fix comment b7f41a55cc69

MyTracks/res/layout/mytracks_waypoint_details.xml

@@ -125,7 +125,7 @@ limitations under the License.
             android:layout_column="2"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/mile"
+            android:text="@string/unit_mile"
             android:textColor="@color/stat_label_text" />
           <!-- TODO 4/08/2009
           The following is a bad hack to get a spacer the same size as the
@@ -351,7 +351,7 @@ limitations under the License.
             android:layout_column="2"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/feet"
+            android:text="@string/unit_feet"
             android:textColor="@color/stat_label_text"/>
           <TextView
             android:background="@color/black"
@@ -375,7 +375,7 @@ limitations under the License.
             android:layout_column="5"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/feet"
+            android:text="@string/unit_feet"
             android:textColor="@color/stat_label_text" />
         </TableRow>
 
@@ -409,7 +409,7 @@ limitations under the License.
             android:layout_column="2"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/feet"
+            android:text="@string/unit_feet"
             android:textColor="@color/stat_label_text" />
           <TextView
             android:background="@color/black"
@@ -433,7 +433,7 @@ limitations under the License.
             android:layout_column="5"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/feet"
+            android:text="@string/unit_feet"
             android:textColor="@color/stat_label_text" />
         </TableRow>
 

MyTracks/res/values-de/strings.xml

@@ -306,8 +306,8 @@ limitations under the License.
   <!-- Time  -->
   <string name="voice_hour">Stunde</string>
   <string name="voice_hours">Stunden</string>
-  <string name="hr">Std</string>
-  <string name="min">Min</string>
+  <string name="unit_hour">Std</string>
+  <string name="unit_minute">Min</string>
   <string name="voice_minute">Minute</string>
   <string name="voice_minutes">Minuten</string>
   <string name="voice_second">Sekunde</string>
@@ -315,11 +315,11 @@ limitations under the License.
   <!--string name="milliseconds">ms</string-->
 
   <!-- Distance -->
-  <!--string name="meter">m</string-->
-  <!--string name="kilometer">km</string-->
+  <!--string name="unit_meter">m</string-->
+  <!--string name="unit_kilometer">km</string-->
   <string name="voice_kilometers">Kilometer</string>
-  <string name="feet">Fuß</string>
-  <!--string name="mile">mi</string-->
+  <string name="unit_feet">Fuß</string>
+  <!--string name="unit_mile">mi</string-->
   <string name="voice_miles">Meilen</string>
 
   <!-- Speed and Pace -->

MyTracks/res/values-es/strings.xml

@@ -382,7 +382,7 @@ limitations under the License.
 
   <!-- Distance -->
   <string name="voice_kilometers">kilómetros</string>
-  <string name="feet">pies</string>
+  <string name="unit_feet">pies</string>
   <string name="voice_miles">millas</string>
 
   <!-- Speed and Pace -->

MyTracks/res/values-fi/strings.xml

@@ -356,8 +356,8 @@ limitations under the License.
   <!-- Time  -->
   <string name="voice_hour">tunti</string>
   <string name="voice_hours">tuntia</string>
-  <string name="hr">h</string>
-  <string name="min">min</string>
+  <string name="unit_hour">h</string>
+  <string name="unit_minute">min</string>
   <string name="voice_minute">minuutti</string>
   <string name="voice_minutes">minuuttia</string>
   <string name="voice_second">sekunti</string>
@@ -365,11 +365,11 @@ limitations under the License.
   <string name="milliseconds">ms</string>
 
   <!-- Distance -->
-  <string name="meter">m</string>
-  <string name="kilometer">km</string>
+  <string name="unit_meter">m</string>
+  <string name="unit_kilometer">km</string>
   <string name="voice_kilometers">kilometriä</string>
-  <string name="feet">ft</string>
-  <string name="mile">mi</string>
+  <string name="unit_feet">ft</string>
+  <string name="unit_mile">mi</string>
   <string name="voice_miles">mailia</string>
 
   <!-- Speed and Pace -->

MyTracks/res/values-fr/strings.xml

@@ -286,7 +286,7 @@ limitations under the License.
   <string name="voice_seconds">secondes</string>
 
   <!-- Distance -->
-  <string name="feet">pied</string>
+  <string name="unit_feet">pied</string>
   <string name="voice_kilometers">kilomètres</string>
   <string name="voice_miles">milles</string>
 

MyTracks/res/values-it/strings.xml

