diff --git a/MyTracks/res/layout/chart_settings.xml b/MyTracks/res/layout/chart_settings.xml
index ac0a452da..430bd79a3 100644
--- a/MyTracks/res/layout/chart_settings.xml
+++ b/MyTracks/res/layout/chart_settings.xml
@@ -57,7 +57,7 @@ limitations under the License.
             <TextView
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:text="@string/x_axis"
+              android:text="@string/chart_settings_x_axis"
               android:textSize="20dip" />
           </LinearLayout>
           <RadioGroup  android:id="@+id/chart_settings_x"
@@ -66,11 +66,11 @@ limitations under the License.
             <RadioButton android:id="@+id/chart_settings_by_distance"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:text="@string/by_distance"/>
+              android:text="@string/chart_settings_by_distance"/>
             <RadioButton android:id="@+id/chart_settings_by_time"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:text="@string/by_time"/>
+              android:text="@string/chart_settings_by_time"/>
           </RadioGroup>
         </LinearLayout>
       </TableRow>
@@ -90,34 +90,34 @@ limitations under the License.
             <TextView
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:text="@string/y_axis"
+              android:text="@string/chart_settings_y_axis"
               android:textSize="20dip" />
           </LinearLayout>
           <CheckBox android:id="@+id/chart_settings_elevation"
             android:checked="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/elevation_label"/>
+            android:text="@string/stat_elevation"/>
           <CheckBox android:id="@+id/chart_settings_speed"
             android:checked="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/speed"/>
+            android:text="@string/stat_speed"/>
           <CheckBox android:id="@+id/chart_settings_power"
             android:checked="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/power"/>
+            android:text="@string/sensor_state_power"/>
           <CheckBox android:id="@+id/chart_settings_cadence"
             android:checked="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/cadence"/>
+            android:text="@string/sensor_state_cadence"/>
           <CheckBox android:id="@+id/chart_settings_heart_rate"
             android:checked="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/heart_rate"/>
+            android:text="@string/sensor_state_heart_rate"/>
         </LinearLayout>
       </TableRow>
     </TableLayout>
diff --git a/MyTracks/res/layout/mytracks_waypoint_details.xml b/MyTracks/res/layout/mytracks_waypoint_details.xml
index 49ea1cc8c..364cebd76 100644
--- a/MyTracks/res/layout/mytracks_waypoint_details.xml
+++ b/MyTracks/res/layout/mytracks_waypoint_details.xml
@@ -101,12 +101,12 @@ limitations under the License.
             android:id="@+id/total_distance_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/total_distance_label" />
+            android:text="@string/stat_total_distance" />
           <TextView
             android:id="@+id/max_speed_label"
             android:layout_column="4"
             android:layout_span="2"
-            android:text="@string/max_speed_label" />
+            android:text="@string/stat_max_speed" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -125,7 +125,7 @@ limitations under the License.
             android:layout_column="2"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/mile"
+            android:text="@string/unit_mile"
             android:textColor="@color/stat_label_text" />
           <!-- TODO 4/08/2009
           The following is a bad hack to get a spacer the same size as the
@@ -183,12 +183,12 @@ limitations under the License.
             android:id="@+id/track_time_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/total_time_label" />
+            android:text="@string/stat_total_time" />
           <TextView
             android:id="@+id/average_speed_label"
             android:layout_column="4"
             android:layout_span="2"
-            android:text="@string/average_speed_label" />
+            android:text="@string/stat_average_speed" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -255,12 +255,12 @@ limitations under the License.
             android:id="@+id/moving_time_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/moving_time_label" />
+            android:text="@string/stat_moving_time" />
           <TextView
             android:id="@+id/average_moving_speed_label"
             android:layout_column="4"
             android:layout_span="2"
-            android:text="@string/average_moving_speed_label" />
+            android:text="@string/stat_average_moving_speed" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -327,12 +327,12 @@ limitations under the License.
             android:id="@+id/elevation_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/elevation_label" />
+            android:text="@string/stat_elevation" />
           <TextView
             android:id="@+id/elevation_gain_label"
             android:layout_column="4"
             android:layout_span="2"
-            android:text="@string/elevation_gain_label" />
+            android:text="@string/stat_elevation_gain" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -351,7 +351,7 @@ limitations under the License.
             android:layout_column="2"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/feet"
+            android:text="@string/unit_feet"
             android:textColor="@color/stat_label_text"/>
           <TextView
             android:background="@color/black"
@@ -375,7 +375,7 @@ limitations under the License.
             android:layout_column="5"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/feet"
+            android:text="@string/unit_feet"
             android:textColor="@color/stat_label_text" />
         </TableRow>
 
@@ -385,12 +385,12 @@ limitations under the License.
             android:id="@+id/min_elevation_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/min_elevation_label" />
+            android:text="@string/stat_min_elevation" />
           <TextView
             android:id="@+id/max_elevation_label"
             android:layout_column="4"
             android:layout_span="3"
-            android:text="@string/max_elevation_label" />
+            android:text="@string/stat_max_elevation" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -409,7 +409,7 @@ limitations under the License.
             android:layout_column="2"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/feet"
+            android:text="@string/unit_feet"
             android:textColor="@color/stat_label_text" />
           <TextView
             android:background="@color/black"
@@ -433,7 +433,7 @@ limitations under the License.
             android:layout_column="5"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/feet"
+            android:text="@string/unit_feet"
             android:textColor="@color/stat_label_text" />
         </TableRow>
 
@@ -443,12 +443,12 @@ limitations under the License.
             android:id="@+id/min_grade_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/min_grade_label" />
+            android:text="@string/stat_min_grade" />
           <TextView
             android:id="@+id/max_grade_label"
             android:layout_column="4"
             android:layout_span="2"
-            android:text="@string/max_grade_label" />
+            android:text="@string/stat_max_grade" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
diff --git a/MyTracks/res/layout/sensor_state.xml b/MyTracks/res/layout/sensor_state.xml
index 6a8cc201b..bc281ed0f 100644
--- a/MyTracks/res/layout/sensor_state.xml
+++ b/MyTracks/res/layout/sensor_state.xml
@@ -52,7 +52,7 @@ limitations under the License.
         <TableRow>
           <TextView
             android:layout_span="5"
-            android:text="@string/sensor_data_time" />
+            android:text="@string/sensor_state_last_sensor_time" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -69,7 +69,7 @@ limitations under the License.
           <TextView
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/power" />
+            android:text="@string/sensor_state_power" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -90,7 +90,7 @@ limitations under the License.
           <TextView
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/cadence" />
+            android:text="@string/sensor_state_cadence" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -110,7 +110,7 @@ limitations under the License.
           <TextView
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/heart_rate" />
+            android:text="@string/sensor_state_heart_rate" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -122,7 +122,7 @@ limitations under the License.
           <TextView
             style="@style/StatsUnitSolo"
             android:layout_column="5"
-            android:text="@string/bpm" />
+            android:text="@string/unit_beat_per_minute" />
         </TableRow>
 
         <!-- Battery Level -->
@@ -131,7 +131,7 @@ limitations under the License.
           <TextView
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/battery_level" />
+            android:text="@string/sensor_state_battery" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
diff --git a/MyTracks/res/layout/stats.xml b/MyTracks/res/layout/stats.xml
index af30d0875..985903027 100644
--- a/MyTracks/res/layout/stats.xml
+++ b/MyTracks/res/layout/stats.xml
@@ -37,7 +37,7 @@ limitations under the License.
         <TextView
           android:id="@+id/speed_label"
           android:layout_span="5"
-          android:text="@string/speed" />
+          android:text="@string/stat_speed" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
@@ -73,12 +73,12 @@ limitations under the License.
           android:id="@+id/total_distance_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/total_distance_label" />
+          android:text="@string/stat_total_distance" />
         <TextView
           android:id="@+id/max_speed_label"
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/max_speed_label" />
+          android:text="@string/stat_max_speed" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
@@ -125,12 +125,12 @@ limitations under the License.
           android:id="@+id/track_time_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/total_time_label" />
+          android:text="@string/stat_total_time" />
         <TextView
           android:id="@+id/average_speed_label"
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/average_speed_label" />
+          android:text="@string/stat_average_speed" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
@@ -171,12 +171,12 @@ limitations under the License.
           android:id="@+id/moving_time_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/moving_time_label" />
+          android:text="@string/stat_moving_time" />
         <TextView
           android:id="@+id/average_moving_speed_label"
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/average_moving_speed_label" />
+          android:text="@string/stat_average_moving_speed" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
@@ -218,12 +218,12 @@ limitations under the License.
           android:id="@+id/elevation_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/elevation_label" />
+          android:text="@string/stat_elevation" />
         <TextView
           android:id="@+id/elevation_gain_label"
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/elevation_gain_label" />
+          android:text="@string/stat_elevation_gain" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
@@ -254,12 +254,12 @@ limitations under the License.
           android:id="@+id/min_elevation_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/min_elevation_label" />
+          android:text="@string/stat_min_elevation" />
         <TextView
           android:id="@+id/max_elevation_label"
           android:layout_column="4"
           android:layout_span="3"
-          android:text="@string/max_elevation_label" />
+          android:text="@string/stat_max_elevation" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
@@ -290,12 +290,12 @@ limitations under the License.
           android:id="@+id/min_grade_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/min_grade_label" />
+          android:text="@string/stat_min_grade" />
         <TextView
           android:id="@+id/max_grade_label"
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/max_grade_label" />
+          android:text="@string/stat_max_grade" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
@@ -319,11 +319,11 @@ limitations under the License.
         <TextView
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/latitude_label" />
+          android:text="@string/stat_latitude" />
         <TextView
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/longitude_label" />
+          android:text="@string/stat_longitude" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
diff --git a/MyTracks/res/layout/track_widget.xml b/MyTracks/res/layout/track_widget.xml
index d7bb7b93e..8a0e17e75 100644
--- a/MyTracks/res/layout/track_widget.xml
+++ b/MyTracks/res/layout/track_widget.xml
@@ -52,7 +52,7 @@ limitations under the License.
           android:id="@+id/appwidget_distance_text" />
         <TextView
           style="@style/WidgetText"
-          android:text="@string/total_distance_label" />
+          android:text="@string/stat_total_distance" />
       </LinearLayout>
       <ImageView
         android:layout_width="fill_parent"
@@ -68,7 +68,7 @@ limitations under the License.
           android:id="@+id/appwidget_time_text" />
         <TextView
           style="@style/WidgetText"
-          android:text="@string/moving_time_label" />
+          android:text="@string/stat_moving_time" />
       </LinearLayout>
       <ImageView
         android:layout_width="fill_parent"
@@ -83,7 +83,7 @@ limitations under the License.
           android:id="@+id/appwidget_speed_text" />
         <TextView
           style="@style/WidgetText"
-          android:text="@string/speed" />
+          android:text="@string/stat_speed" />
       </LinearLayout>
     </LinearLayout>
   </LinearLayout>
diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index c7b45e462..9f1751b6e 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -209,7 +209,7 @@ limitations under the License.
   <string name="settings_recording_name_summary_on">El nom per defecte de la ruta serà la data i hora en que s\'ha iniciat.</string>
   <string name="settings_recording_name_summary_off">Els noms de les rutes seran números que s\'incrementaran per a cada nova ruta.</string>
 
-  <string name="pace_label">Ritme de pas</string>
+  <string name="stat_pace">Ritme de pas</string>
 
   <string name="eclair_required">Suportat només en Android 2.0 i superior</string>
   <string name="settings_sensor_type">Tipus de sensor</string>
@@ -253,40 +253,40 @@ limitations under the License.
 
   <!-- Statistics View -->
   <!-- Average Moving -->
-  <string name="average_moving_speed_label">Velocitat mitjana en moviment</string>
-  <string name="average_moving_pace_label">Ritme mitjà en moviment</string>
+  <string name="stat_average_moving_speed">Velocitat mitjana en moviment</string>
+  <string name="stat_average_moving_pace">Ritme mitjà en moviment</string>
 
   <!-- Average -->
-  <string name="average_speed_label">Velocitat mitjana</string>
-  <string name="average_pace_label">Ritme de pas mitjà</string>
+  <string name="stat_average_speed">Velocitat mitjana</string>
+  <string name="stat_average_pace">Ritme de pas mitjà</string>
 
   <string name="elevation_chart_name">Gràfic d\'elevació</string>
-  <string name="elevation_gain_label">Guany d\'elevació</string>
-  <string name="elevation_label">Elevació</string>
-  <string name="latitude_label">Latitud</string>
-  <string name="longitude_label">Longitud</string>
+  <string name="stat_elevation_gain">Guany d\'elevació</string>
+  <string name="stat_elevation">Elevació</string>
+  <string name="stat_latitude">Latitud</string>
+  <string name="stat_longitude">Longitud</string>
 
   <!-- Min -->
-  <string name="min_elevation_label">Elevació mínima</string>
-  <string name="min_grade_label">Grau mínim</string>
-  <string name="min_pace_label">Ritme de pas mínima</string>
+  <string name="stat_min_elevation">Elevació mínima</string>
+  <string name="stat_min_grade">Grau mínim</string>
+  <string name="stat_min_pace">Ritme de pas mínima</string>
 
   <!-- Max -->
-  <string name="max_elevation_label">Elevació màxima</string>
-  <string name="max_grade_label">Grau màxim</string>
-  <string name="max_speed_label">Velocitat màxima</string>
+  <string name="stat_max_elevation">Elevació màxima</string>
+  <string name="stat_max_grade">Grau màxim</string>
+  <string name="stat_max_speed">Velocitat màxima</string>
 
   <string name="loading_track">S\'està carregant la ruta...</string>
 
   <!-- Chart Settings -->
   <string name="menu_chart_view_chart_settings">Configuració del gràfic</string>
   <!-- X Axis -->
-  <string name="x_axis">Eix X</string>
-  <string name="by_distance">Per distància</string>
-  <string name="by_time">Per temps</string>
+  <string name="chart_settings_x_axis">Eix X</string>
+  <string name="chart_settings_by_distance">Per distància</string>
+  <string name="chart_settings_by_time">Per temps</string>
 
   <!-- Y Axis -->
-  <string name="y_axis">Eix Y</string>
+  <string name="chart_settings_y_axis">Eix Y</string>
 
   <!-- Units -->
   <!-- Time  -->
@@ -308,18 +308,18 @@ limitations under the License.
   <string name="voice_per_mile">per milla</string>
 
   <!-- Stats Labels -->
-  <string name="moving_time_label">Temps en moviment</string>
-  <string name="total_time_label">Temps total</string>
+  <string name="stat_moving_time">Temps en moviment</string>
+  <string name="stat_total_time">Temps total</string>
   <string name="time_label">Temps</string>
   <string name="sd_unavail">La targeta SD no està disponible</string>
-  <string name="speed">Velocitat</string>
+  <string name="stat_speed">Velocitat</string>
   <string name="start_trip">Heu d\'iniciar la marxa.</string>
   <string name="marker_type_statistics">Estadístiques</string>
-  <string name="total_distance_label">Distància total</string>
+  <string name="stat_total_distance">Distància total</string>
   <string name="distance_label">Distància</string>
-  <string name="power">Energia</string>
-  <string name="cadence">Cadència</string>
-  <string name="heart_rate">Freqüència cardíaca</string>
+  <string name="sensor_state_power">Energia</string>
+  <string name="sensor_state_cadence">Cadència</string>
+  <string name="sensor_state_heart_rate">Freqüència cardíaca</string>
   <string name="max_heart_rate">Freqüència cardíaca màxima</string>
   <string name="waiting">S\'està esperant...</string>
 
@@ -395,17 +395,17 @@ limitations under the License.
   <string name="bluetooth_not_connected">El sensor bluetooth no està connectat</string>
 
   <!-- Sensor State -->
