diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index 7e4c9930d..a1fbeff3f 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -166,22 +166,22 @@ limitations under the License.
   <string name="settings_recording">Enregistrament</string>
   <string name="settings_sharing">Compartició</string>
 
-  <string name="settings_announcement_frequency_not_available">No es troba disponible a la vostra versió de l\'Android</string>
+  <string name="settings_recording_voice_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>
+  <string name="settings_recording_voice">Freqüència d\'avís</string>
+  <string name="settings_recording_voice_summary">Temps mínim entre dos avisos de veu</string>
 
-  <string name="settings_min_recording_distance">Distància mínima entre punts</string>
-  <string name="settings_min_recording_distance_summary">La distància més petita entre dos punts enregistrats de la vostra posició</string>
+  <string name="settings_recording_distance">Distància mínima entre punts</string>
+  <string name="settings_recording_distance_summary">La distància més petita entre dos punts enregistrats de la vostra posició</string>
 
-  <string name="settings_max_recording_distance">Distància màxima entre punts</string>
-  <string name="settings_max_recording_distance_summary">Si dos punts estan més lluny d\'això, es dividirà la ruta</string>
+  <string name="settings_recording_track_distance">Distància màxima entre punts</string>
+  <string name="settings_recording_track_distance_summary">Si dos punts estan més lluny d\'això, es dividirà la ruta</string>
 
-  <string name="settings_min_recording_interval">Temps mínim entre punts</string>
-  <string name="settings_min_recording_interval_summary">Interval de temps mínim entre dos enregistraments de la vostra posició</string>
+  <string name="settings_recording_interval">Temps mínim entre punts</string>
+  <string name="settings_recording_interval_summary">Interval de temps mínim entre dos enregistraments de la vostra posició</string>
 
-  <string name="settings_min_required_accuracy">Precisió mínima</string>
-  <string name="settings_min_required_accuracy_summary">S\'aturarà l\'enregistrament si la vostra posició no és així de precisa com a mínim</string>
+  <string name="settings_recording_gps_accuracy">Precisió mínima</string>
+  <string name="settings_recording_gps_accuracy_summary">S\'aturarà l\'enregistrament si la vostra posició no és així de precisa com a mínim</string>
 
   <string name="settings_display_metric">Fes servir unitats mètriques</string>
   <string name="settings_display_metric_summary_on">Totes les distàncies es mostraran en unitats mètriques</string>
@@ -199,23 +199,23 @@ limitations under the License.
   <string name="settings_share_url_only_summary_on">Només s\'enviarà l\'URL del mapa quan es comparteixi</string>
   <string name="settings_share_url_only_summary_off">També s\'inclouran els continguts de la ruta quan es comparteixi</string>
 
-  <string name="settings_split_frequency">Freqüència de divisió</string>
-  <string name="settings_split_frequency_summary">Temps o distància màxima a partir de la qual s\'insertarà un marcador de divisió nou</string>
+  <string name="settings_recording_marker">Freqüència de divisió</string>
+  <string name="settings_recording_marker_summary">Temps o distància màxima a partir de la qual s\'insertarà un marcador de divisió nou</string>
 
-  <string name="settings_auto_resume_track_timeout">Temps d\'espera per reprende la ruta</string>
-  <string name="settings_auto_resume_track_timeout_summary">Temps màxim en minuts a partir del qual l\'anterior ruta enregistrada no es reprendrà en actualitzar el telèfon</string>
+  <string name="settings_recording_auto_resume">Temps d\'espera per reprende la ruta</string>
+  <string name="settings_recording_auto_resume_summary">Temps màxim en minuts a partir del qual l\'anterior ruta enregistrada no es reprendrà en actualitzar el telèfon</string>
 
-  <string name="settings_timestamp_track_name">Data i hora com a nom de la ruta</string>
-  <string name="settings_timestamp_track_name_summary_on">El nom per defecte de la ruta serà la data i hora en que s\'ha iniciat.</string>
-  <string name="settings_timestamp_track_name_summary_off">Els noms de les rutes seran números que s\'incrementaran per a cada nova ruta.</string>
+  <string name="settings_recording_name">Data i hora com a nom de la ruta</string>
+  <string name="settings_recording_name_summary_on">El nom per defecte de la ruta serà la data i hora en que s\'ha iniciat.</string>
+  <string name="settings_recording_name_summary_off">Els noms de les rutes seran números que s\'incrementaran per a cada nova ruta.</string>
 
   <string name="pace_label">Ritme de pas</string>
 
   <string name="eclair_required">Suportat només en Android 2.0 i superior</string>
   <string name="settings_sensor_type">Tipus de sensor</string>
   <string name="settings_sensor_type_summary">El tipus de sensor al qual es connecta.</string>
-  <string name="bluetooth_sensor_title">Sensor bluetooth</string>
-  <string name="bluetooth_sensor_summary">El sensor bluetooth al qual es connecta.</string>
+  <string name="settings_sensor_bluetooth_sensor">Sensor bluetooth</string>
+  <string name="settings_sensor_bluetooth_sensor_summary">El sensor bluetooth al qual es connecta.</string>
   <string name="settings_modular_stats_display_title">Pantalla d\'estadístiques modulars</string>
 
   <string name="settings_backup">Còpia de seguretat (BETA)</string>
@@ -383,9 +383,9 @@ limitations under the License.
   <string name="check_units_title">Avís de les unitats de mesura</string>
 
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
-  <string name="bluetooth_options">Opcions del Bluetooth</string>
-  <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="settings_sensor_bluetooth_options">Opcions del Bluetooth</string>
+  <string name="settings_sensor_bluetooth_pairing">Associació de dispositius</string>
+  <string name="settings_sensor_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="settings_sensor">Opcions del sensor</string>
 
@@ -408,5 +408,5 @@ limitations under the License.
   <string name="sending">S\'està enviant</string>
 
   <!-- Sensor Type Options -->
-  <string name="sensor_type_option_none">Cap</string>
+  <string name="settings_sensor_type_none">Cap</string>
 </resources>
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index d40907deb..7a72431db 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -169,22 +169,22 @@ limitations under the License.
   <string name="settings_recording">Aufzeichnung</string>
   <string name="settings_sharing">Mit Freunden teilen</string>
 
-  <string name="settings_announcement_frequency_not_available">In dieser Android-Version nicht verfügbar</string>
+  <string name="settings_recording_voice_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>
+  <string name="settings_recording_voice">Dauer zwischen Ansagen</string>
+  <string name="settings_recording_voice_summary">Kürzeste Zeit zwischen zwei Ansagen</string>
 
-  <string name="settings_min_recording_distance">Kleinste Entfernung zwischen Punkten</string>
-  <string name="settings_min_recording_distance_summary">Kleinste Entfernung zwischen zwei Positionsaufzeichnungen</string>
+  <string name="settings_recording_distance">Kleinste Entfernung zwischen Punkten</string>
+  <string name="settings_recording_distance_summary">Kleinste Entfernung zwischen zwei Positionsaufzeichnungen</string>
 
-  <string name="settings_max_recording_distance">Neues Segment, wenn Punkte weiter entfernt als</string>
-  <string name="settings_max_recording_distance_summary">Der Track wird in zwei geteilt, wenn zwei folgende Punkte weiter entfernt sind als hier angegeben.</string>
+  <string name="settings_recording_track_distance">Neues Segment, wenn Punkte weiter entfernt als</string>
+  <string name="settings_recording_track_distance_summary">Der Track wird in zwei geteilt, wenn zwei folgende Punkte weiter entfernt sind als hier angegeben.</string>
 
-  <string name="settings_min_recording_interval">Aufzeichnungsfrequenz</string>
-  <string name="settings_min_recording_interval_summary">Kürzeste Zeit zwischen zwei Positionsaufzeichnungen</string>
+  <string name="settings_recording_interval">Aufzeichnungsfrequenz</string>
+  <string name="settings_recording_interval_summary">Kürzeste Zeit zwischen zwei Positionsaufzeichnungen</string>
 
-  <string name="settings_min_required_accuracy">Aufzeichnung pausieren, wenn Genauigkeit kleiner als</string>
-  <string name="settings_min_required_accuracy_summary">Die Aufzeichnung wird kurzfristig angehalten, wenn Deine Position nicht genauer als hier angegeben ermittelt werden kann.</string>
+  <string name="settings_recording_gps_accuracy">Aufzeichnung pausieren, wenn Genauigkeit kleiner als</string>
+  <string name="settings_recording_gps_accuracy_summary">Die Aufzeichnung wird kurzfristig angehalten, wenn Deine Position nicht genauer als hier angegeben ermittelt werden kann.</string>
 
   <string name="settings_display_metric">Entfernungen in metrischen Einheiten anzeigen</string>
   <string name="settings_display_metric_summary_on">Alle Entfernungen werden in metrischen Einheiten angezeigt.</string>
@@ -202,28 +202,28 @@ limitations under the License.
   <string name="settings_share_url_only_summary_on">Beim Teilen mit Freunden wird nur die Karten-URL gesendet.</string>
   <string name="settings_share_url_only_summary_off">Beim Teilen mit Freunden wird der GPS-Track selbst gesendet.</string>
 
-  <string name="settings_split_frequency">Zerteilungsfrequenz</string>
-  <string name="settings_split_frequency_summary">Längste Dauer oder Entfernung, nach der automatisch ein Marker eingefügt wird.</string>
+  <string name="settings_recording_marker">Zerteilungsfrequenz</string>
+  <string name="settings_recording_marker_summary">Längste Dauer oder Entfernung, nach der automatisch ein Marker eingefügt wird.</string>
 
-   <string name="settings_auto_resume_track_timeout">Zeitbegrenzung der Auto-Wiederaufnahme</string>
-  <string name="settings_auto_resume_track_timeout_summary">Maximale Zeit in Minuten, nach der eine abgebrochene Aufzeichnung nach einem Telefonneustart wiederaufgenommen wird.</string>
+   <string name="settings_recording_auto_resume">Zeitbegrenzung der Auto-Wiederaufnahme</string>
+  <string name="settings_recording_auto_resume_summary">Maximale Zeit in Minuten, nach der eine abgebrochene Aufzeichnung nach einem Telefonneustart wiederaufgenommen wird.</string>
 
-  <string name="settings_timestamp_track_name">Zeitstempel als Trackname</string>
-  <string name="settings_timestamp_track_name_summary_on">Der Trackname wird aus Datum und Zeit zum Aufzeichnungsbeginn zusammengesetzt.</string>
-  <string name="settings_timestamp_track_name_summary_off">Tracknamen erhalten eine fortlaufende Nummer.</string>
+  <string name="settings_recording_name">Zeitstempel als Trackname</string>
+  <string name="settings_recording_name_summary_on">Der Trackname wird aus Datum und Zeit zum Aufzeichnungsbeginn zusammengesetzt.</string>
+  <string name="settings_recording_name_summary_off">Tracknamen erhalten eine fortlaufende Nummer.</string>
 
   <string name="pace_label">Pace</string>
 
   <string name="eclair_required">Wird nur unter Android 2.0 oder höher unterstützt</string>
   <string name="settings_sensor_type">Sensortyp</string>
   <string name="settings_sensor_type_summary">Der Typ des zu verbindenden Sensors</string>
