diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 351598e86..3021c2eeb 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -102,7 +102,7 @@ limitations under the License.
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.SettingsActivity"
-              android:label="@string/mytracks_settings" >
+              android:label="@string/settings_title" >
       <intent-filter>
         <category android:name="android.intent.category.PREFERENCE" />
       </intent-filter>
@@ -248,8 +248,8 @@ limitations under the License.
   <!-- Permission to get MyTracks broadcasts. For internal MyTracks communication. -->
   <permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS"
               android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/mytracks_notifications_permission_label"
-              android:description="@string/mytracks_notifications_permission_description"
+              android:label="@string/notification_permission_label"
+              android:description="@string/notification_permission_label"
               android:protectionLevel="signature" />
 
   <!-- We read and write raw track data, obviously. -->
diff --git a/MyTracks/res/layout/chart_settings.xml b/MyTracks/res/layout/chart_settings.xml
index a44e75071..520da839a 100644
--- a/MyTracks/res/layout/chart_settings.xml
+++ b/MyTracks/res/layout/chart_settings.xml
@@ -97,7 +97,7 @@ limitations under the License.
             android:checked="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/elevation"/>
+            android:text="@string/elevation_label"/>
           <CheckBox android:id="@+id/chart_settings_speed"
             android:checked="true"
             android:layout_width="fill_parent"
diff --git a/MyTracks/res/layout/mytracks_send_to_google.xml b/MyTracks/res/layout/mytracks_send_to_google.xml
index 726f515f0..cc7a0408f 100644
--- a/MyTracks/res/layout/mytracks_send_to_google.xml
+++ b/MyTracks/res/layout/mytracks_send_to_google.xml
@@ -108,20 +108,6 @@ limitations under the License.
             android:text="@string/sendtogoogle_google_docs"
             android:textSize="20dip"
             android:checked="true"/>
-          <RadioGroup android:id="@+id/sendtogoogle_group_docs"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone">
-            <RadioButton android:id="@+id/sendtogoogle_send_stats"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:text="@string/sendtogoogle_send_stats"/>
-            <RadioButton android:id="@+id/sendtogoogle_send_stats_and_points"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:text="@string/sendtogoogle_send_stats_and_points"
-              android:enabled="false"/>
-          </RadioGroup>
         </LinearLayout>
       </TableRow>
     </TableLayout>
diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index b44e6850c..d69bc6c7b 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -165,12 +165,12 @@ limitations under the License.
   <string name="waypointdetails_category_hint">Tipus de marcador</string>
 
   <!-- MyTracks Settings -->
-  <string name="mytracks_settings">Paràmetres de My Tracks</string>
+  <string name="settings_title">Paràmetres de My Tracks</string>
   <string name="settings_display">Visualització</string>
   <string name="settings_recording">Enregistrament</string>
   <string name="settings_sharing">Compartició</string>
 
-  <string name="settings_not_available_summary">No es troba disponible a la vostra versió de l\'Android</string>
+  <string name="settings_announcement_frequency_not_available">No es troba disponible a la vostra versió de l\'Android</string>
 
   <string name="settings_announcement_frequency">Freqüència d\'avís</string>
   <string name="settings_announcement_frequency_summary">Temps mínim entre dos avisos de veu</string>
@@ -241,14 +241,14 @@ limitations under the License.
 
   <!-- Sharing -->
   <string name="share_map_subject">M\'agradaria compartir un mapa amb tu</string>
-  <string name="share_map_body_format">Em sembla que estaràs interessat en aquest mapa:
+  <string name="share_track_url_body_format">Em sembla que estaràs interessat en aquest mapa:
 
       %s</string>
-  <string name="send_track_subject">M\'agradaria compartir una ruta amb tu</string>
-  <string name="send_track_body_format">Em sembla que estaràs interessat en aquesta ruta.
+  <string name="share_track_subject">M\'agradaria compartir una ruta amb tu</string>
+  <string name="share_track_file_body_format">Em sembla que estaràs interessat en aquesta ruta.
 
     Per veure aquesta ruta fes servir Google Earth o altre programari de mapes.</string>
-  <string name="share_track">Comparteix la ruta amb amics</string>
+  <string name="share_track_url">Comparteix la ruta amb amics</string>
 
   <!-- Visibility -->
   <string name="public_map">Públic</string>
@@ -294,22 +294,22 @@ limitations under the License.
 
   <!-- Units -->
   <!-- Time  -->
-  <string name="hour">hora</string>
-  <string name="hours">hores</string>
-  <string name="minute">minut</string>
-  <string name="minutes">minuts</string>
-  <string name="second">segon</string>
-  <string name="seconds">segons</string>
+  <string name="voice_hour">hora</string>
+  <string name="voice_hours">hores</string>
+  <string name="voice_minute">minut</string>
+  <string name="voice_minutes">minuts</string>
+  <string name="voice_second">segon</string>
+  <string name="voice_seconds">segons</string>
 
   <!-- Distance -->
-  <string name="kilometers_long">kilòmetres</string>
-  <string name="miles_long">milles</string>
+  <string name="voice_kilometers">kilòmetres</string>
+  <string name="voice_miles">milles</string>
 
   <!-- Speed and Pace -->
-  <string name="kilometer_per_hour_long">kilòmetres per hora</string>
-  <string name="per_kilometer">per kilòmetre</string>
-  <string name="mile_per_hour_long">milles per hora</string>
-  <string name="per_mile">per milla</string>
+  <string name="voice_kilometer_per_hour">kilòmetres per hora</string>
+  <string name="voice_per_kilometer">per kilòmetre</string>
+  <string name="voice_mile_per_hour">milles per hora</string>
+  <string name="voice_per_mile">per milla</string>
 
   <!-- Stats Labels -->
   <string name="moving_time_label">Temps en moviment</string>
@@ -391,7 +391,7 @@ limitations under the License.
   <string name="bluetooth_pairing">Associació de dispositius</string>
   <string name="bluetooth_pairing_summary">Obriu els paràmetres de bluetooth de l\'Android per associar un dispositiu</string>
   <string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
-  <string name="sensor_options">Opcions del sensor</string>
+  <string name="settings_sensor">Opcions del sensor</string>
 
   <!-- Bluetooth Sensor -->
   <string name="bluetooth_connected">Connectat a %s</string>
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index 0d681146b..560783cbe 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -168,12 +168,12 @@ limitations under the License.
   <string name="waypointdetails_category_hint">Art des Wegpunktes</string>
 
   <!-- MyTracks Settings -->
-  <string name="mytracks_settings">Einstellungen für My Tracks</string>
+  <string name="settings_title">Einstellungen für My Tracks</string>
   <string name="settings_display">Anzeige</string>
   <string name="settings_recording">Aufzeichnung</string>
   <string name="settings_sharing">Mit Freunden teilen</string>
 
-  <string name="settings_not_available_summary">In dieser Android-Version nicht verfügbar</string>
+  <string name="settings_announcement_frequency_not_available">In dieser Android-Version nicht verfügbar</string>
 
   <string name="settings_announcement_frequency">Dauer zwischen Ansagen</string>
   <string name="settings_announcement_frequency_summary">Kürzeste Zeit zwischen zwei Ansagen</string>
@@ -249,16 +249,16 @@ limitations under the License.
   <string name="mytracks_sky">GPS-Satelliten</string>
 
   <!-- Sharing -->
-  <string name="share_map">Karte mit Freunden teilen</string>
+  <string name="share_track_picker_title">Karte mit Freunden teilen</string>
   <string name="share_map_subject">Ich möchte gerne eine Karte mit Dir teilen.</string>
-  <string name="share_map_body_format">Vielleicht interessierst Du Dich für diese Karte:
+  <string name="share_track_url_body_format">Vielleicht interessierst Du Dich für diese Karte:
 
       %s</string>
-  <string name="send_track_subject">Ich möchte einen GPS-Track mit Dir teilen</string>
-  <string name="send_track_body_format">Vielleicht interessierst Du Dich für diese Track:
+  <string name="share_track_subject">Ich möchte einen GPS-Track mit Dir teilen</string>
+  <string name="share_track_file_body_format">Vielleicht interessierst Du Dich für diese Track:
 
       Der Track kann mit Google Earth oder anderer Karten-Software visualisiert werden.</string>
-  <string name="share_track">Track mit Freunden teilen</string>
+  <string name="share_track_url">Track mit Freunden teilen</string>
 
   <!-- Visibility -->
   <string name="public_map">Öffentlich</string>
@@ -304,33 +304,33 @@ limitations under the License.
 
   <!-- Units -->
   <!-- Time  -->
-  <string name="hour">Stunde</string>
-  <string name="hours">Stunden</string>
+  <string name="voice_hour">Stunde</string>
+  <string name="voice_hours">Stunden</string>
   <string name="hr">Std</string>
   <string name="min">Min</string>
-  <string name="minute">Minute</string>
-  <string name="minutes">Minuten</string>
-  <string name="second">Sekunde</string>
-  <string name="seconds">Sekunden</string>
+  <string name="voice_minute">Minute</string>
+  <string name="voice_minutes">Minuten</string>
+  <string name="voice_second">Sekunde</string>
+  <string name="voice_seconds">Sekunden</string>
   <!--string name="milliseconds">ms</string-->
 
   <!-- Distance -->
   <!--string name="meter">m</string-->
   <!--string name="kilometer">km</string-->
-  <string name="kilometers_long">Kilometer</string>
+  <string name="voice_kilometers">Kilometer</string>
   <string name="feet">Fuß</string>
   <!--string name="mile">mi</string-->
-  <string name="miles_long">Meilen</string>
+  <string name="voice_miles">Meilen</string>
 
   <!-- Speed and Pace -->
   <!--string name="kilometer_per_hour">km/h</string-->
-  <string name="kilometer_per_hour_long">Kilometer pro Stunde</string>
+  <string name="voice_kilometer_per_hour">Kilometer pro Stunde</string>
   <!--string name="min_per_kilometer">min/km</string-->
-  <string name="per_kilometer">pro Kilometer</string>
+  <string name="voice_per_kilometer">pro Kilometer</string>
   <!--string name="mile_per_hour">mi/h</string-->
-  <string name="mile_per_hour_long">Meilen pro Stunde</string>
+  <string name="voice_mile_per_hour">Meilen pro Stunde</string>
   <!--string name="min_per_mile">min/mi</string-->
-  <string name="per_mile">pro Meile</string>
+  <string name="voice_per_mile">pro Meile</string>
 
   <!-- Sensors -->
   <!--string name="watts">W</string-->
@@ -424,7 +424,7 @@ limitations under the License.
   <string name="bluetooth_pairing">Geräteverbindung</string>
   <string name="bluetooth_pairing_summary">Öffnet Androids Bluetooth-Einstellungen, um Geräte zu verbinden.</string>
   <!--string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string-->
-  <string name="sensor_options">Sensor-Einstellungen</string>
+  <string name="settings_sensor">Sensor-Einstellungen</string>
 
   <!-- Bluetooth Sensor -->
   <string name="bluetooth_connected">Verbunden mit %s</string>
diff --git a/MyTracks/res/values-es-rES/strings.xml b/MyTracks/res/values-es-rES/strings.xml
index da765295d..f1f0aa237 100644
--- a/MyTracks/res/values-es-rES/strings.xml
+++ b/MyTracks/res/values-es-rES/strings.xml
@@ -55,7 +55,7 @@ limitations under the License.
   <!-- MyTracks Waypoint Details -->
 
   <!-- MyTracks Settings -->
-  <string name="settings_not_available_summary">No está disponible en su versión de Android</string>
+  <string name="settings_announcement_frequency_not_available">No está disponible en su versión de Android</string>
 
 
   <string name="settings_report_speed_or_pace">Mostrar velocidad</string>
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index 48ff55414..f02628df0 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -197,12 +197,12 @@ limitations under the License.
   <string name="waypointdetails_category_hint">Tipo de señal</string>
 
   <!-- MyTracks Settings -->
-  <string name="mytracks_settings">Configuraciones de My Tracks</string>
+  <string name="settings_title">Configuraciones de My Tracks</string>
   <string name="settings_display">Visualizador</string>
   <string name="settings_recording">Grabando</string>
   <string name="settings_sharing">Compartiendo</string>
 
-  <string name="settings_not_available_summary">No disponible para tu versión de Android</string>
+  <string name="settings_announcement_frequency_not_available">No disponible para tu versión de Android</string>
   <string name="settings_not_while_recording">No disponible mientras se graba el recorrido</string>
 
   <string name="settings_allow_access">Permitir acceso</string>
@@ -309,7 +309,7 @@ limitations under the License.
   <string name="maps_list_failed">¡No se pudieron cargar sus mapas en este momento!</string>
   <string name="open_map">Seleccionar este mapa</string>
   <string name="edit_map_details">Editar detalles del mapa</string>
-  <string name="share_track">Compartir recorrido</string>
+  <string name="share_track_url">Compartir recorrido</string>
   <string name="delete_map">Borrar mapa de su cuenta</string>
   <string name="map_title">Titulo del mapa:</string>
   <string name="map_description">Descripción del mapa:</string>
@@ -319,13 +319,13 @@ limitations under the License.
   <string name="map_not_searchable">Este mapa y sus contenidos no aparecerán en los resultados de busquedas, aunque pueden ser vistos por otros a traves de su enlace directo</string>
 
   <!-- Sharing -->
-  <string name="share_map">Compartir mapa con amigos</string>
+  <string name="share_track_picker_title">Compartir mapa con amigos</string>
   <string name="share_map_subject">Me gustaría compartir un mapa contigo</string>
-  <string name="share_map_body_format">Creo que este mapa pudiera interesarte:
+  <string name="share_track_url_body_format">Creo que este mapa pudiera interesarte:
   
       %s</string>
-  <string name="send_track_subject">Me gustaría compartir un recorrido contigo</string>
-  <string name="send_track_body_format">Creo que este recorrido pudiera interesarte.
+  <string name="share_track_subject">Me gustaría compartir un recorrido contigo</string>
+  <string name="share_track_file_body_format">Creo que este recorrido pudiera interesarte.
 
     Para ver este recorrido usa Google Earth o algún otro software de mapeo.</string>
 
@@ -373,23 +373,23 @@ limitations under the License.
 
   <!-- Units -->
   <!-- Time  -->
-  <string name="hour">hora</string>
-  <string name="hours">horas</string>
-  <string name="minute">minuto</string>
-  <string name="minutes">minutos</string>
-  <string name="second">segundo</string>
-  <string name="seconds">segundos</string>
+  <string name="voice_hour">hora</string>
+  <string name="voice_hours">horas</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="kilometers_long">kilómetros</string>
+  <string name="voice_kilometers">kilómetros</string>
   <string name="feet">pies</string>
-  <string name="miles_long">millas</string>
+  <string name="voice_miles">millas</string>
 
   <!-- Speed and Pace -->
-  <string name="kilometer_per_hour_long">kilómetros por hora</string>
-  <string name="per_kilometer">por kilómetro</string>
-  <string name="mile_per_hour_long">millas por hora</string>
-  <string name="per_mile">por milla</string>
+  <string name="voice_kilometer_per_hour">kilómetros por hora</string>
+  <string name="voice_per_kilometer">por kilómetro</string>
+  <string name="voice_mile_per_hour">millas por hora</string>
+  <string name="voice_per_mile">por milla</string>
 
   <!-- Sensors -->
   <string name="battery_level">Nivel de batería</string>
@@ -480,7 +480,7 @@ limitations under the License.
   <string name="bluetooth_pairing_summary">Abrir la configuración Bluetooth de Android para conectar un dispositivo</string>
   <string name="sensor_bluetooth_options_key">Sensor Bluetooth activado</string>
   <string name="ant_options">Optiones ANT</string>
-  <string name="sensor_options">Opciones del sensor</string>
+  <string name="settings_sensor">Opciones del sensor</string>
   <string name="track_color_mode">Modo de Recorrido Coloreado</string>
   <string name="fixed_speed_options">Opciones de velocidad fija</string>
   <string name="dynamic_speed_options">Opciones de velocidad dinámica</string>
diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml
index 2907933d0..3a383c2db 100644
--- a/MyTracks/res/values-fi/strings.xml
+++ b/MyTracks/res/values-fi/strings.xml
@@ -197,12 +197,12 @@ limitations under the License.
   <string name="waypointdetails_category_hint">Merkinnän tyyppi</string>
 
   <!-- MyTracks Settings -->
-  <string name="mytracks_settings">My Tracks Asetukset</string>
+  <string name="settings_title">My Tracks Asetukset</string>
   <string name="settings_display">Näyttö</string>
   <string name="settings_recording">Tallennus</string>
   <string name="settings_sharing">Jakaminen</string>
 
-  <string name="settings_not_available_summary">Ei tuettu tässä Android-versiossa</string>
+  <string name="settings_announcement_frequency_not_available">Ei tuettu tässä Android-versiossa</string>
   <string name="settings_not_while_recording">Ei saatavilla reittiä tallennettaessa.</string>
 
   <string name="settings_announcement_frequency">Äänimerkki</string>
@@ -290,7 +290,7 @@ limitations under the License.
   <string name="maps_list_failed">Karttoja ei voitu ladata!</string>
   <string name="open_map">Valitse tämä kartta</string>
   <string name="edit_map_details">Muokkaa kartan tietoja</string>
-  <string name="share_track">Jaa reitti</string>
+  <string name="share_track_url">Jaa reitti</string>
   <string name="delete_map">Poista kartta tililtä</string>
   <string name="map_title">Kartan otsikko:</string>
   <string name="map_description">Kartan kuvaus:</string>
@@ -300,13 +300,13 @@ limitations under the License.
   <string name="map_not_searchable">Kartta tai sen sisältö ei näy hakutuloksissa. Tiedot näkyvät muille kuitenkin suoralla URL-linkillä</string>
 
   <!-- Sharing -->
-  <string name="share_map">Jaa kartta</string>
+  <string name="share_track_picker_title">Jaa kartta</string>
   <string name="share_map_subject">Haluaisin jakaa kartan kanssasi</string>
-  <string name="share_map_body_format">Saattaisit olla kiinnostunut tästä reitistä:
+  <string name="share_track_url_body_format">Saattaisit olla kiinnostunut tästä reitistä:
 
       %s</string>
-  <string name="send_track_subject">Haluaisin jakaa reitin kanssasi</string>
-  <string name="send_track_body_format">Saattaisit olla kiinnostunut tästä reitistä.
+  <string name="share_track_subject">Haluaisin jakaa reitin kanssasi</string>
+  <string name="share_track_file_body_format">Saattaisit olla kiinnostunut tästä reitistä.
 
     Käytä Google Earthia tai jotain muuta karttaohjelmistoa kartan katsomiseen.</string>
 
@@ -354,33 +354,33 @@ limitations under the License.
 
   <!-- Units -->
   <!-- Time  -->
-  <string name="hour">tunti</string>
-  <string name="hours">tuntia</string>
+  <string name="voice_hour">tunti</string>
+  <string name="voice_hours">tuntia</string>
   <string name="hr">h</string>
   <string name="min">min</string>
-  <string name="minute">minuutti</string>
-  <string name="minutes">minuuttia</string>
-  <string name="second">sekunti</string>
-  <string name="seconds">sekuntia</string>
+  <string name="voice_minute">minuutti</string>
+  <string name="voice_minutes">minuuttia</string>
+  <string name="voice_second">sekunti</string>
+  <string name="voice_seconds">sekuntia</string>
   <string name="milliseconds">ms</string>
 
   <!-- Distance -->
   <string name="meter">m</string>
   <string name="kilometer">km</string>
-  <string name="kilometers_long">kilometriä</string>
+  <string name="voice_kilometers">kilometriä</string>
   <string name="feet">ft</string>
   <string name="mile">mi</string>
-  <string name="miles_long">mailia</string>
+  <string name="voice_miles">mailia</string>
 
   <!-- Speed and Pace -->
   <string name="kilometer_per_hour">km/h</string>
-  <string name="kilometer_per_hour_long">kilometriä tunnissa</string>
+  <string name="voice_kilometer_per_hour">kilometriä tunnissa</string>
   <string name="min_per_kilometer">min/km</string>
-  <string name="per_kilometer">per kilometri</string>
+  <string name="voice_per_kilometer">per kilometri</string>
   <string name="mile_per_hour">mi/h</string>
-  <string name="mile_per_hour_long">mailia tunnissa</string>
+  <string name="voice_mile_per_hour">mailia tunnissa</string>
   <string name="min_per_mile">min/mi</string>
-  <string name="per_mile">per maili</string>
+  <string name="voice_per_mile">per maili</string>
 
   <!-- Sensors -->
   <string name="watts">W</string>
@@ -477,7 +477,7 @@ limitations under the License.
   <string name="bluetooth_pairing_summary">Avaa Androidin bluetooth-asetukset luodaksesi laitepareja</string>
   <string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
   <string name="ant_options">ANT asetukset</string>
-  <string name="sensor_options">Sensorien asetukset</string>
+  <string name="settings_sensor">Sensorien asetukset</string>
 
   <!-- Bluetooth Sensor -->
   <string name="bluetooth_connected">Yhdistetty %s</string>
diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml
index 92efd2968..c4323c9cc 100644
--- a/MyTracks/res/values-fr/strings.xml
+++ b/MyTracks/res/values-fr/strings.xml
@@ -158,7 +158,7 @@ limitations under the License.
   <string name="waypointdetails_category_hint">Nom de balise</string>
 
   <!-- MyTracks Settings -->
-  <string name="mytracks_settings">Paramètres My Tracks</string>
+  <string name="settings_title">Paramètres My Tracks</string>
   <string name="settings_display">Affichage</string>
   <string name="settings_recording">Enregistrement</string>
   <string name="settings_sharing">Partage</string>
@@ -228,16 +228,16 @@ limitations under the License.
   <string name="mytracks_sky">Satellites GPS</string>
 
   <!-- Sharing -->
-  <string name="share_map">Partager.</string>
+  <string name="share_track_picker_title">Partager.</string>
   <string name="share_map_subject">Je voudrais partager ma carte avec vous</string>
-  <string name="share_map_body_format">Je pense que cette carte vous intéressera :
+  <string name="share_track_url_body_format">Je pense que cette carte vous intéressera :
 
       %s</string>
-  <string name="send_track_subject">Je voudrais partager un parcours avec vous</string>
-  <string name="send_track_body_format">Je pense que ce parcours vous intéressera.
+  <string name="share_track_subject">Je voudrais partager un parcours avec vous</string>
+  <string name="share_track_file_body_format">Je pense que ce parcours vous intéressera.
 
     Pour voir ce parcours, utilisez Google Earth ou tout autre logiciel de cartographie.</string>
-  <string name="share_track">Partager des parcours.</string>
+  <string name="share_track_url">Partager des parcours.</string>
 
   <!-- Visibility -->
   <string name="unlisted_map">Carte non listée</string>
@@ -280,23 +280,23 @@ limitations under the License.
 
   <!-- Units -->
   <!-- Time  -->
-  <string name="hour">heure</string>
-  <string name="hours">heures</string>
-  <string name="second">seconde</string>
-  <string name="seconds">secondes</string>
+  <string name="voice_hour">heure</string>
+  <string name="voice_hours">heures</string>
+  <string name="voice_second">seconde</string>
+  <string name="voice_seconds">secondes</string>
 
   <!-- Distance -->
   <string name="feet">pied</string>
-  <string name="kilometers_long">kilomètres</string>
-  <string name="miles_long">milles</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="kilometer_per_hour_long">kilomètres/heure</string>
-  <string name="per_kilometer">par kilomètre</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="mile_per_hour_long">miles/heure</string>
-  <string name="per_mile">per mile</string>
+  <string name="voice_mile_per_hour">miles/heure</string>
+  <string name="voice_per_mile">per mile</string>
 
 
   <string name="waiting">Waiting...</string>
@@ -380,7 +380,7 @@ limitations under the License.
   <string name="bluetooth_pairing">Association d\'un appareil</string>
   <string name="bluetooth_pairing_summary">Visitez les paramètres Bluetooth d\'Android pour associer un nouvel appareil</string>
   <string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
-  <string name="sensor_options">Options du capteur</string>
+  <string name="settings_sensor">Options du capteur</string>
 
   <!-- Bluetooth Sensor -->
   <string name="bluetooth_connected">Connecté à %s</string>
diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml
index 52dda5c02..a7e1cee87 100644
--- a/MyTracks/res/values-it/strings.xml
+++ b/MyTracks/res/values-it/strings.xml
@@ -161,7 +161,7 @@ limitations under the License.
   <string name="waypointdetails_category_hint">Tipo di segnaposto</string>
 
   <!-- MyTracks Settings -->
-  <string name="mytracks_settings">Impostazioni di My Tracks</string>
+  <string name="settings_title">Impostazioni di My Tracks</string>
   <string name="settings_display">Visualizzazione</string>
   <string name="settings_recording">Registrazione</string>
   <string name="settings_sharing">Condivisione</string>
@@ -206,14 +206,14 @@ limitations under the License.
 
   <!-- Sharing -->
   <string name="share_map_subject">Vorrei condividere una mappa con te</string>
-  <string name="share_map_body_format">Credo che questa mappa potrebbe interessarti:
+  <string name="share_track_url_body_format">Credo che questa mappa potrebbe interessarti:
 
       %s</string>
-  <string name="send_track_subject">Vorrei condividere un percorso con te</string>
-  <string name="send_track_body_format">Credo che questo percorso potrebbe interessarti.
+  <string name="share_track_subject">Vorrei condividere un percorso con te</string>
+  <string name="share_track_file_body_format">Credo che questo percorso potrebbe interessarti.
 
     Per vedere questo percorso, usa Google Earth o un altro software di cartografia.</string>
-  <string name="share_track">Condividi il percorso con amici</string>
+  <string name="share_track_url">Condividi il percorso con amici</string>
 
   <!-- Visibility -->
   <string name="public_map">Pubblica</string>
@@ -259,32 +259,32 @@ limitations under the License.
 
   <!-- Units -->
   <!-- Time  -->
-  <string name="hour">ora</string>
-  <string name="hours">ore</string>
+  <string name="voice_hour">ora</string>
+  <string name="voice_hours">ore</string>
   <string name="hr">h</string>
   <string name="min">min</string>
-  <string name="minute">minuto</string>
-  <string name="minutes">minuti</string>
-  <string name="second">secondo</string>
-  <string name="seconds">secondi</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="kilometers_long">chilometri</string>
+  <string name="voice_kilometers">chilometri</string>
   <string name="feet">pd</string>
   <string name="mile">mi</string>
-  <string name="miles_long">miglia</string>
+  <string name="voice_miles">miglia</string>
 
   <!-- Speed and Pace -->
   <string name="kilometer_per_hour">km/h</string>
-  <string name="kilometer_per_hour_long">chilometri orari</string>
+  <string name="voice_kilometer_per_hour">chilometri orari</string>
   <string name="min_per_kilometer">min/km</string>
-  <string name="per_kilometer">per chilometro</string>
+  <string name="voice_per_kilometer">per chilometro</string>
   <string name="mile_per_hour">mi/h</string>
-  <string name="mile_per_hour_long">miglia orarie</string>
+  <string name="voice_mile_per_hour">miglia orarie</string>
   <string name="min_per_mile">min/mi</string>
-  <string name="per_mile">per miglio</string>
+  <string name="voice_per_mile">per miglio</string>
 
   <!-- Stats Labels -->
   <string name="moving_time_label">Durata in moto</string>
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index 60dc22a90..e6db12ed4 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -190,12 +190,12 @@ limitations under the License.
   <string name="waypointdetails_category_hint">マーカータイプ</string>
 
   <!-- MyTracks Settings -->
-  <string name="mytracks_settings">My Tracks設定</string>
+  <string name="settings_title">My Tracks設定</string>
   <string name="settings_display">表示</string>
   <string name="settings_recording">記録</string>
   <string name="settings_sharing">共有</string>
 
-  <string name="settings_not_available_summary">このAndroidバージョンでは使用できません</string>
+  <string name="settings_announcement_frequency_not_available">このAndroidバージョンでは使用できません</string>
 
   <string name="settings_announcement_frequency">定期通知</string>
   <string name="settings_announcement_frequency_summary">音声通知間隔の最小時間</string>
@@ -277,7 +277,7 @@ limitations under the License.
   <string name="maps_list_failed">今回はマップをロードできませんでした!</string>
   <string name="open_map">このマップを選択</string>
   <string name="edit_map_details">マップ詳細編集</string>
-  <string name="share_track">トラック共有</string>
+  <string name="share_track_url">トラック共有</string>
   <string name="delete_map">アカウントからマップを削除</string>
   <string name="map_title">マップタイトル:</string>
   <string name="map_description">マップ説明:</string>
@@ -287,16 +287,16 @@ limitations under the License.
   <string name="map_not_searchable">このマップもコンテンツも検索結果に表示されませんが、直接リンクで見られる可能性があります</string>
 
   <!-- Sharing -->
-  <string name="share_map">マップ共有</string>
+  <string name="share_track_picker_title">マップ共有</string>
   <string name="share_map_subject">マップを共有したいと思います</string>
-  <string name="share_map_body_format">このマップに興味を持って頂けると思います:
+  <string name="share_track_url_body_format">このマップに興味を持って頂けると思います:
 
       %s</string>
-  <string name="send_track_subject">トラックを共有したいと思います</string>
-  <string name="send_track_body_format">このトラックに興味を持って頂けると思います．
+  <string name="share_track_subject">トラックを共有したいと思います</string>
+  <string name="share_track_file_body_format">このトラックに興味を持って頂けると思います．
 
     このトラックを閲覧するには、Google Earthまたは他のマッピングソフトウェアが必要です．</string>
-  <string name="share_track">トラックの共有</string>
+  <string name="share_track_url">トラックの共有</string>
 
   <!-- Visibility -->
   <string name="public_map">公開</string>
@@ -342,25 +342,25 @@ limitations under the License.
 
   <!-- Units -->
   <!-- Time  -->
-  <string name="hour">時</string>
-  <string name="hours">時</string>
+  <string name="voice_hour">時</string>
+  <string name="voice_hours">時</string>
   <string name="hr">時</string>
   <string name="min">分</string>
-  <string name="minute">分</string>
-  <string name="minutes">分</string>
-  <string name="second">秒</string>
-  <string name="seconds">秒</string>
+  <string name="voice_minute">分</string>
+  <string name="voice_minutes">分</string>
+  <string name="voice_second">秒</string>
+  <string name="voice_seconds">秒</string>
   <string name="milliseconds">ミリ秒</string>
 
   <!-- Distance -->
-  <string name="kilometers_long">キロメータ</string>
-  <string name="miles_long">マイル</string>
+  <string name="voice_kilometers">キロメータ</string>
+  <string name="voice_miles">マイル</string>
 
   <!-- Speed and Pace -->
-  <string name="kilometer_per_hour_long">キロメータ毎時</string>
-  <string name="per_kilometer">毎キロメータ</string>
-  <string name="mile_per_hour_long">マイル毎時</string>
-  <string name="per_mile">毎マイル</string>
+  <string name="voice_kilometer_per_hour">キロメータ毎時</string>
+  <string name="voice_per_kilometer">毎キロメータ</string>
+  <string name="voice_mile_per_hour">マイル毎時</string>
+  <string name="voice_per_mile">毎マイル</string>
 
   <!-- Stats Labels -->
   <string name="moving_time_label">移動時間</string>
@@ -446,7 +446,7 @@ limitations under the License.
   <string name="bluetooth_pairing_summary">ペアリングを行うには「Bluetooth設定」を開いて下さい</string>
   <string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
   <string name="ant_options">ANTオプション</string>
