karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

merge heads

Browse Source
This commit is contained in:
Jimmy Shih
2011-11-10 14:52:02 -08:00
parent f07856ecb7 4b0b519261
commit 2062ee7dfc
22 changed files with 96 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/layout/about.xml
+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>
MyTracks/res/values-ca/strings.xml
+1 -6
View File
@@ -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>
MyTracks/res/values-de/strings.xml
+1 -6
View File
@@ -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>
MyTracks/res/values-es/strings.xml
+1 -7
View File
@@ -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>
MyTracks/res/values-fi/strings.xml
+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>
MyTracks/res/values-fr/strings.xml
+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>
MyTracks/res/values-it/strings.xml
+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>
MyTracks/res/values-ja/strings.xml
+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>
MyTracks/res/values-pl/strings.xml
+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>
MyTracks/res/values-pt-rBR/strings.xml
+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>
MyTracks/res/values-ru/strings.xml
+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>
MyTracks/res/values-sv/strings.xml
-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>
MyTracks/res/values-zh-rCN/strings.xml
-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 -->
MyTracks/res/values/do_not_translate.xml
+5 -4
View File
@@ -18,9 +18,10 @@ limitations under the License.
<!-- DO NOT TRANSLATE ANY STRINGS IN THIS FILE. -->
<string name="app_name">My Tracks</string>
<string name="my_tracks_web_url">mytracks.appspot.com</string>
<!-- About Dialog -->
<string name="about_googlegroups">mytracks@googlegroups.com</string>
<string name="about_weburl">mytracks.appspot.com</string>
<string name="about_privacy_weburl">m.google.com/privacy</string>
<string name="about_copyright_message">Copyright 2009 Google Inc.</string>
<string name="about_bart">Bartłomiej Niechwiej</string>
@@ -45,9 +46,9 @@ limitations under the License.
<string name="unknown">-</string>
<!-- Send to Google URLs -->
<string name="sendtogoogle_google_fusiontables_url">google.com/fusiontables</string>
<string name="sendtogoogle_google_mymaps_url">maps.google.com</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>
<!-- ID for Google Analytics -->
<string name="google_analytics_id">UA-7222692-2</string>
MyTracks/res/values/strings.xml
+30 -25
View File
@@ -168,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
@@ -284,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. -->
MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java
+6 -7
View File
@@ -22,6 +22,7 @@ import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.io.docs.DocsHelper;
import com.google.android.apps.mytracks.io.gdata.GDataClientFactory;
import com.google.android.apps.mytracks.io.gdata.GDataWrapper;
import com.google.android.apps.mytracks.io.sendtogoogle.SendType;
import com.google.android.common.gdata.AndroidXmlParserFactory;
import com.google.android.maps.mytracks.R;
import com.google.wireless.gdata.client.GDataClient;
@@ -115,13 +116,11 @@ public class SendToDocs {
Log.d(Constants.TAG, "SendToDocs: Uploading to spreadsheet");
success = uploadToDocs(track);
if (success) {
if (createdNewSpreadSheet) {
statusMessage = activity.getString(
R.string.sending_to_docs_success_new_doc);
} else {
statusMessage = activity.getString(
R.string.sending_to_docs_success_existing_doc);
}
String format = createdNewSpreadSheet
? activity.getString(R.string.send_google_docs_new_doc_success)
: activity.getString(R.string.send_google_docs_existing_doc_success);
String url = activity.getString(SendType.DOCS.getServiceUrl());
statusMessage = String.format(format, url);
} else {
statusMessage = activity.getString(R.string.error_sending_to_docs);
}
MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
+8 -6
View File
@@ -24,6 +24,7 @@ import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.content.Waypoint;
import com.google.android.apps.mytracks.io.gdata.GDataWrapper;
import com.google.android.apps.mytracks.io.gdata.GDataWrapper.QueryFunction;
import com.google.android.apps.mytracks.io.sendtogoogle.SendType;
import com.google.android.apps.mytracks.stats.DoubleBuffer;
import com.google.android.apps.mytracks.stats.TripStatistics;
import com.google.android.apps.mytracks.util.ApiFeatures;
@@ -71,7 +72,7 @@ public class SendToFusionTables implements Runnable {
* Listener invoked when sending to fusion tables completes.
*/
public interface OnSendCompletedListener {
void onSendCompleted(String tableId, boolean success, int statusMessage);
void onSendCompleted(String tableId, boolean success, String statusMessage);
}
/** The GData service id for Fusion Tables. */
@@ -168,7 +169,7 @@ public class SendToFusionTables implements Runnable {
}
private void doUpload() {
int statusMessageId = R.string.error_sending_to_fusion_tables;
String statusMessage = context.getString(R.string.error_sending_to_fusion_tables);
boolean success = true;
try {
progressIndicator.setProgressValue(PROGRESS_INITIALIZATION);
@@ -205,17 +206,18 @@ public class SendToFusionTables implements Runnable {
return;
}
statusMessageId = R.string.sending_to_fusion_tables_success;
String format = context.getString(R.string.send_google_fusion_tables_success);
String url = context.getString(SendType.FUSION_TABLES.getServiceUrl());
statusMessage = String.format(format, url);
Log.d(Constants.TAG, "SendToFusionTables: Done: " + success);
progressIndicator.setProgressValue(PROGRESS_COMPLETE);
} finally {
final boolean finalSuccess = success;
final int finalStatusMessageId = statusMessageId;
final String finalStatusMessage = statusMessage;
context.runOnUiThread(new Runnable() {
public void run() {
if (onCompletion != null) {
onCompletion.onSendCompleted(
tableId, finalSuccess, finalStatusMessageId);
onCompletion.onSendCompleted(tableId, finalSuccess, finalStatusMessage);
}
}
});
MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java
+10 -8
View File
@@ -23,6 +23,7 @@ import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.content.Waypoint;
import com.google.android.apps.mytracks.io.mymaps.MapsFacade;
import com.google.android.apps.mytracks.io.sendtogoogle.SendType;
import com.google.android.apps.mytracks.stats.DoubleBuffer;
import com.google.android.apps.mytracks.stats.TripStatistics;
import com.google.android.apps.mytracks.util.LocationUtils;
@@ -75,7 +76,7 @@ public class SendToMyMaps implements Runnable {
private int totalSegmentsUploaded;
public interface OnSendCompletedListener {
void onSendCompleted(String mapId, boolean success, int statusMessage);
void onSendCompleted(String mapId, boolean success, String statusMessage);
}
public SendToMyMaps(Activity context, String mapId, AuthManager auth,
@@ -98,7 +99,7 @@ public class SendToMyMaps implements Runnable {
}
private void doUpload() {
int statusMessageId = R.string.error_sending_to_my_maps;
String statusMessage = context.getString(R.string.error_sending_to_my_maps);
boolean success = true;
try {
progressIndicator.setProgressMessage(
@@ -173,9 +174,11 @@ public class SendToMyMaps implements Runnable {
}
if (success) {
statusMessageId = isNewMap
? R.string.sending_to_my_maps_success_new_map
: R.string.sending_to_my_maps_success_existing_map;
String format = isNewMap
? context.getString(R.string.send_google_my_maps_new_map_success)
: context.getString(R.string.send_google_my_maps_existing_map_success);
String url = context.getString(SendType.MYMAPS.getServiceUrl());
statusMessage = String.format(format, url);
}
Log.d(TAG, "SendToMyMaps: Done: " + success);
progressIndicator.setProgressValue(100);
@@ -185,12 +188,11 @@ public class SendToMyMaps implements Runnable {
}
final boolean finalSuccess = success;
final int finalStatusMessageId = statusMessageId;
final String finalStatusMessage = statusMessage;
context.runOnUiThread(new Runnable() {
public void run() {
if (onCompletion != null) {
onCompletion.onSendCompleted(
mapId, finalSuccess, finalStatusMessageId);
onCompletion.onSendCompleted(mapId, finalSuccess, finalStatusMessage);
}
}
});
MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java
+2 -1
View File
@@ -3,6 +3,7 @@ package com.google.android.apps.mytracks.io.mymaps;
import com.google.android.apps.mytracks.content.Waypoint;
import com.google.android.apps.mytracks.io.AuthManager;
import com.google.android.apps.mytracks.util.StringUtils;
import com.google.android.maps.GeoPoint;
import com.google.android.maps.mytracks.R;
import com.google.wireless.gdata.client.HttpException;
@@ -119,7 +120,7 @@ public class MapsFacade {
MyMapsMapMetadata metaData = new MyMapsMapMetadata();
metaData.setTitle(title);
metaData.setDescription(description + " - "
+ category + " - " + context.getString(R.string.send_to_google_by_mytracks));
+ category + " - " + StringUtils.getCreatedByMyTracks(context, false));
metaData.setSearchable(isPublic);
Entry entry = MyMapsGDataConverter.getMapEntryForMetadata(metaData);
Log.d(MyMapsConstants.TAG, "Title: " + entry.getTitle());
MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
+4 -5
View File
@@ -429,9 +429,9 @@ public class SendActivity extends Activity implements ProgressIndicator {
SendToMyMaps.OnSendCompletedListener onCompletion = new SendToMyMaps.OnSendCompletedListener() {
@Override
public void onSendCompleted(String mapId, boolean success, int statusMessage) {
public void onSendCompleted(String mapId, boolean success, String statusMessage) {
// TODO: Use this message
sendToMyMapsMessage = getString(statusMessage);
sendToMyMapsMessage = statusMessage;
sendToMyMapsSuccess = success;
if (sendToMyMapsSuccess) {
sendToMyMapsMapId = mapId;
@@ -491,10 +491,9 @@ public class SendActivity extends Activity implements ProgressIndicator {
OnSendCompletedListener onCompletion = new OnSendCompletedListener() {
@Override
public void onSendCompleted(String tableId, boolean success,
int statusMessage) {
public void onSendCompleted(String tableId, boolean success, String statusMessage) {
// TODO: Use this message
sendToFusionTablesMessage = getString(statusMessage);
sendToFusionTablesMessage = statusMessage;
sendToFusionTablesSuccess = success;
if (sendToFusionTablesSuccess) {
sendToFusionTablesTableId = tableId;
MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendType.java
+3 -3
View File
@@ -24,11 +24,11 @@ import com.google.android.maps.mytracks.R;
*/
public enum SendType {
MYMAPS(R.string.sendtogoogle_google_mymaps,
R.string.sendtogoogle_google_mymaps_url),
R.string.send_google_my_maps_url),
FUSION_TABLES(R.string.sendtogoogle_google_fusiontables,
R.string.sendtogoogle_google_fusiontables_url),
R.string.send_google_fusion_tables_url),
DOCS(R.string.sendtogoogle_google_docs,
R.string.sendtogoogle_google_docs_url);
R.string.send_google_docs_url);
private int serviceName;
private int serviceUrl;
MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
+17 -1
View File
@@ -303,7 +303,7 @@ public class StringUtils implements DescriptionGenerator {
+ "<img border=\"0\" src=\"%s\"/>",
// Line 1
context.getString(R.string.send_to_google_by_mytracks),
getCreatedByMyTracks(context, true),
// Line 2
context.getString(R.string.total_distance_label),
@@ -353,6 +353,22 @@ public class StringUtils implements DescriptionGenerator {
ChartURLGenerator.getChartUrl(distances, elevations, track, context));
}
/**
* Returns the 'Created by My Tracks on Android' string.
*
* @param context the context
* @param addLink true to add a link to the My Tracks web site
*/
public static String getCreatedByMyTracks(Context context, boolean addLink) {
String format = context.getString(R.string.send_google_by_my_tracks);
if (addLink) {
String url = context.getString(R.string.my_tracks_web_url);
return String.format(format, "<a href='http://" + url + "'>", "</a>");
} else {
return String.format(format, "", "");
}
}
private String getSpeedString(double speed, int speedLabel, int paceLabel,
boolean displaySpeed) {
double speedInKph = speed * 3.6;