diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml index 07cae83f8..2590c718c 100644 --- a/MyTracks/res/values-ca/strings.xml +++ b/MyTracks/res/values-ca/strings.xml @@ -195,16 +195,8 @@ limitations under the License. Edita els detalls Exporta totes les rutes Seleccioneu una ruta. Mantingueu el dit per veure més opcions. - Anomena i desa com un fitxer CSV - Anomena i desa com un fitxer GPX - Anomena i desa com un fitxer KML Escriu a la targeta SD... - Anomena i desa com un fitxer TCX Envia a Google... - Un fitxer CSV - Un fitxer GPX - Un fitxer KML - Un fitxer TCX Comparteix amb amics... Mostra Aquesta ruta diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml index 64270ea48..71d226d9a 100644 --- a/MyTracks/res/values-de/strings.xml +++ b/MyTracks/res/values-de/strings.xml @@ -204,16 +204,8 @@ limitations under the License. Bearbeiten Alle Tracks exportieren Einen Track auswählen. Lange berühren für mehr Optionen. - CSV-Datei exportieren - GPX-Datei exportieren - KML-Datei exportieren Auf SD-Karte speichern… - TCX-Datei exportieren An Google senden… - Eine CSV-Datei - Eine GPX-Datei - Eine KML-Datei - Eine TCX-Datei Mit Freunden teilen… Anzeigen Dieser Track diff --git a/MyTracks/res/values-es-rES/strings.xml b/MyTracks/res/values-es-rES/strings.xml index f019c4715..42225a080 100644 --- a/MyTracks/res/values-es-rES/strings.xml +++ b/MyTracks/res/values-es-rES/strings.xml @@ -32,8 +32,4 @@ limitations under the License. ANT+ Sensores Ninguna SRM ANT+ Puente - Guardar en archivo CSV - Guardar en archivo TCX - Un archivo CSV - Un archivo TCX diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml index 76e1d388d..f9da721d1 100644 --- a/MyTracks/res/values-es/strings.xml +++ b/MyTracks/res/values-es/strings.xml @@ -250,16 +250,8 @@ limitations under the License. Exportar todos Importar todos Escoja un recorrido. Presione&mantenga presionado para ver más opciones. - Guardar en archivo CSV - Guardar en archivo GPX - Guardar en archivo KML Guardar en tarjeta SD... - Guardar en archivo TCX Enviar a Google... - Un archivo CSV - Un archivo GPX" - Un archivo KML" - Un archivo TCX Compartir con amigos..." Un enlace al mapa Mostrar diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml index beb117bfe..04c053e22 100644 --- a/MyTracks/res/values-fi/strings.xml +++ b/MyTracks/res/values-fi/strings.xml @@ -238,16 +238,8 @@ limitations under the License. Vie kaikki Tuo kaikki Valitse reitti. Pitkällä painalluksella lisää vaihtoehtoja. - Tallenna CSV-tiedosto - Tallenna GPX-tiedosto - Tallenna KML-tiedosto Kirjoita SD-kortille... - Tallenna TCX-tiedosto Lähetä Googleen... - CSV-tiedosto - GPX-tiedosto - KML-tiedosto - TCX-tiedosto Jaa... Linkki karttaan Näytä diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml index b7c56cc73..00c982987 100644 --- a/MyTracks/res/values-fr/strings.xml +++ b/MyTracks/res/values-fr/strings.xml @@ -193,12 +193,8 @@ limitations under the License. Consulter les détails Exporter tous les parcours Choisissez un parcours. Faites un appui prolongé pour plus d\'options. - Enregistrer en fichier GPX - Enregistrer en fichier KML Enregistrer sur la carte SD... Envoyer à Google... - Fichier GPX - Fichier KML Partager... Afficher Ce parcours diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml index b07cd5b63..c2bb8e69c 100644 --- a/MyTracks/res/values-it/strings.xml +++ b/MyTracks/res/values-it/strings.xml @@ -154,12 +154,8 @@ limitations under the License. Modifica dettagli Esporta tutti i percorsi Scegli un percorso. Tieni premuto per più opzioni. - Salva in un file GPX - Salva in un file KML Salva su scheda SD... Invia a Google... - Un file GPX - Un file KML Condividi con amici... Un link alla mappa Mostra diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml index f93246845..ab57dfc02 100644 --- a/MyTracks/res/values-ja/strings.xml +++ b/MyTracks/res/values-ja/strings.xml @@ -225,16 +225,8 @@ limitations under the License. 全て出力 全てインポート トラックを選択します．オプションを表示するには長押しして下さい． - CVSファイルの保存 - GPXファイルの保存 - KMLファイルの保存 SDへの書き込み... - TCXファイルの保存 Googleに送信... - CSVファイル - GPXファイル - KMLファイル - TCXファイル 共有... マップへのリンク 表示 diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml index e4d5bff58..67649cb54 100644 --- a/MyTracks/res/values-pl/strings.xml +++ b/MyTracks/res/values-pl/strings.xml @@ -184,14 +184,8 @@ limitations under the License. Edytuj szczegóły Eksportuj wszystkie trasy Wybierz trasę. Naciśnij i przytrzymaj, aby wybrać opcje. - Zapisz plik CSV - Zapisz plik GPX - Zapisz plik KML Zapisz na karcie SD... Wyślij do Google... - Plik CSV - Plik GPX - PLik KML Podziel się z przyjaciółmi... Pokaż Ta trasa diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml index a993eae6f..9807fbf0c 100644 --- a/MyTracks/res/values-pt-rBR/strings.xml +++ b/MyTracks/res/values-pt-rBR/strings.xml @@ -154,12 +154,8 @@ limitations under the License. O caminho e todos os seus marcadores serão permanentemente apagados deste telefone. Editar detalhes Escolha um caminho. Pressione&segure para mais opções. - Salvar arquivo GPX - Salvar arquivo KML Salvar no cartão SD... Enviar para o Google... - Um arquivo GPX - Um arquivo KML Compartilhar com amigos... Um link para a mapa Mostrar diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml index 773dd00c5..436a8b630 100644 --- a/MyTracks/res/values-ru/strings.xml +++ b/MyTracks/res/values-ru/strings.xml @@ -234,16 +234,8 @@ limitations under the License. Экспорт всех Импорт всех Выберите трек. Нажмите и удерживайте для получения дополнительных возможностей. - Сохранить файл CSV - Сохранить файл GPX - Сохранить файл KML Записать на SD карту... - Сохранить файл TCX Отправить в Google ... - Файла CSV - Файл GPX - Файл KML - Файл TCX Поделиться с друзьями... Ссылка на карту Показать diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml index 3126994e9..bfb95f78c 100644 --- a/MyTracks/res/values-sv/strings.xml +++ b/MyTracks/res/values-sv/strings.xml @@ -154,14 +154,8 @@ limitations under the License. Ändra detaljer Exportera alla spår Välj ett spår. Tryck & håll för fler alternativ. - Spara en CSV-fil - Spara en GPX-fil - Spara en KML-fil Skriv till SD-kort... Skicka till Google... - En CSV-fil - En GPX-fil - En KML-fil Dela med vänner... Visa Det här spåret diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml index 1356200a6..71cccbbaf 100644 --- a/MyTracks/res/values-zh-rCN/strings.xml +++ b/MyTracks/res/values-zh-rCN/strings.xml @@ -224,16 +224,8 @@ limitations under the License. 导出所有轨迹 全部导入 选择一个轨迹. 长按弹出操作菜单. - 保存为 CSV 文件 - 保存为 GPX 文件 - 保存为 KML 文件 保存到 SD 卡... - 保存为 TCX 文件 发送到 Google... - CSV 文件 - GPX 文件 - KML 文件 - TCX 文件 与朋友分享... 访问地图的超链接 显示 diff --git a/MyTracks/res/values/arrays_do_not_translate.xml b/MyTracks/res/values/arrays_do_not_translate.xml index 457113c5a..d6749dc0a 100644 --- a/MyTracks/res/values/arrays_do_not_translate.xml +++ b/MyTracks/res/values/arrays_do_not_translate.xml @@ -128,8 +128,7 @@ limitations under the License. @string/sensor_type_value_srm_ant_bridge - - + GPX KML CSV @@ -208,7 +207,7 @@ limitations under the License. @string/waypoint_type_atm @string/waypoint_type_bank @string/waypoint_type_bar - @string/waypoint_type_barbeque + @string/waypoint_type_barbecue @string/waypoint_type_building @string/waypoint_type_bus_stop @string/waypoint_type_cafe diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index 5a0f9168b..3173bbaf5 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -370,7 +370,8 @@ limitations under the License. Exporting a track to the SD card. This may take a while. + translation_description="After exporting all the tracks to the SD card, a toast message + indicating success."> Export finished @@ -443,7 +444,8 @@ limitations under the License. + indicating success. E.g., 'Imported to My Tracks 5 of 6 GPX files from + /mnt/sdcard/MyTracks/gpx/'."> Imported to My Tracks %1$d of %2$d GPX files from %3$s @@ -597,7 +599,7 @@ limitations under the License. - GPS is not available. An approximate location based on cell towers and WIFI networks is shown. + GPS is not available. An approximate location based on cell towers and WiFi networks is shown. - A new Google Fusion table has been created at %s. + A new Google Fusion Table has been created at %s. Export all + + Export as %s + Import all @@ -1591,55 +1598,26 @@ limitations under the License. the user he can press and hold a track for more options."> Pick a track. Press & hold for more options. - - Save as a CSV file - - - Save as a GPX file - - - Save as a KML file + option, the menu option to save the track as a certain file format. E.g, 'Save as a GPX + file'."> + Save as a %s file Save to SD card... - - Save as a TCX file - Send to Google... - - A CSV file - - - A GPX file - - - A KML file - - - A TCX file + option, the menu option to share the track as a certain file format. E.g, 'A GPX file'."> + A %s file bar - - barbeque + + barbecue diff --git a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java index 8d1dc56b7..d1a8c3b84 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java +++ b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java @@ -78,8 +78,16 @@ public class ExportAllTracks { this.activity = activity; Log.i(Constants.TAG, "ExportAllTracks: Starting"); + String exportFileFormat = activity.getString(R.string.track_list_export_file); + String formats[] = activity.getResources().getStringArray(R.array.file_formats); + + String[] choices = new String[formats.length]; + for (int i = 0; i < formats.length; i++) { + choices[i] = String.format(exportFileFormat, formats[i]); + } + AlertDialog.Builder builder = new AlertDialog.Builder(activity); - builder.setSingleChoiceItems(R.array.export_formats, 0, itemClick); + builder.setSingleChoiceItems(choices, 0, itemClick); builder.setPositiveButton(R.string.generic_ok, positiveClick); builder.setNegativeButton(R.string.generic_cancel, null); builder.show(); diff --git a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java index e54a1c923..c14881a7a 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java @@ -362,31 +362,31 @@ public class MapActivity extends com.google.android.maps.MapActivity menu.add(0, Constants.MENU_EDIT, 0, R.string.track_list_edit_track); if (!dataHub.isRecordingSelected()) { + String saveFileFormat = getString(R.string.track_list_save_file); + String shareFileFormat = getString(R.string.track_list_share_file); + String formats[] = getResources().getStringArray(R.array.file_formats); + menu.add(0, Constants.MENU_SEND_TO_GOOGLE, 0, R.string.track_list_send_google); SubMenu share = menu.addSubMenu(0, Constants.MENU_SHARE, 0, R.string.track_list_share_track); share.add(0, Constants.MENU_SHARE_LINK, 0, R.string.track_list_share_url); - share.add(0, Constants.MENU_SHARE_GPX_FILE, 0, - R.string.track_list_share_gpx_file); - share.add(0, Constants.MENU_SHARE_KML_FILE, 0, - R.string.track_list_share_kml_file); - share.add(0, Constants.MENU_SHARE_CSV_FILE, 0, - R.string.track_list_share_csv_file); - share.add(0, Constants.MENU_SHARE_TCX_FILE, 0, - R.string.track_list_share_tcx_file); + share.add( + 0, Constants.MENU_SHARE_GPX_FILE, 0, String.format(shareFileFormat, formats[0])); + share.add( + 0, Constants.MENU_SHARE_KML_FILE, 0, String.format(shareFileFormat, formats[1])); + share.add( + 0, Constants.MENU_SHARE_CSV_FILE, 0, String.format(shareFileFormat, formats[2])); + share.add( + 0, Constants.MENU_SHARE_TCX_FILE, 0, String.format(shareFileFormat, formats[3])); SubMenu save = menu.addSubMenu(0, Constants.MENU_WRITE_TO_SD_CARD, 0, R.string.track_list_save_sd); - save.add(0, Constants.MENU_SAVE_GPX_FILE, 0, - R.string.track_list_save_gpx_file); - save.add(0, Constants.MENU_SAVE_KML_FILE, 0, - R.string.track_list_save_kml_file); - save.add(0, Constants.MENU_SAVE_CSV_FILE, 0, - R.string.track_list_save_csv_file); - save.add(0, Constants.MENU_SAVE_TCX_FILE, 0, - R.string.track_list_save_tcx_file); + save.add(0, Constants.MENU_SAVE_GPX_FILE, 0, String.format(saveFileFormat, formats[0])); + save.add(0, Constants.MENU_SAVE_KML_FILE, 0, String.format(saveFileFormat, formats[1])); + save.add(0, Constants.MENU_SAVE_CSV_FILE, 0, String.format(saveFileFormat, formats[2])); + save.add(0, Constants.MENU_SAVE_TCX_FILE, 0, String.format(saveFileFormat, formats[3])); menu.add(0, Constants.MENU_CLEAR_MAP, 0, R.string.track_list_clear_map); menu.add(0, Constants.MENU_DELETE, 0, diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java index a654d5945..bfcdf353c 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java @@ -86,31 +86,31 @@ public class TrackList extends ListActivity menu.add(0, Constants.MENU_EDIT, 0, R.string.track_list_edit_track); if (!isRecording() || trackId != recordingTrackId) { + String saveFileFormat = getString(R.string.track_list_save_file); + String shareFileFormat = getString(R.string.track_list_share_file); + String formats[] = getResources().getStringArray(R.array.file_formats); + menu.add(0, Constants.MENU_SEND_TO_GOOGLE, 0, R.string.track_list_send_google); SubMenu share = menu.addSubMenu(0, Constants.MENU_SHARE, 0, R.string.track_list_share_track); share.add(0, Constants.MENU_SHARE_LINK, 0, R.string.track_list_share_url); - share.add(0, Constants.MENU_SHARE_GPX_FILE, 0, - R.string.track_list_share_gpx_file); - share.add(0, Constants.MENU_SHARE_KML_FILE, 0, - R.string.track_list_share_kml_file); - share.add(0, Constants.MENU_SHARE_CSV_FILE, 0, - R.string.track_list_share_csv_file); - share.add(0, Constants.MENU_SHARE_TCX_FILE, 0, - R.string.track_list_share_tcx_file); + share.add( + 0, Constants.MENU_SHARE_GPX_FILE, 0, String.format(shareFileFormat, formats[0])); + share.add( + 0, Constants.MENU_SHARE_KML_FILE, 0, String.format(shareFileFormat, formats[1])); + share.add( + 0, Constants.MENU_SHARE_CSV_FILE, 0, String.format(shareFileFormat, formats[2])); + share.add( + 0, Constants.MENU_SHARE_TCX_FILE, 0, String.format(shareFileFormat, formats[3])); SubMenu save = menu.addSubMenu(0, Constants.MENU_WRITE_TO_SD_CARD, 0, R.string.track_list_save_sd); - save.add(0, Constants.MENU_SAVE_GPX_FILE, 0, - R.string.track_list_save_gpx_file); - save.add(0, Constants.MENU_SAVE_KML_FILE, 0, - R.string.track_list_save_kml_file); - save.add(0, Constants.MENU_SAVE_CSV_FILE, 0, - R.string.track_list_save_csv_file); - save.add(0, Constants.MENU_SAVE_TCX_FILE, 0, - R.string.track_list_save_tcx_file); + save.add(0, Constants.MENU_SAVE_GPX_FILE, 0, String.format(saveFileFormat, formats[0])); + save.add(0, Constants.MENU_SAVE_KML_FILE, 0, String.format(saveFileFormat, formats[1])); + save.add(0, Constants.MENU_SAVE_CSV_FILE, 0, String.format(saveFileFormat, formats[2])); + save.add(0, Constants.MENU_SAVE_TCX_FILE, 0, String.format(saveFileFormat, formats[3])); menu.add(0, Constants.MENU_DELETE, 0, R.string.track_list_delete_track); }