-  <string name="sensor_options">センサーオプション</string>
+  <string name="settings_sensor">センサーオプション</string>
 
   <!-- Bluetooth Sensor -->
   <string name="bluetooth_connected">%sに接続しました</string>
diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml
index d4b844032..04476e5ab 100644
--- a/MyTracks/res/values-pl/strings.xml
+++ b/MyTracks/res/values-pl/strings.xml
@@ -163,7 +163,7 @@ limitations under the License.
   <string name="waypointdetails_category_hint">Typ znacznika</string>
 
   <!-- MyTracks Settings -->
-  <string name="mytracks_settings">Ustawienia My Tracks</string>
+  <string name="settings_title">Ustawienia My Tracks</string>
   <string name="settings_display">Wyświetlanie</string>
   <string name="settings_recording">Rejestrowanie</string>
   <string name="settings_sharing">Dzielenie</string>
@@ -234,14 +234,14 @@ limitations under the License.
 
   <!-- Sharing -->
   <string name="share_map_subject">Chciałbym się z Tobą podzielić mapą</string>
-  <string name="share_map_body_format">Myślę, że może Cię zainteresować ta mapa:
+  <string name="share_track_url_body_format">Myślę, że może Cię zainteresować ta mapa:
 
       %s</string>
-  <string name="send_track_subject">Chciałbym się z Tobą podzielić trasą</string>
-  <string name="send_track_body_format">Myślę, że może Cię zainteresować ta trasa.
+  <string name="share_track_subject">Chciałbym się z Tobą podzielić trasą</string>
+  <string name="share_track_file_body_format">Myślę, że może Cię zainteresować ta trasa.
 
     Trasę możesz obejrzeć w Google Earth lub innym programie do obsługi map.</string>
-  <string name="share_track">Podziel się trasą z przyjaciółmi</string>
+  <string name="share_track_url">Podziel się trasą z przyjaciółmi</string>
 
   <!-- Visibility -->
   <string name="public_map">Publiczna</string>
@@ -287,32 +287,32 @@ limitations under the License.
 
   <!-- Units -->
   <!-- Time  -->
-  <string name="hour">godzina</string>
-  <string name="hours">godziny</string>
+  <string name="voice_hour">godzina</string>
+  <string name="voice_hours">godziny</string>
   <string name="hr">godz.</string>
   <string name="min">min</string>
-  <string name="minute">minuta</string>
-  <string name="minutes">minuty</string>
-  <string name="second">sekunda</string>
-  <string name="seconds">sekundy</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="kilometers_long">kilometerów</string>
+  <string name="voice_kilometers">kilometerów</string>
   <string name="feet">st.</string>
   <string name="mile">mi</string>
-  <string name="miles_long">mil</string>
+  <string name="voice_miles">mil</string>
 
   <!-- Speed and Pace -->
   <string name="kilometer_per_hour">km/h</string>
-  <string name="kilometer_per_hour_long">kilometry na godzinę</string>
+  <string name="voice_kilometer_per_hour">kilometry na godzinę</string>
   <string name="min_per_kilometer">min/km</string>
-  <string name="per_kilometer">na kilometr</string>
+  <string name="voice_per_kilometer">na kilometr</string>
   <string name="mile_per_hour">mi/h</string>
-  <string name="mile_per_hour_long">mile na godzinę</string>
+  <string name="voice_mile_per_hour">mile na godzinę</string>
   <string name="min_per_mile">min/mi</string>
-  <string name="per_mile">na milę</string>
+  <string name="voice_per_mile">na milę</string>
 
   <!-- Stats Labels -->
   <string name="moving_time_label">Czas w ruchu</string>
@@ -395,7 +395,7 @@ limitations under the License.
   <string name="bluetooth_pairing_summary">Przejdź do ustawień Bluetooth Androida aby sparować urządzenie</string>
   <string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
   <string name="ant_options">Opce ANT</string>
-  <string name="sensor_options">Opcje Czujników</string>
+  <string name="settings_sensor">Opcje Czujników</string>
 
   <!-- Bluetooth Sensor -->
   <string name="bluetooth_connected">Połączony z %s</string>
diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml
index 9961800f3..cafacd775 100644
--- a/MyTracks/res/values-pt-rBR/strings.xml
+++ b/MyTracks/res/values-pt-rBR/strings.xml
@@ -158,11 +158,11 @@ limitations under the License.
   <string name="waypointdetails_category_hint">Tipo do Marcador</string>
 
   <!-- MyTracks Settings -->
-  <string name="mytracks_settings">Configurações do My Tracks</string>
+  <string name="settings_title">Configurações do My Tracks</string>
   <string name="settings_display">Exibição</string>
   <string name="settings_recording">Gravação</string>
   <string name="settings_sharing">Compartilhamento</string>
-  <string name="settings_not_available_summary">Não disponível na sua versão do Android</string>
+  <string name="settings_announcement_frequency_not_available">Não disponível na sua versão do Android</string>
   <string name="settings_not_while_recording">Não disponível durante a gravação de uma trilha</string>
   <string name="settings_announcement_frequency">Tempo entre anúncios</string>
   <string name="settings_announcement_frequency_summary">Tempo mínimo entre dois anúncios de voz</string>
@@ -195,14 +195,14 @@ limitations under the License.
 
   <!-- Sharing -->
   <string name="share_map_subject">Eu gostaria de compartilhar um mapa com você</string>
-  <string name="share_map_body_format">Eu acredito que você pode se interessar por este mapa:
+  <string name="share_track_url_body_format">Eu acredito que você pode se interessar por este mapa:
 
       %s</string>
-  <string name="send_track_subject">Eu gostaria de compartilhar um caminho com você</string>
-  <string name="send_track_body_format">Eu acredito que você pode se interesasr por este caminho.
+  <string name="share_track_subject">Eu gostaria de compartilhar um caminho com você</string>
+  <string name="share_track_file_body_format">Eu acredito que você pode se interesasr por este caminho.
 
     Para visualizar este caminho, use o Google Earth ou outro software de mapas.</string>
-  <string name="share_track">Compartilhar caminho com amigos</string>
+  <string name="share_track_url">Compartilhar caminho com amigos</string>
 
   <!-- Visibility -->
   <string name="public_map">Público</string>
@@ -246,24 +246,24 @@ limitations under the License.
 
   <!-- Units -->
   <!-- Time -->
-  <string name="hour">hora</string>
-  <string name="hours">horas</string>
+  <string name="voice_hour">hora</string>
+  <string name="voice_hours">horas</string>
   <string name="hr">h</string>
-  <string name="minute">minuto</string>
-  <string name="minutes">minutos</string>
-  <string name="second">segundo</string>
-  <string name="seconds">segundos</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="kilometers_long">kilômetros</string>
-  <string name="miles_long">milhas</string>
+  <string name="voice_kilometers">kilômetros</string>
+  <string name="voice_miles">milhas</string>
 
   <!-- Speed and Pace -->
-  <string name="kilometer_per_hour_long">kilômetros por hora</string>
-  <string name="per_kilometer">por kilômetro</string>
-  <string name="mile_per_hour_long">milhas por hora</string>
-  <string name="per_mile">por milha</string>
+  <string name="voice_kilometer_per_hour">kilômetros por hora</string>
+  <string name="voice_per_kilometer">por kilômetro</string>
+  <string name="voice_mile_per_hour">milhas por hora</string>
+  <string name="voice_per_mile">por milha</string>
 
   <!-- Stats Labels -->
   <string name="moving_time_label">Tempo em Movimento</string>
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index 3552ed2ad..58ed69fce 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -193,12 +193,12 @@ limitations under the License.
   <string name="waypointdetails_category_hint">Тип маркера</string>
 
   <!-- MyTracks Settings -->
-  <string name="mytracks_settings">Настройки My Tracks</string>
+  <string name="settings_title">Настройки My Tracks</string>
   <string name="settings_display">Отображение</string>
   <string name="settings_recording">Запись</string>
   <string name="settings_sharing">Обмен</string>
 
-  <string name="settings_not_available_summary">Не доступен в вашем версии Android</string>
+  <string name="settings_announcement_frequency_not_available">Не доступен в вашем версии Android</string>
   <string name="settings_not_while_recording">Не доступно во время записи трека</string>
 
   <string name="settings_announcement_frequency">Частота объявлений</string>
@@ -286,7 +286,7 @@ limitations under the License.
   <string name="maps_list_failed">Ваши карты не могут быть загружены в данный момент!</string>
   <string name="open_map">Выберите эту карту</string>
   <string name="edit_map_details">Править детали карты</string>
-  <string name="share_track">Поделиться треком</string>
+  <string name="share_track_url">Поделиться треком</string>
   <string name="delete_map">Удалить Карту из вашей учетной записи</string>
   <string name="map_title">Название карты:</string>
   <string name="map_description">Описание карты:</string>
@@ -296,13 +296,13 @@ limitations under the License.
   <string name="map_not_searchable">Ни эта карта, ни ее содержимое не будут отображаться в результатах поиска, но их могут по-прежнему просматривать другие через прямую ссылку</string>
 
   <!-- Sharing -->
-  <string name="share_map">Поделиться картой с друзьями</string>
+  <string name="share_track_picker_title">Поделиться картой с друзьями</string>
   <string name="share_map_subject">Я хотел бы поделиться с вами треком</string>
-  <string name="share_map_body_format">Я думаю, вы можете быть заинтересованы в этом треке:
+  <string name="share_track_url_body_format">Я думаю, вы можете быть заинтересованы в этом треке:
 
 %s</string>
-  <string name="send_track_subject">Я хотел бы поделиться с вами треком</string>
-  <string name="send_track_body_format">Я думаю, вы можете быть заинтересованы в этом треке.
+  <string name="share_track_subject">Я хотел бы поделиться с вами треком</string>
+  <string name="share_track_file_body_format">Я думаю, вы можете быть заинтересованы в этом треке.
 
 Просмотреть трек можно с помощью Google Планета Земля или другого программного обоспечения для карт.</string>
 
@@ -350,33 +350,33 @@ limitations under the License.
 
   <!-- Units -->
   <!-- Time  -->
-  <string name="hour">час</string>
-  <string name="hours">часов</string>
+  <string name="voice_hour">час</string>
+  <string name="voice_hours">часов</string>
   <string name="hr">ч</string>
   <string name="min">мин</string>
-  <string name="minute">минута</string>
-  <string name="minutes">минут</string>
-  <string name="second">секунда</string>
-  <string name="seconds">секунд</string>
+  <string name="voice_minute">минута</string>
+  <string name="voice_minutes">минут</string>
+  <string name="voice_second">секунда</string>
+  <string name="voice_seconds">секунд</string>
   <string name="milliseconds">мс</string>
 
   <!-- Distance -->
   <string name="meter">м</string>
   <string name="kilometer">км</string>
-  <string name="kilometers_long">километров</string>
+  <string name="voice_kilometers">километров</string>
   <string name="feet">футов</string>
   <string name="mile">миль</string>
-  <string name="miles_long">мили</string>
+  <string name="voice_miles">мили</string>
 
   <!-- Speed and Pace -->
   <string name="kilometer_per_hour">км/ч</string>
-  <string name="kilometer_per_hour_long">километров в час</string>
+  <string name="voice_kilometer_per_hour">километров в час</string>
   <string name="min_per_kilometer">мин/км</string>
-  <string name="per_kilometer">за километр</string>
+  <string name="voice_per_kilometer">за километр</string>
   <string name="mile_per_hour">миль/ч</string>
-  <string name="mile_per_hour_long">миль в час</string>
+  <string name="voice_mile_per_hour">миль в час</string>
   <string name="min_per_mile">мин/миля</string>
-  <string name="per_mile">за милю</string>
+  <string name="voice_per_mile">за милю</string>
 
   <!-- Sensors -->
   <string name="watts">Вт</string>
@@ -473,7 +473,7 @@ limitations under the License.
   <string name="bluetooth_pairing_summary">Открыть настройки Android по bluetooth для подключения устройства</string>
   <string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
   <string name="ant_options">Параметры ANT</string>
-  <string name="sensor_options">Параметры датчика</string>
+  <string name="settings_sensor">Параметры датчика</string>
 
   <!-- Bluetooth Sensor -->
   <string name="bluetooth_connected">Подключен к %s</string>
diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml
index f9129552f..f94b0c575 100644
--- a/MyTracks/res/values-sv/strings.xml
+++ b/MyTracks/res/values-sv/strings.xml
@@ -163,7 +163,7 @@ limitations under the License.
   <string name="waypointdetails_category_hint">Markörtyp</string>
 
   <!-- MyTracks Settings -->
-  <string name="mytracks_settings">My Tracks inställningar</string>
+  <string name="settings_title">My Tracks inställningar</string>
   <string name="settings_display">Visning</string>
   <string name="settings_recording">Inspelning</string>
   <string name="settings_sharing">Delning</string>
@@ -209,14 +209,14 @@ limitations under the License.
 
   <!-- Sharing -->
   <string name="share_map_subject">Jag vill dela en karta med dig</string>
-  <string name="share_map_body_format">Jag tror att du skulle vara intresserad av den här kartan:
+  <string name="share_track_url_body_format">Jag tror att du skulle vara intresserad av den här kartan:
 
       %s</string>
-  <string name="send_track_subject">Jag vill dela ett spår med dig</string>
-  <string name="send_track_body_format">Jag tror att du skulle vara intresserad av det här spåret.
+  <string name="share_track_subject">Jag vill dela ett spår med dig</string>
+  <string name="share_track_file_body_format">Jag tror att du skulle vara intresserad av det här spåret.
 
     För att se det här spåret använd Google Earth eller något annat kartprogram.</string>
-  <string name="share_track">Dela spår med vänner</string>
+  <string name="share_track_url">Dela spår med vänner</string>
 
   <!-- Visibility -->
   <string name="public_map">Publik</string>
@@ -262,32 +262,32 @@ limitations under the License.
 
   <!-- Units -->
   <!-- Time  -->
-  <string name="hour">timme</string>
-  <string name="hours">timmar</string>
+  <string name="voice_hour">timme</string>
+  <string name="voice_hours">timmar</string>
   <string name="hr">tim</string>
   <string name="min">min</string>
-  <string name="minute">minut</string>
-  <string name="minutes">minuter</string>
-  <string name="second">sekund</string>
-  <string name="seconds">sekunder</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="kilometers_long">kilometer</string>
+  <string name="voice_kilometers">kilometer</string>
   <string name="feet">ft</string>
   <string name="mile">mi</string>
-  <string name="miles_long">miles</string>
+  <string name="voice_miles">miles</string>
 
   <!-- Speed and Pace -->
   <string name="kilometer_per_hour">km/h</string>
-  <string name="kilometer_per_hour_long">kilometer i timmen</string>
+  <string name="voice_kilometer_per_hour">kilometer i timmen</string>
   <string name="min_per_kilometer">min/km</string>
-  <string name="per_kilometer">per kilometer</string>
+  <string name="voice_per_kilometer">per kilometer</string>
   <string name="mile_per_hour">mi/h</string>
-  <string name="mile_per_hour_long">miles i timmen</string>
+  <string name="voice_mile_per_hour">miles i timmen</string>
   <string name="min_per_mile">min/mi</string>
-  <string name="per_mile">per mile</string>
+  <string name="voice_per_mile">per mile</string>
 
   <!-- Stats Labels -->
   <string name="moving_time_label">Rörlig tid</string>
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index 168705e8f..238a9afa2 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -194,12 +194,12 @@ limitations under the License.
   <string name="waypointdetails_category_hint">标记类型</string>
 
   <!-- MyTracks Settings -->
-  <string name="mytracks_settings">My Tracks 设置</string>
+  <string name="settings_title">My Tracks 设置</string>
   <string name="settings_display">显示</string>
   <string name="settings_recording">记录</string>
   <string name="settings_sharing">分享</string>
 
-  <string name="settings_not_available_summary">不支持当前使用的 Android 版本</string>
+  <string name="settings_announcement_frequency_not_available">不支持当前使用的 Android 版本</string>
   <string name="settings_not_while_recording">在记录轨迹时不可用</string>
 
   <string name="settings_announcement_frequency">通知频度</string>
