diff --git a/MyTracks/res/layout/chart_settings.xml b/MyTracks/res/layout/chart_settings.xml
index 430bd79a3..acfec28d7 100644
--- a/MyTracks/res/layout/chart_settings.xml
+++ b/MyTracks/res/layout/chart_settings.xml
@@ -126,11 +126,11 @@ limitations under the License.
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/chart_settings_ok"
       android:layout_gravity="left"
-      android:text="@string/ok"
+      android:text="@string/generic_ok"
       style="@style/Button"/>
     <Button android:id="@+id/chart_settings_cancel"
       android:layout_gravity="right"
-      android:text="@string/cancel"
+      android:text="@string/generic_cancel"
       style="@style/Button"/>
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
diff --git a/MyTracks/res/layout/mytracks_detail.xml b/MyTracks/res/layout/mytracks_detail.xml
index 040015670..ceab4e7eb 100644
--- a/MyTracks/res/layout/mytracks_detail.xml
+++ b/MyTracks/res/layout/mytracks_detail.xml
@@ -72,11 +72,11 @@ limitations under the License.
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/trackdetails_save"
       android:layout_gravity="left"
-      android:text="@string/save"
+      android:text="@string/generic_save"
       style="@style/Button"/>
     <Button android:id="@+id/trackdetails_cancel"
       android:layout_gravity="right"
-      android:text="@string/cancel"
+      android:text="@string/generic_cancel"
       style="@style/Button"/>
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
diff --git a/MyTracks/res/layout/mytracks_send_to_google.xml b/MyTracks/res/layout/mytracks_send_to_google.xml
index 9d984b120..6a81c260e 100644
--- a/MyTracks/res/layout/mytracks_send_to_google.xml
+++ b/MyTracks/res/layout/mytracks_send_to_google.xml
@@ -120,7 +120,7 @@ limitations under the License.
       style="@style/Button"/>
     <Button android:id="@+id/sendtogoogle_cancel"
       android:layout_gravity="right"
-      android:text="@string/cancel"
+      android:text="@string/generic_cancel"
       style="@style/Button"/>
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
diff --git a/MyTracks/res/layout/mytracks_waypoint_details.xml b/MyTracks/res/layout/mytracks_waypoint_details.xml
index 364cebd76..8a2811201 100644
--- a/MyTracks/res/layout/mytracks_waypoint_details.xml
+++ b/MyTracks/res/layout/mytracks_waypoint_details.xml
@@ -491,11 +491,11 @@ limitations under the License.
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/waypointdetails_save"
       android:layout_gravity="left"
-      android:text="@string/save"
+      android:text="@string/generic_save"
       style="@style/Button"/>
     <Button android:id="@+id/waypointdetails_cancel"
       android:layout_gravity="right"
-      android:text="@string/cancel"
+      android:text="@string/generic_cancel"
       style="@style/Button"/>
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
diff --git a/MyTracks/res/layout/welcome.xml b/MyTracks/res/layout/welcome.xml
index 8bbb46444..f8fbd2164 100644
--- a/MyTracks/res/layout/welcome.xml
+++ b/MyTracks/res/layout/welcome.xml
@@ -28,7 +28,7 @@ limitations under the License.
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/welcome_ok"
       android:layout_gravity="left"
-      android:text="@string/ok"
+      android:text="@string/generic_ok"
       style="@style/Button"/>
     <Button android:id="@+id/welcome_about"
       android:layout_gravity="right"
diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index 32b21f355..91a026849 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -71,14 +71,14 @@ limitations under the License.
   <string name="send_google_progress_sending_fusion_tables">S\'està enviant a Google Fusion Tables...</string>
   <string name="send_google_progress_creating_fusion_table">S\'està creant un Fusion Table nou...</string>
   <string name="progress_message_import">S\'està imporant una ruta GPS. Això pot trigar una estona.</string>
-  <string name="progress_message_export">S\'està escrivint a la targeta SD. Això pot trigar una estona.</string>
+  <string name="export_progress_message">S\'està escrivint a la targeta SD. Això pot trigar una estona.</string>
   <string name="progress_message_updating_track">S\'estan actualitzant les estadístiques de la ruta...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Esteu segur?</string>
-  <string name="all_data_will_be_permanently_deleted">Tots els marcadors i rutes s\'eliminaran d\'aquest telèfon.</string>
-  <string name="track_will_be_permanently_deleted">La ruta i els seus marcadors s\'eliminaran de forma permanent d\'aquest telèfon.</string>
-  <string name="marker_will_be_permanently_deleted">El marcador s\'eliminarà de forma permanent d\'aquest telèfon.</string>
+  <string name="generic_confirm_title">Esteu segur?</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_confirm_message">La ruta i els seus marcadors s\'eliminaran de forma permanent d\'aquest telèfon.</string>
+  <string name="marker_list_delete_marker_confirm_message">El marcador s\'eliminarà de forma permanent d\'aquest telèfon.</string>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">Creat per My Tracks a l\'Android.</string>
@@ -94,14 +94,14 @@ limitations under the License.
   <string name="track_name_format">Ruta %d</string>
 
   <!-- Common -->
-  <string name="no">No</string>
-  <string name="yes">Sí</string>
-  <string name="ok">D\'acord</string>
-  <string name="error">Error</string>
-  <string name="success">Fet</string>
+  <string name="generic_no">No</string>
+  <string name="generic_yes">Sí</string>
+  <string name="generic_ok">D\'acord</string>
+  <string name="generic_error">Error</string>
+  <string name="generic_success">Fet</string>
   <string name="marker_type_waypoint">Punt de referència</string>
-  <string name="cancel">Cancel·la</string>
-  <string name="save">Desa</string>
+  <string name="generic_cancel">Cancel·la</string>
+  <string name="generic_save">Desa</string>
 
   <!-- Placemark labels for start and end of track -->
   <string name="marker_label_start">(Inici)</string>
@@ -124,7 +124,7 @@ limitations under the License.
   <string name="track_list_delete_all">Elimina totes les rutes</string>
   <!-- Export All -->
   <string name="track_list_export_all">Exporta totes les rutes</string>
-  <string name="export_done">Exporta les finalitzades</string>
+  <string name="export_success">Exporta les finalitzades</string>
   <string name="track_list_pick_one">Seleccioneu una ruta. Mantingueu el dit per veure més opcions.</string>
   <string name="tracklist_all_tracks">Totes les rutes:</string>
   <string name="track_list_this_track">Aquesta ruta</string>
@@ -243,7 +243,7 @@ limitations under the License.
   <string name="share_track_file_body_format">Em sembla que estaràs interessat en aquesta ruta.
 
     Per veure aquesta ruta fes servir Google Earth o altre programari de mapes.</string>
-  <string name="share_track_url">Comparteix la ruta amb amics</string>
+  <string name="send_google_result_share_url">Comparteix la ruta amb amics</string>
 
   <!-- Visibility -->
   <string name="my_maps_list_public_label">Públic</string>
@@ -346,12 +346,12 @@ limitations under the License.
   <string name="send_google_choose_account">Trieu un compte</string>
 
   <!-- SD card -->
-  <string name="io_no_external_storage_found">No s\'ha trobat cap dispositiu d\'emmagatzematge extern. Assegureu-vos que la targeta SD està inserida i que el telèfon no està connectat a un ordinador.</string>
-  <string name="io_write_failed">No es pot escriure a un fitxer.</string>
-  <string name="io_read_failed">No es pot llegir des del fitxer.</string>
-  <string name="io_create_dir_failed">No es pot crear el directori a la targeta SD.</string>
-  <string name="io_write_finished">S\'ha finalitzat l\'escriptura a la targeta SD.</string>
-  <string name="io_read_finished">S\'ha finalitzat la lectura a la targeta SD.</string>
+  <string name="sd_card_error_no_storage">No s\'ha trobat cap dispositiu d\'emmagatzematge extern. Assegureu-vos que la targeta SD està inserida i que el telèfon no està connectat a un ordinador.</string>
+  <string name="sd_card_error_write_file">No es pot escriure a un fitxer.</string>
+  <string name="sd_card_error_read_file">No es pot llegir des del fitxer.</string>
+  <string name="sd_card_error_create_dir">No es pot crear el directori a la targeta SD.</string>
+  <string name="sd_card_success_write_file">S\'ha finalitzat l\'escriptura a la targeta SD.</string>
+  <string name="sd_card_success_read_file">S\'ha finalitzat la lectura a la targeta SD.</string>
 
   <!-- VersionChecker -->
   <string name="version_check_title">Comprovació d\'actualitzacions</string>
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index da92fb84c..6abde725b 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -71,14 +71,14 @@ limitations under the License.
   <string name="send_google_progress_sending_fusion_tables">Track wird an Google Fusion Tables gesendet...</string>
   <string name="send_google_progress_creating_fusion_table">Neue \'Fusion Tabelle\' wird erstellt...</string>
   <string name="progress_message_import">Importiere GPS-Track. Das kann ein wenig dauern.</string>
-  <string name="progress_message_export">Schreibe Datei auf SD-Karte. Das kann ein wenig dauern.</string>
+  <string name="export_progress_message">Schreibe Datei auf SD-Karte. Das kann ein wenig dauern.</string>
   <string name="progress_message_updating_track">Aktualisiere Trackstatistik...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Bist Du Dir wirklich sicher?</string>
-  <string name="all_data_will_be_permanently_deleted">Alle Tracks und Wegpunkte werden endgültig von diesem Gerät gelöscht.</string>
-  <string name="track_will_be_permanently_deleted">Dieser Track und seine Wegpunkte werden endgültig von diesem Gerät gelöscht.</string>
-  <string name="marker_will_be_permanently_deleted">Dieser Wegpunkt wird endgültig von diesem Gerät gelöscht.</string>
+  <string name="generic_confirm_title">Bist Du Dir wirklich sicher?</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_confirm_message">Dieser Track und seine Wegpunkte werden endgültig von diesem Gerät gelöscht.</string>
+  <string name="marker_list_delete_marker_confirm_message">Dieser Wegpunkt wird endgültig von diesem Gerät gelöscht.</string>
 
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">Erstellt von My Tracks für Android.</string>
@@ -95,15 +95,15 @@ limitations under the License.
   <!--string name="track_name_format">Track %d</string-->
 
   <!-- Common -->
-  <string name="no">Nein</string>
-  <string name="yes">Ja</string>
-  <!--string name="ok">OK</string-->
-  <string name="error">Fehler</string>
-  <string name="success">Erfolgreich</string>
+  <string name="generic_no">Nein</string>
+  <string name="generic_yes">Ja</string>
+  <!--string name="generic_ok">OK</string-->
+  <string name="generic_error">Fehler</string>
+  <string name="generic_success">Erfolgreich</string>
   <string name="marker_type_waypoint">Wegpunkt</string>
   <string name="about_license">Lizenz</string>
-  <string name="cancel">Abbrechen</string>
-  <string name="save">Sichern</string>
+  <string name="generic_cancel">Abbrechen</string>
+  <string name="generic_save">Sichern</string>
 
   <!-- Placemark labels for start and end of track -->
   <!--string name="marker_label_start">(Start)</string-->
@@ -126,7 +126,7 @@ limitations under the License.
   <string name="track_list_delete_all">Alle Tracks löschen</string>
   <!-- Export All -->
   <string name="track_list_export_all">Alle Tracks exportieren</string>
-  <string name="export_done">Exportieren beendet</string>
+  <string name="export_success">Exportieren beendet</string>
   <string name="track_list_pick_one">Einen Track auswählen. Lange berühren für mehr Optionen.</string>
   <string name="tracklist_all_tracks">Alle Tracks</string>
   <string name="track_list_this_track">Dieser Track</string>
@@ -253,7 +253,7 @@ limitations under the License.
   <string name="share_track_file_body_format">Vielleicht interessierst Du Dich für diese Track:
 
       Der Track kann mit Google Earth oder anderer Karten-Software visualisiert werden.</string>
-  <string name="share_track_url">Track mit Freunden teilen</string>
+  <string name="send_google_result_share_url">Track mit Freunden teilen</string>
 
   <!-- Visibility -->
   <string name="my_maps_list_public_label">Öffentlich</string>
@@ -378,12 +378,12 @@ limitations under the License.
   <string name="send_google_choose_account">Wähle ein Konto</string>
 
   <!-- SD card -->
-  <string name="io_no_external_storage_found">Keine externes Speichermedium verfügbar. Stelle sicher, dass eine SD-Karte vorhanden ist und nicht bereits von einem Computer darauf zugegriffen wird.</string>
-  <string name="io_write_failed">Die Datei kann nicht geschrieben werden.</string>
-  <string name="io_read_failed">Die Datei konnte nicht gelesen werden.</string>
-  <string name="io_create_dir_failed">Das Verzeichnis auf der SD-Karte kann nicht erstellt werden.</string>
-  <string name="io_write_finished">Der Track wurde auf die SD-Karte geschrieben.</string>
-  <string name="io_read_finished">Lesen von der SD-Karte beendet.</string>
+  <string name="sd_card_error_no_storage">Keine externes Speichermedium verfügbar. Stelle sicher, dass eine SD-Karte vorhanden ist und nicht bereits von einem Computer darauf zugegriffen wird.</string>
+  <string name="sd_card_error_write_file">Die Datei kann nicht geschrieben werden.</string>
+  <string name="sd_card_error_read_file">Die Datei konnte nicht gelesen werden.</string>
+  <string name="sd_card_error_create_dir">Das Verzeichnis auf der SD-Karte kann nicht erstellt werden.</string>
+  <string name="sd_card_success_write_file">Der Track wurde auf die SD-Karte geschrieben.</string>
+  <string name="sd_card_success_read_file">Lesen von der SD-Karte beendet.</string>
 
   <!-- VersionChecker -->
   <string name="version_check_title">Suche nach neuer Version</string>