-  <string name="sensor_data_time">Dades del sensor de temps</string>
+  <string name="sensor_state_last_sensor_time">Dades del sensor de temps</string>
   <string name="power_meter_enabled">S\'ha habilitat el mesurador de potència</string>
   <string name="heart_rate_monitor_enabled">S\'ha habilitat el monitor de la freqüència cardíaca</string>
   <string name="no_sensor_manager">Cap gestor de sensors</string>
   <string name="enabled">Habilitat</string>
-  <string name="connecting">S\'està connectant</string>
-  <string name="connected">S\'ha connectat</string>
-  <string name="disconnected">S\'ha desconnectat</string>
+  <string name="sensor_state_connecting">S\'està connectant</string>
+  <string name="sensor_state_connected">S\'ha connectat</string>
+  <string name="sensor_state_disconnected">S\'ha desconnectat</string>
   <string name="no_sensor_service">Cap servei de sensor</string>
   <string name="searching">S\'està cercant</string>
-  <string name="sending">S\'està enviant</string>
+  <string name="sensor_state_sending">S\'està enviant</string>
 
   <!-- Sensor Type Options -->
   <string name="settings_sensor_type_none">Cap</string>
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index ac5a2080d..64a2bd9a9 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -212,7 +212,7 @@ limitations under the License.
   <string name="settings_recording_name_summary_on">Der Trackname wird aus Datum und Zeit zum Aufzeichnungsbeginn zusammengesetzt.</string>
   <string name="settings_recording_name_summary_off">Tracknamen erhalten eine fortlaufende Nummer.</string>
 
-  <string name="pace_label">Pace</string>
+  <string name="stat_pace">Pace</string>
 
   <string name="eclair_required">Wird nur unter Android 2.0 oder höher unterstützt</string>
   <string name="settings_sensor_type">Sensortyp</string>
@@ -263,47 +263,47 @@ limitations under the License.
 
   <!-- Statistics View -->
   <!-- Average Moving -->
-  <string name="average_moving_speed_label">Durchschnitt in Bew.</string>
-  <string name="average_moving_pace_label">Pace in Bew.</string>
+  <string name="stat_average_moving_speed">Durchschnitt in Bew.</string>
+  <string name="stat_average_moving_pace">Pace in Bew.</string>
 
   <!-- Average -->
-  <string name="average_speed_label">Durchschnittsgeschw.</string>
-  <string name="average_pace_label">Durchschnitts-Pace</string>
+  <string name="stat_average_speed">Durchschnittsgeschw.</string>
+  <string name="stat_average_pace">Durchschnitts-Pace</string>
 
   <string name="elevation_chart_name">Höhenprofil</string>
-  <string name="elevation_gain_label">Höhengewinn</string>
-  <string name="elevation_label">Höhe</string>
-  <string name="latitude_label">Breitengrad</string>
-  <string name="longitude_label">Längengrad</string>
+  <string name="stat_elevation_gain">Höhengewinn</string>
+  <string name="stat_elevation">Höhe</string>
+  <string name="stat_latitude">Breitengrad</string>
+  <string name="stat_longitude">Längengrad</string>
 
   <!-- Min -->
-  <string name="min_elevation_label">Niedrigste Höhenlage</string>
-  <string name="min_grade_label">Minimale Steigung</string>
-  <string name="min_pace_label">Minimaler Pace</string>
+  <string name="stat_min_elevation">Niedrigste Höhenlage</string>
+  <string name="stat_min_grade">Minimale Steigung</string>
+  <string name="stat_min_pace">Minimaler Pace</string>
 
   <!-- Max -->
-  <string name="max_elevation_label">Höchste Höhenlage</string>
-  <string name="max_grade_label">Maximale Steigung</string>
-  <string name="max_speed_label">Max. Geschwindigkeit</string>
+  <string name="stat_max_elevation">Höchste Höhenlage</string>
+  <string name="stat_max_grade">Maximale Steigung</string>
+  <string name="stat_max_speed">Max. Geschwindigkeit</string>
 
   <string name="loading_track">Lade Track…</string>
 
   <!-- Chart Settings -->
   <string name="menu_chart_view_chart_settings">Diagramm-Einstellungen</string>
   <!-- X Axis -->
-  <string name="x_axis">X-Achse</string>
-  <string name="by_distance">Nach Entfernung</string>
-  <string name="by_time">Nach Zeit</string>
+  <string name="chart_settings_x_axis">X-Achse</string>
+  <string name="chart_settings_by_distance">Nach Entfernung</string>
+  <string name="chart_settings_by_time">Nach Zeit</string>
 
   <!-- Y Axis -->
-  <string name="y_axis">Y-Achse</string>
+  <string name="chart_settings_y_axis">Y-Achse</string>
 
   <!-- Units -->
   <!-- Time  -->
   <string name="voice_hour">Stunde</string>
   <string name="voice_hours">Stunden</string>
-  <string name="hr">Std</string>
-  <string name="min">Min</string>
+  <string name="unit_hour">Std</string>
+  <string name="unit_minute">Min</string>
   <string name="voice_minute">Minute</string>
   <string name="voice_minutes">Minuten</string>
   <string name="voice_second">Sekunde</string>
@@ -311,43 +311,43 @@ limitations under the License.
   <!--string name="milliseconds">ms</string-->
 
   <!-- Distance -->
-  <!--string name="meter">m</string-->
-  <!--string name="kilometer">km</string-->
+  <!--string name="unit_meter">m</string-->
+  <!--string name="unit_kilometer">km</string-->
   <string name="voice_kilometers">Kilometer</string>
-  <string name="feet">Fuß</string>
-  <!--string name="mile">mi</string-->
+  <string name="unit_feet">Fuß</string>
+  <!--string name="unit_mile">mi</string-->
   <string name="voice_miles">Meilen</string>
 
   <!-- Speed and Pace -->
-  <!--string name="kilometer_per_hour">km/h</string-->
+  <!--string name="unit_kilometer_per_hour">km/h</string-->
   <string name="voice_kilometer_per_hour">Kilometer pro Stunde</string>
-  <!--string name="min_per_kilometer">min/km</string-->
+  <!--string name="unit_minute_per_kilometer">min/km</string-->
   <string name="voice_per_kilometer">pro Kilometer</string>
-  <!--string name="mile_per_hour">mi/h</string-->
+  <!--string name="unit_mile_per_hour">mi/h</string-->
   <string name="voice_mile_per_hour">Meilen pro Stunde</string>
-  <!--string name="min_per_mile">min/mi</string-->
+  <!--string name="unit_minute_per_mile">min/mi</string-->
   <string name="voice_per_mile">pro Meile</string>
 
   <!-- Sensors -->
-  <!--string name="watts">W</string-->
+  <!--string name="unit_watt">W</string-->
 
-  <!--string name="revolutions_per_minute">rpm</string-->
-  <!--string name="bpm">bpm</string-->
-  <string name="battery_level">Akkukapazität</string>
+  <!--string name="unit_revolution_per_minute">rpm</string-->
+  <!--string name="unit_beat_per_minute">bpm</string-->
+  <string name="sensor_state_battery">Akkukapazität</string>
 
   <!-- Stats Labels -->
-  <string name="moving_time_label">Zeit in Bewegung</string>
-  <string name="total_time_label">Gesamtzeit</string>
+  <string name="stat_moving_time">Zeit in Bewegung</string>
+  <string name="stat_total_time">Gesamtzeit</string>
   <string name="time_label">Zeit</string>
   <string name="sd_unavail">SD-Karte nicht verfügbar</string>
-  <string name="speed">Geschwindigkeit</string>
+  <string name="stat_speed">Geschwindigkeit</string>
   <string name="start_trip">Du musst erst eine Aufzeichnung beginnen.</string>
   <string name="marker_type_statistics">Statistik</string>
-  <string name="total_distance_label">Gesamtentfernung</string>
+  <string name="stat_total_distance">Gesamtentfernung</string>
   <string name="distance_label">Entfernung</string>
-  <string name="power">Kraft</string>
-  <string name="cadence">Kadenz</string>
-  <string name="heart_rate">Herzfrequenz</string>
+  <string name="sensor_state_power">Kraft</string>
+  <string name="sensor_state_cadence">Kadenz</string>
+  <string name="sensor_state_heart_rate">Herzfrequenz</string>
   <string name="max_heart_rate">Höchste Herzfrequenz</string>
   <!--string name="unknown">-</string-->
   <string name="waiting">Bitte warten…</string>
@@ -428,17 +428,17 @@ limitations under the License.
   <string name="bluetooth_not_connected">Bluetooth-Sensor nicht verbunden.</string>
 
   <!-- Sensor State -->
-  <string name="sensor_data_time">Uhrzeit</string>
+  <string name="sensor_state_last_sensor_time">Uhrzeit</string>
   <string name="power_meter_enabled">Kraftmesser aktiviert</string>
   <string name="heart_rate_monitor_enabled">Herzfrequenzmessung aktiviert</string>
   <string name="no_sensor_manager">Keine Sensoren verfügbar</string>
   <string name="enabled">Aktiviert</string>
-  <string name="connecting">Verbinde...</string>
-  <string name="connected">Verbunden</string>
-  <string name="disconnected">Getrennt</string>
+  <string name="sensor_state_connecting">Verbinde...</string>
+  <string name="sensor_state_connected">Verbunden</string>
+  <string name="sensor_state_disconnected">Getrennt</string>
   <string name="no_sensor_service">Kein Sensor-Dienst</string>
   <string name="searching">Suche...</string>
-  <string name="sending">Sende...</string>
+  <string name="sensor_state_sending">Sende...</string>
 
   <!-- Manifest description (not seen inside the app) -->
   <string name="permission_notification_label">Track-Aufzeichnungs-Benachrichtigungen empfangen</string>
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index a3770780b..2d4956f63 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -255,7 +255,7 @@ limitations under the License.
   <string name="settings_reset_dialog_message">Todas tus preferencias seran borradas o restauradas a sus valores por defecto. Los recorridos se mantendran. ¿Está seguro?</string>
   <string name="settings_reset_done">Todas las preferencias han sido restauradas a sus valores por defecto.</string>
 
-  <string name="pace_label">Paso</string>
+  <string name="stat_pace">Paso</string>
   
   <string name="eclair_required">Sólo soportado en Android 2.0 o superior</string>
   <string name="settings_sensor_type">Tipo de sensor</string>
@@ -332,40 +332,40 @@ limitations under the License.
 
   <!-- Statistics View -->
   <!-- Average Moving -->
-  <string name="average_moving_speed_label">Velocidad promedio en movimiento</string>
-  <string name="average_moving_pace_label">Paso promedio en movimiento</string>
+  <string name="stat_average_moving_speed">Velocidad promedio en movimiento</string>
+  <string name="stat_average_moving_pace">Paso promedio en movimiento</string>
 
   <!-- Average -->
-  <string name="average_speed_label">Velocidad promedio</string>
-  <string name="average_pace_label">Paso promedio</string>
+  <string name="stat_average_speed">Velocidad promedio</string>
+  <string name="stat_average_pace">Paso promedio</string>
 
   <string name="elevation_chart_name">Gráfica de elevación</string>
-  <string name="elevation_gain_label">Aumento de elevación</string>
-  <string name="elevation_label">Elevación</string>
-  <string name="latitude_label">Latitud</string>
-  <string name="longitude_label">Longitud</string>
+  <string name="stat_elevation_gain">Aumento de elevación</string>
+  <string name="stat_elevation">Elevación</string>
+  <string name="stat_latitude">Latitud</string>
+  <string name="stat_longitude">Longitud</string>
 
   <!-- Min -->
-  <string name="min_elevation_label">Elevación mínima</string>
-  <string name="min_grade_label">Pendiente mínima</string>
-  <string name="min_pace_label">Paso mínimo</string>
+  <string name="stat_min_elevation">Elevación mínima</string>
+  <string name="stat_min_grade">Pendiente mínima</string>
+  <string name="stat_min_pace">Paso mínimo</string>
 
   <!-- Max -->
-  <string name="max_elevation_label">Elevación máxima</string>
-  <string name="max_grade_label">Pendiente máxima</string>
-  <string name="max_speed_label">Velocidad máxima</string>
+  <string name="stat_max_elevation">Elevación máxima</string>
+  <string name="stat_max_grade">Pendiente máxima</string>
+  <string name="stat_max_speed">Velocidad máxima</string>
 
   <string name="loading_track">Cargando recorrido...</string>
 
   <!-- Chart Settings -->
   <string name="menu_chart_view_chart_settings">Configuración de gráficas</string>
   <!-- X Axis -->
-  <string name="x_axis">Eje X</string>
-  <string name="by_distance">Como función de distancia</string>
-  <string name="by_time">Como función de tiempo</string>
+  <string name="chart_settings_x_axis">Eje X</string>
+  <string name="chart_settings_by_distance">Como función de distancia</string>
+  <string name="chart_settings_by_time">Como función de tiempo</string>
 
   <!-- Y Axis -->
-  <string name="y_axis">Eje Y</string>
+  <string name="chart_settings_y_axis">Eje Y</string>
 
   <!-- Units -->
   <!-- Time  -->
@@ -378,7 +378,7 @@ limitations under the License.
 
   <!-- Distance -->
   <string name="voice_kilometers">kilómetros</string>
-  <string name="feet">pies</string>
+  <string name="unit_feet">pies</string>
   <string name="voice_miles">millas</string>
 
   <!-- Speed and Pace -->
@@ -388,21 +388,21 @@ limitations under the License.
   <string name="voice_per_mile">por milla</string>
 
   <!-- Sensors -->
-  <string name="battery_level">Nivel de batería</string>
+  <string name="sensor_state_battery">Nivel de batería</string>
 	
   <!-- Stats Labels -->
-  <string name="moving_time_label">Tiempo en movimiento</string>
-  <string name="total_time_label">Tiempo total</string>
+  <string name="stat_moving_time">Tiempo en movimiento</string>
+  <string name="stat_total_time">Tiempo total</string>
   <string name="time_label">Tiempo</string>
   <string name="sd_unavail">SD no disponible</string>
-  <string name="speed">Velocidad</string>
+  <string name="stat_speed">Velocidad</string>
   <string name="start_trip">Debes comenzar un viaje.</string>
   <string name="marker_type_statistics">Estadísticas</string>
-  <string name="total_distance_label">Distancia total</string>
+  <string name="stat_total_distance">Distancia total</string>
   <string name="distance_label">Distancia</string>
-  <string name="power">Potencia</string>
-  <string name="cadence">Cadencia</string>
-  <string name="heart_rate">Ritmo cardíaco</string>
+  <string name="sensor_state_power">Potencia</string>
+  <string name="sensor_state_cadence">Cadencia</string>
+  <string name="sensor_state_heart_rate">Ritmo cardíaco</string>
   <string name="max_heart_rate">Máx ritmo cardíaco</string>
   <string name="waiting">Esperando...</string>
   
@@ -487,17 +487,17 @@ limitations under the License.
   <string name="bluetooth_not_connected">Sensor Bluetooth no conectado</string>
 
   <!-- Sensor State -->
-  <string name="sensor_data_time">Hora de los datos del sensor</string>
+  <string name="sensor_state_last_sensor_time">Hora de los datos del sensor</string>
   <string name="power_meter_enabled">Sensor de batería activado</string>
   <string name="heart_rate_monitor_enabled">Monitor de ritmo cardíaco activado</string>
   <string name="no_sensor_manager">No hay un gestor de sensores</string>
   <string name="enabled">Activado</string>
-  <string name="connecting">Conectando</string>
-  <string name="connected">Conectado</string>
-  <string name="disconnected">Desconectando</string>
+  <string name="sensor_state_connecting">Conectando</string>
+  <string name="sensor_state_connected">Conectado</string>
+  <string name="sensor_state_disconnected">Desconectando</string>
   <string name="no_sensor_service">No hay un servicio de sensores</string>
   <string name="searching">Buscando</string>
