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

@@ -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"

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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

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,

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()) {

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;

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;

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) {

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();
   }
 

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);
     }