diff --git a/MyTracks/res/values-es-rES/strings.xml b/MyTracks/res/values-es-rES/strings.xml
index 5ccb4b169..9e6e32ab1 100644
--- a/MyTracks/res/values-es-rES/strings.xml
+++ b/MyTracks/res/values-es-rES/strings.xml
@@ -34,7 +34,7 @@ limitations under the License.
 
   <!-- Common -->
   <string name="about_license">Licencia</string>
-  <string name="save">Guardar</string>
+  <string name="generic_save">Guardar</string>
 
   <!-- Placemark labels for start and end of track -->
 
@@ -108,9 +108,9 @@ limitations under the License.
   <string name="send_google_choose_account">Elegir cuenta</string>
 
   <!-- SD card -->
-  <string name="io_read_failed">No es posible leer del fichero.</string>
-  <string name="io_write_finished">Grabación a tarjeta SD terminada.</string>
-  <string name="io_read_finished">Lectura de tarjeta SD terminada.</string>
+  <string name="sd_card_error_read_file">No es posible leer del fichero.</string>
+  <string name="sd_card_success_write_file">Grabación a tarjeta SD terminada.</string>
+  <string name="sd_card_success_read_file">Lectura de tarjeta SD terminada.</string>
 
   <!-- VersionChecker -->
 
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index 1736769c8..78d98c85c 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -45,7 +45,7 @@ limitations under the License.
   <string name="error_import_invalid_gpx_format">El archivo no tiene un format GPX válido.</string>
   <string name="send_google_error">A ocurrido un error. Por favor, inténtelo de nuevo.</string>
   <string name="error_export_track_does_not_exist">El recorrido no existe.</string>
-  <string name="error_export_operation_canceled">La operación fue cancelada.</string>
+  <string name="export_canceled">La operación fue cancelada.</string>
   <string name="error_import_out_of_memory">El archivo es demasiado grande (tiene que ser menor a 500 KB). Abortando.</string>
   <string name="marker_insert_error">No se puede insertar el marcador. La ubicación no está disponible.</string>
 
@@ -80,15 +80,15 @@ limitations under the License.
   <string name="send_google_progress_sending_fusion_tables">Enviando recorrido a Google Fusion Tables...</string>
   <string name="send_google_progress_creating_fusion_table">Creando nuevo mapa Fusion Tables...</string>
   <string name="progress_message_import">Importando un recorrido GPS. Esto puede tardar.</string>
-  <string name="progress_message_export">Escribiendo archivo a tarjeta SD. Esto puede tardar.</string>
+  <string name="export_progress_message">Escribiendo archivo a tarjeta SD. Esto puede tardar.</string>
   <string name="progress_message_updating_track">Actualizando estadísticas del recorrido...</string>
 
   <!-- Used by DeleteAllDataHandler -->
     <string name="delete_track_activity_title">Borrar recorrido</string>
-  <string name="confirmation_title_are_you_sure">¿Está usted seguro?</string>
-  <string name="all_data_will_be_permanently_deleted">Todos los recorridos y señales serán borradas de este teléfono.</string>
-  <string name="track_will_be_permanently_deleted">El recorrido y sus señales serán borrados permanentemente de este teléfono.</string>
-  <string name="marker_will_be_permanently_deleted">La señal será borrada permanentemente de este teléfono.</string>
+  <string name="generic_confirm_title">¿Está usted seguro?</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_confirm_message">El recorrido y sus señales serán borrados permanentemente de este teléfono.</string>
+  <string name="marker_list_delete_marker_confirm_message">La señal será borrada permanentemente de este teléfono.</string>
 
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">Creado por My Tracks para Android.</string>
@@ -109,12 +109,12 @@ limitations under the License.
   <string name="track_name_format">Recorrido %d</string>
 
   <!-- Common -->
-  <string name="yes">Sí</string>
-  <string name="success">Éxito</string>
+  <string name="generic_yes">Sí</string>
+  <string name="generic_success">Éxito</string>
   <string name="marker_type_waypoint">Marcador de recorrido</string>
   <string name="about_license">Licencia</string>
-  <string name="cancel">Cancelar</string>
-  <string name="save">Guardar</string>
+  <string name="generic_cancel">Cancelar</string>
+  <string name="generic_save">Guardar</string>
 
   <!-- Placemark labels for start and end of track -->
   <string name="marker_label_start">(Inicio)</string>
@@ -141,7 +141,7 @@ limitations under the License.
   
   <!-- Export All -->
   <string name="track_list_export_all">Exportar todos</string>
-  <string name="export_done">Exportación concluída</string>
+  <string name="export_success">Exportación concluída</string>
   <string name="track_list_pick_one">Escoja un recorrido. Presione&amp;mantenga presionado para ver más opciones.</string>
   <string name="tracklist_all_tracks">Todos los recorridos:"</string>
   <string name="track_list_this_track">Este recorrido"</string>
@@ -160,8 +160,8 @@ limitations under the License.
   $2 : Attempted imports
   $3 : MyTracks gpx path
   -->
-  <string name="import_multi_done">Importados %1$d de %2$d archivos GPX de %3$s</string>
-  <string name="import_multi_empty">No se encontraron archivos GPX en %s. Es posible que la tarjeta SD no sea accesible o que el directorio no contenga archivos GPX.</string>
+  <string name="import_success">Importados %1$d de %2$d archivos GPX de %3$s</string>
+  <string name="import_no_file">No se encontraron archivos GPX en %s. Es posible que la tarjeta SD no sea accesible o que el directorio no contenga archivos GPX.</string>
   <string name="import_error">Error importando el archivo %s</string>
   <string name="import_title">Importar a My Tracks</string>
   <string name="import_success">Se importaron correctamente %1$d recorrido(s) del archivo.</string>
@@ -304,7 +304,7 @@ limitations under the License.
   <string name="my_maps_list_error">¡No se pudieron cargar sus mapas en este momento!</string>
   <string name="open_map">Seleccionar este mapa</string>
   <string name="edit_map_details">Editar detalles del mapa</string>
-  <string name="share_track_url">Compartir recorrido</string>
+  <string name="send_google_result_share_url">Compartir recorrido</string>
   <string name="delete_map">Borrar mapa de su cuenta</string>
   <string name="map_title">Titulo del mapa:</string>
   <string name="map_description">Descripción del mapa:</string>
@@ -434,12 +434,12 @@ limitations under the License.
   <string name="send_google_choose_account">Elija una cuenta</string>
   
   <!-- SD card -->
-  <string name="io_no_external_storage_found">Ningún almacenamiento externo fue encontrado. Asegúrese que la tarjeta SD se encuentre insertada y que su teléfono no este conectado a una computadora.</string>
-  <string name="io_write_failed">No es posible escribir al archivo.</string>
-  <string name="io_read_failed">No es posible leer el archivo.</string>
-  <string name="io_create_dir_failed">No es posible crear un directorio en su tarjeta SD.</string>
-  <string name="io_write_finished">Grabación a tarjeta SD concluída.</string>
-  <string name="io_read_finished">Lectura de tarjeta SD concluída.</string>
+  <string name="sd_card_error_no_storage">Ningún almacenamiento externo fue encontrado. Asegúrese que la tarjeta SD se encuentre insertada y que su teléfono no este conectado a una computadora.</string>
+  <string name="sd_card_error_write_file">No es posible escribir al archivo.</string>
+  <string name="sd_card_error_read_file">No es posible leer el archivo.</string>
+  <string name="sd_card_error_create_dir">No es posible crear un directorio en su tarjeta SD.</string>
+  <string name="sd_card_success_write_file">Grabación a tarjeta SD concluída.</string>
+  <string name="sd_card_success_read_file">Lectura de tarjeta SD concluída.</string>
   
   <!-- VersionChecker -->
   <string name="version_check_title">Comprobar actualizaciones</string>
diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml
index b8082d42b..33baff85d 100644
--- a/MyTracks/res/values-fi/strings.xml
+++ b/MyTracks/res/values-fi/strings.xml
@@ -45,7 +45,7 @@ limitations under the License.
   <string name="error_import_invalid_gpx_format">Virheellinen GPX-formaatti.</string>
   <string name="error_import_generic">Tapahtui virhe. Yritä uudelleen.</string>
   <string name="error_export_track_does_not_exist">Reittiä ei ole olemassa.</string>
-  <string name="error_export_operation_canceled">Tapahtuma keskeytettiin.</string>
+  <string name="export_canceled">Tapahtuma keskeytettiin.</string>
   <string name="error_import_out_of_memory">Liian suuri tiedosto (maksimi 500 KB). Keskeytetään.</string>
   <string name="marker_insert_error">Merkintää ei voitu lisätä. Paikkatietoa ei saatavilla.</string>
 
@@ -80,14 +80,14 @@ limitations under the License.
   <string name="send_google_progress_sending_fusion_tables">Lähetetään reittiä Fusion Tablesiin...</string>
   <string name="send_google_progress_creating_fusion_table">Luodaan uutta Fusion tablea...</string>
   <string name="progress_message_import">Tuodaan uutta GPS-reittiä. Odota.</string>
-  <string name="progress_message_export">Kirjoitetaan tiedostoa SD-kortille. Odota.</string>
+  <string name="export_progress_message">Kirjoitetaan tiedostoa SD-kortille. Odota.</string>
   <string name="progress_message_updating_track">Päivitetään reitin tilastoja...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Oletko varma?</string>
-  <string name="all_data_will_be_permanently_deleted">Kaikki reitit ja merkinnät poistetaan puhelimesta.</string>
-  <string name="track_will_be_permanently_deleted">Reitti ja se merkinnät poistetaan pysyvästi puhelimesta.</string>
-  <string name="marker_will_be_permanently_deleted">Merkintä poistetaan puhelimesta.</string>
+  <string name="generic_confirm_title">Oletko varma?</string>
+  <string name="track_list_delete_all_confirm_message">Kaikki reitit ja merkinnät poistetaan puhelimesta.</string>
+  <string name="track_list_delete_track_confirm_message">Reitti ja se merkinnät poistetaan pysyvästi puhelimesta.</string>
+  <string name="marker_list_delete_marker_confirm_message">Merkintä poistetaan puhelimesta.</string>
 
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">Created by My Tracks on Android.</string>
@@ -108,15 +108,15 @@ limitations under the License.
   <string name="track_name_format">Reitti %d</string>
 
   <!-- Common -->
-  <string name="no">Ei</string>
-  <string name="yes">Kyllä</string>
-  <string name="ok">OK</string>
-  <string name="error">Virhe</string>
-  <string name="success">Valmis</string>
+  <string name="generic_no">Ei</string>
+  <string name="generic_yes">Kyllä</string>
+  <string name="generic_ok">OK</string>
+  <string name="generic_error">Virhe</string>
+  <string name="generic_success">Valmis</string>
   <string name="marker_type_waypoint">Reittipiste</string>
   <string name="about_license">Lisenssi</string>
-  <string name="cancel">Peruuta</string>
-  <string name="save">Tallenna</string>
+  <string name="generic_cancel">Peruuta</string>
+  <string name="generic_save">Tallenna</string>
 
   <!-- Placemark labels for start and end of track -->
   <string name="marker_label_start">(Lähtö)</string>
@@ -142,7 +142,7 @@ limitations under the License.
   <string name="track_list_delete_all">Poista kaikki</string>
   <!-- Export All -->
   <string name="track_list_export_all">Vie kaikki</string>
-  <string name="export_done">Vienti tehty</string>
+  <string name="export_success">Vienti tehty</string>
   <string name="track_list_pick_one">Valitse reitti. Pitkällä painalluksella lisää vaihtoehtoja.</string>
   <string name="tracklist_all_tracks">Kaikki reitit:</string>
   <string name="track_list_this_track">Tämä reitti</string>
@@ -160,8 +160,8 @@ limitations under the License.
   $2 : Attempted imports
   $3 : MyTracks gpx path
   -->
-  <string name="import_multi_done">Tuotu %1$d GPX-tiedostoa %2$d:sta lähteestä %3$s</string>
-  <string name="import_multi_empty">Lähteestä %s ei löytynyt GPX-tiedostoja. SD-kortti saattaa olla lukukelvoton tai hakemistossa ei ole GPX-tiedostoja.</string>
+  <string name="import_success">Tuotu %1$d GPX-tiedostoa %2$d:sta lähteestä %3$s</string>
+  <string name="import_no_file">Lähteestä %s ei löytynyt GPX-tiedostoja. SD-kortti saattaa olla lukukelvoton tai hakemistossa ei ole GPX-tiedostoja.</string>
   <string name="import_error">Virhe tuotaessa tiedostoa %s</string>
   <string name="import_title">Tuo My Tracksiin</string>
   <string name="import_success">%1$d reittiä tuotu.</string>