-  <string name="sending">Enviando</string>
+  <string name="sensor_state_sending">Enviando</string>
 
   <!-- Manifest description (not seen inside the app) -->
   <string name="permission_notification_label">recibir avisos de registro de recorridos</string>
diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml
index 9a0c76408..3e872444d 100644
--- a/MyTracks/res/values-fi/strings.xml
+++ b/MyTracks/res/values-fi/strings.xml
@@ -247,7 +247,7 @@ limitations under the License.
   <string name="settings_reset_dialog_message">Kaikki asetuksesi poistetaan ja palautetaan oletusarvoisiksi. Tallennetut reitit säilytetään. Oletko varma?</string>
   <string name="settings_reset_done">Oletusasetukset palautettu.</string>
 
-  <string name="pace_label">Tahti</string>
+  <string name="stat_pace">Tahti</string>
 
   <string name="eclair_required">Tuettuna vain Android 2.0 tai uudemmassa</string>
   <string name="settings_sensor_type">Sensorin tyyppi</string>
@@ -313,47 +313,47 @@ limitations under the License.
 
   <!-- Statistics View -->
   <!-- Average Moving -->
-  <string name="average_moving_speed_label">Keskinopeus (liikuttaessa)</string>
-  <string name="average_moving_pace_label">Tahti (liikuttaessa)</string>
+  <string name="stat_average_moving_speed">Keskinopeus (liikuttaessa)</string>
+  <string name="stat_average_moving_pace">Tahti (liikuttaessa)</string>
 
   <!-- Average -->
-  <string name="average_speed_label">Keskinopeus</string>
-  <string name="average_pace_label">Tahti</string>
+  <string name="stat_average_speed">Keskinopeus</string>
+  <string name="stat_average_pace">Tahti</string>
 
   <string name="elevation_chart_name">Korkeuskaavio</string>
-  <string name="elevation_gain_label">Nousu</string>
-  <string name="elevation_label">Korkeus</string>
-  <string name="latitude_label">Leveysaste</string>
-  <string name="longitude_label">Pituuspiiri</string>
+  <string name="stat_elevation_gain">Nousu</string>
+  <string name="stat_elevation">Korkeus</string>
+  <string name="stat_latitude">Leveysaste</string>
+  <string name="stat_longitude">Pituuspiiri</string>
 
   <!-- Min -->
-  <string name="min_elevation_label">Min Korkeus</string>
-  <string name="min_grade_label">Min Kaltevuus</string>
-  <string name="min_pace_label">Min Tahti</string>
+  <string name="stat_min_elevation">Min Korkeus</string>
+  <string name="stat_min_grade">Min Kaltevuus</string>
+  <string name="stat_min_pace">Min Tahti</string>
 
   <!-- Max -->
-  <string name="max_elevation_label">Max Korkeus</string>
-  <string name="max_grade_label">Max Kaltevuus</string>
-  <string name="max_speed_label">Max Nopeus</string>
+  <string name="stat_max_elevation">Max Korkeus</string>
+  <string name="stat_max_grade">Max Kaltevuus</string>
+  <string name="stat_max_speed">Max Nopeus</string>
 
   <string name="loading_track">Ladataan reittiä...</string>
 
   <!-- Chart Settings -->
   <string name="menu_chart_view_chart_settings">Kaavion asetukset</string>
   <!-- X Axis -->
-  <string name="x_axis">X-akseli</string>
-  <string name="by_distance">Etäisyyden mukaan</string>
-  <string name="by_time">Ajan mukaan</string>
+  <string name="chart_settings_x_axis">X-akseli</string>
+  <string name="chart_settings_by_distance">Etäisyyden mukaan</string>
+  <string name="chart_settings_by_time">Ajan mukaan</string>
 
   <!-- Y Axis -->
-  <string name="y_axis">Y-akseli</string>
+  <string name="chart_settings_y_axis">Y-akseli</string>
 
   <!-- Units -->
   <!-- Time  -->
   <string name="voice_hour">tunti</string>
   <string name="voice_hours">tuntia</string>
-  <string name="hr">h</string>
-  <string name="min">min</string>
+  <string name="unit_hour">h</string>
+  <string name="unit_minute">min</string>
   <string name="voice_minute">minuutti</string>
   <string name="voice_minutes">minuuttia</string>
   <string name="voice_second">sekunti</string>
@@ -361,42 +361,42 @@ limitations under the License.
   <string name="milliseconds">ms</string>
 
   <!-- Distance -->
-  <string name="meter">m</string>
-  <string name="kilometer">km</string>
+  <string name="unit_meter">m</string>
+  <string name="unit_kilometer">km</string>
   <string name="voice_kilometers">kilometriä</string>
-  <string name="feet">ft</string>
-  <string name="mile">mi</string>
+  <string name="unit_feet">ft</string>
+  <string name="unit_mile">mi</string>
   <string name="voice_miles">mailia</string>
 
   <!-- Speed and Pace -->
-  <string name="kilometer_per_hour">km/h</string>
+  <string name="unit_kilometer_per_hour">km/h</string>
   <string name="voice_kilometer_per_hour">kilometriä tunnissa</string>
-  <string name="min_per_kilometer">min/km</string>
+  <string name="unit_minute_per_kilometer">min/km</string>
   <string name="voice_per_kilometer">per kilometri</string>
-  <string name="mile_per_hour">mi/h</string>
+  <string name="unit_mile_per_hour">mi/h</string>
   <string name="voice_mile_per_hour">mailia tunnissa</string>
-  <string name="min_per_mile">min/mi</string>
+  <string name="unit_minute_per_mile">min/mi</string>
   <string name="voice_per_mile">per maili</string>
 
   <!-- Sensors -->
-  <string name="watts">W</string>
-  <string name="revolutions_per_minute">rpm</string>
-  <string name="bpm">bpm</string>
-  <string name="battery_level">Akku</string>
+  <string name="unit_watt">W</string>
+  <string name="unit_revolution_per_minute">rpm</string>
+  <string name="unit_beat_per_minute">bpm</string>
+  <string name="sensor_state_battery">Akku</string>
 
   <!-- Stats Labels -->
-  <string name="moving_time_label">Liikkumisaika</string>
-  <string name="total_time_label">Kokonaisaika</string>
+  <string name="stat_moving_time">Liikkumisaika</string>
+  <string name="stat_total_time">Kokonaisaika</string>
   <string name="time_label">Aika</string>
   <string name="sd_unavail">Muistikortti ei ole käytettävissä</string>
-  <string name="speed">Nopeus</string>
+  <string name="stat_speed">Nopeus</string>
   <string name="start_trip">Sinun pitää ensin aloittaa matka.</string>
   <string name="marker_type_statistics">Tilastot</string>
-  <string name="total_distance_label">Kokonaismatka</string>
+  <string name="stat_total_distance">Kokonaismatka</string>
   <string name="distance_label">Matka</string>
-  <string name="power">Teho</string>
-  <string name="cadence">Kadenssi</string>
-  <string name="heart_rate">Syke</string>
+  <string name="sensor_state_power">Teho</string>
+  <string name="sensor_state_cadence">Kadenssi</string>
+  <string name="sensor_state_heart_rate">Syke</string>
   <string name="max_heart_rate">Maksimisyke</string>
   <string name="unknown">-</string>
   <string name="waiting">Odotetaan...</string>
@@ -481,17 +481,17 @@ limitations under the License.
   <string name="bluetooth_not_connected">Bluetooth sensoria ei ole yhdistetty</string>
 
   <!-- Sensor State -->
-  <string name="sensor_data_time">Sensorin data-aika</string>
+  <string name="sensor_state_last_sensor_time">Sensorin data-aika</string>
   <string name="power_meter_enabled">Tehomittari käytössä</string>
   <string name="heart_rate_monitor_enabled">Sykemittari käytössä</string>
   <string name="no_sensor_manager">Ei sensorihallintaa</string>
   <string name="enabled">Käytössä</string>
-  <string name="connecting">Yhdistetään</string>
-  <string name="connected">Yhdistetty</string>
-  <string name="disconnected">Katkaistu</string>
+  <string name="sensor_state_connecting">Yhdistetään</string>
+  <string name="sensor_state_connected">Yhdistetty</string>
+  <string name="sensor_state_disconnected">Katkaistu</string>
   <string name="no_sensor_service">Ei sensoripalvelua</string>
   <string name="searching">Etsitään</string>
-  <string name="sending">Lähetetään</string>
+  <string name="sensor_state_sending">Lähetetään</string>
 
   <string name="settings_sensor_type_none">Ei sensoria</string>
   <string name="settings_sensor_type_ant">ANT+ -sensori</string>
diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml
index 7266ef3c4..636b18528 100644
--- a/MyTracks/res/values-fr/strings.xml
+++ b/MyTracks/res/values-fr/strings.xml
@@ -192,7 +192,7 @@ limitations under the License.
 
   <string name="settings_recording_marker">Fréquence de séparation</string>
   <string name="settings_recording_marker_summary">Temps ou distance minimum avant l\'insertion d\'un marqueur de séparation</string>
-  <string name="pace_label">Rythme</string>
+  <string name="stat_pace">Rythme</string>
 
   <string name="eclair_required">Nécessite au minimum Android 2.0</string>
   <string name="settings_sensor_type">Type de capteur</string>
@@ -241,38 +241,38 @@ limitations under the License.
 
   <!-- Statistics View -->
   <!-- Average Moving -->
-  <string name="average_moving_speed_label">Vitesse moyenne (déplacement)</string>
-  <string name="average_moving_pace_label">Rythme moyen (dépl.)</string>
+  <string name="stat_average_moving_speed">Vitesse moyenne (déplacement)</string>
+  <string name="stat_average_moving_pace">Rythme moyen (dépl.)</string>
 
   <!-- Average -->
-  <string name="average_speed_label">Vitesse moyenne</string>
-  <string name="average_pace_label">Rythme moyen</string>
+  <string name="stat_average_speed">Vitesse moyenne</string>
+  <string name="stat_average_pace">Rythme moyen</string>
 
   <string name="elevation_chart_name">Altitude maximale</string>
-  <string name="elevation_gain_label">Dénivelé cumulé</string>
-  <string name="elevation_label">Altitude</string>
+  <string name="stat_elevation_gain">Dénivelé cumulé</string>
+  <string name="stat_elevation">Altitude</string>
 
   <!-- Min -->
-  <string name="min_elevation_label">Altitude min</string>
-  <string name="min_grade_label">Pente min</string>
-  <string name="min_pace_label">Rythme min</string>
+  <string name="stat_min_elevation">Altitude min</string>
+  <string name="stat_min_grade">Pente min</string>
+  <string name="stat_min_pace">Rythme min</string>
 
   <!-- Max -->
-  <string name="max_elevation_label">Altitude max</string>
-  <string name="max_grade_label">Pente max</string>
-  <string name="max_speed_label">Vitesse max</string>
+  <string name="stat_max_elevation">Altitude max</string>
+  <string name="stat_max_grade">Pente max</string>
+  <string name="stat_max_speed">Vitesse max</string>
 
   <string name="loading_track">Chargement du parcours...</string>
 
   <!-- Chart Settings -->
   <string name="menu_chart_view_chart_settings">Paramètres Graphique</string>
   <!-- X Axis -->
-  <string name="x_axis">Abscisse (X)</string>
-  <string name="by_distance">Par distance</string>
-  <string name="by_time">Par durée</string>
+  <string name="chart_settings_x_axis">Abscisse (X)</string>
+  <string name="chart_settings_by_distance">Par distance</string>
+  <string name="chart_settings_by_time">Par durée</string>
 
   <!-- Y Axis -->
-  <string name="y_axis">Ordonnée (Y)</string>
+  <string name="chart_settings_y_axis">Ordonnée (Y)</string>
 
   <!-- Units -->
   <!-- Time  -->
@@ -282,15 +282,15 @@ limitations under the License.
   <string name="voice_seconds">secondes</string>
 
   <!-- Distance -->
-  <string name="feet">pied</string>
+  <string name="unit_feet">pied</string>
   <string name="voice_kilometers">kilomètres</string>
   <string name="voice_miles">milles</string>
 
   <!-- Speed and Pace -->
-  <string name="kilometer_per_hour">km/h</string>
+  <string name="unit_kilometer_per_hour">km/h</string>
   <string name="voice_kilometer_per_hour">kilomètres/heure</string>
   <string name="voice_per_kilometer">par kilomètre</string>
-  <string name="mile_per_hour">mi/h</string>
+  <string name="unit_mile_per_hour">mi/h</string>
   <string name="voice_mile_per_hour">miles/heure</string>
   <string name="voice_per_mile">per mile</string>
 
@@ -298,20 +298,20 @@ limitations under the License.
   <string name="waiting">Waiting...</string>
   
   <!-- Stats Labels -->
-  <string name="moving_time_label">Durée (déplacement)</string>
-  <string name="total_time_label">Durée totale</string>
+  <string name="stat_moving_time">Durée (déplacement)</string>
+  <string name="stat_total_time">Durée totale</string>
   <string name="time_label">Durée</string>
   <string name="sd_unavail">Carte SD indisponible</string>
-  <string name="speed">Vitesse</string>
+  <string name="stat_speed">Vitesse</string>
   <string name="start_trip">Vous devez commencer un parcours</string>
   <string name="distance_label">Distance</string>
-  <string name="power">Puissance</string>
-  <string name="cadence">Cadence</string>
-  <string name="heart_rate">Rythme cardiaque</string>
+  <string name="sensor_state_power">Puissance</string>
+  <string name="sensor_state_cadence">Cadence</string>
+  <string name="sensor_state_heart_rate">Rythme cardiaque</string>
   <string name="max_heart_rate">Rythme cardiaque maximum</string>
   <string name="unknown">-</string>
   <string name="marker_type_statistics">Statistiques</string>
-  <string name="total_distance_label">Distance totale</string>
+  <string name="stat_total_distance">Distance totale</string>
   <string name="waiting">Patientez</string>
 
   <!-- End User License Agreement -->
@@ -384,17 +384,17 @@ limitations under the License.
   <string name="bluetooth_not_connected">Capteur Bluetooth non connecté</string>
 
   <!-- Sensor State -->
-  <string name="sensor_data_time">Date des données du capteur</string>
+  <string name="sensor_state_last_sensor_time">Date des données du capteur</string>
   <string name="power_meter_enabled">Compteur activé</string>
   <string name="heart_rate_monitor_enabled">Cardiofréquencemètre activé</string>
   <string name="no_sensor_manager">Pas de gestionnaire de capteur</string>
   <string name="enabled">Activé</string>
-  <string name="connecting">Connexion</string>
-  <string name="connected">Connecté</string>
-  <string name="disconnected">Déconnecté</string>
+  <string name="sensor_state_connecting">Connexion</string>
+  <string name="sensor_state_connected">Connecté</string>
+  <string name="sensor_state_disconnected">Déconnecté</string>
   <string name="no_sensor_service">Pas de capteur</string>
   <string name="searching">Recherche</string>
-  <string name="sending">Envoi</string>
+  <string name="sensor_state_sending">Envoi</string>
 
   <!-- Sensor Type Options -->
   <string name="settings_sensor_type_none">Aucun</string>
diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml
index 576f09d1b..021036fb2 100644
--- a/MyTracks/res/values-it/strings.xml
+++ b/MyTracks/res/values-it/strings.xml
@@ -195,7 +195,7 @@ limitations under the License.
 
   <string name="settings_recording_marker">Frequenza di divisione</string>
   <string name="settings_recording_marker_summary">Tempo o distanza massima dopo di cui il percorso verrà diviso</string>
-  <string name="pace_label">Andatura</string>
+  <string name="stat_pace">Andatura</string>
 
   <!-- MyTracksSky -->
   <string name="mytracks_sky">Satelliti GPS</string>