-  <string name="settings_heart_rate_ant_sensor_id">Verbindung mit ANT Herzqrequenzmesser aufheben</string>
+  <string name="settings_sensor_unpair_ant">Verbindung mit ANT Herzqrequenzmesser aufheben</string>
   <string name="settings_power_ant_sensor_id">Verbindung mit ANT Kraftmesser aufheben</string>
-  <string name="settings_srm_bridge_ant_sensor_id">Verbindung mit ANT srm bridge aufheben</string>
-  <string name="settings_ant_not_paired">ANT-Sensor nicht verbunden</string>
-  <string name="settings_ant_paired">ANT-Sensor verbunden mit: %d</string>
-  <string name="bluetooth_sensor_title">Bluetooth-Sensor</string>
-  <string name="bluetooth_sensor_summary">Der zu verbindende Bluetoothsensor</string>
+  <string name="settings_sensor_unpair_srm">Verbindung mit ANT srm bridge aufheben</string>
+  <string name="settings_sensor_ant_not_paired">ANT-Sensor nicht verbunden</string>
+  <string name="settings_sensor_ant_paired">ANT-Sensor verbunden mit: %d</string>
+  <string name="settings_sensor_bluetooth_sensor">Bluetooth-Sensor</string>
+  <string name="settings_sensor_bluetooth_sensor_summary">Der zu verbindende Bluetoothsensor</string>
   <string name="settings_modular_stats_display_title">Art der Datenanzeige</string>
 
   <!-- Backups -->
@@ -416,9 +416,9 @@ limitations under the License.
 
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="method_bluetooth">Bluetooth</string>
-  <string name="bluetooth_options">Bluetooth-Einstellungen</string>
-  <string name="bluetooth_pairing">Geräteverbindung</string>
-  <string name="bluetooth_pairing_summary">Öffnet Androids Bluetooth-Einstellungen, um Geräte zu verbinden.</string>
+  <string name="settings_sensor_bluetooth_options">Bluetooth-Einstellungen</string>
+  <string name="settings_sensor_bluetooth_pairing">Geräteverbindung</string>
+  <string name="settings_sensor_bluetooth_pairing_summary">Öffnet Androids Bluetooth-Einstellungen, um Geräte zu verbinden.</string>
   <!--string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string-->
   <string name="settings_sensor">Sensor-Einstellungen</string>
 
diff --git a/MyTracks/res/values-es-rES/strings.xml b/MyTracks/res/values-es-rES/strings.xml
index 868e29b1c..fe7ecf052 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_announcement_frequency_not_available">No está disponible en su versión de Android</string>
+  <string name="settings_recording_voice_not_available">No está disponible en su versión de Android</string>
 
 
   <string name="settings_display_speed">Mostrar velocidad</string>
@@ -127,7 +127,7 @@ limitations under the License.
   -->
 
   <!-- Sensor Type Options -->
-  <string name="sensor_type_option_none">Ninguna</string>
-  <string name="sensor_type_option_ant">ANT+ Sensores</string>
-  <string name="sensor_type_option_srm_ant_bridge">SRM ANT+ Puente</string>
+  <string name="settings_sensor_type_none">Ninguna</string>
+  <string name="settings_sensor_type_ant">ANT+ Sensores</string>
+  <string name="settings_sensor_type_srm">SRM ANT+ Puente</string>
 </resources>
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index 79106bc15..c9e1c663a 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -198,7 +198,7 @@ limitations under the License.
   <string name="settings_recording">Grabando</string>
   <string name="settings_sharing">Compartiendo</string>
 
-  <string name="settings_announcement_frequency_not_available">No disponible para tu versión de Android</string>
+  <string name="settings_recording_voice_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>
@@ -209,20 +209,20 @@ limitations under the License.
           futuras aplicaciones inclusive, controlen y tengan acceso a los datos de MyTracks? No habra notificaciones 
           posteriores.</string>
 		  
-  <string name="settings_announcement_frequency">Tiempo entre anuncios</string>
-  <string name="settings_announcement_frequency_summary">Tiempo mínimo entre dos anuncios de voz</string>
+  <string name="settings_recording_voice">Tiempo entre anuncios</string>
+  <string name="settings_recording_voice_summary">Tiempo mínimo entre dos anuncios de voz</string>
 
-  <string name="settings_min_recording_distance">Distancia mínima entre puntos consecutivos</string>
-  <string name="settings_min_recording_distance_summary">Distancia mínima entre dos grabaciones de posición</string>
+  <string name="settings_recording_distance">Distancia mínima entre puntos consecutivos</string>
+  <string name="settings_recording_distance_summary">Distancia mínima entre dos grabaciones de posición</string>
 
-  <string name="settings_max_recording_distance">Crear nuevo segmento si distancia es mayor que</string>
-  <string name="settings_max_recording_distance_summary">Empezar un nuevo segmento si los puntos están a una distancia mayor a</string>
+  <string name="settings_recording_track_distance">Crear nuevo segmento si distancia es mayor que</string>
+  <string name="settings_recording_track_distance_summary">Empezar un nuevo segmento si los puntos están a una distancia mayor a</string>
 
-  <string name="settings_min_recording_interval">Grabando frecuencia</string>
-  <string name="settings_min_recording_interval_summary">Diferencia mínima de tiempo entre dos grabaciones de posición</string>
+  <string name="settings_recording_interval">Grabando frecuencia</string>
+  <string name="settings_recording_interval_summary">Diferencia mínima de tiempo entre dos grabaciones de posición</string>
 
-  <string name="settings_min_required_accuracy">Detener la grabación si la precisión es menor a</string>
-  <string name="settings_min_required_accuracy_summary">Precisión mínima de ubicación necesaria para continuar grabando pista</string>
+  <string name="settings_recording_gps_accuracy">Detener la grabación si la precisión es menor a</string>
+  <string name="settings_recording_gps_accuracy_summary">Precisión mínima de ubicación necesaria para continuar grabando pista</string>
 
   <string name="settings_display_metric">Usar unidades métricas</string>
   <string name="settings_display_metric_summary_on">Todas las distancias serán mostradas en unidades métricas</string>
@@ -240,15 +240,15 @@ limitations under the License.
   <string name="settings_share_url_only_summary_on">Sólo el URL del mapa será enviado al compartir</string>
   <string name="settings_share_url_only_summary_off">Los contenidos de la pista también serán incluídos al compartir</string>
 
-  <string name="settings_split_frequency">Dividir frecuencia</string>
-  <string name="settings_split_frequency_summary">Tiempo o distancia máxima para insertar una nueva marca de división</string>
+  <string name="settings_recording_marker">Dividir frecuencia</string>
+  <string name="settings_recording_marker_summary">Tiempo o distancia máxima para insertar una nueva marca de división</string>
 
-  <string name="settings_auto_resume_track_timeout">Temporizador de auto-reinicio de recorrido</string>
-  <string name="settings_auto_resume_track_timeout_summary">Máximo tiempo en minutos después del cual un recorrido previamente grabado no será reiniciado después de un reinicio del teléfono</string>
+  <string name="settings_recording_auto_resume">Temporizador de auto-reinicio de recorrido</string>
+  <string name="settings_recording_auto_resume_summary">Máximo tiempo en minutos después del cual un recorrido previamente grabado no será reiniciado después de un reinicio del teléfono</string>
 
-  <string name="settings_timestamp_track_name">Hora como nombre de recorrido</string>
-  <string name="settings_timestamp_track_name_summary_on">El nombre por defecto del recorrido será la fecha y hora del inicio del recorrido</string>
-  <string name="settings_timestamp_track_name_summary_off">Los nombre de recorrido tendrán números que se incrementarán en cada nuevo recorrido.</string>
+  <string name="settings_recording_name">Hora como nombre de recorrido</string>
+  <string name="settings_recording_name_summary_on">El nombre por defecto del recorrido será la fecha y hora del inicio del recorrido</string>
+  <string name="settings_recording_name_summary_off">Los nombre de recorrido tendrán números que se incrementarán en cada nuevo recorrido.</string>
 
   <string name="settings_reset">Restaurar preferencias</string>
   <string name="settings_reset_summary">Restaura todas tus preferencias a los valores por defecto</string>
@@ -260,13 +260,13 @@ limitations under the License.
   <string name="eclair_required">Sólo soportado en Android 2.0 o superior</string>
   <string name="settings_sensor_type">Tipo de sensor</string>
   <string name="settings_sensor_type_summary">Tipo de sensor al que conectar</string>
-  <string name="settings_heart_rate_ant_sensor_id">Liberar conexión al sensor de corazón ANT</string>
+  <string name="settings_sensor_unpair_ant">Liberar conexión al sensor de corazón ANT</string>
   <string name="settings_power_ant_sensor_id">Liberar conexión al sensor de energía ANT</string>
-  <string name="settings_srm_bridge_ant_sensor_id">Liberar conexión al sensor puente SRM ANT</string>
-  <string name="settings_ant_not_paired">Sensor ANT no conectado</string>
-  <string name="settings_ant_paired">Sensor ANT conectado con: %d</string>
-  <string name="bluetooth_sensor_title">Sensor Bluetooth</string>
-  <string name="bluetooth_sensor_summary">Sensor Bluetooth al que conectar</string>
+  <string name="settings_sensor_unpair_srm">Liberar conexión al sensor puente SRM ANT</string>
+  <string name="settings_sensor_ant_not_paired">Sensor ANT no conectado</string>
+  <string name="settings_sensor_ant_paired">Sensor ANT conectado con: %d</string>
+  <string name="settings_sensor_bluetooth_sensor">Sensor Bluetooth</string>
+  <string name="settings_sensor_bluetooth_sensor_summary">Sensor Bluetooth al que conectar</string>
   <string name="settings_modular_stats_display_title">Pantalla de estadísticas modular</string>
 
   <string name="settings_display_track_color">Modo de Recorrido Coloreado</string>
@@ -471,11 +471,11 @@ limitations under the License.
   <string name="check_units_title">Aviso de unidades de medida</string>
 
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
-  <string name="bluetooth_options">Opciones Bluetooth</string>
-  <string name="bluetooth_pairing">Conexión de dispositivos</string>
-  <string name="bluetooth_pairing_summary">Abrir la configuración Bluetooth de Android para conectar un dispositivo</string>
+  <string name="settings_sensor_bluetooth_options">Opciones Bluetooth</string>
+  <string name="settings_sensor_bluetooth_pairing">Conexión de dispositivos</string>
+  <string name="settings_sensor_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="settings_sensor_ant_options">Optiones ANT</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>
@@ -509,11 +509,11 @@ limitations under the License.
   <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>
-  <string name="sensor_type_option_ant">Sensores ANT+</string>
-  <string name="sensor_type_option_srm_ant_bridge">Puente SRM ANT+</string>
-  <string name="sensor_type_option_polar">Bluetooth Polar</string>
-  <string name="sensor_type_option_zephyr">Bluetooth Zephyr</string>
+  <string name="settings_sensor_type_none">Ninguno</string>
+  <string name="settings_sensor_type_ant">Sensores ANT+</string>
+  <string name="settings_sensor_type_srm">Puente SRM ANT+</string>
+  <string name="settings_sensor_type_polar">Bluetooth Polar</string>
+  <string name="settings_sensor_type_zephyr">Bluetooth Zephyr</string>
 
   <!-- Track Color Modes -->
   <string name="settings_display_track_color_single">Ninguno</string>
diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml
index e663cf9d5..77c7926d6 100644
--- a/MyTracks/res/values-fi/strings.xml
+++ b/MyTracks/res/values-fi/strings.xml
@@ -198,23 +198,23 @@ limitations under the License.
   <string name="settings_recording">Tallennus</string>
   <string name="settings_sharing">Jakaminen</string>
 
-  <string name="settings_announcement_frequency_not_available">Ei tuettu tässä Android-versiossa</string>
+  <string name="settings_recording_voice_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>
-  <string name="settings_announcement_frequency_summary">Äänimerkkien aikaväli</string>
+  <string name="settings_recording_voice">Äänimerkki</string>
+  <string name="settings_recording_voice_summary">Äänimerkkien aikaväli</string>
 
-  <string name="settings_min_recording_distance">Lyhyin piste-etäisyys</string>
-  <string name="settings_min_recording_distance_summary">Lyhyin sallittu reitintallennuksessa käytetty etäisyys kahden pisteen välillä</string>
+  <string name="settings_recording_distance">Lyhyin piste-etäisyys</string>
+  <string name="settings_recording_distance_summary">Lyhyin sallittu reitintallennuksessa käytetty etäisyys kahden pisteen välillä</string>
 
-  <string name="settings_max_recording_distance">Pisin piste-etäisyys</string>
-  <string name="settings_max_recording_distance_summary">Jos edeltävä piste on valittua etäisyyttä pidemmällä reitti jaetaan</string>
+  <string name="settings_recording_track_distance">Pisin piste-etäisyys</string>
+  <string name="settings_recording_track_distance_summary">Jos edeltävä piste on valittua etäisyyttä pidemmällä reitti jaetaan</string>
 
-  <string name="settings_min_recording_interval">Lyhyin aika</string>
-  <string name="settings_min_recording_interval_summary">Lyhyin aikaintervalli kahden tallennetun pisteen välillä</string>
+  <string name="settings_recording_interval">Lyhyin aika</string>
+  <string name="settings_recording_interval_summary">Lyhyin aikaintervalli kahden tallennetun pisteen välillä</string>
 
-  <string name="settings_min_required_accuracy">Sallittu tarkkuus</string>
-  <string name="settings_min_required_accuracy_summary">Reitin tallennus pysäytetään, jos tarkkuus on tätä pienempi</string>
+  <string name="settings_recording_gps_accuracy">Sallittu tarkkuus</string>
+  <string name="settings_recording_gps_accuracy_summary">Reitin tallennus pysäytetään, jos tarkkuus on tätä pienempi</string>
 
   <string name="settings_display_metric">Käytä metrijärjestelmää</string>
   <string name="settings_display_metric_summary_on">Kaikki etäisyydet näytetään metrijärjestelmässä</string>
@@ -232,15 +232,15 @@ limitations under the License.
   <string name="settings_share_url_only_summary_on">Ainoastaan kartan URL jaetaan</string>
   <string name="settings_share_url_only_summary_off">Myös reitin sisältö ja tiedot jaetaan</string>
 
-  <string name="settings_split_frequency">Reitin jaotus</string>
-  <string name="settings_split_frequency_summary">Etäisyys tai aika jolloin reitti jaetaan osiin</string>
+  <string name="settings_recording_marker">Reitin jaotus</string>
+  <string name="settings_recording_marker_summary">Etäisyys tai aika jolloin reitti jaetaan osiin</string>
 
-  <string name="settings_auto_resume_track_timeout">Reitin jatkaminen</string>
-  <string name="settings_auto_resume_track_timeout_summary">Aika jonka sisällä tallennettavaa reittiä jatketaan, jos puhelin käynnitetään uudelleen.</string>
+  <string name="settings_recording_auto_resume">Reitin jatkaminen</string>
+  <string name="settings_recording_auto_resume_summary">Aika jonka sisällä tallennettavaa reittiä jatketaan, jos puhelin käynnitetään uudelleen.</string>
 
-  <string name="settings_timestamp_track_name">Aikamerkintä nimenä</string>
-  <string name="settings_timestamp_track_name_summary_on">Oletusnimenä reitille käytetään aloituspäivämäärää ja aikaa</string>
-  <string name="settings_timestamp_track_name_summary_off">Oletusnimenä käytetään kasvavaa numerointia.</string>
+  <string name="settings_recording_name">Aikamerkintä nimenä</string>
+  <string name="settings_recording_name_summary_on">Oletusnimenä reitille käytetään aloituspäivämäärää ja aikaa</string>
+  <string name="settings_recording_name_summary_off">Oletusnimenä käytetään kasvavaa numerointia.</string>
 
   <string name="settings_reset">Palauta oletusasetukset</string>
   <string name="settings_reset_summary">Palauta kaikki oletusasetukset</string>
@@ -252,13 +252,13 @@ limitations under the License.
   <string name="eclair_required">Tuettuna vain Android 2.0 tai uudemmassa</string>
   <string name="settings_sensor_type">Sensorin tyyppi</string>
   <string name="settings_sensor_type_summary">Sensorin tyyppi johon yhdistetään</string>
-  <string name="settings_heart_rate_ant_sensor_id">Resetoi ANT sykemittarin paritus</string>
+  <string name="settings_sensor_unpair_ant">Resetoi ANT sykemittarin paritus</string>
   <string name="settings_power_ant_sensor_id">Resetoi ANT tehomittarin paritus</string>
-  <string name="settings_srm_bridge_ant_sensor_id">Resetoi ANT SRM sillan paritus</string>
-  <string name="settings_ant_not_paired">ANT sensori ei paritettu</string>
-  <string name="settings_ant_paired">ANT sensori paritettu: %d</string>
-  <string name="bluetooth_sensor_title">Bluetooth sensori</string>
-  <string name="bluetooth_sensor_summary">Bluetooth-sensori johon yhdistetään</string>
+  <string name="settings_sensor_unpair_srm">Resetoi ANT SRM sillan paritus</string>
+  <string name="settings_sensor_ant_not_paired">ANT sensori ei paritettu</string>
+  <string name="settings_sensor_ant_paired">ANT sensori paritettu: %d</string>
+  <string name="settings_sensor_bluetooth_sensor">Bluetooth sensori</string>
+  <string name="settings_sensor_bluetooth_sensor_summary">Bluetooth-sensori johon yhdistetään</string>
   <string name="settings_modular_stats_display_title">Modular Stats Display</string>
 
   <!-- Backups -->
@@ -468,11 +468,11 @@ limitations under the License.
 
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="method_bluetooth">Bluetooth</string>
-  <string name="bluetooth_options">Bluetooth asetukset</string>
-  <string name="bluetooth_pairing">Laiteparit</string>
-  <string name="bluetooth_pairing_summary">Avaa Androidin bluetooth-asetukset luodaksesi laitepareja</string>
+  <string name="settings_sensor_bluetooth_options">Bluetooth asetukset</string>
+  <string name="settings_sensor_bluetooth_pairing">Laiteparit</string>
+  <string name="settings_sensor_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="settings_sensor_ant_options">ANT asetukset</string>
   <string name="settings_sensor">Sensorien asetukset</string>
 
   <!-- Bluetooth Sensor -->
@@ -493,11 +493,11 @@ limitations under the License.
   <string name="searching">Etsitään</string>
   <string name="sending">Lähetetään</string>
 
-  <string name="sensor_type_option_none">Ei sensoria</string>
-  <string name="sensor_type_option_ant">ANT+ -sensori</string>
-  <string name="sensor_type_option_srm_ant_bridge">SRM ANT+ -silta</string>
-  <string name="sensor_type_option_polar">Polar bluetooth</string>
-  <string name="sensor_type_option_zephyr">Zephyr bluetooth</string>
+  <string name="settings_sensor_type_none">Ei sensoria</string>
+  <string name="settings_sensor_type_ant">ANT+ -sensori</string>
+  <string name="settings_sensor_type_srm">SRM ANT+ -silta</string>
+  <string name="settings_sensor_type_polar">Polar bluetooth</string>
+  <string name="settings_sensor_type_zephyr">Zephyr bluetooth</string>
 
   <!-- Manifest description (not seen inside the app) -->
   <string name="permission_notification_label">vastaanota huomautuksia reitin tallentamisesta</string>
diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml
index 8a96d0407..95277a945 100644
--- a/MyTracks/res/values-fr/strings.xml
+++ b/MyTracks/res/values-fr/strings.xml
@@ -159,20 +159,20 @@ limitations under the License.
   <string name="settings_recording">Enregistrement</string>
   <string name="settings_sharing">Partage</string>
 
-  <string name="settings_announcement_frequency">Fréquence des annonces</string>
-  <string name="settings_announcement_frequency_summary">Temps minimum entre deux annonces vocales</string>
+  <string name="settings_recording_voice">Fréquence des annonces</string>
+  <string name="settings_recording_voice_summary">Temps minimum entre deux annonces vocales</string>
 
-  <string name="settings_min_recording_distance">Distance min. entre 2 points</string>
-  <string name="settings_min_recording_distance_summary">Plus petite distance entre deux enregistrements de votre position</string>
+  <string name="settings_recording_distance">Distance min. entre 2 points</string>
+  <string name="settings_recording_distance_summary">Plus petite distance entre deux enregistrements de votre position</string>
 
-  <string name="settings_max_recording_distance">Distance max. entre 2 points</string>
-  <string name="settings_max_recording_distance_summary">Si deux points successifs sont plus éloignés, un nouveau parcours sera créé</string>
+  <string name="settings_recording_track_distance">Distance max. entre 2 points</string>
+  <string name="settings_recording_track_distance_summary">Si deux points successifs sont plus éloignés, un nouveau parcours sera créé</string>
 
-  <string name="settings_min_recording_interval">Fréquence d\'enregistrement</string>
-  <string name="settings_min_recording_interval_summary">Plus petit intervalle de temps entre deux enregistrements de votre position</string>
+  <string name="settings_recording_interval">Fréquence d\'enregistrement</string>
+  <string name="settings_recording_interval_summary">Plus petit intervalle de temps entre deux enregistrements de votre position</string>
 
-  <string name="settings_min_required_accuracy">Précision minimum</string>
-  <string name="settings_min_required_accuracy_summary">L\'enregistrement sera suspendu si la géolocalisation est moins précise</string>
+  <string name="settings_recording_gps_accuracy">Précision minimum</string>
+  <string name="settings_recording_gps_accuracy_summary">L\'enregistrement sera suspendu si la géolocalisation est moins précise</string>
 
   <string name="settings_display_metric">Système métrique</string>
   <string name="settings_display_metric_summary_on">Le système métrique sera utilisé pour l\'affichage des distances</string>
@@ -190,20 +190,20 @@ limitations under the License.
   <string name="settings_share_url_only_summary_on">Seule l\'adresse URL de la carte sera envoyée lors du partage</string>
   <string name="settings_share_url_only_summary_off">Le contenu du parcours sera également inclus lors du partage</string>
 
