rename and reorganize variables in strings.xml for

- settings backup
- settings sharing
- settings reset

MyTracks/res/values-ca/strings.xml

@@ -187,17 +187,17 @@ limitations under the License.
   <string name="settings_display_metric_summary_on">Totes les distàncies es mostraran en unitats mètriques</string>
   <string name="settings_display_metric_summary_off">Totes les distàncies es mostraran en unitats imperials</string>
 
-  <string name="settings_map_public">Fes el mapa públic</string>
+  <string name="settings_sharing_map_public">Fes el mapa públic</string>
-  <string name="settings_map_public_summary_on">Els mapes pujats seran visibles per tothom a maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_on">Els mapes pujats seran visibles per tothom a maps.google.com</string>
-  <string name="settings_map_public_summary_off">Els mapes pujats no es llistaran públicament a maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_off">Els mapes pujats no es llistaran públicament a maps.google.com</string>
 
   <string name="settings_display_speed">Mostra la velocitat</string>
   <string name="settings_display_speed_summary_on">Es mostrarà la velocitat</string>
   <string name="settings_display_speed_summary_off">Es mostrarà el ritme de pas</string>
 
-  <string name="settings_share_url_only">Comparteix només l\'URL</string>
+  <string name="settings_sharing_url_only">Comparteix només l\'URL</string>
   <string name="settings_share_url_only_summary_on">Només s\'enviarà l\'URL del mapa quan es comparteixi</string>
-  <string name="settings_share_url_only_summary_off">També s\'inclouran els continguts de la ruta quan es comparteixi</string>
+  <string name="settings_sharing_url_only_summary_off">També s\'inclouran els continguts de la ruta quan es comparteixi</string>
 
   <string name="settings_recording_marker">Freqüència de divisió</string>
   <string name="settings_recording_marker_summary">Temps o distància màxima a partir de la qual s\'insertarà un marcador de divisió nou</string>
@@ -219,18 +219,18 @@ limitations under the License.
   <string name="settings_modular_stats_display_title">Pantalla d\'estadístiques modulars</string>
 
   <string name="settings_backup">Còpia de seguretat (BETA)</string>
-  <string name="settings_sd_backup">Còpia de seguretat a la targeta SD</string>
+  <string name="settings_backup_sd_card">Còpia de seguretat a la targeta SD</string>
-  <string name="settings_backup_to_sd">Fes la còpia ara</string>
+  <string name="settings_backup_now">Fes la còpia ara</string>
-  <string name="settings_backup_to_sd_summary">Escriu una còpia completa de totes les rutes i els paràmetres a la targeta SD</string>
+  <string name="settings_backup_now_summary">Escriu una còpia completa de totes les rutes i els paràmetres a la targeta SD</string>
-  <string name="settings_restore_from_sd">Restaura ara</string>
+  <string name="settings_backup_restore">Restaura ara</string>
-  <string name="settings_restore_from_sd_summary">Restaura totes les rutes i els paràmetres des de la targeta SD.</string>
+  <string name="settings_backup_restore_summary">Restaura totes les rutes i els paràmetres des de la targeta SD.</string>
 
   <!-- Backups -->
-  <string name="restore_overwrites_warning">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_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="select_backup_to_restore">Seleccioneu la còpia que es restaurarà</string>
+  <string name="settings_backup_restore_select">Seleccioneu la còpia que es restaurarà</string>
-  <string name="no_backups">No s\'ha trobat cap còpia de seguretat.</string>
+  <string name="settings_backup_restore_no_backup">No s\'ha trobat cap còpia de seguretat.</string>
-  <string name="backup_write_progress_message">S\'estan escrivint totes les rutes i els paràmetres a la targeta SD. Això pot trigar una estona...</string>
+  <string name="settings_backup_now_progress_message">S\'estan escrivint totes les rutes i els paràmetres a la targeta SD. Això pot trigar una estona...</string>
-  <string name="backup_import_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_progress_message">S\'estan llegint totes les rutes i els paràmetres de la targeta SD. Això pot trigar una estona...</string>
 
   <!-- MyTracksSky -->
   <string name="mytracks_sky">Satèl·lits GPS</string>

MyTracks/res/values-de/strings.xml

@@ -190,17 +190,17 @@ limitations under the License.
   <string name="settings_display_metric_summary_on">Alle Entfernungen werden in metrischen Einheiten angezeigt.</string>
   <string name="settings_display_metric_summary_off">Alle Entfernungen werden in imperialen Längeneinheiten angezeigt.</string>
 
-  <string name="settings_map_public">Karten auf maps.google.com veröffentlichen</string>
+  <string name="settings_sharing_map_public">Karten auf maps.google.com veröffentlichen</string>
-  <string name="settings_map_public_summary_on">Hochgeladene Karten auf maps.google.com sind für alle sichtbar.</string>
+  <string name="settings_sharing_map_public_summary_on">Hochgeladene Karten auf maps.google.com sind für alle sichtbar.</string>
-  <string name="settings_map_public_summary_off">Hochgeladene Karten auf maps.google.com werden nicht öffentlich sichtbar aufgelistet.</string>
+  <string name="settings_sharing_map_public_summary_off">Hochgeladene Karten auf maps.google.com werden nicht öffentlich sichtbar aufgelistet.</string>
 
   <string name="settings_display_speed">Geschwindigkeitsanzeige</string>
   <string name="settings_display_speed_summary_on">Geschwindigkeit wird angezeigt.</string>
   <string name="settings_display_speed_summary_off">Pace wird angezeigt.</string>
 
-  <string name="settings_share_url_only">Nur URL als Einladung zum Teilen senden</string>
+  <string name="settings_sharing_url_only">Nur URL als Einladung zum Teilen senden</string>
   <string name="settings_share_url_only_summary_on">Beim Teilen mit Freunden wird nur die Karten-URL gesendet.</string>
-  <string name="settings_share_url_only_summary_off">Beim Teilen mit Freunden wird der GPS-Track selbst gesendet.</string>
+  <string name="settings_sharing_url_only_summary_off">Beim Teilen mit Freunden wird der GPS-Track selbst gesendet.</string>
 
   <string name="settings_recording_marker">Zerteilungsfrequenz</string>
   <string name="settings_recording_marker_summary">Längste Dauer oder Entfernung, nach der automatisch ein Marker eingefügt wird.</string>
@@ -228,18 +228,18 @@ limitations under the License.
 
   <!-- Backups -->
   <string name="settings_backup">Datensicherung (BETA)</string>
-  <string name="settings_sd_backup">SD-Karten-Sicherung</string>
+  <string name="settings_backup_sd_card">SD-Karten-Sicherung</string>
-  <string name="settings_backup_to_sd">Jetzt sichern</string>
+  <string name="settings_backup_now">Jetzt sichern</string>
-  <string name="settings_backup_to_sd_summary">Eine Kopie aller Deiner Tracks und Einstellungen auf die SD-Karte schreiben</string>
+  <string name="settings_backup_now_summary">Eine Kopie aller Deiner Tracks und Einstellungen auf die SD-Karte schreiben</string>
-  <string name="settings_restore_from_sd">Jetzt wiederherstellen</string>
+  <string name="settings_backup_restore">Jetzt wiederherstellen</string>
-  <string name="settings_restore_from_sd_summary">Alle Tracks und Einstellungen von der SD-Karte holen.</string>
+  <string name="settings_backup_restore_summary">Alle Tracks und Einstellungen von der SD-Karte holen.</string>
   <string name="settings_no_backup_while_recording">Während ein Track aufgezeichnet wird, kann nicht mit der Datensicherung gearbeitet werden.</string>
 
