diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml index 2590c718c..6a386e777 100644 --- a/MyTracks/res/values-ca/strings.xml +++ b/MyTracks/res/values-ca/strings.xml @@ -83,17 +83,10 @@ limitations under the License. S\'ha finalitzat l\'escriptura a la targeta SD. Trieu un compte S\'ha produït un error. Proveu de nou. - S\'ha prdouït un error quan s\'enviava la ruta a Google Docs. Proveu més tard. - S\'ha produït un error quan s\'enviava la ruta a Google Fusion Tables. Proveu més tard. No s\'ha trobat cap compte No s\'ha trobat cap compte on pujar les rutes. - S\'està autenticant a Google Docs... - S\'està to Google Fusion Tables... - S\'està creant un Fusion Table nou... S\'està preparant la ruta... S\'està llegint la ruta... - S\'està enviant la ruta a Google Docs... - S\'està enviant a Google Fusion Tables... Enregistrat Comparteix la ruta amb amics Envia ara diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml index 71d226d9a..e33fc331b 100644 --- a/MyTracks/res/values-de/strings.xml +++ b/MyTracks/res/values-de/strings.xml @@ -87,17 +87,10 @@ limitations under the License. Wähle ein Konto Google Text & Tabellen Ein Fehler ist aufgetreten. Bitte versuche es noch einmal. - Beim Senden des Tracks an Google Text & Tabellen ist ein Fehler aufgetreten. Bitte versuche es später noch einmal. - Beim Senden des Tracks an Google Fusion Tables ist ein Fehler aufgetreten. Bitte versuche es später noch einmal. Kein Konto vorhanden Kein Konto gefunden, um Tracks zu versenden. - Anmeldung bei Google Text & Tabellen... - Anmeldung bei Google Fusion Tables... - Neue \'Fusion Tabelle\' wird erstellt... Bereite Track vor... Lese Track... - Track wird an Google Text & Tabellen gesendet... - Track wird an Google Fusion Tables gesendet... Aufgezeichnet am Track mit Freunden teilen Jetzt senden diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml index f9da721d1..4cd26f1ce 100644 --- a/MyTracks/res/values-es/strings.xml +++ b/MyTracks/res/values-es/strings.xml @@ -96,25 +96,14 @@ limitations under the License. Grabación a tarjeta SD concluída. Elija una cuenta A ocurrido un error. Por favor, inténtelo de nuevo. - Se produjo un error al enviar su recorrido a Google Docs. - Se produjo un error al enviar su recorrido a Google Fusion Tables. - Se produjo un error al enviar su recorrido a Google Mis Sitios. Elegir un mapa existente Tablas Google Fusion Mis Sitios Google Crear nuevo mapa Cuenta no encontrada No se encontro la cuenta a la que subir las rutas. - Autenticando con Google Docs... - Autenticando con Google Fusion Tables... - Autenticando con Google Maps... - Creando nuevo mapa Fusion Tables... - Creando nuevo Sitio... Preparando recorrido... Leyendo recorrido... - Enviando recorrido a Google Docs... - Enviando recorrido a Google Fusion Tables... - Enviando recorrido a Google Maps... Grabado Compartir recorrido Estado del envío: diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml index 04c053e22..298d4f426 100644 --- a/MyTracks/res/values-fi/strings.xml +++ b/MyTracks/res/values-fi/strings.xml @@ -99,25 +99,14 @@ limitations under the License. SD-kortille kirjoitus valmis. Valitse tili Google Docs - Virhe lähetettäessä reittiä Google Docs-palveluun.. - Virhe lähetettäessä reittiä Google Fusion Tables-palveluun. - Virhe lähetettäessä reittiä Google My Maps-palveluun. Valitse kartta Google Fusion Tables Google My Maps Luo uusi kartta Tiliä ei löytynyt Tiliä johon reitin voisi lähettää ei löytynyt. - Todennetaan Google Docs -tiliä... - Todennetaan Google Fusion Tables -tiliä... - Todennetaan Google Maps -tiliä... - Luodaan uutta Fusion tablea... - Luodaan uutta My Mapsia... Valmistellaan reittiä... Luetaan reittiä... - Lähetetään reittiä Google Docsiin... - Lähetetään reittiä Fusion Tablesiin... - Lähetetään reittiä Google Mapsiin... Tallennettu Jaa reitti Lähetyksen tila: diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml index 00c982987..81d11edc5 100644 --- a/MyTracks/res/values-fr/strings.xml +++ b/MyTracks/res/values-fr/strings.xml @@ -80,17 +80,10 @@ limitations under the License. Impossible d\'écrire dans le fichier. Parcours enregistré sur la carte SD. Choisissez un compte - Il y a eu une erreur lors de l\'envoi de votre parcours à Google Docs. Réessayez plus tard SVP. - Il y a eu une erreur lors de l\'envoi de votre parcours à Google Fusion Tables. Réessayez plus tard SVP. Pas de compte Google Un compte Google est nécessaire pour télécharger le parcours. - Authentification à Google Docs... - Authentification à Google Fusion Tables... - Création d\'une nouvelle \'Fusion Table\'... Préparation du parcours Lecture du parcours... - Envoi du parcours vers Google Docs... - Envoi du parcours vers Google Fusion Tables... Enregistré Partager des parcours. Envoyer maintenant diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml index c2bb8e69c..b4bd7d1b1 100644 --- a/MyTracks/res/values-it/strings.xml +++ b/MyTracks/res/values-it/strings.xml @@ -79,14 +79,10 @@ limitations under the License. Finito di salvare il percorso sulla scheda SD. Scegli un account Google Docs - Si è verificato un errore nell\'invio del percorso a Google Docs. Per favore riporva più tardi. - Si è verificato un errore nell\'invio del percorso a Google Fusion Tables. Per favore riprova più tardi. Account non trovato Non ho trovato un account a cui inviare i percorsi. - Autenticazione a Google Docs in corso... Elaborazione del percorso in corso... Lettura in corso... - Invio del percorso a Google Docs in corso... Registrato Condividi il percorso con amici Invia adesso diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml index ab57dfc02..1dc6abe9e 100644 --- a/MyTracks/res/values-ja/strings.xml +++ b/MyTracks/res/values-ja/strings.xml @@ -96,24 +96,13 @@ limitations under the License. SDカードからの読み込み終了． SDカードへの書き込み終了． アカウント選択 - Google Docsへのトラック送信でエラーが発生しました．しばらく待って試して下さい． - Google Fusion Tablesへのトラック送信でエラーが発生しました．しばらく待って試して下さい． - Googleマイマップへのトラック送信でエラーが発生しました．しばらく待って試して下さい． 既存マップ選択 Googleマイマップ 新規マップ作成 アカウントを発見できませんでした． トラックをアップロードするためのアカウントを発見できませんでした． - Google Docsへの認証を行っています... - Google Fusion Tablesへの認証を行っています... - Googleマップへの認証を行っています... - 新しいFusionテーブルを生成しています... - 新しいマイマップを作成しています... トラックを準備しています... トラックを読んでいます... - トラックをGoogle Docsに送信しています... - トラックをFusion Tablesに送信しています... - トラックをGoogleマップに送信しています... 記録日 トラック共有 今すぐ送信 diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml index 67649cb54..ea58096c4 100644 --- a/MyTracks/res/values-pl/strings.xml +++ b/MyTracks/res/values-pl/strings.xml @@ -82,14 +82,10 @@ limitations under the License. Zakończono zapisywanie na karcie SD. Wybierz konto Dokumenty Google - Podczas przesyłania pliku do Dokumentów Google pojawił się błąd. Spróbuj ponownie później. - Podczas przesyłania pliku do Moich Map Google pojawił się błąd. Spróbuj ponownie później. Znaleziono nowe konto Nie znaleziono konta do przesyłu. - Uwierzytelnianie w Dokumentach Google... Przygotowywanie trasy... Czytanie trasy... - Przesyłanie trasy do Dokumentów Google... Zapisana Podziel się trasą z przyjaciółmi Wyślij teraz diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml index 9807fbf0c..b9b9ff7a5 100644 --- a/MyTracks/res/values-pt-rBR/strings.xml +++ b/MyTracks/res/values-pt-rBR/strings.xml @@ -77,17 +77,10 @@ limitations under the License. Gravação no cartão SD concluída. Escolher conta Google Docs - Ocorreu um erro ao enviar seu caminho para o Google Docs. Por favor tente novamente mais tarde. - Ocorreu um erro ao enviar seu caminho para o Google Fusion Tables. Por favor tente novamente mais tarde. Nenhuma conta encontrada Não foi encontrada nenhuma conta para a qual trilhas possam ser enviadas. - Authenticando com o Google Docs... - Autenticando com o Google Fusion Tables... - Criando nova Fusion Table... Preparando caminho... Lendo caminho... - Enviando caminho para o Google Docs... - Enviando caminho para o Google Fusion Tables... Gravado Compartilhar caminho com amigos Enviar agora diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml index 436a8b630..44a7a91dc 100644 --- a/MyTracks/res/values-ru/strings.xml +++ b/MyTracks/res/values-ru/strings.xml @@ -98,25 +98,14 @@ limitations under the License. Запись на SD карту закончена. Выбор учетной записи Google Документы - Ошибка при отправке вашего трека в Google Документы. - Ошибка при отправке вашего трека в Google Fusion Tables. - Ошибка при отправке вашего трека в Google \"Мои карты\". Выбрать существующую карту Google Fusion Tables Google \"Мои карты\" Создать новую карту Учетная запись не найдена Не найдена учетная запись для загрузки треков. - Аутентификация в Google Документы... - Аутентификация на Google Fusion Tables... - Аутентификация на Google Карты... - Создание новой Fusion table... - Создание новой \"Моей карты\" ... Подготовка трека... Чтение трека... - Отправка трека в Google Документы... - Отправка трека в Fusion Tables... - Отправка трека в Google Карты... Записан Поделиться треком Статус загрузки: diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml index bfb95f78c..4c68224fd 100644 --- a/MyTracks/res/values-sv/strings.xml +++ b/MyTracks/res/values-sv/strings.xml @@ -79,14 +79,10 @@ limitations under the License. Slutförde skrivningen av spåret till SD-kort. Välj konto Google Dokument - Det uppstod ett fel i sändningen av ditt spår till Google Dokument. Försök igen senare. - Det uppstod ett fel i sändningen av ditt spår till Google Fusion Tables. Försök igen senare. Inget konto hittades Inget konto hittades att ladda upp spåret till. - Autentiserar till Google Dokument... Förbereder spår... Läser spår... - Skickar spår till Google Dokument... Inspelad Dela spår med vänner Skicka nu diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml index 71cccbbaf..53df9cf15 100644 --- a/MyTracks/res/values-zh-rCN/strings.xml +++ b/MyTracks/res/values-zh-rCN/strings.xml @@ -91,21 +91,12 @@ limitations under the License. 从 SD 存储卡读取完毕. 轨迹已导出到 SD 存储卡. 选择帐户 - 发送轨迹到 Google Docs 时发生错误. 请稍后重试. - 发送轨迹到 Google Fusion Tables 时发生错误. 请稍后重试. - 发送轨迹到 Google My Map 时发生错误. 选择已有地图 创建新地图 没有帐户 没有可用于上传轨迹的帐户. - 登录 Google Docs 中... - 登录 Google Fusion Tables 中... - 创建新的 Fusion table... - 创建新的 My Map... 准备轨迹中... 读取轨迹中... - 发送轨迹到 Google Docs 中... - 发送轨迹到 Google Fusion Tables 中... 记录日期 分享轨迹 上传状态: diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index 3173bbaf5..f5dff08ee 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -749,20 +749,10 @@ limitations under the License. occurred and ask the user to try again."> An error occurred. Please try again. - - There was an error while sending your track to Google Docs. - - - There was an error while sending your track to Google Fusion Tables. - - - There was an error while sending your track to Google My Maps. + + There was an error while sending your track to %s. No account found to upload tracks to. - - Authenticating to Google Docs... + + Authenticating to %s... - - Authenticating to Google Fusion Tables... - - - Authenticating to Google My Maps... - - - Creating a new Fusion Table... - - - Creating a new My Map... + + Creating a new %s item... Reading track... - - Sending a track to Google Docs... - - - Sending a track to Google Fusion Tables... - - - Sending a track to Google My Maps... + + Sending a track to %s... Send now - - Your track has been sent to %s. - - - Your track has been sent to %s. + + Your track has been sent to %1$s %2$s. It may take a few minutes before new tracks appear. - - A new Google Fusion Table has been created at %s. - - - A new spreadsheet is created at %s. - - - A new Google My Map has been created at %s. + A new item has been created at %1$s %2$s. locations = new ArrayList(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 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 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() + " " diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java index f2e67b3fc..7a9785382 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java @@ -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); } } });