diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index f78a48027..441f5cc70 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -25,7 +25,6 @@ limitations under the License.
   <string name="eula_accept">Accepta</string>
   <string name="eula_decline">Rebutja</string>
   <string name="eula_title">Acord de llicencia d\'usuari final</string>
-  <string name="export_progress_message">S\'està escrivint a la targeta SD. Això pot trigar una estona.</string>
   <string name="export_success">Exporta les finalitzades</string>
   <string name="generic_cancel">Cancel·la</string>
   <string name="generic_confirm_title">Esteu segur?</string>
@@ -79,6 +78,7 @@ limitations under the License.
   <string name="sd_card_error_no_storage">No s\'ha trobat cap dispositiu d\'emmagatzematge extern. Assegureu-vos que la targeta SD està inserida i que el telèfon no està connectat a un ordinador.</string>
   <string name="sd_card_error_read_file">No es pot llegir des del fitxer.</string>
   <string name="sd_card_error_write_file">No es pot escriure a un fitxer.</string>
+  <string name="sd_card_progress_write_file">S\'està escrivint a la targeta SD. Això pot trigar una estona.</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_choose_account_title">Trieu un compte</string>
@@ -197,9 +197,9 @@ limitations under the License.
   <string name="track_record_error">No es pot iniciar l\'enregistrament. Proveu de nou.</string>
   <string name="track_record_notification">S\'està enregistrant la ruta...</string>
   <string name="track_record_success">Ara s\'està enregistrant una ruta nova.</string>
-  <string name="voice_total_distance_zero">Sense distància My Tracks</string>
   <string name="voice_per_kilometer">per kilòmetre</string>
   <string name="voice_per_mile">per milla</string>
+  <string name="voice_total_distance_zero">Sense distància My Tracks</string>
   <string name="welcome_about">Quant a My Tracks</string>
   <string name="welcome_title">Benvingut</string>
 </resources>
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index c41e32754..5800ce68e 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -25,7 +25,6 @@ limitations under the License.
   <string name="eula_accept">Akzeptieren</string>
   <string name="eula_decline">Ablehnen</string>
   <string name="eula_title">Lizenzvereinbarung für Endverbraucher</string>
-  <string name="export_progress_message">Schreibe Datei auf SD-Karte. Das kann ein wenig dauern.</string>
   <string name="export_success">Exportieren beendet</string>
   <string name="generic_cancel">Abbrechen</string>
   <string name="generic_confirm_title">Bist Du Dir wirklich sicher?</string>
@@ -82,6 +81,7 @@ limitations under the License.
   <string name="sd_card_error_no_storage">Keine externes Speichermedium verfügbar. Stelle sicher, dass eine SD-Karte vorhanden ist und nicht bereits von einem Computer darauf zugegriffen wird.</string>
   <string name="sd_card_error_read_file">Die Datei konnte nicht gelesen werden.</string>
   <string name="sd_card_error_write_file">Die Datei kann nicht geschrieben werden.</string>
+  <string name="sd_card_progress_write_file">Schreibe Datei auf SD-Karte. Das kann ein wenig dauern.</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_choose_account_title">Wähle ein Konto</string>
@@ -208,9 +208,9 @@ limitations under the License.
   <string name="unit_feet">Fuß</string>
   <string name="unit_hour">Std</string>
   <string name="unit_minute">Min</string>
-  <string name="voice_total_distance_zero">My Tracks keine Entfernung</string>
   <string name="voice_per_kilometer">pro Kilometer</string>
   <string name="voice_per_mile">pro Meile</string>
+  <string name="voice_total_distance_zero">My Tracks keine Entfernung</string>
   <string name="welcome_about">Über My Tracks</string>
   <string name="welcome_title">Willkommen</string>
 </resources>
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index da4485502..2fbf8c249 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -27,8 +27,6 @@ limitations under the License.
   <string name="eula_accept">Aceptar</string>
   <string name="eula_decline">Declinar</string>
   <string name="eula_title">Contrato de Licencia de Usuario Final</string>
-  <string name="export_canceled">La operación fue cancelada.</string>
-  <string name="export_progress_message">Escribiendo archivo a tarjeta SD. Esto puede tardar.</string>
   <string name="export_success">Exportación concluída</string>
   <string name="generic_cancel">Cancelar</string>
   <string name="generic_confirm_title">¿Está usted seguro?</string>