-  <string name="restore_overwrites_warning">Eine Wiederherstellung von der SD-Karte ÜBERSCHREIBT alle vorhandenen Tracks und Einstellungen. Willst Du das wirklich?</string>
+  <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="select_backup_to_restore">Wähle die wiederherzustellende Datensicherung aus</string>
+  <string name="settings_backup_restore_select">Wähle die wiederherzustellende Datensicherung aus</string>
-  <string name="no_backups">Keine Datensicherungen gefunden.</string>
+  <string name="settings_backup_restore_no_backup">Keine Datensicherungen gefunden.</string>
-  <string name="backup_write_progress_message">Schreibe alle Tracks und Einstellungen auf die SD-Karte. Dies kann eine Weile dauern...</string>
+  <string name="settings_backup_now_progress_message">Schreibe alle Tracks und Einstellungen auf die SD-Karte. Dies kann eine Weile dauern...</string>
-  <string name="backup_import_progress_message">Lese alle Tracks und Einstellungen von der SD-Karte. Dies kann eine Weile dauern...</string>
+  <string name="settings_backup_restore_progress_message">Lese alle Tracks und Einstellungen von der SD-Karte. Dies kann eine Weile dauern...</string>
 
   <!-- MyTracksSky -->
   <string name="mytracks_sky">GPS-Satelliten</string>

MyTracks/res/values-es/strings.xml

@@ -201,11 +201,11 @@ limitations under the License.
   <string name="settings_recording_voice_not_available">No disponible para tu versión de Android</string>
   <string name="settings_not_while_recording">No disponible mientras se graba el recorrido</string>
 
-  <string name="settings_allow_access">Permitir acceso</string>
+  <string name="settings_sharing_allow_access">Permitir acceso</string>
-  <string name="settings_allow_access_summary_on">Otras aplicaciones pueden leer, escribir, comenzar/detener la grabación de 
+  <string name="settings_sharing_allow_access_summary_on">Otras aplicaciones pueden leer, escribir, comenzar/detener la grabación de 
           datos de MyTracks</string>
-  <string name="settings_allow_access_summary_off">Otras aplicaciones no pueden leer, escribir, comenzar/detener la grabación de datos de MyTracks</string>
+  <string name="settings_sharing_allow_access_summary_off">Otras aplicaciones no pueden leer, escribir, comenzar/detener la grabación de datos de MyTracks</string>
-  <string name="settings_allow_access_dialog_message">¿Esta seguro que desea que otras aplicaciones, 
+  <string name="settings_sharing_allow_access_confirm_message">¿Esta seguro que desea que otras aplicaciones, 
           futuras aplicaciones inclusive, controlen y tengan acceso a los datos de MyTracks? No habra notificaciones 
           posteriores.</string>
 		  
@@ -228,17 +228,17 @@ limitations under the License.
   <string name="settings_display_metric_summary_on">Todas las distancias serán mostradas en unidades métricas</string>
   <string name="settings_display_metric_summary_off">Todas las distancias serán mostradas en unidades británicas</string>
 
-  <string name="settings_map_public">Hacer mapas en maps.google.com públicos</string>
+  <string name="settings_sharing_map_public">Hacer mapas en maps.google.com públicos</string>
-  <string name="settings_map_public_summary_on">Mapas subidos serán visibles a cualquier persona en maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_on">Mapas subidos serán visibles a cualquier persona en maps.google.com</string>
-  <string name="settings_map_public_summary_off">Mapas subidos no serán públicos en maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_off">Mapas subidos no serán públicos en maps.google.com</string>
 
   <string name="settings_display_speed">Mostrar</string>
   <string name="settings_display_speed_summary_on">La velocidad será mostrada</string>
   <string name="settings_display_speed_summary_off">El paso será mostrado</string>
 
-  <string name="settings_share_url_only">Mandar sólo URL como mensaje al compartir</string>
+  <string name="settings_sharing_url_only">Mandar sólo URL como mensaje al compartir</string>
   <string name="settings_share_url_only_summary_on">Sólo el URL del mapa será enviado al compartir</string>
-  <string name="settings_share_url_only_summary_off">Los contenidos de la pista también serán incluídos al compartir</string>
+  <string name="settings_sharing_url_only_summary_off">Los contenidos de la pista también serán incluídos al compartir</string>
 
   <string name="settings_recording_marker">Dividir frecuencia</string>
   <string name="settings_recording_marker_summary">Tiempo o distancia máxima para insertar una nueva marca de división</string>
@@ -282,17 +282,17 @@ limitations under the License.
   
   <!-- Backups -->
   <string name="settings_backup">Copia seguridad (BETA)</string>
-  <string name="settings_sd_backup">Copia seguridad en tarjeta SD</string>
+  <string name="settings_backup_sd_card">Copia seguridad en tarjeta SD</string>
-  <string name="settings_backup_to_sd">Hacer copia seguridad</string>
+  <string name="settings_backup_now">Hacer copia seguridad</string>
-  <string name="settings_backup_to_sd_summary">Hacer una copia total de sus recorridos y configuraciones a la tarjeta SD</string>
+  <string name="settings_backup_now_summary">Hacer una copia total de sus recorridos y configuraciones a la tarjeta SD</string>
-  <string name="settings_restore_from_sd">Restaurar</string>
+  <string name="settings_backup_restore">Restaurar</string>
-  <string name="settings_restore_from_sd_summary">Restaurar todos los recorridos y configuraciones desde la tarjeta SD</string>
+  <string name="settings_backup_restore_summary">Restaurar todos los recorridos y configuraciones desde la tarjeta SD</string>
 
-  <string name="restore_overwrites_warning">Restaurar una copia seguridad desde la tarjeta SD SOBREESCRIBIRÁ todos sus recorridos y configuraciones actuales. ¿Está usted seguro?</string>
+  <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="select_backup_to_restore">Seleccionar la copia seguridad para restaurar</string>
+  <string name="settings_backup_restore_select">Seleccionar la copia seguridad para restaurar</string>
-  <string name="no_backups">No se han encontrado copias seguridad.</string>
+  <string name="settings_backup_restore_no_backup">No se han encontrado copias seguridad.</string>
-  <string name="backup_write_progress_message">Guardando todos los recorridos y configuraciones a la tarjeta SD. Esto puede llevar un rato...</string>
+  <string name="settings_backup_now_progress_message">Guardando todos los recorridos y configuraciones a la tarjeta SD. Esto puede llevar un rato...</string>
-  <string name="backup_import_progress_message">Leyendo todos los recorridos y configuraciones desde la tarjeta SD. Esto puede llevar un rato...</string>
+  <string name="settings_backup_restore_progress_message">Leyendo todos los recorridos y configuraciones desde la tarjeta SD. Esto puede llevar un rato...</string>
   
   <!-- MyTracksSky -->
   <string name="mytracks_sky">Satélites GPS</string>

MyTracks/res/values-fi/strings.xml

@@ -220,17 +220,17 @@ limitations under the License.
   <string name="settings_display_metric_summary_on">Kaikki etäisyydet näytetään metrijärjestelmässä</string>
   <string name="settings_display_metric_summary_off">Kaikki etäisyydet näytetään U.S yksiköitä käyttäen</string>
 
-  <string name="settings_map_public">Aseta kartat julkisiksi</string>
+  <string name="settings_sharing_map_public">Aseta kartat julkisiksi</string>
-  <string name="settings_map_public_summary_on">Lähetetyt kartat näkyvät kaikille osoitteessa maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_on">Lähetetyt kartat näkyvät kaikille osoitteessa maps.google.com</string>
-  <string name="settings_map_public_summary_off">Lähetettyjä karttoja ei näytetä julkisesti osoitteessa maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_off">Lähetettyjä karttoja ei näytetä julkisesti osoitteessa maps.google.com</string>
 
   <string name="settings_display_speed">Näytä nopeus</string>
   <string name="settings_display_speed_summary_on">Nopeus näytetään</string>
   <string name="settings_display_speed_summary_off">Tahti näytetään</string>
 
