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

Reducing the number of strings by removing strings specific to

Browse Source 
a Google service.
This commit is contained in:
Jimmy Shih
2011-11-11 17:33:05 -08:00
parent 52eb7bffb6
commit 89fb6f6bd8
18 changed files with 85 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/values-ca/strings.xml
-7
View File
@@ -83,17 +83,10 @@ limitations under the License.
<string name="sd_card_success_write_file">S\'ha finalitzat l\'escriptura a la targeta SD.</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>
<string name="send_google_error_fusion_tables">S\'ha produït un error quan s\'enviava la ruta a Google Fusion Tables. Proveu més tard.</string>
<string name="send_google_no_account">No s\'ha trobat cap compte</string>
<string name="send_google_no_account_message">No s\'ha trobat cap compte on pujar les rutes.</string>
<string name="send_google_progress_auth_docs">S\'està autenticant a Google Docs...</string>
<string name="send_google_progress_auth_fusion_tables">S\'està to Google Fusion Tables...</string>
<string name="send_google_progress_creating_fusion_table">S\'està creant un Fusion Table nou...</string>
<string name="send_google_progress_preparing_track">S\'està preparant la ruta...</string>
<string name="send_google_progress_reading_track">S\'està llegint la ruta...</string>
<string name="send_google_progress_sending_docs">S\'està enviant la ruta a Google Docs...</string>
<string name="send_google_progress_sending_fusion_tables">S\'està enviant a Google Fusion Tables...</string>
<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>
MyTracks/res/values-de/strings.xml
-7
View File
@@ -87,17 +87,10 @@ limitations under the License.
<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>
<string name="send_google_error_docs">Beim Senden des Tracks an Google Text &amp; Tabellen ist ein Fehler aufgetreten. Bitte versuche es später noch einmal.</string>
<string name="send_google_error_fusion_tables">Beim Senden des Tracks an Google Fusion Tables ist ein Fehler aufgetreten. Bitte versuche es später noch einmal.</string>
<string name="send_google_no_account">Kein Konto vorhanden</string>
<string name="send_google_no_account_message">Kein Konto gefunden, um Tracks zu versenden.</string>
<string name="send_google_progress_auth_docs">Anmeldung bei Google Text &amp; Tabellen...</string>
<string name="send_google_progress_auth_fusion_tables">Anmeldung bei Google Fusion Tables...</string>
<string name="send_google_progress_creating_fusion_table">Neue \'Fusion Tabelle\' wird erstellt...</string>
<string name="send_google_progress_preparing_track">Bereite Track vor...</string>
<string name="send_google_progress_reading_track">Lese Track...</string>
<string name="send_google_progress_sending_docs">Track wird an Google Text &amp; Tabellen gesendet...</string>
<string name="send_google_progress_sending_fusion_tables">Track wird an Google Fusion Tables gesendet...</string>
<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>
MyTracks/res/values-es/strings.xml
-11
View File
@@ -96,25 +96,14 @@ limitations under the License.
<string name="sd_card_success_write_file">Grabación a tarjeta SD concluída.</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>
<string name="send_google_error_fusion_tables">Se produjo un error al enviar su recorrido a Google Fusion Tables.</string>
<string name="send_google_error_my_maps">Se produjo un error al enviar su recorrido a Google Mis Sitios.</string>
<string name="send_google_existing_map">Elegir un mapa existente</string>
<string name="send_google_fusion_tables">Tablas Google Fusion</string>
<string name="send_google_my_maps">Mis Sitios Google</string>
<string name="send_google_new_map">Crear nuevo mapa</string>
<string name="send_google_no_account">Cuenta no encontrada</string>
<string name="send_google_no_account_message">No se encontro la cuenta a la que subir las rutas.</string>
<string name="send_google_progress_auth_docs">Autenticando con Google Docs...</string>
<string name="send_google_progress_auth_fusion_tables">Autenticando con Google Fusion Tables...</string>
<string name="send_google_progress_auth_my_maps">Autenticando con Google Maps...</string>
<string name="send_google_progress_creating_fusion_table">Creando nuevo mapa Fusion Tables...</string>
<string name="send_google_progress_creating_map">Creando nuevo Sitio...</string>
<string name="send_google_progress_preparing_track">Preparando recorrido...</string>
<string name="send_google_progress_reading_track">Leyendo recorrido...</string>
<string name="send_google_progress_sending_docs">Enviando recorrido a Google Docs...</string>
<string name="send_google_progress_sending_fusion_tables">Enviando recorrido a Google Fusion Tables...</string>
<string name="send_google_progress_sending_my_maps">Enviando recorrido a Google Maps...</string>
<string name="send_google_recorded">Grabado</string>
<string name="send_google_result_share_url">Compartir recorrido</string>
<string name="send_google_result_title">Estado del envío:</string>
MyTracks/res/values-fi/strings.xml
-11
View File
@@ -99,25 +99,14 @@ limitations under the License.
<string name="sd_card_success_write_file">SD-kortille kirjoitus valmis.</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>
<string name="send_google_error_fusion_tables">Virhe lähetettäessä reittiä Google Fusion Tables-palveluun.</string>
<string name="send_google_error_my_maps">Virhe lähetettäessä reittiä Google My Maps-palveluun.</string>
<string name="send_google_existing_map">Valitse kartta</string>
<string name="send_google_fusion_tables">Google Fusion Tables</string>
<string name="send_google_my_maps">Google My Maps</string>
<string name="send_google_new_map">Luo uusi kartta</string>
<string name="send_google_no_account">Tiliä ei löytynyt</string>
<string name="send_google_no_account_message">Tiliä johon reitin voisi lähettää ei löytynyt.</string>
<string name="send_google_progress_auth_docs">Todennetaan Google Docs -tiliä...</string>
<string name="send_google_progress_auth_fusion_tables">Todennetaan Google Fusion Tables -tiliä...</string>
<string name="send_google_progress_auth_my_maps">Todennetaan Google Maps -tiliä...</string>
<string name="send_google_progress_creating_fusion_table">Luodaan uutta Fusion tablea...</string>
<string name="send_google_progress_creating_map">Luodaan uutta My Mapsia...</string>
<string name="send_google_progress_preparing_track">Valmistellaan reittiä...</string>
<string name="send_google_progress_reading_track">Luetaan reittiä...</string>
<string name="send_google_progress_sending_docs">Lähetetään reittiä Google Docsiin...</string>
<string name="send_google_progress_sending_fusion_tables">Lähetetään reittiä Fusion Tablesiin...</string>
<string name="send_google_progress_sending_my_maps">Lähetetään reittiä Google Mapsiin...</string>
<string name="send_google_recorded">Tallennettu</string>
<string name="send_google_result_share_url">Jaa reitti</string>
<string name="send_google_result_title">Lähetyksen tila:</string>
MyTracks/res/values-fr/strings.xml
-7
View File
@@ -80,17 +80,10 @@ limitations under the License.
<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_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>
<string name="send_google_no_account">Pas de compte Google</string>
<string name="send_google_no_account_message">Un compte Google est nécessaire pour télécharger le parcours.</string>
<string name="send_google_progress_auth_docs">Authentification à Google Docs...</string>
<string name="send_google_progress_auth_fusion_tables">Authentification à Google Fusion Tables...</string>
<string name="send_google_progress_creating_fusion_table">Création d\'une nouvelle \'Fusion Table\'...</string>
<string name="send_google_progress_preparing_track">Préparation du parcours</string>
<string name="send_google_progress_reading_track">Lecture du parcours...</string>
<string name="send_google_progress_sending_docs">Envoi du parcours vers Google Docs...</string>
<string name="send_google_progress_sending_fusion_tables">Envoi du parcours vers Google Fusion Tables...</string>
<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>
MyTracks/res/values-it/strings.xml
-4
View File
@@ -79,14 +79,10 @@ limitations under the License.
<string name="sd_card_success_write_file">Finito di salvare il percorso sulla scheda SD.</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>
<string name="send_google_error_fusion_tables">Si è verificato un errore nell\'invio del percorso a Google Fusion Tables. Per favore riprova più tardi.</string>
<string name="send_google_no_account">Account non trovato</string>
<string name="send_google_no_account_message">Non ho trovato un account a cui inviare i percorsi.</string>
<string name="send_google_progress_auth_docs">Autenticazione a Google Docs in corso...</string>
<string name="send_google_progress_preparing_track">Elaborazione del percorso in corso...</string>
<string name="send_google_progress_reading_track">Lettura in corso...</string>
<string name="send_google_progress_sending_docs">Invio del percorso a Google Docs in corso...</string>
<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>
MyTracks/res/values-ja/strings.xml
-11
View File
@@ -96,24 +96,13 @@ limitations under the License.
<string name="sd_card_success_read_file">SDカードからの読み込み終了．</string>
<string name="sd_card_success_write_file">SDカードへの書き込み終了．</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>
<string name="send_google_error_my_maps">Googleマイマップへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
<string name="send_google_existing_map">既存マップ選択</string>
<string name="send_google_my_maps">Googleマイマップ</string>
<string name="send_google_new_map">新規マップ作成</string>
<string name="send_google_no_account">アカウントを発見できませんでした．</string>
<string name="send_google_no_account_message">トラックをアップロードするためのアカウントを発見できませんでした．</string>
<string name="send_google_progress_auth_docs">Google Docsへの認証を行っています...</string>
<string name="send_google_progress_auth_fusion_tables">Google Fusion Tablesへの認証を行っています...</string>
<string name="send_google_progress_auth_my_maps">Googleマップへの認証を行っています...</string>
<string name="send_google_progress_creating_fusion_table">新しいFusionテーブルを生成しています...</string>
<string name="send_google_progress_creating_map">新しいマイマップを作成しています...</string>
<string name="send_google_progress_preparing_track">トラックを準備しています...</string>
<string name="send_google_progress_reading_track">トラックを読んでいます...</string>
<string name="send_google_progress_sending_docs">トラックをGoogle Docsに送信しています...</string>
<string name="send_google_progress_sending_fusion_tables">トラックをFusion Tablesに送信しています...</string>
<string name="send_google_progress_sending_my_maps">トラックをGoogleマップに送信しています...</string>
<string name="send_google_recorded">記録日</string>
<string name="send_google_result_share_url">トラック共有</string>
<string name="send_google_send_now">今すぐ送信</string>
MyTracks/res/values-pl/strings.xml
-4
View File
@@ -82,14 +82,10 @@ limitations under the License.
<string name="sd_card_success_write_file">Zakończono zapisywanie na karcie SD.</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>
<string name="send_google_error_fusion_tables">Podczas przesyłania pliku do Moich Map Google pojawił się błąd. Spróbuj ponownie później.</string>
<string name="send_google_no_account">Znaleziono nowe konto</string>
<string name="send_google_no_account_message">Nie znaleziono konta do przesyłu.</string>
<string name="send_google_progress_auth_docs">Uwierzytelnianie w Dokumentach Google...</string>
<string name="send_google_progress_preparing_track">Przygotowywanie trasy...</string>
<string name="send_google_progress_reading_track">Czytanie trasy...</string>
<string name="send_google_progress_sending_docs">Przesyłanie trasy do Dokumentów Google...</string>
<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>
MyTracks/res/values-pt-rBR/strings.xml
-7
View File
@@ -77,17 +77,10 @@ limitations under the License.
<string name="sd_card_success_write_file">Gravação no cartão SD concluída.</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>
<string name="send_google_error_fusion_tables">Ocorreu um erro ao enviar seu caminho para o Google Fusion Tables. Por favor tente novamente mais tarde.</string>
<string name="send_google_no_account">Nenhuma conta encontrada</string>
<string name="send_google_no_account_message">Não foi encontrada nenhuma conta para a qual trilhas possam ser enviadas.</string>
<string name="send_google_progress_auth_docs">Authenticando com o Google Docs...</string>
<string name="send_google_progress_auth_fusion_tables">Autenticando com o Google Fusion Tables...</string>
<string name="send_google_progress_creating_fusion_table">Criando nova Fusion Table...</string>
<string name="send_google_progress_preparing_track">Preparando caminho...</string>
<string name="send_google_progress_reading_track">Lendo caminho...</string>
<string name="send_google_progress_sending_docs">Enviando caminho para o Google Docs...</string>
<string name="send_google_progress_sending_fusion_tables">Enviando caminho para o Google Fusion Tables...</string>
<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>
MyTracks/res/values-ru/strings.xml
-11
View File
@@ -98,25 +98,14 @@ limitations under the License.
<string name="sd_card_success_write_file">Запись на SD карту закончена.</string>
<string name="send_google_choose_account">Выбор учетной записи</string>
<string name="send_google_docs">Google Документы</string>
<string name="send_google_error_docs">Ошибка при отправке вашего трека в Google Документы.</string>
<string name="send_google_error_fusion_tables">Ошибка при отправке вашего трека в Google Fusion Tables.</string>
<string name="send_google_error_my_maps">Ошибка при отправке вашего трека в Google \"Мои карты\".</string>
<string name="send_google_existing_map">Выбрать существующую карту</string>
<string name="send_google_fusion_tables">Google Fusion Tables</string>
<string name="send_google_my_maps">Google \"Мои карты\"</string>
<string name="send_google_new_map">Создать новую карту</string>
<string name="send_google_no_account">Учетная запись не найдена</string>
<string name="send_google_no_account_message">Не найдена учетная запись для загрузки треков.</string>
<string name="send_google_progress_auth_docs">Аутентификация в Google Документы...</string>
<string name="send_google_progress_auth_fusion_tables">Аутентификация на Google Fusion Tables...</string>
<string name="send_google_progress_auth_my_maps">Аутентификация на Google Карты...</string>
<string name="send_google_progress_creating_fusion_table">Создание новой Fusion table...</string>
<string name="send_google_progress_creating_map">Создание новой \"Моей карты\" ...</string>
<string name="send_google_progress_preparing_track">Подготовка трека...</string>
<string name="send_google_progress_reading_track">Чтение трека...</string>
<string name="send_google_progress_sending_docs">Отправка трека в Google Документы...</string>
<string name="send_google_progress_sending_fusion_tables">Отправка трека в Fusion Tables...</string>
<string name="send_google_progress_sending_my_maps">Отправка трека в Google Карты...</string>
<string name="send_google_recorded">Записан</string>
<string name="send_google_result_share_url">Поделиться треком</string>
<string name="send_google_result_title">Статус загрузки:</string>
MyTracks/res/values-sv/strings.xml
-4
View File
@@ -79,14 +79,10 @@ limitations under the License.
<string name="sd_card_success_write_file">Slutförde skrivningen av spåret till SD-kort.</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>
<string name="send_google_error_fusion_tables">Det uppstod ett fel i sändningen av ditt spår till Google Fusion Tables. Försök igen senare.</string>
<string name="send_google_no_account">Inget konto hittades</string>
<string name="send_google_no_account_message">Inget konto hittades att ladda upp spåret till.</string>
<string name="send_google_progress_auth_docs">Autentiserar till Google Dokument...</string>
<string name="send_google_progress_preparing_track">Förbereder spår...</string>
<string name="send_google_progress_reading_track">Läser spår...</string>
<string name="send_google_progress_sending_docs">Skickar spår till Google Dokument...</string>
<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>
MyTracks/res/values-zh-rCN/strings.xml
-9
View File
@@ -91,21 +91,12 @@ limitations under the License.
<string name="sd_card_success_read_file">从 SD 存储卡读取完毕.</string>
<string name="sd_card_success_write_file">轨迹已导出到 SD 存储卡.</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>
<string name="send_google_error_my_maps">发送轨迹到 Google My Map 时发生错误.</string>
<string name="send_google_existing_map">选择已有地图</string>
<string name="send_google_new_map">创建新地图</string>
<string name="send_google_no_account">没有帐户</string>
<string name="send_google_no_account_message">没有可用于上传轨迹的帐户.</string>
<string name="send_google_progress_auth_docs">登录 Google Docs 中...</string>
<string name="send_google_progress_auth_fusion_tables">登录 Google Fusion Tables 中...</string>
<string name="send_google_progress_creating_fusion_table">创建新的 Fusion table...</string>
<string name="send_google_progress_creating_map">创建新的 My Map...</string>
<string name="send_google_progress_preparing_track">准备轨迹中...</string>
<string name="send_google_progress_reading_track">读取轨迹中...</string>
<string name="send_google_progress_sending_docs">发送轨迹到 Google Docs 中...</string>
<string name="send_google_progress_sending_fusion_tables">发送轨迹到 Google Fusion Tables 中...</string>
<string name="send_google_recorded">记录日期</string>
<string name="send_google_result_share_url">分享轨迹</string>
<string name="send_google_result_title">上传状态:</string>
MyTracks/res/values/strings.xml
+28 -78
View File
@@ -749,20 +749,10 @@ limitations under the License.
occurred and ask the user to try again.">
An error occurred. Please try again.
</string>
<string name="send_google_error_docs"
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>
<string name="send_google_error_fusion_tables"
translation_description="When sending a track to Google Fusion Table, a message indicating that
an error has occurred.">
There was an error while sending your track to Google Fusion Tables.
</string>
<string name="send_google_error_my_maps"
translation_description="When sending a track to Google My Maps, a message indicating that an
error has occurred.">
There was an error while sending your track to Google My Maps.
<string name="send_google_error_service"
translation_description="When sending a track to a Google service, a message indicating that an
error has occurred. E.g., 'There was an error while sending your track to Google Docs.'.">
There was an error while sending your track to %s.
</string>
<string name="send_google_existing_map"
translation_description="When sending a track to Google My Maps, the radio option to use an
@@ -794,30 +784,15 @@ limitations under the License.
found.">
No account found to upload tracks to.
</string>
<string name="send_google_progress_auth_docs"
translation_description="When sending a track to Google Docs, the message on the progress
dialog indicating authenticating to Google Docs.">
Authenticating to Google Docs...
<string name="send_google_progress_authenticating"
translation_description="When sending a track to a Google service, the message on the progress
dialog indicating authenticating to the service. e.g., 'Authenticating to Google Docs...'.">
Authenticating to %s...
</string>
<string name="send_google_progress_auth_fusion_tables"
translation_description="When sending a track to Google Fusion Tables, the message on the
progress dialog indicating authenticating to Google Fusion Tables.">
Authenticating to Google Fusion Tables...
</string>
<string name="send_google_progress_auth_my_maps"
translation_description="When sending a track to Google My Maps, the message on the progress
dialog indicating authenticating to Google My Maps.">
Authenticating to Google My Maps...
</string>
<string name="send_google_progress_creating_fusion_table"
translation_description="When sending a track to Google Fusion Tables, the message on the
progress dialog indicating My Tracks is creating a new Fusion Table in Google Fusion Tables.">
Creating a new Fusion Table...
</string>
<string name="send_google_progress_creating_map"
translation_description="When sending a track to Google My Maps, the message on the progress
dialog indicating My Tracks is creating a new map in Google My Maps.">
Creating a new My Map...
<string name="send_google_progress_creating"
translation_description="When sending a track to a Google service, the message on the progress
dialog indicating creating a new service item. E.g., 'Creating a new Google Docs item...'.">
Creating a new %s item...
</string>
<string name="send_google_progress_preparing_track"
translation_description="When sending a track to Google My Maps, the message on the progress
@@ -829,20 +804,11 @@ limitations under the License.
indicating My Tracks is reading the track from its database.">
Reading track...
</string>
<string name="send_google_progress_sending_docs"
translation_description="When sending a track to Google Docs, the message on the progress dialog
indicating My Tracks is sending the track data.">
Sending a track to Google Docs...
</string>
<string name="send_google_progress_sending_fusion_tables"
translation_description="When sending a track to Google Fusion Tables, the message on the
progress dialog indicating My Tracks is sending the track data.">
Sending a track to Google Fusion Tables...
</string>
<string name="send_google_progress_sending_my_maps"
translation_description="When sending a track to Google My Maps, the message on the progress
dialog indicating My Tracks is sending the track data.">
Sending a track to Google My Maps...
<string name="send_google_progress_sending"
translation_description="When sending a track to Google service, the message on the progress
dialog indicating My Tracks is sending the track data. E.g., 'Sending a track to Google
Docs...'.">
Sending a track to %s...
</string>
<string name="send_google_recorded"
translation_description="When sending a track to Google, in the track description, a tag
@@ -864,40 +830,24 @@ limitations under the License.
button on the bottom to send the track to the selected Google services.">
Send now
</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. 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. E.g., 'Your track has been sent to
maps.google.com.'">
Your track has been sent to %s.
<string name="send_google_success_existing"
translation_description="When sending a track to a Google service, the message on the result
page indicating that the track is sent to an existing item in the service. The first
placeholder is the service name. The second placeholder is the service url. E.g., 'Your track
has been sent to Google Docs docs.google.com.'.">
Your track has been sent to %1$s %2$s.
</string>
<string name="send_google_success_footer"
translation_description="When sending a track to Google, the additional comment on the bottom of
the result page.">
It may take a few minutes before new tracks appear.
</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. 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. E.g., 'A new spreadsheet is created at
<string name="send_google_success_new"
translation_description="When sending a track to a Google service, the message on the result
page indicating that a new item has been created. The first placeholder is the service name.
The second placeholder is the service url. E.g., 'A new item has been created at Google Docs
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. E.g., 'A new Google My Map has been created at
maps.google.com.'.">
A new Google My Map has been created at %s.
A new item has been created at %1$s %2$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/ProgressIndicator.java
+1 -1
View File
@@ -23,7 +23,7 @@ package com.google.android.apps.mytracks;
*/
public interface ProgressIndicator {
public void setProgressMessage(int resId);
public void setProgressMessage(String message);
public void clearProgressMessage();
public void setProgressValue(int percent);
MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java
+7 -7
View File
@@ -93,7 +93,9 @@ public class SendToDocs {
private void doUpload(long trackId) {
// TODO
statusMessage = activity.getString(R.string.send_google_error_docs);
String errorFormat = activity.getString(R.string.send_google_error_service);
String serviceName = activity.getString(SendType.DOCS.getServiceName());
statusMessage = String.format(errorFormat, serviceName);
success = false;
try {
@@ -116,13 +118,11 @@ public class SendToDocs {
Log.d(Constants.TAG, "SendToDocs: Uploading to spreadsheet");
success = uploadToDocs(track);
if (success) {
String format = createdNewSpreadSheet
? activity.getString(R.string.send_google_success_new_doc)
: activity.getString(R.string.send_google_success_existing_doc);
String successFormat = createdNewSpreadSheet
? activity.getString(R.string.send_google_success_new)
: activity.getString(R.string.send_google_success_existing);
String url = activity.getString(SendType.DOCS.getServiceUrl());
statusMessage = String.format(format, url);
} else {
statusMessage = activity.getString(R.string.send_google_error_docs);
statusMessage = String.format(successFormat, serviceName, url);
}
Log.d(Constants.TAG, "SendToDocs: Done.");
} finally {
MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
+11 -6
View File
@@ -169,11 +169,14 @@ public class SendToFusionTables implements Runnable {
}
private void doUpload() {
String statusMessage = context.getString(R.string.send_google_error_fusion_tables);
String errorFormat = context.getString(R.string.send_google_error_service);
String serviceName = context.getString(SendType.FUSION_TABLES.getServiceName());
String statusMessage = String.format(errorFormat, serviceName);
boolean success = true;
try {
progressIndicator.setProgressValue(PROGRESS_INITIALIZATION);
progressIndicator.setProgressMessage(R.string.send_google_progress_reading_track);
progressIndicator.setProgressMessage(
context.getString(R.string.send_google_progress_reading_track));
// Get the track meta-data
Track track = providerUtils.getTrack(trackId);
@@ -186,13 +189,15 @@ public class SendToFusionTables implements Runnable {
// Create a new table:
progressIndicator.setProgressValue(PROGRESS_FUSION_TABLE_CREATE);
progressIndicator.setProgressMessage(R.string.send_google_progress_creating_fusion_table);
String creatingFormat = context.getString(R.string.send_google_progress_creating);
progressIndicator.setProgressMessage(String.format(creatingFormat, serviceName));
if (!createNewTable(track) || !makeTableUnlisted()) {
return;
}
progressIndicator.setProgressValue(PROGRESS_UPLOAD_DATA_MIN);
progressIndicator.setProgressMessage(R.string.send_google_progress_sending_fusion_tables);
String sendingFormat = context.getString(R.string.send_google_progress_sending);
progressIndicator.setProgressMessage(String.format(sendingFormat, serviceName));
// Upload all of the segments of the track plus start/end markers
if (!uploadAllTrackPoints(track, originalDescription)) {
@@ -206,9 +211,9 @@ public class SendToFusionTables implements Runnable {
return;
}
String format = context.getString(R.string.send_google_success_fusion_tables);
String successFormat = context.getString(R.string.send_google_success_new);
String url = context.getString(SendType.FUSION_TABLES.getServiceUrl());
statusMessage = String.format(format, url);
statusMessage = String.format(successFormat, serviceName, url);
Log.d(Constants.TAG, "SendToFusionTables: Done: " + success);
progressIndicator.setProgressValue(PROGRESS_COMPLETE);
} finally {
MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java
+17 -10
View File
@@ -99,10 +99,13 @@ public class SendToMyMaps implements Runnable {
}
private void doUpload() {
String statusMessage = context.getString(R.string.send_google_error_my_maps);
String errorFormat = context.getString(R.string.send_google_error_service);
String serviceName = context.getString(SendType.MYMAPS.getServiceName());
String statusMessage = String.format(errorFormat, serviceName);
boolean success = true;
try {
progressIndicator.setProgressMessage(R.string.send_google_progress_reading_track);
progressIndicator.setProgressMessage(
context.getString(R.string.send_google_progress_reading_track));
// Get the track meta-data
Track track = providerUtils.getTrack(trackId);
@@ -128,7 +131,8 @@ public class SendToMyMaps implements Runnable {
context.getString(R.string.default_map_public_key), true);
}
progressIndicator.setProgressMessage(R.string.send_google_progress_creating_map);
String creatingFormat = context.getString(R.string.send_google_progress_creating);
progressIndicator.setProgressMessage(String.format(creatingFormat, serviceName));
StringBuilder mapIdBuilder = new StringBuilder();
success = mapsClient.createNewMap(
@@ -172,11 +176,10 @@ public class SendToMyMaps implements Runnable {
}
if (success) {
String format = isNewMap
? context.getString(R.string.send_google_success_new_map)
: context.getString(R.string.send_google_success_existing_map);
String successFormat = isNewMap ? context.getString(R.string.send_google_success_new)
: context.getString(R.string.send_google_success_existing);
String url = context.getString(SendType.MYMAPS.getServiceUrl());
statusMessage = String.format(format, url);
statusMessage = String.format(successFormat, serviceName, url);
}
Log.d(TAG, "SendToMyMaps: Done: " + success);
progressIndicator.setProgressValue(100);
@@ -236,7 +239,8 @@ public class SendToMyMaps implements Runnable {
new DoubleBuffer(Constants.ELEVATION_SMOOTHING_FACTOR);
List<Location> locations = new ArrayList<Location>(MAX_POINTS_PER_UPLOAD);
progressIndicator.setProgressMessage(R.string.send_google_progress_reading_track);
progressIndicator.setProgressMessage(
context.getString(R.string.send_google_progress_reading_track));
Location lastLocation = null;
do {
if (totalLocationsRead % 100 == 0) {
@@ -309,7 +313,8 @@ public class SendToMyMaps implements Runnable {
private boolean prepareAndUploadPoints(Track track, List<Location> locations) {
progressIndicator.setProgressMessage(R.string.send_google_progress_preparing_track);
progressIndicator.setProgressMessage(
context.getString(R.string.send_google_progress_preparing_track));
updateProgress();
int numLocations = locations.size();
@@ -323,7 +328,9 @@ public class SendToMyMaps implements Runnable {
ArrayList<Track> splitTracks = prepareLocations(track, locations);
// Start uploading them
progressIndicator.setProgressMessage(R.string.send_google_progress_sending_my_maps);
String sendingFormat = context.getString(R.string.send_google_progress_sending);
String serviceName = context.getString(SendType.MYMAPS.getServiceName());
progressIndicator.setProgressMessage(String.format(sendingFormat, serviceName));
for (Track splitTrack : splitTracks) {
if (totalSegmentsUploaded > 1) {
splitTrack.setName(splitTrack.getName() + " "
MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
+21 -7
View File
@@ -403,7 +403,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
private SendState authenticateToGoogleMaps() {
Log.d(TAG, "SendActivity.authenticateToGoogleMaps");
progressDialog.setProgress(0);
progressDialog.setMessage(getString(R.string.send_google_progress_auth_my_maps));
progressDialog.setMessage(getAuthenticatingProgressMessage(SendType.MYMAPS));
authenticate(Constants.AUTHENTICATE_TO_MY_MAPS, MyMapsConstants.SERVICE_NAME);
// AUTHENTICATE_TO_MY_MAPS callback calls sendToGoogleMaps
return SendState.NOT_READY;
@@ -478,7 +478,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
private SendState authenticateToFusionTables() {
progressDialog.setProgress(0);
progressDialog.setMessage(getString(R.string.send_google_progress_auth_fusion_tables));
progressDialog.setMessage(getAuthenticatingProgressMessage(SendType.FUSION_TABLES));
authenticate(Constants.AUTHENTICATE_TO_FUSION_TABLES, SendToFusionTables.SERVICE_ID);
// AUTHENTICATE_TO_FUSION_TABLES callback calls sendToFusionTables
return SendState.NOT_READY;
@@ -533,7 +533,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
private SendState authenticateToGoogleDocs() {
setProgressValue(0);
setProgressMessage(R.string.send_google_progress_auth_docs);
setProgressMessage(getAuthenticatingProgressMessage(SendType.DOCS));
authenticate(Constants.AUTHENTICATE_TO_DOCLIST, SendToDocs.GDATA_SERVICE_NAME_DOCLIST);
// AUTHENTICATE_TO_DOCLIST callback calls authenticateToGoogleTrix
return SendState.NOT_READY;
@@ -541,7 +541,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
private SendState authenticateToGoogleTrix() {
setProgressValue(30);
setProgressMessage(R.string.send_google_progress_auth_docs);
setProgressMessage(getAuthenticatingProgressMessage(SendType.DOCS));
authenticate(Constants.AUTHENTICATE_TO_TRIX, SendToDocs.GDATA_SERVICE_NAME_TRIX);
// AUTHENTICATE_TO_TRIX callback calls sendToGoogleDocs
return SendState.NOT_READY;
@@ -552,7 +552,9 @@ public class SendActivity extends Activity implements ProgressIndicator {
tracker.trackPageView("/send/docs");
setProgressValue(50);
setProgressMessage(R.string.send_google_progress_sending_docs);
String format = getString(R.string.send_google_progress_sending);
String serviceName = getString(SendType.DOCS.getServiceName());
setProgressMessage(String.format(format, serviceName));
final SendToDocs sender = new SendToDocs(this,
authMap.get(SendToDocs.GDATA_SERVICE_NAME_TRIX),
authMap.get(SendToDocs.GDATA_SERVICE_NAME_DOCLIST),
@@ -878,12 +880,24 @@ public class SendActivity extends Activity implements ProgressIndicator {
sendToFusionTablesTableId = null;
}
/**
* Gets a progress message indicating My Tracks is authenticating to a
* service.
*
* @param type the type of service
*/
private String getAuthenticatingProgressMessage(SendType type) {
String format = getString(R.string.send_google_progress_authenticating);
String serviceName = getString(type.getServiceName());
return String.format(format, serviceName);
}
@Override
public void setProgressMessage(final int resId) {
public void setProgressMessage(final String message) {
runOnUiThread(new Runnable() {
public void run() {
if (progressDialog != null) {
progressDialog.setMessage(getString(resId));
progressDialog.setMessage(message);
}
}
});