@@ -285,7 +285,7 @@ limitations under the License.
   <string name="my_maps_list_error">Karttoja ei voitu ladata!</string>
   <string name="open_map">Valitse tämä kartta</string>
   <string name="edit_map_details">Muokkaa kartan tietoja</string>
-  <string name="share_track_url">Jaa reitti</string>
+  <string name="send_google_result_share_url">Jaa reitti</string>
   <string name="delete_map">Poista kartta tililtä</string>
   <string name="map_title">Kartan otsikko:</string>
   <string name="map_description">Kartan kuvaus:</string>
@@ -430,12 +430,12 @@ limitations under the License.
   <string name="send_google_choose_account">Valitse tili</string>
 
   <!-- SD card -->
-  <string name="io_no_external_storage_found">Ulkoista tallennusmediaa ei löytynyt. Varmista että SD-kortti on kytketty eikä puhelinta ole liitetty tietokoneeseen.</string>
-  <string name="io_write_failed">Kirjoitusvirhe.</string>
-  <string name="io_read_failed">Lukuvirhe.</string>
-  <string name="io_create_dir_failed">Hakemistoa ei voitu luoda SD-kortille.</string>
-  <string name="io_write_finished">SD-kortille kirjoitus valmis.</string>
-  <string name="io_read_finished">SD-kortin luku valmis.</string>
+  <string name="sd_card_error_no_storage">Ulkoista tallennusmediaa ei löytynyt. Varmista että SD-kortti on kytketty eikä puhelinta ole liitetty tietokoneeseen.</string>
+  <string name="sd_card_error_write_file">Kirjoitusvirhe.</string>
+  <string name="sd_card_error_read_file">Lukuvirhe.</string>
+  <string name="sd_card_error_create_dir">Hakemistoa ei voitu luoda SD-kortille.</string>
+  <string name="sd_card_success_write_file">SD-kortille kirjoitus valmis.</string>
+  <string name="sd_card_success_read_file">SD-kortin luku valmis.</string>
 
   <!-- VersionChecker -->
   <string name="version_check_title">Tarkista päivitykset</string>
diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml
index 94267dff4..2fb59fb6a 100644
--- a/MyTracks/res/values-fr/strings.xml
+++ b/MyTracks/res/values-fr/strings.xml
@@ -72,14 +72,14 @@ limitations under the License.
   <string name="send_google_progress_sending_fusion_tables">Envoi du parcours vers Google Fusion Tables...</string>
   <string name="send_google_progress_creating_fusion_table">Création d\'une nouvelle \'Fusion Table\'...</string>
   <string name="progress_message_import">Importation du parcours GPS. Patientez SVP.</string>
-  <string name="progress_message_export">Enregistrement du fichier sur la carte SD. Patientez SVP.</string>
+  <string name="export_progress_message">Enregistrement du fichier sur la carte SD. Patientez SVP.</string>
   <string name="progress_message_updating_track">Mise à jour des statistiques du parcours...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Êtes-vous sûr?</string>
-  <string name="all_data_will_be_permanently_deleted">Tous les parcours et balises vont être supprimés de ce téléphone.</string>
-  <string name="track_will_be_permanently_deleted">Le parcours et ses balises vont être supprimés de manière permanente de ce téléphone.</string>
-  <string name="marker_will_be_permanently_deleted">Les balises vont être supprimées de manière permanente de ce téléphone.</string>
+  <string name="generic_confirm_title">Êtes-vous sûr?</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_confirm_message">Le parcours et ses balises vont être supprimés de manière permanente de ce téléphone.</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>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">Créée par My Tracks sous Android.</string>
@@ -95,12 +95,12 @@ limitations under the License.
   <string name="track_name_format">Parcours %d</string>
 
   <!-- Common -->
-  <string name="no">Non</string>
-  <string name="yes">Oui</string>
-  <string name="error">Erreur</string>
+  <string name="generic_no">Non</string>
+  <string name="generic_yes">Oui</string>
+  <string name="generic_error">Erreur</string>
   <string name="marker_type_waypoint">Point de passage</string>
-  <string name="cancel">Annuler</string>
-  <string name="save">Enregistrer</string>
+  <string name="generic_cancel">Annuler</string>
+  <string name="generic_save">Enregistrer</string>
 
   <!-- Placemark labels for start and end of track -->
   <string name="marker_label_start">(Début)</string>
@@ -232,7 +232,7 @@ limitations under the License.
   <string name="share_track_file_body_format">Je pense que ce parcours vous intéressera.
 
     Pour voir ce parcours, utilisez Google Earth ou tout autre logiciel de cartographie.</string>
-  <string name="share_track_url">Partager des parcours.</string>
+  <string name="send_google_result_share_url">Partager des parcours.</string>
 
   <!-- Visibility -->
   <string name="my_maps_list_unlisted_label">Carte non listée</string>
@@ -336,10 +336,10 @@ limitations under the License.
   <string name="send_google_choose_account">Choisissez un compte</string>
 
   <!-- SD card -->
-  <string name="io_no_external_storage_found">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="io_write_failed">Impossible d\'écrire dans le fichier.</string>
-  <string name="io_create_dir_failed">Impossible de créer un dossier dans la carte SD.</string>
-  <string name="io_write_finished">Parcours enregistré sur la carte SD.</string>
+  <string name="sd_card_error_no_storage">Aucun emplacement externe de sauvegarde n\'a été trouvé. Assurez-vous qu\'une carte SD est insérée et que votre téléphone n\'est pas relié à un ordinateur.</string>
+  <string name="sd_card_error_write_file">Impossible d\'écrire dans le fichier.</string>
+  <string name="sd_card_error_create_dir">Impossible de créer un dossier dans la carte SD.</string>
+  <string name="sd_card_success_write_file">Parcours enregistré sur la carte SD.</string>
 
   <!-- VersionChecker -->
   <string name="version_check_title">Recherche mise à jour</string>
diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml
index 3ee9fcf11..5df60f6d3 100644
--- a/MyTracks/res/values-it/strings.xml
+++ b/MyTracks/res/values-it/strings.xml
@@ -69,14 +69,14 @@ limitations under the License.
   <!-- <string name="send_google_progress_sending_fusion_tables">Invio del percorso a Google Maps in corso...</string> -->
   <!-- <string name="send_google_progress_creating_fusion_table">Creazione di una nuova mappa in «Le mie mappe» in corso...</string> -->
   <string name="progress_message_import">Importazione del percorso GPS in corso. Attendere prego...</string>
-  <string name="progress_message_export">Salvataggio del file sulla scheda SD in corso. Attendere prego...</string>
+  <string name="export_progress_message">Salvataggio del file sulla scheda SD in corso. Attendere prego...</string>
   <string name="progress_message_updating_track">Aggiornamento delle statistiche del percorso in corso...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Sei sicuro?</string>
-  <string name="all_data_will_be_permanently_deleted">Tutti i percorsi e segnaposti saranno eliminati definitivamente da questo telefono.</string>
-  <string name="track_will_be_permanently_deleted">Il percorso e i suoi segnaposti saranno eliminati definitivamente da questo telefono.</string>
-  <string name="marker_will_be_permanently_deleted">Il segnaposto sarà eliminato definitivamente da questo telefono.</string>
+  <string name="generic_confirm_title">Sei sicuro?</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_confirm_message">Il percorso e i suoi segnaposti saranno eliminati definitivamente da questo telefono.</string>
+  <string name="marker_list_delete_marker_confirm_message">Il segnaposto sarà eliminato definitivamente da questo telefono.</string>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">Creato da My Tracks su Android.</string>
@@ -93,14 +93,14 @@ limitations under the License.
   <string name="track_name_format">Percorso %d</string>
 
   <!-- Common -->
-  <string name="no">No</string>
-  <string name="yes">Sì</string>
-  <string name="ok">OK</string>
-  <string name="error">Errore</string>
-  <string name="success">Successo</string>
+  <string name="generic_no">No</string>
+  <string name="generic_yes">Sì</string>
+  <string name="generic_ok">OK</string>
+  <string name="generic_error">Errore</string>
+  <string name="generic_success">Successo</string>
   <string name="marker_type_waypoint">Punto di passaggio</string>
-  <string name="cancel">Annulla</string>
-  <string name="save">Salva</string>
+  <string name="generic_cancel">Annulla</string>
+  <string name="generic_save">Salva</string>
 
   <!-- Placemark labels for start and end of track -->
   <string name="marker_label_start">(Inizio)</string>
@@ -121,7 +121,7 @@ limitations under the License.
   <string name="track_list_delete_all">Elimina tutti i percorsi</string>
   <!-- Export All -->
   <string name="track_list_export_all">Esporta tutti i percorsi</string>
-  <string name="export_done">Esportazione terminata.</string>
+  <string name="export_success">Esportazione terminata.</string>
   <string name="track_list_pick_one">Scegli un percorso. Tieni premuto per più opzioni.</string>
   <string name="tracklist_all_tracks">Tutti i percorsi:</string>
   <string name="track_list_this_track">Questo percorso</string>
@@ -208,7 +208,7 @@ limitations under the License.
   <string name="share_track_file_body_format">Credo che questo percorso potrebbe interessarti.
 
     Per vedere questo percorso, usa Google Earth o un altro software di cartografia.</string>
-  <string name="share_track_url">Condividi il percorso con amici</string>
+  <string name="send_google_result_share_url">Condividi il percorso con amici</string>
 
   <!-- Visibility -->
   <string name="my_maps_list_public_label">Pubblica</string>
@@ -320,10 +320,10 @@ limitations under the License.
   <string name="send_google_choose_account">Scegli un account</string>
 
   <!-- SD card -->
-  <string name="io_no_external_storage_found">Nessuna memoria esterna trovata. Assicurati che la scheda SD sia inserita e che il telefono no sia montato su un computer.</string>
-  <string name="io_write_failed">Impossibile scrivere su file.</string>
-  <string name="io_create_dir_failed">Impossibile creare directory sulla scheda SD.</string>
-  <string name="io_write_finished">Finito di salvare il percorso sulla scheda SD.</string>
+  <string name="sd_card_error_no_storage">Nessuna memoria esterna trovata. Assicurati che la scheda SD sia inserita e che il telefono no sia montato su un computer.</string>
+  <string name="sd_card_error_write_file">Impossibile scrivere su file.</string>
+  <string name="sd_card_error_create_dir">Impossibile creare directory sulla scheda SD.</string>
+  <string name="sd_card_success_write_file">Finito di salvare il percorso sulla scheda SD.</string>
 
   <!-- VersionChecker -->
   <string name="version_check_title">Controlla aggiornamenti</string>
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index 74c24182e..33e2230c3 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -77,14 +77,14 @@ limitations under the License.
   <string name="send_google_progress_sending_fusion_tables">トラックをFusion Tablesに送信しています...</string>
   <string name="send_google_progress_creating_fusion_table">新しいFusionテーブルを生成しています...</string>
   <string name="progress_message_import">GPSトラックをインポートしています．若干時間がかかります．</string>
-  <string name="progress_message_export">SDカードにデータを書き込んでいます．若干時間がかかります．</string>
+  <string name="export_progress_message">SDカードにデータを書き込んでいます．若干時間がかかります．</string>
   <string name="progress_message_updating_track">トラック統計情報を更新しています...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">よろしいですか?</string>
-  <string name="all_data_will_be_permanently_deleted">全てのトラックとマーカーをこの端末から削除します．</string>
-  <string name="track_will_be_permanently_deleted">トラックとマーカーをこの端末から完全に削除します．</string>
-  <string name="marker_will_be_permanently_deleted">マーカーをこの端末から完全に削除します．</string>
+  <string name="generic_confirm_title">よろしいですか?</string>
+  <string name="track_list_delete_all_confirm_message">全てのトラックとマーカーをこの端末から削除します．</string>
+  <string name="track_list_delete_track_confirm_message">トラックとマーカーをこの端末から完全に削除します．</string>
+  <string name="marker_list_delete_marker_confirm_message">マーカーをこの端末から完全に削除します．</string>
 
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">Android用My Tracksで作成</string>
@@ -105,14 +105,14 @@ limitations under the License.
   <string name="track_name_format">トラック %d</string>
 
   <!-- Common -->
-  <string name="no">いいえ</string>
-  <string name="yes">はい</string>
-  <string name="error">エラー</string>
-  <string name="success">成功</string>
+  <string name="generic_no">いいえ</string>
+  <string name="generic_yes">はい</string>
+  <string name="generic_error">エラー</string>
+  <string name="generic_success">成功</string>
   <string name="marker_type_waypoint">ウェイポイント</string>
   <string name="about_license">ライセンス</string>
-  <string name="cancel">キャンセル</string>
-  <string name="save">保存</string>
+  <string name="generic_cancel">キャンセル</string>
+  <string name="generic_save">保存</string>
 
   <!-- Placemark labels for start and end of track -->
   <string name="marker_label_start">(開始)</string>
@@ -138,7 +138,7 @@ limitations under the License.
   <string name="track_list_delete_all">全て削除</string>
   <!-- Export All -->
   <string name="track_list_export_all">全て出力</string>
