From 16dd54299a840b4f874f7855ca1e35a03b48c7ea Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Sun, 13 Nov 2011 17:18:58 -0800
Subject: [PATCH] One round of proofreading of strings.xml

- add period when appropriate
- remove capitalization (only capitalize first word)
- add a 'title' suffix to title strings
- for Dynamic thresholds, rename to 'Medium Speed Percentage'
  because the value is a percentage.
- tranlstate 'my_tracks_service_name' string.
---
 MyTracks/res/layout/send_to_google_result.xml |   2 +-
 MyTracks/res/values-ca/strings.xml            |  14 +-
 MyTracks/res/values-de/strings.xml            |  14 +-
 MyTracks/res/values-es-rES/strings.xml        |   4 +-
 MyTracks/res/values-es/strings.xml            |  14 +-
 MyTracks/res/values-fi/strings.xml            |  16 +-
 MyTracks/res/values-fr/strings.xml            |  12 +-
 MyTracks/res/values-it/strings.xml            |  12 +-
 MyTracks/res/values-ja/strings.xml            |  14 +-
 MyTracks/res/values-pl/strings.xml            |  14 +-
 MyTracks/res/values-pt-rBR/strings.xml        |  12 +-
 MyTracks/res/values-ru/strings.xml            |  16 +-
 MyTracks/res/values-sv/strings.xml            |  12 +-
 MyTracks/res/values-zh-rCN/strings.xml        |  16 +-
 MyTracks/res/values/do_not_translate.xml      |   2 +-
 MyTracks/res/values/strings.xml               | 569 ++++++++++--------
 .../android/apps/mytracks/AccountChooser.java |   4 +-
 .../android/apps/mytracks/MapActivity.java    |   2 +-
 .../android/apps/mytracks/TrackList.java      |   2 +-
 .../android/apps/mytracks/WaypointsList.java  |   2 +-
 .../io/backup/BackupActivityHelper.java       |   2 +-
 .../apps/mytracks/io/file/SaveActivity.java   |   2 +-
 .../io/sendtogoogle/ResultDialogFactory.java  |   4 +-
 23 files changed, 405 insertions(+), 356 deletions(-)

diff --git a/MyTracks/res/layout/send_to_google_result.xml b/MyTracks/res/layout/send_to_google_result.xml
index 344cf1725..bba36ca80 100644
--- a/MyTracks/res/layout/send_to_google_result.xml
+++ b/MyTracks/res/layout/send_to_google_result.xml
@@ -31,7 +31,7 @@ services.
   <TextView
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:text="@string/send_google_result_title"
+      android:text="@string/send_google_result_header"
       style="?android:attr/textAppearanceLarge"/>
   <TableLayout
       android:layout_width="wrap_content"
diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index 6a386e777..3f92a445a 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -29,12 +29,12 @@ limitations under the License.
   <string name="export_success">Exporta les finalitzades</string>
   <string name="generic_cancel">Cancel·la</string>
   <string name="generic_confirm_title">Esteu segur?</string>
-  <string name="generic_error">Error</string>
+  <string name="generic_error_title">Error</string>
   <string name="generic_no">No</string>
   <string name="generic_ok">D\'acord</string>
   <string name="generic_progress_title">Espereu...</string>
   <string name="generic_save">Desa</string>
-  <string name="generic_success">Fet</string>
+  <string name="generic_success_title">Fet</string>
   <string name="generic_yes">Sí</string>
   <string name="gps_need_to_enable">Toqueu aquí per anar als paràmetres de seguretat i ubicació i activeu \'habilita els satèl·lits GPS\'. Premeu el botó d\'anar enrere per tornar.</string>
   <string name="gps_not_found">No s\'ha trobat cap proveïdor d\'ubicació GPS en aquest dispositiu.</string>
@@ -48,6 +48,7 @@ limitations under the License.
   <string name="marker_insert_success">S\'ha inserit un marcador d\'estadístiques.</string>
   <string name="marker_label_end">(Fi)</string>
   <string name="marker_label_start">(Inici)</string>
+  <string name="marker_list_context_menu_title">Aquest marcador</string>
   <string name="marker_list_delete_marker">Elimina</string>
   <string name="marker_list_delete_marker_confirm_message">El marcador s\'eliminarà de forma permanent d\'aquest telèfon.</string>
   <string name="marker_list_edit_marker">Edita els detalls</string>
@@ -55,7 +56,6 @@ limitations under the License.
   <string name="marker_list_insert_waypoint">Insereix un punt de referència</string>
   <string name="marker_list_pick_one">Seleccioneu un marcador. Mantingueu el dit per veure més opcions.</string>
   <string name="marker_list_show_on_map">Mostra al mapa</string>
-  <string name="marker_list_this_marker">Aquest marcador</string>
   <string name="marker_type_statistics">Estadístiques</string>
   <string name="marker_type_waypoint">Punt de referència</string>
   <string name="menu_aggregated_statistics">Estadístiques agregades</string>
@@ -81,10 +81,10 @@ limitations under the License.
   <string name="sd_card_error_write_file">No es pot escriure a un fitxer.</string>
   <string name="sd_card_success_read_file">S\'ha finalitzat la lectura a la targeta SD.</string>
   <string name="sd_card_success_write_file">S\'ha finalitzat l\'escriptura a la targeta SD.</string>
-  <string name="send_google_choose_account">Trieu un compte</string>
+  <string name="send_google_choose_account_title">Trieu un compte</string>
   <string name="send_google_error">S\'ha produït un error. Proveu de nou.</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_no_account_title">No s\'ha trobat cap compte</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_recorded">Enregistrat</string>
@@ -108,7 +108,7 @@ limitations under the License.
   <string name="settings_backup_restore_confirm_message">La restauració d\'una còpia de seguretat des de la targeta SD sobreescriurà totes les rutes i paràmetres. Esteu segur?</string>
   <string name="settings_backup_restore_no_backup">No s\'ha trobat cap còpia de seguretat.</string>
   <string name="settings_backup_restore_progress_message">S\'estan llegint totes les rutes i els paràmetres de la targeta SD. Això pot trigar una estona...</string>
-  <string name="settings_backup_restore_select">Seleccioneu la còpia que es restaurarà</string>
+  <string name="settings_backup_restore_select_title">Seleccioneu la còpia que es restaurarà</string>
   <string name="settings_backup_restore_summary">Restaura totes les rutes i els paràmetres des de la targeta SD.</string>
   <string name="settings_backup_sd_card">Còpia de seguretat a la targeta SD</string>
   <string name="settings_display">Visualització</string>
@@ -181,6 +181,7 @@ limitations under the License.
   <string name="track_detail_track_description">Descripció de la ruta</string>
   <string name="track_detail_track_name">Nom de la ruta</string>
   <string name="track_list_clear_map">Neteja el mapa</string>
+  <string name="track_list_context_menu_title">Aquesta ruta</string>
   <string name="track_list_delete_all">Elimina totes les rutes</string>
   <string name="track_list_delete_all_confirm_message">Tots els marcadors i rutes s\'eliminaran d\'aquest telèfon.</string>
   <string name="track_list_delete_track">Elimina del telèfon...</string>
@@ -192,7 +193,6 @@ limitations under the License.
   <string name="track_list_send_google">Envia a Google...</string>
   <string name="track_list_share_track">Comparteix amb amics...</string>
   <string name="track_list_show_on_map">Mostra</string>
-  <string name="track_list_this_track">Aquesta ruta</string>
   <string name="track_name_format">Ruta %d</string>
   <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>
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index e33fc331b..861080237 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -29,11 +29,11 @@ limitations under the License.
   <string name="export_success">Exportieren beendet</string>
   <string name="generic_cancel">Abbrechen</string>
   <string name="generic_confirm_title">Bist Du Dir wirklich sicher?</string>
-  <string name="generic_error">Fehler</string>
+  <string name="generic_error_title">Fehler</string>
   <string name="generic_no">Nein</string>
   <string name="generic_progress_title">Bitte warten…</string>
   <string name="generic_save">Sichern</string>
-  <string name="generic_success">Erfolgreich</string>
+  <string name="generic_success_title">Erfolgreich</string>
   <string name="generic_yes">Ja</string>
   <string name="gps_need_to_enable">Hier berühren, um zu den Sicherheits- und Positionseinstellungen zu gelangen. Aktiviere \'GPS-Satelliten\'. Drücke dann den Zurück-Knopf, um hierher zurückzukehren.</string>
   <string name="gps_not_found">Es wurde kein GPS-Empfänger auf diesem Gerät gefunden.</string>
@@ -46,6 +46,7 @@ limitations under the License.
   <string name="marker_insert_error">Der Wegpunkt kann nicht einfügt werden. Keine Positionsbestimmung möglich.</string>
   <string name="marker_insert_success">Ein Statistikwegpunkt wurde eingefügt.</string>
   <string name="marker_label_end">(Ende)</string>
+  <string name="marker_list_context_menu_title">Dieser Wegpunkt</string>
   <string name="marker_list_delete_marker">Löschen</string>
   <string name="marker_list_delete_marker_confirm_message">Dieser Wegpunkt wird endgültig von diesem Gerät gelöscht.</string>
   <string name="marker_list_edit_marker">Details bearbeiten</string>
@@ -53,7 +54,6 @@ limitations under the License.
   <string name="marker_list_insert_waypoint">Wegpunkt einfügen</string>
   <string name="marker_list_pick_one">Wegpunkt auswählen. Lange berühren für mehr Optionen.</string>
   <string name="marker_list_show_on_map">Auf der Karte zeigen</string>
-  <string name="marker_list_this_marker">Dieser Wegpunkt</string>
   <string name="marker_type_statistics">Statistik</string>
   <string name="marker_type_waypoint">Wegpunkt</string>
   <string name="menu_aggregated_statistics">Aggregierte Statistiken</string>
@@ -84,11 +84,11 @@ limitations under the License.
   <string name="sd_card_error_write_file">Die Datei kann nicht geschrieben werden.</string>
   <string name="sd_card_success_read_file">Lesen von der SD-Karte beendet.</string>
   <string name="sd_card_success_write_file">Der Track wurde auf die SD-Karte geschrieben.</string>
-  <string name="send_google_choose_account">Wähle ein Konto</string>
+  <string name="send_google_choose_account_title">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_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_no_account_title">Kein Konto vorhanden</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_recorded">Aufgezeichnet am</string>
@@ -113,7 +113,7 @@ limitations under the License.
   <string name="settings_backup_restore_confirm_message">Eine Wiederherstellung von der SD-Karte ÜBERSCHREIBT alle vorhandenen Tracks und Einstellungen. Willst Du das wirklich?</string>
   <string name="settings_backup_restore_no_backup">Keine Datensicherungen gefunden.</string>
   <string name="settings_backup_restore_progress_message">Lese alle Tracks und Einstellungen von der SD-Karte. Dies kann eine Weile dauern...</string>
-  <string name="settings_backup_restore_select">Wähle die wiederherzustellende Datensicherung aus</string>
+  <string name="settings_backup_restore_select_title">Wähle die wiederherzustellende Datensicherung aus</string>
   <string name="settings_backup_restore_summary">Alle Tracks und Einstellungen von der SD-Karte holen.</string>
   <string name="settings_backup_sd_card">SD-Karten-Sicherung</string>
   <string name="settings_display">Anzeige</string>
@@ -190,6 +190,7 @@ limitations under the License.
   <string name="track_detail_track_description">Beschreibung</string>
   <string name="track_detail_track_name">Name</string>
   <string name="track_list_clear_map">Karte zurücksetzen.</string>
+  <string name="track_list_context_menu_title">Dieser Track</string>
   <string name="track_list_delete_all">Alle Tracks löschen</string>
   <string name="track_list_delete_all_confirm_message">Alle Tracks und Wegpunkte werden endgültig von diesem Gerät gelöscht.</string>
   <string name="track_list_delete_track">Vom Gerät löschen…</string>
@@ -201,7 +202,6 @@ limitations under the License.
   <string name="track_list_send_google">An Google senden…</string>
   <string name="track_list_share_track">Mit Freunden teilen…</string>
   <string name="track_list_show_on_map">Anzeigen</string>
-  <string name="track_list_this_track">Dieser Track</string>
   <string name="track_record_error">Start der Aufzeichnung fehlgeschlagen. Bitte versuche es noch einmal.</string>
   <string name="track_record_notification">Dein Track wird aufgezeichnet…</string>
   <string name="track_record_success">Ein neuer Track wird aufgezeichnet.</string>
diff --git a/MyTracks/res/values-es-rES/strings.xml b/MyTracks/res/values-es-rES/strings.xml
index 42225a080..d22e1a99b 100644
--- a/MyTracks/res/values-es-rES/strings.xml
+++ b/MyTracks/res/values-es-rES/strings.xml
@@ -24,9 +24,9 @@ limitations under the License.
   <string name="sd_card_error_read_file">No es posible leer del fichero.</string>
   <string name="sd_card_success_read_file">Lectura de tarjeta SD terminada.</string>
   <string name="sd_card_success_write_file">Grabación a tarjeta SD terminada.</string>
-  <string name="send_google_choose_account">Elegir cuenta</string>
-  <string name="send_google_no_account">No se ha encontrado la cuenta</string>
+  <string name="send_google_choose_account_title">Elegir cuenta</string>
   <string name="send_google_no_account_message">No se ha encontrado la cuenta a la que subir los recorridos.</string>
+  <string name="send_google_no_account_title">No se ha encontrado la cuenta</string>
   <string name="settings_display_speed">Mostrar velocidad</string>
   <string name="settings_recording_voice_not_available">No está disponible en su versión de Android</string>
   <string name="settings_sensor_type_ant">ANT+ Sensores</string>
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index 4cd26f1ce..b6a093e87 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -34,7 +34,7 @@ limitations under the License.
   <string name="generic_confirm_title">¿Está usted seguro?</string>
   <string name="generic_progress_title">Por favor espere...</string>
   <string name="generic_save">Guardar</string>
-  <string name="generic_success">Éxito</string>
+  <string name="generic_success_title">Éxito</string>
   <string name="generic_yes">Sí</string>
   <string name="gps_need_to_enable">Por favor, presione aquí para ir al menú de Seguridad y Ubicación, y asegúrese que el GPS esté habilitado. Presione el botón "atrás" para regresar.</string>
   <string name="gps_not_found">Ningún proveedor de ubicación GPS fue hallado en este dispositivo.</string>