@@ -87,10 +85,12 @@ limitations under the License.
   <string name="permission_read_label">leer datos de recorridos grabados</string>
   <string name="permission_write_description">Poder escribir datos, como registrar o añadir puntos de interés.</string>
   <string name="permission_write_label">escribir datos de recorridos grabados, iniciar/detener recorridos</string>
+  <string name="sd_card_canceled">La operación fue cancelada.</string>
   <string name="sd_card_error_create_dir">No es posible crear un directorio en su tarjeta SD.</string>
   <string name="sd_card_error_no_storage">Ningún almacenamiento externo fue encontrado. Asegúrese que la tarjeta SD se encuentre insertada y que su teléfono no este conectado a una computadora.</string>
   <string name="sd_card_error_read_file">No es posible leer el archivo.</string>
   <string name="sd_card_error_write_file">No es posible escribir al archivo.</string>
+  <string name="sd_card_progress_write_file">Escribiendo archivo a tarjeta SD. Esto puede tardar.</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_choose_account_title">Elija una cuenta</string>
@@ -249,9 +249,9 @@ limitations under the License.
   <string name="track_record_notification">Grabando su recorrido...</string>
   <string name="track_record_success">Grabando un nuevo recorrido.</string>
   <string name="unit_feet">pies</string>
-  <string name="voice_total_distance_zero">My Tracks sin distancia</string>
   <string name="voice_per_kilometer">por kilómetro</string>
   <string name="voice_per_mile">por milla</string>
+  <string name="voice_total_distance_zero">My Tracks sin distancia</string>
   <string name="welcome_about">Sobre My Tracks</string>
   <string name="welcome_title">Bienvenido</string>
 </resources>
diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml
index 115c4e849..2aa2a6f92 100644
--- a/MyTracks/res/values-fi/strings.xml
+++ b/MyTracks/res/values-fi/strings.xml
@@ -27,8 +27,6 @@ limitations under the License.
   <string name="eula_accept">Hyväksy</string>
   <string name="eula_decline">Hylkää</string>
   <string name="eula_title">End User License Agreement</string>
-  <string name="export_canceled">Tapahtuma keskeytettiin.</string>
-  <string name="export_progress_message">Kirjoitetaan tiedostoa SD-kortille. Odota.</string>
   <string name="export_success">Vienti tehty</string>
   <string name="generic_cancel">Peruuta</string>
   <string name="generic_confirm_title">Oletko varma?</string>
@@ -90,10 +88,12 @@ limitations under the License.
   <string name="permission_read_label">lue tallennettua reittidataa</string>
   <string name="permission_write_description">Mahdollista reittidatan kirjoittaminen, kuten tallennuksen aloittaminen, merkintöjen lisääminen jne.</string>
   <string name="permission_write_label">kirjoita tallennettua reittidataa, aloita/pysäytä reitin tallennus</string>
+  <string name="sd_card_canceled">Tapahtuma keskeytettiin.</string>
   <string name="sd_card_error_create_dir">Hakemistoa ei voitu luoda SD-kortille.</string>
   <string name="sd_card_error_no_storage">Ulkoista tallennusmediaa ei löytynyt. Varmista että SD-kortti on kytketty eikä puhelinta ole liitetty tietokoneeseen.</string>
   <string name="sd_card_error_read_file">Lukuvirhe.</string>
   <string name="sd_card_error_write_file">Kirjoitusvirhe.</string>
+  <string name="sd_card_progress_write_file">Kirjoitetaan tiedostoa SD-kortille. Odota.</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_choose_account_title">Valitse tili</string>
@@ -249,9 +249,9 @@ limitations under the License.
   <string name="unit_minute_per_mile">min/mi</string>
   <string name="unit_revolution_per_minute">rpm</string>
   <string name="unit_watt">W</string>
-  <string name="voice_total_distance_zero">My Tracks ei etäisyyttä</string>
   <string name="voice_per_kilometer">per kilometri</string>
   <string name="voice_per_mile">per maili</string>
+  <string name="voice_total_distance_zero">My Tracks ei etäisyyttä</string>
   <string name="welcome_about">Tietoa My Tracksista</string>
   <string name="welcome_title">Tervetuloa</string>
 </resources>
diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml
index 7ae9959b3..8496c57eb 100644
--- a/MyTracks/res/values-fr/strings.xml
+++ b/MyTracks/res/values-fr/strings.xml
@@ -23,7 +23,6 @@ limitations under the License.
   <string name="eula_accept">Accepter</string>
   <string name="eula_decline">Décliner</string>
   <string name="eula_title">Accord de licence utilisateur</string>