-  <string name="export_done">出力終了</string>
+  <string name="export_success">出力終了</string>
   <string name="track_list_pick_one">トラックを選択します．オプションを表示するには長押しして下さい．</string>
   <string name="tracklist_all_tracks">全トラック:</string>
   <string name="track_list_this_track">このトラック</string>
@@ -156,8 +156,8 @@ limitations under the License.
   $2 : Attempted imports
   $3 : MyTracks gpx path
   -->
-  <string name="import_multi_done">%3$s からGPXファイル %2$d件のうち %1$d件をインポートしました</string>
-  <string name="import_multi_empty">%s ではGPXファイルがありません．SDカードを読み込めないかディレクトリにGPXファイルが無いかも知れません．</string>
+  <string name="import_success">%3$s からGPXファイル %2$d件のうち %1$d件をインポートしました</string>
+  <string name="import_no_file">%s ではGPXファイルがありません．SDカードを読み込めないかディレクトリにGPXファイルが無いかも知れません．</string>
   <string name="import_error">ファイル %s のインポートエラー</string>
 
   <!-- Waypoints list -->
@@ -272,7 +272,7 @@ limitations under the License.
   <string name="my_maps_list_error">今回はマップをロードできませんでした!</string>
   <string name="open_map">このマップを選択</string>
   <string name="edit_map_details">マップ詳細編集</string>
-  <string name="share_track_url">トラック共有</string>
+  <string name="send_google_result_share_url">トラック共有</string>
   <string name="delete_map">アカウントからマップを削除</string>
   <string name="map_title">マップタイトル:</string>
   <string name="map_description">マップ説明:</string>
@@ -291,7 +291,7 @@ limitations under the License.
   <string name="share_track_file_body_format">このトラックに興味を持って頂けると思います．
 
     このトラックを閲覧するには、Google Earthまたは他のマッピングソフトウェアが必要です．</string>
-  <string name="share_track_url">トラックの共有</string>
+  <string name="send_google_result_share_url">トラックの共有</string>
 
   <!-- Visibility -->
   <string name="my_maps_list_public_label">公開</string>
@@ -401,12 +401,12 @@ limitations under the License.
   <string name="send_google_choose_account">アカウント選択</string>
 
   <!-- SD card -->
-  <string name="io_no_external_storage_found">外部ストレージを発見できませんでした．SDカードが刺さっているか、端末がコンピュータにマウントされていないか確認してください．</string>
-  <string name="io_write_failed">ファイルへの書き込みができません．</string>
-  <string name="io_read_failed">ファイルからの読み込みができません．</string>
-  <string name="io_create_dir_failed">SDカード上でディレクトリを作成できません．</string>
-  <string name="io_write_finished">SDカードへの書き込み終了．</string>
-  <string name="io_read_finished">SDカードからの読み込み終了．</string>
+  <string name="sd_card_error_no_storage">外部ストレージを発見できませんでした．SDカードが刺さっているか、端末がコンピュータにマウントされていないか確認してください．</string>
+  <string name="sd_card_error_write_file">ファイルへの書き込みができません．</string>
+  <string name="sd_card_error_read_file">ファイルからの読み込みができません．</string>
+  <string name="sd_card_error_create_dir">SDカード上でディレクトリを作成できません．</string>
+  <string name="sd_card_success_write_file">SDカードへの書き込み終了．</string>
+  <string name="sd_card_success_read_file">SDカードからの読み込み終了．</string>
 
   <!-- VersionChecker -->
   <string name="version_check_title">アップグレードチェック</string>
diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml
index 07768244a..1ec59663b 100644
--- a/MyTracks/res/values-pl/strings.xml
+++ b/MyTracks/res/values-pl/strings.xml
@@ -70,14 +70,14 @@ limitations under the License.
   <!-- <string name="send_google_progress_sending_fusion_tables">Przesyłanie trasy do Map Google...</string> -->
   <!-- <string name="send_google_progress_creating_fusion_table">Tworzenie nowej Mojej Mapy...</string> -->
   <string name="progress_message_import">Importowanie trasy GPS. Poczekaj chwilę.</string>
-  <string name="progress_message_export">Zapisywanie pliku na kartę SD. Poczekaj chwilę.</string>
+  <string name="export_progress_message">Zapisywanie pliku na kartę SD. Poczekaj chwilę.</string>
   <string name="progress_message_updating_track">Aktualizacja statystyk trasy...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Jesteś pewien?</string>
-  <string name="all_data_will_be_permanently_deleted">Wszystkie trasy i znaczniki zostaną usunięte z telefonu.</string>
-  <string name="track_will_be_permanently_deleted">Trasa i jej znaczniki zostanie całkowicie usunięta z telefonu.</string>
-  <string name="marker_will_be_permanently_deleted">Znacznik zostanie całkowicie usunięty z telefonu.</string>
+  <string name="generic_confirm_title">Jesteś pewien?</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_confirm_message">Trasa i jej znaczniki zostanie całkowicie usunięta z telefonu.</string>
+  <string name="marker_list_delete_marker_confirm_message">Znacznik zostanie całkowicie usunięty z telefonu.</string>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">Utworzono za pomocą My Tracks na Android.</string>
@@ -94,14 +94,14 @@ limitations under the License.
   <string name="track_name_format">Trasa %d</string>
 
   <!-- Common -->
-  <string name="no">Nie</string>
-  <string name="yes">Tak</string>
-  <string name="ok">OK</string>
-  <string name="error">Błąd</string>
-  <string name="success">Powodzenie</string>
+  <string name="generic_no">Nie</string>
+  <string name="generic_yes">Tak</string>
+  <string name="generic_ok">OK</string>
+  <string name="generic_error">Błąd</string>
+  <string name="generic_success">Powodzenie</string>
   <string name="marker_type_waypoint">Punkt orientacyjny</string>
-  <string name="cancel">Anuluj</string>
-  <string name="save">Zapisz</string>
+  <string name="generic_cancel">Anuluj</string>
+  <string name="generic_save">Zapisz</string>
 
   <!-- Placemark labels for start and end of track -->
   <string name="marker_label_start">(Początek)</string>
@@ -123,7 +123,7 @@ limitations under the License.
   <string name="track_list_delete_all">Usuń wszystkie trasy</string>
   <!-- Export All -->
   <string name="track_list_export_all">Eksportuj wszystkie trasy</string>
-  <string name="export_done">Eksport zakończony</string>
+  <string name="export_success">Eksport zakończony</string>
   <string name="track_list_pick_one">Wybierz trasę. Naciśnij i przytrzymaj, aby wybrać opcje.</string>
   <string name="tracklist_all_tracks">Wszystkie trasy:</string>
   <string name="track_list_this_track">Ta trasa</string>
@@ -236,7 +236,7 @@ limitations under the License.
   <string name="share_track_file_body_format">Myślę, że może Cię zainteresować ta trasa.
 
     Trasę możesz obejrzeć w Google Earth lub innym programie do obsługi map.</string>
-  <string name="share_track_url">Podziel się trasą z przyjaciółmi</string>
+  <string name="send_google_result_share_url">Podziel się trasą z przyjaciółmi</string>
 
   <!-- Visibility -->
   <string name="my_maps_list_public_label">Publiczna</string>
@@ -348,12 +348,12 @@ limitations under the License.
   <string name="send_google_choose_account">Wybierz konto</string>
 
   <!-- SD card -->
-  <string name="io_no_external_storage_found">Nie znaleziono zewnętrznej pamięci. Upewniej się, że karta SD jest w telefonie i nie jest podłączona do komputera.</string>
-  <string name="io_write_failed">Nie można zapisać pliku.</string>
-  <string name="io_read_failed">Nie można odczytać pliku.</string>
-  <string name="io_create_dir_failed">Nie można utworzyć katalogu na karcie SD.</string>
-  <string name="io_write_finished">Zakończono zapisywanie na karcie SD.</string>
-  <string name="io_read_finished">Zakończono odczytywanie z karty SD.</string>  
+  <string name="sd_card_error_no_storage">Nie znaleziono zewnętrznej pamięci. Upewniej się, że karta SD jest w telefonie i nie jest podłączona do komputera.</string>
+  <string name="sd_card_error_write_file">Nie można zapisać pliku.</string>
+  <string name="sd_card_error_read_file">Nie można odczytać pliku.</string>
+  <string name="sd_card_error_create_dir">Nie można utworzyć katalogu na karcie SD.</string>
+  <string name="sd_card_success_write_file">Zakończono zapisywanie na karcie SD.</string>
+  <string name="sd_card_success_read_file">Zakończono odczytywanie z karty SD.</string>  
 
   <!-- VersionChecker -->
   <string name="version_check_title">Sprawdzanie aktualizacji</string>
diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml
index 67a522070..9e46c6cf6 100644
--- a/MyTracks/res/values-pt-rBR/strings.xml
+++ b/MyTracks/res/values-pt-rBR/strings.xml
@@ -69,14 +69,14 @@ limitations under the License.
   <string name="send_google_progress_sending_fusion_tables">Enviando caminho para o Google Fusion Tables...</string>
   <string name="send_google_progress_creating_fusion_table">Criando nova Fusion Table...</string>
   <string name="progress_message_import">Importando um caminho de GPS. Isso pode demorar alguns instantes.</string>
-  <string name="progress_message_export">Salvando arquivo para o cartão SD. Isso pode demorar alguns instantes.</string>
+  <string name="export_progress_message">Salvando arquivo para o cartão SD. Isso pode demorar alguns instantes.</string>
   <string name="progress_message_updating_track">Atualizando estatísticas do caminho...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Você tem certeza?</string>
-  <string name="all_data_will_be_permanently_deleted">Todos os seus caminhos e marcadores serão apagados deste telefone.</string>
-  <string name="track_will_be_permanently_deleted">O caminho e todos os seus marcadores serão permanentemente apagados deste telefone.</string>
-  <string name="marker_will_be_permanently_deleted">O marcador será permanentemente apagado deste telefone.</string>
+  <string name="generic_confirm_title">Você tem certeza?</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_confirm_message">O caminho e todos os seus marcadores serão permanentemente apagados deste telefone.</string>
+  <string name="marker_list_delete_marker_confirm_message">O marcador será permanentemente apagado deste telefone.</string>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">"Criado por My Tracks no Android.</string>
@@ -93,14 +93,14 @@ limitations under the License.
   <string name="track_name_format">"Caminho %d</string>
 
   <!-- Common -->
-  <string name="no">Não</string>
-  <string name="yes">Sim</string>
-  <!-- KEEP_PARENT name="ok" rev="7cbb95c69f35" -->
-  <string name="error">Erro</string>
-  <string name="success">Successo</string>
+  <string name="generic_no">Não</string>
+  <string name="generic_yes">Sim</string>
+  <!-- KEEP_PARENT name="generic_ok" rev="7cbb95c69f35" -->
+  <string name="generic_error">Erro</string>
+  <string name="generic_success">Successo</string>
   <string name="marker_type_waypoint">Ponto de passagem</string>
-  <string name="cancel">Cancelar</string>
-  <string name="save">Salvar</string>
+  <string name="generic_cancel">Cancelar</string>
+  <string name="generic_save">Salvar</string>
 
   <!-- Placemark labels for start and end of track -->
   <string name="marker_label_start">(Início)</string>
@@ -197,7 +197,7 @@ limitations under the License.
   <string name="share_track_file_body_format">Eu acredito que você pode se interesasr por este caminho.
 
     Para visualizar este caminho, use o Google Earth ou outro software de mapas.</string>
-  <string name="share_track_url">Compartilhar caminho com amigos</string>
+  <string name="send_google_result_share_url">Compartilhar caminho com amigos</string>
 
   <!-- Visibility -->
   <string name="my_maps_list_public_label">Público</string>
@@ -298,10 +298,10 @@ limitations under the License.
   <string name="send_google_choose_account">Escolher conta</string>
 
   <!-- SD card -->
-  <string name="io_no_external_storage_found">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="io_write_failed">Impossível gravar arquivo.</string>
-  <string name="io_create_dir_failed">Impossível criar diretório no cartão SD.</string>
-  <string name="io_write_finished">Gravação no cartão SD concluída.</string>
+  <string name="sd_card_error_no_storage">Nenhum armazenamento externo foi encontrado. Assegure-se de que um cartão SD esteja inserido e que seu telefone não esteja montado em um computador.</string>
+  <string name="sd_card_error_write_file">Impossível gravar arquivo.</string>
+  <string name="sd_card_error_create_dir">Impossível criar diretório no cartão SD.</string>
+  <string name="sd_card_success_write_file">Gravação no cartão SD concluída.</string>
 
   <!-- VersionChecker -->
   <string name="version_check_title">Checar Atualizações</string>
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index cd56efeb1..842dcd065 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -79,14 +79,14 @@ limitations under the License.
   <string name="send_google_progress_sending_fusion_tables">Отправка трека в Fusion Tables...</string>
   <string name="send_google_progress_creating_fusion_table">Создание новой Fusion table...</string>
   <string name="progress_message_import">Импорт GPS трека. Это может занять некоторое время.</string>
-  <string name="progress_message_export">Запись файла на SD карту. Это может занять некоторое время.</string>
+  <string name="export_progress_message">Запись файла на SD карту. Это может занять некоторое время.</string>
   <string name="progress_message_updating_track">Обновление статистики трека...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Вы уверены?</string>