-  <string name="settings_share_url_only">Jaa vain URL</string>
+  <string name="settings_sharing_url_only">Jaa vain URL</string>
   <string name="settings_share_url_only_summary_on">Ainoastaan kartan URL jaetaan</string>
-  <string name="settings_share_url_only_summary_off">Myös reitin sisältö ja tiedot jaetaan</string>
+  <string name="settings_sharing_url_only_summary_off">Myös reitin sisältö ja tiedot jaetaan</string>
 
   <string name="settings_recording_marker">Reitin jaotus</string>
   <string name="settings_recording_marker_summary">Etäisyys tai aika jolloin reitti jaetaan osiin</string>
@@ -263,17 +263,17 @@ limitations under the License.
 
   <!-- Backups -->
   <string name="settings_backup">Varmuuskopioi (BETA)</string>
-  <string name="settings_sd_backup">Varmuuskopioi SD-kortille</string>
+  <string name="settings_backup_sd_card">Varmuuskopioi SD-kortille</string>
-  <string name="settings_backup_to_sd">Varmuuskopioi</string>
+  <string name="settings_backup_now">Varmuuskopioi</string>
-  <string name="settings_backup_to_sd_summary">Tallenna täydellinen kopio reiteistä ja asetuksista SD-kortille</string>
+  <string name="settings_backup_now_summary">Tallenna täydellinen kopio reiteistä ja asetuksista SD-kortille</string>
-  <string name="settings_restore_from_sd">Palauta</string>
+  <string name="settings_backup_restore">Palauta</string>
-  <string name="settings_restore_from_sd_summary">Palauta kaikki reitit ja asetukset SD-kortilta</string>
+  <string name="settings_backup_restore_summary">Palauta kaikki reitit ja asetukset SD-kortilta</string>
 
-  <string name="restore_overwrites_warning">Palautus SD-kortilta ylikirjoittaa kaikki nykyiset reitit ja asetukset. Jatketaanko?</string>
+  <string name="settings_backup_restore_confirm_message">Palautus SD-kortilta ylikirjoittaa kaikki nykyiset reitit ja asetukset. Jatketaanko?</string>
-  <string name="select_backup_to_restore">Valitse palautettava varmuuskopio</string>
+  <string name="settings_backup_restore_select">Valitse palautettava varmuuskopio</string>
-  <string name="no_backups">Varmuuskopioita ei löytynyt.</string>
+  <string name="settings_backup_restore_no_backup">Varmuuskopioita ei löytynyt.</string>
-  <string name="backup_write_progress_message">Luodaan varmuuskopiota. Odota...</string>
+  <string name="settings_backup_now_progress_message">Luodaan varmuuskopiota. Odota...</string>
-  <string name="backup_import_progress_message">Luetaan varmuuskopiota SD-kortilta. Odota...</string>
+  <string name="settings_backup_restore_progress_message">Luetaan varmuuskopiota SD-kortilta. Odota...</string>
 
   <!-- MyTracksSky -->
   <string name="mytracks_sky">GPS-satelliitit</string>

MyTracks/res/values-fr/strings.xml

@@ -178,17 +178,17 @@ limitations under the License.
   <string name="settings_display_metric_summary_on">Le système métrique sera utilisé pour l\'affichage des distances</string>
   <string name="settings_display_metric_summary_off">Le système impérial sera utilisé pour l\'affichage des distances</string>
 
-  <string name="settings_map_public">Cartes publiques</string>
+  <string name="settings_sharing_map_public">Cartes publiques</string>
-  <string name="settings_map_public_summary_on">Les cartes partagées seront visibles par tout le monde sur maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_on">Les cartes partagées seront visibles par tout le monde sur maps.google.com</string>
-  <string name="settings_map_public_summary_off">Les cartes ne seront pas partagées publiquement sur maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_off">Les cartes ne seront pas partagées publiquement sur maps.google.com</string>
 
   <string name="settings_display_speed">Afficher vitesse/rythme</string>
   <string name="settings_display_speed_summary_on">Afficher la vitesse</string>
   <string name="settings_display_speed_summary_off">Afficher le rythme</string>
 
-  <string name="settings_share_url_only">Partager URL/parcours</string>
+  <string name="settings_sharing_url_only">Partager URL/parcours</string>
   <string name="settings_share_url_only_summary_on">Seule l\'adresse URL de la carte sera envoyée lors du partage</string>
-  <string name="settings_share_url_only_summary_off">Le contenu du parcours sera également inclus lors du partage</string>
+  <string name="settings_sharing_url_only_summary_off">Le contenu du parcours sera également inclus lors du partage</string>
 
   <string name="settings_recording_marker">Fréquence de séparation</string>
   <string name="settings_recording_marker_summary">Temps ou distance minimum avant l\'insertion d\'un marqueur de séparation</string>
@@ -208,17 +208,17 @@ limitations under the License.
 
   <!-- Backups -->
   <string name="settings_backup">Sauvegarde (BETA)</string>
-  <string name="settings_sd_backup">Sauvegarde sur carte SD</string>
+  <string name="settings_backup_sd_card">Sauvegarde sur carte SD</string>
-  <string name="settings_backup_to_sd">Sauvegarder</string>
+  <string name="settings_backup_now">Sauvegarder</string>
-  <string name="settings_backup_to_sd_summary">Copier tous vos parcours et paramètres sur la carte SD</string>
+  <string name="settings_backup_now_summary">Copier tous vos parcours et paramètres sur la carte SD</string>
-  <string name="settings_restore_from_sd">Restaurer</string>
+  <string name="settings_backup_restore">Restaurer</string>
-  <string name="settings_restore_from_sd_summary">Restaurer tous les parcours et paramètres depuis la carte SD</string>
+  <string name="settings_backup_restore_summary">Restaurer tous les parcours et paramètres depuis la carte SD</string>
 
-  <string name="restore_overwrites_warning">Restaurer une sauvegarde depuis la carte SD écrasera tous vos parcours et paramètres actuels.</string>
+  <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="select_backup_to_restore">Choisissez la sauvegarde à restaurer</string>
+  <string name="settings_backup_restore_select">Choisissez la sauvegarde à restaurer</string>
-  <string name="no_backups">Pas de sauvegarde disponible.</string>
+  <string name="settings_backup_restore_no_backup">Pas de sauvegarde disponible.</string>
-  <string name="backup_write_progress_message">Écriture de tous vos parcours et paramètres sur la carte SD. Veuillez patienter...</string>
+  <string name="settings_backup_now_progress_message">Écriture de tous vos parcours et paramètres sur la carte SD. Veuillez patienter...</string>
-  <string name="backup_import_progress_message">Lecture de tous vos parcours et paramètres depuis la carte SD. Veuillez patienter...</string>
+  <string name="settings_backup_restore_progress_message">Lecture de tous vos parcours et paramètres depuis la carte SD. Veuillez patienter...</string>
   
   <!-- MyTracksSky -->
   <string name="mytracks_sky">Satellites GPS</string>

MyTracks/res/values-it/strings.xml

@@ -181,17 +181,17 @@ limitations under the License.
   <string name="settings_display_metric_summary_on">Tutte le distanze verranno mostrate nel sistema metrico decimale</string>
   <string name="settings_display_metric_summary_off">Tutte le distanze saranno mostrate nel sistema imperiale</string>
 
