diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index c5251bab6..ac9756e01 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -158,7 +158,7 @@ limitations under the License.
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.WelcomeActivity"
-              android:label="@string/welcome"
+              android:label="@string/welcome_title"
               android:exported="false" />
 
     <service android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
@@ -220,27 +220,27 @@ limitations under the License.
   <!-- Permission to get track start/end broadcasts -->
   <permission android:name="com.google.android.apps.mytracks.TRACK_NOTIFICATIONS"
               android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/notification_permission_label"
-              android:description="@string/notification_permission_description"
+              android:label="@string/permission_notification_label"
+              android:description="@string/permission_notification_description"
               android:protectionLevel="dangerous" />
   <!-- Permission to read raw track data (points, etc.) -->
   <permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA"
               android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/read_tracks_permission_label"
-              android:description="@string/read_tracks_permission_description"
+              android:label="@string/permission_read_label"
+              android:description="@string/permission_read_description"
               android:protectionLevel="dangerous" />
   <!-- Permission to write track data, either raw or by making service calls -->
   <permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA"
               android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/write_tracks_permission_label"
-              android:description="@string/write_tracks_permission_description"
+              android:label="@string/permission_write_label"
+              android:description="@string/permission_write_description"
               android:protectionLevel="dangerous" />
 
   <!-- 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/notification_permission_label"
-              android:description="@string/notification_permission_label"
+              android:label="@string/permission_notification_label"
+              android:description="@string/permission_notification_label"
               android:protectionLevel="signature" />
 
   <!-- We read and write raw track data, obviously. -->
diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index 94764bcff..f3e64486f 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -55,8 +55,8 @@ limitations under the License.
   <string name="sending_to_docs_success_new_doc">S\'ha enviat la ruta a un full de càlcul a docs.google.com.</string>
   <string name="sending_to_docs_success_existing_doc">S\'ha enviat la ruta a docs.google.com.</string>
   <string name="gps_need_to_enable">Toqueu aquí per anar als paràmetres de seguretat i ubicació i activeu \'habilita els satèl·lits GPS\'. Premeu el botó d\'anar enrere per tornar.</string>
-  <string name="status_approximate_current_location">Nota: Es mostra una ubicació determinada a partir de les xarxes sense fils i antenes telefòniques.</string>
-  <string name="status_no_current_location">No es pot determinar la ubicació. Habiliteu més fonts d\'ubicació (vegeu els paràmetres de seguretat i ubicació) i assegureu-vos que el cel és visible. Proveu de nou més tard.</string>
+  <string name="my_location_approximate_location">Nota: Es mostra una ubicació determinada a partir de les xarxes sense fils i antenes telefòniques.</string>
+  <string name="my_location_no_location">No es pot determinar la ubicació. Habiliteu més fonts d\'ubicació (vegeu els paràmetres de seguretat i ubicació) i assegureu-vos que el cel és visible. Proveu de nou més tard.</string>
   <string name="status_waypoint_inserted">S\'ha inserit un marcader de punt de ruta.</string>
   <string name="marker_insert_success">S\'ha inserit un marcador d\'estadístiques.</string>
 
@@ -325,8 +325,8 @@ limitations under the License.
 
   <!-- End User License Agreement -->
   <string name="eula_title">Acord de llicencia d\'usuari final</string>
-  <string name="accept">Accepta</string>
-  <string name="decline">Rebutja</string>
+  <string name="eula_accept">Accepta</string>
+  <string name="eula_decline">Rebutja</string>
 
   <!-- About -->
   <string name="about">Quant a</string>
@@ -363,12 +363,12 @@ limitations under the License.
   <string name="upgrade_available">Hi ha una nova versió disponible de %1$s. Podeu continuar fent servir la vostra versió sense cap problema, però no aconseguireu les darreres funcionalitats fins que no actualitzeu.</string>
 
   <!-- Welcome -->
-  <string name="welcome">Benvingut</string>
+  <string name="welcome_title">Benvingut</string>
   <string name="welcome_read_later">D\'acord</string>
   <string name="welcome_about">Quant a My Tracks</string>
 
   <!-- Announcement -->
-  <string name="announce_no_distance">Sense distància My Tracks</string>
+  <string name="voice_no_distance">Sense distància My Tracks</string>
   <!-- Format:
   $1 : Distance label
   $2 : Distance value (5)
@@ -377,7 +377,7 @@ limitations under the License.
   $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 en %4$s at %5$s %6$s</string>
+  <string name="voice_template">My Tracks %1$s %2$.2f %3$s en %4$s at %5$s %6$s</string>
 
   <!-- Check Units -->
   <string name="check_units_title">Avís de les unitats de mesura</string>
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index 582ac2d4e..38d21777a 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -55,8 +55,8 @@ limitations under the License.
   <string name="sending_to_docs_success_new_doc">Dein Track wurde in einer neuen Tabelle bei docs.google.com gespeichert.</string>
   <string name="sending_to_docs_success_existing_doc">Dein Track wurde an docs.google.com gesendet.</string>
   <string name="gps_need_to_enable">Hier berühren, um zu den Sicherheits- und Positionseinstellungen zu gelangen. Aktiviere \'GPS-Satelliten\'. Drücke dann den Zurück-Knopf, um hierher zurückzukehren.</string>
-  <string name="status_approximate_current_location">Anmerkung: Eine ungefähre Position wird angezeigt, bestimmt mittels Mobilfunkstationen und WiFi-Netzwerken.</string>
-  <string name="status_no_current_location">Die Position kann derzeit nicht bestimmt werden. Aktiviere mehr Positionsquellen (siehe Sicherheits- und Positionseinstellungen) und stelle sicher, dass der Himmel sichtbar ist.</string>
+  <string name="my_location_approximate_location">Anmerkung: Eine ungefähre Position wird angezeigt, bestimmt mittels Mobilfunkstationen und WiFi-Netzwerken.</string>
+  <string name="my_location_no_location">Die Position kann derzeit nicht bestimmt werden. Aktiviere mehr Positionsquellen (siehe Sicherheits- und Positionseinstellungen) und stelle sicher, dass der Himmel sichtbar ist.</string>
   <string name="status_waypoint_inserted">Ein Wegpunkt wurde eingefügt.</string>
   <string name="marker_insert_success">Ein Statistikwegpunkt wurde eingefügt.</string>
 
@@ -102,7 +102,7 @@ limitations under the License.
   <string name="error">Fehler</string>
   <string name="success">Erfolgreich</string>
   <string name="marker_type_waypoint">Wegpunkt</string>
-  <string name="license">Lizenz</string>
+  <string name="about_license">Lizenz</string>
   <string name="cancel">Abbrechen</string>
   <string name="save">Sichern</string>
 
@@ -354,8 +354,8 @@ limitations under the License.
 
   <!-- End User License Agreement -->
   <string name="eula_title">Lizenzvereinbarung für Endverbraucher</string>
-  <string name="accept">Akzeptieren</string>
-  <string name="decline">Ablehnen</string>
+  <string name="eula_accept">Akzeptieren</string>
+  <string name="eula_decline">Ablehnen</string>
 
   <!-- About -->
   <string name="about">Über</string>