-  <string name="all_data_will_be_permanently_deleted">Все треки и маркеры будут удалены с этого телефона.</string>
-  <string name="track_will_be_permanently_deleted">Трек и его маркеры будут удалены из этого телефона.</string>
-  <string name="marker_will_be_permanently_deleted">Маркер будет удален с этого телефона.</string>
+  <string name="generic_confirm_title">Вы уверены?</string>
+  <string name="track_list_delete_all_confirm_message">Все треки и маркеры будут удалены с этого телефона.</string>
+  <string name="track_list_delete_track_confirm_message">Трек и его маркеры будут удалены из этого телефона.</string>
+  <string name="marker_list_delete_marker_confirm_message">Маркер будет удален с этого телефона.</string>
 
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">Создано My Tracks на Android.</string>
@@ -107,15 +107,15 @@ limitations under the License.
   <string name="track_name_format">Трек %d</string>
 
   <!-- Common -->
-  <string name="no">Нет</string>
-  <string name="yes">Да</string>
-  <string name="ok">ОК</string>
-  <string name="error">Ошибка</string>
-  <string name="success">Готово</string>
+  <string name="generic_no">Нет</string>
+  <string name="generic_yes">Да</string>
+  <string name="generic_ok">ОК</string>
+  <string name="generic_error">Ошибка</string>
+  <string name="generic_success">Готово</string>
   <string name="marker_type_waypoint">Путевая точка</string>
   <string name="about_license">Лицензия</string>
-  <string name="cancel">Отмена</string>
-  <string name="save">Сохранить</string>
+  <string name="generic_cancel">Отмена</string>
+  <string name="generic_save">Сохранить</string>
 
   <!-- Placemark labels for start and end of track -->
   <string name="marker_label_start">(Старт)</string>
@@ -141,7 +141,7 @@ limitations under the License.
   <string name="track_list_delete_all">Удалить все</string>
   <!-- Export All -->
   <string name="track_list_export_all">Экспорт всех</string>
-  <string name="export_done">Экспорт закончен</string>
+  <string name="export_success">Экспорт закончен</string>
   <string name="track_list_pick_one">Выберите трек. Нажмите и удерживайте для получения дополнительных возможностей.</string>
   <string name="tracklist_all_tracks">Все треки:</string>
   <string name="track_list_this_track">Этот трек</string>
@@ -159,8 +159,8 @@ limitations under the License.
   $2 : Attempted imports
   $3 : MyTracks gpx path
   -->
-  <string name="import_multi_done">Импортировано %1$d из %2$d GPX файлов с %3$s</string>
-  <string name="import_multi_empty">GPX файлы не найденны в %s. Возможно не читается SD-карта или каталог не содержит GPX файлы.</string>
+  <string name="import_success">Импортировано %1$d из %2$d GPX файлов с %3$s</string>
+  <string name="import_no_file">GPX файлы не найденны в %s. Возможно не читается SD-карта или каталог не содержит GPX файлы.</string>
   <string name="import_error">Ошибка импорта файла %s</string>
 
   <!-- Waypoints list -->
@@ -281,7 +281,7 @@ limitations under the License.
   <string name="my_maps_list_error">Ваши карты не могут быть загружены в данный момент!</string>
   <string name="open_map">Выберите эту карту</string>
   <string name="edit_map_details">Править детали карты</string>
-  <string name="share_track_url">Поделиться треком</string>
+  <string name="send_google_result_share_url">Поделиться треком</string>
   <string name="delete_map">Удалить Карту из вашей учетной записи</string>
   <string name="map_title">Название карты:</string>
   <string name="map_description">Описание карты:</string>
@@ -426,12 +426,12 @@ limitations under the License.
   <string name="send_google_choose_account">Выбор учетной записи</string>
 
   <!-- SD card -->
-  <string name="io_no_external_storage_found">Не обнаружено внешнее устройство хранения данных. Убедитесь, что SD карта вставлена, и что ваш телефон не подключен к компьютеру.</string>
-  <string name="io_write_failed">Невозможно записать файл.</string>
-  <string name="io_read_failed">Невозможно прочитать из файла.</string>
-  <string name="io_create_dir_failed">Невозможно создать папку на SD карте.</string>
-  <string name="io_write_finished">Запись на SD карту закончена.</string>
-  <string name="io_read_finished">Чтение с SD карты закончено.</string>
+  <string name="sd_card_error_no_storage">Не обнаружено внешнее устройство хранения данных. Убедитесь, что SD карта вставлена, и что ваш телефон не подключен к компьютеру.</string>
+  <string name="sd_card_error_write_file">Невозможно записать файл.</string>
+  <string name="sd_card_error_read_file">Невозможно прочитать из файла.</string>
+  <string name="sd_card_error_create_dir">Невозможно создать папку на SD карте.</string>
+  <string name="sd_card_success_write_file">Запись на SD карту закончена.</string>
+  <string name="sd_card_success_read_file">Чтение с SD карты закончено.</string>
 
   <!-- VersionChecker -->
   <string name="version_check_title">Проверить обновления</string>
diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml
index 63540543d..e76574bb5 100644
--- a/MyTracks/res/values-sv/strings.xml
+++ b/MyTracks/res/values-sv/strings.xml
@@ -70,14 +70,14 @@ limitations under the License.
   <!-- <string name="send_google_progress_sending_fusion_tables">Skickar spår till Google Kartor...</string> -->
   <!-- <string name="send_google_progress_creating_fusion_table">Skapar en ny Min Karta...</string> -->
   <string name="progress_message_import">Importerar ett GPS-spår. Detta kan ta en stund.</string>
-  <string name="progress_message_export">Skriver till SD-kortet. Detta kan ta en stund.</string>
+  <string name="export_progress_message">Skriver till SD-kortet. Detta kan ta en stund.</string>
   <string name="progress_message_updating_track">Uppdaterar spårstatistik...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Är du säker?</string>
-  <string name="all_data_will_be_permanently_deleted">Alla spår och markörer kommer att tas bort från telefonen.</string>
-  <string name="track_will_be_permanently_deleted">Spåret och dess markörer kommer att permanent tas bort från telefonen.</string>
-  <string name="marker_will_be_permanently_deleted">Markören kommer att permanent tas bort från telefonen.</string>
+  <string name="generic_confirm_title">Är du säker?</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_confirm_message">Spåret och dess markörer kommer att permanent tas bort från telefonen.</string>
+  <string name="marker_list_delete_marker_confirm_message">Markören kommer att permanent tas bort från telefonen.</string>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">Skapad av My Tracks på Android.</string>
@@ -94,14 +94,14 @@ limitations under the License.
   <string name="track_name_format">Spår %d</string>
 
   <!-- Common -->
-  <string name="no">Nej</string>
-  <string name="yes">Ja</string>
-  <string name="ok">OK</string>
-  <string name="error">Fel</string>
-  <string name="success">Lyckades</string>
+  <string name="generic_no">Nej</string>
+  <string name="generic_yes">Ja</string>
+  <string name="generic_ok">OK</string>
+  <string name="generic_error">Fel</string>
+  <string name="generic_success">Lyckades</string>
   <string name="marker_type_waypoint">Positionsmärke</string>
-  <string name="cancel">Avbryt</string>
-  <string name="save">Spara</string>
+  <string name="generic_cancel">Avbryt</string>
+  <string name="generic_save">Spara</string>
 
   <!-- Placemark labels for start and end of track -->
   <string name="marker_label_start">(Start)</string>
@@ -123,7 +123,7 @@ limitations under the License.
   <string name="track_list_delete_all">Ta bort alla spår</string>
   <!-- Export All -->
   <string name="track_list_export_all">Exportera alla spår</string>
-  <string name="export_done">Exporteringen slutfördes</string>
+  <string name="export_success">Exporteringen slutfördes</string>
   <string name="track_list_pick_one">Välj ett spår. Tryck &amp; håll för fler alternativ.</string>
   <string name="tracklist_all_tracks">Alla spår:</string>
   <string name="track_list_this_track">Det här spåret</string>
@@ -211,7 +211,7 @@ limitations under the License.
   <string name="share_track_file_body_format">Jag tror att du skulle vara intresserad av det här spåret.
 
     För att se det här spåret använd Google Earth eller något annat kartprogram.</string>
-  <string name="share_track_url">Dela spår med vänner</string>
+  <string name="send_google_result_share_url">Dela spår med vänner</string>
 
   <!-- Visibility -->
   <string name="my_maps_list_public_label">Publik</string>
@@ -323,10 +323,10 @@ limitations under the License.
   <string name="send_google_choose_account">Välj konto</string>
 
   <!-- SD card -->
-  <string name="io_no_external_storage_found">Ingen extern lagring hittades. Se till att ett SD-kort sitter i och att telefonen inte är monterad till en dator.</string>
-  <string name="io_write_failed">Kan inte skriva till filen.</string>
-  <string name="io_create_dir_failed">Kunde inte skapa katalog på SD-kort.</string>
-  <string name="io_write_finished">Slutförde skrivningen av spåret till SD-kort.</string>
+  <string name="sd_card_error_no_storage">Ingen extern lagring hittades. Se till att ett SD-kort sitter i och att telefonen inte är monterad till en dator.</string>
+  <string name="sd_card_error_write_file">Kan inte skriva till filen.</string>
+  <string name="sd_card_error_create_dir">Kunde inte skapa katalog på SD-kort.</string>
+  <string name="sd_card_success_write_file">Slutförde skrivningen av spåret till SD-kort.</string>
 
   <!-- VersionChecker -->
   <string name="version_check_title">Uppgraderingskoll</string>
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index adf00d8a0..1bb32fb04 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -45,7 +45,7 @@ limitations under the License.
   <string name="error_import_invalid_gpx_format">文件不是有效的 GPX 格式.</string>
   <string name="error_import_generic">发生错误. 请重试.</string>
   <string name="error_export_track_does_not_exist">轨迹不存在.</string>
-  <string name="error_export_operation_canceled">操作已被取消.</string>
+  <string name="export_canceled">操作已被取消.</string>
   <string name="error_import_out_of_memory">文件太大 (必须小于 500 KB). 中止操作.</string>
   <string name="marker_insert_error">无法插入标记. 定位尚未完成.</string>
 
@@ -80,14 +80,14 @@ limitations under the License.
   <string name="send_google_progress_sending_fusion_tables">发送轨迹到 Fusion Tables...</string>
   <string name="send_google_progress_creating_fusion_table">创建新的 Fusion table...</string>
   <string name="progress_message_import">导入 GPS 轨迹中. 请稍候.</string>
-  <string name="progress_message_export">写入文件到 SD 卡中. 请稍候.</string>
+  <string name="export_progress_message">写入文件到 SD 卡中. 请稍候.</string>
   <string name="progress_message_updating_track">更新轨迹统计信息中...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">请确认</string>
-  <string name="all_data_will_be_permanently_deleted">所以轨迹和标记都将被从本机删除.</string>
-  <string name="track_will_be_permanently_deleted">选定轨迹和它相关的标记都将被从本机彻底删除.</string>
-  <string name="marker_will_be_permanently_deleted">选定标记将被从本机删除.</string>
+  <string name="generic_confirm_title">请确认</string>
+  <string name="track_list_delete_all_confirm_message">所以轨迹和标记都将被从本机删除.</string>
+  <string name="track_list_delete_track_confirm_message">选定轨迹和它相关的标记都将被从本机彻底删除.</string>
+  <string name="marker_list_delete_marker_confirm_message">选定标记将被从本机删除.</string>
 
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">由 Android 平台的 My Tracks 创建.</string>
@@ -108,15 +108,15 @@ limitations under the License.
   <string name="track_name_format">轨迹 %d</string>
 
   <!-- Common -->
-  <string name="no">否</string>
-  <string name="yes">是</string>
-  <string name="ok">确定</string>
-  <string name="error">错误</string>
-  <string name="success">成功</string>
+  <string name="generic_no">否</string>
+  <string name="generic_yes">是</string>
+  <string name="generic_ok">确定</string>
+  <string name="generic_error">错误</string>
+  <string name="generic_success">成功</string>
   <string name="marker_type_waypoint">路点</string>
   <string name="about_license">授权</string>
-  <string name="cancel">取消</string>
-  <string name="save">保存</string>
+  <string name="generic_cancel">取消</string>
+  <string name="generic_save">保存</string>
 
   <!-- Placemark labels for start and end of track -->
   <string name="marker_label_start">(开始)</string>
@@ -142,7 +142,7 @@ limitations under the License.
   <string name="track_list_delete_all">删除所有轨迹</string>
   <!-- Export All -->
   <string name="track_list_export_all">导出所有轨迹</string>
-  <string name="export_done">导出完毕</string>
+  <string name="export_success">导出完毕</string>
   <string name="track_list_pick_one">选择一个轨迹. 长按弹出操作菜单.</string>
   <string name="tracklist_all_tracks">全部轨迹:</string>
   <string name="track_list_this_track">此轨迹</string>
@@ -282,7 +282,7 @@ limitations under the License.
   <string name="my_maps_list_error">现在无法载入你的地图!</string>
   <string name="open_map">选择此地图</string>
   <string name="edit_map_details">编辑地图详细信息</string>