-  <string name="settings_map_public">Rendi pubbliche le mappe su maps.google.com</string>
+  <string name="settings_sharing_map_public">Rendi pubbliche le mappe su maps.google.com</string>
-  <string name="settings_map_public_summary_on">Le mappe inviate a maps.google.com saranno visibili a chiunque</string>
+  <string name="settings_sharing_map_public_summary_on">Le mappe inviate a maps.google.com saranno visibili a chiunque</string>
-  <string name="settings_map_public_summary_off">Le mappe inviate a maps.google.com non saranno rese pubbliche</string>
+  <string name="settings_sharing_map_public_summary_off">Le mappe inviate a maps.google.com non saranno rese pubbliche</string>
 
   <string name="settings_display_speed">Mostra:</string>
   <string name="settings_display_speed_summary_on">Mostrerà la velocità</string>
   <string name="settings_display_speed_summary_off">Mostrerà l\'andatura</string>
 
-  <string name="settings_share_url_only">Invia solo l\'URL nei messaggi di condivisione</string>
+  <string name="settings_sharing_url_only">Invia solo l\'URL nei messaggi di condivisione</string>
   <string name="settings_share_url_only_summary_on">Solo l\'URL della mappa sarà inviata quando condividi un percorso</string>
-  <string name="settings_share_url_only_summary_off">Anche il contenuto del percorso sarà inviato quando condividi un persorso</string>
+  <string name="settings_sharing_url_only_summary_off">Anche il contenuto del percorso sarà inviato quando condividi un persorso</string>
 
   <string name="settings_recording_marker">Frequenza di divisione</string>
   <string name="settings_recording_marker_summary">Tempo o distanza massima dopo di cui il percorso verrà diviso</string>

MyTracks/res/values-ja/strings.xml

@@ -212,17 +212,17 @@ limitations under the License.
   <string name="settings_display_metric_summary_on">全ての距離をメートル法で表示します</string>
   <string name="settings_display_metric_summary_off">全ての距離をヤード・ポンド法で表示します</string>
 
-  <string name="settings_map_public">マップの公開</string>
+  <string name="settings_sharing_map_public">マップの公開</string>
-  <string name="settings_map_public_summary_on">アップロードされたマップはmaps.google.comで誰でも閲覧できます</string>
+  <string name="settings_sharing_map_public_summary_on">アップロードされたマップはmaps.google.comで誰でも閲覧できます</string>
-  <string name="settings_map_public_summary_off">アップロードされたマップはmaps.google.comのリストに公開されません</string>
+  <string name="settings_sharing_map_public_summary_off">アップロードされたマップはmaps.google.comのリストに公開されません</string>
 
   <string name="settings_display_speed">速度表示</string>
   <string name="settings_display_speed_summary_on">速度が表示されます</string>
   <string name="settings_display_speed_summary_off">ペースが表示されます</string>
 
-  <string name="settings_share_url_only">URLのみ共有</string>
+  <string name="settings_sharing_url_only">URLのみ共有</string>
   <string name="settings_share_url_only_summary_on">共有時にマップのURLのみ送信します</string>
-  <string name="settings_share_url_only_summary_off">共有時にトラックのコンテントが含まれます</string>
+  <string name="settings_sharing_url_only_summary_off">共有時にトラックのコンテントが含まれます</string>
 
   <string name="settings_recording_marker">分割頻度</string>
   <string name="settings_recording_marker_summary">分割マーカーを挿入する時間または距離の間隔</string>
@@ -250,17 +250,17 @@ limitations under the License.
 
   <!-- Backups -->
   <string name="settings_backup">バックアップ (ベータ版)</string>
-  <string name="settings_sd_backup">SDカード バックアップ</string>
+  <string name="settings_backup_sd_card">SDカード バックアップ</string>
-  <string name="settings_backup_to_sd">今すぐバックアップ</string>
+  <string name="settings_backup_now">今すぐバックアップ</string>
-  <string name="settings_backup_to_sd_summary">SDカードに全てのトラックと設定をバックアップします</string>
+  <string name="settings_backup_now_summary">SDカードに全てのトラックと設定をバックアップします</string>
-  <string name="settings_restore_from_sd">今すぐ復元</string>
+  <string name="settings_backup_restore">今すぐ復元</string>
-  <string name="settings_restore_from_sd_summary">SDカードから全てのトラックと設定を復元します</string>
+  <string name="settings_backup_restore_summary">SDカードから全てのトラックと設定を復元します</string>
 
-  <string name="restore_overwrites_warning">SDカードからの復元を実行すると、現在のトラックと設定は *全て上書き* されてしまいます．よろしいですか?</string>
+  <string name="settings_backup_restore_confirm_message">SDカードからの復元を実行すると、現在のトラックと設定は *全て上書き* されてしまいます．よろしいですか?</string>
-  <string name="select_backup_to_restore">復元するバックアップの選択</string>
+  <string name="settings_backup_restore_select">復元するバックアップの選択</string>
-  <string name="no_backups">バックアップがありません．</string>
+  <string name="settings_backup_restore_no_backup">バックアップがありません．</string>
-  <string name="backup_write_progress_message">SDカードに全てのトラックと設定をバックアップしています．しばらくかかることがあります...</string>
+  <string name="settings_backup_now_progress_message">SDカードに全てのトラックと設定をバックアップしています．しばらくかかることがあります...</string>
-  <string name="backup_import_progress_message">SDカードから全てのトラックと設定を復元しています．しばらくかかることがあります...</string>
+  <string name="settings_backup_restore_progress_message">SDカードから全てのトラックと設定を復元しています．しばらくかかることがあります...</string>
 
   <!-- MyTracksSky -->
   <string name="mytracks_sky">GPS衛星</string>

MyTracks/res/values-pl/strings.xml

@@ -184,17 +184,17 @@ limitations under the License.
   <string name="settings_display_metric_summary_on">Wszystkie odległości będą wyświetlane w jednostkach metrycznych</string>
   <string name="settings_display_metric_summary_off">Wszystkie odległości będą wyświetlane w jednostkach imperialnych</string>
 
-  <string name="settings_map_public">Ustaw mapy jako publiczne</string>
+  <string name="settings_sharing_map_public">Ustaw mapy jako publiczne</string>
-  <string name="settings_map_public_summary_on">Przesłane mapy będą dostępne dla wszystkich na maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_on">Przesłane mapy będą dostępne dla wszystkich na maps.google.com</string>
-  <string name="settings_map_public_summary_off">Przesłane mapy nie będą dostępne publicznie na maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_off">Przesłane mapy nie będą dostępne publicznie na maps.google.com</string>
 
   <string name="settings_display_speed">Wyświetlanie prędkości</string>
   <string name="settings_display_speed_summary_on">Prędkość będzie wyświetlana</string>
   <string name="settings_display_speed_summary_off">Tempo będzie wyświetlane</string>
 
-  <string name="settings_share_url_only">Dziel się tylko odnośnikiem</string>
+  <string name="settings_sharing_url_only">Dziel się tylko odnośnikiem</string>
   <string name="settings_share_url_only_summary_on">Tylko odnośnik do mapy będzie wysyłany podczas dzielenia się</string>
-  <string name="settings_share_url_only_summary_off">Zawartość trasy będzie również przesyłana</string>
+  <string name="settings_sharing_url_only_summary_off">Zawartość trasy będzie również przesyłana</string>
 
   <string name="settings_recording_marker">Częstotliwość rozdzielania</string>
   <string name="settings_recording_marker_summary">Maksymalny czas lub odległość po którym wstawiony zostanie znacznik rozdzielenia</string>