-  <string name="settings_split_frequency">Fréquence de séparation</string>
-  <string name="settings_split_frequency_summary">Temps ou distance minimum avant l\'insertion d\'un marqueur de séparation</string>
+  <string name="settings_recording_marker">Fréquence de séparation</string>
+  <string name="settings_recording_marker_summary">Temps ou distance minimum avant l\'insertion d\'un marqueur de séparation</string>
   <string name="pace_label">Rythme</string>
 
   <string name="eclair_required">Nécessite au minimum Android 2.0</string>
   <string name="settings_sensor_type">Type de capteur</string>
   <string name="settings_sensor_type_summary">Type du capteur à utiliser</string>
-  <string name="settings_heart_rate_ant_sensor_id">Se désassocier du Cardiofréquencemètre ANT</string>
+  <string name="settings_sensor_unpair_ant">Se désassocier du Cardiofréquencemètre ANT</string>
   <string name="settings_power_ant_sensor_id">Se désassocier du compteur ANT</string>
-  <string name="settings_srm_bridge_ant_sensor_id">Se désassocier du pont SRM ANT</string>
-  <string name="settings_ant_not_paired">Capteur ANT non associé</string>
-  <string name="settings_ant_paired">Capteur ANT associé: %d</string>
-  <string name="bluetooth_sensor_title">Capteur Bluetooth</string>
-  <string name="bluetooth_sensor_summary">Capteur Bluetooth à utiliser</string>
+  <string name="settings_sensor_unpair_srm">Se désassocier du pont SRM ANT</string>
+  <string name="settings_sensor_ant_not_paired">Capteur ANT non associé</string>
+  <string name="settings_sensor_ant_paired">Capteur ANT associé: %d</string>
+  <string name="settings_sensor_bluetooth_sensor">Capteur Bluetooth</string>
+  <string name="settings_sensor_bluetooth_sensor_summary">Capteur Bluetooth à utiliser</string>
   <string name="settings_modular_stats_display_title">Affichage des statistiques modulaires</string>
 
   <!-- Backups -->
@@ -372,9 +372,9 @@ limitations under the License.
  
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="method_bluetooth">Bluetooth</string>
-  <string name="bluetooth_options">Options Bluetooth</string>
-  <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="settings_sensor_bluetooth_options">Options Bluetooth</string>
+  <string name="settings_sensor_bluetooth_pairing">Association d\'un appareil</string>
+  <string name="settings_sensor_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="settings_sensor">Options du capteur</string>
 
@@ -397,11 +397,11 @@ limitations under the License.
   <string name="sending">Envoi</string>
 
   <!-- Sensor Type Options -->
-  <string name="sensor_type_option_none">Aucun</string>
-  <string name="sensor_type_option_ant">Capteur ANT+</string>
-  <string name="sensor_type_option_srm_ant_bridge">Pont SRM ANT+</string>
-  <string name="sensor_type_option_polar">Bluetooth Polar</string>
-  <string name="sensor_type_option_zephyr">Bluetooth Zephyr</string>
+  <string name="settings_sensor_type_none">Aucun</string>
+  <string name="settings_sensor_type_ant">Capteur ANT+</string>
+  <string name="settings_sensor_type_srm">Pont SRM ANT+</string>
+  <string name="settings_sensor_type_polar">Bluetooth Polar</string>
+  <string name="settings_sensor_type_zephyr">Bluetooth Zephyr</string>
 
   <!-- Manifest description (not seen inside the app) -->
   <string name="permission_notification_label">notifications lors de l\'enregistrement de parcours</string>
diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml
index 2f885be88..2847bd401 100644
--- a/MyTracks/res/values-it/strings.xml
+++ b/MyTracks/res/values-it/strings.xml
@@ -162,20 +162,20 @@ limitations under the License.
   <string name="settings_recording">Registrazione</string>
   <string name="settings_sharing">Condivisione</string>
 
-  <string name="settings_announcement_frequency">Intervallo fra due annunci:</string>
-  <string name="settings_announcement_frequency_summary">Tempo minimo fra due annunci audio</string>
+  <string name="settings_recording_voice">Intervallo fra due annunci:</string>
+  <string name="settings_recording_voice_summary">Tempo minimo fra due annunci audio</string>
 
-  <string name="settings_min_recording_distance">Distanza minima fra due punti successivi:</string>
-  <string name="settings_min_recording_distance_summary">Distanza minima fra due successive registrazioni della posizione</string>
+  <string name="settings_recording_distance">Distanza minima fra due punti successivi:</string>
+  <string name="settings_recording_distance_summary">Distanza minima fra due successive registrazioni della posizione</string>
 
-  <string name="settings_max_recording_distance">Inizia un nuovo segmento se i punti sono più distanti di:</string>
-  <string name="settings_max_recording_distance_summary">Se due punti sono più lontani di così, il percorso sarà diviso percorsi più brevi</string>
+  <string name="settings_recording_track_distance">Inizia un nuovo segmento se i punti sono più distanti di:</string>
+  <string name="settings_recording_track_distance_summary">Se due punti sono più lontani di così, il percorso sarà diviso percorsi più brevi</string>
 
-  <string name="settings_min_recording_interval">Frequenza di registrazione:</string>
-  <string name="settings_min_recording_interval_summary">Tempo minimo fra due successive registrazioni della posizione</string>
+  <string name="settings_recording_interval">Frequenza di registrazione:</string>
+  <string name="settings_recording_interval_summary">Tempo minimo fra due successive registrazioni della posizione</string>
 
-  <string name="settings_min_required_accuracy">Fai una pausa nella registrazione se l\'accuratezza scende al disotto di:</string>
-  <string name="settings_min_required_accuracy_summary">La registrazione verrà temporaneamente interrotta se l\'accuratezza della posizione è meno di questo valore</string>
+  <string name="settings_recording_gps_accuracy">Fai una pausa nella registrazione se l\'accuratezza scende al disotto di:</string>
+  <string name="settings_recording_gps_accuracy_summary">La registrazione verrà temporaneamente interrotta se l\'accuratezza della posizione è meno di questo valore</string>
 
   <string name="settings_display_metric">Mostra le distanze nel sistema metrico decimale</string>
   <string name="settings_display_metric_summary_on">Tutte le distanze verranno mostrate nel sistema metrico decimale</string>
@@ -193,8 +193,8 @@ limitations under the License.
   <string name="settings_share_url_only_summary_on">Solo l\'URL della mappa sarà inviata quando condividi un percorso</string>
   <string name="settings_share_url_only_summary_off">Anche il contenuto del percorso sarà inviato quando condividi un persorso</string>
 
-  <string name="settings_split_frequency">Frequenza di divisione</string>
-  <string name="settings_split_frequency_summary">Tempo o distanza massima dopo di cui il percorso verrà diviso</string>
+  <string name="settings_recording_marker">Frequenza di divisione</string>
+  <string name="settings_recording_marker_summary">Tempo o distanza massima dopo di cui il percorso verrà diviso</string>
   <string name="pace_label">Andatura</string>
 
   <!-- MyTracksSky -->
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index 7661b87fc..a61959465 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -191,22 +191,22 @@ limitations under the License.
   <string name="settings_recording">記録</string>
   <string name="settings_sharing">共有</string>
 
-  <string name="settings_announcement_frequency_not_available">このAndroidバージョンでは使用できません</string>
+  <string name="settings_recording_voice_not_available">このAndroidバージョンでは使用できません</string>
 
-  <string name="settings_announcement_frequency">定期通知</string>
-  <string name="settings_announcement_frequency_summary">音声通知間隔の最小時間</string>
+  <string name="settings_recording_voice">定期通知</string>
+  <string name="settings_recording_voice_summary">音声通知間隔の最小時間</string>
 
-  <string name="settings_min_recording_distance">ポイント間の最短距離</string>
-  <string name="settings_min_recording_distance_summary">位置記録間の最短距離</string>
+  <string name="settings_recording_distance">ポイント間の最短距離</string>
+  <string name="settings_recording_distance_summary">位置記録間の最短距離</string>
 
-  <string name="settings_max_recording_distance">ポイント間の最長距離</string>
-  <string name="settings_max_recording_distance_summary">これより間隔が長い場合はトラックは分割されます</string>
+  <string name="settings_recording_track_distance">ポイント間の最長距離</string>
+  <string name="settings_recording_track_distance_summary">これより間隔が長い場合はトラックは分割されます</string>
 
-  <string name="settings_min_recording_interval">ポイント間の最小時間間隔</string>
-  <string name="settings_min_recording_interval_summary">位置記録の最短インターバル</string>
+  <string name="settings_recording_interval">ポイント間の最小時間間隔</string>
+  <string name="settings_recording_interval_summary">位置記録の最短インターバル</string>
 
-  <string name="settings_min_required_accuracy">最低精度</string>
-  <string name="settings_min_required_accuracy_summary">この精度以上でないと記録を休止します</string>
+  <string name="settings_recording_gps_accuracy">最低精度</string>
+  <string name="settings_recording_gps_accuracy_summary">この精度以上でないと記録を休止します</string>
 
   <string name="settings_display_metric">メートル法を使用</string>
   <string name="settings_display_metric_summary_on">全ての距離をメートル法で表示します</string>
@@ -224,28 +224,28 @@ limitations under the License.
   <string name="settings_share_url_only_summary_on">共有時にマップのURLのみ送信します</string>
   <string name="settings_share_url_only_summary_off">共有時にトラックのコンテントが含まれます</string>
 
-  <string name="settings_split_frequency">分割頻度</string>
-  <string name="settings_split_frequency_summary">分割マーカーを挿入する時間または距離の間隔</string>
+  <string name="settings_recording_marker">分割頻度</string>
+  <string name="settings_recording_marker_summary">分割マーカーを挿入する時間または距離の間隔</string>
 
-  <string name="settings_auto_resume_track_timeout">記録自動再開の制限時間</string>
-  <string name="settings_auto_resume_track_timeout_summary">指定時間(分単位)以内なら端末再起動時に以前のトラック記録を再開します．</string>
+  <string name="settings_recording_auto_resume">記録自動再開の制限時間</string>
+  <string name="settings_recording_auto_resume_summary">指定時間(分単位)以内なら端末再起動時に以前のトラック記録を再開します．</string>
 
-  <string name="settings_timestamp_track_name">日時をトラック名にする</string>
-  <string name="settings_timestamp_track_name_summary_on">デフォルトのトラック名をトラック開始日時にします．</string>
-  <string name="settings_timestamp_track_name_summary_off">トラック名を昇順の数字にします．</string>
+  <string name="settings_recording_name">日時をトラック名にする</string>
+  <string name="settings_recording_name_summary_on">デフォルトのトラック名をトラック開始日時にします．</string>
+  <string name="settings_recording_name_summary_off">トラック名を昇順の数字にします．</string>
 
   <string name="pace_label">ペース</string>
 
   <string name="eclair_required">Android 2.0以上でのみサポート</string>
   <string name="settings_sensor_type">センサータイプ</string>
   <string name="settings_sensor_type_summary">接続先センサーのタイプ</string>
-  <string name="settings_heart_rate_ant_sensor_id">ANT心拍数センサーとのペアリング解消</string>
+  <string name="settings_sensor_unpair_ant">ANT心拍数センサーとのペアリング解消</string>
   <string name="settings_power_ant_sensor_id">ANT心拍強度センサーとのペアリング解消</string>