@@ -261,19 +261,19 @@ limitations under the License.
   <!-- Time  -->
   <string name="voice_hour">ora</string>
   <string name="voice_hours">ore</string>
-  <string name="hr">h</string>
-  <string name="min">min</string>
+  <string name="unit_hour">h</string>
+  <string name="unit_minute">min</string>
   <string name="voice_minute">minuto</string>
   <string name="voice_minutes">minuti</string>
   <string name="voice_second">secondo</string>
   <string name="voice_seconds">secondi</string>
 
   <!-- Distance -->
-  <string name="meter">m</string>
-  <string name="kilometer">km</string>
+  <string name="unit_meter">m</string>
+  <string name="unit_kilometer">km</string>
   <string name="voice_kilometers">chilometri</string>
-  <string name="feet">pd</string>
-  <string name="mile">mi</string>
+  <string name="unit_feet">pd</string>
+  <string name="unit_mile">mi</string>
   <string name="voice_miles">miglia</string>
 
   <!-- Speed and Pace -->

MyTracks/res/values-ja/strings.xml

@@ -344,8 +344,8 @@ limitations under the License.
   <!-- Time  -->
   <string name="voice_hour">時</string>
   <string name="voice_hours">時</string>
-  <string name="hr">時</string>
-  <string name="min">分</string>
+  <string name="unit_hour">時</string>
+  <string name="unit_minute">分</string>
   <string name="voice_minute">分</string>
   <string name="voice_minutes">分</string>
   <string name="voice_second">秒</string>

MyTracks/res/values-pl/strings.xml

@@ -289,19 +289,19 @@ limitations under the License.
   <!-- Time  -->
   <string name="voice_hour">godzina</string>
   <string name="voice_hours">godziny</string>
-  <string name="hr">godz.</string>
-  <string name="min">min</string>
+  <string name="unit_hour">godz.</string>
+  <string name="unit_minute">min</string>
   <string name="voice_minute">minuta</string>
   <string name="voice_minutes">minuty</string>
   <string name="voice_second">sekunda</string>
   <string name="voice_seconds">sekundy</string>
 
   <!-- Distance -->
-  <string name="meter">m</string>
-  <string name="kilometer">km</string>
+  <string name="unit_meter">m</string>
+  <string name="unit_kilometer">km</string>
   <string name="voice_kilometers">kilometerów</string>
-  <string name="feet">st.</string>
-  <string name="mile">mi</string>
+  <string name="unit_feet">st.</string>
+  <string name="unit_mile">mi</string>
   <string name="voice_miles">mil</string>
 
   <!-- Speed and Pace -->

MyTracks/res/values-pt-rBR/strings.xml

@@ -248,14 +248,14 @@ limitations under the License.
   <!-- Time -->
   <string name="voice_hour">hora</string>
   <string name="voice_hours">horas</string>
-  <string name="hr">h</string>
+  <string name="unit_hour">h</string>
   <string name="voice_minute">minuto</string>
   <string name="voice_minutes">minutos</string>
   <string name="voice_second">segundo</string>
   <string name="voice_seconds">segundos</string>
 
   <!-- Distance -->
-  <string name="feet">pés</string>
+  <string name="unit_feet">pés</string>
   <string name="voice_kilometers">kilômetros</string>
   <string name="voice_miles">milhas</string>
 

MyTracks/res/values-ru/strings.xml

@@ -352,8 +352,8 @@ limitations under the License.
   <!-- Time  -->
   <string name="voice_hour">час</string>
   <string name="voice_hours">часов</string>
-  <string name="hr">ч</string>
-  <string name="min">мин</string>
+  <string name="unit_hour">ч</string>
+  <string name="unit_minute">мин</string>
   <string name="voice_minute">минута</string>
   <string name="voice_minutes">минут</string>
   <string name="voice_second">секунда</string>
@@ -361,11 +361,11 @@ limitations under the License.
   <string name="milliseconds">мс</string>
 
   <!-- Distance -->
-  <string name="meter">м</string>
-  <string name="kilometer">км</string>
+  <string name="unit_meter">м</string>
+  <string name="unit_kilometer">км</string>
   <string name="voice_kilometers">километров</string>
-  <string name="feet">футов</string>
-  <string name="mile">миль</string>
+  <string name="unit_feet">футов</string>
+  <string name="unit_mile">миль</string>
   <string name="voice_miles">мили</string>
 
   <!-- Speed and Pace -->

MyTracks/res/values-sv/strings.xml

@@ -264,19 +264,19 @@ limitations under the License.
   <!-- Time  -->
   <string name="voice_hour">timme</string>
   <string name="voice_hours">timmar</string>