@@ -218,79 +218,79 @@ limitations under the License.
 
   <!-- Statistics View -->
   <!-- Average Moving -->
-  <string name="average_moving_speed_label">Velocità media in moto</string>
-  <string name="average_moving_pace_label">Andatura media in moto</string>
+  <string name="stat_average_moving_speed">Velocità media in moto</string>
+  <string name="stat_average_moving_pace">Andatura media in moto</string>
 
   <!-- Average -->
-  <string name="average_speed_label">Velocità media</string>
-  <string name="average_pace_label">Andatura media</string>
+  <string name="stat_average_speed">Velocità media</string>
+  <string name="stat_average_pace">Andatura media</string>
 
   <string name="elevation_chart_name">Grafico dell\'Altitudine</string>
-  <string name="elevation_gain_label">Dislivello</string>
-  <string name="elevation_label">Altitudine</string>
-  <string name="latitude_label">Latitudine</string>
-  <string name="longitude_label">Longitudine</string>
+  <string name="stat_elevation_gain">Dislivello</string>
+  <string name="stat_elevation">Altitudine</string>
+  <string name="stat_latitude">Latitudine</string>
+  <string name="stat_longitude">Longitudine</string>
 
   <!-- Min -->
-  <string name="min_elevation_label">Altitudine min</string>
-  <string name="min_grade_label">Inclinazione min</string>
-  <string name="min_pace_label">Andatura min</string>
+  <string name="stat_min_elevation">Altitudine min</string>
+  <string name="stat_min_grade">Inclinazione min</string>
+  <string name="stat_min_pace">Andatura min</string>
 
   <!-- Max -->
-  <string name="max_elevation_label">Altitudine max</string>
-  <string name="max_grade_label">Inclinazione max</string>
-  <string name="max_speed_label">Velocità max</string>
+  <string name="stat_max_elevation">Altitudine max</string>
+  <string name="stat_max_grade">Inclinazione max</string>
+  <string name="stat_max_speed">Velocità max</string>
 
   <string name="loading_track">Caricamento percorso in corso...</string>
 
   <!-- Chart Settings -->
   <string name="menu_chart_view_chart_settings">Impostazioni grafico</string>
   <!-- X Axis -->
-  <string name="x_axis">Asse X</string>
-  <string name="by_distance">Distanza</string>
-  <string name="by_time">Tempo</string>
+  <string name="chart_settings_x_axis">Asse X</string>
+  <string name="chart_settings_by_distance">Distanza</string>
+  <string name="chart_settings_by_time">Tempo</string>
 
   <!-- Y Axis -->
-  <string name="y_axis">Asse Y</string>
+  <string name="chart_settings_y_axis">Asse Y</string>
 
   <!-- Units -->
   <!-- Time  -->
   <string name="voice_hour">ora</string>
   <string name="voice_hours">ore</string>
-  <string name="hr">h</string>
-  <string name="min">min</string>
+  <string name="unit_hour">h</string>
+  <string name="unit_minute">min</string>
   <string name="voice_minute">minuto</string>
   <string name="voice_minutes">minuti</string>
   <string name="voice_second">secondo</string>
   <string name="voice_seconds">secondi</string>
 
   <!-- Distance -->
-  <string name="meter">m</string>
-  <string name="kilometer">km</string>
+  <string name="unit_meter">m</string>
+  <string name="unit_kilometer">km</string>
   <string name="voice_kilometers">chilometri</string>
-  <string name="feet">pd</string>
-  <string name="mile">mi</string>
+  <string name="unit_feet">pd</string>
+  <string name="unit_mile">mi</string>
   <string name="voice_miles">miglia</string>
 
   <!-- Speed and Pace -->
-  <string name="kilometer_per_hour">km/h</string>
+  <string name="unit_kilometer_per_hour">km/h</string>
   <string name="voice_kilometer_per_hour">chilometri orari</string>
-  <string name="min_per_kilometer">min/km</string>
+  <string name="unit_minute_per_kilometer">min/km</string>
   <string name="voice_per_kilometer">per chilometro</string>
-  <string name="mile_per_hour">mi/h</string>
+  <string name="unit_mile_per_hour">mi/h</string>
   <string name="voice_mile_per_hour">miglia orarie</string>
-  <string name="min_per_mile">min/mi</string>
+  <string name="unit_minute_per_mile">min/mi</string>
   <string name="voice_per_mile">per miglio</string>
 
   <!-- Stats Labels -->
-  <string name="moving_time_label">Durata in moto</string>
-  <string name="total_time_label">Durata totale</string>
+  <string name="stat_moving_time">Durata in moto</string>
+  <string name="stat_total_time">Durata totale</string>
   <string name="time_label">Durata</string>
   <string name="sd_unavail">Scheda SD non disponibile</string>
-  <string name="speed">Velocità</string>
+  <string name="stat_speed">Velocità</string>
   <string name="start_trip">Devi prima iniziare un percorso.</string>
   <string name="marker_type_statistics">Statistiche</string>
-  <string name="total_distance_label">Distanza totale</string>
+  <string name="stat_total_distance">Distanza totale</string>
   <string name="distance_label">Distanza</string>
   <string name="unknown">-</string>
   <string name="waiting">Attendere...</string>
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index d2439180a..ce698fa43 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -234,7 +234,7 @@ limitations under the License.
   <string name="settings_recording_name_summary_on">デフォルトのトラック名をトラック開始日時にします．</string>
   <string name="settings_recording_name_summary_off">トラック名を昇順の数字にします．</string>
 
-  <string name="pace_label">ペース</string>
+  <string name="stat_pace">ペース</string>
 
   <string name="eclair_required">Android 2.0以上でのみサポート</string>
   <string name="settings_sensor_type">センサータイプ</string>
@@ -301,47 +301,47 @@ limitations under the License.
 
   <!-- Statistics View -->
   <!-- Average Moving -->
-  <string name="average_moving_speed_label">平均移動速度</string>
-  <string name="average_moving_pace_label">平均移動ペース</string>
+  <string name="stat_average_moving_speed">平均移動速度</string>
+  <string name="stat_average_moving_pace">平均移動ペース</string>
 
   <!-- Average -->
-  <string name="average_speed_label">平均速度</string>
-  <string name="average_pace_label">平均ペース</string>
+  <string name="stat_average_speed">平均速度</string>
+  <string name="stat_average_pace">平均ペース</string>
 
   <string name="elevation_chart_name">標高チャート</string>
-  <string name="elevation_gain_label">標高差</string>
-  <string name="elevation_label">標高</string>
-  <string name="latitude_label">緯度</string>
-  <string name="longitude_label">経度</string>
+  <string name="stat_elevation_gain">標高差</string>
+  <string name="stat_elevation">標高</string>
+  <string name="stat_latitude">緯度</string>
+  <string name="stat_longitude">経度</string>
 
   <!-- Min -->
-  <string name="min_elevation_label">最小標高</string>
-  <string name="min_grade_label">最小勾配</string>
-  <string name="min_pace_label">最小ペース</string>
+  <string name="stat_min_elevation">最小標高</string>
+  <string name="stat_min_grade">最小勾配</string>
+  <string name="stat_min_pace">最小ペース</string>
 
   <!-- Max -->
-  <string name="max_elevation_label">最大標高</string>
-  <string name="max_grade_label">最大勾配</string>
-  <string name="max_speed_label">最大速度</string>
+  <string name="stat_max_elevation">最大標高</string>
+  <string name="stat_max_grade">最大勾配</string>
+  <string name="stat_max_speed">最大速度</string>
 
   <string name="loading_track">トラックの読み込み中...</string>
 
   <!-- Chart Settings -->
   <string name="menu_chart_view_chart_settings">チャート設定</string>
   <!-- X Axis -->
-  <string name="x_axis">X軸</string>
-  <string name="by_distance">距離ベース</string>
-  <string name="by_time">時間ベース</string>
+  <string name="chart_settings_x_axis">X軸</string>
+  <string name="chart_settings_by_distance">距離ベース</string>
+  <string name="chart_settings_by_time">時間ベース</string>
 
   <!-- Y Axis -->
-  <string name="y_axis">Y軸</string>
+  <string name="chart_settings_y_axis">Y軸</string>
 
   <!-- Units -->
   <!-- Time  -->
   <string name="voice_hour">時</string>
   <string name="voice_hours">時</string>
-  <string name="hr">時</string>
-  <string name="min">分</string>
+  <string name="unit_hour">時</string>
+  <string name="unit_minute">分</string>
   <string name="voice_minute">分</string>
   <string name="voice_minutes">分</string>
   <string name="voice_second">秒</string>
@@ -359,18 +359,18 @@ limitations under the License.
   <string name="voice_per_mile">毎マイル</string>
 
   <!-- Stats Labels -->
-  <string name="moving_time_label">移動時間</string>
-  <string name="total_time_label">合計時間</string>
+  <string name="stat_moving_time">移動時間</string>
+  <string name="stat_total_time">合計時間</string>
   <string name="time_label">時間</string>
   <string name="sd_unavail">SD が発見できません</string>
-  <string name="speed">速度</string>
+  <string name="stat_speed">速度</string>
   <string name="start_trip">移動して下さい．</string>
   <string name="marker_type_statistics">統計</string>
-  <string name="total_distance_label">合計距離</string>
+  <string name="stat_total_distance">合計距離</string>
   <string name="distance_label">距離</string>
-  <string name="power">心拍強度</string>
-  <string name="cadence">ケイデンス</string>
-  <string name="heart_rate">心拍数</string>
+  <string name="sensor_state_power">心拍強度</string>
+  <string name="sensor_state_cadence">ケイデンス</string>
+  <string name="sensor_state_heart_rate">心拍数</string>
   <string name="max_heart_rate">最大心拍数</string>
   <string name="waiting">待機中...</string>
 
@@ -450,17 +450,17 @@ limitations under the License.
   <string name="bluetooth_not_connected">Bluetoothセンサーに接続していません</string>
 
   <!-- Sensor State -->
-  <string name="sensor_data_time">計測日時</string>
+  <string name="sensor_state_last_sensor_time">計測日時</string>
   <string name="power_meter_enabled">パワーメーター有効</string>
   <string name="heart_rate_monitor_enabled">心拍数モニタ有効</string>
   <string name="no_sensor_manager">センサーマネージャがありません</string>
   <string name="enabled">有効</string>
-  <string name="connecting">接続中</string>
-  <string name="connected">接続</string>
-  <string name="disconnected">解除</string>
+  <string name="sensor_state_connecting">接続中</string>
+  <string name="sensor_state_connected">接続</string>
+  <string name="sensor_state_disconnected">解除</string>
   <string name="no_sensor_service">センサーサービスがありません</string>
   <string name="searching">検索中</string>
-  <string name="sending">送信中</string>
+  <string name="sensor_state_sending">送信中</string>
 
   <!-- Sensor Type Options -->
   <string name="settings_sensor_type_none">なし</string>
diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml
index 663569caa..1091d1da6 100644
--- a/MyTracks/res/values-pl/strings.xml
+++ b/MyTracks/res/values-pl/strings.xml
@@ -202,7 +202,7 @@ limitations under the License.
   <string name="settings_recording_auto_resume">Automatyczne wznawianie rejestracji trasy</string>
   <string name="settings_recording_auto_resume_summary">Maksymalny czas w minutach, który upłynął od ostatniego restartu telefonu, a po którym nie zostania wznowiona poprzednia trasa</string>
   
-  <string name="pace_label">Tempo</string>
+  <string name="stat_pace">Tempo</string>
   
   <string name="eclair_required">Dostępne tylko w wersji Android 2.0 lub nowszej</string>
   <string name="settings_sensor_type">Typ Czujnika</string>
@@ -246,79 +246,79 @@ limitations under the License.
 
   <!-- Statistics View -->
   <!-- Average Moving -->
-  <string name="average_moving_speed_label">Średnia prędkość poruszania</string>
-  <string name="average_moving_pace_label">Średnie tempo poruszania</string>
+  <string name="stat_average_moving_speed">Średnia prędkość poruszania</string>
+  <string name="stat_average_moving_pace">Średnie tempo poruszania</string>
 
   <!-- Average -->
-  <string name="average_speed_label">Średnia prędkość</string>
-  <string name="average_pace_label">Średnie tempo</string>
+  <string name="stat_average_speed">Średnia prędkość</string>
+  <string name="stat_average_pace">Średnie tempo</string>
 
   <string name="elevation_chart_name">Wykres wysokości</string>
-  <string name="elevation_gain_label">Wzrost wysokości</string>
-  <string name="elevation_label">Wysokość</string>
-  <string name="latitude_label">Szerokość</string>
-  <string name="longitude_label">Długość</string>
+  <string name="stat_elevation_gain">Wzrost wysokości</string>
+  <string name="stat_elevation">Wysokość</string>
+  <string name="stat_latitude">Szerokość</string>
+  <string name="stat_longitude">Długość</string>
 
   <!-- Min -->
-  <string name="min_elevation_label">Min. wysokość</string>
-  <string name="min_grade_label">Min. nachylenie</string>
-  <string name="min_pace_label">Min. tempo</string>
+  <string name="stat_min_elevation">Min. wysokość</string>
+  <string name="stat_min_grade">Min. nachylenie</string>
+  <string name="stat_min_pace">Min. tempo</string>
 
   <!-- Max -->
-  <string name="max_elevation_label">Maks. wysokość</string>
-  <string name="max_grade_label">Maks. nachylenie</string>
-  <string name="max_speed_label">Maks. prędkość</string>
+  <string name="stat_max_elevation">Maks. wysokość</string>
+  <string name="stat_max_grade">Maks. nachylenie</string>
+  <string name="stat_max_speed">Maks. prędkość</string>
 
   <string name="loading_track">Wczytywanie trasy...</string>
 
   <!-- Chart Settings -->
   <string name="menu_chart_view_chart_settings">Ustawienia wykresów</string>
   <!-- X Axis -->
-  <string name="x_axis">Oś X</string>
-  <string name="by_distance">Według odległości</string>
-  <string name="by_time">Według czasu</string>
+  <string name="chart_settings_x_axis">Oś X</string>
+  <string name="chart_settings_by_distance">Według odległości</string>
+  <string name="chart_settings_by_time">Według czasu</string>
 
   <!-- Y Axis -->
-  <string name="y_axis">Oś Y</string>
+  <string name="chart_settings_y_axis">Oś Y</string>
 
   <!-- Units -->
   <!-- Time  -->
   <string name="voice_hour">godzina</string>
   <string name="voice_hours">godziny</string>
-  <string name="hr">godz.</string>
-  <string name="min">min</string>
+  <string name="unit_hour">godz.</string>
+  <string name="unit_minute">min</string>
   <string name="voice_minute">minuta</string>
   <string name="voice_minutes">minuty</string>
   <string name="voice_second">sekunda</string>
   <string name="voice_seconds">sekundy</string>
 
   <!-- Distance -->
-  <string name="meter">m</string>
-  <string name="kilometer">km</string>
+  <string name="unit_meter">m</string>
+  <string name="unit_kilometer">km</string>
   <string name="voice_kilometers">kilometerów</string>
-  <string name="feet">st.</string>
-  <string name="mile">mi</string>
+  <string name="unit_feet">st.</string>
+  <string name="unit_mile">mi</string>
   <string name="voice_miles">mil</string>
 
   <!-- Speed and Pace -->
-  <string name="kilometer_per_hour">km/h</string>
+  <string name="unit_kilometer_per_hour">km/h</string>
   <string name="voice_kilometer_per_hour">kilometry na godzinę</string>
-  <string name="min_per_kilometer">min/km</string>
+  <string name="unit_minute_per_kilometer">min/km</string>
   <string name="voice_per_kilometer">na kilometr</string>
