From cf28a3378f183f9404993df98432b38c1664f349 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Tue, 8 Nov 2011 15:59:28 -0800
Subject: [PATCH] Rename and reorganize track variables in strings.xml.

---
 MyTracks/AndroidManifest.xml                  |   2 +-
 MyTracks/res/layout/mytracks_detail.xml       |  12 +-
 MyTracks/res/layout/mytracks_list.xml         |   8 +-
 MyTracks/res/values-ca/strings.xml            |  60 ++--
 MyTracks/res/values-de/strings.xml            |  60 ++--
 MyTracks/res/values-es-rES/strings.xml        |   8 +-
 MyTracks/res/values-es/strings.xml            |  64 ++--
 MyTracks/res/values-fi/strings.xml            |  64 ++--
 MyTracks/res/values-fr/strings.xml            |  52 ++-
 MyTracks/res/values-it/strings.xml            |  54 ++-
 MyTracks/res/values-ja/strings.xml            |  64 ++--
 MyTracks/res/values-pl/strings.xml            |  56 ++-
 MyTracks/res/values-pt-rBR/strings.xml        |  52 ++-
 MyTracks/res/values-ru/strings.xml            |  64 ++--
 MyTracks/res/values-sv/strings.xml            |  56 ++-
 MyTracks/res/values-zh-rCN/strings.xml        |  64 ++--
 MyTracks/res/values/strings.xml               | 334 ++++++++----------
 .../apps/mytracks/ExportAllTracks.java        |   2 +-
 .../apps/mytracks/ImportAllTracks.java        |   2 +-
 .../android/apps/mytracks/MapActivity.java    |  32 +-
 .../android/apps/mytracks/MyTracks.java       |   7 +-
 .../android/apps/mytracks/TrackList.java      |  32 +-
 .../apps/mytracks/io/SendToFusionTables.java  |   2 +-
 .../apps/mytracks/io/SendToMyMaps.java        |   2 +-
 .../services/DefaultTrackNameFactory.java     |   2 +-
 .../services/TrackRecordingService.java       |   2 +-
 26 files changed, 550 insertions(+), 607 deletions(-)

diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index f7224d9a5..c5251bab6 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -67,7 +67,7 @@ limitations under the License.
     <activity android:name="com.google.android.apps.mytracks.WaypointsList" />
 
     <activity android:name="com.google.android.apps.mytracks.TrackDetails"
-              android:label="@string/trackdetails_title">
+              android:label="@string/track_detail_title">
       <intent-filter>
         <action android:name="android.intent.action.EDIT" />
         <category android:name="android.intent.category.DEFAULT" />
diff --git a/MyTracks/res/layout/mytracks_detail.xml b/MyTracks/res/layout/mytracks_detail.xml
index db3023d8f..040015670 100644
--- a/MyTracks/res/layout/mytracks_detail.xml
+++ b/MyTracks/res/layout/mytracks_detail.xml
@@ -20,7 +20,7 @@ limitations under the License.
   android:layout_height="fill_parent"
   android:paddingTop="10dip"
   android:background="#c000">
-  <TextView android:text="@string/trackdetails_name"
+  <TextView android:text="@string/track_detail_track_name"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"/>
   <LinearLayout
@@ -41,19 +41,19 @@ limitations under the License.
       android:autoText="true"
       android:capitalize="words"
       android:selectAllOnFocus="true"
-      android:hint="@string/trackdetails_name_hint"
+      android:hint="@string/track_detail_track_name"
       android:imeOptions="actionNext"/>
   </LinearLayout>
-  <TextView android:text="@string/trackdetails_category"
+  <TextView android:text="@string/track_detail_activity_type"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"/>
   <AutoCompleteTextView android:id="@+id/trackdetails_category"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:singleLine="true"
-    android:hint="@string/trackdetails_category_hint"
+    android:hint="@string/track_detail_activity_type_hint"
     android:imeOptions="actionNext"/>
-  <TextView android:text="@string/trackdetails_description"
+  <TextView android:text="@string/track_detail_track_description"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"/>
   <EditText android:id="@+id/trackdetails_description"
@@ -66,7 +66,7 @@ limitations under the License.
     android:maxLines="50"
     android:gravity="top"
     android:layout_weight="1"
-    android:hint="@string/trackdetails_description_hint"
+    android:hint="@string/track_detail_track_description"
     android:imeOptions="actionDone"/>
   <LinearLayout style="@style/ButtonLayout">
     <LinearLayout style="@style/ButtonSpacer"/>
diff --git a/MyTracks/res/layout/mytracks_list.xml b/MyTracks/res/layout/mytracks_list.xml
index 3f3144c19..5a3bf21e9 100644
--- a/MyTracks/res/layout/mytracks_list.xml
+++ b/MyTracks/res/layout/mytracks_list.xml
@@ -32,7 +32,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:textSize="16dip"
       android:textColor="#fff"
-      android:text="@string/tracklist_pick_one"
+      android:text="@string/track_list_pick_one"
       android:layout_weight="0"/>
   </LinearLayout>
   <ListView android:id="@android:id/list"
@@ -43,15 +43,15 @@ limitations under the License.
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/tracklist_btn_import_all"
       android:layout_gravity="left"
-      android:text="@string/tracklist_btn_import_all"
+      android:text="@string/track_list_import_all"
       style="@style/Button"/>
     <Button android:id="@+id/tracklist_btn_export_all"
       android:layout_gravity="center_horizontal"
-      android:text="@string/tracklist_btn_export_all"
+      android:text="@string/track_list_export_all"
       style="@style/Button"/>
     <Button android:id="@+id/tracklist_btn_delete_all"
       android:layout_gravity="right"
-      android:text="@string/tracklist_btn_delete_all"
+      android:text="@string/track_list_delete_all"
       style="@style/Button"/>
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index dd5275339..94764bcff 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -37,7 +37,7 @@ limitations under the License.
   <string name="gps_not_found">No s\'ha trobat cap proveïdor d\'ubicació GPS en aquest dispositiu.</string>
   <string name="error_sending_to_fusion_tables">S\'ha produït un error quan s\'enviava la ruta a Google Fusion Tables. Proveu més tard.</string>
   <string name="error_sending_to_docs">S\'ha prdouït un error quan s\'enviava la ruta a Google Docs. Proveu més tard.</string>
-  <string name="track_unable_to_start_recording">No es pot iniciar l\'enregistrament. Proveu de nou.</string>
+  <string name="track_record_error">No es pot iniciar l\'enregistrament. Proveu de nou.</string>
   <string name="error_unable_to_stop_recording">No es pot aturar l\'enregistrament. Proveu de nou.</string>
   <string name="error_import_unable_to_read_file">No es pot llegir des del fitxer.</string>
   <string name="error_import_invalid_gpx_format">El fitxer no conté un format GPX vàlid.</string>
@@ -48,7 +48,7 @@ limitations under the License.
 
   <!-- Status messages -->
   <string name="gps_wait_for_fix">S\'està esperant per tenir una posició GPS fixa. Assegureu-vos que el cel és visible.</string>
-  <string name="status_now_recording">Ara s\'està enregistrant una ruta nova.</string>
+  <string name="track_record_success">Ara s\'està enregistrant una ruta nova.</string>
   <string name="status_stopped_recording">S\'ha aturat l\'enregistrament de la ruta.</string>
   <string name="sending_to_fusion_tables_success">S\'ha creat un Google Fusion Table nou a google.com/fusiontables.</string>
   <string name="sending_to_my_maps_success_existing_map">S\'ha enviat la ruta a maps.google.com.</string>
@@ -88,11 +88,11 @@ limitations under the License.
   <string name="recorded_date">Enregistrat</string>
   <string name="category">Tipus d\'activitat</string>
   <string name="waypoint_category">Tipus de marcador</string>
-  <string name="track_part_format">(Part %d)</string>
+  <string name="send_google_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_format">Ruta %d</string>
+  <string name="track_record_notification">S\'està enregistrant la ruta...</string>
+  <string name="track_name_format">Ruta %d</string>
 
   <!-- Common -->
   <string name="no">No</string>
@@ -109,32 +109,32 @@ limitations under the License.
   <string name="marker_label_end">(Fi)</string>
 
   <!--  TrackList -->
-  <string name="tracklist_show_track">Mostra</string>
+  <string name="track_list_show_on_map">Mostra</string>
   <string name="tracklist_send_to_fusiontables">Envia a Google Fusion Tables</string>
   <string name="tracklist_send_to_new_fusiontable">Envia a un Google Fusion Table nou</string>
   <string name="tracklist_send_to_docs">Envia a Google Docs</string>
-  <string name="tracklist_send_to_google">Envia a Google...</string>
-  <string name="tracklist_delete_track">Elimina del telèfon...</string>
-  <string name="tracklist_edit_track">Edita els detalls</string>
-  <string name="tracklist_write_to_sd">Escriu a la targeta SD...</string>
-  <string name="tracklist_save_as_gpx">Anomena i desa com un fitxer GPX</string>
-  <string name="tracklist_save_as_kml">Anomena i desa com un fitxer KML</string>
-  <string name="tracklist_save_as_csv">Anomena i desa com un fitxer CSV</string>
-  <string name="tracklist_save_as_tcx">Anomena i desa com un fitxer TCX</string>
+  <string name="track_list_send_google">Envia a Google...</string>
+  <string name="track_list_delete_track">Elimina del telèfon...</string>
+  <string name="track_list_edit_track">Edita els detalls</string>
+  <string name="track_list_save_sd">Escriu a la targeta SD...</string>
+  <string name="track_list_save_gpx_file">Anomena i desa com un fitxer GPX</string>
+  <string name="track_list_save_kml_file">Anomena i desa com un fitxer KML</string>
+  <string name="track_list_save_csv_file">Anomena i desa com un fitxer CSV</string>
+  <string name="track_list_save_tcx_file">Anomena i desa com un fitxer TCX</string>
   <string name="tracklist_btn_send_all_to_fusiontables">Envia a Google Fusion Tables</string>
-  <string name="tracklist_btn_delete_all">Elimina totes les rutes</string>
+  <string name="track_list_delete_all">Elimina totes les rutes</string>
   <!-- Export All -->
-  <string name="tracklist_btn_export_all">Exporta totes les rutes</string>
+  <string name="track_list_export_all">Exporta totes les rutes</string>
   <string name="export_done">Exporta les finalitzades</string>
-  <string name="tracklist_pick_one">Seleccioneu una ruta. Mantingueu el dit per veure més opcions.</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="tracklist_this_track">Aquesta ruta</string>
-  <string name="tracklist_share_track">Comparteix amb amics...</string>
-  <string name="tracklist_share_gpx_file">Un fitxer GPX</string>
-  <string name="tracklist_share_kml_file">Un fitxer KML</string>
-  <string name="tracklist_share_csv_file">Un fitxer CSV</string>
-  <string name="tracklist_share_tcx_file">Un fitxer TCX</string>
-  <string name="tracklist_clear_map">Neteja el mapa</string>
+  <string name="track_list_this_track">Aquesta ruta</string>
+  <string name="track_list_share_track">Comparteix amb amics...</string>
+  <string name="track_list_share_gpx_file">Un fitxer GPX</string>
+  <string name="track_list_share_kml_file">Un fitxer KML</string>
+  <string name="track_list_share_csv_file">Un fitxer CSV</string>
+  <string name="track_list_share_tcx_file">Un fitxer TCX</string>
+  <string name="track_list_clear_map">Neteja el mapa</string>
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Elimina tots els marcadors</string>
@@ -147,13 +147,11 @@ limitations under the License.
   <string name="marker_list_pick_one">Seleccioneu un marcador. Mantingueu el dit per veure més opcions.</string>
 
   <!-- MyTracks Details -->
-  <string name="trackdetails_title">Detalls de la ruta</string>
-  <string name="trackdetails_name">Nom de la ruta</string>
-  <string name="trackdetails_name_hint">Nom de la ruta</string>
-  <string name="trackdetails_description">Descripció de la ruta</string>
-  <string name="trackdetails_description_hint">Descripció de la ruta</string>
-  <string name="trackdetails_category">Tipus d\'activitat (p.e. senderisme, bicicleta, còrrer, escalada...)</string>
-  <string name="trackdetails_category_hint">Tipus d\'activitat</string>
+  <string name="track_detail_title">Detalls de la ruta</string>
+  <string name="track_detail_track_name">Nom de la ruta</string>
+  <string name="track_detail_track_description">Descripció de la ruta</string>
+  <string name="track_detail_activity_type">Tipus d\'activitat (p.e. senderisme, bicicleta, còrrer, escalada...)</string>
+  <string name="track_detail_activity_type_hint">Tipus d\'activitat</string>
 
   <!-- MyTracks Waypoint Details -->
   <string name="marker_detail_title">Detalls del marcador</string>
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index abf018328..582ac2d4e 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -37,7 +37,7 @@ limitations under the License.
   <string name="gps_not_found">Es wurde kein GPS-Empfänger auf diesem Gerät gefunden.</string>
   <string name="error_sending_to_fusion_tables">Beim Senden des Tracks an Google Fusion Tables ist ein Fehler aufgetreten. Bitte versuche es später noch einmal.</string>
   <string name="error_sending_to_docs">Beim Senden des Tracks an Google Text &amp; Tabellen ist ein Fehler aufgetreten. Bitte versuche es später noch einmal.</string>
