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 15:53:49 -08:00
parent 9f05d8d8d9
commit f19482985d
24 changed files with 132 additions and 112 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
-5
View File
@@ -81,7 +81,6 @@ limitations under the License.
<string name="sd_card_error_write_file">No es pot escriure a un fitxer.</string>
<string name="sd_card_success_read_file">S\'ha finalitzat la lectura a la targeta SD.</string>
<string name="sd_card_success_write_file">S\'ha finalitzat l\'escriptura a la targeta SD.</string>
<string name="send_google_by_my_tracks">Creat per &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; a l\'Android.</string>
<string name="send_google_choose_account">Trieu un compte</string>
<string name="send_google_error">S\'ha produït un error. Proveu de nou.</string>
<string name="send_google_error_docs">S\'ha prdouït un error quan s\'enviava la ruta a Google Docs. Proveu més tard.</string>
@@ -98,10 +97,6 @@ limitations under the License.
<string name="send_google_recorded">Enregistrat</string>
<string name="send_google_result_share_url">Comparteix la ruta amb amics</string>
<string name="send_google_send_now">Envia ara</string>
<string name="send_google_success_existing_doc">S\'ha enviat la ruta a docs.google.com.</string>
<string name="send_google_success_existing_map">S\'ha enviat la ruta a maps.google.com.</string>
<string name="send_google_success_fusion_tables">S\'ha creat un Google Fusion Table nou a google.com/fusiontables.</string>
<string name="send_google_success_new_doc">S\'ha enviat la ruta a un full de càlcul a docs.google.com.</string>
<string name="send_google_title">Envia a...</string>
<string name="send_google_track_part_label">(Part %d)</string>
<string name="sensor_state_cadence">Cadència</string>
MyTracks/res/values-de/strings.xml
-5
View File
@@ -84,7 +84,6 @@ limitations under the License.
<string name="sd_card_error_write_file">Die Datei kann nicht geschrieben werden.</string>
<string name="sd_card_success_read_file">Lesen von der SD-Karte beendet.</string>
<string name="sd_card_success_write_file">Der Track wurde auf die SD-Karte geschrieben.</string>
<string name="send_google_by_my_tracks">Erstellt von &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; für Android.</string>
<string name="send_google_choose_account">Wähle ein Konto</string>
<string name="send_google_docs">Google Text &amp; Tabellen</string>
<string name="send_google_error">Ein Fehler ist aufgetreten. Bitte versuche es noch einmal.</string>
@@ -102,10 +101,6 @@ limitations under the License.
<string name="send_google_recorded">Aufgezeichnet am</string>
<string name="send_google_result_share_url">Track mit Freunden teilen</string>
<string name="send_google_send_now">Jetzt senden</string>
<string name="send_google_success_existing_doc">Dein Track wurde an docs.google.com gesendet.</string>
<string name="send_google_success_existing_map">Dein Track wurde auf maps.google.com gespeichert.</string>
<string name="send_google_success_fusion_tables">Eine neue Tabelle wurde auf google.com/fusiontables erstellt.</string>
<string name="send_google_success_new_doc">Dein Track wurde in einer neuen Tabelle bei docs.google.com gespeichert.</string>
<string name="send_google_title">Senden an…</string>
<string name="send_google_track_part_label">(Teil %d)</string>
<string name="sensor_state_battery">Akkukapazität</string>
MyTracks/res/values-es/strings.xml
-6
View File
@@ -94,7 +94,6 @@ limitations under the License.
<string name="sd_card_error_write_file">No es posible escribir al archivo.</string>
<string name="sd_card_success_read_file">Lectura de tarjeta SD concluída.</string>
<string name="sd_card_success_write_file">Grabación a tarjeta SD concluída.</string>
<string name="send_google_by_my_tracks">Creado por &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; en Android.</string>
<string name="send_google_choose_account">Elija una cuenta</string>
<string name="send_google_error">A ocurrido un error. Por favor, inténtelo de nuevo.</string>
<string name="send_google_error_docs">Se produjo un error al enviar su recorrido a Google Docs.</string>
@@ -120,12 +119,7 @@ limitations under the License.
<string name="send_google_result_share_url">Compartir recorrido</string>
<string name="send_google_result_title">Estado del envío:</string>
<string name="send_google_send_now">Enviar ahora</string>
<string name="send_google_success_existing_doc">Su recorrido ha sido enviado a docs.google.com.</string>
<string name="send_google_success_existing_map">Su recorrido ha sido enviado a maps.google.com.</string>
<string name="send_google_success_footer">Es posible que pasen unos minutos hasta que los nuevos recorridos aparezcan.</string>
<string name="send_google_success_fusion_tables">Una nueva tabla de Google Fusion ha sido creada en google.com/fusiontables.</string>
<string name="send_google_success_new_doc">Su recorrido ha sido enviado a una nueva hoja de cálculo de docs.google.com.</string>
<string name="send_google_success_new_map">Un nuevo sitio ha sido añadido en maps.google.com.</string>
<string name="send_google_title">Enviar a...</string>
<string name="send_google_track_part_label">"(Parte %d)"</string>
<string name="sensor_state_battery">Nivel de batería</string>
MyTracks/res/values-fi/strings.xml
-6
View File
@@ -97,7 +97,6 @@ limitations under the License.
<string name="sd_card_error_write_file">Kirjoitusvirhe.</string>
<string name="sd_card_success_read_file">SD-kortin luku valmis.</string>
<string name="sd_card_success_write_file">SD-kortille kirjoitus valmis.</string>
<string name="send_google_by_my_tracks">Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; on Android.</string>
<string name="send_google_choose_account">Valitse tili</string>
<string name="send_google_docs">Google Docs</string>
<string name="send_google_error_docs">Virhe lähetettäessä reittiä Google Docs-palveluun..</string>
@@ -123,12 +122,7 @@ limitations under the License.
<string name="send_google_result_share_url">Jaa reitti</string>
<string name="send_google_result_title">Lähetyksen tila:</string>
<string name="send_google_send_now">Lähetä</string>
<string name="send_google_success_existing_doc">Reittisi on lähetetty osoitteeseen docs.google.com.</string>
<string name="send_google_success_existing_map">Reittisi on lähetetty osoitteeseen maps.google.com.</string>
<string name="send_google_success_footer">Reitin näkyminen saattaa kestää muutaman minuutin.</string>
<string name="send_google_success_fusion_tables">Uusi Google Fusion taulukko on luotu osoitteeseen google.com/fusiontables.</string>
<string name="send_google_success_new_doc">Reittisi on luotu taulukoksi osoitteeseen docs.google.com.</string>
<string name="send_google_success_new_map">Uusi Google My Map on luotu osoitteeseen maps.google.com.</string>
<string name="send_google_title">Lähetä...</string>
<string name="send_google_track_part_label">(Osa %d)</string>
<string name="sensor_state_battery">Akku</string>
MyTracks/res/values-fr/strings.xml
-5
View File
@@ -79,7 +79,6 @@ limitations under the License.
<string name="sd_card_error_no_storage">Aucun emplacement externe de sauvegarde n\'a été trouvé. Assurez-vous qu\'une carte SD est insérée et que votre téléphone n\'est pas relié à un ordinateur.</string>
<string name="sd_card_error_write_file">Impossible d\'écrire dans le fichier.</string>
<string name="sd_card_success_write_file">Parcours enregistré sur la carte SD.</string>
<string name="send_google_by_my_tracks">Créée par &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; sous Android.</string>
<string name="send_google_choose_account">Choisissez un compte</string>
<string name="send_google_error_docs">Il y a eu une erreur lors de l\'envoi de votre parcours à Google Docs. Réessayez plus tard SVP.</string>
<string name="send_google_error_fusion_tables">Il y a eu une erreur lors de l\'envoi de votre parcours à Google Fusion Tables. Réessayez plus tard SVP.</string>
@@ -95,10 +94,6 @@ limitations under the License.
<string name="send_google_recorded">Enregistré</string>
<string name="send_google_result_share_url">Partager des parcours.</string>
<string name="send_google_send_now">Envoyer maintenant</string>
<string name="send_google_success_existing_doc">Votre parcours a été envoyé à docs.google.com.</string>
<string name="send_google_success_existing_map">Votre parcours a été envoyé à maps.google.com.</string>
<string name="send_google_success_fusion_tables">Une nouvelle table Google Fusion vient d\'être créée sur google.com/fusiontables.</string>
<string name="send_google_success_new_doc">Votre parcours a été envoyé dans un tableur à docs.google.com.</string>
<string name="send_google_title">Envoyer à</string>
<string name="send_google_track_part_label">(Portion %d)</string>
<string name="sensor_state_cadence">Cadence</string>
MyTracks/res/values-it/strings.xml
-4
View File
@@ -77,7 +77,6 @@ limitations under the License.
<string name="sd_card_error_no_storage">Nessuna memoria esterna trovata. Assicurati che la scheda SD sia inserita e che il telefono no sia montato su un computer.</string>
<string name="sd_card_error_write_file">Impossibile scrivere su file.</string>
<string name="sd_card_success_write_file">Finito di salvare il percorso sulla scheda SD.</string>
<string name="send_google_by_my_tracks">Creato da &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; su Android.</string>
<string name="send_google_choose_account">Scegli un account</string>
<string name="send_google_docs">Google Docs</string>
<string name="send_google_error_docs">Si è verificato un errore nell\'invio del percorso a Google Docs. Per favore riporva più tardi.</string>
@@ -91,9 +90,6 @@ limitations under the License.
<string name="send_google_recorded">Registrato</string>
<string name="send_google_result_share_url">Condividi il percorso con amici</string>
<string name="send_google_send_now">Invia adesso</string>
<string name="send_google_success_existing_doc">Il tuo percorso è stato inviato a docs.google.com.</string>
<string name="send_google_success_existing_map">Il tuo percorso è stato inviato a maps.google.com.</string>
<string name="send_google_success_new_doc">Il tuo percorso è stato inviato ad un nuovo foglio di calcolo su docs.google.com.</string>
<string name="send_google_title">Invia a...</string>
<string name="send_google_track_part_label">(Parte %d)</string>
<string name="settings_display">Visualizzazione</string>
MyTracks/res/values-ja/strings.xml
-6
View File
@@ -95,7 +95,6 @@ limitations under the License.
<string name="sd_card_error_write_file">ファイルへの書き込みができません．</string>
<string name="sd_card_success_read_file">SDカードからの読み込み終了．</string>
<string name="sd_card_success_write_file">SDカードへの書き込み終了．</string>
<string name="send_google_by_my_tracks">Android用&lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt;で作成しました．</string>
<string name="send_google_choose_account">アカウント選択</string>
<string name="send_google_error_docs">Google Docsへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
<string name="send_google_error_fusion_tables">Google Fusion Tablesへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
@@ -118,12 +117,7 @@ limitations under the License.
<string name="send_google_recorded">記録日</string>
<string name="send_google_result_share_url">トラック共有</string>
<string name="send_google_send_now">今すぐ送信</string>
<string name="send_google_success_existing_doc">トラックをdocs.google.comに送信しました．</string>
<string name="send_google_success_existing_map">トラックをmaps.google.comに送信しました．</string>
<string name="send_google_success_footer">新しいトラックが表示されるまでに数分かかることがあります．</string>
<string name="send_google_success_fusion_tables">新しいGoogle Fusion Tableをgoogle.com/fusiontablesに作成しました．</string>
<string name="send_google_success_new_doc">トラックをdocs.google.comの新しいスプレッドシートに送信しました．</string>
<string name="send_google_success_new_map">新しいマイマップをmap.google.comに作成しました．</string>
<string name="send_google_title">送信...</string>
<string name="send_google_track_part_label">(パート %d)</string>
<string name="sensor_state_cadence">ケイデンス</string>
MyTracks/res/values-pl/strings.xml
-4
View File
@@ -80,7 +80,6 @@ limitations under the License.
<string name="sd_card_error_write_file">Nie można zapisać pliku.</string>
<string name="sd_card_success_read_file">Zakończono odczytywanie z karty SD.</string>
<string name="sd_card_success_write_file">Zakończono zapisywanie na karcie SD.</string>
<string name="send_google_by_my_tracks">Utworzona przez &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; na Android.</string>
<string name="send_google_choose_account">Wybierz konto</string>
<string name="send_google_docs">Dokumenty Google</string>
<string name="send_google_error_docs">Podczas przesyłania pliku do Dokumentów Google pojawił się błąd. Spróbuj ponownie później.</string>
@@ -94,9 +93,6 @@ limitations under the License.
<string name="send_google_recorded">Zapisana</string>
<string name="send_google_result_share_url">Podziel się trasą z przyjaciółmi</string>
<string name="send_google_send_now">Wyślij teraz</string>
<string name="send_google_success_existing_doc">Twoja trasa została wysłana do docs.google.com.</string>
<string name="send_google_success_existing_map">Twoja trasa został wysłana do maps.google.com.</string>
<string name="send_google_success_new_doc">Twoja trasa została wysłana do nowego arkusza na docs.google.com.</string>
<string name="send_google_title">Wyślij do...</string>
<string name="send_google_track_part_label">(Część %d)</string>
<string name="sensor_state_connected">Podłączony</string>
MyTracks/res/values-pt-rBR/strings.xml
-5
View File
@@ -75,7 +75,6 @@ limitations under the License.
<string name="sd_card_error_no_storage">Nenhum armazenamento externo foi encontrado. Assegure-se de que um cartão SD esteja inserido e que seu telefone não esteja montado em um computador.</string>
<string name="sd_card_error_write_file">Impossível gravar arquivo.</string>
<string name="sd_card_success_write_file">Gravação no cartão SD concluída.</string>
<string name="send_google_by_my_tracks">"Criado por &lt;a href='http://mytracks.appspot.com'&gt;My Tracks&lt;/a&gt; no Android.</string>
<string name="send_google_choose_account">Escolher conta</string>
<string name="send_google_docs">Google Docs</string>
<string name="send_google_error_docs">Ocorreu um erro ao enviar seu caminho para o Google Docs. Por favor tente novamente mais tarde.</string>
@@ -92,10 +91,6 @@ limitations under the License.
<string name="send_google_recorded">Gravado</string>
<string name="send_google_result_share_url">Compartilhar caminho com amigos</string>
<string name="send_google_send_now">Enviar agora</string>
<string name="send_google_success_existing_doc">Seu caminho foi enviado para docs.google.com.</string>
<string name="send_google_success_existing_map">Seu caminho foi enviado para maps.google.com.</string>
<string name="send_google_success_fusion_tables">Uma nova Fusion Table Google foi criada em google.com/fusiontables.</string>
<string name="send_google_success_new_doc">Seu caminho foi enviado para uma nova planilha em docs.google.com.</string>
<string name="send_google_title">Enviar para...</string>
<string name="send_google_track_part_label">"(Parte %d)</string>
<string name="settings_display">Exibição</string>
MyTracks/res/values-ru/strings.xml
-6
View File
@@ -96,7 +96,6 @@ limitations under the License.
<string name="sd_card_error_write_file">Невозможно записать файл.</string>
<string name="sd_card_success_read_file">Чтение с SD карты закончено.</string>
<string name="sd_card_success_write_file">Запись на SD карту закончена.</string>
<string name="send_google_by_my_tracks">Создано &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; на Android.</string>
<string name="send_google_choose_account">Выбор учетной записи</string>
<string name="send_google_docs">Google Документы</string>
<string name="send_google_error_docs">Ошибка при отправке вашего трека в Google Документы.</string>
@@ -122,12 +121,7 @@ limitations under the License.
<string name="send_google_result_share_url">Поделиться треком</string>
<string name="send_google_result_title">Статус загрузки:</string>
<string name="send_google_send_now">Отправить</string>
<string name="send_google_success_existing_doc">Ваш трек был отправлен в docs.google.com.</string>
<string name="send_google_success_existing_map">Твой трек был отправлен на maps.google.com.</string>
<string name="send_google_success_footer">Это может занять несколько минут, прежде чем появятся новые треки.</string>
<string name="send_google_success_fusion_tables">Новая таблица Google Fusion была создана на google.com/fusiontables.</string>
<string name="send_google_success_new_doc">Ваш трек был отправлен в новую электронную таблицу на docs.google.com.</string>
<string name="send_google_success_new_map">Новая Google \"Мои карты\" была создана на maps.google.com.</string>
<string name="send_google_title">Отправить...</string>
<string name="send_google_track_part_label">(Часть %d)</string>
<string name="sensor_state_cadence">Каденс</string>
MyTracks/res/values-sv/strings.xml
-4
View File
@@ -77,7 +77,6 @@ limitations under the License.
<string name="sd_card_error_no_storage">Ingen extern lagring hittades. Se till att ett SD-kort sitter i och att telefonen inte är monterad till en dator.</string>
<string name="sd_card_error_write_file">Kan inte skriva till filen.</string>
<string name="sd_card_success_write_file">Slutförde skrivningen av spåret till SD-kort.</string>
<string name="send_google_by_my_tracks">Skapad av &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; på Android.</string>
<string name="send_google_choose_account">Välj konto</string>
<string name="send_google_docs">Google Dokument</string>
<string name="send_google_error_docs">Det uppstod ett fel i sändningen av ditt spår till Google Dokument. Försök igen senare.</string>
@@ -91,9 +90,6 @@ limitations under the License.
<string name="send_google_recorded">Inspelad</string>
<string name="send_google_result_share_url">Dela spår med vänner</string>
<string name="send_google_send_now">Skicka nu</string>
<string name="send_google_success_existing_doc">Ditt spår har skickats till docs.google.com.</string>
<string name="send_google_success_existing_map">Ditt spår har skickats till maps.google.com.</string>
<string name="send_google_success_new_doc">Ditt spår har skickats till ett nytt kalkylblad på docs.google.com.</string>
<string name="send_google_title">Skicka till...</string>
<string name="send_google_track_part_label">(Del %d)</string>
<string name="settings_display">Visning</string>
MyTracks/res/values-zh-rCN/strings.xml
-6
View File
@@ -90,7 +90,6 @@ limitations under the License.
<string name="sd_card_error_write_file">无法写入文件.</string>
<string name="sd_card_success_read_file">从 SD 存储卡读取完毕.</string>
<string name="sd_card_success_write_file">轨迹已导出到 SD 存储卡.</string>
<string name="send_google_by_my_tracks">由 Android 上的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 创建.</string>
<string name="send_google_choose_account">选择帐户</string>
<string name="send_google_error_docs">发送轨迹到 Google Docs 时发生错误. 请稍后重试.</string>
<string name="send_google_error_fusion_tables">发送轨迹到 Google Fusion Tables 时发生错误. 请稍后重试.</string>
@@ -111,12 +110,7 @@ limitations under the License.
<string name="send_google_result_share_url">分享轨迹</string>
<string name="send_google_result_title">上传状态:</string>
<string name="send_google_send_now">立即发送</string>
<string name="send_google_success_existing_doc">你的轨迹已经发送到 docs.google.com.</string>
<string name="send_google_success_existing_map">你的轨迹已经发送到 maps.google.com.</string>
<string name="send_google_success_footer">可能需要等待几分钟才能看见新的轨迹.</string>
<string name="send_google_success_fusion_tables">已在 google.com/fusiontables 创建新 Google Fusion Table.</string>
<string name="send_google_success_new_doc">你的轨迹已经作为新的电子表格发送到 docs.google.com.</string>
<string name="send_google_success_new_map">已在 maps.google.com 创建了新的 Google My Map.</string>
<string name="send_google_title">发送到...</string>
<string name="send_google_track_part_label">(第 %d 部分)</string>
<string name="sensor_state_cadence">节奏</string>
MyTracks/res/values/do_not_translate.xml
+5 -4
View File
@@ -19,9 +19,10 @@ limitations under the License.
<string name="app_name">My Tracks</string>
<string name="track_recording_service_name">Track Recording Service</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>
@@ -46,9 +47,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
+19 -13
View File
@@ -455,9 +455,10 @@ limitations under the License.
<!-- Send Google -->
<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 containing 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>
<string name="send_google_choose_account"
translation_description="When sending to Google, the dialog title to choose a Google account.">
@@ -590,13 +591,15 @@ limitations under the License.
</string>
<string name="send_google_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.
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="send_google_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.
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="send_google_success_footer"
translation_description="When sending a track to Google, the additional comment on the bottom of
@@ -605,18 +608,21 @@ limitations under the License.
</string>
<string name="send_google_success_fusion_tables"
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="send_google_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.
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="send_google_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.
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>
<string name="send_google_title"
translation_description="When sending a track to Google, the dialog title to choose the Google
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.send_google_success_new_doc);
} else {
statusMessage = activity.getString(
R.string.send_google_success_existing_doc);
}
String format = createdNewSpreadSheet
? activity.getString(R.string.send_google_success_new_doc)
: activity.getString(R.string.send_google_success_existing_doc);
String url = activity.getString(SendType.DOCS.getServiceUrl());
statusMessage = String.format(format, url);
} else {
statusMessage = activity.getString(R.string.send_google_error_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.send_google_error_fusion_tables;
String statusMessage = context.getString(R.string.send_google_error_fusion_tables);
boolean success = true;
try {
progressIndicator.setProgressValue(PROGRESS_INITIALIZATION);
@@ -205,17 +206,18 @@ public class SendToFusionTables implements Runnable {
return;
}
statusMessageId = R.string.send_google_success_fusion_tables;
String format = context.getString(R.string.send_google_success_fusion_tables);
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.send_google_error_my_maps;
String statusMessage = context.getString(R.string.send_google_error_my_maps);
boolean success = true;
try {
progressIndicator.setProgressMessage(R.string.send_google_progress_reading_track);
@@ -171,9 +172,11 @@ public class SendToMyMaps implements Runnable {
}
if (success) {
statusMessageId = isNewMap
? R.string.send_google_success_new_map
: R.string.send_google_success_existing_map;
String format = isNewMap
? context.getString(R.string.send_google_success_new_map)
: context.getString(R.string.send_google_success_existing_map);
String url = context.getString(SendType.MYMAPS.getServiceUrl());
statusMessage = String.format(format, url);
}
Log.d(TAG, "SendToMyMaps: Done: " + success);
progressIndicator.setProgressValue(100);
@@ -183,12 +186,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_google_by_my_tracks));
+ 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
@@ -428,9 +428,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;
@@ -489,10 +489,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.send_google_my_maps,
R.string.sendtogoogle_google_mymaps_url),
R.string.send_google_my_maps_url),
FUSION_TABLES(R.string.send_google_fusion_tables,
R.string.sendtogoogle_google_fusiontables_url),
R.string.send_google_fusion_tables_url),
DOCS(R.string.send_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/services/tasks/StatusAnnouncerTask.java
+5 -1
View File
@@ -24,6 +24,7 @@ import com.google.android.apps.mytracks.stats.TripStatistics;
import com.google.android.apps.mytracks.util.StringUtils;
import com.google.android.apps.mytracks.util.UnitConversions;
import com.google.android.maps.mytracks.R;
import com.google.common.annotations.VisibleForTesting;
import android.content.Context;
import android.content.SharedPreferences;
@@ -327,7 +328,8 @@ public class StatusAnnouncerTask implements PeriodicTask {
*
* @param time the time
*/
private String getAnnounceTime(long time) {
@VisibleForTesting
String getAnnounceTime(long time) {
int[] parts = StringUtils.getTimeParts(time);
String secLabel =
context.getString(parts[0] == 1 ? R.string.voice_second : R.string.voice_seconds);
@@ -343,6 +345,7 @@ public class StatusAnnouncerTask implements PeriodicTask {
sb.append(hourLabel);
sb.append(" ");
sb.append(parts[1]);
sb.append(" ");
sb.append(minLabel);
} else {
sb.append(parts[1]);
@@ -350,6 +353,7 @@ public class StatusAnnouncerTask implements PeriodicTask {
sb.append(minLabel);
sb.append(" ");
sb.append(parts[0]);
sb.append(" ");
sb.append(secLabel);
}
return sb.toString();
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_google_by_my_tracks),
getCreatedByMyTracks(context, true),
// Line 2
context.getString(R.string.stat_total_distance),
@@ -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;
MyTracksTest/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTaskTest.java
+52
View File
@@ -478,7 +478,59 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
task.runWithStatistics(null);
AndroidMock.verify(mockTask, tts);
}
/**
* Tests {@link StatusAnnouncerTask#getAnnounceTime(long)} with time zero.
*/
public void testGetAnnounceTime_time_zero() {
long time = 0; // 0 seconds
assertEquals("0 minutes 0 seconds", task.getAnnounceTime(time));
}
/**
* Tests {@link StatusAnnouncerTask#getAnnounceTime(long)} with time one.
*/
public void testGetAnnounceTime_time_one() {
long time = 1 * 1000; // 1 second
assertEquals("0 minutes 1 second", task.getAnnounceTime(time));
}
/**
* Tests {@link StatusAnnouncerTask#getAnnounceTime(long)} with singular
* numbers with the hour unit.
*/
public void testGetAnnounceTime_singular_has_hour() {
long time = (1 * 60 * 60 * 1000) + (1 * 60 * 1000) + (1 * 1000); // 1 hour 1 minute 1 second
assertEquals("1 hour 1 minute", task.getAnnounceTime(time));
}
/**
* Tests {@link StatusAnnouncerTask#getAnnounceTime(long)} with plural numbers
* with the hour unit.
*/
public void testGetAnnounceTime_plural_has_hour() {
long time = (2 * 60 * 60 * 1000) + (2 * 60 * 1000) + (2 * 1000); // 2 hours 2 minutes 2 seconds
assertEquals("2 hours 2 minutes", task.getAnnounceTime(time));
}
/**
* Tests {@link StatusAnnouncerTask#getAnnounceTime(long)} with singular
* numbers without the hour unit.
*/
public void testGetAnnounceTime_singular_no_hour() {
long time = (1 * 60 * 1000) + (1 * 1000); // 1 minute 1 second
assertEquals("1 minute 1 second", task.getAnnounceTime(time));
}
/**
* Tests {@link StatusAnnouncerTask#getAnnounceTime(long)} with plural numbers
* without the hour unit.
*/
public void testGetAnnounceTime_plural_no_hour() {
long time = (2 * 60 * 1000) + (2 * 1000); // 2 minutes 2 seconds
assertEquals("2 minutes 2 seconds", task.getAnnounceTime(time));
}
private void startTask(int state) {
AndroidMock.resetToNice(tts);
AndroidMock.replay(tts);