@@ -212,18 +212,18 @@ limitations under the License.
   <string name="settings_modular_stats_display_title">Widok Statystyk Modularnych</string>
 
   <string name="settings_backup">Kopia zapasowa (BETA)</string>
-  <string name="settings_sd_backup">Kopia zapasowa na kartę SD</string>
+  <string name="settings_backup_sd_card">Kopia zapasowa na kartę SD</string>
-  <string name="settings_backup_to_sd">Utwórz kopię</string>
+  <string name="settings_backup_now">Utwórz kopię</string>
-  <string name="settings_backup_to_sd_summary">Tworzy kopię zapasową wszystkich tras i ustawień i zapisuje je na karcie SD</string>
+  <string name="settings_backup_now_summary">Tworzy kopię zapasową wszystkich tras i ustawień i zapisuje je na karcie SD</string>
-  <string name="settings_restore_from_sd">Odtwórz z kopii</string>
+  <string name="settings_backup_restore">Odtwórz z kopii</string>
-  <string name="settings_restore_from_sd_summary">Odtwarza wszystkie trasy i ustawienia z kopii zapasowej z karty SD</string>
+  <string name="settings_backup_restore_summary">Odtwarza wszystkie trasy i ustawienia z kopii zapasowej z karty SD</string>
 
   <!-- Backups -->
-  <string name="restore_overwrites_warning">Odtworzenie z kopii zapasowej z karty SD zastąpi wszystkie bieżące trasy i ustawienia. Jesteś tego pewien?</string>
+  <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="select_backup_to_restore">Wybierz kopię do odtworzenia</string>
+  <string name="settings_backup_restore_select">Wybierz kopię do odtworzenia</string>
-  <string name="no_backups">Nie znaleziono kopii zapasowych.</string>
+  <string name="settings_backup_restore_no_backup">Nie znaleziono kopii zapasowych.</string>
-  <string name="backup_write_progress_message">Zapisywanie wszystkich tras i ustawień na kartę SD. To może trochę potrwać...</string>
+  <string name="settings_backup_now_progress_message">Zapisywanie wszystkich tras i ustawień na kartę SD. To może trochę potrwać...</string>
-  <string name="backup_import_progress_message">Odczytywanie wszystkich tras i ustawień z karty SD. To może trochę potrwać...</string>
+  <string name="settings_backup_restore_progress_message">Odczytywanie wszystkich tras i ustawień z karty SD. To może trochę potrwać...</string>
 
   <!-- MyTracksSky -->
   <string name="mytracks_sky">Satelity GPS</string>

MyTracks/res/values-pt-rBR/strings.xml

@@ -173,15 +173,15 @@ limitations under the License.
   <string name="settings_display_metric">Unidades métricas</string>
   <string name="settings_display_metric_summary_on">Todas as distâncias serão exibidas em unidades métricas</string>
   <string name="settings_display_metric_summary_off">Todas as distâncias serão exibidas em unidades imperiais</string>
-  <string name="settings_map_public">Tornar mapas públicos</string>
+  <string name="settings_sharing_map_public">Tornar mapas públicos</string>
-  <string name="settings_map_public_summary_on">Os mapas enviados ao maps.google.com serão visíveis por qualquer pessoa</string>
+  <string name="settings_sharing_map_public_summary_on">Os mapas enviados ao maps.google.com serão visíveis por qualquer pessoa</string>
-  <string name="settings_map_public_summary_off">Os mapas enviados ao maps.google.com não serão listados publicamente</string>
+  <string name="settings_sharing_map_public_summary_off">Os mapas enviados ao maps.google.com não serão listados publicamente</string>
   <string name="settings_display_speed">Exibir velocidade</string>
   <string name="settings_display_speed_summary_on">A velocidade será exibida</string>
   <string name="settings_display_speed_summary_off">O passo será exibido</string>
-  <string name="settings_share_url_only">Compartilhar apenas URL</string>
+  <string name="settings_sharing_url_only">Compartilhar apenas URL</string>
   <string name="settings_share_url_only_summary_on">Apenas a URL do mapa será enviada ao compartilhar</string>
-  <string name="settings_share_url_only_summary_off">O conteúdo do mapa também será incluído ao compartilhar</string>
+  <string name="settings_sharing_url_only_summary_off">O conteúdo do mapa também será incluído ao compartilhar</string>
   <string name="settings_recording_marker">Freqüência de divisão</string>
   <string name="settings_recording_marker_summary">Maior tempo ou distância de uma gravação antes que ela seja dividida em duas</string>
   <string name="pace_label">Passo</string>

MyTracks/res/values-ru/strings.xml

@@ -216,17 +216,17 @@ limitations under the License.
   <string name="settings_display_metric_summary_on">Все расстояния будут отображаться в метрических единицах</string>
   <string name="settings_display_metric_summary_off">Все расстояния будут отображаться в имперских единицах</string>
 
-  <string name="settings_map_public">Обнародовать карты</string>
+  <string name="settings_sharing_map_public">Обнародовать карты</string>
-  <string name="settings_map_public_summary_on">Загруженные карты будут общедоступны на maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_on">Загруженные карты будут общедоступны на maps.google.com</string>
-  <string name="settings_map_public_summary_off">Загруженные карты не будут перечислены публично на maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_off">Загруженные карты не будут перечислены публично на maps.google.com</string>
 
   <string name="settings_display_speed">Отображать скорость</string>
   <string name="settings_display_speed_summary_on">Скорость будет отображаться</string>
   <string name="settings_display_speed_summary_off">Темп будет отображаться</string>
 
-  <string name="settings_share_url_only">Поделиться только URL</string>
+  <string name="settings_sharing_url_only">Поделиться только URL</string>
   <string name="settings_share_url_only_summary_on">При обмене будет отправлен только URL-адрес</string>
-  <string name="settings_share_url_only_summary_off">Содержимое трека будет также включено при обмене</string>
+  <string name="settings_sharing_url_only_summary_off">Содержимое трека будет также включено при обмене</string>
 
   <string name="settings_recording_marker">Частота деления</string>
   <string name="settings_recording_marker_summary">Максимальное время или расстояние, после которого будет вставлен новый маркер деления</string>
@@ -259,17 +259,17 @@ limitations under the License.
 
   <!-- Backups -->
   <string name="settings_backup">Резервное копирование (BETA)</string>
-  <string name="settings_sd_backup">Резервное копирование SD карты</string>
+  <string name="settings_backup_sd_card">Резервное копирование SD карты</string>
-  <string name="settings_backup_to_sd">Резервировать</string>
+  <string name="settings_backup_now">Резервировать</string>
-  <string name="settings_backup_to_sd_summary">Создать полную копию всех ваших треков и настроек на SD карту</string>
+  <string name="settings_backup_now_summary">Создать полную копию всех ваших треков и настроек на SD карту</string>
-  <string name="settings_restore_from_sd">Восстановить</string>
+  <string name="settings_backup_restore">Восстановить</string>
-  <string name="settings_restore_from_sd_summary">Восстановить все треки и параметры с SD карты</string>
+  <string name="settings_backup_restore_summary">Восстановить все треки и параметры с SD карты</string>
 