-  <string name="track_unable_to_start_recording">Start der Aufzeichnung fehlgeschlagen. Bitte versuche es noch einmal.</string>
+  <string name="track_record_error">Start der Aufzeichnung fehlgeschlagen. Bitte versuche es noch einmal.</string>
   <string name="error_unable_to_stop_recording">Anhalten unmöglich. Bitte versuche es noch einmal.</string>
   <string name="error_import_unable_to_read_file">Konnte Datei nicht lesen.</string>
   <string name="error_import_invalid_gpx_format">Datei ist nicht im GPX-Format.</string>
@@ -48,7 +48,7 @@ limitations under the License.
 
   <!-- Status messages -->
   <string name="gps_wait_for_fix">Warte auf ein besseres GPS-Signal. Bitte stelle sicher, dass der Himmel sichtbar ist.</string>
-  <string name="status_now_recording">Ein neuer Track wird aufgezeichnet.</string>
+  <string name="track_record_success">Ein neuer Track wird aufgezeichnet.</string>
   <string name="status_stopped_recording">Die Aufzeichnung wurde angehalten.</string>
   <string name="sending_to_fusion_tables_success">Eine neue Tabelle wurde auf google.com/fusiontables erstellt.</string>
   <string name="sending_to_my_maps_success_existing_map">Dein Track wurde auf maps.google.com gespeichert.</string>
@@ -89,11 +89,11 @@ limitations under the License.
   <string name="recorded_date">Aufgezeichnet am</string>
   <string name="category">Aktivität</string>
   <string name="waypoint_category">Art des Wegpunktes</string>
-  <string name="track_part_format">(Teil %d)</string>
+  <string name="send_google_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_format">Track %d</string-->
+  <string name="track_record_notification">Dein Track wird aufgezeichnet…</string>
+  <!--string name="track_name_format">Track %d</string-->
 
   <!-- Common -->
   <string name="no">Nein</string>
@@ -111,33 +111,33 @@ limitations under the License.
   <string name="marker_label_end">(Ende)</string>
 
   <!--  TrackList -->
-  <string name="tracklist_show_track">Anzeigen</string>
+  <string name="track_list_show_on_map">Anzeigen</string>
   <string name="tracklist_send_to_fusiontables">An eine Google Fusion Tables-Karte senden</string>
   <string name="tracklist_send_to_new_fusiontable">An eine neue Google Fusion Tables-Karte senden</string>
   <string name="tracklist_send_to_docs">An Google Text &amp; Tabellen senden</string>
-  <string name="tracklist_send_to_google">An Google senden…</string>
-  <string name="tracklist_delete_track">Vom Gerät löschen…</string>
-  <string name="tracklist_edit_track">Bearbeiten</string>
-  <string name="tracklist_write_to_sd">Auf SD-Karte speichern…</string>
-  <string name="tracklist_save_as_gpx">GPX-Datei exportieren</string>
-  <string name="tracklist_save_as_kml">KML-Datei exportieren</string>
-  <string name="tracklist_save_as_csv">CSV-Datei exportieren</string>
-  <string name="tracklist_save_as_tcx">TCX-Datei exportieren</string>
+  <string name="track_list_send_google">An Google senden…</string>
+  <string name="track_list_delete_track">Vom Gerät löschen…</string>
+  <string name="track_list_edit_track">Bearbeiten</string>
+  <string name="track_list_save_sd">Auf SD-Karte speichern…</string>
+  <string name="track_list_save_gpx_file">GPX-Datei exportieren</string>
+  <string name="track_list_save_kml_file">KML-Datei exportieren</string>
+  <string name="track_list_save_csv_file">CSV-Datei exportieren</string>
+  <string name="track_list_save_tcx_file">TCX-Datei exportieren</string>
   <string name="tracklist_btn_send_all_to_fusiontables">An Google Fusion Tables senden</string>
-  <string name="tracklist_btn_delete_all">Alle Tracks löschen</string>
+  <string name="track_list_delete_all">Alle Tracks löschen</string>
   <!-- Export All -->
-  <string name="tracklist_btn_export_all">Alle Tracks exportieren</string>
+  <string name="track_list_export_all">Alle Tracks exportieren</string>
   <string name="export_done">Exportieren beendet</string>
-  <string name="tracklist_pick_one">Einen Track auswählen. Lange berühren für mehr Optionen.</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="tracklist_this_track">Dieser Track</string>
-  <string name="tracklist_share_track">Mit Freunden teilen…</string>
+  <string name="track_list_this_track">Dieser Track</string>
+  <string name="track_list_share_track">Mit Freunden teilen…</string>
   <string name="tracklist_share_linkfusion">Ein Link zur Google Fusion Tables-Karte</string>
-  <string name="tracklist_share_gpx_file">Eine GPX-Datei</string>
-  <string name="tracklist_share_kml_file">Eine KML-Datei</string>
-  <string name="tracklist_share_csv_file">Eine CSV-Datei</string>
-  <string name="tracklist_share_tcx_file">Eine TCX-Datei</string>
-  <string name="tracklist_clear_map">Karte zurücksetzen.</string>
+  <string name="track_list_share_gpx_file">Eine GPX-Datei</string>
+  <string name="track_list_share_kml_file">Eine KML-Datei</string>
+  <string name="track_list_share_csv_file">Eine CSV-Datei</string>
+  <string name="track_list_share_tcx_file">Eine TCX-Datei</string>
+  <string name="track_list_clear_map">Karte zurücksetzen.</string>
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Alle Wegpunkte löschen</string>
@@ -150,13 +150,11 @@ limitations under the License.
   <string name="marker_list_pick_one">Wegpunkt auswählen. Lange berühren für mehr Optionen.</string>
 
   <!-- MyTracks Details -->
-  <string name="trackdetails_title">Trackdetails</string>
-  <string name="trackdetails_name">Name</string>
-  <string name="trackdetails_name_hint">Name</string>
-  <string name="trackdetails_description">Beschreibung</string>
-  <string name="trackdetails_description_hint">Beschreibung</string>
-  <string name="trackdetails_category">Aktivität (z. B. Wandern, Fahrradfahren, Laufen, Klettern…)</string>
-  <string name="trackdetails_category_hint">Aktivität</string>
+  <string name="track_detail_title">Trackdetails</string>
+  <string name="track_detail_track_name">Name</string>
+  <string name="track_detail_track_description">Beschreibung</string>
+  <string name="track_detail_activity_type">Aktivität (z. B. Wandern, Fahrradfahren, Laufen, Klettern…)</string>
+  <string name="track_detail_activity_type_hint">Aktivität</string>
 
   <!-- MyTracks Waypoint Details -->
   <string name="marker_detail_title">Wegpunktdetails</string>
diff --git a/MyTracks/res/values-es-rES/strings.xml b/MyTracks/res/values-es-rES/strings.xml
index adcd0c7b9..abfc89081 100644
--- a/MyTracks/res/values-es-rES/strings.xml
+++ b/MyTracks/res/values-es-rES/strings.xml
@@ -41,12 +41,12 @@ limitations under the License.
   <!--  TrackList -->
   <string name="tracklist_send_to_fusiontables">Enviar a Google Fusion Tables</string>
   <string name="tracklist_send_to_new_fusiontable">Enviar a nueva Google Fusion Table</string>
-  <string name="tracklist_save_as_csv">Guardar en archivo CSV</string>
-  <string name="tracklist_save_as_tcx">Guardar en archivo TCX</string>
+  <string name="track_list_save_csv_file">Guardar en archivo CSV</string>
+  <string name="track_list_save_tcx_file">Guardar en archivo TCX</string>
   <string name="tracklist_btn_send_all_to_fusiontables">Enviar a Google Fusion Tables</string>
   <!-- Export All -->
-  <string name="tracklist_share_csv_file">Un archivo CSV</string>
-  <string name="tracklist_share_tcx_file">Un archivo TCX</string>
+  <string name="track_list_share_csv_file">Un archivo CSV</string>
+  <string name="track_list_share_tcx_file">Un archivo TCX</string>
 
   <!-- Waypoints list -->
 
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index 31eab24a1..7a5ac72d5 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -39,7 +39,7 @@ limitations under the License.
   <string name="error_sending_to_fusion_tables">Se produjo un error al enviar su recorrido a Google Fusion Tables.</string>
   <string name="error_sending_to_docs">Se produjo un error al enviar su recorrido a Google Docs.</string>
   <string name="error_sending_generic">Por favor, inténtelo de nuevo mas tarde.</string>
-  <string name="track_unable_to_start_recording">No se puede iniciar la grabación. Inténtelo de nuevo. </string>
+  <string name="track_record_error">No se puede iniciar la grabación. Inténtelo de nuevo. </string>
   <string name="error_unable_to_stop_recording">No se puede detener la grabación. Inténtelo de nuevo.</string>
   <string name="error_import_unable_to_read_file">No pude leer del archivo.</string>
   <string name="error_import_invalid_gpx_format">El archivo no tiene un format GPX válido.</string>
@@ -51,7 +51,7 @@ limitations under the License.
 
   <!-- Status messages -->
   <string name="gps_wait_for_fix">Esperando una ubicación mas exacta del GPS. Asegúrese que el cielo sea visible.</string>
-  <string name="status_now_recording">Grabando un nuevo recorrido.</string>
+  <string name="track_record_success">Grabando un nuevo recorrido.</string>
   <string name="status_stopped_recording">Grabación interrumpida.</string>
   <string name="sending_to_my_maps_success_new_map">Un nuevo sitio ha sido añadido en maps.google.com.</string>
   <string name="sending_to_fusion_tables_success">Una nueva tabla de Google Fusion ha sido creada en google.com/fusiontables.</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="track_part_format">"(Parte %d)"</string>
+  <string name="send_google_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_format">Recorrido %d</string>
+  <string name="track_record_notification">Grabando su recorrido...</string>
+  <string name="track_name_format">Recorrido %d</string>
 
   <!-- Common -->
   <string name="yes">Sí</string>
@@ -122,40 +122,40 @@ limitations under the License.
   <string name="marker_label_end">(Fin)</string>
 
   <!--  TrackList -->
-  <string name="tracklist_show_track">Mostrar</string>
+  <string name="track_list_show_on_map">Mostrar</string>
   <string name="tracklist_send_to_mymaps">Enviar a Google Mis Sitios</string>
   <string name="tracklist_send_to_new_mymap">Enviar a nuevo Google Mis Sitios</string>
   <string name="tracklist_send_to_fusiontables">Enviar a Google Fusion Tables</string>
   <string name="tracklist_send_to_new_fusiontable">Enviar a nueva Google Fusion Table</string>
   <string name="tracklist_send_to_docs">Enviar a Google Docs</string>
-  <string name="tracklist_send_to_google">Enviar a Google...</string>
-  <string name="tracklist_delete_track">Borrar del teléfono...</string>
-  <string name="tracklist_edit_track">Editar detalles</string>
-  <string name="tracklist_write_to_sd">Guardar en tarjeta SD...</string>
-  <string name="tracklist_save_as_gpx">Guardar en archivo GPX</string>
-  <string name="tracklist_save_as_kml">Guardar en archivo KML</string>
-  <string name="tracklist_save_as_csv">Guardar en archivo CSV</string>
-  <string name="tracklist_save_as_tcx">Guardar en archivo TCX</string>
+  <string name="track_list_send_google">Enviar a Google...</string>
+  <string name="track_list_delete_track">Borrar del teléfono...</string>
+  <string name="track_list_edit_track">Editar detalles</string>
+  <string name="track_list_save_sd">Guardar en tarjeta SD...</string>
+  <string name="track_list_save_gpx_file">Guardar en archivo GPX</string>
+  <string name="track_list_save_kml_file">Guardar en archivo KML</string>
+  <string name="track_list_save_csv_file">Guardar en archivo CSV</string>
+  <string name="track_list_save_tcx_file">Guardar en archivo TCX</string>
   <string name="tracklist_btn_send_all_to_fusiontables">Enviar a Google Fusion Tables</string>
   <string name="tracklist_btn_send_all_to_mymaps">Enviar a Google Mis Sitios</string>
-  <string name="tracklist_btn_delete_all">Borrar todos</string>
+  <string name="track_list_delete_all">Borrar todos</string>
   
   <!-- Export All -->
-  <string name="tracklist_btn_export_all">Exportar todos</string>
+  <string name="track_list_export_all">Exportar todos</string>
   <string name="export_done">Exportación concluída</string>