-  <string name="export_progress_message">Enregistrement du fichier sur la carte SD. Patientez SVP.</string>
   <string name="generic_cancel">Annuler</string>
   <string name="generic_confirm_title">Êtes-vous sûr?</string>
   <string name="generic_error_title">Erreur</string>
@@ -78,6 +77,7 @@ limitations under the License.
   <string name="sd_card_error_create_dir">Impossible de créer un dossier dans la carte SD.</string>
   <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_progress_write_file">Enregistrement du fichier sur la carte SD. Patientez SVP.</string>
   <string name="sd_card_success_write_file">Parcours enregistré sur la carte SD.</string>
   <string name="send_google_choose_account_title">Choisissez un compte</string>
   <string name="send_google_no_account_message">Un compte Google est nécessaire pour télécharger le parcours.</string>
@@ -198,9 +198,9 @@ limitations under the License.
   <string name="unit_feet">pied</string>
   <string name="unit_kilometer_per_hour">km/h</string>
   <string name="unit_mile_per_hour">mi/h</string>
-  <string name="voice_total_distance_zero">My Tracks pas de distance disponible</string>
   <string name="voice_per_kilometer">par kilomètre</string>
   <string name="voice_per_mile">per mile</string>
+  <string name="voice_total_distance_zero">My Tracks pas de distance disponible</string>
   <string name="welcome_about">À propos de My Tracks</string>
   <string name="welcome_title">Bienvenue</string>
 </resources>
diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml
index 78bb7d0f5..04462dacd 100644
--- a/MyTracks/res/values-it/strings.xml
+++ b/MyTracks/res/values-it/strings.xml
@@ -25,7 +25,6 @@ limitations under the License.
   <string name="eula_accept">Accetto</string>
   <string name="eula_decline">Non accetto</string>
   <string name="eula_title">Termini di servizio</string>
-  <string name="export_progress_message">Salvataggio del file sulla scheda SD in corso. Attendere prego...</string>
   <string name="export_success">Esportazione terminata.</string>
   <string name="generic_cancel">Annulla</string>
   <string name="generic_confirm_title">Sei sicuro?</string>
@@ -76,6 +75,7 @@ limitations under the License.
   <string name="sd_card_error_create_dir">Impossibile creare directory sulla scheda SD.</string>
   <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_progress_write_file">Salvataggio del file sulla scheda SD in corso. Attendere prego...</string>
   <string name="sd_card_success_write_file">Finito di salvare il percorso sulla scheda SD.</string>
   <string name="send_google_choose_account_title">Scegli un account</string>
   <string name="send_google_docs">Google Docs</string>
@@ -170,9 +170,9 @@ limitations under the License.
   <string name="unit_minute">min</string>
   <string name="unit_minute_per_kilometer">min/km</string>
   <string name="unit_minute_per_mile">min/mi</string>
-  <string name="voice_total_distance_zero">Mai Tracks Distanza non disponibile</string>
   <string name="voice_per_kilometer">per chilometro</string>
   <string name="voice_per_mile">per miglio</string>
+  <string name="voice_total_distance_zero">Mai Tracks Distanza non disponibile</string>
   <string name="welcome_about">Informazioni su My Tracks</string>
   <string name="welcome_title">Benvenuto</string>
 </resources>
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index 398dcccae..db39082f2 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -27,7 +27,6 @@ limitations under the License.
   <string name="eula_accept">同意する</string>
   <string name="eula_decline">拒否する</string>
   <string name="eula_title">エンドユーザライセンス契約書</string>
-  <string name="export_progress_message">SDカードにデータを書き込んでいます．若干時間がかかります．</string>
   <string name="export_success">出力終了</string>
   <string name="generic_cancel">キャンセル</string>
   <string name="generic_confirm_title">よろしいですか?</string>
@@ -92,6 +91,7 @@ limitations under the License.
   <string name="sd_card_error_no_storage">外部ストレージを発見できませんでした．SDカードが刺さっているか、端末がコンピュータにマウントされていないか確認してください．</string>
   <string name="sd_card_error_read_file">ファイルからの読み込みができません．</string>
   <string name="sd_card_error_write_file">ファイルへの書き込みができません．</string>