@@ -51,6 +51,7 @@ limitations under the License.
   <string name="marker_insert_success">Un marcador de estadísticas fue insertado.</string>
   <string name="marker_label_end">(Fin)</string>
   <string name="marker_label_start">(Inicio)</string>
+  <string name="marker_list_context_menu_title">Este marcador</string>
   <string name="marker_list_delete_marker">Borrar</string>
   <string name="marker_list_delete_marker_confirm_message">La señal será borrada permanentemente de este teléfono.</string>
   <string name="marker_list_edit_marker">Editar detalles"</string>
@@ -58,7 +59,6 @@ limitations under the License.
   <string name="marker_list_insert_waypoint">Insertar marcador"</string>
   <string name="marker_list_pick_one">Escoja un marcador. Presione&amp; mantenga presionado para ver más opciones.</string>
   <string name="marker_list_show_on_map">Mostrar en el mapa"</string>
-  <string name="marker_list_this_marker">Este marcador</string>
   <string name="marker_type_statistics">Estadísticas</string>
   <string name="marker_type_waypoint">Marcador de recorrido</string>
   <string name="menu_aggregated_statistics">Estadísticas recorrido</string>
@@ -94,19 +94,19 @@ limitations under the License.
   <string name="sd_card_error_write_file">No es posible escribir al archivo.</string>
   <string name="sd_card_success_read_file">Lectura de tarjeta SD concluída.</string>
   <string name="sd_card_success_write_file">Grabación a tarjeta SD concluída.</string>
-  <string name="send_google_choose_account">Elija una cuenta</string>
+  <string name="send_google_choose_account_title">Elija una cuenta</string>
   <string name="send_google_error">A ocurrido un error. Por favor, inténtelo de nuevo.</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_no_account_title">Cuenta no encontrada</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_recorded">Grabado</string>
+  <string name="send_google_result_header">Estado del envío:</string>
   <string name="send_google_result_share_url">Compartir recorrido</string>
-  <string name="send_google_result_title">Estado del envío:</string>
   <string name="send_google_send_now">Enviar ahora</string>
   <string name="send_google_success_footer">Es posible que pasen unos minutos hasta que los nuevos recorridos aparezcan.</string>
   <string name="send_google_title">Enviar a...</string>
@@ -128,7 +128,7 @@ limitations under the License.
   <string name="settings_backup_restore_confirm_message">Restaurar una copia seguridad desde la tarjeta SD SOBREESCRIBIRÁ todos sus recorridos y configuraciones actuales. ¿Está usted seguro?</string>
   <string name="settings_backup_restore_no_backup">No se han encontrado copias seguridad.</string>
   <string name="settings_backup_restore_progress_message">Leyendo todos los recorridos y configuraciones desde la tarjeta SD. Esto puede llevar un rato...</string>
-  <string name="settings_backup_restore_select">Seleccionar la copia seguridad para restaurar</string>
+  <string name="settings_backup_restore_select_title">Seleccionar la copia seguridad para restaurar</string>
   <string name="settings_backup_restore_summary">Restaurar todos los recorridos y configuraciones desde la tarjeta SD</string>
   <string name="settings_backup_sd_card">Copia seguridad en tarjeta SD</string>
   <string name="settings_display">Visualizador</string>
@@ -231,6 +231,7 @@ limitations under the License.
   <string name="track_detail_track_description">Descripción del recorrido</string>
   <string name="track_detail_track_name">Nombre del recorrido</string>
   <string name="track_list_clear_map">"Limpiar mapa"</string>
+  <string name="track_list_context_menu_title">Este recorrido"</string>
   <string name="track_list_delete_all">Borrar todos</string>
   <string name="track_list_delete_all_confirm_message">Todos los recorridos y señales serán borradas de este teléfono.</string>
   <string name="track_list_delete_track">Borrar del teléfono...</string>
@@ -244,7 +245,6 @@ limitations under the License.
   <string name="track_list_share_track">Compartir con amigos..."</string>
   <string name="track_list_share_url">Un enlace al mapa</string>
   <string name="track_list_show_on_map">Mostrar</string>
-  <string name="track_list_this_track">Este recorrido"</string>
   <string name="track_name_format">Recorrido %d</string>
   <string name="track_record_error">No se puede iniciar la grabación. Inténtelo de nuevo. </string>
   <string name="track_record_notification">Grabando su recorrido...</string>
diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml
index 298d4f426..53f85482c 100644
--- a/MyTracks/res/values-fi/strings.xml
+++ b/MyTracks/res/values-fi/strings.xml
@@ -32,12 +32,12 @@ limitations under the License.
   <string name="export_success">Vienti tehty</string>
   <string name="generic_cancel">Peruuta</string>
   <string name="generic_confirm_title">Oletko varma?</string>
-  <string name="generic_error">Virhe</string>
+  <string name="generic_error_title">Virhe</string>
   <string name="generic_no">Ei</string>
   <string name="generic_ok">OK</string>
   <string name="generic_progress_title">Odota...</string>
   <string name="generic_save">Tallenna</string>
-  <string name="generic_success">Valmis</string>
+  <string name="generic_success_title">Valmis</string>
   <string name="generic_yes">Kyllä</string>
   <string name="gps_need_to_enable">Avaa tästä Sijainti ja suojaus -asetukset ja valitse \'Käytä GPS-satelliitteja\'. Palaa ohjelmaan painamalla Takaisin-näppäintä.</string>
   <string name="gps_not_found">GPS-palvelua ei löytynyt.</string>
@@ -54,6 +54,7 @@ limitations under the License.
   <string name="marker_insert_success">Tilastomerkintä lisätty.</string>
   <string name="marker_label_end">(Maali)</string>
   <string name="marker_label_start">(Lähtö)</string>
+  <string name="marker_list_context_menu_title">Tämä merkintä</string>
   <string name="marker_list_delete_marker">Poista</string>
   <string name="marker_list_delete_marker_confirm_message">Merkintä poistetaan puhelimesta.</string>
   <string name="marker_list_edit_marker">Muokkaa tietoja</string>
@@ -61,7 +62,6 @@ limitations under the License.
   <string name="marker_list_insert_waypoint">Lisää reittipiste</string>
   <string name="marker_list_pick_one">Valitse merkintä. Pitkä painallus tuo esiin lisää vaihtoehtoja.</string>
   <string name="marker_list_show_on_map">Näytä kartalla</string>
-  <string name="marker_list_this_marker">Tämä merkintä</string>
   <string name="marker_type_statistics">Tilastot</string>
   <string name="marker_type_waypoint">Reittipiste</string>
   <string name="menu_aggregated_statistics">Yhteenlasketut tilastot</string>
@@ -97,19 +97,19 @@ limitations under the License.
   <string name="sd_card_error_write_file">Kirjoitusvirhe.</string>
   <string name="sd_card_success_read_file">SD-kortin luku valmis.</string>
   <string name="sd_card_success_write_file">SD-kortille kirjoitus valmis.</string>
-  <string name="send_google_choose_account">Valitse tili</string>
+  <string name="send_google_choose_account_title">Valitse tili</string>
   <string name="send_google_docs">Google Docs</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_no_account_title">Tiliä ei löytynyt</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_recorded">Tallennettu</string>
+  <string name="send_google_result_header">Lähetyksen tila:</string>
   <string name="send_google_result_share_url">Jaa reitti</string>
-  <string name="send_google_result_title">Lähetyksen tila:</string>
   <string name="send_google_send_now">Lähetä</string>
   <string name="send_google_success_footer">Reitin näkyminen saattaa kestää muutaman minuutin.</string>
   <string name="send_google_title">Lähetä...</string>
@@ -131,7 +131,7 @@ limitations under the License.
   <string name="settings_backup_restore_confirm_message">Palautus SD-kortilta ylikirjoittaa kaikki nykyiset reitit ja asetukset. Jatketaanko?</string>
   <string name="settings_backup_restore_no_backup">Varmuuskopioita ei löytynyt.</string>
   <string name="settings_backup_restore_progress_message">Luetaan varmuuskopiota SD-kortilta. Odota...</string>
-  <string name="settings_backup_restore_select">Valitse palautettava varmuuskopio</string>
+  <string name="settings_backup_restore_select_title">Valitse palautettava varmuuskopio</string>
   <string name="settings_backup_restore_summary">Palauta kaikki reitit ja asetukset SD-kortilta</string>
   <string name="settings_backup_sd_card">Varmuuskopioi SD-kortille</string>
   <string name="settings_display">Näyttö</string>
@@ -219,6 +219,7 @@ limitations under the License.
   <string name="track_detail_track_description">Reitin kuvaus</string>
   <string name="track_detail_track_name">Reitin nimi</string>
   <string name="track_list_clear_map">Tyhjennä kartta</string>
+  <string name="track_list_context_menu_title">Tämä reitti</string>
   <string name="track_list_delete_all">Poista kaikki</string>
   <string name="track_list_delete_all_confirm_message">Kaikki reitit ja merkinnät poistetaan puhelimesta.</string>
   <string name="track_list_delete_track">Poista puhelimesta...</string>
@@ -232,7 +233,6 @@ limitations under the License.
   <string name="track_list_share_track">Jaa...</string>
   <string name="track_list_share_url">Linkki karttaan</string>
   <string name="track_list_show_on_map">Näytä</string>
-  <string name="track_list_this_track">Tämä reitti</string>
   <string name="track_name_format">Reitti %d</string>
   <string name="track_record_error">Tallennusta ei voitu aloittaa. Yritä uudelleen.</string>
   <string name="track_record_notification">Tallennetaan reittiä...</string>
diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml
index 81d11edc5..162c25ee0 100644
--- a/MyTracks/res/values-fr/strings.xml
+++ b/MyTracks/res/values-fr/strings.xml
@@ -26,7 +26,7 @@ limitations under the License.
   <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">Erreur</string>
+  <string name="generic_error_title">Erreur</string>
   <string name="generic_no">Non</string>
   <string name="generic_progress_title">Patientez SVP...</string>
   <string name="generic_save">Enregistrer</string>
@@ -43,6 +43,7 @@ limitations under the License.
   <string name="marker_insert_success">Une balise de statistiques a été insérée.</string>
   <string name="marker_label_end">(Fin)</string>
   <string name="marker_label_start">(Début)</string>
+  <string name="marker_list_context_menu_title">Ce marqueur</string>
   <string name="marker_list_delete_marker">Supprimer</string>
   <string name="marker_list_delete_marker_confirm_message">Les balises vont être supprimées de manière permanente de ce téléphone.</string>
   <string name="marker_list_edit_marker">Consulter les détails</string>
@@ -50,7 +51,6 @@ limitations under the License.
   <string name="marker_list_insert_waypoint">Ajout point de passage</string>
   <string name="marker_list_pick_one">Choisissez une balise. Faites un appui prolongé pour plus d\'options.</string>
   <string name="marker_list_show_on_map">Indiquer sur la carte</string>
-  <string name="marker_list_this_marker">Ce marqueur</string>
   <string name="marker_type_statistics">Statistiques</string>
   <string name="marker_type_waypoint">Point de passage</string>
   <string name="menu_aggregated_statistics">Statistiques consolidées</string>
@@ -79,9 +79,9 @@ limitations under the License.
   <string name="sd_card_error_no_storage">Aucun emplacement externe de sauvegarde n\'a été trouvé. Assurez-vous qu\'une carte SD est insérée et que votre téléphone n\'est pas relié à un ordinateur.</string>
   <string name="sd_card_error_write_file">Impossible d\'écrire dans le fichier.</string>
   <string name="sd_card_success_write_file">Parcours enregistré sur la carte SD.</string>
-  <string name="send_google_choose_account">Choisissez un compte</string>
-  <string name="send_google_no_account">Pas de compte Google</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>
+  <string name="send_google_no_account_title">Pas de compte Google</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_recorded">Enregistré</string>
@@ -105,7 +105,7 @@ limitations under the License.
   <string name="settings_backup_restore_confirm_message">Restaurer une sauvegarde depuis la carte SD écrasera tous vos parcours et paramètres actuels.</string>
   <string name="settings_backup_restore_no_backup">Pas de sauvegarde disponible.</string>
   <string name="settings_backup_restore_progress_message">Lecture de tous vos parcours et paramètres depuis la carte SD. Veuillez patienter...</string>
-  <string name="settings_backup_restore_select">Choisissez la sauvegarde à restaurer</string>
+  <string name="settings_backup_restore_select_title">Choisissez la sauvegarde à restaurer</string>
   <string name="settings_backup_restore_summary">Restaurer tous les parcours et paramètres depuis la carte SD</string>
   <string name="settings_backup_sd_card">Sauvegarde sur carte SD</string>
   <string name="settings_display">Affichage</string>
@@ -179,6 +179,7 @@ limitations under the License.
   <string name="track_detail_track_description">Description du parcours</string>
   <string name="track_detail_track_name">Nom du parcours</string>
   <string name="track_list_clear_map">Effacer la carte</string>
+  <string name="track_list_context_menu_title">Ce parcours</string>
   <string name="track_list_delete_all">Tout supprimer</string>
   <string name="track_list_delete_all_confirm_message">Tous les parcours et balises vont être supprimés de ce téléphone.</string>
   <string name="track_list_delete_track">Effacer du téléphone...</string>
@@ -190,7 +191,6 @@ limitations under the License.
   <string name="track_list_send_google">Envoyer à Google...</string>
   <string name="track_list_share_track">Partager...</string>
   <string name="track_list_show_on_map">Afficher</string>
-  <string name="track_list_this_track">Ce parcours</string>
   <string name="track_name_format">Parcours %d</string>
   <string name="track_record_error">Impossible de débuter l\'enregistrement. Réessayez.</string>
   <string name="track_record_notification">Enregistrement de votre parcours...</string>
diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml
index b4bd7d1b1..131e275a3 100644
--- a/MyTracks/res/values-it/strings.xml
+++ b/MyTracks/res/values-it/strings.xml
@@ -29,12 +29,12 @@ limitations under the License.
   <string name="export_success">Esportazione terminata.</string>
   <string name="generic_cancel">Annulla</string>
   <string name="generic_confirm_title">Sei sicuro?</string>
-  <string name="generic_error">Errore</string>
+  <string name="generic_error_title">Errore</string>
   <string name="generic_no">No</string>
   <string name="generic_ok">OK</string>
   <string name="generic_progress_title">Attendi per favore...</string>
   <string name="generic_save">Salva</string>