-  <string name="settings_srm_bridge_ant_sensor_id">ANT SRMブリッジセンサーとのペアリング解消</string>
-  <string name="settings_ant_not_paired">ANTセンサーとペアリングしていません</string>
-  <string name="settings_ant_paired">ANTセンサーとペアリング: %d</string>
-  <string name="bluetooth_sensor_title">Bluetoothセンサー</string>
-  <string name="bluetooth_sensor_summary">Bluetoothセンサー接続先</string>
+  <string name="settings_sensor_unpair_srm">ANT SRMブリッジセンサーとのペアリング解消</string>
+  <string name="settings_sensor_ant_not_paired">ANTセンサーとペアリングしていません</string>
+  <string name="settings_sensor_ant_paired">ANTセンサーとペアリング: %d</string>
+  <string name="settings_sensor_bluetooth_sensor">Bluetoothセンサー</string>
+  <string name="settings_sensor_bluetooth_sensor_summary">Bluetoothセンサー接続先</string>
   <string name="settings_modular_stats_display_title">モジュール統計表示 </string>
 
   <!-- Backups -->
@@ -437,11 +437,11 @@ limitations under the License.
   <string name="check_units_title">計測単位についてのご注意</string>
 
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
-  <string name="bluetooth_options">Bluetoothオプション</string>
-  <string name="bluetooth_pairing">ペアリング</string>
-  <string name="bluetooth_pairing_summary">ペアリングを行うには「Bluetooth設定」を開いて下さい</string>
+  <string name="settings_sensor_bluetooth_options">Bluetoothオプション</string>
+  <string name="settings_sensor_bluetooth_pairing">ペアリング</string>
+  <string name="settings_sensor_bluetooth_pairing_summary">ペアリングを行うには「Bluetooth設定」を開いて下さい</string>
   <string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
-  <string name="ant_options">ANTオプション</string>
+  <string name="settings_sensor_ant_options">ANTオプション</string>
   <string name="settings_sensor">センサーオプション</string>
 
   <!-- Bluetooth Sensor -->
@@ -463,9 +463,9 @@ limitations under the License.
   <string name="sending">送信中</string>
 
   <!-- Sensor Type Options -->
-  <string name="sensor_type_option_none">なし</string>
-  <string name="sensor_type_option_ant">ANT+ センサー</string>
-  <string name="sensor_type_option_srm_ant_bridge">SRM ANT+ ブリッジ</string>
+  <string name="settings_sensor_type_none">なし</string>
+  <string name="settings_sensor_type_ant">ANT+ センサー</string>
+  <string name="settings_sensor_type_srm">SRM ANT+ ブリッジ</string>
     
   <!-- Manifest description (not seen inside the app) -->
   <string name="permission_notification_label">トラック記録通知受信</string>
diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml
index 876a3539d..ec22419b5 100644
--- a/MyTracks/res/values-pl/strings.xml
+++ b/MyTracks/res/values-pl/strings.xml
@@ -164,21 +164,21 @@ limitations under the License.
   <string name="settings_recording">Rejestrowanie</string>
   <string name="settings_sharing">Dzielenie</string>
 
-  <string name="settings_announcement_frequency">Częstotliwość komunikatów</string>
-  <string name="settings_announcement_frequency_summary">Minimalny czas między dwoma komunikatami głosowymi</string>
+  <string name="settings_recording_voice">Częstotliwość komunikatów</string>
+  <string name="settings_recording_voice_summary">Minimalny czas między dwoma komunikatami głosowymi</string>
   
 
-  <string name="settings_min_recording_distance">Min. odległość między punktami</string>
-  <string name="settings_min_recording_distance_summary">Najmniejsza odległość między dwoma zapisami twojej pozycji</string>
+  <string name="settings_recording_distance">Min. odległość między punktami</string>
+  <string name="settings_recording_distance_summary">Najmniejsza odległość między dwoma zapisami twojej pozycji</string>
 
-  <string name="settings_max_recording_distance">Max. odległość między punktami</string>
-  <string name="settings_max_recording_distance_summary">Jeśli dwa punkty są dalej niż ta wartość, trasa zostanie podzielona</string>
+  <string name="settings_recording_track_distance">Max. odległość między punktami</string>
+  <string name="settings_recording_track_distance_summary">Jeśli dwa punkty są dalej niż ta wartość, trasa zostanie podzielona</string>
 
-  <string name="settings_min_recording_interval">Min. czas między punktami</string>
-  <string name="settings_min_recording_interval_summary">Najmniejsza odstęp czasowy między dwoma zapisami twojej pozycji</string>
+  <string name="settings_recording_interval">Min. czas między punktami</string>
+  <string name="settings_recording_interval_summary">Najmniejsza odstęp czasowy między dwoma zapisami twojej pozycji</string>
 
-  <string name="settings_min_required_accuracy">Minimalna dokładność</string>
-  <string name="settings_min_required_accuracy_summary">Zapis zostanie zatrzymany jeśli twoja pozycja jest mniej dokładana niż ta wartość</string>
+  <string name="settings_recording_gps_accuracy">Minimalna dokładność</string>
+  <string name="settings_recording_gps_accuracy_summary">Zapis zostanie zatrzymany jeśli twoja pozycja jest mniej dokładana niż ta wartość</string>
 
   <string name="settings_display_metric">Używaj jednostek metrycznych</string>
   <string name="settings_display_metric_summary_on">Wszystkie odległości będą wyświetlane w jednostkach metrycznych</string>
@@ -196,19 +196,19 @@ limitations under the License.
   <string name="settings_share_url_only_summary_on">Tylko odnośnik do mapy będzie wysyłany podczas dzielenia się</string>
   <string name="settings_share_url_only_summary_off">Zawartość trasy będzie również przesyłana</string>
 
-  <string name="settings_split_frequency">Częstotliwość rozdzielania</string>
-  <string name="settings_split_frequency_summary">Maksymalny czas lub odległość po którym wstawiony zostanie znacznik rozdzielenia</string>
+  <string name="settings_recording_marker">Częstotliwość rozdzielania</string>
+  <string name="settings_recording_marker_summary">Maksymalny czas lub odległość po którym wstawiony zostanie znacznik rozdzielenia</string>
   
-  <string name="settings_auto_resume_track_timeout">Automatyczne wznawianie rejestracji trasy</string>
-  <string name="settings_auto_resume_track_timeout_summary">Maksymalny czas w minutach, który upłynął od ostatniego restartu telefonu, a po którym nie zostania wznowiona poprzednia trasa</string>
+  <string name="settings_recording_auto_resume">Automatyczne wznawianie rejestracji trasy</string>
+  <string name="settings_recording_auto_resume_summary">Maksymalny czas w minutach, który upłynął od ostatniego restartu telefonu, a po którym nie zostania wznowiona poprzednia trasa</string>
   
   <string name="pace_label">Tempo</string>
   
   <string name="eclair_required">Dostępne tylko w wersji Android 2.0 lub nowszej</string>
   <string name="settings_sensor_type">Typ Czujnika</string>
   <string name="settings_sensor_type_summary">Typ czujnika do podłączenia.</string>
-  <string name="bluetooth_sensor_title">Czujnik bluetooth</string>
-  <string name="bluetooth_sensor_summary">Czujnik bluetooth do podłączenia.</string>
+  <string name="settings_sensor_bluetooth_sensor">Czujnik bluetooth</string>
+  <string name="settings_sensor_bluetooth_sensor_summary">Czujnik bluetooth do podłączenia.</string>
   <string name="settings_modular_stats_display_title">Widok Statystyk Modularnych</string>
 
   <string name="settings_backup">Kopia zapasowa (BETA)</string>
@@ -386,11 +386,11 @@ limitations under the License.
   
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="method_bluetooth">Bluetooth</string>
-  <string name="bluetooth_options">Opcje Bluetooth</string>
-  <string name="bluetooth_pairing">Parowanie urządzenia</string>
-  <string name="bluetooth_pairing_summary">Przejdź do ustawień Bluetooth Androida aby sparować urządzenie</string>
+  <string name="settings_sensor_bluetooth_options">Opcje Bluetooth</string>
+  <string name="settings_sensor_bluetooth_pairing">Parowanie urządzenia</string>
+  <string name="settings_sensor_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="settings_sensor_ant_options">Opce ANT</string>
   <string name="settings_sensor">Opcje Czujników</string>
 
   <!-- Bluetooth Sensor -->
diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml
index 7a538732c..4dcc28277 100644
--- a/MyTracks/res/values-pt-rBR/strings.xml
+++ b/MyTracks/res/values-pt-rBR/strings.xml
@@ -158,18 +158,18 @@ limitations under the License.
   <string name="settings_display">Exibição</string>
   <string name="settings_recording">Gravação</string>
   <string name="settings_sharing">Compartilhamento</string>
-  <string name="settings_announcement_frequency_not_available">Não disponível na sua versão do Android</string>
+  <string name="settings_recording_voice_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>
-  <string name="settings_min_recording_distance">Dist. mín. entre pontos</string>
-  <string name="settings_min_recording_distance_summary">Menor distância entre duas gravações da sua posição</string>
-  <string name="settings_max_recording_distance">Dist. máx. entre pontos</string>
-  <string name="settings_max_recording_distance_summary">Se dois pontos forem mais distantes do que isto, a trilha será dividida</string>
-  <string name="settings_min_recording_interval">Tempo mín. entre pontos</string>
-  <string name="settings_min_recording_interval_summary">Menor intervalo de tempo entre a gravação de dois pontos</string>
-  <string name="settings_min_required_accuracy">Precisão mínima</string>
-  <string name="settings_min_required_accuracy_summary">A gravação será interrompida enquanto a precisão da sua posição for menor que esta</string>
+  <string name="settings_recording_voice">Tempo entre anúncios</string>
+  <string name="settings_recording_voice_summary">Tempo mínimo entre dois anúncios de voz</string>
+  <string name="settings_recording_distance">Dist. mín. entre pontos</string>
+  <string name="settings_recording_distance_summary">Menor distância entre duas gravações da sua posição</string>
+  <string name="settings_recording_track_distance">Dist. máx. entre pontos</string>
+  <string name="settings_recording_track_distance_summary">Se dois pontos forem mais distantes do que isto, a trilha será dividida</string>
+  <string name="settings_recording_interval">Tempo mín. entre pontos</string>
+  <string name="settings_recording_interval_summary">Menor intervalo de tempo entre a gravação de dois pontos</string>
+  <string name="settings_recording_gps_accuracy">Precisão mínima</string>
+  <string name="settings_recording_gps_accuracy_summary">A gravação será interrompida enquanto a precisão da sua posição for menor que esta</string>
   <string name="settings_display_metric">Unidades métricas</string>
   <string name="settings_display_metric_summary_on">Todas as distâncias serão exibidas em unidades métricas</string>
   <string name="settings_display_metric_summary_off">Todas as distâncias serão exibidas em unidades imperiais</string>
@@ -182,8 +182,8 @@ limitations under the License.
   <string name="settings_share_url_only">Compartilhar apenas URL</string>
   <string name="settings_share_url_only_summary_on">Apenas a URL do mapa será enviada ao compartilhar</string>
   <string name="settings_share_url_only_summary_off">O conteúdo do mapa também será incluído ao compartilhar</string>