+  <string name="sd_card_progress_write_file">SDカードにデータを書き込んでいます．若干時間がかかります．</string>
   <string name="sd_card_success_read_file">SDカードからの読み込み終了．</string>
   <string name="sd_card_success_write_file">SDカードへの書き込み終了．</string>
   <string name="send_google_choose_account_title">アカウント選択</string>
@@ -225,9 +225,9 @@ limitations under the License.
   <string name="track_record_success">新しいトラックを記録中です．</string>
   <string name="unit_hour">時</string>
   <string name="unit_minute">分</string>
-  <string name="voice_total_distance_zero">My Tracks 移動していません</string>
   <string name="voice_per_kilometer">毎キロメータ</string>
   <string name="voice_per_mile">毎マイル</string>
+  <string name="voice_total_distance_zero">My Tracks 移動していません</string>
   <string name="welcome_about">My Tracksについて</string>
   <string name="welcome_title">ようこそ</string>
 </resources>
diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml
index 03bac3213..164befad0 100644
--- a/MyTracks/res/values-pl/strings.xml
+++ b/MyTracks/res/values-pl/strings.xml
@@ -25,7 +25,6 @@ limitations under the License.
   <string name="eula_accept">Zaakceptuj</string>
   <string name="eula_decline">Odrzuć</string>
   <string name="eula_title">Licencja użytkownika końcowego</string>
-  <string name="export_progress_message">Zapisywanie pliku na kartę SD. Poczekaj chwilę.</string>
   <string name="export_success">Eksport zakończony</string>
   <string name="generic_cancel">Anuluj</string>
   <string name="generic_confirm_title">Jesteś pewien?</string>
@@ -78,6 +77,7 @@ limitations under the License.
   <string name="sd_card_error_no_storage">Nie znaleziono zewnętrznej pamięci. Upewniej się, że karta SD jest w telefonie i nie jest podłączona do komputera.</string>
   <string name="sd_card_error_read_file">Nie można odczytać pliku.</string>
   <string name="sd_card_error_write_file">Nie można zapisać pliku.</string>
+  <string name="sd_card_progress_write_file">Zapisywanie pliku na kartę SD. Poczekaj chwilę.</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_choose_account_title">Wybierz konto</string>
@@ -199,9 +199,9 @@ limitations under the License.
   <string name="unit_minute">min</string>
   <string name="unit_minute_per_kilometer">min/km</string>
   <string name="unit_minute_per_mile">min/mi</string>
-  <string name="voice_total_distance_zero">My Tracks brak odległości</string>
   <string name="voice_per_kilometer">na kilometr</string>
   <string name="voice_per_mile">na milę</string>
+  <string name="voice_total_distance_zero">My Tracks brak odległości</string>
   <string name="welcome_about">O My Tracks</string>
   <string name="welcome_title">Witamy</string>
 </resources>
diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml
index 874d29622..0d50d2dfd 100644
--- a/MyTracks/res/values-pt-rBR/strings.xml
+++ b/MyTracks/res/values-pt-rBR/strings.xml
@@ -25,7 +25,6 @@ limitations under the License.
   <string name="eula_accept">Aceitar</string>
   <string name="eula_decline">Recusar</string>
   <string name="eula_title">Contrato de Licença de Usuário Final</string>
-  <string name="export_progress_message">Salvando arquivo para o cartão SD. Isso pode demorar alguns instantes.</string>
   <string name="generic_cancel">Cancelar</string>
   <string name="generic_confirm_title">Você tem certeza?</string>
   <string name="generic_error_title">Erro</string>
@@ -74,6 +73,7 @@ limitations under the License.
   <string name="sd_card_error_create_dir">Impossível criar diretório no cartão SD.</string>
   <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_progress_write_file">Salvando arquivo para o cartão SD. Isso pode demorar alguns instantes.</string>
   <string name="sd_card_success_write_file">Gravação no cartão SD concluída.</string>
   <string name="send_google_choose_account_title">Escolher conta</string>
   <string name="send_google_docs">Google Docs</string>
@@ -159,9 +159,9 @@ limitations under the License.
   <string name="track_record_success">Gravando um novo caminho.</string>
   <string name="unit_feet">pés</string>
   <string name="unit_hour">h</string>
-  <string name="voice_total_distance_zero">My Tracks sem distância</string>
   <string name="voice_per_kilometer">por kilômetro</string>
   <string name="voice_per_mile">por milha</string>