-  <string name="restore_overwrites_warning">Восстановление резервной копии с SD карты ПЕРЕЗАПИШЕТ все текущие треки и настройки. Вы уверены?</string>
+  <string name="settings_backup_restore_confirm_message">Восстановление резервной копии с SD карты ПЕРЕЗАПИШЕТ все текущие треки и настройки. Вы уверены?</string>
-  <string name="select_backup_to_restore">Выберите резервную копию для восстановления</string>
+  <string name="settings_backup_restore_select">Выберите резервную копию для восстановления</string>
-  <string name="no_backups">Резервные копии не найдены.</string>
+  <string name="settings_backup_restore_no_backup">Резервные копии не найдены.</string>
-  <string name="backup_write_progress_message">Запись на SD-карту всех треков и настроек. Это может занять некоторое время...</string>
+  <string name="settings_backup_now_progress_message">Запись на SD-карту всех треков и настроек. Это может занять некоторое время...</string>
-  <string name="backup_import_progress_message">Чтение всех треков и настроек с SD-карты. Это может занять некоторое время...</string>
+  <string name="settings_backup_restore_progress_message">Чтение всех треков и настроек с SD-карты. Это может занять некоторое время...</string>
 
   <!-- MyTracksSky -->
   <string name="mytracks_sky">Спутники GPS</string>

MyTracks/res/values-sv/strings.xml

@@ -184,17 +184,17 @@ limitations under the License.
   <string name="settings_display_metric_summary_on">Alla distanser kommer att visas i metriska enheter</string>
   <string name="settings_display_metric_summary_off">Alla distanser kommer att visas i brittiska enheter</string>
 
-  <string name="settings_map_public">Gör kartor offentliga</string>
+  <string name="settings_sharing_map_public">Gör kartor offentliga</string>
-  <string name="settings_map_public_summary_on">Uppladdade kartor kommer att vara synliga för alla på maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_on">Uppladdade kartor kommer att vara synliga för alla på maps.google.com</string>
-  <string name="settings_map_public_summary_off">Uppladdade kartor kommer inte att visas offentligt på maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_off">Uppladdade kartor kommer inte att visas offentligt på maps.google.com</string>
 
   <string name="settings_display_speed">Visa hastighet</string>
   <string name="settings_display_speed_summary_on">Hastighet kommer att visas</string>
   <string name="settings_display_speed_summary_off">Tempo kommer att visas</string>
 
-  <string name="settings_share_url_only">Dela bara länk</string>
+  <string name="settings_sharing_url_only">Dela bara länk</string>
   <string name="settings_share_url_only_summary_on">Bara länken till kartan kommer att skickas vid delning</string>
-  <string name="settings_share_url_only_summary_off">Innehållet i spåret kommer också att inkluderas vid delning</string>
+  <string name="settings_sharing_url_only_summary_off">Innehållet i spåret kommer också att inkluderas vid delning</string>
 
   <string name="settings_recording_marker">Delningsfrekvens</string>
   <string name="settings_recording_marker_summary">Maximala tiden eller distansen varefter en ny delningsmarkör kommer infogas</string>

MyTracks/res/values-zh-rCN/strings.xml

@@ -217,17 +217,17 @@ limitations under the License.
   <string name="settings_display_metric_summary_on">所有的距离都将以公制单位显示</string>
   <string name="settings_display_metric_summary_off">所有的距离都将以英制单位显示</string>
 
-  <string name="settings_map_public">公开地图</string>
+  <string name="settings_sharing_map_public">公开地图</string>
-  <string name="settings_map_public_summary_on">上传的地图将对所有 maps.google.com 访问者可见</string>
+  <string name="settings_sharing_map_public_summary_on">上传的地图将对所有 maps.google.com 访问者可见</string>
-  <string name="settings_map_public_summary_off">上传的地图不会在 maps.google.com 上公开</string>
+  <string name="settings_sharing_map_public_summary_off">上传的地图不会在 maps.google.com 上公开</string>
 
   <string name="settings_display_speed">显示速度</string>
   <string name="settings_display_speed_summary_on">显示速度信息</string>
   <string name="settings_display_speed_summary_off">显示步速</string>
 
-  <string name="settings_share_url_only">只分享 URL</string>
+  <string name="settings_sharing_url_only">只分享 URL</string>
   <string name="settings_share_url_only_summary_on">在分享时只发送地图的 URL</string>
-  <string name="settings_share_url_only_summary_off">在分享时也包括轨迹的内容</string>
+  <string name="settings_sharing_url_only_summary_off">在分享时也包括轨迹的内容</string>
 
   <string name="settings_recording_marker">切割频度</string>
   <string name="settings_recording_marker_summary">插入新切割标记所需要达到的最大时间或距离</string>
@@ -260,17 +260,17 @@ limitations under the License.
 
   <!-- Backups -->
   <string name="settings_backup">备份 (测试版)</string>
-  <string name="settings_sd_backup">SD 存储卡备份</string>
+  <string name="settings_backup_sd_card">SD 存储卡备份</string>
-  <string name="settings_backup_to_sd">立即备份</string>
+  <string name="settings_backup_now">立即备份</string>
-  <string name="settings_backup_to_sd_summary">将你所有轨迹和设置的完整备份写入到 SD 存储卡</string>
+  <string name="settings_backup_now_summary">将你所有轨迹和设置的完整备份写入到 SD 存储卡</string>
-  <string name="settings_restore_from_sd">立即恢复</string>
+  <string name="settings_backup_restore">立即恢复</string>
-  <string name="settings_restore_from_sd_summary">从 SD 存储卡恢复所有轨迹和设置</string>
+  <string name="settings_backup_restore_summary">从 SD 存储卡恢复所有轨迹和设置</string>
 
-  <string name="restore_overwrites_warning">从 SD 存储卡恢复备份数据将覆盖掉你当前的所有轨迹和设置. 确定要继续吗?</string>
+  <string name="settings_backup_restore_confirm_message">从 SD 存储卡恢复备份数据将覆盖掉你当前的所有轨迹和设置. 确定要继续吗?</string>
-  <string name="select_backup_to_restore">请选择要恢复的备份文件</string>
+  <string name="settings_backup_restore_select">请选择要恢复的备份文件</string>
-  <string name="no_backups">没有找到备份文件.</string>
+  <string name="settings_backup_restore_no_backup">没有找到备份文件.</string>
-  <string name="backup_write_progress_message">将所有轨迹和设置写入 SD 存储卡中. 这需要一些时间...</string>
+  <string name="settings_backup_now_progress_message">将所有轨迹和设置写入 SD 存储卡中. 这需要一些时间...</string>
-  <string name="backup_import_progress_message">从 SD 存储卡读取轨迹和设置中. 这需要一些时间...</string>
+  <string name="settings_backup_restore_progress_message">从 SD 存储卡读取轨迹和设置中. 这需要一些时间...</string>
 
   <!-- MyTracksSky -->
   <string name="mytracks_sky">GPS 卫星</string>

MyTracks/res/values/strings.xml

@@ -290,11 +290,67 @@ limitations under the License.
       settings."> 
     Backup
   </string>
+  <string name="settings_backup_now"
+    translation_description="In the Backup settings, under the 'SD Card Backup' section, the option
+      to backup to the SD card now.">
+    Backup now
+  </string>
+  <string name="settings_backup_now_progress_message"
+    translation_description="In the Backup settings, after pressing the 'Backup now' option, the
+      progress dialog telling the user that it is writing all tracks and settings and that it may
+      take a while.">
+    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
+      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
+  </string>
+  <string name="settings_backup_restore"
+    translation_description="In the Backup settings, under the 'SD Card Backup' section, the option
+      to restore everything from the SD card.">
+    Restore now
+  </string>  
+  <string name="settings_backup_restore_confirm_message"
+    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
+    sure?
+  </string>
+  <string name="settings_backup_restore_no_backup"
+    translation_description="In the Backup settings, after pressing the 'Restore now' option, the
+      message in the alert dialog informing the user that there is no backup to restore from.">
+    No backup found.
+  </string>
+  <string name="settings_backup_restore_progress_message"
+    translation_description="In the Backup settings, after pressing the 'Restore now' option, the
+      message on the progress dialog indicating that My Tracks is reading all tracks and settings
+      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"
+    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
+  </string>
+  <string name="settings_backup_restore_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
+  </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
+  </string>  
   <string name="settings_display"
     translation_description="In the Settings page, the option to change the display related
       settings.">  
     Display