-  <string name="tracklist_pick_one">Escoja un recorrido. Presione&amp;mantenga presionado para ver más opciones.</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="tracklist_this_track">Este recorrido"</string>
-  <string name="tracklist_share_track">Compartir con amigos..."</string>
-  <string name="tracklist_share_link">Un enlace al mapa</string>
-  <string name="tracklist_share_gpx_file">Un archivo GPX"</string>
-  <string name="tracklist_share_kml_file">Un archivo KML"</string>
-  <string name="tracklist_share_csv_file">Un archivo CSV</string>
-  <string name="tracklist_share_tcx_file">Un archivo TCX</string>
-  <string name="tracklist_clear_map">"Limpiar mapa"</string>
+  <string name="track_list_this_track">Este recorrido"</string>
+  <string name="track_list_share_track">Compartir con amigos..."</string>
+  <string name="track_list_share_url">Un enlace al mapa</string>
+  <string name="track_list_share_gpx_file">Un archivo GPX"</string>
+  <string name="track_list_share_kml_file">Un archivo KML"</string>
+  <string name="track_list_share_csv_file">Un archivo CSV</string>
+  <string name="track_list_share_tcx_file">Un archivo TCX</string>
+  <string name="track_list_clear_map">"Limpiar mapa"</string>
 
   <!-- Import All -->
-  <string name="tracklist_btn_import_all">Importar todos</string>
+  <string name="track_list_import_all">Importar todos</string>
     <!-- Format:
   $1 : Successful imports
   $2 : Attempted imports
@@ -179,13 +179,11 @@ limitations under the License.
   <string name="marker_list_pick_one">Escoja un marcador. Presione&amp; mantenga presionado para ver más opciones.</string>
 
   <!-- MyTracks Details -->
-  <string name="trackdetails_title">Detalles del recorrido</string>
-  <string name="trackdetails_name">Nombre del recorrido</string>
-  <string name="trackdetails_name_hint">Nombre del recorrido</string>
-  <string name="trackdetails_description">Descripción del recorrido</string>
-  <string name="trackdetails_description_hint">Descripción del recorrido</string>
-  <string name="trackdetails_category">Tipo de actividad (por ejemplo, ciclismo, alpinismo...)</string>
-  <string name="trackdetails_category_hint">Tipo de actividad</string>
+  <string name="track_detail_title">Detalles del recorrido</string>
+  <string name="track_detail_track_name">Nombre del recorrido</string>
+  <string name="track_detail_track_description">Descripción del recorrido</string>
+  <string name="track_detail_activity_type">Tipo de actividad (por ejemplo, ciclismo, alpinismo...)</string>
+  <string name="track_detail_activity_type_hint">Tipo de actividad</string>
 
   <!-- MyTracks Waypoint Details -->
   <string name="marker_detail_title">Detalles de señal</string>
diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml
index 6fa9dcbef..21907cd51 100644
--- a/MyTracks/res/values-fi/strings.xml
+++ b/MyTracks/res/values-fi/strings.xml
@@ -39,7 +39,7 @@ limitations under the License.
   <string name="error_sending_to_fusion_tables">Virhe lähetettäessä reittiä Google Fusion Tables-palveluun.</string>
   <string name="error_sending_to_docs">Virhe lähetettäessä reittiä Google Docs-palveluun..</string>
   <string name="error_sending_generic">Yritä myöhemmin uudelleen.</string>
-  <string name="track_unable_to_start_recording">Tallennusta ei voitu aloittaa. Yritä uudelleen.</string>
+  <string name="track_record_error">Tallennusta ei voitu aloittaa. Yritä uudelleen.</string>
   <string name="error_unable_to_stop_recording">Tallennusta ei voitu pysäyttää. Yritä uudelleen.</string>
   <string name="error_import_unable_to_read_file">Tiedostovirhe.</string>
   <string name="error_import_invalid_gpx_format">Virheellinen GPX-formaatti.</string>
@@ -51,7 +51,7 @@ limitations under the License.
 
   <!-- Status messages -->
   <string name="gps_wait_for_fix">Odotetaan parempaa GPS-yhteyttä. Varmista että taivas on näkyvissä.</string>
-  <string name="status_now_recording">Tallennetaan uutta reittiä.</string>
+  <string name="track_record_success">Tallennetaan uutta reittiä.</string>
   <string name="status_stopped_recording">Reitin tallentaminen lopetettiin.</string>
   <string name="sending_to_my_maps_success_new_map">Uusi Google My Map on luotu osoitteeseen maps.google.com.</string>
   <string name="sending_to_fusion_tables_success">Uusi Google Fusion taulukko on luotu osoitteeseen google.com/fusiontables.</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="track_part_format">(Osa %d)</string>
+  <string name="send_google_track_part_format">(Osa %d)</string>
 
   <!-- Used by the track recording service -->
-  <string name="recording_your_track">Tallennetaan reittiä...</string>
-  <string name="new_track_format">Reitti %d</string>
+  <string name="track_record_notification">Tallennetaan reittiä...</string>
+  <string name="track_name_format">Reitti %d</string>
 
   <!-- Common -->
   <string name="no">Ei</string>
@@ -124,38 +124,38 @@ limitations under the License.
   <string name="marker_label_end">(Maali)</string>
 
   <!--  TrackList -->
-  <string name="tracklist_show_track">Näytä</string>
+  <string name="track_list_show_on_map">Näytä</string>
   <string name="tracklist_send_to_mymaps">Lähetä Google My Mapsiin</string>
   <string name="tracklist_send_to_new_mymap">Lähetä New Google My Mapiin</string>
   <string name="tracklist_send_to_fusiontables">Lähetä Google Fusion Tablesiin</string>
   <string name="tracklist_send_to_new_fusiontable">Lähetä New Google Fusion Tablesiin</string>
   <string name="tracklist_send_to_docs">Lähetä Google Docsiin</string>
-  <string name="tracklist_send_to_google">Lähetä Googleen...</string>
-  <string name="tracklist_delete_track">Poista puhelimesta...</string>
-  <string name="tracklist_edit_track">Muokkaa tietoja...</string>
-  <string name="tracklist_write_to_sd">Kirjoita SD-kortille...</string>
-  <string name="tracklist_save_as_gpx">Tallenna GPX-tiedosto</string>
-  <string name="tracklist_save_as_kml">Tallenna KML-tiedosto</string>
-  <string name="tracklist_save_as_csv">Tallenna CSV-tiedosto</string>
-  <string name="tracklist_save_as_tcx">Tallenna TCX-tiedosto</string>
+  <string name="track_list_send_google">Lähetä Googleen...</string>
+  <string name="track_list_delete_track">Poista puhelimesta...</string>
+  <string name="track_list_edit_track">Muokkaa tietoja...</string>
+  <string name="track_list_save_sd">Kirjoita SD-kortille...</string>
+  <string name="track_list_save_gpx_file">Tallenna GPX-tiedosto</string>
+  <string name="track_list_save_kml_file">Tallenna KML-tiedosto</string>
+  <string name="track_list_save_csv_file">Tallenna CSV-tiedosto</string>
+  <string name="track_list_save_tcx_file">Tallenna TCX-tiedosto</string>
   <string name="tracklist_btn_send_all_to_fusiontables">Lähetä Google Fusion Tablesiin</string>
   <string name="tracklist_btn_send_all_to_mymaps">Lähetä Google My Mapsiin</string>
-  <string name="tracklist_btn_delete_all">Poista kaikki</string>
+  <string name="track_list_delete_all">Poista kaikki</string>
   <!-- Export All -->
-  <string name="tracklist_btn_export_all">Vie kaikki</string>
+  <string name="track_list_export_all">Vie kaikki</string>
   <string name="export_done">Vienti tehty</string>
-  <string name="tracklist_pick_one">Valitse reitti. Pitkällä painalluksella lisää vaihtoehtoja.</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="tracklist_this_track">Tämä reitti</string>
-  <string name="tracklist_share_track">Jaa...</string>
-  <string name="tracklist_share_link">Linkki karttaan</string>
-  <string name="tracklist_share_gpx_file">GPX-tiedosto</string>
-  <string name="tracklist_share_kml_file">KML-tiedosto</string>
-  <string name="tracklist_share_csv_file">CSV-tiedosto</string>
-  <string name="tracklist_share_tcx_file">TCX-tiedosto</string>
-  <string name="tracklist_clear_map">Tyhjennä kartta</string>
+  <string name="track_list_this_track">Tämä reitti</string>
+  <string name="track_list_share_track">Jaa...</string>
+  <string name="track_list_share_url">Linkki karttaan</string>
+  <string name="track_list_share_gpx_file">GPX-tiedosto</string>
+  <string name="track_list_share_kml_file">KML-tiedosto</string>
+  <string name="track_list_share_csv_file">CSV-tiedosto</string>
+  <string name="track_list_share_tcx_file">TCX-tiedosto</string>
+  <string name="track_list_clear_map">Tyhjennä kartta</string>
   <!-- Import All -->
-  <string name="tracklist_btn_import_all">Tuo kaikki</string>
+  <string name="track_list_import_all">Tuo kaikki</string>
   <!-- Format:
   $1 : Successful imports
   $2 : Attempted imports
@@ -179,13 +179,11 @@ limitations under the License.
   <string name="marker_list_pick_one">Valitse merkintä. Pitkä painallus tuo esiin lisää vaihtoehtoja.</string>
 
   <!-- MyTracks Details -->
-  <string name="trackdetails_title">Reitin tiedot</string>
-  <string name="trackdetails_name">Reitin nimi</string>
-  <string name="trackdetails_name_hint">Reitin nimi</string>
-  <string name="trackdetails_description">Reitin kuvaus</string>
-  <string name="trackdetails_description_hint">Reitin kuvaus</string>
-  <string name="trackdetails_category">Liikunnan muoto (esim. hölkkä, pyöräily, juoksu...)</string>
-  <string name="trackdetails_category_hint">Liikunnan muoto</string>
+  <string name="track_detail_title">Reitin tiedot</string>
+  <string name="track_detail_track_name">Reitin nimi</string>
+  <string name="track_detail_track_description">Reitin kuvaus</string>
+  <string name="track_detail_activity_type">Liikunnan muoto (esim. hölkkä, pyöräily, juoksu...)</string>
+  <string name="track_detail_activity_type_hint">Liikunnan muoto</string>
 
   <!-- MyTracks Waypoint Details -->
   <string name="marker_detail_title">Merkinnän tiedot</string>
diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml
index 2df0d3331..e5a0bfd70 100644
--- a/MyTracks/res/values-fr/strings.xml
+++ b/MyTracks/res/values-fr/strings.xml
@@ -38,7 +38,7 @@ limitations under the License.
   <string name="gps_not_found">Aucune source GPS de localisation n\'a été trouvée sur ce système.</string>
   <string name="error_sending_to_fusion_tables">Il y a eu une erreur lors de l\'envoi de votre parcours à Google Fusion Tables. Réessayez plus tard SVP.</string>
   <string name="error_sending_to_docs">Il y a eu une erreur lors de l\'envoi de votre parcours à Google Docs. Réessayez plus tard SVP.</string>
-  <string name="track_unable_to_start_recording">Impossible de débuter l\'enregistrement. Réessayez.</string>
+  <string name="track_record_error">Impossible de débuter l\'enregistrement. Réessayez.</string>
   <string name="error_unable_to_stop_recording">Impossible de stopper l\'enregistrement. Réessayez.</string>
   <string name="error_import_unable_to_read_file">Impossible de lire le fichier.</string>
   <string name="error_import_invalid_gpx_format">Le fichier n\'a pas un format GPX valide.</string>
@@ -49,7 +49,7 @@ limitations under the License.
 
   <!-- Status messages -->
   <string name="gps_wait_for_fix">Attente du signal GPS. Assurez-vous que le ciel est bien visible.</string>
-  <string name="status_now_recording">Parcours en cours d\'enregistrement.</string>
+  <string name="track_record_success">Parcours en cours d\'enregistrement.</string>
   <string name="status_stopped_recording">Enregistrement du parcours terminé.</string>
   <string name="sending_to_fusion_tables_success">Une nouvelle table Google Fusion vient d\'être créée sur google.com/fusiontables.</string>
   <string name="sending_to_my_maps_success_existing_map">Votre parcours a été envoyé à maps.google.com.</string>
@@ -89,11 +89,11 @@ limitations under the License.
   <string name="recorded_date">Enregistré</string>
   <string name="category">Type d\'activité</string>
   <string name="waypoint_category">Type de balise</string>
-  <string name="track_part_format">(Portion %d)</string>
+  <string name="send_google_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_format">Parcours %d</string>
+  <string name="track_record_notification">Enregistrement de votre parcours...</string>
+  <string name="track_name_format">Parcours %d</string>
 
   <!-- Common -->
   <string name="no">Non</string>
@@ -108,26 +108,26 @@ limitations under the License.
   <string name="marker_label_end">(Fin)</string>
 
   <!--  TrackList -->
-  <string name="tracklist_show_track">Afficher</string>
+  <string name="track_list_show_on_map">Afficher</string>
   <string name="tracklist_send_to_fusiontables">Envoyer à Google Fusion Tables</string>
   <string name="tracklist_send_to_new_fusiontable">Envoyer et créer un nouvelle table Google Fusion Tables</string>
   <string name="tracklist_send_to_docs">Envoyer à Google Docs</string>