-  <string name="hr">tim</string>
-  <string name="min">min</string>
+  <string name="unit_hour">tim</string>
+  <string name="unit_minute">min</string>
   <string name="voice_minute">minut</string>
   <string name="voice_minutes">minuter</string>
   <string name="voice_second">sekund</string>
   <string name="voice_seconds">sekunder</string>
 
   <!-- Distance -->
-  <string name="meter">m</string>
-  <string name="kilometer">km</string>
+  <string name="unit_meter">m</string>
+  <string name="unit_kilometer">km</string>
   <string name="voice_kilometers">kilometer</string>
-  <string name="feet">ft</string>
-  <string name="mile">mi</string>
+  <string name="unit_feet">ft</string>
+  <string name="unit_mile">mi</string>
   <string name="voice_miles">miles</string>
 
   <!-- Speed and Pace -->

MyTracks/res/values-zh-rCN/strings.xml

@@ -353,8 +353,8 @@ limitations under the License.
   <!-- Time  -->
   <string name="voice_hour">小时</string>
   <string name="voice_hours">小时</string>
-  <string name="hr">时</string>
-  <string name="min">分</string>
+  <string name="unit_hour">时</string>
+  <string name="unit_minute">分</string>
   <string name="voice_minute">分钟</string>
   <string name="voice_minutes">分钟</string>
   <string name="voice_second">秒</string>

MyTracks/res/values/strings.xml

@@ -1313,39 +1313,117 @@ limitations under the License.
     seconds
   </string> 
       
-  <!-- time -->
-  <string name="hr"
-    translation_description="Abbreviation for hours. E.g, '2 hr'.">
-    hr
-  </string>
-  <string name="second"
-   translation_description="Abbreviation for second. E.g, '5 s' for 5 seconds.">
-   s
-  </string>
-  
-  <string name="min"
-    translation_description="Abbreviation for minutes. E.g, '2 min'.">
-    min
-  </string>
-
-  <!--  distance -->
-  <string name="kilometer"
-    translation_description="Abbreviation for kilometers. E.g., '2 km'.">
-    km
-  </string>
-  <string name="meter"
-    translation_description="Abbreviation for meters. E.g., '2 m'.">
-    m
-  </string>
-  <string name="mile"
-    translation_description="Abbreviation for miles. E.g., '2 mi'.">
-    mi
-  </string>
-  <string name="feet"
+  <!-- Unit -->
+  <string name="unit_feet"
     translation_description="Abbreviation for feet. E.g., '2 ft'.">
     ft
   </string>
+  <string name="unit_hour"
+    translation_description="Abbreviation for hour. E.g, '2 hr'.">
+    hr
+  </string>   
+  <string name="unit_kilometer"
+    translation_description="Abbreviation for kilometer. E.g., '2 km'.">
+    km
+  </string>
+  <string name="unit_meter"
+    translation_description="Abbreviation for meter. E.g., '2 m'.">
+    m
+  </string>
+  <string name="unit_mile"
+    translation_description="Abbreviation for mile. E.g., '2 mi'.">
+    mi
+  </string>
+  <string name="unit_minute"
+    translation_description="Abbreviation for minute. E.g, '2 min'.">
+    min
+  </string>
 
