From 63ba6ec37c6f7955cdc29679bba35217ae7ddc63 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Tue, 8 Nov 2011 14:30:26 -0800
Subject: [PATCH] - rename and sort marker related variables - rename and sort
 gps related variables - clean up unused strings in AndroidManifest.xml

---
 MyTracks/AndroidManifest.xml                  |  15 +-
 MyTracks/res/layout/mytracks_layout.xml       |   2 +-
 .../res/layout/mytracks_waypoint_details.xml  |  12 +-
 .../res/layout/mytracks_waypoints_list.xml    |   6 +-
 MyTracks/res/values-ca/strings.xml            |  46 ++--
 MyTracks/res/values-de/strings.xml            |  46 ++--
 MyTracks/res/values-es/strings.xml            |  46 ++--
 MyTracks/res/values-fi/strings.xml            |  46 ++--
 MyTracks/res/values-fr/strings.xml            |  46 ++--
 MyTracks/res/values-it/strings.xml            |  46 ++--
 MyTracks/res/values-ja/strings.xml            |  46 ++--
 MyTracks/res/values-pl/strings.xml            |  46 ++--
 MyTracks/res/values-pt-rBR/strings.xml        |  46 ++--
 MyTracks/res/values-ru/strings.xml            |  46 ++--
 MyTracks/res/values-sv/strings.xml            |  46 ++--
 MyTracks/res/values-zh-rCN/strings.xml        |  46 ++--
 MyTracks/res/values/strings.xml               | 235 +++++++++---------
 .../android/apps/mytracks/MapActivity.java    |   6 +-
 .../android/apps/mytracks/MyTracks.java       |   8 +-
 .../android/apps/mytracks/WaypointsList.java  |  14 +-
 .../apps/mytracks/io/SendToFusionTables.java  |   4 +-
 .../apps/mytracks/io/mymaps/MapsFacade.java   |   4 +-
 .../services/TrackRecordingService.java       |   4 +-
 .../services/TrackRecordingServiceTest.java   |   4 +-
 24 files changed, 410 insertions(+), 456 deletions(-)

diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 566dff1ca..f7224d9a5 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -35,7 +35,6 @@ limitations under the License.
               android:writePermission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
 
     <activity android:name="com.google.android.apps.mytracks.MyTracks"
-              android:label="My Tracks"
               android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
@@ -50,7 +49,6 @@ limitations under the License.
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.MapActivity"
-              android:label="MyTracks"
               android:exported="false">
       <intent-filter>
         <category android:name="android.intent.category.TAB" />
@@ -63,12 +61,10 @@ limitations under the License.
               android:exported="false" />
 
     <!-- TODO: VIEW and PICK for track cursor dir -->
-    <activity android:name="com.google.android.apps.mytracks.TrackList"
-              android:label="Recorded Tracks" />
+    <activity android:name="com.google.android.apps.mytracks.TrackList" />
 
     <!-- TODO: VIEW and PICK for waypoint cursor dir -->
-    <activity android:name="com.google.android.apps.mytracks.WaypointsList"
-              android:label="Recorded Waypoints" />
+    <activity android:name="com.google.android.apps.mytracks.WaypointsList" />
 
     <activity android:name="com.google.android.apps.mytracks.TrackDetails"
               android:label="@string/trackdetails_title">
@@ -91,7 +87,7 @@ limitations under the License.
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.WaypointDetails"
-              android:label="@string/waypointdetails_title">
+              android:label="@string/marker_detail_title">
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
         <action android:name="android.intent.action.EDIT" />
@@ -112,7 +108,6 @@ limitations under the License.
               android:label="@string/menu_aggregated_statistics" />
 
     <activity android:name="com.google.android.apps.mytracks.StatsActivity"
-              android:label="@string/statistics"
               android:exported="false">
       <intent-filter>
         <category android:name="android.intent.category.TAB" />
@@ -123,7 +118,6 @@ limitations under the License.
               android:label="@string/menu_sensor_state" />
 
     <activity android:name="com.google.android.apps.mytracks.ChartActivity"
-              android:label="@string/elevation_label"
               android:exported="false">
       <intent-filter>
         <category android:name="android.intent.category.TAB" />
@@ -131,7 +125,6 @@ limitations under the License.
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.SendActivity"
-              android:label="@string/sendtogoogle_title"
               android:theme="@android:style/Theme.Translucent.NoTitleBar">
       <intent-filter>
         <action android:name="android.intent.action.SEND" />
@@ -140,7 +133,6 @@ limitations under the License.
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.io.file.SaveActivity"
-              android:label="@string/tracklist_write_to_sd"
               android:theme="@android:style/Theme.Translucent.NoTitleBar"
               android:noHistory="true">
       <intent-filter>
@@ -170,7 +162,6 @@ limitations under the License.
               android:exported="false" />
 
     <service android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
-             android:label="Track Recording Service"
              android:icon="@drawable/arrow_320"
              android:enabled="true"
              android:exported="true"
diff --git a/MyTracks/res/layout/mytracks_layout.xml b/MyTracks/res/layout/mytracks_layout.xml
index 96a360a25..5055ea2a5 100644
--- a/MyTracks/res/layout/mytracks_layout.xml
+++ b/MyTracks/res/layout/mytracks_layout.xml
@@ -41,7 +41,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:textSize="16dip"
       android:textColor="#fff"
-      android:text="@string/status_wait_for_gps_fix"
+      android:text="@string/gps_wait_for_fix"
       android:layout_weight="0"/>
     </LinearLayout>
     <LinearLayout android:id="@+id/busypane"
diff --git a/MyTracks/res/layout/mytracks_waypoint_details.xml b/MyTracks/res/layout/mytracks_waypoint_details.xml
index bb683f23f..49ea1cc8c 100644
--- a/MyTracks/res/layout/mytracks_waypoint_details.xml
+++ b/MyTracks/res/layout/mytracks_waypoint_details.xml
@@ -30,7 +30,7 @@ limitations under the License.
       android:layout_width="fill_parent"
       android:layout_height="fill_parent"
       android:orientation="vertical">
-      <TextView android:text="@string/waypointdetails_name"
+      <TextView android:text="@string/marker_detail_marker_name"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"/>
       <LinearLayout
@@ -51,7 +51,7 @@ limitations under the License.
          android:autoText="true"
          android:capitalize="words"
          android:selectAllOnFocus="true"
-         android:hint="@string/waypointdetails_name_hint"
+         android:hint="@string/marker_detail_marker_name"
          android:imeOptions="actionNext"/>
       </LinearLayout>
       <LinearLayout android:id="@+id/waypointdetails_description_layout"
@@ -61,16 +61,16 @@ limitations under the License.
         android:visibility="visible"
         android:layout_weight="1">
         <TextView android:id="@+id/waypointdetails_category_label"
-          android:text="@string/waypointdetails_category"
+          android:text="@string/marker_detail_marker_type"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"/>
         <AutoCompleteTextView android:id="@+id/waypointdetails_category"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
           android:singleLine="true"
-          android:hint="@string/waypointdetails_category_hint"
+          android:hint="@string/marker_detail_marker_type_hint"
           android:imeOptions="actionNext"/>
-        <TextView android:text="@string/waypointdetails_description"
+        <TextView android:text="@string/marker_detail_marker_description"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"/>
         <EditText android:id="@+id/waypointdetails_description"
@@ -84,7 +84,7 @@ limitations under the License.
           android:maxLines="50"
           android:gravity="top"
           android:layout_weight="1"
-          android:hint="@string/waypointdetails_description_hint"
+          android:hint="@string/marker_detail_marker_description"
           android:imeOptions="actionDone"/>
       </LinearLayout>
 
diff --git a/MyTracks/res/layout/mytracks_waypoints_list.xml b/MyTracks/res/layout/mytracks_waypoints_list.xml
index f6773807f..944fd2c45 100644
--- a/MyTracks/res/layout/mytracks_waypoints_list.xml
+++ b/MyTracks/res/layout/mytracks_waypoints_list.xml
@@ -32,7 +32,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:textSize="16dip"
       android:textColor="#fff"
-      android:text="@string/waypointslist_pick_one"
+      android:text="@string/marker_list_pick_one"
       android:layout_weight="0"/>
   </LinearLayout>
 
@@ -44,11 +44,11 @@ limitations under the License.
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/waypointslist_btn_insert_statistics"
       android:layout_gravity="left"
-      android:text="@string/waypointslist_btn_insert_statistics"
+      android:text="@string/marker_list_insert_statistics"
       style="@style/Button"/>
     <Button android:id="@+id/waypointslist_btn_insert_waypoint"
       android:layout_gravity="right"
-      android:text="@string/waypointslist_btn_insert_waypoint"
+      android:text="@string/marker_list_insert_waypoint"
       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 201038053..dd5275339 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -34,31 +34,31 @@ limitations under the License.
 
   <!-- Error messages -->
   <string name="error_no_location_manager">No s\'ha trobat cap gestor d\'ubicacions en aquest dispositiu.</string>