-  <string name="tracklist_send_to_google">Envoyer à Google...</string>
-  <string name="tracklist_delete_track">Effacer du téléphone...</string>
-  <string name="tracklist_edit_track">Consulter les détails</string>
-  <string name="tracklist_write_to_sd">Enregistrer sur la carte SD...</string>
-  <string name="tracklist_save_as_gpx">Enregistrer en fichier GPX </string>
-  <string name="tracklist_save_as_kml">Enregistrer en fichier KML</string>
+  <string name="track_list_send_google">Envoyer à Google...</string>
+  <string name="track_list_delete_track">Effacer du téléphone...</string>
+  <string name="track_list_edit_track">Consulter les détails</string>
+  <string name="track_list_save_sd">Enregistrer sur la carte SD...</string>
+  <string name="track_list_save_gpx_file">Enregistrer en fichier GPX </string>
+  <string name="track_list_save_kml_file">Enregistrer en fichier KML</string>
   <string name="tracklist_btn_send_all_to_fusiontables">Envoyer à Google Fusion Tables</string>
-  <string name="tracklist_btn_export_all">Exporter tous les parcours</string>
-  <string name="tracklist_btn_delete_all">Tout supprimer</string>
-  <string name="tracklist_pick_one">Choisissez un parcours. Faites un appui prolongé pour plus d\'options.</string>
+  <string name="track_list_export_all">Exporter tous les parcours</string>
+  <string name="track_list_delete_all">Tout supprimer</string>
+  <string name="track_list_pick_one">Choisissez un parcours. Faites un appui prolongé pour plus d\'options.</string>
   <string name="tracklist_all_tracks">Tous les parcours:</string>
-  <string name="tracklist_this_track">Ce parcours</string>
-  <string name="tracklist_share_track">Partager...</string>
-  <string name="tracklist_share_gpx_file">Fichier GPX</string>
-  <string name="tracklist_share_kml_file">Fichier KML</string>
-  <string name="tracklist_clear_map">Effacer la carte</string>
+  <string name="track_list_this_track">Ce parcours</string>
+  <string name="track_list_share_track">Partager...</string>
+  <string name="track_list_share_gpx_file">Fichier GPX</string>
+  <string name="track_list_share_kml_file">Fichier KML</string>
+  <string name="track_list_clear_map">Effacer la carte</string>
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Supprimer toutes les balises</string>
@@ -140,13 +140,11 @@ limitations under the License.
   <string name="marker_list_pick_one">Choisissez une balise. Faites un appui prolongé pour plus d\'options.</string>
 
   <!-- MyTracks Details -->
-  <string name="trackdetails_title">Détails parcours</string>
-  <string name="trackdetails_name">Nom du parcours</string>
-  <string name="trackdetails_name_hint">Nom du parcours</string>
-  <string name="trackdetails_description">Description du parcours</string>
-  <string name="trackdetails_description_hint">Description du parcours</string>
-  <string name="trackdetails_category">Type d\'activité (randonnée, cyclisme, jogging, escalade...)</string>
-  <string name="trackdetails_category_hint">Type d\'activité</string>
+  <string name="track_detail_title">Détails parcours</string>
+  <string name="track_detail_track_name">Nom du parcours</string>
+  <string name="track_detail_track_description">Description du parcours</string>
+  <string name="track_detail_activity_type">Type d\'activité (randonnée, cyclisme, jogging, escalade...)</string>
+  <string name="track_detail_activity_type_hint">Type d\'activité</string>
 
   <!-- MyTracks Waypoint Details -->
   <string name="marker_detail_title">Details balise</string>
diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml
index e160ef0dc..028086c4a 100644
--- a/MyTracks/res/values-it/strings.xml
+++ b/MyTracks/res/values-it/strings.xml
@@ -35,7 +35,7 @@ limitations under the License.
   <string name="gps_not_found">Nessuna fonte di posizione GPS trovata su questo dispositivo.</string>
   <string name="error_sending_to_fusion_tables">Si è verificato un errore nell\'invio del percorso a Google Fusion Tables. Per favore riprova più tardi.</string>
   <string name="error_sending_to_docs">Si è verificato un errore nell\'invio del percorso a Google Docs. Per favore riporva più tardi.</string>
-  <string name="track_unable_to_start_recording">Impossibile iniziare la registrazione. Riprova.</string>
+  <string name="track_record_error">Impossibile iniziare la registrazione. Riprova.</string>
   <string name="error_unable_to_stop_recording">Impossibile fermare la registrazione. Riprova.</string>
   <string name="error_import_unable_to_read_file">Impossibile leggere da un file.</string>
   <string name="error_import_invalid_gpx_format">Il file non contiene dati validi in formato GPX.</string>
@@ -46,7 +46,7 @@ limitations under the License.
 
   <!-- Status messages -->
   <string name="gps_wait_for_fix">Sto aspettando il fix del GPS. Accertati che il cielo sia visibile.</string>
-  <string name="status_now_recording">Sto registrando un nuovo percorso.</string>
+  <string name="track_record_success">Sto registrando un nuovo percorso.</string>
   <string name="status_stopped_recording">Registrazione del percorso terminata.</string>
   <!-- <string name="sending_to_fusion_tables_success">Una nuova mappa è stata creata in «Le mie mappe» su maps.google.com.</string> -->
   <string name="sending_to_my_maps_success_existing_map">Il tuo percorso è stato inviato a maps.google.com.</string>
@@ -87,11 +87,11 @@ limitations under the License.
   <string name="recorded_date">Registrato</string>
   <string name="category">Tipo di attività</string>
   <string name="waypoint_category">Tipo di segnaposto</string>
-  <string name="track_part_format">(Parte %d)</string>
+  <string name="send_google_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_format">Percorso %d</string>
+  <string name="track_record_notification">Registrazione del percorso in corso...</string>
+  <string name="track_name_format">Percorso %d</string>
 
   <!-- Common -->
   <string name="no">No</string>
@@ -108,29 +108,29 @@ limitations under the License.
   <string name="marker_label_end">(Fine)</string>
 
   <!--  TrackList -->
-  <string name="tracklist_show_track">Mostra</string>
+  <string name="track_list_show_on_map">Mostra</string>
   <!-- <string name="tracklist_send_to_fusiontables">Invia a «Le mie mappe» di Google</string> -->
   <!-- <string name="tracklist_send_to_new_fusiontable">Invia a nuova mappa in «Le mie mappe» di Google</string>  -->
   <string name="tracklist_send_to_docs">Invia a Google Docs</string>
-  <string name="tracklist_send_to_google">Invia a Google...</string>
-  <string name="tracklist_delete_track">Elimina dal telefono...</string>
-  <string name="tracklist_edit_track">Modifica dettagli</string>
-  <string name="tracklist_write_to_sd">Salva su scheda SD...</string>
-  <string name="tracklist_save_as_gpx">Salva in un file GPX</string>
-  <string name="tracklist_save_as_kml">Salva in un file KML</string>
+  <string name="track_list_send_google">Invia a Google...</string>
+  <string name="track_list_delete_track">Elimina dal telefono...</string>
+  <string name="track_list_edit_track">Modifica dettagli</string>
+  <string name="track_list_save_sd">Salva su scheda SD...</string>
+  <string name="track_list_save_gpx_file">Salva in un file GPX</string>
+  <string name="track_list_save_kml_file">Salva in un file KML</string>
   <!-- <string name="tracklist_btn_send_all_to_fusiontables">Invia a «Le mie mappe» di Google</string> -->
-  <string name="tracklist_btn_delete_all">Elimina tutti i percorsi</string>
+  <string name="track_list_delete_all">Elimina tutti i percorsi</string>
   <!-- Export All -->
-  <string name="tracklist_btn_export_all">Esporta tutti i percorsi</string>
+  <string name="track_list_export_all">Esporta tutti i percorsi</string>
   <string name="export_done">Esportazione terminata.</string>
-  <string name="tracklist_pick_one">Scegli un percorso. Tieni premuto per più opzioni.</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="tracklist_this_track">Questo percorso</string>
-  <string name="tracklist_share_track">Condividi con amici...</string>
-  <string name="tracklist_share_link">Un link alla mappa</string>
-  <string name="tracklist_share_gpx_file">Un file GPX</string>
-  <string name="tracklist_share_kml_file">Un file KML</string>
-  <string name="tracklist_clear_map">Cancella la mappa</string>
+  <string name="track_list_this_track">Questo percorso</string>
+  <string name="track_list_share_track">Condividi con amici...</string>
+  <string name="track_list_share_url">Un link alla mappa</string>
+  <string name="track_list_share_gpx_file">Un file GPX</string>
+  <string name="track_list_share_kml_file">Un file KML</string>
+  <string name="track_list_clear_map">Cancella la mappa</string>
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Elimina tutti i segnaposti</string>
@@ -143,13 +143,11 @@ limitations under the License.
   <string name="marker_list_pick_one">Scegli un segnaposto. Tieni premuto per più opzioni.</string>
 
   <!-- MyTracks Details -->
-  <string name="trackdetails_title">Dettagli del percorso</string>
-  <string name="trackdetails_name">Nome del percorso</string>
-  <string name="trackdetails_name_hint">Nome del percorso</string>
-  <string name="trackdetails_description">Descrizione del percorso</string>
-  <string name="trackdetails_description_hint">Descrizione del percorso</string>
-  <string name="trackdetails_category">Tipo di attività (ad es. escursionismo, ciclismo, corsa, arrampicata...)</string>
-  <string name="trackdetails_category_hint">Tipo di attività</string>
+  <string name="track_detail_title">Dettagli del percorso</string>
+  <string name="track_detail_track_name">Nome del percorso</string>
+  <string name="track_detail_track_description">Descrizione del percorso</string>
+  <string name="track_detail_activity_type">Tipo di attività (ad es. escursionismo, ciclismo, corsa, arrampicata...)</string>
+  <string name="track_detail_activity_type_hint">Tipo di attività</string>
 
   <!-- MyTracks Waypoint Details -->
   <string name="marker_detail_title">Dettagli sul segnaposto</string>
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index b698aa530..0207510ff 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -38,7 +38,7 @@ limitations under the License.
   <string name="error_sending_to_my_maps">Googleマイマップへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
   <string name="error_sending_to_fusion_tables">Google Fusion Tablesへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
   <string name="error_sending_to_docs">Google Docsへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
-  <string name="track_unable_to_start_recording">記録作成開始できません．もう一度試して下さい．</string>
+  <string name="track_record_error">記録作成開始できません．もう一度試して下さい．</string>
   <string name="error_unable_to_stop_recording">記録停止できません．もう一度試して下さい．</string>
   <string name="error_import_unable_to_read_file">ファイルからの読み込みができません．</string>
   <string name="error_import_invalid_gpx_format">ファイルは正しいGPX書式ではありませんでした．</string>
@@ -49,7 +49,7 @@ limitations under the License.
 
   <!-- Status messages -->
   <string name="gps_wait_for_fix">GPS位置精度がよくなるまで待機しています．空が見えるところにいて下さい．</string>
-  <string name="status_now_recording">新しいトラックを記録中です．</string>
+  <string name="track_record_success">新しいトラックを記録中です．</string>
   <string name="status_stopped_recording">トラック記録を停止しました．</string>
   <string name="sending_to_my_maps_success_new_map">新しいマイマップをmap.google.comに作成しました．</string>
   <string name="sending_to_fusion_tables_success">新しいGoogle Fusion Tableをgoogle.com/fusiontablesに作成しました．</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="track_part_format">(パート %d)</string>
+  <string name="send_google_track_part_format">(パート %d)</string>
 
   <!-- Used by the track recording service -->
-  <string name="recording_your_track">トラックを保存中...</string>
-  <string name="new_track_format">トラック %d</string>
+  <string name="track_record_notification">トラックを保存中...</string>
+  <string name="track_name_format">トラック %d</string>
 
   <!-- Common -->
   <string name="no">いいえ</string>
@@ -120,38 +120,38 @@ limitations under the License.
   <string name="marker_label_end">(終了)</string>
 
   <!--  TrackList -->
-  <string name="tracklist_show_track">表示</string>
+  <string name="track_list_show_on_map">表示</string>
   <string name="tracklist_send_to_mymaps">Googleマイマップに送信</string>
   <string name="tracklist_send_to_new_mymap">新規Googleマイマップに送信</string>
   <string name="tracklist_send_to_fusiontables">Google Fusion Tablesに送信</string>
   <string name="tracklist_send_to_new_fusiontable">新規Google Fusion Tableに送信</string>
   <string name="tracklist_send_to_docs">Google Docsに送信</string>
-  <string name="tracklist_send_to_google">Googleに送信...</string>
-  <string name="tracklist_delete_track">端末から削除...</string>
-  <string name="tracklist_edit_track">詳細編集</string>
-  <string name="tracklist_write_to_sd">SDへの書き込み...</string>
-  <string name="tracklist_save_as_gpx">GPXファイルの保存</string>
-  <string name="tracklist_save_as_kml">KMLファイルの保存</string>
-  <string name="tracklist_save_as_csv">CVSファイルの保存</string>
-  <string name="tracklist_save_as_tcx">TCXファイルの保存</string>
+  <string name="track_list_send_google">Googleに送信...</string>
+  <string name="track_list_delete_track">端末から削除...</string>
+  <string name="track_list_edit_track">詳細編集</string>
+  <string name="track_list_save_sd">SDへの書き込み...</string>
+  <string name="track_list_save_gpx_file">GPXファイルの保存</string>
+  <string name="track_list_save_kml_file">KMLファイルの保存</string>
+  <string name="track_list_save_csv_file">CVSファイルの保存</string>
+  <string name="track_list_save_tcx_file">TCXファイルの保存</string>
   <string name="tracklist_btn_send_all_to_fusiontables">Google Fusion Tablesに送信</string>
   <string name="tracklist_btn_send_all_to_mymaps">Googleマイマップに送信</string>