@@ -287,7 +287,7 @@ limitations under the License.
   <string name="maps_list_failed">现在无法载入你的地图!</string>
   <string name="open_map">选择此地图</string>
   <string name="edit_map_details">编辑地图详细信息</string>
-  <string name="share_track">分享轨迹</string>
+  <string name="share_track_url">分享轨迹</string>
   <string name="delete_map">从你的帐号删除地图</string>
   <string name="map_title">地图标题:</string>
   <string name="map_description">地图描述:</string>
@@ -297,13 +297,13 @@ limitations under the License.
   <string name="map_not_searchable">此地图和它的内容不会在搜索结果中出现, 但其它用户依然可以通过直接 URL 访问它</string>
 
   <!-- Sharing -->
-  <string name="share_map">与朋友分享地图</string>
+  <string name="share_track_picker_title">与朋友分享地图</string>
   <string name="share_map_subject">我想与你分享一张地图</string>
-  <string name="share_map_body_format">我想你可能会对这个地图感兴趣:
+  <string name="share_track_url_body_format">我想你可能会对这个地图感兴趣:
 
       %s</string>
-  <string name="send_track_subject">我想与你分享一条轨迹</string>
-  <string name="send_track_body_format">我想你可能会对这条轨迹感兴趣.
+  <string name="share_track_subject">我想与你分享一条轨迹</string>
+  <string name="share_track_file_body_format">我想你可能会对这条轨迹感兴趣.
 
     请用 Google Earth 或其它地图软件查看此轨迹.</string>
 
@@ -351,24 +351,24 @@ limitations under the License.
 
   <!-- Units -->
   <!-- Time  -->
-  <string name="hour">小时</string>
-  <string name="hours">小时</string>
+  <string name="voice_hour">小时</string>
+  <string name="voice_hours">小时</string>
   <string name="hr">时</string>
   <string name="min">分</string>
-  <string name="minute">分钟</string>
-  <string name="minutes">分钟</string>
-  <string name="second">秒</string>
-  <string name="seconds">秒</string>
+  <string name="voice_minute">分钟</string>
+  <string name="voice_minutes">分钟</string>
+  <string name="voice_second">秒</string>
+  <string name="voice_seconds">秒</string>
 
   <!-- Distance -->
-  <string name="kilometers_long">千米</string>
-  <string name="miles_long">英里</string>
+  <string name="voice_kilometers">千米</string>
+  <string name="voice_miles">英里</string>
 
   <!-- Speed and Pace -->
-  <string name="kilometer_per_hour_long">千米每小时</string>
-  <string name="per_kilometer">每千米</string>
-  <string name="mile_per_hour_long">英里每小时</string>
-  <string name="per_mile">每英里</string>
+  <string name="voice_kilometer_per_hour">千米每小时</string>
+  <string name="voice_per_kilometer">每千米</string>
+  <string name="voice_mile_per_hour">英里每小时</string>
+  <string name="voice_per_mile">每英里</string>
 
   <!-- Stats Labels -->
   <string name="moving_time_label">移动时间</string>
@@ -453,7 +453,7 @@ limitations under the License.
   <string name="bluetooth_options">蓝牙设置</string>
   <string name="bluetooth_pairing">设备关联</string>
   <string name="bluetooth_pairing_summary">打开 Android 的蓝牙设置关联设备</string>
-  <string name="sensor_options">感应器选项</string>
+  <string name="settings_sensor">感应器选项</string>
 
   <!-- Bluetooth Sensor -->
   <string name="bluetooth_connected">连接到 %s</string>
diff --git a/MyTracks/res/values/do_not_translate.xml b/MyTracks/res/values/do_not_translate.xml
index fde795cd2..4fe28ab38 100644
--- a/MyTracks/res/values/do_not_translate.xml
+++ b/MyTracks/res/values/do_not_translate.xml
@@ -41,6 +41,9 @@ limitations under the License.
   <string name="track_color_mode_value_fixed">FIXED</string>
   <string name="track_color_mode_value_dynamic">DYNAMIC</string>
 
+  <!-- When a value is unknown. E.g. when speed is unknown '- km/hr'. -->
+  <string name="unknown">-</string>
+      
   <!-- Send to Google URLs -->
   <string name="sendtogoogle_google_mymaps_url">maps.google.com</string>
   <string name="sendtogoogle_google_fusiontables_url">google.com/fusiontables</string>
diff --git a/MyTracks/res/values/keys.xml b/MyTracks/res/values/keys.xml
index 22c2eb6df..def4309b5 100644
--- a/MyTracks/res/values/keys.xml
+++ b/MyTracks/res/values/keys.xml
@@ -31,7 +31,6 @@ limitations under the License.
   <string name="min_required_accuracy_key">minRequiredAccuracy</string>
   <string name="pick_existing_map_key">pickExistingMap</string>
   <string name="report_speed_key">reportSpeed</string>
-  <string name="send_stats_and_points_key">sendStatsAndPoints</string>
   <string name="send_to_docs_key">sendToDocs</string>
   <string name="send_to_fusion_tables_key">sendToFusionTables</string>
   <string name="send_to_my_maps_key">sendToMyMaps</string>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 559f469fd..67dd5ebb9 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -472,8 +472,9 @@ limitations under the License.
   <!--  'Share with friends...' menu options. -->
   <string name="tracklist_share_link"
     translation_description="In the context menu for a track, under the 'Share with friends...'
-      option, the menu option to share the track's link to My Maps or Fusion Tables with friends.">
-    A link to My Maps or Fusion Tables
+      option, the menu option to save a track to My Maps or Fusion Tables and share the URL with
+      friends.">
+    My Map or Fusion Table URL
   </string>
   <string name="tracklist_share_gpx_file"
     translation_description="In the context menu for a track, under the 'Share with friends...'
@@ -659,353 +660,969 @@ limitations under the License.
     Marker Description
   </string>
 
-  <!-- MyTracks Settings -->
-  <string name="mytracks_settings">My Tracks Settings</string>
-  <string name="settings_display">Display</string>
-  <string name="settings_recording">Recording</string>
-  <string name="settings_sharing">Sharing</string>
-
-  <string name="settings_not_available_summary">Not available in your version of Android</string>
-  <string name="settings_not_while_recording">Not available while recording a track</string>
-
-  <string name="settings_allow_access">Allow access</string>
-  <string name="settings_allow_access_summary_on">Other apps can read, write, start/stop recording
-          MyTracks data.</string>
-  <string name="settings_allow_access_summary_off">Other apps cannot read, write, start/stop
-          recording MyTracks data.</string>
-  <string name="settings_allow_access_dialog_message">Are you sure you want to allow other apps,
-          including future apps, to control and access MyTracks data? There will be no further
-          notification.</string>
-          
-  <string name="settings_announcement_frequency">Announcement frequency</string>
-  <string name="settings_announcement_frequency_summary">Minimum time between two voice announcements</string>
-
-  <string name="settings_min_recording_distance">Min distance between points</string>
-  <string name="settings_min_recording_distance_summary">Smallest distance between two recordings of your position</string>
-
-  <string name="settings_max_recording_distance">Max distance between points</string>
-  <string name="settings_max_recording_distance_summary">If two points are further than this, the track will be split</string>
-
-  <string name="settings_min_recording_interval">Min time between points</string>
-  <string name="settings_min_recording_interval_summary">Smallest time interval between two recordings of your position</string>
-
-  <string name="settings_min_required_accuracy">Minimum accuracy</string>
-  <string name="settings_min_required_accuracy_summary">Recording will be paused if your position is not at least this accurate</string>
-
-  <string name="settings_metric_units">Use metric units</string>
-  <string name="settings_metric_units_summary_on">All distances will be displayed in metric units</string>
-  <string name="settings_metric_units_summary_off">All distances will be displayed in imperial units</string>
-
-  <string name="settings_map_public">Make maps public</string>
-  <string name="settings_map_public_summary_on">Uploaded maps will be visible to anyone on maps.google.com</string>
-  <string name="settings_map_public_summary_off">Uploaded maps will not be listed publicly on maps.google.com</string>
-
-  <string name="settings_report_speed_or_pace">Display speed</string>
-  <string name="settings_report_speed_or_pace_summary_on">Speed will be displayed</string>
-  <string name="settings_report_speed_or_pace_summary_off">Pace will be displayed</string>
-
-  <string name="settings_share_url_only">Share only URL</string>
-  <string name="settings_share_url_only_summary_on">Only the URL of the map will be sent when sharing</string>
-  <string name="settings_share_url_only_summary_off">The contents of the track will also be included when sharing</string>
-
-  <string name="settings_split_frequency">Split frequency</string>
-  <string name="settings_split_frequency_summary">Maximum time or distance after which a new split marker will be inserted</string>
-
-  <string name="settings_auto_resume_track_timeout">Auto-resume track timeout</string>
-  <string name="settings_auto_resume_track_timeout_summary">Maximum time in minutes after which a previously recording track will not be resumed on phone reboot</string>
-
-  <string name="settings_timestamp_track_name">Timestamp as track name</string>
-  <string name="settings_timestamp_track_name_summary_on">The default track name will be the date and time at the start of the track</string>
-  <string name="settings_timestamp_track_name_summary_off">Track names will have numbers which increment for each new track.</string>
-
-  <string name="settings_reset">Reset to defaults</string>
-  <string name="settings_reset_summary">Revert all your settings to the default values</string>
-  <string name="settings_reset_dialog_message">All your settings will be erased and reverted to the default values. Saved tracks will be preserved. Are you sure?</string>
-  <string name="settings_reset_done">All settings have been reverted to their defaults.</string>
-
-  <string name="pace_label">Pace</string>
-
-  <string name="eclair_required">Only supported in Android 2.0 or above</string>
-  <string name="settings_sensor_type">Sensor Type</string>
-  <string name="settings_sensor_type_summary">The type of sensor to connect to</string>
-  <string name="settings_heart_rate_ant_sensor_id">Clear ANT heart rate sensor pairing</string>
-  <string name="settings_power_ant_sensor_id">Clear ANT power sensor pairing</string>
-  <string name="settings_srm_bridge_ant_sensor_id">Clear ANT SRM bridge sensor pairing</string>
-  <string name="settings_ant_not_paired">ANT sensor not paired</string>
-  <string name="settings_ant_paired">ANT sensor paired with: %d</string>
-  <string name="bluetooth_sensor_title">Bluetooth sensor</string>
-  <string name="bluetooth_sensor_summary">The bluetooth sensor to connect to</string>
-  <string name="settings_modular_stats_display_title">Modular Stats Display</string>
-
-  <string name="settings_track_color_mode">Track Color Mode</string>
-  <string name="settings_track_color_mode_summary">The way to color the track</string>
-  <string name="settings_track_color_mode_fixed">Fixed</string>
-  <string name="settings_track_color_mode_dynamic">Dynamic</string>
-  <string name="settings_track_color_mode_fixed_speed_slow">Fixed Speed Slow</string>
-  <string name="settings_track_color_mode_fixed_speed_slow_summary">Slow speed top value</string>
-  <string name="settings_track_color_mode_fixed_speed_medium">Fixed Speed Medium</string>
-  <string name="settings_track_color_mode_fixed_speed_medium_summary">Medium speed top value</string>
-  <string name="settings_track_color_mode_dynamic_speed_variation">Dynamic Speed Variation</string>
-  <string name="settings_track_color_mode_dynamic_speed_variation_summary">% Margin from average speed to consider medium speed</string>
+  <!-- Settings page -->
+  <string name="settings_title"
+    translation_description="The title of the Settings page.">  
+    My Tracks Settings
+  </string>
+  <string name="settings_display"
+    translation_description="In the Settings page, the option to change the display related
+      settings.">  
+    Display
+  </string>
+  <string name="settings_recording"
+    translation_description="In the Settings page, the option to change the track recording related
+      settings.">  
+    Recording
+  </string>
+  <string name="settings_sensor"
+    translation_description="In the Settings page, the option to change the sensor related
+      settings.">
+    Sensor
+  </string>
+  <string name="settings_sharing"
+    translation_description="In the Settings page, the option to change the track sharing related
+      settings.">   
+    Sharing
+  </string>
+  <string name="settings_backup"
+    translation_description="In the Settings page, the option to change the data backup related
+      settings."> 
+    Backup
+  </string>
+  <string name="settings_reset"
+    translation_description="In the Settings page, the option to reset everything to defaults."> 
+    Reset to defaults
+  </string>
+  <string name="settings_reset_summary"
+    translation_description="In the Settings page, the summary for the 'Reset to defaults'
+      option explaining reverting all the settings to the default values."> 
+    Revert all your settings to the default values
+  </string>
   