@@ -395,12 +395,12 @@ limitations under the License.
   <string name="upgrade_available">Eine neue Version von %1$s ist jetzt verfügbar. Du kannst Deine installierte Version ohne Probleme weiterverwenden, aber um die neuesten Funktionen in Anspruch nehmen zu können, musst Du die Software aktualisieren.</string>
 
   <!-- Welcome -->
-  <string name="welcome">Willkommen</string>
+  <string name="welcome_title">Willkommen</string>
   <string name="welcome_read_later">OK</string>
   <string name="welcome_about">Über My Tracks</string>
 
   <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks keine Entfernung</string>
+  <string name="voice_no_distance">My Tracks keine Entfernung</string>
   <!-- Format:
   $1 : Distance label
   $2 : Distance value (5)
@@ -409,7 +409,7 @@ limitations under the License.
   $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 mit %5$s %6$s</string>
+  <string name="voice_template">My Tracks %1$s %2$.2f %3$s in %4$s mit %5$s %6$s</string>
 
   <!-- Check Units -->
   <string name="check_units_title">Einheitenbenachrichtigung</string>
@@ -441,10 +441,10 @@ limitations under the License.
   <string name="sending">Sende...</string>
 
   <!-- Manifest description (not seen inside the app) -->
-  <string name="notification_permission_label">Track-Aufzeichnungs-Benachrichtigungen empfangen</string>
-  <string name="read_tracks_permission_label">Aufgezeichnete Trackdaten lesen</string>
-  <string name="write_tracks_permission_label">Aufgezeichnete Trackdaten schreiben, Starten/Anhalten des Aufzeichnens von Tracks</string>
-  <string name="notification_permission_description">Werde benachrichtigt, wenn die Aufzeichnung eines Tracks beginnt oder anhält.</string>
-  <string name="read_tracks_permission_description">Ermöglicht das Lesen von Trackdaten wie Messpunkten oder Wegpunkten.</string>
-  <string name="write_tracks_permission_description">Ermöglicht das Schreiben von Trackdaten wie beim Starten der Aufzeichnung oder beim Hinzufügen von Wegpunkten.</string>
+  <string name="permission_notification_label">Track-Aufzeichnungs-Benachrichtigungen empfangen</string>
+  <string name="permission_read_label">Aufgezeichnete Trackdaten lesen</string>
+  <string name="permission_write_label">Aufgezeichnete Trackdaten schreiben, Starten/Anhalten des Aufzeichnens von Tracks</string>
+  <string name="permission_notification_description">Werde benachrichtigt, wenn die Aufzeichnung eines Tracks beginnt oder anhält.</string>
+  <string name="permission_read_description">Ermöglicht das Lesen von Trackdaten wie Messpunkten oder Wegpunkten.</string>
+  <string name="permission_write_description">Ermöglicht das Schreiben von Trackdaten wie beim Starten der Aufzeichnung oder beim Hinzufügen von Wegpunkten.</string>
 </resources>
diff --git a/MyTracks/res/values-es-rES/strings.xml b/MyTracks/res/values-es-rES/strings.xml
index abfc89081..747d5f654 100644
--- a/MyTracks/res/values-es-rES/strings.xml
+++ b/MyTracks/res/values-es-rES/strings.xml
@@ -33,7 +33,7 @@ limitations under the License.
   <!-- Used by the track recording service -->
 
   <!-- Common -->
-  <string name="license">Licencia</string>
+  <string name="about_license">Licencia</string>
   <string name="save">Guardar</string>
 
   <!-- Placemark labels for start and end of track -->
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index 7a5ac72d5..8fcd0c106 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -60,8 +60,8 @@ limitations under the License.
   <string name="sending_to_docs_success_existing_doc">Su recorrido ha sido enviado a docs.google.com.</string>
   <string name="sending_to_google_additional_info">Es posible que pasen unos minutos hasta que los nuevos recorridos aparezcan.</string>
   <string name="gps_need_to_enable">Por favor, presione aquí para ir al menú de Seguridad y Ubicación, y asegúrese que el GPS esté habilitado. Presione el botón "atrás" para regresar.</string>
-  <string name="status_approximate_current_location">Nota: Una ubicación aproximada es determinada a partir de torres de telefonía celular y redes WIFI.</string>
-  <string name="status_no_current_location">No puede ser determinada la ubicación actual. Habilite más fuentes de datos (vea las configuraciones de Seguridad y Ubicación) y asegúrese que el cielo sea visible. Inténtelo mas tarde.</string>
+  <string name="my_location_approximate_location">Nota: Una ubicación aproximada es determinada a partir de torres de telefonía celular y redes WIFI.</string>
+  <string name="my_location_no_location">No puede ser determinada la ubicación actual. Habilite más fuentes de datos (vea las configuraciones de Seguridad y Ubicación) y asegúrese que el cielo sea visible. Inténtelo mas tarde.</string>
   <string name="status_waypoint_inserted">Un marcador de recorrido fue insertado.</string>
   <string name="marker_insert_success">Un marcador de estadísticas fue insertado.</string>
   <string name="sending_to_google_upload_status">Estado del envío:</string>
@@ -113,7 +113,7 @@ limitations under the License.
   <string name="yes">Sí</string>
   <string name="success">Éxito</string>
   <string name="marker_type_waypoint">Marcador de recorrido</string>
-  <string name="license">Licencia</string>
+  <string name="about_license">Licencia</string>
   <string name="cancel">Cancelar</string>
   <string name="save">Guardar</string>
 
@@ -408,8 +408,8 @@ limitations under the License.
   
   <!-- End User License Agreement -->
   <string name="eula_title">Contrato de Licencia de Usuario Final</string>
-  <string name="accept">Aceptar</string>
-  <string name="decline">Declinar</string>
+  <string name="eula_accept">Aceptar</string>
+  <string name="eula_decline">Declinar</string>
 
   <!-- About -->
   <string name="about">Sobre</string>
@@ -451,12 +451,12 @@ limitations under the License.
   <string name="upgrade_available">Una nueva versión de %1$s ya está disponible. Puede continuar usando su versión actual sin ninún problema, pero no tendrá las nueva funcionalidad hasta que actualice su versión.</string>
 
   <!-- Welcome -->
-  <string name="welcome">Bienvenido</string>
+  <string name="welcome_title">Bienvenido</string>
   <string name="welcome_read_later">Aceptar</string>
   <string name="welcome_about">Sobre My Tracks</string>
 
   <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks sin distancia</string>
+  <string name="voice_no_distance">My Tracks sin distancia</string>
   <!-- Format:
   $1 : Distance label
   $2 : Distance value (5)
@@ -465,7 +465,7 @@ limitations under the License.
   $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 en %4$s a %5$s %6$s</string>
+  <string name="voice_template">My Tracks %1$s %2$.2f %3$s en %4$s a %5$s %6$s</string>
 
   <!-- Check Units -->
   <string name="check_units_title">Aviso de unidades de medida</string>
@@ -500,13 +500,13 @@ limitations under the License.
   <string name="sending">Enviando</string>
 
   <!-- Manifest description (not seen inside the app) -->
-  <string name="notification_permission_label">recibir avisos de registro de recorridos</string>
+  <string name="permission_notification_label">recibir avisos de registro de recorridos</string>
   <string name="mytracks_notifications_permission_label">receive MyTracks notifications</string>