-  </string> 
+  </string>      
   <string name="settings_display_metric"
     translation_description="In the Display settings, the checkbox option to use the metric units.">
     Use metric units
@@ -394,6 +450,11 @@ limitations under the License.
       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
   </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
+  </string>
   <string name="settings_recording"
     translation_description="In the Settings page, the option to change the track recording related
       settings.">  
@@ -502,17 +563,30 @@ limitations under the License.
     translation_description="In the Settings page, the option to reset everything to the defaults."> 
     Reset to defaults
   </string>
+  <string name="settings_reset_dialog_message"
+    translation_description="In the Settings page, after pressing the 'Reset to defaults' option,
+      the confirmation dialog asking the user to confirm reverting all settings to defaults. But
+      the saved tracks will be preserved.">
+    All your settings will be erased and reverted to the default values. Saved tracks will be
+    preserved. Are you sure?
+  </string>
+  <string name="settings_reset_done"
+    translation_description="In the Settings page, after pressing the 'Reset to defaults' option,
+      the confirmation dialog informing the user that all settings have been reverted to their
+      defaults.">
+    All settings have been reverted to their defaults.
+  </string>
   <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
-  </string>
+  </string>      
   <string name="settings_sensor"
     translation_description="In the Settings page, the option to change the sensor related
       settings.">
     Sensor
   </string>
-    <string name="settings_sensor_ant_not_paired"
+  <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
@@ -603,6 +677,65 @@ limitations under the License.
       settings.">   
     Sharing
   </string>
+  <string name="settings_sharing_allow_access"
+    translation_description="In the Sharing settings, the checkbox option to allow third party apps
+     access to the My Tracks data.">
+    Allow access
+  </string>
+  <string name="settings_sharing_allow_access_confirm_message"
+    translation_description="In the Sharing settings, after checking the 'Allow access' checkbox,
+      the confirmation dialog asking the user if he wants to allow other apps, including apps
+      installed in the future, to control and access My Tracks data. In addition, no further
+      notification of third party app access will be shown.">
+    Are you sure you want to allow other apps, including future apps, to control and access My
+    Tracks data? There will be no further notification.
+  </string>
+  <string name="settings_sharing_allow_access_summary_off"
+    translation_description="In the Sharing settings, the summary for the 'Allow access' checkbox
+      option when it is unchecked explaining that other apps cannot read, write, start/stop
+      recording My Tracks data.">
+    Other apps cannot read, write, start/stop recording My Tracks data.
+  </string>
+  <string name="settings_sharing_allow_access_summary_on"
+    translation_description="In the Sharing settings, the summary for the 'Allow access' checkbox
+      option when it is checked explaining that other apps can read, write, start/stop recording My
+      Tracks data.">
+    Other apps can read, write, start/stop recording My Tracks data.
+  </string>
+  <string name="settings_sharing_map_public"
+    translation_description="In the Sharing settings, the checkbox option to make a new map created
+      in Google My Maps public."> 
+    Make new maps public
+  </string>
+  <string name="settings_sharing_map_public_summary_off"
+    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 Goolge 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
+  </string>
+  <string name="settings_sharing_url_only"
+    translation_description="In the Sharing settings, the checkbox option to share only the URL
+      link, without any additional text, when sharing the URL with friends.">  
+    Share only URL link
+  </string>
+  <string name="settings_sharing_url_only_summary_off"
+    translation_description="In the Sharing settings, the summary for the 'Share only URL link'
+      checkbox option when it is unchecked explaining that some text and the the URL link will be
+      sent when sharing the URL with friends.">  
+    Some text and the URL link will be sent when sharing the URL with friends.
+  </string>
+  <string name="settings_sharing_url_only_summary_on" 
+    translation_description="In the Sharing settings, the summary for the 'Share only URL link'
+      checkbox option when it is checked explaining that only the URL link, without any additional
+      text, will be sent when sharing the URL with friends.">  
+   Only the URL link will be sent when sharing the URL with friends.
+  </string>      
   <string name="settings_title"
     translation_description="The title of the Settings page.">  
     My Tracks Settings
@@ -1073,152 +1206,7 @@ limitations under the License.
     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
-  </string>
-
-      
-  
-  
-  <!-- Sharing settings -->
-  <string name="settings_map_public"
-    translation_description="In the Sharing settings, the checkbox option to make a new map created
-      in Google My Maps public."> 
-    Make new maps public
-  </string>
-  <string name="settings_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
-  </string>
-  <string name="settings_map_public_summary_off"
-    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 Goolge My Maps unlisted
-  </string>
-  <string name="settings_share_url_only"
-    translation_description="In the Sharing settings, the checkbox option to share only the URL 
-      link when sharing a link with friends.">  
-    Share only URL link
-  </string>
-  <string name="settings_share_url_only_summary_on" 
-    translation_description="In the Sharing settings, the summary for the 'Share only URL link'
-      checkbox option when it is checked explaining that only the URL link will be sent when sharing
-      a link with friends.">  
-   Only the URL link will be sent when sharing a link with friends
-  </string>
-  <string name="settings_share_url_only_summary_off"
-    translation_description="In the Sharing settings, the summary for the 'Share only URL link'
-      checkbox option when it is unchecked explaining that some text and the the URL link will be
-      sent when sharing a link with friends.">  
-    Some text and the URL link will be sent when sharing a link with friends
-  </string>
-  <string name="settings_allow_access"
-   translation_description="In the Sharing settings, the checkbox option to allow third party apps
-     access to My Tracks data.">
-    Allow access
-  </string>
-  <string name="settings_allow_access_summary_on"
-  translation_description="In the Sharing settings, the summary for the 'Allow access' checkbox
-      option when it is checked explaining that other apps can read, write, start/stop recording My
-      Tracks data.">
-    Other apps can read, write, start/stop recording My Tracks data.
-  </string>
-  <string name="settings_allow_access_summary_off"
-   translation_description="In the Sharing settings, the summary for the 'Allow access' checkbox
-      option when it is unchecked explaining that other apps cannot read, write, start/stop
-      recording My Tracks data.">
-    Other apps cannot read, write, start/stop recording My Tracks data.
-  </string>
-  <string name="settings_allow_access_dialog_message"
-    translation_description="In the Sharing settings, after checking the 'Allow access' checkbox,
-      the confirmation dialog asking the user if he wants to allow other apps, including apps
-      installed in the future, to control and access My Tracks data. In addition, no further
-      notification of third party app access will be shown.">
-    Are you sure you want to allow other apps, including future apps, to control and access My
-    Tracks data? There will be no further notification.
-  </string>
-  
-  <!-- Backup settings -->
-  <string name="settings_sd_backup"
-    translation_description="In the Backup settings, the section title for configuring backup to the
-      SD card.">
-    SD Card Backup
-  </string>
-  <string name="settings_backup_to_sd"
-    translation_description="In the Backup settings, the option to backup to the SD card now.">
-    Backup now
-  </string>
-  <string name="settings_backup_to_sd_summary"
-    translation_description="In the Backup settings, 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
-  </string>
-  <string name="settings_restore_from_sd"
-    translation_description="In the Backup settings, the option to restore everything from the SD
-      card.">
-    Restore now
-  </string>
-  <string name="settings_restore_from_sd_summary"
-    translation_description="In the Backup settings, 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
   </string>  