-  <string name="mile_per_hour">mi/h</string>
+  <string name="unit_mile_per_hour">mi/h</string>
   <string name="voice_mile_per_hour">mile na godzinę</string>
-  <string name="min_per_mile">min/mi</string>
+  <string name="unit_minute_per_mile">min/mi</string>
   <string name="voice_per_mile">na milę</string>
 
   <!-- Stats Labels -->
-  <string name="moving_time_label">Czas w ruchu</string>
-  <string name="total_time_label">Całkowity czas</string>
+  <string name="stat_moving_time">Czas w ruchu</string>
+  <string name="stat_total_time">Całkowity czas</string>
   <string name="time_label">Czas</string>
   <string name="sd_unavail">Karta SD niedostępna</string>
-  <string name="speed">Prędkość</string>
+  <string name="stat_speed">Prędkość</string>
   <string name="start_trip">Musisz rozpocząć podróż.</string>
   <string name="marker_type_statistics">Statystyki</string>
-  <string name="total_distance_label">Całkowita odległość</string>
+  <string name="stat_total_distance">Całkowita odległość</string>
   <string name="distance_label">Odległość</string>
   <string name="unknown">-</string>
   <string name="waiting">Oczekiwanie...</string>
@@ -399,15 +399,15 @@ limitations under the License.
   <string name="bluetooth_not_connected">Urządzenie Bluetooth niepołączone</string>
 
   <!-- Sensor State -->
-  <string name="sensor_data_time">Czas Danych Czujnika</string>
+  <string name="sensor_state_last_sensor_time">Czas Danych Czujnika</string>
   <string name="power_meter_enabled">Miernik mocy aktywny</string>
   <string name="heart_rate_monitor_enabled">Pulsometr aktywny</string>
   <string name="no_sensor_manager">Brak Ustawień Czujników</string>
   <string name="enabled">Aktywny</string>
-  <string name="connecting">Łączenie</string>
-  <string name="connected">Podłączony</string>
-  <string name="disconnected">Rozłączony</string>
+  <string name="sensor_state_connecting">Łączenie</string>
+  <string name="sensor_state_connected">Podłączony</string>
+  <string name="sensor_state_disconnected">Rozłączony</string>
   <string name="no_sensor_service">Brak Serwisu Czujników</string>
   <string name="searching">Wykrywanie</string>
-  <string name="sending">Przesyłanie</string>
+  <string name="sensor_state_sending">Przesyłanie</string>
 </resources>
diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml
index 1fcad9a67..26e99a577 100644
--- a/MyTracks/res/values-pt-rBR/strings.xml
+++ b/MyTracks/res/values-pt-rBR/strings.xml
@@ -184,7 +184,7 @@ limitations under the License.
   <string name="settings_sharing_url_only_summary_off">O conteúdo do mapa também será incluído ao compartilhar</string>
   <string name="settings_recording_marker">Freqüência de divisão</string>
   <string name="settings_recording_marker_summary">Maior tempo ou distância de uma gravação antes que ela seja dividida em duas</string>
-  <string name="pace_label">Passo</string>
+  <string name="stat_pace">Passo</string>
 
   <!-- MyTracksSky -->
   <string name="mytracks_sky">Satélites de GPS</string>
@@ -207,51 +207,51 @@ limitations under the License.
 
   <!-- Statistics View -->
   <!-- Average Moving -->
-  <string name="average_moving_speed_label">Velocidade Méd. em Movimento</string>
-  <string name="average_moving_pace_label">Passo Médio em Movimento</string>
+  <string name="stat_average_moving_speed">Velocidade Méd. em Movimento</string>
+  <string name="stat_average_moving_pace">Passo Médio em Movimento</string>
 
   <!-- Average -->
-  <string name="average_speed_label">Velocidade Média</string>
-  <string name="average_pace_label">Passo Médio</string>
+  <string name="stat_average_speed">Velocidade Média</string>
+  <string name="stat_average_pace">Passo Médio</string>
 
   <!-- Min -->
   <string name="elevation_chart_name">Carta de elevação</string>
-  <string name="elevation_gain_label">Ganho de elevação</string>
-  <string name="elevation_label">Elevação</string>
+  <string name="stat_elevation_gain">Ganho de elevação</string>
+  <string name="stat_elevation">Elevação</string>
 
   <!-- Max -->
-  <string name="min_elevation_label">Elevação Mínima</string>
-  <string name="min_grade_label">Subida mínima</string>
-  <string name="min_pace_label">Passo Mínimo</string>
+  <string name="stat_min_elevation">Elevação Mínima</string>
+  <string name="stat_min_grade">Subida mínima</string>
+  <string name="stat_min_pace">Passo Mínimo</string>
 
-  <string name="max_elevation_label">Elevação Máxima</string>
-   <string name="max_grade_label">Subida máxima</string>
-  <string name="max_speed_label">Velocidade Máxima</string>
+  <string name="stat_max_elevation">Elevação Máxima</string>
+   <string name="stat_max_grade">Subida máxima</string>
+  <string name="stat_max_speed">Velocidade Máxima</string>
 
   <string name="loading_track">Carregando caminho...</string>
 
   <!-- Chart Settings -->
   <string name="menu_chart_view_chart_settings">Configurações do gráfico</string>
   <!-- X Axis -->
-  <string name="x_axis">Eixo X</string>
-  <string name="by_distance">Por Distância</string>
-  <string name="by_time">Por Tempo</string>
+  <string name="chart_settings_x_axis">Eixo X</string>
+  <string name="chart_settings_by_distance">Por Distância</string>
+  <string name="chart_settings_by_time">Por Tempo</string>
 
   <!-- Y Axis -->
-  <string name="y_axis">Eixo Y</string>
+  <string name="chart_settings_y_axis">Eixo Y</string>
 
   <!-- Units -->
   <!-- Time -->
   <string name="voice_hour">hora</string>
   <string name="voice_hours">horas</string>
-  <string name="hr">h</string>
+  <string name="unit_hour">h</string>
   <string name="voice_minute">minuto</string>
   <string name="voice_minutes">minutos</string>
   <string name="voice_second">segundo</string>
   <string name="voice_seconds">segundos</string>
 
   <!-- Distance -->
-  <string name="feet">pés</string>
+  <string name="unit_feet">pés</string>
   <string name="voice_kilometers">kilômetros</string>
   <string name="voice_miles">milhas</string>
 
@@ -262,14 +262,14 @@ limitations under the License.
   <string name="voice_per_mile">por milha</string>
 
   <!-- Stats Labels -->
-  <string name="moving_time_label">Tempo em Movimento</string>
-  <string name="total_time_label">Tempo Total</string>
+  <string name="stat_moving_time">Tempo em Movimento</string>
+  <string name="stat_total_time">Tempo Total</string>
   <string name="time_label">Tempo</string>
   <string name="sd_unavail">SD não disponível</string>
-  <string name="speed">Velocidade</string>
+  <string name="stat_speed">Velocidade</string>
   <string name="start_trip">Você deve começar uma viagem.</string>
   <string name="marker_type_statistics">Estatísticas</string>
-  <string name="total_distance_label">Distância Total</string>
+  <string name="stat_total_distance">Distância Total</string>
   <string name="distance_label">Distância</string>
   <string name="unknown">-</string>
   <string name="waiting">Aguardando...</string>
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index 051b30aaf..706a5f13c 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -243,7 +243,7 @@ limitations under the License.
   <string name="settings_reset_dialog_message">Все ваши настройки будут стерты и восстановлены значения по умолчанию. Записанные треки будут сохранены. Вы уверены?</string>
   <string name="settings_reset_done">Все настройки были возвращены к значениям по умолчанию.</string>
 
-  <string name="pace_label">Темп</string>
+  <string name="stat_pace">Темп</string>
 
   <string name="eclair_required">Поддерживается только в Android 2.0 или выше</string>
   <string name="settings_sensor_type">Тип датчика</string>
@@ -309,47 +309,47 @@ limitations under the License.
 
   <!-- Statistics View -->
   <!-- Average Moving -->
-  <string name="average_moving_speed_label">Средняя скорость движения</string>
-  <string name="average_moving_pace_label">Средний темп движения</string>
+  <string name="stat_average_moving_speed">Средняя скорость движения</string>
+  <string name="stat_average_moving_pace">Средний темп движения</string>
 
   <!-- Average -->
-  <string name="average_speed_label">Средняя скорость</string>
-  <string name="average_pace_label">Средний темп</string>
+  <string name="stat_average_speed">Средняя скорость</string>
+  <string name="stat_average_pace">Средний темп</string>
 
   <string name="elevation_chart_name">Диаграмма высоты</string>
-  <string name="elevation_gain_label">Набор высоты</string>
-  <string name="elevation_label">Высота</string>
-  <string name="latitude_label">Широта</string>
-  <string name="longitude_label">Долгота</string>
+  <string name="stat_elevation_gain">Набор высоты</string>
+  <string name="stat_elevation">Высота</string>
+  <string name="stat_latitude">Широта</string>
+  <string name="stat_longitude">Долгота</string>
 
   <!-- Min -->
-  <string name="min_elevation_label">Минимальная высота</string>
-  <string name="min_grade_label">Минимальный уклон</string>
-  <string name="min_pace_label">Минимальный темп</string>
+  <string name="stat_min_elevation">Минимальная высота</string>
+  <string name="stat_min_grade">Минимальный уклон</string>
+  <string name="stat_min_pace">Минимальный темп</string>
 
   <!-- Max -->
-  <string name="max_elevation_label">Максимальная высота</string>
-  <string name="max_grade_label">Максимальный уклон</string>
-  <string name="max_speed_label">Максимальная скорость</string>
+  <string name="stat_max_elevation">Максимальная высота</string>
+  <string name="stat_max_grade">Максимальный уклон</string>
+  <string name="stat_max_speed">Максимальная скорость</string>
 
   <string name="loading_track">Загрузка трека...</string>
 
   <!-- Chart Settings -->
   <string name="menu_chart_view_chart_settings">Настройки диаграммы</string>
   <!-- X Axis -->
-  <string name="x_axis">Ось X</string>
-  <string name="by_distance">По расстоянию</string>
-  <string name="by_time">По времени</string>
+  <string name="chart_settings_x_axis">Ось X</string>
+  <string name="chart_settings_by_distance">По расстоянию</string>
+  <string name="chart_settings_by_time">По времени</string>
 
   <!-- Y Axis -->
-  <string name="y_axis">Ось Y</string>
+  <string name="chart_settings_y_axis">Ось Y</string>
 
   <!-- Units -->
   <!-- Time  -->
   <string name="voice_hour">час</string>
   <string name="voice_hours">часов</string>
-  <string name="hr">ч</string>
-  <string name="min">мин</string>
+  <string name="unit_hour">ч</string>
+  <string name="unit_minute">мин</string>
   <string name="voice_minute">минута</string>
   <string name="voice_minutes">минут</string>
   <string name="voice_second">секунда</string>
@@ -357,42 +357,42 @@ limitations under the License.
   <string name="milliseconds">мс</string>
 
   <!-- Distance -->
-  <string name="meter">м</string>
-  <string name="kilometer">км</string>
+  <string name="unit_meter">м</string>
+  <string name="unit_kilometer">км</string>
   <string name="voice_kilometers">километров</string>
-  <string name="feet">футов</string>
-  <string name="mile">миль</string>
+  <string name="unit_feet">футов</string>
+  <string name="unit_mile">миль</string>
   <string name="voice_miles">мили</string>
 
   <!-- Speed and Pace -->
-  <string name="kilometer_per_hour">км/ч</string>
+  <string name="unit_kilometer_per_hour">км/ч</string>
   <string name="voice_kilometer_per_hour">километров в час</string>
-  <string name="min_per_kilometer">мин/км</string>
+  <string name="unit_minute_per_kilometer">мин/км</string>
   <string name="voice_per_kilometer">за километр</string>
-  <string name="mile_per_hour">миль/ч</string>
+  <string name="unit_mile_per_hour">миль/ч</string>
   <string name="voice_mile_per_hour">миль в час</string>
-  <string name="min_per_mile">мин/миля</string>
+  <string name="unit_minute_per_mile">мин/миля</string>
   <string name="voice_per_mile">за милю</string>
 
   <!-- Sensors -->
-  <string name="watts">Вт</string>
+  <string name="unit_watt">Вт</string>
 
-  <string name="revolutions_per_minute">об/мин</string>
-  <string name="bpm">bpm</string>
+  <string name="unit_revolution_per_minute">об/мин</string>
+  <string name="unit_beat_per_minute">bpm</string>
 
   <!-- Stats Labels -->
-  <string name="moving_time_label">Время движения</string>
-  <string name="total_time_label">Общее время</string>
+  <string name="stat_moving_time">Время движения</string>
+  <string name="stat_total_time">Общее время</string>
   <string name="time_label">Время</string>
   <string name="sd_unavail">SD карта недоступна</string>
-  <string name="speed">Скорость</string>
+  <string name="stat_speed">Скорость</string>
   <string name="start_trip">Вы должны начать путешествие.</string>
   <string name="marker_type_statistics">Статистика</string>
-  <string name="total_distance_label">Общее расстояние</string>
+  <string name="stat_total_distance">Общее расстояние</string>
   <string name="distance_label">Расстояние</string>
-  <string name="power">Мощность</string>
-  <string name="cadence">Каденс</string>
-  <string name="heart_rate">Пульс</string>
+  <string name="sensor_state_power">Мощность</string>
+  <string name="sensor_state_cadence">Каденс</string>
+  <string name="sensor_state_heart_rate">Пульс</string>
   <string name="max_heart_rate">Максимальный пульс</string>
   <string name="unknown">-</string>
   <string name="waiting">Ожидание...</string>
@@ -477,17 +477,17 @@ limitations under the License.
   <string name="bluetooth_not_connected">Bluetooth датчик не подключен</string>
 
   <!-- Sensor State -->
-  <string name="sensor_data_time">Датчик времени</string>
+  <string name="sensor_state_last_sensor_time">Датчик времени</string>
   <string name="power_meter_enabled">Измеритель мощности включен</string>
   <string name="heart_rate_monitor_enabled">Монитор пульса включен</string>
   <string name="no_sensor_manager">Нет диспетчера датчиков</string>
   <string name="enabled">Включено</string>
-  <string name="connecting">Подключение</string>
-  <string name="connected">Подключено</string>
-  <string name="disconnected">Отключено</string>
+  <string name="sensor_state_connecting">Подключение</string>
+  <string name="sensor_state_connected">Подключено</string>
+  <string name="sensor_state_disconnected">Отключено</string>
   <string name="no_sensor_service">Нет службы датчиков</string>
   <string name="searching">Поиск</string>
-  <string name="sending">Отправка</string>
+  <string name="sensor_state_sending">Отправка</string>
 
   <!-- Sensor Type Options -->
   <string name="settings_sensor_type_none">Нет</string>
diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml
index d29f05289..de620cad9 100644
--- a/MyTracks/res/values-sv/strings.xml
+++ b/MyTracks/res/values-sv/strings.xml
@@ -198,7 +198,7 @@ limitations under the License.
 
   <string name="settings_recording_marker">Delningsfrekvens</string>
   <string name="settings_recording_marker_summary">Maximala tiden eller distansen varefter en ny delningsmarkör kommer infogas</string>
-  <string name="pace_label">Tempo</string>
+  <string name="stat_pace">Tempo</string>
 
   <!-- MyTracksSky -->
   <string name="mytracks_sky">GPS-satelliter</string>
@@ -221,79 +221,79 @@ limitations under the License.
 
   <!-- Statistics View -->
   <!-- Average Moving -->
-  <string name="average_moving_speed_label">Genomsnittlig rörlig hastighet</string>
-  <string name="average_moving_pace_label">Genomsnittlig rörligt tempo</string>
+  <string name="stat_average_moving_speed">Genomsnittlig rörlig hastighet</string>
+  <string name="stat_average_moving_pace">Genomsnittlig rörligt tempo</string>
 
   <!-- Average -->