-  <string name="read_tracks_permission_label">leer datos de recorridos grabados</string>
-  <string name="write_tracks_permission_label">escribir datos de recorridos grabados, iniciar/detener recorridos</string>
-  <string name="notification_permission_description">Ser notificado cuando un recorrido empieza o termina de registrarse.</string>
-  <string name="read_tracks_permission_description">Poder leer datos, como puntos de interés.</string>
-  <string name="write_tracks_permission_description">Poder escribir datos, como registrar o añadir puntos de interés.</string>
+  <string name="permission_read_label">leer datos de recorridos grabados</string>
+  <string name="permission_write_label">escribir datos de recorridos grabados, iniciar/detener recorridos</string>
+  <string name="permission_notification_description">Ser notificado cuando un recorrido empieza o termina de registrarse.</string>
+  <string name="permission_read_description">Poder leer datos, como puntos de interés.</string>
+  <string name="permission_write_description">Poder escribir datos, como registrar o añadir puntos de interés.</string>
   
   <!-- Sensor Type Options -->
   <string name="sensor_type_option_none">Ninguno</string>
diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml
index 21907cd51..a9ac09efd 100644
--- a/MyTracks/res/values-fi/strings.xml
+++ b/MyTracks/res/values-fi/strings.xml
@@ -60,8 +60,8 @@ limitations under the License.
   <string name="sending_to_docs_success_existing_doc">Reittisi on lähetetty osoitteeseen docs.google.com.</string>
   <string name="sending_to_google_additional_info">Reitin näkyminen saattaa kestää muutaman minuutin.</string>
   <string name="gps_need_to_enable">Avaa tästä Sijainti ja suojaus -asetukset ja valitse \'Käytä GPS-satelliitteja\'. Palaa ohjelmaan painamalla Takaisin-näppäintä.</string>
-  <string name="status_approximate_current_location">Huomio: Näkyvä sijainti perustuu kännykkämastoista ja WLAN-verkoista arvioituun paikkatietoon.</string>
-  <string name="status_no_current_location">Paikkatietoa ei löydy. Aktivoi lisää paikannusmenetelmiä (katso Asetukset) ja varmista että taivas on näkyvissä. Yritä myöhemmin uudelleen.</string>
+  <string name="my_location_approximate_location">Huomio: Näkyvä sijainti perustuu kännykkämastoista ja WLAN-verkoista arvioituun paikkatietoon.</string>
+  <string name="my_location_no_location">Paikkatietoa ei löydy. Aktivoi lisää paikannusmenetelmiä (katso Asetukset) ja varmista että taivas on näkyvissä. Yritä myöhemmin uudelleen.</string>
   <string name="status_waypoint_inserted">Reittimerkintä lisätty.</string>
   <string name="marker_insert_success">Tilastomerkintä lisätty.</string>
   <string name="sending_to_google_upload_status">Lähetyksen tila:</string>
@@ -115,7 +115,7 @@ limitations under the License.
   <string name="error">Virhe</string>
   <string name="success">Valmis</string>
   <string name="marker_type_waypoint">Reittipiste</string>
-  <string name="license">Lisenssi</string>
+  <string name="about_license">Lisenssi</string>
   <string name="cancel">Peruuta</string>
   <string name="save">Tallenna</string>
 
@@ -403,8 +403,8 @@ limitations under the License.
 
   <!-- End User License Agreement -->
   <string name="eula_title">End User License Agreement</string>
-  <string name="accept">Hyväksy</string>
-  <string name="decline">Hylkää</string>
+  <string name="eula_accept">Hyväksy</string>
+  <string name="eula_decline">Hylkää</string>
 
   <!-- About -->
   <string name="about">Tietoja</string>
@@ -447,12 +447,12 @@ limitations under the License.
   <string name="upgrade_available">%1$s uusi versio saatavilla. Voit jatkaa nykyisen version käyttöä tai päivitää uuteen versioon.</string>
 
   <!-- Welcome -->
-  <string name="welcome">Tervetuloa</string>
+  <string name="welcome_title">Tervetuloa</string>
   <string name="welcome_read_later">Ok</string>
   <string name="welcome_about">Tietoa My Tracksista</string>
 
   <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks ei etäisyyttä</string>
+  <string name="voice_no_distance">My Tracks ei etäisyyttä</string>
   <!-- Format:
   $1 : Distance label
   $2 : Distance value (5)
@@ -461,7 +461,7 @@ limitations under the License.
   $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 ajassa %4$s nopeudella %5$s %6$s</string>
+  <string name="voice_template">My Tracks %1$s %2$.2f %3$s ajassa %4$s nopeudella %5$s %6$s</string>
 
   <!-- Check Units -->
   <string name="check_units_title">Huomautus mittayksiköistä</string>
@@ -500,10 +500,10 @@ limitations under the License.
   <string name="sensor_type_option_zephyr">Zephyr bluetooth</string>
 
   <!-- Manifest description (not seen inside the app) -->
-  <string name="notification_permission_label">vastaanota huomautuksia reitin tallentamisesta</string>
-  <string name="read_tracks_permission_label">lue tallennettua reittidataa</string>
-  <string name="write_tracks_permission_label">kirjoita tallennettua reittidataa, aloita/pysäytä reitin tallennus</string>
-  <string name="notification_permission_description">Huomauta kun reitin tallennus aloitetaan tai pysäytetään..</string>
-  <string name="read_tracks_permission_description">Mahdollista reittidatan lukeminen, kuten reittipisteet, merkinnät jne.</string>
-  <string name="write_tracks_permission_description">Mahdollista reittidatan kirjoittaminen, kuten tallennuksen aloittaminen, merkintöjen lisääminen jne.</string>
+  <string name="permission_notification_label">vastaanota huomautuksia reitin tallentamisesta</string>
+  <string name="permission_read_label">lue tallennettua reittidataa</string>
+  <string name="permission_write_label">kirjoita tallennettua reittidataa, aloita/pysäytä reitin tallennus</string>
+  <string name="permission_notification_description">Huomauta kun reitin tallennus aloitetaan tai pysäytetään..</string>
+  <string name="permission_read_description">Mahdollista reittidatan lukeminen, kuten reittipisteet, merkinnät jne.</string>
+  <string name="permission_write_description">Mahdollista reittidatan kirjoittaminen, kuten tallennuksen aloittaminen, merkintöjen lisääminen jne.</string>
 </resources>
diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml
index e5a0bfd70..908ebc33b 100644
--- a/MyTracks/res/values-fr/strings.xml
+++ b/MyTracks/res/values-fr/strings.xml
@@ -56,8 +56,8 @@ limitations under the License.
   <string name="sending_to_docs_success_new_doc">Votre parcours a été envoyé dans un tableur à docs.google.com.</string>
   <string name="sending_to_docs_success_existing_doc">Votre parcours a été envoyé à docs.google.com.</string>
   <string name="gps_need_to_enable">Cliquez ici et allez dans \'Paramètres\', \'Sécurité et Localisation\' et selectionnez \'Activer les satellites GPS\'. Appuyez sur le bouton de retour pour revenir au menu.</string>