-  <string name="share_track_url">分享轨迹</string>
+  <string name="send_google_result_share_url">分享轨迹</string>
   <string name="delete_map">从你的帐号删除地图</string>
   <string name="map_title">地图标题:</string>
   <string name="map_description">地图描述:</string>
@@ -408,12 +408,12 @@ limitations under the License.
   <string name="send_google_choose_account">选择帐户</string>
 
   <!-- SD card -->
-  <string name="io_no_external_storage_found">没有发现存储设备. 请确认插入了 SD 存储卡并且你的手机没有将挂载 SD 卡到电脑.</string>
-  <string name="io_write_failed">无法写入文件.</string>
-  <string name="io_create_dir_failed">无法在 SD 存储卡上创建目录.</string>
-  <string name="io_create_dir_failed">无法在 SD 存储卡上创建目录card.</string>
-  <string name="io_write_finished">轨迹已导出到 SD 存储卡.</string>
-  <string name="io_read_finished">从 SD 存储卡读取完毕.</string>
+  <string name="sd_card_error_no_storage">没有发现存储设备. 请确认插入了 SD 存储卡并且你的手机没有将挂载 SD 卡到电脑.</string>
+  <string name="sd_card_error_write_file">无法写入文件.</string>
+  <string name="sd_card_error_create_dir">无法在 SD 存储卡上创建目录.</string>
+  <string name="sd_card_error_create_dir">无法在 SD 存储卡上创建目录card.</string>
+  <string name="sd_card_success_write_file">轨迹已导出到 SD 存储卡.</string>
+  <string name="sd_card_success_read_file">从 SD 存储卡读取完毕.</string>
 
   <!-- VersionChecker -->
   <string name="version_check_title">检查更新</string>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index aa54999cf..ea60b518e 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <resources>
 
-  <!-- About -->  
+  <!-- About Page -->  
   <string name="about_license"
     translation_description="In the 'About' page, the button on the bottom to view the terms
       of service agreement.">
@@ -64,7 +64,7 @@ limitations under the License.
     translation_description="In the Chart Settings, the section label for configuring the Y axis.">
     Y Axis
   </string>
-  
+      
   <!-- EULA -->
   <string name="eula_accept"
     translation_description="In the 'End User License Agreement' dialog, the button to accept.">
@@ -80,13 +80,65 @@ limitations under the License.
     End User License Agreement
   </string>
   
-  <!-- Generic -->
+  <!-- Export -->
+  <string name="export_canceled"
+    translation_description="When exporting a track to the SD card, a message indicating that the
+      export operation was canceled.">
+    The operation was canceled.
+  </string>
+  <string name="export_error"
+    translation_description="When exporting a track to the SD card, a generic error message
+      indicating unable to export.">
+    Unable to export.
+  </string>
+  <string name="export_progress_message"
+    translation_description="When exporting a track to the SD card, the message on the progress
+      dialog indicating that it may take a while.">
+    Exporting a track to the SD card. This may take a while.
+  </string>
+  <string name="export_success"
+    translation_description="After exporting all the tracks, a toast message indicating success.">
+    Export finished
+  </string>
+  
+  <!-- Generic Strings -->
+  <string name="generic_cancel"
+    translation_description="The text on a button to say cancel.">
+    Cancel
+  </string>
+  <string name="generic_confirm_title"
+    translation_description="The title on a confirmation dialog asking the user if he is sure?">
+    Are you sure?
+  </string>
+  <string name="generic_error"
+    translation_description="The title on an alert dialog indicating error.">
+    Error
+  </string>
+  <string name="generic_no"
+    translation_description="The text on a button to say no.">
+    No
+  </string>
+  <string name="generic_ok"
+    translation_description="The text on a button to say ok.">
+    OK
+  </string>    
   <string name="generic_progress_title"
-    translation_description="When displaying a progress dialog, the title on the dialog asking the
-      user to wait.">
+    translation_description="The title on a progress dialog asking the user to wait.">
     Please wait...
   </string>
-      
+  <string name="generic_save"
+    translation_description="The text on a button to say save.">
+    Save
+  </string>
+  <string name="generic_success"
+    translation_description="The title on an alert dialog indicating success.">
+    Success
+  </string>
+  <string name="generic_yes"
+    translation_description="The text on a button to say yes.">
+    Yes
+  </string>
+
   <!-- GPS -->
   <string name="gps_need_to_enable"
     translation_description="In the main view, the message on the top asking the user to enable
@@ -104,6 +156,24 @@ limitations under the License.
     Waiting for a better GPS fix. Make sure the sky is visible.
   </string> 
   
+  <!-- Import -->
+  <string name="import_error"
+    translation_description="When importing all the tracks, a toast message indicating error for
+      one of the tracks. E.g., 'Import error for file /mnt/sdcard/MyTacks/gpx/1.gpx'."> 
+    Import error for file %s
+  </string>  
+  <string name="import_no_file"
+    translation_description="After importing all the tracks from the SD card, the alert message
+      indicating that no track is imported. E.g., 'No GPX file found in /mnt/sdcard/MyTracks/gpx/.
+      SD card may be unreadable or directory may not contain any GPX file.'.">
+    No GPX file found in %s. SD card may be unreadable or directory may not contain any GPX file.
+  </string>
+  <string name="import_success"
+    translation_description="After importing all the tracks from the SD card, the alert message
+      indicating success. E.g., 'Imported 5 of 6 GPX files from /mnt/sdcard/MyTracks/gpx/'.">
+    Imported to My Tracks %1$d of %2$d GPX files from %3$s
+  </string>
+  
   <!-- Marker -->    
   <string name="marker_detail_marker_description"
     translation_description="In the detail page for a waypoint marker, the text field for the marker
@@ -154,6 +224,12 @@ limitations under the License.
       marker.">   
     Delete
   </string>
+  <string name="marker_list_delete_marker_confirm_message"
+    translation_description="In the context menu for a marker, when pressing the 'Delete' option,
+      the confirmation dialog message informing the user that the marker will be permanently
+      deleted from the phone.">
+    The marker will be permanently deleted from the phone.
+  </string>
   <string name="marker_list_edit_marker"
     translation_description="In the context menu for a marker, the menu option to edit the marker's
       metadata (e.g., name, type, etc.)."> 
@@ -193,7 +269,7 @@ limitations under the License.
     Waypoint
   </string>
       
-  <!-- Menu items for the map, chart, and stat view. -->
+  <!-- Menu Items -->
   <string name="menu_aggregated_statistics"
     translation_description="In the menu, to go to the aggregated statistics page.">
     Aggregated Statistics
@@ -259,8 +335,8 @@ limitations under the License.
   
   <!-- My Maps List -->
   <string name="my_maps_list_error"
-     translation_description="When sending a track to an existing Google My Map, the text on the 
-       'My Maps' list page informing the user that his maps cannot be loaded at this time.">
+    translation_description="When sending a track to an existing Google My Map, the text on the 
+      'My Maps' list page informing the user that his maps cannot be loaded at this time.">
     Your maps could not be loaded at this time.
   </string>
   <string name="my_maps_list_loading"
@@ -294,7 +370,7 @@ limitations under the License.
     Unlisted
   </string>
       
-  <!-- Permission - not seen inside the app -->
+  <!-- Permission -->
   <string name="permission_notification_description"
     translation_description="When installing a third-party app that wants to receive My Tracks 
       notifications, the permission description that the Android Market shows to the user.">
@@ -326,7 +402,7 @@ limitations under the License.
     write data to My Tracks and start/stop My Tracks recording
   </string>
   
-  <!--  Preferred Units -->
+  <!-- Preferred Units -->
   <string name="preferred_units_imperial"
     translation_description="In the dialog asking the user to choose a preferred units, the option
       to choose the imperial units.">
@@ -343,10 +419,43 @@ limitations under the License.
     Preferred Units
   </string>
   
+  <!-- SD Card -->
+  <string name="sd_card_error_create_dir"
+    translation_description="When writing to the SD card, the error message when not able to create
+      a directory on the SD card.">
+    Unable to create directory on SD card.
+  </string>
+  <string name="sd_card_error_no_storage"
+    translation_description="When writing to the SD card, the error message when the SD card is not
+      found.">
+    No external storage was found. Make sure that a SD card is inserted and that your phone is not
+    mounted to a computer.
+  </string>
+  <string name="sd_card_error_read_file"
+    translation_description="When reading from the SD card, the error message when not able to read
+      a file.">
+    Unable to read from file.
+  </string>
+  <string name="sd_card_error_write_file"
+    translation_description="When writing to the SD card, the error message when not able to write a
+      file.">
+    Unable to write to file.
+  </string>
+  <string name="sd_card_success_read_file"
+    translation_description="When reading from the SD card, the success message when finish reading
+      from the SD card.">
+    Finished reading from SD card.
+  </string>
+  <string name="sd_card_success_write_file"
+    translation_description="When writing to the SD card, the success message when finish writing to
+      the SD card.">
+    Finished writing to SD card.
+  </string>
+      
   <!-- Send Google -->
   <string name="send_google_by_my_tracks"
     translation_description="When sending a track to Google, a note indicating it is created by
-      My Tracks on Android, with the 'My Tracks' word containng a http link to
+      My Tracks on Android, with the 'My Tracks' word containing a http link to
       http://mytracks.appspot.com.">
     Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; on Android.
   </string>
@@ -359,16 +468,6 @@ limitations under the License.
       checkbox option to send to Google Docs.">
     Google Docs
   </string>
-  <string name="send_google_existing_map"
-    translation_description="When sending a track to Google My Maps, the radio option to use an
-      existing map as opposed to create a new map.">
-    Use an existing map
-  </string>
-  <string name="send_google_fusion_tables"
-    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
-      checkbox option to send to Google Fusion Tables.">
-    Google Fusion Tables
-  </string>  
   <string name="send_google_error"
     translation_description="When sending a track to Google, a message indicating that an error has
       occurred and ask the user to try again.">
@@ -386,9 +485,19 @@ limitations under the License.
   </string>  
   <string name="send_google_error_my_maps"
     translation_description="When sending a track to Google My Maps, a message indicating that an
-      error has occured.">
+      error has occurred.">
     There was an error while sending your track to Google My Maps.
   </string>
+  <string name="send_google_existing_map"
+    translation_description="When sending a track to Google My Maps, the radio option to use an
+      existing map as opposed to create a new map.">
+    Use an existing map
+  </string>
+  <string name="send_google_fusion_tables"
+    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
+      checkbox option to send to Google Fusion Tables.">
+    Google Fusion Tables
+  </string>  
   <string name="send_google_my_maps"
     translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
       checkbox option to send to Google My Maps.">
@@ -410,27 +519,27 @@ limitations under the License.
     No account found to upload tracks to.
   </string>
   <string name="send_google_progress_auth_docs"
-    translation_description="When sending a track to Google Docs, the messsage on the progress
+    translation_description="When sending a track to Google Docs, the message on the progress
       dialog indicating authenticating to Google Docs.">
     Authenticating to Google Docs...
   </string>   
   <string name="send_google_progress_auth_fusion_tables"
-    translation_description="When sending a track to Google Fusion Tables, the messsage on the
+    translation_description="When sending a track to Google Fusion Tables, the message on the
       progress dialog indicating authenticating to Google Fusion Tables.">
     Authenticating to Google Fusion Tables...
   </string>
   <string name="send_google_progress_auth_my_maps"
-    translation_description="When sending a track to Google My Maps, the messsage on the progress
+    translation_description="When sending a track to Google My Maps, the message on the progress
       dialog indicating authenticating to Google My Maps.">
     Authenticating to Google My Maps...
   </string>
   <string name="send_google_progress_creating_fusion_table"
-    translation_description="When sending a track to Google Fusion Tables, the messsage on the
+    translation_description="When sending a track to Google Fusion Tables, the message on the
       progress dialog indicating My Tracks is creating a new Fusion Table in Google Fusion Tables.">
     Creating a new Fusion Table...
   </string>  
   <string name="send_google_progress_creating_map"
-    translation_description="When sending a track to Google My Maps, the messsage on the progress
+    translation_description="When sending a track to Google My Maps, the message on the progress
       dialog indicating My Tracks is creating a new map in Google My Maps.">
     Creating a new My Map...
   </string>
@@ -464,6 +573,11 @@ limitations under the License.
       for the track recorded date. E.g., 'Recorded: Tue Sep 06 15:08:30 PDT 2011'.">        
     Recorded
   </string>
+  <string name="send_google_result_share_url"
+    translation_description="When sending a track to Google, in the result dialog, the button on
+      the bottom to share with friends the URL of the uploaded track.">    
+    Share track URL
+  </string>
   <string name="send_google_result_title"
     translation_description="When sending a track to Google, the header on the top of the result
       page.">
@@ -516,7 +630,7 @@ limitations under the License.
     (Part %d)
   </string>
       
-  <!--  Sensor State -->
+  <!-- Sensor State -->
   <string name="sensor_state_battery"
     translation_description="In the 'Sensor State' page, the label for the battery level on the bike
       sensor. E.g, 'Battery Level: 50 %'.">
@@ -538,11 +652,6 @@ limitations under the License.
       connecting.">
     Connecting
   </string>  