-  <string name="average_speed_label">Genomsnittlig hastighet</string>
-  <string name="average_pace_label">Genomsnittligt tempo</string>
+  <string name="stat_average_speed">Genomsnittlig hastighet</string>
+  <string name="stat_average_pace">Genomsnittligt tempo</string>
 
   <string name="elevation_chart_name">Höjddiagram</string>
-  <string name="elevation_gain_label">Höjdvinst</string>
-  <string name="elevation_label">Höjd</string>
-  <string name="latitude_label">Latitud</string>
-  <string name="longitude_label">Longitud</string>
+  <string name="stat_elevation_gain">Höjdvinst</string>
+  <string name="stat_elevation">Höjd</string>
+  <string name="stat_latitude">Latitud</string>
+  <string name="stat_longitude">Longitud</string>
 
   <!-- Min -->
-  <string name="min_elevation_label">Minimihöjd</string>
-  <string name="min_grade_label">Minimilutning</string>
-  <string name="min_pace_label">Minimitempo</string>
+  <string name="stat_min_elevation">Minimihöjd</string>
+  <string name="stat_min_grade">Minimilutning</string>
+  <string name="stat_min_pace">Minimitempo</string>
 
   <!-- Max -->
-  <string name="max_elevation_label">Maxhöjd</string>
-  <string name="max_grade_label">Maxlutning</string>
-  <string name="max_speed_label">Maxhastighet</string>
+  <string name="stat_max_elevation">Maxhöjd</string>
+  <string name="stat_max_grade">Maxlutning</string>
+  <string name="stat_max_speed">Maxhastighet</string>
 
   <string name="loading_track">Laddar spår...</string>
 
   <!-- Chart Settings -->
   <string name="menu_chart_view_chart_settings">Diagraminställningar</string>
   <!-- X Axis -->
-  <string name="x_axis">X-axel</string>
-  <string name="by_distance">Efter distans</string>
-  <string name="by_time">Efter tid</string>
+  <string name="chart_settings_x_axis">X-axel</string>
+  <string name="chart_settings_by_distance">Efter distans</string>
+  <string name="chart_settings_by_time">Efter tid</string>
 
   <!-- Y Axis -->
-  <string name="y_axis">Y-axel</string>
+  <string name="chart_settings_y_axis">Y-axel</string>
 
   <!-- Units -->
   <!-- Time  -->
   <string name="voice_hour">timme</string>
   <string name="voice_hours">timmar</string>
-  <string name="hr">tim</string>
-  <string name="min">min</string>
+  <string name="unit_hour">tim</string>
+  <string name="unit_minute">min</string>
   <string name="voice_minute">minut</string>
   <string name="voice_minutes">minuter</string>
   <string name="voice_second">sekund</string>
   <string name="voice_seconds">sekunder</string>
 
   <!-- Distance -->
-  <string name="meter">m</string>
-  <string name="kilometer">km</string>
+  <string name="unit_meter">m</string>
+  <string name="unit_kilometer">km</string>
   <string name="voice_kilometers">kilometer</string>
-  <string name="feet">ft</string>
-  <string name="mile">mi</string>
+  <string name="unit_feet">ft</string>
+  <string name="unit_mile">mi</string>
   <string name="voice_miles">miles</string>
 
   <!-- Speed and Pace -->
-  <string name="kilometer_per_hour">km/h</string>
+  <string name="unit_kilometer_per_hour">km/h</string>
   <string name="voice_kilometer_per_hour">kilometer i timmen</string>
-  <string name="min_per_kilometer">min/km</string>
+  <string name="unit_minute_per_kilometer">min/km</string>
   <string name="voice_per_kilometer">per kilometer</string>
-  <string name="mile_per_hour">mi/h</string>
+  <string name="unit_mile_per_hour">mi/h</string>
   <string name="voice_mile_per_hour">miles i timmen</string>
-  <string name="min_per_mile">min/mi</string>
+  <string name="unit_minute_per_mile">min/mi</string>
   <string name="voice_per_mile">per mile</string>
 
   <!-- Stats Labels -->
-  <string name="moving_time_label">Rörlig tid</string>
-  <string name="total_time_label">Total tid</string>
+  <string name="stat_moving_time">Rörlig tid</string>
+  <string name="stat_total_time">Total tid</string>
   <string name="time_label">Tid</string>
   <string name="sd_unavail">SD otillgängligt</string>
-  <string name="speed">Hastighet</string>
+  <string name="stat_speed">Hastighet</string>
   <string name="start_trip">Du måste starta en tur.</string>
   <string name="marker_type_statistics">Statistik</string>
-  <string name="total_distance_label">Total distans</string>
+  <string name="stat_total_distance">Total distans</string>
   <string name="distance_label">Distans</string>
   <string name="unknown">-</string>
   <string name="waiting">Väntar...</string>
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index 2550d9f15..b6ea0ca8c 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -244,7 +244,7 @@ limitations under the License.
   <string name="settings_reset_dialog_message">你的所有设置都将恢复到默认值. 已保存的轨迹不会丢失. 确定要继续吗?</string>
   <string name="settings_reset_done">所有设置已恢复到默认值.</string>
 
-  <string name="pace_label">节奏</string>
+  <string name="stat_pace">节奏</string>
 
   <string name="eclair_required">只在 Android 2.0 及以上版本支持</string>
   <string name="settings_sensor_type">感应器类型</string>
@@ -310,47 +310,47 @@ limitations under the License.
 
   <!-- Statistics View -->
   <!-- Average Moving -->
-  <string name="average_moving_speed_label">平均移动速度</string>
-  <string name="average_moving_pace_label">平均移动步速</string>
+  <string name="stat_average_moving_speed">平均移动速度</string>
+  <string name="stat_average_moving_pace">平均移动步速</string>
 
   <!-- Average -->
-  <string name="average_speed_label">平均速度</string>
-  <string name="average_pace_label">平均步速</string>
+  <string name="stat_average_speed">平均速度</string>
+  <string name="stat_average_pace">平均步速</string>
 
   <string name="elevation_chart_name">海拔图表</string>
-  <string name="elevation_gain_label">爬升</string>
-  <string name="elevation_label">海拔</string>
-  <string name="latitude_label">纬度</string>
-  <string name="longitude_label">经度</string>
+  <string name="stat_elevation_gain">爬升</string>
+  <string name="stat_elevation">海拔</string>
+  <string name="stat_latitude">纬度</string>
+  <string name="stat_longitude">经度</string>
 
   <!-- Min -->
-  <string name="min_elevation_label">最小海拔</string>
-  <string name="min_grade_label">最小落差</string>
-  <string name="min_pace_label">最小步速</string>
+  <string name="stat_min_elevation">最小海拔</string>
+  <string name="stat_min_grade">最小落差</string>
+  <string name="stat_min_pace">最小步速</string>
 
   <!-- Max -->
-  <string name="max_elevation_label">最大海拔</string>
-  <string name="max_grade_label">最大落差</string>
-  <string name="max_speed_label">最大速度</string>
+  <string name="stat_max_elevation">最大海拔</string>
+  <string name="stat_max_grade">最大落差</string>
+  <string name="stat_max_speed">最大速度</string>
 
   <string name="loading_track">载入轨迹中...</string>
 
   <!-- Chart Settings -->
   <string name="menu_chart_view_chart_settings">图表设置</string>
   <!-- X Axis -->
-  <string name="x_axis">横轴</string>
-  <string name="by_distance">按距离显示</string>
-  <string name="by_time">按时间显示</string>
+  <string name="chart_settings_x_axis">横轴</string>
+  <string name="chart_settings_by_distance">按距离显示</string>
+  <string name="chart_settings_by_time">按时间显示</string>
 
   <!-- Y Axis -->
-  <string name="y_axis">纵轴</string>
+  <string name="chart_settings_y_axis">纵轴</string>
 
   <!-- Units -->
   <!-- Time  -->
   <string name="voice_hour">小时</string>
   <string name="voice_hours">小时</string>
-  <string name="hr">时</string>
-  <string name="min">分</string>
+  <string name="unit_hour">时</string>
+  <string name="unit_minute">分</string>
   <string name="voice_minute">分钟</string>
   <string name="voice_minutes">分钟</string>
   <string name="voice_second">秒</string>
@@ -367,18 +367,18 @@ limitations under the License.
   <string name="voice_per_mile">每英里</string>
 
   <!-- Stats Labels -->
-  <string name="moving_time_label">移动时间</string>
-  <string name="total_time_label">总时间</string>
+  <string name="stat_moving_time">移动时间</string>
+  <string name="stat_total_time">总时间</string>
   <string name="time_label">时间</string>
   <string name="sd_unavail">没有 SD 卡</string>
-  <string name="speed">速度</string>
+  <string name="stat_speed">速度</string>
   <string name="start_trip">你必须先记录轨迹.</string>
   <string name="marker_type_statistics">统计</string>
-  <string name="total_distance_label">总距离</string>
+  <string name="stat_total_distance">总距离</string>
   <string name="distance_label">距离</string>
-  <string name="power">电源</string>
-  <string name="cadence">节奏</string>
-  <string name="heart_rate">心率</string>
+  <string name="sensor_state_power">电源</string>
+  <string name="sensor_state_cadence">节奏</string>
+  <string name="sensor_state_heart_rate">心率</string>
   <string name="max_heart_rate">最大心率</string>
   <string name="waiting">请稍候...</string>
 
@@ -457,17 +457,17 @@ limitations under the License.
   <string name="bluetooth_not_connected">未连接蓝牙感应器</string>
 
   <!-- Sensor State -->
-  <string name="sensor_data_time">感应器数据时间</string>
+  <string name="sensor_state_last_sensor_time">感应器数据时间</string>
   <string name="power_meter_enabled">电源计量器已启用</string>
   <string name="heart_rate_monitor_enabled">心率监视器已启用</string>
   <string name="no_sensor_manager">没有感应器管理器</string>
   <string name="enabled">已启用</string>
-  <string name="connecting">连接中</string>
-  <string name="connected">已连接</string>
-  <string name="disconnected">未连接</string>
+  <string name="sensor_state_connecting">连接中</string>
+  <string name="sensor_state_connected">已连接</string>
+  <string name="sensor_state_disconnected">未连接</string>
   <string name="no_sensor_service">没有感应器服务</string>
   <string name="searching">搜索中</string>
-  <string name="sending">发送中</string>
+  <string name="sensor_state_sending">发送中</string>
 
   <!-- Sensor Type Options -->
   <string name="settings_sensor_type_none">无</string>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 68a9c9a7d..8080fa0bc 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -43,6 +43,28 @@ limitations under the License.
     Version:
   </string>
  
+  <!-- Chart Settings -->
+  <string name="chart_settings_by_distance"
+    translation_description="In the Chart Settings, under the 'X Axis' section, the radio option 
+      to show the charts by distance. The other radio option is to show by time. User can only
+      choose one of the options.">
+    By Distance
+  </string>
+  <string name="chart_settings_by_time"
+    translation_description="In the Chart Settings, under the 'X Axis' section, the radio option 
+      to show the charts by time. The other radio option is to show by distance. User can only
+      choose one of the options.">
+    By Time
+  </string>
+  <string name="chart_settings_x_axis"
+    translation_description="In the Chart Settings, the section label for configuring the X axis.">
+    X Axis
+  </string>
+  <string name="chart_settings_y_axis"
+    translation_description="In the Chart Settings, the section label for configuring the Y axis.">
+    Y Axis
+  </string>
+  
   <!-- EULA -->
   <string name="eula_accept"
     translation_description="In the 'End User License Agreement' dialog, the button to accept.">
@@ -284,6 +306,54 @@ limitations under the License.
     (Part %d)
   </string>
   
+  <!--  Sensor State -->
+  <string name="sensor_state_battery"
+    translation_description="In the 'Sensor State' page, the label for the battery level on the bike
+      sensor. E.g, 'Battery Level: 50 %'.">
+    Battery Level
+  </string> 
+  <string name="sensor_state_cadence"
+    translation_description="In the 'Sensor State' page, the label for the cadence on the bike
+      sensor. Cadence is the number of revolutions of the crank per minute. E.g.,
+      'Cadence: 80 rpm'.">    
+    Cadence
+  </string>
+  <string name="sensor_state_connected"
+    translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor
+      has connected.">
+    Connected
+  </string>
+  <string name="sensor_state_connecting"
+    translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor is
+      connecting.">
+    Connecting
+  </string>  
+  <string name="sensor_state_last_sensor_time"
+    translation_description="In the 'Sensor State' page, the label for the last time the sensor has
+      sent a data. E.g., 'Last Sensor Time: 10:05 am'.">
+    Last Sensor Time
+  </string>
+  <string name="sensor_state_disconnected"
+    translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor
+      has disconnected.">
+    Disconnected
+  </string>
+  <string name="sensor_state_heart_rate"
+    translation_description="In the 'Sensor State' page, the label for the heart rate from a heart
+      rate sensor. E.g., 'Hear Rate: 100 bpm'.">
+    Heart Rate
+  </string>
+  <string name="sensor_state_power"
+    translation_description="In the 'Sensor State' page, the label for the power from the bike
+      sensor. Power is the power output of the rider. E.g., 'Power: 50 W'.">    
+    Power
+  </string>
+  <string name="sensor_state_sending"
+    translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor
+      is sending data.">
+    Sending
+  </string>      
+      
   <!-- Settings -->
   <string name="settings_backup"
     translation_description="In the Settings page, the option to change the data backup related
@@ -739,8 +809,86 @@ limitations under the License.
   <string name="settings_title"
     translation_description="The title of the Settings page.">  
     My Tracks Settings
+  </string> 
+      
+  <!-- Stat view -->
+  <string name="stat_average_moving_pace"
+    translation_description="In the Statistic view, the average moving pace.">    
+    Average Moving Pace
+  </string>  
+  <string name="stat_average_moving_speed"
+    translation_description="In the Statistic view, the average moving speed.">    
+    Average Moving Speed
+  </string>  
+  <string name="stat_average_pace"
+    translation_description="In the Statistic view, the average pace.">    
+    Average Pace
   </string>
-       
+  <string name="stat_average_speed"
+    translation_description="In the Statistic view, the average speed.">    
+    Average Speed
+  </string>
+  <string name="stat_elevation"
+    translation_description="In the Statistic view, the elevation.">  
+    Elevation
+  </string>
+  <string name="stat_elevation_gain"
+    translation_description="In the Statistic view, the elevation gain.">
+    Elevation Gain
+  </string>
+  <string name="stat_latitude"
+    translation_description="In the Statistic view, the latitude.">
+    Latitude
+  </string>
+  <string name="stat_longitude"
+    translation_description="In the Statistic view, the longitude.">
+    Longitude
+  </string>
+  <string name="stat_max_elevation"
+    translation_description="In the Statistic view, the maximum elevation.">
+    Max Elevation
+  </string>
+  <string name="stat_max_grade"
+    translation_description="In the Statistic view, the maximum grade.">
+    Max Grade
+  </string>  
+  <string name="stat_max_speed"
+    translation_description="In the Statistic view, the maximum speed.">    
+    Max Speed
+  </string>
+  <string name="stat_min_elevation"
+    translation_description="In the Statistic view, the minimum elevation.">
+    Min Elevation
+  </string>
+  <string name="stat_min_grade"
+    translation_description="In the Statistic view, the minimum grade.">
+    Min Grade
+  </string>    
+  <string name="stat_min_pace"
+    translation_description="In the Statistic view, the minimum pace.">    
+    Min Pace
+  </string>
+  <string name="stat_moving_time"
+    translation_description="In the Statistic view, the moving time.">  
+    Moving Time
+  </string>
+  <string name="stat_pace"
+    translation_description="In the Statistic view, the pace like hours per mile.">    
+    Pace
+  </string>           
+  <string name="stat_speed"
+    translation_description="In the Statistic view, the speed like miles per hour.">    
+    Speed
+  </string>
+  <string name="stat_total_distance"
+    translation_description="In the Statistic view, the total distance.">    
+    Total Distance
+  </string>
+  <string name="stat_total_time"
+    translation_description="In the Statistic view, the total time.">    
+    Total Time
+  </string>
+
   <!-- Track -->
   <string name="track_detail_activity_type"
     translation_description="In the detail page for a track, the text field for the activity type,