-  <string name="generic_success">Successo</string>
+  <string name="generic_success_title">Successo</string>
   <string name="generic_yes">Sì</string>
   <string name="gps_need_to_enable">Premi qui per andare a «Impostazioni di posizione e protezione» e attiva «Utilizza satelliti GPS». Poi premi il tasto di ritorno per tornare qui.</string>
   <string name="gps_not_found">Nessuna fonte di posizione GPS trovata su questo dispositivo.</string>
@@ -48,6 +48,7 @@ limitations under the License.
   <string name="marker_insert_success">Inserito un segnaposto con statistiche.</string>
   <string name="marker_label_end">(Fine)</string>
   <string name="marker_label_start">(Inizio)</string>
+  <string name="marker_list_context_menu_title">Questo segnaposto</string>
   <string name="marker_list_delete_marker">Elimina</string>
   <string name="marker_list_delete_marker_confirm_message">Il segnaposto sarà eliminato definitivamente da questo telefono.</string>
   <string name="marker_list_edit_marker">Modifica dettagli</string>
@@ -55,7 +56,6 @@ limitations under the License.
   <string name="marker_list_insert_waypoint">Inserisci punto di passaggio</string>
   <string name="marker_list_pick_one">Scegli un segnaposto. Tieni premuto per più opzioni.</string>
   <string name="marker_list_show_on_map">Mostra sulla mappa</string>
-  <string name="marker_list_this_marker">Questo segnaposto</string>
   <string name="marker_type_statistics">Statistiche</string>
   <string name="marker_type_waypoint">Punto di passaggio</string>
   <string name="menu_chart_view_chart_settings">Impostazioni grafico</string>
@@ -77,10 +77,10 @@ limitations under the License.
   <string name="sd_card_error_no_storage">Nessuna memoria esterna trovata. Assicurati che la scheda SD sia inserita e che il telefono no sia montato su un computer.</string>
   <string name="sd_card_error_write_file">Impossibile scrivere su file.</string>
   <string name="sd_card_success_write_file">Finito di salvare il percorso sulla scheda SD.</string>
-  <string name="send_google_choose_account">Scegli un account</string>
+  <string name="send_google_choose_account_title">Scegli un account</string>
   <string name="send_google_docs">Google Docs</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_no_account_title">Account non trovato</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_recorded">Registrato</string>
@@ -143,6 +143,7 @@ limitations under the License.
   <string name="track_detail_track_description">Descrizione del percorso</string>
   <string name="track_detail_track_name">Nome del percorso</string>
   <string name="track_list_clear_map">Cancella la mappa</string>
+  <string name="track_list_context_menu_title">Questo percorso</string>
   <string name="track_list_delete_all">Elimina tutti i percorsi</string>
   <string name="track_list_delete_all_confirm_message">Tutti i percorsi e segnaposti saranno eliminati definitivamente da questo telefono.</string>
   <string name="track_list_delete_track">Elimina dal telefono...</string>
@@ -155,7 +156,6 @@ limitations under the License.
   <string name="track_list_share_track">Condividi con amici...</string>
   <string name="track_list_share_url">Un link alla mappa</string>
   <string name="track_list_show_on_map">Mostra</string>
-  <string name="track_list_this_track">Questo percorso</string>
   <string name="track_name_format">Percorso %d</string>
   <string name="track_record_error">Impossibile iniziare la registrazione. Riprova.</string>
   <string name="track_record_notification">Registrazione del percorso in corso...</string>
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index 1dc6abe9e..f736cde23 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -31,11 +31,11 @@ limitations under the License.
   <string name="export_success">出力終了</string>
   <string name="generic_cancel">キャンセル</string>
   <string name="generic_confirm_title">よろしいですか?</string>
-  <string name="generic_error">エラー</string>
+  <string name="generic_error_title">エラー</string>
   <string name="generic_no">いいえ</string>
   <string name="generic_progress_title">お待ちください...</string>
   <string name="generic_save">保存</string>
-  <string name="generic_success">成功</string>
+  <string name="generic_success_title">成功</string>
   <string name="generic_yes">はい</string>
   <string name="gps_need_to_enable">ここをタップして「位置情報とセキュリティの設定」を開いて「GPS機能を使用」にチェックを入れて下さい．バックボタンで戻ってください．</string>
   <string name="gps_not_found">この端末でGPSロケーションプロバイダを発見できました．</string>
@@ -52,6 +52,7 @@ limitations under the License.
   <string name="marker_insert_success">統計マーカーを挿入しました．</string>
   <string name="marker_label_end">(終了)</string>
   <string name="marker_label_start">(開始)</string>
+  <string name="marker_list_context_menu_title">このマーカー</string>
   <string name="marker_list_delete_marker">削除</string>
   <string name="marker_list_delete_marker_confirm_message">マーカーをこの端末から完全に削除します．</string>
   <string name="marker_list_edit_marker">詳細編集</string>
@@ -59,7 +60,6 @@ limitations under the License.
   <string name="marker_list_insert_waypoint">ウェイポイントの挿入</string>
   <string name="marker_list_pick_one">マーカーを選択します．オプションを表示するには長押しして下さい．</string>
   <string name="marker_list_show_on_map">マップに表示</string>
-  <string name="marker_list_this_marker">このマーカー</string>
   <string name="marker_type_statistics">統計</string>
   <string name="marker_type_waypoint">ウェイポイント</string>
   <string name="menu_aggregated_statistics">集計情報</string>
@@ -95,12 +95,12 @@ limitations under the License.
   <string name="sd_card_error_write_file">ファイルへの書き込みができません．</string>
   <string name="sd_card_success_read_file">SDカードからの読み込み終了．</string>
   <string name="sd_card_success_write_file">SDカードへの書き込み終了．</string>
-  <string name="send_google_choose_account">アカウント選択</string>
+  <string name="send_google_choose_account_title">アカウント選択</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_no_account_title">アカウントを発見できませんでした．</string>
   <string name="send_google_progress_preparing_track">トラックを準備しています...</string>
   <string name="send_google_progress_reading_track">トラックを読んでいます...</string>
   <string name="send_google_recorded">記録日</string>
@@ -125,7 +125,7 @@ limitations under the License.
   <string name="settings_backup_restore_confirm_message">SDカードからの復元を実行すると、現在のトラックと設定は *全て上書き* されてしまいます．よろしいですか?</string>
   <string name="settings_backup_restore_no_backup">バックアップがありません．</string>
   <string name="settings_backup_restore_progress_message">SDカードから全てのトラックと設定を復元しています．しばらくかかることがあります...</string>
-  <string name="settings_backup_restore_select">復元するバックアップの選択</string>
+  <string name="settings_backup_restore_select_title">復元するバックアップの選択</string>
   <string name="settings_backup_restore_summary">SDカードから全てのトラックと設定を復元します</string>
   <string name="settings_backup_sd_card">SDカード バックアップ</string>
   <string name="settings_display">表示</string>
@@ -206,6 +206,7 @@ limitations under the License.
   <string name="track_detail_track_description">トラック説明</string>
   <string name="track_detail_track_name">トラック名</string>
   <string name="track_list_clear_map">マップのクリア</string>
+  <string name="track_list_context_menu_title">このトラック</string>
   <string name="track_list_delete_all">全て削除</string>
   <string name="track_list_delete_all_confirm_message">全てのトラックとマーカーをこの端末から削除します．</string>
   <string name="track_list_delete_track">端末から削除...</string>
@@ -219,7 +220,6 @@ limitations under the License.
   <string name="track_list_share_track">共有...</string>
   <string name="track_list_share_url">マップへのリンク</string>
   <string name="track_list_show_on_map">表示</string>
-  <string name="track_list_this_track">このトラック</string>
   <string name="track_name_format">トラック %d</string>
   <string name="track_record_error">記録作成開始できません．もう一度試して下さい．</string>
   <string name="track_record_notification">トラックを保存中...</string>
diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml
index ea58096c4..8b769797c 100644
--- a/MyTracks/res/values-pl/strings.xml
+++ b/MyTracks/res/values-pl/strings.xml
@@ -29,12 +29,12 @@ limitations under the License.
   <string name="export_success">Eksport zakończony</string>
   <string name="generic_cancel">Anuluj</string>
   <string name="generic_confirm_title">Jesteś pewien?</string>
-  <string name="generic_error">Błąd</string>
+  <string name="generic_error_title">Błąd</string>
   <string name="generic_no">Nie</string>
   <string name="generic_ok">OK</string>
   <string name="generic_progress_title">Proszę czekać...</string>
   <string name="generic_save">Zapisz</string>
-  <string name="generic_success">Powodzenie</string>
+  <string name="generic_success_title">Powodzenie</string>
   <string name="generic_yes">Tak</string>
   <string name="gps_need_to_enable">Tapnij tutaj, aby przejść do ustawień Lokalizacji i zabezpieczeń, a następnie zaznacz Użyj satelitów GPS. Naciśnij klawisz Wstecz, aby powrócić.</string>
   <string name="gps_not_found">Brak dostawcy lokalizacji GPS na urządzeniu.</string>
@@ -48,6 +48,7 @@ limitations under the License.
   <string name="marker_insert_success">Wstawiono znacznik statystyk.</string>
   <string name="marker_label_end">(Koniec)</string>
   <string name="marker_label_start">(Początek)</string>
+  <string name="marker_list_context_menu_title">Ten znacznik</string>
   <string name="marker_list_delete_marker">Usuń</string>
   <string name="marker_list_delete_marker_confirm_message">Znacznik zostanie całkowicie usunięty z telefonu.</string>
   <string name="marker_list_edit_marker">Edytuj szczegóły</string>
@@ -55,7 +56,6 @@ limitations under the License.
   <string name="marker_list_insert_waypoint">Wstaw punkt orientacyjny</string>
   <string name="marker_list_pick_one">Wybierz znacznik. Naciśnij i przytrzymaj, aby wybrać opcje.</string>
   <string name="marker_list_show_on_map">Pokaż na mapie</string>
-  <string name="marker_list_this_marker">Ten znacznik</string>
   <string name="marker_type_statistics">Statystyki</string>
   <string name="marker_type_waypoint">Punkt orientacyjny</string>
   <string name="menu_aggregated_statistics">Statystyki Grupowe</string>
@@ -80,10 +80,10 @@ limitations under the License.
   <string name="sd_card_error_write_file">Nie można zapisać pliku.</string>
   <string name="sd_card_success_read_file">Zakończono odczytywanie z karty SD.</string>  
   <string name="sd_card_success_write_file">Zakończono zapisywanie na karcie SD.</string>
-  <string name="send_google_choose_account">Wybierz konto</string>
+  <string name="send_google_choose_account_title">Wybierz konto</string>
   <string name="send_google_docs">Dokumenty Google</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_no_account_title">Znaleziono nowe konto</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_recorded">Zapisana</string>
@@ -104,7 +104,7 @@ limitations under the License.
   <string name="settings_backup_restore_confirm_message">Odtworzenie z kopii zapasowej z karty SD zastąpi wszystkie bieżące trasy i ustawienia. Jesteś tego pewien?</string>
   <string name="settings_backup_restore_no_backup">Nie znaleziono kopii zapasowych.</string>
   <string name="settings_backup_restore_progress_message">Odczytywanie wszystkich tras i ustawień z karty SD. To może trochę potrwać...</string>
-  <string name="settings_backup_restore_select">Wybierz kopię do odtworzenia</string>
+  <string name="settings_backup_restore_select_title">Wybierz kopię do odtworzenia</string>
   <string name="settings_backup_restore_summary">Odtwarza wszystkie trasy i ustawienia z kopii zapasowej z karty SD</string>
   <string name="settings_backup_sd_card">Kopia zapasowa na kartę SD</string>
   <string name="settings_display">Wyświetlanie</string>
@@ -173,6 +173,7 @@ limitations under the License.
   <string name="track_detail_track_description">Opis trasy</string>
   <string name="track_detail_track_name">Nazwa trasy</string>
   <string name="track_list_clear_map">Wyczyść mapę</string>
+  <string name="track_list_context_menu_title">Ta trasa</string>
   <string name="track_list_delete_all">Usuń wszystkie trasy</string>
   <string name="track_list_delete_all_confirm_message">Wszystkie trasy i znaczniki zostaną usunięte z telefonu.</string>
   <string name="track_list_delete_track">Usuń z telefonu...</string>
@@ -184,7 +185,6 @@ limitations under the License.
   <string name="track_list_send_google">Wyślij do Google...</string>
   <string name="track_list_share_track">Podziel się z przyjaciółmi...</string>
   <string name="track_list_show_on_map">Pokaż</string>
-  <string name="track_list_this_track">Ta trasa</string>
   <string name="track_name_format">Trasa %d</string>
   <string name="track_record_error">Nie można rozpocząć rejestrowania. Spróbuj ponownie.</string>
   <string name="track_record_notification">Rejestrowanie twojej trasy...</string>
diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml
index b9b9ff7a5..62740a36e 100644
--- a/MyTracks/res/values-pt-rBR/strings.xml
+++ b/MyTracks/res/values-pt-rBR/strings.xml
@@ -28,11 +28,11 @@ limitations under the License.
   <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">Erro</string>
+  <string name="generic_error_title">Erro</string>
   <string name="generic_no">Não</string>
   <string name="generic_progress_title">Por favor aguarde...</string>
   <string name="generic_save">Salvar</string>
-  <string name="generic_success">Successo</string>
+  <string name="generic_success_title">Successo</string>
   <string name="generic_yes">Sim</string>
   <string name="gps_need_to_enable">"Por favor pressione aqui para ir aos ajustes de segurança e localização e verifique que o GPS esteja habilitado. Pressione o botão de voltar para retornar.</string>
   <string name="gps_not_found">"Provedor de posição de GPS não encontrado neste dispositivo.</string>
@@ -46,6 +46,7 @@ limitations under the License.
   <string name="marker_insert_success">Um marcador de estatísticas foi inserido..</string>
   <string name="marker_label_end">(Fim)</string>
   <string name="marker_label_start">(Início)</string>
+  <string name="marker_list_context_menu_title">Este Marcador</string>
   <string name="marker_list_delete_marker">Apagar</string>
   <string name="marker_list_delete_marker_confirm_message">O marcador será permanentemente apagado deste telefone.</string>
   <string name="marker_list_edit_marker">Editar detalhes</string>