-  <string name="tracklist_btn_delete_all">全て削除</string>
+  <string name="track_list_delete_all">全て削除</string>
   <!-- Export All -->
-  <string name="tracklist_btn_export_all">全て出力</string>
+  <string name="track_list_export_all">全て出力</string>
   <string name="export_done">出力終了</string>
-  <string name="tracklist_pick_one">トラックを選択します．オプションを表示するには長押しして下さい．</string>
+  <string name="track_list_pick_one">トラックを選択します．オプションを表示するには長押しして下さい．</string>
   <string name="tracklist_all_tracks">全トラック:</string>
-  <string name="tracklist_this_track">このトラック</string>
-  <string name="tracklist_share_track">共有...</string>
-  <string name="tracklist_share_link">マップへのリンク</string>
-  <string name="tracklist_share_gpx_file">GPXファイル</string>
-  <string name="tracklist_share_kml_file">KMLファイル</string>
-  <string name="tracklist_share_csv_file">CSVファイル</string>
-  <string name="tracklist_share_tcx_file">TCXファイル</string>
-  <string name="tracklist_clear_map">マップのクリア</string>
+  <string name="track_list_this_track">このトラック</string>
+  <string name="track_list_share_track">共有...</string>
+  <string name="track_list_share_url">マップへのリンク</string>
+  <string name="track_list_share_gpx_file">GPXファイル</string>
+  <string name="track_list_share_kml_file">KMLファイル</string>
+  <string name="track_list_share_csv_file">CSVファイル</string>
+  <string name="track_list_share_tcx_file">TCXファイル</string>
+  <string name="track_list_clear_map">マップのクリア</string>
   <!-- Import All -->
-  <string name="tracklist_btn_import_all">全てインポート</string>
+  <string name="track_list_import_all">全てインポート</string>
   <!-- Format:
   $1 : Successful imports
   $2 : Attempted imports
@@ -172,13 +172,11 @@ limitations under the License.
   <string name="marker_list_pick_one">マーカーを選択します．オプションを表示するには長押しして下さい．</string>
 
   <!-- MyTracks Details -->
-  <string name="trackdetails_title">トラック詳細</string>
-  <string name="trackdetails_name">トラック名</string>
-  <string name="trackdetails_name_hint">トラック名</string>
-  <string name="trackdetails_description">トラック説明</string>
-  <string name="trackdetails_description_hint">トラック説明</string>
-  <string name="trackdetails_category">活動タイプ(ハイキング, サイクリング、ランニング、登山...)</string>
-  <string name="trackdetails_category_hint">活動タイプ</string>
+  <string name="track_detail_title">トラック詳細</string>
+  <string name="track_detail_track_name">トラック名</string>
+  <string name="track_detail_track_description">トラック説明</string>
+  <string name="track_detail_activity_type">活動タイプ(ハイキング, サイクリング、ランニング、登山...)</string>
+  <string name="track_detail_activity_type_hint">活動タイプ</string>
 
   <!-- MyTracks Waypoint Details -->
   <string name="marker_detail_title">マーカー詳細</string>
diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml
index 80ddc224b..96d574eaa 100644
--- a/MyTracks/res/values-pl/strings.xml
+++ b/MyTracks/res/values-pl/strings.xml
@@ -36,7 +36,7 @@ limitations under the License.
   <string name="gps_not_found">Brak dostawcy lokalizacji GPS na urządzeniu.</string>
   <string name="error_sending_to_fusion_tables">Podczas przesyłania pliku do Moich Map Google pojawił się błąd. Spróbuj ponownie później.</string>
   <string name="error_sending_to_docs">Podczas przesyłania pliku do Dokumentów Google pojawił się błąd. Spróbuj ponownie później.</string>
-  <string name="track_unable_to_start_recording">Nie można rozpocząć rejestrowania. Spróbuj ponownie.</string>
+  <string name="track_record_error">Nie można rozpocząć rejestrowania. Spróbuj ponownie.</string>
   <string name="error_unable_to_stop_recording">Nie można zakończyć rejestrowania. Spróbuj ponownie.</string>
   <string name="error_import_unable_to_read_file">Nie można czytać z pliku.</string>
   <string name="error_import_invalid_gpx_format">Plik nie jest poprawnym plikiem GPX.</string>
@@ -47,7 +47,7 @@ limitations under the License.
 
   <!-- Status messages -->
   <string name="gps_wait_for_fix">Oczekiwanie na lepsze ustalenie pozycji GPS. Upewnij się, że niebo jest widoczne.</string>
-  <string name="status_now_recording">Rejestrowanie nowej trasy.</string>
+  <string name="track_record_success">Rejestrowanie nowej trasy.</string>
   <string name="status_stopped_recording">Zatrzymano rejestrowanie nowej trasy.</string>
   <!-- <string name="sending_to_fusion_tables_success">Utworzona nową Mapę Google na maps.google.com.</string> -->
   <string name="sending_to_my_maps_success_existing_map">Twoja trasa został wysłana do maps.google.com.</string>
@@ -88,11 +88,11 @@ limitations under the License.
   <string name="recorded_date">Zapisana</string>
   <string name="category">Typ aktywności</string>
   <string name="waypoint_category">Typ znacznika</string>
-  <string name="track_part_format">(Część %d)</string>
+  <string name="send_google_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_format">Trasa %d</string>
+  <string name="track_record_notification">Rejestrowanie twojej trasy...</string>
+  <string name="track_name_format">Trasa %d</string>
 
   <!-- Common -->
   <string name="no">Nie</string>
@@ -109,30 +109,30 @@ limitations under the License.
   <string name="marker_label_end">(Koniec)</string>
 
   <!--  TrackList -->
-  <string name="tracklist_show_track">Pokaż</string>
+  <string name="track_list_show_on_map">Pokaż</string>
   <!-- <string name="tracklist_send_to_fusiontables">Wyślij do Moich Map Google</string> -->
   <!-- <string name="tracklist_send_to_new_fusiontable">Wyślij do Moich Map Google jako nową mapę</string> -->
   <string name="tracklist_send_to_docs">Wyślij do Dokumentów Google</string>
-  <string name="tracklist_send_to_google">Wyślij do Google...</string>
-  <string name="tracklist_delete_track">Usuń z telefonu...</string>
-  <string name="tracklist_edit_track">Edytuj szczegóły</string>
-  <string name="tracklist_write_to_sd">Zapisz na karcie SD...</string>
-  <string name="tracklist_save_as_gpx">Zapisz plik GPX</string>
-  <string name="tracklist_save_as_kml">Zapisz plik KML</string>
-  <string name="tracklist_save_as_csv">Zapisz plik CSV</string>
+  <string name="track_list_send_google">Wyślij do Google...</string>
+  <string name="track_list_delete_track">Usuń z telefonu...</string>
+  <string name="track_list_edit_track">Edytuj szczegóły</string>
+  <string name="track_list_save_sd">Zapisz na karcie SD...</string>
+  <string name="track_list_save_gpx_file">Zapisz plik GPX</string>
+  <string name="track_list_save_kml_file">Zapisz plik KML</string>
+  <string name="track_list_save_csv_file">Zapisz plik CSV</string>
   <!-- <string name="tracklist_btn_send_all_to_fusiontables">Wyślij do Moich Map Google</string> -->
-  <string name="tracklist_btn_delete_all">Usuń wszystkie trasy</string>
+  <string name="track_list_delete_all">Usuń wszystkie trasy</string>
   <!-- Export All -->
-  <string name="tracklist_btn_export_all">Eksportuj wszystkie trasy</string>
+  <string name="track_list_export_all">Eksportuj wszystkie trasy</string>
   <string name="export_done">Eksport zakończony</string>
-  <string name="tracklist_pick_one">Wybierz trasę. Naciśnij i przytrzymaj, aby wybrać opcje.</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="tracklist_this_track">Ta trasa</string>
-  <string name="tracklist_share_track">Podziel się z przyjaciółmi...</string>
-  <string name="tracklist_share_gpx_file">Plik GPX</string>
-  <string name="tracklist_share_kml_file">PLik KML</string>
-  <string name="tracklist_share_csv_file">Plik CSV</string>
-  <string name="tracklist_clear_map">Wyczyść mapę</string>
+  <string name="track_list_this_track">Ta trasa</string>
+  <string name="track_list_share_track">Podziel się z przyjaciółmi...</string>
+  <string name="track_list_share_gpx_file">Plik GPX</string>
+  <string name="track_list_share_kml_file">PLik KML</string>
+  <string name="track_list_share_csv_file">Plik CSV</string>
+  <string name="track_list_clear_map">Wyczyść mapę</string>
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Wyczyść wszystkie znaczniki</string>
@@ -145,13 +145,11 @@ limitations under the License.
   <string name="marker_list_pick_one">Wybierz znacznik. Naciśnij i przytrzymaj, aby wybrać opcje.</string>
 
   <!-- MyTracks Details -->
-  <string name="trackdetails_title">Szczegóły trasy</string>
-  <string name="trackdetails_name">Nazwa trasy</string>
-  <string name="trackdetails_name_hint">Nazwa trasy</string>
-  <string name="trackdetails_description">Opis trasy</string>
-  <string name="trackdetails_description_hint">Opis trasy</string>
-  <string name="trackdetails_category">Typ aktywności (np. wspinanie, jazda rowerem, bieganie...)</string>
-  <string name="trackdetails_category_hint">Typ aktywności</string>
+  <string name="track_detail_title">Szczegóły trasy</string>
+  <string name="track_detail_track_name">Nazwa trasy</string>
+  <string name="track_detail_track_description">Opis trasy</string>
+  <string name="track_detail_activity_type">Typ aktywności (np. wspinanie, jazda rowerem, bieganie...)</string>
+  <string name="track_detail_activity_type_hint">Typ aktywności</string>
 
   <!-- MyTracks Waypoint Details -->
   <string name="marker_detail_title">Szczegóły znacznika</string>
diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml
index d663cb0af..52163813e 100644
--- a/MyTracks/res/values-pt-rBR/strings.xml
+++ b/MyTracks/res/values-pt-rBR/strings.xml
@@ -35,7 +35,7 @@ limitations under the License.
   <string name="gps_not_found">"Provedor de posição de GPS não encontrado neste dispositivo.</string>
   <string name="error_sending_to_fusion_tables">Ocorreu um erro ao enviar seu caminho para o Google Fusion Tables. Por favor tente novamente mais tarde.</string>
   <string name="error_sending_to_docs">Ocorreu um erro ao enviar seu caminho para o Google Docs. Por favor tente novamente mais tarde.</string>
-  <string name="track_unable_to_start_recording">Impossível iniciar a gravação. Tente novamente.</string>
+  <string name="track_record_error">Impossível iniciar a gravação. Tente novamente.</string>
   <string name="error_unable_to_stop_recording">Impossível interromper a gravação. Tente novamente.</string>
   <string name="error_import_unable_to_read_file">Impossível ler do arquivo.</string>
   <string name="error_import_invalid_gpx_format">O arquivo não tem um formato GPX válido.</string>
@@ -46,7 +46,7 @@ limitations under the License.
 
   <!-- Status messages -->
   <string name="gps_wait_for_fix">Esperando por um sinal melhor do GPS.  Assegure-se de que o céu está visível.</string>
-  <string name="status_now_recording">Gravando um novo caminho.</string>
+  <string name="track_record_success">Gravando um novo caminho.</string>
   <string name="status_stopped_recording">Gravação interrompida.</string>
   <string name="sending_to_fusion_tables_success">Uma nova Fusion Table Google foi criada em google.com/fusiontables.</string>
   <string name="sending_to_my_maps_success_existing_map">Seu caminho foi enviado para maps.google.com.</string>
@@ -87,11 +87,11 @@ limitations under the License.
   <string name="recorded_date">Gravado</string>
   <string name="category">"Tipo de atividade</string>
   <string name="waypoint_category">"Tipo de marcador</string>
-  <string name="track_part_format">"(Parte %d)</string>
+  <string name="send_google_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_format">"Caminho %d</string>
+  <string name="track_record_notification">"Gravando seu caminho...</string>
+  <string name="track_name_format">"Caminho %d</string>
 
   <!-- Common -->
   <string name="no">Não</string>
@@ -108,26 +108,26 @@ limitations under the License.
   <string name="marker_label_end">(Fim)</string>
 
   <!--  TrackList -->
-  <string name="tracklist_show_track">Mostrar</string>
+  <string name="track_list_show_on_map">Mostrar</string>
   <string name="tracklist_send_to_fusiontables">Enviar para o Google Fusion Tables</string>
   <string name="tracklist_send_to_new_fusiontable">Enviar para nova Google Fusion Table</string>
   <string name="tracklist_send_to_docs">Enviar para o Google Docs</string>