-  <!-- Backups -->
-  <string name="settings_backup">Backup (BETA)</string>
-  <string name="settings_sd_backup">SD Card Backup</string>
-  <string name="settings_backup_to_sd">Backup now</string>
-  <string name="settings_backup_to_sd_summary">Write a full copy of all your tracks and settings to the SD card</string>
-  <string name="settings_restore_from_sd">Restore now</string>
-  <string name="settings_restore_from_sd_summary">Restore all tracks and settings from the SD card</string>
+  <!--  Display settings -->
+  <string name="settings_metric_units"
+    translation_description="In the Display settings, the checkbox option to use the metrics units."
+      >
+    Use metric units
+  </string>
+  <string name="settings_metric_units_summary_on"
+    translation_description="In the Display settings, the summary for the 'Use metric units'
+      checkbox when it is checked explaining using the metrics units to display distances.">
+    Use metrics units to display distances
+  </string>
+  <string name="settings_metric_units_summary_off"
+    translation_description="In the Display settings, the summary for the 'Use metrics units'
+      checkbox when it is unchecked explaining using the imperial units to display distances.">
+    Use imperial units to display distances
+  </string>
+  <string name="settings_report_speed_or_pace"
+    translation_description="In the Display settings, the checkbox option to display speed (e.g., 5
+      miles per hour) instead of pace (e.g., 0.2 hours per mile).">  
+    Display speed
+  </string>
+  <string name="settings_report_speed_or_pace_summary_on"
+    translation_description="In the Display settings, the summary for the 'Display speed' checkbox
+      when it is checked explaining that speed (e.g., 5 miles per hour) will be used instead of pace
+      (e.g., 0.2 hours per mile).">  
+    Display speed (e.g., miles/hour)
+  </string>
+  <string name="settings_report_speed_or_pace_summary_off"
+    translation_description="In the Display settings, the summary for the 'Display speed' checkbox
+      when it is unchecked explaining that pace (e.g., 0.2 hours per mile) will be used instead of
+      speed (e.g., 5 miles per hour).">  
+    Display pace (e.g., hours/mile)
+  </string>
+  <string name="settings_track_color_mode"
+    translation_description="In the Display settings, the dropdown option to choose a track color
+      mode for how to use different colors to color a track based on speed.">
+    Track color mode
+  </string>
+  <string name="settings_track_color_mode_summary"
+    translation_description="In the Display settings, the summary for the 'Track color mode'
+      dropdown option explaining that it configures how colors are used to color a track based on
+      speed."
+      >
+    The way to color a track based on speed
+  </string>    
+  <string name="settings_track_color_mode_fixed_speed_slow"
+    translation_description="In the Display settings, the option for configuring the slow speed
+      threshold. Thus any speed lower than the threshold will be colored by the slow speed color.">
+    Slow speed threshold
+  </string>
+  <string name="settings_track_color_mode_fixed_speed_slow_summary"
+    translation_description="In the Display settings, the summary for the 'Slow speed threshold'
+      option explaining that it sets a cutoff speed for the slow speed color.">
+    Slow speed top value
+  </string>
+  <string name="settings_track_color_mode_fixed_speed_medium"
+    translation_description="In the Display settings, the option for configuring the medium speed
+      threshold. Thus any speed lower than the threshold but greater than the slow speed threshold
+      will be colored by the medium speed color.">
+    Medium speed threshold
+  </string>
+  <string name="settings_track_color_mode_fixed_speed_medium_summary"
+    translation_description="In the Display settings, the summary for the 'Medium speed threshold'
+      option explaining that it sets a cutoff speed for the medium speed color.">
+    Medium speed top value
+  </string> 
+  <string name="settings_track_color_mode_dynamic_speed_variation"
+    translation_description="In the Display settings, the option for configuring the dynamic
+      speed threshold for using colors to color a track based on speed.">
+    Medium speed range
+  </string>
+  <string name="settings_track_color_mode_dynamic_speed_variation_summary"
+    translation_description="In the Display settings, the summary for the 'Medium speed range'
+      option explaining that it sets a percentage from the average speed to determine the
+      medium speed range for using colors to color a track based on speed.">
+    Percentage from the average speed for the medium speed
+  </string>
+  
+  <!-- Recording settings -->
+  <!-- TODO decide if voice frequency should be under the Recording settings. -->
+  <string name="settings_announcement_frequency"
+    translation_description="In the Recording settings, the dropdown option to configure the voice
+      announcement frequency.">
+    Voice frequency
+  </string>
+  <string name="settings_announcement_frequency_summary"
+    translation_description="In the Recording settings, the summary for the 'Voice frequency'
+      dropdown option explaining that it configures the time or distance between two voice
+      announcements.">
+    Time/distance between two voice announcements
+  </string>
+  <string name="settings_announcement_frequency_not_available"
+    translation_description="In the Recording settings, the summary for the 'Voice frequency'
+      explaining that this option is not available on your Android phone.">
+    Voice announcement is not available on your Android phone
+  </string>
+  <string name="settings_split_frequency"
+    translation_description="In the Recording settings, the dropdown option to configure the
+      time or distance a new marker will be inserted.">
+    Marker frequency
+  </string>
+  <string name="settings_split_frequency_summary"
+    translation_description="In the Recording settings, the summary for the 'Marker frequency' 
+      dropdown option explaining that it configures the time or distance after which a new
+      marker will be inserted.">
+    Time/distance after which a new marker will be inserted
+  </string>
+  <string name="settings_min_recording_interval"
+    translation_description="In the Recording settings, the dropdown option to configure the
+      time between two recorded points.">
+    Time between points
+  </string>
+  <string name="settings_min_recording_interval_summary"
+    translation_description="In the Recording settings, the summary for the 'Time between points'
+      dropdown option explaining that it configures the smallest time interval between two
+      recordings of your position.">
+    Smallest time interval between two recordings of your position
+  </string>    
+  <string name="settings_min_recording_distance"
+    translation_description="In the Recording settings, the dropdown option to configure the
+      distance between two recorded points.">
+    Distance between points
+  </string>
+  <string name="settings_min_recording_distance_summary"
+    translation_description="In the Recording settings, the summary for the 'Distance between
+      points' dropdown option explaining that it configures the smallest distance between two
+      recordings of your position.">
+    Smallest distance between two recordings of your position
+  </string>
+  <string name="settings_max_recording_distance"
+    translation_description="In the Recording settings, the dropdown option to configure the 
+      distance between two tracks.">
+    Distance between tracks
+  </string>
+  <string name="settings_max_recording_distance_summary"
+    translation_description="In the Recording settings, the summary for the 'Distance between
+      tracks' dropdown option explaining that it configures the maximum distance for two recorded
+      points for them to be still considered as the same track.">
+    Track will be split if two recordings of your position are further than this
+  </string>
+  <string name="settings_min_required_accuracy"
+    translation_description="In the Recording settings, the dropdown option to configure the 
+      required GPS accuracy. If a GPS position's accuracy is below the requirement, then it will
+      not be used.">
+    GPS accuracy
+  </string>
+  <string name="settings_min_required_accuracy_summary"
+    translation_description="In the Recording settings, the summary for the 'GPS accuracy' dropdown
+      option explaining that it configures the required accuracy for your position.
+      If a GPS position's accuracy is below the requirement, then it will not be used.">
+    GPS position will be ignored if it is not this accurate
+  </string>
+  <string name="settings_auto_resume_track_timeout"
+    translation_description="In the Recording settings, the dropdown option to configure the timeout
+      after which a recorded track will not be continued after phone reboot.">
+    Auto-resume timeout
+  </string>
+  <string name="settings_auto_resume_track_timeout_summary"
+    translation_description="In the Recording settings, the summary for the 'Auto-resume timeout'
+      dropdown option explaining that it configures the maximum time after which a previous
+      recording will not resumed after phone reboot.">
+    Maximum time after which a previously recording track will not be resumed on phone reboot
+  </string>      
+  <string name="settings_timestamp_track_name"
+    translation_description="In the Recording settings, the checkbox on whether the track should be
+      named based on the track's start time or based on a number.">
+    Use time for track name
+  </string>
+  <string name="settings_timestamp_track_name_summary_on"
+    translation_description="In the Recording settings, the summary for the 'Use time for track
+      name' checkbox when it is checked explaining using the track's start time as the default track
+      name.">
+    Use the track\'s start time as the default track name
+  </string>
+  <string name="settings_timestamp_track_name_summary_off"
+    translation_description="In the Recording settings, the summary for the 'Use time for track
+      name' checkbox when it is unchecked explaining using a number as the default track name.">
+    Use a number as the default track name
+  </string>
+      
+  <!-- Sensor settings -->
+  <string name="settings_sensor_type"
+    translation_description="In the Sensor settings, the dropdown option to choose a sensor type.">
+    Sensor Type
+  </string>
+  <string name="settings_sensor_type_summary"
+    translation_description="In the Sensor settings, the summary for the 'Sensor Type' option
+      explaining that it is to configure the type of sensor to connect to.">
+    The type of sensor to connect to
+  </string>
+  <string name="bluetooth_options" 
+    translation_description="In the Sensor settings, the section title to configure the Bluetooth
+      options.">
+   Bluetooth Options
+  </string>
+  <string name="bluetooth_sensor_title"
+    translation_description="In the Sensor settings, the dropdown option to pick a Bluetooth
+      sensor.">
+    Bluetooth sensor
+  </string>
+  <string name="bluetooth_sensor_summary"
+    translation_description="In the Sensor settings, the summary for the 'Bluetooth sensor' dropdown
+      option explaining it is to pick a Bluetooth sensor to connect to.">
+    The Bluetooth sensor to connect to
+  </string>
+  <string name="bluetooth_pairing"
+    translation_description="In the Sensor settings, the option to pair with a Bluetooth device.">
+    Bluetooth pairing
+  </string>
+  <string name="bluetooth_pairing_summary"
+    translation_description="In the Sensor settings, the summary for the 'Bluetooth pairing' option
+      explaining that it will open the Android's Bluetooth settings to pair a device.">
+    Open Android\'s Bluetooth settings to pair a device
+  </string>
+  <string name="ant_options"
+    translation_description="In the Sensor settings, the section title to configure the ANT+
+      options.">
+    ANT+ Options
+  </string>    
+  <string name="settings_heart_rate_ant_sensor_id"
+    translation_description="In the Sensor settings, the option to unpair an ANT+ heart rate
+      sensor.">
+    Unpair ANT+ heart rate sensor
+  </string>
+  <string name="settings_srm_bridge_ant_sensor_id"
+    translation_description="In the Sensor settings, the option to unpair a SRM ANT+ bridge.">
+    Unpair SRM ANT+ bridge
+  </string>    
+  <string name="settings_ant_not_paired"
+    translation_description="In the Sensor settings, the summary under 'Clear ANT+ sensor' or 'Clear
+      SRM ANT+ bridge' when there no ANT+ device paired.">
+    Not paired
+  </string>
+  <string name="settings_ant_paired"
+    translation_description="In the Sensor settings, the summary under 'Clear ANT+ sensor' or 'Clear
+      SRM ANT+ bridge' when there is an ANT+ device paired. E.g., 'Paired with: 1'.">
+    Paired with: %d
+  </string>
+  
+  <!-- Sharing settings -->
+  <string name="settings_map_public"
+    translation_description="In the Sharing settings, the checkbox option to make a new map created
+      in Google My Maps public."> 
+    Make new maps public
+  </string>
+  <string name="settings_map_public_summary_on"
+    translation_description="In the Sharing settings, the summary for the 'Make new maps public'
+      checkbox option when it is checked explaining that new maps created in Google My Maps will
+      be public, as opposed to unlisted.">
+    Make new maps created in Google My Maps public
+  </string>
+  <string name="settings_map_public_summary_off"
+    translation_description="In the Sharing settings, the summary for the 'Make new maps public'
+      checkbox option when it is unchecked explaining that new maps created in Google My Maps will
+      be unlisted, as opposed to public.">
+    Make new maps created in Goolge My Maps unlisted
+  </string>
+  <string name="settings_share_url_only"
+    translation_description="In the Sharing settings, the checkbox option to share only the URL 
+      link when sharing a link with friends.">  
+    Share only URL link
+  </string>
+  <string name="settings_share_url_only_summary_on" 
+    translation_description="In the Sharing settings, the summary for the 'Share only URL link'
+      checkbox option when it is checked explaining that only the URL link will be sent when sharing
+      a link with friends.">  
+   Only the URL link will be sent when sharing a link with friends
+  </string>
+  <string name="settings_share_url_only_summary_off"
+    translation_description="In the Sharing settings, the summary for the 'Share only URL link'
+      checkbox option when it is unchecked explaining that some text and the the URL link will be
+      sent when sharing a link with friends.">  
+    Some text and the URL link will be sent when sharing a link with friends
+  </string>
+  <string name="settings_allow_access"
+   translation_description="In the Sharing settings, the checkbox option to allow third party apps
+     access to My Tracks data.">
+    Allow access
+  </string>
+  <string name="settings_allow_access_summary_on"
+  translation_description="In the Sharing settings, the summary for the 'Allow access' checkbox
+      option when it is checked explaining that other apps can read, write, start/stop recording My
+      Tracks data.">
+    Other apps can read, write, start/stop recording My Tracks data.
+  </string>
+  <string name="settings_allow_access_summary_off"
+   translation_description="In the Sharing settings, the summary for the 'Allow access' checkbox
+      option when it is unchecked explaining that other apps cannot read, write, start/stop
+      recording My Tracks data.">
+    Other apps cannot read, write, start/stop recording My Tracks data.
+  </string>
+  <string name="settings_allow_access_dialog_message"
+    translation_description="In the Sharing settings, after checking the 'Allow access' checkbox,
+      the confirmation dialog asking the user if he wants to allow other apps, including apps
+      installed in the future, to control and access My Tracks data. In addition, no further
+      notification of third party app access will be shown.">
+    Are you sure you want to allow other apps, including future apps, to control and access My
+    Tracks data? There will be no further notification.
+  </string>
+  
+  <!-- Backup settings -->
+  <string name="settings_sd_backup"
+    translation_description="In the Backup settings, the section title for configuring backup to the
+      SD card.">
+    SD Card Backup
+  </string>
+  <string name="settings_backup_to_sd"
+    translation_description="In the Backup settings, the option to backup to the SD card now.">
+    Backup now
+  </string>
+  <string name="settings_backup_to_sd_summary"
+    translation_description="In the Backup settings, the summary for the 'Backup now' option
+      explaining that all tracks and settings will be written to the SD card.">
+    Write a full copy of all your tracks and settings to the SD card
+  </string>
+  <string name="settings_restore_from_sd"
+    translation_description="In the Backup settings, the option to restore everything from the SD
+      card.">
+    Restore now
+  </string>
+  <string name="settings_restore_from_sd_summary"
+    translation_description="In the Backup settings, the summary for the 'Restore now' option
+      explaining that it restores all tracks and settings from the SD card.">
+    Restore all tracks and settings from the SD card
+  </string>  
+      
+  <!-- Reset to defaults -->    
+  <string name="settings_reset_dialog_message"
+    translation_description="In the Settings page, after pressing the 'Reset to defaults' option,
+      the confirmation dialog asking the user to confirm reverting all settings to defaults. But
+      the saved tracks will be preserved.">
+    All your settings will be erased and reverted to the default values. Saved tracks will be
+    preserved. Are you sure?
+  </string>
+  <string name="settings_reset_done"
+    translation_description="In the Settings page, after pressing the 'Reset to defaults' option,
+      the confirmation dialog informing the user that all settings have been reverted to their
+      defaults.">
+    All settings have been reverted to their defaults.
+  </string>
+ 
+  <!-- Settings others -->    
+  <string name="settings_not_while_recording"
+    translation_description="In the Settings page, the summary for an option that is not available 
+      during a track recording.">
+    Not available while recording a track
+  </string>
+ 
+  <!-- Backup now -->
+  <string name="backup_write_progress_message"
+    translation_description="In the Backup settings, after pressing the 'Backup now' option, the
+      progress dialog telling the user that it is writing all tracks and settings and that it may
+      take a while.">
+    Writing all tracks and settings to the SD card. This may take a while...
+  </string>
+  
+  <!-- Restore now -->
+  <string name="restore_overwrites_warning"
+    translation_description="In the Backup settings, after pressing the 'Restore now' option, the
+      message in the alert dialog asking the user to confirm that he wants to restore from a backup
+      and it will overwrite all the current tracks and settings.">
+    Restoring a backup from the SD card will OVERWRITE all your current tracks and settings. Are you
+    sure?
+  </string>
+  <string name="select_backup_to_restore"
+    translation_description="In the Backup settings, after pressing the 'Restore now' option, the
+      message in the alert dialog asking the user to select a backup.">
+    Select the backup to restore
+  </string>
+  <string name="no_backups"
+    translation_description="In the Backup settings, after pressing the 'Restore now' option, the
+      message in the alert dialog informing the user that there is no backup.">
+    No backup found.
+  </string>
+  <string name="backup_import_progress_message"
+    translation_description="In the Backup settings, after pressing the 'Restore now' option, the
+      message on the progress dialog indicating that My Tracks is reading all tracks and settings
+      from the backup on the SD card and that it may take a while.">
+    Reading all tracks and settings from the SD card. This may take a while...
+  </string>
+       
+  <!-- Google My Maps -->
+  <string name="map_list_title"
+    translation_description="When sending a track to an existing Google My Map, the title of the
+      page listing the user's maps in Google My Maps.">
+    Your Google My Maps
+  </string>
+  <string name="select_map_message"
+    translation_description="When sending a track to an existing Google My Map, the text on 'Your
+      Google My Maps' page asking the user to pick one of his maps.">
+    Pick a map:
+  </string>
+  <string name="mapslist_no_maps_available"
+    translation_description="When showing a track to an existing Google My Map, the text on 'Your
+      Google My Maps' page informing the user that he doesn't have any map."> 
+    You don\'t have any maps.
+  </string>
+  <string name="maps_list_loading"
+    translation_description="When sending a track to an existing Google My Map, a progress message
+      informing the user that My Tracks is loading his maps.">
+    Loading maps...
+  </string>
+  <string name="maps_list_failed"
+     translation_description="When sending a track to an existing Google My Map, a message informing
+       the user that My Tracks cannot load his maps.">
+    Your maps could not be loaded at this time.
+  </string>
+  <string name="public_map"
+    translation_description="In the 'Your Google My Maps' page, tag next to the maps that are public
+      (as opposed to being not listed).">
+    Public
+  </string>
+  <string name="unlisted_map"
+    translation_description="In the 'Your Google My Maps' page, tag next to the maps that are not
+      listed (as opposed to being public).">
+    Unlisted
+  </string>
+  
+  <!-- Share Track -->
+  <string name="share_track_url"
+    translation_description="After sending a track to Google, in the confirmation dialog, a
+      button to share the track URL with friends.">    
+    Share track URL
+  </string>
+  <string name="share_track_picker_title"
+    translation_description="When sharing a track with friends, the title on the picker to
+      ask the user which application he wants to use.">
+    Share track using:
+  </string>
+  <string name="share_track_subject"
+    translation_description="When sharing a track with friends, the subject line.">    
+    I would like to share a track with you
+  </string>
+  <string name="share_track_url_body_format"
+    translation_description="When sharing a track URL with friends, the body of the message. E.g.,
+    'I think you might be interested in this track:\n\nhttps://maps.google.com/maps'.">
+    I think you might be interested in this track:\n\n%s
+  </string>
+  <string name="share_track_file_body_format"
+    translation_description="When sharing a track file with friends, the body of the message.">
+    I think you might be interested in this track.\n\nTo view this track use Google Earth or other
+    mapping software.
+  </string>
 
