From cc06c469eee5fc6cbac887e0f897b1275c4e05f1 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Fri, 4 Nov 2011 13:50:25 -0700
Subject: [PATCH] fix comment on 87a508c1fb9b

---
 MyTracks/res/values-ca/strings.xml            |  2 +-
 MyTracks/res/values-de/strings.xml            |  2 +-
 MyTracks/res/values-es-rES/strings.xml        |  2 +-
 MyTracks/res/values-es/strings.xml            |  2 +-
 MyTracks/res/values-fi/strings.xml            |  2 +-
 MyTracks/res/values-ja/strings.xml            |  2 +-
 MyTracks/res/values-pt-rBR/strings.xml        |  2 +-
 MyTracks/res/values-ru/strings.xml            |  2 +-
 MyTracks/res/values-zh-rCN/strings.xml        |  2 +-
 MyTracks/res/values/strings.xml               | 58 +++++++++----------
 .../apps/mytracks/SettingsActivity.java       |  2 +-
 11 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index f2031d965..6919b1fb6 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -170,7 +170,7 @@ limitations under the License.
   <string name="settings_recording">Enregistrament</string>
   <string name="settings_sharing">Compartició</string>
 
-  <string name="settings_not_available_summary">No es troba disponible a la vostra versió de l\'Android</string>
+  <string name="settings_announcement_frequency_not_available">No es troba disponible a la vostra versió de l\'Android</string>
 
   <string name="settings_announcement_frequency">Freqüència d\'avís</string>
   <string name="settings_announcement_frequency_summary">Temps mínim entre dos avisos de veu</string>
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index 55320a414..f087759d6 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -173,7 +173,7 @@ limitations under the License.
   <string name="settings_recording">Aufzeichnung</string>
   <string name="settings_sharing">Mit Freunden teilen</string>
 
-  <string name="settings_not_available_summary">In dieser Android-Version nicht verfügbar</string>
+  <string name="settings_announcement_frequency_not_available">In dieser Android-Version nicht verfügbar</string>
 
   <string name="settings_announcement_frequency">Dauer zwischen Ansagen</string>
   <string name="settings_announcement_frequency_summary">Kürzeste Zeit zwischen zwei Ansagen</string>
diff --git a/MyTracks/res/values-es-rES/strings.xml b/MyTracks/res/values-es-rES/strings.xml
index da765295d..f1f0aa237 100644
--- a/MyTracks/res/values-es-rES/strings.xml
+++ b/MyTracks/res/values-es-rES/strings.xml
@@ -55,7 +55,7 @@ limitations under the License.
   <!-- MyTracks Waypoint Details -->
 
   <!-- MyTracks Settings -->
-  <string name="settings_not_available_summary">No está disponible en su versión de Android</string>
+  <string name="settings_announcement_frequency_not_available">No está disponible en su versión de Android</string>
 
 
   <string name="settings_report_speed_or_pace">Mostrar velocidad</string>
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index 10740f9c6..246fec8e3 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -202,7 +202,7 @@ limitations under the License.
   <string name="settings_recording">Grabando</string>
   <string name="settings_sharing">Compartiendo</string>
 
-  <string name="settings_not_available_summary">No disponible para tu versión de Android</string>
+  <string name="settings_announcement_frequency_not_available">No disponible para tu versión de Android</string>
   <string name="settings_not_while_recording">No disponible mientras se graba el recorrido</string>
 
   <string name="settings_allow_access">Permitir acceso</string>
diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml
index d42042715..1300cf182 100644
--- a/MyTracks/res/values-fi/strings.xml
+++ b/MyTracks/res/values-fi/strings.xml
@@ -202,7 +202,7 @@ limitations under the License.
   <string name="settings_recording">Tallennus</string>
   <string name="settings_sharing">Jakaminen</string>
 
-  <string name="settings_not_available_summary">Ei tuettu tässä Android-versiossa</string>
+  <string name="settings_announcement_frequency_not_available">Ei tuettu tässä Android-versiossa</string>
   <string name="settings_not_while_recording">Ei saatavilla reittiä tallennettaessa.</string>
 
   <string name="settings_announcement_frequency">Äänimerkki</string>
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index 9e4637cfe..074a199a5 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -195,7 +195,7 @@ limitations under the License.
   <string name="settings_recording">記録</string>
   <string name="settings_sharing">共有</string>
 
-  <string name="settings_not_available_summary">このAndroidバージョンでは使用できません</string>
+  <string name="settings_announcement_frequency_not_available">このAndroidバージョンでは使用できません</string>
 
   <string name="settings_announcement_frequency">定期通知</string>
   <string name="settings_announcement_frequency_summary">音声通知間隔の最小時間</string>
diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml
index 31e694841..68a8cb0db 100644
--- a/MyTracks/res/values-pt-rBR/strings.xml
+++ b/MyTracks/res/values-pt-rBR/strings.xml
@@ -162,7 +162,7 @@ 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_not_available_summary">Não disponível na sua versão do Android</string>
+  <string name="settings_announcement_frequency_not_available">Não disponível na sua versão do Android</string>
   <string name="settings_not_while_recording">Não disponível durante a gravação de uma trilha</string>
   <string name="settings_announcement_frequency">Tempo entre anúncios</string>
   <string name="settings_announcement_frequency_summary">Tempo mínimo entre dois anúncios de voz</string>
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index 10fa8b4d7..64a97e12a 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -198,7 +198,7 @@ limitations under the License.
   <string name="settings_recording">Запись</string>
   <string name="settings_sharing">Обмен</string>
 
-  <string name="settings_not_available_summary">Не доступен в вашем версии Android</string>
+  <string name="settings_announcement_frequency_not_available">Не доступен в вашем версии Android</string>
   <string name="settings_not_while_recording">Не доступно во время записи трека</string>
 
   <string name="settings_announcement_frequency">Частота объявлений</string>
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index 8d8b9fcfc..01c351e1d 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -199,7 +199,7 @@ limitations under the License.
   <string name="settings_recording">记录</string>
   <string name="settings_sharing">分享</string>
 
-  <string name="settings_not_available_summary">不支持当前使用的 Android 版本</string>
+  <string name="settings_announcement_frequency_not_available">不支持当前使用的 Android 版本</string>
   <string name="settings_not_while_recording">在记录轨迹时不可用</string>
 
   <string name="settings_announcement_frequency">通知频度</string>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 4541aaf85..3cba2f091 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -778,6 +778,7 @@ limitations under the License.
   </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.">
@@ -789,10 +790,10 @@ limitations under the License.
       announcements.">
     Time/distance between two voice announcements
   </string>
-  <string name="settings_not_available_summary"
+  <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.">
-    Not available in your version of Android
+    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
@@ -807,49 +808,48 @@ limitations under the License.
   </string>
   <string name="settings_min_recording_interval"
     translation_description="In the Recording settings, the dropdown option to configure the
-      minimum time between two recorded points.">
-    Min time for points
+      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 'Min time for points'
+    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 minimum
+    translation_description="In the Recording settings, the dropdown option to configure the
       distance between two recorded points.">
-    Min distance for points
+    Distance between points
   </string>
   <string name="settings_min_recording_distance_summary"
-    translation_description="In the Recording settings, the summary for the 'Min distance for
+    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 maximum
-      distance between two recorded points for them to still be considered as the same track.">
-    Max distance for points
+    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 'Max distance for
-      points' dropdown option explaining that it configures the maximum distance for two recorded
+    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.">
-    If two recordings are further than this, the track will be split
+    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 minimum
+    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.">
-    Min accuracy
+    GPS accuracy
   </string>
   <string name="settings_min_required_accuracy_summary"
-    translation_description="In the Recording settings, the summary for the 'Min accuracy' dropdown
-      option explaining that it configures the minimum required accuracy for your position.
-      If a GPS position's accuracy is below the requirement, then it will not be used and the 
-      recording will be paused.">
-    Recording will be paused if your position is not this accurate
+    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
@@ -919,13 +919,13 @@ limitations under the License.
     ANT+ Options
   </string>    
   <string name="settings_heart_rate_ant_sensor_id"
-    translation_description="In the Sensor settings, the option to clear an ANT+ sensor pairing.">
-    Clear ANT+ sensor
+    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 clear a SRM ANT+ bridge pairing."
-      >
-    Clear SRM ANT+ bridge
+    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
@@ -947,14 +947,14 @@ limitations under the License.
   <string name="settings_map_public_summary_on"
     translation_description="In the Sharing settings, the summary for the 'Make new maps public'
       checkbox option when it is checked explaining that new maps created in Google My Maps will
-      be made public.">
+      be public, as opposed to unlisted.">
     Make new maps created in Google My Maps public
   </string>
   <string name="settings_map_public_summary_off"
     translation_description="In the Sharing settings, the summary for the 'Make new maps public'
       checkbox option when it is unchecked explaining that new maps created in Google My Maps will
-      be private.">
-    Make new maps created in Goolge My Maps private
+      be unlisted, as opposed to public.">
+    Make new maps created in Goolge My Maps unlisted
   </string>
   <string name="settings_share_url_only"
     translation_description="In the Sharing settings, the checkbox option to share only the URL 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
index 0d1fa11e0..0b378b13e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
@@ -108,7 +108,7 @@ public class SettingsActivity extends PreferenceActivity {
       announcementFrequency.setEnabled(false);
       announcementFrequency.setValue("-1");
       announcementFrequency.setSummary(
-          R.string.settings_not_available_summary);
+          R.string.settings_announcement_frequency_not_available);
     }
   }