+  <string name="voice_total_distance_zero">My Tracks sem distância</string>
   <string name="welcome_about">Sobre My Tracks</string>
   <string name="welcome_title">Bem-vindo</string>
 </resources>
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index dbaee87ae..92993151f 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -27,7 +27,6 @@ limitations under the License.
   <string name="eula_accept">Принять</string>
   <string name="eula_decline">Отклонить</string>
   <string name="eula_title">Лицензионное соглашение</string>
-  <string name="export_progress_message">Запись файла на SD карту. Это может занять некоторое время.</string>
   <string name="export_success">Экспорт закончен</string>
   <string name="generic_cancel">Отмена</string>
   <string name="generic_confirm_title">Вы уверены?</string>
@@ -93,6 +92,7 @@ limitations under the License.
   <string name="sd_card_error_no_storage">Не обнаружено внешнее устройство хранения данных. Убедитесь, что SD карта вставлена, и что ваш телефон не подключен к компьютеру.</string>
   <string name="sd_card_error_read_file">Невозможно прочитать из файла.</string>
   <string name="sd_card_error_write_file">Невозможно записать файл.</string>
+  <string name="sd_card_progress_write_file">Запись файла на SD карту. Это может занять некоторое время.</string>
   <string name="sd_card_success_read_file">Чтение с SD карты закончено.</string>
   <string name="sd_card_success_write_file">Запись на SD карту закончена.</string>
   <string name="send_google_choose_account_title">Выбор учетной записи</string>
@@ -245,9 +245,9 @@ limitations under the License.
   <string name="unit_minute_per_mile">мин/миля</string>
   <string name="unit_revolution_per_minute">об/мин</string>
   <string name="unit_watt">Вт</string>
-  <string name="voice_total_distance_zero">My Tracks нет расстояния</string>
   <string name="voice_per_kilometer">за километр</string>
   <string name="voice_per_mile">за милю</string>
+  <string name="voice_total_distance_zero">My Tracks нет расстояния</string>
   <string name="welcome_about">О My Tracks</string>
   <string name="welcome_title">Добро пожаловать</string>
 </resources>
diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml
index 532248b47..727f6db4c 100644
--- a/MyTracks/res/values-sv/strings.xml
+++ b/MyTracks/res/values-sv/strings.xml
@@ -25,7 +25,6 @@ limitations under the License.
   <string name="eula_accept">Acceptera</string>
   <string name="eula_decline">Avböj</string>
   <string name="eula_title">Licensavtal för slutanvändare</string>
-  <string name="export_progress_message">Skriver till SD-kortet. Detta kan ta en stund.</string>
   <string name="export_success">Exporteringen slutfördes</string>
   <string name="generic_cancel">Avbryt</string>
   <string name="generic_confirm_title">Är du säker?</string>
@@ -76,6 +75,7 @@ limitations under the License.
   <string name="sd_card_error_create_dir">Kunde inte skapa katalog på SD-kort.</string>
   <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_progress_write_file">Skriver till SD-kortet. Detta kan ta en stund.</string>
   <string name="sd_card_success_write_file">Slutförde skrivningen av spåret till SD-kort.</string>
   <string name="send_google_choose_account_title">Välj konto</string>
   <string name="send_google_docs">Google Dokument</string>
@@ -169,9 +169,9 @@ limitations under the License.
   <string name="unit_minute">min</string>
   <string name="unit_minute_per_kilometer">min/km</string>
   <string name="unit_minute_per_mile">min/mi</string>
-  <string name="voice_total_distance_zero">My Tracks ingen distans</string>
   <string name="voice_per_kilometer">per kilometer</string>
   <string name="voice_per_mile">per mile</string>
+  <string name="voice_total_distance_zero">My Tracks ingen distans</string>
   <string name="welcome_about">Om My Tracks</string>
   <string name="welcome_title">Välkommen</string>
 </resources>
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index 4f92f43fc..75bceab54 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -27,8 +27,6 @@ limitations under the License.
   <string name="eula_accept">同意</string>
   <string name="eula_decline">拒绝</string>
   <string name="eula_title">最终用户协议</string>
-  <string name="export_canceled">操作已被取消.</string>
-  <string name="export_progress_message">写入文件到 SD 卡中. 请稍候.</string>
   <string name="export_success">导出完毕</string>
   <string name="generic_cancel">取消</string>
   <string name="generic_confirm_title">请确认</string>