-  <string name="restore_overwrites_warning">Restoring a backup from the SD card will OVERWRITE all your current tracks and settings. Are you sure?</string>
-  <string name="select_backup_to_restore">Select the backup to restore</string>
-  <string name="no_backups">No backups found.</string>
-  <string name="backup_write_progress_message">Writing all tracks and settings to the SD card. This may take a while...</string>
-  <string name="backup_import_progress_message">Reading all tracks and settings from the SD card. This may take a while...</string>
-
-  <!-- MyTracksSky -->
-  <string name="mytracks_sky">GPS Satellites</string>
-
-  <!-- My Maps -->
-  <string name="select_map_message">Pick a map from your account:</string>
-  <string name="create_new_map">Create new map...</string>
-  <string name="map_list_title">Send to Google My Maps</string>
-  <string name="maps_list_loading">Loading maps...</string>
-  <string name="maps_list_failed">Your maps could not be loaded at this time!</string>
-  <string name="open_map">Select this Map</string>
-  <string name="edit_map_details">Edit Map Details</string>
-  <string name="share_track">Share Track</string>
-  <string name="delete_map">Delete Map from your Account</string>
-  <string name="map_title">Map Title:</string>
-  <string name="map_description">Map Description:</string>
-  <string name="map_searchable_edit">Make this map and its contents show up in search results</string>
-  <string name="map_not_searchable_edit">Do not let this map or its contents show up in search results, though they may still be viewed be others through the direct URL</string>
-  <string name="map_searchable">This map and its contents will show in search results</string>
-  <string name="map_not_searchable">Neither this map nor its contents will show in search results, but they may still be viewed by others through a direct link</string>
-
-  <!-- Sharing -->
-  <string name="share_map">Share map with friends</string>
-  <string name="share_map_subject">I would like to share a track with you</string>
-  <string name="share_map_body_format">I think you might be interested in this track:
-
-      %s</string>
-  <string name="send_track_subject">I would like to share a track with you</string>
-  <string name="send_track_body_format">I think you might be interested in this track.
-
-    To view this track use Google Earth or other mapping software.</string>
-
-  <!-- Visibility -->
-  <string name="public_map">Public</string>
-  <string name="unlisted_map">Unlisted</string>
-  <string name="mapslist_no_maps_available">You don\'t have any maps, yet.</string>
-
-  <!-- Statistics View -->
-  <!-- Average Moving -->
-  <string name="average_moving_speed_label">Average Moving Speed</string>
-  <string name="average_moving_pace_label">Average Moving Pace</string>
-
-  <!-- Average -->
-  <string name="average_speed_label">Average Speed</string>
-  <string name="average_pace_label">Average Pace</string>
-
-  <string name="elevation_chart_name">Elevation Chart</string>
-  <string name="elevation_gain_label">Elevation Gain</string>
-  <string name="elevation_label">Elevation</string>
-  <string name="latitude_label">Latitude</string>
-  <string name="longitude_label">Longitude</string>
-
-  <!-- Min -->
-  <string name="min_elevation_label">Min Elevation</string>
-  <string name="min_grade_label">Min Grade</string>
-  <string name="min_pace_label">Min Pace</string>
-
-  <!-- Max -->
-  <string name="max_elevation_label">Max Elevation</string>
-  <string name="max_grade_label">Max Grade</string>
-  <string name="max_speed_label">Max Speed</string>
-
-  <string name="loading_track">Loading track...</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 -->
-  <!-- X Axis -->
-  <string name="x_axis">X Axis</string>
-  <string name="by_distance">By Distance</string>
-  <string name="by_time">By Time</string>
-
-  <!-- Y Axis -->
-  <string name="y_axis">Y Axis</string>
-
-  <!-- Units -->
-  <!-- Time  -->
-  <string name="hour">hour</string>
-  <string name="hours">hours</string>
-  <string name="hr">hr</string>
-  <string name="min">min</string>
-  <string name="minute">minute</string>
-  <string name="minutes">minutes</string>
-  <string name="seconds">seconds</string>
-  <string name="milliseconds">ms</string>
-
+  <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>
+      
+  <!-- Voice -->
+  <string name="voice_hour"
+    translation_description="For voice announcement, to say hour like 'one hour'.">
+    hour
+  </string>
+  <string name="voice_hours"
+    translation_description="For voice announcement, to say hours like 'two hours'.">  
+    hours
+  </string>
+  <string name="voice_kilometer_per_hour"
+    translation_description="For voice announcement, to say 'kilometers per hour' for speed like
+      'two kilometers per hour'.">
+    kilometers per hour
+  </string>
+  <string name="voice_kilometers"
+    translation_description="For voice announcement, to say kilometers like 'two kilometers'.">
+    kilometers
+  </string>
+  <string name="voice_mile_per_hour"
+    translation_description="For voice announcement, to say 'miles per hour' for speed like 'two
+      miles per hour'.">
+    miles per hour
+  </string>
+  <string name="voice_miles"
+    translation_description="For voice announcement, to say miles like 'two miles'.">
+    miles
+  </string>
+  <string name="voice_minute"
+    translation_description="For voice announcement, to say minute like 'one minute'.">
+    minute
+  </string>
+  <string name="voice_minutes"
+    translation_description="For voice announcement, to say minutes like 'two minutes'.">
+    minutes
+  </string>
+  <string name="voice_per_kilometer"
+    translation_description="For voice announcement, to say 'per kilometer' for pace like 'two
+      minutes per kilometer'.">
+    per kilometer
+  </string>
+  <string name="voice_per_mile"
+    translation_description="For voice announcement, to say 'per mile' for pace like 'two minutes
+      per mile'.">
+    per mile
+  </string>
+  <string name="voice_second"
+    translation_description="For voice announcement, to say second like 'one second'.">
+    second
+  </string>
+  <string name="voice_seconds"
+    translation_description="For voice announcement, to say seconds like 'two seconds'.">
+    seconds
+  </string> 
+      
+  <!-- time -->
+  <string name="hr"
+    translation_description="Abbreviation for hours. E.g, '2 hr'.">
+    hr
+  </string>
   <string name="second"
    translation_description="Abbreviation for second. E.g, '5 s' for 5 seconds.">
    s
   </string>
   
-  <!-- Distance -->
-  <string name="meter">m</string>
-  <string name="kilometer">km</string>
-  <string name="kilometers_long">kilometers</string>
-  <string name="feet">ft</string>
-  <string name="mile">mi</string>
-  <string name="miles_long">miles</string>
+  <string name="min"
+    translation_description="Abbreviation for minutes. E.g, '2 min'.">
+    min
+  </string>
 
-  <!-- Speed and Pace -->
-  <string name="kilometer_per_hour">km/h</string>
-  <string name="kilometer_per_hour_long">kilometers per hour</string>
-  <string name="min_per_kilometer">min/km</string>
-  <string name="per_kilometer">per kilometer</string>
-  <string name="mile_per_hour">mi/h</string>
-  <string name="mile_per_hour_long">miles per hour</string>
-  <string name="min_per_mile">min/mi</string>
-  <string name="per_mile">per mile</string>
-
-  <!-- Sensors -->
-  <string name="watts">W</string>
-
-  <string name="revolutions_per_minute">rpm</string>
-  <string name="bpm">bpm</string>
-  <string name="battery_level">Battery Level</string>
-
-  <!-- Stats Labels -->
-  <string name="moving_time_label">Moving Time</string>
-  <string name="total_time_label">Total Time</string>
-  <string name="time_label">Time</string>
-  <string name="sd_unavail">SD Unavailable</string>
-  <string name="speed">Speed</string>
-  <string name="start_trip">You must start a trip.</string>
-
-  <string name="total_distance_label">Total Distance</string>
-  <string name="distance_label">Distance</string>
-  <string name="power">Power</string>
-  <string name="cadence">Cadence</string>
-  <string name="heart_rate">Heart Rate</string>
-  <string name="max_heart_rate">Max Heart Rate</string>
-  <string name="unknown">-</string>
-  <string name="waiting">Waiting...</string>
-  <string name="elevation">Elevation</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>
+  
   <!-- End User License Agreement -->
-  <string name="eula_title">End User License Agreement</string>
-  <string name="accept">Accept</string>
-  <string name="decline">Decline</string>
+  <string name="eula_title"
+    translation_description="The title for the terms of service dialog, asking the user to accept
+      or decline.">
+    End User License Agreement
+  </string>
+  <string name="accept"
+    translation_description="In the 'End User License Agreement' dialog, the button to accept.">
+    Accept
+  </string>
+  <string name="decline"
+    translation_description="In the 'End User License Agreement' dialog, the button to decline.">
+    Decline
+  </string>
 
-  <!-- About Page -->
-  <string name="about">About</string>
-  <string name="about_team">Team:</string>
-  <string name="about_version">Version:</string>
-  <string name="about_support">Support:</string>
-  <string name="about_privacy">Privacy:</string>
+  <!-- About My Tracks page -->
+  <string name="about_team"
+    translation_description="In the 'About My Tracks' page, label for the team members. E.g.,
+      'Team: Sandor Dornbush, Rodrigo Damazio'.">
+    Team:
+  </string>
+  <string name="about_version"
+    translation_description="In the 'About My Tracks' page, label for the version number. E.g.,
+      'Version: 1.1.10'.">
+    Version:
+  </string>
+  <string name="about_support"
+    translation_description="In the 'About My Tracks' page, label for the support link. E.g.,
+      'Support: mytracks.appspot.com'.">
+    Support:
+  </string>
+  <string name="about_privacy"
+    translation_description="In the 'About My Tracks' page, label for the privacy link. E.g.,
+      'Privacy: m.google.com/privacy'.">
+    Privacy:
+  </string>
 
   <string name="about_copyright_message"
     translation_description="In the 'About' page, the copy right notice.">
     Copyright 2009 Google Inc.
   </string>
         
-  <!-- Send to Google -->
-  <string name="sendtogoogle_title">Send to...</string>
-  <string name="sendtogoogle_google_fusiontables">Google Fusion Tables</string>
-  <string name="sendtogoogle_google_mymaps">Google My Maps</string>
-  <string name="sendtogoogle_google_docs">Google Docs</string>
-  <string name="sendtogoogle_send_now">Send now</string>
-  <string name="sendtogoogle_create_new_map">Create a new map</string>
-  <string name="sendtogoogle_pick_existing_map">Pick an existing map</string>
-  <string name="sendtogoogle_send_stats">Send track statistics</string>
-  <string name="sendtogoogle_send_stats_and_points">Send statistics and points</string>
+  <!-- Send to Google dialog -->
+  <string name="sendtogoogle_title"
+    translation_description="When sending a track to Google, the dialog title to choose the Google
+      services to send the track to. The user can choose Google My Maps, Google Fusion
+      Tables, and Google Docs.">
+    Send to...
+  </string>
+  <string name="sendtogoogle_google_mymaps"
+    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
+      checkbox option to send to Google My Maps.">
+    Google My Maps
+  </string>
+  <string name="sendtogoogle_create_new_map"
+    translation_description="When sending a track to Google My Maps, the radio option to create a
+      new map as opposed to use an existing map.">
+    Create a new map
+  </string>
+  <string name="sendtogoogle_pick_existing_map"
+    translation_description="When sending a track to Google My Maps, the radio option to use an
+      existing map as opposed to create a new map.">
+    Use an existing map
+  </string>
+  <string name="sendtogoogle_google_fusiontables"
+    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
+      checkbox option to send to Google Fusion Tables.">
+    Google Fusion Tables
+  </string>
+  <string name="sendtogoogle_google_docs"
+    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
+      checkbox option to send to Google Docs.">
+    Google Docs
+  </string>
+  <string name="sendtogoogle_send_now"
+    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
+      button on the bottom to send the track to the selected Google services.">
+    Send now
+  </string>
 
   <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">No Account Found</string>
-  <string name="no_account_found">No account found to upload tracks to.</string>
-  <string name="choose_account_title">Choose Account</string>
+  <string name="choose_account_title"
+    translation_description="When sending to Google, the dialog title to choose a Google account.">
+    Choose Account
+  </string>
+  <string name="no_account_found_title"
+    translation_description="When sending to Google, the dialog title when no Google account is
+      found.">
+    No Account Found
+  </string>
+  <string name="no_account_found"
+    translation_description="When sending to Google, the dialog message when no Google account is
+      found.">
+    No account found to upload tracks to.
+  </string>
 
-  <!-- SD card -->
-  <string name="io_no_external_storage_found">No external storage was found. Make sure that a SD card is inserted and that your phone is not mounted to a computer.</string>
-  <string name="io_write_failed">Unable to write to file.</string>
-  <string name="io_read_failed">Unable to read from file.</string>
-  <string name="io_create_dir_failed">Unable to create directory on SD card.</string>
-  <string name="io_write_finished">Finished writing to SD card.</string>
-  <string name="io_read_finished">Finished reading from SD card.</string>
-
-  <!-- VersionChecker -->
-  <string name="version_check_title">Upgrade Check</string>
-  <string name="version_check_upgrade_button">Upgrade Now</string>
-  <string name="version_check_continue_button">Continue Without Upgrading</string>
-  <string name="upgrade_required">Your version of %1$s may no longer work properly, and is no longer supported. Please upgrade in order to continue using %1$s.</string>
-  <string name="upgrade_recommended">Your version of %1$s may no longer work properly. You may upgrade it now, or continue to use it at your own risk. Some functionality such as server synchronization may not function until you upgrade.</string>
-  <string name="upgrade_available">A new version of %1$s is available. You may continue to use your current version without problems, but you won\'t get the latest features until you upgrade.</string>
+  <!-- writing to SD card -->
+  <string name="io_no_external_storage_found"
+    translation_description="When writing to the SD card, the error message when the SD card is not
+      found.">
+    No external storage was found. Make sure that a SD card is inserted and that your phone is not
+    mounted to a computer.
+  </string>
+  <string name="io_create_dir_failed"
+    translation_description="When writing to the SD card, the error message when not able to create
+      a directory on the SD card.">
+    Unable to create directory on SD card.
+  </string>
+  <string name="io_write_failed"
+    translation_description="When writing to the SD card, the error message when not able to write a
+      file to the SD card.">
+    Unable to write to file.
+  </string>
+  <string name="io_write_finished"
+    translation_description="When writing to the SD card, the success message when finish writing to
+      the SD card.">
+    Finished writing to SD card.
+  </string>
+  
+  <!--  reading from SD card -->
+  <string name="io_read_failed"
+    translation_description="When reading from the SD card, the error message when not able to read
+      a file.">
+    Unable to read from file.
+  </string>
+  <string name="io_read_finished"
+    translation_description="When reading from the SD card, the success message when finish reading
+      from the SD card.">
+    Finished reading from SD card.
+  </string>
 
   <!-- Welcome -->
-  <string name="welcome">Welcome</string>
-  <string name="welcome_about">About My Tracks</string>
+  <string name="welcome"
+    translation_description="The title of the welcome page.">
+    Welcome
+  </string>
+  <string name="welcome_about"
+    translation_description="In the 'Welcome' page, the button on the bottom to read the 'About'
+      page.">
+    About My Tracks
+  </string>
 
   <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks no distance</string>