@@ -53,7 +54,6 @@ limitations under the License.
   <string name="marker_list_insert_waypoint">Inserir ponto no caminho</string>
   <string name="marker_list_pick_one">Escolha um marcador.  Pressione&amp;segure para mais opções.</string>
   <string name="marker_list_show_on_map">Mostrar no mapa</string>
-  <string name="marker_list_this_marker">Este Marcador</string>
   <string name="marker_type_statistics">Estatísticas</string>
   <string name="marker_type_waypoint">Ponto de passagem</string>
   <string name="menu_chart_view_chart_settings">Configurações do gráfico</string>
@@ -75,10 +75,10 @@ limitations under the License.
   <string name="sd_card_error_no_storage">Nenhum armazenamento externo foi encontrado. Assegure-se de que um cartão SD esteja inserido e que seu telefone não esteja montado em um computador.</string>
   <string name="sd_card_error_write_file">Impossível gravar arquivo.</string>
   <string name="sd_card_success_write_file">Gravação no cartão SD concluída.</string>
-  <string name="send_google_choose_account">Escolher conta</string>
+  <string name="send_google_choose_account_title">Escolher conta</string>
   <string name="send_google_docs">Google Docs</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_no_account_title">Nenhuma conta encontrada</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_recorded">Gravado</string>
@@ -141,6 +141,7 @@ limitations under the License.
   <string name="track_detail_track_description">Descrição do Caminho</string>
   <string name="track_detail_track_name">Nome do Caminho</string>
   <string name="track_list_clear_map">Limpar mapa</string>
+  <string name="track_list_context_menu_title">Este Caminho</string>
   <string name="track_list_delete_all">Apagar todos os caminhos</string>
   <string name="track_list_delete_all_confirm_message">Todos os seus caminhos e marcadores serão apagados deste telefone.</string>
   <string name="track_list_delete_track">Apagar do telefone...</string>
@@ -152,7 +153,6 @@ limitations under the License.
   <string name="track_list_share_track">Compartilhar com amigos...</string>
   <string name="track_list_share_url">Um link para a mapa</string>
   <string name="track_list_show_on_map">Mostrar</string>
-  <string name="track_list_this_track">Este Caminho</string>
   <string name="track_name_format">"Caminho %d</string>
   <string name="track_record_error">Impossível iniciar a gravação. Tente novamente.</string>
   <string name="track_record_notification">"Gravando seu caminho...</string>
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index 44a7a91dc..186f57e87 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -31,12 +31,12 @@ limitations under the License.
   <string name="export_success">Экспорт закончен</string>
   <string name="generic_cancel">Отмена</string>
   <string name="generic_confirm_title">Вы уверены?</string>
-  <string name="generic_error">Ошибка</string>
+  <string name="generic_error_title">Ошибка</string>
   <string name="generic_no">Нет</string>
   <string name="generic_ok">ОК</string>
   <string name="generic_progress_title">Пожалуйста, подождите...</string>
   <string name="generic_save">Сохранить</string>
-  <string name="generic_success">Готово</string>
+  <string name="generic_success_title">Готово</string>
   <string name="generic_yes">Да</string>
   <string name="gps_need_to_enable">Пожалуйста, нажмите здесь для перехода к разделу настроек Координаты и отметьте пункт \"Спутники GPS\". Для возвращения нажмите кнопку Назад.</string>
   <string name="gps_not_found">На этом устройстве не был обнаружен поставщик GPS местоположения.</string>
@@ -53,6 +53,7 @@ limitations under the License.
   <string name="marker_insert_success">Маркер статистики был вставлен.</string>
   <string name="marker_label_end">(Конец)</string>
   <string name="marker_label_start">(Старт)</string>
+  <string name="marker_list_context_menu_title">Этот маркер</string>
   <string name="marker_list_delete_marker">Удалить</string>
   <string name="marker_list_delete_marker_confirm_message">Маркер будет удален с этого телефона.</string>
   <string name="marker_list_edit_marker">Править детали</string>
@@ -60,7 +61,6 @@ limitations under the License.
   <string name="marker_list_insert_waypoint">Вставить путевую точку</string>
   <string name="marker_list_pick_one">Выберите маркер. Нажмите и удерживайте для получения дополнительных возможностей.</string>
   <string name="marker_list_show_on_map">Показать на карте</string>
-  <string name="marker_list_this_marker">Этот маркер</string>
   <string name="marker_type_statistics">Статистика</string>
   <string name="marker_type_waypoint">Путевая точка</string>
   <string name="menu_aggregated_statistics">Совокупная статистика</string>
@@ -96,19 +96,19 @@ limitations under the License.
   <string name="sd_card_error_write_file">Невозможно записать файл.</string>
   <string name="sd_card_success_read_file">Чтение с SD карты закончено.</string>
   <string name="sd_card_success_write_file">Запись на SD карту закончена.</string>
-  <string name="send_google_choose_account">Выбор учетной записи</string>
+  <string name="send_google_choose_account_title">Выбор учетной записи</string>
   <string name="send_google_docs">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_no_account_title">Учетная запись не найдена</string>
   <string name="send_google_progress_preparing_track">Подготовка трека...</string>
   <string name="send_google_progress_reading_track">Чтение трека...</string>
   <string name="send_google_recorded">Записан</string>
+  <string name="send_google_result_header">Статус загрузки:</string>
   <string name="send_google_result_share_url">Поделиться треком</string>
-  <string name="send_google_result_title">Статус загрузки:</string>
   <string name="send_google_send_now">Отправить</string>
   <string name="send_google_success_footer">Это может занять несколько минут, прежде чем появятся новые треки.</string>
   <string name="send_google_title">Отправить...</string>
@@ -129,7 +129,7 @@ limitations under the License.
   <string name="settings_backup_restore_confirm_message">Восстановление резервной копии с SD карты ПЕРЕЗАПИШЕТ все текущие треки и настройки. Вы уверены?</string>
   <string name="settings_backup_restore_no_backup">Резервные копии не найдены.</string>
   <string name="settings_backup_restore_progress_message">Чтение всех треков и настроек с SD-карты. Это может занять некоторое время...</string>
-  <string name="settings_backup_restore_select">Выберите резервную копию для восстановления</string>
+  <string name="settings_backup_restore_select_title">Выберите резервную копию для восстановления</string>
   <string name="settings_backup_restore_summary">Восстановить все треки и параметры с SD карты</string>
   <string name="settings_backup_sd_card">Резервное копирование SD карты</string>
   <string name="settings_display">Отображение</string>
@@ -215,6 +215,7 @@ limitations under the License.
   <string name="track_detail_track_description">Описание трека</string>
   <string name="track_detail_track_name">Название трека</string>
   <string name="track_list_clear_map">Очистить карту</string>
+  <string name="track_list_context_menu_title">Этот трек</string>
   <string name="track_list_delete_all">Удалить все</string>
   <string name="track_list_delete_all_confirm_message">Все треки и маркеры будут удалены с этого телефона.</string>
   <string name="track_list_delete_track">Удалить из телефона...</string>
@@ -228,7 +229,6 @@ limitations under the License.
   <string name="track_list_share_track">Поделиться с друзьями...</string>
   <string name="track_list_share_url">Ссылка на карту</string>
   <string name="track_list_show_on_map">Показать</string>
-  <string name="track_list_this_track">Этот трек</string>
   <string name="track_name_format">Трек %d</string>
   <string name="track_record_error">Не удалось начать запись. Попробуйте еще раз.</string>
   <string name="track_record_notification">Запись трека...</string>
diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml
index 4c68224fd..123d4df31 100644
--- a/MyTracks/res/values-sv/strings.xml
+++ b/MyTracks/res/values-sv/strings.xml
@@ -29,12 +29,12 @@ limitations under the License.
   <string name="export_success">Exporteringen slutfördes</string>
   <string name="generic_cancel">Avbryt</string>
   <string name="generic_confirm_title">Är du säker?</string>
-  <string name="generic_error">Fel</string>
+  <string name="generic_error_title">Fel</string>
   <string name="generic_no">Nej</string>
   <string name="generic_ok">OK</string>
   <string name="generic_progress_title">Var god vänta...</string>
   <string name="generic_save">Spara</string>
-  <string name="generic_success">Lyckades</string>
+  <string name="generic_success_title">Lyckades</string>
   <string name="generic_yes">Ja</string>
   <string name="gps_need_to_enable">Klicka här för att gå till Säkerhet och Platsinställningar och kryssa i \'aktivera gps-satteliter\'. Tryck på tillbakaknappen för att återgå.</string>
   <string name="gps_not_found">Ingen GPS-positioneringstjänst hittades på denna enhet.</string>
@@ -48,6 +48,7 @@ limitations under the License.
   <string name="marker_insert_success">En statistikmarkör har lagts in.</string>
   <string name="marker_label_end">(Slut)</string>
   <string name="marker_label_start">(Start)</string>
+  <string name="marker_list_context_menu_title">Den här markören</string>
   <string name="marker_list_delete_marker">Ta bort</string>
   <string name="marker_list_delete_marker_confirm_message">Markören kommer att permanent tas bort från telefonen.</string>
   <string name="marker_list_edit_marker">Ändra detaljer</string>
@@ -55,7 +56,6 @@ limitations under the License.
   <string name="marker_list_insert_waypoint">Infoga positionspunkt</string>
   <string name="marker_list_pick_one">Välj en markör. Tryck &amp; håll för fler alternativ.</string>
   <string name="marker_list_show_on_map">Visa på karta</string>
-  <string name="marker_list_this_marker">Den här markören</string>
   <string name="marker_type_statistics">Statistik</string>
   <string name="marker_type_waypoint">Positionsmärke</string>
   <string name="menu_chart_view_chart_settings">Diagraminställningar</string>
@@ -77,10 +77,10 @@ limitations under the License.
   <string name="sd_card_error_no_storage">Ingen extern lagring hittades. Se till att ett SD-kort sitter i och att telefonen inte är monterad till en dator.</string>
   <string name="sd_card_error_write_file">Kan inte skriva till filen.</string>
   <string name="sd_card_success_write_file">Slutförde skrivningen av spåret till SD-kort.</string>
-  <string name="send_google_choose_account">Välj konto</string>
+  <string name="send_google_choose_account_title">Välj konto</string>
   <string name="send_google_docs">Google Dokument</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_no_account_title">Inget konto hittades</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_recorded">Inspelad</string>
@@ -143,6 +143,7 @@ limitations under the License.
   <string name="track_detail_track_description">Spårbeskrivning</string>
   <string name="track_detail_track_name">Spårnamn</string>
   <string name="track_list_clear_map">Rensa karta</string>
+  <string name="track_list_context_menu_title">Det här spåret</string>
   <string name="track_list_delete_all">Ta bort alla spår</string>
   <string name="track_list_delete_all_confirm_message">Alla spår och markörer kommer att tas bort från telefonen.</string>
   <string name="track_list_delete_track">Ta bort från telefonen...</string>
@@ -154,7 +155,6 @@ limitations under the License.
   <string name="track_list_send_google">Skicka till Google...</string>
   <string name="track_list_share_track">Dela med vänner...</string>
   <string name="track_list_show_on_map">Visa</string>
-  <string name="track_list_this_track">Det här spåret</string>
   <string name="track_name_format">Spår %d</string>
   <string name="track_record_error">Kan inte starta inspelningen. Försök igen.</string>
   <string name="track_record_notification">Spelar in ditt spår...</string>
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index 53df9cf15..05765b4e1 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -32,12 +32,12 @@ limitations under the License.
   <string name="export_success">导出完毕</string>
   <string name="generic_cancel">取消</string>
   <string name="generic_confirm_title">请确认</string>
-  <string name="generic_error">错误</string>
+  <string name="generic_error_title">错误</string>
   <string name="generic_no">否</string>
   <string name="generic_ok">确定</string>
   <string name="generic_progress_title">请稍候...</string>
   <string name="generic_save">保存</string>
-  <string name="generic_success">成功</string>
+  <string name="generic_success_title">成功</string>
   <string name="generic_yes">是</string>
   <string name="gps_need_to_enable">请点击这里进入\'安全和位置设置\'并勾选上\'启用 GPS 卫星\'. 然后用后退键返回.</string>
   <string name="gps_not_found">此设备上没有 GPS 定位装置.</string>
@@ -54,6 +54,7 @@ limitations under the License.
   <string name="marker_insert_success">插入了一个统计标记.</string>
   <string name="marker_label_end">(结束)</string>
   <string name="marker_label_start">(开始)</string>
+  <string name="marker_list_context_menu_title">此标记</string>
   <string name="marker_list_delete_marker">删除</string>
   <string name="marker_list_delete_marker_confirm_message">选定标记将被从本机删除.</string>
   <string name="marker_list_edit_marker">编辑详情</string>
@@ -61,7 +62,6 @@ limitations under the License.
   <string name="marker_list_insert_waypoint">插入路点</string>
   <string name="marker_list_pick_one">选择一个标记. 长按弹出操作菜单.</string>
   <string name="marker_list_show_on_map">在地图上显示</string>
-  <string name="marker_list_this_marker">此标记</string>
   <string name="marker_type_statistics">统计</string>
   <string name="marker_type_waypoint">路点</string>
   <string name="menu_aggregated_statistics">累积统计</string>
@@ -90,16 +90,16 @@ limitations under the License.
   <string name="sd_card_error_write_file">无法写入文件.</string>
   <string name="sd_card_success_read_file">从 SD 存储卡读取完毕.</string>
   <string name="sd_card_success_write_file">轨迹已导出到 SD 存储卡.</string>
-  <string name="send_google_choose_account">选择帐户</string>
+  <string name="send_google_choose_account_title">选择帐户</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_no_account_title">没有帐户</string>
   <string name="send_google_progress_preparing_track">准备轨迹中...</string>
   <string name="send_google_progress_reading_track">读取轨迹中...</string>
   <string name="send_google_recorded">记录日期</string>
+  <string name="send_google_result_header">上传状态:</string>
   <string name="send_google_result_share_url">分享轨迹</string>
-  <string name="send_google_result_title">上传状态:</string>
   <string name="send_google_send_now">立即发送</string>
   <string name="send_google_success_footer">可能需要等待几分钟才能看见新的轨迹.</string>
   <string name="send_google_title">发送到...</string>