@@ -84,9 +82,11 @@ limitations under the License.
   <string name="my_maps_list_public_label">公开</string>
   <string name="my_maps_list_title">发送到 Google My Maps</string>
   <string name="my_maps_list_unlisted_label">未公布</string>
+  <string name="sd_card_canceled">操作已被取消.</string>
   <string name="sd_card_error_create_dir">无法在 SD 存储卡上创建目录.</string>
   <string name="sd_card_error_no_storage">没有发现存储设备. 请确认插入了 SD 存储卡并且你的手机没有将挂载 SD 卡到电脑.</string>
   <string name="sd_card_error_write_file">无法写入文件.</string>
+  <string name="sd_card_progress_write_file">写入文件到 SD 卡中. 请稍候.</string>
   <string name="sd_card_success_read_file">从 SD 存储卡读取完毕.</string>
   <string name="sd_card_success_write_file">轨迹已导出到 SD 存储卡.</string>
   <string name="send_google_choose_account_title">选择帐户</string>
@@ -226,9 +226,9 @@ limitations under the License.
   <string name="track_record_success">现在开始记录新的轨迹.</string>
   <string name="unit_hour">时</string>
   <string name="unit_minute">分</string>
-  <string name="voice_total_distance_zero">My Tracks 无距离</string>
   <string name="voice_per_kilometer">每千米</string>
   <string name="voice_per_mile">每英里</string>
+  <string name="voice_total_distance_zero">My Tracks 无距离</string>
   <string name="welcome_about">关于 My Tracks</string>
   <string name="welcome_title">欢迎</string>
 </resources>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 3ba133ca3..01386e311 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -610,24 +610,16 @@ limitations under the License.
   </string>
 
   <!-- Export -->
-  <string name="export_canceled"
-    translation_description="When exporting a track to the SD card, a message indicating that the
-      export operation was canceled.">
-    The operation was canceled.
-  </string>
   <string name="export_error"
-    translation_description="When exporting a track to the SD card, a generic error message
-      indicating unable to export.">
+    translation_description="When exporting all the tracks to the SD card, a toast message
+      indicating error.">
     Unable to export.
   </string>
-  <string name="export_progress_message"
-    translation_description="When exporting a track to the SD card, the message on the progress
-      dialog indicating that it may take a while.">
-    Exporting a track to the SD card. This may take a while.
-  </string>
   <string name="export_success"
-    translation_description="After exporting all the tracks to the SD card, a toast message
-      indicating success.">
+    translation_description="When exporting all the tracks to the SD card, a toast message
+      indicating success.
+
+      Screenshot: export_success">
     Export finished.
   </string>
 
@@ -637,7 +629,9 @@ limitations under the License.
     Cancel
   </string>
   <string name="generic_confirm_title"
-    translation_description="The title on a confirmation dialog asking the user if he is sure?">
+    translation_description="The title on a confirmation dialog asking the user if he is sure?
+
+      Screenshot: marker_list_delete_marker_confirm_message.png">
     Are you sure?
   </string>
   <string name="generic_error_title"
@@ -653,7 +647,9 @@ limitations under the License.
     OK
   </string>
   <string name="generic_progress_title"
-    translation_description="The title on a progress dialog asking the user to wait.">
+    translation_description="The title on a progress dialog asking the user to wait.
+
+      Screenshot: sc_card_progress_write_file.png">
     Please wait...
   </string>
   <string name="generic_save"
@@ -661,7 +657,9 @@ limitations under the License.
     Save
   </string>
   <string name="generic_success_title"
-    translation_description="The title on an alert dialog indicating success.">
+    translation_description="The title on an alert dialog indicating success.
+
+      Screenshot: sc_card_success_write_file.png">
     Success
   </string>
   <string name="generic_yes"
@@ -671,18 +669,23 @@ limitations under the License.
 
   <!-- GPS -->
   <string name="gps_need_to_enable"
-    translation_description="In the main view, the message on the top asking the user to enable
-      GPS.">
+    translation_description="In the main view, the message on the top asking the user to enable GPS.
+
+      Screenshot: gps_not_found.png">
     Please tap here to go to \'Location &amp; security\' settings &amp; check
     \'Use GPS satellites\'. Press the back button to return.
   </string>
   <string name="gps_not_found"
-    translation_description="On application start, message when there is no GPS on the device.">
+    translation_description="On application start, message when there is no GPS on the device.
+
+      Screenshot: gps_not_found.png">
     No GPS is found on the device.
   </string>
   <string name="gps_wait_for_fix"
     translation_description="In the main view, the message on the top indicating My Tracks is