-  <string name="settings_split_frequency">Freqüência de divisão</string>
-  <string name="settings_split_frequency_summary">Maior tempo ou distância de uma gravação antes que ela seja dividida em duas</string>
+  <string name="settings_recording_marker">Freqüência de divisão</string>
+  <string name="settings_recording_marker_summary">Maior tempo ou distância de uma gravação antes que ela seja dividida em duas</string>
   <string name="pace_label">Passo</string>
 
   <!-- MyTracksSky -->
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index 3bbf874ea..fa43a12d6 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -194,23 +194,23 @@ limitations under the License.
   <string name="settings_recording">Запись</string>
   <string name="settings_sharing">Обмен</string>
 
-  <string name="settings_announcement_frequency_not_available">Не доступен в вашем версии Android</string>
+  <string name="settings_recording_voice_not_available">Не доступен в вашем версии Android</string>
   <string name="settings_not_while_recording">Не доступно во время записи трека</string>
 
-  <string name="settings_announcement_frequency">Частота объявлений</string>
-  <string name="settings_announcement_frequency_summary">Минимальное время между двумя голосовыми объявлениями</string>
+  <string name="settings_recording_voice">Частота объявлений</string>
+  <string name="settings_recording_voice_summary">Минимальное время между двумя голосовыми объявлениями</string>
 
-  <string name="settings_min_recording_distance">Минимальное расстояние между точками</string>
-  <string name="settings_min_recording_distance_summary">Наименьшее расстояние между двумя записями вашей позиции</string>
+  <string name="settings_recording_distance">Минимальное расстояние между точками</string>
+  <string name="settings_recording_distance_summary">Наименьшее расстояние между двумя записями вашей позиции</string>
 
-  <string name="settings_max_recording_distance">Максимальное расстояние между точками</string>
-  <string name="settings_max_recording_distance_summary">Если два пункта находятся дальше, чем указано, то трек будет разделен</string>
+  <string name="settings_recording_track_distance">Максимальное расстояние между точками</string>
+  <string name="settings_recording_track_distance_summary">Если два пункта находятся дальше, чем указано, то трек будет разделен</string>
 
-  <string name="settings_min_recording_interval">Минимальное время между точками</string>
-  <string name="settings_min_recording_interval_summary">Наименьший интервал времени между двумя записями вашей позиции</string>
+  <string name="settings_recording_interval">Минимальное время между точками</string>
+  <string name="settings_recording_interval_summary">Наименьший интервал времени между двумя записями вашей позиции</string>
 
-  <string name="settings_min_required_accuracy">Минимальная точность</string>
-  <string name="settings_min_required_accuracy_summary">Запись будет приостановлена, если ваша позиция не является достаточно точной</string>
+  <string name="settings_recording_gps_accuracy">Минимальная точность</string>
+  <string name="settings_recording_gps_accuracy_summary">Запись будет приостановлена, если ваша позиция не является достаточно точной</string>
 
   <string name="settings_display_metric">Использовать метрические единицы</string>
   <string name="settings_display_metric_summary_on">Все расстояния будут отображаться в метрических единицах</string>
@@ -228,15 +228,15 @@ limitations under the License.
   <string name="settings_share_url_only_summary_on">При обмене будет отправлен только URL-адрес</string>
   <string name="settings_share_url_only_summary_off">Содержимое трека будет также включено при обмене</string>
 
-  <string name="settings_split_frequency">Частота деления</string>
-  <string name="settings_split_frequency_summary">Максимальное время или расстояние, после которого будет вставлен новый маркер деления</string>
+  <string name="settings_recording_marker">Частота деления</string>
+  <string name="settings_recording_marker_summary">Максимальное время или расстояние, после которого будет вставлен новый маркер деления</string>
 
-  <string name="settings_auto_resume_track_timeout">Автоматическое возобновление трек тайм-аут</string>
-  <string name="settings_auto_resume_track_timeout_summary">Максимальное время в минутах, после которого предыдущая запись трека не будет возобновлена на перезагруженном телефоне</string>
+  <string name="settings_recording_auto_resume">Автоматическое возобновление трек тайм-аут</string>
+  <string name="settings_recording_auto_resume_summary">Максимальное время в минутах, после которого предыдущая запись трека не будет возобновлена на перезагруженном телефоне</string>
 
-  <string name="settings_timestamp_track_name">Штамп времени как название дорожки</string>
-  <string name="settings_timestamp_track_name_summary_on">По умолчанию имя трека будет складываться из даты и времени старта трека</string>
-  <string name="settings_timestamp_track_name_summary_off">Названия треков будут иметь прирост чисел для каждого нового трека.</string>
+  <string name="settings_recording_name">Штамп времени как название дорожки</string>
+  <string name="settings_recording_name_summary_on">По умолчанию имя трека будет складываться из даты и времени старта трека</string>
+  <string name="settings_recording_name_summary_off">Названия треков будут иметь прирост чисел для каждого нового трека.</string>
 
   <string name="settings_reset">Восстановить значения по умолчанию</string>
   <string name="settings_reset_summary">Восстановить значения по умолчанию во всех настройках</string>
@@ -248,13 +248,13 @@ limitations under the License.
   <string name="eclair_required">Поддерживается только в Android 2.0 или выше</string>
   <string name="settings_sensor_type">Тип датчика</string>
   <string name="settings_sensor_type_summary">Тип подключенного датчика</string>
-  <string name="settings_heart_rate_ant_sensor_id">Очистить ANT подсоединенного датчика пульса</string>
+  <string name="settings_sensor_unpair_ant">Очистить ANT подсоединенного датчика пульса</string>
   <string name="settings_power_ant_sensor_id">Очистить ANT подсоединенного датчика мощности</string>
-  <string name="settings_srm_bridge_ant_sensor_id">Очистить ANT подсоединенного датчика SRM</string>
-  <string name="settings_ant_not_paired">ANT датчик не подсоединен</string>
-  <string name="settings_ant_paired">ANT датчик подсоединен с: %d</string>
-  <string name="bluetooth_sensor_title">Bluetooth датчик</string>
-  <string name="bluetooth_sensor_summary">Подключенный bluetooth датчик</string>
+  <string name="settings_sensor_unpair_srm">Очистить ANT подсоединенного датчика SRM</string>
+  <string name="settings_sensor_ant_not_paired">ANT датчик не подсоединен</string>
+  <string name="settings_sensor_ant_paired">ANT датчик подсоединен с: %d</string>
+  <string name="settings_sensor_bluetooth_sensor">Bluetooth датчик</string>
+  <string name="settings_sensor_bluetooth_sensor_summary">Подключенный bluetooth датчик</string>
   <string name="settings_modular_stats_display_title">Отображение модульной статистики</string>
 
   <!-- Backups -->
@@ -464,11 +464,11 @@ limitations under the License.
  
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="method_bluetooth">Bluetooth</string>
-  <string name="bluetooth_options">Параметры Bluetooth</string>
-  <string name="bluetooth_pairing">Подключение устройства</string>
-  <string name="bluetooth_pairing_summary">Открыть настройки Android по bluetooth для подключения устройства</string>
+  <string name="settings_sensor_bluetooth_options">Параметры Bluetooth</string>
+  <string name="settings_sensor_bluetooth_pairing">Подключение устройства</string>
+  <string name="settings_sensor_bluetooth_pairing_summary">Открыть настройки Android по bluetooth для подключения устройства</string>
   <string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
-  <string name="ant_options">Параметры ANT</string>
+  <string name="settings_sensor_ant_options">Параметры ANT</string>
   <string name="settings_sensor">Параметры датчика</string>
 
   <!-- Bluetooth Sensor -->
@@ -490,9 +490,9 @@ limitations under the License.
   <string name="sending">Отправка</string>
 
   <!-- Sensor Type Options -->
-  <string name="sensor_type_option_none">Нет</string>
-  <string name="sensor_type_option_ant">ANT+ Датчик</string>
-  <string name="sensor_type_option_srm_ant_bridge">SRM ANT+ Bridge</string>
+  <string name="settings_sensor_type_none">Нет</string>
+  <string name="settings_sensor_type_ant">ANT+ Датчик</string>
+  <string name="settings_sensor_type_srm">SRM ANT+ Bridge</string>
 
   <!-- Manifest description (not seen inside the app) -->
   <string name="permission_notification_label">получать уведомления о записи трека</string>
diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml
index aac8938e9..55dd9ca44 100644
--- a/MyTracks/res/values-sv/strings.xml
+++ b/MyTracks/res/values-sv/strings.xml
@@ -164,21 +164,21 @@ limitations under the License.
   <string name="settings_recording">Inspelning</string>
   <string name="settings_sharing">Delning</string>
 
-  <string name="settings_announcement_frequency">Meddelandefrekvens</string>
-  <string name="settings_announcement_frequency_summary">Minimumtid mellan två röstmeddelanden</string>
+  <string name="settings_recording_voice">Meddelandefrekvens</string>
+  <string name="settings_recording_voice_summary">Minimumtid mellan två röstmeddelanden</string>
   
 
-  <string name="settings_min_recording_distance">Min distans mellan två punkter</string>
-  <string name="settings_min_recording_distance_summary">Minsta distans mellan två inspelningar av din position</string>
+  <string name="settings_recording_distance">Min distans mellan två punkter</string>
+  <string name="settings_recording_distance_summary">Minsta distans mellan två inspelningar av din position</string>
 
-  <string name="settings_max_recording_distance">Max distans mellan punter</string>
-  <string name="settings_max_recording_distance_summary">Om två punkter är längre bort än det här, kommer spåret att delas</string>
+  <string name="settings_recording_track_distance">Max distans mellan punter</string>
+  <string name="settings_recording_track_distance_summary">Om två punkter är längre bort än det här, kommer spåret att delas</string>
 
-  <string name="settings_min_recording_interval">Min tid mellan punkter</string>
-  <string name="settings_min_recording_interval_summary">Minsta tidsintervall mellan två inspelningar av din position</string>
+  <string name="settings_recording_interval">Min tid mellan punkter</string>
+  <string name="settings_recording_interval_summary">Minsta tidsintervall mellan två inspelningar av din position</string>
 
-  <string name="settings_min_required_accuracy">Minsta precision</string>
-  <string name="settings_min_required_accuracy_summary">Inspelningen kommer att pausas om din position inte är minst så här precis</string>
+  <string name="settings_recording_gps_accuracy">Minsta precision</string>
+  <string name="settings_recording_gps_accuracy_summary">Inspelningen kommer att pausas om din position inte är minst så här precis</string>
 
   <string name="settings_display_metric">Använd metersystemet</string>
   <string name="settings_display_metric_summary_on">Alla distanser kommer att visas i metriska enheter</string>
@@ -196,8 +196,8 @@ limitations under the License.
   <string name="settings_share_url_only_summary_on">Bara länken till kartan kommer att skickas vid delning</string>
   <string name="settings_share_url_only_summary_off">Innehållet i spåret kommer också att inkluderas vid delning</string>
 