-  <string name="status_approximate_current_location">Note : Votre position est approximative, elle a été déterminée par les antennes de téléphonie ou le réseau WiFi.</string>
-  <string name="status_no_current_location">Votre position ne peut être déterminée. Vérifiez votre configuration dans \'Paramètres\', \'Sécurité et Localisation\'. Assurez-vous également que le ciel soit bien visible.</string>
+  <string name="my_location_approximate_location">Note : Votre position est approximative, elle a été déterminée par les antennes de téléphonie ou le réseau WiFi.</string>
+  <string name="my_location_no_location">Votre position ne peut être déterminée. Vérifiez votre configuration dans \'Paramètres\', \'Sécurité et Localisation\'. Assurez-vous également que le ciel soit bien visible.</string>
   <string name="status_waypoint_inserted">Un point de passage a été inséré.</string>
   <string name="marker_insert_success">Une balise de statistiques a été insérée.</string>
 
@@ -316,8 +316,8 @@ limitations under the License.
 
   <!-- End User License Agreement -->
   <string name="eula_title">Accord de licence utilisateur</string>
-  <string name="accept">Accepter</string>
-  <string name="decline">Décliner</string>
+  <string name="eula_accept">Accepter</string>
+  <string name="eula_decline">Décliner</string>
 
   <!-- About -->
   <string name="about">À propos</string>
@@ -351,12 +351,12 @@ limitations under the License.
   <string name="upgrade_available">Une nouvelle version %1$s est disponible.  Vous pouvez continuer à utiliser la version actuelle sans rencontrer de problèmes mais vous de disposerez pas des dernières fonctionnalités tant que vous n\'aurez pas installé les mises à jour.</string>
 
   <!-- Welcome -->
-  <string name="welcome">Bienvenue</string>
+  <string name="welcome_title">Bienvenue</string>
   <string name="welcome_about">À propos de My Tracks</string>
 
 
   <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks pas de distance disponible</string>
+  <string name="voice_no_distance">My Tracks pas de distance disponible</string>
   <!-- Format:
   $1 : Distance label
   $2 : Distance value (5)
@@ -365,7 +365,7 @@ limitations under the License.
   $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 en %4$s at %5$s %6$s</string>
+  <string name="voice_template">My Tracks %1$s %2$.2f %3$s en %4$s at %5$s %6$s</string>
 
   <!-- Check Units -->
   <string name="check_units_title">Note sur les unités de mesure</string>
@@ -404,10 +404,10 @@ limitations under the License.
   <string name="sensor_type_option_zephyr">Bluetooth Zephyr</string>
 
   <!-- Manifest description (not seen inside the app) -->
-  <string name="notification_permission_label">notifications lors de l\'enregistrement de parcours</string>
-  <string name="read_tracks_permission_label">lecture des parcours enregistrés</string>
-  <string name="write_tracks_permission_label">sauvegarde de parcours, lancer/arrêter l\'enregistrement de parcours</string>
-  <string name="notification_permission_description">Notifications lors du lancement et de l\'arrêt de l\'enregistrement de parcours.</string>
-  <string name="read_tracks_permission_description">Possibilité de lire les données des parcours enregistrés, telles que les marqueurs et les points de passage.</string>
-  <string name="write_tracks_permission_description">Possibilité d\'écrire des données de parcours, telles que les marqueurs et les points de passage..</string>
+  <string name="permission_notification_label">notifications lors de l\'enregistrement de parcours</string>
+  <string name="permission_read_label">lecture des parcours enregistrés</string>
+  <string name="permission_write_label">sauvegarde de parcours, lancer/arrêter l\'enregistrement de parcours</string>
+  <string name="permission_notification_description">Notifications lors du lancement et de l\'arrêt de l\'enregistrement de parcours.</string>
+  <string name="permission_read_description">Possibilité de lire les données des parcours enregistrés, telles que les marqueurs et les points de passage.</string>
+  <string name="permission_write_description">Possibilité d\'écrire des données de parcours, telles que les marqueurs et les points de passage..</string>
 </resources>
diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml
index 028086c4a..d712abfc2 100644
--- a/MyTracks/res/values-it/strings.xml
+++ b/MyTracks/res/values-it/strings.xml
@@ -53,8 +53,8 @@ limitations under the License.
   <string name="sending_to_docs_success_new_doc">Il tuo percorso è stato inviato ad un nuovo foglio di calcolo su docs.google.com.</string>
   <string name="sending_to_docs_success_existing_doc">Il tuo percorso è stato inviato a docs.google.com.</string>
   <string name="gps_need_to_enable">Premi qui per andare a «Impostazioni di posizione e protezione» e attiva «Utilizza satelliti GPS». Poi premi il tasto di ritorno per tornare qui.</string>
-  <string name="status_approximate_current_location">Nota: la posizione indicata è un\'approssimazione determinata in base alle antenne cellulari e reti WIFI vicine.</string>
-  <string name="status_no_current_location">La posizione non può essere determinata. Attiva più fonti di posizione (vedi «Impostazioni di posizione e protezione») e eccertati che il cielo sia visibile. Riprova più tardi.</string>
+  <string name="my_location_approximate_location">Nota: la posizione indicata è un\'approssimazione determinata in base alle antenne cellulari e reti WIFI vicine.</string>
+  <string name="my_location_no_location">La posizione non può essere determinata. Attiva più fonti di posizione (vedi «Impostazioni di posizione e protezione») e eccertati che il cielo sia visibile. Riprova più tardi.</string>
   <string name="status_waypoint_inserted">Inserito un punto di passaggio.</string>
   <string name="marker_insert_success">Inserito un segnaposto con statistiche.</string>
 
@@ -297,8 +297,8 @@ limitations under the License.
 
   <!-- End User License Agreement -->
   <string name="eula_title">Termini di servizio</string>
-  <string name="accept">Accetto</string>
-  <string name="decline">Non accetto</string>
+  <string name="eula_accept">Accetto</string>
+  <string name="eula_decline">Non accetto</string>
 
   <!-- About -->
   <string name="about">Informazioni</string>
@@ -335,12 +335,12 @@ limitations under the License.
   <string name="upgrade_available">Una nuova versione di %1$s è disponibile. Puoi continuare a usare la versione corrente senza problemi, ma non avrai le ultime funzionalità finché non installi l\'aggiornamento.</string>
 
   <!-- Welcome -->
-  <string name="welcome">Benvenuto</string>
+  <string name="welcome_title">Benvenuto</string>
   <string name="welcome_read_later">OK</string>
   <string name="welcome_about">Informazioni su My Tracks</string>
 
   <!-- Announcement -->
-  <string name="announce_no_distance">Mai Tracks Distanza non disponibile</string>
+  <string name="voice_no_distance">Mai Tracks Distanza non disponibile</string>
   <!-- Format:
   $1 : Distance label
   $2 : Distance value (5)
@@ -349,5 +349,5 @@ limitations under the License.
   $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
   $6 : Speed units (mph) : Pace units (per mile)
   -->
-  <string name="announce_template">Mai Tracks %1$s %2$.2f %3$s in %4$s a %5$s %6$s</string>
+  <string name="voice_template">Mai Tracks %1$s %2$.2f %3$s in %4$s a %5$s %6$s</string>
 </resources>
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index 0207510ff..a84ee5355 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -58,8 +58,8 @@ limitations under the License.
   <string name="sending_to_docs_success_existing_doc">トラックをdocs.google.comに送信しました．</string>
   <string name="sending_to_google_additional_info">新しいトラックが表示されるまでに数分かかることがあります．</string>
   <string name="gps_need_to_enable">ここをタップして「位置情報とセキュリティの設定」を開いて「GPS機能を使用」にチェックを入れて下さい．バックボタンで戻ってください．</string>