@@ -889,6 +1037,62 @@ limitations under the License.
     Now recording a new track.
   </string>
   
+  <!-- Unit - all abbreviations for display-->
+  <string name="unit_beat_per_minute"
+    translation_description="Abbreviation for beats per minute, unit for heart rate. E.g.,
+      'heart rate: 80 bpm'.">
+    bpm
+  </string>   
+  <string name="unit_feet"
+    translation_description="Abbreviation for feet. E.g., '2 ft'.">
+    ft
+  </string>  
+  <string name="unit_hour"
+    translation_description="Abbreviation for hours. E.g, '2 hr'.">
+    hr
+  </string>
+  <string name="unit_kilometer"
+    translation_description="Abbreviation for kilometers. E.g., '2 km'.">
+    km
+  </string>
+  <string name="unit_kilometer_per_hour"
+    translation_description="Abbreviation for kilometers per hour. E.g, '5 km/h'.">
+    km/h
+  </string>
+  <string name="unit_meter"
+    translation_description="Abbreviation for meters. E.g., '2 m'.">
+    m
+  </string>    
+  <string name="unit_mile"
+    translation_description="Abbreviation for miles. E.g., '2 mi'.">
+    mi
+  </string>
+  <string name="unit_mile_per_hour"
+    translation_description="Abbreviation for miles per hour. E.g, '5 mi/h'.">
+    mi/h
+  </string>  
+  <string name="unit_minute"
+    translation_description="Abbreviation for minutes. E.g, '2 min'.">
+    min
+  </string>
+  <string name="unit_minute_per_kilometer"
+    translation_description="Abbreviation for minutes per kilometer. E.g, '5 min/km'.">
+    min/km
+  </string>
+  <string name="unit_minute_per_mile"
+    translation_description="Abbreviation for minutes per mile. E.g, '5 min/mi'.">
+    min/mi
+  </string>
+  <string name="unit_revolution_per_minute"
+    translation_description="Abbreviation for revolutions per minute, unit for cadence. E.g.,
+      'cadence: 80 rpm'.">  
+    rpm
+  </string>
+  <string name="unit_watt"
+    translation_description="Abbreviation for watts, unit for power. E.g., 'power: 80 W'.">  
+    W
+  </string>
+      
   <!-- Voice -->
   <string name="voice_hour"
     translation_description="For voice announcement, to say hour like 'one hour'.">
@@ -1270,193 +1474,6 @@ limitations under the License.
     I think you might be interested in this track.\n\nTo view this track use Google Earth or other
     mapping software.
   </string>
-
-  <!-- Statistics view -->
-  <string name="speed"
-    translation_description="In the Statistic view, the speed like miles per hour.">    
-    Speed
-  </string>
-  <string name="pace_label"
-    translation_description="In the Statistic view, the pace like hours per mile.">    
-    Pace
-  </string> 
-  <string name="total_distance_label"
-    translation_description="In the Statistic view, the total distance.">    
-    Total Distance
-  </string>
-  <string name="total_time_label"
-    translation_description="In the Statistic view, the total time.">    
-    Total Time
-  </string>
-  <string name="moving_time_label"
-    translation_description="In the Statistic view, the moving time.">  
-    Moving Time
-  </string>      
-  <string name="max_speed_label"
-    translation_description="In the Statistic view, the maximum speed.">    
-    Max Speed
-  </string>
-  <string name="average_speed_label"
-    translation_description="In the Statistic view, the average speed.">    
-    Average Speed
-  </string>
-  <string name="average_moving_speed_label"
-    translation_description="In the Statistic view, the average moving speed.">    
-    Average Moving Speed
-  </string>    
-  <string name="min_pace_label"
-    translation_description="In the Statistic view, the minimum pace.">    
-    Min Pace
-  </string>
-  <string name="average_pace_label"
-    translation_description="In the Statistic view, the average pace.">    
-    Average Pace
-  </string>
-  <string name="average_moving_pace_label"
-    translation_description="In the Statistic view, the average moving pace.">    
-    Average Moving Pace
-  </string>  
-  <string name="elevation_label"
-    translation_description="In the Statistic view, the current elevation.">  
-    Elevation
-  </string>
-  <string name="elevation_gain_label"
-    translation_description="In the Statistic view, the elevation gain.">
-    Elevation Gain
-  </string>
-  <string name="max_elevation_label"
-    translation_description="In the Statistic view, the maximum elevation.">
-    Max Elevation
-  </string>
-  <string name="min_elevation_label"
-    translation_description="In the Statistic view, the minimum elevation.">
-    Min Elevation
-  </string>    
-  <string name="min_grade_label"
-    translation_description="In the Statistic view, the minimum grade.">
-    Min Grade
-  </string>
-  <string name="max_grade_label"
-    translation_description="In the Statistic view, the maximum grade.">
-    Max Grade
-  </string>  
-  <string name="latitude_label"
-    translation_description="In the Statistic view, the current latitude.">
-    Latitude
-  </string>
-  <string name="longitude_label"
-    translation_description="In the Statistic view, the current longitude.">
-    Longitude
-  </string>
-
-  <!-- Chart Settings -->
-  <string name="x_axis"
-    translation_description="In the Chart Settings, the section label for configuring the X axis.">
-    X Axis
-  </string>
-  <string name="by_distance"
-    translation_description="In the Chart Settings, under the 'X Axis' section, the radio option 
-      to show the graphics by distance. The other radio option is to show by time. User can only
-      choose one of the options.">
-    By Distance
-  </string>
-  <string name="by_time"
-    translation_description="In the Chart Settings, under the 'X Axis' section, the radio option 
-      to show the graphics by time. The other radio option is to show by distance. User can only
-      choose one of the options.">
-    By Time
-  </string>
-  <string name="y_axis"
-    translation_description="In the Chart Settings, the section label for configuring the Y axis.">
-    Y Axis
-  </string>
-  <string name="power"
-    translation_description="In the Chart Settings, under the 'Y Axis' section, the checkbox option
-      to graph power (for cycling, the power output of the rider).">    
-    Power
-  </string>
-  <string name="cadence"
-    translation_description="In the Chart Settings, under the 'Y Axis' section, the checkbox option
-      to graph cadence (for cycling, the number of revolutions of the crank per minute).">    
-    Cadence
-  </string>
-  <string name="heart_rate"
-    translation_description="In the Chart Settings, under the 'Y Axis' section, the checkbox option
-      to graph heart rate.">
-    Heart Rate
-  </string> 
-      
-  <!-- time -->
-  <string name="hr"
-    translation_description="Abbreviation for hours. E.g, '2 hr'.">
-    hr
-  </string>
-  <string name="min"
-    translation_description="Abbreviation for minutes. E.g, '2 min'.">
-    min
-  </string>
-
-  <!--  distance -->
-  <string name="kilometer"
-    translation_description="Abbreviation for kilometers. E.g., '2 km'.">
-    km
-  </string>
-  <string name="meter"
-    translation_description="Abbreviation for meters. E.g., '2 m'.">
-    m
-  </string>
-  <string name="mile"
-    translation_description="Abbreviation for miles. E.g., '2 mi'.">
-    mi
-  </string>
-  <string name="feet"
-    translation_description="Abbreviation for feet. E.g., '2 ft'.">
-    ft
-  </string>
-
-  <!-- Speed unit -->
-  <string name="kilometer_per_hour"
-    translation_description="For speed unit, abbreviation for kilometers per hour. E.g, '5 km/h'.">
-    km/h
-  </string>
-  <string name="mile_per_hour"
-    translation_description="For speed unit, abbreviation for miles per hour. E.g, '5 mi/h'.">
-    mi/h
-  </string>
-  
-  <!-- Pace unit -->
-  <string name="min_per_kilometer"
-    translation_description="For pace unit, abbreviation for minutes per kilometer. E.g,
-      '5 min/km'.">
-    min/km
-  </string>
-  <string name="min_per_mile"
-    translation_description="For pace unit, abbreviation for minutes per mile. E.g, '5 min/mi'.">
-    min/mi
-  </string>
-      
-  <!-- Sensor State -->    
-  <string name="battery_level"
-    translation_description="In the Sensor State page, the label for battery level on the bike
-      sensor. E.g, battery level like '50 %'.">
-    Battery Level
-  </string>
-  
-  <!-- Sensor State unit -->
-  <string name="watts"
-    translation_description="Abbreviation for watts, unit for power. E.g., power of '80 W'.">  
-    W
-  </string>
-  <string name="revolutions_per_minute"
-    translation_description="Abbreviation for revolutions per minute, unit for cadence. E.g.,
-    cadence of '80 rpm'.">  
-    rpm
-  </string>
-  <string name="bpm"
-    translation_description="Abbreviation for beats per minute, unit for heart rate. E.g.,
-    heart rate of '80 bpm'.">
-    bpm
-  </string>
   
   <!-- Send to Google dialog -->
   <string name="sendtogoogle_title"
@@ -1546,33 +1563,4 @@ limitations under the License.
       from the SD card.">
     Finished reading from SD card.
   </string>
-
-  <!-- Sensor State page -->
-  <string name="sensor_data_time"
-    translation_description="In the 'Sensor State' page, the label for the last time the sensor has
-      sent data. E.g., 'Sensor Date Time' 10:05 am.">
-    Sensor Data Time
-  </string>
-
-  <!-- sensor states -->
-  <string name="connecting"
-    translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor is
-      connecting.">
-    Connecting
-  </string>
-  <string name="connected"
-    translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor
-      has connected.">
-    Connected
-  </string>
-  <string name="disconnected"
-    translation_description="In the 'Sensor State' page, the 'Sensor State' value the sensor has
-      disconnected.">
-    Disconnected
-  </string>
-  <string name="sending"
-    translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor
-      is sending data.">
-    Sending
-  </string>
 </resources>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
index 3e2767bf2..302891967 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
@@ -74,7 +74,7 @@ public class AggregatedStatsActivity extends Activity implements
     }
     utils.setMetricUnits(metricUnits);
     utils.updateUnits();
-    utils.setSpeedLabel(R.id.speed_label, R.string.speed, R.string.pace_label);
+    utils.setSpeedLabel(R.id.speed_label, R.string.stat_speed, R.string.stat_pace);
     utils.setSpeedLabels();
 
     DisplayMetrics metrics = new DisplayMetrics();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