-  <string name="sensor_state_last_sensor_time"
-    translation_description="In the 'Sensor State' page, the label for the last time the sensor has
-      sent a data. E.g., 'Last Sensor Time: 10:05 am'.">
-    Last Sensor Time
-  </string>
   <string name="sensor_state_disconnected"
     translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor
       has disconnected.">
@@ -553,6 +662,11 @@ limitations under the License.
       rate sensor. E.g., 'Hear Rate: 100 bpm'.">
     Heart Rate
   </string>
+  <string name="sensor_state_last_sensor_time"
+    translation_description="In the 'Sensor State' page, the label for the last time the sensor has
+      sent a data. E.g., 'Last Sensor Time: 10:05 am'.">
+    Last Sensor Time
+  </string>
   <string name="sensor_state_power"
     translation_description="In the 'Sensor State' page, the label for the power from the bike
       sensor. Power is the power output of the rider. E.g., 'Power: 50 W'.">    
@@ -801,17 +915,17 @@ limitations under the License.
       named based on the track's start time or based on a number.">
     Use time for track name
   </string>
+  <string name="settings_recording_name_summary_off"
+    translation_description="In the Recording settings, the summary for the 'Use time for track
+      name' checkbox when it is unchecked explaining using a number as the default track name.">
+    Use a number as the default track name
+  </string>
   <string name="settings_recording_name_summary_on"
     translation_description="In the Recording settings, the summary for the 'Use time for track
       name' checkbox when it is checked explaining using the track's start time as the default track
       name.">
     Use the track\'s start time as the default track name
   </string>
-  <string name="settings_recording_name_summary_off"
-    translation_description="In the Recording settings, the summary for the 'Use time for track
-      name' checkbox when it is unchecked explaining using a number as the default track name.">
-    Use a number as the default track name
-  </string>
   <string name="settings_recording_track_distance"
     translation_description="In the Recording settings, the dropdown option to configure the 
       distance between two tracks.">
@@ -991,7 +1105,7 @@ limitations under the License.
     translation_description="In the Sharing settings, the summary for the 'Make new maps public'
       checkbox option when it is unchecked explaining that new maps created in Google My Maps will
       be unlisted, as opposed to public.">
-    Make new maps created in Goolge My Maps unlisted
+    Make new maps created in Google My Maps unlisted
   </string>
   <string name="settings_sharing_map_public_summary_on"
     translation_description="In the Sharing settings, the summary for the 'Make new maps public'
@@ -1019,9 +1133,30 @@ limitations under the License.
   <string name="settings_title"
     translation_description="The title of the Settings page.">  
     My Tracks Settings
-  </string> 
+  </string>
+   
+  <!-- Share Track -->
+  <string name="share_track_file_body_format"
+    translation_description="When sharing a track file with friends, the body of the message.">
+    I think you might be interested in this track.\n\nTo view this track use Google Earth or other
+    mapping software.
+  </string>      
+  <string name="share_track_picker_title"
+    translation_description="When sharing a track with friends, the title on the picker to
+      ask the user which application he wants to use.">
+    Share track using:
+  </string>
+  <string name="share_track_subject"
+    translation_description="When sharing a track with friends, the subject line.">    
+    I would like to share a track with you
+  </string>
+  <string name="share_track_url_body_format"
+    translation_description="When sharing a track URL with friends, the body of the message. E.g.,
+      'I think you might be interested in this track:\n\nhttps://maps.google.com/maps'.">
+    I think you might be interested in this track:\n\n%s
+  </string>
       
-  <!-- Stat view -->
+  <!-- Stat Page -->
   <string name="stat_average_moving_pace"
     translation_description="In the Statistic view, the average moving pace.">    
     Average Moving Pace
@@ -1132,11 +1267,23 @@ limitations under the License.
     translation_description="In the Tracks page, the button on the bottom to delete all tracks.">
     Delete all
   </string>
+  <string name="track_list_delete_all_confirm_message"
+    translation_description="In the Tracks page, when pressing the 'Delete all' button, the 
+      confirmation dialog message informing the user that all tracks and markers will be permanently
+      deleted from the phone.">
+    All tracks and markers will be permanently deleted from the phone.
+  </string>
   <string name="track_list_delete_track"
     translation_description="In the context menu for a track, the menu option to delete the
       track from the phone.">
     Delete from phone...
   </string>
+  <string name="track_list_delete_track_confirm_message"
+    translation_description="In the context menu for a track, when pressing the 'Delete from
+      phone...' option, the confirmation dialog message informing the user that the track and its
+      markers will be permanently deleted from the phone.">
+    The track and its markers will be permanently deleted from the phone.
+  </string>  
   <string name="track_list_edit_track"
     translation_description="In the context menu for a track, the menu option to edit the track's 
       metadata (e.g., name, activity type, etc.).">
@@ -1247,7 +1394,7 @@ limitations under the License.
     Now recording a new track.
   </string>
   
-  <!-- Unit - all abbreviations for display-->
+  <!-- Unit -->
   <string name="unit_beat_per_minute"
     translation_description="Abbreviation for beats per minute, unit for heart rate. E.g.,
       'heart rate: 80 bpm'.">
@@ -1372,10 +1519,10 @@ limitations under the License.
       %4$s: Speed value (E.g., 2.2) or pace value (E.g., 2 hours and 30 minutes)
       %5$s: Speed unit (miles per hour or kilometers per hour) or pace unit (per mile or per
         kilometer)">
-      My Tracks total distance %1$.2f %2$s in %3$s at %4$s %5$s
+    My Tracks total distance %1$.2f %2$s in %3$s at %4$s %5$s
   </string>
   
-  <!-- Welcome -->
+  <!-- Welcome Page -->
   <string name="welcome_about"
     translation_description="In the 'Welcome' page, the button on the bottom to read the 'About'
       page.">
@@ -1385,162 +1532,4 @@ limitations under the License.
     translation_description="The title of the welcome page.">
     Welcome
   </string>
-      
-  <!--  Error messages when exporting a track. -->
-  <string name="error_export_generic"
-    translation_description="When exporting a track to the SD card, a generic error message
-      indicating unable to export.">
-    Unable to export.
-  </string>
-  <string name="error_export_operation_canceled"
-    translation_description="When exporting a track to the SD card, a message indicating that the
-      export operation was canceled.">
-    The operation was canceled.
-  </string>
-  
-  <!-- Export progress messages. -->
-  <string name="progress_message_export"
-    translation_description="When exporting a track to the SD card, the message on the progress
-      dialog indicating that it may take a while.">
-    Exporting a track to the SD card. This may take a while.
-  </string>
-
-  <!-- Used by deletion actions -->
-  <string name="confirmation_title_are_you_sure"
-    translation_description="When deleting data (e.g., deleting all tracks, deleting a track,
-      deleting a marker, etc.), the title on the confirmation dialog asking the user if he is sure."
-      >
-    Are you sure?
-  </string>
-  <string name="all_data_will_be_permanently_deleted"
-    translation_description="When deleting all tracks, the message on the confirmation dialog
-      informing the user that all tracks and markers will be permanently deleted from the phone.">
-    All tracks and markers will be permanently deleted from the phone.
-  </string>
-  <string name="track_will_be_permanently_deleted"
-    translation_description="When deleting a track, the message on the confirmation dialog informing
-      the user that the track and its markers will be permanently deleted from the phone.">
-    The track and its markers will be permanently deleted from the phone.
-  </string>
-  <string name="marker_will_be_permanently_deleted"
-    translation_description="When deleting a marker, the message on the confirmation dialog
-      informing the user that the marker will be permanently deleted from the phone.">
-    The marker will be permanently deleted from the phone.
-  </string>
-  
-  <!-- Button texts -->
-  <string name="yes"
-    translation_description="Text on the button to say yes.">
-    Yes
-  </string>
-  <string name="no"
-    translation_description="Text on the button to say no.">
-    No
-  </string>
-  <string name="ok"
-    translation_description="Text on the button to say ok.">
-    OK
-  </string>
-  <string name="save"
-    translation_description="Text on the button to say save.">
-    Save
-  </string>
-  <string name="cancel"
-    translation_description="Text on the button to say cancel.">
-    Cancel
-  </string>
-  
-  <!-- Alert dialog titles -->    
-  <string name="success"
-    translation_description="The title on the alert dialog to indicate success.">
-    Success
-  </string>
-  <string name="error"
-    translation_description="The title on the alert dialog to indicate error.">
-    Error
-  </string>
-
-  <!-- Export -->
-  <string name="export_done"
-    translation_description="After exporting all the tracks, a toast message indicating success.">
-    Export finished
-  </string>
-
-  <string name="import_multi_done"
-    translation_description="After importing all the tracks from the SD card, the alert message
-      indicating success. E.g., 'Imported 5 of 6 GPX files from /mnt/sdcard/MyTracks/gpx/'.">
-    Imported to My Tracks %1$d of %2$d GPX files from %3$s
-  </string>
-  <string name="import_multi_empty"
-    translation_description="After importing all the tracks from the SD card, the alert message
-      indicating that no track is imported. E.g., 'No GPX file found in /mnt/sdcard/MyTracks/gpx/.
-      SD card may be unreadable or directory may not contain any GPX file.'.">
-    No GPX file found in %s. SD card may be unreadable or directory may not contain any GPX file.
-  </string>
-  <string name="import_error"
-    translation_description="When importing all the tracks, a toast message indicating error for
-      one of the tracks. E.g., 'Import error for file /mnt/sdcard/MyTacks/gpx/1.gpx'."> 
-    Import error for file %s
-  </string>  
-
-  <!-- Share Track -->
-  <string name="share_track_url"
-    translation_description="After sending a track to Google, in the confirmation dialog, a
-      button to share the track URL with friends.">    
-    Share track URL
-  </string>
-  <string name="share_track_picker_title"
-    translation_description="When sharing a track with friends, the title on the picker to
-      ask the user which application he wants to use.">
-    Share track using:
-  </string>
-  <string name="share_track_subject"
-    translation_description="When sharing a track with friends, the subject line.">    
-    I would like to share a track with you
-  </string>
-  <string name="share_track_url_body_format"
-    translation_description="When sharing a track URL with friends, the body of the message. E.g.,
-    'I think you might be interested in this track:\n\nhttps://maps.google.com/maps'.">
-    I think you might be interested in this track:\n\n%s
-  </string>
-  <string name="share_track_file_body_format"
-    translation_description="When sharing a track file with friends, the body of the message.">
-    I think you might be interested in this track.\n\nTo view this track use Google Earth or other
-    mapping software.
-  </string>
-
-  <!-- writing to SD card -->
-  <string name="io_no_external_storage_found"
-    translation_description="When writing to the SD card, the error message when the SD card is not
-      found.">
-    No external storage was found. Make sure that a SD card is inserted and that your phone is not
-    mounted to a computer.
-  </string>
-  <string name="io_create_dir_failed"
-    translation_description="When writing to the SD card, the error message when not able to create
-      a directory on the SD card.">
-    Unable to create directory on SD card.
-  </string>
-  <string name="io_write_failed"
-    translation_description="When writing to the SD card, the error message when not able to write a
-      file to the SD card.">
-    Unable to write to file.
-  </string>
-  <string name="io_write_finished"
-    translation_description="When writing to the SD card, the success message when finish writing to
-      the SD card.">
-    Finished writing to SD card.
-  </string>
-  
-  <!--  reading from SD card -->
-  <string name="io_read_failed"
-    translation_description="When reading from the SD card, the error message when not able to read
-      a file.">
-    Unable to read from file.
-  </string>
-  <string name="io_read_finished"
-    translation_description="When reading from the SD card, the success message when finish reading
-      from the SD card.">
-    Finished reading from SD card.
-  </string>
 </resources>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java b/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java
