diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index f3752ef43..351598e86 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -81,7 +81,6 @@ limitations under the License.
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.DeleteTrack"
-              android:label="@string/deletetrack_title"
               android:theme="@android:style/Theme.Translucent.NoTitleBar"
               android:noHistory="true">
       <intent-filter>
@@ -151,7 +150,6 @@ limitations under the License.
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.io.file.ImportActivity"
-              android:label="@string/import_title"
               android:theme="@android:style/Theme.Translucent.NoTitleBar"
               android:noHistory="true">
       <intent-filter>
diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index dfd94fa8a..b44e6850c 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -65,35 +65,34 @@ limitations under the License.
   <string name="progress_message">S\'està enviant la ruta a Google.</string>
   <string name="progress_message_reading_track">S\'està llegint la ruta...</string>
   <string name="progress_message_preparing_track">S\'està preparant la ruta...</string>
-  <string name="progress_message_authenticating_fusiontables">S\'està  to Google Fusion Tables...</string>
+  <string name="progress_message_authenticating_fusion_tables">S\'està  to Google Fusion Tables...</string>
   <string name="progress_message_authenticating_docs">S\'està autenticant a Google Docs...</string>
   <string name="progress_message_sending_docs">S\'està enviant la ruta a Google Docs...</string>
-  <string name="progress_message_sending_fusiontables">S\'està enviant a Google Fusion Tables...</string>
-  <string name="progress_message_creating_fusiontable">S\'està creant un Fusion Table nou...</string>
-  <string name="import_progress_message">S\'està imporant una ruta GPS. Això pot trigar una estona.</string>
-  <string name="write_progress_message">S\'està escrivint a la targeta SD. Això pot trigar una estona.</string>
+  <string name="progress_message_sending_fusion_tables">S\'està enviant a Google Fusion Tables...</string>
+  <string name="progress_message_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="progress_message_updating_track">S\'estan actualitzant les estadístiques de la ruta...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Esteu segur?</string>
+  <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>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">Creat per My Tracks a l\'Android.</string>
-  <string name="fusiontable_link">Creat per &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; a l\'Android.</string>
+  <string name="send_to_google_by_mytracks">Creat per &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; a l\'Android.</string>
 
   <!-- Formatting of track and marker descriptions -->
-  <string name="points">Punts</string>
   <string name="recorded_date">Enregistrat</string>
   <string name="category">Tipus d\'activitat</string>
   <string name="waypoint_category">Tipus de marcador</string>