-      waiting for a better GPS fix.">
+      waiting for a better GPS fix.
+
+      Screenshot: gps_wait_fix.png">
     Waiting for a better GPS fix. Make sure the sky is visible.
   </string>
 
@@ -729,7 +732,8 @@ limitations under the License.
     translation_description="After importing all the tracks from the SD card, the alert message
       indicating that no track is imported.
 
-      %1$s: the SD card directory path. E.g., '/mnt/sdcard/MyTracks/gpx/'.">
+      %1$s: the SD card directory path. E.g., '/mnt/sdcard/MyTracks/gpx/'.
+      Screenshot: import_no_file.png">
     No GPX file found in %1$s. The SD card may be unreadable or the directory may not contain any
     GPX file.
   </string>
@@ -739,34 +743,45 @@ limitations under the License.
 
       %1$d the number of successfully imported tracks. E.g., '1'.
       %2$s the number of GPX files in the SD card. E.g., '1 GPX file' or '2 GPX files'.
-      %3$s the SD card directory path. E.g., '/mnt/sdcard/MyTracks/gpx/'.">
+      %3$s the SD card directory path. E.g., '/mnt/sdcard/MyTracks/gpx/'.
+      Screenshot: import_success.png">
     My Tracks: Imported %1$d of %2$s from %3$s.
   </string>
 
   <!-- Marker -->
   <string name="marker_detail_marker_description"
     translation_description="In the detail page for a waypoint marker, the text field for the marker
-      description.">
+      description.
+
+      Screenshot: marker_detail.png">
     Marker description
   </string>
   <string name="marker_detail_marker_name"
     translation_description="In the detail page for a waypoint or statistics marker, text field for
-      the marker name.">
+      the marker name.
+
+      Screenshot: marker_detail.png">
     Marker name
   </string>
   <string name="marker_detail_marker_type"
     translation_description="In the detail page for a waypoint marker, the text field for the
-      marker type, including examples.">
+      marker type, including examples.
+
+      Screenshot: marker_detail.png">
     Marker type (e.g. building, pothole, sight...)
   </string>
   <string name="marker_detail_marker_type_hint"
     translation_description="In the detail page for a waypoint marker, the hint in the 'Marker type'
-      text field when it is empty.">
+      text field when it is empty.
+
+      Screenshot: marker_detail.png">
     Marker type
   </string>
   <string name="marker_detail_title"
     translation_description="In the detail page for a waypoint or statistics marker, the title of
-      the page.">
+      the page.
+
+      Screenshot: marker_detail.png">
     Marker details
   </string>
   <string name="marker_insert_error"
@@ -775,7 +790,9 @@ limitations under the License.
     Unable to insert a marker. No GPS location. Try again.
   </string>
   <string name="marker_insert_success"
-    translation_description="When inserting a new marker, a message indicating success.">
+    translation_description="When inserting a new marker, a message indicating success.
+
+      Screenshot: marker_insert_success.png">
     A marker was inserted.
   </string>
   <string name="marker_label_end"
@@ -790,51 +807,71 @@ limitations under the License.
   </string>
   <string name="marker_list_context_menu_title"
     translation_description="In the context menu for a marker, the title indicating that all the
-      menu options below are for this marker.">
+      menu options below are for this marker.
+
+      Screenshot: marker_list_context_menu.png">
     This marker
   </string>
   <string name="marker_list_delete_marker"
     translation_description="In the context menu for a marker, the menu option to delete the
-      marker.">
+      marker.
+
+      Screenshot: marker_list_context_menu.png">
     Delete
   </string>
   <string name="marker_list_delete_marker_confirm_message"
     translation_description="In the context menu for a marker, when pressing the 'Delete' option,
       the confirmation dialog message informing the user that the marker will be permanently
-      deleted from the phone.">
+      deleted from the phone.
+
+      Screenshot: marker_list_delete_marker_confirm_message.png">
     The marker will be permanently deleted from the phone.
   </string>
   <string name="marker_list_edit_marker"
     translation_description="In the context menu for a marker, the menu option to edit the marker's
-      metadata (e.g., name, type, etc.).">
+      metadata (e.g., name, type, etc.).
+
+      Screenshot: marker_list_context_menu.png">
     Edit
   </string>
   <string name="marker_list_insert_statistics"
     translation_description="In the Markers page, the button on the bottom to insert a statistics