index 17e200b79..0d634be7e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java
@@ -80,7 +80,7 @@ public class AccountChooser {
     final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
     builder.setTitle(R.string.send_google_choose_account);
     builder.setCancelable(false);
-    builder.setPositiveButton(R.string.ok,
+    builder.setPositiveButton(R.string.generic_ok,
         new DialogInterface.OnClickListener() {
       public void onClick(DialogInterface dialog, int which) {
         dialog.dismiss();
@@ -92,7 +92,7 @@ public class AccountChooser {
         handler.onAccountSelected(selectedAccount);
       }
     });
-    builder.setNegativeButton(R.string.cancel,
+    builder.setNegativeButton(R.string.generic_cancel,
         new DialogInterface.OnClickListener() {
       public void onClick(DialogInterface dialog, int which) {
         dialog.dismiss();
@@ -127,7 +127,7 @@ public class AccountChooser {
     builder.setTitle(R.string.send_google_no_account);
     builder.setMessage(R.string.send_google_no_account_message);
     builder.setCancelable(true);
-    builder.setPositiveButton(R.string.ok,
+    builder.setPositiveButton(R.string.generic_ok,
         new DialogInterface.OnClickListener() {
           public void onClick(DialogInterface dialog, int which) {
             dialog.dismiss();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/CheckUnits.java b/MyTracks/src/com/google/android/apps/mytracks/CheckUnits.java
index a35f4409d..a732ff67d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/CheckUnits.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/CheckUnits.java
@@ -57,7 +57,7 @@ class CheckUnits {
       }
     });
     builder.setCancelable(true);
-    builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+    builder.setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
       public void onClick(DialogInterface dialog, int which) {
         recordCheckPerformed(checkUnitsSharedPreferences);
         SharedPreferences useMetricPreferences = context.getSharedPreferences(
diff --git a/MyTracks/src/com/google/android/apps/mytracks/DeleteAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/DeleteAllTracks.java
index ff1f35fe9..20f6509ac 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/DeleteAllTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/DeleteAllTracks.java
@@ -51,10 +51,10 @@ public class DeleteAllTracks extends Handler {
     AlertDialog dialog = null;
     AlertDialog.Builder builder = new AlertDialog.Builder(context);
     builder.setMessage(
-        context.getString(R.string.all_data_will_be_permanently_deleted));
-    builder.setTitle(context.getString(R.string.confirmation_title_are_you_sure));
+        context.getString(R.string.track_list_delete_all_confirm_message));
+    builder.setTitle(context.getString(R.string.generic_confirm_title));
     builder.setIcon(android.R.drawable.ic_dialog_alert);
-    builder.setPositiveButton(context.getString(R.string.yes),
+    builder.setPositiveButton(context.getString(R.string.generic_yes),
         new DialogInterface.OnClickListener() {
           public void onClick(DialogInterface dialogInterface, int i) {
             dialogInterface.dismiss();
@@ -72,7 +72,7 @@ public class DeleteAllTracks extends Handler {
             }
           }
         });
-    builder.setNegativeButton(context.getString(R.string.no),
+    builder.setNegativeButton(context.getString(R.string.generic_no),
         new DialogInterface.OnClickListener() {
           public void onClick(DialogInterface dialogInterface, int i) {
             dialogInterface.dismiss();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/DeleteTrack.java b/MyTracks/src/com/google/android/apps/mytracks/DeleteTrack.java
index a0746a9e1..7b799758c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/DeleteTrack.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/DeleteTrack.java
@@ -77,11 +77,11 @@ public class DeleteTrack extends Activity
     }
 
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setMessage(getString(R.string.track_will_be_permanently_deleted));
-    builder.setTitle(getString(R.string.confirmation_title_are_you_sure));
+    builder.setMessage(getString(R.string.track_list_delete_track_confirm_message));
+    builder.setTitle(getString(R.string.generic_confirm_title));
     builder.setIcon(android.R.drawable.ic_dialog_alert);
-    builder.setPositiveButton(getString(R.string.yes), this);
-    builder.setNegativeButton(getString(R.string.no), this);
+    builder.setPositiveButton(getString(R.string.generic_yes), this);
+    builder.setNegativeButton(getString(R.string.generic_no), this);
     builder.setOnCancelListener(this);
     return builder.create();
   }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/Eula.java b/MyTracks/src/com/google/android/apps/mytracks/Eula.java
index e662c0c4f..39ea5b319 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/Eula.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/Eula.java
@@ -82,7 +82,7 @@ class Eula {
    */
   static void showEula(Context context) {
     AlertDialog.Builder builder = initDialog(context);
-    builder.setPositiveButton(R.string.ok, null);
+    builder.setPositiveButton(R.string.generic_ok, null);
     builder.show();
   }
   
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
index b2e9d463a..8d1dc56b7 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
@@ -80,8 +80,8 @@ public class ExportAllTracks {
 
     AlertDialog.Builder builder = new AlertDialog.Builder(activity);
     builder.setSingleChoiceItems(R.array.export_formats, 0, itemClick);
-    builder.setPositiveButton(R.string.ok, positiveClick);
-    builder.setNegativeButton(R.string.cancel, null);
+    builder.setPositiveButton(R.string.generic_ok, positiveClick);
+    builder.setNegativeButton(R.string.generic_cancel, null);
     builder.show();
   }
 
@@ -126,7 +126,7 @@ public class ExportAllTracks {
       Log.i(Constants.TAG, "ExportAllTracks: Releasing wake lock.");
     }
     Log.i(Constants.TAG, "ExportAllTracks: Done");
-    showToast(R.string.export_done, Toast.LENGTH_SHORT);
+    showToast(R.string.export_success, Toast.LENGTH_SHORT);
   }
 
   private void makeProgressDialog(final int trackCount) {
@@ -183,7 +183,7 @@ public class ExportAllTracks {
         TrackWriter writer =
             TrackWriterFactory.newWriter(activity, providerUtils, id, format);
         if (writer == null) {
-          showToast(R.string.error_export_generic, Toast.LENGTH_LONG);
+          showToast(R.string.export_error, Toast.LENGTH_LONG);
           return;
         }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java
index b83d739ac..4bd2aefbe 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java
@@ -126,12 +126,12 @@ public class ImportAllTracks {
     Log.i(Constants.TAG, "ImportAllTracks: Done");
     AlertDialog.Builder builder = new AlertDialog.Builder(activity);
     if (gpxFileCount == 0) {
-      builder.setMessage(activity.getString(R.string.import_multi_empty, gpxPath));
+      builder.setMessage(activity.getString(R.string.import_no_file, gpxPath));
     } else {
-      builder.setMessage(activity.getString(R.string.import_multi_done, importSuccessCount, gpxFileCount,
-          gpxPath));
+      builder.setMessage(
+          activity.getString(R.string.import_success, importSuccessCount, gpxFileCount, gpxPath));
     }
-    builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+    builder.setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
       @Override
       public void onClick(DialogInterface dialog, int which) {
         if (singleTrackSelected) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
index f24732fef..561c181b5 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
@@ -293,10 +293,10 @@ public class WaypointsList extends ListActivity
   public void deleteWaypoint(final long waypointId) {
     AlertDialog dialog = null;
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setMessage(getString(R.string.marker_will_be_permanently_deleted));
-    builder.setTitle(getString(R.string.confirmation_title_are_you_sure));
+    builder.setMessage(getString(R.string.marker_list_delete_marker_confirm_message));
+    builder.setTitle(getString(R.string.generic_confirm_title));
     builder.setIcon(android.R.drawable.ic_dialog_alert);
-    builder.setPositiveButton(getString(R.string.yes),
+    builder.setPositiveButton(getString(R.string.generic_yes),
         new DialogInterface.OnClickListener() {
           @Override
           public void onClick(DialogInterface dialogInterface, int i) {
@@ -305,7 +305,7 @@ public class WaypointsList extends ListActivity
                 new StringUtils(WaypointsList.this));
           }
         });
-    builder.setNegativeButton(getString(R.string.no),
+    builder.setNegativeButton(getString(R.string.generic_no),
         new DialogInterface.OnClickListener() {
           @Override
           public void onClick(DialogInterface dialogInterface, int i) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
index 3affd5219..cde40f9a2 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
@@ -71,7 +71,7 @@ public class WelcomeActivity extends Activity {
     View view = li.inflate(R.layout.about, null);
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
     builder.setView(view);
-    builder.setPositiveButton(R.string.ok, null);
+    builder.setPositiveButton(R.string.generic_ok, null);
     builder.setNegativeButton(R.string.about_license, new DialogInterface.OnClickListener() {
       @Override 
       public void onClick(DialogInterface dialog, int which) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java
index 209d4a8cb..80f64b796 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java
@@ -74,12 +74,12 @@ public class BackupActivityHelper {
    */
   public void writeBackup() {
     if (!fileUtils.isSdCardAvailable()) {
-      showToast(R.string.io_no_external_storage_found);
+      showToast(R.string.sd_card_error_no_storage);
       return;
     }
 
     if (!backup.isBackupsDirectoryAvailable(true)) {
-      showToast(R.string.io_create_dir_failed);
+      showToast(R.string.sd_card_error_create_dir);
       return;
     }
 
@@ -95,10 +95,10 @@ public class BackupActivityHelper {
       public void run() {
         try {
           backup.writeToDefaultFile();
-          showToast(R.string.io_write_finished);
+          showToast(R.string.sd_card_success_write_file);
         } catch (IOException e) {
           Log.e(Constants.TAG, "Failed to write backup", e);
-          showToast(R.string.io_write_failed);
+          showToast(R.string.sd_card_error_write_file);
         } finally {
           dismissDialog(progressDialog);
         }
@@ -114,7 +114,7 @@ public class BackupActivityHelper {
   public void restoreBackup() {
     // Get the list of existing backups
     if (!fileUtils.isSdCardAvailable()) {
-      showToast(R.string.io_no_external_storage_found);
+      showToast(R.string.sd_card_error_no_storage);
       return;
     }
 
@@ -196,10 +196,10 @@ public class BackupActivityHelper {
       public void run() {
         try {
           backup.restoreFromDate(date);
-          showToast(R.string.io_read_finished);
+          showToast(R.string.sd_card_success_read_file);
         } catch (IOException e) {
           Log.e(Constants.TAG, "Failed to restore backup", e);
-          showToast(R.string.io_read_failed);
+          showToast(R.string.sd_card_error_read_file);
         } finally {
           // Data may have been restored, "reboot" the app to catch it
           restartApplication();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
index cfef0cfac..0e2533ade 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
@@ -169,7 +169,7 @@ public class SaveActivity extends Activity {
 
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
     builder.setMessage(writer.getErrorMessage());
-    builder.setPositiveButton(R.string.ok, new OnClickListener() {
+    builder.setPositiveButton(R.string.generic_ok, new OnClickListener() {
       @Override
       public void onClick(DialogInterface dialog, int arg1) {
         dialog.dismiss();
@@ -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.success : R.string.error);
+    builder.setTitle(success ? R.string.generic_success : R.string.generic_error);
     return builder.create();
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
index 84abd201f..4432e21d7 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
@@ -114,7 +114,7 @@ class TrackWriterImpl implements TrackWriter {
   private void doWriteTrack() {
     // Open the input and output
     success = false;
-    errorMessage = R.string.error_export_generic;
+    errorMessage = R.string.export_error;
     if (track != null) {
       if (openFile()) {
         try {
@@ -127,7 +127,7 @@ class TrackWriterImpl implements TrackWriter {
             }
           }
           success = false;
-          errorMessage = R.string.error_export_operation_canceled;
+          errorMessage = R.string.export_canceled;
         }
       }
     }
@@ -208,7 +208,7 @@ class TrackWriterImpl implements TrackWriter {
       writer.prepare(track, newOutputStream(fileName));
     } catch (FileNotFoundException e) {
       Log.e(Constants.TAG, "Failed to open output file.", e);
-      errorMessage = R.string.io_write_failed;
+      errorMessage = R.string.sd_card_error_write_file;
       return false;
     }
     return true;
@@ -226,12 +226,12 @@ class TrackWriterImpl implements TrackWriter {
 
     if (!fileUtils.isSdCardAvailable()) {
       Log.i(Constants.TAG, "Could not find SD card.");
-      errorMessage = R.string.io_no_external_storage_found;
+      errorMessage = R.string.sd_card_error_no_storage;
       return false;
     }
     if (!fileUtils.ensureDirectoryExists(directory)) {
       Log.i(Constants.TAG, "Could not create export directory.");
-      errorMessage = R.string.io_create_dir_failed;
+      errorMessage = R.string.sd_card_error_create_dir;
       return false;
     }
 
@@ -297,7 +297,7 @@ class TrackWriterImpl implements TrackWriter {
     writer.close();
     success = true;
     Log.d(Constants.TAG, "Done writing track.");
-    errorMessage = R.string.io_write_finished;
+    errorMessage = R.string.sd_card_success_write_file;
   }
 
   private void writeLocations() throws InterruptedException {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java
index d61ff1010..15b48cf1d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java
@@ -81,7 +81,7 @@ class WriteProgressController {
     dialog.setIcon(android.R.drawable.ic_dialog_info);
     dialog.setTitle(activity.getString(R.string.generic_progress_title));
     dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
-    dialog.setMessage(activity.getString(R.string.progress_message_export));
+    dialog.setMessage(activity.getString(R.string.export_progress_message));
     dialog.setIndeterminate(true);
     dialog.setOnCancelListener(dialogCancelListener);
     return dialog;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java
index 419a25cf1..fec3ef891 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java
@@ -72,16 +72,16 @@ public class ResultDialogFactory {
         .setView(makeDialogContent(activity, results, success));
 
     if (success) {
-      builder.setTitle(R.string.success);
+      builder.setTitle(R.string.generic_success);
       builder.setIcon(android.R.drawable.ic_dialog_info);
     } else {
-      builder.setTitle(R.string.error);
+      builder.setTitle(R.string.generic_error);
       builder.setIcon(android.R.drawable.ic_dialog_alert);
     }
 
-    builder.setPositiveButton(activity.getString(R.string.ok), onOkClickListener);
+    builder.setPositiveButton(activity.getString(R.string.generic_ok), onOkClickListener);
     if (onShareClickListener != null) {
-      builder.setNegativeButton(activity.getString(R.string.share_track_url),
+      builder.setNegativeButton(activity.getString(R.string.send_google_result_share_url),
           onShareClickListener);
     }
 
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java
index abb9a2d17..ada16bc30 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java
@@ -214,7 +214,7 @@ public class TrackWriterTest extends AndroidTestCase {
     mocksControl.verify();
 
     assertFalse(writer.wasSuccess());
-    assertEquals(R.string.error_export_operation_canceled, writer.getErrorMessage());
+    assertEquals(R.string.export_canceled, writer.getErrorMessage());
   }
 
   public void testWriteTrack_openFails() {