-  <string name="tracklist_send_to_google">Enviar para o Google...</string>
-  <string name="tracklist_delete_track">Apagar do telefone...</string>
-  <string name="tracklist_edit_track">Editar detalhes</string>
-  <string name="tracklist_write_to_sd">Salvar no cartão SD...</string>
-  <string name="tracklist_save_as_gpx">Salvar arquivo GPX</string>
-  <string name="tracklist_save_as_kml">Salvar arquivo KML</string>
+  <string name="track_list_send_google">Enviar para o Google...</string>
+  <string name="track_list_delete_track">Apagar do telefone...</string>
+  <string name="track_list_edit_track">Editar detalhes</string>
+  <string name="track_list_save_sd">Salvar no cartão SD...</string>
+  <string name="track_list_save_gpx_file">Salvar arquivo GPX</string>
+  <string name="track_list_save_kml_file">Salvar arquivo KML</string>
   <string name="tracklist_btn_send_all_to_fusiontables">Enviar para o Google Fusion Tables</string>
-  <string name="tracklist_btn_delete_all">Apagar todos os caminhos</string>
-  <string name="tracklist_pick_one">Escolha um caminho. Pressione&amp;segure para mais opções.</string>
+  <string name="track_list_delete_all">Apagar todos os caminhos</string>
+  <string name="track_list_pick_one">Escolha um caminho. Pressione&amp;segure para mais opções.</string>
   <string name="tracklist_all_tracks">Todos os Caminhos:</string>
-  <string name="tracklist_this_track">Este Caminho</string>
-  <string name="tracklist_share_track">Compartilhar com amigos...</string>
-  <string name="tracklist_share_link">Um link para a mapa</string>
-  <string name="tracklist_share_gpx_file">Um arquivo GPX</string>
-  <string name="tracklist_share_kml_file">Um arquivo KML</string>
-  <string name="tracklist_clear_map">Limpar mapa</string>
+  <string name="track_list_this_track">Este Caminho</string>
+  <string name="track_list_share_track">Compartilhar com amigos...</string>
+  <string name="track_list_share_url">Um link para a mapa</string>
+  <string name="track_list_share_gpx_file">Um arquivo GPX</string>
+  <string name="track_list_share_kml_file">Um arquivo KML</string>
+  <string name="track_list_clear_map">Limpar mapa</string>
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Apagar todos os marcadores</string>
@@ -140,13 +140,11 @@ limitations under the License.
   <string name="marker_list_pick_one">Escolha um marcador.  Pressione&amp;segure para mais opções.</string>
 
   <!-- MyTracks Details -->
-  <string name="trackdetails_title">Detalhes do Caminho</string>
-  <string name="trackdetails_name">Nome do Caminho</string>
-  <string name="trackdetails_name_hint">Nome do Caminho</string>
-  <string name="trackdetails_description">Descrição do Caminho</string>
-  <string name="trackdetails_description_hint">Descrição do Caminho</string>
-  <string name="trackdetails_category">Tipo de Atividade (por ex. caminhada, ciclismo, escalada...)</string>
-  <string name="trackdetails_category_hint">Tipo de Atividade</string>
+  <string name="track_detail_title">Detalhes do Caminho</string>
+  <string name="track_detail_track_name">Nome do Caminho</string>
+  <string name="track_detail_track_description">Descrição do Caminho</string>
+  <string name="track_detail_activity_type">Tipo de Atividade (por ex. caminhada, ciclismo, escalada...)</string>
+  <string name="track_detail_activity_type_hint">Tipo de Atividade</string>
 
   <!-- MyTracks Waypoint Details -->
   <string name="marker_detail_title">Detalhes do Marcador</string>
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index acdbb995b..c5a331bf8 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -39,7 +39,7 @@ limitations under the License.
   <string name="error_sending_to_fusion_tables">Ошибка при отправке вашего трека в Google Fusion Tables.</string>
   <string name="error_sending_to_docs">Ошибка при отправке вашего трека в Google Документы.</string>
   <string name="error_sending_generic">Пожалуйста, повторите попытку позже.</string>
-  <string name="track_unable_to_start_recording">Не удалось начать запись. Попробуйте еще раз.</string>
+  <string name="track_record_error">Не удалось начать запись. Попробуйте еще раз.</string>
   <string name="error_unable_to_stop_recording">Не удалось остановить запись. Попробуйте еще раз.</string>
   <string name="error_import_unable_to_read_file">Не удалось прочитать из файла.</string>
   <string name="error_import_invalid_gpx_format">Неверный формат GPX файла.</string>
@@ -50,7 +50,7 @@ limitations under the License.
 
   <!-- Status messages -->
   <string name="gps_wait_for_fix">Ожидание сигнала GPS. Убедитесь в том, что вы находитесь под открытым небом.</string>
-  <string name="status_now_recording">Записывается новый трек.</string>
+  <string name="track_record_success">Записывается новый трек.</string>
   <string name="status_stopped_recording">Запись вашего трека остановлена.</string>
   <string name="sending_to_my_maps_success_new_map">Новая Google \"Мои карты\" была создана на maps.google.com.</string>
   <string name="sending_to_fusion_tables_success">Новая таблица Google Fusion была создана на google.com/fusiontables.</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="track_part_format">(Часть %d)</string>
+  <string name="send_google_track_part_format">(Часть %d)</string>
 
   <!-- Used by the track recording service -->
-  <string name="recording_your_track">Запись трека...</string>
-  <string name="new_track_format">Трек %d</string>
+  <string name="track_record_notification">Запись трека...</string>
+  <string name="track_name_format">Трек %d</string>
 
   <!-- Common -->
   <string name="no">Нет</string>
@@ -123,38 +123,38 @@ limitations under the License.
   <string name="marker_label_end">(Конец)</string>
 
   <!--  TrackList -->
-  <string name="tracklist_show_track">Показать</string>
+  <string name="track_list_show_on_map">Показать</string>
   <string name="tracklist_send_to_mymaps">Отправить в Google \"Мои карты\"</string>
   <string name="tracklist_send_to_new_mymap">Отправить в новый Google \"Мои карты\"</string>
   <string name="tracklist_send_to_fusiontables">Отправить в Google Fusion Tables</string>
   <string name="tracklist_send_to_new_fusiontable">Отправить в новую Google Fusion Table</string>
   <string name="tracklist_send_to_docs">Отправить в Google Документы</string>
-  <string name="tracklist_send_to_google">Отправить в Google ...</string>
-  <string name="tracklist_delete_track">Удалить из телефона...</string>
-  <string name="tracklist_edit_track">Править детали</string>
-  <string name="tracklist_write_to_sd">Записать на SD карту...</string>
-  <string name="tracklist_save_as_gpx">Сохранить файл GPX</string>
-  <string name="tracklist_save_as_kml">Сохранить файл KML</string>
-  <string name="tracklist_save_as_csv">Сохранить файл CSV</string>
-  <string name="tracklist_save_as_tcx">Сохранить файл TCX</string>
+  <string name="track_list_send_google">Отправить в Google ...</string>
+  <string name="track_list_delete_track">Удалить из телефона...</string>
+  <string name="track_list_edit_track">Править детали</string>
+  <string name="track_list_save_sd">Записать на SD карту...</string>
+  <string name="track_list_save_gpx_file">Сохранить файл GPX</string>
+  <string name="track_list_save_kml_file">Сохранить файл KML</string>
+  <string name="track_list_save_csv_file">Сохранить файл CSV</string>
+  <string name="track_list_save_tcx_file">Сохранить файл TCX</string>
   <string name="tracklist_btn_send_all_to_fusiontables">Отправить в Google Fusion Tables</string>
   <string name="tracklist_btn_send_all_to_mymaps">Отправить в Google \"Мои карты\"</string>
-  <string name="tracklist_btn_delete_all">Удалить все</string>
+  <string name="track_list_delete_all">Удалить все</string>
   <!-- Export All -->
-  <string name="tracklist_btn_export_all">Экспорт всех</string>
+  <string name="track_list_export_all">Экспорт всех</string>
   <string name="export_done">Экспорт закончен</string>
-  <string name="tracklist_pick_one">Выберите трек. Нажмите и удерживайте для получения дополнительных возможностей.</string>
+  <string name="track_list_pick_one">Выберите трек. Нажмите и удерживайте для получения дополнительных возможностей.</string>
   <string name="tracklist_all_tracks">Все треки:</string>
-  <string name="tracklist_this_track">Этот трек</string>
-  <string name="tracklist_share_track">Поделиться с друзьями...</string>
-  <string name="tracklist_share_link">Ссылка на карту</string>
-  <string name="tracklist_share_gpx_file">Файл GPX</string>
-  <string name="tracklist_share_kml_file">Файл KML</string>
-  <string name="tracklist_share_csv_file">Файла CSV</string>
-  <string name="tracklist_share_tcx_file">Файл TCX</string>
-  <string name="tracklist_clear_map">Очистить карту</string>
+  <string name="track_list_this_track">Этот трек</string>
+  <string name="track_list_share_track">Поделиться с друзьями...</string>
+  <string name="track_list_share_url">Ссылка на карту</string>
+  <string name="track_list_share_gpx_file">Файл GPX</string>
+  <string name="track_list_share_kml_file">Файл KML</string>
+  <string name="track_list_share_csv_file">Файла CSV</string>
+  <string name="track_list_share_tcx_file">Файл TCX</string>
+  <string name="track_list_clear_map">Очистить карту</string>
   <!-- Import All -->
-  <string name="tracklist_btn_import_all">Импорт всех</string>
+  <string name="track_list_import_all">Импорт всех</string>
   <!-- Format:
   $1 : Successful imports
   $2 : Attempted imports
@@ -175,13 +175,11 @@ limitations under the License.
   <string name="marker_list_pick_one">Выберите маркер. Нажмите и удерживайте для получения дополнительных возможностей.</string>
 
   <!-- MyTracks Details -->
-  <string name="trackdetails_title">Трек детали</string>
-  <string name="trackdetails_name">Название трека</string>
-  <string name="trackdetails_name_hint">Название трека</string>
-  <string name="trackdetails_description">Описание трека</string>
-  <string name="trackdetails_description_hint">Описание трека</string>
-  <string name="trackdetails_category">Тип деятельности (например: пешая прогулка, велосипедная прогулка, бег, восхождение...)</string>
-  <string name="trackdetails_category_hint">Тип деятельности</string>
+  <string name="track_detail_title">Трек детали</string>
+  <string name="track_detail_track_name">Название трека</string>
+  <string name="track_detail_track_description">Описание трека</string>
+  <string name="track_detail_activity_type">Тип деятельности (например: пешая прогулка, велосипедная прогулка, бег, восхождение...)</string>
+  <string name="track_detail_activity_type_hint">Тип деятельности</string>
 
   <!-- MyTracks Waypoint Details -->
   <string name="marker_detail_title">Маркер детали</string>
diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml
index cbfe2e526..ffc6c07bd 100644
--- a/MyTracks/res/values-sv/strings.xml
+++ b/MyTracks/res/values-sv/strings.xml
@@ -36,7 +36,7 @@ limitations under the License.
   <string name="gps_not_found">Ingen GPS-positioneringstjänst hittades på denna enhet.</string>
   <string name="error_sending_to_fusion_tables">Det uppstod ett fel i sändningen av ditt spår till Google Fusion Tables. Försök igen senare.</string>
   <string name="error_sending_to_docs">Det uppstod ett fel i sändningen av ditt spår till Google Dokument. Försök igen senare.</string>
-  <string name="track_unable_to_start_recording">Kan inte starta inspelningen. Försök igen.</string>
+  <string name="track_record_error">Kan inte starta inspelningen. Försök igen.</string>
   <string name="error_unable_to_stop_recording">Kan inte stoppa inspelningen. Försök igen.</string>
   <string name="error_import_unable_to_read_file">Kan inte läsa från fil.</string>
   <string name="error_import_invalid_gpx_format">Filen har inte ett giltigt GPX-format.</string>
@@ -47,7 +47,7 @@ limitations under the License.
 
   <!-- Status messages -->
   <string name="gps_wait_for_fix">Väntar på bättre GPS-position. Se till att himlen är synlig.</string>
-  <string name="status_now_recording">Spelar nu in ett nytt spår.</string>
+  <string name="track_record_success">Spelar nu in ett nytt spår.</string>
   <string name="status_stopped_recording">Stoppade inspelning av ditt spår.</string>
   <!-- <string name="sending_to_fusion_tables_success">En ny Google Mina Kartor har skapats på maps.google.com.</string> -->
   <string name="sending_to_my_maps_success_existing_map">Ditt spår har skickats till maps.google.com.</string>
@@ -88,11 +88,11 @@ limitations under the License.
   <string name="recorded_date">Inspelad</string>
   <string name="category">Aktivitetstyp</string>
   <string name="waypoint_category">Markörtyp</string>
-  <string name="track_part_format">(Del %d)</string>
+  <string name="send_google_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_format">Spår %d</string>
+  <string name="track_record_notification">Spelar in ditt spår...</string>
+  <string name="track_name_format">Spår %d</string>
 
   <!-- Common -->
   <string name="no">Nej</string>