-  <string name="status_approximate_current_location">ご注意: 携帯電話中継局とWi-Fiネットワークから大まかな位置を特定します．</string>
-  <string name="status_no_current_location">現在位置決定ができません．位置取得源を増やし(位置情報とセキュリティの設定 をご覧ください)、空が見えるようにして下さい．もう一度試して下さい．</string>
+  <string name="my_location_approximate_location">ご注意: 携帯電話中継局とWi-Fiネットワークから大まかな位置を特定します．</string>
+  <string name="my_location_no_location">現在位置決定ができません．位置取得源を増やし(位置情報とセキュリティの設定 をご覧ください)、空が見えるようにして下さい．もう一度試して下さい．</string>
   <string name="status_waypoint_inserted">ウェイポイントマーカーを挿入しました．</string>
   <string name="marker_insert_success">統計マーカーを挿入しました．</string>
 
@@ -111,7 +111,7 @@ limitations under the License.
   <string name="error">エラー</string>
   <string name="success">成功</string>
   <string name="marker_type_waypoint">ウェイポイント</string>
-  <string name="license">ライセンス</string>
+  <string name="about_license">ライセンス</string>
   <string name="cancel">キャンセル</string>
   <string name="save">保存</string>
 
@@ -376,8 +376,8 @@ limitations under the License.
 
   <!-- End User License Agreement -->
   <string name="eula_title">エンドユーザライセンス契約書</string>
-  <string name="accept">同意する</string>
-  <string name="decline">拒否する</string>
+  <string name="eula_accept">同意する</string>
+  <string name="eula_decline">拒否する</string>
 
   <!-- About -->
   <string name="about">このアプリケーションについて</string>
@@ -418,11 +418,11 @@ limitations under the License.
   <string name="upgrade_available">%1$s の新しい版が出ています．現版で問題なくご使用になれますが、アップグレードするまで最新の機能をお使いになれません．</string>
 
   <!-- Welcome -->
-  <string name="welcome">ようこそ</string>
+  <string name="welcome_title">ようこそ</string>
   <string name="welcome_about">My Tracksについて</string>
 
   <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks 移動していません</string>
+  <string name="voice_no_distance">My Tracks 移動していません</string>
   <!-- Format:
   $1 : Distance label
   $2 : Distance value (5)
@@ -431,7 +431,7 @@ limitations under the License.
   $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 時間 %4$s 速度/ペース %5$s %6$s</string>
+  <string name="voice_template">My Tracks %1$s %2$.2f %3$s 時間 %4$s 速度/ペース %5$s %6$s</string>
 
   <!-- Check Units -->
   <string name="check_units_title">計測単位についてのご注意</string>
@@ -468,10 +468,10 @@ limitations under the License.
   <string name="sensor_type_option_srm_ant_bridge">SRM ANT+ ブリッジ</string>
     
   <!-- Manifest description (not seen inside the app) -->
-  <string name="notification_permission_label">トラック記録通知受信</string>
-  <string name="read_tracks_permission_label">トラック読み込み</string>
-  <string name="write_tracks_permission_label">トラック書き込みとトラック記録の開始・終了</string>
-  <string name="notification_permission_description">トラック記録の開始・終了時に通知されます．</string>
-  <string name="read_tracks_permission_description">ポイントやウェイポイントといったトラックの読み込みを可能にします．</string>
-  <string name="write_tracks_permission_description">記録開始やウェイポイント追加といったトラック記録を可能にします．</string>
+  <string name="permission_notification_label">トラック記録通知受信</string>
+  <string name="permission_read_label">トラック読み込み</string>
+  <string name="permission_write_label">トラック書き込みとトラック記録の開始・終了</string>
+  <string name="permission_notification_description">トラック記録の開始・終了時に通知されます．</string>
+  <string name="permission_read_description">ポイントやウェイポイントといったトラックの読み込みを可能にします．</string>
+  <string name="permission_write_description">記録開始やウェイポイント追加といったトラック記録を可能にします．</string>
 </resources>
diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml
index 96d574eaa..9430a30c1 100644
--- a/MyTracks/res/values-pl/strings.xml
+++ b/MyTracks/res/values-pl/strings.xml
@@ -54,8 +54,8 @@ limitations under the License.
   <string name="sending_to_docs_success_new_doc">Twoja trasa została wysłana do nowego arkusza na docs.google.com.</string>
   <string name="sending_to_docs_success_existing_doc">Twoja trasa została wysłana do docs.google.com.</string>
   <string name="gps_need_to_enable">Tapnij tutaj, aby przejść do ustawień Lokalizacji i zabezpieczeń, a następnie zaznacz Użyj satelitów GPS. Naciśnij klawisz Wstecz, aby powrócić.</string>
-  <string name="status_approximate_current_location">Uwaga: używana jest przybliżona lokalizacja ustalona za pomocą stacji komórkowych i sieci WIFI.</string>
-  <string name="status_no_current_location">Lokalizacja nie może być obecnie ustalona. Włącz wiecej źródeł (zobacz ustawienia Lokalizacji i zabezpieczeń) i upewnij się, że niebo jest widoczne. Spróbuj później.</string>
+  <string name="my_location_approximate_location">Uwaga: używana jest przybliżona lokalizacja ustalona za pomocą stacji komórkowych i sieci WIFI.</string>
+  <string name="my_location_no_location">Lokalizacja nie może być obecnie ustalona. Włącz wiecej źródeł (zobacz ustawienia Lokalizacji i zabezpieczeń) i upewnij się, że niebo jest widoczne. Spróbuj później.</string>
   <string name="status_waypoint_inserted">Wstawiono znacznik punktu orientacyjnego.</string>
   <string name="marker_insert_success">Wstawiono znacznik statystyk.</string>
 
@@ -325,8 +325,8 @@ limitations under the License.
 
   <!-- End User License Agreement -->
   <string name="eula_title">Licencja użytkownika końcowego</string>
-  <string name="accept">Zaakceptuj</string>
-  <string name="decline">Odrzuć</string>
+  <string name="eula_accept">Zaakceptuj</string>
+  <string name="eula_decline">Odrzuć</string>
 
   <!-- About -->
   <string name="about">O</string>
@@ -365,12 +365,12 @@ limitations under the License.
   <string name="upgrade_available">Dostępna jest nowa wersja %1$s is available. Możesz nadal używać obecnej wersji bez problemów, nie będziesz miał jednak dostępu do najnowszych funkcji.</string>
 
   <!-- Welcome -->
-  <string name="welcome">Witamy</string>
+  <string name="welcome_title">Witamy</string>
   <string name="welcome_read_later">Ok</string>
   <string name="welcome_about">O My Tracks</string>
 
   <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks brak odległości</string>
+  <string name="voice_no_distance">My Tracks brak odległości</string>
   <!-- Format:
   $1 : Distance label
   $2 : Distance value (5)
@@ -379,7 +379,7 @@ limitations under the License.
   $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 w %4$s w tempie %5$s %6$s</string>
+  <string name="voice_template">My Tracks %1$s %2$.2f %3$s w %4$s w tempie %5$s %6$s</string>
 
   <!-- Check Units -->
   <string name="check_units_title">Jednostki miary</string>
diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml
index 52163813e..c5b49f029 100644
--- a/MyTracks/res/values-pt-rBR/strings.xml
+++ b/MyTracks/res/values-pt-rBR/strings.xml
@@ -53,8 +53,8 @@ limitations under the License.
   <string name="sending_to_docs_success_new_doc">Seu caminho foi enviado para uma nova planilha em docs.google.com.</string>
   <string name="sending_to_docs_success_existing_doc">Seu caminho foi enviado para docs.google.com.</string>
   <string name="gps_need_to_enable">"Por favor pressione aqui para ir aos ajustes de segurança e localização e verifique que o GPS esteja habilitado. Pressione o botão de voltar para retornar.</string>
-  <string name="status_approximate_current_location">Nota: Uma localização aproximada, determinada por torres de telefonia celular, está sendo mostrada.</string>
-  <string name="status_no_current_location">Sua localização não pôde ser determinada.  Habilite fontes adicionais de localização (veja configurações de Segurança e Localização) e assegure-se de que o céu está visível.</string>
+  <string name="my_location_approximate_location">Nota: Uma localização aproximada, determinada por torres de telefonia celular, está sendo mostrada.</string>
+  <string name="my_location_no_location">Sua localização não pôde ser determinada.  Habilite fontes adicionais de localização (veja configurações de Segurança e Localização) e assegure-se de que o céu está visível.</string>
   <string name="status_waypoint_inserted">Um marcador de ponto de passagem foi inserido.</string>
   <string name="marker_insert_success">Um marcador de estatísticas foi inserido..</string>
 
@@ -276,8 +276,8 @@ limitations under the License.
 
   <!-- End User License Agreement -->
   <string name="eula_title">Contrato de Licença de Usuário Final</string>
-  <string name="accept">Aceitar</string>
-  <string name="decline">Recusar</string>
+  <string name="eula_accept">Aceitar</string>
+  <string name="eula_decline">Recusar</string>
 
   <!-- About -->
   <string name="about">Sobre</string>
@@ -313,11 +313,11 @@ limitations under the License.
   <string name="upgrade_available">Uma nova versão do %1$s está disponível.  Você pode continuar a usar sua versão atual sem problemas, porém não terá acesso aos novos recursos até que atualize.</string>
 
   <!-- Welcome -->
-  <string name="welcome">Bem-vindo</string>
+  <string name="welcome_title">Bem-vindo</string>
   <string name="welcome_about">Sobre My Tracks</string>
 
   <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks sem distância</string>
+  <string name="voice_no_distance">My Tracks sem distância</string>
   <!-- Format:
   $1 : Distance label
   $2 : Distance value (5)
@@ -326,6 +326,6 @@ limitations under the License.
   $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 em %4$s a %5$s %6$s</string>
+  <string name="voice_template">My Tracks %1$s %2$.2f %3$s em %4$s a %5$s %6$s</string>
 
 </resources>
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index c5a331bf8..e9d354eae 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -59,8 +59,8 @@ limitations under the License.
   <string name="sending_to_docs_success_existing_doc">Ваш трек был отправлен в docs.google.com.</string>
   <string name="sending_to_google_additional_info">Это может занять несколько минут, прежде чем появятся новые треки.</string>
   <string name="gps_need_to_enable">Пожалуйста, нажмите здесь для перехода к разделу настроек Координаты и отметьте пункт \"Спутники GPS\". Для возвращения нажмите кнопку Назад.</string>
-  <string name="status_approximate_current_location">Примечание: приблизительное местоположение определено относительно вышек сотовой связи и беспроводных сетей.</string>
-  <string name="status_no_current_location">В настоящее время местоположение не может быть определено. Включите больше источников местоположение (см. раздел настроек Координаты) и убедитесь в том, что находитесь под открытым небом. Повторите попытку позднее.</string>
+  <string name="my_location_approximate_location">Примечание: приблизительное местоположение определено относительно вышек сотовой связи и беспроводных сетей.</string>
+  <string name="my_location_no_location">В настоящее время местоположение не может быть определено. Включите больше источников местоположение (см. раздел настроек Координаты) и убедитесь в том, что находитесь под открытым небом. Повторите попытку позднее.</string>
   <string name="status_waypoint_inserted">Маркер путевой точки был вставлен.</string>
   <string name="marker_insert_success">Маркер статистики был вставлен.</string>
   <string name="sending_to_google_upload_status">Статус загрузки:</string>
@@ -114,7 +114,7 @@ limitations under the License.
   <string name="error">Ошибка</string>
   <string name="success">Готово</string>
   <string name="marker_type_waypoint">Путевая точка</string>
-  <string name="license">Лицензия</string>
+  <string name="about_license">Лицензия</string>
   <string name="cancel">Отмена</string>
   <string name="save">Сохранить</string>
 
@@ -399,8 +399,8 @@ limitations under the License.
 
   <!-- End User License Agreement -->
   <string name="eula_title">Лицензионное соглашение</string>
-  <string name="accept">Принять</string>
-  <string name="decline">Отклонить</string>
+  <string name="eula_accept">Принять</string>
+  <string name="eula_decline">Отклонить</string>
 
   <!-- About -->
   <string name="about">О программе</string>
@@ -443,12 +443,12 @@ limitations under the License.
   <string name="upgrade_available">Доступна новая версия %1$s. Вы можете продолжать использовать текущую версию без проблем, но вы не получите новейшие функции, до тех пор, пока не обновитесь.</string>
 
   <!-- Welcome -->
-  <string name="welcome">Добро пожаловать</string>
+  <string name="welcome_title">Добро пожаловать</string>
   <string name="welcome_read_later">Ок</string>
   <string name="welcome_about">О My Tracks</string>
 
   <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks нет расстояния</string>
+  <string name="voice_no_distance">My Tracks нет расстояния</string>
   <!-- Format:
   $1 : Distance label
   $2 : Distance value (5)
@@ -457,7 +457,7 @@ limitations under the License.
   $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
   $6 : Speed units (mph) : Pace units (per mile)
   -->
-  <string name="announce_template">Мои треки %1$s %2$.2f %3$s в %4$s на %5$s %6$s</string>
+  <string name="voice_template">Мои треки %1$s %2$.2f %3$s в %4$s на %5$s %6$s</string>
 
   <!-- Check Units -->
   <string name="check_units_title">Единицы измерения обратите внимание</string>
@@ -495,10 +495,10 @@ limitations under the License.
   <string name="sensor_type_option_srm_ant_bridge">SRM ANT+ Bridge</string>
 
   <!-- Manifest description (not seen inside the app) -->
-  <string name="notification_permission_label">получать уведомления о записи трека</string>
-  <string name="read_tracks_permission_label">чтение записанных данных трека</string>
-  <string name="write_tracks_permission_label">запись данных трека, старт/стоп записи треков</string>
-  <string name="notification_permission_description">Получать уведомления, при старте или останове записи трека.</string>
-  <string name="read_tracks_permission_description">Иметь возможность читать данные трека, такие как точки и путевые точки.</string>
-  <string name="write_tracks_permission_description">Иметь возможность записать данные трека, такие как начало записи или добавление путевых точек.</string>
+  <string name="permission_notification_label">получать уведомления о записи трека</string>
+  <string name="permission_read_label">чтение записанных данных трека</string>
+  <string name="permission_write_label">запись данных трека, старт/стоп записи треков</string>
+  <string name="permission_notification_description">Получать уведомления, при старте или останове записи трека.</string>
+  <string name="permission_read_description">Иметь возможность читать данные трека, такие как точки и путевые точки.</string>
+  <string name="permission_write_description">Иметь возможность записать данные трека, такие как начало записи или добавление путевых точек.</string>
 </resources>
diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml
index ffc6c07bd..efff5b519 100644
--- a/MyTracks/res/values-sv/strings.xml
+++ b/MyTracks/res/values-sv/strings.xml
@@ -54,8 +54,8 @@ limitations under the License.
   <string name="sending_to_docs_success_new_doc">Ditt spår har skickats till ett nytt kalkylblad på docs.google.com.</string>
   <string name="sending_to_docs_success_existing_doc">Ditt spår har skickats till docs.google.com.</string>
   <string name="gps_need_to_enable">Klicka här för att gå till Säkerhet och Platsinställningar och kryssa i \'aktivera gps-satteliter\'. Tryck på tillbakaknappen för att återgå.</string>
-  <string name="status_approximate_current_location">OBS: En ungefärlig position som avgörs från mobilmaster och WIFI-nät visas.</string>
-  <string name="status_no_current_location">En position kan för närvarande inte fastställas. Aktivera mer platskällor (se Säkerhet och Platsinställningar) och se till att himlen är synlig. Försök igen senare.</string>
+  <string name="my_location_approximate_location">OBS: En ungefärlig position som avgörs från mobilmaster och WIFI-nät visas.</string>
+  <string name="my_location_no_location">En position kan för närvarande inte fastställas. Aktivera mer platskällor (se Säkerhet och Platsinställningar) och se till att himlen är synlig. Försök igen senare.</string>
   <string name="status_waypoint_inserted">En positionsmarkör har lagts in.</string>
   <string name="marker_insert_success">En statistikmarkör har lagts in.</string>
 
@@ -300,8 +300,8 @@ limitations under the License.
 
   <!-- End User License Agreement -->
   <string name="eula_title">Licensavtal för slutanvändare</string>
-  <string name="accept">Acceptera</string>
-  <string name="decline">Avböj</string>
+  <string name="eula_accept">Acceptera</string>
+  <string name="eula_decline">Avböj</string>
 
   <!-- About -->
   <string name="about">Om</string>
@@ -338,12 +338,12 @@ limitations under the License.
   <string name="upgrade_available">En ny version av %1$s finns tillgänglig. Du kan fortsätta använda din nuvarande version utan problem, men du kommer inte få de senaste funktionerna förrän du uppgraderar.</string>
 
   <!-- Welcome -->
-  <string name="welcome">Välkommen</string>
+  <string name="welcome_title">Välkommen</string>
   <string name="welcome_read_later">Ok</string>
   <string name="welcome_about">Om My Tracks</string>
 
   <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks ingen distans</string>
+  <string name="voice_no_distance">My Tracks ingen distans</string>
   <!-- Format:
   $1 : Distance label
   $2 : Distance value (5)
@@ -352,7 +352,7 @@ limitations under the License.
   $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 på %4$s i %5$s %6$s</string>
+  <string name="voice_template">My Tracks %1$s %2$.2f %3$s på %4$s i %5$s %6$s</string>
 
   <!-- Check Units -->
   <string name="check_units_title">Mätenheter</string>
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index 5a397c090..283514e69 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -60,8 +60,8 @@ limitations under the License.
   <string name="sending_to_docs_success_existing_doc">你的轨迹已经发送到 docs.google.com.</string>
   <string name="sending_to_google_additional_info">可能需要等待几分钟才能看见新的轨迹.</string>
   <string name="gps_need_to_enable">请点击这里进入\'安全和位置设置\'并勾选上\'启用 GPS 卫星\'. 然后用后退键返回.</string>