-  <string name="part">(Part %d)</string>
+  <string name="track_part_format">(Part %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="recording_your_track">S\'està enregistrant la ruta...</string>
-  <string name="new_track">Ruta %d</string>
+  <string name="new_track_format">Ruta %d</string>
 
   <!-- Common -->
   <string name="no">No</string>
@@ -103,8 +102,6 @@ limitations under the License.
   <string name="success">Fet</string>
   <string name="waypoint">Punt de referència</string>
   <string name="cancel">Cancel·la</string>
-  <string name="close">Tanca</string>
-  <string name="edit">Edita</string>
   <string name="save">Desa</string>
 
   <!-- Placemark labels for start and end of track -->
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index 737a3f7f6..0d681146b 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -65,35 +65,35 @@ limitations under the License.
   <string name="progress_message">Dein Track wird an Google gesendet...</string>
   <string name="progress_message_reading_track">Lese Track...</string>
   <string name="progress_message_preparing_track">Bereite Track vor...</string>
-  <string name="progress_message_authenticating_fusiontables">Anmeldung bei Google Fusion Tables...</string>
+  <string name="progress_message_authenticating_fusion_tables">Anmeldung bei Google Fusion Tables...</string>
   <string name="progress_message_authenticating_docs">Anmeldung bei Google Text &amp; Tabellen...</string>
   <string name="progress_message_sending_docs">Track wird an Google Text &amp; Tabellen gesendet...</string>
-  <string name="progress_message_sending_fusiontables">Track wird an Google Fusion Tables gesendet...</string>
-  <string name="progress_message_creating_fusiontable">Neue \'Fusion Tabelle\' wird erstellt...</string>
-  <string name="import_progress_message">Importiere GPS-Track. Das kann ein wenig dauern.</string>
-  <string name="write_progress_message">Schreibe Datei auf SD-Karte. Das kann ein wenig dauern.</string>
+  <string name="progress_message_sending_fusion_tables">Track wird an Google Fusion Tables gesendet...</string>
+  <string name="progress_message_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="progress_message_updating_track">Aktualisiere Trackstatistik...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Bist Du Dir wirklich sicher?</string>
+  <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>
 
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">Erstellt von My Tracks für Android.</string>
-  <string name="fusiontable_link">Erstellt von &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; für Android.</string>
+  <string name="send_to_google_by_mytracks">Erstellt von &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; für Android.</string>
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">Punkte</string>
   <string name="recorded_date">Aufgezeichnet am</string>
   <string name="category">Aktivität</string>
   <string name="waypoint_category">Art des Wegpunktes</string>
-  <string name="part">(Teil %d)</string>
+  <string name="track_part_format">(Teil %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="recording_your_track">Dein Track wird aufgezeichnet…</string>
-  <!--string name="new_track">Track %d</string-->
+  <!--string name="new_track_format">Track %d</string-->
 
   <!-- Common -->
   <string name="no">Nein</string>
@@ -104,8 +104,6 @@ limitations under the License.
   <string name="waypoint">Wegpunkt</string>
   <string name="license">Lizenz</string>
   <string name="cancel">Abbrechen</string>
-  <string name="close">Schließen</string>
-  <string name="edit">Bearbeiten</string>
   <string name="save">Sichern</string>
 
   <!-- Placemark labels for start and end of track -->
diff --git a/MyTracks/res/values-es-rES/strings.xml b/MyTracks/res/values-es-rES/strings.xml
index 773b99cf7..da765295d 100644
--- a/MyTracks/res/values-es-rES/strings.xml
+++ b/MyTracks/res/values-es-rES/strings.xml
@@ -34,8 +34,6 @@ limitations under the License.
 
   <!-- Common -->
   <string name="license">Licencia</string>
-  <string name="close">Cerrar</string>
-  <string name="edit">Editar</string>
   <string name="save">Guardar</string>
 
   <!-- Placemark labels for start and end of track -->
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index e07075262..48ff55414 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -71,28 +71,28 @@ limitations under the License.
   <string name="progress_message">Enviando su recorrido a Google.</string>
   <string name="progress_message_reading_track">Leyendo recorrido...</string>
   <string name="progress_message_preparing_track">Preparando recorrido...</string>
-  <string name="progress_message_authenticating_fusiontables">Autenticando con Google Fusion Tables...</string>
-  <string name="progress_message_authenticating_mymaps">Autenticando con Google Maps...</string>
+  <string name="progress_message_authenticating_fusion_tables">Autenticando con Google Fusion Tables...</string>
+  <string name="progress_message_authenticating_my_maps">Autenticando con Google Maps...</string>
   <string name="progress_message_authenticating_docs">Autenticando con Google Docs...</string>
   <string name="progress_message_sending_docs">Enviando recorrido a Google Docs...</string>
-  <string name="progress_message_sending_mymaps">Enviando recorrido a Google Maps...</string>
+  <string name="progress_message_sending_my_maps">Enviando recorrido a Google Maps...</string>
   <string name="progress_message_creating_map">Creando nuevo Sitio...</string>
-  <string name="progress_message_sending_fusiontables">Enviando recorrido a Google Fusion Tables...</string>
-  <string name="progress_message_creating_fusiontable">Creando nuevo mapa Fusion Tables...</string>
-  <string name="import_progress_message">Importando un recorrido GPS. Esto puede tardar.</string>
-  <string name="write_progress_message">Escribiendo archivo a tarjeta SD. Esto puede tardar.</string>
+  <string name="progress_message_sending_fusion_tables">Enviando recorrido a Google Fusion Tables...</string>
+  <string name="progress_message_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="progress_message_updating_track">Actualizando estadísticas del recorrido...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-    <string name="deletetrack_title">Borrar recorrido</string>
-  <string name="are_you_sure_question">¿Está usted seguro?</string>
+    <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>
 
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">Creado por My Tracks para Android.</string>
-  <string name="fusiontable_link">Creado por &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; en Android.</string>
+  <string name="send_to_google_by_mytracks">Creado por &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; en Android.</string>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="my_map_link">Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; en Android.</string>
@@ -103,11 +103,11 @@ limitations under the License.
   <string name="recorded_date">Grabado</string>
   <string name="category">Tipo de actividad</string>
   <string name="waypoint_category">Tipo de señal</string>
-  <string name="part">"(Parte %d)"</string>
+  <string name="track_part_format">"(Parte %d)"</string>
 
   <!-- Used by the track recording service -->
   <string name="recording_your_track">Grabando su recorrido...</string>
-  <string name="new_track">Recorrido %d</string>
+  <string name="new_track_format">Recorrido %d</string>
 
   <!-- Common -->
   <string name="yes">Sí</string>
@@ -115,8 +115,6 @@ limitations under the License.
   <string name="waypoint">Marcador de recorrido</string>
   <string name="license">Licencia</string>
   <string name="cancel">Cancelar</string>
-  <string name="close">Cerrar</string>
-  <string name="edit">Editar</string>
   <string name="save">Guardar</string>
 
   <!-- Placemark labels for start and end of track -->
diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml
index e8f4e1485..2907933d0 100644
--- a/MyTracks/res/values-fi/strings.xml
+++ b/MyTracks/res/values-fi/strings.xml
@@ -71,27 +71,27 @@ limitations under the License.
   <string name="progress_message">Lähetetään reittiä Google:n palvelimelle.</string>
   <string name="progress_message_reading_track">Luetaan reittiä...</string>
   <string name="progress_message_preparing_track">Valmistellaan reittiä...</string>
-  <string name="progress_message_authenticating_fusiontables">Todennetaan Google Fusion Tables -tiliä...</string>
-  <string name="progress_message_authenticating_mymaps">Todennetaan Google Maps -tiliä...</string>
+  <string name="progress_message_authenticating_fusion_tables">Todennetaan Google Fusion Tables -tiliä...</string>
+  <string name="progress_message_authenticating_my_maps">Todennetaan Google Maps -tiliä...</string>
   <string name="progress_message_authenticating_docs">Todennetaan Google Docs -tiliä...</string>
   <string name="progress_message_sending_docs">Lähetetään reittiä Google Docsiin...</string>
-  <string name="progress_message_sending_mymaps">Lähetetään reittiä Google Mapsiin...</string>
+  <string name="progress_message_sending_my_maps">Lähetetään reittiä Google Mapsiin...</string>
   <string name="progress_message_creating_map">Luodaan uutta My Mapsia...</string>
-  <string name="progress_message_sending_fusiontables">Lähetetään reittiä Fusion Tablesiin...</string>
-  <string name="progress_message_creating_fusiontable">Luodaan uutta Fusion tablea...</string>
-  <string name="import_progress_message">Tuodaan uutta GPS-reittiä. Odota.</string>
-  <string name="write_progress_message">Kirjoitetaan tiedostoa SD-kortille. Odota.</string>
+  <string name="progress_message_sending_fusion_tables">Lähetetään reittiä Fusion Tablesiin...</string>
+  <string name="progress_message_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="progress_message_updating_track">Päivitetään reitin tilastoja...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Oletko varma?</string>
+  <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>
 
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">Created by My Tracks on Android.</string>
-  <string name="fusiontable_link">Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; on Android.</string>
+  <string name="send_to_google_by_mytracks">Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; on Android.</string>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="my_map_link">Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; on Android.</string>
@@ -102,11 +102,11 @@ limitations under the License.
   <string name="recorded_date">Tallennettu</string>
   <string name="category">Liikunnan muoto</string>
   <string name="waypoint_category">Merkinnän tyyppi</string>
-  <string name="part">(Osa %d)</string>
+  <string name="track_part_format">(Osa %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="recording_your_track">Tallennetaan reittiä...</string>
-  <string name="new_track">Reitti %d</string>
+  <string name="new_track_format">Reitti %d</string>
 
   <!-- Common -->
   <string name="no">Ei</string>
@@ -117,8 +117,6 @@ limitations under the License.
   <string name="waypoint">Reittipiste</string>
   <string name="license">Lisenssi</string>
   <string name="cancel">Peruuta</string>
-  <string name="close">Sulje</string>
-  <string name="edit">Muokkaa</string>
   <string name="save">Tallenna</string>
 
   <!-- Placemark labels for start and end of track -->
diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml
index 2ead92d99..92efd2968 100644
--- a/MyTracks/res/values-fr/strings.xml
+++ b/MyTracks/res/values-fr/strings.xml
@@ -66,34 +66,34 @@ limitations under the License.
   <string name="progress_message">Envoi du parcours à Google...</string>
   <string name="progress_message_reading_track">Lecture du parcours...</string>
   <string name="progress_message_preparing_track">Préparation du parcours</string>
-  <string name="progress_message_authenticating_fusiontables">Authentification à Google Fusion Tables...</string>
+  <string name="progress_message_authenticating_fusion_tables">Authentification à Google Fusion Tables...</string>
   <string name="progress_message_authenticating_docs">Authentification à Google Docs...</string>
   <string name="progress_message_sending_docs">Envoi du parcours vers Google Docs...</string>
-  <string name="progress_message_sending_fusiontables">Envoi du parcours vers Google Fusion Tables...</string>
-  <string name="progress_message_creating_fusiontable">Création d\'une nouvelle \'Fusion Table\'...</string>
-  <string name="import_progress_message">Importation du parcours GPS. Patientez SVP.</string>
-  <string name="write_progress_message">Enregistrement du fichier sur la carte SD. Patientez SVP.</string>
+  <string name="progress_message_sending_fusion_tables">Envoi du parcours vers Google Fusion Tables...</string>
+  <string name="progress_message_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="progress_message_updating_track">Mise à jour des statistiques du parcours...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Êtes-vous sûr?</string>
+  <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>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">Créée par My Tracks sous Android.</string>
-  <string name="fusiontable_link">Créée par &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; sous Android.</string>
+  <string name="send_to_google_by_mytracks">Créée par &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; sous Android.</string>
 
   <!-- Formatting of track and marker descriptions -->
   <string name="recorded_date">Enregistré</string>
   <string name="category">Type d\'activité</string>
   <string name="waypoint_category">Type de balise</string>
-  <string name="part">(Portion %d)</string>
+  <string name="track_part_format">(Portion %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="recording_your_track">Enregistrement de votre parcours...</string>
-  <string name="new_track">Parcours %d</string>
+  <string name="new_track_format">Parcours %d</string>
 
   <!-- Common -->
   <string name="no">Non</string>
@@ -101,8 +101,6 @@ limitations under the License.
   <string name="error">Erreur</string>
   <string name="waypoint">Point de passage</string>
   <string name="cancel">Annuler</string>
-  <string name="close">Fermer</string>
-  <string name="edit">Modifier</string>
   <string name="save">Enregistrer</string>
 
   <!-- Placemark labels for start and end of track -->
diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml
index 64ddf7c98..52dda5c02 100644
--- a/MyTracks/res/values-it/strings.xml
+++ b/MyTracks/res/values-it/strings.xml
@@ -63,35 +63,35 @@ limitations under the License.
   <string name="progress_message">Invio del percorso a Google in corso.</string>
   <string name="progress_message_reading_track">Lettura in corso...</string>
   <string name="progress_message_preparing_track">Elaborazione del percorso in corso...</string>
-  <!-- <string name="progress_message_authenticating_fusiontables">Autenticazione a Google Maps in corso...</string> -->
+  <!-- <string name="progress_message_authenticating_fusion_tables">Autenticazione a Google Maps in corso...</string> -->
   <string name="progress_message_authenticating_docs">Autenticazione a Google Docs in corso...</string>
   <string name="progress_message_sending_docs">Invio del percorso a Google Docs in corso...</string>
-  <!-- <string name="progress_message_sending_fusiontables">Invio del percorso a Google Maps in corso...</string> -->
-  <!-- <string name="progress_message_creating_fusiontable">Creazione di una nuova mappa in «Le mie mappe» in corso...</string> -->
-  <string name="import_progress_message">Importazione del percorso GPS in corso. Attendere prego...</string>
-  <string name="write_progress_message">Salvataggio del file sulla scheda SD in corso. Attendere prego...</string>
+  <!-- <string name="progress_message_sending_fusion_tables">Invio del percorso a Google Maps in corso...</string> -->
+  <!-- <string name="progress_message_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="progress_message_updating_track">Aggiornamento delle statistiche del percorso in corso...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Sei sicuro?</string>
+  <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>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">Creato da My Tracks su Android.</string>
-  <string name="fusiontable_link">Creato da &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; su Android.</string>
+  <string name="send_to_google_by_mytracks">Creato da &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; su Android.</string>
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">Punti</string>
   <string name="recorded_date">Registrato</string>
   <string name="category">Tipo di attività</string>
   <string name="waypoint_category">Tipo di segnaposto</string>
-  <string name="part">(Parte %d)</string>
+  <string name="track_part_format">(Parte %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="recording_your_track">Registrazione del percorso in corso...</string>
-  <string name="new_track">Percorso %d</string>
+  <string name="new_track_format">Percorso %d</string>
 
   <!-- Common -->
   <string name="no">No</string>
@@ -101,8 +101,6 @@ limitations under the License.
   <string name="success">Successo</string>
   <string name="waypoint">Punto di passaggio</string>
   <string name="cancel">Annulla</string>
-  <string name="close">Chiudi</string>
-  <string name="edit">Modifica</string>
   <string name="save">Salva</string>
 
   <!-- Placemark labels for start and end of track -->
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index 9056d7d2c..60dc22a90 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -68,27 +68,27 @@ limitations under the License.
   <string name="progress_message">トラックをGoogleに送信しています．</string>
   <string name="progress_message_reading_track">トラックを読んでいます...</string>
   <string name="progress_message_preparing_track">トラックを準備しています...</string>
-  <string name="progress_message_authenticating_fusiontables">Google Fusion Tablesへの認証を行っています...</string>
-  <string name="progress_message_authenticating_mymaps">Googleマップへの認証を行っています...</string>
+  <string name="progress_message_authenticating_fusion_tables">Google Fusion Tablesへの認証を行っています...</string>
+  <string name="progress_message_authenticating_my_maps">Googleマップへの認証を行っています...</string>
   <string name="progress_message_authenticating_docs">Google Docsへの認証を行っています...</string>
   <string name="progress_message_sending_docs">トラックをGoogle Docsに送信しています...</string>
-  <string name="progress_message_sending_mymaps">トラックをGoogleマップに送信しています...</string>
+  <string name="progress_message_sending_my_maps">トラックをGoogleマップに送信しています...</string>
   <string name="progress_message_creating_map">新しいマイマップを作成しています...</string>
-  <string name="progress_message_sending_fusiontables">トラックをFusion Tablesに送信しています...</string>
-  <string name="progress_message_creating_fusiontable">新しいFusionテーブルを生成しています...</string>
-  <string name="import_progress_message">GPSトラックをインポートしています．若干時間がかかります．</string>
-  <string name="write_progress_message">SDカードにデータを書き込んでいます．若干時間がかかります．</string>
+  <string name="progress_message_sending_fusion_tables">トラックをFusion Tablesに送信しています...</string>
+  <string name="progress_message_creating_fusion_table">新しいFusionテーブルを生成しています...</string>
+  <string name="progress_message_import">GPSトラックをインポートしています．若干時間がかかります．</string>
+  <string name="progress_message_export">SDカードにデータを書き込んでいます．若干時間がかかります．</string>
   <string name="progress_message_updating_track">トラック統計情報を更新しています...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">よろしいですか?</string>
+  <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>
 
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">Android用My Tracksで作成</string>
-  <string name="fusiontable_link">Android用&lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt;で作成しました．</string>
+  <string name="send_to_google_by_mytracks">Android用&lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt;で作成しました．</string>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="my_map_link">Android用&lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt;で作成しました．</string>
@@ -99,11 +99,11 @@ limitations under the License.
   <string name="recorded_date">記録日</string>
   <string name="category">活動タイプ</string>
   <string name="waypoint_category">マーカータイプ</string>
-  <string name="part">(パート %d)</string>
+  <string name="track_part_format">(パート %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="recording_your_track">トラックを保存中...</string>
-  <string name="new_track">トラック %d</string>
+  <string name="new_track_format">トラック %d</string>
 
   <!-- Common -->
   <string name="no">いいえ</string>
@@ -113,8 +113,6 @@ limitations under the License.
   <string name="waypoint">ウェイポイント</string>
   <string name="license">ライセンス</string>
   <string name="cancel">キャンセル</string>
-  <string name="close">閉じる</string>
-  <string name="edit">編集</string>
   <string name="save">保存</string>
 
   <!-- Placemark labels for start and end of track -->
diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml
index 0d9814fa2..d4b844032 100644
--- a/MyTracks/res/values-pl/strings.xml
+++ b/MyTracks/res/values-pl/strings.xml
@@ -64,35 +64,35 @@ limitations under the License.
   <string name="progress_message">Przesyłanie trasy do Google.</string>
   <string name="progress_message_reading_track">Czytanie trasy...</string>
   <string name="progress_message_preparing_track">Przygotowywanie trasy...</string>
-  <!-- <string name="progress_message_authenticating_fusiontables">Uwierzytelnianie w Mapach Google...</string> -->
+  <!-- <string name="progress_message_authenticating_fusion_tables">Uwierzytelnianie w Mapach Google...</string> -->
   <string name="progress_message_authenticating_docs">Uwierzytelnianie w Dokumentach Google...</string>
   <string name="progress_message_sending_docs">Przesyłanie trasy do Dokumentów Google...</string>
-  <!-- <string name="progress_message_sending_fusiontables">Przesyłanie trasy do Map Google...</string> -->
-  <!-- <string name="progress_message_creating_fusiontable">Tworzenie nowej Mojej Mapy...</string> -->
-  <string name="import_progress_message">Importowanie trasy GPS. Poczekaj chwilę.</string>
-  <string name="write_progress_message">Zapisywanie pliku na kartę SD. Poczekaj chwilę.</string>
+  <!-- <string name="progress_message_sending_fusion_tables">Przesyłanie trasy do Map Google...</string> -->
+  <!-- <string name="progress_message_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="progress_message_updating_track">Aktualizacja statystyk trasy...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Jesteś pewien?</string>
+  <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>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">Utworzono za pomocą My Tracks na Android.</string>
-  <string name="fusiontable_link">Utworzona przez &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; na Android.</string>
+  <string name="send_to_google_by_mytracks">Utworzona przez &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; na Android.</string>
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">Punkty</string>
   <string name="recorded_date">Zapisana</string>
   <string name="category">Typ aktywności</string>
   <string name="waypoint_category">Typ znacznika</string>
-  <string name="part">(Część %d)</string>
+  <string name="track_part_format">(Część %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="recording_your_track">Rejestrowanie twojej trasy...</string>
-  <string name="new_track">Trasa %d</string>
+  <string name="new_track_format">Trasa %d</string>
 
   <!-- Common -->
   <string name="no">Nie</string>
@@ -102,8 +102,6 @@ limitations under the License.
   <string name="success">Powodzenie</string>
   <string name="waypoint">Punkt orientacyjny</string>
   <string name="cancel">Anuluj</string>
-  <string name="close">Zamknij</string>
-  <string name="edit">Edytuj</string>
   <string name="save">Zapisz</string>
 
   <!-- Placemark labels for start and end of track -->
diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml
index 4a445439a..9961800f3 100644
--- a/MyTracks/res/values-pt-rBR/strings.xml
+++ b/MyTracks/res/values-pt-rBR/strings.xml
@@ -63,35 +63,35 @@ limitations under the License.
   <string name="progress_message">Enviando seu caminho ao Google.</string>
   <string name="progress_message_reading_track">Lendo caminho...</string>
   <string name="progress_message_preparing_track">Preparando caminho...</string>
-  <string name="progress_message_authenticating_fusiontables">Autenticando com o Google Fusion Tables...</string>
+  <string name="progress_message_authenticating_fusion_tables">Autenticando com o Google Fusion Tables...</string>
   <string name="progress_message_authenticating_docs">Authenticando com o Google Docs...</string>
   <string name="progress_message_sending_docs">Enviando caminho para o Google Docs...</string>
-  <string name="progress_message_sending_fusiontables">Enviando caminho para o Google Fusion Tables...</string>
-  <string name="progress_message_creating_fusiontable">Criando nova Fusion Table...</string>
-  <string name="import_progress_message">Importando um caminho de GPS. Isso pode demorar alguns instantes.</string>
-  <string name="write_progress_message">Salvando arquivo para o cartão SD. Isso pode demorar alguns instantes.</string>
+  <string name="progress_message_sending_fusion_tables">Enviando caminho para o Google Fusion Tables...</string>
+  <string name="progress_message_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="progress_message_updating_track">Atualizando estatísticas do caminho...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Você tem certeza?</string>
+  <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>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">"Criado por My Tracks no Android.</string>
-  <string name="fusiontable_link">"Criado por &lt;a href='http://mytracks.appspot.com'&gt;My Tracks&lt;/a&gt; no Android.</string>
+  <string name="send_to_google_by_mytracks">"Criado por &lt;a href='http://mytracks.appspot.com'&gt;My Tracks&lt;/a&gt; no Android.</string>
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">Pontos</string>
   <string name="recorded_date">Gravado</string>
   <string name="category">"Tipo de atividade</string>
   <string name="waypoint_category">"Tipo de marcador</string>
-  <string name="part">"(Parte %d)</string>
+  <string name="track_part_format">"(Parte %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="recording_your_track">"Gravando seu caminho...</string>
-  <string name="new_track">"Caminho %d</string>
+  <string name="new_track_format">"Caminho %d</string>
 
   <!-- Common -->
   <string name="no">Não</string>
@@ -101,8 +101,6 @@ limitations under the License.
   <string name="success">Successo</string>
   <string name="waypoint">Ponto de passagem</string>
   <string name="cancel">Cancelar</string>
-  <string name="close">Fechar</string>
-  <string name="edit">Editar</string>
   <string name="save">Salvar</string>
 
   <!-- Placemark labels for start and end of track -->
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index b382da343..3552ed2ad 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -70,27 +70,27 @@ limitations under the License.
   <string name="progress_message">Отправка вашего трека в Google.</string>
   <string name="progress_message_reading_track">Чтение трека...</string>
   <string name="progress_message_preparing_track">Подготовка трека...</string>
-  <string name="progress_message_authenticating_fusiontables">Аутентификация на Google Fusion Tables...</string>
-  <string name="progress_message_authenticating_mymaps">Аутентификация на Google Карты...</string>
+  <string name="progress_message_authenticating_fusion_tables">Аутентификация на Google Fusion Tables...</string>
+  <string name="progress_message_authenticating_my_maps">Аутентификация на Google Карты...</string>
   <string name="progress_message_authenticating_docs">Аутентификация в Google Документы...</string>
   <string name="progress_message_sending_docs">Отправка трека в Google Документы...</string>
-  <string name="progress_message_sending_mymaps">Отправка трека в Google Карты...</string>
+  <string name="progress_message_sending_my_maps">Отправка трека в Google Карты...</string>
   <string name="progress_message_creating_map">Создание новой \"Моей карты\" ...</string>
-  <string name="progress_message_sending_fusiontables">Отправка трека в Fusion Tables...</string>
-  <string name="progress_message_creating_fusiontable">Создание новой Fusion table...</string>
-  <string name="import_progress_message">Импорт GPS трека. Это может занять некоторое время.</string>
-  <string name="write_progress_message">Запись файла на SD карту. Это может занять некоторое время.</string>
+  <string name="progress_message_sending_fusion_tables">Отправка трека в Fusion Tables...</string>
+  <string name="progress_message_creating_fusion_table">Создание новой Fusion table...</string>
+  <string name="progress_message_import">Импорт GPS трека. Это может занять некоторое время.</string>
+  <string name="progress_message_export">Запись файла на SD карту. Это может занять некоторое время.</string>
   <string name="progress_message_updating_track">Обновление статистики трека...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Вы уверены?</string>
+  <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>
 
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">Создано My Tracks на Android.</string>
-  <string name="fusiontable_link">Создано &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; на Android.</string>
+  <string name="send_to_google_by_mytracks">Создано &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; на Android.</string>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="my_map_link">Создано &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; на Android.</string>
@@ -101,11 +101,11 @@ limitations under the License.
   <string name="recorded_date">Записан</string>
   <string name="category">Тип деятельности</string>
   <string name="waypoint_category">Тип маркера</string>
-  <string name="part">(Часть %d)</string>
+  <string name="track_part_format">(Часть %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="recording_your_track">Запись трека...</string>
-  <string name="new_track">Трек %d</string>
+  <string name="new_track_format">Трек %d</string>
 
   <!-- Common -->
   <string name="no">Нет</string>
@@ -116,8 +116,6 @@ limitations under the License.
   <string name="waypoint">Путевая точка</string>
   <string name="license">Лицензия</string>
   <string name="cancel">Отмена</string>
-  <string name="close">Закрыть</string>
-  <string name="edit">Правка</string>
   <string name="save">Сохранить</string>
 
   <!-- Placemark labels for start and end of track -->
diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml
index 537cfb77e..f9129552f 100644
--- a/MyTracks/res/values-sv/strings.xml
+++ b/MyTracks/res/values-sv/strings.xml
@@ -64,35 +64,35 @@ limitations under the License.
   <string name="progress_message">Skickar ditt spår till Google.</string>
   <string name="progress_message_reading_track">Läser spår...</string>
   <string name="progress_message_preparing_track">Förbereder spår...</string>
-  <!-- <string name="progress_message_authenticating_fusiontables">Autentiserar till Google Kartor...</string> -->
+  <!-- <string name="progress_message_authenticating_fusion_tables">Autentiserar till Google Kartor...</string> -->
   <string name="progress_message_authenticating_docs">Autentiserar till Google Dokument...</string>
   <string name="progress_message_sending_docs">Skickar spår till Google Dokument...</string>
-  <!-- <string name="progress_message_sending_fusiontables">Skickar spår till Google Kartor...</string> -->
-  <!-- <string name="progress_message_creating_fusiontable">Skapar en ny Min Karta...</string> -->
-  <string name="import_progress_message">Importerar ett GPS-spår. Detta kan ta en stund.</string>
-  <string name="write_progress_message">Skriver till SD-kortet. Detta kan ta en stund.</string>
+  <!-- <string name="progress_message_sending_fusion_tables">Skickar spår till Google Kartor...</string> -->
+  <!-- <string name="progress_message_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="progress_message_updating_track">Uppdaterar spårstatistik...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">Är du säker?</string>
+  <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>
 
   <!-- Text and links when uploading to Google My Maps -->
   <string name="new_map_description">Skapad av My Tracks på Android.</string>
-  <string name="fusiontable_link">Skapad av &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; på Android.</string>
+  <string name="send_to_google_by_mytracks">Skapad av &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; på Android.</string>
 
   <!-- Formatting of track and marker descriptions -->
   <string name="points">Punkter</string>
   <string name="recorded_date">Inspelad</string>
   <string name="category">Aktivitetstyp</string>
   <string name="waypoint_category">Markörtyp</string>
-  <string name="part">(Del %d)</string>
+  <string name="track_part_format">(Del %d)</string>
 
   <!-- Used by the track recording service -->
   <string name="recording_your_track">Spelar in ditt spår...</string>
-  <string name="new_track">Spår %d</string>
+  <string name="new_track_format">Spår %d</string>
 
   <!-- Common -->
   <string name="no">Nej</string>
@@ -102,8 +102,6 @@ limitations under the License.
   <string name="success">Lyckades</string>
   <string name="waypoint">Positionsmärke</string>
   <string name="cancel">Avbryt</string>
-  <string name="close">Stäng</string>
-  <string name="edit">Ändra</string>
   <string name="save">Spara</string>
 
   <!-- Placemark labels for start and end of track -->
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index fde5e2d07..168705e8f 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -71,30 +71,30 @@ limitations under the License.
   <string name="progress_message">发送你的轨迹到 Google.</string>
   <string name="progress_message_reading_track">读取轨迹中...</string>
   <string name="progress_message_preparing_track">准备轨迹中...</string>
-  <string name="progress_message_authenticating_fusiontables">登录 Google Fusion Tables 中...</string>
+  <string name="progress_message_authenticating_fusion_tables">登录 Google Fusion Tables 中...</string>
   <string name="progress_message_authenticating_docs">登录 Google Docs 中...</string>
   <string name="progress_message_sending_docs">发送轨迹到 Google Docs 中...</string>
-  <string name="progress_message_sending_fusiontables">发送轨迹到 Google Fusion Tables 中...</string>
-  <string name="progress_message_creating_fusiontable">创建新的 Fusion Table 中...</string>
+  <string name="progress_message_sending_fusion_tables">发送轨迹到 Google Fusion Tables 中...</string>
+  <string name="progress_message_creating_fusion_table">创建新的 Fusion Table 中...</string>
   <string name="progress_message_creating_map">创建新的 My Map...</string>
-  <string name="progress_message_sending_fusiontables">发送轨迹到 Fusion Tables...</string>
-  <string name="progress_message_creating_fusiontable">创建新的 Fusion table...</string>
-  <string name="import_progress_message">导入 GPS 轨迹中. 请稍候.</string>
-  <string name="write_progress_message">写入文件到 SD 卡中. 请稍候.</string>
+  <string name="progress_message_sending_fusion_tables">发送轨迹到 Fusion Tables...</string>
+  <string name="progress_message_creating_fusion_table">创建新的 Fusion table...</string>
+  <string name="progress_message_import">导入 GPS 轨迹中. 请稍候.</string>
+  <string name="progress_message_export">写入文件到 SD 卡中. 请稍候.</string>
   <string name="progress_message_updating_track">更新轨迹统计信息中...</string>
 
   <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">请确认</string>
+  <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>
 
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">由 Android 平台的 My Tracks 创建.</string>
-  <string name="fusiontable_link">由 Android 平台的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 创建.</string>
+  <string name="send_to_google_by_mytracks">由 Android 平台的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 创建.</string>
 
   <!-- Text and links when uploading to Google My Maps -->
-  <string name="fusiontable_link">由 Android 上的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 创建.</string>
+  <string name="send_to_google_by_mytracks">由 Android 上的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 创建.</string>
   <string name="new_map_title">新地图</string>
 
   <!-- Formatting of track and marker descriptions -->
@@ -102,11 +102,11 @@ limitations under the License.
   <string name="recorded_date">记录日期</string>
   <string name="category">活动类型</string>
   <string name="waypoint_category">标记类型</string>
-  <string name="part">(第 %d 部分)</string>
+  <string name="track_part_format">(第 %d 部分)</string>
 
   <!-- Used by the track recording service -->
   <string name="recording_your_track">记录轨迹中...</string>
-  <string name="new_track">轨迹 %d</string>
+  <string name="new_track_format">轨迹 %d</string>
 
   <!-- Common -->
   <string name="no">否</string>
@@ -117,8 +117,6 @@ limitations under the License.
   <string name="waypoint">路点</string>
   <string name="license">授权</string>
   <string name="cancel">取消</string>
-  <string name="close">关闭</string>
-  <string name="edit">编辑</string>
   <string name="save">保存</string>
 
   <!-- Placemark labels for start and end of track -->
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 17a23f9a0..84c3e96e7 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -113,7 +113,7 @@ limitations under the License.
   <!-- Error messages when importing a track. -->
   <string name="error_import_unable_to_read_file"
     translation_description="When importing a track from the SD card, a messsage indicating that
-      MyTracks is unable to read the file.">
+      My Tracks is unable to read the file.">
     Unable to read from file.
   </string>
   <string name="error_import_invalid_gpx_format"
@@ -215,139 +215,449 @@ limitations under the License.
     Your track has been sent to docs.google.com.
   </string>
 
-  <!-- Progress dialog -->
-  <string name="progress_title">Please wait...</string>
-  <string name="progress_message">Sending your track to Google.</string>
-  <string name="progress_message_reading_track">Reading track...</string>
-  <string name="progress_message_preparing_track">Preparing track...</string>
-  <string name="progress_message_authenticating_fusiontables">Authenticating to Google Fusion Tables...</string>
-  <string name="progress_message_authenticating_mymaps">Authenticating to Google Maps...</string>
-  <string name="progress_message_authenticating_docs">Authenticating to Google Docs...</string>
-  <string name="progress_message_sending_docs">Sending track to Google Docs...</string>
-  <string name="progress_message_sending_mymaps">Sending track to Google Maps...</string>
-  <string name="progress_message_creating_map">Creating new My Map...</string>
-  <string name="progress_message_sending_fusiontables">Sending track to Fusion Tables...</string>
-  <string name="progress_message_creating_fusiontable">Creating new Fusion table...</string>
-  <string name="import_progress_message">Importing a GPS track. This may take a while.</string>
-  <string name="write_progress_message">Writing file to SD card. This may take a while.</string>
-  <string name="progress_message_updating_track">Updating track statistics...</string>
+  <!-- Progress dialog title -->
+  <string name="progress_title"
+    translation_description="When displaying a progress dialog, the title on the dialog asking the
+      user to wait.">
+    Please wait...
+  </string>
+  
+  <!-- Progress dialog messages when sending to Google. -->
+  <string name="progress_message_authenticating_my_maps"
+    translation_description="When sending a track to Google My Maps, the messsage on the progress
+      dialog indicating authenticating to Google My Maps.">
+    Authenticating to Google My Maps...
+  </string>
+  <string name="progress_message_authenticating_fusion_tables"
+    translation_description="When sending a track to Google Fusion Tables, the messsage on the
+      progress dialog indicating authenticating to Google Fusion Tables.">
+    Authenticating to Google Fusion Tables...
+  </string>
+  <string name="progress_message_authenticating_docs"
+    translation_description="When sending a track to Google Docs, the messsage on the progress
+      dialog indicating authenticating to Google Docs.">
+    Authenticating to Google Docs...
+  </string>    
+  <string name="progress_message_reading_track"
+    translation_description="When sending a track to Google, the message on the progress dialog
+      indicating My Tracks is reading the track from its database.">
+    Reading track...
+  </string>  
+  <string name="progress_message_preparing_track"
+    translation_description="When sending a track to Google My Maps, the message on the progress
+      dialog indicating My Tracks is preparing the track's data for upload.">
+    Preparing track...
+  </string> 
+  <string name="progress_message_creating_map"
+    translation_description="When sending a track to Google My Maps, the messsage on the progress
+      dialog indicating My Tracks is creating a new map in Google My Maps.">
+    Creating a new My Map...
+  </string>
+  <string name="progress_message_creating_fusion_table"
+    translation_description="When sending a track to Google Fusion Tables, the messsage 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="progress_message_sending_my_maps"
+    translation_description="When sending a track to Google My Maps, the message on the progress
+      dialog indicating My Tracks is sending the track data.">
+    Sending a track to Google My Maps...
+  </string>
+  <string name="progress_message_sending_fusion_tables"
+    translation_description="When sending a track to Google Fusion Tables, the message on the
+      progress dialog indicating My Tracks is sending the track data.">
+    Sending a track to Google Fusion Tables...
+  </string>
+  <string name="progress_message_sending_docs"
+    translation_description="When sending a track to Google Docs, the message on the progress dialog
+      indicating My Tracks is sending the track data.">
+    Sending a track to Google Docs...
+  </string>
+  
+  <!-- Import and Export progress messages. -->
+  <string name="progress_message_import"
+    translation_description="When importing a track from the SD card, the message on the progress
+      dialog indicating that it may take a while.">
+    Importing a track from the SD card. This may take a while.
+  </string>
+  <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="deletetrack_title">Delete track</string>
-  <string name="are_you_sure_question">Are you sure?</string>
-  <string name="all_data_will_be_permanently_deleted">All tracks and markers will be deleted from this phone.</string>
-  <string name="track_will_be_permanently_deleted">The track and its markers will be permanently deleted from this phone.</string>
-  <string name="marker_will_be_permanently_deleted">The marker will be permanently deleted from this phone.</string>
+  <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>
 
-  <!-- Text and links when uploading to Google Fusion Tables -->
-  <string name="new_map_description">Created by My Tracks on Android.</string>
-  <string name="fusiontable_link">Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; on Android.</string>
+  <!-- Text and link when uploading to Google. -->
+  <!-- TODO(jshih@google.com) remove the html href tag from this string. -->
+  <string name="send_to_google_by_mytracks"
+    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
+      http://mytracks.appspot.com.">
+    Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; on Android.
+  </string>
 
-  <!-- Text and links when uploading to Google My Maps -->
-  <string name="my_map_link">Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; on Android.</string>
-  <string name="new_map_title">New map</string>
-
-  <!-- Formatting of track and marker descriptions -->
-  <string name="points">Points</string>
-  <string name="recorded_date">Recorded</string>
-  <string name="category">Activity type</string>
-  <string name="waypoint_category">Marker type</string>
-  <string name="part">(Part %d)</string>
+  <!-- Tags for a track description. -->
+  <string name="recorded_date"
+    translation_description="When sending a track to Google, in the track description, a tag
+      for the track recorded date. E.g., 'Recorded: Tue Sep 06 15:08:30 PDT 2011'.">        
+    Recorded
+  </string>
+  <string name="category"
+    translation_description="When sending a track to Google, in the track desription, a tag
+      for the activity type. E.g., 'Activity type: hiking'.">
+    Activity type
+  </string>
 
   <!-- Used by the track recording service -->
-  <string name="recording_your_track">Recording your track...</string>
-  <string name="new_track">Track %d</string>
-
-  <!-- Common -->
-  <string name="no">No</string>
-  <string name="yes">Yes</string>
-  <string name="ok">OK</string>
-  <string name="error">Error</string>
-  <string name="success">Success</string>
-  <string name="waypoint">Waypoint</string>
-  <string name="license">License</string>
-  <string name="cancel">Cancel</string>
-  <string name="close">Close</string>
-  <string name="edit">Edit</string>
-  <string name="save">Save</string>
-
-  <!-- Placemark labels for start and end of track -->
-  <string name="start">(Start)</string>
-  <string name="end">(End)</string>
-
-  <!--  TrackList -->
-  <string name="tracklist_show_track">Show</string>
-  <string name="tracklist_send_to_mymaps">Send to Google My Maps</string>
-  <string name="tracklist_send_to_new_mymap">Send to New Google My Map</string>
-  <string name="tracklist_send_to_fusiontables">Send to Google Fusion Tables</string>
-  <string name="tracklist_send_to_new_fusiontable">Send to New Google Fusion Table</string>
-  <string name="tracklist_send_to_docs">Send to Google Docs</string>
-  <string name="tracklist_send_to_google">Send to Google...</string>
-  <string name="tracklist_delete_track">Delete from phone...</string>
-  <string name="tracklist_edit_track">Edit details</string>
-  <string name="tracklist_write_to_sd">Write to SD card...</string>
-  <string name="tracklist_save_as_gpx">Save a GPX file</string>
-  <string name="tracklist_save_as_kml">Save a KML file</string>
-  <string name="tracklist_save_as_csv">Save a CSV file</string>
-  <string name="tracklist_save_as_tcx">Save a TCX file</string>
-  <string name="tracklist_btn_send_all_to_fusiontables">Send to Google Fusion Tables</string>
-  <string name="tracklist_btn_send_all_to_mymaps">Send to Google My Maps</string>
-  <string name="tracklist_btn_delete_all">Delete all</string>
-  <!-- Export All -->
-  <string name="tracklist_btn_export_all">Export all</string>
-  <string name="export_done">Export finished</string>
-  <string name="tracklist_pick_one">Pick a track. Press&amp;hold for more options.</string>
-  <string name="tracklist_all_tracks">All Tracks:</string>
-  <string name="tracklist_this_track">This Track</string>
-  <string name="tracklist_share_track">Share with Friends...</string>
-  <string name="tracklist_share_link">A link to the map</string>
-  <string name="tracklist_share_gpx_file">A GPX file</string>
-  <string name="tracklist_share_kml_file">A KML file</string>
-  <string name="tracklist_share_csv_file">A CSV file</string>
-  <string name="tracklist_share_tcx_file">A TCX file</string>
-  <string name="tracklist_clear_map">Clear map</string>
+  <string name="recording_your_track"
+    translation_description="When recording a track, the message on the My Tracks notification 
+      informing the user that My Tracks is actively recording his track.">
+    Recording your track...
+  </string>
+  <string name="new_track_format"
+    translation_description="When creating a new track, the string format to name the track. E.g.,
+      'Track 1'.">
+    Track %d
+  </string>  
+  <string name="track_part_format"
+    translation_description="When sending a track to Google, the string format to name segments
+      when splitting a large track. E.g., '(Part 1)'.">
+    (Part %d)
+  </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>
   
-  <!-- Import All -->
-  <string name="tracklist_btn_import_all">Import all</string>
-  <!-- Format:
-  $1 : Successful imports
-  $2 : Attempted imports
-  $3 : MyTracks gpx path
-  -->
-  <string name="import_multi_done">Imported %1$d of %2$d GPX files from %3$s</string>
-  <string name="import_multi_empty">No GPX files found in %s. SD card may be unreadable or directory may not contain GPX files.</string>
-  <string name="import_error">Import error for file %s</string>
-  <string name="import_title">Import into My Tracks</string>
-  <string name="import_success">Successfully imported %1$d track(s) from file.</string>
-  <string name="import_show_track">Show track</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>
 
-  <!-- Waypoints list -->
-  <string name="waypointslist_btn_delete_all">Delete all markers</string>
-  <string name="waypointslist_this_waypoint">This Marker</string>
-  <string name="waypointslist_delete_waypoint">Delete</string>
-  <string name="waypointslist_edit_waypoint">Edit details</string>
-  <string name="waypointslist_show_waypoint">Show on map</string>
-  <string name="waypointslist_btn_insert_waypoint">Insert waypoint</string>
-  <string name="waypointslist_btn_insert_statistics">Insert statistics</string>
-  <string name="waypointslist_pick_one">Pick a marker. Press&amp;hold for more options.</string>
+  <!-- Insert markers -->
+  <string name="waypoint"
+    translation_description="When inserting a waypoint marker, the default name of the marker.">
+    Waypoint
+  </string>
+  <string name="statistics"
+    translation_description="When inserting a statistics marker, the default name of the marker.">
+    Statistics
+  </string>
+  
+  <!--  Welcome dialog -->
+  <string name="license"
+    translation_description="In the welcome dialog, the text on the bottom button to view the terms
+      of service agreement.">
+    License
+  </string>
+  
+  <!-- Labels for start and end of a track -->
+  <string name="start"
+    translation_description="When inserting a marker to indicate the beginning of a track, the label
+      at the end of the marker name. E.g., the marker is named 'track_name (Start)'.">
+    (Start)
+  </string>
+  <string name="end"
+    translation_description="When inserting a marker to indicate the end of a track, the label at
+      the end of the marker name. E.g., the marker is named 'track_name (End)'."> 
+    (End)
+  </string>
 
-  <!-- MyTracks Details -->
-  <string name="trackdetails_title">Track Details</string>
-  <string name="trackdetails_name">Track Name</string>
-  <string name="trackdetails_name_hint">Track Name</string>
-  <string name="trackdetails_description">Track Description</string>
-  <string name="trackdetails_description_hint">Track Description</string>
-  <string name="trackdetails_category">Activity Type (e.g. hiking, cycling, running, climbing...)</string>
-  <string name="trackdetails_category_hint">Activity Type</string>
+  <!--  Tracks page -->
+  <string name="tracklist_pick_one"
+    translation_description="In the Tracks page, the instruction at the top of the page informing
+      the user he can press and hold a track for more options.">
+    Pick a track. Press&amp;hold for more options.
+  </string>
+  <string name="tracklist_btn_import_all"
+    translation_description="In the Tracks page, the button on the bottom to import all tracks.">
+    Import all
+  </string>
+  <string name="tracklist_btn_export_all"
+    translation_description="In the Tracks page, the button on the bottom to export all tracks.">
+    Export all
+  </string>  
+  <string name="tracklist_btn_delete_all"
+    translation_description="In the Tracks page, the button on the bottom to delete all tracks.">
+    Delete all
+  </string>
+  
+  <!-- A track's context menu -->
+  <string name="tracklist_this_track"
+    translation_description="In the context menu for a track, the title indicating that all the menu
+      options below are for this track.">
+    This Track
+  </string>
+  <string name="tracklist_show_track"
+    translation_description="In the context menu for a track, the menu option to show the track on
+      the map.">
+    Show on map
+  </string>
+  <string name="tracklist_edit_track"
+    translation_description="In the context menu for a track, the menu option to edit the track's 
+      metadata (e.g., title, activity type, etc.).">
+    Edit
+  </string>
+  <string name="tracklist_send_to_google"
+    translation_description="In the context menu for a track, the menu option to send the track to
+      Google.">
+    Send to Google...
+  </string>
+  <string name="tracklist_share_track"
+    translation_description="In the context menu for a track, the menu option to share the track
+      with friends through other applications.">
+    Share with friends...
+  </string>
+  <string name="tracklist_write_to_sd"
+    translation_description="In the context menu for a track, the menu option to write the track to
+      the SD card.">       
+    Write to SD card...
+  </string>      
+  <string name="tracklist_clear_map"
+    translation_description="In the context menu for a track, the menu option to clear the map
+      of any track.">
+    Clear map
+  </string>
+  <string name="tracklist_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>
+  
+  <!--  'Share with friends...' menu options. -->
+  <string name="tracklist_share_link"
+    translation_description="In the context menu for a track, under the 'Share with friends...'
+      option, the menu option to share the track's link to My Maps or Fusion Tables with friends.">
+    A link to My Maps or Fusion Tables
+  </string>
+  <string name="tracklist_share_gpx_file"
+    translation_description="In the context menu for a track, under the 'Share with friends...'
+      option, the menu option to share the track as a GPX file with friends.">     
+    A GPX file
+  </string>
+  <string name="tracklist_share_kml_file"
+    translation_description="In the context menu for a track, under the 'Share with friends...'
+      option, the menu option to share the track as a KML file with friends.">
+    A KML file
+  </string>
+  <string name="tracklist_share_csv_file"
+    translation_description="In the context menu for a track, under the 'Share with friends...'
+      option, the menu option to share the track as a CSV file with friends.">  
+    A CSV file
+  </string>
+  <string name="tracklist_share_tcx_file"
+    translation_description="In the context menu for a track, under the 'Share with friends...'
+      option, the menu option to share the track as a TCX file with friends."> 
+   A TCX file
+  </string>  
 
-  <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Marker Details</string>
-  <string name="waypointdetails_name">Marker Name</string>
-  <string name="waypointdetails_name_hint">Marker Name</string>
-  <string name="waypointdetails_description">Marker Description</string>
-  <string name="waypointdetails_description_hint">Marker Description</string>
-  <string name="waypointdetails_category">Marker Type (e.g. Building, Pothole, Sight...)</string>
-  <string name="waypointdetails_category_hint">Marker Type</string>
+  <!-- 'Write to SD card...' menu options. -->
+  <string name="tracklist_save_as_gpx"
+    translation_description="In the context menu for a track, under the 'Write to SD card...'
+      option, the menu option to save the track as a GPX file.">     
+    Save as a GPX file
+  </string>
+  <string name="tracklist_save_as_kml"
+    translation_description="In the context menu for a track, under the 'Write to SD card...'
+      option, the menu option to save the track as a KML file.">           
+    Save as a KML file
+  </string>
+  <string name="tracklist_save_as_csv"
+    translation_description="In the context menu for a track, under the 'Write to SD card...'
+      option, the menu option to save the track as a CSV file.">      
+    Save as a CSV file
+  </string>
+  <string name="tracklist_save_as_tcx"
+    translation_description="In the context menu for a track, under the 'Write to SD card...'
+      option, the menu option to save the track as a TCX file.">       
+    Save as a TCX file
+  </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 %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>
+  <string name="import_success"
+    translation_description="After successfully importing one track, the message on the confirmation
+      dialog. E.g., 'Successfully imported 5 track(s) from file'.">
+    Successfully imported %d track(s) from file.
+  </string>
+  <string name="import_show_track"
+    translation_description="After importing one track, the button to see the track.">
+    Show track
+  </string>
+
+  <!-- Markers page. -->
+  <string name="waypointslist_pick_one"
+    translation_description="In the Markers page, the instruction at the top of the page informing
+      the user he can press and hold a marker for more options.">
+    Pick a marker. Press&amp;hold for more options.
+  </string>
+  <string name="waypointslist_btn_insert_waypoint"
+    translation_description="In the Markers page, the button on the bottom to insert a waypoint
+      marker.">      
+    Insert waypoint
+  </string>
+  <string name="waypointslist_btn_insert_statistics"
+    translation_description="In the Markers page, the button on the bottom to insert a statistics
+      marker.">            
+    Insert statistics
+  </string>
+  <string name="waypointslist_this_waypoint"
+    translation_description="In the context menu for a marker, the title indicating that all the 
+      menu options below are for this marker.">      
+    This Marker
+  </string>
+  <string name="waypointslist_show_waypoint"
+    translation_description="In the context menu for a marker, the menu option to show the marker
+      on the map.">      
+    Show on map
+  </string>
+  <string name="waypointslist_edit_waypoint"
+    translation_description="In the context menu for a marker, the menu option to edit the marker's
+      metadata (e.g., title, type, etc.)."> 
+    Edit
+  </string>
+  <string name="waypointslist_delete_waypoint"
+    translation_description="In the context menu for a marker, the menu option to delete the
+      marker.">   
+    Delete
+  </string>
+
+  <!-- Track detail page -->
+  <string name="trackdetails_title"
+    translation_description="In the detail page for a track, the title of the page.">
+    Track Details
+  </string>
+  <string name="trackdetails_name"
+    translation_description="In the detail page for a track, the text field for the track name.">
+    Track Name
+  </string>
+  <string name="trackdetails_name_hint"
+    translation_description="In the detail page for a track, the hint in the 'Track Name' text field
+      when it is empty.">  
+    Track Name
+  </string>
+  <string name="trackdetails_category"
+    translation_description="In the detail page for a track, the text field for the activity type,
+      including for examples.">
+    Activity Type (e.g. hiking, cycling, running, climbing...)
+  </string>
+  <string name="trackdetails_category_hint"
+    translation_description="In the detail page for a track, the hint in the 'Activity Type' text
+      field when it is empty.">  
+    Activity Type
+  </string>
+  <string name="trackdetails_description"
+    translation_description="In the detail page for a track, the text field for the track 
+      description.">  
+    Track Description
+  </string>
+  <string name="trackdetails_description_hint"
+    translation_description="In the detail page for a track, the hint in the 'Track Description'
+      text field when it is empty.">    
+    Track Description
+  </string>
+
+  <!-- Waypoint marker and statistics marker detail page -->
+  <string name="waypointdetails_title"
+    translation_description="In the detail page for a waypoint or statistics marker, the title of
+      the page.">
+    Marker Details
+  </string>
+  <string name="waypointdetails_name"
+    translation_description="In the detail page for a waypoint or statistics marker, text field for
+      the marker name.">      
+    Marker Name
+  </string>
+  <string name="waypointdetails_name_hint"
+    translation_description="In the detail page for a waypoint or statistics marker, the hint in the 
+      'Marker Name' text field when it is empty.">   
+    Marker Name
+  </string>
+  <string name="waypointdetails_category"
+    translation_description="In the detail page for a waypoint marker, the text field for the
+      marker type, including examples.">       
+    Marker Type (e.g. Building, Pothole, Sight...)
+  </string>
+  <string name="waypointdetails_category_hint"
+    translation_description="In the detail page for a waypoint marker, the hint in the 'Marker Type'
+      text field when it is empty.">
+    Marker Type
+  </string>
+  <string name="waypointdetails_description"
+    translation_description="In the detail page for a waypoint marker, the text field for the marker
+      description.">     
+    Marker Description
+  </string>
+  <string name="waypointdetails_description_hint"
+    translation_description="In the detail page for a waypoint marker, the hint in the 'Marker
+      Description' text field when it is empty.">     
+    Marker Description
+  </string>
 
   <!-- MyTracks Settings -->
   <string name="mytracks_settings">My Tracks Settings</string>
@@ -568,7 +878,7 @@ limitations under the License.
   <string name="sd_unavail">SD Unavailable</string>
   <string name="speed">Speed</string>
   <string name="start_trip">You must start a trip.</string>
-  <string name="statistics">Statistics</string>
+
   <string name="total_distance_label">Total Distance</string>
   <string name="distance_label">Distance</string>
   <string name="power">Power</string>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/DeleteAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/DeleteAllTracks.java
index 2338b5b39..ff1f35fe9 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/DeleteAllTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/DeleteAllTracks.java
@@ -52,7 +52,7 @@ public class DeleteAllTracks extends Handler {
     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.are_you_sure_question));
+    builder.setTitle(context.getString(R.string.confirmation_title_are_you_sure));
     builder.setIcon(android.R.drawable.ic_dialog_alert);
     builder.setPositiveButton(context.getString(R.string.yes),
         new DialogInterface.OnClickListener() {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/DeleteTrack.java b/MyTracks/src/com/google/android/apps/mytracks/DeleteTrack.java
index bc53c8fed..a0746a9e1 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/DeleteTrack.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/DeleteTrack.java
@@ -78,7 +78,7 @@ 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.are_you_sure_question));
+    builder.setTitle(getString(R.string.confirmation_title_are_you_sure));
     builder.setIcon(android.R.drawable.ic_dialog_alert);
     builder.setPositiveButton(getString(R.string.yes), this);
     builder.setNegativeButton(getString(R.string.no), this);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
index f397e7a9f..5e04c6ba8 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
@@ -296,7 +296,7 @@ public class WaypointsList extends ListActivity
     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.are_you_sure_question));
+    builder.setTitle(getString(R.string.confirmation_title_are_you_sure));
     builder.setIcon(android.R.drawable.ic_dialog_alert);
     builder.setPositiveButton(getString(R.string.yes),
         new DialogInterface.OnClickListener() {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java b/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
index b6379eaae..8b6e83be1 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
@@ -185,13 +185,13 @@ public class SendToFusionTables implements Runnable {
 
       // Create a new table:
       progressIndicator.setProgressValue(PROGRESS_FUSION_TABLE_CREATE);
-      progressIndicator.setProgressMessage(R.string.progress_message_creating_fusiontable);
+      progressIndicator.setProgressMessage(R.string.progress_message_creating_fusion_table);
       if (!createNewTable(track) || !makeTableUnlisted()) {
         return;
       }
 
       progressIndicator.setProgressValue(PROGRESS_UPLOAD_DATA_MIN);
-      progressIndicator.setProgressMessage(R.string.progress_message_sending_fusiontables);
+      progressIndicator.setProgressMessage(R.string.progress_message_sending_fusion_tables);
 
       // Upload all of the segments of the track plus start/end markers
       if (!uploadAllTrackPoints(track, originalDescription)) {
@@ -462,7 +462,7 @@ public class SendToFusionTables implements Runnable {
       if (totalSegmentsUploaded > 1) {
         splitTrack.setName(splitTrack.getName() + " "
             + String.format(
-                context.getString(R.string.part), totalSegmentsUploaded));
+                context.getString(R.string.track_part_format), totalSegmentsUploaded));
       }
       totalSegmentsUploaded++;
       Log.d(Constants.TAG,
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java b/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java
index b19a0e6cb..84a6cb0de 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java
@@ -326,12 +326,12 @@ public class SendToMyMaps implements Runnable {
 
     // Start uploading them
     progressIndicator.setProgressMessage(
-        R.string.progress_message_sending_mymaps);
+        R.string.progress_message_sending_my_maps);
     for (Track splitTrack : splitTracks) {
       if (totalSegmentsUploaded > 1) {
         splitTrack.setName(splitTrack.getName() + " "
             + String.format(
-                context.getString(R.string.part), totalSegmentsUploaded));
+                context.getString(R.string.track_part_format), totalSegmentsUploaded));
       }
       totalSegmentsUploaded++;
       Log.d(TAG,
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
index d107b582f..f6323aba3 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
@@ -93,7 +93,7 @@ public class ImportActivity extends Activity {
         progressDialog.setIcon(android.R.drawable.ic_dialog_info);
         progressDialog.setTitle(R.string.progress_title);
         progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-        progressDialog.setMessage(getString(R.string.import_progress_message));
+        progressDialog.setMessage(getString(R.string.progress_message_import));
         return progressDialog;
       case SUCCESS_DIALOG:
         final Builder dialogBuilder = new AlertDialog.Builder(this);
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 c759e24d9..e40ef6895 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.progress_title));
     dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
-    dialog.setMessage(activity.getString(R.string.write_progress_message));
+    dialog.setMessage(activity.getString(R.string.progress_message_export));
     dialog.setIndeterminate(true);
     dialog.setOnCancelListener(dialogCancelListener);
     return dialog;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java b/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java
index 991f5d90c..a5b817dc1 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java
@@ -119,7 +119,7 @@ public class MapsFacade {
         MyMapsMapMetadata metaData = new MyMapsMapMetadata();
         metaData.setTitle(title);
         metaData.setDescription(description + " - "
-            + category + " - " + context.getString(R.string.new_map_description));
+            + category + " - " + context.getString(R.string.send_to_google_by_mytracks));
         metaData.setSearchable(isPublic);
         Entry entry = MyMapsGDataConverter.getMapEntryForMetadata(metaData);
         Log.d(MyMapsConstants.TAG, "Title: " + entry.getTitle());
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
index 712ade62f..cd60bae89 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
@@ -404,7 +404,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
     Log.d(TAG, "SendActivity.authenticateToGoogleMaps");
     progressDialog.setProgress(0);
     progressDialog.setMessage(getString(
-        R.string.progress_message_authenticating_mymaps));
+        R.string.progress_message_authenticating_my_maps));
     authenticate(Constants.AUTHENTICATE_TO_MY_MAPS, MyMapsConstants.SERVICE_NAME);
     // AUTHENTICATE_TO_MY_MAPS callback calls sendToGoogleMaps
     return SendState.NOT_READY;
@@ -480,7 +480,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
   private SendState authenticateToFusionTables() {
     progressDialog.setProgress(0);
     progressDialog.setMessage(getString(
-        R.string.progress_message_authenticating_fusiontables));
+        R.string.progress_message_authenticating_fusion_tables));
     authenticate(Constants.AUTHENTICATE_TO_FUSION_TABLES, SendToFusionTables.SERVICE_ID);
     // AUTHENTICATE_TO_FUSION_TABLES callback calls sendToFusionTables
     return SendState.NOT_READY;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java b/MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java
index a83658854..84f5bfa24 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java
@@ -51,7 +51,7 @@ class DefaultTrackNameFactory {
       SimpleDateFormat formatter = new SimpleDateFormat(TIMESTAMP_DATE_FORMAT);
       return formatter.format(new Date(startTime));
     } else {
-      return String.format(context.getString(R.string.new_track), trackId);
+      return String.format(context.getString(R.string.new_track_format), trackId);
     }
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
index 1c7cb5e9c..e74bef3e4 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
@@ -331,7 +331,7 @@ public class StringUtils implements DescriptionGenerator {
         + "<img border=\"0\" src=\"%s\"/>",
 
         // Line 1
-        context.getString(R.string.fusiontable_link),
+        context.getString(R.string.send_to_google_by_mytracks),
 
         // Line 2
         context.getString(R.string.total_distance_label),