@@ -109,30 +109,30 @@ limitations under the License.
   <string name="marker_label_end">(Slut)</string>
 
   <!--  TrackList -->
-  <string name="tracklist_show_track">Visa</string>
+  <string name="track_list_show_on_map">Visa</string>
   <!-- <string name="tracklist_send_to_fusiontables">Skicka till Google Mina Kartor</string> -->
   <!-- <string name="tracklist_send_to_new_fusiontable">Skicka till ny Google Mina Kartor</string> -->
   <string name="tracklist_send_to_docs">Skicka till Google Dokument</string>
-  <string name="tracklist_send_to_google">Skicka till Google...</string>
-  <string name="tracklist_delete_track">Ta bort från telefonen...</string>
-  <string name="tracklist_edit_track">Ändra detaljer</string>
-  <string name="tracklist_write_to_sd">Skriv till SD-kort...</string>
-  <string name="tracklist_save_as_gpx">Spara en GPX-fil</string>
-  <string name="tracklist_save_as_kml">Spara en KML-fil</string>
-  <string name="tracklist_save_as_csv">Spara en CSV-fil</string>
+  <string name="track_list_send_google">Skicka till Google...</string>
+  <string name="track_list_delete_track">Ta bort från telefonen...</string>
+  <string name="track_list_edit_track">Ändra detaljer</string>
+  <string name="track_list_save_sd">Skriv till SD-kort...</string>
+  <string name="track_list_save_gpx_file">Spara en GPX-fil</string>
+  <string name="track_list_save_kml_file">Spara en KML-fil</string>
+  <string name="track_list_save_csv_file">Spara en CSV-fil</string>
   <!-- <string name="tracklist_btn_send_all_to_fusiontables">Skicka till Google Mina Kartor</string> -->
-  <string name="tracklist_btn_delete_all">Ta bort alla spår</string>
+  <string name="track_list_delete_all">Ta bort alla spår</string>
   <!-- Export All -->
-  <string name="tracklist_btn_export_all">Exportera alla spår</string>
+  <string name="track_list_export_all">Exportera alla spår</string>
   <string name="export_done">Exporteringen slutfördes</string>
-  <string name="tracklist_pick_one">Välj ett spår. Tryck &amp; håll för fler alternativ.</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="tracklist_this_track">Det här spåret</string>
-  <string name="tracklist_share_track">Dela med vänner...</string>
-  <string name="tracklist_share_gpx_file">En GPX-fil</string>
-  <string name="tracklist_share_kml_file">En KML-fil</string>
-  <string name="tracklist_share_csv_file">En CSV-fil</string>
-  <string name="tracklist_clear_map">Rensa karta</string>
+  <string name="track_list_this_track">Det här spåret</string>
+  <string name="track_list_share_track">Dela med vänner...</string>
+  <string name="track_list_share_gpx_file">En GPX-fil</string>
+  <string name="track_list_share_kml_file">En KML-fil</string>
+  <string name="track_list_share_csv_file">En CSV-fil</string>
+  <string name="track_list_clear_map">Rensa karta</string>
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Ta bort alla markörer</string>
@@ -145,13 +145,11 @@ limitations under the License.
   <string name="marker_list_pick_one">Välj en markör. Tryck &amp; håll för fler alternativ.</string>
 
   <!-- MyTracks Details -->
-  <string name="trackdetails_title">Spårdetaljer</string>
-  <string name="trackdetails_name">Spårnamn</string>
-  <string name="trackdetails_name_hint">Spårnamn</string>
-  <string name="trackdetails_description">Spårbeskrivning</string>
-  <string name="trackdetails_description_hint">Spårbeskrivning</string>
-  <string name="trackdetails_category">Aktivitetstyp (t ex vandring, cyckling, löpning, klättring...)</string>
-  <string name="trackdetails_category_hint">Aktivitetstyp</string>
+  <string name="track_detail_title">Spårdetaljer</string>
+  <string name="track_detail_track_name">Spårnamn</string>
+  <string name="track_detail_track_description">Spårbeskrivning</string>
+  <string name="track_detail_activity_type">Aktivitetstyp (t ex vandring, cyckling, löpning, klättring...)</string>
+  <string name="track_detail_activity_type_hint">Aktivitetstyp</string>
 
   <!-- MyTracks Waypoint Details -->
   <string name="marker_detail_title">Markördetaljer</string>
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index abbfb9be7..5a397c090 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -39,7 +39,7 @@ limitations under the License.
   <string name="error_sending_to_fusion_tables">发送轨迹到 Google Fusion Tables 时发生错误. 请稍后重试.</string>
   <string name="error_sending_to_docs">发送轨迹到 Google Docs 时发生错误. 请稍后重试.</string>
   <string name="error_sending_generic">请稍后再试.</string>
-  <string name="track_unable_to_start_recording">无法开始记录. 请重试.</string>
+  <string name="track_record_error">无法开始记录. 请重试.</string>
   <string name="error_unable_to_stop_recording">无法停止记录. 请重试.</string>
   <string name="error_import_unable_to_read_file">无法读取文件.</string>
   <string name="error_import_invalid_gpx_format">文件不是有效的 GPX 格式.</string>
@@ -51,7 +51,7 @@ limitations under the License.
 
   <!-- Status messages -->
   <string name="gps_wait_for_fix">等待更准确的 GPS 定位. 请确定可以看见天空.</string>
-  <string name="status_now_recording">现在开始记录新的轨迹.</string>
+  <string name="track_record_success">现在开始记录新的轨迹.</string>
   <string name="status_stopped_recording">停止记录你的轨迹.</string>
   <string name="sending_to_my_maps_success_new_map">已在 maps.google.com 创建了新的 Google My Map.</string>
   <string name="sending_to_fusion_tables_success">已在 google.com/fusiontables 创建新 Google Fusion Table.</string>
@@ -102,11 +102,11 @@ limitations under the License.
   <string name="recorded_date">记录日期</string>
   <string name="category">活动类型</string>
   <string name="waypoint_category">标记类型</string>
-  <string name="track_part_format">(第 %d 部分)</string>
+  <string name="send_google_track_part_format">(第 %d 部分)</string>
 
   <!-- Used by the track recording service -->
-  <string name="recording_your_track">记录轨迹中...</string>
-  <string name="new_track_format">轨迹 %d</string>
+  <string name="track_record_notification">记录轨迹中...</string>
+  <string name="track_name_format">轨迹 %d</string>
 
   <!-- Common -->
   <string name="no">否</string>
@@ -124,38 +124,38 @@ limitations under the License.
   <string name="marker_label_end">(结束)</string>
 
   <!--  TrackList -->
-  <string name="tracklist_show_track">显示</string>
+  <string name="track_list_show_on_map">显示</string>
   <string name="tracklist_send_to_mymaps">发送到 Google My Maps</string>
   <string name="tracklist_send_to_new_mymap">发送到新建的 Google My Map</string>
   <string name="tracklist_send_to_fusiontables">发送到 Google Fusion Table</string>
   <string name="tracklist_send_to_new_fusiontable">发送到新建的 Google Fusion Table</string>
   <string name="tracklist_send_to_docs">发送到 Google Docs</string>
-  <string name="tracklist_send_to_google">发送到 Google...</string>
-  <string name="tracklist_delete_track">从手机上删除...</string>
-  <string name="tracklist_edit_track">编辑详细信息</string>
-  <string name="tracklist_write_to_sd">保存到 SD 卡...</string>
-  <string name="tracklist_save_as_gpx">保存为 GPX 文件</string>
-  <string name="tracklist_save_as_kml">保存为 KML 文件</string>
-  <string name="tracklist_save_as_csv">保存为 CSV 文件</string>
-  <string name="tracklist_save_as_tcx">保存为 TCX 文件</string>
+  <string name="track_list_send_google">发送到 Google...</string>
+  <string name="track_list_delete_track">从手机上删除...</string>
+  <string name="track_list_edit_track">编辑详细信息</string>
+  <string name="track_list_save_sd">保存到 SD 卡...</string>
+  <string name="track_list_save_gpx_file">保存为 GPX 文件</string>
+  <string name="track_list_save_kml_file">保存为 KML 文件</string>
+  <string name="track_list_save_csv_file">保存为 CSV 文件</string>
+  <string name="track_list_save_tcx_file">保存为 TCX 文件</string>
   <string name="tracklist_btn_send_all_to_fusiontables">发送到 Google Fusion Tables</string>
   <string name="tracklist_btn_send_all_to_mymaps">发送到 Google My Maps</string>
-  <string name="tracklist_btn_delete_all">删除所有轨迹</string>
+  <string name="track_list_delete_all">删除所有轨迹</string>
   <!-- Export All -->
-  <string name="tracklist_btn_export_all">导出所有轨迹</string>
+  <string name="track_list_export_all">导出所有轨迹</string>
   <string name="export_done">导出完毕</string>
-  <string name="tracklist_pick_one">选择一个轨迹. 长按弹出操作菜单.</string>
+  <string name="track_list_pick_one">选择一个轨迹. 长按弹出操作菜单.</string>
   <string name="tracklist_all_tracks">全部轨迹:</string>
-  <string name="tracklist_this_track">此轨迹</string>
-  <string name="tracklist_share_track">与朋友分享...</string>
-  <string name="tracklist_share_link">访问地图的超链接</string>
-  <string name="tracklist_share_gpx_file">GPX 文件</string>
-  <string name="tracklist_share_kml_file">KML 文件</string>
-  <string name="tracklist_share_csv_file">CSV 文件</string>
-  <string name="tracklist_share_tcx_file">TCX 文件</string>
-  <string name="tracklist_clear_map">清除地图</string>
+  <string name="track_list_this_track">此轨迹</string>
+  <string name="track_list_share_track">与朋友分享...</string>
+  <string name="track_list_share_url">访问地图的超链接</string>
+  <string name="track_list_share_gpx_file">GPX 文件</string>
+  <string name="track_list_share_kml_file">KML 文件</string>
+  <string name="track_list_share_csv_file">CSV 文件</string>
+  <string name="track_list_share_tcx_file">TCX 文件</string>
+  <string name="track_list_clear_map">清除地图</string>
   <!-- Import All -->
-  <string name="tracklist_btn_import_all">全部导入</string>
+  <string name="track_list_import_all">全部导入</string>
   <!-- Format:
   $1 : Successful imports
   $2 : Attempted imports
@@ -176,13 +176,11 @@ limitations under the License.
   <string name="marker_list_pick_one">选择一个标记. 长按弹出操作菜单.</string>
 
   <!-- MyTracks Details -->
-  <string name="trackdetails_title">轨迹详细信息</string>
-  <string name="trackdetails_name">轨迹名称</string>
-  <string name="trackdetails_name_hint">轨迹名称</string>
-  <string name="trackdetails_description">轨迹描述</string>
-  <string name="trackdetails_description_hint">轨迹描述</string>
-  <string name="trackdetails_category">活动类型 (例如: 徒步, 骑行, 跑步, 攀岩...)</string>
-  <string name="trackdetails_category_hint">活动类型</string>
+  <string name="track_detail_title">轨迹详细信息</string>
+  <string name="track_detail_track_name">轨迹名称</string>
+  <string name="track_detail_track_description">轨迹描述</string>
+  <string name="track_detail_activity_type">活动类型 (例如: 徒步, 骑行, 跑步, 攀岩...)</string>
+  <string name="track_detail_activity_type_hint">活动类型</string>
 
   <!-- MyTracks Waypoint Details -->
   <string name="marker_detail_title">标记详细信息</string>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index a955fd0dc..e1d7d2899 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -172,14 +172,162 @@ limitations under the License.
     translation_description="In the menu, to show a list of all the tracks.">
     Tracks
   </string> 
-       
+  
+  <!-- Send Google -->    
+  <string name="send_google_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>
+  
   <!-- Track -->