@@ -120,7 +120,7 @@ limitations under the License.
   <string name="settings_backup_restore_confirm_message">从 SD 存储卡恢复备份数据将覆盖掉你当前的所有轨迹和设置. 确定要继续吗?</string>
   <string name="settings_backup_restore_no_backup">没有找到备份文件.</string>
   <string name="settings_backup_restore_progress_message">从 SD 存储卡读取轨迹和设置中. 这需要一些时间...</string>
-  <string name="settings_backup_restore_select">请选择要恢复的备份文件</string>
+  <string name="settings_backup_restore_select_title">请选择要恢复的备份文件</string>
   <string name="settings_backup_restore_summary">从 SD 存储卡恢复所有轨迹和设置</string>
   <string name="settings_backup_sd_card">SD 存储卡备份</string>
   <string name="settings_display">显示</string>
@@ -207,6 +207,7 @@ limitations under the License.
   <string name="track_detail_track_description">轨迹描述</string>
   <string name="track_detail_track_name">轨迹名称</string>
   <string name="track_list_clear_map">清除地图</string>
+  <string name="track_list_context_menu_title">此轨迹</string>
   <string name="track_list_delete_all">删除所有轨迹</string>
   <string name="track_list_delete_all_confirm_message">所以轨迹和标记都将被从本机删除.</string>
   <string name="track_list_delete_track">从手机上删除...</string>
@@ -220,7 +221,6 @@ limitations under the License.
   <string name="track_list_share_track">与朋友分享...</string>
   <string name="track_list_share_url">访问地图的超链接</string>
   <string name="track_list_show_on_map">显示</string>
-  <string name="track_list_this_track">此轨迹</string>
   <string name="track_name_format">轨迹 %d</string>
   <string name="track_record_error">无法开始记录. 请重试.</string>
   <string name="track_record_notification">记录轨迹中...</string>
diff --git a/MyTracks/res/values/do_not_translate.xml b/MyTracks/res/values/do_not_translate.xml
index a6a15c590..bb943732e 100644
--- a/MyTracks/res/values/do_not_translate.xml
+++ b/MyTracks/res/values/do_not_translate.xml
@@ -34,7 +34,7 @@ limitations under the License.
   <string name="my_tracks_analytics_id">UA-7222692-2</string> 
   <string name="my_tracks_app_name">My Tracks</string>
   <string name="my_tracks_privacy_url">m.google.com/privacy</string>
-
+  <string name="my_tracks_recording_service_name">My Tracks Recording Service</string>
   <string name="my_tracks_web_url">mytracks.appspot.com</string>
   <string name="permission_notification_value">
     com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 7480898c6..5288a0d3d 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -18,12 +18,12 @@ limitations under the License.
 
   <!-- About Page -->
   <string name="about_copyright_notice"
-    translation_description="In the 'About' page, the copyright notice.">
+    translation_description="In the 'About My Tracks' page, the copyright notice.">
     Copyright 2009 Google Inc.
   </string>
   <string name="about_license"
-    translation_description="In the 'About' page, the button on the bottom to view the terms of
-      service agreement.">
+    translation_description="In the 'About My Tracks' page, the button on the bottom to view the
+      terms of service agreement.">
     License
   </string>
   <string name="about_privacy"
@@ -318,24 +318,24 @@ limitations under the License.
 
   <!-- Chart Settings -->
   <string name="chart_settings_by_distance"
-    translation_description="In the Chart Settings, under the 'X Axis' section, the radio option
+    translation_description="In the Chart Settings, under the 'X axis' section, the radio option
       to show the charts by distance. The other radio option is to show by time. User can only
       choose one of the options.">
-    By Distance
+    By distance
   </string>
   <string name="chart_settings_by_time"
-    translation_description="In the Chart Settings, under the 'X Axis' section, the radio option
+    translation_description="In the Chart Settings, under the 'X axis' section, the radio option
       to show the charts by time. The other radio option is to show by distance. User can only
       choose one of the options.">
-    By Time
+    By time
   </string>
   <string name="chart_settings_x_axis"
     translation_description="In the Chart Settings, the section label for configuring the X axis.">
-    X Axis
+    X axis
   </string>
   <string name="chart_settings_y_axis"
     translation_description="In the Chart Settings, the section label for configuring the Y axis.">
-    Y Axis
+    Y axis
   </string>
 
   <!-- EULA -->
@@ -372,7 +372,7 @@ limitations under the License.
   <string name="export_success"
     translation_description="After exporting all the tracks to the SD card, a toast message
       indicating success.">
-    Export finished
+    Export finished.
   </string>
 
   <!-- Generic Strings -->
@@ -384,7 +384,7 @@ limitations under the License.
     translation_description="The title on a confirmation dialog asking the user if he is sure?">
     Are you sure?
   </string>
-  <string name="generic_error"
+  <string name="generic_error_title"
     translation_description="The title on an alert dialog indicating error.">
     Error
   </string>
@@ -404,7 +404,7 @@ limitations under the License.
     translation_description="The text on a button to say save.">
     Save
   </string>
-  <string name="generic_success"
+  <string name="generic_success_title"
     translation_description="The title on an alert dialog indicating success.">
     Success
   </string>
@@ -417,8 +417,8 @@ limitations under the License.
   <string name="gps_need_to_enable"
     translation_description="In the main view, the message on the top asking the user to enable
       GPS.">
-    Please tap here to go to \'Location &amp; security\' settings and check \'Use GPS satellites\'.
-    Press the back button to return.
+    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.">
@@ -432,53 +432,60 @@ limitations under the License.
 
   <!-- Import -->
   <string name="import_error"
-    translation_description="When importing all the tracks, a toast message indicating error for
-      one of the tracks. E.g., 'Import error for file /mnt/sdcard/MyTacks/gpx/1.gpx'.">
-    Import error for file %s
+    translation_description="When importing all the tracks, a toast message indicating import error
+      for one of the tracks.
+      
+      %1$s: file path of the track encountering error. E.g., '/mnt/sdcard/MyTacks/gpx/1.gpx'.">
+    Import error for file %1$s.
   </string>
   <string name="import_no_file"
     translation_description="After importing all the tracks from the SD card, the alert message
-      indicating that no track is imported. E.g., 'No GPX file found in /mnt/sdcard/MyTracks/gpx/.
-      SD card may be unreadable or directory may not contain any GPX file.'.">
-    No GPX file found in %s. SD card may be unreadable or directory may not contain any GPX file.
+      indicating that no track is imported.
+      
+      %1$s: file path of the import directory. E.g., '/mnt/sdcard/MyTracks/gpx/'.">
+    No GPX file found in %1$s. The SD card may be unreadable or the directory may not contain any
+    GPX file.
   </string>
   <string name="import_success"
     translation_description="After importing all the tracks from the SD card, the alert message
-      indicating success. E.g., 'Imported to My Tracks 5 of 6 GPX files from
-      /mnt/sdcard/MyTracks/gpx/'.">
-    Imported to My Tracks %1$d of %2$d GPX files from %3$s
+      indicating success.
+      
+      %1$d the number of successfully imported tracks. E.g., '5'.
+      %2$d the number of total tracks to be imported. E.g., '6'.
+      %3$s file path of the import directory. E.g., '/mnt/sdcard/MyTracks/gpx/'.">
+    Imported to My Tracks %1$d of %2$d GPX files 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.">
-    Marker Description
+    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.">
-    Marker Name
+    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 (e.g. Building, Pothole, Sight...)
+    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'
+    translation_description="In the detail page for a waypoint marker, the hint in the 'Marker type'
       text field when it is empty.">
-    Marker Type
+    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.">
-    Marker Details
+    Marker details
   </string>
   <string name="marker_insert_error"
     translation_description="When inserting a marker, message when not able to insert due to no GPS
       location and asking the user to try again.">
-    Unable to insert marker. No GPS location. Try again.
+    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.">
@@ -494,6 +501,11 @@ limitations under the License.
       at the end of the marker name. E.g., the marker is named 'track_name (Start)'.">
     (Start)
   </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.">
+    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.">
@@ -530,11 +542,6 @@ limitations under the License.
       on the map.">
     Show on map
   </string>
-  <string name="marker_list_this_marker"
-    translation_description="In the context menu for a marker, the title indicating that all the
-      menu options below are for this marker.">
-    This Marker
-  </string>
   <string name="marker_type_statistics"
     translation_description="When inserting a statistics marker, the default name of the marker.">
     Statistics
@@ -547,11 +554,11 @@ limitations under the License.
   <!-- Menu Items -->
   <string name="menu_aggregated_statistics"
     translation_description="In the menu, to go to the aggregated statistics page.">
-    Aggregated Statistics
+    Aggregated statistics
   </string>
   <string name="menu_chart_view_chart_settings"
     translation_description="In the menu for the chart view, to change the chart settings.">
-    Chart Settings
+    Chart settings
   </string>
   <string name="menu_help"
     translation_description="In the menu, to go to the help page.">
@@ -559,16 +566,16 @@ limitations under the License.
   </string>
   <string name="menu_map_view_map_mode"
     translation_description="In the menu for the map view, to switch the display to the map mode.">
-    Map Mode
+    Map mode
   </string>
   <string name="menu_map_view_my_location"
     translation_description="In the menu for the map view, to display user's current location.">
-    My Location
+    My location
   </string>
   <string name="menu_map_view_satellite_mode"
     translation_description="In the menu for the map view, to switch the display to the satellite
       mode.">
-    Satellite Mode
+    Satellite mode
   </string>
   <string name="menu_markers"
     translation_description="In the menu, to show a list of markers for the current track.">
@@ -576,11 +583,11 @@ limitations under the License.
   </string>
   <string name="menu_record_track"
     translation_description="In the menu, to start recording a track.">
-    Record Track
+    Record track
   </string>
   <string name="menu_sensor_state"
     translation_description="In the menu, to go to the sensor state page.">
-    Sensor State
+    Sensor state
   </string>
   <string name="menu_settings"
     translation_description="In the menu, to go to the settings page.">
@@ -588,7 +595,7 @@ limitations under the License.
   </string>
   <string name="menu_stop_recording"
     translation_description="In the menu, to stop recording a track.">
-    Stop Recording
+    Stop recording
   </string>
   <string name="menu_tracks"
     translation_description="In the menu, to show a list of all the tracks.">