index 428df8310..09bc9e002 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
@@ -210,7 +210,7 @@ public class ChartView extends View {
                              R.color.elevation_border,
                              new ZoomSettings(MAX_INTERVALS,
                                  new int[] {5, 10, 25, 50, 100, 250, 500, 1000, 2500, 5000}),
-                             R.string.elevation_label);
+                             R.string.stat_elevation);
 
     series[SPEED_SERIES] =
         new ChartValueSeries(context,
@@ -219,14 +219,14 @@ public class ChartView extends View {
                              R.color.speed_border,
                              new ZoomSettings(MAX_INTERVALS, 0, Integer.MIN_VALUE,
                                  new int[] {1, 5, 10, 20, 50}),
-                             R.string.speed);
+                             R.string.stat_speed);
     series[POWER_SERIES] =
         new ChartValueSeries(context,
                              "###,###",
                              R.color.power_fill,
                              R.color.power_border,
                              new ZoomSettings(MAX_INTERVALS, 0, 1000, new int[] {5, 50, 100, 200}),
-                             R.string.power);
+                             R.string.sensor_state_power);
     series[CADENCE_SERIES] =
         new ChartValueSeries(context,
                              "###,###",
@@ -234,7 +234,7 @@ public class ChartView extends View {
                              R.color.cadence_border,
                              new ZoomSettings(MAX_INTERVALS, 0, Integer.MIN_VALUE,
                                  new int[] {5, 10, 25, 50}),
-                             R.string.cadence);
+                             R.string.sensor_state_cadence);
     series[HEART_RATE_SERIES] =
         new ChartValueSeries(context,
                              "###,###",
@@ -242,7 +242,7 @@ public class ChartView extends View {
                              R.color.heartrate_border,
                              new ZoomSettings(MAX_INTERVALS, 0, Integer.MIN_VALUE,
                                  new int[] {25, 50}),
-                             R.string.heart_rate);
+                             R.string.sensor_state_heart_rate);
   }
 
   public void clearWaypoints() {
@@ -269,8 +269,8 @@ public class ChartView extends View {
 
   public void setReportSpeed(boolean reportSpeed, Context c) {
     series[SPEED_SERIES].setTitle(c.getString(reportSpeed
-                                              ? R.string.speed
-                                              : R.string.pace_label));
+                                              ? R.string.stat_speed
+                                              : R.string.stat_pace));
   }
 
   private void addDataPointInternal(double[] theData) {
@@ -832,8 +832,8 @@ public class ChartView extends View {
     canvas.drawLine(leftBorder, y, rightEdge, y, borderPaint);
     Context c = getContext();
     String s = mode == Mode.BY_DISTANCE
-        ? (metricUnits ? c.getString(R.string.kilometer) : c.getString(R.string.mile))
-        : c.getString(R.string.min);
+        ? (metricUnits ? c.getString(R.string.unit_kilometer) : c.getString(R.string.unit_mile))
+        : c.getString(R.string.unit_minute);
     canvas.drawText(s, rightEdge, effectiveHeight + .2f * UNIT_BORDER + topBorder, labelPaint);
   }
 
@@ -852,7 +852,7 @@ public class ChartView extends View {
 
     Context c = getContext();
     // TODO: This should really show units for all series.
-    String s = metricUnits ? c.getString(R.string.meter) : c.getString(R.string.feet);
+    String s = metricUnits ? c.getString(R.string.unit_meter) : c.getString(R.string.unit_feet);
     canvas.drawText(s, leftBorder - UNIT_BORDER * .2f, UNIT_BORDER * .8f + topBorder, labelPaint);
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
index f44be3ffa..346793781 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
@@ -177,7 +177,7 @@ public class StatsActivity extends Activity implements TrackDataListener {
       @Override
       public void run() {
         utils.updateUnits();
-        utils.setSpeedLabel(R.id.speed_label, R.string.speed, R.string.pace_label);
+        utils.setSpeedLabel(R.id.speed_label, R.string.stat_speed, R.string.stat_pace);
         utils.setSpeedLabels();
       }
     });
diff --git a/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java b/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java
index 674122f2c..77c8a1a6b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java
@@ -20,13 +20,13 @@ import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.mytracks.R;
 
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-
 import android.app.Activity;
 import android.util.Log;
 import android.widget.TextView;
 
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+
 /**
  * Various utility functions for views that display statistics information.
  *
@@ -128,24 +128,24 @@ public class StatsUtilities {
 
   public void setAltitudeUnits(int unitLabelId) {
     TextView unitTextView = (TextView) activity.findViewById(unitLabelId);
-    unitTextView.setText(metricUnits ? R.string.meter : R.string.feet);
+    unitTextView.setText(metricUnits ? R.string.unit_meter : R.string.unit_feet);
   }
 
   public void setDistanceUnits(int unitLabelId) {
     TextView unitTextView = (TextView) activity.findViewById(unitLabelId);
-    unitTextView.setText(metricUnits ? R.string.kilometer : R.string.mile);
+    unitTextView.setText(metricUnits ? R.string.unit_kilometer : R.string.unit_mile);
   }
 
   public void setSpeedUnits(int unitLabelId, int unitLabelBottomId) {
     TextView unitTextView = (TextView) activity.findViewById(unitLabelId);
     unitTextView.setText(reportSpeed
-        ? (metricUnits ? R.string.kilometer : R.string.mile)
-        : R.string.min);
+        ? (metricUnits ? R.string.unit_kilometer : R.string.unit_mile)
+        : R.string.unit_minute);
 
     unitTextView = (TextView) activity.findViewById(unitLabelBottomId);
     unitTextView.setText(reportSpeed
-        ? R.string.hr
-        : (metricUnits ? R.string.kilometer : R.string.mile));
+        ? R.string.unit_hour
+        : (metricUnits ? R.string.unit_kilometer : R.string.unit_mile));
   }
 
   public void setTime(int id, long l) {
@@ -251,13 +251,13 @@ public class StatsUtilities {
 
   public void setSpeedLabels() {
     setSpeedLabel(R.id.average_speed_label,
-                  R.string.average_speed_label,
-                  R.string.average_pace_label);
+                  R.string.stat_average_speed,
+                  R.string.stat_average_pace);
     setSpeedLabel(R.id.average_moving_speed_label,
-                  R.string.average_moving_speed_label,
-                  R.string.average_moving_pace_label);
+                  R.string.stat_average_moving_speed,
+                  R.string.stat_average_moving_pace);
     setSpeedLabel(R.id.max_speed_label,
-                  R.string.max_speed_label,
-                  R.string.min_pace_label);
+                  R.string.stat_max_speed,
+                  R.string.stat_min_pace);
   }
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
index 04f495d86..a654d5945 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
@@ -312,17 +312,17 @@ public class TrackList extends ListActivity
           if (metricUnits) {
             if (length > 1000) {
               length /= 1000;
-              lengthUnit = getString(R.string.kilometer);
+              lengthUnit = getString(R.string.unit_kilometer);
             } else {
-              lengthUnit = getString(R.string.meter);
+              lengthUnit = getString(R.string.unit_meter);
             }
           } else {
             if (length > UnitConversions.MI_TO_M) {
               length /= UnitConversions.MI_TO_M;
-              lengthUnit = getString(R.string.mile);
+              lengthUnit = getString(R.string.unit_mile);
             } else {
               length *= UnitConversions.M_TO_FT;
-              lengthUnit = getString(R.string.feet);
+              lengthUnit = getString(R.string.unit_feet);
             }
           }
           textView.setText(String.format("%s  %.2f %s",
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java b/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java
index f423e85c8..99a07a4bc 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java
@@ -280,11 +280,11 @@ public class DocsHelper {
     TripStatistics stats = track.getStatistics();
 
     String distanceUnit = context.getString(metricUnits ?
-        R.string.kilometer : R.string.mile);
+        R.string.unit_kilometer : R.string.unit_mile);
     String speedUnit = context.getString(metricUnits ?
-        R.string.kilometer_per_hour : R.string.mile_per_hour);
+        R.string.unit_kilometer_per_hour : R.string.unit_mile_per_hour);
     String elevationUnit = context.getString(metricUnits ?
-        R.string.meter : R.string.feet);
+        R.string.unit_meter : R.string.unit_feet);
 
     // Prepare the Post-Text we are going to send.
     DocsTagBuilder tagBuilder = new DocsTagBuilder(metricUnits)
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorUtils.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorUtils.java
index 6c1d99f71..a1e2f94a5 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorUtils.java
@@ -101,13 +101,13 @@ public class SensorUtils {
       case NONE:
         return c.getString(R.string.sensor_type_value_none);
       case CONNECTING:
-        return c.getString(R.string.connecting);
+        return c.getString(R.string.sensor_state_connecting);
       case CONNECTED:
-        return c.getString(R.string.connected);
+        return c.getString(R.string.sensor_state_connected);
       case DISCONNECTED:
-        return c.getString(R.string.disconnected);
+        return c.getString(R.string.sensor_state_disconnected);
       case SENDING:
-        return c.getString(R.string.sending);
+        return c.getString(R.string.sensor_state_sending);
       default:
         return "";
     }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/ChartURLGenerator.java b/MyTracks/src/com/google/android/apps/mytracks/util/ChartURLGenerator.java
index 5c0336192..cc05d91ea 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/ChartURLGenerator.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/ChartURLGenerator.java
@@ -58,7 +58,7 @@ public class ChartURLGenerator {
     }
 
     return getChartUrl(distances, elevations, track,
-        context.getString(R.string.elevation_label), metricUnits);
+        context.getString(R.string.stat_elevation), metricUnits);
   }
 
   /**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
index e28445469..43f7d78fa 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
@@ -272,20 +272,20 @@ public class StringUtils implements DescriptionGenerator {
 
     String averageSpeed =
         getSpeedString(trackStats.getAverageSpeed(),
-            R.string.average_speed_label,
-            R.string.average_pace_label,
+            R.string.stat_average_speed,
+            R.string.stat_average_pace,
             displaySpeed);
 
     String averageMovingSpeed =
         getSpeedString(trackStats.getAverageMovingSpeed(),
-            R.string.average_moving_speed_label,
-            R.string.average_moving_pace_label,
+            R.string.stat_average_moving_speed,
+            R.string.stat_average_moving_pace,
             displaySpeed);
 
     String maxSpeed =
         getSpeedString(trackStats.getMaxSpeed(),
-            R.string.max_speed_label,
-            R.string.min_pace_label,
+            R.string.stat_max_speed,
+            R.string.stat_min_pace,
             displaySpeed);
 
     return String.format("%s<p>"
@@ -306,41 +306,41 @@ public class StringUtils implements DescriptionGenerator {
         context.getString(R.string.send_to_google_by_mytracks),
 
         // Line 2
-        context.getString(R.string.total_distance_label),
-        distanceInKm, context.getString(R.string.kilometer),
-        distanceInMiles, context.getString(R.string.mile),
+        context.getString(R.string.stat_total_distance),
+        distanceInKm, context.getString(R.string.unit_kilometer),
+        distanceInMiles, context.getString(R.string.unit_mile),
 
         // Line 3
-        context.getString(R.string.total_time_label),
+        context.getString(R.string.stat_total_time),
         StringUtils.formatTime(trackStats.getTotalTime()),
 
         // Line 4
-        context.getString(R.string.moving_time_label),
+        context.getString(R.string.stat_moving_time),
         StringUtils.formatTime(trackStats.getMovingTime()),
 
         // Line 5
         averageSpeed, averageMovingSpeed, maxSpeed,
 
         // Line 6
-        context.getString(R.string.min_elevation_label),
-        minElevationInMeters, context.getString(R.string.meter),
-        minElevationInFeet, context.getString(R.string.feet),
+        context.getString(R.string.stat_min_elevation),
+        minElevationInMeters, context.getString(R.string.unit_meter),
+        minElevationInFeet, context.getString(R.string.unit_feet),
 
         // Line 7
-        context.getString(R.string.max_elevation_label),
-        maxElevationInMeters, context.getString(R.string.meter),
-        maxElevationInFeet, context.getString(R.string.feet),
+        context.getString(R.string.stat_max_elevation),
+        maxElevationInMeters, context.getString(R.string.unit_meter),
+        maxElevationInFeet, context.getString(R.string.unit_feet),
 
         // Line 8
-        context.getString(R.string.elevation_gain_label),
-        elevationGainInMeters, context.getString(R.string.meter),
-        elevationGainInFeet, context.getString(R.string.feet),
+        context.getString(R.string.stat_elevation_gain),
+        elevationGainInMeters, context.getString(R.string.unit_meter),
+        elevationGainInFeet, context.getString(R.string.unit_feet),
 
         // Line 9
-        context.getString(R.string.max_grade_label), maxGrade,
+        context.getString(R.string.stat_max_grade), maxGrade,
 
         // Line 10
-        context.getString(R.string.min_grade_label), minGrade,
+        context.getString(R.string.stat_min_grade), minGrade,
 
         // Line 11
         context.getString(R.string.recorded_date),
@@ -360,8 +360,8 @@ public class StringUtils implements DescriptionGenerator {
     if (displaySpeed) {
       return String.format("%s: %.2f %s (%.1f %s)<br>",
           context.getString(speedLabel),
-          speedInKph, context.getString(R.string.kilometer_per_hour),
-          speedInMph, context.getString(R.string.mile_per_hour));
+          speedInKph, context.getString(R.string.unit_kilometer_per_hour),
+          speedInMph, context.getString(R.string.unit_mile_per_hour));
     } else {
       double paceInKm;
       double paceInMi;
@@ -374,8 +374,8 @@ public class StringUtils implements DescriptionGenerator {
       }
       return String.format("%s: %.2f %s (%.1f %s)<br>",
           context.getString(paceLabel),
-          paceInKm, context.getString(R.string.min_per_kilometer),
-          paceInMi, context.getString(R.string.min_per_mile));
+          paceInKm, context.getString(R.string.unit_minute_per_kilometer),
+          paceInMi, context.getString(R.string.unit_minute_per_mile));
     }
   }
 
@@ -434,34 +434,34 @@ public class StringUtils implements DescriptionGenerator {
         + "%s: %d %s (%d %s)\n"
         + "%s: %d %s\n"
         + "%s: %d %s\n",
-        context.getString(R.string.total_distance_label),
-            distanceInKm, context.getString(R.string.kilometer),
-            distanceInMiles, context.getString(R.string.mile),
-        context.getString(R.string.total_time_label),
+        context.getString(R.string.stat_total_distance),
+            distanceInKm, context.getString(R.string.unit_kilometer),
+            distanceInMiles, context.getString(R.string.unit_mile),
+        context.getString(R.string.stat_total_time),
             StringUtils.formatTime(stats.getTotalTime()),
-        context.getString(R.string.moving_time_label),
+        context.getString(R.string.stat_moving_time),
             StringUtils.formatTime(stats.getMovingTime()),
-        context.getString(R.string.average_speed_label),
-            averageSpeedInKmh, context.getString(R.string.kilometer_per_hour),
-            averageSpeedInMph, context.getString(R.string.mile_per_hour),
-        context.getString(R.string.average_moving_speed_label),
-            movingSpeedInKmh, context.getString(R.string.kilometer_per_hour),
-            movingSpeedInMph, context.getString(R.string.mile_per_hour),
-        context.getString(R.string.max_speed_label),
-            maxSpeedInKmh, context.getString(R.string.kilometer_per_hour),
-            maxSpeedInMph, context.getString(R.string.mile_per_hour),
-        context.getString(R.string.min_elevation_label),
-            minElevationInMeters, context.getString(R.string.meter),
-            minElevationInFeet, context.getString(R.string.feet),
-        context.getString(R.string.max_elevation_label),
-            maxElevationInMeters, context.getString(R.string.meter),
-            maxElevationInFeet, context.getString(R.string.feet),
-        context.getString(R.string.elevation_gain_label),
-            elevationGainInMeters, context.getString(R.string.meter),
-            elevationGainInFeet, context.getString(R.string.feet),
-        context.getString(R.string.max_grade_label),
+        context.getString(R.string.stat_average_speed),
+            averageSpeedInKmh, context.getString(R.string.unit_kilometer_per_hour),
+            averageSpeedInMph, context.getString(R.string.unit_mile_per_hour),
+        context.getString(R.string.stat_average_moving_speed),
+            movingSpeedInKmh, context.getString(R.string.unit_kilometer_per_hour),
+            movingSpeedInMph, context.getString(R.string.unit_mile_per_hour),
+        context.getString(R.string.stat_max_speed),
+            maxSpeedInKmh, context.getString(R.string.unit_kilometer_per_hour),
+            maxSpeedInMph, context.getString(R.string.unit_mile_per_hour),
+        context.getString(R.string.stat_min_elevation),
+            minElevationInMeters, context.getString(R.string.unit_meter),
+            minElevationInFeet, context.getString(R.string.unit_feet),
+        context.getString(R.string.stat_max_elevation),
+            maxElevationInMeters, context.getString(R.string.unit_meter),
+            maxElevationInFeet, context.getString(R.string.unit_feet),
+        context.getString(R.string.stat_elevation_gain),
+            elevationGainInMeters, context.getString(R.string.unit_meter),
+            elevationGainInFeet, context.getString(R.string.unit_feet),
+        context.getString(R.string.stat_max_grade),
             theMaxGrade, percent,
-        context.getString(R.string.min_grade_label),
+        context.getString(R.string.stat_min_grade),
             theMinGrade, percent);
   }
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
index ff7959365..8c3c7d3a7 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
@@ -252,9 +252,11 @@ public class TrackWidgetProvider
     String metricUnitsKey = context.getString(R.string.metric_units_key);
     if (key == null || key.equals(metricUnitsKey)) {
       isMetric = prefs.getBoolean(metricUnitsKey, true);
-      distanceLabel = context.getString(isMetric ? R.string.kilometer : R.string.mile);
-      speedLabel = context.getString(isMetric ? R.string.kilometer_per_hour : R.string.mile_per_hour);
-      paceLabel = context.getString(isMetric ? R.string.min_per_kilometer : R.string.min_per_mile);
+      distanceLabel = context.getString(isMetric ? R.string.unit_kilometer : R.string.unit_mile);
+      speedLabel = context.getString(
+          isMetric ? R.string.unit_kilometer_per_hour : R.string.unit_mile_per_hour);
+      paceLabel = context.getString(
+          isMetric ? R.string.unit_minute_per_kilometer : R.string.unit_minute_per_mile);
     }
 
     String reportSpeedKey = context.getString(R.string.report_speed_key);
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java
index b3623c892..c9e3311c2 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java
@@ -34,7 +34,7 @@ public class ChartValueSeriesTest extends AndroidTestCase {
         R.color.elevation_fill,
         R.color.elevation_border,
         new ZoomSettings(5, new int[] {100}),
-        R.string.elevation_label);
+        R.string.stat_elevation);
   }
 
   public void testInitialConditions() {
@@ -44,7 +44,7 @@ public class ChartValueSeriesTest extends AndroidTestCase {
     assertEquals(0, series.getMax());
     assertEquals(0.0, series.getSpread());
     assertEquals(Style.STROKE, series.getPaint().getStyle());
-    assertEquals(getContext().getString(R.string.elevation_label),
+    assertEquals(getContext().getString(R.string.stat_elevation),
         series.getTitle());
     assertTrue(series.isEnabled());
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java
index 996f77ef5..d908e0e37 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java
@@ -124,18 +124,18 @@ public class DocsHelper_AddTrackRowTest extends TestCase {
     final Resources mockResources = AndroidMock.createMock(MockResources.class);
 
     if (useMetric) {
-      AndroidMock.expect(mockResources.getString(R.string.kilometer))
+      AndroidMock.expect(mockResources.getString(R.string.unit_kilometer))
           .andReturn("km");
-      AndroidMock.expect(mockResources.getString(R.string.kilometer_per_hour))
+      AndroidMock.expect(mockResources.getString(R.string.unit_kilometer_per_hour))
           .andReturn("kph");
-      AndroidMock.expect(mockResources.getString(R.string.meter))
+      AndroidMock.expect(mockResources.getString(R.string.unit_meter))
           .andReturn("meter");
     } else {
-      AndroidMock.expect(mockResources.getString(R.string.mile))
+      AndroidMock.expect(mockResources.getString(R.string.unit_mile))
           .andReturn("mile");
-      AndroidMock.expect(mockResources.getString(R.string.mile_per_hour))
+      AndroidMock.expect(mockResources.getString(R.string.unit_mile_per_hour))
           .andReturn("mph");
-      AndroidMock.expect(mockResources.getString(R.string.feet))
+      AndroidMock.expect(mockResources.getString(R.string.unit_feet))
           .andReturn("feet");
     }
     AndroidMock.replay(mockResources);