-  <!-- Format:
-  $1 : Distance label
-  $2 : Distance value (5)
-  $3 : Distance units (mi, km)
-  $4 : Time description (10 minutes 5 seconds)
-  $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
-  $6 : Speed units (mph) : Pace units (per mile)
-  -->
-  <string name="announce_template">My Tracks %1$s %2$.2f %3$s in %4$s at %5$s %6$s</string>
+  <string name="announce_no_distance"
+    translation_description="For the voice announcement, the announcement when the current track's
+      total distance is zero.">
+    My Tracks no distance
+  </string>
+  <string name="announce_template"
+    translation_description="For the voice announcement, the template to make an announcement. E.g.,
+      'My Tracks total distance 5.2 miles in 2 hours 30 minutes at 2.2 miles per hour'. Below is the
+      list of the parameters:
+       
+      %1$.2f: Distance value (E.g., 5.2)
+      %2$s: Distance unit (miles or kilometers)
+      %3$s: Time value (E.g., 2 hours and 30 minutes)
+      %4$s: Speed value (E.g., 2.2) or pace value (E.g., 2 hours and 30 minutes)
+      %5$s: Speed unit (miles per hour or kilometers per hour) or pace unit (per mile or per
+        kilometer)">
+      My Tracks total distance %1$.2f %2$s in %3$s at %4$s %5$s
+  </string>
 
   <!-- Check Units -->
-  <string name="check_units_title">Units of Measure Notice</string>
-  <string name="check_units_message">Do you want to use metrics as your default units?</string>
+  <string name="check_units_title"
+    translation_description="The title of the dialog asking the user to confirm if he wants to use
+      metrics as the preferred units.">
+    Preferred Units
+  </string>
+  <string name="check_units_message"
+    translation_description="The message of the dialog asking the user to confirm if he wants to use
+      metrics as the preferred units.">
+    Do you want to use metrics as the preferred units?
+  </string>
 
-  <!-- Fake preference keys - never saved, but show options in the preferences screen -->
-  <string name="method_bluetooth">Bluetooth</string>
-  <string name="bluetooth_options">Bluetooth options</string>
-  <string name="bluetooth_pairing">Device pairing</string>
-  <string name="bluetooth_pairing_summary">Open Android\'s bluetooth settings to pair a device</string>
-  <string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
-  <string name="ant_options">ANT options</string>
-  <string name="sensor_options">Sensor Options</string>
-  <string name="track_color_mode">Track Color Mode</string>
-  <string name="fixed_speed_options">Fixed Speed Options</string>
-  <string name="dynamic_speed_options">Dynamic Speed Options</string>
-  
-  <!-- Bluetooth Sensor -->
-  <string name="bluetooth_connected">Connected to %s</string>
-  <string name="bluetooth_connecting">Bluetooth sensor connecting ...</string>
-  <string name="bluetooth_not_connected">Bluetooth sensor not connected</string>
-
-  <!-- Sensor State -->
-  <string name="sensor_data_time">Sensor Data Time</string>
-  <string name="power_meter_enabled">Power meter enabled</string>
-  <string name="heart_rate_monitor_enabled">Heart rate monitor enabled</string>
-  <string name="no_sensor_manager">No Sensor Manager</string>
-  <string name="enabled">Enabled</string>
-  <string name="connecting">Connecting</string>
-  <string name="connected">Connected</string>
-  <string name="disconnected">Disconnected</string>
-  <string name="no_sensor_service">No Sensor Service</string>
-  <string name="searching">Searching</string>
-  <string name="sending">Sending</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>
+      
   <!-- Manifest description (not seen inside the app) -->
-  <string name="notification_permission_label">receive MyTracks notifications</string>
-  <string name="mytracks_notifications_permission_label">receive MyTracks notifications</string>
-  <string name="read_tracks_permission_label">read MyTracks data</string>
-  <string name="write_tracks_permission_label">write data to MyTracks and start/stop MyTracks
-          recording</string>
-  <string name="notification_permission_description">Allows the application to receive notifications
-          when MyTracks starts or stops a recording.</string>
-  <string name="mytracks_notifications_permission_description">receive MyTracks notifications
-          </string>
-  <string name="read_tracks_permission_description">Allows the application to read MyTracks data.
-          </string>
-  <string name="write_tracks_permission_description">Allows the application to write data to
-          MyTracks and start/stop MyTracks recording.</string>
+  <string name="notification_permission_label"
+    translation_description="When installing a third-party app that wants to receive My Tracks 
+      notifications, the permission label that the Android Market shows to the user.">
+    receive My Tracks notifications
+  </string>
+  <string name="notification_permission_description"
+    translation_description="When installing a third-party app that wants to receive My Tracks 
+      notifications, the permission description that the Android Market shows to the user.">
+    Allows the application to receive notifications when My Tracks starts or stops a recording.
+  </string>
+  <string name="read_tracks_permission_label"
+    translation_description="When installing a third-party app that wants to read My Tracks data,
+      the permission label that the Android Market shows to the user.">
+    read My Tracks data
+  </string>
+  <string name="read_tracks_permission_description"
+    translation_description="When installing a third-party app that wants to read My Tracks data,
+      the permission description that the Android Market shows to the user.">
+    Allows the application to read My Tracks data.</string>
+  <string name="write_tracks_permission_label"
+    translation_description="When installing a third-party app that wants to write data to My
+      Tracks, the permission label that the Android Market shows to the user.">
+    write data to My Tracks and start/stop My Tracks recording
+  </string>
+  <string name="write_tracks_permission_description"
+    translation_description="When installing a third-party app that wants to write data to My
+      Tracks, the permission description that the Android Market shows to the user.">
+    Allows the application to write data to My Tracks and start/stop My Tracks recording.
+  </string>
 
   <!-- Sensor Type Options -->
   <string name="sensor_type_option_none"
@@ -1571,4 +2188,4 @@ limitations under the License.
     translation_description="When entering the Marker Type, an option for a way point.">
     way point
   </string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/MyTracks/res/xml/preferences.xml b/MyTracks/res/xml/preferences.xml
index 597e87378..45b519c38 100644
--- a/MyTracks/res/xml/preferences.xml
+++ b/MyTracks/res/xml/preferences.xml
@@ -41,7 +41,7 @@ limitations under the License.
         android:entryValues="@array/track_color_mode_values"
         android:defaultValue="@string/track_color_mode_value_none"/>
 
-    <PreferenceCategory android:title="@string/fixed_speed_options" 
+    <PreferenceCategory android:title="@string/track_color_mode_option_fixed" 
         android:key="@string/track_color_mode_fixed_speed_options_key">
         <EditTextPreference android:key="@string/track_color_mode_fixed_speed_slow_key" 
             android:title="@string/settings_track_color_mode_fixed_speed_slow" 
@@ -76,7 +76,7 @@ limitations under the License.
         </EditTextPreference>
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/dynamic_speed_options">
+    <PreferenceCategory android:title="@string/track_color_mode_option_dynamic">
         <EditTextPreference android:key="@string/track_color_mode_dynamic_speed_variation_key" 
             android:title="@string/settings_track_color_mode_dynamic_speed_variation" 
             android:summary="@string/settings_track_color_mode_dynamic_speed_variation_summary" 
@@ -148,7 +148,7 @@ limitations under the License.
   </PreferenceScreen>
 
   <!-- Sensors -->
-  <PreferenceScreen android:title="@string/sensor_options"
+  <PreferenceScreen android:title="@string/settings_sensor"
       android:key="@string/sensor_options_key">
     <ListPreference android:key="@string/sensor_type_key"
         android:title="@string/settings_sensor_type"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
index e6938769a..428df8310 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);
+                             R.string.elevation_label);
 
     series[SPEED_SERIES] =
         new ChartValueSeries(context,
diff --git a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
index 1c6ba21fa..436574ea0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
@@ -108,7 +108,7 @@ public class SettingsActivity extends PreferenceActivity {
       announcementFrequency.setEnabled(false);
       announcementFrequency.setValue("-1");
       announcementFrequency.setSummary(
-          R.string.settings_not_available_summary);
+          R.string.settings_announcement_frequency_not_available);
     }
     
     setMinRecordingIntervalOptions();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
index 6467b84d6..cfef0cfac 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
@@ -132,16 +132,16 @@ public class SaveActivity extends Activity {
     // Share the file.
     Intent shareIntent = new Intent(Intent.ACTION_SEND);
     shareIntent.putExtra(Intent.EXTRA_SUBJECT,
-        getResources().getText(R.string.send_track_subject).toString());
+        getResources().getText(R.string.share_track_subject).toString());
     shareIntent.putExtra(Intent.EXTRA_TEXT,
-        getResources().getText(R.string.send_track_body_format)
+        getResources().getText(R.string.share_track_file_body_format)
         .toString());
     shareIntent.setType(format.getMimeType());
     Uri u = Uri.fromFile(new File(writer.getAbsolutePath()));
     shareIntent.putExtra(Intent.EXTRA_STREAM, u);
     shareIntent.putExtra(getString(R.string.track_id_broadcast_extra), trackId);
     startActivity(Intent.createChooser(shareIntent,
-        getResources().getText(R.string.share_track).toString()));
+        getResources().getText(R.string.share_track_picker_title).toString()));
   }
 
   private void showResultDialog() {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TempFileCleaner.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TempFileCleaner.java
index ec200f823..42242fa59 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TempFileCleaner.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TempFileCleaner.java
@@ -17,6 +17,8 @@ package com.google.android.apps.mytracks.io.file;
 
 import static com.google.android.apps.mytracks.Constants.TAG;
 
+import com.google.android.apps.mytracks.util.FileUtils;
+
 import android.os.Environment;
 import android.util.Log;
 
@@ -51,11 +53,9 @@ public class TempFileCleaner {
   }
 
   private void cleanTmpDirectory(String name) {
-    String sep = System.getProperty("file.separator");
-    cleanTmpDirectory(
-        new File(
-            Environment.getExternalStorageDirectory() + sep + name + sep
-            + "tmp"));
+    FileUtils fileUtils = new FileUtils();
+    String dirName = fileUtils.buildExternalDirectoryPath(name, "tmp");
+    cleanTmpDirectory(new File(dirName));
   }
 
   // @VisibleForTesting
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java
index 8d774da00..419a25cf1 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java
@@ -81,7 +81,7 @@ public class ResultDialogFactory {
 
     builder.setPositiveButton(activity.getString(R.string.ok), onOkClickListener);
     if (onShareClickListener != null) {
-      builder.setNegativeButton(activity.getString(R.string.share_track),
+      builder.setNegativeButton(activity.getString(R.string.share_track_url),
           onShareClickListener);
     }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
index cd60bae89..573e95765 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
@@ -692,15 +692,15 @@ public class SendActivity extends Activity implements ProgressIndicator {
     boolean shareUrlOnly = sharedPreferences.getBoolean(
         getString(R.string.share_url_only_key), false);
     String msg = shareUrlOnly ? url : String.format(
-        getResources().getText(R.string.share_map_body_format).toString(), url);
+        getResources().getText(R.string.share_track_url_body_format).toString(), url);
 
     Intent shareIntent = new Intent(Intent.ACTION_SEND);
     shareIntent.setType("text/plain");
     shareIntent.putExtra(Intent.EXTRA_SUBJECT,
-        getResources().getText(R.string.share_map_subject).toString());
+        getResources().getText(R.string.share_track_subject).toString());
     shareIntent.putExtra(Intent.EXTRA_TEXT, msg);
     startActivity(Intent.createChooser(shareIntent,
-        getResources().getText(R.string.share_map).toString()));
+        getResources().getText(R.string.share_track_picker_title).toString()));
   }
 
   protected String getFusionTablesUrl(long trackId) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendDialog.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendDialog.java