-  <string name="status_approximate_current_location">注意: 当前显示的位置是根据无线信号和无线网络计算的近似位置.</string>
-  <string name="status_no_current_location">目前无法定位. 请启用更多的位置来源 (在\'安全和位置设置\'中) 并确认天空是可见的. 再重试.</string>
+  <string name="my_location_approximate_location">注意: 当前显示的位置是根据无线信号和无线网络计算的近似位置.</string>
+  <string name="my_location_no_location">目前无法定位. 请启用更多的位置来源 (在\'安全和位置设置\'中) 并确认天空是可见的. 再重试.</string>
   <string name="status_waypoint_inserted">插入了一个路点标记.</string>
   <string name="marker_insert_success">插入了一个统计标记.</string>
   <string name="sending_to_google_upload_status">上传状态:</string>
@@ -115,7 +115,7 @@ limitations under the License.
   <string name="error">错误</string>
   <string name="success">成功</string>
   <string name="marker_type_waypoint">路点</string>
-  <string name="license">授权</string>
+  <string name="about_license">授权</string>
   <string name="cancel">取消</string>
   <string name="save">保存</string>
 
@@ -384,8 +384,8 @@ limitations under the License.
 
   <!-- End User License Agreement -->
   <string name="eula_title">最终用户协议</string>
-  <string name="accept">同意</string>
-  <string name="decline">拒绝</string>
+  <string name="eula_accept">同意</string>
+  <string name="eula_decline">拒绝</string>
 
   <!-- About -->
   <string name="about">关于</string>
@@ -425,12 +425,12 @@ limitations under the License.
   <string name="upgrade_available">%1$s 的新版本已经发布. 你可以继续使用现在的版本, 但在更新前无法使用到最新的功能.</string>
 
   <!-- Welcome -->
-  <string name="welcome">欢迎</string>
+  <string name="welcome_title">欢迎</string>
   <string name="welcome_read_later">确定</string>
   <string name="welcome_about">关于 My Tracks</string>
 
   <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks 无距离</string>
+  <string name="voice_no_distance">My Tracks 无距离</string>
   <!-- Format:
   $1 : Distance label
   $2 : Distance value (5)
@@ -439,7 +439,7 @@ limitations under the License.
   $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 用时 %4$s 速度 %5$s %6$s</string>
+  <string name="voice_template">My Tracks %1$s %2$.2f %3$s 用时 %4$s 速度 %5$s %6$s</string>
 
   <!-- Check Units -->
   <string name="check_units_title">测量单位提示</string>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index e1d7d2899..e2b6a0e3b 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -15,7 +15,49 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
+
+  <!-- About -->  
+  <string name="about_license"
+    translation_description="In the 'About' page, the button on the bottom to view the terms
+      of service agreement.">
+    License
+  </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_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_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>
  
+  <!-- EULA -->
+  <string name="eula_accept"
+    translation_description="In the 'End User License Agreement' dialog, the button to accept.">
+    Accept
+  </string>
+  <string name="eula_decline"
+    translation_description="In the 'End User License Agreement' dialog, the button to 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>
+    
   <!-- GPS -->
   <string name="gps_need_to_enable"
     translation_description="In the main view, the message on the top asking the user to enable
@@ -173,6 +215,68 @@ limitations under the License.
     Tracks
   </string> 
   
+  <!-- My Location -->
+  <string name="my_location_approximate_location"
+    translation_description="When displaying the user's current location, a status message
+      indicating that GPS is not available and an approximate location is used instead.">
+    GPS is not available. An approximate location based on cell towers and WIFI networks is shown.
+  </string>
+  <string name="my_location_no_location"
+    translation_description="When displaying the user's current location, a status message
+      indicating that the current location cannot be determined.">
+    GPS is not available. Current location cannot be determined. Enable more location sources (see
+    \'Location &amp; security\' settings) and make sure the sky is visible. Try again later.
+  </string>
+  
+  <!-- Permission - not seen inside the app -->
+  <string name="permission_notification_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="permission_notification_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="permission_read_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="permission_read_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="permission_write_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>
+  <string name="permission_write_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>
+  
+  <!--  Preferred Units -->
+  <string name="preferred_units_imperial"
+    translation_description="In the dialog asking the user to choose a preferred units, the option
+      to choose the imperial units.">
+    Imperial
+  </string>
+  <string name="preferred_units_metric"
+    translation_description="In the dialog asking the user to choose a preferred units, the option
+      to choose the metric units.">
+    Metric
+  </string>
+  <string name="preferred_units_title"
+    translation_description="The title of the dialog asking the user to choose a preferred units,
+      metric or imperial.">
+    Preferred Units
+  </string>
+  
   <!-- Send Google -->    
   <string name="send_google_track_part_format"
     translation_description="When sending a track to Google, the string format to name segments
@@ -328,6 +432,89 @@ limitations under the License.
     Now recording a new track.
   </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_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="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> 
+  <string name="voice_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>
+  
+  <!-- Welcome -->
+  <string name="welcome_about"
+    translation_description="In the 'Welcome' page, the button on the bottom to read the 'About'
+      page.">
+    About My Tracks
+  </string>    
+  <string name="welcome_title"
+    translation_description="The title of the welcome page.">
+    Welcome
+  </string>
+      
   <!-- Error messages when sending to Google. -->
   <string name="error_sending_to_google"
     translation_description="When sending a track to Google, a message indicating that an error has
@@ -362,18 +549,6 @@ limitations under the License.
     The operation was canceled.
   </string>
 
-  <string name="status_approximate_current_location"
-    translation_description="When displaying the user's current location, a status message
-      indicating that GPS is not available and an approximate location is used instead.">
-    GPS is not available. An approximate location based on cell towers and WIFI networks is shown.
-  </string>
-  <string name="status_no_current_location"
-    translation_description="When displaying the user's current location, a status message
-      indicating that the current location cannot be determined.">
-    GPS is not available. Current location cannot be determined. Enable more location sources (see
-    \'Location &amp; security\' settings) and make sure the sky is visible. Try again later.
-  </string>
-  
   <!-- Sending to Google status messages. -->
   <string name="sending_to_google_upload_status"
     translation_description="When sending a track to Google, the header on the top of the result
@@ -552,14 +727,7 @@ limitations under the License.
     translation_description="The title on the alert dialog to indicate error.">
     Error
   </string>
-  
-  <!--  Welcome dialog -->
-  <string name="license"
-    translation_description="In the welcome dialog, the text on the bottom button to view the terms
-      of service agreement.">
-    License
-  </string>
-  
+
   <!-- Export -->
   <string name="export_done"
     translation_description="After exporting all the tracks, a toast message indicating success.">
@@ -1180,60 +1348,6 @@ limitations under the License.
     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 -->
@@ -1308,43 +1422,6 @@ limitations under the License.
     bpm
   </string>
   
-  <!-- End User License Agreement -->
-  <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 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>
-
   <!-- Send to Google dialog -->
   <string name="sendtogoogle_title"
     translation_description="When sending a track to Google, the dialog title to choose the Google
@@ -1434,54 +1511,6 @@ limitations under the License.
     Finished reading from SD card.
   </string>
 
-  <!-- Welcome -->
-  <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"
-    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>
-
-  <!--  Preferred Units -->
-  <string name="preferred_units_title"
-    translation_description="The title of the dialog asking the user to choose a preferred units,
-      metric or imperial.">
-    Preferred Units
-  </string>
-  <string name="preferred_units_metric"
-    translation_description="In the dialog asking the user to choose a preferred units, the option
-      to choose the metric units.">
-    Metric
-  </string>
-  <string name="preferred_units_imperial"
-    translation_description="In the dialog asking the user to choose a preferred units, the option
-      to choose the imperial units.">
-    Imperial
-  </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
@@ -1511,37 +1540,6 @@ limitations under the License.
     Sending
   </string>
       
-  <!-- Manifest description (not seen inside the app) -->
-  <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"
     translation_description="In the Sensor Options settings page, for the Sensor Type picker, the
diff --git a/MyTracks/src/com/google/android/apps/mytracks/Eula.java b/MyTracks/src/com/google/android/apps/mytracks/Eula.java
index 59936ce80..e662c0c4f 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/Eula.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/Eula.java
@@ -52,14 +52,14 @@ class Eula {
     }
 
     final AlertDialog.Builder builder = initDialog(activity);
-    builder.setPositiveButton(R.string.accept,
+    builder.setPositiveButton(R.string.eula_accept,
         new DialogInterface.OnClickListener() {
           @Override
           public void onClick(DialogInterface dialog, int which) {
             accept(activity, preferences);
           }
         });
-    builder.setNegativeButton(R.string.decline,
+    builder.setNegativeButton(R.string.eula_decline,
         new DialogInterface.OnClickListener() {
           @Override
           public void onClick(DialogInterface dialog, int which) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
index 91b5eef13..3affd5219 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
@@ -72,7 +72,7 @@ public class WelcomeActivity extends Activity {
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
     builder.setView(view);
     builder.setPositiveButton(R.string.ok, null);
-    builder.setNegativeButton(R.string.license, new DialogInterface.OnClickListener() {
+    builder.setNegativeButton(R.string.about_license, new DialogInterface.OnClickListener() {
       @Override 
       public void onClick(DialogInterface dialog, int which) {
         Eula.showEula(WelcomeActivity.this);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/DataSourcesWrapperImpl.java b/MyTracks/src/com/google/android/apps/mytracks/content/DataSourcesWrapperImpl.java
index 18fc8b7d9..6e4e51de9 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/content/DataSourcesWrapperImpl.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/content/DataSourcesWrapperImpl.java
@@ -147,10 +147,10 @@ class DataSourcesWrapperImpl implements DataSourcesWrapper {
       // We don't have a recent GPS fix, just use cell towers if available
       loc = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
 
-      int toastResId = R.string.status_approximate_current_location;
+      int toastResId = R.string.my_location_approximate_location;
       if (loc == null || loc.getTime() < now - MAX_NETWORK_AGE_MS) {
         // We don't have a recent cell tower location, let the user know:
-        toastResId = R.string.status_no_current_location;
+        toastResId = R.string.my_location_no_location;
       }
 
       // Let the user know we have only an approximate location:
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 a1dbaba2f..4c5346f87 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
@@ -165,7 +165,7 @@ public class StatusAnnouncerTask implements PeriodicTask {
     double d =  stats.getTotalDistance() / 1000;
     double s =  stats.getAverageMovingSpeed() * 3.6;
     if (d == 0) {
-      return context.getString(R.string.announce_no_distance);
+      return context.getString(R.string.voice_no_distance);
     }
 
     int speedLabel;
@@ -199,7 +199,7 @@ public class StatusAnnouncerTask implements PeriodicTask {
       }
     }
 
-    return context.getString(R.string.announce_template,
+    return context.getString(R.string.voice_template,
         d,
         context.getString(metricUnits
                           ? R.string.voice_kilometers