-  <string name="error_no_gps">No s\'ha trobat cap proveïdor d\'ubicació GPS en aquest dispositiu.</string>
+  <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="error_unable_to_start_recording">No es pot iniciar l\'enregistrament. Proveu de nou.</string>
+  <string name="track_unable_to_start_recording">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>
   <string name="error_sending_to_google">S\'ha produït un error. Proveu de nou.</string>
   <string name="error_export_track_does_not_exist">No existeix la ruta.</string>
   <string name="error_import_out_of_memory">Aquest fitxer és massa gran (ha d\'ésser inferior a 500KB. S\'està cancel·lant.</string>
-  <string name="error_unable_to_insert_marker">No es pot inserir un marcador. No hi ha cap ubicació fixa disponible.</string>
+  <string name="marker_insert_error">No es pot inserir un marcador. No hi ha cap ubicació fixa disponible.</string>
 
   <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">S\'està esperant per tenir una posició GPS fixa. Assegureu-vos que el cel és visible.</string>
+  <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="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>
   <string name="sending_to_docs_success_new_doc">S\'ha enviat la ruta a un full de càlcul a docs.google.com.</string>
   <string name="sending_to_docs_success_existing_doc">S\'ha enviat la ruta a docs.google.com.</string>
-  <string name="status_need_to_enable_gps">Toqueu aquí per anar als paràmetres de seguretat i ubicació i activeu \'habilita els satèl·lits GPS\'. Premeu el botó d\'anar enrere per tornar.</string>
+  <string name="gps_need_to_enable">Toqueu aquí per anar als paràmetres de seguretat i ubicació i activeu \'habilita els satèl·lits GPS\'. Premeu el botó d\'anar enrere per tornar.</string>
   <string name="status_approximate_current_location">Nota: Es mostra una ubicació determinada a partir de les xarxes sense fils i antenes telefòniques.</string>
   <string name="status_no_current_location">No es pot determinar la ubicació. Habiliteu més fonts d\'ubicació (vegeu els paràmetres de seguretat i ubicació) i assegureu-vos que el cel és visible. Proveu de nou més tard.</string>
   <string name="status_waypoint_inserted">S\'ha inserit un marcader de punt de ruta.</string>
-  <string name="status_marker_inserted">S\'ha inserit un marcador d\'estadístiques.</string>
+  <string name="marker_insert_success">S\'ha inserit un marcador d\'estadístiques.</string>
 
   <!-- Progress dialog -->
   <string name="progress_title">Espereu...</string>
@@ -100,13 +100,13 @@ limitations under the License.
   <string name="ok">D\'acord</string>
   <string name="error">Error</string>
   <string name="success">Fet</string>
-  <string name="waypoint">Punt de referència</string>
+  <string name="marker_type_waypoint">Punt de referència</string>
   <string name="cancel">Cancel·la</string>
   <string name="save">Desa</string>
 
   <!-- Placemark labels for start and end of track -->
-  <string name="start">(Inici)</string>
-  <string name="end">(Fi)</string>
+  <string name="marker_label_start">(Inici)</string>
+  <string name="marker_label_end">(Fi)</string>
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Mostra</string>
@@ -138,13 +138,13 @@ limitations under the License.
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Elimina tots els marcadors</string>
-  <string name="waypointslist_this_waypoint">Aquest marcador</string>
-  <string name="waypointslist_delete_waypoint">Elimina</string>
-  <string name="waypointslist_edit_waypoint">Edita els detalls</string>
-  <string name="waypointslist_show_waypoint">Mostra al mapa</string>
-  <string name="waypointslist_btn_insert_waypoint">Insereix un punt de referència</string>
-  <string name="waypointslist_btn_insert_statistics">Insereix estadístiques</string>
-  <string name="waypointslist_pick_one">Seleccioneu un marcador. Mantingueu el dit per veure més opcions.</string>
+  <string name="marker_list_this_marker">Aquest marcador</string>
+  <string name="marker_list_delete_marker">Elimina</string>
+  <string name="marker_list_edit_marker">Edita els detalls</string>
+  <string name="marker_list_show_on_map">Mostra al mapa</string>
+  <string name="marker_list_insert_waypoint">Insereix un punt de referència</string>
+  <string name="marker_list_insert_statistics">Insereix estadístiques</string>
+  <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>
@@ -156,13 +156,11 @@ limitations under the License.
   <string name="trackdetails_category_hint">Tipus d\'activitat</string>
 
   <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Detalls del marcador</string>
-  <string name="waypointdetails_name">Nom del marcador</string>
-  <string name="waypointdetails_name_hint">Nom del marcador</string>
-  <string name="waypointdetails_description">Descripció del marcador</string>
-  <string name="waypointdetails_description_hint">Descripció del marcador</string>
-  <string name="waypointdetails_category">Tipus de marcador (e.g. edifici, sot, vista...)</string>
-  <string name="waypointdetails_category_hint">Tipus de marcador</string>
+  <string name="marker_detail_title">Detalls del marcador</string>
+  <string name="marker_detail_marker_name">Nom del marcador</string>
+  <string name="marker_detail_marker_description">Descripció del marcador</string>
+  <string name="marker_detail_marker_type">Tipus de marcador (e.g. edifici, sot, vista...)</string>
+  <string name="marker_detail_marker_type_hint">Tipus de marcador</string>
 
   <!-- MyTracks Settings -->
   <string name="settings_title">Paràmetres de My Tracks</string>
@@ -318,7 +316,7 @@ limitations under the License.
   <string name="sd_unavail">La targeta SD no està disponible</string>
   <string name="speed">Velocitat</string>
   <string name="start_trip">Heu d\'iniciar la marxa.</string>
-  <string name="statistics">Estadístiques</string>
+  <string name="marker_type_statistics">Estadístiques</string>
   <string name="total_distance_label">Distància total</string>
   <string name="distance_label">Distància</string>
   <string name="power">Energia</string>
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index d0e32c865..abf018328 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -34,31 +34,31 @@ limitations under the License.
 
   <!-- Error messages -->
   <string name="error_no_location_manager">Es wurde kein Dienst zur Positionsermittlung auf diesem Gerät gefunden.</string>
-  <string name="error_no_gps">Es wurde kein GPS-Empfänger auf diesem Gerät gefunden.</string>
+  <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="error_unable_to_start_recording">Start der Aufzeichnung fehlgeschlagen. Bitte versuche es noch einmal.</string>
+  <string name="track_unable_to_start_recording">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>
   <string name="error_sending_to_google">Ein Fehler ist aufgetreten. Bitte versuche es noch einmal.</string>
   <string name="error_export_track_does_not_exist">Track existiert nicht.</string>
   <string name="error_import_out_of_memory">Die Datei ist zu groß (maximal 500 KB). Operation abgebrochen.</string>
-  <string name="error_unable_to_insert_marker">Der Wegpunkt kann nicht einfügt werden. Keine Positionsbestimmung möglich.</string>
+  <string name="marker_insert_error">Der Wegpunkt kann nicht einfügt werden. Keine Positionsbestimmung möglich.</string>
 
   <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Warte auf ein besseres GPS-Signal. Bitte stelle sicher, dass der Himmel sichtbar ist.</string>
+  <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="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>
   <string name="sending_to_docs_success_new_doc">Dein Track wurde in einer neuen Tabelle bei docs.google.com gespeichert.</string>
   <string name="sending_to_docs_success_existing_doc">Dein Track wurde an docs.google.com gesendet.</string>
-  <string name="status_need_to_enable_gps">Hier berühren, um zu den Sicherheits- und Positionseinstellungen zu gelangen. Aktiviere \'GPS-Satelliten\'. Drücke dann den Zurück-Knopf, um hierher zurückzukehren.</string>
+  <string name="gps_need_to_enable">Hier berühren, um zu den Sicherheits- und Positionseinstellungen zu gelangen. Aktiviere \'GPS-Satelliten\'. Drücke dann den Zurück-Knopf, um hierher zurückzukehren.</string>
   <string name="status_approximate_current_location">Anmerkung: Eine ungefähre Position wird angezeigt, bestimmt mittels Mobilfunkstationen und WiFi-Netzwerken.</string>
   <string name="status_no_current_location">Die Position kann derzeit nicht bestimmt werden. Aktiviere mehr Positionsquellen (siehe Sicherheits- und Positionseinstellungen) und stelle sicher, dass der Himmel sichtbar ist.</string>
   <string name="status_waypoint_inserted">Ein Wegpunkt wurde eingefügt.</string>
-  <string name="status_marker_inserted">Ein Statistikwegpunkt wurde eingefügt.</string>
+  <string name="marker_insert_success">Ein Statistikwegpunkt wurde eingefügt.</string>
 
   <!-- Progress dialog -->
   <string name="progress_title">Bitte warten…</string>
@@ -101,14 +101,14 @@ limitations under the License.
   <!--string name="ok">OK</string-->
   <string name="error">Fehler</string>
   <string name="success">Erfolgreich</string>
-  <string name="waypoint">Wegpunkt</string>
+  <string name="marker_type_waypoint">Wegpunkt</string>
   <string name="license">Lizenz</string>
   <string name="cancel">Abbrechen</string>
   <string name="save">Sichern</string>
 
   <!-- Placemark labels for start and end of track -->
-  <!--string name="start">(Start)</string-->
-  <string name="end">(Ende)</string>
+  <!--string name="marker_label_start">(Start)</string-->
+  <string name="marker_label_end">(Ende)</string>
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Anzeigen</string>
@@ -141,13 +141,13 @@ limitations under the License.
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Alle Wegpunkte löschen</string>
-  <string name="waypointslist_this_waypoint">Dieser Wegpunkt</string>
-  <string name="waypointslist_delete_waypoint">Löschen</string>
-  <string name="waypointslist_edit_waypoint">Details bearbeiten</string>
-  <string name="waypointslist_show_waypoint">Auf der Karte zeigen</string>
-  <string name="waypointslist_btn_insert_waypoint">Wegpunkt einfügen</string>
-  <string name="waypointslist_btn_insert_statistics">Statistik einfügen</string>
-  <string name="waypointslist_pick_one">Wegpunkt auswählen. Lange berühren für mehr Optionen.</string>
+  <string name="marker_list_this_marker">Dieser Wegpunkt</string>
+  <string name="marker_list_delete_marker">Löschen</string>
+  <string name="marker_list_edit_marker">Details bearbeiten</string>
+  <string name="marker_list_show_on_map">Auf der Karte zeigen</string>
+  <string name="marker_list_insert_waypoint">Wegpunkt einfügen</string>
+  <string name="marker_list_insert_statistics">Statistik einfügen</string>
+  <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>
@@ -159,13 +159,11 @@ limitations under the License.
   <string name="trackdetails_category_hint">Aktivität</string>
 
   <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Wegpunktdetails</string>
-  <string name="waypointdetails_name">Wegpunktname</string>
-  <string name="waypointdetails_name_hint">Wegpunktname</string>
-  <string name="waypointdetails_description">Wegpunktbeschreibung</string>
-  <string name="waypointdetails_description_hint">Wegpunktbeschreibung</string>
-  <string name="waypointdetails_category">Art des Wegpunktes (z. B. Gebäude, Schlagloch, Sehenswürdigkeit…)</string>
-  <string name="waypointdetails_category_hint">Art des Wegpunktes</string>
+  <string name="marker_detail_title">Wegpunktdetails</string>
+  <string name="marker_detail_marker_name">Wegpunktname</string>
+  <string name="marker_detail_marker_description">Wegpunktbeschreibung</string>
+  <string name="marker_detail_marker_type">Art des Wegpunktes (z. B. Gebäude, Schlagloch, Sehenswürdigkeit…)</string>
+  <string name="marker_detail_marker_type_hint">Art des Wegpunktes</string>
 
   <!-- MyTracks Settings -->
   <string name="settings_title">Einstellungen für My Tracks</string>
@@ -346,7 +344,7 @@ limitations under the License.
   <string name="sd_unavail">SD-Karte nicht verfügbar</string>
   <string name="speed">Geschwindigkeit</string>
   <string name="start_trip">Du musst erst eine Aufzeichnung beginnen.</string>
-  <string name="statistics">Statistik</string>
+  <string name="marker_type_statistics">Statistik</string>
   <string name="total_distance_label">Gesamtentfernung</string>
   <string name="distance_label">Entfernung</string>
   <string name="power">Kraft</string>
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index 780efde07..31eab24a1 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -34,12 +34,12 @@ limitations under the License.
   
   <!-- Error messages -->
   <string name="error_no_location_manager">Ningún administrador de ubicación fue hallado en este dispositivo! </string>
-  <string name="error_no_gps">Ningún proveedor de ubicación GPS fue hallado en este dispositivo.</string>
+  <string name="gps_not_found">Ningún proveedor de ubicación GPS fue hallado en este dispositivo.</string>
   <string name="error_sending_to_my_maps">Se produjo un error al enviar su recorrido a Google Mis Sitios.</string>
   <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="error_unable_to_start_recording">No se puede iniciar la grabación. Inténtelo de nuevo. </string>
+  <string name="track_unable_to_start_recording">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>
@@ -47,10 +47,10 @@ limitations under the License.
   <string name="error_export_track_does_not_exist">El recorrido no existe.</string>
   <string name="error_export_operation_canceled">La operación fue cancelada.</string>
   <string name="error_import_out_of_memory">El archivo es demasiado grande (tiene que ser menor a 500 KB). Abortando.</string>
-  <string name="error_unable_to_insert_marker">No se puede insertar el marcador. La ubicación no está disponible.</string>
+  <string name="marker_insert_error">No se puede insertar el marcador. La ubicación no está disponible.</string>
 
   <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Esperando una ubicación mas exacta del GPS. Asegúrese que el cielo sea visible.</string>
+  <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="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>
@@ -59,11 +59,11 @@ limitations under the License.
   <string name="sending_to_docs_success_new_doc">Su recorrido ha sido enviado a una nueva hoja de cálculo de docs.google.com.</string>
   <string name="sending_to_docs_success_existing_doc">Su recorrido ha sido enviado a docs.google.com.</string>
   <string name="sending_to_google_additional_info">Es posible que pasen unos minutos hasta que los nuevos recorridos aparezcan.</string>
-  <string name="status_need_to_enable_gps">Por favor, presione aquí para ir al menú de Seguridad y Ubicación, y asegúrese que el GPS esté habilitado. Presione el botón "atrás" para regresar.</string>
+  <string name="gps_need_to_enable">Por favor, presione aquí para ir al menú de Seguridad y Ubicación, y asegúrese que el GPS esté habilitado. Presione el botón "atrás" para regresar.</string>
   <string name="status_approximate_current_location">Nota: Una ubicación aproximada es determinada a partir de torres de telefonía celular y redes WIFI.</string>
   <string name="status_no_current_location">No puede ser determinada la ubicación actual. Habilite más fuentes de datos (vea las configuraciones de Seguridad y Ubicación) y asegúrese que el cielo sea visible. Inténtelo mas tarde.</string>
   <string name="status_waypoint_inserted">Un marcador de recorrido fue insertado.</string>
-  <string name="status_marker_inserted">Un marcador de estadísticas fue insertado.</string>
+  <string name="marker_insert_success">Un marcador de estadísticas fue insertado.</string>
   <string name="sending_to_google_upload_status">Estado del envío:</string>
   
   <!-- Progress dialog -->
@@ -112,14 +112,14 @@ limitations under the License.
   <!-- Common -->
   <string name="yes">Sí</string>
   <string name="success">Éxito</string>
-  <string name="waypoint">Marcador de recorrido</string>
+  <string name="marker_type_waypoint">Marcador de recorrido</string>
   <string name="license">Licencia</string>
   <string name="cancel">Cancelar</string>
   <string name="save">Guardar</string>
 
   <!-- Placemark labels for start and end of track -->
-  <string name="start">(Inicio)</string>
-  <string name="end">(Fin)</string>
+  <string name="marker_label_start">(Inicio)</string>
+  <string name="marker_label_end">(Fin)</string>
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Mostrar</string>
@@ -170,13 +170,13 @@ limitations under the License.
   
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Borrar todas los marcadores</string>
-  <string name="waypointslist_this_waypoint">Este marcador</string>
-  <string name="waypointslist_delete_waypoint">Borrar</string>
-  <string name="waypointslist_edit_waypoint">Editar detalles"</string>
-  <string name="waypointslist_show_waypoint">Mostrar en el mapa"</string>
-  <string name="waypointslist_btn_insert_waypoint">Insertar marcador"</string>
-  <string name="waypointslist_btn_insert_statistics">Insertar estadísticas"</string>
-  <string name="waypointslist_pick_one">Escoja un marcador. Presione&amp; mantenga presionado para ver más opciones.</string>
+  <string name="marker_list_this_marker">Este marcador</string>
+  <string name="marker_list_delete_marker">Borrar</string>
+  <string name="marker_list_edit_marker">Editar detalles"</string>
+  <string name="marker_list_show_on_map">Mostrar en el mapa"</string>
+  <string name="marker_list_insert_waypoint">Insertar marcador"</string>
+  <string name="marker_list_insert_statistics">Insertar estadísticas"</string>
+  <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>
@@ -188,13 +188,11 @@ limitations under the License.
   <string name="trackdetails_category_hint">Tipo de actividad</string>
 
   <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Detalles de señal</string>
-  <string name="waypointdetails_name">Nombre de señal</string>
-  <string name="waypointdetails_name_hint">Nombre de señal</string>
-  <string name="waypointdetails_description">Descripción  de señal</string>
-  <string name="waypointdetails_description_hint">Descripción  de señal</string>
-  <string name="waypointdetails_category">Tipo de señal (por ejemplo, edificio, bache, atracción...)</string>
-  <string name="waypointdetails_category_hint">Tipo de señal</string>
+  <string name="marker_detail_title">Detalles de señal</string>
+  <string name="marker_detail_marker_name">Nombre de señal</string>
+  <string name="marker_detail_marker_description">Descripción  de señal</string>
+  <string name="marker_detail_marker_type">Tipo de señal (por ejemplo, edificio, bache, atracción...)</string>
+  <string name="marker_detail_marker_type_hint">Tipo de señal</string>
 
   <!-- MyTracks Settings -->
   <string name="settings_title">Configuraciones de My Tracks</string>
@@ -401,7 +399,7 @@ limitations under the License.
   <string name="sd_unavail">SD no disponible</string>
   <string name="speed">Velocidad</string>
   <string name="start_trip">Debes comenzar un viaje.</string>
-  <string name="statistics">Estadísticas</string>
+  <string name="marker_type_statistics">Estadísticas</string>
   <string name="total_distance_label">Distancia total</string>
   <string name="distance_label">Distancia</string>
   <string name="power">Potencia</string>
diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml
index 174277f5d..6fa9dcbef 100644
--- a/MyTracks/res/values-fi/strings.xml
+++ b/MyTracks/res/values-fi/strings.xml
@@ -34,12 +34,12 @@ limitations under the License.
 
   <!-- Error messages -->
   <string name="error_no_location_manager">Paikkatietoja ei löytynyt!</string>
-  <string name="error_no_gps">GPS-palvelua ei löytynyt.</string>
+  <string name="gps_not_found">GPS-palvelua ei löytynyt.</string>
   <string name="error_sending_to_my_maps">Virhe lähetettäessä reittiä Google My Maps-palveluun.</string>
   <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="error_unable_to_start_recording">Tallennusta ei voitu aloittaa. Yritä uudelleen.</string>
+  <string name="track_unable_to_start_recording">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>
@@ -47,10 +47,10 @@ limitations under the License.
   <string name="error_export_track_does_not_exist">Reittiä ei ole olemassa.</string>
   <string name="error_export_operation_canceled">Tapahtuma keskeytettiin.</string>
   <string name="error_import_out_of_memory">Liian suuri tiedosto (maksimi 500 KB). Keskeytetään.</string>
-  <string name="error_unable_to_insert_marker">Merkintää ei voitu lisätä. Paikkatietoa ei saatavilla.</string>
+  <string name="marker_insert_error">Merkintää ei voitu lisätä. Paikkatietoa ei saatavilla.</string>
 
   <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Odotetaan parempaa GPS-yhteyttä. Varmista että taivas on näkyvissä.</string>
+  <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="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>
@@ -59,11 +59,11 @@ limitations under the License.
   <string name="sending_to_docs_success_new_doc">Reittisi on luotu taulukoksi osoitteeseen  docs.google.com.</string>
   <string name="sending_to_docs_success_existing_doc">Reittisi on lähetetty osoitteeseen docs.google.com.</string>
   <string name="sending_to_google_additional_info">Reitin näkyminen saattaa kestää muutaman minuutin.</string>
-  <string name="status_need_to_enable_gps">Avaa tästä Sijainti ja suojaus -asetukset ja valitse \'Käytä GPS-satelliitteja\'. Palaa ohjelmaan painamalla Takaisin-näppäintä.</string>
+  <string name="gps_need_to_enable">Avaa tästä Sijainti ja suojaus -asetukset ja valitse \'Käytä GPS-satelliitteja\'. Palaa ohjelmaan painamalla Takaisin-näppäintä.</string>
   <string name="status_approximate_current_location">Huomio: Näkyvä sijainti perustuu kännykkämastoista ja WLAN-verkoista arvioituun paikkatietoon.</string>
   <string name="status_no_current_location">Paikkatietoa ei löydy. Aktivoi lisää paikannusmenetelmiä (katso Asetukset) ja varmista että taivas on näkyvissä. Yritä myöhemmin uudelleen.</string>
   <string name="status_waypoint_inserted">Reittimerkintä lisätty.</string>
-  <string name="status_marker_inserted">Tilastomerkintä lisätty.</string>
+  <string name="marker_insert_success">Tilastomerkintä lisätty.</string>
   <string name="sending_to_google_upload_status">Lähetyksen tila:</string>
 
   <!-- Progress dialog -->
@@ -114,14 +114,14 @@ limitations under the License.
   <string name="ok">OK</string>
   <string name="error">Virhe</string>
   <string name="success">Valmis</string>
-  <string name="waypoint">Reittipiste</string>
+  <string name="marker_type_waypoint">Reittipiste</string>
   <string name="license">Lisenssi</string>
   <string name="cancel">Peruuta</string>
   <string name="save">Tallenna</string>
 
   <!-- Placemark labels for start and end of track -->
-  <string name="start">(Lähtö)</string>
-  <string name="end">(Maali)</string>
+  <string name="marker_label_start">(Lähtö)</string>
+  <string name="marker_label_end">(Maali)</string>
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Näytä</string>
@@ -170,13 +170,13 @@ limitations under the License.
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Poista kaikki merkinnät</string>
-  <string name="waypointslist_this_waypoint">Tämä merkintä</string>
-  <string name="waypointslist_delete_waypoint">Poista</string>
-  <string name="waypointslist_edit_waypoint">Muokkaa tietoja</string>
-  <string name="waypointslist_show_waypoint">Näytä kartalla</string>
-  <string name="waypointslist_btn_insert_waypoint">Lisää reittipiste</string>
-  <string name="waypointslist_btn_insert_statistics">Lisää tilastot</string>
-  <string name="waypointslist_pick_one">Valitse merkintä. Pitkä painallus tuo esiin lisää vaihtoehtoja.</string>
+  <string name="marker_list_this_marker">Tämä merkintä</string>
+  <string name="marker_list_delete_marker">Poista</string>
+  <string name="marker_list_edit_marker">Muokkaa tietoja</string>
+  <string name="marker_list_show_on_map">Näytä kartalla</string>
+  <string name="marker_list_insert_waypoint">Lisää reittipiste</string>
+  <string name="marker_list_insert_statistics">Lisää tilastot</string>
+  <string name="marker_list_pick_one">Valitse merkintä. Pitkä painallus tuo esiin lisää vaihtoehtoja.</string>
 
   <!-- MyTracks Details -->
   <string name="trackdetails_title">Reitin tiedot</string>
@@ -188,13 +188,11 @@ limitations under the License.
   <string name="trackdetails_category_hint">Liikunnan muoto</string>
 
   <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Merkinnän tiedot</string>
-  <string name="waypointdetails_name">Merkinnän nimi</string>
-  <string name="waypointdetails_name_hint">Merkinnän nimi</string>
-  <string name="waypointdetails_description">Merkinnän kuvaus</string>
-  <string name="waypointdetails_description_hint">Merkinnän kuvaus</string>
-  <string name="waypointdetails_category">Merkinnän tyyppi (esim. rakennus, kuoppa, nähtävyys...)</string>
-  <string name="waypointdetails_category_hint">Merkinnän tyyppi</string>
+  <string name="marker_detail_title">Merkinnän tiedot</string>
+  <string name="marker_detail_marker_name">Merkinnän nimi</string>
+  <string name="marker_detail_marker_description">Merkinnän kuvaus</string>
+  <string name="marker_detail_marker_type">Merkinnän tyyppi (esim. rakennus, kuoppa, nähtävyys...)</string>
+  <string name="marker_detail_marker_type_hint">Merkinnän tyyppi</string>
 
   <!-- MyTracks Settings -->
   <string name="settings_title">My Tracks Asetukset</string>
@@ -395,7 +393,7 @@ limitations under the License.
   <string name="sd_unavail">Muistikortti ei ole käytettävissä</string>
   <string name="speed">Nopeus</string>
   <string name="start_trip">Sinun pitää ensin aloittaa matka.</string>
-  <string name="statistics">Tilastot</string>
+  <string name="marker_type_statistics">Tilastot</string>
   <string name="total_distance_label">Kokonaismatka</string>
   <string name="distance_label">Matka</string>
   <string name="power">Teho</string>
diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml
index 89b1cc230..2df0d3331 100644
--- a/MyTracks/res/values-fr/strings.xml
+++ b/MyTracks/res/values-fr/strings.xml
@@ -35,31 +35,31 @@ limitations under the License.
   
   <!-- Error messages -->
   <string name="error_no_location_manager">Aucune source de localisation n\'a été trouvée sur ce système !</string>
-  <string name="error_no_gps">Aucune source GPS de localisation n\'a été trouvée sur ce système.</string>
+  <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="error_unable_to_start_recording">Impossible de débuter l\'enregistrement. Réessayez.</string>
+  <string name="track_unable_to_start_recording">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>
   <string name="error_import_generic">Une erreur a eu lieu. Essayez de nouveau s\'il vous plaît.</string>
   <string name="error_export_track_does_not_exist">Le parcours n\'existe pas.</string>
   <string name="error_import_out_of_memory">Ce fichier est trop gros (sa taille doit être inférieure à 500ko). Abandon.</string>
-  <string name="error_unable_to_insert_marker">Impossible d\'insérer une balise.  Position inconnue.</string>
+  <string name="marker_insert_error">Impossible d\'insérer une balise.  Position inconnue.</string>
 
   <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Attente du signal GPS. Assurez-vous que le ciel est bien visible.</string>
+  <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="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>
   <string name="sending_to_docs_success_new_doc">Votre parcours a été envoyé dans un tableur à docs.google.com.</string>
   <string name="sending_to_docs_success_existing_doc">Votre parcours a été envoyé à docs.google.com.</string>
-  <string name="status_need_to_enable_gps">Cliquez ici et allez dans \'Paramètres\', \'Sécurité et Localisation\' et selectionnez \'Activer les satellites GPS\'. Appuyez sur le bouton de retour pour revenir au menu.</string>
+  <string name="gps_need_to_enable">Cliquez ici et allez dans \'Paramètres\', \'Sécurité et Localisation\' et selectionnez \'Activer les satellites GPS\'. Appuyez sur le bouton de retour pour revenir au menu.</string>
   <string name="status_approximate_current_location">Note : Votre position est approximative, elle a été déterminée par les antennes de téléphonie ou le réseau WiFi.</string>
   <string name="status_no_current_location">Votre position ne peut être déterminée. Vérifiez votre configuration dans \'Paramètres\', \'Sécurité et Localisation\'. Assurez-vous également que le ciel soit bien visible.</string>
   <string name="status_waypoint_inserted">Un point de passage a été inséré.</string>
-  <string name="status_marker_inserted">Une balise de statistiques a été insérée.</string>
+  <string name="marker_insert_success">Une balise de statistiques a été insérée.</string>
 
   <!-- Progress dialog -->
   <string name="progress_title">Patientez SVP...</string>
@@ -99,13 +99,13 @@ limitations under the License.
   <string name="no">Non</string>
   <string name="yes">Oui</string>
   <string name="error">Erreur</string>
-  <string name="waypoint">Point de passage</string>
+  <string name="marker_type_waypoint">Point de passage</string>
   <string name="cancel">Annuler</string>
   <string name="save">Enregistrer</string>
 
   <!-- Placemark labels for start and end of track -->
-  <string name="start">(Début)</string>
-  <string name="end">(Fin)</string>
+  <string name="marker_label_start">(Début)</string>
+  <string name="marker_label_end">(Fin)</string>
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Afficher</string>
@@ -131,13 +131,13 @@ limitations under the License.
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Supprimer toutes les balises</string>
-  <string name="waypointslist_this_waypoint">Ce marqueur</string>
-  <string name="waypointslist_delete_waypoint">Supprimer</string>
-  <string name="waypointslist_edit_waypoint">Consulter les détails</string>
-  <string name="waypointslist_show_waypoint">Indiquer sur la carte</string>
-  <string name="waypointslist_btn_insert_waypoint">Ajout point de passage</string>
-  <string name="waypointslist_btn_insert_statistics">Ajout de statistiques</string>
-  <string name="waypointslist_pick_one">Choisissez une balise. Faites un appui prolongé pour plus d\'options.</string>
+  <string name="marker_list_this_marker">Ce marqueur</string>
+  <string name="marker_list_delete_marker">Supprimer</string>
+  <string name="marker_list_edit_marker">Consulter les détails</string>
+  <string name="marker_list_show_on_map">Indiquer sur la carte</string>
+  <string name="marker_list_insert_waypoint">Ajout point de passage</string>
+  <string name="marker_list_insert_statistics">Ajout de statistiques</string>
+  <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>
@@ -149,13 +149,11 @@ limitations under the License.
   <string name="trackdetails_category_hint">Type d\'activité</string>
 
   <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Details balise</string>
-  <string name="waypointdetails_name">Nom de la balise</string>
-  <string name="waypointdetails_name_hint">Nom de la balise</string>
-  <string name="waypointdetails_description">Description balise</string>
-  <string name="waypointdetails_description_hint">Description balise</string>
-  <string name="waypointdetails_category">Nom de balise (par ex.: immeuble, boutique, point de vue...)</string>
-  <string name="waypointdetails_category_hint">Nom de balise</string>
+  <string name="marker_detail_title">Details balise</string>
+  <string name="marker_detail_marker_name">Nom de la balise</string>
+  <string name="marker_detail_marker_description">Description balise</string>
+  <string name="marker_detail_marker_type">Nom de balise (par ex.: immeuble, boutique, point de vue...)</string>
+  <string name="marker_detail_marker_type_hint">Nom de balise</string>
 
   <!-- MyTracks Settings -->
   <string name="settings_title">Paramètres My Tracks</string>
@@ -314,7 +312,7 @@ limitations under the License.
   <string name="heart_rate">Rythme cardiaque</string>
   <string name="max_heart_rate">Rythme cardiaque maximum</string>
   <string name="unknown">-</string>
-  <string name="statistics">Statistiques</string>
+  <string name="marker_type_statistics">Statistiques</string>
   <string name="total_distance_label">Distance totale</string>
   <string name="waiting">Patientez</string>
 
diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml
index 7ad03accf..e160ef0dc 100644
--- a/MyTracks/res/values-it/strings.xml
+++ b/MyTracks/res/values-it/strings.xml
@@ -32,31 +32,31 @@ limitations under the License.
 
   <!-- Error messages -->
   <string name="error_no_location_manager">Nessuna fonte di posizione trovata su questo dispositivo.</string>
-  <string name="error_no_gps">Nessuna fonte di posizione GPS trovata su questo dispositivo.</string>
+  <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="error_unable_to_start_recording">Impossibile iniziare la registrazione. Riprova.</string>
+  <string name="track_unable_to_start_recording">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>
   <string name="error_import_generic">Si è verificato un errore. Per favore riprova.</string>
   <string name="error_export_track_does_not_exist">Il percorso non esiste.</string>
   <string name="error_import_out_of_memory">Il file è troppo grande (dev\'essere meno di 500 KB). Azione abbandonata.</string>
-  <string name="error_unable_to_insert_marker">Impossibile inserire il segnaposto. La posizione corrente non è disponibile.</string>
+  <string name="marker_insert_error">Impossibile inserire il segnaposto. La posizione corrente non è disponibile.</string>
 
   <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Sto aspettando il fix del GPS. Accertati che il cielo sia visibile.</string>
+  <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="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>
   <string name="sending_to_docs_success_new_doc">Il tuo percorso è stato inviato ad un nuovo foglio di calcolo su docs.google.com.</string>
   <string name="sending_to_docs_success_existing_doc">Il tuo percorso è stato inviato a docs.google.com.</string>
-  <string name="status_need_to_enable_gps">Premi qui per andare a «Impostazioni di posizione e protezione» e attiva «Utilizza satelliti GPS». Poi premi il tasto di ritorno per tornare qui.</string>
+  <string name="gps_need_to_enable">Premi qui per andare a «Impostazioni di posizione e protezione» e attiva «Utilizza satelliti GPS». Poi premi il tasto di ritorno per tornare qui.</string>
   <string name="status_approximate_current_location">Nota: la posizione indicata è un\'approssimazione determinata in base alle antenne cellulari e reti WIFI vicine.</string>
   <string name="status_no_current_location">La posizione non può essere determinata. Attiva più fonti di posizione (vedi «Impostazioni di posizione e protezione») e eccertati che il cielo sia visibile. Riprova più tardi.</string>
   <string name="status_waypoint_inserted">Inserito un punto di passaggio.</string>
-  <string name="status_marker_inserted">Inserito un segnaposto con statistiche.</string>
+  <string name="marker_insert_success">Inserito un segnaposto con statistiche.</string>
 
   <!-- Progress dialog -->
   <string name="progress_title">Attendi per favore...</string>
@@ -99,13 +99,13 @@ limitations under the License.
   <string name="ok">OK</string>
   <string name="error">Errore</string>
   <string name="success">Successo</string>
-  <string name="waypoint">Punto di passaggio</string>
+  <string name="marker_type_waypoint">Punto di passaggio</string>
   <string name="cancel">Annulla</string>
   <string name="save">Salva</string>
 
   <!-- Placemark labels for start and end of track -->
-  <string name="start">(Inizio)</string>
-  <string name="end">(Fine)</string>
+  <string name="marker_label_start">(Inizio)</string>
+  <string name="marker_label_end">(Fine)</string>
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Mostra</string>
@@ -134,13 +134,13 @@ limitations under the License.
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Elimina tutti i segnaposti</string>
-  <string name="waypointslist_this_waypoint">Questo segnaposto</string>
-  <string name="waypointslist_delete_waypoint">Elimina</string>
-  <string name="waypointslist_edit_waypoint">Modifica dettagli</string>
-  <string name="waypointslist_show_waypoint">Mostra sulla mappa</string>
-  <string name="waypointslist_btn_insert_waypoint">Inserisci punto di passaggio</string>
-  <string name="waypointslist_btn_insert_statistics">Inserisci statistiche</string>
-  <string name="waypointslist_pick_one">Scegli un segnaposto. Tieni premuto per più opzioni.</string>
+  <string name="marker_list_this_marker">Questo segnaposto</string>
+  <string name="marker_list_delete_marker">Elimina</string>
+  <string name="marker_list_edit_marker">Modifica dettagli</string>
+  <string name="marker_list_show_on_map">Mostra sulla mappa</string>
+  <string name="marker_list_insert_waypoint">Inserisci punto di passaggio</string>
+  <string name="marker_list_insert_statistics">Inserisci statistiche</string>
+  <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>
@@ -152,13 +152,11 @@ limitations under the License.
   <string name="trackdetails_category_hint">Tipo di attività</string>
 
   <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Dettagli sul segnaposto</string>
-  <string name="waypointdetails_name">Nome del segnaposto</string>
-  <string name="waypointdetails_name_hint">Nome del segnaposto</string>
-  <string name="waypointdetails_description">Descrizione del segnaposto</string>
-  <string name="waypointdetails_description_hint">Descrizione del segnaposto</string>
-  <string name="waypointdetails_category">Tipo di segnaposto (ad es. edificio, buca, vista...)</string>
-  <string name="waypointdetails_category_hint">Tipo di segnaposto</string>
+  <string name="marker_detail_title">Dettagli sul segnaposto</string>
+  <string name="marker_detail_marker_name">Nome del segnaposto</string>
+  <string name="marker_detail_marker_description">Descrizione del segnaposto</string>
+  <string name="marker_detail_marker_type">Tipo di segnaposto (ad es. edificio, buca, vista...)</string>
+  <string name="marker_detail_marker_type_hint">Tipo di segnaposto</string>
 
   <!-- MyTracks Settings -->
   <string name="settings_title">Impostazioni di My Tracks</string>
@@ -293,7 +291,7 @@ limitations under the License.
   <string name="sd_unavail">Scheda SD non disponibile</string>
   <string name="speed">Velocità</string>
   <string name="start_trip">Devi prima iniziare un percorso.</string>
-  <string name="statistics">Statistiche</string>
+  <string name="marker_type_statistics">Statistiche</string>
   <string name="total_distance_label">Distanza totale</string>
   <string name="distance_label">Distanza</string>
   <string name="unknown">-</string>
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index a73020785..b698aa530 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -34,21 +34,21 @@ limitations under the License.
 
   <!-- Error messages -->
   <string name="error_no_location_manager">この端末でロケーションマネージャを発見できませんでした．</string>
-  <string name="error_no_gps">この端末でGPSロケーションプロバイダを発見できました．</string>
+  <string name="gps_not_found">この端末でGPSロケーションプロバイダを発見できました．</string>
   <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="error_unable_to_start_recording">記録作成開始できません．もう一度試して下さい．</string>
+  <string name="track_unable_to_start_recording">記録作成開始できません．もう一度試して下さい．</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>
   <string name="error_import_generic">エラーが発生しました．もう一度試して下さい．</string>
   <string name="error_export_track_does_not_exist">トラックが存在しません．</string>
   <string name="error_import_out_of_memory">大きなファイルです(500KB未満でなければなりません)．終了します．</string>
-  <string name="error_unable_to_insert_marker">マーカーの挿入ができません．位置決定ができません．</string>
+  <string name="marker_insert_error">マーカーの挿入ができません．位置決定ができません．</string>
 
   <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">GPS位置精度がよくなるまで待機しています．空が見えるところにいて下さい．</string>
+  <string name="gps_wait_for_fix">GPS位置精度がよくなるまで待機しています．空が見えるところにいて下さい．</string>
   <string name="status_now_recording">新しいトラックを記録中です．</string>
   <string name="status_stopped_recording">トラック記録を停止しました．</string>
   <string name="sending_to_my_maps_success_new_map">新しいマイマップをmap.google.comに作成しました．</string>
@@ -57,11 +57,11 @@ limitations under the License.
   <string name="sending_to_docs_success_new_doc">トラックをdocs.google.comの新しいスプレッドシートに送信しました．</string>
   <string name="sending_to_docs_success_existing_doc">トラックをdocs.google.comに送信しました．</string>
   <string name="sending_to_google_additional_info">新しいトラックが表示されるまでに数分かかることがあります．</string>
-  <string name="status_need_to_enable_gps">ここをタップして「位置情報とセキュリティの設定」を開いて「GPS機能を使用」にチェックを入れて下さい．バックボタンで戻ってください．</string>
+  <string name="gps_need_to_enable">ここをタップして「位置情報とセキュリティの設定」を開いて「GPS機能を使用」にチェックを入れて下さい．バックボタンで戻ってください．</string>
   <string name="status_approximate_current_location">ご注意: 携帯電話中継局とWi-Fiネットワークから大まかな位置を特定します．</string>
   <string name="status_no_current_location">現在位置決定ができません．位置取得源を増やし(位置情報とセキュリティの設定 をご覧ください)、空が見えるようにして下さい．もう一度試して下さい．</string>
   <string name="status_waypoint_inserted">ウェイポイントマーカーを挿入しました．</string>
-  <string name="status_marker_inserted">統計マーカーを挿入しました．</string>
+  <string name="marker_insert_success">統計マーカーを挿入しました．</string>
 
   <!-- Progress dialog -->
   <string name="progress_title">お待ちください...</string>
@@ -110,14 +110,14 @@ limitations under the License.
   <string name="yes">はい</string>
   <string name="error">エラー</string>
   <string name="success">成功</string>
-  <string name="waypoint">ウェイポイント</string>
+  <string name="marker_type_waypoint">ウェイポイント</string>
   <string name="license">ライセンス</string>
   <string name="cancel">キャンセル</string>
   <string name="save">保存</string>
 
   <!-- Placemark labels for start and end of track -->
-  <string name="start">(開始)</string>
-  <string name="end">(終了)</string>
+  <string name="marker_label_start">(開始)</string>
+  <string name="marker_label_end">(終了)</string>
 
   <!--  TrackList -->
   <string name="tracklist_show_track">表示</string>
@@ -163,13 +163,13 @@ limitations under the License.
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">全てのマーカーの削除</string>
-  <string name="waypointslist_this_waypoint">このマーカー</string>
-  <string name="waypointslist_delete_waypoint">削除</string>
-  <string name="waypointslist_edit_waypoint">詳細編集</string>
-  <string name="waypointslist_show_waypoint">マップに表示</string>
-  <string name="waypointslist_btn_insert_waypoint">ウェイポイントの挿入</string>
-  <string name="waypointslist_btn_insert_statistics">統計情報の挿入</string>
-  <string name="waypointslist_pick_one">マーカーを選択します．オプションを表示するには長押しして下さい．</string>
+  <string name="marker_list_this_marker">このマーカー</string>
+  <string name="marker_list_delete_marker">削除</string>
+  <string name="marker_list_edit_marker">詳細編集</string>
+  <string name="marker_list_show_on_map">マップに表示</string>
+  <string name="marker_list_insert_waypoint">ウェイポイントの挿入</string>
+  <string name="marker_list_insert_statistics">統計情報の挿入</string>
+  <string name="marker_list_pick_one">マーカーを選択します．オプションを表示するには長押しして下さい．</string>
 
   <!-- MyTracks Details -->
   <string name="trackdetails_title">トラック詳細</string>
@@ -181,13 +181,11 @@ limitations under the License.
   <string name="trackdetails_category_hint">活動タイプ</string>
 
   <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">マーカー詳細</string>
-  <string name="waypointdetails_name">マーカー名</string>
-  <string name="waypointdetails_name_hint">マーカー名</string>
-  <string name="waypointdetails_description">マーカー説明</string>
-  <string name="waypointdetails_description_hint">マーカー説明</string>
-  <string name="waypointdetails_category">マーカータイプ(建物、洞穴、名所...)</string>
-  <string name="waypointdetails_category_hint">マーカータイプ</string>
+  <string name="marker_detail_title">マーカー詳細</string>
+  <string name="marker_detail_marker_name">マーカー名</string>
+  <string name="marker_detail_marker_description">マーカー説明</string>
+  <string name="marker_detail_marker_type">マーカータイプ(建物、洞穴、名所...)</string>
+  <string name="marker_detail_marker_type_hint">マーカータイプ</string>
 
   <!-- MyTracks Settings -->
   <string name="settings_title">My Tracks設定</string>
@@ -369,7 +367,7 @@ limitations under the License.
   <string name="sd_unavail">SD が発見できません</string>
   <string name="speed">速度</string>
   <string name="start_trip">移動して下さい．</string>
-  <string name="statistics">統計</string>
+  <string name="marker_type_statistics">統計</string>
   <string name="total_distance_label">合計距離</string>
   <string name="distance_label">距離</string>
   <string name="power">心拍強度</string>
diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml
index fd1fe6f1b..80ddc224b 100644
--- a/MyTracks/res/values-pl/strings.xml
+++ b/MyTracks/res/values-pl/strings.xml
@@ -33,31 +33,31 @@ limitations under the License.
 
   <!-- Error messages -->
   <string name="error_no_location_manager">Brak menedżera lokalizacji na urządzeniu!</string>
-  <string name="error_no_gps">Brak dostawcy lokalizacji GPS na urządzeniu.</string>
+  <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="error_unable_to_start_recording">Nie można rozpocząć rejestrowania. Spróbuj ponownie.</string>
+  <string name="track_unable_to_start_recording">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>
   <string name="error_import_generic">Wystąpił błąd. Spróbuj ponownie.</string>
   <string name="error_export_track_does_not_exist">Trasa nie istnieje.</string>
   <string name="error_import_out_of_memory">Plik jest za duży (musi być mniejszy niż 500 KB). Przerywam.</string>
-  <string name="error_unable_to_insert_marker">Nie można wstawić markera. Brak poprawnych danych o lokalizacji.</string>
+  <string name="marker_insert_error">Nie można wstawić markera. Brak poprawnych danych o lokalizacji.</string>
 
   <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Oczekiwanie na lepsze ustalenie pozycji GPS. Upewnij się, że niebo jest widoczne.</string>
+  <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="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>
   <string name="sending_to_docs_success_new_doc">Twoja trasa została wysłana do nowego arkusza na docs.google.com.</string>
   <string name="sending_to_docs_success_existing_doc">Twoja trasa została wysłana do docs.google.com.</string>
-  <string name="status_need_to_enable_gps">Tapnij tutaj, aby przejść do ustawień Lokalizacji i zabezpieczeń, a następnie zaznacz Użyj satelitów GPS. Naciśnij klawisz Wstecz, aby powrócić.</string>
+  <string name="gps_need_to_enable">Tapnij tutaj, aby przejść do ustawień Lokalizacji i zabezpieczeń, a następnie zaznacz Użyj satelitów GPS. Naciśnij klawisz Wstecz, aby powrócić.</string>
   <string name="status_approximate_current_location">Uwaga: używana jest przybliżona lokalizacja ustalona za pomocą stacji komórkowych i sieci WIFI.</string>
   <string name="status_no_current_location">Lokalizacja nie może być obecnie ustalona. Włącz wiecej źródeł (zobacz ustawienia Lokalizacji i zabezpieczeń) i upewnij się, że niebo jest widoczne. Spróbuj później.</string>
   <string name="status_waypoint_inserted">Wstawiono znacznik punktu orientacyjnego.</string>
-  <string name="status_marker_inserted">Wstawiono znacznik statystyk.</string>
+  <string name="marker_insert_success">Wstawiono znacznik statystyk.</string>
 
   <!-- Progress dialog -->
   <string name="progress_title">Proszę czekać...</string>
@@ -100,13 +100,13 @@ limitations under the License.
   <string name="ok">OK</string>
   <string name="error">Błąd</string>
   <string name="success">Powodzenie</string>
-  <string name="waypoint">Punkt orientacyjny</string>
+  <string name="marker_type_waypoint">Punkt orientacyjny</string>
   <string name="cancel">Anuluj</string>
   <string name="save">Zapisz</string>
 
   <!-- Placemark labels for start and end of track -->
-  <string name="start">(Początek)</string>
-  <string name="end">(Koniec)</string>
+  <string name="marker_label_start">(Początek)</string>
+  <string name="marker_label_end">(Koniec)</string>
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Pokaż</string>
@@ -136,13 +136,13 @@ limitations under the License.
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Wyczyść wszystkie znaczniki</string>
-  <string name="waypointslist_this_waypoint">Ten znacznik</string>
-  <string name="waypointslist_delete_waypoint">Usuń</string>
-  <string name="waypointslist_edit_waypoint">Edytuj szczegóły</string>
-  <string name="waypointslist_show_waypoint">Pokaż na mapie</string>
-  <string name="waypointslist_btn_insert_waypoint">Wstaw punkt orientacyjny</string>
-  <string name="waypointslist_btn_insert_statistics">Wstaw statystyki</string>
-  <string name="waypointslist_pick_one">Wybierz znacznik. Naciśnij i przytrzymaj, aby wybrać opcje.</string>
+  <string name="marker_list_this_marker">Ten znacznik</string>
+  <string name="marker_list_delete_marker">Usuń</string>
+  <string name="marker_list_edit_marker">Edytuj szczegóły</string>
+  <string name="marker_list_show_on_map">Pokaż na mapie</string>
+  <string name="marker_list_insert_waypoint">Wstaw punkt orientacyjny</string>
+  <string name="marker_list_insert_statistics">Wstaw statystyki</string>
+  <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>
@@ -154,13 +154,11 @@ limitations under the License.
   <string name="trackdetails_category_hint">Typ aktywności</string>
 
   <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Szczegóły znacznika</string>
-  <string name="waypointdetails_name">Nazwa znacznika</string>
-  <string name="waypointdetails_name_hint">Nazwa znacznika</string>
-  <string name="waypointdetails_description">Opis znacznika</string>
-  <string name="waypointdetails_description_hint">Opis znacznika</string>
-  <string name="waypointdetails_category">Typ znacznika (np. budynek, jaskinia, punkt widokowy...)</string>
-  <string name="waypointdetails_category_hint">Typ znacznika</string>
+  <string name="marker_detail_title">Szczegóły znacznika</string>
+  <string name="marker_detail_marker_name">Nazwa znacznika</string>
+  <string name="marker_detail_marker_description">Opis znacznika</string>
+  <string name="marker_detail_marker_type">Typ znacznika (np. budynek, jaskinia, punkt widokowy...)</string>
+  <string name="marker_detail_marker_type_hint">Typ znacznika</string>
 
   <!-- MyTracks Settings -->
   <string name="settings_title">Ustawienia My Tracks</string>
@@ -321,7 +319,7 @@ limitations under the License.
   <string name="sd_unavail">Karta SD niedostępna</string>
   <string name="speed">Prędkość</string>
   <string name="start_trip">Musisz rozpocząć podróż.</string>
-  <string name="statistics">Statystyki</string>
+  <string name="marker_type_statistics">Statystyki</string>
   <string name="total_distance_label">Całkowita odległość</string>
   <string name="distance_label">Odległość</string>
   <string name="unknown">-</string>
diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml
index faa6bdbad..d663cb0af 100644
--- a/MyTracks/res/values-pt-rBR/strings.xml
+++ b/MyTracks/res/values-pt-rBR/strings.xml
@@ -32,31 +32,31 @@ limitations under the License.
 
   <!-- Error messages -->
   <string name="error_no_location_manager">Gerenciador de localização não encontrado neste dispositivo!</string>
-  <string name="error_no_gps">"Provedor de posição de GPS não encontrado neste dispositivo.</string>
+  <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="error_unable_to_start_recording">Impossível iniciar a gravação. Tente novamente.</string>
+  <string name="track_unable_to_start_recording">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>
   <string name="error_import_generic">Ocorreu um erro. Por favor tente novamente.</string>
   <string name="error_export_track_does_not_exist">Caminho não existe.</string>
   <string name="error_import_out_of_memory">O arquivo é grande demais (deve ser menos de 500KB). Abortando.</string>
-  <string name="error_unable_to_insert_marker">Impossível inserir marcador - posição indisponível.</string>
+  <string name="marker_insert_error">Impossível inserir marcador - posição indisponível.</string>
 
   <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Esperando por um sinal melhor do GPS.  Assegure-se de que o céu está visível.</string>
+  <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="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>
   <string name="sending_to_docs_success_new_doc">Seu caminho foi enviado para uma nova planilha em docs.google.com.</string>
   <string name="sending_to_docs_success_existing_doc">Seu caminho foi enviado para docs.google.com.</string>
-  <string name="status_need_to_enable_gps">"Por favor pressione aqui para ir aos ajustes de segurança e localização e verifique que o GPS esteja habilitado. Pressione o botão de voltar para retornar.</string>
+  <string name="gps_need_to_enable">"Por favor pressione aqui para ir aos ajustes de segurança e localização e verifique que o GPS esteja habilitado. Pressione o botão de voltar para retornar.</string>
   <string name="status_approximate_current_location">Nota: Uma localização aproximada, determinada por torres de telefonia celular, está sendo mostrada.</string>
   <string name="status_no_current_location">Sua localização não pôde ser determinada.  Habilite fontes adicionais de localização (veja configurações de Segurança e Localização) e assegure-se de que o céu está visível.</string>
   <string name="status_waypoint_inserted">Um marcador de ponto de passagem foi inserido.</string>
-  <string name="status_marker_inserted">Um marcador de estatísticas foi inserido..</string>
+  <string name="marker_insert_success">Um marcador de estatísticas foi inserido..</string>
 
   <!-- Progress dialog -->
   <string name="progress_title">Por favor aguarde...</string>
@@ -99,13 +99,13 @@ limitations under the License.
   <!-- KEEP_PARENT name="ok" rev="7cbb95c69f35" -->
   <string name="error">Erro</string>
   <string name="success">Successo</string>
-  <string name="waypoint">Ponto de passagem</string>
+  <string name="marker_type_waypoint">Ponto de passagem</string>
   <string name="cancel">Cancelar</string>
   <string name="save">Salvar</string>
 
   <!-- Placemark labels for start and end of track -->
-  <string name="start">(Início)</string>
-  <string name="end">(Fim)</string>
+  <string name="marker_label_start">(Início)</string>
+  <string name="marker_label_end">(Fim)</string>
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Mostrar</string>
@@ -131,13 +131,13 @@ limitations under the License.
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Apagar todos os marcadores</string>
-  <string name="waypointslist_this_waypoint">Este Marcador</string>
-  <string name="waypointslist_delete_waypoint">Apagar</string>
-  <string name="waypointslist_edit_waypoint">Editar detalhes</string>
-  <string name="waypointslist_show_waypoint">Mostrar no mapa</string>
-  <string name="waypointslist_btn_insert_waypoint">Inserir ponto no caminho</string>
-  <string name="waypointslist_btn_insert_statistics">Inserir estatísticas</string>
-  <string name="waypointslist_pick_one">Escolha um marcador.  Pressione&amp;segure para mais opções.</string>
+  <string name="marker_list_this_marker">Este Marcador</string>
+  <string name="marker_list_delete_marker">Apagar</string>
+  <string name="marker_list_edit_marker">Editar detalhes</string>
+  <string name="marker_list_show_on_map">Mostrar no mapa</string>
+  <string name="marker_list_insert_waypoint">Inserir ponto no caminho</string>
+  <string name="marker_list_insert_statistics">Inserir estatísticas</string>
+  <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>
@@ -149,13 +149,11 @@ limitations under the License.
   <string name="trackdetails_category_hint">Tipo de Atividade</string>
 
   <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Detalhes do Marcador</string>
-  <string name="waypointdetails_name">Nome do Marcador</string>
-  <string name="waypointdetails_name_hint">Nome do Marcador</string>
-  <string name="waypointdetails_description">Descrição do Marcador</string>
-  <string name="waypointdetails_description_hint">Descrição do Marcador</string>
-  <string name="waypointdetails_category">Tipo do Marcador (por ex. Prédio, Mirante, Cachoeira...)</string>
-  <string name="waypointdetails_category_hint">Tipo do Marcador</string>
+  <string name="marker_detail_title">Detalhes do Marcador</string>
+  <string name="marker_detail_marker_name">Nome do Marcador</string>
+  <string name="marker_detail_marker_description">Descrição do Marcador</string>
+  <string name="marker_detail_marker_type">Tipo do Marcador (por ex. Prédio, Mirante, Cachoeira...)</string>
+  <string name="marker_detail_marker_type_hint">Tipo do Marcador</string>
 
   <!-- MyTracks Settings -->
   <string name="settings_title">Configurações do My Tracks</string>
@@ -272,7 +270,7 @@ limitations under the License.
   <string name="sd_unavail">SD não disponível</string>
   <string name="speed">Velocidade</string>
   <string name="start_trip">Você deve começar uma viagem.</string>
-  <string name="statistics">Estatísticas</string>
+  <string name="marker_type_statistics">Estatísticas</string>
   <string name="total_distance_label">Distância Total</string>
   <string name="distance_label">Distância</string>
   <string name="unknown">-</string>
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index c54641154..acdbb995b 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -34,22 +34,22 @@ limitations under the License.
 
   <!-- Error messages -->
   <string name="error_no_location_manager">На этом устройстве не был обнаружен диспетчер местоположения!</string>
-  <string name="error_no_gps">На этом устройстве не был обнаружен поставщик GPS местоположения.</string>
+  <string name="gps_not_found">На этом устройстве не был обнаружен поставщик GPS местоположения.</string>
   <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 Документы.</string>
   <string name="error_sending_generic">Пожалуйста, повторите попытку позже.</string>
-  <string name="error_unable_to_start_recording">Не удалось начать запись. Попробуйте еще раз.</string>
+  <string name="track_unable_to_start_recording">Не удалось начать запись. Попробуйте еще раз.</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>
   <string name="error_import_generic">Произошла ошибка. Пожалуйста, попробуйте еще раз.</string>
   <string name="error_export_track_does_not_exist">Трек не существует.</string>
   <string name="error_import_out_of_memory">Этот файл слишком большой (должен быть меньше, чем 500 КБ). Прервано.</string>
-  <string name="error_unable_to_insert_marker">Невозможно вставить маркер. Местоположение неизвестно.</string>
+  <string name="marker_insert_error">Невозможно вставить маркер. Местоположение неизвестно.</string>
 
   <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Ожидание сигнала GPS. Убедитесь в том, что вы находитесь под открытым небом.</string>
+  <string name="gps_wait_for_fix">Ожидание сигнала GPS. Убедитесь в том, что вы находитесь под открытым небом.</string>
   <string name="status_now_recording">Записывается новый трек.</string>
   <string name="status_stopped_recording">Запись вашего трека остановлена.</string>
   <string name="sending_to_my_maps_success_new_map">Новая Google \"Мои карты\" была создана на maps.google.com.</string>
@@ -58,11 +58,11 @@ limitations under the License.
   <string name="sending_to_docs_success_new_doc">Ваш трек был отправлен в новую электронную таблицу на docs.google.com.</string>
   <string name="sending_to_docs_success_existing_doc">Ваш трек был отправлен в docs.google.com.</string>
   <string name="sending_to_google_additional_info">Это может занять несколько минут, прежде чем появятся новые треки.</string>
-  <string name="status_need_to_enable_gps">Пожалуйста, нажмите здесь для перехода к разделу настроек Координаты и отметьте пункт \"Спутники GPS\". Для возвращения нажмите кнопку Назад.</string>
+  <string name="gps_need_to_enable">Пожалуйста, нажмите здесь для перехода к разделу настроек Координаты и отметьте пункт \"Спутники GPS\". Для возвращения нажмите кнопку Назад.</string>
   <string name="status_approximate_current_location">Примечание: приблизительное местоположение определено относительно вышек сотовой связи и беспроводных сетей.</string>
   <string name="status_no_current_location">В настоящее время местоположение не может быть определено. Включите больше источников местоположение (см. раздел настроек Координаты) и убедитесь в том, что находитесь под открытым небом. Повторите попытку позднее.</string>
   <string name="status_waypoint_inserted">Маркер путевой точки был вставлен.</string>
-  <string name="status_marker_inserted">Маркер статистики был вставлен.</string>
+  <string name="marker_insert_success">Маркер статистики был вставлен.</string>
   <string name="sending_to_google_upload_status">Статус загрузки:</string>
 
   <!-- Progress dialog -->
@@ -113,14 +113,14 @@ limitations under the License.
   <string name="ok">ОК</string>
   <string name="error">Ошибка</string>
   <string name="success">Готово</string>
-  <string name="waypoint">Путевая точка</string>
+  <string name="marker_type_waypoint">Путевая точка</string>
   <string name="license">Лицензия</string>
   <string name="cancel">Отмена</string>
   <string name="save">Сохранить</string>
 
   <!-- Placemark labels for start and end of track -->
-  <string name="start">(Старт)</string>
-  <string name="end">(Конец)</string>
+  <string name="marker_label_start">(Старт)</string>
+  <string name="marker_label_end">(Конец)</string>
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Показать</string>
@@ -166,13 +166,13 @@ limitations under the License.
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Удалить все маркеры</string>
-  <string name="waypointslist_this_waypoint">Этот маркер</string>
-  <string name="waypointslist_delete_waypoint">Удалить</string>
-  <string name="waypointslist_edit_waypoint">Править детали</string>
-  <string name="waypointslist_show_waypoint">Показать на карте</string>
-  <string name="waypointslist_btn_insert_waypoint">Вставить путевую точку</string>
-  <string name="waypointslist_btn_insert_statistics">Вставить статистику</string>
-  <string name="waypointslist_pick_one">Выберите маркер. Нажмите и удерживайте для получения дополнительных возможностей.</string>
+  <string name="marker_list_this_marker">Этот маркер</string>
+  <string name="marker_list_delete_marker">Удалить</string>
+  <string name="marker_list_edit_marker">Править детали</string>
+  <string name="marker_list_show_on_map">Показать на карте</string>
+  <string name="marker_list_insert_waypoint">Вставить путевую точку</string>
+  <string name="marker_list_insert_statistics">Вставить статистику</string>
+  <string name="marker_list_pick_one">Выберите маркер. Нажмите и удерживайте для получения дополнительных возможностей.</string>
 
   <!-- MyTracks Details -->
   <string name="trackdetails_title">Трек детали</string>
@@ -184,13 +184,11 @@ limitations under the License.
   <string name="trackdetails_category_hint">Тип деятельности</string>
 
   <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Маркер детали</string>
-  <string name="waypointdetails_name">Имя маркера</string>
-  <string name="waypointdetails_name_hint">Имя маркера</string>
-  <string name="waypointdetails_description">Описание маркера</string>
-  <string name="waypointdetails_description_hint">Описание маркера</string>
-  <string name="waypointdetails_category">Тип маркера (например: здание, выбоина, достопримечательность...)</string>
-  <string name="waypointdetails_category_hint">Тип маркера</string>
+  <string name="marker_detail_title">Маркер детали</string>
+  <string name="marker_detail_marker_name">Имя маркера</string>
+  <string name="marker_detail_marker_description">Описание маркера</string>
+  <string name="marker_detail_marker_type">Тип маркера (например: здание, выбоина, достопримечательность...)</string>
+  <string name="marker_detail_marker_type_hint">Тип маркера</string>
 
   <!-- MyTracks Settings -->
   <string name="settings_title">Настройки My Tracks</string>
@@ -391,7 +389,7 @@ limitations under the License.
   <string name="sd_unavail">SD карта недоступна</string>
   <string name="speed">Скорость</string>
   <string name="start_trip">Вы должны начать путешествие.</string>
-  <string name="statistics">Статистика</string>
+  <string name="marker_type_statistics">Статистика</string>
   <string name="total_distance_label">Общее расстояние</string>
   <string name="distance_label">Расстояние</string>
   <string name="power">Мощность</string>
diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml
index 0148039fc..cbfe2e526 100644
--- a/MyTracks/res/values-sv/strings.xml
+++ b/MyTracks/res/values-sv/strings.xml
@@ -33,31 +33,31 @@ limitations under the License.
 
   <!-- Error messages -->
   <string name="error_no_location_manager">Ingen platshanterare hittades på denna enhet!</string>
-  <string name="error_no_gps">Ingen GPS-positioneringstjänst hittades på denna enhet.</string>
+  <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="error_unable_to_start_recording">Kan inte starta inspelningen. Försök igen.</string>
+  <string name="track_unable_to_start_recording">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>
   <string name="error_import_generic">Ett fel uppstod. Försök igen.</string>
   <string name="error_export_track_does_not_exist">Spåret finns inte.</string>
   <string name="error_import_out_of_memory">Den här filen är för stor (måste vara mindre än 500 KB). Avbryter.</string>
-  <string name="error_unable_to_insert_marker">Kan inte skapa markör. Ingen position tillgänglig.</string>
+  <string name="marker_insert_error">Kan inte skapa markör. Ingen position tillgänglig.</string>
 
   <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Väntar på bättre GPS-position. Se till att himlen är synlig.</string>
+  <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="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>
   <string name="sending_to_docs_success_new_doc">Ditt spår har skickats till ett nytt kalkylblad på docs.google.com.</string>
   <string name="sending_to_docs_success_existing_doc">Ditt spår har skickats till docs.google.com.</string>
-  <string name="status_need_to_enable_gps">Klicka här för att gå till Säkerhet och Platsinställningar och kryssa i \'aktivera gps-satteliter\'. Tryck på tillbakaknappen för att återgå.</string>
+  <string name="gps_need_to_enable">Klicka här för att gå till Säkerhet och Platsinställningar och kryssa i \'aktivera gps-satteliter\'. Tryck på tillbakaknappen för att återgå.</string>
   <string name="status_approximate_current_location">OBS: En ungefärlig position som avgörs från mobilmaster och WIFI-nät visas.</string>
   <string name="status_no_current_location">En position kan för närvarande inte fastställas. Aktivera mer platskällor (se Säkerhet och Platsinställningar) och se till att himlen är synlig. Försök igen senare.</string>
   <string name="status_waypoint_inserted">En positionsmarkör har lagts in.</string>
-  <string name="status_marker_inserted">En statistikmarkör har lagts in.</string>
+  <string name="marker_insert_success">En statistikmarkör har lagts in.</string>
 
   <!-- Progress dialog -->
   <string name="progress_title">Var god vänta...</string>
@@ -100,13 +100,13 @@ limitations under the License.
   <string name="ok">OK</string>
   <string name="error">Fel</string>
   <string name="success">Lyckades</string>
-  <string name="waypoint">Positionsmärke</string>
+  <string name="marker_type_waypoint">Positionsmärke</string>
   <string name="cancel">Avbryt</string>
   <string name="save">Spara</string>
 
   <!-- Placemark labels for start and end of track -->
-  <string name="start">(Start)</string>
-  <string name="end">(Slut)</string>
+  <string name="marker_label_start">(Start)</string>
+  <string name="marker_label_end">(Slut)</string>
 
   <!--  TrackList -->
   <string name="tracklist_show_track">Visa</string>
@@ -136,13 +136,13 @@ limitations under the License.
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Ta bort alla markörer</string>
-  <string name="waypointslist_this_waypoint">Den här markören</string>
-  <string name="waypointslist_delete_waypoint">Ta bort</string>
-  <string name="waypointslist_edit_waypoint">Ändra detaljer</string>
-  <string name="waypointslist_show_waypoint">Visa på karta</string>
-  <string name="waypointslist_btn_insert_waypoint">Infoga positionspunkt</string>
-  <string name="waypointslist_btn_insert_statistics">Infoga statistik</string>
-  <string name="waypointslist_pick_one">Välj en markör. Tryck &amp; håll för fler alternativ.</string>
+  <string name="marker_list_this_marker">Den här markören</string>
+  <string name="marker_list_delete_marker">Ta bort</string>
+  <string name="marker_list_edit_marker">Ändra detaljer</string>
+  <string name="marker_list_show_on_map">Visa på karta</string>
+  <string name="marker_list_insert_waypoint">Infoga positionspunkt</string>
+  <string name="marker_list_insert_statistics">Infoga statistik</string>
+  <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>
@@ -154,13 +154,11 @@ limitations under the License.
   <string name="trackdetails_category_hint">Aktivitetstyp</string>
 
   <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Markördetaljer</string>
-  <string name="waypointdetails_name">Markörnamn</string>
-  <string name="waypointdetails_name_hint">Markörnamn</string>
-  <string name="waypointdetails_description">Markörbeskrivning</string>
-  <string name="waypointdetails_description_hint">Markörbeskrivning</string>
-  <string name="waypointdetails_category">Markörtyp (e.g. byggnad, grop, sevärdhet...)</string>
-  <string name="waypointdetails_category_hint">Markörtyp</string>
+  <string name="marker_detail_title">Markördetaljer</string>
+  <string name="marker_detail_marker_name">Markörnamn</string>
+  <string name="marker_detail_marker_description">Markörbeskrivning</string>
+  <string name="marker_detail_marker_type">Markörtyp (e.g. byggnad, grop, sevärdhet...)</string>
+  <string name="marker_detail_marker_type_hint">Markörtyp</string>
 
   <!-- MyTracks Settings -->
   <string name="settings_title">My Tracks inställningar</string>
@@ -296,7 +294,7 @@ limitations under the License.
   <string name="sd_unavail">SD otillgängligt</string>
   <string name="speed">Hastighet</string>
   <string name="start_trip">Du måste starta en tur.</string>
-  <string name="statistics">Statistik</string>
+  <string name="marker_type_statistics">Statistik</string>
   <string name="total_distance_label">Total distans</string>
   <string name="distance_label">Distans</string>
   <string name="unknown">-</string>
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index 890f95b04..abbfb9be7 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -34,12 +34,12 @@ limitations under the License.
 
   <!-- Error messages -->
   <string name="error_no_location_manager">此设备上没有位置管理器!</string>
-  <string name="error_no_gps">此设备上没有 GPS 定位装置.</string>
+  <string name="gps_not_found">此设备上没有 GPS 定位装置.</string>
   <string name="error_sending_to_my_maps">发送轨迹到 Google My Map 时发生错误.</string>
   <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="error_unable_to_start_recording">无法开始记录. 请重试.</string>
+  <string name="track_unable_to_start_recording">无法开始记录. 请重试.</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>
@@ -47,10 +47,10 @@ limitations under the License.
   <string name="error_export_track_does_not_exist">轨迹不存在.</string>
   <string name="error_export_operation_canceled">操作已被取消.</string>
   <string name="error_import_out_of_memory">文件太大 (必须小于 500 KB). 中止操作.</string>
-  <string name="error_unable_to_insert_marker">无法插入标记. 定位尚未完成.</string>
+  <string name="marker_insert_error">无法插入标记. 定位尚未完成.</string>
 
   <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">等待更准确的 GPS 定位. 请确定可以看见天空.</string>
+  <string name="gps_wait_for_fix">等待更准确的 GPS 定位. 请确定可以看见天空.</string>
   <string name="status_now_recording">现在开始记录新的轨迹.</string>
   <string name="status_stopped_recording">停止记录你的轨迹.</string>
   <string name="sending_to_my_maps_success_new_map">已在 maps.google.com 创建了新的 Google My Map.</string>
@@ -59,11 +59,11 @@ limitations under the License.
   <string name="sending_to_docs_success_new_doc">你的轨迹已经作为新的电子表格发送到 docs.google.com.</string>
   <string name="sending_to_docs_success_existing_doc">你的轨迹已经发送到 docs.google.com.</string>
   <string name="sending_to_google_additional_info">可能需要等待几分钟才能看见新的轨迹.</string>
-  <string name="status_need_to_enable_gps">请点击这里进入\'安全和位置设置\'并勾选上\'启用 GPS 卫星\'. 然后用后退键返回.</string>
+  <string name="gps_need_to_enable">请点击这里进入\'安全和位置设置\'并勾选上\'启用 GPS 卫星\'. 然后用后退键返回.</string>
   <string name="status_approximate_current_location">注意: 当前显示的位置是根据无线信号和无线网络计算的近似位置.</string>
   <string name="status_no_current_location">目前无法定位. 请启用更多的位置来源 (在\'安全和位置设置\'中) 并确认天空是可见的. 再重试.</string>
   <string name="status_waypoint_inserted">插入了一个路点标记.</string>
-  <string name="status_marker_inserted">插入了一个统计标记.</string>
+  <string name="marker_insert_success">插入了一个统计标记.</string>
   <string name="sending_to_google_upload_status">上传状态:</string>
 
   <!-- Progress dialog -->
@@ -114,14 +114,14 @@ limitations under the License.
   <string name="ok">确定</string>
   <string name="error">错误</string>
   <string name="success">成功</string>
-  <string name="waypoint">路点</string>
+  <string name="marker_type_waypoint">路点</string>
   <string name="license">授权</string>
   <string name="cancel">取消</string>
   <string name="save">保存</string>
 
   <!-- Placemark labels for start and end of track -->
-  <string name="start">(开始)</string>
-  <string name="end">(结束)</string>
+  <string name="marker_label_start">(开始)</string>
+  <string name="marker_label_end">(结束)</string>
 
   <!--  TrackList -->
   <string name="tracklist_show_track">显示</string>
@@ -167,13 +167,13 @@ limitations under the License.
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">删除所有标记</string>
-  <string name="waypointslist_this_waypoint">此标记</string>
-  <string name="waypointslist_delete_waypoint">删除</string>
-  <string name="waypointslist_edit_waypoint">编辑详情</string>
-  <string name="waypointslist_show_waypoint">在地图上显示</string>
-  <string name="waypointslist_btn_insert_waypoint">插入路点</string>
-  <string name="waypointslist_btn_insert_statistics">插入统计信息</string>
-  <string name="waypointslist_pick_one">选择一个标记. 长按弹出操作菜单.</string>
+  <string name="marker_list_this_marker">此标记</string>
+  <string name="marker_list_delete_marker">删除</string>
+  <string name="marker_list_edit_marker">编辑详情</string>
+  <string name="marker_list_show_on_map">在地图上显示</string>
+  <string name="marker_list_insert_waypoint">插入路点</string>
+  <string name="marker_list_insert_statistics">插入统计信息</string>
+  <string name="marker_list_pick_one">选择一个标记. 长按弹出操作菜单.</string>
 
   <!-- MyTracks Details -->
   <string name="trackdetails_title">轨迹详细信息</string>
@@ -185,13 +185,11 @@ limitations under the License.
   <string name="trackdetails_category_hint">活动类型</string>
 
   <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">标记详细信息</string>
-  <string name="waypointdetails_name">标记名称</string>
-  <string name="waypointdetails_name_hint">标记名称</string>
-  <string name="waypointdetails_description">标记描述</string>
-  <string name="waypointdetails_description_hint">标记描述</string>
-  <string name="waypointdetails_category">标记类型 (例如: 建筑, 陷坑, 景点...)</string>
-  <string name="waypointdetails_category_hint">标记类型</string>
+  <string name="marker_detail_title">标记详细信息</string>
+  <string name="marker_detail_marker_name">标记名称</string>
+  <string name="marker_detail_marker_description">标记描述</string>
+  <string name="marker_detail_marker_type">标记类型 (例如: 建筑, 陷坑, 景点...)</string>
+  <string name="marker_detail_marker_type_hint">标记类型</string>
 
   <!-- MyTracks Settings -->
   <string name="settings_title">My Tracks 设置</string>
@@ -377,7 +375,7 @@ limitations under the License.
   <string name="sd_unavail">没有 SD 卡</string>
   <string name="speed">速度</string>
   <string name="start_trip">你必须先记录轨迹.</string>
-  <string name="statistics">统计</string>
+  <string name="marker_type_statistics">统计</string>
   <string name="total_distance_label">总距离</string>
   <string name="distance_label">距离</string>
   <string name="power">电源</string>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 39bacd83b..a955fd0dc 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -16,6 +16,112 @@ limitations under the License.
 -->
 <resources>
  
+  <!-- GPS -->
+  <string name="gps_need_to_enable"
+    translation_description="In the main view, the message on the top asking the user to enable
+      GPS.">     
+    Please tap here to go to \'Location &amp; security\' settings and check \'Use GPS satellites\'.
+    Press the back button to return.
+  </string> 
+  <string name="gps_not_found"
+    translation_description="On application start, message when there is no GPS on the device.">
+    No GPS is found on the device.
+  </string>
+  <string name="gps_wait_for_fix"
+    translation_description="In the main view, the message on the top indicating My Tracks is
+      waiting for a better GPS fix.">
+    Waiting for a better GPS fix. Make sure the sky is visible.
+  </string> 
+  
+  <!-- Marker -->    
+  <string name="marker_detail_marker_description"
+    translation_description="In the detail page for a waypoint marker, the text field for the marker
+      description.">     
+    Marker Description
+  </string>    
+  <string name="marker_detail_marker_name"
+    translation_description="In the detail page for a waypoint or statistics marker, text field for
+      the marker name.">      
+    Marker Name
+  </string>
+  <string name="marker_detail_marker_type"
+    translation_description="In the detail page for a waypoint marker, the text field for the
+      marker type, including examples.">       
+    Marker Type (e.g. Building, Pothole, Sight...)
+  </string>
+  <string name="marker_detail_marker_type_hint"
+    translation_description="In the detail page for a waypoint marker, the hint in the 'Marker Type'
+      text field when it is empty.">
+    Marker Type
+  </string>
+  <string name="marker_detail_title"
+    translation_description="In the detail page for a waypoint or statistics marker, the title of
+      the page.">
+    Marker Details
+  </string>  
+  <string name="marker_insert_error"
+    translation_description="When inserting a marker, message when not able to insert due to no GPS
+      location and asking the user to try again.">
+    Unable to insert marker. No GPS location. Try again.
+  </string>  
+  <string name="marker_insert_success"
+    translation_description="When inserting a new marker, a message indicating success.">
+    A marker was inserted.
+  </string>
+  <string name="marker_label_end"
+    translation_description="When inserting a marker to indicate the end of a track, the label at
+      the end of the marker name. E.g., the marker is named 'track_name (End)'."> 
+    (End)
+  </string>
+  <string name="marker_label_start"
+    translation_description="When inserting a marker to indicate the beginning of a track, the label
+      at the end of the marker name. E.g., the marker is named 'track_name (Start)'.">
+    (Start)
+  </string>
+  <string name="marker_list_delete_marker"
+    translation_description="In the context menu for a marker, the menu option to delete the
+      marker.">   
+    Delete
+  </string>
+  <string name="marker_list_edit_marker"
+    translation_description="In the context menu for a marker, the menu option to edit the marker's
+      metadata (e.g., name, type, etc.)."> 
+    Edit
+  </string>
+  <string name="marker_list_insert_statistics"
+    translation_description="In the Markers page, the button on the bottom to insert a statistics
+      marker.">            
+    Insert statistics
+  </string>
+  <string name="marker_list_insert_waypoint"
+    translation_description="In the Markers page, the button on the bottom to insert a waypoint
+      marker.">      
+    Insert waypoint
+  </string>
+  <string name="marker_list_pick_one"
+    translation_description="In the Markers page, the instruction at the top of the page informing
+      the user he can press and hold a marker for more options.">
+    Pick a marker. Press &amp; hold for more options.
+  </string>
+  <string name="marker_list_show_on_map"
+    translation_description="In the context menu for a marker, the menu option to show the marker
+      on the map.">      
+    Show on map
+  </string>
+  <string name="marker_list_this_marker"
+    translation_description="In the context menu for a marker, the title indicating that all the 
+      menu options below are for this marker.">      
+    This Marker
+  </string>
+  <string name="marker_type_statistics"
+    translation_description="When inserting a statistics marker, the default name of the marker.">
+    Statistics
+  </string>
+  <string name="marker_type_waypoint"
+    translation_description="When inserting a waypoint marker, the default name of the marker.">
+    Waypoint
+  </string>
+      
   <!-- Menu items for the map, chart, and stat view. -->
   <string name="menu_aggregated_statistics"
     translation_description="In the menu, to go to the aggregated statistics page.">
@@ -66,22 +172,13 @@ limitations under the License.
     translation_description="In the menu, to show a list of all the tracks.">
     Tracks
   </string> 
- 
-  <!-- Error messages when there is no GPS. -->
-  <string name="error_no_gps"
-    translation_description="On application start, message when there is no GPS on the device.">
-    No GPS is found on the device.
-  </string>
-  <string name="error_unable_to_start_recording"
+       
+  <!-- Track -->
+  <string name="track_unable_to_start_recording"
     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="error_unable_to_insert_marker"
-    translation_description="When inserting a marker, message when not able to insert due to no GPS
-      location and asking the user to try again.">
-    Unable to insert marker. No GPS location. Try again.
-  </string>  
 
   <!-- Error messages when sending to Google. -->
   <string name="error_sending_to_google"
@@ -117,18 +214,6 @@ limitations under the License.
     The operation was canceled.
   </string>
 
-  <!-- GPS status messages. -->
-  <string name="status_wait_for_gps_fix"
-    translation_description="In the main view, the message on the top indicating My Tracks is
-      waiting for a better GPS fix.">
-    Waiting for a better GPS fix. Make sure the sky is visible.
-  </string>
-  <string name="status_need_to_enable_gps"
-    translation_description="In the main view, the message on the top asking the user to enable
-      GPS.">     
-    Please tap here to go to \'Location &amp; security\' settings and check \'Use GPS satellites\'.
-    Press the back button to return.
-  </string>
   <string name="status_approximate_current_location"
     translation_description="When displaying the user's current location, a status message
       indicating that GPS is not available and an approximate location is used instead.">
@@ -148,11 +233,7 @@ limitations under the License.
     Now recording a new track.
   </string>
   
-  <!-- Insert marker status message. -->
-  <string name="status_marker_inserted"
-    translation_description="When inserting a new marker, a message indicating success.">
-    A marker was inserted.
-  </string>
+
   
   <!-- Sending to Google status messages. -->
   <string name="sending_to_google_upload_status"
@@ -350,15 +431,7 @@ limitations under the License.
     Error
   </string>
 
-  <!-- Insert markers -->
-  <string name="waypoint"
-    translation_description="When inserting a waypoint marker, the default name of the marker.">
-    Waypoint
-  </string>
-  <string name="statistics"
-    translation_description="When inserting a statistics marker, the default name of the marker.">
-    Statistics
-  </string>
+
   
   <!--  Welcome dialog -->
   <string name="license"
@@ -367,18 +440,6 @@ limitations under the License.
     License
   </string>
   
-  <!-- Labels for start and end of a track -->
-  <string name="start"
-    translation_description="When inserting a marker to indicate the beginning of a track, the label
-      at the end of the marker name. E.g., the marker is named 'track_name (Start)'.">
-    (Start)
-  </string>
-  <string name="end"
-    translation_description="When inserting a marker to indicate the end of a track, the label at
-      the end of the marker name. E.g., the marker is named 'track_name (End)'."> 
-    (End)
-  </string>
-
   <!--  Tracks page -->
   <string name="tracklist_pick_one"
     translation_description="In the Tracks page, the instruction at the top of the page informing
@@ -513,42 +574,7 @@ limitations under the License.
     Import error for file %s
   </string>
 
-  <!-- Markers page. -->
-  <string name="waypointslist_pick_one"
-    translation_description="In the Markers page, the instruction at the top of the page informing
-      the user he can press and hold a marker for more options.">
-    Pick a marker. Press&amp;hold for more options.
-  </string>
-  <string name="waypointslist_btn_insert_waypoint"
-    translation_description="In the Markers page, the button on the bottom to insert a waypoint
-      marker.">      
-    Insert waypoint
-  </string>
-  <string name="waypointslist_btn_insert_statistics"
-    translation_description="In the Markers page, the button on the bottom to insert a statistics
-      marker.">            
-    Insert statistics
-  </string>
-  <string name="waypointslist_this_waypoint"
-    translation_description="In the context menu for a marker, the title indicating that all the 
-      menu options below are for this marker.">      
-    This Marker
-  </string>
-  <string name="waypointslist_show_waypoint"
-    translation_description="In the context menu for a marker, the menu option to show the marker
-      on the map.">      
-    Show on map
-  </string>
-  <string name="waypointslist_edit_waypoint"
-    translation_description="In the context menu for a marker, the menu option to edit the marker's
-      metadata (e.g., title, type, etc.)."> 
-    Edit
-  </string>
-  <string name="waypointslist_delete_waypoint"
-    translation_description="In the context menu for a marker, the menu option to delete the
-      marker.">   
-    Delete
-  </string>
+
 
   <!-- Track detail page -->
   <string name="trackdetails_title"
@@ -585,42 +611,7 @@ limitations under the License.
     Track Description
   </string>
 
-  <!-- Waypoint marker and statistics marker detail page -->
-  <string name="waypointdetails_title"
-    translation_description="In the detail page for a waypoint or statistics marker, the title of
-      the page.">
-    Marker Details
-  </string>
-  <string name="waypointdetails_name"
-    translation_description="In the detail page for a waypoint or statistics marker, text field for
-      the marker name.">      
-    Marker Name
-  </string>
-  <string name="waypointdetails_name_hint"
-    translation_description="In the detail page for a waypoint or statistics marker, the hint in the 
-      'Marker Name' text field when it is empty.">   
-    Marker Name
-  </string>
-  <string name="waypointdetails_category"
-    translation_description="In the detail page for a waypoint marker, the text field for the
-      marker type, including examples.">       
-    Marker Type (e.g. Building, Pothole, Sight...)
-  </string>
-  <string name="waypointdetails_category_hint"
-    translation_description="In the detail page for a waypoint marker, the hint in the 'Marker Type'
-      text field when it is empty.">
-    Marker Type
-  </string>
-  <string name="waypointdetails_description"
-    translation_description="In the detail page for a waypoint marker, the text field for the marker
-      description.">     
-    Marker Description
-  </string>
-  <string name="waypointdetails_description_hint"
-    translation_description="In the detail page for a waypoint marker, the hint in the 'Marker
-      Description' text field when it is empty.">     
-    Marker Description
-  </string>
+
 
   <!-- Settings page -->
   <string name="settings_title"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
index 9a8b60332..56053ae3b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
@@ -504,12 +504,12 @@ public class MapActivity extends com.google.android.maps.MapActivity
     final boolean isGpsDisabled;
     switch (state) {
       case DISABLED:
-        messageId = R.string.status_need_to_enable_gps;
+        messageId = R.string.gps_need_to_enable;
         isGpsDisabled = true;
         break;
       case NO_FIX:
       case BAD_FIX:
-        messageId = R.string.status_wait_for_gps_fix;
+        messageId = R.string.gps_wait_for_fix;
         isGpsDisabled = false;
         break;
       case GOOD_FIX:
@@ -531,7 +531,7 @@ public class MapActivity extends com.google.android.maps.MapActivity
           if (isGpsDisabled) {
             // Give a warning about this state.
             Toast.makeText(MapActivity.this,
-                R.string.error_no_gps,
+                R.string.gps_not_found,
                 Toast.LENGTH_LONG).show();
 
             // Make clicking take the user to the location settings.
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
index 27436e122..2f2e5f5e3 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
@@ -369,13 +369,11 @@ public class MyTracks extends TabActivity implements OnTouchListener {
     try {
       long waypointId = trackRecordingService.insertWaypoint(request);
       if (waypointId >= 0) {
-        Toast.makeText(this, R.string.status_marker_inserted,
-            Toast.LENGTH_LONG).show();
+        Toast.makeText(this, R.string.marker_insert_success, Toast.LENGTH_LONG).show();
       }
       return waypointId;
     } catch (RemoteException e) {
-      Toast.makeText(this, R.string.error_unable_to_insert_marker,
-          Toast.LENGTH_LONG).show();
+      Toast.makeText(this, R.string.marker_insert_error, Toast.LENGTH_LONG).show();
       throw e;
     }
   }
@@ -392,7 +390,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
       // all exceptions it may throw are no longer wrapped in a RemoteException.
     } catch (Exception e) {
       Toast.makeText(this,
-          getString(R.string.error_unable_to_start_recording),
+          getString(R.string.track_unable_to_start_recording),
           Toast.LENGTH_SHORT).show();
       Log.w(TAG, "Unable to start recording.", e);
     }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
index 5e04c6ba8..f24732fef 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
@@ -73,7 +73,7 @@ public class WaypointsList extends ListActivity
       new OnCreateContextMenuListener() {
         public void onCreateContextMenu(ContextMenu menu, View v,
             ContextMenuInfo menuInfo) {
-          menu.setHeaderTitle(R.string.waypointslist_this_waypoint);
+          menu.setHeaderTitle(R.string.marker_list_this_marker);
           AdapterView.AdapterContextMenuInfo info =
               (AdapterView.AdapterContextMenuInfo) menuInfo;
           contextPosition = info.position;
@@ -83,11 +83,11 @@ public class WaypointsList extends ListActivity
           if (waypoint != null) {
             int type = waypoint.getType();
             menu.add(0, Constants.MENU_SHOW, 0,
-                R.string.waypointslist_show_waypoint);
+                R.string.marker_list_show_on_map);
             menu.add(0, Constants.MENU_EDIT, 0,
-                R.string.waypointslist_edit_waypoint);
+                R.string.marker_list_edit_marker);
             menu.add(0, Constants.MENU_DELETE, 0,
-                R.string.waypointslist_delete_waypoint).setEnabled(
+                R.string.marker_list_delete_marker).setEnabled(
                     recordingTrackId < 0 || type == Waypoint.TYPE_WAYPOINT ||
                     info.id != providerUtils.getLastWaypointId(recordingTrackId));
           }
@@ -211,8 +211,7 @@ public class WaypointsList extends ListActivity
     }
     long id = insertWaypoint(request);
     if (id < 0) {
-      Toast.makeText(this, R.string.error_unable_to_insert_marker,
-          Toast.LENGTH_LONG).show();
+      Toast.makeText(this, R.string.marker_insert_error, Toast.LENGTH_LONG).show();
       Log.e(Constants.TAG, "Failed to insert marker.");
       return;
     }
@@ -227,8 +226,7 @@ public class WaypointsList extends ListActivity
       if (trackRecordingService != null) {
         long waypointId = trackRecordingService.insertWaypoint(request);
         if (waypointId >= 0) {
-          Toast.makeText(this, R.string.status_marker_inserted,
-              Toast.LENGTH_LONG).show();
+          Toast.makeText(this, R.string.marker_insert_success, Toast.LENGTH_LONG).show();
           return waypointId;
         }
       } else {
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 8b6e83be1..45219922f 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
@@ -339,7 +339,7 @@ public class SendToFusionTables implements Runnable {
 
         if (totalLocationsRead == 0) {
           // Put a marker at the first point of the first valid segment:
-          String name = track.getName() + " " + context.getString(R.string.start);
+          String name = track.getName() + " " + context.getString(R.string.marker_label_start);
           createNewPoint(name, "", loc, MARKER_TYPE_START);
         }
 
@@ -385,7 +385,7 @@ public class SendToFusionTables implements Runnable {
         track.setDescription("<p>" + originalDescription + "</p><p>"
             + stringUtils.generateTrackDescription(track, distances, elevations)
             + "</p>");
-        String name = track.getName() + " " + context.getString(R.string.end);
+        String name = track.getName() + " " + context.getString(R.string.marker_label_end);
         return createNewPoint(name, track.getDescription(), lastLocation, MARKER_TYPE_END);
       }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java b/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java
index a5b817dc1..7a149c35a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java
@@ -201,8 +201,8 @@ public class MapsFacade {
       iconUrl = END_ICON_URL;
     }
     String title = trackName + " "
-        + (isStart ? context.getString(R.string.start)
-                   : context.getString(R.string.end));
+        + (isStart ? context.getString(R.string.marker_label_start)
+                   : context.getString(R.string.marker_label_end));
     String description = isStart ? "" : trackDescription;
     return buildMyMapsPlacemarkFeature(title, description, iconUrl, geoPoint);
   }
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 c32f88c10..6726f7601 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
@@ -962,7 +962,7 @@ public class TrackRecordingService extends Service {
       wpt.setIcon(request.getIconUrl());
     }
     if (request.getName() == null) {
-      wpt.setName(getString(R.string.waypoint));
+      wpt.setName(getString(R.string.marker_type_waypoint));
     } else {
       wpt.setName(request.getName());
     }
@@ -990,7 +990,7 @@ public class TrackRecordingService extends Service {
 
     // Set the rest of the waypoint data
     waypoint.setType(Waypoint.TYPE_STATISTICS);
-    waypoint.setName(getString(R.string.statistics));
+    waypoint.setName(getString(R.string.marker_type_statistics));
     waypoint.setStatistics(waypointStatsBuilder.getStatistics());
     waypoint.setDescription(utils.generateWaypointDescription(waypoint));
     waypoint.setIcon(getString(R.string.stats_icon_url));
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
index 16b7af12a..75f28c0c6 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
@@ -491,7 +491,7 @@ public class TrackRecordingServiceTest
     Waypoint wpt = providerUtils.getWaypoint(1);
     assertEquals(getContext().getString(R.string.stats_icon_url),
         wpt.getIcon());
-    assertEquals(getContext().getString(R.string.statistics),
+    assertEquals(getContext().getString(R.string.marker_type_statistics),
         wpt.getName());
     assertEquals(Waypoint.TYPE_STATISTICS, wpt.getType());
     assertEquals(123, wpt.getTrackId());
@@ -527,7 +527,7 @@ public class TrackRecordingServiceTest
     Waypoint wpt = providerUtils.getWaypoint(1);
     assertEquals(getContext().getString(R.string.waypoint_icon_url),
         wpt.getIcon());
-    assertEquals(getContext().getString(R.string.waypoint),
+    assertEquals(getContext().getString(R.string.marker_type_waypoint),
         wpt.getName());
     assertEquals(Waypoint.TYPE_WAYPOINT, wpt.getType());
     assertEquals(123, wpt.getTrackId());