index 868e25ed1..1bf5e7fe0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendDialog.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendDialog.java
@@ -45,7 +45,6 @@ public class SendDialog extends Dialog {
   private CheckBox sendToMyMapsCheckBox;
   private CheckBox sendToFusionTablesCheckBox;
   private CheckBox sendToDocsCheckBox;
-  private RadioButton sendStatsAndPointsRadioButton;
   private OnClickListener clickListener;
 
   public SendDialog(Context context) {
@@ -69,9 +68,6 @@ public class SendDialog extends Dialog {
         (RadioButton) findViewById(R.id.sendtogoogle_create_new_map);
     pickMapRadioButton =
         (RadioButton) findViewById(R.id.sendtogoogle_pick_existing_map);
-    RadioButton sendStatsRadioButton = (RadioButton) findViewById(R.id.sendtogoogle_send_stats);
-    sendStatsAndPointsRadioButton = (RadioButton) findViewById(
-        R.id.sendtogoogle_send_stats_and_points);
 
     Button cancel = (Button) findViewById(R.id.sendtogoogle_cancel);
     cancel.setOnClickListener(new View.OnClickListener() {
@@ -124,14 +120,6 @@ public class SendDialog extends Dialog {
       createNewMapRadioButton.setChecked(
           !prefs.getBoolean(
               getContext().getString(R.string.pick_existing_map_key), false));
-      sendStatsAndPointsRadioButton.setChecked(
-          prefs.getBoolean(
-              getContext().getString(R.string.send_stats_and_points_key),
-              false));
-      sendStatsRadioButton.setChecked(
-          !prefs.getBoolean(
-              getContext().getString(R.string.send_stats_and_points_key),
-              false));
     }
   }
 
@@ -154,9 +142,6 @@ public class SendDialog extends Dialog {
         editor.putBoolean(
             getContext().getString(R.string.pick_existing_map_key),
             pickMapRadioButton.isChecked());
-        editor.putBoolean(
-            getContext().getString(R.string.send_stats_and_points_key),
-            sendStatsAndPointsRadioButton.isChecked());
         editor.commit();
       }
     }
@@ -182,8 +167,4 @@ public class SendDialog extends Dialog {
   public boolean getCreateNewMap() {
     return createNewMapRadioButton.isChecked();
   }
-
-  public boolean getSendStatsAndPoints() {
-    return sendStatsAndPointsRadioButton.isChecked();
-  }
 }
\ No newline at end of file
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensorManager.java
index 096943abd..7b5d896e3 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensorManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSensorManager.java
@@ -67,10 +67,6 @@ public abstract class AntSensorManager extends SensorManager {
 
   private AntInterface antReceiver;
 
-  // Flag to know if the ANT App was interrupted
-  // TODO: This code path is not used but probably should be.
-  private boolean antInterrupted;
-
   /**
    * The data from the sensors.
    */
@@ -126,33 +122,19 @@ public abstract class AntSensorManager extends SensorManager {
 
   public AntSensorManager(Context context) {
     this.context = context;
+    
+    // We register for ANT intents early because we want to have a record of
+    // the status intents in the log as we start up.
+    registerForAntIntents();
+
   }
 
   @Override
   public void onDestroy() {
     Log.i(TAG, "destroying AntSensorManager");
-    try {
-      context.unregisterReceiver(statusReceiver);
-    } catch (IllegalArgumentException e) {
-      Log.w(TAG, "Failed to unregister ANT status receiver", e);
-    }
-
-    try {
-      context.unregisterReceiver(dataReceiver);
-    } catch (IllegalArgumentException e) {
-      Log.w(TAG, "Failed to unregister ANT data receiver", e);
-    }
-
-    if (antReceiver != null) {
-      try {
-        antReceiver.releaseInterface();
-      } catch (AntServiceNotConnectedException e) {
-        Log.i(TAG, "ANT service not connected", e);
-      } catch (AntInterfaceException e) {
-        Log.e(TAG, "failed to release ANT interface", e);
-      }
-      antReceiver.destroy();
-    }
+    
+    cleanAntInterface();
+    unregisterForAntIntents();
   }
 
   @Override
@@ -177,16 +159,18 @@ public abstract class AntSensorManager extends SensorManager {
    */
   @Override
   protected final void setupChannel() {
+    setup();
+  }
+  
+  private synchronized void setup() {
     // We handle this unpleasantly because the UI should've checked for ANT
     // support before it even instantiated this class.
     if (!AntInterface.hasAntSupport(context)) {
       throw new IllegalStateException("device does not have ANT support");
     }
-
-    // We register for ANT intents early because we want to have a record of
-    // the status intents in the log as we start up.
-    registerForAntIntents();
-
+    
+    cleanAntInterface();
+    
     antReceiver = AntInterface.getInstance(context, antServiceListener);
 
     if (antReceiver == null) {
@@ -197,6 +181,29 @@ public abstract class AntSensorManager extends SensorManager {
     setSensorState(Sensor.SensorState.CONNECTING);
   }
 
+  /**
+   * Cleans up the ANT+ receiver interface, by releasing the interface
+   * and destroying it.
+   */
+  private void cleanAntInterface()
+  {
+    Log.i(TAG, "Destroying AntSensorManager");
+    
+    if (antReceiver != null) {
+      try {
+        antReceiver.releaseInterface();
+      } catch (AntServiceNotConnectedException e) {
+        Log.i(TAG, "ANT service not connected", e);
+      } catch (AntInterfaceException e) {
+        Log.e(TAG, "failed to release ANT interface", e);
+      }
+  
+      antReceiver.destroy();
+      
+      antReceiver = null;
+    }
+  }
+  
   /**
    * This method is invoked via the ServiceListener when we're connected to
    * the ANT service.  If we're just starting up, this is our first opportunity
@@ -214,10 +221,8 @@ public abstract class AntSensorManager extends SensorManager {
       if (!antReceiver.isEnabled()) {
         // Make sure not to call AntInterface.enable() again, if it has been
         // already called before
-        if (antInterrupted == false) {
-          Log.i(TAG, "Powering on Radio");
-          antReceiver.enable();
-        }
+        Log.i(TAG, "Powering on Radio");
+        antReceiver.enable();
       } else {
         Log.i(TAG, "Radio already enabled");
       }
@@ -337,6 +342,23 @@ public abstract class AntSensorManager extends SensorManager {
     dataIntentFilter.addAction(AntInterfaceIntent.ANT_RX_MESSAGE_ACTION);
     context.registerReceiver(dataReceiver, dataIntentFilter);
   }
+  
+  private void unregisterForAntIntents()
+  {
+    Log.i(TAG, "Unregistering ANT Intents.");
+    
+    try {
+      context.unregisterReceiver(statusReceiver);
+    } catch (IllegalArgumentException e) {
+      Log.w(TAG, "Failed to unregister ANT status receiver", e);
+    }
+
+    try {
+      context.unregisterReceiver(dataReceiver);
+    } catch (IllegalArgumentException e) {
+      Log.w(TAG, "Failed to unregister ANT data receiver", e);
+    }
+  }  
 
   private String messageToString(byte[] message) {
     StringBuilder out = new StringBuilder();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java b/MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java
index 389130423..a1dbaba2f 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java
@@ -53,11 +53,6 @@ public class StatusAnnouncerTask implements PeriodicTask {
    */
   private final Context context;
 
-  /**
-   * String utilities.
-   */
-  private final StringUtils stringUtils;
-
   /**
    * The interface to the text to speech engine.
    */
@@ -93,14 +88,8 @@ public class StatusAnnouncerTask implements PeriodicTask {
     }
   };
 
-
   public StatusAnnouncerTask(Context context) {
-    this(context, new StringUtils(context));
-  }
-
-  public StatusAnnouncerTask(Context context, StringUtils stringUtils) {
     this.context = context;
-    this.stringUtils = stringUtils;
   }
 
   /**
@@ -182,17 +171,17 @@ public class StatusAnnouncerTask implements PeriodicTask {
     int speedLabel;
     if (metricUnits) {
       if (reportSpeed) {
-        speedLabel = R.string.kilometer_per_hour_long;
+        speedLabel = R.string.voice_kilometer_per_hour;
       } else {
-        speedLabel = R.string.per_kilometer;
+        speedLabel = R.string.voice_per_kilometer;
       }
     } else {
       s *= UnitConversions.KMH_TO_MPH;
       d *= UnitConversions.KM_TO_MI;
       if (reportSpeed) {
-        speedLabel = R.string.mile_per_hour_long;
+        speedLabel = R.string.voice_mile_per_hour;
       } else {
-        speedLabel = R.string.per_mile;
+        speedLabel = R.string.voice_per_mile;
       }
     }
 
@@ -206,17 +195,16 @@ public class StatusAnnouncerTask implements PeriodicTask {
         double pace = 3600000.0 / s;
         Log.w(Constants.TAG,
               "Converted speed: " + s + " to pace: " + pace);
-        speed = stringUtils.formatTimeLong((long) pace);
+        speed = getAnnounceTime((long) pace);
       }
     }
 
     return context.getString(R.string.announce_template,
-        context.getString(R.string.total_distance_label),
         d,
         context.getString(metricUnits
-                          ? R.string.kilometers_long
-                          : R.string.miles_long),
-        stringUtils.formatTimeLong(stats.getMovingTime()),
+                          ? R.string.voice_kilometers
+                          : R.string.voice_miles),
+        getAnnounceTime(stats.getMovingTime()),
         speed,
         context.getString(speedLabel));
   }
@@ -333,4 +321,37 @@ public class StatusAnnouncerTask implements PeriodicTask {
   public static int getVolumeStream() {
     return TextToSpeech.Engine.DEFAULT_STREAM;
   }
+  
+  /**
+   * Gets a string to announce the time.
+   * 
+   * @param time the time
+   */
+  private String getAnnounceTime(long time) {
+    int[] parts = StringUtils.getTimeParts(time);
+    String secLabel =
+        context.getString(parts[0] == 1 ? R.string.voice_second : R.string.voice_seconds);
+    String minLabel =
+        context.getString(parts[1] == 1 ? R.string.voice_minute : R.string.voice_minutes);
+    String hourLabel =
+        context.getString(parts[2] == 1 ? R.string.voice_hour : R.string.voice_hours);
+
+    StringBuilder sb = new StringBuilder();
+    if (parts[2] != 0) {
+      sb.append(parts[2]);
+      sb.append(" ");
+      sb.append(hourLabel);
+      sb.append(" ");
+      sb.append(parts[1]);
+      sb.append(minLabel);
+    } else {
+      sb.append(parts[1]);
+      sb.append(" ");
+      sb.append(minLabel);
+      sb.append(" ");
+      sb.append(parts[0]);
+      sb.append(secLabel);
+    }
+    return sb.toString();
+  }
 }
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 e74bef3e4..e28445469 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
@@ -221,34 +221,6 @@ public class StringUtils implements DescriptionGenerator {
     this.context = context;
   }
 
-  public String formatTimeLong(long time) {
-    int[] parts = getTimeParts(time);
-    String secLabel =
-        context.getString(parts[0] == 1 ? R.string.second : R.string.seconds);
-    String minLabel =
-        context.getString(parts[1] == 1 ? R.string.minute : R.string.minutes);
-    String hourLabel =
-        context.getString(parts[2] == 1 ? R.string.hour : R.string.hours);
-
-    StringBuilder sb = new StringBuilder();
-    if (parts[2] != 0) {
-      sb.append(parts[2]);
-      sb.append(" ");
-      sb.append(hourLabel);
-      sb.append(" ");
-      sb.append(parts[1]);
-      sb.append(minLabel);
-    } else {
-      sb.append(parts[1]);
-      sb.append(" ");
-      sb.append(minLabel);
-      sb.append(" ");
-      sb.append(parts[0]);
-      sb.append(secLabel);
-    }
-    return sb.toString();
-  }
-
   /**
    * Generates a description for a track (with information about the
    * statistics).
@@ -462,10 +434,10 @@ public class StringUtils implements DescriptionGenerator {
         + "%s: %d %s (%d %s)\n"
         + "%s: %d %s\n"
         + "%s: %d %s\n",
-        context.getString(R.string.distance_label),
+        context.getString(R.string.total_distance_label),
             distanceInKm, context.getString(R.string.kilometer),
             distanceInMiles, context.getString(R.string.mile),
-        context.getString(R.string.time_label),
+        context.getString(R.string.total_time_label),
             StringUtils.formatTime(stats.getTotalTime()),
         context.getString(R.string.moving_time_label),
             StringUtils.formatTime(stats.getMovingTime()),
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java
index 491f181bc..b3623c892 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);
+        R.string.elevation_label);
   }
 
   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),
+    assertEquals(getContext().getString(R.string.elevation_label),
         series.getTitle());
     assertTrue(series.isEnabled());
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTaskTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTaskTest.java
index 5d0bc0c87..4f7c2e600 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTaskTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTaskTest.java
@@ -20,7 +20,6 @@ import static com.google.android.testing.mocking.AndroidMock.eq;
 import static com.google.android.testing.mocking.AndroidMock.expect;
 import static com.google.android.testing.mocking.AndroidMock.same;
 
-import com.google.android.apps.mytracks.services.tasks.StatusAnnouncerTask;
 import com.google.android.apps.mytracks.stats.TripStatistics;
 import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.testing.mocking.AndroidMock;
@@ -55,7 +54,6 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
   private Locale oldDefaultLocale;
 
   private StatusAnnouncerTask task;
-  private StringUtils stringUtils;
   private StatusAnnouncerTask mockTask;
   private Capture<OnInitListener> initListenerCapture;
   private Capture<PhoneStateListener> phoneListenerCapture;
@@ -263,7 +261,6 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
 
     oldDefaultLocale = Locale.getDefault();
     Locale.setDefault(DEFAULT_LOCALE);
-    stringUtils = AndroidMock.createMock(StringUtils.class, getContext());
 
     // Eww, the effort required just to mock TextToSpeech is insane
     final AtomicBoolean listenerCalled = new AtomicBoolean();
@@ -294,9 +291,8 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
     phoneListenerCapture = new Capture<PhoneStateListener>();
 
     // Create a partial forwarding mock
-    mockTask = AndroidMock.createMock(StatusAnnouncerTask.class,
-        getContext(), stringUtils);
-    task = new StatusAnnouncerTask(getContext(), stringUtils) {
+    mockTask = AndroidMock.createMock(StatusAnnouncerTask.class, getContext());
+    task = new StatusAnnouncerTask(getContext()) {
       @Override
       protected TextToSpeech newTextToSpeech(Context ctx,
           OnInitListener onInitListener) {
@@ -333,11 +329,11 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
     expect(tts.setSpeechRate(StatusAnnouncerTask.TTS_SPEECH_RATE))
         .andReturn(TextToSpeech.SUCCESS);
 
-    AndroidMock.replay(tts, stringUtils);
+    AndroidMock.replay(tts);
 
     ttsInitListener.onInit(TextToSpeech.SUCCESS);
 
-    AndroidMock.verify(mockTask, tts, stringUtils);
+    AndroidMock.verify(mockTask, tts);
   }
 
   public void testStart_languageNotSupported() {
@@ -352,11 +348,11 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
     expect(tts.setSpeechRate(StatusAnnouncerTask.TTS_SPEECH_RATE))
         .andReturn(TextToSpeech.SUCCESS);
 
-    AndroidMock.replay(tts, stringUtils);
+    AndroidMock.replay(tts);
 
     ttsInitListener.onInit(TextToSpeech.SUCCESS);
 
-    AndroidMock.verify(mockTask, tts, stringUtils);
+    AndroidMock.verify(mockTask, tts);
   }
 
   public void testStart_notReady() {
@@ -364,11 +360,11 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
     OnInitListener ttsInitListener = initListenerCapture.getValue();
     assertNotNull(ttsInitListener);
 
-    AndroidMock.replay(tts, stringUtils);
+    AndroidMock.replay(tts);
 
     ttsInitListener.onInit(TextToSpeech.ERROR);
 
-    AndroidMock.verify(mockTask, tts, stringUtils);
+    AndroidMock.verify(mockTask, tts);
   }
 
   public void testShutdown() {
@@ -382,9 +378,9 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
     mockTask.listenToPhoneState(
         same(phoneListener), eq(PhoneStateListener.LISTEN_NONE));
     tts.shutdown();
-    AndroidMock.replay(mockTask, tts, stringUtils);
+    AndroidMock.replay(mockTask, tts);
     task.shutdown();
-    AndroidMock.verify(mockTask, tts, stringUtils);
+    AndroidMock.verify(mockTask, tts);
   }
 
   public void testRun() throws Exception {
@@ -404,9 +400,9 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
             .andReturn(TextToSpeech.SUCCESS);
 
     // Run the announcement
-    AndroidMock.replay(tts, stringUtils);
+    AndroidMock.replay(tts);
     task.runWithStatistics(stats);
-    AndroidMock.verify(mockTask, tts, stringUtils);
+    AndroidMock.verify(mockTask, tts);
   }
 
   public void testRun_notReady() throws Exception {
@@ -414,9 +410,9 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
     startTask(TextToSpeech.ERROR);
 
     // Run the announcement
-    AndroidMock.replay(tts, stringUtils);
+    AndroidMock.replay(tts);
     task.runWithStatistics(null);
-    AndroidMock.verify(mockTask, tts, stringUtils);
+    AndroidMock.verify(mockTask, tts);
   }
 
   public void testRun_duringCall() throws Exception {
@@ -425,11 +421,11 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
     expect(tts.isSpeaking()).andStubReturn(false);
 
     // Run the announcement
-    AndroidMock.replay(tts, stringUtils);
+    AndroidMock.replay(tts);
     PhoneStateListener phoneListener = phoneListenerCapture.getValue();
     phoneListener.onCallStateChanged(TelephonyManager.CALL_STATE_OFFHOOK, null);
     task.runWithStatistics(null);
-    AndroidMock.verify(mockTask, tts, stringUtils);
+    AndroidMock.verify(mockTask, tts);
   }
 
   public void testRun_ringWhileSpeaking() throws Exception {
@@ -438,7 +434,7 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
     expect(tts.isSpeaking()).andStubReturn(true);
     expect(tts.stop()).andReturn(TextToSpeech.SUCCESS);
 
-    AndroidMock.replay(tts, stringUtils);
+    AndroidMock.replay(tts);
 
     // Update the state to ringing - this should stop the current announcement.
     PhoneStateListener phoneListener = phoneListenerCapture.getValue();
@@ -447,7 +443,7 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
     // Run the announcement - this should do nothing.
     task.runWithStatistics(null);
 
-    AndroidMock.verify(mockTask, tts, stringUtils);
+    AndroidMock.verify(mockTask, tts);
   }
 
   public void testRun_whileRinging() throws Exception {
@@ -456,20 +452,20 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
     expect(tts.isSpeaking()).andStubReturn(false);
 
     // Run the announcement
-    AndroidMock.replay(tts, stringUtils);
+    AndroidMock.replay(tts);
     PhoneStateListener phoneListener = phoneListenerCapture.getValue();
     phoneListener.onCallStateChanged(TelephonyManager.CALL_STATE_RINGING, null);
     task.runWithStatistics(null);
-    AndroidMock.verify(mockTask, tts, stringUtils);
+    AndroidMock.verify(mockTask, tts);
   }
 
   public void testRun_noService() throws Exception {
     startTask(TextToSpeech.SUCCESS);
 
     // Run the announcement
-    AndroidMock.replay(tts, stringUtils);
+    AndroidMock.replay(tts);
     task.run(null);
-    AndroidMock.verify(mockTask, tts, stringUtils);
+    AndroidMock.verify(mockTask, tts);
   }
 
   public void testRun_noStats() throws Exception {
@@ -478,18 +474,18 @@ public class StatusAnnouncerTaskTest extends AndroidTestCase {
     startTask(TextToSpeech.SUCCESS);
 
     // Run the announcement
-    AndroidMock.replay(tts, stringUtils);
+    AndroidMock.replay(tts);
     task.runWithStatistics(null);
-    AndroidMock.verify(mockTask, tts, stringUtils);
+    AndroidMock.verify(mockTask, tts);
   }
 
   private void startTask(int state) {
-    AndroidMock.resetToNice(tts, stringUtils);
-    AndroidMock.replay(tts, stringUtils);
+    AndroidMock.resetToNice(tts);
+    AndroidMock.replay(tts);
     doStart();
     OnInitListener ttsInitListener = initListenerCapture.getValue();
     ttsInitListener.onInit(state);
-    AndroidMock.resetToDefault(tts, stringUtils);
+    AndroidMock.resetToDefault(tts);
   }
 
   private void doStart() {