+  <!-- Value - values in a setting picker -->
+  <string name="value_adapt_accuracy"
+    translation_description="In a setting picker, the value to adapt for accuracy.">
+    adapt for accuracy
+  </string> 
+  <string name="value_adapt_battery_life"
+    translation_description="In a setting picker, the value to adapt for battery life.">
+    adapt for battery life
+  </string> 
+  <string name="value_always"
+    translation_description="In a setting picker, the value to always enable the option.">
+    Always
+  </string>
+  <string name="value_float_mile"
+    translation_description="In a setting picker, a float value in miles. E.g., '2.2 mi'.">
+    %.1f mi
+  </string> 
+  <string name="value_float_mile_poor_gps"
+    translation_description="In a setting picker, a float value in miles, recommended when having
+      poor GPS signal. E.g., '2.2 mi (poor GPS)'.">
+    %.1f mi (poor GPS)
+  </string> 
+  <string name="value_integer_feet"
+    translation_description="In a setting picker, an integer value in feet. E.g., '2 ft'.">
+    %d ft
+  </string>
+  <string name="value_integer_feet_excellent_gps"
+    translation_description="In a setting picker, an integer value in feet, recommended when having
+      excellent GPS signal. E.g., '2 ft (excellent GPS)'.">
+    %d ft (excellent GPS)
+  </string>       
+  <string name="value_integer_feet_recommended"
+    translation_description="In a setting picker, an integer value in feet that is recommended.
+      E.g., '2 ft (recommended)'.">
+    %d ft (recommended)
+  </string>  
+  <string name="value_integer_kilometer"
+    translation_description="In a setting picker, an integer value in kilometers. E.g., '2 km'.">
+    %d km
+  </string> 
+  <string name="value_integer_meter"
+    translation_description="In a setting picker, an integer value in meters. E.g., '2 m'.">
+    %d m
+  </string>
+  <string name="value_integer_meter_excellent_gps"
+    translation_description="In a setting picker, an integer value in meters, recommended when
+      having excellent GPS signal. E.g., '2 m (excellent GPS)'.">
+    %d m (excellent GPS)
+  </string>
+  <string name="value_integer_meter_poor_gps"
+    translation_description="In a setting picker, an integer value in meters, recommended when
+      having poor GPS signal. E.g., '2 m (poor GPS)'.">
+    %d m (poor GPS)
+  </string>      
+  <string name="value_integer_meter_recommended"
+    translation_description="In a setting picker, an integer value in meters that is recommended.
+      E.g., '2 m (recommended)'.">    
+    %d m (recommended)
+  </string>
+  <string name="value_integer_mile"
+    translation_description="In a setting picker, an integer value in miles. E.g., '2 mi'.">
+    %d mi
+  </string>   
+  <string name="value_integer_minute"
+    translation_description="In a setting picker, an integer value in minutes. E.g., '2 min'.">
+    %d min
+  </string>
+  <string name="value_integer_second"
+    translation_description="In a setting picker, an integer value in seconds. E.g., '2 s'.">
+    %d s
+  </string>
+  <string name="value_never"
+    translation_description="In a setting picker, the value to never use the feature.">
+    Never
+  </string>
+  <string name="value_off"
+    translation_description="In a setting picker, the value to turn off the feature.">
+    Off
+  </string>
+  <string name="value_smallest_recommended"
+    translation_description="In a setting picker, the value to use the smallest value, also the
+      recommended value.">
+    smallest (recommended)
+  </string> 
+        
   <!-- Speed unit -->
   <string name="kilometer_per_hour"
     translation_description="For speed unit, abbreviation for kilometers per hour. E.g, '5 km/h'.">
@@ -1668,52 +1746,8 @@ limitations under the License.
         speed thresholds. E.g., use one color for segments where the speed is below the average
         speed of the track.">
     Dynamic Thresholds
-  </string>
- 
-  <string name="auto_resume_track_timeout_never"
-    translation_description="In the 'Auto-resume timeout' setting, the option to never resume a
-      recording after phone reboot.">
-  </string>
-  <string name="auto_resume_track_timeout_always"
-    translation_description="In the 'Auto-resume timeout' setting, the option to always resume a
-      recording after phone reboot.">
-    Always
-  </string>
-  <string name="task_frequency_off"
-    translation_description="For task frequency settings like voice announcement, the option to turn
-      off the task.">
-    Off
-  </string>
-  <string name="settings_recommended"
-    translation_description="For settings, the text next to the recommended value.">
-    recommended
-  </string>
-  <string name="min_required_accuracy_excellent_gps"
-    translation_description="For the 'Min accuracy' setting, the text next to the option that should
-      be picked when the phone has excellent GPS.">
-    excellent GPS
-  </string>
-  <string name="min_required_accuracy_poor_gps"
-    translation_description="In the 'Min accuracy' setting, the text next to the option that should
-      be picked when the phone has poor GPS.">
-    poor GPS
-  </string>    
-  <string name="min_recording_interval_adaptive_battery"
-    translation_description="In the 'Min time between points' setting, the option to record using
-      an adaptive algorithm to optimize for battery life.">
-    battery life (adaptive)
   </string> 
-  <string name="min_recording_interval_adaptive_accuracy"
-    translation_description="In the 'Min time between points' setting, the option to record using
-      an adaptive algorithm to optimize for high accuracy.">
-    high accuracy (adaptive)
-  </string> 
-  <string name="min_recording_interval_highest"
-    translation_description="In the 'Min time between points' setting, the option to record at the
-      highest rate.">
-    highest
-  </string> 
-        
+      
   <!-- Activity Types -->
   <string name="activity_type_airplane"
     translation_description="When entering the Activity Type, an option for airplane.">