-  <string name="settings_split_frequency">Delningsfrekvens</string>
-  <string name="settings_split_frequency_summary">Maximala tiden eller distansen varefter en ny delningsmarkör kommer infogas</string>
+  <string name="settings_recording_marker">Delningsfrekvens</string>
+  <string name="settings_recording_marker_summary">Maximala tiden eller distansen varefter en ny delningsmarkör kommer infogas</string>
   <string name="pace_label">Tempo</string>
 
   <!-- MyTracksSky -->
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index 99e204a45..492f3550f 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -195,23 +195,23 @@ limitations under the License.
   <string name="settings_recording">记录</string>
   <string name="settings_sharing">分享</string>
 
-  <string name="settings_announcement_frequency_not_available">不支持当前使用的 Android 版本</string>
+  <string name="settings_recording_voice_not_available">不支持当前使用的 Android 版本</string>
   <string name="settings_not_while_recording">在记录轨迹时不可用</string>
 
-  <string name="settings_announcement_frequency">通知频度</string>
-  <string name="settings_announcement_frequency_summary">语音通知的最小时间间隔</string>
+  <string name="settings_recording_voice">通知频度</string>
+  <string name="settings_recording_voice_summary">语音通知的最小时间间隔</string>
 
-  <string name="settings_min_recording_distance">最小记录间距</string>
-  <string name="settings_min_recording_distance_summary">位置记录的最小间隔距离</string>
+  <string name="settings_recording_distance">最小记录间距</string>
+  <string name="settings_recording_distance_summary">位置记录的最小间隔距离</string>
 
-  <string name="settings_max_recording_distance">最大记录间距</string>
-  <string name="settings_max_recording_distance_summary">如果记录点之间的距离大于这个值, 轨迹将被切割</string>
+  <string name="settings_recording_track_distance">最大记录间距</string>
+  <string name="settings_recording_track_distance_summary">如果记录点之间的距离大于这个值, 轨迹将被切割</string>
 
-  <string name="settings_min_recording_interval">最小记录时间间隔</string>
-  <string name="settings_min_recording_interval_summary">记录位置的最小时间间隔</string>
+  <string name="settings_recording_interval">最小记录时间间隔</string>
+  <string name="settings_recording_interval_summary">记录位置的最小时间间隔</string>
 
-  <string name="settings_min_required_accuracy">最小精度</string>
-  <string name="settings_min_required_accuracy_summary">如果位置信息达不到此精度, 记录将被暂停</string>
+  <string name="settings_recording_gps_accuracy">最小精度</string>
+  <string name="settings_recording_gps_accuracy_summary">如果位置信息达不到此精度, 记录将被暂停</string>
 
   <string name="settings_display_metric">使用公制单位</string>
   <string name="settings_display_metric_summary_on">所有的距离都将以公制单位显示</string>
@@ -229,15 +229,15 @@ limitations under the License.
   <string name="settings_share_url_only_summary_on">在分享时只发送地图的 URL</string>
   <string name="settings_share_url_only_summary_off">在分享时也包括轨迹的内容</string>
 
-  <string name="settings_split_frequency">切割频度</string>
-  <string name="settings_split_frequency_summary">插入新切割标记所需要达到的最大时间或距离</string>
+  <string name="settings_recording_marker">切割频度</string>
+  <string name="settings_recording_marker_summary">插入新切割标记所需要达到的最大时间或距离</string>
 
-  <string name="settings_auto_resume_track_timeout">自动恢复追踪等待时间</string>
-  <string name="settings_auto_resume_track_timeout_summary">手机重启后自动继续上次轨迹记录的最大间隔时间</string>
+  <string name="settings_recording_auto_resume">自动恢复追踪等待时间</string>
+  <string name="settings_recording_auto_resume_summary">手机重启后自动继续上次轨迹记录的最大间隔时间</string>
 
-  <string name="settings_timestamp_track_name">使用时间作为轨迹名称</string>
-  <string name="settings_timestamp_track_name_summary_on">使用轨迹记录的开始时间作为默认名称</string>
-  <string name="settings_timestamp_track_name_summary_off">轨迹使用自动递增的数字进行命名.</string>
+  <string name="settings_recording_name">使用时间作为轨迹名称</string>
+  <string name="settings_recording_name_summary_on">使用轨迹记录的开始时间作为默认名称</string>
+  <string name="settings_recording_name_summary_off">轨迹使用自动递增的数字进行命名.</string>
 
   <string name="settings_reset">恢复默认值</string>
   <string name="settings_reset_summary">将所有设置恢复到默认值</string>
@@ -249,13 +249,13 @@ limitations under the License.
   <string name="eclair_required">只在 Android 2.0 及以上版本支持</string>
   <string name="settings_sensor_type">感应器类型</string>
   <string name="settings_sensor_type_summary">要连接到的感应器类型</string>
-  <string name="settings_heart_rate_ant_sensor_id">清除 ANT 心率计的设备关联</string>
+  <string name="settings_sensor_unpair_ant">清除 ANT 心率计的设备关联</string>
   <string name="settings_power_ant_sensor_id">清除 ANT 能量感应器的设备关联</string>
-  <string name="settings_srm_bridge_ant_sensor_id">清除 ANT SRM 桥接感应器的设备关联</string>
-  <string name="settings_ant_not_paired">ANT 感应器未关联</string>
-  <string name="settings_ant_paired">ANT 感应器已关联到: %d</string>
-  <string name="bluetooth_sensor_title">蓝牙感应器</string>
-  <string name="bluetooth_sensor_summary">想要连接的蓝牙感应器</string>
+  <string name="settings_sensor_unpair_srm">清除 ANT SRM 桥接感应器的设备关联</string>
+  <string name="settings_sensor_ant_not_paired">ANT 感应器未关联</string>
+  <string name="settings_sensor_ant_paired">ANT 感应器已关联到: %d</string>
+  <string name="settings_sensor_bluetooth_sensor">蓝牙感应器</string>
+  <string name="settings_sensor_bluetooth_sensor_summary">想要连接的蓝牙感应器</string>
   <string name="settings_modular_stats_display_title">模块化状态显示</string>
 
   <!-- Backups -->
@@ -446,9 +446,9 @@ limitations under the License.
 
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="method_bluetooth">蓝牙</string>
-  <string name="bluetooth_options">蓝牙设置</string>
-  <string name="bluetooth_pairing">设备关联</string>
-  <string name="bluetooth_pairing_summary">打开 Android 的蓝牙设置关联设备</string>
+  <string name="settings_sensor_bluetooth_options">蓝牙设置</string>
+  <string name="settings_sensor_bluetooth_pairing">设备关联</string>
+  <string name="settings_sensor_bluetooth_pairing_summary">打开 Android 的蓝牙设置关联设备</string>
   <string name="settings_sensor">感应器选项</string>
 
   <!-- Bluetooth Sensor -->
@@ -470,10 +470,10 @@ limitations under the License.
   <string name="sending">发送中</string>
 
   <!-- Sensor Type Options -->
-  <string name="sensor_type_option_none">无</string>
-  <string name="sensor_type_option_ant">ANT+ 感应器</string>
-  <string name="sensor_type_option_srm_ant_bridge">SRM ANT+ 转接器</string>
-  <string name="sensor_type_option_polar">Polar Bluetooth</string>
-  <string name="sensor_type_option_zephyr">Zephyr 蓝牙设备</string>
+  <string name="settings_sensor_type_none">无</string>
+  <string name="settings_sensor_type_ant">ANT+ 感应器</string>
+  <string name="settings_sensor_type_srm">SRM ANT+ 转接器</string>
+  <string name="settings_sensor_type_polar">Polar Bluetooth</string>
+  <string name="settings_sensor_type_zephyr">Zephyr 蓝牙设备</string>
   
 </resources>
diff --git a/MyTracks/res/values/arrays_do_not_translate.xml b/MyTracks/res/values/arrays_do_not_translate.xml
index 94adbbdbb..d6c135966 100644
--- a/MyTracks/res/values/arrays_do_not_translate.xml
+++ b/MyTracks/res/values/arrays_do_not_translate.xml
@@ -108,11 +108,11 @@ limitations under the License.
 
   <!-- Sensor Options settings -->
   <array name="sensor_type_options">
-    <item>@string/sensor_type_option_none</item>
-    <item>@string/sensor_type_option_ant</item>
-    <item>@string/sensor_type_option_srm_ant_bridge</item>
-    <item>@string/sensor_type_option_polar</item>
-    <item>@string/sensor_type_option_zephyr</item>
+    <item>@string/settings_sensor_type_none</item>
+    <item>@string/settings_sensor_type_ant</item>
+    <item>@string/settings_sensor_type_srm</item>
+    <item>@string/settings_sensor_type_polar</item>
+    <item>@string/settings_sensor_type_zephyr</item>
   </array>
   
   <array name="sensor_type_values">
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 1c4a8b43a..91c1c47ce 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -399,6 +399,105 @@ limitations under the License.
       settings.">  
     Recording
   </string>
+  <string name="settings_recording_auto_resume"
+    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_recording_auto_resume_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 be resumed after phone reboot.">
+    Maximum time after which a previously recording track will not be resumed on phone reboot
+  </string>      
+  <string name="settings_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_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_recording_gps_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_recording_gps_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_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_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_recording_marker"
+    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_recording_marker_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_recording_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_recording_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_recording_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>
+  <string name="settings_recording_track_distance"
+    translation_description="In the Recording settings, the dropdown option to configure the 
+      distance between two tracks.">
+    Distance between tracks
+  </string>
+  <string name="settings_recording_track_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_recording_voice"
+    translation_description="In the Recording settings, the dropdown option to configure the voice
+      announcement frequency.">
+    Voice frequency
+  </string>
+  <string name="settings_recording_voice_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_recording_voice_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_reset"
     translation_description="In the Settings page, the option to reset everything to the defaults."> 
     Reset to defaults
@@ -413,6 +512,92 @@ limitations under the License.
       settings.">
     Sensor
   </string>