@@ -605,7 +612,7 @@ limitations under the License.
     translation_description="When displaying the user's current location, a status message
       indicating that the current location cannot be determined.">
     GPS is not available. Current location cannot be determined. Enable more location sources (see
-    \'Location &amp; security\' settings) and make sure the sky is visible. Try again later.
+    \'Location &amp; security\' settings) &amp; make sure the sky is visible. Try again later.
   </string>
 
   <!-- My Maps List -->
@@ -649,7 +656,7 @@ limitations under the License.
   <string name="my_tracks_service_name"
     translation_description="When viewing the 'Running services' on Android, the name for the My
       Tracks service.">
-    My Tracks Service
+    My Tracks service
   </string>
 
   <!-- Permission -->
@@ -698,14 +705,14 @@ limitations under the License.
   <string name="preferred_units_title"
     translation_description="The title of the dialog asking the user to choose a preferred units,
       metric or imperial.">
-    Preferred Units
+    Preferred units
   </string>
 
   <!-- SD Card -->
   <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.">
-    Unable to create directory on SD card.
+    Unable to create a directory on the SD card.
   </string>
   <string name="sd_card_error_no_storage"
     translation_description="When writing to the SD card, the error message when the SD card is not
@@ -716,35 +723,36 @@ limitations under the License.
   <string name="sd_card_error_read_file"
     translation_description="When reading from the SD card, the error message when not able to read
       a file.">
-    Unable to read from file.
+    Unable to read from a file.
   </string>
   <string name="sd_card_error_write_file"
     translation_description="When writing to the SD card, the error message when not able to write a
       file.">
-    Unable to write to file.
+    Unable to write to a file.
   </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.">
-    Finished reading from SD card.
+    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.">
-    Finished writing to SD card.
+    Finished writing to the SD card.
   </string>
 
   <!-- Send Google -->
   <string name="send_google_by_my_tracks"
     translation_description="When sending a track to Google, a note indicating it is created by
-      My Tracks on Android. The two string placeholders are used to insert the html link tags around
-      'My Tracks'. E.g., 'Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks
-      &lt;/a&gt; on Android.'.">
+      My Tracks on Android.
+      
+      %1$s: html anchor opening tag. E.g., '&lt;a href=\'http://mytracks.appspot.com\'&gt;'.
+      %2$s: html anchor closing tag. E.g., '&lt;/a&gt;'.">
     Created by %1$sMy Tracks%2$s on Android.
   </string>
-  <string name="send_google_choose_account"
+  <string name="send_google_choose_account_title"
     translation_description="When sending to Google, the dialog title to choose a Google account.">
-    Choose Account
+    Choose account
   </string>
   <string name="send_google_docs"
     translation_description="When sending a track to Google, under the 'Send to...' dialog, the
@@ -754,12 +762,14 @@ limitations under the License.
   <string name="send_google_error"
     translation_description="When sending a track to Google, a message indicating that an error has
       occurred and ask the user to try again.">
-    An error occurred. Please try again.
+    An error has occurred. Please try again.
   </string>
   <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.
+      error has occurred.
+      
+      %1$s: service name. E.g., 'Google Docs'.">
+    There was an error while sending your track to %1$s.
   </string>
   <string name="send_google_existing_map"
     translation_description="When sending a track to Google My Maps, the radio option to use an
@@ -781,25 +791,29 @@ limitations under the License.
       new map as opposed to use an existing map.">
     Create a new map
   </string>
-  <string name="send_google_no_account"
-    translation_description="When sending to Google, the dialog title when no Google account is
-      found.">
-    No Account Found
-  </string>
   <string name="send_google_no_account_message"
     translation_description="When sending to Google, the dialog message when no Google account is
       found.">
     No account found to upload tracks to.
   </string>
+  <string name="send_google_no_account_title"
+    translation_description="When sending to Google, the dialog title when no Google account is
+      found.">
+    No account found
+  </string>
   <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...
+      dialog indicating authenticating to the service.
+      
+      %1$s: service name. E.g., 'Google Docs'.">
+    Authenticating to %1$s...
   </string>
   <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...
+      dialog indicating creating a new service item.
+      
+      %1$s: service name. E.g., 'Google Docs'.">
+    Creating a new %1$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
@@ -813,25 +827,26 @@ limitations under the License.
   </string>
   <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...
+      dialog indicating My Tracks is sending the track data.
+      
+      %1$s: service name. E.g., 'Google Docs'.">      
+    Sending a track to %1$s...
   </string>
   <string name="send_google_recorded"
     translation_description="When sending a track to Google, in the track description, a tag
       for the track recorded date. E.g., 'Recorded: Tue Sep 06 15:08:30 PDT 2011'.">
     Recorded
   </string>
+  <string name="send_google_result_header"
+    translation_description="When sending a track to Google, the header on the top of the result
+      page.">
+    Upload status:
+  </string>
   <string name="send_google_result_share_url"
     translation_description="When sending a track to Google, in the result dialog, the button on
       the bottom to share with friends the URL of the uploaded track.">
     Share track URL
   </string>
-  <string name="send_google_result_title"
-    translation_description="When sending a track to Google, the header on the top of the result
-      page.">
-    Upload status:
-  </string>
   <string name="send_google_send_now"
     translation_description="When sending a track to Google, under the 'Send to...' dialog, the
       button on the bottom to send the track to the selected Google services.">
@@ -839,9 +854,10 @@ limitations under the License.
   </string>
   <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.'.">
+      page indicating that the track is sent to an existing item in the service.
+      
+      %1$s: service name. E.g., 'Google Docs'.
+      %2$s: service url. E.g., 'docs.google.com'.">         
     Your track has been sent to %1$s %2$s.
   </string>
   <string name="send_google_success_footer"
@@ -851,9 +867,10 @@ limitations under the License.
   </string>
   <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.'.">
+      page indicating that a new item has been created.
+      
+      %1$s: service name. E.g., 'Google Docs'.
+      %2$s: service url. E.g., 'docs.google.com'.">      
     A new item has been created at %1$s %2$s.
   </string>
   <string name="send_google_title"
@@ -864,54 +881,56 @@ limitations under the License.
   </string>
   <string name="send_google_track_part_label"
     translation_description="When sending a track to Google, the label to name segments when
-      splitting a large track. E.g., '(Part 1)'.">
-    (Part %d)
+      splitting a large track.
+      
+      %1$d: part number. E.g., '1'.">
+    (Part %1$d)
   </string>
 
   <!-- Sensor State -->
   <string name="sensor_state_battery"
-    translation_description="In the 'Sensor State' page, the label for the battery level on the bike
-      sensor. E.g, 'Battery Level: 50 %'.">
-    Battery Level
+    translation_description="In the 'Sensor state' page, the label for the battery level on the bike
+      sensor. E.g, 'Battery level: 50 %'.">
+    Battery level
   </string>
   <string name="sensor_state_cadence"
-    translation_description="In the 'Sensor State' page, the label for the cadence on the bike
+    translation_description="In the 'Sensor state' page, the label for the cadence on the bike
       sensor. Cadence is the number of revolutions of the crank per minute. E.g.,
       'Cadence: 80 rpm'.">
     Cadence
   </string>
   <string name="sensor_state_connected"
-    translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor
+    translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor
       has connected.">
     Connected
   </string>
   <string name="sensor_state_connecting"
-    translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor is
+    translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor is
       connecting.">
     Connecting
   </string>
   <string name="sensor_state_disconnected"
-    translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor
+    translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor
       has disconnected.">
     Disconnected
   </string>
   <string name="sensor_state_heart_rate"
-    translation_description="In the 'Sensor State' page, the label for the heart rate from a heart
-      rate sensor. E.g., 'Hear Rate: 100 bpm'.">
-    Heart Rate
+    translation_description="In the 'Sensor state' page, the label for the heart rate from a heart
+      rate sensor. E.g., 'Hear rate: 100 bpm'.">
+    Heart rate
   </string>
   <string name="sensor_state_last_sensor_time"
-    translation_description="In the 'Sensor State' page, the label for the last time the sensor has
-      sent a data. E.g., 'Last Sensor Time: 10:05 am'.">
-    Last Sensor Time
+    translation_description="In the 'Sensor state' page, the label for the last time the sensor has
+      sent a data. E.g., 'Last sensor time: 10:05 am'.">
+    Last sensor time
   </string>
   <string name="sensor_state_power"
-    translation_description="In the 'Sensor State' page, the label for the power from the bike
+    translation_description="In the 'Sensor state' page, the label for the power from the bike
       sensor. Power is the power output of the rider. E.g., 'Power: 50 W'.">
     Power
   </string>
   <string name="sensor_state_sending"
-    translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor
+    translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor
       is sending data.">
     Sending
   </string>
@@ -923,7 +942,7 @@ limitations under the License.
     Backup
   </string>
   <string name="settings_backup_now"
-    translation_description="In the Backup settings, under the 'SD Card Backup' section, the option
+    translation_description="In the Backup settings, under the 'SD card backup' section, the option
       to backup to the SD card now.">
     Backup now
   </string>
@@ -934,13 +953,13 @@ limitations under the License.
     Writing all tracks and settings to the SD card. This may take a while...
   </string>
   <string name="settings_backup_now_summary"
-    translation_description="In the Backup settings, under the 'SD Card Backup' section, the summary
+    translation_description="In the Backup settings, under the 'SD card backup' section, the summary
       for the 'Backup now' option explaining that all tracks and settings will be written to the SD
       card.">
-    Write a full copy of all your tracks and settings to the SD card
+    Write a full copy of all your tracks and settings to the SD card.
   </string>
   <string name="settings_backup_restore"
-    translation_description="In the Backup settings, under the 'SD Card Backup' section, the option
+    translation_description="In the Backup settings, under the 'SD card backup' section, the option
       to restore everything from the SD card.">
     Restore now
   </string>
@@ -948,7 +967,7 @@ limitations under the License.
     translation_description="In the Backup settings, after pressing the 'Restore now' option, the
       message in the alert dialog asking the user to confirm that he wants to restore from a backup
       and it will overwrite all the current tracks and settings.">
-    Restoring a backup from the SD card will OVERWRITE all your current tracks and settings. Are you
+    Restoring a backup from the SD card will overwrite all your current tracks and settings. Are you
     sure?
   </string>
   <string name="settings_backup_restore_no_backup"
@@ -962,21 +981,21 @@ limitations under the License.
       from the backup on the SD card and that it may take a while.">
     Reading all tracks and settings from the SD card. This may take a while...
   </string>
-  <string name="settings_backup_restore_select"
+  <string name="settings_backup_restore_select_title"
     translation_description="In the Backup settings, after pressing the 'Restore now' option, the
       title in the picker dialog asking the user to select a backup.">
-    Select the backup to restore
+    Select a backup to restore
   </string>
   <string name="settings_backup_restore_summary"
-    translation_description="In the Backup settings, under the 'SD Card Backup' section, the summary
+    translation_description="In the Backup settings, under the 'SD card backup' section, the summary
       for the 'Restore now' option explaining that it restores all tracks and settings from the SD
       card.">
-    Restore all tracks and settings from the SD card
+    Restore all tracks and settings from the SD card.
   </string>
   <string name="settings_backup_sd_card"
-    translation_description="In the Backup settings, the section title for configuring backup to the
-      SD card.">
-    SD Card Backup
+    translation_description="In the Backup settings, the section header for configuring backup to
+      the SD card.">
+    SD card backup
   </string>
   <string name="settings_display"
     translation_description="In the Settings page, the option to change the display related
@@ -990,12 +1009,12 @@ limitations under the License.
   <string name="settings_display_metric_summary_off"
     translation_description="In the Display settings, the summary for the 'Use metric units'
       checkbox when it is unchecked explaining using the imperial units to display distances.">
-    Use imperial units to display distances
+    Use imperial units to display distances.
   </string>
   <string name="settings_display_metric_summary_on"
     translation_description="In the Display settings, the summary for the 'Use metric units'
       checkbox when it is checked explaining using the metric units to display distances.">
-    Use metric units to display distances
+    Use metric units to display distances.
   </string>
   <string name="settings_display_speed"
     translation_description="In the Display settings, the checkbox option to display speed (e.g., 5
@@ -1006,13 +1025,13 @@ limitations under the License.
     translation_description="In the Display settings, the summary for the 'Display speed' checkbox
       when it is unchecked explaining that pace (e.g., 0.2 hours per mile) will be used instead of
       speed (e.g., 5 miles per hour).">
-    Display pace (e.g., hours/mile)
+    Display pace (e.g., hours/mile).
   </string>
   <string name="settings_display_speed_summary_on"
     translation_description="In the Display settings, the summary for the 'Display speed' checkbox
       when it is checked explaining that speed (e.g., 5 miles per hour) will be used instead of pace
       (e.g., 0.2 hours per mile).">
-    Display speed (e.g., miles/hour)
+    Display speed (e.g., miles/hour).
   </string>
   <string name="settings_display_track_color"
     translation_description="In the Display settings, the dropdown option to choose a track color
@@ -1024,68 +1043,68 @@ limitations under the License.
       option to use different colors to color a track based on dynamically determined speed
       thresholds. E.g., use one color for segments where the speed is below the average speed of the
       track.">
-    Dynamic Thresholds
+    Dynamic thresholds
   </string>
   <string name="settings_display_track_color_dynamic_medium"
-    translation_description="In the Display settings, under the 'Dynamic Thresholds' configurations,
-      the option for configuring the medium speed range. The track color mode will use different
-      colors to color a track depending on whether the speed is above, in, or below the medium speed
-      range.">
-    Medium speed range
+    translation_description="In the Display settings, under the 'Dynamic thresholds' configurations,
+      the option for configuring the medium speed percentage. It is the percentage from the average
+      speed to be considered as the medium speed. The track color mode will use different colors to
+      color a track depending on whether the speed is above, in, or below the medium speed range.">
+    Medium speed percentage
   </string>
   <string name="settings_display_track_color_dynamic_medium_summary"
-    translation_description="In the Display settings, under the 'Dynamic Thresholds' configurations,
-      the summary for the 'Medium speed range' option explaining that it sets a percentage from the
-      average speed to determine the medium speed range. The track color mode will use different
-      colors to color a track depending on whether the speed is above, in, or below the medium speed
-      range.">
-    Percentage from the average speed for the medium speed range
+    translation_description="In the Display settings, under the 'Dynamic thresholds' configurations,
+      the summary for the 'Medium speed percentage' option explaining that it sets a percentage from
+      the average speed to be considered as the medium speed color. The track color mode will use
+      different colors to color a track depending on whether the speed is above, in, or below the
+      medium speed range.">
+    Percentage from the average speed for the medium speed color.
   </string>
   <string name="settings_display_track_color_fixed"
     translation_description="In the Display settings, for the 'Track color mode' dropdown, the
       option to use different colors to color a track based on fixed speed thresholds. E.g., use
       one color for segments where the speed is below a fixed speed threshold.">
-    Fixed Thresholds
+    Fixed thresholds
   </string>
   <string name="settings_display_track_color_fixed_medium"
-    translation_description="In the Display settings, under the 'Fixed Thresholds' configurations,
+    translation_description="In the Display settings, under the 'Fixed thresholds' configurations,
       the option for configuring the medium speed threshold. Thus any speed lower than the
       threshold but greater than the slow speed threshold will be colored by the medium speed
       color.">
     Medium speed threshold
   </string>
   <string name="settings_display_track_color_fixed_medium_summary"
-    translation_description="In the Display settings, under the 'Fixed Thresholds' configurations,
+    translation_description="In the Display settings, under the 'Fixed thresholds' configurations,
       the summary for the 'Medium speed threshold' option explaining that it sets a cutoff speed
       for the medium speed color.">
-    Medium speed top value
+    Medium speed top value.
   </string>
   <string name="settings_display_track_color_fixed_slow"
-    translation_description="In the Display settings, under the 'Fixed Thresholds' configurations,
+    translation_description="In the Display settings, under the 'Fixed thresholds' configurations,
       the option for configuring the slow speed threshold. Thus any speed lower than the threshold
       will be colored by the slow speed color.">
     Slow speed threshold
   </string>
   <string name="settings_display_track_color_fixed_slow_summary"
-    translation_description="In the Display settings, under the 'Fixed Thresholds' configurations,
+    translation_description="In the Display settings, under the 'Fixed thresholds' configurations,
       the summary for the 'Slow speed threshold' option explaining that it sets a cutoff speed for
       the slow speed color.">
-    Slow speed top value
+    Slow speed top value.
   </string>
   <string name="settings_display_track_color_single"
     translation_description="In the Display settings, for the 'Track color mode' dropdown, the
       option to only use a single color to color a track.">
-    Single Color
+    Single color
   </string>
   <string name="settings_display_track_color_summary"
     translation_description="In the Display settings, the summary for the 'Track color mode'
       dropdown explaining that it configures how colors are used to color a track based on speed.">
-    The way to color a track based on speed
+    The way to color a track based on speed.
   </string>
   <string name="settings_not_while_recording"
     translation_description="In the Settings page, the summary for an option that is not available
       during a track recording.">
-    Not available while recording a track
+    Not available while recording a track.
   </string>
   <string name="settings_recording"
     translation_description="In the Settings page, the option to change the track recording related
@@ -1101,7 +1120,7 @@ limitations under the License.
     translation_description="In the Recording settings, the summary for the 'Auto-resume timeout'
       dropdown option explaining that it configures the maximum time after which a previous
       recording will not be resumed after phone reboot.">
-    Maximum time after which a previously recording track will not be resumed on phone reboot
+    Maximum time after which a previously recording track will not be resumed after phone reboot.
   </string>
   <string name="settings_recording_default_activity"
     translation_description="In the Recording settings, the option to specify a new track's default
@@ -1122,7 +1141,7 @@ limitations under the License.
     translation_description="In the Recording settings, the summary for the 'Distance between
       points' dropdown option explaining that it configures the smallest distance between two
       recordings of your position.">
-    Smallest distance between two recordings of your position
+    Smallest distance between two recordings of your position.
   </string>
   <string name="settings_recording_gps_accuracy"
     translation_description="In the Recording settings, the dropdown option to configure the
@@ -1134,7 +1153,7 @@ limitations under the License.
     translation_description="In the Recording settings, the summary for the 'GPS accuracy' dropdown
       option explaining that it configures the required accuracy for your position. If a GPS
       position's accuracy is below the requirement, then it will not be used.">
-    GPS position will be ignored if it is not this accurate
+    GPS position will be ignored if it is not this accurate.
   </string>
   <string name="settings_recording_interval"
     translation_description="In the Recording settings, the dropdown option to configure the
@@ -1145,7 +1164,7 @@ limitations under the License.
     translation_description="In the Recording settings, the summary for the 'Time between points'
       dropdown option explaining that it configures the smallest time interval between two
       recordings of your position.">
-    Smallest time interval between two recordings of your position
+    Smallest time interval between two recordings of your position.
   </string>
   <string name="settings_recording_marker"
     translation_description="In the Recording settings, the dropdown option to configure the time or
@@ -1156,7 +1175,7 @@ limitations under the License.
     translation_description="In the Recording settings, the summary for the 'Marker frequency'
       dropdown option explaining that it configures the time or distance after which a new marker
       will be inserted.">
-    Time/distance after which a new marker will be inserted
+    Time/distance after which a new marker will be inserted.
   </string>
   <string name="settings_recording_name"
     translation_description="In the Recording settings, the checkbox on whether the track should be
@@ -1166,13 +1185,13 @@ limitations under the License.
   <string name="settings_recording_name_summary_off"
     translation_description="In the Recording settings, the summary for the 'Use time for track
       name' checkbox when it is unchecked explaining using a number as the default track name.">
-    Use a number as the default track name
+    Use a number as the default track name.
   </string>
   <string name="settings_recording_name_summary_on"
     translation_description="In the Recording settings, the summary for the 'Use time for track
       name' checkbox when it is checked explaining using the track's start time as the default track
       name.">
-    Use the track\'s start time as the default track name
+    Use the track\'s start time as the default track name.
   </string>
   <string name="settings_recording_track_distance"
     translation_description="In the Recording settings, the dropdown option to configure the
@@ -1183,7 +1202,7 @@ limitations under the License.
     translation_description="In the Recording settings, the summary for the 'Distance between
       tracks' dropdown option explaining that it configures the maximum distance for two recorded
       points for them to be still considered as the same track.">
-    Track will be split if two recordings of your position are further than this
+    Track will be split if two recordings of your position are further than this.
   </string>
   <string name="settings_recording_voice"
     translation_description="In the Recording settings, the dropdown option to configure the voice
@@ -1193,13 +1212,13 @@ limitations under the License.
   <string name="settings_recording_voice_not_available"
     translation_description="In the Recording settings, the summary for the 'Voice frequency'
       explaining that this option is not available on your Android phone.">
-    Voice announcement is not available on your Android phone
+    Voice announcement is not available on your Android phone.
   </string>
   <string name="settings_recording_voice_summary"
     translation_description="In the Recording settings, the summary for the 'Voice frequency'
       dropdown option explaining that it configures the time or distance between two voice
       announcements.">
-    Time/distance between two voice announcements
+    Time/distance between two voice announcements.
   </string>
   <string name="settings_reset"
     translation_description="In the Settings page, the option to reset everything to the defaults.">
@@ -1221,7 +1240,7 @@ limitations under the License.
   <string name="settings_reset_summary"
     translation_description="In the Settings page, the summary for the 'Reset to defaults'
       option explaining reverting all the settings to the default values.">
-    Revert all your settings to the default values
+    Revert all your settings to the default values.
   </string>
   <string name="settings_sensor"
     translation_description="In the Settings page, the option to change the sensor related
@@ -1231,86 +1250,88 @@ limitations under the License.
   <string name="settings_sensor_ant_not_paired"
     translation_description="In the Sensor settings, the summary for 'Unpair ANT+ heart rate sensor'
       or 'Unpair SRM ANT+ bridge' when there no ANT+ device paired.">
-    Not paired
+    Not paired.
   </string>
   <string name="settings_sensor_ant_options"
-    translation_description="In the Sensor settings, the section title to configure the ANT+
+    translation_description="In the Sensor settings, the section header to configure the ANT+ 
       options.">
-    ANT+ Options
+    ANT+ options
   </string>
   <string name="settings_sensor_ant_paired"
     translation_description="In the Sensor settings, the summary for 'Unpair ANT+ heart rate sensor'
-      or 'Unpair SRM ANT+ bridge' when there is an ANT+ device paired. E.g., 'Paired with: 1'.">
-    Paired with: %d
+      or 'Unpair SRM ANT+ bridge' when there is an ANT+ device paired.
+      
+      %1$d: sensor id number. E.g., '1'.">
+    Paired with: %1$d.
   </string>
   <string name="settings_sensor_bluetooth_options"
-    translation_description="In the Sensor settings, the section title to configure the Bluetooth
+    translation_description="In the Sensor settings, the section header to configure the Bluetooth
       options.">
-   Bluetooth Options
+   Bluetooth options
   </string>
   <string name="settings_sensor_bluetooth_pairing"
-    translation_description="In the Sensor settings, under the 'Bluetooth Options' configurations,
+    translation_description="In the Sensor settings, under the 'Bluetooth options' configurations,
       the option to pair with a Bluetooth device.">
     Bluetooth pairing
   </string>
   <string name="settings_sensor_bluetooth_pairing_summary"
-    translation_description="In the Sensor settings, under the 'Bluetooth Options' configurations,
+    translation_description="In the Sensor settings, under the 'Bluetooth options' configurations,
       the summary for the 'Bluetooth pairing' option explaining that it will open the Android's
       Bluetooth settings to pair a device.">
-    Open Android\'s Bluetooth settings to pair a device
+    Open Android\'s Bluetooth settings to pair a device.
   </string>
   <string name="settings_sensor_bluetooth_sensor"
-    translation_description="In the Sensor settings, under the 'Bluetooth Options' configurations,
+    translation_description="In the Sensor settings, under the 'Bluetooth options' configurations,
       the dropdown option to pick a Bluetooth sensor.">
     Bluetooth sensor
   </string>
   <string name="settings_sensor_bluetooth_sensor_summary"
-    translation_description="In the Sensor settings, under the 'Bluetooth Options' configurations,
+    translation_description="In the Sensor settings, under the 'Bluetooth options' configurations,
       the summary for the 'Bluetooth sensor' dropdown option explaining it is to pick a Bluetooth
       sensor to connect to.">
-    The Bluetooth sensor to connect to
+    The Bluetooth sensor to connect to.
   </string>
   <string name="settings_sensor_type"
     translation_description="In the Sensor settings, the dropdown option to choose a sensor type.">
-    Sensor Type
+    Sensor type
   </string>
   <string name="settings_sensor_type_ant"
-    translation_description="In the Sensor settings, for the 'Sensor Type' dropdown, the option to
+    translation_description="In the Sensor settings, for the 'Sensor type' dropdown, the option to
       connect to an ANT+ heart rate sensor.">
-    ANT+ Heart Rate Sensor
+    ANT+ heart rate sensor
   </string>
   <string name="settings_sensor_type_none"
-    translation_description="In the Sensor settings, for the 'Sensor Type' dropdown, the option to
+    translation_description="In the Sensor settings, for the 'Sensor type' dropdown, the option to
       not connect to any sensor.">
     None
   </string>
   <string name="settings_sensor_type_polar"
-    translation_description="In the Sensor settings, for the 'Sensor Type' dropdown, the option to
+    translation_description="In the Sensor settings, for the 'Sensor type' dropdown, the option to
       connect to a Polar bluetooth sensor.">
     Polar Bluetooth
   </string>
   <string name="settings_sensor_type_srm"
-    translation_description="In the Sensor settings, for the 'Sensor Type' dropdown, the option to
+    translation_description="In the Sensor settings, for the 'Sensor type' dropdown, the option to
       connect to a SRM ANT+ bridge.">
-    SRM ANT+ Bridge
+    SRM ANT+ bridge
   </string>
   <string name="settings_sensor_type_summary"
-    translation_description="In the Sensor settings, the summary for the 'Sensor Type' option
+    translation_description="In the Sensor settings, the summary for the 'Sensor type' option
       explaining that it is to configure the type of sensor to connect to.">
-    The type of sensor to connect to
+    The type of sensor to connect to.
   </string>
   <string name="settings_sensor_type_zephyr"
-    translation_description="In the Sensor settings, for the 'Sensor Type' dropdown, the option to
+    translation_description="In the Sensor settings, for the 'Sensor type' dropdown, the option to
       connect to a Zephyr bluetooth sensor.">
     Zephyr Bluetooth
   </string>
   <string name="settings_sensor_unpair_ant"
-    translation_description="In the Sensor settings, under the 'ANT+ Options' configurations, the
+    translation_description="In the Sensor settings, under the 'ANT+ options' configurations, the
       option to unpair an ANT+ heart rate sensor.">
     Unpair ANT+ heart rate sensor
   </string>
   <string name="settings_sensor_unpair_srm"
-    translation_description="In the Sensor settings, under the 'ANT+ Options' configurations, the
+    translation_description="In the Sensor settings, under the 'ANT+ options' configurations, the
       option to unpair a SRM ANT+ bridge.">
     Unpair SRM ANT+ bridge
   </string>
@@ -1353,13 +1374,13 @@ limitations under the License.
     translation_description="In the Sharing settings, the summary for the 'Make new maps public'
       checkbox option when it is unchecked explaining that new maps created in Google My Maps will
       be unlisted, as opposed to public.">
-    Make new maps created in Google My Maps unlisted
+    Make new maps created in Google My Maps unlisted.
   </string>
   <string name="settings_sharing_map_public_summary_on"
     translation_description="In the Sharing settings, the summary for the 'Make new maps public'
       checkbox option when it is checked explaining that new maps created in Google My Maps will
       be public, as opposed to unlisted.">
-    Make new maps created in Google My Maps public
+    Make new maps created in Google My Maps public.
   </string>
   <string name="settings_sharing_url_only"
     translation_description="In the Sharing settings, the checkbox option to share only the URL
@@ -1380,7 +1401,7 @@ limitations under the License.
   </string>
   <string name="settings_title"
     translation_description="The title of the Settings page.">
-    My Tracks Settings
+    My Tracks settings
   </string>
 
   <!-- Share Track -->
@@ -1399,27 +1420,28 @@ limitations under the License.
     I would like to share a track with you
   </string>
   <string name="share_track_url_body_format"
-    translation_description="When sharing a track URL with friends, the body of the message. E.g.,
-      'I think you might be interested in this track:\n\nhttps://maps.google.com/maps'.">
-    I think you might be interested in this track:\n\n%s
+    translation_description="When sharing a track URL with friends, the body of the message.
+      
+      %1$s: url. E.g, 'https://maps.google.com/maps'.">
+    I think you might be interested in this track:\n\n%1$s
   </string>
 
   <!-- Stat Page -->
   <string name="stat_average_moving_pace"
     translation_description="In the Statistic view, the average moving pace.">
-    Average Moving Pace
+    Average moving pace
   </string>
   <string name="stat_average_moving_speed"
     translation_description="In the Statistic view, the average moving speed.">
-    Average Moving Speed
+    Average moving speed
   </string>
   <string name="stat_average_pace"
     translation_description="In the Statistic view, the average pace.">
-    Average Pace
+    Average pace
   </string>
   <string name="stat_average_speed"
     translation_description="In the Statistic view, the average speed.">
-    Average Speed
+    Average speed
   </string>
   <string name="stat_elevation"
     translation_description="In the Statistic view, the elevation.">
@@ -1427,7 +1449,7 @@ limitations under the License.
   </string>
   <string name="stat_elevation_gain"
     translation_description="In the Statistic view, the elevation gain.">
-    Elevation Gain
+    Elevation gain
   </string>
   <string name="stat_latitude"
     translation_description="In the Statistic view, the latitude.">
@@ -1439,31 +1461,31 @@ limitations under the License.
   </string>
   <string name="stat_max_elevation"
     translation_description="In the Statistic view, the maximum elevation.">
-    Max Elevation
+    Max elevation
   </string>
   <string name="stat_max_grade"
     translation_description="In the Statistic view, the maximum grade.">
-    Max Grade
+    Max grade
   </string>
   <string name="stat_max_speed"
     translation_description="In the Statistic view, the maximum speed.">
-    Max Speed
+    Max speed
   </string>
   <string name="stat_min_elevation"
     translation_description="In the Statistic view, the minimum elevation.">
-    Min Elevation
+    Min elevation
   </string>
   <string name="stat_min_grade"
     translation_description="In the Statistic view, the minimum grade.">
-    Min Grade
+    Min grade
   </string>
   <string name="stat_min_pace"
     translation_description="In the Statistic view, the minimum pace.">
-    Min Pace
+    Min pace
   </string>
   <string name="stat_moving_time"
     translation_description="In the Statistic view, the moving time.">
-    Moving Time
+    Moving time
   </string>
   <string name="stat_pace"
     translation_description="In the Statistic view, the pace like hours per mile.">
@@ -1475,42 +1497,47 @@ limitations under the License.
   </string>
   <string name="stat_total_distance"
     translation_description="In the Statistic view, the total distance.">
-    Total Distance
+    Total distance
   </string>
   <string name="stat_total_time"
     translation_description="In the Statistic view, the total time.">
-    Total Time
+    Total time
   </string>
 
   <!-- Track -->
   <string name="track_detail_activity_type"
     translation_description="In the detail page for a track, the text field for the activity type,
       including for examples.">
-    Activity Type (e.g. hiking, cycling, running, climbing...)
+    Activity type (e.g. hiking, cycling, running, climbing...)
   </string>
   <string name="track_detail_activity_type_hint"
-    translation_description="In the detail page for a track, the hint in the 'Activity Type' text
+    translation_description="In the detail page for a track, the hint in the 'Activity type' text
       field when it is empty.">
-    Activity Type
+    Activity type
   </string>
   <string name="track_detail_title"
     translation_description="In the detail page for a track, the title of the page.">
-    Track Details
+    Track details
   </string>
   <string name="track_detail_track_description"
     translation_description="In the detail page for a track, the text field for the track
       description.">
-    Track Description
+    Track description
   </string>
   <string name="track_detail_track_name"
     translation_description="In the detail page for a track, the text field for the track name.">
-    Track Name
+    Track name
   </string>
   <string name="track_list_clear_map"
     translation_description="In the context menu for a track, the menu option to clear the map
       of any track.">
     Clear map
   </string>
+  <string name="track_list_context_menu_title"
+    translation_description="In the context menu for a track, the title indicating that all the menu
+      options below are for this track.">
+    This track
+  </string>
   <string name="track_list_delete_all"
     translation_description="In the Tracks page, the button on the bottom to delete all tracks.">
     Delete all
@@ -1543,8 +1570,10 @@ limitations under the License.
   </string>
   <string name="track_list_export_file"
     translation_description="In the Tracks page, after pressing the 'Export all' button, the menu
-      option to export all the tracks as a certain file format. E.g., 'Export as GPX'.">
-    Export as %s
+      option to export all the tracks as a certain file format.
+    
+      %1$s: file format. E.g, 'GPX'.">
+    Export as %1$s
   </string>
   <string name="track_list_import_all"
     translation_description="In the Tracks page, the button on the bottom to import all tracks.">
@@ -1557,9 +1586,10 @@ limitations under the License.
   </string>
   <string name="track_list_save_file"
     translation_description="In the context menu for a track, under the 'Save to SD card...'
-      option, the menu option to save the track as a certain file format. E.g, 'Save as a GPX
-      file'.">
-    Save as a %s file
+      option, the menu option to save the track as a certain file format.
+      
+      %1$s: file format. E.g, 'GPX'.">
+    As a %1$s file
   </string>
   <string name="track_list_save_sd"
     translation_description="In the context menu for a track, the menu option to save the track to
@@ -1573,8 +1603,10 @@ limitations under the License.
   </string>
   <string name="track_list_share_file"
     translation_description="In the context menu for a track, under the 'Share with friends...'
-      option, the menu option to share the track as a certain file format. E.g, 'A GPX file'.">
-    A %s file
+      option, the menu option to share the track as a certain file format.
+      
+      %1$s: file format. E.g, 'GPX'.">
+    A %1$s file
   </string>
   <string name="track_list_share_track"
     translation_description="In the context menu for a track, the menu option to share the track
@@ -1592,15 +1624,11 @@ limitations under the License.
       the map.">
     Show on map
   </string>
-  <string name="track_list_this_track"
-    translation_description="In the context menu for a track, the title indicating that all the menu
-      options below are for this track.">
-    This Track
-  </string>
   <string name="track_name_format"
-    translation_description="When creating a new track, the string format to name the track. E.g.,
-      'Track 1'.">
-    Track %d
+    translation_description="When creating a new track, the string format to name the track.
+    
+      %1$d: track number. E.g., '1'.">
+    Track %1$d
   </string>
   <string name="track_record_error"
     translation_description="When starting a recording, message when not able to start due to no GPS
@@ -1621,7 +1649,7 @@ limitations under the License.
   <!-- Unit -->
   <string name="unit_beat_per_minute"
     translation_description="Abbreviation for beats per minute, unit for heart rate. E.g.,
-      'heart rate: 80 bpm'.">
+      'Heart rate: 80 bpm'.">
     bpm
   </string>
   <string name="unit_feet"
@@ -1666,84 +1694,108 @@ limitations under the License.
   </string>
   <string name="unit_revolution_per_minute"
     translation_description="Abbreviation for revolutions per minute, unit for cadence. E.g.,
-      'cadence: 80 rpm'.">
+      'Cadence: 80 rpm'.">
     rpm
   </string>
   <string name="unit_watt"
-    translation_description="Abbreviation for watts, unit for power. E.g., 'power: 80 W'.">
+    translation_description="Abbreviation for watts, unit for power. E.g., 'Power: 80 W'.">
     W
   </string>
 
   <!-- Value -->
   <string name="value_adapt_accuracy"
     translation_description="In a setting picker, the value to adapt for accuracy.">
-    adapt for accuracy
+    Adapt for accuracy
   </string>
   <string name="value_adapt_battery_life"
     translation_description="In a setting picker, the value to adapt for battery life.">
-    adapt for battery life
+    Adapt for battery life
   </string>
   <string name="value_always"
     translation_description="In a setting picker, the value to always enable the option.">
     Always
   </string>
   <string name="value_float_mile"
-    translation_description="In a setting picker, a float value in miles. E.g., '2.2 mi'.">
-    %.1f mi
+    translation_description="In a setting picker, a float value in miles.
+    
+      %1$.1f: mile as a float number. E.g., '2.2'">  
+    %1$.1f mi
   </string>
   <string name="value_float_mile_poor_gps"
     translation_description="In a setting picker, a float value in miles, recommended when having
-      poor GPS signal. E.g., '2.2 mi (poor GPS)'.">
-    %.1f mi (poor GPS)
+      poor GPS signal.
+      
+      %1$.1f: mile as a float number. E.g., '2.2'">  
+    %1$.1f mi (poor GPS)
   </string>
   <string name="value_integer_feet"
-    translation_description="In a setting picker, an integer value in feet. E.g., '2 ft'.">
-    %d ft
+    translation_description="In a setting picker, an integer value in feet.
+    
+      %1$d: feet as an integer value. E.g., '2'">  
+    %1$d ft
   </string>
   <string name="value_integer_feet_excellent_gps"
     translation_description="In a setting picker, an integer value in feet, recommended when having
-      excellent GPS signal. E.g., '2 ft (excellent GPS)'.">
-    %d ft (excellent GPS)
+      excellent GPS signal.
+      
+      %1$d: feet as an integer value. E.g., '2'">  
+    %1$d ft (excellent GPS)
   </string>
   <string name="value_integer_feet_recommended"
     translation_description="In a setting picker, an integer value in feet that is recommended.
-      E.g., '2 ft (recommended)'.">
-    %d ft (recommended)
+    
+      %1$d: feet as an integer value. E.g., '2'">      
+    %1$d ft (recommended)
   </string>
   <string name="value_integer_kilometer"
-    translation_description="In a setting picker, an integer value in kilometers. E.g., '2 km'.">
-    %d km
+    translation_description="In a setting picker, an integer value in kilometers.
+    
+      %1$d: kilometer as an integer value. E.g., '2'">       
+    %1$d km
   </string>
   <string name="value_integer_meter"
-    translation_description="In a setting picker, an integer value in meters. E.g., '2 m'.">
-    %d m
+    translation_description="In a setting picker, an integer value in meters.
+    
+      %1$d: meter as an integer value. E.g., '2'">      
+    %1$d m
   </string>
   <string name="value_integer_meter_excellent_gps"
     translation_description="In a setting picker, an integer value in meters, recommended when
-      having excellent GPS signal. E.g., '2 m (excellent GPS)'.">
-    %d m (excellent GPS)
+      having excellent GPS signal.
+      
+      %1$d: meter as an integer value. E.g., '2'">    
+    %1$d m (excellent GPS)
   </string>
   <string name="value_integer_meter_poor_gps"
     translation_description="In a setting picker, an integer value in meters, recommended when
-      having poor GPS signal. E.g., '2 m (poor GPS)'.">
-    %d m (poor GPS)
+      having poor GPS signal.
+      
+      %1$d: meter as an integer value. E.g., '2'">    
+    %1$d m (poor GPS)
   </string>
   <string name="value_integer_meter_recommended"
     translation_description="In a setting picker, an integer value in meters that is recommended.
-      E.g., '2 m (recommended)'.">
-    %d m (recommended)
+    
+      %1$d: meter as an integer value. E.g., '2'">        
+    %1$d m (recommended)
   </string>
   <string name="value_integer_mile"
-    translation_description="In a setting picker, an integer value in miles. E.g., '2 mi'.">
-    %d mi
+    translation_description="In a setting picker, an integer value in miles.
+
+      %1$d: mile as an integer value. E.g., '2'">        
+    %1$d mi
   </string>
   <string name="value_integer_minute"
-    translation_description="In a setting picker, an integer value in minutes. E.g., '2 min'.">
-    %d min
+    translation_description="In a setting picker, an integer value in minutes.
+    
+      %1$d: minute as an integer value. E.g., '2'">      
+    %1$d min
   </string>
   <string name="value_integer_second"
-    translation_description="In a setting picker, an integer value in seconds. E.g., '2 s'.">
-    %d s
+    translation_description="In a setting picker, an integer value in seconds.
+
+      %1$d: second as an integer value. E.g., '2'">      
+    %1$d s
   </string>
   <string name="value_never"
     translation_description="In a setting picker, the value to never use the feature.">
@@ -1756,7 +1808,7 @@ limitations under the License.
   <string name="value_smallest_recommended"
     translation_description="In a setting picker, the value to use the smallest value, also the
       recommended value.">
-    smallest (recommended)
+    Smallest (recommended)
   </string>
 
   <!-- Voice -->
@@ -1797,7 +1849,7 @@ limitations under the License.
   <string name="voice_no_distance"
     translation_description="For the voice announcement, the announcement when the current track's
       total distance is zero.">
-    My Tracks no distance
+    My Tracks no distance.
   </string>
   <string name="voice_per_kilometer"
     translation_description="For voice announcement, to say 'per kilometer' for pace like 'two
@@ -1818,17 +1870,14 @@ limitations under the License.
     seconds
   </string>
   <string name="voice_template"
-    translation_description="For the voice announcement, the template to make an announcement. E.g.,
-      'My Tracks total distance 5.2 miles in 2 hours 30 minutes at 2.2 miles per hour'. Below is the
-      list of the parameters:
-
-      %1$.2f: Distance value (E.g., 5.2)
-      %2$s: Distance unit (miles or kilometers)
-      %3$s: Time value (E.g., 2 hours and 30 minutes)
-      %4$s: Speed value (E.g., 2.2) or pace value (E.g., 2 hours and 30 minutes)
-      %5$s: Speed unit (miles per hour or kilometers per hour) or pace unit (per mile or per
-      kilometer)">
-    My Tracks total distance %1$.2f %2$s in %3$s at %4$s %5$s
+    translation_description="For the voice announcement, the template to make an announcement.
+    
+      %1$.2f: distance value. E.g., '5.2'.
+      %2$s: distance unit. E.g., 'miles'.
+      %3$s: time value. E.g., '2 hours and 30 minutes'.
+      %4$s: speed/pace value. E.g., '2 hours and 30 minutes'.
+      %5$s: speed/pace unit. E.g., 'per mile'.">
+    My Tracks total distance %1$.2f %2$s in %3$s at %4$s %5$s.
   </string>
 
   <!-- Waypoint Type -->
@@ -2039,8 +2088,8 @@ limitations under the License.
 
   <!-- Welcome Page -->
   <string name="welcome_about"
-    translation_description="In the 'Welcome' page, the button on the bottom to read the 'About'
-      page.">
+    translation_description="In the 'Welcome' page, the button on the bottom to read the 'About My
+      Tracks' page.">
     About My Tracks
   </string>
   <string name="welcome_title"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java b/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java
index 0d634be7e..bc8dc5707 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java
@@ -78,7 +78,7 @@ public class AccountChooser {
     // Let the user choose.
     Log.e(Constants.TAG, "Multiple matching accounts found.");
     final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-    builder.setTitle(R.string.send_google_choose_account);
+    builder.setTitle(R.string.send_google_choose_account_title);
     builder.setCancelable(false);
     builder.setPositiveButton(R.string.generic_ok,
         new DialogInterface.OnClickListener() {
@@ -124,7 +124,7 @@ public class AccountChooser {
       final AccountHandler handler) {
     Log.e(Constants.TAG, "No matching accounts found.");
     final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-    builder.setTitle(R.string.send_google_no_account);
+    builder.setTitle(R.string.send_google_no_account_title);
     builder.setMessage(R.string.send_google_no_account_message);
     builder.setCancelable(true);
     builder.setPositiveButton(R.string.generic_ok,
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
index afec80c7a..048eae13b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
@@ -358,7 +358,7 @@ public class MapActivity extends com.google.android.maps.MapActivity
         @Override
         public void onCreateContextMenu(ContextMenu menu, View v,
             ContextMenuInfo menuInfo) {
-          menu.setHeaderTitle(R.string.track_list_this_track);
+          menu.setHeaderTitle(R.string.track_list_context_menu_title);
           menu.add(0, Constants.MENU_EDIT, 0,
               R.string.track_list_edit_track);
           if (!dataHub.isRecordingSelected()) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
index d5b7617a8..baa4004db 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
@@ -75,7 +75,7 @@ public class TrackList extends ListActivity
         @Override
         public void onCreateContextMenu(ContextMenu menu, View v,
             ContextMenuInfo menuInfo) {
-          menu.setHeaderTitle(R.string.track_list_this_track);
+          menu.setHeaderTitle(R.string.track_list_context_menu_title);
           AdapterView.AdapterContextMenuInfo info =
               (AdapterView.AdapterContextMenuInfo) menuInfo;
           contextPosition = info.position;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
index 561c181b5..4f60969ef 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
@@ -73,7 +73,7 @@ public class WaypointsList extends ListActivity
       new OnCreateContextMenuListener() {
         public void onCreateContextMenu(ContextMenu menu, View v,
             ContextMenuInfo menuInfo) {
-          menu.setHeaderTitle(R.string.marker_list_this_marker);
+          menu.setHeaderTitle(R.string.marker_list_context_menu_title);
           AdapterView.AdapterContextMenuInfo info =
               (AdapterView.AdapterContextMenuInfo) menuInfo;
           contextPosition = info.position;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java
index 80f64b796..60d0af6f4 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java
@@ -166,7 +166,7 @@ public class BackupActivityHelper {
     // Show a dialog for the user to pick which backup to restore
     Builder dialogBuilder = new AlertDialog.Builder(activity);
     dialogBuilder.setCancelable(true);
-    dialogBuilder.setTitle(R.string.settings_backup_restore_select);
+    dialogBuilder.setTitle(R.string.settings_backup_restore_select_title);
     dialogBuilder.setItems(backupDateStrs, new OnClickListener() {
       @Override
       public void onClick(DialogInterface dialog, int which) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
index c92602fda..aa7ae5888 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
@@ -185,7 +185,7 @@ public class SaveActivity extends Activity {
     });
     builder.setIcon(success ? android.R.drawable.ic_dialog_info :
         android.R.drawable.ic_dialog_alert);
-    builder.setTitle(success ? R.string.generic_success : R.string.generic_error);
+    builder.setTitle(success ? R.string.generic_success_title : R.string.generic_error_title);
     return builder.create();
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java
index fec3ef891..ec03581a5 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java
@@ -72,10 +72,10 @@ public class ResultDialogFactory {
         .setView(makeDialogContent(activity, results, success));
 
     if (success) {
-      builder.setTitle(R.string.generic_success);
+      builder.setTitle(R.string.generic_success_title);
       builder.setIcon(android.R.drawable.ic_dialog_info);
     } else {
-      builder.setTitle(R.string.generic_error);
+      builder.setTitle(R.string.generic_error_title);
       builder.setIcon(android.R.drawable.ic_dialog_alert);
     }