-      marker.">
+      marker.
+
+      Screenshot: marker_list.png">
     Insert statistics
   </string>
   <string name="marker_list_insert_waypoint"
     translation_description="In the Markers page, the button on the bottom to insert a waypoint
-      marker.">
+      marker.      
+
+      Screenshot: marker_list.png">
     Insert waypoint
   </string>
   <string name="marker_list_pick_one"
     translation_description="In the Markers page, the instruction at the top of the page informing
-      the user he can press and hold a marker for more options.">
+      the user he can press and hold a marker for more options.
+      
+      Screenshot: marker_list.png">
     Pick a marker. Press &amp; hold for more options.
   </string>
   <string name="marker_list_show_on_map"
     translation_description="In the context menu for a marker, the menu option to show the marker
-      on the map.">
+      on the map.
+
+      Screenshot: marker_list_context_menu.png">
     Show on map
   </string>
   <string name="marker_type_statistics"
-    translation_description="When inserting a statistics marker, the default name of the marker.">
+    translation_description="When inserting a statistics marker, the default name of the marker.
+
+      Screenshot: marker_type_statistics.png">
     Statistics
   </string>
   <string name="marker_type_waypoint"
-    translation_description="When inserting a waypoint marker, the default name of the marker.">
+    translation_description="When inserting a waypoint marker, the default name of the marker.
+
+      Screenshot: marker_detail.png">
     Waypoint
   </string>
 
@@ -1047,6 +1084,13 @@ limitations under the License.
   </string>
 
   <!-- SD Card -->
+  <string name="sd_card_canceled"
+    translation_description="When exporting a track to the SD card, a message indicating that the
+      export operation was canceled.
+      
+      Screenshot: sd_card_canceled.png">      
+    The operation was canceled.
+  </string>
   <string name="sd_card_error_create_dir"
     translation_description="When writing to the SD card, the error message when not able to create
       a directory on the SD card.">
@@ -1068,14 +1112,25 @@ limitations under the License.
       file.">
     Unable to write to a file.
   </string>
+  <string name="sd_card_progress_write_file"
+    translation_description="When writing to the SD card, the progress dialog message indicating
+      that it may take a while.
+
+      Screenshot: sd_card_progress_write_file.png">      
+    Exporting a track to the SD card. This may take a while.
+  </string>
   <string name="sd_card_success_read_file"
     translation_description="When reading from the SD card, the success message when finish reading
-      from the SD card.">
+      from the SD card.
+
+      Screenshot: sc_card_success_read_file.png">
     Finished reading from the SD card.
   </string>
   <string name="sd_card_success_write_file"
     translation_description="When writing to the SD card, the success message when finish writing to
-      the SD card.">
+      the SD card.
+
+      Screenshot: sd_card_success_write_file.png">  
     Finished writing to the SD card.
   </string>
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
index 4432e21d7..51852802c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
@@ -114,7 +114,7 @@ class TrackWriterImpl implements TrackWriter {
   private void doWriteTrack() {
     // Open the input and output
     success = false;
-    errorMessage = R.string.export_error;
+    errorMessage = R.string.sd_card_error_write_file;
     if (track != null) {
       if (openFile()) {
         try {
@@ -127,7 +127,7 @@ class TrackWriterImpl implements TrackWriter {
             }
           }
           success = false;
-          errorMessage = R.string.export_canceled;
+          errorMessage = R.string.sd_card_canceled;
         }
       }
     }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java
index 15b48cf1d..8da3a1871 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java
@@ -81,7 +81,7 @@ class WriteProgressController {
     dialog.setIcon(android.R.drawable.ic_dialog_info);
     dialog.setTitle(activity.getString(R.string.generic_progress_title));
     dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
-    dialog.setMessage(activity.getString(R.string.export_progress_message));
+    dialog.setMessage(activity.getString(R.string.sd_card_progress_write_file));
     dialog.setIndeterminate(true);
     dialog.setOnCancelListener(dialogCancelListener);
     return dialog;
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java
index ada16bc30..55204969f 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java
@@ -214,7 +214,7 @@ public class TrackWriterTest extends AndroidTestCase {
     mocksControl.verify();
 
     assertFalse(writer.wasSuccess());
-    assertEquals(R.string.export_canceled, writer.getErrorMessage());
+    assertEquals(R.string.sd_card_canceled, writer.getErrorMessage());
   }
 
   public void testWriteTrack_openFails() {