+    <string name="settings_sensor_ant_not_paired"
+    translation_description="In the Sensor settings, the summary for 'Unpair ANT+ heart rate sensor'
+      or 'Unpair SRM ANT+ bridge' when there no ANT+ device paired.">
+    Not paired
+  </string>
+  <string name="settings_sensor_ant_options"
+    translation_description="In the Sensor settings, the section title to configure the ANT+
+      options.">
+    ANT+ Options
+  </string>    
+  <string name="settings_sensor_ant_paired"
+    translation_description="In the Sensor settings, the summary for 'Unpair ANT+ heart rate sensor'
+      or 'Unpair SRM ANT+ bridge' when there is an ANT+ device paired. E.g., 'Paired with: 1'.">
+    Paired with: %d
+  </string>     
+  <string name="settings_sensor_bluetooth_options" 
+    translation_description="In the Sensor settings, the section title to configure the Bluetooth
+      options.">
+   Bluetooth Options
+  </string>
+  <string name="settings_sensor_bluetooth_pairing"
+    translation_description="In the Sensor settings, under the 'Bluetooth Options' configurations,
+      the option to pair with a Bluetooth device.">
+    Bluetooth pairing
+  </string>
+  <string name="settings_sensor_bluetooth_pairing_summary"
+    translation_description="In the Sensor settings, under the 'Bluetooth Options' configurations,
+      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="settings_sensor_bluetooth_sensor"
+    translation_description="In the Sensor settings, under the 'Bluetooth Options' configurations,
+      the dropdown option to pick a Bluetooth sensor.">
+    Bluetooth sensor
+  </string>
+  <string name="settings_sensor_bluetooth_sensor_summary"
+    translation_description="In the Sensor settings, under the 'Bluetooth Options' configurations,
+      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="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_ant"
+    translation_description="In the Sensor settings, for the 'Sensor Type' dropdown, the option to
+      connect to an ANT+ heart rate sensor.">  
+    ANT+ Heart Rate Sensor
+  </string>
+  <string name="settings_sensor_type_none"
+    translation_description="In the Sensor settings, for the 'Sensor Type' dropdown, the option to
+      not connect to any sensor.">
+    None
+  </string>
+  <string name="settings_sensor_type_polar"
+    translation_description="In the Sensor settings, for the 'Sensor Type' dropdown, the option to
+      connect to a Polar bluetooth sensor.">  
+    Polar Bluetooth
+  </string>
+  <string name="settings_sensor_type_srm"
+    translation_description="In the Sensor settings, for the 'Sensor Type' dropdown, the option to
+      connect to a SRM ANT+ bridge.">  
+    SRM ANT+ Bridge
+  </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="settings_sensor_type_zephyr"
+    translation_description="In the Sensor settings, for the 'Sensor Type' dropdown, the option to
+      connect to a Zephyr bluetooth sensor.">     
+    Zephyr Bluetooth
+  </string>      
+  <string name="settings_sensor_unpair_ant"
+    translation_description="In the Sensor settings, under the 'ANT+ Options' configurations, the
+      option to unpair an ANT+ heart rate sensor.">
+    Unpair ANT+ heart rate sensor
+  </string>
+  <string name="settings_sensor_unpair_srm"
+    translation_description="In the Sensor settings, under the 'ANT+ Options' configurations, the
+      option to unpair a SRM ANT+ bridge.">
+    Unpair SRM ANT+ bridge
+  </string>    
   <string name="settings_sharing"
     translation_description="In the Settings page, the option to change the track sharing related
       settings.">   
@@ -890,168 +1075,8 @@ limitations under the License.
     Import error for file %s
   </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"
@@ -1562,33 +1587,4 @@ limitations under the License.
       is sending data.">
     Sending
   </string>
-      
-  <!-- Sensor Type Options -->
-  <string name="sensor_type_option_none"
-    translation_description="In the Sensor Options settings page, for the Sensor Type picker, the
-        dropdown option to not connect to any sensor.">
-    None
-  </string>
-  <string name="sensor_type_option_ant"
-    translation_description="In the Sensor Options settings page, for the Sensor Type picker, the
-        dropdown option to connect to an ANT+ sensor.">  
-    ANT+ Sensor
-  </string>
-  <string name="sensor_type_option_srm_ant_bridge"
-    translation_description="In the Sensor Options settings page, for the Sensor Type picker, the
-        dropdown option to connect to a SRM ANT+ bridge.">  
-    SRM ANT+ Bridge
-  </string>
-  <string name="sensor_type_option_polar"
-    translation_description="In the Sensor Options settings page, for the Sensor Type picker, the
-        dropdown option to connect to a Polar bluetooth sensor.">  
-    Polar Bluetooth
-  </string>
-  <string name="sensor_type_option_zephyr"
-    translation_description="In the Sensor Options settings page, for the Sensor Type picker, the
-        dropdown option to connect to a Zephyr bluetooth sensor.">     
-    Zephyr Bluetooth
-  </string>
-
-
 </resources>
diff --git a/MyTracks/res/xml/preferences.xml b/MyTracks/res/xml/preferences.xml
index 830e557a1..d7c1089aa 100644
--- a/MyTracks/res/xml/preferences.xml
+++ b/MyTracks/res/xml/preferences.xml
@@ -90,65 +90,65 @@ limitations under the License.
   <PreferenceScreen android:title="@string/settings_recording">
     <com.google.android.apps.mytracks.IntegerListPreference
         android:key="@string/announcement_frequency_key"
-        android:title="@string/settings_announcement_frequency"
-        android:summary="@string/settings_announcement_frequency_summary"
+        android:title="@string/settings_recording_voice"
+        android:summary="@string/settings_recording_voice_summary"
         android:entries="@array/task_frequency_options"
         android:entryValues="@array/task_frequency_values"
         android:defaultValue="0" />
 
     <com.google.android.apps.mytracks.IntegerListPreference
         android:key="@string/split_frequency_key"
-        android:title="@string/settings_split_frequency"
-        android:summary="@string/settings_split_frequency_summary"
+        android:title="@string/settings_recording_marker"
+        android:summary="@string/settings_recording_marker_summary"
         android:entries="@array/task_frequency_options"
         android:entryValues="@array/task_frequency_values"
         android:defaultValue="0" />
 
     <com.google.android.apps.mytracks.IntegerListPreference
         android:key="@string/min_recording_interval_key"
-        android:title="@string/settings_min_recording_interval"
-        android:summary="@string/settings_min_recording_interval_summary"
+        android:title="@string/settings_recording_interval"
+        android:summary="@string/settings_recording_interval_summary"
         android:entries="@array/min_recording_interval_options"
         android:entryValues="@array/min_recording_interval_values"
         android:defaultValue="0" />
 
     <com.google.android.apps.mytracks.IntegerListPreference
         android:key="@string/min_recording_distance_key"
-        android:title="@string/settings_min_recording_distance"
-        android:summary="@string/settings_min_recording_distance_summary"
+        android:title="@string/settings_recording_distance"
+        android:summary="@string/settings_recording_distance_summary"
         android:entries="@array/min_recording_distance_options"
         android:entryValues="@array/min_recording_distance_values"
         android:defaultValue="5" />
 
     <com.google.android.apps.mytracks.IntegerListPreference
         android:key="@string/max_recording_distance_key"
-        android:title="@string/settings_max_recording_distance"
-        android:summary="@string/settings_max_recording_distance_summary"
+        android:title="@string/settings_recording_track_distance"
+        android:summary="@string/settings_recording_track_distance_summary"
         android:entries="@array/max_recording_distance_options"
         android:entryValues="@array/max_recording_distance_values"
         android:defaultValue="200" />
 
     <com.google.android.apps.mytracks.IntegerListPreference
         android:key="@string/min_required_accuracy_key"
-        android:title="@string/settings_min_required_accuracy"
-        android:summary="@string/settings_min_required_accuracy_summary"
+        android:title="@string/settings_recording_gps_accuracy"
+        android:summary="@string/settings_recording_gps_accuracy_summary"
         android:entries="@array/min_required_accuracy_options"
         android:entryValues="@array/min_required_accuracy_values"
         android:defaultValue="200" />
 
     <com.google.android.apps.mytracks.IntegerListPreference
         android:key="@string/auto_resume_track_timeout_key"
-        android:title="@string/settings_auto_resume_track_timeout"
-        android:summary="@string/settings_auto_resume_track_timeout_summary"
+        android:title="@string/settings_recording_auto_resume"
+        android:summary="@string/settings_recording_auto_resume_summary"
         android:entries="@array/auto_resume_track_timeout_options"
         android:entryValues="@array/auto_resume_track_timeout_values"
         android:defaultValue="10" />
 
     <CheckBoxPreference
         android:key="@string/timestamp_track_name_key"
-        android:title="@string/settings_timestamp_track_name"
-        android:summaryOn="@string/settings_timestamp_track_name_summary_on"
-        android:summaryOff="@string/settings_timestamp_track_name_summary_off"
+        android:title="@string/settings_recording_name"
+        android:summaryOn="@string/settings_recording_name_summary_on"
+        android:summaryOff="@string/settings_recording_name_summary_off"
         android:defaultValue="true" />
 
   </PreferenceScreen>
@@ -164,32 +164,26 @@ limitations under the License.
         android:defaultValue="@string/sensor_type_value_none"/>
 
     <!-- Bluetooth -->
-    <PreferenceCategory android:title="@string/bluetooth_options">
+    <PreferenceCategory android:title="@string/settings_sensor_bluetooth_options">
       <ListPreference android:key="@string/bluetooth_sensor_key"
-                      android:title="@string/bluetooth_sensor_title"
-                      android:summary="@string/bluetooth_sensor_summary"
+                      android:title="@string/settings_sensor_bluetooth_sensor"
+                      android:summary="@string/settings_sensor_bluetooth_sensor_summary"
                       android:defaultValue="any" />
 
       <Preference android:key="@string/bluetooth_pairing_key"
-                  android:title="@string/bluetooth_pairing"
-                  android:summary="@string/bluetooth_pairing_summary"
+                  android:title="@string/settings_sensor_bluetooth_pairing"
+                  android:summary="@string/settings_sensor_bluetooth_pairing_summary"
                   android:persistent="false" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/ant_options"
+    <PreferenceCategory android:title="@string/settings_sensor_ant_options"
       android:key="@string/ant_options_key">
 	    <com.google.android.apps.mytracks.AntPreference
 	    	android:key="@string/ant_heart_rate_sensor_id_key"
-	        android:title="@string/settings_heart_rate_ant_sensor_id"/>
-<!--
-	    <com.google.android.apps.mytracks.AntPreference
-	    	android:key="@string/ant_power_sensor_id_key"
-	        android:title="@string/settings_power_ant_sensor_id"/>
--->
-
+	        android:title="@string/settings_sensor_unpair_ant"/>
 	    <com.google.android.apps.mytracks.AntPreference
 	    	android:key="@string/ant_srm_bridge_sensor_id_key"
-	        android:title="@string/settings_srm_bridge_ant_sensor_id"/>
+	        android:title="@string/settings_sensor_unpair_srm"/>
     </PreferenceCategory>
   </PreferenceScreen>
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/AntPreference.java b/MyTracks/src/com/google/android/apps/mytracks/AntPreference.java
index 6d6a4b853..7b840018a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/AntPreference.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/AntPreference.java
@@ -43,9 +43,10 @@ public class AntPreference extends Preference {
   private void init() {
     int sensorId = getPersistedInt(0);
     if (sensorId == 0) {
-      setSummary(R.string.settings_ant_not_paired);
+      setSummary(R.string.settings_sensor_ant_not_paired);
     } else {
-      setSummary(String.format(getContext().getString(R.string.settings_ant_paired), sensorId));
+      setSummary(
+          String.format(getContext().getString(R.string.settings_sensor_ant_paired), sensorId));
     }
 
     // Add actions to allow repairing.
@@ -54,7 +55,7 @@ public class AntPreference extends Preference {
           @Override
           public boolean onPreferenceClick(Preference preference) {
             AntPreference.this.persistInt(0);
-            setSummary(R.string.settings_ant_not_paired);
+            setSummary(R.string.settings_sensor_ant_not_paired);
             return true;
           }
         });
diff --git a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
index d513799e7..59d756eac 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
@@ -93,8 +93,7 @@ public class SettingsActivity extends PreferenceActivity {
               getString(R.string.announcement_frequency_key));
       announcementFrequency.setEnabled(false);
       announcementFrequency.setValue("-1");
-      announcementFrequency.setSummary(
-          R.string.settings_announcement_frequency_not_available);
+      announcementFrequency.setSummary(R.string.settings_recording_voice_not_available);
     }
 
     // Hook up switching of displayed list entries between metric and imperial