-      
-  <!-- Reset to defaults -->    
-  <string name="settings_reset_dialog_message"
-    translation_description="In the Settings page, after pressing the 'Reset to defaults' option,
-      the confirmation dialog asking the user to confirm reverting all settings to defaults. But
-      the saved tracks will be preserved.">
-    All your settings will be erased and reverted to the default values. Saved tracks will be
-    preserved. Are you sure?
-  </string>
-  <string name="settings_reset_done"
-    translation_description="In the Settings page, after pressing the 'Reset to defaults' option,
-      the confirmation dialog informing the user that all settings have been reverted to their
-      defaults.">
-    All settings have been reverted to their defaults.
-  </string>
- 
-  <!-- Settings others -->    
-  <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
-  </string>
- 
-  <!-- Backup now -->
-  <string name="backup_write_progress_message"
-    translation_description="In the Backup settings, after pressing the 'Backup now' option, the
-      progress dialog telling the user that it is writing all tracks and settings and that it may
-      take a while.">
-    Writing all tracks and settings to the SD card. This may take a while...
-  </string>
-  
-  <!-- Restore now -->
-  <string name="restore_overwrites_warning"
-    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
-    sure?
-  </string>
-  <string name="select_backup_to_restore"
-    translation_description="In the Backup settings, after pressing the 'Restore now' option, the
-      message in the alert dialog asking the user to select a backup.">
-    Select the backup to restore
-  </string>
-  <string name="no_backups"
-    translation_description="In the Backup settings, after pressing the 'Restore now' option, the
-      message in the alert dialog informing the user that there is no backup.">
-    No backup found.
-  </string>
-  <string name="backup_import_progress_message"
-    translation_description="In the Backup settings, after pressing the 'Restore now' option, the
-      message on the progress dialog indicating that My Tracks is reading all tracks and settings
-      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>
        
   <!-- Google My Maps -->
   <string name="map_list_title"

MyTracks/res/xml/preferences.xml

@@ -191,38 +191,38 @@ limitations under the License.
   <PreferenceScreen android:title="@string/settings_sharing">
     <CheckBoxPreference
         android:key="@string/default_map_public_key"
-        android:title="@string/settings_map_public"
+        android:title="@string/settings_sharing_map_public"
-        android:summaryOn="@string/settings_map_public_summary_on"
+        android:summaryOn="@string/settings_sharing_map_public_summary_on"
-        android:summaryOff="@string/settings_map_public_summary_off"
+        android:summaryOff="@string/settings_sharing_map_public_summary_off"
         android:defaultValue="true" />
 
     <CheckBoxPreference
         android:key="@string/share_url_only_key"
-        android:title="@string/settings_share_url_only"
+        android:title="@string/settings_sharing_url_only"
-        android:summaryOn="@string/settings_share_url_only_summary_on"
+        android:summaryOn="@string/settings_sharing_url_only_summary_on"
-        android:summaryOff="@string/settings_share_url_only_summary_off"
+        android:summaryOff="@string/settings_sharing_url_only_summary_off"
         android:defaultValue="false" />
 
     <CheckBoxPreference
         android:key="@string/allow_access_key"
-        android:title="@string/settings_allow_access"
+        android:title="@string/settings_sharing_allow_access"
-        android:summaryOn="@string/settings_allow_access_summary_on"
+        android:summaryOn="@string/settings_sharing_allow_access_summary_on"
-        android:summaryOff="@string/settings_allow_access_summary_off"
+        android:summaryOff="@string/settings_sharing_allow_access_summary_off"
         android:defaultValue="false" />
   </PreferenceScreen>
 
   <!-- Backup settings -->
   <PreferenceScreen android:title="@string/settings_backup">
-    <PreferenceCategory android:title="@string/settings_sd_backup">
+    <PreferenceCategory android:title="@string/settings_backup_sd_card">
       <Preference
           android:key="@string/backup_to_sd_key"
-          android:title="@string/settings_backup_to_sd"
+          android:title="@string/settings_backup_now"
-          android:summary="@string/settings_backup_to_sd_summary"
+          android:summary="@string/settings_backup_now_summary"
           android:persistent="false" />
       <Preference
           android:key="@string/restore_from_sd_key"
-          android:title="@string/settings_restore_from_sd"
+          android:title="@string/settings_backup_restore"
-          android:summary="@string/settings_restore_from_sd_summary"
+          android:summary="@string/settings_backup_restore_summary"
           android:persistent="false" />
     </PreferenceCategory>
   </PreferenceScreen>

MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java

@@ -135,8 +135,8 @@ public class SettingsActivity extends PreferenceActivity {
         if ((Boolean) newValue) {
           AlertDialog dialog = new AlertDialog.Builder(SettingsActivity.this)
               .setCancelable(true)
-              .setTitle(getString(R.string.settings_allow_access))
+              .setTitle(getString(R.string.settings_sharing_allow_access))
-              .setMessage(getString(R.string.settings_allow_access_dialog_message))
+              .setMessage(getString(R.string.settings_sharing_allow_access_confirm_message))
               .setPositiveButton(android.R.string.ok, new OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialogInterface, int button) {
@@ -244,10 +244,10 @@ public class SettingsActivity extends PreferenceActivity {
     resetPreference.setEnabled(!recording);
     backupNowPreference.setSummary(
         recording ? R.string.settings_not_while_recording
-                  : R.string.settings_backup_to_sd_summary);
+                  : R.string.settings_backup_now_summary);
     restoreNowPreference.setSummary(
         recording ? R.string.settings_not_while_recording
-                  : R.string.settings_restore_from_sd_summary);
+                  : R.string.settings_backup_restore_summary);
     resetPreference.setSummary(
         recording ? R.string.settings_not_while_recording
                   : R.string.settings_reset_summary);

MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java

@@ -86,7 +86,7 @@ public class BackupActivityHelper {
     final ProgressDialog progressDialog = ProgressDialog.show(
         activity,
         activity.getString(R.string.progress_title),
-        activity.getString(R.string.backup_write_progress_message),
+        activity.getString(R.string.settings_backup_now_progress_message),
         true);
 
     // Do the writing in another thread
@@ -119,20 +119,20 @@ public class BackupActivityHelper {
     }
 
     if (!backup.isBackupsDirectoryAvailable(false)) {
-      showToast(R.string.no_backups);
+      showToast(R.string.settings_backup_restore_no_backup);
       return;
     }
 
     final Date[] backupDates = backup.getAvailableBackups();
     if (backupDates == null || backupDates.length == 0) {
-      showToast(R.string.no_backups);
+      showToast(R.string.settings_backup_restore_no_backup);
       return;
     }
     Arrays.sort(backupDates, REVERSE_DATE_ORDER);
 
     // Show a confirmation dialog
     Builder confirmationDialogBuilder = new AlertDialog.Builder(activity);
-    confirmationDialogBuilder.setMessage(R.string.restore_overwrites_warning);
+    confirmationDialogBuilder.setMessage(R.string.settings_backup_restore_confirm_message);
     confirmationDialogBuilder.setCancelable(true);
     confirmationDialogBuilder.setPositiveButton(android.R.string.yes,
         new OnClickListener() {
@@ -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.select_backup_to_restore);
+    dialogBuilder.setTitle(R.string.settings_backup_restore_select);
     dialogBuilder.setItems(backupDateStrs, new OnClickListener() {
       @Override
       public void onClick(DialogInterface dialog, int which) {
@@ -187,7 +187,7 @@ public class BackupActivityHelper {
     ProgressDialog.show(
         activity,
         activity.getString(R.string.progress_title),
-        activity.getString(R.string.backup_import_progress_message),
+        activity.getString(R.string.settings_backup_restore_progress_message),
         true);
 
     // Do the actual importing in another thread (don't block the UI)