merge heads

This commit is contained in:
Jimmy Shih
2011-11-10 16:51:10 -08:00
parent 44e81383f9
commit 23b5f879ae
34 changed files with 378 additions and 473 deletions
+1 -1
View File
@@ -119,7 +119,7 @@ limitations under the License.
android:autoLink="web"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/about_weburl"
android:text="@string/my_tracks_web_url"
android:textSize="18sp" />
</TableRow>
@@ -59,7 +59,7 @@ services.
android:id="@+id/send_to_google_result_error"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/error_generic"
android:text="@string/error_sending_to_google"
android:visibility="gone"
style="?android:attr/textAppearanceLarge"/>
</LinearLayout>
+2 -7
View File
@@ -41,7 +41,7 @@ limitations under the License.
<string name="error_unable_to_stop_recording">No es pot aturar l\'enregistrament. Proveu de nou.</string>
<string name="error_import_unable_to_read_file">No es pot llegir des del fitxer.</string>
<string name="error_import_invalid_gpx_format">El fitxer no conté un format GPX vàlid.</string>
<string name="error_generic">S\'ha produït un error. Proveu de nou.</string>
<string name="error_sending_to_google">S\'ha produït un error. Proveu de nou.</string>
<string name="error_export_track_does_not_exist">No existeix la ruta.</string>
<string name="error_import_out_of_memory">Aquest fitxer és massa gran (ha d\'ésser inferior a 500KB. S\'està cancel·lant.</string>
<string name="error_unable_to_insert_marker">No es pot inserir un marcador. No hi ha cap ubicació fixa disponible.</string>
@@ -50,10 +50,6 @@ limitations under the License.
<string name="status_wait_for_gps_fix">S\'està esperant per tenir una posició GPS fixa. Assegureu-vos que el cel és visible.</string>
<string name="status_now_recording">Ara s\'està enregistrant una ruta nova.</string>
<string name="status_stopped_recording">S\'ha aturat l\'enregistrament de la ruta.</string>
<string name="sending_to_fusion_tables_success">S\'ha creat un Google Fusion Table nou a google.com/fusiontables.</string>
<string name="sending_to_my_maps_success_existing_map">S\'ha enviat la ruta a maps.google.com.</string>
<string name="sending_to_docs_success_new_doc">S\'ha enviat la ruta a un full de càlcul a docs.google.com.</string>
<string name="sending_to_docs_success_existing_doc">S\'ha enviat la ruta a docs.google.com.</string>
<string name="status_need_to_enable_gps">Toqueu aquí per anar als paràmetres de seguretat i ubicació i activeu \'habilita els satèl·lits GPS\'. Premeu el botó d\'anar enrere per tornar.</string>
<string name="status_approximate_current_location">Nota: Es mostra una ubicació determinada a partir de les xarxes sense fils i antenes telefòniques.</string>
<string name="status_no_current_location">No es pot determinar la ubicació. Habiliteu més fonts d\'ubicació (vegeu els paràmetres de seguretat i ubicació) i assegureu-vos que el cel és visible. Proveu de nou més tard.</string>
@@ -82,8 +78,7 @@ limitations under the License.
<!-- Text and links when uploading to Google My Maps -->
<string name="new_map_description">Creat per My Tracks a l\'Android.</string>
<string name="send_to_google_by_mytracks">Creat per &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; a l\'Android.</string>
<!-- Formatting of track and marker descriptions -->
<string name="recorded_date">Enregistrat</string>
<string name="category">Tipus d\'activitat</string>
+2 -7
View File
@@ -41,7 +41,7 @@ limitations under the License.
<string name="error_unable_to_stop_recording">Anhalten unmöglich. Bitte versuche es noch einmal.</string>
<string name="error_import_unable_to_read_file">Konnte Datei nicht lesen.</string>
<string name="error_import_invalid_gpx_format">Datei ist nicht im GPX-Format.</string>
<string name="error_generic">Ein Fehler ist aufgetreten. Bitte versuche es noch einmal.</string>
<string name="error_sending_to_google">Ein Fehler ist aufgetreten. Bitte versuche es noch einmal.</string>
<string name="error_export_track_does_not_exist">Track existiert nicht.</string>
<string name="error_import_out_of_memory">Die Datei ist zu groß (maximal 500 KB). Operation abgebrochen.</string>
<string name="error_unable_to_insert_marker">Der Wegpunkt kann nicht einfügt werden. Keine Positionsbestimmung möglich.</string>
@@ -50,10 +50,6 @@ limitations under the License.
<string name="status_wait_for_gps_fix">Warte auf ein besseres GPS-Signal. Bitte stelle sicher, dass der Himmel sichtbar ist.</string>
<string name="status_now_recording">Ein neuer Track wird aufgezeichnet.</string>
<string name="status_stopped_recording">Die Aufzeichnung wurde angehalten.</string>
<string name="sending_to_fusion_tables_success">Eine neue Tabelle wurde auf google.com/fusiontables erstellt.</string>
<string name="sending_to_my_maps_success_existing_map">Dein Track wurde auf maps.google.com gespeichert.</string>
<string name="sending_to_docs_success_new_doc">Dein Track wurde in einer neuen Tabelle bei docs.google.com gespeichert.</string>
<string name="sending_to_docs_success_existing_doc">Dein Track wurde an docs.google.com gesendet.</string>
<string name="status_need_to_enable_gps">Hier berühren, um zu den Sicherheits- und Positionseinstellungen zu gelangen. Aktiviere \'GPS-Satelliten\'. Drücke dann den Zurück-Knopf, um hierher zurückzukehren.</string>
<string name="status_approximate_current_location">Anmerkung: Eine ungefähre Position wird angezeigt, bestimmt mittels Mobilfunkstationen und WiFi-Netzwerken.</string>
<string name="status_no_current_location">Die Position kann derzeit nicht bestimmt werden. Aktiviere mehr Positionsquellen (siehe Sicherheits- und Positionseinstellungen) und stelle sicher, dass der Himmel sichtbar ist.</string>
@@ -82,8 +78,7 @@ limitations under the License.
<!-- Text and links when uploading to Google Fusion Tables -->
<string name="new_map_description">Erstellt von My Tracks für Android.</string>
<string name="send_to_google_by_mytracks">Erstellt von &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; für Android.</string>
<!-- Formatting of track and marker descriptions -->
<string name="points">Punkte</string>
<string name="recorded_date">Aufgezeichnet am</string>
+2 -8
View File
@@ -43,7 +43,7 @@ limitations under the License.
<string name="error_unable_to_stop_recording">No se puede detener la grabación. Inténtelo de nuevo.</string>
<string name="error_import_unable_to_read_file">No pude leer del archivo.</string>
<string name="error_import_invalid_gpx_format">El archivo no tiene un format GPX válido.</string>
<string name="error_generic">A ocurrido un error. Por favor, inténtelo de nuevo.</string>
<string name="error_sending_to_google">A ocurrido un error. Por favor, inténtelo de nuevo.</string>
<string name="error_export_track_does_not_exist">El recorrido no existe.</string>
<string name="error_export_operation_canceled">La operación fue cancelada.</string>
<string name="error_import_out_of_memory">El archivo es demasiado grande (tiene que ser menor a 500 KB). Abortando.</string>
@@ -53,11 +53,6 @@ limitations under the License.
<string name="status_wait_for_gps_fix">Esperando una ubicación mas exacta del GPS. Asegúrese que el cielo sea visible.</string>
<string name="status_now_recording">Grabando un nuevo recorrido.</string>
<string name="status_stopped_recording">Grabación interrumpida.</string>
<string name="sending_to_my_maps_success_new_map">Un nuevo sitio ha sido añadido en maps.google.com.</string>
<string name="sending_to_fusion_tables_success">Una nueva tabla de Google Fusion ha sido creada en google.com/fusiontables.</string>
<string name="sending_to_my_maps_success_existing_map">Su recorrido ha sido enviado a maps.google.com.</string>
<string name="sending_to_docs_success_new_doc">Su recorrido ha sido enviado a una nueva hoja de cálculo de docs.google.com.</string>
<string name="sending_to_docs_success_existing_doc">Su recorrido ha sido enviado a docs.google.com.</string>
<string name="sending_to_google_additional_info">Es posible que pasen unos minutos hasta que los nuevos recorridos aparezcan.</string>
<string name="status_need_to_enable_gps">Por favor, presione aquí para ir al menú de Seguridad y Ubicación, y asegúrese que el GPS esté habilitado. Presione el botón "atrás" para regresar.</string>
<string name="status_approximate_current_location">Nota: Una ubicación aproximada es determinada a partir de torres de telefonía celular y redes WIFI.</string>
@@ -92,8 +87,7 @@ limitations under the License.
<!-- Text and links when uploading to Google Fusion Tables -->
<string name="new_map_description">Creado por My Tracks para Android.</string>
<string name="send_to_google_by_mytracks">Creado por &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; en Android.</string>
<!-- Text and links when uploading to Google My Maps -->
<string name="my_map_link">Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; en Android.</string>
<string name="new_map_title">Nuevo Sitio</string>
+1 -7
View File
@@ -53,11 +53,6 @@ limitations under the License.
<string name="status_wait_for_gps_fix">Odotetaan parempaa GPS-yhteyttä. Varmista että taivas on näkyvissä.</string>
<string name="status_now_recording">Tallennetaan uutta reittiä.</string>
<string name="status_stopped_recording">Reitin tallentaminen lopetettiin.</string>
<string name="sending_to_my_maps_success_new_map">Uusi Google My Map on luotu osoitteeseen maps.google.com.</string>
<string name="sending_to_fusion_tables_success">Uusi Google Fusion taulukko on luotu osoitteeseen google.com/fusiontables.</string>
<string name="sending_to_my_maps_success_existing_map">Reittisi on lähetetty osoitteeseen maps.google.com.</string>
<string name="sending_to_docs_success_new_doc">Reittisi on luotu taulukoksi osoitteeseen docs.google.com.</string>
<string name="sending_to_docs_success_existing_doc">Reittisi on lähetetty osoitteeseen docs.google.com.</string>
<string name="sending_to_google_additional_info">Reitin näkyminen saattaa kestää muutaman minuutin.</string>
<string name="status_need_to_enable_gps">Avaa tästä Sijainti ja suojaus -asetukset ja valitse \'Käytä GPS-satelliitteja\'. Palaa ohjelmaan painamalla Takaisin-näppäintä.</string>
<string name="status_approximate_current_location">Huomio: Näkyvä sijainti perustuu kännykkämastoista ja WLAN-verkoista arvioituun paikkatietoon.</string>
@@ -91,8 +86,7 @@ limitations under the License.
<!-- Text and links when uploading to Google Fusion Tables -->
<string name="new_map_description">Created by My Tracks on Android.</string>
<string name="send_to_google_by_mytracks">Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; on Android.</string>
<!-- Text and links when uploading to Google My Maps -->
<string name="my_map_link">Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; on Android.</string>
<string name="new_map_title">Uusi kartta</string>
+1 -6
View File
@@ -51,10 +51,6 @@ limitations under the License.
<string name="status_wait_for_gps_fix">Attente du signal GPS. Assurez-vous que le ciel est bien visible.</string>
<string name="status_now_recording">Parcours en cours d\'enregistrement.</string>
<string name="status_stopped_recording">Enregistrement du parcours terminé.</string>
<string name="sending_to_fusion_tables_success">Une nouvelle table Google Fusion vient d\'être créée sur google.com/fusiontables.</string>
<string name="sending_to_my_maps_success_existing_map">Votre parcours a été envoyé à maps.google.com.</string>
<string name="sending_to_docs_success_new_doc">Votre parcours a été envoyé dans un tableur à docs.google.com.</string>
<string name="sending_to_docs_success_existing_doc">Votre parcours a été envoyé à docs.google.com.</string>
<string name="status_need_to_enable_gps">Cliquez ici et allez dans \'Paramètres\', \'Sécurité et Localisation\' et selectionnez \'Activer les satellites GPS\'. Appuyez sur le bouton de retour pour revenir au menu.</string>
<string name="status_approximate_current_location">Note : Votre position est approximative, elle a été déterminée par les antennes de téléphonie ou le réseau WiFi.</string>
<string name="status_no_current_location">Votre position ne peut être déterminée. Vérifiez votre configuration dans \'Paramètres\', \'Sécurité et Localisation\'. Assurez-vous également que le ciel soit bien visible.</string>
@@ -83,8 +79,7 @@ limitations under the License.
<!-- Text and links when uploading to Google My Maps -->
<string name="new_map_description">Créée par My Tracks sous Android.</string>
<string name="send_to_google_by_mytracks">Créée par &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; sous Android.</string>
<!-- Formatting of track and marker descriptions -->
<string name="recorded_date">Enregistré</string>
<string name="category">Type d\'activité</string>
+1 -6
View File
@@ -48,10 +48,6 @@ limitations under the License.
<string name="status_wait_for_gps_fix">Sto aspettando il fix del GPS. Accertati che il cielo sia visibile.</string>
<string name="status_now_recording">Sto registrando un nuovo percorso.</string>
<string name="status_stopped_recording">Registrazione del percorso terminata.</string>
<!-- <string name="sending_to_fusion_tables_success">Una nuova mappa è stata creata in «Le mie mappe» su maps.google.com.</string> -->
<string name="sending_to_my_maps_success_existing_map">Il tuo percorso è stato inviato a maps.google.com.</string>
<string name="sending_to_docs_success_new_doc">Il tuo percorso è stato inviato ad un nuovo foglio di calcolo su docs.google.com.</string>
<string name="sending_to_docs_success_existing_doc">Il tuo percorso è stato inviato a docs.google.com.</string>
<string name="status_need_to_enable_gps">Premi qui per andare a «Impostazioni di posizione e protezione» e attiva «Utilizza satelliti GPS». Poi premi il tasto di ritorno per tornare qui.</string>
<string name="status_approximate_current_location">Nota: la posizione indicata è un\'approssimazione determinata in base alle antenne cellulari e reti WIFI vicine.</string>
<string name="status_no_current_location">La posizione non può essere determinata. Attiva più fonti di posizione (vedi «Impostazioni di posizione e protezione») e eccertati che il cielo sia visibile. Riprova più tardi.</string>
@@ -80,8 +76,7 @@ limitations under the License.
<!-- Text and links when uploading to Google My Maps -->
<string name="new_map_description">Creato da My Tracks su Android.</string>
<string name="send_to_google_by_mytracks">Creato da &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; su Android.</string>
<!-- Formatting of track and marker descriptions -->
<string name="points">Punti</string>
<string name="recorded_date">Registrato</string>
+1 -7
View File
@@ -51,11 +51,6 @@ limitations under the License.
<string name="status_wait_for_gps_fix">GPS位置精度がよくなるまで待機しています.空が見えるところにいて下さい.</string>
<string name="status_now_recording">新しいトラックを記録中です.</string>
<string name="status_stopped_recording">トラック記録を停止しました.</string>
<string name="sending_to_my_maps_success_new_map">新しいマイマップをmap.google.comに作成しました.</string>
<string name="sending_to_fusion_tables_success">新しいGoogle Fusion Tableをgoogle.com/fusiontablesに作成しました.</string>
<string name="sending_to_my_maps_success_existing_map">トラックをmaps.google.comに送信しました.</string>
<string name="sending_to_docs_success_new_doc">トラックをdocs.google.comの新しいスプレッドシートに送信しました.</string>
<string name="sending_to_docs_success_existing_doc">トラックをdocs.google.comに送信しました.</string>
<string name="sending_to_google_additional_info">新しいトラックが表示されるまでに数分かかることがあります.</string>
<string name="status_need_to_enable_gps">ここをタップして「位置情報とセキュリティの設定」を開いて「GPS機能を使用」にチェックを入れて下さい.バックボタンで戻ってください.</string>
<string name="status_approximate_current_location">ご注意: 携帯電話中継局とWi-Fiネットワークから大まかな位置を特定します.</string>
@@ -88,8 +83,7 @@ limitations under the License.
<!-- Text and links when uploading to Google Fusion Tables -->
<string name="new_map_description">Android用My Tracksで作成</string>
<string name="send_to_google_by_mytracks">Android用&lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt;で作成しました.</string>
<!-- Text and links when uploading to Google My Maps -->
<string name="my_map_link">Android用&lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt;で作成しました.</string>
<string name="new_map_title">新規マップ</string>
+1 -6
View File
@@ -49,10 +49,6 @@ limitations under the License.
<string name="status_wait_for_gps_fix">Oczekiwanie na lepsze ustalenie pozycji GPS. Upewnij się, że niebo jest widoczne.</string>
<string name="status_now_recording">Rejestrowanie nowej trasy.</string>
<string name="status_stopped_recording">Zatrzymano rejestrowanie nowej trasy.</string>
<!-- <string name="sending_to_fusion_tables_success">Utworzona nową Mapę Google na maps.google.com.</string> -->
<string name="sending_to_my_maps_success_existing_map">Twoja trasa został wysłana do maps.google.com.</string>
<string name="sending_to_docs_success_new_doc">Twoja trasa została wysłana do nowego arkusza na docs.google.com.</string>
<string name="sending_to_docs_success_existing_doc">Twoja trasa została wysłana do docs.google.com.</string>
<string name="status_need_to_enable_gps">Tapnij tutaj, aby przejść do ustawień Lokalizacji i zabezpieczeń, a następnie zaznacz Użyj satelitów GPS. Naciśnij klawisz Wstecz, aby powrócić.</string>
<string name="status_approximate_current_location">Uwaga: używana jest przybliżona lokalizacja ustalona za pomocą stacji komórkowych i sieci WIFI.</string>
<string name="status_no_current_location">Lokalizacja nie może być obecnie ustalona. Włącz wiecej źródeł (zobacz ustawienia Lokalizacji i zabezpieczeń) i upewnij się, że niebo jest widoczne. Spróbuj później.</string>
@@ -81,8 +77,7 @@ limitations under the License.
<!-- Text and links when uploading to Google My Maps -->
<string name="new_map_description">Utworzono za pomocą My Tracks na Android.</string>
<string name="send_to_google_by_mytracks">Utworzona przez &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; na Android.</string>
<!-- Formatting of track and marker descriptions -->
<string name="points">Punkty</string>
<string name="recorded_date">Zapisana</string>
+1 -6
View File
@@ -48,10 +48,6 @@ limitations under the License.
<string name="status_wait_for_gps_fix">Esperando por um sinal melhor do GPS. Assegure-se de que o céu está visível.</string>
<string name="status_now_recording">Gravando um novo caminho.</string>
<string name="status_stopped_recording">Gravação interrompida.</string>
<string name="sending_to_fusion_tables_success">Uma nova Fusion Table Google foi criada em google.com/fusiontables.</string>
<string name="sending_to_my_maps_success_existing_map">Seu caminho foi enviado para maps.google.com.</string>
<string name="sending_to_docs_success_new_doc">Seu caminho foi enviado para uma nova planilha em docs.google.com.</string>
<string name="sending_to_docs_success_existing_doc">Seu caminho foi enviado para docs.google.com.</string>
<string name="status_need_to_enable_gps">"Por favor pressione aqui para ir aos ajustes de segurança e localização e verifique que o GPS esteja habilitado. Pressione o botão de voltar para retornar.</string>
<string name="status_approximate_current_location">Nota: Uma localização aproximada, determinada por torres de telefonia celular, está sendo mostrada.</string>
<string name="status_no_current_location">Sua localização não pôde ser determinada. Habilite fontes adicionais de localização (veja configurações de Segurança e Localização) e assegure-se de que o céu está visível.</string>
@@ -80,8 +76,7 @@ limitations under the License.
<!-- Text and links when uploading to Google My Maps -->
<string name="new_map_description">"Criado por My Tracks no Android.</string>
<string name="send_to_google_by_mytracks">"Criado por &lt;a href='http://mytracks.appspot.com'&gt;My Tracks&lt;/a&gt; no Android.</string>
<!-- Formatting of track and marker descriptions -->
<string name="points">Pontos</string>
<string name="recorded_date">Gravado</string>
+1 -7
View File
@@ -52,11 +52,6 @@ limitations under the License.
<string name="status_wait_for_gps_fix">Ожидание сигнала GPS. Убедитесь в том, что вы находитесь под открытым небом.</string>
<string name="status_now_recording">Записывается новый трек.</string>
<string name="status_stopped_recording">Запись вашего трека остановлена.</string>
<string name="sending_to_my_maps_success_new_map">Новая Google \"Мои карты\" была создана на maps.google.com.</string>
<string name="sending_to_fusion_tables_success">Новая таблица Google Fusion была создана на google.com/fusiontables.</string>
<string name="sending_to_my_maps_success_existing_map">Твой трек был отправлен на maps.google.com.</string>
<string name="sending_to_docs_success_new_doc">Ваш трек был отправлен в новую электронную таблицу на docs.google.com.</string>
<string name="sending_to_docs_success_existing_doc">Ваш трек был отправлен в docs.google.com.</string>
<string name="sending_to_google_additional_info">Это может занять несколько минут, прежде чем появятся новые треки.</string>
<string name="status_need_to_enable_gps">Пожалуйста, нажмите здесь для перехода к разделу настроек Координаты и отметьте пункт \"Спутники GPS\". Для возвращения нажмите кнопку Назад.</string>
<string name="status_approximate_current_location">Примечание: приблизительное местоположение определено относительно вышек сотовой связи и беспроводных сетей.</string>
@@ -90,8 +85,7 @@ limitations under the License.
<!-- Text and links when uploading to Google Fusion Tables -->
<string name="new_map_description">Создано My Tracks на Android.</string>
<string name="send_to_google_by_mytracks">Создано &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; на Android.</string>
<!-- Text and links when uploading to Google My Maps -->
<string name="my_map_link">Создано &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; на Android.</string>
<string name="new_map_title">Новая карта</string>
-5
View File
@@ -49,10 +49,6 @@ limitations under the License.
<string name="status_wait_for_gps_fix">Väntar på bättre GPS-position. Se till att himlen är synlig.</string>
<string name="status_now_recording">Spelar nu in ett nytt spår.</string>
<string name="status_stopped_recording">Stoppade inspelning av ditt spår.</string>
<!-- <string name="sending_to_fusion_tables_success">En ny Google Mina Kartor har skapats på maps.google.com.</string> -->
<string name="sending_to_my_maps_success_existing_map">Ditt spår har skickats till maps.google.com.</string>
<string name="sending_to_docs_success_new_doc">Ditt spår har skickats till ett nytt kalkylblad på docs.google.com.</string>
<string name="sending_to_docs_success_existing_doc">Ditt spår har skickats till docs.google.com.</string>
<string name="status_need_to_enable_gps">Klicka här för att gå till Säkerhet och Platsinställningar och kryssa i \'aktivera gps-satteliter\'. Tryck på tillbakaknappen för att återgå.</string>
<string name="status_approximate_current_location">OBS: En ungefärlig position som avgörs från mobilmaster och WIFI-nät visas.</string>
<string name="status_no_current_location">En position kan för närvarande inte fastställas. Aktivera mer platskällor (se Säkerhet och Platsinställningar) och se till att himlen är synlig. Försök igen senare.</string>
@@ -81,7 +77,6 @@ limitations under the License.
<!-- Text and links when uploading to Google My Maps -->
<string name="new_map_description">Skapad av My Tracks på Android.</string>
<string name="send_to_google_by_mytracks">Skapad av &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; på Android.</string>
<!-- Formatting of track and marker descriptions -->
<string name="points">Punkter</string>
-9
View File
@@ -53,11 +53,6 @@ limitations under the License.
<string name="status_wait_for_gps_fix">等待更准确的 GPS 定位. 请确定可以看见天空.</string>
<string name="status_now_recording">现在开始记录新的轨迹.</string>
<string name="status_stopped_recording">停止记录你的轨迹.</string>
<string name="sending_to_my_maps_success_new_map">已在 maps.google.com 创建了新的 Google My Map.</string>
<string name="sending_to_fusion_tables_success">已在 google.com/fusiontables 创建新 Google Fusion Table.</string>
<string name="sending_to_my_maps_success_existing_map">你的轨迹已经发送到 maps.google.com.</string>
<string name="sending_to_docs_success_new_doc">你的轨迹已经作为新的电子表格发送到 docs.google.com.</string>
<string name="sending_to_docs_success_existing_doc">你的轨迹已经发送到 docs.google.com.</string>
<string name="sending_to_google_additional_info">可能需要等待几分钟才能看见新的轨迹.</string>
<string name="status_need_to_enable_gps">请点击这里进入\'安全和位置设置\'并勾选上\'启用 GPS 卫星\'. 然后用后退键返回.</string>
<string name="status_approximate_current_location">注意: 当前显示的位置是根据无线信号和无线网络计算的近似位置.</string>
@@ -91,10 +86,6 @@ limitations under the License.
<!-- Text and links when uploading to Google Fusion Tables -->
<string name="new_map_description">由 Android 平台的 My Tracks 创建.</string>
<string name="send_to_google_by_mytracks">由 Android 平台的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 创建.</string>
<!-- Text and links when uploading to Google My Maps -->
<string name="send_to_google_by_mytracks">由 Android 上的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 创建.</string>
<string name="new_map_title">新地图</string>
<!-- Formatting of track and marker descriptions -->
+7 -6
View File
@@ -20,8 +20,10 @@ limitations under the License.
<!-- Application Name -->
<string name="app_name">My Tracks</string>
<!-- About Page -->
<string name="about_weburl">mytracks.appspot.com</string>
<string name="my_tracks_web_url">mytracks.appspot.com</string>
<!-- About Dialog -->
<string name="about_googlegroups">mytracks@googlegroups.com</string>
<string name="about_privacy_weburl">m.google.com/privacy</string>
<string name="about_bart">Bartłomiej Niechwiej</string>
<string name="about_dylan">Dylan Casey</string>
@@ -45,9 +47,9 @@ limitations under the License.
<string name="unknown">-</string>
<!-- Send to Google URLs -->
<string name="sendtogoogle_google_mymaps_url">maps.google.com</string>
<string name="sendtogoogle_google_fusiontables_url">google.com/fusiontables</string>
<string name="sendtogoogle_google_docs_url">docs.google.com</string>
<string name="send_google_fusion_tables_url">google.com/fusiontables</string>
<string name="send_google_my_maps_url">maps.google.com</string>
<string name="send_google_docs_url">docs.google.com</string>
<!-- Google Analytics ID -->
<string name="google_analytics_id">UA-7222692-2</string>
@@ -57,7 +59,6 @@ limitations under the License.
<!-- Intent Actions -->
<string name="save_intent_action">android.intent.action.SAVE</string>
<string name="open_settings_screen">android.intent.action.settings.OPEN</string>
<string name="start_new_track_action">com.google.android.apps.mytracks.START_NEW_TRACK</string>
<string name="end_current_track_action">
com.google.android.apps.mytracks.END_CURRENT_TRACK
+1 -1
View File
@@ -23,6 +23,7 @@ limitations under the License.
<string name="auto_resume_track_timeout_key">autoResumeTrackTimeout</string>
<string name="bluetooth_pairing_key">bluetoothPairing</string>
<string name="bluetooth_sensor_key">bluetoothSensor</string>
<string name="default_category_key">defaultCategory</string>
<string name="default_map_public_key">defaultMapPublic</string>
<string name="max_recording_distance_key">maxRecordingDistance</string>
<string name="metric_units_key">metricUnits</string>
@@ -57,7 +58,6 @@ limitations under the License.
<!-- Keys for non-persisted preferences. Sorted alphabetically. - DO NOT TRANSLATE -->
<string name="ant_options_key">antOptions</string>
<string name="backup_to_sd_key">backupToSd</string>
<string name="display_settings_screen_key">displaySettingsScreen</string>
<string name="reset_key">resetToDefaults</string>
<string name="restore_from_sd_key">restoreFromSd</string>
<string name="sensor_options_key">sensorOptions</string>
+63 -78
View File
@@ -86,14 +86,12 @@ limitations under the License.
Unable to insert marker. No GPS location. Try again.
</string>
<!-- A generic error message. -->
<string name="error_generic"
translation_description="In an alert dialog, a generic error message indicating that an error
has occurred and asking the user to try again.">
<!-- Error messages when sending to Google. -->
<string name="error_sending_to_google"
translation_description="When sending a track to Google, a message indicating that an error has
occurred and ask the user to try again.">
An error occurred. Please try again.
</string>
<!-- Error messages when sending to Google. -->
<string name="error_sending_to_my_maps"
translation_description="When sending a track to Google My Maps, a message indicating that an
error has occured.">
@@ -108,27 +106,8 @@ limitations under the License.
translation_description="When sending a track to Google Docs, a message indicating that an error
has occurred.">
There was an error while sending your track to Google Docs.
</string>
<!-- Error messages when importing a track. -->
<string name="error_import_unable_to_read_file"
translation_description="When importing a track from the SD card, a messsage indicating that
My Tracks is unable to read the file.">
Unable to read from file.
</string>
<string name="error_import_invalid_gpx_format"
translation_description="When importing a track from the SD card, a message indicating that
the file does not have a valid GPX format.">
File does not have a valid GPX format.
</string>
<!-- TODO(jshih@google.com) confirm if the file size limit is still 500 KB. -->
<string name="error_import_out_of_memory"
translation_description="When importing a track from the SD card, a message indicating that
the file is too big, must be less than 500 KB, and aborting.">
This file is too big (must be less than 500 KB). Aborting.
</string>
</string>
<!-- Error messages when exporting a track. -->
<string name="error_export_generic"
translation_description="When exporting a track to the SD card, a generic error message
@@ -189,32 +168,37 @@ limitations under the License.
the result page.">
It may take a few minutes before new tracks appear.
</string>
<string name="sending_to_my_maps_success_new_map"
translation_description="When sending a track to Google My Maps, the message on the result page
indicating that a new map is created.">
A new Google My Map has been created at maps.google.com.
<string name="send_google_docs_existing_doc_success"
translation_description="When sending a track to Google Docs, the message on the result page
indicating that the track is sent to an existing spreadsheet. E.g., 'Your track has been sent
to docs.google.com.'.">
Your track has been sent to %s.
</string>
<string name="sending_to_my_maps_success_existing_map"
translation_description="When sending a track to Google My Maps, the message on the result page
indicating that the track is sent to an existing map.">
Your track has been sent to maps.google.com.
<string name="send_google_docs_new_doc_success"
translation_description="When sending a track to Google Docs, the message on the result page
indicating that a new spreadsheet is created. E.g., 'A new spreadsheet is created at
docs.google.com.'.">
A new spreadsheet is created at %s.
</string>
<string name="sending_to_fusion_tables_success"
<string name="send_google_fusion_tables_success"
translation_description="When sending a track to Google Fusion Tables, the message on the result
page indicating success.">
A new Google Fusion table has been created at google.com/fusiontables.
page indicating success. E.g., 'A new Google Fusion table has been created at
google.com/fusiontables.'">
A new Google Fusion table has been created at %s.
</string>
<string name="sending_to_docs_success_new_doc"
translation_description="When sending a track to Google Docs, the message on the result page
indicating that a new spreadsheet is created.">
A new spreadsheet is created at docs.google.com.
<string name="send_google_my_maps_existing_map_success"
translation_description="When sending a track to Google My Maps, the message on the result page
indicating that the track is sent to an existing map. E.g., 'Your track has been sent to
maps.google.com.'">
Your track has been sent to %s.
</string>
<string name="sending_to_docs_success_existing_doc"
translation_description="When sending a track to Google Docs, the message on the result page
indicating that the track is sent to an existing spreadsheet.">
Your track has been sent to docs.google.com.
<string name="send_google_my_maps_new_map_success"
translation_description="When sending a track to Google My Maps, the message on the result page
indicating that a new map is created. E.g., 'A new Google My Map has been created at
maps.google.com.'.">
A new Google My Map has been created at %s.
</string>
<!-- Progress dialog title -->
<string name="progress_title"
translation_description="When displaying a progress dialog, the title on the dialog asking the
@@ -274,12 +258,7 @@ limitations under the License.
Sending a track to Google Docs...
</string>
<!-- Import and Export progress messages. -->
<string name="progress_message_import"
translation_description="When importing a track from the SD card, the message on the progress
dialog indicating that it may take a while.">
Importing a track from the SD card. This may take a while.
</string>
<!-- Export progress messages. -->
<string name="progress_message_export"
translation_description="When exporting a track to the SD card, the message on the progress
dialog indicating that it may take a while.">
@@ -310,12 +289,12 @@ limitations under the License.
</string>
<!-- Text and link when uploading to Google. -->
<!-- TODO(jshih@google.com) remove the html href tag from this string. -->
<string name="send_to_google_by_mytracks"
<string name="send_google_by_my_tracks"
translation_description="When sending a track to Google, a note indicating it is created by
My Tracks on Android, with the 'My Tracks' word containng a http link to
http://mytracks.appspot.com.">
Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; on Android.
My Tracks on Android. The two string placeholders are used to insert the html link tags around
'My Tracks'. E.g., 'Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks
&lt;/a&gt; on Android.'.">
Created by %1$sMy Tracks%2$s on Android.
</string>
<!-- Tags for a track description. -->
@@ -528,7 +507,7 @@ limitations under the License.
<string name="import_multi_done"
translation_description="After importing all the tracks from the SD card, the alert message
indicating success. E.g., 'Imported 5 of 6 GPX files from /mnt/sdcard/MyTracks/gpx/'.">
Imported %1$d of %2$d GPX files from %3$s
Imported to My Tracks %1$d of %2$d GPX files from %3$s
</string>
<string name="import_multi_empty"
translation_description="After importing all the tracks from the SD card, the alert message
@@ -541,15 +520,6 @@ limitations under the License.
one of the tracks. E.g., 'Import error for file /mnt/sdcard/MyTacks/gpx/1.gpx'.">
Import error for file %s
</string>
<string name="import_success"
translation_description="After successfully importing one track, the message on the confirmation
dialog. E.g., 'Successfully imported 5 track(s) from file'.">
Successfully imported %d track(s) from file.
</string>
<string name="import_show_track"
translation_description="After importing one track, the button to see the track.">
Show track
</string>
<!-- Markers page. -->
<string name="waypointslist_pick_one"
@@ -879,7 +849,17 @@ limitations under the License.
name' checkbox when it is unchecked explaining using a number as the default track name.">
Use a number as the default track name
</string>
<string name="settings_default_category"
translation_description="In the Recording settings, the option to specify a new track's default
activity type.">
Default activity type
</string>
<string name="settings_default_category_summary"
translation_description="In the Recording settings, the summary for the 'Default activity type'
option explaining that it sets the default activity type for a new track.">
Default activity type for a new track.
</string>
<!-- Sensor settings -->
<string name="settings_sensor_type"
translation_description="In the Sensor settings, the dropdown option to choose a sensor type.">
@@ -1630,18 +1610,23 @@ limitations under the License.
My Tracks total distance %1$.2f %2$s in %3$s at %4$s %5$s
</string>
<!-- Check Units -->
<string name="check_units_title"
translation_description="The title of the dialog asking the user to confirm if he wants to use
metrics as the preferred units.">
<!-- Preferred Units -->
<string name="preferred_units_title"
translation_description="The title of the dialog asking the user to choose a preferred units,
metric or imperial.">
Preferred Units
</string>
<string name="check_units_message"
translation_description="The message of the dialog asking the user to confirm if he wants to use
metrics as the preferred units.">
Do you want to use metrics as the preferred units?
<string name="preferred_units_metric"
translation_description="In the dialog asking the user to choose a preferred units, the option
to choose the metric units.">
Metric
</string>
<string name="preferred_units_imperial"
translation_description="In the dialog asking the user to choose a preferred units, the option
to choose the imperial units.">
Imperial
</string>
<!-- Sensor State page -->
<string name="sensor_data_time"
translation_description="In the 'Sensor State' page, the label for the last time the sensor has
+7 -2
View File
@@ -18,8 +18,7 @@ limitations under the License.
xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Display settings -->
<PreferenceScreen android:title="@string/settings_display"
android:key="@string/display_settings_screen_key">
<PreferenceScreen android:title="@string/settings_display">
<CheckBoxPreference
android:key="@string/metric_units_key"
android:title="@string/settings_metric_units"
@@ -144,6 +143,12 @@ limitations under the License.
android:summaryOn="@string/settings_timestamp_track_name_summary_on"
android:summaryOff="@string/settings_timestamp_track_name_summary_off"
android:defaultValue="true" />
<com.google.android.apps.mytracks.AutoCompleteTextPreference
android:key="@string/default_category_key"
android:title="@string/settings_default_category"
android:summary="@string/settings_default_category_summary"
android:defaultValue="" />
</PreferenceScreen>