-  <string name="track_unable_to_start_recording"
+  <string name="track_detail_activity_type"
+    translation_description="In the detail page for a track, the text field for the activity type,
+      including for examples.">
+    Activity Type (e.g. hiking, cycling, running, climbing...)
+  </string>
+  <string name="track_detail_activity_type_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="track_detail_title"
+    translation_description="In the detail page for a track, the title of the page.">
+    Track Details
+  </string>
+  <string name="track_detail_track_description"
+    translation_description="In the detail page for a track, the text field for the track 
+      description.">  
+    Track Description
+  </string>
+  <string name="track_detail_track_name"
+    translation_description="In the detail page for a track, the text field for the track name.">
+    Track Name
+  </string>
+  <string name="track_list_clear_map"
+    translation_description="In the context menu for a track, the menu option to clear the map
+      of any track.">
+    Clear map
+  </string>
+  <string name="track_list_delete_all"
+    translation_description="In the Tracks page, the button on the bottom to delete all tracks.">
+    Delete all
+  </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_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.).">
+    Edit
+  </string>
+  <string name="track_list_export_all"
+    translation_description="In the Tracks page, the button on the bottom to export all tracks.">
+    Export all
+  </string>  
+  <string name="track_list_import_all"
+    translation_description="In the Tracks page, the button on the bottom to import all tracks.">
+    Import all
+  </string>      
+  <string name="track_list_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="track_list_save_csv_file"
+    translation_description="In the context menu for a track, under the 'Save to SD card...'
+      option, the menu option to save the track as a CSV file.">      
+    Save as a CSV file
+  </string>
+  <string name="track_list_save_gpx_file"
+    translation_description="In the context menu for a track, under the 'Save to SD card...'
+      option, the menu option to save the track as a GPX file.">     
+    Save as a GPX file
+  </string>
+  <string name="track_list_save_kml_file"
+    translation_description="In the context menu for a track, under the 'Save to SD card...'
+      option, the menu option to save the track as a KML file.">           
+    Save as a KML file
+  </string>
+  <string name="track_list_save_sd"
+    translation_description="In the context menu for a track, the menu option to save the track to
+      the SD card.">       
+    Save to SD card...
+  </string>   
+  <string name="track_list_save_tcx_file"
+    translation_description="In the context menu for a track, under the 'Save to SD card...'
+      option, the menu option to save the track as a TCX file.">       
+    Save as a TCX file
+  </string>
+  <string name="track_list_send_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="track_list_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="track_list_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="track_list_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="track_list_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>  
+  <string name="track_list_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="track_list_share_url"
+    translation_description="In the context menu for a track, under the 'Share with friends...'
+      option, the menu option to save a track to My Maps or Fusion Tables and share the URL with
+      friends.">
+    My Map or Fusion Table URL
+  </string>
+  <string name="track_list_show_on_map"
+    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="track_list_this_track"
+    translation_description="In the context menu for a track, the title indicating that all the menu
+      options below are for this track.">
+    This Track
+  </string>
+  <string name="track_name_format"
+    translation_description="When creating a new track, the string format to name the track. E.g.,
+      'Track 1'.">
+    Track %d
+  </string>
+  <string name="track_record_error"
     translation_description="When starting a recording, message when not able to start due to no GPS
       location and asking the user to try again.">
     Unable to start recording. No GPS location. Try again.
   </string>
-
+  <string name="track_record_notification"
+    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="track_record_success"
+    translation_description="When starting a new track recording, a status message indicating
+      success.">
+    Now recording a new track.
+  </string>
+  
   <!-- Error messages when sending to Google. -->
   <string name="error_sending_to_google"
     translation_description="When sending a track to Google, a message indicating that an error has
@@ -226,15 +374,6 @@ limitations under the License.
     \'Location &amp; security\' settings) and make sure the sky is visible. Try again later.
   </string>
   
-  <!-- Record track status message. -->
-  <string name="status_now_recording"
-    translation_description="When starting a new track recording, a status message indicating
-      success.">
-    Now recording a new track.
-  </string>
-  
-
-  
   <!-- Sending to Google status messages. -->
   <string name="sending_to_google_upload_status"
     translation_description="When sending a track to Google, the header on the top of the result
@@ -381,24 +520,7 @@ limitations under the License.
       for the activity type. E.g., 'Activity type: hiking'.">
     Activity type
   </string>
-
-  <!-- Used by the track recording service -->
-  <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.">
@@ -430,8 +552,6 @@ limitations under the License.
     translation_description="The title on the alert dialog to indicate error.">
     Error
   </string>
-
-
   
   <!--  Welcome dialog -->
   <string name="license"
@@ -440,117 +560,6 @@ limitations under the License.
     License
   </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 save a track to My Maps or Fusion Tables and share the URL with
-      friends.">
-    My Map or Fusion Table URL
-  </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>  
-
-  <!-- '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.">
@@ -574,45 +583,6 @@ limitations under the License.
     Import error for file %s
   </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>
-
-
-
   <!-- Settings page -->
   <string name="settings_title"
     translation_description="The title of the Settings page.">  
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
index a78674bf0..b2e9d463a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
@@ -130,7 +130,7 @@ public class ExportAllTracks {
   }
 
   private void makeProgressDialog(final int trackCount) {
-    String exportMsg = activity.getString(R.string.tracklist_btn_export_all);
+    String exportMsg = activity.getString(R.string.track_list_export_all);
     progress = new ProgressDialog(activity);
     progress.setIcon(android.R.drawable.ic_dialog_info);
     progress.setTitle(exportMsg);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java
index 248899c65..b83d739ac 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java
@@ -150,7 +150,7 @@ public class ImportAllTracks {
   }
 
   private void makeProgressDialog(final int trackCount) {
-    String importMsg = activity.getString(R.string.tracklist_btn_import_all);
+    String importMsg = activity.getString(R.string.track_list_import_all);
     progress = new ProgressDialog(activity);
     progress.setIcon(android.R.drawable.ic_dialog_info);
     progress.setTitle(importMsg);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
index 56053ae3b..e54a1c923 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
@@ -358,39 +358,39 @@ public class MapActivity extends com.google.android.maps.MapActivity
         @Override
         public void onCreateContextMenu(ContextMenu menu, View v,
             ContextMenuInfo menuInfo) {
-          menu.setHeaderTitle(R.string.tracklist_this_track);
+          menu.setHeaderTitle(R.string.track_list_this_track);
           menu.add(0, Constants.MENU_EDIT, 0,
-              R.string.tracklist_edit_track);
+              R.string.track_list_edit_track);
           if (!dataHub.isRecordingSelected()) {
             menu.add(0, Constants.MENU_SEND_TO_GOOGLE, 0,
-                R.string.tracklist_send_to_google);
+                R.string.track_list_send_google);
             SubMenu share = menu.addSubMenu(0, Constants.MENU_SHARE, 0,
-                R.string.tracklist_share_track);
+                R.string.track_list_share_track);
             share.add(0, Constants.MENU_SHARE_LINK, 0,
-                R.string.tracklist_share_link);
+                R.string.track_list_share_url);
             share.add(0, Constants.MENU_SHARE_GPX_FILE, 0,
-                R.string.tracklist_share_gpx_file);
+                R.string.track_list_share_gpx_file);
             share.add(0, Constants.MENU_SHARE_KML_FILE, 0,
-                R.string.tracklist_share_kml_file);
+                R.string.track_list_share_kml_file);
             share.add(0, Constants.MENU_SHARE_CSV_FILE, 0,
-                R.string.tracklist_share_csv_file);
+                R.string.track_list_share_csv_file);
             share.add(0, Constants.MENU_SHARE_TCX_FILE, 0,
-                R.string.tracklist_share_tcx_file);
+                R.string.track_list_share_tcx_file);
             SubMenu save = menu.addSubMenu(0,
                 Constants.MENU_WRITE_TO_SD_CARD, 0,
-                R.string.tracklist_write_to_sd);
+                R.string.track_list_save_sd);
             save.add(0, Constants.MENU_SAVE_GPX_FILE, 0,
-                R.string.tracklist_save_as_gpx);
+                R.string.track_list_save_gpx_file);
             save.add(0, Constants.MENU_SAVE_KML_FILE, 0,
-                R.string.tracklist_save_as_kml);
+                R.string.track_list_save_kml_file);
             save.add(0, Constants.MENU_SAVE_CSV_FILE, 0,
-                R.string.tracklist_save_as_csv);
+                R.string.track_list_save_csv_file);
             save.add(0, Constants.MENU_SAVE_TCX_FILE, 0,
-                R.string.tracklist_save_as_tcx);
+                R.string.track_list_save_tcx_file);
             menu.add(0, Constants.MENU_CLEAR_MAP, 0,
-                R.string.tracklist_clear_map);
+                R.string.track_list_clear_map);
             menu.add(0, Constants.MENU_DELETE, 0,
-                R.string.tracklist_delete_track);
+                R.string.track_list_delete_track);
           }
         }
       };
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
index 2f2e5f5e3..ad2dc8b15 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
@@ -384,14 +384,11 @@ public class MyTracks extends TabActivity implements OnTouchListener {
       long recordingTrackId = trackRecordingService.startNewTrack();
       // Select the recording track.
       dataHub.loadTrack(recordingTrackId);
-      Toast.makeText(this, getString(R.string.status_now_recording),
-          Toast.LENGTH_SHORT).show();
+      Toast.makeText(this, getString(R.string.track_record_success), Toast.LENGTH_SHORT).show();
       // TODO: We catch Exception, because after eliminating the service process
       // all exceptions it may throw are no longer wrapped in a RemoteException.
     } catch (Exception e) {
-      Toast.makeText(this,
-          getString(R.string.track_unable_to_start_recording),
-          Toast.LENGTH_SHORT).show();
+      Toast.makeText(this, getString(R.string.track_record_error), Toast.LENGTH_SHORT).show();
       Log.w(TAG, "Unable to start recording.", e);
     }
   }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
index cf0defa44..04f495d86 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
@@ -75,44 +75,44 @@ public class TrackList extends ListActivity
         @Override
         public void onCreateContextMenu(ContextMenu menu, View v,
             ContextMenuInfo menuInfo) {
-          menu.setHeaderTitle(R.string.tracklist_this_track);
+          menu.setHeaderTitle(R.string.track_list_this_track);
           AdapterView.AdapterContextMenuInfo info =
               (AdapterView.AdapterContextMenuInfo) menuInfo;
           contextPosition = info.position;
           trackId = TrackList.this.listView.getAdapter().getItemId(
               contextPosition);
           menu.add(0, Constants.MENU_SHOW, 0,
-              R.string.tracklist_show_track);
+              R.string.track_list_show_on_map);
           menu.add(0, Constants.MENU_EDIT, 0,
-              R.string.tracklist_edit_track);
+              R.string.track_list_edit_track);
           if (!isRecording() || trackId != recordingTrackId) {
             menu.add(0, Constants.MENU_SEND_TO_GOOGLE, 0,
-                R.string.tracklist_send_to_google);
+                R.string.track_list_send_google);
             SubMenu share = menu.addSubMenu(0, Constants.MENU_SHARE, 0,
-                R.string.tracklist_share_track);
+                R.string.track_list_share_track);
             share.add(0, Constants.MENU_SHARE_LINK, 0,
-                R.string.tracklist_share_link);
+                R.string.track_list_share_url);
             share.add(0, Constants.MENU_SHARE_GPX_FILE, 0,
-                R.string.tracklist_share_gpx_file);
+                R.string.track_list_share_gpx_file);
             share.add(0, Constants.MENU_SHARE_KML_FILE, 0,
-                R.string.tracklist_share_kml_file);
+                R.string.track_list_share_kml_file);
             share.add(0, Constants.MENU_SHARE_CSV_FILE, 0,
-                R.string.tracklist_share_csv_file);
+                R.string.track_list_share_csv_file);
             share.add(0, Constants.MENU_SHARE_TCX_FILE, 0,
-                R.string.tracklist_share_tcx_file);
+                R.string.track_list_share_tcx_file);
             SubMenu save = menu.addSubMenu(0,
                 Constants.MENU_WRITE_TO_SD_CARD, 0,
-                R.string.tracklist_write_to_sd);
+                R.string.track_list_save_sd);
             save.add(0, Constants.MENU_SAVE_GPX_FILE, 0,
-                R.string.tracklist_save_as_gpx);
+                R.string.track_list_save_gpx_file);
             save.add(0, Constants.MENU_SAVE_KML_FILE, 0,
-                R.string.tracklist_save_as_kml);
+                R.string.track_list_save_kml_file);
             save.add(0, Constants.MENU_SAVE_CSV_FILE, 0,
-                R.string.tracklist_save_as_csv);
+                R.string.track_list_save_csv_file);
             save.add(0, Constants.MENU_SAVE_TCX_FILE, 0,
-                R.string.tracklist_save_as_tcx);
+                R.string.track_list_save_tcx_file);
             menu.add(0, Constants.MENU_DELETE, 0,
-                R.string.tracklist_delete_track);
+                R.string.track_list_delete_track);
           }
         }
       };
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 45219922f..7159aa2fd 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
@@ -462,7 +462,7 @@ public class SendToFusionTables implements Runnable {
       if (totalSegmentsUploaded > 1) {
         splitTrack.setName(splitTrack.getName() + " "
             + String.format(
-                context.getString(R.string.track_part_format), totalSegmentsUploaded));
+                context.getString(R.string.send_google_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 84a6cb0de..8fa7ec05d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java
@@ -331,7 +331,7 @@ public class SendToMyMaps implements Runnable {
       if (totalSegmentsUploaded > 1) {
         splitTrack.setName(splitTrack.getName() + " "
             + String.format(
-                context.getString(R.string.track_part_format), totalSegmentsUploaded));
+                context.getString(R.string.send_google_track_part_format), totalSegmentsUploaded));
       }
       totalSegmentsUploaded++;
       Log.d(TAG,
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 84f5bfa24..e59b03d30 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_format), trackId);
+      return String.format(context.getString(R.string.track_name_format), trackId);
     }
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
index 6726f7601..90768d827 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
@@ -495,7 +495,7 @@ public class TrackRecordingService extends Service {
           this, 0 /* requestCode */, new Intent(this, MyTracks.class),
           0 /* flags */);
       notification.setLatestEventInfo(this, getString(R.string.app_name),
-          getString(R.string.recording_your_track), contentIntent);
+          getString(R.string.track_record_notification), contentIntent);
       notification.flags += Notification.FLAG_NO_CLEAR;
       apiLevelAdapter.startForeground(this, notificationManager, 1,
           notification);