From ae28dc01fe513af16984b3cb558249a428ebc85c Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Tue, 15 Nov 2011 16:43:45 -0800
Subject: [PATCH] merge heads

---
 MyTracks/AndroidManifest.xml                  |   44 +-
 MyTracks/res/layout/about.xml                 |   15 +-
 MyTracks/res/layout/chart_settings.xml        |   24 +-
 MyTracks/res/layout/list.xml                  |    8 +-
 MyTracks/res/layout/mytracks_detail.xml       |   16 +-
 MyTracks/res/layout/mytracks_layout.xml       |    2 +-
 MyTracks/res/layout/mytracks_list.xml         |    8 +-
 .../res/layout/mytracks_send_to_google.xml    |   16 +-
 .../res/layout/mytracks_waypoint_details.xml  |   64 +-
 .../res/layout/mytracks_waypoints_list.xml    |    6 +-
 MyTracks/res/layout/send_to_google_result.xml |    6 +-
 MyTracks/res/layout/sensor_state.xml          |   16 +-
 MyTracks/res/layout/stats.xml                 |   30 +-
 MyTracks/res/layout/track_widget.xml          |    6 +-
 MyTracks/res/layout/welcome.xml               |    2 +-
 MyTracks/res/menu/main.xml                    |   37 +-
 MyTracks/res/values-ca/arrays.xml             |  287 --
 MyTracks/res/values-ca/strings.xml            |  585 +--
 MyTracks/res/values-de/arrays.xml             |  285 --
 MyTracks/res/values-de/strings.xml            |  614 +--
 MyTracks/res/values-es-rES/arrays.xml         |  146 -
 MyTracks/res/values-es-rES/strings.xml        |  130 +-
 MyTracks/res/values-es/arrays.xml             |  274 --
 MyTracks/res/values-es/strings.xml            |  747 ++--
 MyTracks/res/values-fi/arrays.xml             |  271 --
 MyTracks/res/values-fi/strings.xml            |  734 ++--
 MyTracks/res/values-fr/arrays.xml             |  294 --
 MyTracks/res/values-fr/strings.xml            |  575 +--
 MyTracks/res/values-it/arrays.xml             |  266 --
 MyTracks/res/values-it/strings.xml            |  499 +--
 MyTracks/res/values-ja/arrays.xml             |  275 --
 MyTracks/res/values-ja/strings.xml            |  678 ++--
 MyTracks/res/values-pl/arrays.xml             |  275 --
 MyTracks/res/values-pl/strings.xml            |  588 +--
 MyTracks/res/values-pt-rBR/arrays.xml         |  267 --
 MyTracks/res/values-pt-rBR/strings.xml        |  466 +--
 MyTracks/res/values-ru/arrays.xml             |  275 --
 MyTracks/res/values-ru/strings.xml            |  725 ++--
 MyTracks/res/values-sv/arrays.xml             |  265 --
 MyTracks/res/values-sv/strings.xml            |  504 +--
 MyTracks/res/values-zh-rCN/arrays.xml         |  280 --
 MyTracks/res/values-zh-rCN/strings.xml        |  678 ++--
 .../res/values/arrays_do_not_translate.xml    |  251 +-
 MyTracks/res/values/do_not_translate.xml      |   80 +-
 MyTracks/res/values/keys.xml                  |    2 +-
 MyTracks/res/values/strings.xml               | 3313 ++++++++---------
 MyTracks/res/values/styles.xml                |    2 +-
 MyTracks/res/values/urls.xml                  |   21 -
 MyTracks/res/xml/preferences.xml              |  144 +-
 .../android/apps/mytracks/AccountChooser.java |   12 +-
 .../mytracks/AggregatedStatsActivity.java     |    2 +-
 .../android/apps/mytracks/AntPreference.java  |    7 +-
 .../mytracks/AutoCompleteTextPreference.java  |    2 +-
 .../android/apps/mytracks/ChartActivity.java  |    2 +-
 .../android/apps/mytracks/ChartView.java      |   14 +-
 .../android/apps/mytracks/CheckUnits.java     |    2 +-
 .../apps/mytracks/DeleteAllTracks.java        |    8 +-
 .../android/apps/mytracks/DeleteTrack.java    |    8 +-
 .../google/android/apps/mytracks/Eula.java    |    6 +-
 .../apps/mytracks/ExportAllTracks.java        |   20 +-
 .../apps/mytracks/ImportAllTracks.java        |   10 +-
 .../android/apps/mytracks/MapActivity.java    |   67 +-
 .../android/apps/mytracks/MenuManager.java    |   13 +-
 .../apps/mytracks/MyMapsListAdapter.java      |    4 +-
 .../android/apps/mytracks/MyTracks.java       |   15 +-
 .../apps/mytracks/ProgressIndicator.java      |    2 +-
 .../apps/mytracks/SettingsActivity.java       |   33 +-
 .../android/apps/mytracks/StatsActivity.java  |    2 +-
 .../android/apps/mytracks/StatsUtilities.java |   14 +-
 .../android/apps/mytracks/TrackList.java      |   52 +-
 .../android/apps/mytracks/WaypointsList.java  |   22 +-
 .../apps/mytracks/WelcomeActivity.java        |    4 +-
 .../content/DataSourcesWrapperImpl.java       |    4 +-
 .../android/apps/mytracks/io/SendToDocs.java  |   14 +-
 .../apps/mytracks/io/SendToFusionTables.java  |   23 +-
 .../apps/mytracks/io/SendToMyMaps.java        |   28 +-
 .../io/backup/BackupActivityHelper.java       |   30 +-
 .../apps/mytracks/io/docs/DocsHelper.java     |    2 +-
 .../apps/mytracks/io/file/SaveActivity.java   |   12 +-
 .../mytracks/io/file/TrackWriterImpl.java     |   12 +-
 .../io/file/WriteProgressController.java      |    4 +-
 .../apps/mytracks/io/mymaps/MapsFacade.java   |    4 +-
 .../io/sendtogoogle/ResultDialogFactory.java  |    8 +-
 .../io/sendtogoogle/SendActivity.java         |   36 +-
 .../mytracks/io/sendtogoogle/SendType.java    |    6 +-
 .../maps/TrackPathPainterFactory.java         |    7 +-
 .../services/ControlRecordingService.java     |    4 +-
 .../services/DefaultTrackNameFactory.java     |    2 +-
 .../services/TrackRecordingService.java       |   16 +-
 .../services/sensors/SensorUtils.java         |    8 +-
 .../services/tasks/StatusAnnouncerTask.java   |    6 +-
 .../apps/mytracks/util/ChartURLGenerator.java |    2 +-
 .../apps/mytracks/util/StringUtils.java       |   76 +-
 .../mytracks/widgets/TrackWidgetProvider.java |   14 +-
 .../apps/mytracks/ChartValueSeriesTest.java   |    4 +-
 .../io/docs/DocsHelper_AddTrackRowTest.java   |    4 +-
 .../mytracks/io/file/TrackWriterTest.java     |    2 +-
 .../maps/TrackPathPainterFactoryTest.java     |    6 +-
 .../services/TrackRecordingServiceTest.java   |   10 +-
 99 files changed, 4799 insertions(+), 10962 deletions(-)
 delete mode 100644 MyTracks/res/values-ca/arrays.xml
 delete mode 100644 MyTracks/res/values-de/arrays.xml
 delete mode 100644 MyTracks/res/values-es-rES/arrays.xml
 delete mode 100644 MyTracks/res/values-es/arrays.xml
 delete mode 100644 MyTracks/res/values-fi/arrays.xml
 delete mode 100644 MyTracks/res/values-fr/arrays.xml
 delete mode 100644 MyTracks/res/values-it/arrays.xml
 delete mode 100644 MyTracks/res/values-ja/arrays.xml
 delete mode 100644 MyTracks/res/values-pl/arrays.xml
 delete mode 100644 MyTracks/res/values-pt-rBR/arrays.xml
 delete mode 100755 MyTracks/res/values-ru/arrays.xml
 delete mode 100644 MyTracks/res/values-sv/arrays.xml
 delete mode 100644 MyTracks/res/values-zh-rCN/arrays.xml
 delete mode 100644 MyTracks/res/values/urls.xml

diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 3021c2eeb..6245fab09 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -20,7 +20,7 @@ limitations under the License.
           android:versionCode="33"
           android:versionName="1.1.10">
   <application android:icon="@drawable/arrow_icon"
-               android:label="@string/app_name"
+               android:label="@string/my_tracks_app_name"
                android:name="com.google.android.apps.mytracks.MyTracksApplication"
                android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent">
     <uses-library android:name="com.google.android.maps" />
@@ -35,7 +35,6 @@ limitations under the License.
               android:writePermission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
 
     <activity android:name="com.google.android.apps.mytracks.MyTracks"
-              android:label="My Tracks"
               android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
@@ -50,7 +49,6 @@ limitations under the License.
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.MapActivity"
-              android:label="MyTracks"
               android:exported="false">
       <intent-filter>
         <category android:name="android.intent.category.TAB" />
@@ -58,20 +56,18 @@ limitations under the License.
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.MyMapsList"
-              android:label="@string/map_list_title"
+              android:label="@string/my_maps_list_title"
               android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale"
               android:exported="false" />
 
     <!-- TODO: VIEW and PICK for track cursor dir -->
-    <activity android:name="com.google.android.apps.mytracks.TrackList"
-              android:label="Recorded Tracks" />
+    <activity android:name="com.google.android.apps.mytracks.TrackList" />
 
     <!-- TODO: VIEW and PICK for waypoint cursor dir -->
-    <activity android:name="com.google.android.apps.mytracks.WaypointsList"
-              android:label="Recorded Waypoints" />
+    <activity android:name="com.google.android.apps.mytracks.WaypointsList" />
 
     <activity android:name="com.google.android.apps.mytracks.TrackDetails"
-              android:label="@string/trackdetails_title">
+              android:label="@string/track_detail_title">
       <intent-filter>
         <action android:name="android.intent.action.EDIT" />
         <category android:name="android.intent.category.DEFAULT" />
@@ -91,7 +87,7 @@ limitations under the License.
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.WaypointDetails"
-              android:label="@string/waypointdetails_title">
+              android:label="@string/marker_detail_title">
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
         <action android:name="android.intent.action.EDIT" />
@@ -109,10 +105,9 @@ limitations under the License.
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.AggregatedStatsActivity"
-              android:label="@string/aggregated_stats" />
+              android:label="@string/menu_aggregated_statistics" />
 
     <activity android:name="com.google.android.apps.mytracks.StatsActivity"
-              android:label="@string/statistics"
               android:exported="false">
       <intent-filter>
         <category android:name="android.intent.category.TAB" />
@@ -120,10 +115,9 @@ limitations under the License.
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.SensorStateActivity"
-              android:label="@string/sensor_state" />
+              android:label="@string/menu_sensor_state" />
 
     <activity android:name="com.google.android.apps.mytracks.ChartActivity"
-              android:label="@string/elevation_label"
               android:exported="false">
       <intent-filter>
         <category android:name="android.intent.category.TAB" />
@@ -131,7 +125,6 @@ limitations under the License.
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.SendActivity"
-              android:label="@string/sendtogoogle_title"
               android:theme="@android:style/Theme.Translucent.NoTitleBar">
       <intent-filter>
         <action android:name="android.intent.action.SEND" />
@@ -140,7 +133,6 @@ limitations under the License.
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.io.file.SaveActivity"
-              android:label="@string/tracklist_write_to_sd"
               android:theme="@android:style/Theme.Translucent.NoTitleBar"
               android:noHistory="true">
       <intent-filter>
@@ -166,11 +158,11 @@ limitations under the License.
     </activity>
 
     <activity android:name="com.google.android.apps.mytracks.WelcomeActivity"
-              android:label="@string/welcome"
+              android:label="@string/welcome_title"
               android:exported="false" />
 
     <service android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
-             android:label="Track Recording Service"
+             android:label="@string/my_tracks_recording_service"
              android:icon="@drawable/arrow_320"
              android:enabled="true"
              android:exported="true"
@@ -229,27 +221,27 @@ limitations under the License.
   <!-- Permission to get track start/end broadcasts -->
   <permission android:name="com.google.android.apps.mytracks.TRACK_NOTIFICATIONS"
               android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/notification_permission_label"
-              android:description="@string/notification_permission_description"
+              android:label="@string/permission_notification_label"
+              android:description="@string/permission_notification_description"
               android:protectionLevel="dangerous" />
   <!-- Permission to read raw track data (points, etc.) -->
   <permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA"
               android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/read_tracks_permission_label"
-              android:description="@string/read_tracks_permission_description"
+              android:label="@string/permission_read_label"
+              android:description="@string/permission_read_description"
               android:protectionLevel="dangerous" />
   <!-- Permission to write track data, either raw or by making service calls -->
   <permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA"
               android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/write_tracks_permission_label"
-              android:description="@string/write_tracks_permission_description"
+              android:label="@string/permission_write_label"
+              android:description="@string/permission_write_description"
               android:protectionLevel="dangerous" />
 
   <!-- Permission to get MyTracks broadcasts. For internal MyTracks communication. -->
   <permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS"
               android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/notification_permission_label"
-              android:description="@string/notification_permission_label"
+              android:label="@string/permission_notification_label"
+              android:description="@string/permission_notification_label"
               android:protectionLevel="signature" />
 
   <!-- We read and write raw track data, obviously. -->
diff --git a/MyTracks/res/layout/about.xml b/MyTracks/res/layout/about.xml
index 56c721c37..74ef6aa7a 100644
--- a/MyTracks/res/layout/about.xml
+++ b/MyTracks/res/layout/about.xml
@@ -31,12 +31,12 @@ limitations under the License.
       <TextView
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:text="@string/app_name"
+        android:text="@string/my_tracks_app_name"
         android:textSize="30sp" />
       <TextView
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:text="@string/about_copyright_message"
+        android:text="@string/about_copyright_notice"
         android:textSize="15sp" />
     </LinearLayout>
   </TableRow>
@@ -67,6 +67,11 @@ limitations under the License.
         android:layout_width="wrap_content"
         android:text="@string/about_dylan"
         android:textSize="20sp" />
+      <TextView
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/about_jimmy"
+        android:textSize="20sp" />
       <TextView
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
@@ -75,7 +80,7 @@ limitations under the License.
       <TextView
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:text="@string/about_rdamazio"
+        android:text="@string/about_rodrigo"
         android:textSize="20sp" />
       <TextView
         android:layout_height="wrap_content"
@@ -100,7 +105,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:id="@+id/about_version_register"
       android:layout_width="wrap_content"
-      android:text="@string/unknown"
+      android:text="@string/value_unknown"
       android:textSize="20sp" />
   </TableRow>
 
@@ -138,7 +143,7 @@ limitations under the License.
       android:autoLink="web"
       android:layout_height="wrap_content"
       android:layout_width="wrap_content"
-      android:text="@string/about_privacy_weburl"
+      android:text="@string/my_tracks_privacy_url"
       android:textSize="18sp" />
   </TableRow>
   
diff --git a/MyTracks/res/layout/chart_settings.xml b/MyTracks/res/layout/chart_settings.xml
index 520da839a..acfec28d7 100644
--- a/MyTracks/res/layout/chart_settings.xml
+++ b/MyTracks/res/layout/chart_settings.xml
@@ -26,7 +26,7 @@ limitations under the License.
     <TextView
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:text="@string/chart_settings"
+      android:text="@string/menu_chart_view_chart_settings"
       android:textSize="20dip"
       android:textColor="#fff"
       android:layout_marginLeft="10dip"/>
@@ -57,7 +57,7 @@ limitations under the License.
             <TextView
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:text="@string/x_axis"
+              android:text="@string/chart_settings_x_axis"
               android:textSize="20dip" />
           </LinearLayout>
           <RadioGroup  android:id="@+id/chart_settings_x"
@@ -66,11 +66,11 @@ limitations under the License.
             <RadioButton android:id="@+id/chart_settings_by_distance"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:text="@string/by_distance"/>
+              android:text="@string/chart_settings_by_distance"/>
             <RadioButton android:id="@+id/chart_settings_by_time"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:text="@string/by_time"/>
+              android:text="@string/chart_settings_by_time"/>
           </RadioGroup>
         </LinearLayout>
       </TableRow>
@@ -90,34 +90,34 @@ limitations under the License.
             <TextView
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:text="@string/y_axis"
+              android:text="@string/chart_settings_y_axis"
               android:textSize="20dip" />
           </LinearLayout>
           <CheckBox android:id="@+id/chart_settings_elevation"
             android:checked="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/elevation_label"/>
+            android:text="@string/stat_elevation"/>
           <CheckBox android:id="@+id/chart_settings_speed"
             android:checked="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/speed"/>
+            android:text="@string/stat_speed"/>
           <CheckBox android:id="@+id/chart_settings_power"
             android:checked="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/power"/>
+            android:text="@string/sensor_state_power"/>
           <CheckBox android:id="@+id/chart_settings_cadence"
             android:checked="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/cadence"/>
+            android:text="@string/sensor_state_cadence"/>
           <CheckBox android:id="@+id/chart_settings_heart_rate"
             android:checked="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/heart_rate"/>
+            android:text="@string/sensor_state_heart_rate"/>
         </LinearLayout>
       </TableRow>
     </TableLayout>
@@ -126,11 +126,11 @@ limitations under the License.
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/chart_settings_ok"
       android:layout_gravity="left"
-      android:text="@string/ok"
+      android:text="@string/generic_ok"
       style="@style/Button"/>
     <Button android:id="@+id/chart_settings_cancel"
       android:layout_gravity="right"
-      android:text="@string/cancel"
+      android:text="@string/generic_cancel"
       style="@style/Button"/>
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
diff --git a/MyTracks/res/layout/list.xml b/MyTracks/res/layout/list.xml
index 33567b8d2..b137b426d 100644
--- a/MyTracks/res/layout/list.xml
+++ b/MyTracks/res/layout/list.xml
@@ -31,7 +31,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:textSize="16dip"
       android:textColor="#fff"
-      android:text="@string/select_map_message"
+      android:text="@string/my_maps_list_pick_map"
       android:layout_weight="0"/>
   </LinearLayout>
   <ListView android:id="@+id/maplist"
@@ -47,7 +47,7 @@ limitations under the License.
       android:textSize="16dip"
       android:textColor="#c00"
       android:textStyle="bold"
-      android:text="@string/mapslist_no_maps_available"
+      android:text="@string/my_maps_list_no_maps"
       android:visibility="gone"/>
     <TextView android:id="@+id/failed"
     android:layout_width="fill_parent"
@@ -58,7 +58,7 @@ limitations under the License.
     android:textSize="16dip"
     android:textColor="#c00"
     android:textStyle="bold"
-    android:text="@string/maps_list_failed"
+    android:text="@string/my_maps_list_error"
     android:visibility="gone"/>
     <LinearLayout
     android:orientation="horizontal"
@@ -89,7 +89,7 @@ limitations under the License.
           android:textSize="16dip"
           android:textColor="#fff"
           android:textStyle="bold"
-          android:text="@string/maps_list_loading"/>
+          android:text="@string/my_maps_list_loading"/>
         <TextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
diff --git a/MyTracks/res/layout/mytracks_detail.xml b/MyTracks/res/layout/mytracks_detail.xml
index db3023d8f..ceab4e7eb 100644
--- a/MyTracks/res/layout/mytracks_detail.xml
+++ b/MyTracks/res/layout/mytracks_detail.xml
@@ -20,7 +20,7 @@ limitations under the License.
   android:layout_height="fill_parent"
   android:paddingTop="10dip"
   android:background="#c000">
-  <TextView android:text="@string/trackdetails_name"
+  <TextView android:text="@string/track_detail_track_name"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"/>
   <LinearLayout
@@ -41,19 +41,19 @@ limitations under the License.
       android:autoText="true"
       android:capitalize="words"
       android:selectAllOnFocus="true"
-      android:hint="@string/trackdetails_name_hint"
+      android:hint="@string/track_detail_track_name"
       android:imeOptions="actionNext"/>
   </LinearLayout>
-  <TextView android:text="@string/trackdetails_category"
+  <TextView android:text="@string/track_detail_activity_type"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"/>
   <AutoCompleteTextView android:id="@+id/trackdetails_category"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:singleLine="true"
-    android:hint="@string/trackdetails_category_hint"
+    android:hint="@string/track_detail_activity_type_hint"
     android:imeOptions="actionNext"/>
-  <TextView android:text="@string/trackdetails_description"
+  <TextView android:text="@string/track_detail_track_description"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"/>
   <EditText android:id="@+id/trackdetails_description"
@@ -66,17 +66,17 @@ limitations under the License.
     android:maxLines="50"
     android:gravity="top"
     android:layout_weight="1"
-    android:hint="@string/trackdetails_description_hint"
+    android:hint="@string/track_detail_track_description"
     android:imeOptions="actionDone"/>
   <LinearLayout style="@style/ButtonLayout">
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/trackdetails_save"
       android:layout_gravity="left"
-      android:text="@string/save"
+      android:text="@string/generic_save"
       style="@style/Button"/>
     <Button android:id="@+id/trackdetails_cancel"
       android:layout_gravity="right"
-      android:text="@string/cancel"
+      android:text="@string/generic_cancel"
       style="@style/Button"/>
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
diff --git a/MyTracks/res/layout/mytracks_layout.xml b/MyTracks/res/layout/mytracks_layout.xml
index 96a360a25..5055ea2a5 100644
--- a/MyTracks/res/layout/mytracks_layout.xml
+++ b/MyTracks/res/layout/mytracks_layout.xml
@@ -41,7 +41,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:textSize="16dip"
       android:textColor="#fff"
-      android:text="@string/status_wait_for_gps_fix"
+      android:text="@string/gps_wait_for_fix"
       android:layout_weight="0"/>
     </LinearLayout>
     <LinearLayout android:id="@+id/busypane"
diff --git a/MyTracks/res/layout/mytracks_list.xml b/MyTracks/res/layout/mytracks_list.xml
index 3f3144c19..5a3bf21e9 100644
--- a/MyTracks/res/layout/mytracks_list.xml
+++ b/MyTracks/res/layout/mytracks_list.xml
@@ -32,7 +32,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:textSize="16dip"
       android:textColor="#fff"
-      android:text="@string/tracklist_pick_one"
+      android:text="@string/track_list_pick_one"
       android:layout_weight="0"/>
   </LinearLayout>
   <ListView android:id="@android:id/list"
@@ -43,15 +43,15 @@ limitations under the License.
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/tracklist_btn_import_all"
       android:layout_gravity="left"
-      android:text="@string/tracklist_btn_import_all"
+      android:text="@string/track_list_import_all"
       style="@style/Button"/>
     <Button android:id="@+id/tracklist_btn_export_all"
       android:layout_gravity="center_horizontal"
-      android:text="@string/tracklist_btn_export_all"
+      android:text="@string/track_list_export_all"
       style="@style/Button"/>
     <Button android:id="@+id/tracklist_btn_delete_all"
       android:layout_gravity="right"
-      android:text="@string/tracklist_btn_delete_all"
+      android:text="@string/track_list_delete_all"
       style="@style/Button"/>
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
diff --git a/MyTracks/res/layout/mytracks_send_to_google.xml b/MyTracks/res/layout/mytracks_send_to_google.xml
index cc7a0408f..6a81c260e 100644
--- a/MyTracks/res/layout/mytracks_send_to_google.xml
+++ b/MyTracks/res/layout/mytracks_send_to_google.xml
@@ -26,7 +26,7 @@ limitations under the License.
     <TextView
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:text="@string/sendtogoogle_title"
+      android:text="@string/send_google_title"
       android:textSize="20dip"
       android:textColor="#fff"
       android:layout_marginLeft="10dip"/>
@@ -55,7 +55,7 @@ limitations under the License.
           <CheckBox android:id="@+id/sendtogoogle_google_mymaps"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sendtogoogle_google_mymaps"
+            android:text="@string/send_google_my_maps"
             android:textSize="20dip"
             android:checked="true"/>
           <RadioGroup android:id="@+id/sendtogoogle_group_mymaps"
@@ -64,11 +64,11 @@ limitations under the License.
             <RadioButton android:id="@+id/sendtogoogle_create_new_map"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:text="@string/sendtogoogle_create_new_map"/>
+              android:text="@string/send_google_new_map"/>
             <RadioButton android:id="@+id/sendtogoogle_pick_existing_map"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:text="@string/sendtogoogle_pick_existing_map"/>
+              android:text="@string/send_google_existing_map"/>
           </RadioGroup>
         </LinearLayout>
       </TableRow>
@@ -86,7 +86,7 @@ limitations under the License.
           <CheckBox android:id="@+id/sendtogoogle_google_fusiontables"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sendtogoogle_google_fusiontables"
+            android:text="@string/send_google_fusion_tables"
             android:textSize="20dip"
             android:checked="true"/>
         </LinearLayout>
@@ -105,7 +105,7 @@ limitations under the License.
           <CheckBox android:id="@+id/sendtogoogle_google_docs"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sendtogoogle_google_docs"
+            android:text="@string/send_google_docs"
             android:textSize="20dip"
             android:checked="true"/>
         </LinearLayout>
@@ -116,11 +116,11 @@ limitations under the License.
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/sendtogoogle_send_now"
       android:layout_gravity="left"
-      android:text="@string/sendtogoogle_send_now"
+      android:text="@string/send_google_send_now"
       style="@style/Button"/>
     <Button android:id="@+id/sendtogoogle_cancel"
       android:layout_gravity="right"
-      android:text="@string/cancel"
+      android:text="@string/generic_cancel"
       style="@style/Button"/>
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
diff --git a/MyTracks/res/layout/mytracks_waypoint_details.xml b/MyTracks/res/layout/mytracks_waypoint_details.xml
index cad4a007a..2c63e97ae 100644
--- a/MyTracks/res/layout/mytracks_waypoint_details.xml
+++ b/MyTracks/res/layout/mytracks_waypoint_details.xml
@@ -30,7 +30,7 @@ limitations under the License.
       android:layout_width="fill_parent"
       android:layout_height="fill_parent"
       android:orientation="vertical">
-      <TextView android:text="@string/waypointdetails_name"
+      <TextView android:text="@string/marker_detail_marker_name"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"/>
       <LinearLayout
@@ -51,7 +51,7 @@ limitations under the License.
          android:autoText="true"
          android:capitalize="words"
          android:selectAllOnFocus="true"
-         android:hint="@string/waypointdetails_name_hint"
+         android:hint="@string/marker_detail_marker_name"
          android:imeOptions="actionNext"/>
       </LinearLayout>
       <LinearLayout android:id="@+id/waypointdetails_description_layout"
@@ -61,16 +61,16 @@ limitations under the License.
         android:visibility="visible"
         android:layout_weight="1">
         <TextView android:id="@+id/waypointdetails_category_label"
-          android:text="@string/waypointdetails_category"
+          android:text="@string/marker_detail_marker_type"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"/>
         <AutoCompleteTextView android:id="@+id/waypointdetails_category"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
           android:singleLine="true"
-          android:hint="@string/waypointdetails_category_hint"
+          android:hint="@string/marker_detail_marker_type_hint"
           android:imeOptions="actionNext"/>
-        <TextView android:text="@string/waypointdetails_description"
+        <TextView android:text="@string/marker_detail_marker_description"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"/>
         <EditText android:id="@+id/waypointdetails_description"
@@ -84,7 +84,7 @@ limitations under the License.
           android:maxLines="50"
           android:gravity="top"
           android:layout_weight="1"
-          android:hint="@string/waypointdetails_description_hint"
+          android:hint="@string/marker_detail_marker_description"
           android:imeOptions="actionDone"/>
       </LinearLayout>
 
@@ -101,12 +101,12 @@ limitations under the License.
             android:id="@+id/total_distance_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/total_distance_label" />
+            android:text="@string/stat_total_distance" />
           <TextView
             android:id="@+id/max_speed_label"
             android:layout_column="4"
             android:layout_span="2"
-            android:text="@string/max_speed_label" />
+            android:text="@string/stat_max_speed" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -116,7 +116,7 @@ limitations under the License.
             android:layout_column="1"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <TextView
@@ -145,7 +145,7 @@ limitations under the License.
             android:layout_column="4"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <LinearLayout
@@ -183,12 +183,12 @@ limitations under the License.
             android:id="@+id/track_time_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/total_time_label" />
+            android:text="@string/stat_total_time" />
           <TextView
             android:id="@+id/average_speed_label"
             android:layout_column="4"
             android:layout_span="2"
-            android:text="@string/average_speed_label" />
+            android:text="@string/stat_average_speed" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -201,7 +201,7 @@ limitations under the License.
             android:layout_marginTop="-9dip"
             android:layout_span="2"
             android:layout_width="fill_parent"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <TextView
@@ -217,7 +217,7 @@ limitations under the License.
             android:layout_column="4"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <LinearLayout
@@ -255,12 +255,12 @@ limitations under the License.
             android:id="@+id/moving_time_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/moving_time_label" />
+            android:text="@string/stat_moving_time" />
           <TextView
             android:id="@+id/average_moving_speed_label"
             android:layout_column="4"
             android:layout_span="2"
-            android:text="@string/average_moving_speed_label" />
+            android:text="@string/stat_average_moving_speed" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -273,7 +273,7 @@ limitations under the License.
             android:layout_marginTop="-9dip"
             android:layout_width="fill_parent"
             android:layout_span="2"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <TextView
@@ -289,7 +289,7 @@ limitations under the License.
             android:layout_column="4"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <LinearLayout
@@ -327,12 +327,12 @@ limitations under the License.
             android:id="@+id/elevation_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/elevation_label" />
+            android:text="@string/stat_elevation" />
           <TextView
             android:id="@+id/elevation_gain_label"
             android:layout_column="4"
             android:layout_span="2"
-            android:text="@string/elevation_gain_label" />
+            android:text="@string/stat_elevation_gain" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -342,7 +342,7 @@ limitations under the License.
             android:layout_column="1"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <TextView
@@ -366,7 +366,7 @@ limitations under the License.
             android:layout_column="4"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <TextView
@@ -385,12 +385,12 @@ limitations under the License.
             android:id="@+id/min_elevation_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/min_elevation_label" />
+            android:text="@string/stat_min_elevation" />
           <TextView
             android:id="@+id/max_elevation_label"
             android:layout_column="4"
             android:layout_span="3"
-            android:text="@string/max_elevation_label" />
+            android:text="@string/stat_max_elevation" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -400,7 +400,7 @@ limitations under the License.
             android:layout_column="1"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <TextView
@@ -424,7 +424,7 @@ limitations under the License.
             android:layout_column="4"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <TextView
@@ -443,12 +443,12 @@ limitations under the License.
             android:id="@+id/min_grade_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/min_grade_label" />
+            android:text="@string/stat_min_grade" />
           <TextView
             android:id="@+id/max_grade_label"
             android:layout_column="4"
             android:layout_span="2"
-            android:text="@string/max_grade_label" />
+            android:text="@string/stat_max_grade" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -461,7 +461,7 @@ limitations under the License.
             android:layout_marginTop="-9dip"
             android:layout_width="fill_parent"
             android:layout_span="2"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <TextView
@@ -480,7 +480,7 @@ limitations under the License.
             android:layout_marginTop="-9dip"
             android:layout_width="fill_parent"
             android:layout_span="2"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
         </TableRow>
@@ -491,11 +491,11 @@ limitations under the License.
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/waypointdetails_save"
       android:layout_gravity="left"
-      android:text="@string/save"
+      android:text="@string/generic_save"
       style="@style/Button"/>
     <Button android:id="@+id/waypointdetails_cancel"
       android:layout_gravity="right"
-      android:text="@string/cancel"
+      android:text="@string/generic_cancel"
       style="@style/Button"/>
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
diff --git a/MyTracks/res/layout/mytracks_waypoints_list.xml b/MyTracks/res/layout/mytracks_waypoints_list.xml
index f6773807f..944fd2c45 100644
--- a/MyTracks/res/layout/mytracks_waypoints_list.xml
+++ b/MyTracks/res/layout/mytracks_waypoints_list.xml
@@ -32,7 +32,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:textSize="16dip"
       android:textColor="#fff"
-      android:text="@string/waypointslist_pick_one"
+      android:text="@string/marker_list_pick_one"
       android:layout_weight="0"/>
   </LinearLayout>
 
@@ -44,11 +44,11 @@ limitations under the License.
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/waypointslist_btn_insert_statistics"
       android:layout_gravity="left"
-      android:text="@string/waypointslist_btn_insert_statistics"
+      android:text="@string/marker_list_insert_statistics"
       style="@style/Button"/>
     <Button android:id="@+id/waypointslist_btn_insert_waypoint"
       android:layout_gravity="right"
-      android:text="@string/waypointslist_btn_insert_waypoint"
+      android:text="@string/marker_list_insert_waypoint"
       style="@style/Button"/>
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
diff --git a/MyTracks/res/layout/send_to_google_result.xml b/MyTracks/res/layout/send_to_google_result.xml
index e457935cf..bba36ca80 100644
--- a/MyTracks/res/layout/send_to_google_result.xml
+++ b/MyTracks/res/layout/send_to_google_result.xml
@@ -31,7 +31,7 @@ services.
   <TextView
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:text="@string/sending_to_google_upload_status"
+      android:text="@string/send_google_result_header"
       style="?android:attr/textAppearanceLarge"/>
   <TableLayout
       android:layout_width="wrap_content"
@@ -52,14 +52,14 @@ services.
       android:id="@+id/send_to_google_result_comment"
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:text="@string/sending_to_google_additional_info"
+      android:text="@string/send_google_success_footer"
       android:visibility="gone"
       style="?android:attr/textAppearanceSmall"/>
   <TextView
       android:id="@+id/send_to_google_result_error"
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:text="@string/error_sending_to_google"
+      android:text="@string/send_google_error"
       android:visibility="gone"
       style="?android:attr/textAppearanceLarge"/>
 </LinearLayout>
diff --git a/MyTracks/res/layout/sensor_state.xml b/MyTracks/res/layout/sensor_state.xml
index d59b0aeb7..bf995f4b6 100644
--- a/MyTracks/res/layout/sensor_state.xml
+++ b/MyTracks/res/layout/sensor_state.xml
@@ -37,7 +37,7 @@ limitations under the License.
         <TableRow>
           <TextView
             android:layout_span="5"
-            android:text="@string/sensor_state" />
+            android:text="@string/menu_sensor_state" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -52,7 +52,7 @@ limitations under the License.
         <TableRow>
           <TextView
             android:layout_span="5"
-            android:text="@string/sensor_data_time" />
+            android:text="@string/sensor_state_last_sensor_time" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -69,7 +69,7 @@ limitations under the License.
           <TextView
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/power" />
+            android:text="@string/sensor_state_power" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -90,7 +90,7 @@ limitations under the License.
           <TextView
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/cadence" />
+            android:text="@string/sensor_state_cadence" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -110,7 +110,7 @@ limitations under the License.
           <TextView
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/heart_rate" />
+            android:text="@string/sensor_state_heart_rate" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -122,7 +122,7 @@ limitations under the License.
           <TextView
             style="@style/StatsUnitSolo"
             android:layout_column="5"
-            android:text="@string/bpm" />
+            android:text="@string/unit_beat_per_minute" />
         </TableRow>
 
         <!-- Battery Level -->
@@ -131,7 +131,7 @@ limitations under the License.
           <TextView
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/battery_level" />
+            android:text="@string/sensor_state_battery" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -143,7 +143,7 @@ limitations under the License.
           <TextView
             style="@style/StatsUnitSolo"
             android:layout_column="5"
-            android:text="@string/percent" />
+            android:text="@string/unit_percent" />
         </TableRow>
 
       </TableLayout>
diff --git a/MyTracks/res/layout/stats.xml b/MyTracks/res/layout/stats.xml
index af30d0875..985903027 100644
--- a/MyTracks/res/layout/stats.xml
+++ b/MyTracks/res/layout/stats.xml
@@ -37,7 +37,7 @@ limitations under the License.
         <TextView
           android:id="@+id/speed_label"
           android:layout_span="5"
-          android:text="@string/speed" />
+          android:text="@string/stat_speed" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
@@ -73,12 +73,12 @@ limitations under the License.
           android:id="@+id/total_distance_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/total_distance_label" />
+          android:text="@string/stat_total_distance" />
         <TextView
           android:id="@+id/max_speed_label"
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/max_speed_label" />
+          android:text="@string/stat_max_speed" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
@@ -125,12 +125,12 @@ limitations under the License.
           android:id="@+id/track_time_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/total_time_label" />
+          android:text="@string/stat_total_time" />
         <TextView
           android:id="@+id/average_speed_label"
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/average_speed_label" />
+          android:text="@string/stat_average_speed" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
@@ -171,12 +171,12 @@ limitations under the License.
           android:id="@+id/moving_time_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/moving_time_label" />
+          android:text="@string/stat_moving_time" />
         <TextView
           android:id="@+id/average_moving_speed_label"
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/average_moving_speed_label" />
+          android:text="@string/stat_average_moving_speed" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
@@ -218,12 +218,12 @@ limitations under the License.
           android:id="@+id/elevation_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/elevation_label" />
+          android:text="@string/stat_elevation" />
         <TextView
           android:id="@+id/elevation_gain_label"
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/elevation_gain_label" />
+          android:text="@string/stat_elevation_gain" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
@@ -254,12 +254,12 @@ limitations under the License.
           android:id="@+id/min_elevation_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/min_elevation_label" />
+          android:text="@string/stat_min_elevation" />
         <TextView
           android:id="@+id/max_elevation_label"
           android:layout_column="4"
           android:layout_span="3"
-          android:text="@string/max_elevation_label" />
+          android:text="@string/stat_max_elevation" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
@@ -290,12 +290,12 @@ limitations under the License.
           android:id="@+id/min_grade_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/min_grade_label" />
+          android:text="@string/stat_min_grade" />
         <TextView
           android:id="@+id/max_grade_label"
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/max_grade_label" />
+          android:text="@string/stat_max_grade" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
@@ -319,11 +319,11 @@ limitations under the License.
         <TextView
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/latitude_label" />
+          android:text="@string/stat_latitude" />
         <TextView
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/longitude_label" />
+          android:text="@string/stat_longitude" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
diff --git a/MyTracks/res/layout/track_widget.xml b/MyTracks/res/layout/track_widget.xml
index d7bb7b93e..8a0e17e75 100644
--- a/MyTracks/res/layout/track_widget.xml
+++ b/MyTracks/res/layout/track_widget.xml
@@ -52,7 +52,7 @@ limitations under the License.
           android:id="@+id/appwidget_distance_text" />
         <TextView
           style="@style/WidgetText"
-          android:text="@string/total_distance_label" />
+          android:text="@string/stat_total_distance" />
       </LinearLayout>
       <ImageView
         android:layout_width="fill_parent"
@@ -68,7 +68,7 @@ limitations under the License.
           android:id="@+id/appwidget_time_text" />
         <TextView
           style="@style/WidgetText"
-          android:text="@string/moving_time_label" />
+          android:text="@string/stat_moving_time" />
       </LinearLayout>
       <ImageView
         android:layout_width="fill_parent"
@@ -83,7 +83,7 @@ limitations under the License.
           android:id="@+id/appwidget_speed_text" />
         <TextView
           style="@style/WidgetText"
-          android:text="@string/speed" />
+          android:text="@string/stat_speed" />
       </LinearLayout>
     </LinearLayout>
   </LinearLayout>
diff --git a/MyTracks/res/layout/welcome.xml b/MyTracks/res/layout/welcome.xml
index 8bbb46444..f8fbd2164 100644
--- a/MyTracks/res/layout/welcome.xml
+++ b/MyTracks/res/layout/welcome.xml
@@ -28,7 +28,7 @@ limitations under the License.
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button android:id="@+id/welcome_ok"
       android:layout_gravity="left"
-      android:text="@string/ok"
+      android:text="@string/generic_ok"
       style="@style/Button"/>
     <Button android:id="@+id/welcome_about"
       android:layout_gravity="right"
diff --git a/MyTracks/res/menu/main.xml b/MyTracks/res/menu/main.xml
index e2a2dc395..7979d052b 100644
--- a/MyTracks/res/menu/main.xml
+++ b/MyTracks/res/menu/main.xml
@@ -1,38 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:id="@+id/menu_start_recording"
+  <item android:id="@+id/menu_record_track"
     android:icon="@drawable/ic_menu_recordtrack"
-    android:title="@string/start_recording"/>
+    android:title="@string/menu_record_track"/>
 
   <item android:id="@+id/menu_stop_recording"
     android:icon="@drawable/ic_menu_stoprecording"
-    android:title="@string/stop_recording"/>
+    android:title="@string/menu_stop_recording"/>
 
-  <item android:id="@+id/menu_list_tracks"
+  <item android:id="@+id/menu_tracks"
     android:icon="@drawable/ic_menu_tracklist"
-    android:title="@string/list_tracks"/>
+    android:title="@string/menu_tracks"/>
 
-  <item android:id="@+id/menu_list_markers"
+  <item android:id="@+id/menu_markers"
     android:icon="@drawable/ic_menu_waypoints"
-    android:title="@string/list_markers"/>
-
-  <item android:id="@+id/menu_settings"
-    android:icon="@android:drawable/ic_menu_preferences"
-    android:orderInCategory="1001"
-    android:title="@string/settings"/>
-    
-  <item android:id="@+id/menu_aggregated_stats"
-    android:orderInCategory="1002"
-    android:title="@string/aggregated_stats"/>
+    android:title="@string/menu_markers"/>
 
   <item android:id="@+id/menu_sensor_state"
     android:icon="@drawable/ic_menu_sensorstatus"
     android:orderInCategory="1000"
-    android:title="@string/sensor_state"/>
+    android:title="@string/menu_sensor_state"/>
+  
+  <item android:id="@+id/menu_settings"
+    android:icon="@android:drawable/ic_menu_preferences"
+    android:orderInCategory="1001"
+    android:title="@string/menu_settings"/>
+    
+  <item android:id="@+id/menu_aggregated_statistics"
+    android:orderInCategory="1002"
+    android:title="@string/menu_aggregated_statistics"/>
     
   <item android:id="@+id/menu_help"
     android:icon="@android:drawable/ic_menu_info_details"
     android:orderInCategory="1003"
-    android:title="@string/help"/>
-
+    android:title="@string/menu_help"/>
 </menu>
diff --git a/MyTracks/res/values-ca/arrays.xml b/MyTracks/res/values-ca/arrays.xml
deleted file mode 100644
index 693efc12b..000000000
--- a/MyTracks/res/values-ca/arrays.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Inactiu</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-    <item>60 min</item>
-  </string-array>
-
-  <!-- Minimum recording distance -->
-  <string-array name="min_recording_distance_options">
-    <item>1 m</item>
-    <item>2 m</item>
-    <item>3 m</item>
-    <item>4 m</item>
-    <item>5 m (recomanat)</item>
-    <item>10 m</item>
-    <item>100 m</item>
-  </string-array>
-
-  <string-array name="min_recording_distance_options_ft">
-    <item>3 ft</item>
-    <item>6 ft</item>
-    <item>10 ft</item>
-    <item>13 ft</item>
-    <item>16 ft (recomanat)</item>
-    <item>33 ft</item>
-    <item>328 ft</item>
-  </string-array>
-
-  <!-- Maximum recording distance -->
-  <string-array name="max_recording_distance_options">
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (recomanat)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>5000 m</item>
-  </string-array>
-
-  <string-array name="max_recording_distance_options_ft">
-    <item>164 ft</item>
-    <item>328 ft</item>
-    <item>656 ft (recomanat)</item>
-    <item>1640 ft</item>
-    <item>0.6 miles</item>
-    <item>3.1 miles</item>
-  </string-array>
-
-  <!-- Minimum recording interval -->
-  <string-array name="min_recording_interval_options">
-    <item>poca precisió (adaptable)</item>
-    <item>gran precisió (adaptable)</item>
-    <item>el millor (recomanat)</item>
-    <item>2 s</item>
-    <item>3 s</item>
-    <item>4 s</item>
-    <item>5 s</item>
-    <item>10 s</item>
-    <item>20 s</item>
-    <item>30 s</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-  </string-array>
-
-  <!-- Minimum required accuracy -->
-  <string-array name="min_required_accuracy_options">
-    <item>10 m (senyal GPS excel·lent)</item>
-    <item>20 m</item>
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (recomanat)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>2000 m</item>
-    <item>5000 m (senyal GPS pobre)</item>
-  </string-array>
-
-  <string-array name="min_required_accuracy_options_ft">
-    <item>33 ft (senyal GPS excel·lent)</item>
-    <item>66 ft</item>
-    <item>165 ft</item>
-    <item>328 ft</item>
-    <item>656 ft (recomanat)</item>
-    <item>1640 ft</item>
-    <item>0.6 miles</item>
-    <item>1.2 miles</item>
-    <item>3.1 miles (senyal GPS pobre)</item>
-  </string-array>
-
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Inactiu</item>
-    <item>100 km</item>
-    <item>50 km</item>
-    <item>25 km</item>
-    <item>10 km</item>
-    <item>5 km</item>
-    <item>1 km</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-  <string-array name="task_frequency_options_ft">
-    <item>Inactiu</item>
-    <item>100 mi</item>
-    <item>50 mi</item>
-    <item>25 mi</item>
-    <item>10 mi</item>
-    <item>5 mi</item>
-    <item>1 mi</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-  <!-- Auto-resume track timeout -->
-  <string-array name="auto_resume_track_timeout_options">
-    <item>Mai</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>Always</item>
-  </string-array>
-
-  <!-- Other non-preference arrays -->
-  <array name="activity_types">
-    <item>desconegut</item>
-    <item>tipus barrejats</item>
-    <item>altre</item>
-
-    <item>córrer</item>
-    <item>córrer al carrer</item>
-    <item>pista d\'atletisme</item>
-    <item>córrer en ruta</item>
-    <item>a peu</item>
-    <item>caminar de presa</item>
-    <item>senderisme</item>
-    <item>ruta de senderisme</item>
-    <item>senderisme fora de ruta</item>
-    <item>escalada</item>
-
-    <item>ciclisme</item>
-    <item>bici al carrer</item>
-    <item>bici de muntanya</item>
-    <item>ruta de bici</item>
-
-    <item>patinatge</item>
-    <item>patinatge en línia</item>
-    <item>skate</item>
-
-    <item>snow shoeing</item>
-    <item>skiing</item>
-    <item>snow boarding</item>
-    <item>sled</item>
-    <item>ice sailing</item>
-
-    <item>pesca</item>
-    <item>rem</item>
-    <item>caiac</item>
-    <item>rem</item>
-    <item>llanxa motora</item>
-    <item>ferry</item>
-    <item>RC boat</item>
-    <item>surf</item>
-    <item>windsurf</item>
-    <item>kitesurf</item>
-    <item>esquí aquàtic</item>
-    <item>wakeboard</item>
-
-    <item>avió</item>
-    <item>hidroavió</item>
-    <item>avió comercial</item>
-    <item>helicòpter</item>
-    <item>globus aerostàtic</item>
-    <item>dirigible</item>
-    <item>avió RC</item>
-    <item>helicòpter RC</item>
-    <item>salt d\'esquí</item>
-    <item>vol sense motor</item>
-    <item>ala delta</item>
-    <item>parapent</item>
-
-    <item>riding</item>
-    <item>horse back riding</item>
-    <item>donkey back riding</item>
-
-    <item>conducció d\'automòbil</item>
-    <item>conducció de bus</item>
-    <item>tren</item>
-    <item>moto</item>
-    <item>dirtbike</item>
-    <item>ATV</item>
-
-    <item>landsailing</item>
-    <item>frisbee</item>
-    <item>ultimate frisbee</item>
-  </array>
-
-  <array name="waypoint_types">
-    <item>ATM</item>
-    <item>banc</item>
-    <item>bar</item>
-    <item>barbeque</item>
-    <item>edifici</item>
-    <item>parada de bús</item>
-    <item>cafeteria</item>
-    <item>acampada</item>
-    <item>càmping</item>
-    <item>església</item>
-    <item>cafeteria</item>
-    <item>botiga de conveniència</item>
-    <item>aigua potable</item>
-    <item>caiguda de roques</item>
-    <item>ferry</item>
-    <item>llar de foc</item>
-    <item>estació de bombers</item>
-    <item>pesca</item>
-    <item>benzinera</item>
-    <item>camp de golf</item>
-    <item>botiga de queviures</item>
-    <item>perruqueria</item>
-    <item>port</item>
-    <item>ruta de senderisme</item>
-    <item>hotel</item>
-    <item>casa</item>
-    <item>informació</item>
-    <item>intersecció</item>
-    <item>bústia</item>
-    <item>mercat</item>
-    <item>punt de trobada</item>
-    <item>opera</item>
-    <item>parking</item>
-    <item>oficina de correus</item>
-    <item>sot</item>
-    <item>comissaria dels mossos</item>
-    <item>encreuament ferroviari</item>
-    <item>restaurant</item>
-    <item>compres</item>
-    <item>vista</item>
-    <item>magatzem</item>
-    <item>piscina</item>
-    <item>telèfon</item>
-    <item>teatre</item>
-    <item>serveis</item>
-    <item>informació turística</item>
-    <item>túnel</item>
-    <item>arbre</item>
-    <item>cascada</item>
-    <item>font d\'aigua</item>
-    <item>punt de referència</item>
-  </array>
-
-</resources>
diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index 1c94be163..3f92a445a 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -15,397 +15,202 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Used by the Menu -->
-  <string name="start_recording">Enregistra la ruta</string>
-  <string name="stop_recording">Atura l\'enregistrament</string>
-  <string name="switch_to_sat">Mode de satèl·lit</string>
-  <string name="switch_to_map">Mode de mapa</string>
-  <string name="mylocation">La meva ubicació</string>
-  <string name="list_tracks">Rutes</string>
-  <string name="list_markers">Marcadors</string>
-  <string name="delete_all_tracks">Elimina totes les rutes</string>
-  <string name="settings">Paràmetres</string>
-  <string name="elevation">Elevació</string>
-  <string name="choose_track_message">Seleccioneu la ruta que es visualitzarà</string>
-  <string name="current_track">Ruta actual</string>
-  <string name="current_segment">Darrer segment</string>
-  <string name="sensor_state">Estat del sensor</string>
-  <string name="aggregated_stats">Estadístiques agregades</string>
-
-  <!-- Error messages -->
-  <string name="error_no_location_manager">No s\'ha trobat cap gestor d\'ubicacions en aquest dispositiu.</string>
-  <string name="error_no_gps">No s\'ha trobat cap proveïdor d\'ubicació GPS en aquest dispositiu.</string>
-  <string name="error_sending_to_fusion_tables">S\'ha produït un error quan s\'enviava la ruta a Google Fusion Tables. Proveu més tard.</string>
-  <string name="error_sending_to_docs">S\'ha prdouït un error quan s\'enviava la ruta a Google Docs. Proveu més tard.</string>
-  <string name="error_unable_to_start_recording">No es pot iniciar l\'enregistrament. Proveu de nou.</string>
-  <string name="error_unable_to_stop_recording">No es pot aturar l\'enregistrament. Proveu de nou.</string>
-  <string name="error_import_unable_to_read_file">No es pot llegir des del fitxer.</string>
-  <string name="error_import_invalid_gpx_format">El fitxer no conté un format GPX vàlid.</string>
-  <string name="error_sending_to_google">S\'ha produït un error. Proveu de nou.</string>
-  <string name="error_export_track_does_not_exist">No existeix la ruta.</string>
-  <string name="error_import_out_of_memory">Aquest fitxer és massa gran (ha d\'ésser inferior a 500KB. S\'està cancel·lant.</string>
-  <string name="error_unable_to_insert_marker">No es pot inserir un marcador. No hi ha cap ubicació fixa disponible.</string>
-
-  <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">S\'està esperant per tenir una posició GPS fixa. Assegureu-vos que el cel és visible.</string>
-  <string name="status_now_recording">Ara s\'està enregistrant una ruta nova.</string>
-  <string name="status_stopped_recording">S\'ha aturat l\'enregistrament de la ruta.</string>
-  <string name="status_need_to_enable_gps">Toqueu aquí per anar als paràmetres de seguretat i ubicació i activeu \'habilita els satèl·lits GPS\'. Premeu el botó d\'anar enrere per tornar.</string>
-  <string name="status_approximate_current_location">Nota: Es mostra una ubicació determinada a partir de les xarxes sense fils i antenes telefòniques.</string>
-  <string name="status_no_current_location">No es pot determinar la ubicació. Habiliteu més fonts d\'ubicació (vegeu els paràmetres de seguretat i ubicació) i assegureu-vos que el cel és visible. Proveu de nou més tard.</string>
-  <string name="status_waypoint_inserted">S\'ha inserit un marcader de punt de ruta.</string>
-  <string name="status_marker_inserted">S\'ha inserit un marcador d\'estadístiques.</string>
-
-  <!-- Progress dialog -->
-  <string name="progress_title">Espereu...</string>
-  <string name="progress_message">S\'està enviant la ruta a Google.</string>
-  <string name="progress_message_reading_track">S\'està llegint la ruta...</string>
-  <string name="progress_message_preparing_track">S\'està preparant la ruta...</string>
-  <string name="progress_message_authenticating_fusion_tables">S\'està  to Google Fusion Tables...</string>
-  <string name="progress_message_authenticating_docs">S\'està autenticant a Google Docs...</string>
-  <string name="progress_message_sending_docs">S\'està enviant la ruta a Google Docs...</string>
-  <string name="progress_message_sending_fusion_tables">S\'està enviant a Google Fusion Tables...</string>
-  <string name="progress_message_creating_fusion_table">S\'està creant un Fusion Table nou...</string>
-  <string name="progress_message_import">S\'està imporant una ruta GPS. Això pot trigar una estona.</string>
-  <string name="progress_message_export">S\'està escrivint a la targeta SD. Això pot trigar una estona.</string>
-  <string name="progress_message_updating_track">S\'estan actualitzant les estadístiques de la ruta...</string>
-
-  <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Esteu segur?</string>
-  <string name="all_data_will_be_permanently_deleted">Tots els marcadors i rutes s\'eliminaran d\'aquest telèfon.</string>
-  <string name="track_will_be_permanently_deleted">La ruta i els seus marcadors s\'eliminaran de forma permanent d\'aquest telèfon.</string>
-  <string name="marker_will_be_permanently_deleted">El marcador s\'eliminarà de forma permanent d\'aquest telèfon.</string>
-
-  <!-- Text and links when uploading to Google My Maps -->
-  <string name="new_map_description">Creat per My Tracks a l\'Android.</string>
- 
-  <!-- Formatting of track and marker descriptions -->
-  <string name="recorded_date">Enregistrat</string>
-  <string name="category">Tipus d\'activitat</string>
-  <string name="waypoint_category">Tipus de marcador</string>
-  <string name="track_part_format">(Part %d)</string>
-
-  <!-- Used by the track recording service -->
-  <string name="recording_your_track">S\'està enregistrant la ruta...</string>
-  <string name="new_track_format">Ruta %d</string>
-
-  <!-- Common -->
-  <string name="no">No</string>
-  <string name="yes">Sí</string>
-  <string name="ok">D\'acord</string>
-  <string name="error">Error</string>
-  <string name="success">Fet</string>
-  <string name="waypoint">Punt de referència</string>
-  <string name="cancel">Cancel·la</string>
-  <string name="save">Desa</string>
-
-  <!-- Placemark labels for start and end of track -->
-  <string name="start">(Inici)</string>
-  <string name="end">(Fi)</string>
-
-  <!--  TrackList -->
-  <string name="tracklist_show_track">Mostra</string>
-  <string name="tracklist_send_to_fusiontables">Envia a Google Fusion Tables</string>
-  <string name="tracklist_send_to_new_fusiontable">Envia a un Google Fusion Table nou</string>
-  <string name="tracklist_send_to_docs">Envia a Google Docs</string>
-  <string name="tracklist_send_to_google">Envia a Google...</string>
-  <string name="tracklist_delete_track">Elimina del telèfon...</string>
-  <string name="tracklist_edit_track">Edita els detalls</string>
-  <string name="tracklist_write_to_sd">Escriu a la targeta SD...</string>
-  <string name="tracklist_save_as_gpx">Anomena i desa com un fitxer GPX</string>
-  <string name="tracklist_save_as_kml">Anomena i desa com un fitxer KML</string>
-  <string name="tracklist_save_as_csv">Anomena i desa com un fitxer CSV</string>
-  <string name="tracklist_save_as_tcx">Anomena i desa com un fitxer TCX</string>
-  <string name="tracklist_btn_send_all_to_fusiontables">Envia a Google Fusion Tables</string>
-  <string name="tracklist_btn_delete_all">Elimina totes les rutes</string>
-  <!-- Export All -->
-  <string name="tracklist_btn_export_all">Exporta totes les rutes</string>
-  <string name="export_done">Exporta les finalitzades</string>
-  <string name="tracklist_pick_one">Seleccioneu una ruta. Mantingueu el dit per veure més opcions.</string>
-  <string name="tracklist_all_tracks">Totes les rutes:</string>
-  <string name="tracklist_this_track">Aquesta ruta</string>
-  <string name="tracklist_share_track">Comparteix amb amics...</string>
-  <string name="tracklist_share_gpx_file">Un fitxer GPX</string>
-  <string name="tracklist_share_kml_file">Un fitxer KML</string>
-  <string name="tracklist_share_csv_file">Un fitxer CSV</string>
-  <string name="tracklist_share_tcx_file">Un fitxer TCX</string>
-  <string name="tracklist_clear_map">Neteja el mapa</string>
-
-  <!-- Waypoints list -->
-  <string name="waypointslist_btn_delete_all">Elimina tots els marcadors</string>
-  <string name="waypointslist_this_waypoint">Aquest marcador</string>
-  <string name="waypointslist_delete_waypoint">Elimina</string>
-  <string name="waypointslist_edit_waypoint">Edita els detalls</string>
-  <string name="waypointslist_show_waypoint">Mostra al mapa</string>
-  <string name="waypointslist_btn_insert_waypoint">Insereix un punt de referència</string>
-  <string name="waypointslist_btn_insert_statistics">Insereix estadístiques</string>
-  <string name="waypointslist_pick_one">Seleccioneu un marcador. Mantingueu el dit per veure més opcions.</string>
-
-  <!-- MyTracks Details -->
-  <string name="trackdetails_title">Detalls de la ruta</string>
-  <string name="trackdetails_name">Nom de la ruta</string>
-  <string name="trackdetails_name_hint">Nom de la ruta</string>
-  <string name="trackdetails_description">Descripció de la ruta</string>
-  <string name="trackdetails_description_hint">Descripció de la ruta</string>
-  <string name="trackdetails_category">Tipus d\'activitat (p.e. senderisme, bicicleta, còrrer, escalada...)</string>
-  <string name="trackdetails_category_hint">Tipus d\'activitat</string>
-
-  <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Detalls del marcador</string>
-  <string name="waypointdetails_name">Nom del marcador</string>
-  <string name="waypointdetails_name_hint">Nom del marcador</string>
-  <string name="waypointdetails_description">Descripció del marcador</string>
-  <string name="waypointdetails_description_hint">Descripció del marcador</string>
-  <string name="waypointdetails_category">Tipus de marcador (e.g. edifici, sot, vista...)</string>
-  <string name="waypointdetails_category_hint">Tipus de marcador</string>
-
-  <!-- MyTracks Settings -->
-  <string name="settings_title">Paràmetres de My Tracks</string>
-  <string name="settings_display">Visualització</string>
-  <string name="settings_recording">Enregistrament</string>
-  <string name="settings_sharing">Compartició</string>
-
-  <string name="settings_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>
-
-  <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_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_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_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_metric_units">Fes servir unitats mètriques</string>
-  <string name="settings_metric_units_summary_on">Totes les distàncies es mostraran en unitats mètriques</string>
-  <string name="settings_metric_units_summary_off">Totes les distàncies es mostraran en unitats imperials</string>
-
-  <string name="settings_map_public">Fes el mapa públic</string>
-  <string name="settings_map_public_summary_on">Els mapes pujats seran visibles per tothom a maps.google.com</string>
-  <string name="settings_map_public_summary_off">Els mapes pujats no es llistaran públicament a maps.google.com</string>
-
-  <string name="settings_report_speed_or_pace">Mostra la velocitat</string>
-  <string name="settings_report_speed_or_pace_summary_on">Es mostrarà la velocitat</string>
-  <string name="settings_report_speed_or_pace_summary_off">Es mostrarà el ritme de pas</string>
-
-  <string name="settings_share_url_only">Comparteix només l\'URL</string>
-  <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_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_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="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_modular_stats_display_title">Pantalla d\'estadístiques modulars</string>
-
-  <string name="settings_backup">Còpia de seguretat (BETA)</string>
-  <string name="settings_sd_backup">Còpia de seguretat a la targeta SD</string>
-  <string name="settings_backup_to_sd">Fes la còpia ara</string>
-  <string name="settings_backup_to_sd_summary">Escriu una còpia completa de totes les rutes i els paràmetres a la targeta SD</string>
-  <string name="settings_restore_from_sd">Restaura ara</string>
-  <string name="settings_restore_from_sd_summary">Restaura totes les rutes i els paràmetres des de la targeta SD.</string>
-
-  <!-- Backups -->
-  <string name="restore_overwrites_warning">La restauració d\'una còpia de seguretat des de la targeta SD sobreescriurà totes les rutes i paràmetres. Esteu segur?</string>
-  <string name="select_backup_to_restore">Seleccioneu la còpia que es restaurarà</string>
-  <string name="no_backups">No s\'ha trobat cap còpia de seguretat.</string>
-  <string name="backup_write_progress_message">S\'estan escrivint totes les rutes i els paràmetres a la targeta SD. Això pot trigar una estona...</string>
-  <string name="backup_import_progress_message">S\'estan llegint totes les rutes i els paràmetres de la targeta SD. Això pot trigar una estona...</string>
-
-  <!-- MyTracksSky -->
-  <string name="mytracks_sky">Satèl·lits GPS</string>
-
-  <!-- Sharing -->
-  <string name="share_map_subject">M\'agradaria compartir un mapa amb tu</string>
-  <string name="share_track_url_body_format">Em sembla que estaràs interessat en aquest mapa:
-
-      %s</string>
-  <string name="share_track_subject">M\'agradaria compartir una ruta amb tu</string>
-  <string name="share_track_file_body_format">Em sembla que estaràs interessat en aquesta ruta.
-
-    Per veure aquesta ruta fes servir Google Earth o altre programari de mapes.</string>
-  <string name="share_track_url">Comparteix la ruta amb amics</string>
-
-  <!-- Visibility -->
-  <string name="public_map">Públic</string>
-  <string name="unlisted_map">No llistat</string>
-  <string name="mapslist_no_maps_available">Encara no teniu cap mapa.</string>
-
-  <!-- Statistics View -->
-  <!-- Average Moving -->
-  <string name="average_moving_speed_label">Velocitat mitjana en moviment</string>
-  <string name="average_moving_pace_label">Ritme mitjà en moviment</string>
-
-  <!-- Average -->
-  <string name="average_speed_label">Velocitat mitjana</string>
-  <string name="average_pace_label">Ritme de pas mitjà</string>
-
-  <string name="elevation_chart_name">Gràfic d\'elevació</string>
-  <string name="elevation_gain_label">Guany d\'elevació</string>
-  <string name="elevation_label">Elevació</string>
-  <string name="latitude_label">Latitud</string>
-  <string name="longitude_label">Longitud</string>
-
-  <!-- Min -->
-  <string name="min_elevation_label">Elevació mínima</string>
-  <string name="min_grade_label">Grau mínim</string>
-  <string name="min_pace_label">Ritme de pas mínima</string>
-
-  <!-- Max -->
-  <string name="max_elevation_label">Elevació màxima</string>
-  <string name="max_grade_label">Grau màxim</string>
-  <string name="max_speed_label">Velocitat màxima</string>
-
-  <string name="loading_track">S\'està carregant la ruta...</string>
-
-  <!-- Chart Settings -->
-  <string name="chart_settings">Configuració del gràfic</string>
-  <!-- X Axis -->
-  <string name="x_axis">Eix X</string>
-  <string name="by_distance">Per distància</string>
-  <string name="by_time">Per temps</string>
-
-  <!-- Y Axis -->
-  <string name="y_axis">Eix Y</string>
-
-  <!-- Units -->
-  <!-- Time  -->
-  <string name="voice_hour">hora</string>
-  <string name="voice_hours">hores</string>
-  <string name="voice_minute">minut</string>
-  <string name="voice_minutes">minuts</string>
-  <string name="voice_second">segon</string>
-  <string name="voice_seconds">segons</string>
-
-  <!-- Distance -->
-  <string name="voice_kilometers">kilòmetres</string>
-  <string name="voice_miles">milles</string>
-
-  <!-- Speed and Pace -->
-  <string name="voice_kilometer_per_hour">kilòmetres per hora</string>
-  <string name="voice_per_kilometer">per kilòmetre</string>
-  <string name="voice_mile_per_hour">milles per hora</string>
-  <string name="voice_per_mile">per milla</string>
-
-  <!-- Stats Labels -->
-  <string name="moving_time_label">Temps en moviment</string>
-  <string name="total_time_label">Temps total</string>
-  <string name="time_label">Temps</string>
-  <string name="sd_unavail">La targeta SD no està disponible</string>
-  <string name="speed">Velocitat</string>
-  <string name="start_trip">Heu d\'iniciar la marxa.</string>
-  <string name="statistics">Estadístiques</string>
-  <string name="total_distance_label">Distància total</string>
-  <string name="distance_label">Distància</string>
-  <string name="power">Energia</string>
-  <string name="cadence">Cadència</string>
-  <string name="heart_rate">Freqüència cardíaca</string>
-  <string name="max_heart_rate">Freqüència cardíaca màxima</string>
-  <string name="waiting">S\'està esperant...</string>
-
-  <!-- End User License Agreement -->
-  <string name="eula_title">Acord de llicencia d\'usuari final</string>
-  <string name="accept">Accepta</string>
-  <string name="decline">Rebutja</string>
-
-  <!-- About -->
-  <string name="about">Quant a</string>
-  <string name="help">Ajuda</string>
+  <string name="about_support">Assistència:</string>
   <string name="about_team">Equip:</string>
   <string name="about_version">Versió:</string>
-  <string name="about_support">Assistència:</string>
-
-  <!-- Send to Google -->
-  <string name="sendtogoogle_title">Envia a...</string>
-  <string name="sendtogoogle_send_now">Envia ara</string>
-  <string name="sendtogoogle_send_stats">Envia les estadístiques de la ruta</string>
-  <string name="sendtogoogle_send_stats_and_points">Envia les estadístiques i els punts</string>
-
-  <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">No s\'ha trobat cap compte</string>
-  <string name="no_account_found">No s\'ha trobat cap compte on pujar les rutes.</string>
-  <string name="choose_account_title">Trieu un compte</string>
-
-  <!-- SD card -->
-  <string name="io_no_external_storage_found">No s\'ha trobat cap dispositiu d\'emmagatzematge extern. Assegureu-vos que la targeta SD està inserida i que el telèfon no està connectat a un ordinador.</string>
-  <string name="io_write_failed">No es pot escriure a un fitxer.</string>
-  <string name="io_read_failed">No es pot llegir des del fitxer.</string>
-  <string name="io_create_dir_failed">No es pot crear el directori a la targeta SD.</string>
-  <string name="io_write_finished">S\'ha finalitzat l\'escriptura a la targeta SD.</string>
-  <string name="io_read_finished">S\'ha finalitzat la lectura a la targeta SD.</string>
-
-  <!-- VersionChecker -->
-  <string name="version_check_title">Comprovació d\'actualitzacions</string>
-  <string name="version_check_upgrade_button">Actualitza ara</string>
-  <string name="version_check_continue_button">Continua sense actualitzar</string>
-  <string name="upgrade_required">La vostra versió de %1$s podria no funcionar correctament a partir d\'ara i no està suportada. Actualitzeu per continuar fent servir %1$s.</string>
-  <string name="upgrade_recommended">La vostra versió de %1$s podria no funcionar correctament a partir d\'ara. Heu d\'actualitzar-la ara o continuar fent-la servir pel vostre compte. Algunes funcionalitats com la sincronització podrien no funcionar fins que no actualitzeu.</string>
-  <string name="upgrade_available">Hi ha una nova versió disponible de %1$s. Podeu continuar fent servir la vostra versió sense cap problema, però no aconseguireu les darreres funcionalitats fins que no actualitzeu.</string>
-
-  <!-- Welcome -->
-  <string name="welcome">Benvingut</string>
-  <string name="welcome_read_later">D\'acord</string>
-  <string name="welcome_about">Quant a My Tracks</string>
-
-  <!-- Announcement -->
-  <string name="announce_no_distance">Sense distància My Tracks</string>
-  <!-- Format:
-  $1 : Distance label
-  $2 : Distance value (5)
-  $3 : Distance units (mi, km)
-  $4 : Time description (10 minutes 5 seconds)
-  $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
-  $6 : Speed units (mph) : Pace units (per mile)
-  -->
-  <string name="announce_template">My Tracks %1$s %2$.2f %3$s en %4$s at %5$s %6$s</string>
-
-  <!-- Check Units -->
-  <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="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
+  <string name="chart_settings_by_distance">Per distància</string>
+  <string name="chart_settings_by_time">Per temps</string>
+  <string name="chart_settings_x_axis">Eix X</string>
+  <string name="chart_settings_y_axis">Eix Y</string>
+  <string name="eula_accept">Accepta</string>
+  <string name="eula_decline">Rebutja</string>
+  <string name="eula_title">Acord de llicencia d\'usuari final</string>
+  <string name="export_progress_message">S\'està escrivint a la targeta SD. Això pot trigar una estona.</string>
+  <string name="export_success">Exporta les finalitzades</string>
+  <string name="generic_cancel">Cancel·la</string>
+  <string name="generic_confirm_title">Esteu segur?</string>
+  <string name="generic_error_title">Error</string>
+  <string name="generic_no">No</string>
+  <string name="generic_ok">D\'acord</string>
+  <string name="generic_progress_title">Espereu...</string>
+  <string name="generic_save">Desa</string>
+  <string name="generic_success_title">Fet</string>
+  <string name="generic_yes">Sí</string>
+  <string name="gps_need_to_enable">Toqueu aquí per anar als paràmetres de seguretat i ubicació i activeu \'habilita els satèl·lits GPS\'. Premeu el botó d\'anar enrere per tornar.</string>
+  <string name="gps_not_found">No s\'ha trobat cap proveïdor d\'ubicació GPS en aquest dispositiu.</string>
+  <string name="gps_wait_for_fix">S\'està esperant per tenir una posició GPS fixa. Assegureu-vos que el cel és visible.</string>
+  <string name="marker_detail_marker_description">Descripció del marcador</string>
+  <string name="marker_detail_marker_name">Nom del marcador</string>
+  <string name="marker_detail_marker_type">Tipus de marcador (e.g. edifici, sot, vista...)</string>
+  <string name="marker_detail_marker_type_hint">Tipus de marcador</string>
+  <string name="marker_detail_title">Detalls del marcador</string>
+  <string name="marker_insert_error">No es pot inserir un marcador. No hi ha cap ubicació fixa disponible.</string>
+  <string name="marker_insert_success">S\'ha inserit un marcador d\'estadístiques.</string>
+  <string name="marker_label_end">(Fi)</string>
+  <string name="marker_label_start">(Inici)</string>
+  <string name="marker_list_context_menu_title">Aquest marcador</string>
+  <string name="marker_list_delete_marker">Elimina</string>
+  <string name="marker_list_delete_marker_confirm_message">El marcador s\'eliminarà de forma permanent d\'aquest telèfon.</string>
+  <string name="marker_list_edit_marker">Edita els detalls</string>
+  <string name="marker_list_insert_statistics">Insereix estadístiques</string>
+  <string name="marker_list_insert_waypoint">Insereix un punt de referència</string>
+  <string name="marker_list_pick_one">Seleccioneu un marcador. Mantingueu el dit per veure més opcions.</string>
+  <string name="marker_list_show_on_map">Mostra al mapa</string>
+  <string name="marker_type_statistics">Estadístiques</string>
+  <string name="marker_type_waypoint">Punt de referència</string>
+  <string name="menu_aggregated_statistics">Estadístiques agregades</string>
+  <string name="menu_chart_view_chart_settings">Configuració del gràfic</string>
+  <string name="menu_help">Ajuda</string>
+  <string name="menu_map_view_map_mode">Mode de mapa</string>
+  <string name="menu_map_view_my_location">La meva ubicació</string>
+  <string name="menu_map_view_satellite_mode">Mode de satèl·lit</string>
+  <string name="menu_markers">Marcadors</string>
+  <string name="menu_record_track">Enregistra la ruta</string>
+  <string name="menu_sensor_state">Estat del sensor</string>
+  <string name="menu_settings">Paràmetres</string>
+  <string name="menu_stop_recording">Atura l\'enregistrament</string>
+  <string name="menu_tracks">Rutes</string>
+  <string name="my_location_approximate_location">Nota: Es mostra una ubicació determinada a partir de les xarxes sense fils i antenes telefòniques.</string>
+  <string name="my_location_no_location">No es pot determinar la ubicació. Habiliteu més fonts d\'ubicació (vegeu els paràmetres de seguretat i ubicació) i assegureu-vos que el cel és visible. Proveu de nou més tard.</string>
+  <string name="my_maps_list_no_maps">Encara no teniu cap mapa.</string>
+  <string name="my_maps_list_public_label">Públic</string>
+  <string name="my_maps_list_unlisted_label">No llistat</string>
+  <string name="sd_card_error_create_dir">No es pot crear el directori a la targeta SD.</string>
+  <string name="sd_card_error_no_storage">No s\'ha trobat cap dispositiu d\'emmagatzematge extern. Assegureu-vos que la targeta SD està inserida i que el telèfon no està connectat a un ordinador.</string>
+  <string name="sd_card_error_read_file">No es pot llegir des del fitxer.</string>
+  <string name="sd_card_error_write_file">No es pot escriure a un fitxer.</string>
+  <string name="sd_card_success_read_file">S\'ha finalitzat la lectura a la targeta SD.</string>
+  <string name="sd_card_success_write_file">S\'ha finalitzat l\'escriptura a la targeta SD.</string>
+  <string name="send_google_choose_account_title">Trieu un compte</string>
+  <string name="send_google_error">S\'ha produït un error. Proveu de nou.</string>
+  <string name="send_google_no_account_message">No s\'ha trobat cap compte on pujar les rutes.</string>
+  <string name="send_google_no_account_title">No s\'ha trobat cap compte</string>
+  <string name="send_google_progress_preparing_track">S\'està preparant la ruta...</string>
+  <string name="send_google_progress_reading_track">S\'està llegint la ruta...</string>
+  <string name="send_google_recorded">Enregistrat</string>
+  <string name="send_google_result_share_url">Comparteix la ruta amb amics</string>
+  <string name="send_google_send_now">Envia ara</string>
+  <string name="send_google_title">Envia a...</string>
+  <string name="send_google_track_part_label">(Part %d)</string>
+  <string name="sensor_state_cadence">Cadència</string>
+  <string name="sensor_state_connected">S\'ha connectat</string>
+  <string name="sensor_state_connecting">S\'està connectant</string>
+  <string name="sensor_state_disconnected">S\'ha desconnectat</string>
+  <string name="sensor_state_heart_rate">Freqüència cardíaca</string>
+  <string name="sensor_state_last_sensor_time">Dades del sensor de temps</string>
+  <string name="sensor_state_power">Energia</string>
+  <string name="sensor_state_sending">S\'està enviant</string>
+  <string name="settings_backup">Còpia de seguretat (BETA)</string>
+  <string name="settings_backup_now">Fes la còpia ara</string>
+  <string name="settings_backup_now_progress_message">S\'estan escrivint totes les rutes i els paràmetres a la targeta SD. Això pot trigar una estona...</string>
+  <string name="settings_backup_now_summary">Escriu una còpia completa de totes les rutes i els paràmetres a la targeta SD</string>
+  <string name="settings_backup_restore">Restaura ara</string>
+  <string name="settings_backup_restore_confirm_message">La restauració d\'una còpia de seguretat des de la targeta SD sobreescriurà totes les rutes i paràmetres. Esteu segur?</string>
+  <string name="settings_backup_restore_no_backup">No s\'ha trobat cap còpia de seguretat.</string>
+  <string name="settings_backup_restore_progress_message">S\'estan llegint totes les rutes i els paràmetres de la targeta SD. Això pot trigar una estona...</string>
+  <string name="settings_backup_restore_select_title">Seleccioneu la còpia que es restaurarà</string>
+  <string name="settings_backup_restore_summary">Restaura totes les rutes i els paràmetres des de la targeta SD.</string>
+  <string name="settings_backup_sd_card">Còpia de seguretat a la targeta SD</string>
+  <string name="settings_display">Visualització</string>
+  <string name="settings_display_metric">Fes servir unitats mètriques</string>
+  <string name="settings_display_metric_summary_off">Totes les distàncies es mostraran en unitats imperials</string>
+  <string name="settings_display_metric_summary_on">Totes les distàncies es mostraran en unitats mètriques</string>
+  <string name="settings_display_speed">Mostra la velocitat</string>
+  <string name="settings_display_speed_summary_off">Es mostrarà el ritme de pas</string>
+  <string name="settings_display_speed_summary_on">Es mostrarà la velocitat</string>
+  <string name="settings_recording">Enregistrament</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_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_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_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_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_recording_name">Data i hora com a nom de la ruta</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="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_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_recording_voice">Freqüència d\'avís</string>
+  <string name="settings_recording_voice_not_available">No es troba disponible a la vostra versió de l\'Android</string>
+  <string name="settings_recording_voice_summary">Temps mínim entre dos avisos de veu</string>
   <string name="settings_sensor">Opcions del sensor</string>
-
-  <!-- Bluetooth Sensor -->
-  <string name="bluetooth_connected">Connectat a %s</string>
-  <string name="bluetooth_connecting">Connexió del sensor bluetooth...</string>
-  <string name="bluetooth_not_connected">El sensor bluetooth no està connectat</string>
-
-  <!-- Sensor State -->
-  <string name="sensor_data_time">Dades del sensor de temps</string>
-  <string name="power_meter_enabled">S\'ha habilitat el mesurador de potència</string>
-  <string name="heart_rate_monitor_enabled">S\'ha habilitat el monitor de la freqüència cardíaca</string>
-  <string name="no_sensor_manager">Cap gestor de sensors</string>
-  <string name="enabled">Habilitat</string>
-  <string name="connecting">S\'està connectant</string>
-  <string name="connected">S\'ha connectat</string>
-  <string name="disconnected">S\'ha desconnectat</string>
-  <string name="no_sensor_service">Cap servei de sensor</string>
-  <string name="searching">S\'està cercant</string>
-  <string name="sending">S\'està enviant</string>
-
-  <!-- Sensor Type Options -->
-  <string name="sensor_type_option_none">Cap</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="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_sensor_type">Tipus de sensor</string>
+  <string name="settings_sensor_type_none">Cap</string>
+  <string name="settings_sensor_type_summary">El tipus de sensor al qual es connecta.</string>
+  <string name="settings_sharing">Compartició</string>
+  <string name="settings_sharing_map_public">Fes el mapa públic</string>
+  <string name="settings_sharing_map_public_summary_off">Els mapes pujats no es llistaran públicament a maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_on">Els mapes pujats seran visibles per tothom a maps.google.com</string>
+  <string name="settings_sharing_url_only">Comparteix només l\'URL</string>
+  <string name="settings_sharing_url_only_summary_off">També s\'inclouran els continguts de la ruta quan es comparteixi</string>
+  <string name="settings_title">Paràmetres de My Tracks</string>
+  <string name="share_track_file_body_format">Em sembla que estaràs interessat en aquesta ruta.\n\nPer veure aquesta ruta fes servir Google Earth o altre programari de mapes.</string>
+  <string name="share_track_subject">M\'agradaria compartir una ruta amb tu</string>
+  <string name="share_track_url_body_format">Em sembla que estaràs interessat en aquest mapa:\n\n%s</string>
+  <string name="stat_average_moving_pace">Ritme mitjà en moviment</string>
+  <string name="stat_average_moving_speed">Velocitat mitjana en moviment</string>
+  <string name="stat_average_pace">Ritme de pas mitjà</string>
+  <string name="stat_average_speed">Velocitat mitjana</string>
+  <string name="stat_elevation">Elevació</string>
+  <string name="stat_elevation_gain">Guany d\'elevació</string>
+  <string name="stat_latitude">Latitud</string>
+  <string name="stat_longitude">Longitud</string>
+  <string name="stat_max_elevation">Elevació màxima</string>
+  <string name="stat_max_grade">Grau màxim</string>
+  <string name="stat_max_speed">Velocitat màxima</string>
+  <string name="stat_min_elevation">Elevació mínima</string>
+  <string name="stat_min_grade">Grau mínim</string>
+  <string name="stat_min_pace">Ritme de pas mínima</string>
+  <string name="stat_moving_time">Temps en moviment</string>
+  <string name="stat_pace">Ritme de pas</string>
+  <string name="stat_speed">Velocitat</string>
+  <string name="stat_total_distance">Distància total</string>
+  <string name="stat_total_time">Temps total</string>
+  <string name="track_detail_activity_type">Tipus d\'activitat (p.e. senderisme, bicicleta, còrrer, escalada...)</string>
+  <string name="track_detail_activity_type_hint">Tipus d\'activitat</string>
+  <string name="track_detail_title">Detalls de la ruta</string>
+  <string name="track_detail_track_description">Descripció de la ruta</string>
+  <string name="track_detail_track_name">Nom de la ruta</string>
+  <string name="track_list_clear_map">Neteja el mapa</string>
+  <string name="track_list_context_menu_title">Aquesta ruta</string>
+  <string name="track_list_delete_all">Elimina totes les rutes</string>
+  <string name="track_list_delete_all_confirm_message">Tots els marcadors i rutes s\'eliminaran d\'aquest telèfon.</string>
+  <string name="track_list_delete_track">Elimina del telèfon...</string>
+  <string name="track_list_delete_track_confirm_message">La ruta i els seus marcadors s\'eliminaran de forma permanent d\'aquest telèfon.</string>
+  <string name="track_list_edit_track">Edita els detalls</string>
+  <string name="track_list_export_all">Exporta totes les rutes</string>
+  <string name="track_list_pick_one">Seleccioneu una ruta. Mantingueu el dit per veure més opcions.</string>
+  <string name="track_list_save_sd">Escriu a la targeta SD...</string>
+  <string name="track_list_send_google">Envia a Google...</string>
+  <string name="track_list_share_track">Comparteix amb amics...</string>
+  <string name="track_list_show_on_map">Mostra</string>
+  <string name="track_name_format">Ruta %d</string>
+  <string name="track_record_error">No es pot iniciar l\'enregistrament. Proveu de nou.</string>
+  <string name="track_record_notification">S\'està enregistrant la ruta...</string>
+  <string name="track_record_success">Ara s\'està enregistrant una ruta nova.</string>
+  <string name="voice_hour">hora</string>
+  <string name="voice_hours">hores</string>
+  <string name="voice_kilometer_per_hour">kilòmetres per hora</string>
+  <string name="voice_kilometers">kilòmetres</string>
+  <string name="voice_mile_per_hour">milles per hora</string>
+  <string name="voice_miles">milles</string>
+  <string name="voice_minute">minut</string>
+  <string name="voice_minutes">minuts</string>
+  <string name="voice_no_distance">Sense distància My Tracks</string>
+  <string name="voice_per_kilometer">per kilòmetre</string>
+  <string name="voice_per_mile">per milla</string>
+  <string name="voice_second">segon</string>
+  <string name="voice_seconds">segons</string>
+  <string name="voice_template">My Tracks %1$.2f %2$s en %3$s at %4$s %5$s</string>
+  <string name="welcome_about">Quant a My Tracks</string>
+  <string name="welcome_title">Benvingut</string>
 </resources>
diff --git a/MyTracks/res/values-de/arrays.xml b/MyTracks/res/values-de/arrays.xml
deleted file mode 100644
index f33ae9fe1..000000000
--- a/MyTracks/res/values-de/arrays.xml
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Aus</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-    <item>60 min</item>
-  </string-array>
-
-  <!-- Minimum recording distance -->
-  <string-array name="min_recording_distance_options">
-    <item>1 m</item>
-    <item>2 m</item>
-    <item>3 m</item>
-    <item>4 m</item>
-    <item>5 m (empfohlen)</item>
-    <item>10 m</item>
-    <item>100 m</item>
-  </string-array>
-
-  <string-array name="min_recording_distance_options_ft">
-    <item>3 Fuß</item>
-    <item>6 Fuß</item>
-    <item>10 Fuß</item>
-    <item>13 Fuß</item>
-    <item>16 Fuß (empfohlen)</item>
-    <item>33 Fuß</item>
-    <item>328 Fuß</item>
-  </string-array>
-
-  <!-- Maximum recording distance -->
-  <string-array name="max_recording_distance_options">
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (empfohlen)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>5000 m</item>
-  </string-array>
-
-  <string-array name="max_recording_distance_options_ft">
-    <item>164 Fuß</item>
-    <item>328 Fuß</item>
-    <item>656 Fuß (empfohlen)</item>
-    <item>1640 Fuß</item>
-    <item>0,6 Meilen</item>
-    <item>3,1 Meilen</item>
-  </string-array>
-
-  <!-- Minimum recording interval -->
-  <string-array name="min_recording_interval_options">
-    <item>batteriesparend (adaptiv)</item>
-    <item>hohe Genauigkeit (adaptiv)</item>
-    <item>maximal (empfohlen)</item>
-    <item>2 s</item>
-    <item>3 s</item>
-    <item>4 s</item>
-    <item>5 s</item>
-    <item>10 s</item>
-    <item>20 s</item>
-    <item>30 s</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-  </string-array>
-
-  <!-- Minimum required accuracy -->
-  <string-array name="min_required_accuracy_options">
-    <item>10 m (sehr gutes GPS-Signal)</item>
-    <item>20 m</item>
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (empfohlen)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>2000 m</item>
-    <item>5000 m (sehr schlechtes GPS-Signal)</item>
-  </string-array>
-
-  <string-array name="min_required_accuracy_options_ft">
-    <item>33 Fuß (sehr gutes GPS-Signal)</item>
-    <item>66 Fuß</item>
-    <item>165 Fuß</item>
-    <item>328 Fuß</item>
-    <item>656 Fuß (empfohlen)</item>
-    <item>1640 Fuß</item>
-    <item>0,6 Meilen</item>
-    <item>1,2 Meilen</item>
-    <item>3,1 Meilen (sehr schlechtes GPS-Signal)</item>
-  </string-array>
-
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Aus</item>
-    <item>100 km</item>
-    <item>50 km</item>
-    <item>25 km</item>
-    <item>10 km</item>
-    <item>5 km</item>
-    <item>1 km</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-  <string-array name="split_frequency_options_ft">
-    <item>Aus</item>
-    <item>100 Meilen</item>
-    <item>50 Meilen</item>
-    <item>25 Meilen</item>
-    <item>10 Meilen</item>
-    <item>5 Meilen</item>
-    <item>1 Meile</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-  <!-- Other non-preference arrays -->
-  <array name="activity_types">
-    <item>unbekannt</item>
-    <item>gemischt</item>
-    <item>andere</item>
-
-    <item>Jogging</item>
-    <item>Straßenlauf</item>
-    <item>Laufbahn</item>
-    <item>Geländelauf</item>
-    <item>Gehen</item>
-    <item>Gehen (Sport)</item>
-    <item>Wandern</item>
-    <item>Bergwandern</item>
-    <item>Bergsteigen</item>
-    <item>Trekking</item>
-
-    <item>Radfahren</item>
-    <item>Rennradfahren</item>
-    <item>Mountainbiking</item>
-    <item>Radwandern</item>
-
-    <item>Eislaufen</item>
-    <item>Inlineskaten</item>
-    <item>Skateboarden</item>
-
-    <item>Schneeschuhwandern</item>
-    <item>Skifahren</item>
-    <item>Snowboarden</item>
-    <item>Schlittenfahren</item>
-    <item>Eissegeln</item>
-
-    <item>Segeln</item>
-    <item>Paddeln</item>
-    <item>Kajak fahren</item>
-    <item>Kanuwandern</item>
-    <item>Rudern</item>
-    <item>Motorboot fahren</item>
-    <item>Fähre</item>
-    <item>Ferngesteuertes Boot</item>
-    <item>Surfen</item>
-    <item>Windsurfen</item>
-    <item>Kitesurfen</item>
-    <item>Wasserski</item>
-    <item>Wakeboarden</item>
-
-    <item>Flugzeug</item>
-    <item>Segelflugzeug</item>
-    <item>Wasserflugzeug</item>
-    <item>Linienflugzeug</item>
-    <item>Hubschrauber</item>
-    <item>Heißluftballon</item>
-    <item>Luftschiff</item>
-    <item>Modellflugzeug</item>
-    <item>Modellhubschrauber</item>
-    <item>Fallschirmspringen</item>
-    <item>Gleitschirmfliegen</item>
-    <item>Hängegleiten</item>
-
-    <item>Reiten</item>
-    <item>Pferdewanderung</item>
-    <item>Eselreiten</item>
-
-    <item>Auto</item>
-    <item>Bus</item>
-    <item>Zug</item>
-    <item>Motorrad</item>
-    <item>Motorroller</item>
-    <item>Motocross</item>
-    <item>Quad</item>
-
-    <item>Strandsegeln</item>
-    <item>Frisbee</item>
-    <item>Ultimate Frisbee</item>
-  </array>
-
-  <array name="waypoint_types">
-    <item>Geldautomat</item>
-    <item>Bank</item>
-    <item>Kneipe</item>
-    <item>Grill</item>
-    <item>Imbiss</item>
-    <item>Gebäude</item>
-    <item>Bushaltestelle</item>
-    <item>Straßenbahnhaltestelle</item>
-    <item>Bahnhof</item>
-    <item>S-Bahnhof</item>
-    <item>Café</item>
-    <item>Feuerstelle</item>
-    <item>Campingplatz</item>
-    <item>Zeltplatz</item>
-    <item>Kirche</item>
-    <item>Gasthaus</item>
-    <item>Kiosk</item>
-    <item>Trinkwasser</item>
-    <item>Geröll</item>
-    <item>Fähre</item>
-    <item>Feuerstelle</item>
-    <item>Feuerwache</item>
-    <item>Angelplatz</item>
-    <item>Tankstelle</item>
-    <item>Golfplatz</item>
-    <item>Lebensmittelgeschäft</item>
-    <item>Friseur</item>
-    <item>Hafen</item>
-    <item>Wanderweg</item>
-    <item>Hotel</item>
-    <item>Haus</item>
-    <item>Information</item>
-    <item>Kreuzung</item>
-    <item>Briefkasten</item>
-    <item>Marktplatz</item>
-    <item>Treffpunkt</item>
-    <item>Oper</item>
-    <item>Parkplatz</item>
-    <item>Post</item>
-    <item>Schlagloch</item>
-    <item>Polizeiwache</item>
-    <item>Bahnübergang</item>
-    <item>Restaurant</item>
-    <item>Shopping</item>
-    <item>Sehenswürdigkeit</item>
-    <item>Laden</item>
-    <item>Schwimmbad</item>
-    <item>Telefon</item>
-    <item>Theater</item>
-    <item>Toilette</item>
-    <item>Touristeninformation</item>
-    <item>Tunnel</item>
-    <item>Baum</item>
-    <item>Wasserfall</item>
-    <item>Springbrunnen</item>
-    <item>Wegpunkt</item>
-  </array>
-
-</resources>
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index fa0f01ad5..861080237 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -15,435 +15,213 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Used by the Menu -->
-  <string name="start_recording">Track aufzeichnen</string>
-  <string name="stop_recording">Aufzeichnung anhalten</string>
-  <string name="switch_to_sat">Satellitenansicht</string>
-  <string name="switch_to_map">Kartenansicht</string>
-  <string name="mylocation">Mein Aufenthaltsort</string>
-  <!--string name="list_tracks">Tracks</string-->
-  <string name="list_markers">Wegpunkte</string>
-  <string name="delete_all_tracks">Alle Tracks löschen</string>
-  <string name="settings">Einstellungen</string>
-  <string name="elevation">Höhe</string>
-  <string name="choose_track_message">Bitte wähle einen Track zur Ansicht aus</string>
-  <string name="current_track">Aktueller Track</string>
-  <string name="current_segment">Letztes Segment</string>
-  <string name="sensor_state">Sensorstatus</string>
-  <string name="aggregated_stats">Aggregierte Statistiken</string>
-
-  <!-- Error messages -->
-  <string name="error_no_location_manager">Es wurde kein Dienst zur Positionsermittlung auf diesem Gerät gefunden.</string>
-  <string name="error_no_gps">Es wurde kein GPS-Empfänger auf diesem Gerät gefunden.</string>
-  <string name="error_sending_to_fusion_tables">Beim Senden des Tracks an Google Fusion Tables ist ein Fehler aufgetreten. Bitte versuche es später noch einmal.</string>
-  <string name="error_sending_to_docs">Beim Senden des Tracks an Google Text &amp; Tabellen ist ein Fehler aufgetreten. Bitte versuche es später noch einmal.</string>
-  <string name="error_unable_to_start_recording">Start der Aufzeichnung fehlgeschlagen. Bitte versuche es noch einmal.</string>
-  <string name="error_unable_to_stop_recording">Anhalten unmöglich. Bitte versuche es noch einmal.</string>
-  <string name="error_import_unable_to_read_file">Konnte Datei nicht lesen.</string>
-  <string name="error_import_invalid_gpx_format">Datei ist nicht im GPX-Format.</string>
-  <string name="error_sending_to_google">Ein Fehler ist aufgetreten. Bitte versuche es noch einmal.</string>
-  <string name="error_export_track_does_not_exist">Track existiert nicht.</string>
-  <string name="error_import_out_of_memory">Die Datei ist zu groß (maximal 500 KB). Operation abgebrochen.</string>
-  <string name="error_unable_to_insert_marker">Der Wegpunkt kann nicht einfügt werden. Keine Positionsbestimmung möglich.</string>
-
-  <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Warte auf ein besseres GPS-Signal. Bitte stelle sicher, dass der Himmel sichtbar ist.</string>
-  <string name="status_now_recording">Ein neuer Track wird aufgezeichnet.</string>
-  <string name="status_stopped_recording">Die Aufzeichnung wurde angehalten.</string>
-  <string name="status_need_to_enable_gps">Hier berühren, um zu den Sicherheits- und Positionseinstellungen zu gelangen. Aktiviere \'GPS-Satelliten\'. Drücke dann den Zurück-Knopf, um hierher zurückzukehren.</string>
-  <string name="status_approximate_current_location">Anmerkung: Eine ungefähre Position wird angezeigt, bestimmt mittels Mobilfunkstationen und WiFi-Netzwerken.</string>
-  <string name="status_no_current_location">Die Position kann derzeit nicht bestimmt werden. Aktiviere mehr Positionsquellen (siehe Sicherheits- und Positionseinstellungen) und stelle sicher, dass der Himmel sichtbar ist.</string>
-  <string name="status_waypoint_inserted">Ein Wegpunkt wurde eingefügt.</string>
-  <string name="status_marker_inserted">Ein Statistikwegpunkt wurde eingefügt.</string>
-
-  <!-- Progress dialog -->
-  <string name="progress_title">Bitte warten…</string>
-  <string name="progress_message">Dein Track wird an Google gesendet...</string>
-  <string name="progress_message_reading_track">Lese Track...</string>
-  <string name="progress_message_preparing_track">Bereite Track vor...</string>
-  <string name="progress_message_authenticating_fusion_tables">Anmeldung bei Google Fusion Tables...</string>
-  <string name="progress_message_authenticating_docs">Anmeldung bei Google Text &amp; Tabellen...</string>
-  <string name="progress_message_sending_docs">Track wird an Google Text &amp; Tabellen gesendet...</string>
-  <string name="progress_message_sending_fusion_tables">Track wird an Google Fusion Tables gesendet...</string>
-  <string name="progress_message_creating_fusion_table">Neue \'Fusion Tabelle\' wird erstellt...</string>
-  <string name="progress_message_import">Importiere GPS-Track. Das kann ein wenig dauern.</string>
-  <string name="progress_message_export">Schreibe Datei auf SD-Karte. Das kann ein wenig dauern.</string>
-  <string name="progress_message_updating_track">Aktualisiere Trackstatistik...</string>
-
-  <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Bist Du Dir wirklich sicher?</string>
-  <string name="all_data_will_be_permanently_deleted">Alle Tracks und Wegpunkte werden endgültig von diesem Gerät gelöscht.</string>
-  <string name="track_will_be_permanently_deleted">Dieser Track und seine Wegpunkte werden endgültig von diesem Gerät gelöscht.</string>
-  <string name="marker_will_be_permanently_deleted">Dieser Wegpunkt wird endgültig von diesem Gerät gelöscht.</string>
-
-  <!-- Text and links when uploading to Google Fusion Tables -->
-  <string name="new_map_description">Erstellt von My Tracks für Android.</string>
-  
-  <!-- Formatting of track and marker descriptions -->
-  <string name="points">Punkte</string>
-  <string name="recorded_date">Aufgezeichnet am</string>
-  <string name="category">Aktivität</string>
-  <string name="waypoint_category">Art des Wegpunktes</string>
-  <string name="track_part_format">(Teil %d)</string>
-
-  <!-- Used by the track recording service -->
-  <string name="recording_your_track">Dein Track wird aufgezeichnet…</string>
-  <!--string name="new_track_format">Track %d</string-->
-
-  <!-- Common -->
-  <string name="no">Nein</string>
-  <string name="yes">Ja</string>
-  <!--string name="ok">OK</string-->
-  <string name="error">Fehler</string>
-  <string name="success">Erfolgreich</string>
-  <string name="waypoint">Wegpunkt</string>
-  <string name="license">Lizenz</string>
-  <string name="cancel">Abbrechen</string>
-  <string name="save">Sichern</string>
-
-  <!-- Placemark labels for start and end of track -->
-  <!--string name="start">(Start)</string-->
-  <string name="end">(Ende)</string>
-
-  <!--  TrackList -->
-  <string name="tracklist_show_track">Anzeigen</string>
-  <string name="tracklist_send_to_fusiontables">An eine Google Fusion Tables-Karte senden</string>
-  <string name="tracklist_send_to_new_fusiontable">An eine neue Google Fusion Tables-Karte senden</string>
-  <string name="tracklist_send_to_docs">An Google Text &amp; Tabellen senden</string>
-  <string name="tracklist_send_to_google">An Google senden…</string>
-  <string name="tracklist_delete_track">Vom Gerät löschen…</string>
-  <string name="tracklist_edit_track">Bearbeiten</string>
-  <string name="tracklist_write_to_sd">Auf SD-Karte speichern…</string>
-  <string name="tracklist_save_as_gpx">GPX-Datei exportieren</string>
-  <string name="tracklist_save_as_kml">KML-Datei exportieren</string>
-  <string name="tracklist_save_as_csv">CSV-Datei exportieren</string>
-  <string name="tracklist_save_as_tcx">TCX-Datei exportieren</string>
-  <string name="tracklist_btn_send_all_to_fusiontables">An Google Fusion Tables senden</string>
-  <string name="tracklist_btn_delete_all">Alle Tracks löschen</string>
-  <!-- Export All -->
-  <string name="tracklist_btn_export_all">Alle Tracks exportieren</string>
-  <string name="export_done">Exportieren beendet</string>
-  <string name="tracklist_pick_one">Einen Track auswählen. Lange berühren für mehr Optionen.</string>
-  <string name="tracklist_all_tracks">Alle Tracks</string>
-  <string name="tracklist_this_track">Dieser Track</string>
-  <string name="tracklist_share_track">Mit Freunden teilen…</string>
-  <string name="tracklist_share_linkfusion">Ein Link zur Google Fusion Tables-Karte</string>
-  <string name="tracklist_share_gpx_file">Eine GPX-Datei</string>
-  <string name="tracklist_share_kml_file">Eine KML-Datei</string>
-  <string name="tracklist_share_csv_file">Eine CSV-Datei</string>
-  <string name="tracklist_share_tcx_file">Eine TCX-Datei</string>
-  <string name="tracklist_clear_map">Karte zurücksetzen.</string>
-
-  <!-- Waypoints list -->
-  <string name="waypointslist_btn_delete_all">Alle Wegpunkte löschen</string>
-  <string name="waypointslist_this_waypoint">Dieser Wegpunkt</string>
-  <string name="waypointslist_delete_waypoint">Löschen</string>
-  <string name="waypointslist_edit_waypoint">Details bearbeiten</string>
-  <string name="waypointslist_show_waypoint">Auf der Karte zeigen</string>
-  <string name="waypointslist_btn_insert_waypoint">Wegpunkt einfügen</string>
-  <string name="waypointslist_btn_insert_statistics">Statistik einfügen</string>
-  <string name="waypointslist_pick_one">Wegpunkt auswählen. Lange berühren für mehr Optionen.</string>
-
-  <!-- MyTracks Details -->
-  <string name="trackdetails_title">Trackdetails</string>
-  <string name="trackdetails_name">Name</string>
-  <string name="trackdetails_name_hint">Name</string>
-  <string name="trackdetails_description">Beschreibung</string>
-  <string name="trackdetails_description_hint">Beschreibung</string>
-  <string name="trackdetails_category">Aktivität (z. B. Wandern, Fahrradfahren, Laufen, Klettern…)</string>
-  <string name="trackdetails_category_hint">Aktivität</string>
-
-  <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Wegpunktdetails</string>
-  <string name="waypointdetails_name">Wegpunktname</string>
-  <string name="waypointdetails_name_hint">Wegpunktname</string>
-  <string name="waypointdetails_description">Wegpunktbeschreibung</string>
-  <string name="waypointdetails_description_hint">Wegpunktbeschreibung</string>
-  <string name="waypointdetails_category">Art des Wegpunktes (z. B. Gebäude, Schlagloch, Sehenswürdigkeit…)</string>
-  <string name="waypointdetails_category_hint">Art des Wegpunktes</string>
-
-  <!-- MyTracks Settings -->
-  <string name="settings_title">Einstellungen für My Tracks</string>
+  <string name="about_license">Lizenz</string>
+  <string name="about_privacy">Datenschutz:</string>
+  <string name="about_support">Unterstützung:</string>
+  <string name="chart_settings_by_distance">Nach Entfernung</string>
+  <string name="chart_settings_by_time">Nach Zeit</string>
+  <string name="chart_settings_x_axis">X-Achse</string>
+  <string name="chart_settings_y_axis">Y-Achse</string>
+  <string name="eula_accept">Akzeptieren</string>
+  <string name="eula_decline">Ablehnen</string>
+  <string name="eula_title">Lizenzvereinbarung für Endverbraucher</string>
+  <string name="export_progress_message">Schreibe Datei auf SD-Karte. Das kann ein wenig dauern.</string>
+  <string name="export_success">Exportieren beendet</string>
+  <string name="generic_cancel">Abbrechen</string>
+  <string name="generic_confirm_title">Bist Du Dir wirklich sicher?</string>
+  <string name="generic_error_title">Fehler</string>
+  <string name="generic_no">Nein</string>
+  <string name="generic_progress_title">Bitte warten…</string>
+  <string name="generic_save">Sichern</string>
+  <string name="generic_success_title">Erfolgreich</string>
+  <string name="generic_yes">Ja</string>
+  <string name="gps_need_to_enable">Hier berühren, um zu den Sicherheits- und Positionseinstellungen zu gelangen. Aktiviere \'GPS-Satelliten\'. Drücke dann den Zurück-Knopf, um hierher zurückzukehren.</string>
+  <string name="gps_not_found">Es wurde kein GPS-Empfänger auf diesem Gerät gefunden.</string>
+  <string name="gps_wait_for_fix">Warte auf ein besseres GPS-Signal. Bitte stelle sicher, dass der Himmel sichtbar ist.</string>
+  <string name="marker_detail_marker_description">Wegpunktbeschreibung</string>
+  <string name="marker_detail_marker_name">Wegpunktname</string>
+  <string name="marker_detail_marker_type">Art des Wegpunktes (z. B. Gebäude, Schlagloch, Sehenswürdigkeit…)</string>
+  <string name="marker_detail_marker_type_hint">Art des Wegpunktes</string>
+  <string name="marker_detail_title">Wegpunktdetails</string>
+  <string name="marker_insert_error">Der Wegpunkt kann nicht einfügt werden. Keine Positionsbestimmung möglich.</string>
+  <string name="marker_insert_success">Ein Statistikwegpunkt wurde eingefügt.</string>
+  <string name="marker_label_end">(Ende)</string>
+  <string name="marker_list_context_menu_title">Dieser Wegpunkt</string>
+  <string name="marker_list_delete_marker">Löschen</string>
+  <string name="marker_list_delete_marker_confirm_message">Dieser Wegpunkt wird endgültig von diesem Gerät gelöscht.</string>
+  <string name="marker_list_edit_marker">Details bearbeiten</string>
+  <string name="marker_list_insert_statistics">Statistik einfügen</string>
+  <string name="marker_list_insert_waypoint">Wegpunkt einfügen</string>
+  <string name="marker_list_pick_one">Wegpunkt auswählen. Lange berühren für mehr Optionen.</string>
+  <string name="marker_list_show_on_map">Auf der Karte zeigen</string>
+  <string name="marker_type_statistics">Statistik</string>
+  <string name="marker_type_waypoint">Wegpunkt</string>
+  <string name="menu_aggregated_statistics">Aggregierte Statistiken</string>
+  <string name="menu_chart_view_chart_settings">Diagramm-Einstellungen</string>
+  <string name="menu_help">Hilfe</string>
+  <string name="menu_map_view_map_mode">Kartenansicht</string>
+  <string name="menu_map_view_my_location">Mein Aufenthaltsort</string>
+  <string name="menu_map_view_satellite_mode">Satellitenansicht</string>
+  <string name="menu_markers">Wegpunkte</string>
+  <string name="menu_record_track">Track aufzeichnen</string>
+  <string name="menu_sensor_state">Sensorstatus</string>
+  <string name="menu_settings">Einstellungen</string>
+  <string name="menu_stop_recording">Aufzeichnung anhalten</string>
+  <string name="my_location_approximate_location">Anmerkung: Eine ungefähre Position wird angezeigt, bestimmt mittels Mobilfunkstationen und WiFi-Netzwerken.</string>
+  <string name="my_location_no_location">Die Position kann derzeit nicht bestimmt werden. Aktiviere mehr Positionsquellen (siehe Sicherheits- und Positionseinstellungen) und stelle sicher, dass der Himmel sichtbar ist.</string>
+  <string name="my_maps_list_no_maps">Du hast noch keine Karten.</string>
+  <string name="my_maps_list_public_label">Öffentlich</string>
+  <string name="my_maps_list_unlisted_label">Nicht in Suchergebnissen enthalten.</string>
+  <string name="permission_notification_description">Werde benachrichtigt, wenn die Aufzeichnung eines Tracks beginnt oder anhält.</string>
+  <string name="permission_notification_label">Track-Aufzeichnungs-Benachrichtigungen empfangen</string>
+  <string name="permission_read_description">Ermöglicht das Lesen von Trackdaten wie Messpunkten oder Wegpunkten.</string>
+  <string name="permission_read_label">Aufgezeichnete Trackdaten lesen</string>
+  <string name="permission_write_description">Ermöglicht das Schreiben von Trackdaten wie beim Starten der Aufzeichnung oder beim Hinzufügen von Wegpunkten.</string>
+  <string name="permission_write_label">Aufgezeichnete Trackdaten schreiben, Starten/Anhalten des Aufzeichnens von Tracks</string>
+  <string name="sd_card_error_create_dir">Das Verzeichnis auf der SD-Karte kann nicht erstellt werden.</string>
+  <string name="sd_card_error_no_storage">Keine externes Speichermedium verfügbar. Stelle sicher, dass eine SD-Karte vorhanden ist und nicht bereits von einem Computer darauf zugegriffen wird.</string>
+  <string name="sd_card_error_read_file">Die Datei konnte nicht gelesen werden.</string>
+  <string name="sd_card_error_write_file">Die Datei kann nicht geschrieben werden.</string>
+  <string name="sd_card_success_read_file">Lesen von der SD-Karte beendet.</string>
+  <string name="sd_card_success_write_file">Der Track wurde auf die SD-Karte geschrieben.</string>
+  <string name="send_google_choose_account_title">Wähle ein Konto</string>
+  <string name="send_google_docs">Google Text &amp; Tabellen</string>
+  <string name="send_google_error">Ein Fehler ist aufgetreten. Bitte versuche es noch einmal.</string>
+  <string name="send_google_no_account_message">Kein Konto gefunden, um Tracks zu versenden.</string>
+  <string name="send_google_no_account_title">Kein Konto vorhanden</string>
+  <string name="send_google_progress_preparing_track">Bereite Track vor...</string>
+  <string name="send_google_progress_reading_track">Lese Track...</string>
+  <string name="send_google_recorded">Aufgezeichnet am</string>
+  <string name="send_google_result_share_url">Track mit Freunden teilen</string>
+  <string name="send_google_send_now">Jetzt senden</string>
+  <string name="send_google_title">Senden an…</string>
+  <string name="send_google_track_part_label">(Teil %d)</string>
+  <string name="sensor_state_battery">Akkukapazität</string>
+  <string name="sensor_state_cadence">Kadenz</string>
+  <string name="sensor_state_connected">Verbunden</string>
+  <string name="sensor_state_connecting">Verbinde...</string>
+  <string name="sensor_state_disconnected">Getrennt</string>
+  <string name="sensor_state_heart_rate">Herzfrequenz</string>
+  <string name="sensor_state_last_sensor_time">Uhrzeit</string>
+  <string name="sensor_state_power">Kraft</string>
+  <string name="sensor_state_sending">Sende...</string>
+  <string name="settings_backup">Datensicherung (BETA)</string>
+  <string name="settings_backup_now">Jetzt sichern</string>
+  <string name="settings_backup_now_progress_message">Schreibe alle Tracks und Einstellungen auf die SD-Karte. Dies kann eine Weile dauern...</string>
+  <string name="settings_backup_now_summary">Eine Kopie aller Deiner Tracks und Einstellungen auf die SD-Karte schreiben</string>
+  <string name="settings_backup_restore">Jetzt wiederherstellen</string>
+  <string name="settings_backup_restore_confirm_message">Eine Wiederherstellung von der SD-Karte ÜBERSCHREIBT alle vorhandenen Tracks und Einstellungen. Willst Du das wirklich?</string>
+  <string name="settings_backup_restore_no_backup">Keine Datensicherungen gefunden.</string>
+  <string name="settings_backup_restore_progress_message">Lese alle Tracks und Einstellungen von der SD-Karte. Dies kann eine Weile dauern...</string>
+  <string name="settings_backup_restore_select_title">Wähle die wiederherzustellende Datensicherung aus</string>
+  <string name="settings_backup_restore_summary">Alle Tracks und Einstellungen von der SD-Karte holen.</string>
+  <string name="settings_backup_sd_card">SD-Karten-Sicherung</string>
   <string name="settings_display">Anzeige</string>
+  <string name="settings_display_metric">Entfernungen in metrischen Einheiten anzeigen</string>
+  <string name="settings_display_metric_summary_off">Alle Entfernungen werden in imperialen Längeneinheiten angezeigt.</string>
+  <string name="settings_display_metric_summary_on">Alle Entfernungen werden in metrischen Einheiten angezeigt.</string>
+  <string name="settings_display_speed">Geschwindigkeitsanzeige</string>
+  <string name="settings_display_speed_summary_off">Pace wird angezeigt.</string>
+  <string name="settings_display_speed_summary_on">Geschwindigkeit wird angezeigt.</string>
   <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_announcement_frequency">Dauer zwischen Ansagen</string>
-  <string name="settings_announcement_frequency_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_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_min_recording_interval">Aufzeichnungsfrequenz</string>
-  <string name="settings_min_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_metric_units">Entfernungen in metrischen Einheiten anzeigen</string>
-  <string name="settings_metric_units_summary_on">Alle Entfernungen werden in metrischen Einheiten angezeigt.</string>
-  <string name="settings_metric_units_summary_off">Alle Entfernungen werden in imperialen Längeneinheiten angezeigt.</string>
-
-  <string name="settings_map_public">Karten auf maps.google.com veröffentlichen</string>
-  <string name="settings_map_public_summary_on">Hochgeladene Karten auf maps.google.com sind für alle sichtbar.</string>
-  <string name="settings_map_public_summary_off">Hochgeladene Karten auf maps.google.com werden nicht öffentlich sichtbar aufgelistet.</string>
-
-  <string name="settings_report_speed_or_pace">Geschwindigkeitsanzeige</string>
-  <string name="settings_report_speed_or_pace_summary_on">Geschwindigkeit wird angezeigt.</string>
-  <string name="settings_report_speed_or_pace_summary_off">Pace wird angezeigt.</string>
-
-  <string name="settings_share_url_only">Nur URL als Einladung zum Teilen senden</string>
-  <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_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_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="pace_label">Pace</string>
-
-  <string name="eclair_required">Wird nur unter Android 2.0 oder höher unterstützt</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_recording_distance">Kleinste Entfernung zwischen Punkten</string>
+  <string name="settings_recording_distance_summary">Kleinste Entfernung zwischen zwei Positionsaufzeichnungen</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_recording_interval">Aufzeichnungsfrequenz</string>
+  <string name="settings_recording_interval_summary">Kürzeste Zeit zwischen zwei Positionsaufzeichnungen</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_recording_name">Zeitstempel als Trackname</string>
+  <string name="settings_recording_name_summary_off">Tracknamen erhalten eine fortlaufende Nummer.</string>
+  <string name="settings_recording_name_summary_on">Der Trackname wird aus Datum und Zeit zum Aufzeichnungsbeginn zusammengesetzt.</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_recording_voice">Dauer zwischen Ansagen</string>
+  <string name="settings_recording_voice_not_available">In dieser Android-Version nicht verfügbar</string>
+  <string name="settings_recording_voice_summary">Kürzeste Zeit zwischen zwei Ansagen</string>
+  <string name="settings_sensor">Sensor-Einstellungen</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_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="settings_sensor_bluetooth_sensor">Bluetooth-Sensor</string>
+  <string name="settings_sensor_bluetooth_sensor_summary">Der zu verbindende Bluetoothsensor</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_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_modular_stats_display_title">Art der Datenanzeige</string>
-
-  <!-- Backups -->
-  <string name="settings_backup">Datensicherung (BETA)</string>
-  <string name="settings_sd_backup">SD-Karten-Sicherung</string>
-  <string name="settings_backup_to_sd">Jetzt sichern</string>
-  <string name="settings_backup_to_sd_summary">Eine Kopie aller Deiner Tracks und Einstellungen auf die SD-Karte schreiben</string>
-  <string name="settings_restore_from_sd">Jetzt wiederherstellen</string>
-  <string name="settings_restore_from_sd_summary">Alle Tracks und Einstellungen von der SD-Karte holen.</string>
-  <string name="settings_no_backup_while_recording">Während ein Track aufgezeichnet wird, kann nicht mit der Datensicherung gearbeitet werden.</string>
-
-  <string name="restore_overwrites_warning">Eine Wiederherstellung von der SD-Karte ÜBERSCHREIBT alle vorhandenen Tracks und Einstellungen. Willst Du das wirklich?</string>
-  <string name="select_backup_to_restore">Wähle die wiederherzustellende Datensicherung aus</string>
-  <string name="no_backups">Keine Datensicherungen gefunden.</string>
-  <string name="backup_write_progress_message">Schreibe alle Tracks und Einstellungen auf die SD-Karte. Dies kann eine Weile dauern...</string>
-  <string name="backup_import_progress_message">Lese alle Tracks und Einstellungen von der SD-Karte. Dies kann eine Weile dauern...</string>
-
-  <!-- MyTracksSky -->
-  <string name="mytracks_sky">GPS-Satelliten</string>
-
-  <!-- Sharing -->
+  <string name="settings_sensor_unpair_ant">Verbindung mit ANT Herzqrequenzmesser aufheben</string>
+  <string name="settings_sensor_unpair_srm">Verbindung mit ANT srm bridge aufheben</string>
+  <string name="settings_sharing">Mit Freunden teilen</string>
+  <string name="settings_sharing_map_public">Karten auf maps.google.com veröffentlichen</string>
+  <string name="settings_sharing_map_public_summary_off">Hochgeladene Karten auf maps.google.com werden nicht öffentlich sichtbar aufgelistet.</string>
+  <string name="settings_sharing_map_public_summary_on">Hochgeladene Karten auf maps.google.com sind für alle sichtbar.</string>
+  <string name="settings_sharing_url_only">Nur URL als Einladung zum Teilen senden</string>
+  <string name="settings_sharing_url_only_summary_off">Beim Teilen mit Freunden wird der GPS-Track selbst gesendet.</string>
+  <string name="settings_title">Einstellungen für My Tracks</string>
+  <string name="share_track_file_body_format">Vielleicht interessierst Du Dich für diese Track:\n\nDer Track kann mit Google Earth oder anderer Karten-Software visualisiert werden.</string>
   <string name="share_track_picker_title">Karte mit Freunden teilen</string>
-  <string name="share_map_subject">Ich möchte gerne eine Karte mit Dir teilen.</string>
-  <string name="share_track_url_body_format">Vielleicht interessierst Du Dich für diese Karte:
-
-      %s</string>
   <string name="share_track_subject">Ich möchte einen GPS-Track mit Dir teilen</string>
-  <string name="share_track_file_body_format">Vielleicht interessierst Du Dich für diese Track:
-
-      Der Track kann mit Google Earth oder anderer Karten-Software visualisiert werden.</string>
-  <string name="share_track_url">Track mit Freunden teilen</string>
-
-  <!-- Visibility -->
-  <string name="public_map">Öffentlich</string>
-  <string name="unlisted_map">Nicht in Suchergebnissen enthalten.</string>
-  <string name="mapslist_no_maps_available">Du hast noch keine Karten.</string>
-
-  <!-- Statistics View -->
-  <!-- Average Moving -->
-  <string name="average_moving_speed_label">Durchschnitt in Bew.</string>
-  <string name="average_moving_pace_label">Pace in Bew.</string>
-
-  <!-- Average -->
-  <string name="average_speed_label">Durchschnittsgeschw.</string>
-  <string name="average_pace_label">Durchschnitts-Pace</string>
-
-  <string name="elevation_chart_name">Höhenprofil</string>
-  <string name="elevation_gain_label">Höhengewinn</string>
-  <string name="elevation_label">Höhe</string>
-  <string name="latitude_label">Breitengrad</string>
-  <string name="longitude_label">Längengrad</string>
-
-  <!-- Min -->
-  <string name="min_elevation_label">Niedrigste Höhenlage</string>
-  <string name="min_grade_label">Minimale Steigung</string>
-  <string name="min_pace_label">Minimaler Pace</string>
-
-  <!-- Max -->
-  <string name="max_elevation_label">Höchste Höhenlage</string>
-  <string name="max_grade_label">Maximale Steigung</string>
-  <string name="max_speed_label">Max. Geschwindigkeit</string>
-
-  <string name="loading_track">Lade Track…</string>
-
-  <!-- Chart Settings -->
-  <string name="chart_settings">Diagramm-Einstellungen</string>
-  <!-- X Axis -->
-  <string name="x_axis">X-Achse</string>
-  <string name="by_distance">Nach Entfernung</string>
-  <string name="by_time">Nach Zeit</string>
-
-  <!-- Y Axis -->
-  <string name="y_axis">Y-Achse</string>
-
-  <!-- Units -->
-  <!-- Time  -->
-  <string name="voice_hour">Stunde</string>
-  <string name="voice_hours">Stunden</string>
+  <string name="share_track_url_body_format">Vielleicht interessierst Du Dich für diese Karte:\n\n%s</string>
+  <string name="stat_average_moving_pace">Pace in Bew.</string>
+  <string name="stat_average_moving_speed">Durchschnitt in Bew.</string>
+  <string name="stat_average_pace">Durchschnitts-Pace</string>
+  <string name="stat_average_speed">Durchschnittsgeschw.</string>
+  <string name="stat_elevation">Höhe</string>
+  <string name="stat_elevation_gain">Höhengewinn</string>
+  <string name="stat_latitude">Breitengrad</string>
+  <string name="stat_longitude">Längengrad</string>
+  <string name="stat_max_elevation">Höchste Höhenlage</string>
+  <string name="stat_max_grade">Maximale Steigung</string>
+  <string name="stat_max_speed">Max. Geschwindigkeit</string>
+  <string name="stat_min_elevation">Niedrigste Höhenlage</string>
+  <string name="stat_min_grade">Minimale Steigung</string>
+  <string name="stat_min_pace">Minimaler Pace</string>
+  <string name="stat_moving_time">Zeit in Bewegung</string>
+  <string name="stat_pace">Pace</string>
+  <string name="stat_speed">Geschwindigkeit</string>
+  <string name="stat_total_distance">Gesamtentfernung</string>
+  <string name="stat_total_time">Gesamtzeit</string>
+  <string name="track_detail_activity_type">Aktivität (z. B. Wandern, Fahrradfahren, Laufen, Klettern…)</string>
+  <string name="track_detail_activity_type_hint">Aktivität</string>
+  <string name="track_detail_title">Trackdetails</string>
+  <string name="track_detail_track_description">Beschreibung</string>
+  <string name="track_detail_track_name">Name</string>
+  <string name="track_list_clear_map">Karte zurücksetzen.</string>
+  <string name="track_list_context_menu_title">Dieser Track</string>
+  <string name="track_list_delete_all">Alle Tracks löschen</string>
+  <string name="track_list_delete_all_confirm_message">Alle Tracks und Wegpunkte werden endgültig von diesem Gerät gelöscht.</string>
+  <string name="track_list_delete_track">Vom Gerät löschen…</string>
+  <string name="track_list_delete_track_confirm_message">Dieser Track und seine Wegpunkte werden endgültig von diesem Gerät gelöscht.</string>
+  <string name="track_list_edit_track">Bearbeiten</string>
+  <string name="track_list_export_all">Alle Tracks exportieren</string>
+  <string name="track_list_pick_one">Einen Track auswählen. Lange berühren für mehr Optionen.</string>
+  <string name="track_list_save_sd">Auf SD-Karte speichern…</string>
+  <string name="track_list_send_google">An Google senden…</string>
+  <string name="track_list_share_track">Mit Freunden teilen…</string>
+  <string name="track_list_show_on_map">Anzeigen</string>
+  <string name="track_record_error">Start der Aufzeichnung fehlgeschlagen. Bitte versuche es noch einmal.</string>
+  <string name="track_record_notification">Dein Track wird aufgezeichnet…</string>
+  <string name="track_record_success">Ein neuer Track wird aufgezeichnet.</string>
+  <string name="unit_feet">Fuß</string>
   <string name="unit_hour">Std</string>
   <string name="unit_minute">Min</string>
+  <string name="voice_hour">Stunde</string>
+  <string name="voice_hours">Stunden</string>
+  <string name="voice_kilometer_per_hour">Kilometer pro Stunde</string>
+  <string name="voice_kilometers">Kilometer</string>
+  <string name="voice_mile_per_hour">Meilen pro Stunde</string>
+  <string name="voice_miles">Meilen</string>
   <string name="voice_minute">Minute</string>
   <string name="voice_minutes">Minuten</string>
+  <string name="voice_no_distance">My Tracks keine Entfernung</string>
+  <string name="voice_per_kilometer">pro Kilometer</string>
+  <string name="voice_per_mile">pro Meile</string>
   <string name="voice_second">Sekunde</string>
   <string name="voice_seconds">Sekunden</string>
-  <!--string name="milliseconds">ms</string-->
-
-  <!-- Distance -->
-  <!--string name="unit_meter">m</string-->
-  <!--string name="unit_kilometer">km</string-->
-  <string name="voice_kilometers">Kilometer</string>
-  <string name="unit_feet">Fuß</string>
-  <!--string name="unit_mile">mi</string-->
-  <string name="voice_miles">Meilen</string>
-
-  <!-- Speed and Pace -->
-  <!--string name="kilometer_per_hour">km/h</string-->
-  <string name="voice_kilometer_per_hour">Kilometer pro Stunde</string>
-  <!--string name="min_per_kilometer">min/km</string-->
-  <string name="voice_per_kilometer">pro Kilometer</string>
-  <!--string name="mile_per_hour">mi/h</string-->
-  <string name="voice_mile_per_hour">Meilen pro Stunde</string>
-  <!--string name="min_per_mile">min/mi</string-->
-  <string name="voice_per_mile">pro Meile</string>
-
-  <!-- Sensors -->
-  <!--string name="watts">W</string-->
-
-  <!--string name="revolutions_per_minute">rpm</string-->
-  <!--string name="bpm">bpm</string-->
-  <string name="battery_level">Akkukapazität</string>
-
-  <!-- Stats Labels -->
-  <string name="moving_time_label">Zeit in Bewegung</string>
-  <string name="total_time_label">Gesamtzeit</string>
-  <string name="time_label">Zeit</string>
-  <string name="sd_unavail">SD-Karte nicht verfügbar</string>
-  <string name="speed">Geschwindigkeit</string>
-  <string name="start_trip">Du musst erst eine Aufzeichnung beginnen.</string>
-  <string name="statistics">Statistik</string>
-  <string name="total_distance_label">Gesamtentfernung</string>
-  <string name="distance_label">Entfernung</string>
-  <string name="power">Kraft</string>
-  <string name="cadence">Kadenz</string>
-  <string name="heart_rate">Herzfrequenz</string>
-  <string name="max_heart_rate">Höchste Herzfrequenz</string>
-  <!--string name="unknown">-</string-->
-  <string name="waiting">Bitte warten…</string>
-
-  <!-- End User License Agreement -->
-  <string name="eula_title">Lizenzvereinbarung für Endverbraucher</string>
-  <string name="accept">Akzeptieren</string>
-  <string name="decline">Ablehnen</string>
-
-  <!-- About -->
-  <string name="about">Über</string>
-  <string name="help">Hilfe</string>
-  <!--string name="about_team">Team:</string-->
-  <!--string name="about_version">Version:</string-->
-  <string name="about_support">Unterstützung:</string>
-  <string name="about_privacy">Datenschutz:</string>
-
-  <!-- Send to Google -->
-  <string name="sendtogoogle_title">Senden an…</string>
-  <!--string name="sendtogoogle_google_fusiontables">Google Fusion Tables</string-->
-  <string name="sendtogoogle_google_docs">Google Text &amp; Tabellen</string>
-  <string name="sendtogoogle_send_now">Jetzt senden</string>
-  <string name="sendtogoogle_send_stats">Trackstatistik senden</string>
-  <string name="sendtogoogle_send_stats_and_points">Statistik und Punkte senden</string>
-
-  <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Kein Konto vorhanden</string>
-  <string name="no_account_found">Kein Konto gefunden, um Tracks zu versenden.</string>
-  <string name="choose_account_title">Wähle ein Konto</string>
-
-  <!-- SD card -->
-  <string name="io_no_external_storage_found">Keine externes Speichermedium verfügbar. Stelle sicher, dass eine SD-Karte vorhanden ist und nicht bereits von einem Computer darauf zugegriffen wird.</string>
-  <string name="io_write_failed">Die Datei kann nicht geschrieben werden.</string>
-  <string name="io_read_failed">Die Datei konnte nicht gelesen werden.</string>
-  <string name="io_create_dir_failed">Das Verzeichnis auf der SD-Karte kann nicht erstellt werden.</string>
-  <string name="io_write_finished">Der Track wurde auf die SD-Karte geschrieben.</string>
-  <string name="io_read_finished">Lesen von der SD-Karte beendet.</string>
-
-  <!-- VersionChecker -->
-  <string name="version_check_title">Suche nach neuer Version</string>
-  <string name="version_check_upgrade_button">Jetzt aktualisieren</string>
-  <string name="version_check_continue_button">Fortfahren, ohne zu aktualisieren</string>
-  <string name="upgrade_required">Deine Version von %1$s funktioniert möglicherweise nicht mehr richtig und wird nicht mehr unterstützt. Bitte aktualisiere %1$s.</string>
-  <string name="upgrade_recommended">Deine Version von %1$s funktioniert möglicherweise nicht mehr richtig. Du kannst sie jetzt aktualisieren, oder auf sie auf eigene Gefahr weiterverwenden. Einige Funktionen wie Datenaustausch mit Google-Diensten werden möglicherweise nicht mehr funktionieren, solange Du die Software nicht aktualisierst.</string>
-  <string name="upgrade_available">Eine neue Version von %1$s ist jetzt verfügbar. Du kannst Deine installierte Version ohne Probleme weiterverwenden, aber um die neuesten Funktionen in Anspruch nehmen zu können, musst Du die Software aktualisieren.</string>
-
-  <!-- Welcome -->
-  <string name="welcome">Willkommen</string>
-  <string name="welcome_read_later">OK</string>
+  <string name="voice_template">My Tracks %1$.2f %2$s in %3$s mit %4$s %5$s</string>
   <string name="welcome_about">Über My Tracks</string>
-
-  <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks keine Entfernung</string>
-  <!-- Format:
-  $1 : Distance label
-  $2 : Distance value (5)
-  $3 : Distance units (mi, km)
-  $4 : Time description (10 minutes 5 seconds)
-  $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
-  $6 : Speed units (mph) : Pace units (per mile)
-  -->
-  <string name="announce_template">My Tracks %1$s %2$.2f %3$s in %4$s mit %5$s %6$s</string>
-
-  <!-- Check Units -->
-  <string name="check_units_title">Einheitenbenachrichtigung</string>
-
-  <!-- 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="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string-->
-  <string name="settings_sensor">Sensor-Einstellungen</string>
-
-  <!-- Bluetooth Sensor -->
-  <string name="bluetooth_connected">Verbunden mit %s</string>
-  <string name="bluetooth_connecting">Verbinde mit Bluetooth-Sensor ...</string>
-  <string name="bluetooth_not_connected">Bluetooth-Sensor nicht verbunden.</string>
-
-  <!-- Sensor State -->
-  <string name="sensor_data_time">Uhrzeit</string>
-  <string name="power_meter_enabled">Kraftmesser aktiviert</string>
-  <string name="heart_rate_monitor_enabled">Herzfrequenzmessung aktiviert</string>
-  <string name="no_sensor_manager">Keine Sensoren verfügbar</string>
-  <string name="enabled">Aktiviert</string>
-  <string name="connecting">Verbinde...</string>
-  <string name="connected">Verbunden</string>
-  <string name="disconnected">Getrennt</string>
-  <string name="no_sensor_service">Kein Sensor-Dienst</string>
-  <string name="searching">Suche...</string>
-  <string name="sending">Sende...</string>
-
-  <!-- Manifest description (not seen inside the app) -->
-  <string name="notification_permission_label">Track-Aufzeichnungs-Benachrichtigungen empfangen</string>
-  <string name="read_tracks_permission_label">Aufgezeichnete Trackdaten lesen</string>
-  <string name="write_tracks_permission_label">Aufgezeichnete Trackdaten schreiben, Starten/Anhalten des Aufzeichnens von Tracks</string>
-  <string name="notification_permission_description">Werde benachrichtigt, wenn die Aufzeichnung eines Tracks beginnt oder anhält.</string>
-  <string name="read_tracks_permission_description">Ermöglicht das Lesen von Trackdaten wie Messpunkten oder Wegpunkten.</string>
-  <string name="write_tracks_permission_description">Ermöglicht das Schreiben von Trackdaten wie beim Starten der Aufzeichnung oder beim Hinzufügen von Wegpunkten.</string>
+  <string name="welcome_title">Willkommen</string>
 </resources>
diff --git a/MyTracks/res/values-es-rES/arrays.xml b/MyTracks/res/values-es-rES/arrays.xml
deleted file mode 100644
index cb7c0b79a..000000000
--- a/MyTracks/res/values-es-rES/arrays.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-  <!-- Other non-preference arrays -->
-  <array name="activity_types">
-    <item>desconocido</item>
-    <item>tipo mixto</item>
-    <item>otro</item>
-
-    <item>correr</item>
-    <item>correr en calle</item>
-    <item>correr en pista</item>
-    <item>correr en senda</item>
-    <item>caminar</item>
-    <item>caminar rápido</item>
-    <item>excursión</item>
-    <item>excursión por sendas</item>
-    <item>excursión campo a través</item>
-    <item>escalando</item>
-
-    <item>bicicleta</item>
-    <item>bicicleta de carreras</item>
-    <item>bicicleta de montaña</item>
-    <item>bicicleta de pista</item>
-
-    <item>patinando</item>
-    <item>patinando inline</item>
-    <item>skate boarding</item>
-
-    <item>caminata sobre nieve</item>
-    <item>esquiando</item>
-    <item>snow boarding</item>
-    <item>trineo</item>
-    <item>navegando sobre hielo</item>
-
-    <item>navegando</item>
-    <item>en canoa</item>
-    <item>en kayak</item>
-    <item>remo</item>
-    <item>bote de motor</item>
-    <item>transbordador</item>
-    <item>barco teledirigido</item>
-    <item>surfeando</item>
-    <item>wind surfing</item>
-    <item>kite surfing</item>
-    <item>esquí aquático</item>
-    <item>wake boarding</item>
-
-    <item>avión</item>
-    <item>hidroavión</item>
-    <item>avión comercial</item>
-    <item>helicóptero</item>
-    <item>globo aerostático</item>
-    <item>dirigible</item>
-    <item>avión teledirigido</item>
-    <item>helicóptero teledirigido</item>
-    <item>paracaidismo</item>
-    <item>planeador</item>
-    <item>hang gliding</item>
-    <item>para gliding</item>
-
-    <item>montando</item>
-    <item>montando caballo</item>
-    <item>montando burro</item>
-
-    <item>conduciendo coche</item>
-    <item>conduciendo autobús</item>
-    <item>tren</item>
-    <item>moto</item>
-    <item>moto cross</item>
-    <item>ATV</item>
-
-    <item>navegando sobre tierra</item>
-    <item>frisbee</item>
-    <item>ultimate frisbee</item>
-  </array>
-
-  <array name="waypoint_types">
-    <item>cajero automático</item>
-    <item>banco</item>
-    <item>bar</item>
-    <item>barbacoa</item>
-    <item>edificio</item>
-    <item>parada de autobús</item>
-    <item>café</item>
-    <item>fogata</item>
-    <item>campamento</item>
-    <item>iglesia</item>
-    <item>café</item>
-    <item>tienda de abarrotes</item>
-    <item>agua potable</item>
-    <item>derrumbamiento</item>
-    <item>transbordador</item>
-    <item>chimenea</item>
-    <item>estación de bomberos</item>
-    <item>pesca</item>
-    <item>gasolinera</item>
-    <item>campo de golf</item>
-    <item>tienda de abarrotes</item>
-    <item>salon de belleza</item>
-    <item>puerto</item>
-    <item>senda</item>
-    <item>hotel</item>
-    <item>casa</item>
-    <item>información</item>
-    <item>intersección</item>
-    <item>buzón de correos</item>
-    <item>mercado</item>
-    <item>punto de encuentro</item>
-    <item>ópera</item>
-    <item>aparcamiento</item>
-    <item>oficina de correos</item>
-    <item>bache</item>
-    <item>comisaría de policía</item>
-    <item>cruce de vía de tren</item>
-    <item>restaurante</item>
-    <item>mall</item>
-    <item>lugar de interés</item>
-    <item>tienda</item>
-    <item>piscina</item>
-    <item>teléfono</item>
-    <item>teatro</item>
-    <item>baño</item>
-    <item>información turística</item>
-    <item>túnel</item>
-    <item>árbol</item>
-    <item>cascada</item>
-    <item>fuente de agua</item>
-    <item>camino</item>
-  </array>
-
-</resources>
diff --git a/MyTracks/res/values-es-rES/strings.xml b/MyTracks/res/values-es-rES/strings.xml
index f1f0aa237..d22e1a99b 100644
--- a/MyTracks/res/values-es-rES/strings.xml
+++ b/MyTracks/res/values-es-rES/strings.xml
@@ -15,119 +15,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Used by the Menu -->
-  <string name="list_markers">Señales</string>
-
-  <!-- Error messages -->
-
-  <!-- Status messages -->
-
-  <!-- Progress dialog -->
-
-  <!-- Used by DeleteAllDataHandler -->
-
-  <!-- Text and links when uploading to Google Fusion Tables -->
-
-  <!-- Formatting of track and marker descriptions -->
-
-  <!-- Used by the track recording service -->
-
-  <!-- Common -->
-  <string name="license">Licencia</string>
-  <string name="save">Guardar</string>
-
-  <!-- Placemark labels for start and end of track -->
-
-  <!--  TrackList -->
-  <string name="tracklist_send_to_fusiontables">Enviar a Google Fusion Tables</string>
-  <string name="tracklist_send_to_new_fusiontable">Enviar a nueva Google Fusion Table</string>
-  <string name="tracklist_save_as_csv">Guardar en archivo CSV</string>
-  <string name="tracklist_save_as_tcx">Guardar en archivo TCX</string>
-  <string name="tracklist_btn_send_all_to_fusiontables">Enviar a Google Fusion Tables</string>
-  <!-- Export All -->
-  <string name="tracklist_share_csv_file">Un archivo CSV</string>
-  <string name="tracklist_share_tcx_file">Un archivo TCX</string>
-
-  <!-- Waypoints list -->
-
-  <!-- MyTracks Details -->
-
-  <!-- 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_report_speed_or_pace">Mostrar velocidad</string>
-
-  <!-- Backups -->
-
-  <!-- MyTracksSky -->
-
-  <!-- Sharing -->
-
-  <!-- Visibility -->
-
-  <!-- Statistics View -->
-  <!-- Average Moving -->
-
-  <!-- Average -->
-
-  <!-- Min -->
-
-  <!-- Max -->
-
-  <!-- Chart Settings -->
-  <!-- X Axis -->
-
-  <!-- Y Axis -->
-
-  <!-- Units -->
-  <!-- Time  -->
-
-  <!-- Distance -->
-
-  <!-- Speed and Pace -->
-
-  <!-- Sensors -->
-
-  <!-- Stats Labels -->
-
-  <!-- End User License Agreement -->
-
-  <!-- About -->
-  <string name="about_version">Versión:</string>
-  <string name="about_support">Soporte:</string>
+  <string name="about_license">Licencia</string>
   <string name="about_privacy">Privacidad:</string>
-
-  <!-- Send to Google -->
-
-  <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">No se ha encontrado la cuenta</string>
-  <string name="no_account_found">No se ha encontrado la cuenta a la que subir los recorridos.</string>
-  <string name="choose_account_title">Elegir cuenta</string>
-
-  <!-- SD card -->
-  <string name="io_read_failed">No es posible leer del fichero.</string>
-  <string name="io_write_finished">Grabación a tarjeta SD terminada.</string>
-  <string name="io_read_finished">Lectura de tarjeta SD terminada.</string>
-
-  <!-- VersionChecker -->
-
-  <!-- Welcome -->
-
-  <!-- Announcement -->
-  <!-- Format:
-  $1 : Distance label
-  $2 : Distance value (5)
-  $3 : Distance units (mi, km)
-  $4 : Time description (10 minutes 5 seconds)
-  $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
-  $6 : Speed units (mph) : Pace units (per mile)
-  -->
-
-  <!-- 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="about_support">Soporte:</string>
+  <string name="about_version">Versión:</string>
+  <string name="generic_save">Guardar</string>
+  <string name="menu_markers">Señales</string>
+  <string name="sd_card_error_read_file">No es posible leer del fichero.</string>
+  <string name="sd_card_success_read_file">Lectura de tarjeta SD terminada.</string>
+  <string name="sd_card_success_write_file">Grabación a tarjeta SD terminada.</string>
+  <string name="send_google_choose_account_title">Elegir cuenta</string>
+  <string name="send_google_no_account_message">No se ha encontrado la cuenta a la que subir los recorridos.</string>
+  <string name="send_google_no_account_title">No se ha encontrado la cuenta</string>
+  <string name="settings_display_speed">Mostrar velocidad</string>
+  <string name="settings_recording_voice_not_available">No está disponible en su versión de Android</string>
+  <string name="settings_sensor_type_ant">ANT+ Sensores</string>
+  <string name="settings_sensor_type_none">Ninguna</string>
+  <string name="settings_sensor_type_srm">SRM ANT+ Puente</string>
 </resources>
diff --git a/MyTracks/res/values-es/arrays.xml b/MyTracks/res/values-es/arrays.xml
deleted file mode 100644
index 41e3d7112..000000000
--- a/MyTracks/res/values-es/arrays.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-  <!-- Minimum recording distance -->
-  <string-array name="min_recording_distance_options">
-    <item>1 m</item>
-    <item>2 m</item>
-    <item>3 m</item>
-    <item>4 m</item>
-    <item>5 m (recomendada)</item>
-    <item>10 m</item>
-    <item>100 m</item>
-  </string-array>
-
-  <string-array name="min_recording_distance_options_ft">
-    <item>3 pies</item>
-    <item>6 pies</item>
-    <item>10 pies</item>
-    <item>13 pies</item>
-    <item>16 pies (recomendada)</item>
-    <item>33 pies</item>
-    <item>328 pies</item>
-  </string-array>
-
-  <!-- Maximum recording distance -->
-  <string-array name="max_recording_distance_options">
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (recomendada)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>5000 m</item>
-  </string-array>
-
-  <string-array name="max_recording_distance_options_ft">
-    <item>164 pies</item>
-    <item>328 pies</item>
-    <item>656 pies (recomendada)</item>
-    <item>1640 pies</item>
-    <item>0.6 millas</item>
-    <item>3.1 millas</item>
-  </string-array>
-
-  <!-- Minimum recording interval -->
-  <string-array name="min_recording_interval_options">
-    <item>optimizar duración de la batería (adaptable)</item>
-    <item>alta precisión (adaptable)</item>
-    <item>más alta posible (recomendada)</item>
-    <item>2 s</item>
-    <item>3 s</item>
-    <item>4 s</item>
-    <item>5 s</item>
-    <item>10 s</item>
-    <item>20 s</item>
-    <item>30 s</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-  </string-array>
-
-  <!-- Minimum required accuracy -->
-  <string-array name="min_required_accuracy_options">
-    <item>10 m (señal GPS excelente)</item>
-    <item>20 m</item>
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (recomendada)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>2000 m</item>
-    <item>5000 m (señal GPS débil)</item>
-  </string-array>
-
-  <string-array name="min_required_accuracy_options_ft">
-    <item>33 pies (señal GPS excelente)</item>
-    <item>66 pies</item>
-    <item>165 pies</item>
-    <item>328 pies</item>
-    <item>656 pies (recomendada)</item>
-    <item>1640 pies</item>
-    <item>0.6 millas</item>
-    <item>1.2 millas</item>
-    <item>3.1 millas (señal GPS débil)</item>
-  </string-array>
-
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Apagado</item>
-    <item>100 km</item>
-    <item>50 km</item>
-    <item>25 km</item>
-    <item>10 km</item>
-    <item>5 km</item>
-    <item>1 km</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-  <string-array name="task_frequency_options_ft">
-    <item>Apagado</item>
-    <item>100 mi</item>
-    <item>50 mi</item>
-    <item>25 mi</item>
-    <item>10 mi</item>
-    <item>5 mi</item>
-    <item>1 mi</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-    <!-- Auto-resume track timeout -->
-  <string-array name="auto_resume_track_timeout_options">
-    <item>Nunca</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>Siempre</item>
-  </string-array>
-
-  <!-- Other non-preference arrays -->
-  <array name="activity_types">
-    <item>desconocido</item>
-    <item>tipo mixto</item>
-    <item>otro</item>
-
-    <item>correr</item>
-    <item>correr en calle</item>
-    <item>correr en pista</item>
-    <item>correr en senda</item>
-    <item>caminar</item>
-    <item>caminar rápido</item>
-    <item>excursión</item>
-    <item>excursión por sendas</item>
-    <item>excursión a campo traviesa</item>
-    <item>escalando</item>
-
-    <item>bicicleta</item>
-    <item>bicicleta de carrera</item>
-    <item>bicicleta de montaña</item>
-    <item>bicicleta de pista</item>
-
-    <item>patinando</item>
-    <item>patinando inline</item>
-    <item>skate boarding</item>
-
-    <item>caminata sobre nieve</item>
-    <item>esquiando</item>
-    <item>snow boarding</item>
-    <item>trineo</item>
-    <item>veleando sobre hielo</item>
-
-    <item>veleando</item>
-    <item>canotaje</item>
-    <item>kayaking</item>
-    <item>remo</item>
-    <item>bote de motor</item>
-    <item>tansbordador</item>
-    <item>bote RC</item>
-    <item>surfeando</item>
-    <item>wind surfing</item>
-    <item>kite surfing</item>
-    <item>esquí aquático</item>
-    <item>wake boarding</item>
-
-    <item>avión</item>
-    <item>hidroavion</item>
-    <item>avión comercial</item>
-    <item>helicóptero</item>
-    <item>glbo aerostático</item>
-    <item>dirigible</item>
-    <item>aeroplane RC</item>
-    <item>helicóptero RC</item>
-    <item>paracaidismo</item>
-    <item>planeador</item>
-    <item>hang gliding</item>
-    <item>para gliding</item>
-
-    <item>montando</item>
-    <item>montando caballo</item>
-    <item>montando burro</item>
-
-    <item>manejeando auto</item>
-    <item>manejando camión</item>
-    <item>tren</item>
-    <item>moto bici</item>
-    <item>moto cross</item>
-    <item>ATV</item>
-
-    <item>veleando sobre tierra</item>
-    <item>frisbee</item>
-    <item>ultimate frisbee</item>
-  </array>
-
-  <array name="waypoint_types">
-    <item>cajero automático</item>
-    <item>banco</item>
-    <item>bar</item>
-    <item>parrillada</item>
-    <item>edificio</item>
-    <item>parada de camión</item>
-    <item>café</item>
-    <item>fogata</item>
-    <item>campamento</item>
-    <item>iglesia</item>
-    <item>café</item>
-    <item>tienda de abarrotes</item>
-    <item>agua potable</item>
-    <item>deslave</item>
-    <item>transbordador</item>
-    <item>chimenea</item>
-    <item>estación de bomberos</item>
-    <item>pesca</item>
-    <item>gasolinera</item>
-    <item>campo de golf</item>
-    <item>tienda de abarrotes</item>
-    <item>salon de belleza</item>
-    <item>puerto</item>
-    <item>senda</item>
-    <item>hotel</item>
-    <item>casa</item>
-    <item>información</item>
-    <item>intersección</item>
-    <item>buzón de correo</item>
-    <item>mercado</item>
-    <item>punto de encuentro</item>
-    <item>ópera</item>
-    <item>estacionamiento</item>
-    <item>oficina de correos</item>
-    <item>bache</item>
-    <item>estación de policía</item>
-    <item>cruce de vía de tren</item>
-    <item>restaurante</item>
-    <item>mall</item>
-    <item>lugar de interés</item>
-    <item>tienda</item>
-    <item>alberca</item>
-    <item>teléfono</item>
-    <item>teatro</item>
-    <item>baño</item>
-    <item>información turística</item>
-    <item>túnel</item>
-    <item>árbol</item>
-    <item>cascada</item>
-    <item>fuente de agua</item>
-    <item>camino</item>
-  </array>
-</resources>
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index 2fb745a3c..b6a093e87 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -15,506 +15,255 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Used by the Menu -->
-  <string name="start_recording">Grabar recorrido</string>
-  <string name="stop_recording">Dejar de grabar recorrido</string>
-  <string name="switch_to_sat">Modo satelital</string>
-  <string name="switch_to_map">Modo mapa</string>
-  <string name="mylocation">Mi ubicación</string>
-  <string name="list_tracks">Recorridos</string>
-  <string name="list_markers">Señal</string>
-  <string name="delete_all_tracks">Borrar todos</string>
-  <string name="settings">Configuración</string>
-  <string name="elevation">Elevación</string>
-  <string name="choose_track_message">Por favor, seleccione el recorrido que desea ver</string>
-  <string name="current_track">Recorrido actual</string>
-  <string name="current_segment">Último segmento</string>
-  <string name="sensor_state">Estado de los sensores</string>
-  <string name="aggregated_stats">Estadísticas recorrido</string>
-  
-  <!-- Error messages -->
-  <string name="error_no_location_manager">Ningún administrador de ubicación fue hallado en este dispositivo! </string>
-  <string name="error_no_gps">Ningún proveedor de ubicación GPS fue hallado en este dispositivo.</string>
-  <string name="error_sending_to_my_maps">Se produjo un error al enviar su recorrido a Google Mis Sitios.</string>
-  <string name="error_sending_to_fusion_tables">Se produjo un error al enviar su recorrido a Google Fusion Tables.</string>
-  <string name="error_sending_to_docs">Se produjo un error al enviar su recorrido a Google Docs.</string>
-  <string name="error_sending_generic">Por favor, inténtelo de nuevo mas tarde.</string>
-  <string name="error_unable_to_start_recording">No se puede iniciar la grabación. Inténtelo de nuevo. </string>
-  <string name="error_unable_to_stop_recording">No se puede detener la grabación. Inténtelo de nuevo.</string>
-  <string name="error_import_unable_to_read_file">No pude leer del archivo.</string>
-  <string name="error_import_invalid_gpx_format">El archivo no tiene un format GPX válido.</string>
-  <string name="error_sending_to_google">A ocurrido un error. Por favor, inténtelo de nuevo.</string>
-  <string name="error_export_track_does_not_exist">El recorrido no existe.</string>
-  <string name="error_export_operation_canceled">La operación fue cancelada.</string>
-  <string name="error_import_out_of_memory">El archivo es demasiado grande (tiene que ser menor a 500 KB). Abortando.</string>
-  <string name="error_unable_to_insert_marker">No se puede insertar el marcador. La ubicación no está disponible.</string>
-
-  <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Esperando una ubicación mas exacta del GPS. Asegúrese que el cielo sea visible.</string>
-  <string name="status_now_recording">Grabando un nuevo recorrido.</string>
-  <string name="status_stopped_recording">Grabación interrumpida.</string>
-  <string name="sending_to_google_additional_info">Es posible que pasen unos minutos hasta que los nuevos recorridos aparezcan.</string>
-  <string name="status_need_to_enable_gps">Por favor, presione aquí para ir al menú de Seguridad y Ubicación, y asegúrese que el GPS esté habilitado. Presione el botón "atrás" para regresar.</string>
-  <string name="status_approximate_current_location">Nota: Una ubicación aproximada es determinada a partir de torres de telefonía celular y redes WIFI.</string>
-  <string name="status_no_current_location">No puede ser determinada la ubicación actual. Habilite más fuentes de datos (vea las configuraciones de Seguridad y Ubicación) y asegúrese que el cielo sea visible. Inténtelo mas tarde.</string>
-  <string name="status_waypoint_inserted">Un marcador de recorrido fue insertado.</string>
-  <string name="status_marker_inserted">Un marcador de estadísticas fue insertado.</string>
-  <string name="sending_to_google_upload_status">Estado del envío:</string>
-  
-  <!-- Progress dialog -->
-  <string name="progress_title">Por favor espere...</string>
-  <string name="progress_message">Enviando su recorrido a Google.</string>
-  <string name="progress_message_reading_track">Leyendo recorrido...</string>
-  <string name="progress_message_preparing_track">Preparando recorrido...</string>
-  <string name="progress_message_authenticating_fusion_tables">Autenticando con Google Fusion Tables...</string>
-  <string name="progress_message_authenticating_my_maps">Autenticando con Google Maps...</string>
-  <string name="progress_message_authenticating_docs">Autenticando con Google Docs...</string>
-  <string name="progress_message_sending_docs">Enviando recorrido a Google Docs...</string>
-  <string name="progress_message_sending_my_maps">Enviando recorrido a Google Maps...</string>
-  <string name="progress_message_creating_map">Creando nuevo Sitio...</string>
-  <string name="progress_message_sending_fusion_tables">Enviando recorrido a Google Fusion Tables...</string>
-  <string name="progress_message_creating_fusion_table">Creando nuevo mapa Fusion Tables...</string>
-  <string name="progress_message_import">Importando un recorrido GPS. Esto puede tardar.</string>
-  <string name="progress_message_export">Escribiendo archivo a tarjeta SD. Esto puede tardar.</string>
-  <string name="progress_message_updating_track">Actualizando estadísticas del recorrido...</string>
-
-  <!-- Used by DeleteAllDataHandler -->
-    <string name="delete_track_activity_title">Borrar recorrido</string>
-  <string name="confirmation_title_are_you_sure">¿Está usted seguro?</string>
-  <string name="all_data_will_be_permanently_deleted">Todos los recorridos y señales serán borradas de este teléfono.</string>
-  <string name="track_will_be_permanently_deleted">El recorrido y sus señales serán borrados permanentemente de este teléfono.</string>
-  <string name="marker_will_be_permanently_deleted">La señal será borrada permanentemente de este teléfono.</string>
-
-  <!-- Text and links when uploading to Google Fusion Tables -->
-  <string name="new_map_description">Creado por My Tracks para Android.</string>
-  
-  <!-- Text and links when uploading to Google My Maps -->
-  <string name="my_map_link">Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; en Android.</string>
-  <string name="new_map_title">Nuevo Sitio</string>
-  
-  <!-- Formatting of track and marker descriptions -->
-  <string name="points">Puntos</string>
-  <string name="recorded_date">Grabado</string>
-  <string name="category">Tipo de actividad</string>
-  <string name="waypoint_category">Tipo de señal</string>
-  <string name="track_part_format">"(Parte %d)"</string>
-
-  <!-- Used by the track recording service -->
-  <string name="recording_your_track">Grabando su recorrido...</string>
-  <string name="new_track_format">Recorrido %d</string>
-
-  <!-- Common -->
-  <string name="yes">Sí</string>
-  <string name="success">Éxito</string>
-  <string name="waypoint">Marcador de recorrido</string>
-  <string name="license">Licencia</string>
-  <string name="cancel">Cancelar</string>
-  <string name="save">Guardar</string>
-
-  <!-- Placemark labels for start and end of track -->
-  <string name="start">(Inicio)</string>
-  <string name="end">(Fin)</string>
-
-  <!--  TrackList -->
-  <string name="tracklist_show_track">Mostrar</string>
-  <string name="tracklist_send_to_mymaps">Enviar a Google Mis Sitios</string>
-  <string name="tracklist_send_to_new_mymap">Enviar a nuevo Google Mis Sitios</string>
-  <string name="tracklist_send_to_fusiontables">Enviar a Google Fusion Tables</string>
-  <string name="tracklist_send_to_new_fusiontable">Enviar a nueva Google Fusion Table</string>
-  <string name="tracklist_send_to_docs">Enviar a Google Docs</string>
-  <string name="tracklist_send_to_google">Enviar a Google...</string>
-  <string name="tracklist_delete_track">Borrar del teléfono...</string>
-  <string name="tracklist_edit_track">Editar detalles</string>
-  <string name="tracklist_write_to_sd">Guardar en tarjeta SD...</string>
-  <string name="tracklist_save_as_gpx">Guardar en archivo GPX</string>
-  <string name="tracklist_save_as_kml">Guardar en archivo KML</string>
-  <string name="tracklist_save_as_csv">Guardar en archivo CSV</string>
-  <string name="tracklist_save_as_tcx">Guardar en archivo TCX</string>
-  <string name="tracklist_btn_send_all_to_fusiontables">Enviar a Google Fusion Tables</string>
-  <string name="tracklist_btn_send_all_to_mymaps">Enviar a Google Mis Sitios</string>
-  <string name="tracklist_btn_delete_all">Borrar todos</string>
-  
-  <!-- Export All -->
-  <string name="tracklist_btn_export_all">Exportar todos</string>
-  <string name="export_done">Exportación concluída</string>
-  <string name="tracklist_pick_one">Escoja un recorrido. Presione&amp;mantenga presionado para ver más opciones.</string>
-  <string name="tracklist_all_tracks">Todos los recorridos:"</string>
-  <string name="tracklist_this_track">Este recorrido"</string>
-  <string name="tracklist_share_track">Compartir con amigos..."</string>
-  <string name="tracklist_share_link">Un enlace al mapa</string>
-  <string name="tracklist_share_gpx_file">Un archivo GPX"</string>
-  <string name="tracklist_share_kml_file">Un archivo KML"</string>
-  <string name="tracklist_share_csv_file">Un archivo CSV</string>
-  <string name="tracklist_share_tcx_file">Un archivo TCX</string>
-  <string name="tracklist_clear_map">"Limpiar mapa"</string>
-
-  <!-- Import All -->
-  <string name="tracklist_btn_import_all">Importar todos</string>
-    <!-- Format:
-  $1 : Successful imports
-  $2 : Attempted imports
-  $3 : MyTracks gpx path
-  -->
-  <string name="import_multi_done">Importados %1$d de %2$d archivos GPX de %3$s</string>
-  <string name="import_multi_empty">No se encontraron archivos GPX en %s. Es posible que la tarjeta SD no sea accesible o que el directorio no contenga archivos GPX.</string>
-  <string name="import_error">Error importando el archivo %s</string>
-  <string name="import_title">Importar a My Tracks</string>
-  <string name="import_success">Se importaron correctamente %1$d recorrido(s) del archivo.</string>
-  <string name="import_show_track">Mostrar recorrido</string>
-  
-  <!-- Waypoints list -->
-  <string name="waypointslist_btn_delete_all">Borrar todas los marcadores</string>
-  <string name="waypointslist_this_waypoint">Este marcador</string>
-  <string name="waypointslist_delete_waypoint">Borrar</string>
-  <string name="waypointslist_edit_waypoint">Editar detalles"</string>
-  <string name="waypointslist_show_waypoint">Mostrar en el mapa"</string>
-  <string name="waypointslist_btn_insert_waypoint">Insertar marcador"</string>
-  <string name="waypointslist_btn_insert_statistics">Insertar estadísticas"</string>
-  <string name="waypointslist_pick_one">Escoja un marcador. Presione&amp; mantenga presionado para ver más opciones.</string>
-
-  <!-- MyTracks Details -->
-  <string name="trackdetails_title">Detalles del recorrido</string>
-  <string name="trackdetails_name">Nombre del recorrido</string>
-  <string name="trackdetails_name_hint">Nombre del recorrido</string>
-  <string name="trackdetails_description">Descripción del recorrido</string>
-  <string name="trackdetails_description_hint">Descripción del recorrido</string>
-  <string name="trackdetails_category">Tipo de actividad (por ejemplo, ciclismo, alpinismo...)</string>
-  <string name="trackdetails_category_hint">Tipo de actividad</string>
-
-  <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Detalles de señal</string>
-  <string name="waypointdetails_name">Nombre de señal</string>
-  <string name="waypointdetails_name_hint">Nombre de señal</string>
-  <string name="waypointdetails_description">Descripción  de señal</string>
-  <string name="waypointdetails_description_hint">Descripción  de señal</string>
-  <string name="waypointdetails_category">Tipo de señal (por ejemplo, edificio, bache, atracción...)</string>
-  <string name="waypointdetails_category_hint">Tipo de señal</string>
-
-  <!-- MyTracks Settings -->
-  <string name="settings_title">Configuraciones de My Tracks</string>
-  <string name="settings_display">Visualizador</string>
-  <string name="settings_recording">Grabando</string>
-  <string name="settings_sharing">Compartiendo</string>
-
-  <string name="settings_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>
-  <string name="settings_allow_access_summary_on">Otras aplicaciones pueden leer, escribir, comenzar/detener la grabación de 
-          datos de MyTracks</string>
-  <string name="settings_allow_access_summary_off">Otras aplicaciones no pueden leer, escribir, comenzar/detener la grabación de datos de MyTracks</string>
-  <string name="settings_allow_access_dialog_message">¿Esta seguro que desea que otras aplicaciones, 
-          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_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_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_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_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_metric_units">Usar unidades métricas</string>
-  <string name="settings_metric_units_summary_on">Todas las distancias serán mostradas en unidades métricas</string>
-  <string name="settings_metric_units_summary_off">Todas las distancias serán mostradas en unidades británicas</string>
-
-  <string name="settings_map_public">Hacer mapas en maps.google.com públicos</string>
-  <string name="settings_map_public_summary_on">Mapas subidos serán visibles a cualquier persona en maps.google.com</string>
-  <string name="settings_map_public_summary_off">Mapas subidos no serán públicos en maps.google.com</string>
-
-  <string name="settings_report_speed_or_pace">Mostrar</string>
-  <string name="settings_report_speed_or_pace_summary_on">La velocidad será mostrada</string>
-  <string name="settings_report_speed_or_pace_summary_off">El paso será mostrado</string>
-
-  <string name="settings_share_url_only">Mandar sólo URL como mensaje al compartir</string>
-  <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_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_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_reset">Restaurar preferencias</string>
-  <string name="settings_reset_summary">Restaura todas tus preferencias a los valores por defecto</string>
-  <string name="settings_reset_dialog_message">Todas tus preferencias seran borradas o restauradas a sus valores por defecto. Los recorridos se mantendran. ¿Está seguro?</string>
-  <string name="settings_reset_done">Todas las preferencias han sido restauradas a sus valores por defecto.</string>
-
-  <string name="pace_label">Paso</string>
-  
-  <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_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_modular_stats_display_title">Pantalla de estadísticas modular</string>
-
-  <string name="settings_track_color_mode">Modo de Recorrido Coloreado</string>
-  <string name="settings_track_color_mode_summary">La forma de colorear el recorrido</string>
-  <string name="settings_track_color_mode_fixed">Fija</string>
-  <string name="settings_track_color_mode_dynamic">Dinámica</string>
-  <string name="settings_track_color_mode_fixed_speed_slow">Velocidad Fija Lenta</string>
-  <string name="settings_track_color_mode_fixed_speed_slow_summary">Velocidad máxima considerada lenta</string>
-  <string name="settings_track_color_mode_fixed_speed_medium">Velocidad Fija Media</string>
-  <string name="settings_track_color_mode_fixed_speed_medium_summary">Velocidad máxima considerada media</string>
-  <string name="settings_track_color_mode_dynamic_speed_variation">Variación de velocidad dinámica</string>
-  <string name="settings_track_color_mode_dynamic_speed_variation_summary">% de margen a partir de la velocidad media de movimiento que se considera velocidad media</string>
-  
-  <!-- Backups -->
-  <string name="settings_backup">Copia seguridad (BETA)</string>
-  <string name="settings_sd_backup">Copia seguridad en tarjeta SD</string>
-  <string name="settings_backup_to_sd">Hacer copia seguridad</string>
-  <string name="settings_backup_to_sd_summary">Hacer una copia total de sus recorridos y configuraciones a la tarjeta SD</string>
-  <string name="settings_restore_from_sd">Restaurar</string>
-  <string name="settings_restore_from_sd_summary">Restaurar todos los recorridos y configuraciones desde la tarjeta SD</string>
-
-  <string name="restore_overwrites_warning">Restaurar una copia seguridad desde la tarjeta SD SOBREESCRIBIRÁ todos sus recorridos y configuraciones actuales. ¿Está usted seguro?</string>
-  <string name="select_backup_to_restore">Seleccionar la copia seguridad para restaurar</string>
-  <string name="no_backups">No se han encontrado copias seguridad.</string>
-  <string name="backup_write_progress_message">Guardando todos los recorridos y configuraciones a la tarjeta SD. Esto puede llevar un rato...</string>
-  <string name="backup_import_progress_message">Leyendo todos los recorridos y configuraciones desde la tarjeta SD. Esto puede llevar un rato...</string>
-  
-  <!-- MyTracksSky -->
-  <string name="mytracks_sky">Satélites GPS</string>
-
-  <!-- My Maps -->
-  <string name="select_map_message">Seleccione un mapa de su cuenta:</string>
-  <string name="create_new_map">Crear un nuevo mapa...</string>
-  <string name="map_list_title">Enviar a Google Mis Sitios</string>
-  <string name="maps_list_loading">Cargando mapas...</string>
-  <string name="maps_list_failed">¡No se pudieron cargar sus mapas en este momento!</string>
-  <string name="open_map">Seleccionar este mapa</string>
-  <string name="edit_map_details">Editar detalles del mapa</string>
-  <string name="share_track_url">Compartir recorrido</string>
-  <string name="delete_map">Borrar mapa de su cuenta</string>
-  <string name="map_title">Titulo del mapa:</string>
-  <string name="map_description">Descripción del mapa:</string>
-  <string name="map_searchable_edit">Permitir que este mapa y sus contenidos aparezcan en los resultados de busquedas</string>
-  <string name="map_not_searchable_edit">No permitir que este mapa o sus contenidos aparezcan en los resultados de busquedas, aunque pueden ser vistos por otros a traves de su enlace directo</string>
-  <string name="map_searchable">Este mapa y sus contenidos aparecerán en los resultados de busquedas</string>
-  <string name="map_not_searchable">Este mapa y sus contenidos no aparecerán en los resultados de busquedas, aunque pueden ser vistos por otros a traves de su enlace directo</string>
-
-  <!-- Sharing -->
-  <string name="share_track_picker_title">Compartir mapa con amigos</string>
-  <string name="share_map_subject">Me gustaría compartir un mapa contigo</string>
-  <string name="share_track_url_body_format">Creo que este mapa pudiera interesarte:
-  
-      %s</string>
-  <string name="share_track_subject">Me gustaría compartir un recorrido contigo</string>
-  <string name="share_track_file_body_format">Creo que este recorrido pudiera interesarte.
-
-    Para ver este recorrido usa Google Earth o algún otro software de mapeo.</string>
-
-  <!-- Visibility -->
-  <string name="public_map">Público</string>
-  <string name="unlisted_map">No listado</string>
-  <string name="mapslist_no_maps_available">Aún no tienes ningún mapa.</string>
-
-  <!-- Statistics View -->
-  <!-- Average Moving -->
-  <string name="average_moving_speed_label">Velocidad promedio en movimiento</string>
-  <string name="average_moving_pace_label">Paso promedio en movimiento</string>
-
-  <!-- Average -->
-  <string name="average_speed_label">Velocidad promedio</string>
-  <string name="average_pace_label">Paso promedio</string>
-
-  <string name="elevation_chart_name">Gráfica de elevación</string>
-  <string name="elevation_gain_label">Aumento de elevación</string>
-  <string name="elevation_label">Elevación</string>
-  <string name="latitude_label">Latitud</string>
-  <string name="longitude_label">Longitud</string>
-
-  <!-- Min -->
-  <string name="min_elevation_label">Elevación mínima</string>
-  <string name="min_grade_label">Pendiente mínima</string>
-  <string name="min_pace_label">Paso mínimo</string>
-
-  <!-- Max -->
-  <string name="max_elevation_label">Elevación máxima</string>
-  <string name="max_grade_label">Pendiente máxima</string>
-  <string name="max_speed_label">Velocidad máxima</string>
-
-  <string name="loading_track">Cargando recorrido...</string>
-
-  <!-- Chart Settings -->
-  <string name="chart_settings">Configuración de gráficas</string>
-  <!-- X Axis -->
-  <string name="x_axis">Eje X</string>
-  <string name="by_distance">Como función de distancia</string>
-  <string name="by_time">Como función de tiempo</string>
-
-  <!-- Y Axis -->
-  <string name="y_axis">Eje Y</string>
-
-  <!-- Units -->
-  <!-- Time  -->
-  <string name="voice_hour">hora</string>
-  <string name="voice_hours">horas</string>
-  <string name="voice_minute">minuto</string>
-  <string name="voice_minutes">minutos</string>
-  <string name="voice_second">segundo</string>
-  <string name="voice_seconds">segundos</string>
-
-  <!-- Distance -->
-  <string name="voice_kilometers">kilómetros</string>
-  <string name="unit_feet">pies</string>
-  <string name="voice_miles">millas</string>
-
-  <!-- Speed and Pace -->
-  <string name="voice_kilometer_per_hour">kilómetros por hora</string>
-  <string name="voice_per_kilometer">por kilómetro</string>
-  <string name="voice_mile_per_hour">millas por hora</string>
-  <string name="voice_per_mile">por milla</string>
-
-  <!-- Sensors -->
-  <string name="battery_level">Nivel de batería</string>
-	
-  <!-- Stats Labels -->
-  <string name="moving_time_label">Tiempo en movimiento</string>
-  <string name="total_time_label">Tiempo total</string>
-  <string name="time_label">Tiempo</string>
-  <string name="sd_unavail">SD no disponible</string>
-  <string name="speed">Velocidad</string>
-  <string name="start_trip">Debes comenzar un viaje.</string>
-  <string name="statistics">Estadísticas</string>
-  <string name="total_distance_label">Distancia total</string>
-  <string name="distance_label">Distancia</string>
-  <string name="power">Potencia</string>
-  <string name="cadence">Cadencia</string>
-  <string name="heart_rate">Ritmo cardíaco</string>
-  <string name="max_heart_rate">Máx ritmo cardíaco</string>
-  <string name="waiting">Esperando...</string>
-  
-  <!-- End User License Agreement -->
-  <string name="eula_title">Contrato de Licencia de Usuario Final</string>
-  <string name="accept">Aceptar</string>
-  <string name="decline">Declinar</string>
-
-  <!-- About -->
-  <string name="about">Sobre</string>
-  <string name="help">Ayuda</string>
+  <string name="about_license">Licencia</string>
+  <string name="about_privacy">Privacidad:</string>
+  <string name="about_support">Soporte técnico:</string>
   <string name="about_team">Equipo:</string>
   <string name="about_version">Versión:</string>
-  <string name="about_support">Soporte técnico:</string>
-  <string name="about_privacy">Privacidad:</string>
-  
-  <!-- Send to Google -->
-  <string name="sendtogoogle_title">Enviar a...</string>
-  <string name="sendtogoogle_google_fusiontables">Tablas Google Fusion</string>
-  <string name="sendtogoogle_google_mymaps">Mis Sitios Google</string>
-  <string name="sendtogoogle_send_now">Enviar ahora</string>
-  <string name="sendtogoogle_create_new_map">Crear nuevo mapa</string>
-  <string name="sendtogoogle_pick_existing_map">Elegir un mapa existente</string>
-  <string name="sendtogoogle_send_stats">Enviar estadísticas de recorrido</string>
-  <string name="sendtogoogle_send_stats_and_points">Enviar estadísticas y puntos</string>
-
-  <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Cuenta no encontrada</string>
-  <string name="no_account_found">No se encontro la cuenta a la que subir las rutas.</string>
-  <string name="choose_account_title">Elija una cuenta</string>
-  
-  <!-- SD card -->
-  <string name="io_no_external_storage_found">Ningún almacenamiento externo fue encontrado. Asegúrese que la tarjeta SD se encuentre insertada y que su teléfono no este conectado a una computadora.</string>
-  <string name="io_write_failed">No es posible escribir al archivo.</string>
-  <string name="io_read_failed">No es posible leer el archivo.</string>
-  <string name="io_create_dir_failed">No es posible crear un directorio en su tarjeta SD.</string>
-  <string name="io_write_finished">Grabación a tarjeta SD concluída.</string>
-  <string name="io_read_finished">Lectura de tarjeta SD concluída.</string>
-  
-  <!-- VersionChecker -->
-  <string name="version_check_title">Comprobar actualizaciones</string>
-  <string name="version_check_upgrade_button">Actualizar ahora</string>
-  <string name="version_check_continue_button">Continuar sin actualizar</string>
-  <string name="upgrade_required">Su versión de %1$s puede no funcionar bien, y no contar ya con soporte técnico. Por favor actualice para poder continuar usando %1$s.</string>
-  <string name="upgrade_recommended">Su versión de %1$s puede no funcionar bien. Puede actualizar ahora, o continuar usándola bajo su propio riesgo. Algunos procesos como la sincronización con los servidores pueden no funcionar hasta que actualice su versión.</string>
-  <string name="upgrade_available">Una nueva versión de %1$s ya está disponible. Puede continuar usando su versión actual sin ninún problema, pero no tendrá las nueva funcionalidad hasta que actualice su versión.</string>
-
-  <!-- Welcome -->
-  <string name="welcome">Bienvenido</string>
-  <string name="welcome_read_later">Aceptar</string>
-  <string name="welcome_about">Sobre My Tracks</string>
-
-  <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks sin distancia</string>
-  <!-- Format:
-  $1 : Distance label
-  $2 : Distance value (5)
-  $3 : Distance units (mi, km)
-  $4 : Time description (10 minutes 5 seconds)
-  $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
-  $6 : Speed units (mph) : Pace units (per mile)
-  -->
-  <string name="announce_template">My Tracks %1$s %2$.2f %3$s en %4$s a %5$s %6$s</string>
-
-  <!-- Check Units -->
-  <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="sensor_bluetooth_options_key">Sensor Bluetooth activado</string>
-  <string name="ant_options">Optiones ANT</string>
+  <string name="chart_settings_by_distance">Como función de distancia</string>
+  <string name="chart_settings_by_time">Como función de tiempo</string>
+  <string name="chart_settings_x_axis">Eje X</string>
+  <string name="chart_settings_y_axis">Eje Y</string>
+  <string name="eula_accept">Aceptar</string>
+  <string name="eula_decline">Declinar</string>
+  <string name="eula_title">Contrato de Licencia de Usuario Final</string>
+  <string name="export_canceled">La operación fue cancelada.</string>
+  <string name="export_progress_message">Escribiendo archivo a tarjeta SD. Esto puede tardar.</string>
+  <string name="export_success">Exportación concluída</string>
+  <string name="generic_cancel">Cancelar</string>
+  <string name="generic_confirm_title">¿Está usted seguro?</string>
+  <string name="generic_progress_title">Por favor espere...</string>
+  <string name="generic_save">Guardar</string>
+  <string name="generic_success_title">Éxito</string>
+  <string name="generic_yes">Sí</string>
+  <string name="gps_need_to_enable">Por favor, presione aquí para ir al menú de Seguridad y Ubicación, y asegúrese que el GPS esté habilitado. Presione el botón "atrás" para regresar.</string>
+  <string name="gps_not_found">Ningún proveedor de ubicación GPS fue hallado en este dispositivo.</string>
+  <string name="gps_wait_for_fix">Esperando una ubicación mas exacta del GPS. Asegúrese que el cielo sea visible.</string>
+  <string name="import_error">Error importando el archivo %s</string>
+  <string name="import_no_file">No se encontraron archivos GPX en %s. Es posible que la tarjeta SD no sea accesible o que el directorio no contenga archivos GPX.</string>
+  <string name="import_success">Importados %1$d de %2$d archivos GPX de %3$s</string>
+  <string name="marker_detail_marker_description">Descripción  de señal</string>
+  <string name="marker_detail_marker_name">Nombre de señal</string>
+  <string name="marker_detail_marker_type">Tipo de señal (por ejemplo, edificio, bache, atracción...)</string>
+  <string name="marker_detail_marker_type_hint">Tipo de señal</string>
+  <string name="marker_detail_title">Detalles de señal</string>
+  <string name="marker_insert_error">No se puede insertar el marcador. La ubicación no está disponible.</string>
+  <string name="marker_insert_success">Un marcador de estadísticas fue insertado.</string>
+  <string name="marker_label_end">(Fin)</string>
+  <string name="marker_label_start">(Inicio)</string>
+  <string name="marker_list_context_menu_title">Este marcador</string>
+  <string name="marker_list_delete_marker">Borrar</string>
+  <string name="marker_list_delete_marker_confirm_message">La señal será borrada permanentemente de este teléfono.</string>
+  <string name="marker_list_edit_marker">Editar detalles"</string>
+  <string name="marker_list_insert_statistics">Insertar estadísticas"</string>
+  <string name="marker_list_insert_waypoint">Insertar marcador"</string>
+  <string name="marker_list_pick_one">Escoja un marcador. Presione&amp; mantenga presionado para ver más opciones.</string>
+  <string name="marker_list_show_on_map">Mostrar en el mapa"</string>
+  <string name="marker_type_statistics">Estadísticas</string>
+  <string name="marker_type_waypoint">Marcador de recorrido</string>
+  <string name="menu_aggregated_statistics">Estadísticas recorrido</string>
+  <string name="menu_chart_view_chart_settings">Configuración de gráficas</string>
+  <string name="menu_help">Ayuda</string>
+  <string name="menu_map_view_map_mode">Modo mapa</string>
+  <string name="menu_map_view_my_location">Mi ubicación</string>
+  <string name="menu_map_view_satellite_mode">Modo satelital</string>
+  <string name="menu_markers">Señal</string>
+  <string name="menu_record_track">Grabar recorrido</string>
+  <string name="menu_sensor_state">Estado de los sensores</string>
+  <string name="menu_settings">Configuración</string>
+  <string name="menu_stop_recording">Dejar de grabar recorrido</string>
+  <string name="menu_tracks">Recorridos</string>
+  <string name="my_location_approximate_location">Nota: Una ubicación aproximada es determinada a partir de torres de telefonía celular y redes WIFI.</string>
+  <string name="my_location_no_location">No puede ser determinada la ubicación actual. Habilite más fuentes de datos (vea las configuraciones de Seguridad y Ubicación) y asegúrese que el cielo sea visible. Inténtelo mas tarde.</string>
+  <string name="my_maps_list_error">¡No se pudieron cargar sus mapas en este momento!</string>
+  <string name="my_maps_list_loading">Cargando mapas...</string>
+  <string name="my_maps_list_no_maps">Aún no tienes ningún mapa.</string>
+  <string name="my_maps_list_pick_map">Seleccione un mapa de su cuenta:</string>
+  <string name="my_maps_list_public_label">Público</string>
+  <string name="my_maps_list_title">Enviar a Google Mis Sitios</string>
+  <string name="my_maps_list_unlisted_label">No listado</string>
+  <string name="permission_notification_description">Ser notificado cuando un recorrido empieza o termina de registrarse.</string>
+  <string name="permission_notification_label">recibir avisos de registro de recorridos</string>
+  <string name="permission_read_description">Poder leer datos, como puntos de interés.</string>
+  <string name="permission_read_label">leer datos de recorridos grabados</string>
+  <string name="permission_write_description">Poder escribir datos, como registrar o añadir puntos de interés.</string>
+  <string name="permission_write_label">escribir datos de recorridos grabados, iniciar/detener recorridos</string>
+  <string name="sd_card_error_create_dir">No es posible crear un directorio en su tarjeta SD.</string>
+  <string name="sd_card_error_no_storage">Ningún almacenamiento externo fue encontrado. Asegúrese que la tarjeta SD se encuentre insertada y que su teléfono no este conectado a una computadora.</string>
+  <string name="sd_card_error_read_file">No es posible leer el archivo.</string>
+  <string name="sd_card_error_write_file">No es posible escribir al archivo.</string>
+  <string name="sd_card_success_read_file">Lectura de tarjeta SD concluída.</string>
+  <string name="sd_card_success_write_file">Grabación a tarjeta SD concluída.</string>
+  <string name="send_google_choose_account_title">Elija una cuenta</string>
+  <string name="send_google_error">A ocurrido un error. Por favor, inténtelo de nuevo.</string>
+  <string name="send_google_existing_map">Elegir un mapa existente</string>
+  <string name="send_google_fusion_tables">Tablas Google Fusion</string>
+  <string name="send_google_my_maps">Mis Sitios Google</string>
+  <string name="send_google_new_map">Crear nuevo mapa</string>
+  <string name="send_google_no_account_message">No se encontro la cuenta a la que subir las rutas.</string>
+  <string name="send_google_no_account_title">Cuenta no encontrada</string>
+  <string name="send_google_progress_preparing_track">Preparando recorrido...</string>
+  <string name="send_google_progress_reading_track">Leyendo recorrido...</string>
+  <string name="send_google_recorded">Grabado</string>
+  <string name="send_google_result_header">Estado del envío:</string>
+  <string name="send_google_result_share_url">Compartir recorrido</string>
+  <string name="send_google_send_now">Enviar ahora</string>
+  <string name="send_google_success_footer">Es posible que pasen unos minutos hasta que los nuevos recorridos aparezcan.</string>
+  <string name="send_google_title">Enviar a...</string>
+  <string name="send_google_track_part_label">"(Parte %d)"</string>
+  <string name="sensor_state_battery">Nivel de batería</string>
+  <string name="sensor_state_cadence">Cadencia</string>
+  <string name="sensor_state_connected">Conectado</string>
+  <string name="sensor_state_connecting">Conectando</string>
+  <string name="sensor_state_disconnected">Desconectando</string>
+  <string name="sensor_state_heart_rate">Ritmo cardíaco</string>
+  <string name="sensor_state_last_sensor_time">Hora de los datos del sensor</string>
+  <string name="sensor_state_power">Potencia</string>
+  <string name="sensor_state_sending">Enviando</string>
+  <string name="settings_backup">Copia seguridad (BETA)</string>
+  <string name="settings_backup_now">Hacer copia seguridad</string>
+  <string name="settings_backup_now_progress_message">Guardando todos los recorridos y configuraciones a la tarjeta SD. Esto puede llevar un rato...</string>
+  <string name="settings_backup_now_summary">Hacer una copia total de sus recorridos y configuraciones a la tarjeta SD</string>
+  <string name="settings_backup_restore">Restaurar</string>
+  <string name="settings_backup_restore_confirm_message">Restaurar una copia seguridad desde la tarjeta SD SOBREESCRIBIRÁ todos sus recorridos y configuraciones actuales. ¿Está usted seguro?</string>
+  <string name="settings_backup_restore_no_backup">No se han encontrado copias seguridad.</string>
+  <string name="settings_backup_restore_progress_message">Leyendo todos los recorridos y configuraciones desde la tarjeta SD. Esto puede llevar un rato...</string>
+  <string name="settings_backup_restore_select_title">Seleccionar la copia seguridad para restaurar</string>
+  <string name="settings_backup_restore_summary">Restaurar todos los recorridos y configuraciones desde la tarjeta SD</string>
+  <string name="settings_backup_sd_card">Copia seguridad en tarjeta SD</string>
+  <string name="settings_display">Visualizador</string>
+  <string name="settings_display_metric">Usar unidades métricas</string>
+  <string name="settings_display_metric_summary_off">Todas las distancias serán mostradas en unidades británicas</string>
+  <string name="settings_display_metric_summary_on">Todas las distancias serán mostradas en unidades métricas</string>
+  <string name="settings_display_speed">Mostrar</string>
+  <string name="settings_display_speed_summary_off">El paso será mostrado</string>
+  <string name="settings_display_speed_summary_on">La velocidad será mostrada</string>
+  <string name="settings_display_track_color">Modo de Recorrido Coloreado</string>
+  <string name="settings_display_track_color_dynamic">Dinámico (BETA)</string>
+  <string name="settings_display_track_color_dynamic_medium">Variación de velocidad dinámica</string>
+  <string name="settings_display_track_color_dynamic_medium_summary">% de margen a partir de la velocidad media de movimiento que se considera velocidad media</string>
+  <string name="settings_display_track_color_fixed">Fijo (BETA)</string>
+  <string name="settings_display_track_color_fixed_medium">Velocidad Fija Media</string>
+  <string name="settings_display_track_color_fixed_medium_summary">Velocidad máxima considerada media</string>
+  <string name="settings_display_track_color_fixed_slow">Velocidad Fija Lenta</string>
+  <string name="settings_display_track_color_fixed_slow_summary">Velocidad máxima considerada lenta</string>
+  <string name="settings_display_track_color_single">Ninguno</string>
+  <string name="settings_display_track_color_summary">La forma de colorear el recorrido</string>
+  <string name="settings_not_while_recording">No disponible mientras se graba el recorrido</string>
+  <string name="settings_recording">Grabando</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_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_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_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_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_recording_name">Hora como nombre de 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_recording_name_summary_on">El nombre por defecto del recorrido será la fecha y hora del inicio del recorrido</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_recording_voice">Tiempo entre anuncios</string>
+  <string name="settings_recording_voice_not_available">No disponible para tu versión de Android</string>
+  <string name="settings_recording_voice_summary">Tiempo mínimo entre dos anuncios de voz</string>
+  <string name="settings_reset">Restaurar preferencias</string>
+  <string name="settings_reset_dialog_message">Todas tus preferencias seran borradas o restauradas a sus valores por defecto. Los recorridos se mantendran. ¿Está seguro?</string>
+  <string name="settings_reset_done">Todas las preferencias han sido restauradas a sus valores por defecto.</string>
+  <string name="settings_reset_summary">Restaura todas tus preferencias a los valores por defecto</string>
   <string name="settings_sensor">Opciones del sensor</string>
-  <string name="track_color_mode">Modo de Recorrido Coloreado</string>
-  <string name="fixed_speed_options">Opciones de velocidad fija</string>
-  <string name="dynamic_speed_options">Opciones de velocidad dinámica</string>
-  
-  <!-- Bluetooth Sensor -->
-  <string name="bluetooth_connected">Conectado a %s</string>
-  <string name="bluetooth_connecting">Sensor Bluetooth conectando ...</string>
-  <string name="bluetooth_not_connected">Sensor Bluetooth no conectado</string>
-
-  <!-- Sensor State -->
-  <string name="sensor_data_time">Hora de los datos del sensor</string>
-  <string name="power_meter_enabled">Sensor de batería activado</string>
-  <string name="heart_rate_monitor_enabled">Monitor de ritmo cardíaco activado</string>
-  <string name="no_sensor_manager">No hay un gestor de sensores</string>
-  <string name="enabled">Activado</string>
-  <string name="connecting">Conectando</string>
-  <string name="connected">Conectado</string>
-  <string name="disconnected">Desconectando</string>
-  <string name="no_sensor_service">No hay un servicio de sensores</string>
-  <string name="searching">Buscando</string>
-  <string name="sending">Enviando</string>
-
-  <!-- Manifest description (not seen inside the app) -->
-  <string name="notification_permission_label">recibir avisos de registro de recorridos</string>
-  <string name="mytracks_notifications_permission_label">receive MyTracks notifications</string>
-  <string name="read_tracks_permission_label">leer datos de recorridos grabados</string>
-  <string name="write_tracks_permission_label">escribir datos de recorridos grabados, iniciar/detener recorridos</string>
-  <string name="notification_permission_description">Ser notificado cuando un recorrido empieza o termina de registrarse.</string>
-  <string name="read_tracks_permission_description">Poder leer datos, como puntos de interés.</string>
-  <string name="write_tracks_permission_description">Poder escribir datos, como registrar o añadir puntos de interés.</string>
-  
-  <!-- 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>
-
-  <!-- Track Color Modes -->
-  <string name="track_color_mode_option_none">Ninguno</string>
-  <string name="track_color_mode_option_fixed">Fijo (BETA)</string>
-  <string name="track_color_mode_option_dynamic">Dinámico (BETA)</string>
+  <string name="settings_sensor_ant_not_paired">Sensor ANT no conectado</string>
+  <string name="settings_sensor_ant_options">Optiones ANT</string>
+  <string name="settings_sensor_ant_paired">Sensor ANT conectado con: %d</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="settings_sensor_bluetooth_sensor">Sensor Bluetooth</string>
+  <string name="settings_sensor_bluetooth_sensor_summary">Sensor Bluetooth al que conectar</string>
+  <string name="settings_sensor_type">Tipo de sensor</string>
+  <string name="settings_sensor_type_ant">Sensores ANT+</string>
+  <string name="settings_sensor_type_none">Ninguno</string>
+  <string name="settings_sensor_type_polar">Bluetooth Polar</string>
+  <string name="settings_sensor_type_srm">Puente SRM ANT+</string>
+  <string name="settings_sensor_type_summary">Tipo de sensor al que conectar</string>
+  <string name="settings_sensor_type_zephyr">Bluetooth Zephyr</string>
+  <string name="settings_sensor_unpair_ant">Liberar conexión al sensor de corazón ANT</string>
+  <string name="settings_sensor_unpair_srm">Liberar conexión al sensor puente SRM ANT</string>
+  <string name="settings_sharing">Compartiendo</string>
+  <string name="settings_sharing_allow_access">Permitir acceso</string>
+  <string name="settings_sharing_allow_access_confirm_message">¿Esta seguro que desea que otras aplicaciones, futuras aplicaciones inclusive, controlen y tengan acceso a los datos de MyTracks? No habra notificaciones posteriores.</string>
+  <string name="settings_sharing_allow_access_summary_off">Otras aplicaciones no pueden leer, escribir, comenzar/detener la grabación de datos de MyTracks</string>
+  <string name="settings_sharing_allow_access_summary_on">Otras aplicaciones pueden leer, escribir, comenzar/detener la grabación de datos de MyTracks</string>
+  <string name="settings_sharing_map_public">Hacer mapas en maps.google.com públicos</string>
+  <string name="settings_sharing_map_public_summary_off">Mapas subidos no serán públicos en maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_on">Mapas subidos serán visibles a cualquier persona en maps.google.com</string>
+  <string name="settings_sharing_url_only">Mandar sólo URL como mensaje al compartir</string>
+  <string name="settings_sharing_url_only_summary_off">Los contenidos de la pista también serán incluídos al compartir</string>
+  <string name="settings_title">Configuraciones de My Tracks</string>
+  <string name="share_track_file_body_format">Creo que este recorrido pudiera interesarte.\n\nPara ver este recorrido usa Google Earth o algún otro software de mapeo.</string>
+  <string name="share_track_picker_title">Compartir mapa con amigos</string>
+  <string name="share_track_subject">Me gustaría compartir un recorrido contigo</string>
+  <string name="share_track_url_body_format">Creo que este mapa pudiera interesarte:\n\n%s</string>
+  <string name="stat_average_moving_pace">Paso promedio en movimiento</string>
+  <string name="stat_average_moving_speed">Velocidad promedio en movimiento</string>
+  <string name="stat_average_pace">Paso promedio</string>
+  <string name="stat_average_speed">Velocidad promedio</string>
+  <string name="stat_elevation">Elevación</string>
+  <string name="stat_elevation_gain">Aumento de elevación</string>
+  <string name="stat_latitude">Latitud</string>
+  <string name="stat_longitude">Longitud</string>
+  <string name="stat_max_elevation">Elevación máxima</string>
+  <string name="stat_max_grade">Pendiente máxima</string>
+  <string name="stat_max_speed">Velocidad máxima</string>
+  <string name="stat_min_elevation">Elevación mínima</string>
+  <string name="stat_min_grade">Pendiente mínima</string>
+  <string name="stat_min_pace">Paso mínimo</string>
+  <string name="stat_moving_time">Tiempo en movimiento</string>
+  <string name="stat_pace">Paso</string>
+  <string name="stat_speed">Velocidad</string>
+  <string name="stat_total_distance">Distancia total</string>
+  <string name="stat_total_time">Tiempo total</string>
+  <string name="track_detail_activity_type">Tipo de actividad (por ejemplo, ciclismo, alpinismo...)</string>
+  <string name="track_detail_activity_type_hint">Tipo de actividad</string>
+  <string name="track_detail_title">Detalles del recorrido</string>
+  <string name="track_detail_track_description">Descripción del recorrido</string>
+  <string name="track_detail_track_name">Nombre del recorrido</string>
+  <string name="track_list_clear_map">"Limpiar mapa"</string>
+  <string name="track_list_context_menu_title">Este recorrido"</string>
+  <string name="track_list_delete_all">Borrar todos</string>
+  <string name="track_list_delete_all_confirm_message">Todos los recorridos y señales serán borradas de este teléfono.</string>
+  <string name="track_list_delete_track">Borrar del teléfono...</string>
+  <string name="track_list_delete_track_confirm_message">El recorrido y sus señales serán borrados permanentemente de este teléfono.</string>
+  <string name="track_list_edit_track">Editar detalles</string>
+  <string name="track_list_export_all">Exportar todos</string>
+  <string name="track_list_import_all">Importar todos</string>
+  <string name="track_list_pick_one">Escoja un recorrido. Presione&amp;mantenga presionado para ver más opciones.</string>
+  <string name="track_list_save_sd">Guardar en tarjeta SD...</string>
+  <string name="track_list_send_google">Enviar a Google...</string>
+  <string name="track_list_share_track">Compartir con amigos..."</string>
+  <string name="track_list_share_url">Un enlace al mapa</string>
+  <string name="track_list_show_on_map">Mostrar</string>
+  <string name="track_name_format">Recorrido %d</string>
+  <string name="track_record_error">No se puede iniciar la grabación. Inténtelo de nuevo. </string>
+  <string name="track_record_notification">Grabando su recorrido...</string>
+  <string name="track_record_success">Grabando un nuevo recorrido.</string>
+  <string name="unit_feet">pies</string>
+  <string name="voice_hour">hora</string>
+  <string name="voice_hours">horas</string>
+  <string name="voice_kilometer_per_hour">kilómetros por hora</string>
+  <string name="voice_kilometers">kilómetros</string>
+  <string name="voice_mile_per_hour">millas por hora</string>
+  <string name="voice_miles">millas</string>
+  <string name="voice_minute">minuto</string>
+  <string name="voice_minutes">minutos</string>
+  <string name="voice_no_distance">My Tracks sin distancia</string>
+  <string name="voice_per_kilometer">por kilómetro</string>
+  <string name="voice_per_mile">por milla</string>
+  <string name="voice_second">segundo</string>
+  <string name="voice_seconds">segundos</string>
+  <string name="voice_template">My Tracks %1$.2f %2$s en %3$s a %4$s %5$s</string>
+  <string name="welcome_about">Sobre My Tracks</string>
+  <string name="welcome_title">Bienvenido</string>
 </resources>
diff --git a/MyTracks/res/values-fi/arrays.xml b/MyTracks/res/values-fi/arrays.xml
deleted file mode 100644
index 43f61760c..000000000
--- a/MyTracks/res/values-fi/arrays.xml
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-  <!-- Minimum recording distance -->
-  <string-array name="min_recording_distance_options">
-    <item>1 m</item>
-    <item>2 m</item>
-    <item>3 m</item>
-    <item>4 m</item>
-    <item>5 m (suositeltu)</item>
-    <item>10 m</item>
-    <item>100 m</item>
-  </string-array>
-
-  <string-array name="min_recording_distance_options_ft">
-    <item>3 ft</item>
-    <item>6 ft</item>
-    <item>10 ft</item>
-    <item>13 ft</item>
-    <item>16 ft (suositeltu)</item>
-    <item>33 ft</item>
-    <item>328 ft</item>
-  </string-array>
-
-  <!-- Maximum recording distance -->
-  <string-array name="max_recording_distance_options">
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (suositeltu)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>5000 m</item>
-  </string-array>
-
-  <string-array name="max_recording_distance_options_ft">
-    <item>164 ft</item>
-    <item>328 ft</item>
-    <item>656 ft (suositeltu)</item>
-    <item>1640 ft</item>
-    <item>0.6 mailia</item>
-    <item>3.1 mailia</item>
-  </string-array>
-
-  <!-- Minimum recording interval -->
-  <string-array name="min_recording_interval_options">
-    <item>virransäästö (mukautuva)</item>
-    <item>paras tarkkuus (mukautuva)</item>
-    <item>nopein (suositeltu)</item>
-    <item>2 s</item>
-    <item>3 s</item>
-    <item>4 s</item>
-    <item>5 s</item>
-    <item>10 s</item>
-    <item>20 s</item>
-    <item>30 s</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-  </string-array>
-
-  <!-- Minimum required accuracy -->
-  <string-array name="min_required_accuracy_options">
-    <item>10 m (erinomainen GPS-signaali)</item>
-    <item>20 m</item>
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (suositeltu)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>2000 m</item>
-    <item>5000 m (heikko GPS-signaali)</item>
-  </string-array>
-
-  <string-array name="min_required_accuracy_options_ft">
-    <item>33 ft (erinomainen GPS-signaali)</item>
-    <item>66 ft</item>
-    <item>165 ft</item>
-    <item>328 ft</item>
-    <item>656 ft (suositeltu)</item>
-    <item>1640 ft</item>
-    <item>0.6 mailia</item>
-    <item>1.2 mailia</item>
-    <item>3.1 mailia (heikko GPS-signaali)</item>
-  </string-array>
-
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Pois päältä</item>
-    <item>100 km</item>
-    <item>50 km</item>
-    <item>25 km</item>
-    <item>10 km</item>
-    <item>5 km</item>
-    <item>1 km</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-  <string-array name="task_frequency_options_ft">
-    <item>Pois päältä</item>
-    <item>100 mi</item>
-    <item>50 mi</item>
-    <item>25 mi</item>
-    <item>10 mi</item>
-    <item>5 mi</item>
-    <item>1 mi</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-  <!-- Auto-resume track timeout -->
-  <string-array name="auto_resume_track_timeout_options">
-    <item>Ei koskaan</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>Aina</item>
-  </string-array>
-
-  <!-- Other non-preference arrays -->
-  <array name="activity_types">
-    <item>tuntematon</item>
-    <item>sekoitus</item>
-    <item>muu</item>
-
-    <item>juoksu</item>
-    <item>katujuoksu</item>
-    <item>ratajuoksu</item>
-    <item>maastojuoksu</item>
-    <item>kävely</item>
-    <item>hölkkä</item>
-    <item>patikointi</item>
-    <item>patikointi metsässä</item>
-    <item>suokävely</item>
-    <item>kiipeily</item>
-
-    <item>pyöräily</item>
-    <item>maantiepyöräily</item>
-    <item>maastopyöräily</item>
-    <item>ratapyöräily</item>
-
-    <item>luistelu</item>
-    <item>rullaluistelu</item>
-    <item>rullalautailu</item>
-
-    <item>rullahiihto (classic)</item>
-    <item>rullahiihto (skate)</item>
-    <item>maastohiihto (classic)</item>
-    <item>maastohiihto (skate)</item>
-
-    <item>lumikävely</item>
-    <item>hiihto</item>
-    <item>lumilautailu</item>
-    <item>kelkkailu</item>
-    <item>jääpurjehdus</item>
-
-    <item>purjehdus</item>
-    <item>melonta</item>
-    <item>soutu</item>
-    <item>moottoriveneily</item>
-    <item>lautta</item>
-    <item>RC-veneily</item>
-    <item>surffaus</item>
-    <item>purjelautailu</item>
-    <item>vesihiito</item>
-    <item>wake boarding</item>
-
-    <item>lentokone</item>
-    <item>katamaraani</item>
-    <item>liikennelentokone</item>
-    <item>helikopteri</item>
-    <item>kuumailmapallo</item>
-    <item>ilmalaiva</item>
-    <item>RC-lennokki</item>
-    <item>RC-helikopteri</item>
-    <item>laskuvarjohyppy</item>
-    <item>liitovarjo</item>
-
-    <item>ratsastus</item>
-
-    <item>autolla ajo</item>
-    <item>bussimatka</item>
-    <item>juna</item>
-    <item>moottoripyörä</item>
-    <item>maastopyörä</item>
-    <item>ATV</item>
-
-    <item>maapurjehdus</item>
-    <item>frisbee</item>
-    <item>ultimate frisbee</item>
-  </array>
-
-  <array name="waypoint_types">
-    <item>baari</item>
-    <item>bussipysäkki</item>
-    <item>cafe</item>
-    <item>golfrata</item>
-    <item>grilli</item>
-    <item>hotelli</item>
-    <item>huoltoasema</item>
-    <item>information</item>
-    <item>juomavesi</item>
-    <item>kahvila</item>
-    <item>kalastus</item>
-    <item>kampaamo</item>
-    <item>kauppa</item>  
-    <item>kirkko</item>
-    <item>kohtaamispaikka</item>
-    <item>kuoppa</item>
-    <item>lautta</item>
-    <item>marketti</item>
-    <item>nuotio</item>
-    <item>nähtävyys</item>
-    <item>putoavia kiviä</item>
-    <item>paloasema</item>
-    <item>postilaatikko</item>
-    <item>ooppera</item>
-    <item>ostokset</item>
-    <item>pankkiautomaatti</item>
-    <item>pankki</item>
-    <item>poliisiasema</item>
-    <item>pysäköinti</item>
-    <item>posti</item>
-    <item>puhelin</item>
-    <item>puu</item>
-    <item>rakennus</item>
-    <item>ravintola</item>
-    <item>reittipiste</item>
-    <item>retkeilyreitti</item>
-    <item>risteys</item>
-    <item>ruokakauppa</item>
-    <item>satama</item>
-    <item>talo</item>
-    <item>tasoristeys</item>
-    <item>teatteri</item>
-    <item>tulentekopaikka</item>
-    <item>tunneli</item>
-    <item>turisti-info</item>
-    <item>uima-allas</item>
-    <item>vesiputous</item>
-    <item>WC</item>
-  </array>
-
-</resources>
diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml
index b88779a81..53f85482c 100644
--- a/MyTracks/res/values-fi/strings.xml
+++ b/MyTracks/res/values-fi/strings.xml
@@ -15,493 +15,255 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Used by the Menu -->
-  <string name="start_recording">Aloita reitti</string>
-  <string name="stop_recording">Lopeta</string>
-  <string name="switch_to_sat">Satelliitti</string>
-  <string name="switch_to_map">Kartta</string>
-  <string name="mylocation">Oma sijainti</string>
-  <string name="list_tracks">Reitit</string>
-  <string name="list_markers">Merkinnät</string>
-  <string name="delete_all_tracks">Poista kaikki reitit</string>
-  <string name="settings">Asetukset</string>
-  <string name="elevation">Korkeus</string>
-  <string name="choose_track_message">Valitse näytettävä reitti</string>
-  <string name="current_track">Valittu reitti</string>
-  <string name="current_segment">Nykyinen segmentti</string>
-  <string name="sensor_state">Sensorien tila</string>
-  <string name="aggregated_stats">Yhteenlasketut tilastot</string>
-
-  <!-- Error messages -->
-  <string name="error_no_location_manager">Paikkatietoja ei löytynyt!</string>
-  <string name="error_no_gps">GPS-palvelua ei löytynyt.</string>
-  <string name="error_sending_to_my_maps">Virhe lähetettäessä reittiä Google My Maps-palveluun.</string>
-  <string name="error_sending_to_fusion_tables">Virhe lähetettäessä reittiä Google Fusion Tables-palveluun.</string>
-  <string name="error_sending_to_docs">Virhe lähetettäessä reittiä Google Docs-palveluun..</string>
-  <string name="error_sending_generic">Yritä myöhemmin uudelleen.</string>
-  <string name="error_unable_to_start_recording">Tallennusta ei voitu aloittaa. Yritä uudelleen.</string>
-  <string name="error_unable_to_stop_recording">Tallennusta ei voitu pysäyttää. Yritä uudelleen.</string>
-  <string name="error_import_unable_to_read_file">Tiedostovirhe.</string>
-  <string name="error_import_invalid_gpx_format">Virheellinen GPX-formaatti.</string>
-  <string name="error_import_generic">Tapahtui virhe. Yritä uudelleen.</string>
-  <string name="error_export_track_does_not_exist">Reittiä ei ole olemassa.</string>
-  <string name="error_export_operation_canceled">Tapahtuma keskeytettiin.</string>
-  <string name="error_import_out_of_memory">Liian suuri tiedosto (maksimi 500 KB). Keskeytetään.</string>
-  <string name="error_unable_to_insert_marker">Merkintää ei voitu lisätä. Paikkatietoa ei saatavilla.</string>
-
-  <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Odotetaan parempaa GPS-yhteyttä. Varmista että taivas on näkyvissä.</string>
-  <string name="status_now_recording">Tallennetaan uutta reittiä.</string>
-  <string name="status_stopped_recording">Reitin tallentaminen lopetettiin.</string>
-  <string name="sending_to_google_additional_info">Reitin näkyminen saattaa kestää muutaman minuutin.</string>
-  <string name="status_need_to_enable_gps">Avaa tästä Sijainti ja suojaus -asetukset ja valitse \'Käytä GPS-satelliitteja\'. Palaa ohjelmaan painamalla Takaisin-näppäintä.</string>
-  <string name="status_approximate_current_location">Huomio: Näkyvä sijainti perustuu kännykkämastoista ja WLAN-verkoista arvioituun paikkatietoon.</string>
-  <string name="status_no_current_location">Paikkatietoa ei löydy. Aktivoi lisää paikannusmenetelmiä (katso Asetukset) ja varmista että taivas on näkyvissä. Yritä myöhemmin uudelleen.</string>
-  <string name="status_waypoint_inserted">Reittimerkintä lisätty.</string>
-  <string name="status_marker_inserted">Tilastomerkintä lisätty.</string>
-  <string name="sending_to_google_upload_status">Lähetyksen tila:</string>
-
-  <!-- Progress dialog -->
-  <string name="progress_title">Odota...</string>
-  <string name="progress_message">Lähetetään reittiä Google:n palvelimelle.</string>
-  <string name="progress_message_reading_track">Luetaan reittiä...</string>
-  <string name="progress_message_preparing_track">Valmistellaan reittiä...</string>
-  <string name="progress_message_authenticating_fusion_tables">Todennetaan Google Fusion Tables -tiliä...</string>
-  <string name="progress_message_authenticating_my_maps">Todennetaan Google Maps -tiliä...</string>
-  <string name="progress_message_authenticating_docs">Todennetaan Google Docs -tiliä...</string>
-  <string name="progress_message_sending_docs">Lähetetään reittiä Google Docsiin...</string>
-  <string name="progress_message_sending_my_maps">Lähetetään reittiä Google Mapsiin...</string>
-  <string name="progress_message_creating_map">Luodaan uutta My Mapsia...</string>
-  <string name="progress_message_sending_fusion_tables">Lähetetään reittiä Fusion Tablesiin...</string>
-  <string name="progress_message_creating_fusion_table">Luodaan uutta Fusion tablea...</string>
-  <string name="progress_message_import">Tuodaan uutta GPS-reittiä. Odota.</string>
-  <string name="progress_message_export">Kirjoitetaan tiedostoa SD-kortille. Odota.</string>
-  <string name="progress_message_updating_track">Päivitetään reitin tilastoja...</string>
-
-  <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Oletko varma?</string>
-  <string name="all_data_will_be_permanently_deleted">Kaikki reitit ja merkinnät poistetaan puhelimesta.</string>
-  <string name="track_will_be_permanently_deleted">Reitti ja se merkinnät poistetaan pysyvästi puhelimesta.</string>
-  <string name="marker_will_be_permanently_deleted">Merkintä poistetaan puhelimesta.</string>
-
-  <!-- Text and links when uploading to Google Fusion Tables -->
-  <string name="new_map_description">Created by My Tracks on Android.</string>
- 
-  <!-- Text and links when uploading to Google My Maps -->
-  <string name="my_map_link">Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; on Android.</string>
-  <string name="new_map_title">Uusi kartta</string>
-
-  <!-- Formatting of track and marker descriptions -->
-  <string name="points">Pisteet</string>
-  <string name="recorded_date">Tallennettu</string>
-  <string name="category">Liikunnan muoto</string>
-  <string name="waypoint_category">Merkinnän tyyppi</string>
-  <string name="track_part_format">(Osa %d)</string>
-
-  <!-- Used by the track recording service -->
-  <string name="recording_your_track">Tallennetaan reittiä...</string>
-  <string name="new_track_format">Reitti %d</string>
-
-  <!-- Common -->
-  <string name="no">Ei</string>
-  <string name="yes">Kyllä</string>
-  <string name="ok">OK</string>
-  <string name="error">Virhe</string>
-  <string name="success">Valmis</string>
-  <string name="waypoint">Reittipiste</string>
-  <string name="license">Lisenssi</string>
-  <string name="cancel">Peruuta</string>
-  <string name="save">Tallenna</string>
-
-  <!-- Placemark labels for start and end of track -->
-  <string name="start">(Lähtö)</string>
-  <string name="end">(Maali)</string>
-
-  <!--  TrackList -->
-  <string name="tracklist_show_track">Näytä</string>
-  <string name="tracklist_send_to_mymaps">Lähetä Google My Mapsiin</string>
-  <string name="tracklist_send_to_new_mymap">Lähetä New Google My Mapiin</string>
-  <string name="tracklist_send_to_fusiontables">Lähetä Google Fusion Tablesiin</string>
-  <string name="tracklist_send_to_new_fusiontable">Lähetä New Google Fusion Tablesiin</string>
-  <string name="tracklist_send_to_docs">Lähetä Google Docsiin</string>
-  <string name="tracklist_send_to_google">Lähetä Googleen...</string>
-  <string name="tracklist_delete_track">Poista puhelimesta...</string>
-  <string name="tracklist_edit_track">Muokkaa tietoja...</string>
-  <string name="tracklist_write_to_sd">Kirjoita SD-kortille...</string>
-  <string name="tracklist_save_as_gpx">Tallenna GPX-tiedosto</string>
-  <string name="tracklist_save_as_kml">Tallenna KML-tiedosto</string>
-  <string name="tracklist_save_as_csv">Tallenna CSV-tiedosto</string>
-  <string name="tracklist_save_as_tcx">Tallenna TCX-tiedosto</string>
-  <string name="tracklist_btn_send_all_to_fusiontables">Lähetä Google Fusion Tablesiin</string>
-  <string name="tracklist_btn_send_all_to_mymaps">Lähetä Google My Mapsiin</string>
-  <string name="tracklist_btn_delete_all">Poista kaikki</string>
-  <!-- Export All -->
-  <string name="tracklist_btn_export_all">Vie kaikki</string>
-  <string name="export_done">Vienti tehty</string>
-  <string name="tracklist_pick_one">Valitse reitti. Pitkällä painalluksella lisää vaihtoehtoja.</string>
-  <string name="tracklist_all_tracks">Kaikki reitit:</string>
-  <string name="tracklist_this_track">Tämä reitti</string>
-  <string name="tracklist_share_track">Jaa...</string>
-  <string name="tracklist_share_link">Linkki karttaan</string>
-  <string name="tracklist_share_gpx_file">GPX-tiedosto</string>
-  <string name="tracklist_share_kml_file">KML-tiedosto</string>
-  <string name="tracklist_share_csv_file">CSV-tiedosto</string>
-  <string name="tracklist_share_tcx_file">TCX-tiedosto</string>
-  <string name="tracklist_clear_map">Tyhjennä kartta</string>
-  <!-- Import All -->
-  <string name="tracklist_btn_import_all">Tuo kaikki</string>
-  <!-- Format:
-  $1 : Successful imports
-  $2 : Attempted imports
-  $3 : MyTracks gpx path
-  -->
-  <string name="import_multi_done">Tuotu %1$d GPX-tiedostoa %2$d:sta lähteestä %3$s</string>
-  <string name="import_multi_empty">Lähteestä %s ei löytynyt GPX-tiedostoja. SD-kortti saattaa olla lukukelvoton tai hakemistossa ei ole GPX-tiedostoja.</string>
-  <string name="import_error">Virhe tuotaessa tiedostoa %s</string>
-  <string name="import_title">Tuo My Tracksiin</string>
-  <string name="import_success">%1$d reittiä tuotu.</string>
-  <string name="import_show_track">Näytä reitti</string>
-
-  <!-- Waypoints list -->
-  <string name="waypointslist_btn_delete_all">Poista kaikki merkinnät</string>
-  <string name="waypointslist_this_waypoint">Tämä merkintä</string>
-  <string name="waypointslist_delete_waypoint">Poista</string>
-  <string name="waypointslist_edit_waypoint">Muokkaa tietoja</string>
-  <string name="waypointslist_show_waypoint">Näytä kartalla</string>
-  <string name="waypointslist_btn_insert_waypoint">Lisää reittipiste</string>
-  <string name="waypointslist_btn_insert_statistics">Lisää tilastot</string>
-  <string name="waypointslist_pick_one">Valitse merkintä. Pitkä painallus tuo esiin lisää vaihtoehtoja.</string>
-
-  <!-- MyTracks Details -->
-  <string name="trackdetails_title">Reitin tiedot</string>
-  <string name="trackdetails_name">Reitin nimi</string>
-  <string name="trackdetails_name_hint">Reitin nimi</string>
-  <string name="trackdetails_description">Reitin kuvaus</string>
-  <string name="trackdetails_description_hint">Reitin kuvaus</string>
-  <string name="trackdetails_category">Liikunnan muoto (esim. hölkkä, pyöräily, juoksu...)</string>
-  <string name="trackdetails_category_hint">Liikunnan muoto</string>
-
-  <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Merkinnän tiedot</string>
-  <string name="waypointdetails_name">Merkinnän nimi</string>
-  <string name="waypointdetails_name_hint">Merkinnän nimi</string>
-  <string name="waypointdetails_description">Merkinnän kuvaus</string>
-  <string name="waypointdetails_description_hint">Merkinnän kuvaus</string>
-  <string name="waypointdetails_category">Merkinnän tyyppi (esim. rakennus, kuoppa, nähtävyys...)</string>
-  <string name="waypointdetails_category_hint">Merkinnän tyyppi</string>
-
-  <!-- MyTracks Settings -->
-  <string name="settings_title">My Tracks Asetukset</string>
-  <string name="settings_display">Näyttö</string>
-  <string name="settings_recording">Tallennus</string>
-  <string name="settings_sharing">Jakaminen</string>
-
-  <string name="settings_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>
-  <string name="settings_announcement_frequency_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_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_min_recording_interval">Lyhyin aika</string>
-  <string name="settings_min_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_metric_units">Käytä metrijärjestelmää</string>
-  <string name="settings_metric_units_summary_on">Kaikki etäisyydet näytetään metrijärjestelmässä</string>
-  <string name="settings_metric_units_summary_off">Kaikki etäisyydet näytetään U.S yksiköitä käyttäen</string>
-
-  <string name="settings_map_public">Aseta kartat julkisiksi</string>
-  <string name="settings_map_public_summary_on">Lähetetyt kartat näkyvät kaikille osoitteessa maps.google.com</string>
-  <string name="settings_map_public_summary_off">Lähetettyjä karttoja ei näytetä julkisesti osoitteessa maps.google.com</string>
-
-  <string name="settings_report_speed_or_pace">Näytä nopeus</string>
-  <string name="settings_report_speed_or_pace_summary_on">Nopeus näytetään</string>
-  <string name="settings_report_speed_or_pace_summary_off">Tahti näytetään</string>
-
-  <string name="settings_share_url_only">Jaa vain URL</string>
-  <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_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_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_reset">Palauta oletusasetukset</string>
-  <string name="settings_reset_summary">Palauta kaikki oletusasetukset</string>
-  <string name="settings_reset_dialog_message">Kaikki asetuksesi poistetaan ja palautetaan oletusarvoisiksi. Tallennetut reitit säilytetään. Oletko varma?</string>
-  <string name="settings_reset_done">Oletusasetukset palautettu.</string>
-
-  <string name="pace_label">Tahti</string>
-
-  <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_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_modular_stats_display_title">Modular Stats Display</string>
-
-  <!-- Backups -->
-  <string name="settings_backup">Varmuuskopioi (BETA)</string>
-  <string name="settings_sd_backup">Varmuuskopioi SD-kortille</string>
-  <string name="settings_backup_to_sd">Varmuuskopioi</string>
-  <string name="settings_backup_to_sd_summary">Tallenna täydellinen kopio reiteistä ja asetuksista SD-kortille</string>
-  <string name="settings_restore_from_sd">Palauta</string>
-  <string name="settings_restore_from_sd_summary">Palauta kaikki reitit ja asetukset SD-kortilta</string>
-
-  <string name="restore_overwrites_warning">Palautus SD-kortilta ylikirjoittaa kaikki nykyiset reitit ja asetukset. Jatketaanko?</string>
-  <string name="select_backup_to_restore">Valitse palautettava varmuuskopio</string>
-  <string name="no_backups">Varmuuskopioita ei löytynyt.</string>
-  <string name="backup_write_progress_message">Luodaan varmuuskopiota. Odota...</string>
-  <string name="backup_import_progress_message">Luetaan varmuuskopiota SD-kortilta. Odota...</string>
-
-  <!-- MyTracksSky -->
-  <string name="mytracks_sky">GPS-satelliitit</string>
-
-  <!-- My Maps -->
-  <string name="select_map_message">Valitse kartta tililtäsi:</string>
-  <string name="create_new_map">Luo uusi kartta...</string>
-  <string name="map_list_title">Lähetä Google My Mapsiin</string>
-  <string name="maps_list_loading">Ladataan karttoja...</string>
-  <string name="maps_list_failed">Karttoja ei voitu ladata!</string>
-  <string name="open_map">Valitse tämä kartta</string>
-  <string name="edit_map_details">Muokkaa kartan tietoja</string>
-  <string name="share_track_url">Jaa reitti</string>
-  <string name="delete_map">Poista kartta tililtä</string>
-  <string name="map_title">Kartan otsikko:</string>
-  <string name="map_description">Kartan kuvaus:</string>
-  <string name="map_searchable_edit">Näytä kartta ja sen sisältö hakutuloksissa</string>
-  <string name="map_not_searchable_edit">Älä näytä karttaa tai sen sisältöä hakutuloksissa. Tiedot näkyvät suoralla URL-linkillä</string>
-  <string name="map_searchable">Tämä kartta ja sen sisältö näkyy hakutuloksissa</string>
-  <string name="map_not_searchable">Kartta tai sen sisältö ei näy hakutuloksissa. Tiedot näkyvät muille kuitenkin suoralla URL-linkillä</string>
-
-  <!-- Sharing -->
-  <string name="share_track_picker_title">Jaa kartta</string>
-  <string name="share_map_subject">Haluaisin jakaa kartan kanssasi</string>
-  <string name="share_track_url_body_format">Saattaisit olla kiinnostunut tästä reitistä:
-
-      %s</string>
-  <string name="share_track_subject">Haluaisin jakaa reitin kanssasi</string>
-  <string name="share_track_file_body_format">Saattaisit olla kiinnostunut tästä reitistä.
-
-    Käytä Google Earthia tai jotain muuta karttaohjelmistoa kartan katsomiseen.</string>
-
-  <!-- Visibility -->
-  <string name="public_map">Julkinen</string>
-  <string name="unlisted_map">Ei listattu</string>
-  <string name="mapslist_no_maps_available">Ei karttoja saatavilla.</string>
-
-  <!-- Statistics View -->
-  <!-- Average Moving -->
-  <string name="average_moving_speed_label">Keskinopeus (liikuttaessa)</string>
-  <string name="average_moving_pace_label">Tahti (liikuttaessa)</string>
-
-  <!-- Average -->
-  <string name="average_speed_label">Keskinopeus</string>
-  <string name="average_pace_label">Tahti</string>
-
-  <string name="elevation_chart_name">Korkeuskaavio</string>
-  <string name="elevation_gain_label">Nousu</string>
-  <string name="elevation_label">Korkeus</string>
-  <string name="latitude_label">Leveysaste</string>
-  <string name="longitude_label">Pituuspiiri</string>
-
-  <!-- Min -->
-  <string name="min_elevation_label">Min Korkeus</string>
-  <string name="min_grade_label">Min Kaltevuus</string>
-  <string name="min_pace_label">Min Tahti</string>
-
-  <!-- Max -->
-  <string name="max_elevation_label">Max Korkeus</string>
-  <string name="max_grade_label">Max Kaltevuus</string>
-  <string name="max_speed_label">Max Nopeus</string>
-
-  <string name="loading_track">Ladataan reittiä...</string>
-
-  <!-- Chart Settings -->
-  <string name="chart_settings">Kaavion asetukset</string>
-  <!-- X Axis -->
-  <string name="x_axis">X-akseli</string>
-  <string name="by_distance">Etäisyyden mukaan</string>
-  <string name="by_time">Ajan mukaan</string>
-
-  <!-- Y Axis -->
-  <string name="y_axis">Y-akseli</string>
-
-  <!-- Units -->
-  <!-- Time  -->
-  <string name="voice_hour">tunti</string>
-  <string name="voice_hours">tuntia</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>
-  <string name="voice_seconds">sekuntia</string>
-  <string name="milliseconds">ms</string>
-
-  <!-- Distance -->
-  <string name="unit_meter">m</string>
-  <string name="unit_kilometer">km</string>
-  <string name="voice_kilometers">kilometriä</string>
-  <string name="unit_feet">ft</string>
-  <string name="unit_mile">mi</string>
-  <string name="voice_miles">mailia</string>
-
-  <!-- Speed and Pace -->
-  <string name="kilometer_per_hour">km/h</string>
-  <string name="voice_kilometer_per_hour">kilometriä tunnissa</string>
-  <string name="min_per_kilometer">min/km</string>
-  <string name="voice_per_kilometer">per kilometri</string>
-  <string name="mile_per_hour">mi/h</string>
-  <string name="voice_mile_per_hour">mailia tunnissa</string>
-  <string name="min_per_mile">min/mi</string>
-  <string name="voice_per_mile">per maili</string>
-
-  <!-- Sensors -->
-  <string name="watts">W</string>
-  <string name="revolutions_per_minute">rpm</string>
-  <string name="bpm">bpm</string>
-  <string name="battery_level">Akku</string>
-
-  <!-- Stats Labels -->
-  <string name="moving_time_label">Liikkumisaika</string>
-  <string name="total_time_label">Kokonaisaika</string>
-  <string name="time_label">Aika</string>
-  <string name="sd_unavail">Muistikortti ei ole käytettävissä</string>
-  <string name="speed">Nopeus</string>
-  <string name="start_trip">Sinun pitää ensin aloittaa matka.</string>
-  <string name="statistics">Tilastot</string>
-  <string name="total_distance_label">Kokonaismatka</string>
-  <string name="distance_label">Matka</string>
-  <string name="power">Teho</string>
-  <string name="cadence">Kadenssi</string>
-  <string name="heart_rate">Syke</string>
-  <string name="max_heart_rate">Maksimisyke</string>
-  <string name="unknown">-</string>
-  <string name="waiting">Odotetaan...</string>
-
-  <!-- End User License Agreement -->
-  <string name="eula_title">End User License Agreement</string>
-  <string name="accept">Hyväksy</string>
-  <string name="decline">Hylkää</string>
-
-  <!-- About -->
-  <string name="about">Tietoja</string>
-  <string name="help">Apua</string>
+  <string name="about_license">Lisenssi</string>
+  <string name="about_privacy">Yksityisyys:</string>
+  <string name="about_support">Tuki:</string>
   <string name="about_team">Tiimi:</string>
   <string name="about_version">Version:</string>
-  <string name="about_support">Tuki:</string>
-  <string name="about_privacy">Yksityisyys:</string>
-
-  <!-- Send to Google -->
-  <string name="sendtogoogle_title">Lähetä...</string>
-  <string name="sendtogoogle_google_fusiontables">Google Fusion Tables</string>
-  <string name="sendtogoogle_google_mymaps">Google My Maps</string>
-  <string name="sendtogoogle_google_docs">Google Docs</string>
-  <string name="sendtogoogle_send_now">Lähetä</string>
-  <string name="sendtogoogle_create_new_map">Luo uusi kartta</string>
-  <string name="sendtogoogle_pick_existing_map">Valitse kartta</string>
-  <string name="sendtogoogle_send_stats">Lähetä reitin statistiikka</string>
-  <string name="sendtogoogle_send_stats_and_points">Lähetä reitin statistiikka ja pisteet</string>
-
-  <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Tiliä ei löytynyt</string>
-  <string name="no_account_found">Tiliä johon reitin voisi lähettää ei löytynyt.</string>
-  <string name="choose_account_title">Valitse tili</string>
-
-  <!-- SD card -->
-  <string name="io_no_external_storage_found">Ulkoista tallennusmediaa ei löytynyt. Varmista että SD-kortti on kytketty eikä puhelinta ole liitetty tietokoneeseen.</string>
-  <string name="io_write_failed">Kirjoitusvirhe.</string>
-  <string name="io_read_failed">Lukuvirhe.</string>
-  <string name="io_create_dir_failed">Hakemistoa ei voitu luoda SD-kortille.</string>
-  <string name="io_write_finished">SD-kortille kirjoitus valmis.</string>
-  <string name="io_read_finished">SD-kortin luku valmis.</string>
-
-  <!-- VersionChecker -->
-  <string name="version_check_title">Tarkista päivitykset</string>
-  <string name="version_check_upgrade_button">Päivitä</string>
-  <string name="version_check_continue_button">Ohita päivitys</string>
-  <string name="upgrade_required">Käytössäsi oleva versio ohjelmasta %1$s saattaa lakata toimimasta eikä ole enää tuettu. Päivitä jatkaaksesi %1$s käyttöä.</string>
-  <string name="upgrade_recommended">Käytössäsi oleva versio ohjelmasta %1$s saattaa lakata toimimasta. Voit päivittää sen nyt tai jatkaa käyttöä omalla riskillä. Tietyt ominaisuudet, kuten synkronointi serverin kanssa, ei välttämättä toimi ennen päivitystä.</string>
-  <string name="upgrade_available">%1$s uusi versio saatavilla. Voit jatkaa nykyisen version käyttöä tai päivitää uuteen versioon.</string>
-
-  <!-- Welcome -->
-  <string name="welcome">Tervetuloa</string>
-  <string name="welcome_read_later">Ok</string>
-  <string name="welcome_about">Tietoa My Tracksista</string>
-
-  <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks ei etäisyyttä</string>
-  <!-- Format:
-  $1 : Distance label
-  $2 : Distance value (5)
-  $3 : Distance units (mi, km)
-  $4 : Time description (10 minutes 5 seconds)
-  $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
-  $6 : Speed units (mph) : Pace units (per mile)
-  -->
-  <string name="announce_template">My Tracks %1$s %2$.2f %3$s ajassa %4$s nopeudella %5$s %6$s</string>
-
-  <!-- Check Units -->
-  <string name="check_units_title">Huomautus mittayksiköistä</string>
-
-  <!-- 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="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
-  <string name="ant_options">ANT asetukset</string>
+  <string name="chart_settings_by_distance">Etäisyyden mukaan</string>
+  <string name="chart_settings_by_time">Ajan mukaan</string>
+  <string name="chart_settings_x_axis">X-akseli</string>
+  <string name="chart_settings_y_axis">Y-akseli</string>
+  <string name="eula_accept">Hyväksy</string>
+  <string name="eula_decline">Hylkää</string>
+  <string name="eula_title">End User License Agreement</string>
+  <string name="export_canceled">Tapahtuma keskeytettiin.</string>
+  <string name="export_progress_message">Kirjoitetaan tiedostoa SD-kortille. Odota.</string>
+  <string name="export_success">Vienti tehty</string>
+  <string name="generic_cancel">Peruuta</string>
+  <string name="generic_confirm_title">Oletko varma?</string>
+  <string name="generic_error_title">Virhe</string>
+  <string name="generic_no">Ei</string>
+  <string name="generic_ok">OK</string>
+  <string name="generic_progress_title">Odota...</string>
+  <string name="generic_save">Tallenna</string>
+  <string name="generic_success_title">Valmis</string>
+  <string name="generic_yes">Kyllä</string>
+  <string name="gps_need_to_enable">Avaa tästä Sijainti ja suojaus -asetukset ja valitse \'Käytä GPS-satelliitteja\'. Palaa ohjelmaan painamalla Takaisin-näppäintä.</string>
+  <string name="gps_not_found">GPS-palvelua ei löytynyt.</string>
+  <string name="gps_wait_for_fix">Odotetaan parempaa GPS-yhteyttä. Varmista että taivas on näkyvissä.</string>
+  <string name="import_error">Virhe tuotaessa tiedostoa %s</string>
+  <string name="import_no_file">Lähteestä %s ei löytynyt GPX-tiedostoja. SD-kortti saattaa olla lukukelvoton tai hakemistossa ei ole GPX-tiedostoja.</string>
+  <string name="import_success">Tuotu %1$d GPX-tiedostoa %2$d:sta lähteestä %3$s</string>
+  <string name="marker_detail_marker_description">Merkinnän kuvaus</string>
+  <string name="marker_detail_marker_name">Merkinnän nimi</string>
+  <string name="marker_detail_marker_type">Merkinnän tyyppi (esim. rakennus, kuoppa, nähtävyys...)</string>
+  <string name="marker_detail_marker_type_hint">Merkinnän tyyppi</string>
+  <string name="marker_detail_title">Merkinnän tiedot</string>
+  <string name="marker_insert_error">Merkintää ei voitu lisätä. Paikkatietoa ei saatavilla.</string>
+  <string name="marker_insert_success">Tilastomerkintä lisätty.</string>
+  <string name="marker_label_end">(Maali)</string>
+  <string name="marker_label_start">(Lähtö)</string>
+  <string name="marker_list_context_menu_title">Tämä merkintä</string>
+  <string name="marker_list_delete_marker">Poista</string>
+  <string name="marker_list_delete_marker_confirm_message">Merkintä poistetaan puhelimesta.</string>
+  <string name="marker_list_edit_marker">Muokkaa tietoja</string>
+  <string name="marker_list_insert_statistics">Lisää tilastot</string>
+  <string name="marker_list_insert_waypoint">Lisää reittipiste</string>
+  <string name="marker_list_pick_one">Valitse merkintä. Pitkä painallus tuo esiin lisää vaihtoehtoja.</string>
+  <string name="marker_list_show_on_map">Näytä kartalla</string>
+  <string name="marker_type_statistics">Tilastot</string>
+  <string name="marker_type_waypoint">Reittipiste</string>
+  <string name="menu_aggregated_statistics">Yhteenlasketut tilastot</string>
+  <string name="menu_chart_view_chart_settings">Kaavion asetukset</string>
+  <string name="menu_help">Apua</string>
+  <string name="menu_map_view_map_mode">Kartta</string>
+  <string name="menu_map_view_my_location">Oma sijainti</string>
+  <string name="menu_map_view_satellite_mode">Satelliitti</string>
+  <string name="menu_markers">Merkinnät</string>
+  <string name="menu_record_track">Aloita reitti</string>
+  <string name="menu_sensor_state">Sensorien tila</string>
+  <string name="menu_settings">Asetukset</string>
+  <string name="menu_stop_recording">Lopeta</string>
+  <string name="menu_tracks">Reitit</string>
+  <string name="my_location_approximate_location">Huomio: Näkyvä sijainti perustuu kännykkämastoista ja WLAN-verkoista arvioituun paikkatietoon.</string>
+  <string name="my_location_no_location">Paikkatietoa ei löydy. Aktivoi lisää paikannusmenetelmiä (katso Asetukset) ja varmista että taivas on näkyvissä. Yritä myöhemmin uudelleen.</string>
+  <string name="my_maps_list_error">Karttoja ei voitu ladata!</string>
+  <string name="my_maps_list_loading">Ladataan karttoja...</string>
+  <string name="my_maps_list_no_maps">Ei karttoja saatavilla.</string>
+  <string name="my_maps_list_pick_map">Valitse kartta tililtäsi:</string>
+  <string name="my_maps_list_public_label">Julkinen</string>
+  <string name="my_maps_list_title">Lähetä Google My Mapsiin</string>
+  <string name="my_maps_list_unlisted_label">Ei listattu</string>
+  <string name="permission_notification_description">Huomauta kun reitin tallennus aloitetaan tai pysäytetään..</string>
+  <string name="permission_notification_label">vastaanota huomautuksia reitin tallentamisesta</string>
+  <string name="permission_read_description">Mahdollista reittidatan lukeminen, kuten reittipisteet, merkinnät jne.</string>
+  <string name="permission_read_label">lue tallennettua reittidataa</string>
+  <string name="permission_write_description">Mahdollista reittidatan kirjoittaminen, kuten tallennuksen aloittaminen, merkintöjen lisääminen jne.</string>
+  <string name="permission_write_label">kirjoita tallennettua reittidataa, aloita/pysäytä reitin tallennus</string>
+  <string name="sd_card_error_create_dir">Hakemistoa ei voitu luoda SD-kortille.</string>
+  <string name="sd_card_error_no_storage">Ulkoista tallennusmediaa ei löytynyt. Varmista että SD-kortti on kytketty eikä puhelinta ole liitetty tietokoneeseen.</string>
+  <string name="sd_card_error_read_file">Lukuvirhe.</string>
+  <string name="sd_card_error_write_file">Kirjoitusvirhe.</string>
+  <string name="sd_card_success_read_file">SD-kortin luku valmis.</string>
+  <string name="sd_card_success_write_file">SD-kortille kirjoitus valmis.</string>
+  <string name="send_google_choose_account_title">Valitse tili</string>
+  <string name="send_google_docs">Google Docs</string>
+  <string name="send_google_existing_map">Valitse kartta</string>
+  <string name="send_google_fusion_tables">Google Fusion Tables</string>
+  <string name="send_google_my_maps">Google My Maps</string>
+  <string name="send_google_new_map">Luo uusi kartta</string>
+  <string name="send_google_no_account_message">Tiliä johon reitin voisi lähettää ei löytynyt.</string>
+  <string name="send_google_no_account_title">Tiliä ei löytynyt</string>
+  <string name="send_google_progress_preparing_track">Valmistellaan reittiä...</string>
+  <string name="send_google_progress_reading_track">Luetaan reittiä...</string>
+  <string name="send_google_recorded">Tallennettu</string>
+  <string name="send_google_result_header">Lähetyksen tila:</string>
+  <string name="send_google_result_share_url">Jaa reitti</string>
+  <string name="send_google_send_now">Lähetä</string>
+  <string name="send_google_success_footer">Reitin näkyminen saattaa kestää muutaman minuutin.</string>
+  <string name="send_google_title">Lähetä...</string>
+  <string name="send_google_track_part_label">(Osa %d)</string>
+  <string name="sensor_state_battery">Akku</string>
+  <string name="sensor_state_cadence">Kadenssi</string>
+  <string name="sensor_state_connected">Yhdistetty</string>
+  <string name="sensor_state_connecting">Yhdistetään</string>
+  <string name="sensor_state_disconnected">Katkaistu</string>
+  <string name="sensor_state_heart_rate">Syke</string>
+  <string name="sensor_state_last_sensor_time">Sensorin data-aika</string>
+  <string name="sensor_state_power">Teho</string>
+  <string name="sensor_state_sending">Lähetetään</string>
+  <string name="settings_backup">Varmuuskopioi (BETA)</string>
+  <string name="settings_backup_now">Varmuuskopioi</string>
+  <string name="settings_backup_now_progress_message">Luodaan varmuuskopiota. Odota...</string>
+  <string name="settings_backup_now_summary">Tallenna täydellinen kopio reiteistä ja asetuksista SD-kortille</string>
+  <string name="settings_backup_restore">Palauta</string>
+  <string name="settings_backup_restore_confirm_message">Palautus SD-kortilta ylikirjoittaa kaikki nykyiset reitit ja asetukset. Jatketaanko?</string>
+  <string name="settings_backup_restore_no_backup">Varmuuskopioita ei löytynyt.</string>
+  <string name="settings_backup_restore_progress_message">Luetaan varmuuskopiota SD-kortilta. Odota...</string>
+  <string name="settings_backup_restore_select_title">Valitse palautettava varmuuskopio</string>
+  <string name="settings_backup_restore_summary">Palauta kaikki reitit ja asetukset SD-kortilta</string>
+  <string name="settings_backup_sd_card">Varmuuskopioi SD-kortille</string>
+  <string name="settings_display">Näyttö</string>
+  <string name="settings_display_metric">Käytä metrijärjestelmää</string>
+  <string name="settings_display_metric_summary_off">Kaikki etäisyydet näytetään U.S yksiköitä käyttäen</string>
+  <string name="settings_display_metric_summary_on">Kaikki etäisyydet näytetään metrijärjestelmässä</string>
+  <string name="settings_display_speed">Näytä nopeus</string>
+  <string name="settings_display_speed_summary_off">Tahti näytetään</string>
+  <string name="settings_display_speed_summary_on">Nopeus näytetään</string>
+  <string name="settings_not_while_recording">Ei saatavilla reittiä tallennettaessa.</string>
+  <string name="settings_recording">Tallennus</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_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_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_recording_interval">Lyhyin aika</string>
+  <string name="settings_recording_interval_summary">Lyhyin aikaintervalli kahden tallennetun pisteen välillä</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_recording_name">Aikamerkintä nimenä</string>
+  <string name="settings_recording_name_summary_off">Oletusnimenä käytetään kasvavaa numerointia.</string>
+  <string name="settings_recording_name_summary_on">Oletusnimenä reitille käytetään aloituspäivämäärää ja aikaa</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_recording_voice">Äänimerkki</string>
+  <string name="settings_recording_voice_not_available">Ei tuettu tässä Android-versiossa</string>
+  <string name="settings_recording_voice_summary">Äänimerkkien aikaväli</string>
+  <string name="settings_reset">Palauta oletusasetukset</string>
+  <string name="settings_reset_dialog_message">Kaikki asetuksesi poistetaan ja palautetaan oletusarvoisiksi. Tallennetut reitit säilytetään. Oletko varma?</string>
+  <string name="settings_reset_done">Oletusasetukset palautettu.</string>
+  <string name="settings_reset_summary">Palauta kaikki oletusasetukset</string>
   <string name="settings_sensor">Sensorien asetukset</string>
-
-  <!-- Bluetooth Sensor -->
-  <string name="bluetooth_connected">Yhdistetty %s</string>
-  <string name="bluetooth_connecting">Yhdistetään bluetooth sensoria ...</string>
-  <string name="bluetooth_not_connected">Bluetooth sensoria ei ole yhdistetty</string>
-
-  <!-- Sensor State -->
-  <string name="sensor_data_time">Sensorin data-aika</string>
-  <string name="power_meter_enabled">Tehomittari käytössä</string>
-  <string name="heart_rate_monitor_enabled">Sykemittari käytössä</string>
-  <string name="no_sensor_manager">Ei sensorihallintaa</string>
-  <string name="enabled">Käytössä</string>
-  <string name="connecting">Yhdistetään</string>
-  <string name="connected">Yhdistetty</string>
-  <string name="disconnected">Katkaistu</string>
-  <string name="no_sensor_service">Ei sensoripalvelua</string>
-  <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>
-
-  <!-- Manifest description (not seen inside the app) -->
-  <string name="notification_permission_label">vastaanota huomautuksia reitin tallentamisesta</string>
-  <string name="read_tracks_permission_label">lue tallennettua reittidataa</string>
-  <string name="write_tracks_permission_label">kirjoita tallennettua reittidataa, aloita/pysäytä reitin tallennus</string>
-  <string name="notification_permission_description">Huomauta kun reitin tallennus aloitetaan tai pysäytetään..</string>
-  <string name="read_tracks_permission_description">Mahdollista reittidatan lukeminen, kuten reittipisteet, merkinnät jne.</string>
-  <string name="write_tracks_permission_description">Mahdollista reittidatan kirjoittaminen, kuten tallennuksen aloittaminen, merkintöjen lisääminen jne.</string>
+  <string name="settings_sensor_ant_not_paired">ANT sensori ei paritettu</string>
+  <string name="settings_sensor_ant_options">ANT asetukset</string>
+  <string name="settings_sensor_ant_paired">ANT sensori paritettu: %d</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="settings_sensor_bluetooth_sensor">Bluetooth sensori</string>
+  <string name="settings_sensor_bluetooth_sensor_summary">Bluetooth-sensori johon yhdistetään</string>
+  <string name="settings_sensor_type">Sensorin tyyppi</string>
+  <string name="settings_sensor_type_ant">ANT+ -sensori</string>
+  <string name="settings_sensor_type_none">Ei sensoria</string>
+  <string name="settings_sensor_type_polar">Polar bluetooth</string>
+  <string name="settings_sensor_type_srm">SRM ANT+ -silta</string>
+  <string name="settings_sensor_type_summary">Sensorin tyyppi johon yhdistetään</string>
+  <string name="settings_sensor_type_zephyr">Zephyr bluetooth</string>
+  <string name="settings_sensor_unpair_ant">Resetoi ANT sykemittarin paritus</string>
+  <string name="settings_sensor_unpair_srm">Resetoi ANT SRM sillan paritus</string>
+  <string name="settings_sharing">Jakaminen</string>
+  <string name="settings_sharing_map_public">Aseta kartat julkisiksi</string>
+  <string name="settings_sharing_map_public_summary_off">Lähetettyjä karttoja ei näytetä julkisesti osoitteessa maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_on">Lähetetyt kartat näkyvät kaikille osoitteessa maps.google.com</string>
+  <string name="settings_sharing_url_only">Jaa vain URL</string>
+  <string name="settings_sharing_url_only_summary_off">Myös reitin sisältö ja tiedot jaetaan</string>
+  <string name="settings_title">My Tracks Asetukset</string>
+  <string name="share_track_file_body_format">Saattaisit olla kiinnostunut tästä reitistä.\n\nKäytä Google Earthia tai jotain muuta karttaohjelmistoa kartan katsomiseen.</string>
+  <string name="share_track_picker_title">Jaa kartta</string>
+  <string name="share_track_subject">Haluaisin jakaa reitin kanssasi</string>
+  <string name="share_track_url_body_format">Saattaisit olla kiinnostunut tästä reitistä:\n\n%s</string>
+  <string name="stat_average_moving_pace">Tahti (liikuttaessa)</string>
+  <string name="stat_average_moving_speed">Keskinopeus (liikuttaessa)</string>
+  <string name="stat_average_pace">Tahti</string>
+  <string name="stat_average_speed">Keskinopeus</string>
+  <string name="stat_elevation">Korkeus</string>
+  <string name="stat_elevation_gain">Nousu</string>
+  <string name="stat_latitude">Leveysaste</string>
+  <string name="stat_longitude">Pituuspiiri</string>
+  <string name="stat_max_elevation">Max Korkeus</string>
+  <string name="stat_max_grade">Max Kaltevuus</string>
+  <string name="stat_max_speed">Max Nopeus</string>
+  <string name="stat_min_elevation">Min Korkeus</string>
+  <string name="stat_min_grade">Min Kaltevuus</string>
+  <string name="stat_min_pace">Min Tahti</string>
+  <string name="stat_moving_time">Liikkumisaika</string>
+  <string name="stat_pace">Tahti</string>
+  <string name="stat_speed">Nopeus</string>
+  <string name="stat_total_distance">Kokonaismatka</string>
+  <string name="stat_total_time">Kokonaisaika</string>
+  <string name="track_detail_activity_type">Liikunnan muoto (esim. hölkkä, pyöräily, juoksu...)</string>
+  <string name="track_detail_activity_type_hint">Liikunnan muoto</string>
+  <string name="track_detail_title">Reitin tiedot</string>
+  <string name="track_detail_track_description">Reitin kuvaus</string>
+  <string name="track_detail_track_name">Reitin nimi</string>
+  <string name="track_list_clear_map">Tyhjennä kartta</string>
+  <string name="track_list_context_menu_title">Tämä reitti</string>
+  <string name="track_list_delete_all">Poista kaikki</string>
+  <string name="track_list_delete_all_confirm_message">Kaikki reitit ja merkinnät poistetaan puhelimesta.</string>
+  <string name="track_list_delete_track">Poista puhelimesta...</string>
+  <string name="track_list_delete_track_confirm_message">Reitti ja se merkinnät poistetaan pysyvästi puhelimesta.</string>
+  <string name="track_list_edit_track">Muokkaa tietoja...</string>
+  <string name="track_list_export_all">Vie kaikki</string>
+  <string name="track_list_import_all">Tuo kaikki</string>
+  <string name="track_list_pick_one">Valitse reitti. Pitkällä painalluksella lisää vaihtoehtoja.</string>
+  <string name="track_list_save_sd">Kirjoita SD-kortille...</string>
+  <string name="track_list_send_google">Lähetä Googleen...</string>
+  <string name="track_list_share_track">Jaa...</string>
+  <string name="track_list_share_url">Linkki karttaan</string>
+  <string name="track_list_show_on_map">Näytä</string>
+  <string name="track_name_format">Reitti %d</string>
+  <string name="track_record_error">Tallennusta ei voitu aloittaa. Yritä uudelleen.</string>
+  <string name="track_record_notification">Tallennetaan reittiä...</string>
+  <string name="track_record_success">Tallennetaan uutta reittiä.</string>
+  <string name="unit_beat_per_minute">bpm</string>
+  <string name="unit_feet">ft</string>
+  <string name="unit_hour">h</string>
+  <string name="unit_kilometer">km</string>
+  <string name="unit_kilometer_per_hour">km/h</string>
+  <string name="unit_meter">m</string>
+  <string name="unit_mile">mi</string>
+  <string name="unit_mile_per_hour">mi/h</string>
+  <string name="unit_minute">min</string>
+  <string name="unit_minute_per_kilometer">min/km</string>
+  <string name="unit_minute_per_mile">min/mi</string>
+  <string name="unit_revolution_per_minute">rpm</string>
+  <string name="unit_watt">W</string>
+  <string name="voice_hour">tunti</string>
+  <string name="voice_hours">tuntia</string>
+  <string name="voice_kilometer_per_hour">kilometriä tunnissa</string>
+  <string name="voice_kilometers">kilometriä</string>
+  <string name="voice_mile_per_hour">mailia tunnissa</string>
+  <string name="voice_miles">mailia</string>
+  <string name="voice_minute">minuutti</string>
+  <string name="voice_minutes">minuuttia</string>
+  <string name="voice_no_distance">My Tracks ei etäisyyttä</string>
+  <string name="voice_per_kilometer">per kilometri</string>
+  <string name="voice_per_mile">per maili</string>
+  <string name="voice_second">sekunti</string>
+  <string name="voice_seconds">sekuntia</string>
+  <string name="voice_template">My Tracks %1$.2f %2$s ajassa %3$s nopeudella %4$s %5$s</string>
+  <string name="welcome_about">Tietoa My Tracksista</string>
+  <string name="welcome_title">Tervetuloa</string>
 </resources>
diff --git a/MyTracks/res/values-fr/arrays.xml b/MyTracks/res/values-fr/arrays.xml
deleted file mode 100644
index ef0994644..000000000
--- a/MyTracks/res/values-fr/arrays.xml
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-  <!-- Minimum recording distance -->
-  <string-array name="min_recording_distance_options">
-    <item>1 m</item>
-    <item>2 m</item>
-    <item>3 m</item>
-    <item>4 m</item>
-    <item>5 m (recommandé)</item>
-    <item>10 m</item>
-    <item>100 m</item>
-  </string-array>
-
-  <string-array name="min_recording_distance_options_ft">
-    <item>3 pieds</item>
-    <item>6 pieds</item>
-    <item>10 pieds</item>
-    <item>13 pieds</item>
-    <item>16 pieds (recommandé)</item>
-    <item>33 pieds</item>
-    <item>328 pieds</item>
-  </string-array>
-
-  <!-- Maximum recording distance -->
-  <string-array name="max_recording_distance_options">
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (recommandé)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>5000 m</item>
-  </string-array>
-
-  <string-array name="max_recording_distance_options_ft">
-    <item>164 pieds</item>
-    <item>328 pieds</item>
-    <item>656 pieds (recommandé)</item>
-    <item>1640 pieds</item>
-    <item>0.6 miles</item>
-    <item>3.1 miles</item>
-  </string-array>
-
-  <!-- Minimum recording interval -->
-  <string-array name="min_recording_interval_options">
-    <item>économiseur de batterie (adaptatif)</item>
-    <item>haute résolution (adaptatif)</item>
-    <item>haute résolution (recommandé)</item>
-    <item>2 s</item>
-    <item>3 s</item>
-    <item>4 s</item>
-    <item>5 s</item>
-    <item>10 s</item>
-    <item>20 s</item>
-    <item>30 s</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-  </string-array>
-
-  <!-- Minimum required accuracy -->
-  <string-array name="min_required_accuracy_options">
-    <item>10 m (excellent signal GPS)</item>
-    <item>20 m</item>
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (recommandé)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>2000 m</item>
-    <item>5000 m (Mauvais signal GPS)</item>
-  </string-array>
-
-  <string-array name="min_required_accuracy_options_ft">
-    <item>33 pieds (excellent signal GPS)</item>
-    <item>66 pieds</item>
-    <item>165 pieds</item>
-    <item>328 pieds</item>
-    <item>656 pieds (recommandé)</item>
-    <item>1640 pieds</item>
-    <item>0.6 miles</item>
-    <item>1.2 miles</item>
-    <item>3.1 miles (mauvais signal GPS)</item>
-  </string-array>
-
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Absent</item>
-    <item>100 km</item>
-    <item>50 km</item>
-    <item>25 km</item>
-    <item>10 km</item>
-    <item>5 km</item>
-    <item>1 km</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-  <string-array name="task_frequency_options_ft">
-    <item>Absent</item>
-    <item>100 mi</item>
-    <item>50 mi</item>
-    <item>25 mi</item>
-    <item>10 mi</item>
-    <item>5 mi</item>
-    <item>1 mi</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-
-  <!-- Other non-preference arrays -->
-  <array name="activity_types">
-    <item>inconnue</item>
-    <item>activité mixte</item>
-    <item>autre</item>
-
-    <item>jogging</item>
-    <item>course à pied</item>
-    <item>jogging urbain</item>
-    <item>athlétisme</item>
-    <item>course sur piste</item>
-    <item>cross</item>
-
-    <item>marche à pied</item>
-    <item>balade</item>
-    <item>marche sportive</item>
-    <item>randonnée</item>
-    <item>trekking</item>
-    <item>alpinisme</item>
-
-    <item>marche à pied hors sentier</item>
-    <item>escalade</item>
-
-    <item>cyclisme</item>
-    <item>vélo</item>
-    <item>cyclisme sur route</item>
-    <item>vélo sur route</item>
-    <item>VTT</item>
-    <item>Vélo Tout Terrain</item>
-    <item>cyclisme sur piste</item>
-    <item>vélo de piste</item>
-
-    <item>patin à roulette</item>
-    <item>skate board</item>
-
-    <item>randonnée en raquette</item>
-    <item>ski</item>
-    <item>ski de fond</item>
-    <item>ski de piste</item>
-    <item>ski de randonnée</item>
-    <item>ski hors piste</item>
-    <item>snow board</item>
-    <item>luge</item>
-    <item>voilier sur glace</item>
-
-    <item>navigation</item>
-    <item>bateau à voile</item>
-    <item>voilier</item>
-    <item>aviron</item>
-    <item>kayak</item>
-    <item>bateau à moteur</item>
-    <item>ferry</item>
-    <item>bateau télécommandé</item>
-    <item>surf</item>
-    <item>planche à voile</item>
-    <item>kite surf</item>
-    <item>ski nautique</item>
-
-    <item>avion</item>
-    <item>avion à moteur</item>
-    <item>planneur</item>
-    <item>planneur à moteur</item>
-    <item>motoplanneur</item>
-    <item>avion commercial</item>
-    <item>helicoptère</item>
-    <item>ballon</item>
-    <item>dirigeable</item>
-    <item>avion télécommandé</item>
-    <item>hélicoptère télécommandé</item>
-    <item>saut en parachute</item>
-    <item>base jump</item>
-    <item>base jumping</item>
-    <item>parapente</item>
-    <item>deltaplane</item>
-
-    <item>équitation</item>
-    <item>balade à cheval</item>
-
-    <item>conduite</item>
-    <item>conduite de voiture</item>
-    <item>conduite de bus</item>
-    <item>voiture</item>
-    <item>bus</item>
-    <item>camion</item>
-    <item>fourgon</item>
-    <item>fourgonnette</item>
-    <item>utilitaire</item>
-    <item>train</item>
-    <item>moto</item>
-    <item>motocyclette</item>
-    <item>motocross</item>
-
-    <item>char à voile</item>
-    <item>frisbee</item>
-    <item>ultimate frisbee</item>
-  </array>
-
-  <array name="waypoint_types">
-    <item>distributeur de billets</item>
-    <item>banque</item>
-    <item>bar</item>
-    <item>barbecue</item>
-    <item>immeuble</item>
-    <item>arrêt de bus</item>
-    <item>café</item>
-    <item>feu de camp</item>
-    <item>camping</item>
-    <item>église</item>
-    <item>coffee house</item>
-    <item>supérette</item>
-    <item>eau potable</item>
-    <item>chute de pierre</item>
-    <item>ferry</item>
-    <item>feu de camp</item>
-    <item>caserne de pompiers</item>
-    <item>lieu de pêche</item>
-    <item>station service</item>
-    <item>golf</item>
-    <item>magasin d\'alimentation</item>
-    <item>coiffeur</item>
-    <item>port</item>
-    <item>sentier</item>
-    <item>hôtel</item>
-    <item>maison</item>
-    <item>information</item>
-    <item>intersection</item>
-    <item>boite aux lettres</item>
-    <item>marché</item>
-    <item>lieu de rendez-vous</item>
-    <item>point de rendez-vous</item>
-    <item>opéra</item>
-    <item>parking</item>
-    <item>poste</item>
-    <item>caverne</item>
-    <item>commissariat</item>
-    <item>passage à niveaux</item>
-    <item>restaurant</item>
-    <item>boutiques</item>
-    <item>vue</item>
-    <item>point de vue</item>
-    <item>boutique</item>
-    <item>magasin</item>
-    <item>piscine</item>
-    <item>téléphone</item>
-    <item>théâtre</item>
-    <item>toilettes</item>
-    <item>office du tourisme</item>
-    <item>tunnel</item>
-    <item>arbre</item>
-    <item>cascade</item>
-    <item>fontaine</item>
-    <item>way point</item>
-    <item>point de passage</item>
-  </array>
-
-</resources>
diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml
index 12ba8761e..162c25ee0 100644
--- a/MyTracks/res/values-fr/strings.xml
+++ b/MyTracks/res/values-fr/strings.xml
@@ -15,398 +15,201 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-
-  <!-- Used by the Menu -->
-  <string name="start_recording">Enregistrer parcours</string>
-  <string name="stop_recording">Arrêter enregistrement</string>
-  <string name="switch_to_sat">Mode satellite</string>
-  <string name="switch_to_map">Mode plan</string>
-  <string name="mylocation">Ma position</string>
-  <string name="list_tracks">Parcours</string>
-  <string name="list_markers">Marqueurs</string>
-  <string name="delete_all_tracks">Supprimer tous les parcours</string>
-  <string name="settings">Paramètres</string>
-  <string name="elevation">Altitude</string>
-  <string name="choose_track_message">Sélectionnez le parcours à visualiser</string>
-  <string name="current_track">Parcours actuel</string>
-  <string name="current_segment">Segment actuel</string>
-  <string name="sensor_state">État du capteur</string>
-  <string name="aggregated_stats">Statistiques consolidées</string>
-  
-  <!-- Error messages -->
-  <string name="error_no_location_manager">Aucune source de localisation n\'a été trouvée sur ce système !</string>
-  <string name="error_no_gps">Aucune source GPS de localisation n\'a été trouvée sur ce système.</string>
-  <string name="error_sending_to_fusion_tables">Il y a eu une erreur lors de l\'envoi de votre parcours à Google Fusion Tables. Réessayez plus tard SVP.</string>
-  <string name="error_sending_to_docs">Il y a eu une erreur lors de l\'envoi de votre parcours à Google Docs. Réessayez plus tard SVP.</string>
-  <string name="error_unable_to_start_recording">Impossible de débuter l\'enregistrement. Réessayez.</string>
-  <string name="error_unable_to_stop_recording">Impossible de stopper l\'enregistrement. Réessayez.</string>
-  <string name="error_import_unable_to_read_file">Impossible de lire le fichier.</string>
-  <string name="error_import_invalid_gpx_format">Le fichier n\'a pas un format GPX valide.</string>
-  <string name="error_import_generic">Une erreur a eu lieu. Essayez de nouveau s\'il vous plaît.</string>
-  <string name="error_export_track_does_not_exist">Le parcours n\'existe pas.</string>
-  <string name="error_import_out_of_memory">Ce fichier est trop gros (sa taille doit être inférieure à 500ko). Abandon.</string>
-  <string name="error_unable_to_insert_marker">Impossible d\'insérer une balise.  Position inconnue.</string>
-
-  <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Attente du signal GPS. Assurez-vous que le ciel est bien visible.</string>
-  <string name="status_now_recording">Parcours en cours d\'enregistrement.</string>
-  <string name="status_stopped_recording">Enregistrement du parcours terminé.</string>
-  <string name="status_need_to_enable_gps">Cliquez ici et allez dans \'Paramètres\', \'Sécurité et Localisation\' et selectionnez \'Activer les satellites GPS\'. Appuyez sur le bouton de retour pour revenir au menu.</string>
-  <string name="status_approximate_current_location">Note : Votre position est approximative, elle a été déterminée par les antennes de téléphonie ou le réseau WiFi.</string>
-  <string name="status_no_current_location">Votre position ne peut être déterminée. Vérifiez votre configuration dans \'Paramètres\', \'Sécurité et Localisation\'. Assurez-vous également que le ciel soit bien visible.</string>
-  <string name="status_waypoint_inserted">Un point de passage a été inséré.</string>
-  <string name="status_marker_inserted">Une balise de statistiques a été insérée.</string>
-
-  <!-- Progress dialog -->
-  <string name="progress_title">Patientez SVP...</string>
-  <string name="progress_message">Envoi du parcours à Google...</string>
-  <string name="progress_message_reading_track">Lecture du parcours...</string>
-  <string name="progress_message_preparing_track">Préparation du parcours</string>
-  <string name="progress_message_authenticating_fusion_tables">Authentification à Google Fusion Tables...</string>
-  <string name="progress_message_authenticating_docs">Authentification à Google Docs...</string>
-  <string name="progress_message_sending_docs">Envoi du parcours vers Google Docs...</string>
-  <string name="progress_message_sending_fusion_tables">Envoi du parcours vers Google Fusion Tables...</string>
-  <string name="progress_message_creating_fusion_table">Création d\'une nouvelle \'Fusion Table\'...</string>
-  <string name="progress_message_import">Importation du parcours GPS. Patientez SVP.</string>
-  <string name="progress_message_export">Enregistrement du fichier sur la carte SD. Patientez SVP.</string>
-  <string name="progress_message_updating_track">Mise à jour des statistiques du parcours...</string>
-
-  <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Êtes-vous sûr?</string>
-  <string name="all_data_will_be_permanently_deleted">Tous les parcours et balises vont être supprimés de ce téléphone.</string>
-  <string name="track_will_be_permanently_deleted">Le parcours et ses balises vont être supprimés de manière permanente de ce téléphone.</string>
-  <string name="marker_will_be_permanently_deleted">Les balises vont être supprimées de manière permanente de ce téléphone.</string>
-
-  <!-- Text and links when uploading to Google My Maps -->
-  <string name="new_map_description">Créée par My Tracks sous Android.</string>
- 
-  <!-- Formatting of track and marker descriptions -->
-  <string name="recorded_date">Enregistré</string>
-  <string name="category">Type d\'activité</string>
-  <string name="waypoint_category">Type de balise</string>
-  <string name="track_part_format">(Portion %d)</string>
-
-  <!-- Used by the track recording service -->
-  <string name="recording_your_track">Enregistrement de votre parcours...</string>
-  <string name="new_track_format">Parcours %d</string>
-
-  <!-- Common -->
-  <string name="no">Non</string>
-  <string name="yes">Oui</string>
-  <string name="error">Erreur</string>
-  <string name="waypoint">Point de passage</string>
-  <string name="cancel">Annuler</string>
-  <string name="save">Enregistrer</string>
-
-  <!-- Placemark labels for start and end of track -->
-  <string name="start">(Début)</string>
-  <string name="end">(Fin)</string>
-
-  <!--  TrackList -->
-  <string name="tracklist_show_track">Afficher</string>
-  <string name="tracklist_send_to_fusiontables">Envoyer à Google Fusion Tables</string>
-  <string name="tracklist_send_to_new_fusiontable">Envoyer et créer un nouvelle table Google Fusion Tables</string>
-  <string name="tracklist_send_to_docs">Envoyer à Google Docs</string>
-  <string name="tracklist_send_to_google">Envoyer à Google...</string>
-  <string name="tracklist_delete_track">Effacer du téléphone...</string>
-  <string name="tracklist_edit_track">Consulter les détails</string>
-  <string name="tracklist_write_to_sd">Enregistrer sur la carte SD...</string>
-  <string name="tracklist_save_as_gpx">Enregistrer en fichier GPX </string>
-  <string name="tracklist_save_as_kml">Enregistrer en fichier KML</string>
-  <string name="tracklist_btn_send_all_to_fusiontables">Envoyer à Google Fusion Tables</string>
-  <string name="tracklist_btn_export_all">Exporter tous les parcours</string>
-  <string name="tracklist_btn_delete_all">Tout supprimer</string>
-  <string name="tracklist_pick_one">Choisissez un parcours. Faites un appui prolongé pour plus d\'options.</string>
-  <string name="tracklist_all_tracks">Tous les parcours:</string>
-  <string name="tracklist_this_track">Ce parcours</string>
-  <string name="tracklist_share_track">Partager...</string>
-  <string name="tracklist_share_gpx_file">Fichier GPX</string>
-  <string name="tracklist_share_kml_file">Fichier KML</string>
-  <string name="tracklist_clear_map">Effacer la carte</string>
-
-  <!-- Waypoints list -->
-  <string name="waypointslist_btn_delete_all">Supprimer toutes les balises</string>
-  <string name="waypointslist_this_waypoint">Ce marqueur</string>
-  <string name="waypointslist_delete_waypoint">Supprimer</string>
-  <string name="waypointslist_edit_waypoint">Consulter les détails</string>
-  <string name="waypointslist_show_waypoint">Indiquer sur la carte</string>
-  <string name="waypointslist_btn_insert_waypoint">Ajout point de passage</string>
-  <string name="waypointslist_btn_insert_statistics">Ajout de statistiques</string>
-  <string name="waypointslist_pick_one">Choisissez une balise. Faites un appui prolongé pour plus d\'options.</string>
-
-  <!-- MyTracks Details -->
-  <string name="trackdetails_title">Détails parcours</string>
-  <string name="trackdetails_name">Nom du parcours</string>
-  <string name="trackdetails_name_hint">Nom du parcours</string>
-  <string name="trackdetails_description">Description du parcours</string>
-  <string name="trackdetails_description_hint">Description du parcours</string>
-  <string name="trackdetails_category">Type d\'activité (randonnée, cyclisme, jogging, escalade...)</string>
-  <string name="trackdetails_category_hint">Type d\'activité</string>
-
-  <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Details balise</string>
-  <string name="waypointdetails_name">Nom de la balise</string>
-  <string name="waypointdetails_name_hint">Nom de la balise</string>
-  <string name="waypointdetails_description">Description balise</string>
-  <string name="waypointdetails_description_hint">Description balise</string>
-  <string name="waypointdetails_category">Nom de balise (par ex.: immeuble, boutique, point de vue...)</string>
-  <string name="waypointdetails_category_hint">Nom de balise</string>
-
-  <!-- MyTracks Settings -->
-  <string name="settings_title">Paramètres My Tracks</string>
-  <string name="settings_display">Affichage</string>
-  <string name="settings_recording">Enregistrement</string>
-  <string name="settings_sharing">Partage</string>
-
-  <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_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_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_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_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_metric_units">Système métrique</string>
-  <string name="settings_metric_units_summary_on">Le système métrique sera utilisé pour l\'affichage des distances</string>
-  <string name="settings_metric_units_summary_off">Le système impérial sera utilisé pour l\'affichage des distances</string>
-
-  <string name="settings_map_public">Cartes publiques</string>
-  <string name="settings_map_public_summary_on">Les cartes partagées seront visibles par tout le monde sur maps.google.com</string>
-  <string name="settings_map_public_summary_off">Les cartes ne seront pas partagées publiquement sur maps.google.com</string>
-
-  <string name="settings_report_speed_or_pace">Afficher vitesse/rythme</string>
-  <string name="settings_report_speed_or_pace_summary_on">Afficher la vitesse</string>
-  <string name="settings_report_speed_or_pace_summary_off">Afficher le rythme</string>
-
-  <string name="settings_share_url_only">Partager URL/parcours</string>
-  <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="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_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_modular_stats_display_title">Affichage des statistiques modulaires</string>
-
-  <!-- Backups -->
+  <string name="about_team">Équipe :</string>
+  <string name="chart_settings_by_distance">Par distance</string>
+  <string name="chart_settings_by_time">Par durée</string>
+  <string name="chart_settings_x_axis">Abscisse (X)</string>
+  <string name="chart_settings_y_axis">Ordonnée (Y)</string>
+  <string name="eula_accept">Accepter</string>
+  <string name="eula_decline">Décliner</string>
+  <string name="eula_title">Accord de licence utilisateur</string>
+  <string name="export_progress_message">Enregistrement du fichier sur la carte SD. Patientez SVP.</string>
+  <string name="generic_cancel">Annuler</string>
+  <string name="generic_confirm_title">Êtes-vous sûr?</string>
+  <string name="generic_error_title">Erreur</string>
+  <string name="generic_no">Non</string>
+  <string name="generic_progress_title">Patientez SVP...</string>
+  <string name="generic_save">Enregistrer</string>
+  <string name="generic_yes">Oui</string>
+  <string name="gps_need_to_enable">Cliquez ici et allez dans \'Paramètres\', \'Sécurité et Localisation\' et selectionnez \'Activer les satellites GPS\'. Appuyez sur le bouton de retour pour revenir au menu.</string>
+  <string name="gps_not_found">Aucune source GPS de localisation n\'a été trouvée sur ce système.</string>
+  <string name="gps_wait_for_fix">Attente du signal GPS. Assurez-vous que le ciel est bien visible.</string>
+  <string name="marker_detail_marker_description">Description balise</string>
+  <string name="marker_detail_marker_name">Nom de la balise</string>
+  <string name="marker_detail_marker_type">Nom de balise (par ex.: immeuble, boutique, point de vue...)</string>
+  <string name="marker_detail_marker_type_hint">Nom de balise</string>
+  <string name="marker_detail_title">Details balise</string>
+  <string name="marker_insert_error">Impossible d\'insérer une balise.  Position inconnue.</string>
+  <string name="marker_insert_success">Une balise de statistiques a été insérée.</string>
+  <string name="marker_label_end">(Fin)</string>
+  <string name="marker_label_start">(Début)</string>
+  <string name="marker_list_context_menu_title">Ce marqueur</string>
+  <string name="marker_list_delete_marker">Supprimer</string>
+  <string name="marker_list_delete_marker_confirm_message">Les balises vont être supprimées de manière permanente de ce téléphone.</string>
+  <string name="marker_list_edit_marker">Consulter les détails</string>
+  <string name="marker_list_insert_statistics">Ajout de statistiques</string>
+  <string name="marker_list_insert_waypoint">Ajout point de passage</string>
+  <string name="marker_list_pick_one">Choisissez une balise. Faites un appui prolongé pour plus d\'options.</string>
+  <string name="marker_list_show_on_map">Indiquer sur la carte</string>
+  <string name="marker_type_statistics">Statistiques</string>
+  <string name="marker_type_waypoint">Point de passage</string>
+  <string name="menu_aggregated_statistics">Statistiques consolidées</string>
+  <string name="menu_chart_view_chart_settings">Paramètres Graphique</string>
+  <string name="menu_help">Aide</string>
+  <string name="menu_map_view_map_mode">Mode plan</string>
+  <string name="menu_map_view_my_location">Ma position</string>
+  <string name="menu_map_view_satellite_mode">Mode satellite</string>
+  <string name="menu_markers">Marqueurs</string>
+  <string name="menu_record_track">Enregistrer parcours</string>
+  <string name="menu_sensor_state">État du capteur</string>
+  <string name="menu_settings">Paramètres</string>
+  <string name="menu_stop_recording">Arrêter enregistrement</string>
+  <string name="menu_tracks">Parcours</string>
+  <string name="my_location_approximate_location">Note : Votre position est approximative, elle a été déterminée par les antennes de téléphonie ou le réseau WiFi.</string>
+  <string name="my_location_no_location">Votre position ne peut être déterminée. Vérifiez votre configuration dans \'Paramètres\', \'Sécurité et Localisation\'. Assurez-vous également que le ciel soit bien visible.</string>
+  <string name="my_maps_list_no_maps">Vous n\'avez par encore de carte personnalisée.</string>
+  <string name="my_maps_list_unlisted_label">Carte non listée</string>
+  <string name="permission_notification_description">Notifications lors du lancement et de l\'arrêt de l\'enregistrement de parcours.</string>
+  <string name="permission_notification_label">notifications lors de l\'enregistrement de parcours</string>
+  <string name="permission_read_description">Possibilité de lire les données des parcours enregistrés, telles que les marqueurs et les points de passage.</string>
+  <string name="permission_read_label">lecture des parcours enregistrés</string>
+  <string name="permission_write_description">Possibilité d\'écrire des données de parcours, telles que les marqueurs et les points de passage..</string>
+  <string name="permission_write_label">sauvegarde de parcours, lancer/arrêter l\'enregistrement de parcours</string>
+  <string name="sd_card_error_create_dir">Impossible de créer un dossier dans la carte SD.</string>
+  <string name="sd_card_error_no_storage">Aucun emplacement externe de sauvegarde n\'a été trouvé. Assurez-vous qu\'une carte SD est insérée et que votre téléphone n\'est pas relié à un ordinateur.</string>
+  <string name="sd_card_error_write_file">Impossible d\'écrire dans le fichier.</string>
+  <string name="sd_card_success_write_file">Parcours enregistré sur la carte SD.</string>
+  <string name="send_google_choose_account_title">Choisissez un compte</string>
+  <string name="send_google_no_account_message">Un compte Google est nécessaire pour télécharger le parcours.</string>
+  <string name="send_google_no_account_title">Pas de compte Google</string>
+  <string name="send_google_progress_preparing_track">Préparation du parcours</string>
+  <string name="send_google_progress_reading_track">Lecture du parcours...</string>
+  <string name="send_google_recorded">Enregistré</string>
+  <string name="send_google_result_share_url">Partager des parcours.</string>
+  <string name="send_google_send_now">Envoyer maintenant</string>
+  <string name="send_google_title">Envoyer à</string>
+  <string name="send_google_track_part_label">(Portion %d)</string>
+  <string name="sensor_state_cadence">Cadence</string>
+  <string name="sensor_state_connected">Connecté</string>
+  <string name="sensor_state_connecting">Connexion</string>
+  <string name="sensor_state_disconnected">Déconnecté</string>
+  <string name="sensor_state_heart_rate">Rythme cardiaque</string>
+  <string name="sensor_state_last_sensor_time">Date des données du capteur</string>
+  <string name="sensor_state_power">Puissance</string>
+  <string name="sensor_state_sending">Envoi</string>
   <string name="settings_backup">Sauvegarde (BETA)</string>
-  <string name="settings_sd_backup">Sauvegarde sur carte SD</string>
-  <string name="settings_backup_to_sd">Sauvegarder</string>
-  <string name="settings_backup_to_sd_summary">Copier tous vos parcours et paramètres sur la carte SD</string>
-  <string name="settings_restore_from_sd">Restaurer</string>
-  <string name="settings_restore_from_sd_summary">Restaurer tous les parcours et paramètres depuis la carte SD</string>
-
-  <string name="restore_overwrites_warning">Restaurer une sauvegarde depuis la carte SD écrasera tous vos parcours et paramètres actuels.</string>
-  <string name="select_backup_to_restore">Choisissez la sauvegarde à restaurer</string>
-  <string name="no_backups">Pas de sauvegarde disponible.</string>
-  <string name="backup_write_progress_message">Écriture de tous vos parcours et paramètres sur la carte SD. Veuillez patienter...</string>
-  <string name="backup_import_progress_message">Lecture de tous vos parcours et paramètres depuis la carte SD. Veuillez patienter...</string>
-  
-  <!-- MyTracksSky -->
-  <string name="mytracks_sky">Satellites GPS</string>
-
-  <!-- Sharing -->
+  <string name="settings_backup_now">Sauvegarder</string>
+  <string name="settings_backup_now_progress_message">Écriture de tous vos parcours et paramètres sur la carte SD. Veuillez patienter...</string>
+  <string name="settings_backup_now_summary">Copier tous vos parcours et paramètres sur la carte SD</string>
+  <string name="settings_backup_restore">Restaurer</string>
+  <string name="settings_backup_restore_confirm_message">Restaurer une sauvegarde depuis la carte SD écrasera tous vos parcours et paramètres actuels.</string>
+  <string name="settings_backup_restore_no_backup">Pas de sauvegarde disponible.</string>
+  <string name="settings_backup_restore_progress_message">Lecture de tous vos parcours et paramètres depuis la carte SD. Veuillez patienter...</string>
+  <string name="settings_backup_restore_select_title">Choisissez la sauvegarde à restaurer</string>
+  <string name="settings_backup_restore_summary">Restaurer tous les parcours et paramètres depuis la carte SD</string>
+  <string name="settings_backup_sd_card">Sauvegarde sur carte SD</string>
+  <string name="settings_display">Affichage</string>
+  <string name="settings_display_metric">Système métrique</string>
+  <string name="settings_display_metric_summary_off">Le système impérial sera utilisé pour l\'affichage des distances</string>
+  <string name="settings_display_metric_summary_on">Le système métrique sera utilisé pour l\'affichage des distances</string>
+  <string name="settings_display_speed">Afficher vitesse/rythme</string>
+  <string name="settings_display_speed_summary_off">Afficher le rythme</string>
+  <string name="settings_display_speed_summary_on">Afficher la vitesse</string>
+  <string name="settings_recording">Enregistrement</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_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_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_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="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_recording_voice">Fréquence des annonces</string>
+  <string name="settings_recording_voice_summary">Temps minimum entre deux annonces vocales</string>
+  <string name="settings_sensor">Options du capteur</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_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="settings_sensor_bluetooth_sensor">Capteur Bluetooth</string>
+  <string name="settings_sensor_bluetooth_sensor_summary">Capteur Bluetooth à utiliser</string>
+  <string name="settings_sensor_type">Type de capteur</string>
+  <string name="settings_sensor_type_ant">Capteur ANT+</string>
+  <string name="settings_sensor_type_none">Aucun</string>
+  <string name="settings_sensor_type_polar">Bluetooth Polar</string>
+  <string name="settings_sensor_type_srm">Pont SRM ANT+</string>
+  <string name="settings_sensor_type_summary">Type du capteur à utiliser</string>
+  <string name="settings_sensor_type_zephyr">Bluetooth Zephyr</string>
+  <string name="settings_sensor_unpair_ant">Se désassocier du Cardiofréquencemètre ANT</string>
+  <string name="settings_sensor_unpair_srm">Se désassocier du pont SRM ANT</string>
+  <string name="settings_sharing">Partage</string>
+  <string name="settings_sharing_map_public">Cartes publiques</string>
+  <string name="settings_sharing_map_public_summary_off">Les cartes ne seront pas partagées publiquement sur maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_on">Les cartes partagées seront visibles par tout le monde sur maps.google.com</string>
+  <string name="settings_sharing_url_only">Partager URL/parcours</string>
+  <string name="settings_sharing_url_only_summary_off">Le contenu du parcours sera également inclus lors du partage</string>
+  <string name="settings_title">Paramètres My Tracks</string>
+  <string name="share_track_file_body_format">Je pense que ce parcours vous intéressera.\n\nPour voir ce parcours, utilisez Google Earth ou tout autre logiciel de cartographie.</string>
   <string name="share_track_picker_title">Partager.</string>
-  <string name="share_map_subject">Je voudrais partager ma carte avec vous</string>
-  <string name="share_track_url_body_format">Je pense que cette carte vous intéressera :
-
-      %s</string>
   <string name="share_track_subject">Je voudrais partager un parcours avec vous</string>
-  <string name="share_track_file_body_format">Je pense que ce parcours vous intéressera.
-
-    Pour voir ce parcours, utilisez Google Earth ou tout autre logiciel de cartographie.</string>
-  <string name="share_track_url">Partager des parcours.</string>
-
-  <!-- Visibility -->
-  <string name="unlisted_map">Carte non listée</string>
-  <string name="mapslist_no_maps_available">Vous n\'avez par encore de carte personnalisée.</string>
-
-  <!-- Statistics View -->
-  <!-- Average Moving -->
-  <string name="average_moving_speed_label">Vitesse moyenne (déplacement)</string>
-  <string name="average_moving_pace_label">Rythme moyen (dépl.)</string>
-
-  <!-- Average -->
-  <string name="average_speed_label">Vitesse moyenne</string>
-  <string name="average_pace_label">Rythme moyen</string>
-
-  <string name="elevation_chart_name">Altitude maximale</string>
-  <string name="elevation_gain_label">Dénivelé cumulé</string>
-  <string name="elevation_label">Altitude</string>
-
-  <!-- Min -->
-  <string name="min_elevation_label">Altitude min</string>
-  <string name="min_grade_label">Pente min</string>
-  <string name="min_pace_label">Rythme min</string>
-
-  <!-- Max -->
-  <string name="max_elevation_label">Altitude max</string>
-  <string name="max_grade_label">Pente max</string>
-  <string name="max_speed_label">Vitesse max</string>
-
-  <string name="loading_track">Chargement du parcours...</string>
-
-  <!-- Chart Settings -->
-  <string name="chart_settings">Paramètres Graphique</string>
-  <!-- X Axis -->
-  <string name="x_axis">Abscisse (X)</string>
-  <string name="by_distance">Par distance</string>
-  <string name="by_time">Par durée</string>
-
-  <!-- Y Axis -->
-  <string name="y_axis">Ordonnée (Y)</string>
-
-  <!-- Units -->
-  <!-- Time  -->
+  <string name="share_track_url_body_format">Je pense que cette carte vous intéressera :\n\n%s</string>
+  <string name="stat_average_moving_pace">Rythme moyen (dépl.)</string>
+  <string name="stat_average_moving_speed">Vitesse moyenne (déplacement)</string>
+  <string name="stat_average_pace">Rythme moyen</string>
+  <string name="stat_average_speed">Vitesse moyenne</string>
+  <string name="stat_elevation">Altitude</string>
+  <string name="stat_elevation_gain">Dénivelé cumulé</string>
+  <string name="stat_max_elevation">Altitude max</string>
+  <string name="stat_max_grade">Pente max</string>
+  <string name="stat_max_speed">Vitesse max</string>
+  <string name="stat_min_elevation">Altitude min</string>
+  <string name="stat_min_grade">Pente min</string>
+  <string name="stat_min_pace">Rythme min</string>
+  <string name="stat_moving_time">Durée (déplacement)</string>
+  <string name="stat_pace">Rythme</string>
+  <string name="stat_speed">Vitesse</string>
+  <string name="stat_total_distance">Distance totale</string>
+  <string name="stat_total_time">Durée totale</string>
+  <string name="track_detail_activity_type">Type d\'activité (randonnée, cyclisme, jogging, escalade...)</string>
+  <string name="track_detail_activity_type_hint">Type d\'activité</string>
+  <string name="track_detail_title">Détails parcours</string>
+  <string name="track_detail_track_description">Description du parcours</string>
+  <string name="track_detail_track_name">Nom du parcours</string>
+  <string name="track_list_clear_map">Effacer la carte</string>
+  <string name="track_list_context_menu_title">Ce parcours</string>
+  <string name="track_list_delete_all">Tout supprimer</string>
+  <string name="track_list_delete_all_confirm_message">Tous les parcours et balises vont être supprimés de ce téléphone.</string>
+  <string name="track_list_delete_track">Effacer du téléphone...</string>
+  <string name="track_list_delete_track_confirm_message">Le parcours et ses balises vont être supprimés de manière permanente de ce téléphone.</string>
+  <string name="track_list_edit_track">Consulter les détails</string>
+  <string name="track_list_export_all">Exporter tous les parcours</string>
+  <string name="track_list_pick_one">Choisissez un parcours. Faites un appui prolongé pour plus d\'options.</string>
+  <string name="track_list_save_sd">Enregistrer sur la carte SD...</string>
+  <string name="track_list_send_google">Envoyer à Google...</string>
+  <string name="track_list_share_track">Partager...</string>
+  <string name="track_list_show_on_map">Afficher</string>
+  <string name="track_name_format">Parcours %d</string>
+  <string name="track_record_error">Impossible de débuter l\'enregistrement. Réessayez.</string>
+  <string name="track_record_notification">Enregistrement de votre parcours...</string>
+  <string name="track_record_success">Parcours en cours d\'enregistrement.</string>
+  <string name="unit_feet">pied</string>
+  <string name="unit_kilometer_per_hour">km/h</string>
+  <string name="unit_mile_per_hour">mi/h</string>
   <string name="voice_hour">heure</string>
   <string name="voice_hours">heures</string>
+  <string name="voice_kilometer_per_hour">kilomètres/heure</string>
+  <string name="voice_kilometers">kilomètres</string>
+  <string name="voice_mile_per_hour">miles/heure</string>
+  <string name="voice_miles">milles</string>
+  <string name="voice_no_distance">My Tracks pas de distance disponible</string>
+  <string name="voice_per_kilometer">par kilomètre</string>
+  <string name="voice_per_mile">per mile</string>
   <string name="voice_second">seconde</string>
   <string name="voice_seconds">secondes</string>
-
-  <!-- Distance -->
-  <string name="unit_feet">pied</string>
-  <string name="voice_kilometers">kilomètres</string>
-  <string name="voice_miles">milles</string>
-
-  <!-- Speed and Pace -->
-  <string name="kilometer_per_hour">km/h</string>
-  <string name="voice_kilometer_per_hour">kilomètres/heure</string>
-  <string name="voice_per_kilometer">par kilomètre</string>
-  <string name="mile_per_hour">mi/h</string>
-  <string name="voice_mile_per_hour">miles/heure</string>
-  <string name="voice_per_mile">per mile</string>
-
-
-  <string name="waiting">Waiting...</string>
-  
-  <!-- Stats Labels -->
-  <string name="moving_time_label">Durée (déplacement)</string>
-  <string name="total_time_label">Durée totale</string>
-  <string name="time_label">Durée</string>
-  <string name="sd_unavail">Carte SD indisponible</string>
-  <string name="speed">Vitesse</string>
-  <string name="start_trip">Vous devez commencer un parcours</string>
-  <string name="distance_label">Distance</string>
-  <string name="power">Puissance</string>
-  <string name="cadence">Cadence</string>
-  <string name="heart_rate">Rythme cardiaque</string>
-  <string name="max_heart_rate">Rythme cardiaque maximum</string>
-  <string name="unknown">-</string>
-  <string name="statistics">Statistiques</string>
-  <string name="total_distance_label">Distance totale</string>
-  <string name="waiting">Patientez</string>
-
-  <!-- End User License Agreement -->
-  <string name="eula_title">Accord de licence utilisateur</string>
-  <string name="accept">Accepter</string>
-  <string name="decline">Décliner</string>
-
-  <!-- About -->
-  <string name="about">À propos</string>
-  <string name="help">Aide</string>
-
-  <string name="about_team">Équipe :</string>
-
-  <!-- Send to Google -->
-  <string name="sendtogoogle_title">Envoyer à</string>
-  <string name="sendtogoogle_send_now">Envoyer maintenant</string>
-  <string name="sendtogoogle_send_stats">Envoyer les statistiques du parcours</string>
-  <string name="sendtogoogle_send_stats_and_points">Envoyer les statistiques et les balises</string>
-
-  <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Pas de compte Google</string>
-  <string name="no_account_found">Un compte Google est nécessaire pour télécharger le parcours.</string>
-  <string name="choose_account_title">Choisissez un compte</string>
-
-  <!-- SD card -->
-  <string name="io_no_external_storage_found">Aucun emplacement externe de sauvegarde n\'a été trouvé. Assurez-vous qu\'une carte SD est insérée et que votre téléphone n\'est pas relié à un ordinateur.</string>
-  <string name="io_write_failed">Impossible d\'écrire dans le fichier.</string>
-  <string name="io_create_dir_failed">Impossible de créer un dossier dans la carte SD.</string>
-  <string name="io_write_finished">Parcours enregistré sur la carte SD.</string>
-
-  <!-- VersionChecker -->
-  <string name="version_check_title">Recherche mise à jour</string>
-  <string name="version_check_upgrade_button">Installer mise à jour</string>
-  <string name="version_check_continue_button">Continuer sans installer mise à jour</string>
-  <string name="upgrade_required">Votre version %1$s est obsolète et n\'est plus supportée. Installer les mises à jour afin de pouvoir continuer à utiliser %1$s.</string>
-  <string name="upgrade_recommended">Votre version  %1$s est obsolète et n\'est plus supportée. Vous pouvez installer les mises à jour ou continuer à l\'utiliser à vos propres risques. Certaines fonctionalités comme la synchronisation avec le serveur risquent de ne pas fonctionner tant que vous n\'installerez pas la mise à jour.</string>
-  <string name="upgrade_available">Une nouvelle version %1$s est disponible.  Vous pouvez continuer à utiliser la version actuelle sans rencontrer de problèmes mais vous de disposerez pas des dernières fonctionnalités tant que vous n\'aurez pas installé les mises à jour.</string>
-
-  <!-- Welcome -->
-  <string name="welcome">Bienvenue</string>
+  <string name="voice_template">My Tracks %1$.2f %2$s en %3$s at %4$s %5$s</string>
   <string name="welcome_about">À propos de My Tracks</string>
-
-
-  <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks pas de distance disponible</string>
-  <!-- Format:
-  $1 : Distance label
-  $2 : Distance value (5)
-  $3 : Distance units (mi, km)
-  $4 : Time description (10 minutes 5 seconds)
-  $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
-  $6 : Speed units (mph) : Pace units (per mile)
-  -->
-  <string name="announce_template">My Tracks %1$s %2$.2f %3$s en %4$s at %5$s %6$s</string>
-
-  <!-- Check Units -->
-  <string name="check_units_title">Note sur les unités de mesure</string>
- 
-  <!-- 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="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
-  <string name="settings_sensor">Options du capteur</string>
-
-  <!-- Bluetooth Sensor -->
-  <string name="bluetooth_connected">Connecté à %s</string>
-  <string name="bluetooth_connecting">Connexion du capteur Bluetooth...</string>
-  <string name="bluetooth_not_connected">Capteur Bluetooth non connecté</string>
-
-  <!-- Sensor State -->
-  <string name="sensor_data_time">Date des données du capteur</string>
-  <string name="power_meter_enabled">Compteur activé</string>
-  <string name="heart_rate_monitor_enabled">Cardiofréquencemètre activé</string>
-  <string name="no_sensor_manager">Pas de gestionnaire de capteur</string>
-  <string name="enabled">Activé</string>
-  <string name="connecting">Connexion</string>
-  <string name="connected">Connecté</string>
-  <string name="disconnected">Déconnecté</string>
-  <string name="no_sensor_service">Pas de capteur</string>
-  <string name="searching">Recherche</string>
-  <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>
-
-  <!-- Manifest description (not seen inside the app) -->
-  <string name="notification_permission_label">notifications lors de l\'enregistrement de parcours</string>
-  <string name="read_tracks_permission_label">lecture des parcours enregistrés</string>
-  <string name="write_tracks_permission_label">sauvegarde de parcours, lancer/arrêter l\'enregistrement de parcours</string>
-  <string name="notification_permission_description">Notifications lors du lancement et de l\'arrêt de l\'enregistrement de parcours.</string>
-  <string name="read_tracks_permission_description">Possibilité de lire les données des parcours enregistrés, telles que les marqueurs et les points de passage.</string>
-  <string name="write_tracks_permission_description">Possibilité d\'écrire des données de parcours, telles que les marqueurs et les points de passage..</string>
+  <string name="welcome_title">Bienvenue</string>
 </resources>
diff --git a/MyTracks/res/values-it/arrays.xml b/MyTracks/res/values-it/arrays.xml
deleted file mode 100644
index 9974d2fc2..000000000
--- a/MyTracks/res/values-it/arrays.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-  <!-- Minimum recording distance -->
-  <string-array name="min_recording_distance_options">
-    <item>1 m</item>
-    <item>2 m</item>
-    <item>3 m</item>
-    <item>4 m</item>
-    <item>5 m (raccomandato)</item>
-    <item>10 m</item>
-    <item>100 m</item>
-  </string-array>
-
-  <string-array name="min_recording_distance_options_ft">
-    <item>3 pd</item>
-    <item>6 pd</item>
-    <item>10 pd</item>
-    <item>13 pd</item>
-    <item>16 pd (raccomandato)</item>
-    <item>33 pd</item>
-    <item>328 pd</item>
-  </string-array>
-
-  <!-- Maximum recording distance -->
-  <string-array name="max_recording_distance_options">
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (raccomandato)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>5000 m</item>
-  </string-array>
-
-  <string-array name="max_recording_distance_options_ft">
-    <item>164 pd</item>
-    <item>328 pd</item>
-    <item>656 pd (raccomandato)</item>
-    <item>1640 pd</item>
-    <item>0,6 mi</item>
-    <item>3,1 mi</item>
-  </string-array>
-
-  <!-- Minimum recording interval -->
-  <string-array name="min_recording_interval_options">
-    <item>risparmio batteria (adattativo)</item>
-    <item>alta (adattativo)</item>
-    <item>massima (raccomandato)</item>
-    <item>2 s</item>
-    <item>3 s</item>
-    <item>4 s</item>
-    <item>5 s</item>
-    <item>10 s</item>
-    <item>20 s</item>
-    <item>30 s</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-  </string-array>
-
-  <!-- Minimum required accuracy -->
-  <string-array name="min_required_accuracy_options">
-    <item>10 m (segnale GPS ottimo)</item>
-    <item>20 m</item>
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (raccomandato)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>2000 m</item>
-    <item>5000 m (segnale GPS debole)</item>
-  </string-array>
-
-  <string-array name="min_required_accuracy_options_ft">
-    <item>33 pd (segnale GPS ottimo)</item>
-    <item>66 pd</item>
-    <item>165 pd</item>
-    <item>328 pd</item>
-    <item>656 pd (raccomandato)</item>
-    <item>1640 pd</item>
-    <item>0.6 mi</item>
-    <item>1.2 mi</item>
-    <item>3.1 mi (segnale GPS debole)</item>
-  </string-array>
-
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Disattivato</item>
-    <item>100 km</item>
-    <item>50 km</item>
-    <item>25 km</item>
-    <item>10 km</item>
-    <item>5 km</item>
-    <item>1 km</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-  <string-array name="task_frequency_options_ft">
-    <item>Disattivato</item>
-    <item>100 mi</item>
-    <item>50 mi</item>
-    <item>25 mi</item>
-    <item>10 mi</item>
-    <item>5 mi</item>
-    <item>1 mi</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-
-  <!-- Other non-preference arrays -->
-  <array name="activity_types">
-    <item>ignoto</item>
-    <item>misto</item>
-    <item>altro</item>
-
-    <item>corsa</item>
-    <item>corsa su strada</item>
-    <item>corsa su pista</item>
-    <item>costa campestre</item>
-    <item>passeggiata</item>
-    <item>marcia</item>
-    <item>escursionismo</item>
-    <item>camminata su sentiero</item>
-    <item>camminata fuori sentiero</item>
-    <item>arrampicata</item>
-
-    <item>ciclismo</item>
-    <item>ciclismo su strada</item>
-    <item>mountain biking</item>
-    <item>ciclismo su pista</item>
-
-    <item>pattinaggio</item>
-    <item>pattinaggio in-line</item>
-    <item>skateboarding</item>
-
-    <item>escursione con racchette da neve</item>
-    <item>sci</item>
-    <item>snowboard</item>
-    <item>slitta</item>
-    <item>pattinaggio su ghiaccio</item>
-
-    <item>vela</item>
-    <item>barca a remi</item>
-    <item>kayak</item>
-    <item>cannottaggio</item>
-    <item>motoscafo</item>
-    <item>traghetto</item>
-    <item>barca radiocomandata</item>
-    <item>surf</item>
-    <item>windsurf</item>
-    <item>kitesurf</item>
-    <item>sci acquatico</item>
-    <item>wakeboard</item>
-
-    <item>aeroplano</item>
-    <item>idrovolante</item>
-    <item>aereo commerciale</item>
-    <item>elicottero</item>
-    <item>mongolfiera</item>
-    <item>dirigibile</item>
-    <item>aereo radiocomandato</item>
-    <item>elicottero radiocomandato</item>
-    <item>paracadutismo</item>
-    <item>aliante</item>
-    <item>deltaplano</item>
-    <item>parapendio</item>
-
-    <item>equitazione</item>
-    <item>equitazione (cavallo)</item>
-    <item>equitazione (mulo)</item>
-
-    <item>automobile</item>
-    <item>autobus</item>
-    <item>treno</item>
-    <item>motocicletta</item>
-    <item>enduro</item>
-    <item>ATV</item>
-
-    <item>landsailing</item>
-    <item>frisbee</item>
-    <item>ultimate frisbee</item>
-  </array>
-
-  <array name="waypoint_types">
-    <item>bancomat</item>
-    <item>banca</item>
-    <item>bar</item>
-    <item>barbeque</item>
-    <item>edificio</item>
-    <item>fermata bus</item>
-    <item>caffè</item>
-    <item>fuoco da campocampfire</item>
-    <item>campeggio</item>
-    <item>chiesa</item>
-    <item>caffè bar</item>
-    <item>bottega</item>
-    <item>acqua potabile</item>
-    <item>caduta sassi</item>
-    <item>traghetto</item>
-    <item>fuoco</item>
-    <item>stazione pompieri</item>
-    <item>pesca</item>
-    <item>stazione di benzina</item>
-    <item>campo da golf</item>
-    <item>negozio alimentari</item>
-    <item>parrucchiere</item>
-    <item>porto</item>
-    <item>sentiero</item>
-    <item>hotel</item>
-    <item>casa</item>
-    <item>informazioni</item>
-    <item>incrocio</item>
-    <item>casella per le lettere</item>
-    <item>mercato</item>
-    <item>luogo d\'incontro</item>
-    <item>opera</item>
-    <item>parcheggio</item>
-    <item>ufficio postale</item>
-    <item>buca in strada</item>
-    <item>stazione di polizia</item>
-    <item>incrocio ferroviario</item>
-    <item>ristorante</item>
-    <item>shopping</item>
-    <item>panorama</item>
-    <item>negozio</item>
-    <item>piscina</item>
-    <item>telefono</item>
-    <item>teatro</item>
-    <item>WC</item>
-    <item>informazioni turistiche</item>
-    <item>tunnel</item>
-    <item>albero</item>
-    <item>cascata</item>
-    <item>fontana</item>
-    <item>punto di passaggio</item>
-  </array>
-</resources>
diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml
index b19d7366d..131e275a3 100644
--- a/MyTracks/res/values-it/strings.xml
+++ b/MyTracks/res/values-it/strings.xml
@@ -15,338 +15,175 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Used by the Menu -->
-  <string name="start_recording">Registra percorso</string>
-  <string name="stop_recording">Fine registrazione</string>
-  <string name="switch_to_sat">Satellite</string>
-  <string name="switch_to_map">Mappa</string>
-  <string name="mylocation">Posizione corrente</string>
-  <string name="list_tracks">Percorsi</string>
-  <string name="list_markers">Segnaposti</string>
-  <string name="delete_all_tracks">Elimina tutti i percorsi</string>
-  <string name="settings">Impostazioni</string>
-  <string name="elevation">Altitudine</string>
-  <string name="choose_track_message">Scegli il percorso da visualizzare</string>
-  <string name="current_track">Percorso corrente</string>
-  <string name="current_segment">Ultimo segmento</string>
-
-  <!-- Error messages -->
-  <string name="error_no_location_manager">Nessuna fonte di posizione trovata su questo dispositivo.</string>
-  <string name="error_no_gps">Nessuna fonte di posizione GPS trovata su questo dispositivo.</string>
-  <string name="error_sending_to_fusion_tables">Si è verificato un errore nell\'invio del percorso a Google Fusion Tables. Per favore riprova più tardi.</string>
-  <string name="error_sending_to_docs">Si è verificato un errore nell\'invio del percorso a Google Docs. Per favore riporva più tardi.</string>
-  <string name="error_unable_to_start_recording">Impossibile iniziare la registrazione. Riprova.</string>
-  <string name="error_unable_to_stop_recording">Impossibile fermare la registrazione. Riprova.</string>
-  <string name="error_import_unable_to_read_file">Impossibile leggere da un file.</string>
-  <string name="error_import_invalid_gpx_format">Il file non contiene dati validi in formato GPX.</string>
-  <string name="error_import_generic">Si è verificato un errore. Per favore riprova.</string>
-  <string name="error_export_track_does_not_exist">Il percorso non esiste.</string>
-  <string name="error_import_out_of_memory">Il file è troppo grande (dev\'essere meno di 500 KB). Azione abbandonata.</string>
-  <string name="error_unable_to_insert_marker">Impossibile inserire il segnaposto. La posizione corrente non è disponibile.</string>
-
-  <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Sto aspettando il fix del GPS. Accertati che il cielo sia visibile.</string>
-  <string name="status_now_recording">Sto registrando un nuovo percorso.</string>
-  <string name="status_stopped_recording">Registrazione del percorso terminata.</string>
-  <string name="status_need_to_enable_gps">Premi qui per andare a «Impostazioni di posizione e protezione» e attiva «Utilizza satelliti GPS». Poi premi il tasto di ritorno per tornare qui.</string>
-  <string name="status_approximate_current_location">Nota: la posizione indicata è un\'approssimazione determinata in base alle antenne cellulari e reti WIFI vicine.</string>
-  <string name="status_no_current_location">La posizione non può essere determinata. Attiva più fonti di posizione (vedi «Impostazioni di posizione e protezione») e eccertati che il cielo sia visibile. Riprova più tardi.</string>
-  <string name="status_waypoint_inserted">Inserito un punto di passaggio.</string>
-  <string name="status_marker_inserted">Inserito un segnaposto con statistiche.</string>
-
-  <!-- Progress dialog -->
-  <string name="progress_title">Attendi per favore...</string>
-  <string name="progress_message">Invio del percorso a Google in corso.</string>
-  <string name="progress_message_reading_track">Lettura in corso...</string>
-  <string name="progress_message_preparing_track">Elaborazione del percorso in corso...</string>
-  <!-- <string name="progress_message_authenticating_fusion_tables">Autenticazione a Google Maps in corso...</string> -->
-  <string name="progress_message_authenticating_docs">Autenticazione a Google Docs in corso...</string>
-  <string name="progress_message_sending_docs">Invio del percorso a Google Docs in corso...</string>
-  <!-- <string name="progress_message_sending_fusion_tables">Invio del percorso a Google Maps in corso...</string> -->
-  <!-- <string name="progress_message_creating_fusion_table">Creazione di una nuova mappa in «Le mie mappe» in corso...</string> -->
-  <string name="progress_message_import">Importazione del percorso GPS in corso. Attendere prego...</string>
-  <string name="progress_message_export">Salvataggio del file sulla scheda SD in corso. Attendere prego...</string>
-  <string name="progress_message_updating_track">Aggiornamento delle statistiche del percorso in corso...</string>
-
-  <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Sei sicuro?</string>
-  <string name="all_data_will_be_permanently_deleted">Tutti i percorsi e segnaposti saranno eliminati definitivamente da questo telefono.</string>
-  <string name="track_will_be_permanently_deleted">Il percorso e i suoi segnaposti saranno eliminati definitivamente da questo telefono.</string>
-  <string name="marker_will_be_permanently_deleted">Il segnaposto sarà eliminato definitivamente da questo telefono.</string>
-
-  <!-- Text and links when uploading to Google My Maps -->
-  <string name="new_map_description">Creato da My Tracks su Android.</string>
- 
-  <!-- Formatting of track and marker descriptions -->
-  <string name="points">Punti</string>
-  <string name="recorded_date">Registrato</string>
-  <string name="category">Tipo di attività</string>
-  <string name="waypoint_category">Tipo di segnaposto</string>
-  <string name="track_part_format">(Parte %d)</string>
-
-  <!-- Used by the track recording service -->
-  <string name="recording_your_track">Registrazione del percorso in corso...</string>
-  <string name="new_track_format">Percorso %d</string>
-
-  <!-- Common -->
-  <string name="no">No</string>
-  <string name="yes">Sì</string>
-  <string name="ok">OK</string>
-  <string name="error">Errore</string>
-  <string name="success">Successo</string>
-  <string name="waypoint">Punto di passaggio</string>
-  <string name="cancel">Annulla</string>
-  <string name="save">Salva</string>
-
-  <!-- Placemark labels for start and end of track -->
-  <string name="start">(Inizio)</string>
-  <string name="end">(Fine)</string>
-
-  <!--  TrackList -->
-  <string name="tracklist_show_track">Mostra</string>
-  <!-- <string name="tracklist_send_to_fusiontables">Invia a «Le mie mappe» di Google</string> -->
-  <!-- <string name="tracklist_send_to_new_fusiontable">Invia a nuova mappa in «Le mie mappe» di Google</string>  -->
-  <string name="tracklist_send_to_docs">Invia a Google Docs</string>
-  <string name="tracklist_send_to_google">Invia a Google...</string>
-  <string name="tracklist_delete_track">Elimina dal telefono...</string>
-  <string name="tracklist_edit_track">Modifica dettagli</string>
-  <string name="tracklist_write_to_sd">Salva su scheda SD...</string>
-  <string name="tracklist_save_as_gpx">Salva in un file GPX</string>
-  <string name="tracklist_save_as_kml">Salva in un file KML</string>
-  <!-- <string name="tracklist_btn_send_all_to_fusiontables">Invia a «Le mie mappe» di Google</string> -->
-  <string name="tracklist_btn_delete_all">Elimina tutti i percorsi</string>
-  <!-- Export All -->
-  <string name="tracklist_btn_export_all">Esporta tutti i percorsi</string>
-  <string name="export_done">Esportazione terminata.</string>
-  <string name="tracklist_pick_one">Scegli un percorso. Tieni premuto per più opzioni.</string>
-  <string name="tracklist_all_tracks">Tutti i percorsi:</string>
-  <string name="tracklist_this_track">Questo percorso</string>
-  <string name="tracklist_share_track">Condividi con amici...</string>
-  <string name="tracklist_share_link">Un link alla mappa</string>
-  <string name="tracklist_share_gpx_file">Un file GPX</string>
-  <string name="tracklist_share_kml_file">Un file KML</string>
-  <string name="tracklist_clear_map">Cancella la mappa</string>
-
-  <!-- Waypoints list -->
-  <string name="waypointslist_btn_delete_all">Elimina tutti i segnaposti</string>
-  <string name="waypointslist_this_waypoint">Questo segnaposto</string>
-  <string name="waypointslist_delete_waypoint">Elimina</string>
-  <string name="waypointslist_edit_waypoint">Modifica dettagli</string>
-  <string name="waypointslist_show_waypoint">Mostra sulla mappa</string>
-  <string name="waypointslist_btn_insert_waypoint">Inserisci punto di passaggio</string>
-  <string name="waypointslist_btn_insert_statistics">Inserisci statistiche</string>
-  <string name="waypointslist_pick_one">Scegli un segnaposto. Tieni premuto per più opzioni.</string>
-
-  <!-- MyTracks Details -->
-  <string name="trackdetails_title">Dettagli del percorso</string>
-  <string name="trackdetails_name">Nome del percorso</string>
-  <string name="trackdetails_name_hint">Nome del percorso</string>
-  <string name="trackdetails_description">Descrizione del percorso</string>
-  <string name="trackdetails_description_hint">Descrizione del percorso</string>
-  <string name="trackdetails_category">Tipo di attività (ad es. escursionismo, ciclismo, corsa, arrampicata...)</string>
-  <string name="trackdetails_category_hint">Tipo di attività</string>
-
-  <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Dettagli sul segnaposto</string>
-  <string name="waypointdetails_name">Nome del segnaposto</string>
-  <string name="waypointdetails_name_hint">Nome del segnaposto</string>
-  <string name="waypointdetails_description">Descrizione del segnaposto</string>
-  <string name="waypointdetails_description_hint">Descrizione del segnaposto</string>
-  <string name="waypointdetails_category">Tipo di segnaposto (ad es. edificio, buca, vista...)</string>
-  <string name="waypointdetails_category_hint">Tipo di segnaposto</string>
-
-  <!-- MyTracks Settings -->
-  <string name="settings_title">Impostazioni di My Tracks</string>
-  <string name="settings_display">Visualizzazione</string>
-  <string name="settings_recording">Registrazione</string>
-  <string name="settings_sharing">Condivisione</string>
-
-  <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_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_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_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_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_metric_units">Mostra le distanze nel sistema metrico decimale</string>
-  <string name="settings_metric_units_summary_on">Tutte le distanze verranno mostrate nel sistema metrico decimale</string>
-  <string name="settings_metric_units_summary_off">Tutte le distanze saranno mostrate nel sistema imperiale</string>
-
-  <string name="settings_map_public">Rendi pubbliche le mappe su maps.google.com</string>
-  <string name="settings_map_public_summary_on">Le mappe inviate a maps.google.com saranno visibili a chiunque</string>
-  <string name="settings_map_public_summary_off">Le mappe inviate a maps.google.com non saranno rese pubbliche</string>
-
-  <string name="settings_report_speed_or_pace">Mostra:</string>
-  <string name="settings_report_speed_or_pace_summary_on">Mostrerà la velocità</string>
-  <string name="settings_report_speed_or_pace_summary_off">Mostrerà l\'andatura</string>
-
-  <string name="settings_share_url_only">Invia solo l\'URL nei messaggi di condivisione</string>
-  <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="pace_label">Andatura</string>
-
-  <!-- MyTracksSky -->
-  <string name="mytracks_sky">Satelliti GPS</string>
-
-  <!-- Sharing -->
-  <string name="share_map_subject">Vorrei condividere una mappa con te</string>
-  <string name="share_track_url_body_format">Credo che questa mappa potrebbe interessarti:
-
-      %s</string>
-  <string name="share_track_subject">Vorrei condividere un percorso con te</string>
-  <string name="share_track_file_body_format">Credo che questo percorso potrebbe interessarti.
-
-    Per vedere questo percorso, usa Google Earth o un altro software di cartografia.</string>
-  <string name="share_track_url">Condividi il percorso con amici</string>
-
-  <!-- Visibility -->
-  <string name="public_map">Pubblica</string>
-  <string name="unlisted_map">Privata</string>
-  <string name="mapslist_no_maps_available">Non hai ancora alcuna mappa.</string>
-
-  <!-- Statistics View -->
-  <!-- Average Moving -->
-  <string name="average_moving_speed_label">Velocità media in moto</string>
-  <string name="average_moving_pace_label">Andatura media in moto</string>
-
-  <!-- Average -->
-  <string name="average_speed_label">Velocità media</string>
-  <string name="average_pace_label">Andatura media</string>
-
-  <string name="elevation_chart_name">Grafico dell\'Altitudine</string>
-  <string name="elevation_gain_label">Dislivello</string>
-  <string name="elevation_label">Altitudine</string>
-  <string name="latitude_label">Latitudine</string>
-  <string name="longitude_label">Longitudine</string>
-
-  <!-- Min -->
-  <string name="min_elevation_label">Altitudine min</string>
-  <string name="min_grade_label">Inclinazione min</string>
-  <string name="min_pace_label">Andatura min</string>
-
-  <!-- Max -->
-  <string name="max_elevation_label">Altitudine max</string>
-  <string name="max_grade_label">Inclinazione max</string>
-  <string name="max_speed_label">Velocità max</string>
-
-  <string name="loading_track">Caricamento percorso in corso...</string>
-
-  <!-- Chart Settings -->
-  <string name="chart_settings">Impostazioni grafico</string>
-  <!-- X Axis -->
-  <string name="x_axis">Asse X</string>
-  <string name="by_distance">Distanza</string>
-  <string name="by_time">Tempo</string>
-
-  <!-- Y Axis -->
-  <string name="y_axis">Asse Y</string>
-
-  <!-- Units -->
-  <!-- Time  -->
-  <string name="voice_hour">ora</string>
-  <string name="voice_hours">ore</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="unit_meter">m</string>
-  <string name="unit_kilometer">km</string>
-  <string name="voice_kilometers">chilometri</string>
-  <string name="unit_feet">pd</string>
-  <string name="unit_mile">mi</string>
-  <string name="voice_miles">miglia</string>
-
-  <!-- Speed and Pace -->
-  <string name="kilometer_per_hour">km/h</string>
-  <string name="voice_kilometer_per_hour">chilometri orari</string>
-  <string name="min_per_kilometer">min/km</string>
-  <string name="voice_per_kilometer">per chilometro</string>
-  <string name="mile_per_hour">mi/h</string>
-  <string name="voice_mile_per_hour">miglia orarie</string>
-  <string name="min_per_mile">min/mi</string>
-  <string name="voice_per_mile">per miglio</string>
-
-  <!-- Stats Labels -->
-  <string name="moving_time_label">Durata in moto</string>
-  <string name="total_time_label">Durata totale</string>
-  <string name="time_label">Durata</string>
-  <string name="sd_unavail">Scheda SD non disponibile</string>
-  <string name="speed">Velocità</string>
-  <string name="start_trip">Devi prima iniziare un percorso.</string>
-  <string name="statistics">Statistiche</string>
-  <string name="total_distance_label">Distanza totale</string>
-  <string name="distance_label">Distanza</string>
-  <string name="unknown">-</string>
-  <string name="waiting">Attendere...</string>
-
-  <!-- End User License Agreement -->
-  <string name="eula_title">Termini di servizio</string>
-  <string name="accept">Accetto</string>
-  <string name="decline">Non accetto</string>
-
-  <!-- About -->
-  <string name="about">Informazioni</string>
-  <string name="help">Aiuto</string>
+  <string name="about_support">Supporto:</string>
   <string name="about_team">Team:</string>
   <string name="about_version">Versione:</string>
-  <string name="about_support">Supporto:</string>
-
-  <!-- Send to Google -->
-  <string name="sendtogoogle_title">Invia a...</string>
-  <!-- <string name="sendtogoogle_google_fusiontables">«Le mie mappe» di Google</string> -->
-  <string name="sendtogoogle_google_docs">Google Docs</string>
-  <string name="sendtogoogle_send_now">Invia adesso</string>
-  <string name="sendtogoogle_send_stats">Invia statistiche del percorso</string>
-  <string name="sendtogoogle_send_stats_and_points">Invia statistiche e segnaposti</string>
-
-  <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Account non trovato</string>
-  <string name="no_account_found">Non ho trovato un account a cui inviare i percorsi.</string>
-  <string name="choose_account_title">Scegli un account</string>
-
-  <!-- SD card -->
-  <string name="io_no_external_storage_found">Nessuna memoria esterna trovata. Assicurati che la scheda SD sia inserita e che il telefono no sia montato su un computer.</string>
-  <string name="io_write_failed">Impossibile scrivere su file.</string>
-  <string name="io_create_dir_failed">Impossibile creare directory sulla scheda SD.</string>
-  <string name="io_write_finished">Finito di salvare il percorso sulla scheda SD.</string>
-
-  <!-- VersionChecker -->
-  <string name="version_check_title">Controlla aggiornamenti</string>
-  <string name="version_check_upgrade_button">Aggiorna adesso</string>
-  <string name="version_check_continue_button">Continua senza aggiornare</string>
-  <string name="upgrade_required">La tua versione di %1$s potrebbe non funzionare più correttamente e non è più supportata. Per favore installa l\'aggiornamento in modo da poter continuare a usare %1$s.</string>
-  <string name="upgrade_recommended">La tua versione di %1$s potrebbe non funzionare più correttamente e non è più supportata. Puoi installare l\'aggiornamento adesso oppure continuare a usare %1$s a tuo rischio. Alcune funzionalità, ad es. la sincronizzazione con i server, potrebbero non funzionare senza l\'aggiornamento.</string>
-  <string name="upgrade_available">Una nuova versione di %1$s è disponibile. Puoi continuare a usare la versione corrente senza problemi, ma non avrai le ultime funzionalità finché non installi l\'aggiornamento.</string>
-
-  <!-- Welcome -->
-  <string name="welcome">Benvenuto</string>
-  <string name="welcome_read_later">OK</string>
+  <string name="chart_settings_by_distance">Distanza</string>
+  <string name="chart_settings_by_time">Tempo</string>
+  <string name="chart_settings_x_axis">Asse X</string>
+  <string name="chart_settings_y_axis">Asse Y</string>
+  <string name="eula_accept">Accetto</string>
+  <string name="eula_decline">Non accetto</string>
+  <string name="eula_title">Termini di servizio</string>
+  <string name="export_progress_message">Salvataggio del file sulla scheda SD in corso. Attendere prego...</string>
+  <string name="export_success">Esportazione terminata.</string>
+  <string name="generic_cancel">Annulla</string>
+  <string name="generic_confirm_title">Sei sicuro?</string>
+  <string name="generic_error_title">Errore</string>
+  <string name="generic_no">No</string>
+  <string name="generic_ok">OK</string>
+  <string name="generic_progress_title">Attendi per favore...</string>
+  <string name="generic_save">Salva</string>
+  <string name="generic_success_title">Successo</string>
+  <string name="generic_yes">Sì</string>
+  <string name="gps_need_to_enable">Premi qui per andare a «Impostazioni di posizione e protezione» e attiva «Utilizza satelliti GPS». Poi premi il tasto di ritorno per tornare qui.</string>
+  <string name="gps_not_found">Nessuna fonte di posizione GPS trovata su questo dispositivo.</string>
+  <string name="gps_wait_for_fix">Sto aspettando il fix del GPS. Accertati che il cielo sia visibile.</string>
+  <string name="marker_detail_marker_description">Descrizione del segnaposto</string>
+  <string name="marker_detail_marker_name">Nome del segnaposto</string>
+  <string name="marker_detail_marker_type">Tipo di segnaposto (ad es. edificio, buca, vista...)</string>
+  <string name="marker_detail_marker_type_hint">Tipo di segnaposto</string>
+  <string name="marker_detail_title">Dettagli sul segnaposto</string>
+  <string name="marker_insert_error">Impossibile inserire il segnaposto. La posizione corrente non è disponibile.</string>
+  <string name="marker_insert_success">Inserito un segnaposto con statistiche.</string>
+  <string name="marker_label_end">(Fine)</string>
+  <string name="marker_label_start">(Inizio)</string>
+  <string name="marker_list_context_menu_title">Questo segnaposto</string>
+  <string name="marker_list_delete_marker">Elimina</string>
+  <string name="marker_list_delete_marker_confirm_message">Il segnaposto sarà eliminato definitivamente da questo telefono.</string>
+  <string name="marker_list_edit_marker">Modifica dettagli</string>
+  <string name="marker_list_insert_statistics">Inserisci statistiche</string>
+  <string name="marker_list_insert_waypoint">Inserisci punto di passaggio</string>
+  <string name="marker_list_pick_one">Scegli un segnaposto. Tieni premuto per più opzioni.</string>
+  <string name="marker_list_show_on_map">Mostra sulla mappa</string>
+  <string name="marker_type_statistics">Statistiche</string>
+  <string name="marker_type_waypoint">Punto di passaggio</string>
+  <string name="menu_chart_view_chart_settings">Impostazioni grafico</string>
+  <string name="menu_help">Aiuto</string>
+  <string name="menu_map_view_map_mode">Mappa</string>
+  <string name="menu_map_view_my_location">Posizione corrente</string>
+  <string name="menu_map_view_satellite_mode">Satellite</string>
+  <string name="menu_markers">Segnaposti</string>
+  <string name="menu_record_track">Registra percorso</string>
+  <string name="menu_settings">Impostazioni</string>
+  <string name="menu_stop_recording">Fine registrazione</string>
+  <string name="menu_tracks">Percorsi</string>
+  <string name="my_location_approximate_location">Nota: la posizione indicata è un\'approssimazione determinata in base alle antenne cellulari e reti WIFI vicine.</string>
+  <string name="my_location_no_location">La posizione non può essere determinata. Attiva più fonti di posizione (vedi «Impostazioni di posizione e protezione») e eccertati che il cielo sia visibile. Riprova più tardi.</string>
+  <string name="my_maps_list_no_maps">Non hai ancora alcuna mappa.</string>
+  <string name="my_maps_list_public_label">Pubblica</string>
+  <string name="my_maps_list_unlisted_label">Privata</string>
+  <string name="sd_card_error_create_dir">Impossibile creare directory sulla scheda SD.</string>
+  <string name="sd_card_error_no_storage">Nessuna memoria esterna trovata. Assicurati che la scheda SD sia inserita e che il telefono no sia montato su un computer.</string>
+  <string name="sd_card_error_write_file">Impossibile scrivere su file.</string>
+  <string name="sd_card_success_write_file">Finito di salvare il percorso sulla scheda SD.</string>
+  <string name="send_google_choose_account_title">Scegli un account</string>
+  <string name="send_google_docs">Google Docs</string>
+  <string name="send_google_no_account_message">Non ho trovato un account a cui inviare i percorsi.</string>
+  <string name="send_google_no_account_title">Account non trovato</string>
+  <string name="send_google_progress_preparing_track">Elaborazione del percorso in corso...</string>
+  <string name="send_google_progress_reading_track">Lettura in corso...</string>
+  <string name="send_google_recorded">Registrato</string>
+  <string name="send_google_result_share_url">Condividi il percorso con amici</string>
+  <string name="send_google_send_now">Invia adesso</string>
+  <string name="send_google_title">Invia a...</string>
+  <string name="send_google_track_part_label">(Parte %d)</string>
+  <string name="settings_display">Visualizzazione</string>
+  <string name="settings_display_metric">Mostra le distanze nel sistema metrico decimale</string>
+  <string name="settings_display_metric_summary_off">Tutte le distanze saranno mostrate nel sistema imperiale</string>
+  <string name="settings_display_metric_summary_on">Tutte le distanze verranno mostrate nel sistema metrico decimale</string>
+  <string name="settings_display_speed">Mostra:</string>
+  <string name="settings_display_speed_summary_off">Mostrerà l\'andatura</string>
+  <string name="settings_display_speed_summary_on">Mostrerà la velocità</string>
+  <string name="settings_recording">Registrazione</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_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_recording_interval">Frequenza di registrazione:</string>
+  <string name="settings_recording_interval_summary">Tempo minimo fra due successive registrazioni della posizione</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="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_recording_voice">Intervallo fra due annunci:</string>
+  <string name="settings_recording_voice_summary">Tempo minimo fra due annunci audio</string>
+  <string name="settings_sharing">Condivisione</string>
+  <string name="settings_sharing_map_public">Rendi pubbliche le mappe su maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_off">Le mappe inviate a maps.google.com non saranno rese pubbliche</string>
+  <string name="settings_sharing_map_public_summary_on">Le mappe inviate a maps.google.com saranno visibili a chiunque</string>
+  <string name="settings_sharing_url_only">Invia solo l\'URL nei messaggi di condivisione</string>
+  <string name="settings_sharing_url_only_summary_off">Anche il contenuto del percorso sarà inviato quando condividi un persorso</string>
+  <string name="settings_title">Impostazioni di My Tracks</string>
+  <string name="share_track_file_body_format">Credo che questo percorso potrebbe interessarti.\n\nPer vedere questo percorso, usa Google Earth o un altro software di cartografia.</string>
+  <string name="share_track_subject">Vorrei condividere un percorso con te</string>
+  <string name="share_track_url_body_format">Credo che questa mappa potrebbe interessarti:\n\n%s</string>
+  <string name="stat_average_moving_pace">Andatura media in moto</string>
+  <string name="stat_average_moving_speed">Velocità media in moto</string>
+  <string name="stat_average_pace">Andatura media</string>
+  <string name="stat_average_speed">Velocità media</string>
+  <string name="stat_elevation">Altitudine</string>
+  <string name="stat_elevation_gain">Dislivello</string>
+  <string name="stat_latitude">Latitudine</string>
+  <string name="stat_longitude">Longitudine</string>
+  <string name="stat_max_elevation">Altitudine max</string>
+  <string name="stat_max_grade">Inclinazione max</string>
+  <string name="stat_max_speed">Velocità max</string>
+  <string name="stat_min_elevation">Altitudine min</string>
+  <string name="stat_min_grade">Inclinazione min</string>
+  <string name="stat_min_pace">Andatura min</string>
+  <string name="stat_moving_time">Durata in moto</string>
+  <string name="stat_pace">Andatura</string>
+  <string name="stat_speed">Velocità</string>
+  <string name="stat_total_distance">Distanza totale</string>
+  <string name="stat_total_time">Durata totale</string>
+  <string name="track_detail_activity_type">Tipo di attività (ad es. escursionismo, ciclismo, corsa, arrampicata...)</string>
+  <string name="track_detail_activity_type_hint">Tipo di attività</string>
+  <string name="track_detail_title">Dettagli del percorso</string>
+  <string name="track_detail_track_description">Descrizione del percorso</string>
+  <string name="track_detail_track_name">Nome del percorso</string>
+  <string name="track_list_clear_map">Cancella la mappa</string>
+  <string name="track_list_context_menu_title">Questo percorso</string>
+  <string name="track_list_delete_all">Elimina tutti i percorsi</string>
+  <string name="track_list_delete_all_confirm_message">Tutti i percorsi e segnaposti saranno eliminati definitivamente da questo telefono.</string>
+  <string name="track_list_delete_track">Elimina dal telefono...</string>
+  <string name="track_list_delete_track_confirm_message">Il percorso e i suoi segnaposti saranno eliminati definitivamente da questo telefono.</string>
+  <string name="track_list_edit_track">Modifica dettagli</string>
+  <string name="track_list_export_all">Esporta tutti i percorsi</string>
+  <string name="track_list_pick_one">Scegli un percorso. Tieni premuto per più opzioni.</string>
+  <string name="track_list_save_sd">Salva su scheda SD...</string>
+  <string name="track_list_send_google">Invia a Google...</string>
+  <string name="track_list_share_track">Condividi con amici...</string>
+  <string name="track_list_share_url">Un link alla mappa</string>
+  <string name="track_list_show_on_map">Mostra</string>
+  <string name="track_name_format">Percorso %d</string>
+  <string name="track_record_error">Impossibile iniziare la registrazione. Riprova.</string>
+  <string name="track_record_notification">Registrazione del percorso in corso...</string>
+  <string name="track_record_success">Sto registrando un nuovo percorso.</string>
+  <string name="unit_feet">pd</string>
+  <string name="unit_hour">h</string>
+  <string name="unit_kilometer">km</string>
+  <string name="unit_kilometer_per_hour">km/h</string>
+  <string name="unit_meter">m</string>
+  <string name="unit_mile">mi</string>
+  <string name="unit_mile_per_hour">mi/h</string>
+  <string name="unit_minute">min</string>
+  <string name="unit_minute_per_kilometer">min/km</string>
+  <string name="unit_minute_per_mile">min/mi</string>
+  <string name="voice_hour">ora</string>
+  <string name="voice_hours">ore</string>
+  <string name="voice_kilometer_per_hour">chilometri orari</string>
+  <string name="voice_kilometers">chilometri</string>
+  <string name="voice_mile_per_hour">miglia orarie</string>
+  <string name="voice_miles">miglia</string>
+  <string name="voice_minute">minuto</string>
+  <string name="voice_minutes">minuti</string>
+  <string name="voice_no_distance">Mai Tracks Distanza non disponibile</string>
+  <string name="voice_per_kilometer">per chilometro</string>
+  <string name="voice_per_mile">per miglio</string>
+  <string name="voice_second">secondo</string>
+  <string name="voice_seconds">secondi</string>
+  <string name="voice_template">Mai Tracks %1$.2f %2$s in %3$s a %4$s %5$s</string>
   <string name="welcome_about">Informazioni su My Tracks</string>
-
-  <!-- Announcement -->
-  <string name="announce_no_distance">Mai Tracks Distanza non disponibile</string>
-  <!-- Format:
-  $1 : Distance label
-  $2 : Distance value (5)
-  $3 : Distance units (mi, km)
-  $4 : Time description (10 minutes 5 seconds)
-  $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
-  $6 : Speed units (mph) : Pace units (per mile)
-  -->
-  <string name="announce_template">Mai Tracks %1$s %2$.2f %3$s in %4$s a %5$s %6$s</string>
+  <string name="welcome_title">Benvenuto</string>
 </resources>
diff --git a/MyTracks/res/values-ja/arrays.xml b/MyTracks/res/values-ja/arrays.xml
deleted file mode 100644
index aeffc5d84..000000000
--- a/MyTracks/res/values-ja/arrays.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-  <!-- Minimum recording distance -->
-  <string-array name="min_recording_distance_options">
-    <item>1 m</item>
-    <item>2 m</item>
-    <item>3 m</item>
-    <item>4 m</item>
-    <item>5 m (推奨)</item>
-    <item>10 m</item>
-    <item>100 m</item>
-  </string-array>
-
-  <string-array name="min_recording_distance_options_ft">
-    <item>3 ft</item>
-    <item>6 ft</item>
-    <item>10 ft</item>
-    <item>13 ft</item>
-    <item>16 ft (推奨)</item>
-    <item>33 ft</item>
-    <item>328 ft</item>
-  </string-array>
-
-  <!-- Maximum recording distance -->
-  <string-array name="max_recording_distance_options">
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (推奨)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>5000 m</item>
-  </string-array>
-
-  <string-array name="max_recording_distance_options_ft">
-    <item>164 ft</item>
-    <item>328 ft</item>
-    <item>656 ft (推奨)</item>
-    <item>1640 ft</item>
-    <item>0.6 mi</item>
-    <item>3.1 mi</item>
-  </string-array>
-
-  <!-- Minimum recording interval -->
-  <string-array name="min_recording_interval_options">
-    <item>電源節約 (動的制御)</item>
-    <item>高精度 (動的制御)</item>
-    <item>最高 (推奨)</item>
-    <item>2 秒</item>
-    <item>3 秒</item>
-    <item>4 秒</item>
-    <item>5 秒</item>
-    <item>10 秒</item>
-    <item>20 秒</item>
-    <item>30 秒</item>
-    <item>1 分</item>
-    <item>2 分</item>
-    <item>5 分</item>
-    <item>10 分</item>
-    <item>15 分</item>
-    <item>30 分</item>
-  </string-array>
-
-  <!-- Minimum required accuracy -->
-  <string-array name="min_required_accuracy_options">
-    <item>10 m (GPS信号強度良好)</item>
-    <item>20 m</item>
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (推奨)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>2000 m</item>
-    <item>5000 m (GPS信号強度不良)</item>
-  </string-array>
-
-  <string-array name="min_required_accuracy_options_ft">
-    <item>33 ft (GPS信号強度良好)</item>
-    <item>66 ft</item>
-    <item>165 ft</item>
-    <item>328 ft</item>
-    <item>656 ft (推奨)</item>
-    <item>1640 ft</item>
-    <item>0.6 mi</item>
-    <item>1.2 mi</item>
-    <item>3.1 mi (GPS信号強度不良)</item>
-  </string-array>
-
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>不使用</item>
-    <item>100 km</item>
-    <item>50 km</item>
-    <item>25 km</item>
-    <item>10 km</item>
-    <item>5 km</item>
-    <item>1 km</item>
-    <item>60 分</item>
-    <item>30 分</item>
-    <item>15 分</item>
-    <item>10 分</item>
-    <item>5 分</item>
-    <item>2 分</item>
-    <item>1 分</item>
-  </string-array>
-
-  <string-array name="task_frequency_options_ft">
-    <item>不使用</item>
-    <item>100 mi</item>
-    <item>50 mi</item>
-    <item>25 mi</item>
-    <item>10 mi</item>
-    <item>5 mi</item>
-    <item>1 mi</item>
-    <item>60 分</item>
-    <item>30 分</item>
-    <item>15 分</item>
-    <item>10 分</item>
-    <item>5 分</item>
-    <item>2 分</item>
-    <item>1 分</item>
-  </string-array>
-
-  <!-- Auto-resume track timeout -->
-  <string-array name="auto_resume_track_timeout_options">
-    <item>なし</item>
-    <item>5 分</item>
-    <item>10 分</item>
-    <item>15 分</item>
-    <item>常時</item>
-  </string-array>
-
-  <!-- Other non-preference arrays -->
-  <array name="activity_types">
-    <item>不明</item>
-    <item>混合タイプ</item>
-    <item>その他</item>
-
-    <item>実行中</item>
-    <item>市街地ランニング</item>
-    <item>トラックランニング</item>
-    <item>山道ランニング</item>
-    <item>徒歩</item>
-    <item>早歩き</item>
-    <item>ハイキング</item>
-    <item>山道ハイキング</item>
-    <item>原野ハイキング</item>
-    <item>登山</item>
-
-    <item>サイクリング</item>
-    <item>ロードバイク</item>
-    <item>マウンテンバイク</item>
-    <item>トラック自転車</item>
-
-    <item>スケート</item>
-    <item>インラインスケート</item>
-    <item>スケートボード</item>
-
-    <item>スノーシュー</item>
-    <item>スキー</item>
-    <item>スノーボード</item>
-    <item>ソリ</item>
-    <item>アイスセーリング</item>
-
-    <item>帆走</item>
-    <item>パドリング</item>
-    <item>カヤック</item>
-    <item>漕艇</item>
-    <item>モーターボート</item>
-    <item>フェリー</item>
-    <item>ラジコンボート</item>
-    <item>サーフィン</item>
-    <item>ウィンドサーフィン</item>
-    <item>カイトサーフィン</item>
-    <item>水上スキー</item>
-    <item>ウェークボード</item>
-
-    <item>飛行機</item>
-    <item>水上機</item>
-    <item>商用航空機</item>
-    <item>ヘリコプター</item>
-    <item>熱気球</item>
-    <item>飛行船</item>
-    <item>ラジコン飛行機</item>
-    <item>ラジコンヘリコプター</item>
-    <item>スカイダイビング</item>
-    <item>グライダー</item>
-    <item>ハンググライダー</item>
-    <item>パラグライダー</item>
-
-    <item>騎乗</item>
-    <item>乗馬</item>
-    <item>ロバ騎乗</item>
-
-    <item>自動車運転</item>
-    <item>バス運転</item>
-    <item>鉄道</item>
-    <item>オートバイ</item>
-    <item>オフロードバイク</item>
-    <item>四輪バギー</item>
-
-    <item>ランドセーリング</item>
-    <item>フリスビー</item>
-    <item>アルティメットフリスビー</item>
-  </array>
-
-  <array name="waypoint_types">
-    <item>ATM</item>
-    <item>銀行</item>
-    <item>飲み屋</item>
-    <item>バーベキュー</item>
-    <item>建物</item>
-    <item>バス停</item>
-    <item>カフェ</item>
-    <item>キャンプファイアー</item>
-    <item>キャンプ場</item>
-    <item>教会</item>
-    <item>コーヒーハウス</item>
-    <item>コンビニ</item>
-    <item>水飲み場</item>
-    <item>がけ崩れ</item>
-    <item>フェリー</item>
-    <item>火事場</item>
-    <item>消防署</item>
-    <item>釣り場</item>
-    <item>ガソリンスタンド</item>
-    <item>ゴルフ場</item>
-    <item>雑貨店</item>
-    <item>美容室</item>
-    <item>船着き場</item>
-    <item>ハイキング道</item>
-    <item>ホテル</item>
-    <item>家</item>
-    <item>案内所</item>
-    <item>交差点</item>
-    <item>メールボックス</item>
-    <item>市場</item>
-    <item>集合場所</item>
-    <item>歌劇場</item>
-    <item>駐車場</item>
-    <item>郵便局</item>
-    <item>洞穴</item>
-    <item>警察署</item>
-    <item>踏切</item>
-    <item>レストラン</item>
-    <item>ショッピング</item>
-    <item>名所</item>
-    <item>店</item>
-    <item>プール</item>
-    <item>電話</item>
-    <item>劇場</item>
-    <item>トイレ</item>
-    <item>観光案内</item>
-    <item>トンネル</item>
-    <item>樹木</item>
-    <item>滝</item>
-    <item>噴水</item>
-    <item>ウェイポイント</item>
-  </array>
-
-</resources>
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index 213f27308..f736cde23 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -15,461 +15,231 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Used by the Menu -->
-  <string name="start_recording">トラック記録</string>
-  <string name="stop_recording">記録停止</string>
-  <string name="switch_to_sat">衛星モード</string>
-  <string name="switch_to_map">地図モード</string>
-  <string name="mylocation">現在地</string>
-  <string name="list_tracks">トラック</string>
-  <string name="list_markers">マーカー</string>
-  <string name="delete_all_tracks">全トラック消去</string>
-  <string name="settings">設定</string>
-  <string name="elevation">標高</string>
-  <string name="choose_track_message">表示するトラックを選択して下さい</string>
-  <string name="current_track">現在のトラック</string>
-  <string name="current_segment">最終セグメント</string>
-  <string name="sensor_state">センサー情報</string>
-  <string name="aggregated_stats">集計情報</string>
-
-  <!-- Error messages -->
-  <string name="error_no_location_manager">この端末でロケーションマネージャを発見できませんでした．</string>
-  <string name="error_no_gps">この端末でGPSロケーションプロバイダを発見できました．</string>
-  <string name="error_sending_to_my_maps">Googleマイマップへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
-  <string name="error_sending_to_fusion_tables">Google Fusion Tablesへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
-  <string name="error_sending_to_docs">Google Docsへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
-  <string name="error_unable_to_start_recording">記録作成開始できません．もう一度試して下さい．</string>
-  <string name="error_unable_to_stop_recording">記録停止できません．もう一度試して下さい．</string>
-  <string name="error_import_unable_to_read_file">ファイルからの読み込みができません．</string>
-  <string name="error_import_invalid_gpx_format">ファイルは正しいGPX書式ではありませんでした．</string>
-  <string name="error_import_generic">エラーが発生しました．もう一度試して下さい．</string>
-  <string name="error_export_track_does_not_exist">トラックが存在しません．</string>
-  <string name="error_import_out_of_memory">大きなファイルです(500KB未満でなければなりません)．終了します．</string>
-  <string name="error_unable_to_insert_marker">マーカーの挿入ができません．位置決定ができません．</string>
-
-  <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">GPS位置精度がよくなるまで待機しています．空が見えるところにいて下さい．</string>
-  <string name="status_now_recording">新しいトラックを記録中です．</string>
-  <string name="status_stopped_recording">トラック記録を停止しました．</string>
-  <string name="sending_to_google_additional_info">新しいトラックが表示されるまでに数分かかることがあります．</string>
-  <string name="status_need_to_enable_gps">ここをタップして「位置情報とセキュリティの設定」を開いて「GPS機能を使用」にチェックを入れて下さい．バックボタンで戻ってください．</string>
-  <string name="status_approximate_current_location">ご注意: 携帯電話中継局とWi-Fiネットワークから大まかな位置を特定します．</string>
-  <string name="status_no_current_location">現在位置決定ができません．位置取得源を増やし(位置情報とセキュリティの設定 をご覧ください)、空が見えるようにして下さい．もう一度試して下さい．</string>
-  <string name="status_waypoint_inserted">ウェイポイントマーカーを挿入しました．</string>
-  <string name="status_marker_inserted">統計マーカーを挿入しました．</string>
-
-  <!-- Progress dialog -->
-  <string name="progress_title">お待ちください...</string>
-  <string name="progress_message">トラックをGoogleに送信しています．</string>
-  <string name="progress_message_reading_track">トラックを読んでいます...</string>
-  <string name="progress_message_preparing_track">トラックを準備しています...</string>
-  <string name="progress_message_authenticating_fusion_tables">Google Fusion Tablesへの認証を行っています...</string>
-  <string name="progress_message_authenticating_my_maps">Googleマップへの認証を行っています...</string>
-  <string name="progress_message_authenticating_docs">Google Docsへの認証を行っています...</string>
-  <string name="progress_message_sending_docs">トラックをGoogle Docsに送信しています...</string>
-  <string name="progress_message_sending_my_maps">トラックをGoogleマップに送信しています...</string>
-  <string name="progress_message_creating_map">新しいマイマップを作成しています...</string>
-  <string name="progress_message_sending_fusion_tables">トラックをFusion Tablesに送信しています...</string>
-  <string name="progress_message_creating_fusion_table">新しいFusionテーブルを生成しています...</string>
-  <string name="progress_message_import">GPSトラックをインポートしています．若干時間がかかります．</string>
-  <string name="progress_message_export">SDカードにデータを書き込んでいます．若干時間がかかります．</string>
-  <string name="progress_message_updating_track">トラック統計情報を更新しています...</string>
-
-  <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">よろしいですか?</string>
-  <string name="all_data_will_be_permanently_deleted">全てのトラックとマーカーをこの端末から削除します．</string>
-  <string name="track_will_be_permanently_deleted">トラックとマーカーをこの端末から完全に削除します．</string>
-  <string name="marker_will_be_permanently_deleted">マーカーをこの端末から完全に削除します．</string>
-
-  <!-- Text and links when uploading to Google Fusion Tables -->
-  <string name="new_map_description">Android用My Tracksで作成</string>
- 
-  <!-- Text and links when uploading to Google My Maps -->
-  <string name="my_map_link">Android用&lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt;で作成しました．</string>
-  <string name="new_map_title">新規マップ</string>
-
-  <!-- Formatting of track and marker descriptions -->
-  <string name="points">ポイント</string>
-  <string name="recorded_date">記録日</string>
-  <string name="category">活動タイプ</string>
-  <string name="waypoint_category">マーカータイプ</string>
-  <string name="track_part_format">(パート %d)</string>
-
-  <!-- Used by the track recording service -->
-  <string name="recording_your_track">トラックを保存中...</string>
-  <string name="new_track_format">トラック %d</string>
-
-  <!-- Common -->
-  <string name="no">いいえ</string>
-  <string name="yes">はい</string>
-  <string name="error">エラー</string>
-  <string name="success">成功</string>
-  <string name="waypoint">ウェイポイント</string>
-  <string name="license">ライセンス</string>
-  <string name="cancel">キャンセル</string>
-  <string name="save">保存</string>
-
-  <!-- Placemark labels for start and end of track -->
-  <string name="start">(開始)</string>
-  <string name="end">(終了)</string>
-
-  <!--  TrackList -->
-  <string name="tracklist_show_track">表示</string>
-  <string name="tracklist_send_to_mymaps">Googleマイマップに送信</string>
-  <string name="tracklist_send_to_new_mymap">新規Googleマイマップに送信</string>
-  <string name="tracklist_send_to_fusiontables">Google Fusion Tablesに送信</string>
-  <string name="tracklist_send_to_new_fusiontable">新規Google Fusion Tableに送信</string>
-  <string name="tracklist_send_to_docs">Google Docsに送信</string>
-  <string name="tracklist_send_to_google">Googleに送信...</string>
-  <string name="tracklist_delete_track">端末から削除...</string>
-  <string name="tracklist_edit_track">詳細編集</string>
-  <string name="tracklist_write_to_sd">SDへの書き込み...</string>
-  <string name="tracklist_save_as_gpx">GPXファイルの保存</string>
-  <string name="tracklist_save_as_kml">KMLファイルの保存</string>
-  <string name="tracklist_save_as_csv">CVSファイルの保存</string>
-  <string name="tracklist_save_as_tcx">TCXファイルの保存</string>
-  <string name="tracklist_btn_send_all_to_fusiontables">Google Fusion Tablesに送信</string>
-  <string name="tracklist_btn_send_all_to_mymaps">Googleマイマップに送信</string>
-  <string name="tracklist_btn_delete_all">全て削除</string>
-  <!-- Export All -->
-  <string name="tracklist_btn_export_all">全て出力</string>
-  <string name="export_done">出力終了</string>
-  <string name="tracklist_pick_one">トラックを選択します．オプションを表示するには長押しして下さい．</string>
-  <string name="tracklist_all_tracks">全トラック:</string>
-  <string name="tracklist_this_track">このトラック</string>
-  <string name="tracklist_share_track">共有...</string>
-  <string name="tracklist_share_link">マップへのリンク</string>
-  <string name="tracklist_share_gpx_file">GPXファイル</string>
-  <string name="tracklist_share_kml_file">KMLファイル</string>
-  <string name="tracklist_share_csv_file">CSVファイル</string>
-  <string name="tracklist_share_tcx_file">TCXファイル</string>
-  <string name="tracklist_clear_map">マップのクリア</string>
-  <!-- Import All -->
-  <string name="tracklist_btn_import_all">全てインポート</string>
-  <!-- Format:
-  $1 : Successful imports
-  $2 : Attempted imports
-  $3 : MyTracks gpx path
-  -->
-  <string name="import_multi_done">%3$s からGPXファイル %2$d件のうち %1$d件をインポートしました</string>
-  <string name="import_multi_empty">%s ではGPXファイルがありません．SDカードを読み込めないかディレクトリにGPXファイルが無いかも知れません．</string>
-  <string name="import_error">ファイル %s のインポートエラー</string>
-
-  <!-- Waypoints list -->
-  <string name="waypointslist_btn_delete_all">全てのマーカーの削除</string>
-  <string name="waypointslist_this_waypoint">このマーカー</string>
-  <string name="waypointslist_delete_waypoint">削除</string>
-  <string name="waypointslist_edit_waypoint">詳細編集</string>
-  <string name="waypointslist_show_waypoint">マップに表示</string>
-  <string name="waypointslist_btn_insert_waypoint">ウェイポイントの挿入</string>
-  <string name="waypointslist_btn_insert_statistics">統計情報の挿入</string>
-  <string name="waypointslist_pick_one">マーカーを選択します．オプションを表示するには長押しして下さい．</string>
-
-  <!-- MyTracks Details -->
-  <string name="trackdetails_title">トラック詳細</string>
-  <string name="trackdetails_name">トラック名</string>
-  <string name="trackdetails_name_hint">トラック名</string>
-  <string name="trackdetails_description">トラック説明</string>
-  <string name="trackdetails_description_hint">トラック説明</string>
-  <string name="trackdetails_category">活動タイプ(ハイキング, サイクリング、ランニング、登山...)</string>
-  <string name="trackdetails_category_hint">活動タイプ</string>
-
-  <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">マーカー詳細</string>
-  <string name="waypointdetails_name">マーカー名</string>
-  <string name="waypointdetails_name_hint">マーカー名</string>
-  <string name="waypointdetails_description">マーカー説明</string>
-  <string name="waypointdetails_description_hint">マーカー説明</string>
-  <string name="waypointdetails_category">マーカータイプ(建物、洞穴、名所...)</string>
-  <string name="waypointdetails_category_hint">マーカータイプ</string>
-
-  <!-- MyTracks Settings -->
-  <string name="settings_title">My Tracks設定</string>
-  <string name="settings_display">表示</string>
-  <string name="settings_recording">記録</string>
-  <string name="settings_sharing">共有</string>
-
-  <string name="settings_announcement_frequency_not_available">このAndroidバージョンでは使用できません</string>
-
-  <string name="settings_announcement_frequency">定期通知</string>
-  <string name="settings_announcement_frequency_summary">音声通知間隔の最小時間</string>
-
-  <string name="settings_min_recording_distance">ポイント間の最短距離</string>
-  <string name="settings_min_recording_distance_summary">位置記録間の最短距離</string>
-
-  <string name="settings_max_recording_distance">ポイント間の最長距離</string>
-  <string name="settings_max_recording_distance_summary">これより間隔が長い場合はトラックは分割されます</string>
-
-  <string name="settings_min_recording_interval">ポイント間の最小時間間隔</string>
-  <string name="settings_min_recording_interval_summary">位置記録の最短インターバル</string>
-
-  <string name="settings_min_required_accuracy">最低精度</string>
-  <string name="settings_min_required_accuracy_summary">この精度以上でないと記録を休止します</string>
-
-  <string name="settings_metric_units">メートル法を使用</string>
-  <string name="settings_metric_units_summary_on">全ての距離をメートル法で表示します</string>
-  <string name="settings_metric_units_summary_off">全ての距離をヤード・ポンド法で表示します</string>
-
-  <string name="settings_map_public">マップの公開</string>
-  <string name="settings_map_public_summary_on">アップロードされたマップはmaps.google.comで誰でも閲覧できます</string>
-  <string name="settings_map_public_summary_off">アップロードされたマップはmaps.google.comのリストに公開されません</string>
-
-  <string name="settings_report_speed_or_pace">速度表示</string>
-  <string name="settings_report_speed_or_pace_summary_on">速度が表示されます</string>
-  <string name="settings_report_speed_or_pace_summary_off">ペースが表示されます</string>
-
-  <string name="settings_share_url_only">URLのみ共有</string>
-  <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_auto_resume_track_timeout">記録自動再開の制限時間</string>
-  <string name="settings_auto_resume_track_timeout_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="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_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_modular_stats_display_title">モジュール統計表示 </string>
-
-  <!-- Backups -->
-  <string name="settings_backup">バックアップ (ベータ版)</string>
-  <string name="settings_sd_backup">SDカード バックアップ</string>
-  <string name="settings_backup_to_sd">今すぐバックアップ</string>
-  <string name="settings_backup_to_sd_summary">SDカードに全てのトラックと設定をバックアップします</string>
-  <string name="settings_restore_from_sd">今すぐ復元</string>
-  <string name="settings_restore_from_sd_summary">SDカードから全てのトラックと設定を復元します</string>
-
-  <string name="restore_overwrites_warning">SDカードからの復元を実行すると、現在のトラックと設定は *全て上書き* されてしまいます．よろしいですか?</string>
-  <string name="select_backup_to_restore">復元するバックアップの選択</string>
-  <string name="no_backups">バックアップがありません．</string>
-  <string name="backup_write_progress_message">SDカードに全てのトラックと設定をバックアップしています．しばらくかかることがあります...</string>
-  <string name="backup_import_progress_message">SDカードから全てのトラックと設定を復元しています．しばらくかかることがあります...</string>
-
-  <!-- MyTracksSky -->
-  <string name="mytracks_sky">GPS衛星</string>
-
-  <!-- My Maps -->
-  <string name="select_map_message">アカウントからのマップ選択:</string>
-  <string name="create_new_map">新規マップ作成...</string>
-  <string name="map_list_title">Googleマイマップに送信</string>
-  <string name="maps_list_loading">マップをロード中...</string>
-  <string name="maps_list_failed">今回はマップをロードできませんでした!</string>
-  <string name="open_map">このマップを選択</string>
-  <string name="edit_map_details">マップ詳細編集</string>
-  <string name="share_track_url">トラック共有</string>
-  <string name="delete_map">アカウントからマップを削除</string>
-  <string name="map_title">マップタイトル:</string>
-  <string name="map_description">マップ説明:</string>
-  <string name="map_searchable_edit">このマップまたはコンテンツを検索結果に表示</string>
-  <string name="map_not_searchable_edit">このマップまたはコンテンツを検索結果に表示しない(直接URLで見られる可能性があります)</string>
-  <string name="map_searchable">このマップまたはコンテンツは検索結果に表示されます</string>
-  <string name="map_not_searchable">このマップもコンテンツも検索結果に表示されませんが、直接リンクで見られる可能性があります</string>
-
-  <!-- Sharing -->
-  <string name="share_track_picker_title">マップ共有</string>
-  <string name="share_map_subject">マップを共有したいと思います</string>
-  <string name="share_track_url_body_format">このマップに興味を持って頂けると思います:
-
-      %s</string>
-  <string name="share_track_subject">トラックを共有したいと思います</string>
-  <string name="share_track_file_body_format">このトラックに興味を持って頂けると思います．
-
-    このトラックを閲覧するには、Google Earthまたは他のマッピングソフトウェアが必要です．</string>
-  <string name="share_track_url">トラックの共有</string>
-
-  <!-- Visibility -->
-  <string name="public_map">公開</string>
-  <string name="unlisted_map">リストに出さない</string>
-  <string name="mapslist_no_maps_available">まだ地図がありません．</string>
-
-  <!-- Statistics View -->
-  <!-- Average Moving -->
-  <string name="average_moving_speed_label">平均移動速度</string>
-  <string name="average_moving_pace_label">平均移動ペース</string>
-
-  <!-- Average -->
-  <string name="average_speed_label">平均速度</string>
-  <string name="average_pace_label">平均ペース</string>
-
-  <string name="elevation_chart_name">標高チャート</string>
-  <string name="elevation_gain_label">標高差</string>
-  <string name="elevation_label">標高</string>
-  <string name="latitude_label">緯度</string>
-  <string name="longitude_label">経度</string>
-
-  <!-- Min -->
-  <string name="min_elevation_label">最小標高</string>
-  <string name="min_grade_label">最小勾配</string>
-  <string name="min_pace_label">最小ペース</string>
-
-  <!-- Max -->
-  <string name="max_elevation_label">最大標高</string>
-  <string name="max_grade_label">最大勾配</string>
-  <string name="max_speed_label">最大速度</string>
-
-  <string name="loading_track">トラックの読み込み中...</string>
-
-  <!-- Chart Settings -->
-  <string name="chart_settings">チャート設定</string>
-  <!-- X Axis -->
-  <string name="x_axis">X軸</string>
-  <string name="by_distance">距離ベース</string>
-  <string name="by_time">時間ベース</string>
-
-  <!-- Y Axis -->
-  <string name="y_axis">Y軸</string>
-
-  <!-- Units -->
-  <!-- Time  -->
-  <string name="voice_hour">時</string>
-  <string name="voice_hours">時</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>
-  <string name="voice_seconds">秒</string>
-  <string name="milliseconds">ミリ秒</string>
-
-  <!-- Distance -->
-  <string name="voice_kilometers">キロメータ</string>
-  <string name="voice_miles">マイル</string>
-
-  <!-- Speed and Pace -->
-  <string name="voice_kilometer_per_hour">キロメータ毎時</string>
-  <string name="voice_per_kilometer">毎キロメータ</string>
-  <string name="voice_mile_per_hour">マイル毎時</string>
-  <string name="voice_per_mile">毎マイル</string>
-
-  <!-- Stats Labels -->
-  <string name="moving_time_label">移動時間</string>
-  <string name="total_time_label">合計時間</string>
-  <string name="time_label">時間</string>
-  <string name="sd_unavail">SD が発見できません</string>
-  <string name="speed">速度</string>
-  <string name="start_trip">移動して下さい．</string>
-  <string name="statistics">統計</string>
-  <string name="total_distance_label">合計距離</string>
-  <string name="distance_label">距離</string>
-  <string name="power">心拍強度</string>
-  <string name="cadence">ケイデンス</string>
-  <string name="heart_rate">心拍数</string>
-  <string name="max_heart_rate">最大心拍数</string>
-  <string name="waiting">待機中...</string>
-
-  <!-- End User License Agreement -->
-  <string name="eula_title">エンドユーザライセンス契約書</string>
-  <string name="accept">同意する</string>
-  <string name="decline">拒否する</string>
-
-  <!-- About -->
-  <string name="about">このアプリケーションについて</string>
-  <string name="help">ヘルプ</string>
+  <string name="about_license">ライセンス</string>
+  <string name="about_privacy">プライバシー:</string>
+  <string name="about_support">サポート:</string>
   <string name="about_team">チーム:</string>
   <string name="about_version">バージョン:</string>
-  <string name="about_support">サポート:</string>
-  <string name="about_privacy">プライバシー:</string>
-
-  <!-- Send to Google -->
-  <string name="sendtogoogle_title">送信...</string>
-  <string name="sendtogoogle_google_mymaps">Googleマイマップ</string>
-  <string name="sendtogoogle_send_now">今すぐ送信</string>
-  <string name="sendtogoogle_create_new_map">新規マップ作成</string>
-  <string name="sendtogoogle_pick_existing_map">既存マップ選択</string>
-  <string name="sendtogoogle_send_stats">トラック統計情報送信</string>
-  <string name="sendtogoogle_send_stats_and_points">統計情報とポイント送信</string>
-
-  <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">アカウントを発見できませんでした．</string>
-  <string name="no_account_found">トラックをアップロードするためのアカウントを発見できませんでした．</string>
-  <string name="choose_account_title">アカウント選択</string>
-
-  <!-- SD card -->
-  <string name="io_no_external_storage_found">外部ストレージを発見できませんでした．SDカードが刺さっているか、端末がコンピュータにマウントされていないか確認してください．</string>
-  <string name="io_write_failed">ファイルへの書き込みができません．</string>
-  <string name="io_read_failed">ファイルからの読み込みができません．</string>
-  <string name="io_create_dir_failed">SDカード上でディレクトリを作成できません．</string>
-  <string name="io_write_finished">SDカードへの書き込み終了．</string>
-  <string name="io_read_finished">SDカードからの読み込み終了．</string>
-
-  <!-- VersionChecker -->
-  <string name="version_check_title">アップグレードチェック</string>
-  <string name="version_check_upgrade_button">今すぐアップグレード</string>
-  <string name="version_check_continue_button">アップグレードせずに続行</string>
-  <string name="upgrade_required">お使いの版では、確実には動作せず、サポートもされません．ご使用を続けるには %1$s をアップグレードしてください．</string>
-  <string name="upgrade_recommended">お使いの版では、確実には動作しません．すぐにアップグレードすることをお勧めします．アップグレードされない場合は問題発生の可能性があることをご認識ください． サーバ同期するような機能の中には、アップグレードされるまで機能しないものがあります．</string>
-  <string name="upgrade_available">%1$s の新しい版が出ています．現版で問題なくご使用になれますが、アップグレードするまで最新の機能をお使いになれません．</string>
-
-  <!-- Welcome -->
-  <string name="welcome">ようこそ</string>
-  <string name="welcome_about">My Tracksについて</string>
-
-  <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks 移動していません</string>
-  <!-- Format:
-  $1 : Distance label
-  $2 : Distance value (5)
-  $3 : Distance units (mi, km)
-  $4 : Time description (10 minutes 5 seconds)
-  $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
-  $6 : Speed units (mph) : Pace units (per mile)
-  -->
-  <string name="announce_template">My Tracks %1$s %2$.2f %3$s 時間 %4$s 速度/ペース %5$s %6$s</string>
-
-  <!-- Check Units -->
-  <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="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
-  <string name="ant_options">ANTオプション</string>
+  <string name="chart_settings_by_distance">距離ベース</string>
+  <string name="chart_settings_by_time">時間ベース</string>
+  <string name="chart_settings_x_axis">X軸</string>
+  <string name="chart_settings_y_axis">Y軸</string>
+  <string name="eula_accept">同意する</string>
+  <string name="eula_decline">拒否する</string>
+  <string name="eula_title">エンドユーザライセンス契約書</string>
+  <string name="export_progress_message">SDカードにデータを書き込んでいます．若干時間がかかります．</string>
+  <string name="export_success">出力終了</string>
+  <string name="generic_cancel">キャンセル</string>
+  <string name="generic_confirm_title">よろしいですか?</string>
+  <string name="generic_error_title">エラー</string>
+  <string name="generic_no">いいえ</string>
+  <string name="generic_progress_title">お待ちください...</string>
+  <string name="generic_save">保存</string>
+  <string name="generic_success_title">成功</string>
+  <string name="generic_yes">はい</string>
+  <string name="gps_need_to_enable">ここをタップして「位置情報とセキュリティの設定」を開いて「GPS機能を使用」にチェックを入れて下さい．バックボタンで戻ってください．</string>
+  <string name="gps_not_found">この端末でGPSロケーションプロバイダを発見できました．</string>
+  <string name="gps_wait_for_fix">GPS位置精度がよくなるまで待機しています．空が見えるところにいて下さい．</string>
+  <string name="import_error">ファイル %s のインポートエラー</string>
+  <string name="import_no_file">%s ではGPXファイルがありません．SDカードを読み込めないかディレクトリにGPXファイルが無いかも知れません．</string>
+  <string name="import_success">%3$s からGPXファイル %2$d件のうち %1$d件をインポートしました</string>
+  <string name="marker_detail_marker_description">マーカー説明</string>
+  <string name="marker_detail_marker_name">マーカー名</string>
+  <string name="marker_detail_marker_type">マーカータイプ(建物、洞穴、名所...)</string>
+  <string name="marker_detail_marker_type_hint">マーカータイプ</string>
+  <string name="marker_detail_title">マーカー詳細</string>
+  <string name="marker_insert_error">マーカーの挿入ができません．位置決定ができません．</string>
+  <string name="marker_insert_success">統計マーカーを挿入しました．</string>
+  <string name="marker_label_end">(終了)</string>
+  <string name="marker_label_start">(開始)</string>
+  <string name="marker_list_context_menu_title">このマーカー</string>
+  <string name="marker_list_delete_marker">削除</string>
+  <string name="marker_list_delete_marker_confirm_message">マーカーをこの端末から完全に削除します．</string>
+  <string name="marker_list_edit_marker">詳細編集</string>
+  <string name="marker_list_insert_statistics">統計情報の挿入</string>
+  <string name="marker_list_insert_waypoint">ウェイポイントの挿入</string>
+  <string name="marker_list_pick_one">マーカーを選択します．オプションを表示するには長押しして下さい．</string>
+  <string name="marker_list_show_on_map">マップに表示</string>
+  <string name="marker_type_statistics">統計</string>
+  <string name="marker_type_waypoint">ウェイポイント</string>
+  <string name="menu_aggregated_statistics">集計情報</string>
+  <string name="menu_chart_view_chart_settings">チャート設定</string>
+  <string name="menu_help">ヘルプ</string>
+  <string name="menu_map_view_map_mode">地図モード</string>
+  <string name="menu_map_view_my_location">現在地</string>
+  <string name="menu_map_view_satellite_mode">衛星モード</string>
+  <string name="menu_markers">マーカー</string>
+  <string name="menu_record_track">トラック記録</string>
+  <string name="menu_sensor_state">センサー情報</string>
+  <string name="menu_settings">設定</string>
+  <string name="menu_stop_recording">記録停止</string>
+  <string name="menu_tracks">トラック</string>
+  <string name="my_location_approximate_location">ご注意: 携帯電話中継局とWi-Fiネットワークから大まかな位置を特定します．</string>
+  <string name="my_location_no_location">現在位置決定ができません．位置取得源を増やし(位置情報とセキュリティの設定 をご覧ください)、空が見えるようにして下さい．もう一度試して下さい．</string>
+  <string name="my_maps_list_error">今回はマップをロードできませんでした!</string>
+  <string name="my_maps_list_loading">マップをロード中...</string>
+  <string name="my_maps_list_no_maps">まだ地図がありません．</string>
+  <string name="my_maps_list_pick_map">アカウントからのマップ選択:</string>
+  <string name="my_maps_list_public_label">公開</string>
+  <string name="my_maps_list_title">Googleマイマップに送信</string>
+  <string name="my_maps_list_unlisted_label">リストに出さない</string>
+  <string name="permission_notification_description">トラック記録の開始・終了時に通知されます．</string>
+  <string name="permission_notification_label">トラック記録通知受信</string>
+  <string name="permission_read_description">ポイントやウェイポイントといったトラックの読み込みを可能にします．</string>
+  <string name="permission_read_label">トラック読み込み</string>
+  <string name="permission_write_description">記録開始やウェイポイント追加といったトラック記録を可能にします．</string>
+  <string name="permission_write_label">トラック書き込みとトラック記録の開始・終了</string>
+  <string name="sd_card_error_create_dir">SDカード上でディレクトリを作成できません．</string>
+  <string name="sd_card_error_no_storage">外部ストレージを発見できませんでした．SDカードが刺さっているか、端末がコンピュータにマウントされていないか確認してください．</string>
+  <string name="sd_card_error_read_file">ファイルからの読み込みができません．</string>
+  <string name="sd_card_error_write_file">ファイルへの書き込みができません．</string>
+  <string name="sd_card_success_read_file">SDカードからの読み込み終了．</string>
+  <string name="sd_card_success_write_file">SDカードへの書き込み終了．</string>
+  <string name="send_google_choose_account_title">アカウント選択</string>
+  <string name="send_google_existing_map">既存マップ選択</string>
+  <string name="send_google_my_maps">Googleマイマップ</string>
+  <string name="send_google_new_map">新規マップ作成</string>
+  <string name="send_google_no_account_message">トラックをアップロードするためのアカウントを発見できませんでした．</string>
+  <string name="send_google_no_account_title">アカウントを発見できませんでした．</string>
+  <string name="send_google_progress_preparing_track">トラックを準備しています...</string>
+  <string name="send_google_progress_reading_track">トラックを読んでいます...</string>
+  <string name="send_google_recorded">記録日</string>
+  <string name="send_google_result_share_url">トラック共有</string>
+  <string name="send_google_send_now">今すぐ送信</string>
+  <string name="send_google_success_footer">新しいトラックが表示されるまでに数分かかることがあります．</string>
+  <string name="send_google_title">送信...</string>
+  <string name="send_google_track_part_label">(パート %d)</string>
+  <string name="sensor_state_cadence">ケイデンス</string>
+  <string name="sensor_state_connected">接続</string>
+  <string name="sensor_state_connecting">接続中</string>
+  <string name="sensor_state_disconnected">解除</string>
+  <string name="sensor_state_heart_rate">心拍数</string>
+  <string name="sensor_state_last_sensor_time">計測日時</string>
+  <string name="sensor_state_power">心拍強度</string>
+  <string name="sensor_state_sending">送信中</string>
+  <string name="settings_backup">バックアップ (ベータ版)</string>
+  <string name="settings_backup_now">今すぐバックアップ</string>
+  <string name="settings_backup_now_progress_message">SDカードに全てのトラックと設定をバックアップしています．しばらくかかることがあります...</string>
+  <string name="settings_backup_now_summary">SDカードに全てのトラックと設定をバックアップします</string>
+  <string name="settings_backup_restore">今すぐ復元</string>
+  <string name="settings_backup_restore_confirm_message">SDカードからの復元を実行すると、現在のトラックと設定は *全て上書き* されてしまいます．よろしいですか?</string>
+  <string name="settings_backup_restore_no_backup">バックアップがありません．</string>
+  <string name="settings_backup_restore_progress_message">SDカードから全てのトラックと設定を復元しています．しばらくかかることがあります...</string>
+  <string name="settings_backup_restore_select_title">復元するバックアップの選択</string>
+  <string name="settings_backup_restore_summary">SDカードから全てのトラックと設定を復元します</string>
+  <string name="settings_backup_sd_card">SDカード バックアップ</string>
+  <string name="settings_display">表示</string>
+  <string name="settings_display_metric">メートル法を使用</string>
+  <string name="settings_display_metric_summary_off">全ての距離をヤード・ポンド法で表示します</string>
+  <string name="settings_display_metric_summary_on">全ての距離をメートル法で表示します</string>
+  <string name="settings_display_speed">速度表示</string>
+  <string name="settings_display_speed_summary_off">ペースが表示されます</string>
+  <string name="settings_display_speed_summary_on">速度が表示されます</string>
+  <string name="settings_recording">記録</string>
+  <string name="settings_recording_auto_resume">記録自動再開の制限時間</string>
+  <string name="settings_recording_auto_resume_summary">指定時間(分単位)以内なら端末再起動時に以前のトラック記録を再開します．</string>
+  <string name="settings_recording_distance">ポイント間の最短距離</string>
+  <string name="settings_recording_distance_summary">位置記録間の最短距離</string>
+  <string name="settings_recording_gps_accuracy">最低精度</string>
+  <string name="settings_recording_gps_accuracy_summary">この精度以上でないと記録を休止します</string>
+  <string name="settings_recording_interval">ポイント間の最小時間間隔</string>
+  <string name="settings_recording_interval_summary">位置記録の最短インターバル</string>
+  <string name="settings_recording_marker">分割頻度</string>
+  <string name="settings_recording_marker_summary">分割マーカーを挿入する時間または距離の間隔</string>
+  <string name="settings_recording_name">日時をトラック名にする</string>
+  <string name="settings_recording_name_summary_off">トラック名を昇順の数字にします．</string>
+  <string name="settings_recording_name_summary_on">デフォルトのトラック名をトラック開始日時にします．</string>
+  <string name="settings_recording_track_distance">ポイント間の最長距離</string>
+  <string name="settings_recording_track_distance_summary">これより間隔が長い場合はトラックは分割されます</string>
+  <string name="settings_recording_voice">定期通知</string>
+  <string name="settings_recording_voice_not_available">このAndroidバージョンでは使用できません</string>
+  <string name="settings_recording_voice_summary">音声通知間隔の最小時間</string>
   <string name="settings_sensor">センサーオプション</string>
-
-  <!-- Bluetooth Sensor -->
-  <string name="bluetooth_connected">%sに接続しました</string>
-  <string name="bluetooth_connecting">Bluetoothセンサー接続中...</string>
-  <string name="bluetooth_not_connected">Bluetoothセンサーに接続していません</string>
-
-  <!-- Sensor State -->
-  <string name="sensor_data_time">計測日時</string>
-  <string name="power_meter_enabled">パワーメーター有効</string>
-  <string name="heart_rate_monitor_enabled">心拍数モニタ有効</string>
-  <string name="no_sensor_manager">センサーマネージャがありません</string>
-  <string name="enabled">有効</string>
-  <string name="connecting">接続中</string>
-  <string name="connected">接続</string>
-  <string name="disconnected">解除</string>
-  <string name="no_sensor_service">センサーサービスがありません</string>
-  <string name="searching">検索中</string>
-  <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>
-    
-  <!-- Manifest description (not seen inside the app) -->
-  <string name="notification_permission_label">トラック記録通知受信</string>
-  <string name="read_tracks_permission_label">トラック読み込み</string>
-  <string name="write_tracks_permission_label">トラック書き込みとトラック記録の開始・終了</string>
-  <string name="notification_permission_description">トラック記録の開始・終了時に通知されます．</string>
-  <string name="read_tracks_permission_description">ポイントやウェイポイントといったトラックの読み込みを可能にします．</string>
-  <string name="write_tracks_permission_description">記録開始やウェイポイント追加といったトラック記録を可能にします．</string>
+  <string name="settings_sensor_ant_not_paired">ANTセンサーとペアリングしていません</string>
+  <string name="settings_sensor_ant_options">ANTオプション</string>
+  <string name="settings_sensor_ant_paired">ANTセンサーとペアリング: %d</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="settings_sensor_bluetooth_sensor">Bluetoothセンサー</string>
+  <string name="settings_sensor_bluetooth_sensor_summary">Bluetoothセンサー接続先</string>
+  <string name="settings_sensor_type">センサータイプ</string>
+  <string name="settings_sensor_type_ant">ANT+ センサー</string>
+  <string name="settings_sensor_type_none">なし</string>
+  <string name="settings_sensor_type_srm">SRM ANT+ ブリッジ</string>
+  <string name="settings_sensor_type_summary">接続先センサーのタイプ</string>
+  <string name="settings_sensor_unpair_ant">ANT心拍数センサーとのペアリング解消</string>
+  <string name="settings_sensor_unpair_srm">ANT SRMブリッジセンサーとのペアリング解消</string>
+  <string name="settings_sharing">共有</string>
+  <string name="settings_sharing_map_public">マップの公開</string>
+  <string name="settings_sharing_map_public_summary_off">アップロードされたマップはmaps.google.comのリストに公開されません</string>
+  <string name="settings_sharing_map_public_summary_on">アップロードされたマップはmaps.google.comで誰でも閲覧できます</string>
+  <string name="settings_sharing_url_only">URLのみ共有</string>
+  <string name="settings_sharing_url_only_summary_off">共有時にトラックのコンテントが含まれます</string>
+  <string name="settings_title">My Tracks設定</string>
+  <string name="share_track_file_body_format">このトラックに興味を持って頂けると思います．\n\nこのトラックを閲覧するには、Google Earthまたは他のマッピングソフトウェアが必要です．</string>
+  <string name="share_track_picker_title">マップ共有</string>
+  <string name="share_track_subject">トラックを共有したいと思います</string>
+  <string name="share_track_url_body_format">このマップに興味を持って頂けると思います:\n\n%s</string>
+  <string name="stat_average_moving_pace">平均移動ペース</string>
+  <string name="stat_average_moving_speed">平均移動速度</string>
+  <string name="stat_average_pace">平均ペース</string>
+  <string name="stat_average_speed">平均速度</string>
+  <string name="stat_elevation">標高</string>
+  <string name="stat_elevation_gain">標高差</string>
+  <string name="stat_latitude">緯度</string>
+  <string name="stat_longitude">経度</string>
+  <string name="stat_max_elevation">最大標高</string>
+  <string name="stat_max_grade">最大勾配</string>
+  <string name="stat_max_speed">最大速度</string>
+  <string name="stat_min_elevation">最小標高</string>
+  <string name="stat_min_grade">最小勾配</string>
+  <string name="stat_min_pace">最小ペース</string>
+  <string name="stat_moving_time">移動時間</string>
+  <string name="stat_pace">ペース</string>
+  <string name="stat_speed">速度</string>
+  <string name="stat_total_distance">合計距離</string>
+  <string name="stat_total_time">合計時間</string>
+  <string name="track_detail_activity_type">活動タイプ(ハイキング, サイクリング、ランニング、登山...)</string>
+  <string name="track_detail_activity_type_hint">活動タイプ</string>
+  <string name="track_detail_title">トラック詳細</string>
+  <string name="track_detail_track_description">トラック説明</string>
+  <string name="track_detail_track_name">トラック名</string>
+  <string name="track_list_clear_map">マップのクリア</string>
+  <string name="track_list_context_menu_title">このトラック</string>
+  <string name="track_list_delete_all">全て削除</string>
+  <string name="track_list_delete_all_confirm_message">全てのトラックとマーカーをこの端末から削除します．</string>
+  <string name="track_list_delete_track">端末から削除...</string>
+  <string name="track_list_delete_track_confirm_message">トラックとマーカーをこの端末から完全に削除します．</string>
+  <string name="track_list_edit_track">詳細編集</string>
+  <string name="track_list_export_all">全て出力</string>
+  <string name="track_list_import_all">全てインポート</string>
+  <string name="track_list_pick_one">トラックを選択します．オプションを表示するには長押しして下さい．</string>
+  <string name="track_list_save_sd">SDへの書き込み...</string>
+  <string name="track_list_send_google">Googleに送信...</string>
+  <string name="track_list_share_track">共有...</string>
+  <string name="track_list_share_url">マップへのリンク</string>
+  <string name="track_list_show_on_map">表示</string>
+  <string name="track_name_format">トラック %d</string>
+  <string name="track_record_error">記録作成開始できません．もう一度試して下さい．</string>
+  <string name="track_record_notification">トラックを保存中...</string>
+  <string name="track_record_success">新しいトラックを記録中です．</string>
+  <string name="unit_hour">時</string>
+  <string name="unit_minute">分</string>
+  <string name="voice_hour">時</string>
+  <string name="voice_hours">時</string>
+  <string name="voice_kilometer_per_hour">キロメータ毎時</string>
+  <string name="voice_kilometers">キロメータ</string>
+  <string name="voice_mile_per_hour">マイル毎時</string>
+  <string name="voice_miles">マイル</string>
+  <string name="voice_minute">分</string>
+  <string name="voice_minutes">分</string>
+  <string name="voice_no_distance">My Tracks 移動していません</string>
+  <string name="voice_per_kilometer">毎キロメータ</string>
+  <string name="voice_per_mile">毎マイル</string>
+  <string name="voice_second">秒</string>
+  <string name="voice_seconds">秒</string>
+  <string name="voice_template">My Tracks %1$.2f %2$s 時間 %3$s 速度/ペース %4$s %5$s</string>
+  <string name="welcome_about">My Tracksについて</string>
+  <string name="welcome_title">ようこそ</string>
 </resources>
diff --git a/MyTracks/res/values-pl/arrays.xml b/MyTracks/res/values-pl/arrays.xml
deleted file mode 100644
index b349decd7..000000000
--- a/MyTracks/res/values-pl/arrays.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-  <!-- Minimum recording distance -->
-  <string-array name="min_recording_distance_options">
-    <item>1 m</item>
-    <item>2 m</item>
-    <item>3 m</item>
-    <item>4 m</item>
-    <item>5 m (zalecane)</item>
-    <item>10 m</item>
-    <item>100 m</item>
-  </string-array>
-
-  <string-array name="min_recording_distance_options_ft">
-    <item>3 stopy</item>
-    <item>6 stóp</item>
-    <item>10 stóp</item>
-    <item>13 stóp</item>
-    <item>16 stóp (zalecane)</item>
-    <item>33 stopy</item>
-    <item>328 stóp</item>
-  </string-array>
-
-  <!-- Maximum recording distance -->
-  <string-array name="max_recording_distance_options">
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (zalecane)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>5000 m</item>
-  </string-array>
-
-  <string-array name="max_recording_distance_options_ft">
-    <item>164 stopy</item>
-    <item>328 stóp</item>
-    <item>656 stóp (polecane)</item>
-    <item>1640 stóp</item>
-    <item>0.6 mili</item>
-    <item>3.1 mili</item>
-  </string-array>
-
-  <!-- Minimum recording interval -->
-  <string-array name="min_recording_interval_options">
-    <item>oszczędzanie baterii (adaptacyjny)</item>
-    <item>wysoka dokładność (adaptacyjny)</item>
-    <item>najwyższa (zalecane)</item>
-    <item>2 s</item>
-    <item>3 s</item>
-    <item>4 s</item>
-    <item>5 s</item>
-    <item>10 s</item>
-    <item>20 s</item>
-    <item>30 s</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-  </string-array>
-
-  <!-- Minimum required accuracy -->
-  <string-array name="min_required_accuracy_options">
-    <item>10 m (doskonał sygnał GPS)</item>
-    <item>20 m</item>
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (zalecane)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>2000 m</item>
-    <item>5000 m (słaby sygnał GPS)</item>
-  </string-array>
-
-  <string-array name="min_required_accuracy_options_ft">
-    <item>33 stopy (doskonały sygnał GPS)</item>
-    <item>66 stóp</item>
-    <item>165 stóp</item>
-    <item>328 stóp</item>
-    <item>656 stóp (zalecany)</item>
-    <item>1640 ft</item>
-    <item>0.6 mili</item>
-    <item>1.2 mili</item>
-    <item>3.1 mili (słaby sygnał GPS)</item>
-  </string-array>
-
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Brak</item>
-    <item>100 km</item>
-    <item>50 km</item>
-    <item>25 km</item>
-    <item>10 km</item>
-    <item>5 km</item>
-    <item>1 km</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-  <string-array name="task_frequency_options_ft">
-    <item>Brak</item>
-    <item>100 mi</item>
-    <item>50 mi</item>
-    <item>25 mi</item>
-    <item>10 mi</item>
-    <item>5 mi</item>
-    <item>1 mi</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-  <!-- Auto-resume track timeout -->
-  <string-array name="auto_resume_track_timeout_options">
-    <item>Nigdy</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>Zawsze</item>
-  </string-array>
-
-  <!-- Other non-preference arrays -->
-  <array name="activity_types">
-    <item>nieznany</item>
-    <item>typ mieszany</item>
-    <item>inny</item>
-
-    <item>bieganie</item>
-    <item>bieganie uliczne</item>
-    <item>bieganie na torze</item>
-    <item>bieganie terenowe</item>
-    <item>spacer</item>
-    <item>szybki spacer</item>
-    <item>wędrówka</item>
-    <item>wędrówka po szlaku</item>
-    <item>wędrówka poza szlakiem</item>
-    <item>wspinaczka</item>
-
-    <item>jazda rowerem</item>
-    <item>jazda po szosie</item>
-    <item>jazda górska</item>
-    <item>jazda na torze</item>
-
-    <item>łyżwiarstwo</item>
-    <item>łyżwiarstwo torowe</item>
-    <item>deskorolka</item>
-
-    <item>wędrówka po śniegu</item>
-    <item>narciarstwo</item>
-    <item>snowboard</item>
-    <item>saneczkarstwo</item>
-    <item>żeglarstwo lodowe</item>
-
-    <item>żeglowanie</item>
-    <item>paddling</item>
-    <item>kajak</item>
-    <item>wioślarstwo</item>
-    <item>motorówka</item>
-    <item>prom</item>
-    <item>łódź zdalnie st.</item>
-    <item>surfing</item>
-    <item>wind surfing</item>
-    <item>kite surfing</item>
-    <item>narty wodne</item>
-    <item>wake boarding</item>
-
-    <item>samolot</item>
-    <item>wodolot</item>
-    <item>commercial airplane</item>
-    <item>helikopter</item>
-    <item>balon powietrzny</item>
-    <item>sterowiec</item>
-    <item>samolot zdalnie st.</item>
-    <item>helikopter zalnie st.</item>
-    <item>sky jumping</item>
-    <item>szybowiec</item>
-    <item>hang gliding</item>
-    <item>para gliding</item>
-
-    <item>jeździectwo</item>
-    <item>jazda konna</item>
-    <item>jazda na ośle</item>
-
-    <item>samochód</item>
-    <item>autobus</item>
-    <item>pociąg</item>
-    <item>motocykl</item>
-    <item>rower terenowy</item>
-    <item>ATV</item>
-
-    <item>żeglarstwo lądowe</item>
-    <item>ringo</item>
-    <item>ultimate ringo</item>
-  </array>
-
-  <array name="waypoint_types">
-    <item>bankomat</item>
-    <item>bank</item>
-    <item>bar</item>
-    <item>grill</item>
-    <item>budynek</item>
-    <item>przystanek autobusowy</item>
-    <item>kawa</item>
-    <item>ognisko</item>
-    <item>kemping</item>
-    <item>kościół</item>
-    <item>kawiarnia</item>
-    <item>delikatesy</item>
-    <item>woda pitna</item>
-    <item>spadające skały</item>
-    <item>prom</item>
-    <item>kominek</item>
-    <item>remiza strażacka</item>
-    <item>baza wędkarska</item>
-    <item>stacja paliw</item>
-    <item>pole golfowe</item>
-    <item>sklep spożywczy</item>
-    <item>fryzjer</item>
-    <item>zatoka</item>
-    <item>szlak</item>
-    <item>hotel</item>
-    <item>dom</item>
-    <item>informacja</item>
-    <item>skrzyżowanie</item>
-    <item>skrzynka pocztowa</item>
-    <item>market</item>
-    <item>miejsce zbiórki</item>
-    <item>opera</item>
-    <item>parking</item>
-    <item>poczta</item>
-    <item>grota</item>
-    <item>posterunek policji</item>
-    <item>przejazd kolejowy</item>
-    <item>restauracja</item>
-    <item>zakupy</item>
-    <item>widok</item>
-    <item>sklep</item>
-    <item>basen</item>
-    <item>telefon</item>
-    <item>teatr</item>
-    <item>toaleta</item>
-    <item>informacja turystyczna</item>
-    <item>tunel</item>
-    <item>drzewo</item>
-    <item>wodospad</item>
-    <item>zdrój</item>
-    <item>punkt orientacyjny</item>
-  </array>
-
-</resources>
diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml
index 9f4f27d02..8b769797c 100644
--- a/MyTracks/res/values-pl/strings.xml
+++ b/MyTracks/res/values-pl/strings.xml
@@ -15,398 +15,204 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Used by the Menu -->
-  <string name="start_recording">Rejestruj trasę</string>
-  <string name="stop_recording">Zakończ rejestrowanie</string>
-  <string name="switch_to_sat">Tryb satelitarny</string>
-  <string name="switch_to_map">Tryb mapy</string>
-  <string name="mylocation">Moja lokalizacja</string>
-  <string name="list_tracks">Trasy</string>
-  <string name="list_markers">Znaczniki</string>
-  <string name="delete_all_tracks">Usuń wszystkie trasy</string>
-  <string name="settings">Ustawienia</string>
-  <string name="elevation">Wysokość n.p.m.</string>
-  <string name="choose_track_message">Wybierz trasę do podglądu</string>
-  <string name="current_track">Obecna trasa</string>
-  <string name="current_segment">Ostatni segment</string>
-  <string name="aggregated_stats">Statystyki Grupowe</string>
-
-  <!-- Error messages -->
-  <string name="error_no_location_manager">Brak menedżera lokalizacji na urządzeniu!</string>
-  <string name="error_no_gps">Brak dostawcy lokalizacji GPS na urządzeniu.</string>
-  <string name="error_sending_to_fusion_tables">Podczas przesyłania pliku do Moich Map Google pojawił się błąd. Spróbuj ponownie później.</string>
-  <string name="error_sending_to_docs">Podczas przesyłania pliku do Dokumentów Google pojawił się błąd. Spróbuj ponownie później.</string>
-  <string name="error_unable_to_start_recording">Nie można rozpocząć rejestrowania. Spróbuj ponownie.</string>
-  <string name="error_unable_to_stop_recording">Nie można zakończyć rejestrowania. Spróbuj ponownie.</string>
-  <string name="error_import_unable_to_read_file">Nie można czytać z pliku.</string>
-  <string name="error_import_invalid_gpx_format">Plik nie jest poprawnym plikiem GPX.</string>
-  <string name="error_import_generic">Wystąpił błąd. Spróbuj ponownie.</string>
-  <string name="error_export_track_does_not_exist">Trasa nie istnieje.</string>
-  <string name="error_import_out_of_memory">Plik jest za duży (musi być mniejszy niż 500 KB). Przerywam.</string>
-  <string name="error_unable_to_insert_marker">Nie można wstawić markera. Brak poprawnych danych o lokalizacji.</string>
-
-  <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Oczekiwanie na lepsze ustalenie pozycji GPS. Upewnij się, że niebo jest widoczne.</string>
-  <string name="status_now_recording">Rejestrowanie nowej trasy.</string>
-  <string name="status_stopped_recording">Zatrzymano rejestrowanie nowej trasy.</string>
-  <string name="status_need_to_enable_gps">Tapnij tutaj, aby przejść do ustawień Lokalizacji i zabezpieczeń, a następnie zaznacz Użyj satelitów GPS. Naciśnij klawisz Wstecz, aby powrócić.</string>
-  <string name="status_approximate_current_location">Uwaga: używana jest przybliżona lokalizacja ustalona za pomocą stacji komórkowych i sieci WIFI.</string>
-  <string name="status_no_current_location">Lokalizacja nie może być obecnie ustalona. Włącz wiecej źródeł (zobacz ustawienia Lokalizacji i zabezpieczeń) i upewnij się, że niebo jest widoczne. Spróbuj później.</string>
-  <string name="status_waypoint_inserted">Wstawiono znacznik punktu orientacyjnego.</string>
-  <string name="status_marker_inserted">Wstawiono znacznik statystyk.</string>
-
-  <!-- Progress dialog -->
-  <string name="progress_title">Proszę czekać...</string>
-  <string name="progress_message">Przesyłanie trasy do Google.</string>
-  <string name="progress_message_reading_track">Czytanie trasy...</string>
-  <string name="progress_message_preparing_track">Przygotowywanie trasy...</string>
-  <!-- <string name="progress_message_authenticating_fusion_tables">Uwierzytelnianie w Mapach Google...</string> -->
-  <string name="progress_message_authenticating_docs">Uwierzytelnianie w Dokumentach Google...</string>
-  <string name="progress_message_sending_docs">Przesyłanie trasy do Dokumentów Google...</string>
-  <!-- <string name="progress_message_sending_fusion_tables">Przesyłanie trasy do Map Google...</string> -->
-  <!-- <string name="progress_message_creating_fusion_table">Tworzenie nowej Mojej Mapy...</string> -->
-  <string name="progress_message_import">Importowanie trasy GPS. Poczekaj chwilę.</string>
-  <string name="progress_message_export">Zapisywanie pliku na kartę SD. Poczekaj chwilę.</string>
-  <string name="progress_message_updating_track">Aktualizacja statystyk trasy...</string>
-
-  <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Jesteś pewien?</string>
-  <string name="all_data_will_be_permanently_deleted">Wszystkie trasy i znaczniki zostaną usunięte z telefonu.</string>
-  <string name="track_will_be_permanently_deleted">Trasa i jej znaczniki zostanie całkowicie usunięta z telefonu.</string>
-  <string name="marker_will_be_permanently_deleted">Znacznik zostanie całkowicie usunięty z telefonu.</string>
-
-  <!-- Text and links when uploading to Google My Maps -->
-  <string name="new_map_description">Utworzono za pomocą My Tracks na Android.</string>
- 
-  <!-- Formatting of track and marker descriptions -->
-  <string name="points">Punkty</string>
-  <string name="recorded_date">Zapisana</string>
-  <string name="category">Typ aktywności</string>
-  <string name="waypoint_category">Typ znacznika</string>
-  <string name="track_part_format">(Część %d)</string>
-
-  <!-- Used by the track recording service -->
-  <string name="recording_your_track">Rejestrowanie twojej trasy...</string>
-  <string name="new_track_format">Trasa %d</string>
-
-  <!-- Common -->
-  <string name="no">Nie</string>
-  <string name="yes">Tak</string>
-  <string name="ok">OK</string>
-  <string name="error">Błąd</string>
-  <string name="success">Powodzenie</string>
-  <string name="waypoint">Punkt orientacyjny</string>
-  <string name="cancel">Anuluj</string>
-  <string name="save">Zapisz</string>
-
-  <!-- Placemark labels for start and end of track -->
-  <string name="start">(Początek)</string>
-  <string name="end">(Koniec)</string>
-
-  <!--  TrackList -->
-  <string name="tracklist_show_track">Pokaż</string>
-  <!-- <string name="tracklist_send_to_fusiontables">Wyślij do Moich Map Google</string> -->
-  <!-- <string name="tracklist_send_to_new_fusiontable">Wyślij do Moich Map Google jako nową mapę</string> -->
-  <string name="tracklist_send_to_docs">Wyślij do Dokumentów Google</string>
-  <string name="tracklist_send_to_google">Wyślij do Google...</string>
-  <string name="tracklist_delete_track">Usuń z telefonu...</string>
-  <string name="tracklist_edit_track">Edytuj szczegóły</string>
-  <string name="tracklist_write_to_sd">Zapisz na karcie SD...</string>
-  <string name="tracklist_save_as_gpx">Zapisz plik GPX</string>
-  <string name="tracklist_save_as_kml">Zapisz plik KML</string>
-  <string name="tracklist_save_as_csv">Zapisz plik CSV</string>
-  <!-- <string name="tracklist_btn_send_all_to_fusiontables">Wyślij do Moich Map Google</string> -->
-  <string name="tracklist_btn_delete_all">Usuń wszystkie trasy</string>
-  <!-- Export All -->
-  <string name="tracklist_btn_export_all">Eksportuj wszystkie trasy</string>
-  <string name="export_done">Eksport zakończony</string>
-  <string name="tracklist_pick_one">Wybierz trasę. Naciśnij i przytrzymaj, aby wybrać opcje.</string>
-  <string name="tracklist_all_tracks">Wszystkie trasy:</string>
-  <string name="tracklist_this_track">Ta trasa</string>
-  <string name="tracklist_share_track">Podziel się z przyjaciółmi...</string>
-  <string name="tracklist_share_gpx_file">Plik GPX</string>
-  <string name="tracklist_share_kml_file">PLik KML</string>
-  <string name="tracklist_share_csv_file">Plik CSV</string>
-  <string name="tracklist_clear_map">Wyczyść mapę</string>
-
-  <!-- Waypoints list -->
-  <string name="waypointslist_btn_delete_all">Wyczyść wszystkie znaczniki</string>
-  <string name="waypointslist_this_waypoint">Ten znacznik</string>
-  <string name="waypointslist_delete_waypoint">Usuń</string>
-  <string name="waypointslist_edit_waypoint">Edytuj szczegóły</string>
-  <string name="waypointslist_show_waypoint">Pokaż na mapie</string>
-  <string name="waypointslist_btn_insert_waypoint">Wstaw punkt orientacyjny</string>
-  <string name="waypointslist_btn_insert_statistics">Wstaw statystyki</string>
-  <string name="waypointslist_pick_one">Wybierz znacznik. Naciśnij i przytrzymaj, aby wybrać opcje.</string>
-
-  <!-- MyTracks Details -->
-  <string name="trackdetails_title">Szczegóły trasy</string>
-  <string name="trackdetails_name">Nazwa trasy</string>
-  <string name="trackdetails_name_hint">Nazwa trasy</string>
-  <string name="trackdetails_description">Opis trasy</string>
-  <string name="trackdetails_description_hint">Opis trasy</string>
-  <string name="trackdetails_category">Typ aktywności (np. wspinanie, jazda rowerem, bieganie...)</string>
-  <string name="trackdetails_category_hint">Typ aktywności</string>
-
-  <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Szczegóły znacznika</string>
-  <string name="waypointdetails_name">Nazwa znacznika</string>
-  <string name="waypointdetails_name_hint">Nazwa znacznika</string>
-  <string name="waypointdetails_description">Opis znacznika</string>
-  <string name="waypointdetails_description_hint">Opis znacznika</string>
-  <string name="waypointdetails_category">Typ znacznika (np. budynek, jaskinia, punkt widokowy...)</string>
-  <string name="waypointdetails_category_hint">Typ znacznika</string>
-
-  <!-- MyTracks Settings -->
-  <string name="settings_title">Ustawienia My Tracks</string>
-  <string name="settings_display">Wyświetlanie</string>
-  <string name="settings_recording">Rejestrowanie</string>
-  <string name="settings_sharing">Dzielenie</string>
-
-  <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_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_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_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_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_metric_units">Używaj jednostek metrycznych</string>
-  <string name="settings_metric_units_summary_on">Wszystkie odległości będą wyświetlane w jednostkach metrycznych</string>
-  <string name="settings_metric_units_summary_off">Wszystkie odległości będą wyświetlane w jednostkach imperialnych</string>
-
-  <string name="settings_map_public">Ustaw mapy jako publiczne</string>
-  <string name="settings_map_public_summary_on">Przesłane mapy będą dostępne dla wszystkich na maps.google.com</string>
-  <string name="settings_map_public_summary_off">Przesłane mapy nie będą dostępne publicznie na maps.google.com</string>
-
-  <string name="settings_report_speed_or_pace">Wyświetlanie prędkości</string>
-  <string name="settings_report_speed_or_pace_summary_on">Prędkość będzie wyświetlana</string>
-  <string name="settings_report_speed_or_pace_summary_off">Tempo będzie wyświetlane</string>
-
-  <string name="settings_share_url_only">Dziel się tylko odnośnikiem</string>
-  <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_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="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_modular_stats_display_title">Widok Statystyk Modularnych</string>
-
-  <string name="settings_backup">Kopia zapasowa (BETA)</string>
-  <string name="settings_sd_backup">Kopia zapasowa na kartę SD</string>
-  <string name="settings_backup_to_sd">Utwórz kopię</string>
-  <string name="settings_backup_to_sd_summary">Tworzy kopię zapasową wszystkich tras i ustawień i zapisuje je na karcie SD</string>
-  <string name="settings_restore_from_sd">Odtwórz z kopii</string>
-  <string name="settings_restore_from_sd_summary">Odtwarza wszystkie trasy i ustawienia z kopii zapasowej z karty SD</string>
-
-  <!-- Backups -->
-  <string name="restore_overwrites_warning">Odtworzenie z kopii zapasowej z karty SD zastąpi wszystkie bieżące trasy i ustawienia. Jesteś tego pewien?</string>
-  <string name="select_backup_to_restore">Wybierz kopię do odtworzenia</string>
-  <string name="no_backups">Nie znaleziono kopii zapasowych.</string>
-  <string name="backup_write_progress_message">Zapisywanie wszystkich tras i ustawień na kartę SD. To może trochę potrwać...</string>
-  <string name="backup_import_progress_message">Odczytywanie wszystkich tras i ustawień z karty SD. To może trochę potrwać...</string>
-
-  <!-- MyTracksSky -->
-  <string name="mytracks_sky">Satelity GPS</string>
-
-  <!-- Sharing -->
-  <string name="share_map_subject">Chciałbym się z Tobą podzielić mapą</string>
-  <string name="share_track_url_body_format">Myślę, że może Cię zainteresować ta mapa:
-
-      %s</string>
-  <string name="share_track_subject">Chciałbym się z Tobą podzielić trasą</string>
-  <string name="share_track_file_body_format">Myślę, że może Cię zainteresować ta trasa.
-
-    Trasę możesz obejrzeć w Google Earth lub innym programie do obsługi map.</string>
-  <string name="share_track_url">Podziel się trasą z przyjaciółmi</string>
-
-  <!-- Visibility -->
-  <string name="public_map">Publiczna</string>
-  <string name="unlisted_map">Niepubliczna</string>
-  <string name="mapslist_no_maps_available">Nie masz jeszcze żadnych map.</string>
-
-  <!-- Statistics View -->
-  <!-- Average Moving -->
-  <string name="average_moving_speed_label">Średnia prędkość poruszania</string>
-  <string name="average_moving_pace_label">Średnie tempo poruszania</string>
-
-  <!-- Average -->
-  <string name="average_speed_label">Średnia prędkość</string>
-  <string name="average_pace_label">Średnie tempo</string>
-
-  <string name="elevation_chart_name">Wykres wysokości</string>
-  <string name="elevation_gain_label">Wzrost wysokości</string>
-  <string name="elevation_label">Wysokość</string>
-  <string name="latitude_label">Szerokość</string>
-  <string name="longitude_label">Długość</string>
-
-  <!-- Min -->
-  <string name="min_elevation_label">Min. wysokość</string>
-  <string name="min_grade_label">Min. nachylenie</string>
-  <string name="min_pace_label">Min. tempo</string>
-
-  <!-- Max -->
-  <string name="max_elevation_label">Maks. wysokość</string>
-  <string name="max_grade_label">Maks. nachylenie</string>
-  <string name="max_speed_label">Maks. prędkość</string>
-
-  <string name="loading_track">Wczytywanie trasy...</string>
-
-  <!-- Chart Settings -->
-  <string name="chart_settings">Ustawienia wykresów</string>
-  <!-- X Axis -->
-  <string name="x_axis">Oś X</string>
-  <string name="by_distance">Według odległości</string>
-  <string name="by_time">Według czasu</string>
-
-  <!-- Y Axis -->
-  <string name="y_axis">Oś Y</string>
-
-  <!-- Units -->
-  <!-- Time  -->
-  <string name="voice_hour">godzina</string>
-  <string name="voice_hours">godziny</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="unit_meter">m</string>
-  <string name="unit_kilometer">km</string>
-  <string name="voice_kilometers">kilometerów</string>
-  <string name="unit_feet">st.</string>
-  <string name="unit_mile">mi</string>
-  <string name="voice_miles">mil</string>
-
-  <!-- Speed and Pace -->
-  <string name="kilometer_per_hour">km/h</string>
-  <string name="voice_kilometer_per_hour">kilometry na godzinę</string>
-  <string name="min_per_kilometer">min/km</string>
-  <string name="voice_per_kilometer">na kilometr</string>
-  <string name="mile_per_hour">mi/h</string>
-  <string name="voice_mile_per_hour">mile na godzinę</string>
-  <string name="min_per_mile">min/mi</string>
-  <string name="voice_per_mile">na milę</string>
-
-  <!-- Stats Labels -->
-  <string name="moving_time_label">Czas w ruchu</string>
-  <string name="total_time_label">Całkowity czas</string>
-  <string name="time_label">Czas</string>
-  <string name="sd_unavail">Karta SD niedostępna</string>
-  <string name="speed">Prędkość</string>
-  <string name="start_trip">Musisz rozpocząć podróż.</string>
-  <string name="statistics">Statystyki</string>
-  <string name="total_distance_label">Całkowita odległość</string>
-  <string name="distance_label">Odległość</string>
-  <string name="unknown">-</string>
-  <string name="waiting">Oczekiwanie...</string>
-
-  <!-- End User License Agreement -->
-  <string name="eula_title">Licencja użytkownika końcowego</string>
-  <string name="accept">Zaakceptuj</string>
-  <string name="decline">Odrzuć</string>
-
-  <!-- About -->
-  <string name="about">O</string>
-  <string name="help">Pomoc</string>
+  <string name="about_support">Wsparcie:</string>
   <string name="about_team">Zespół:</string>
   <string name="about_version">Wersja:</string>
-  <string name="about_support">Wsparcie:</string>
-
-  <!-- Send to Google -->
-  <string name="sendtogoogle_title">Wyślij do...</string>
-  <!-- <string name="sendtogoogle_google_fusiontables">Moje Mapy Google</string> -->
-  <string name="sendtogoogle_google_docs">Dokumenty Google</string>
-  <string name="sendtogoogle_send_now">Wyślij teraz</string>
-  <string name="sendtogoogle_send_stats">Wyślij statystyki trasy</string>
-  <string name="sendtogoogle_send_stats_and_points">Wyślij statystyki i punkty</string>
-
-  <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Znaleziono nowe konto</string>
-  <string name="no_account_found">Nie znaleziono konta do przesyłu.</string>
-  <string name="choose_account_title">Wybierz konto</string>
-
-  <!-- SD card -->
-  <string name="io_no_external_storage_found">Nie znaleziono zewnętrznej pamięci. Upewniej się, że karta SD jest w telefonie i nie jest podłączona do komputera.</string>
-  <string name="io_write_failed">Nie można zapisać pliku.</string>
-  <string name="io_read_failed">Nie można odczytać pliku.</string>
-  <string name="io_create_dir_failed">Nie można utworzyć katalogu na karcie SD.</string>
-  <string name="io_write_finished">Zakończono zapisywanie na karcie SD.</string>
-  <string name="io_read_finished">Zakończono odczytywanie z karty SD.</string>  
-
-  <!-- VersionChecker -->
-  <string name="version_check_title">Sprawdzanie aktualizacji</string>
-  <string name="version_check_upgrade_button">Aktualizuj</string>
-  <string name="version_check_continue_button">Kontynuuj bez aktualizacji</string>
-  <string name="upgrade_required">Twoja wersja %1$s może nie działać poprawnie i nie jest już wspierana. Jeśli chcesz nadal używać %1$s zaktualizuj program.</string>
-  <string name="upgrade_recommended">Twoja wersja %1$s może nie działać poprawnie. MOżesz zaktualizować program lub używać obecnej wersji na własne ryzyko. Niektóre funkcje, takie jak synchronizacja z serwerem nie będą działać dopóki nie zaktualizujesz programu.</string>
-  <string name="upgrade_available">Dostępna jest nowa wersja %1$s is available. Możesz nadal używać obecnej wersji bez problemów, nie będziesz miał jednak dostępu do najnowszych funkcji.</string>
-
-  <!-- Welcome -->
-  <string name="welcome">Witamy</string>
-  <string name="welcome_read_later">Ok</string>
-  <string name="welcome_about">O My Tracks</string>
-
-  <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks brak odległości</string>
-  <!-- Format:
-  $1 : Distance label
-  $2 : Distance value (5)
-  $3 : Distance units (mi, km)
-  $4 : Time description (10 minutes 5 seconds)
-  $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
-  $6 : Speed units (mph) : Pace units (per mile)
-  -->
-  <string name="announce_template">My Tracks %1$s %2$.2f %3$s w %4$s w tempie %5$s %6$s</string>
-
-  <!-- Check Units -->
-  <string name="check_units_title">Jednostki miary</string>
-  
-  <!-- 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="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
-  <string name="ant_options">Opce ANT</string>
+  <string name="chart_settings_by_distance">Według odległości</string>
+  <string name="chart_settings_by_time">Według czasu</string>
+  <string name="chart_settings_x_axis">Oś X</string>
+  <string name="chart_settings_y_axis">Oś Y</string>
+  <string name="eula_accept">Zaakceptuj</string>
+  <string name="eula_decline">Odrzuć</string>
+  <string name="eula_title">Licencja użytkownika końcowego</string>
+  <string name="export_progress_message">Zapisywanie pliku na kartę SD. Poczekaj chwilę.</string>
+  <string name="export_success">Eksport zakończony</string>
+  <string name="generic_cancel">Anuluj</string>
+  <string name="generic_confirm_title">Jesteś pewien?</string>
+  <string name="generic_error_title">Błąd</string>
+  <string name="generic_no">Nie</string>
+  <string name="generic_ok">OK</string>
+  <string name="generic_progress_title">Proszę czekać...</string>
+  <string name="generic_save">Zapisz</string>
+  <string name="generic_success_title">Powodzenie</string>
+  <string name="generic_yes">Tak</string>
+  <string name="gps_need_to_enable">Tapnij tutaj, aby przejść do ustawień Lokalizacji i zabezpieczeń, a następnie zaznacz Użyj satelitów GPS. Naciśnij klawisz Wstecz, aby powrócić.</string>
+  <string name="gps_not_found">Brak dostawcy lokalizacji GPS na urządzeniu.</string>
+  <string name="gps_wait_for_fix">Oczekiwanie na lepsze ustalenie pozycji GPS. Upewnij się, że niebo jest widoczne.</string>
+  <string name="marker_detail_marker_description">Opis znacznika</string>
+  <string name="marker_detail_marker_name">Nazwa znacznika</string>
+  <string name="marker_detail_marker_type">Typ znacznika (np. budynek, jaskinia, punkt widokowy...)</string>
+  <string name="marker_detail_marker_type_hint">Typ znacznika</string>
+  <string name="marker_detail_title">Szczegóły znacznika</string>
+  <string name="marker_insert_error">Nie można wstawić markera. Brak poprawnych danych o lokalizacji.</string>
+  <string name="marker_insert_success">Wstawiono znacznik statystyk.</string>
+  <string name="marker_label_end">(Koniec)</string>
+  <string name="marker_label_start">(Początek)</string>
+  <string name="marker_list_context_menu_title">Ten znacznik</string>
+  <string name="marker_list_delete_marker">Usuń</string>
+  <string name="marker_list_delete_marker_confirm_message">Znacznik zostanie całkowicie usunięty z telefonu.</string>
+  <string name="marker_list_edit_marker">Edytuj szczegóły</string>
+  <string name="marker_list_insert_statistics">Wstaw statystyki</string>
+  <string name="marker_list_insert_waypoint">Wstaw punkt orientacyjny</string>
+  <string name="marker_list_pick_one">Wybierz znacznik. Naciśnij i przytrzymaj, aby wybrać opcje.</string>
+  <string name="marker_list_show_on_map">Pokaż na mapie</string>
+  <string name="marker_type_statistics">Statystyki</string>
+  <string name="marker_type_waypoint">Punkt orientacyjny</string>
+  <string name="menu_aggregated_statistics">Statystyki Grupowe</string>
+  <string name="menu_chart_view_chart_settings">Ustawienia wykresów</string>
+  <string name="menu_help">Pomoc</string>
+  <string name="menu_map_view_map_mode">Tryb mapy</string>
+  <string name="menu_map_view_my_location">Moja lokalizacja</string>
+  <string name="menu_map_view_satellite_mode">Tryb satelitarny</string>
+  <string name="menu_markers">Znaczniki</string>
+  <string name="menu_record_track">Rejestruj trasę</string>
+  <string name="menu_settings">Ustawienia</string>
+  <string name="menu_stop_recording">Zakończ rejestrowanie</string>
+  <string name="menu_tracks">Trasy</string>
+  <string name="my_location_approximate_location">Uwaga: używana jest przybliżona lokalizacja ustalona za pomocą stacji komórkowych i sieci WIFI.</string>
+  <string name="my_location_no_location">Lokalizacja nie może być obecnie ustalona. Włącz wiecej źródeł (zobacz ustawienia Lokalizacji i zabezpieczeń) i upewnij się, że niebo jest widoczne. Spróbuj później.</string>
+  <string name="my_maps_list_no_maps">Nie masz jeszcze żadnych map.</string>
+  <string name="my_maps_list_public_label">Publiczna</string>
+  <string name="my_maps_list_unlisted_label">Niepubliczna</string>
+  <string name="sd_card_error_create_dir">Nie można utworzyć katalogu na karcie SD.</string>
+  <string name="sd_card_error_no_storage">Nie znaleziono zewnętrznej pamięci. Upewniej się, że karta SD jest w telefonie i nie jest podłączona do komputera.</string>
+  <string name="sd_card_error_read_file">Nie można odczytać pliku.</string>
+  <string name="sd_card_error_write_file">Nie można zapisać pliku.</string>
+  <string name="sd_card_success_read_file">Zakończono odczytywanie z karty SD.</string>  
+  <string name="sd_card_success_write_file">Zakończono zapisywanie na karcie SD.</string>
+  <string name="send_google_choose_account_title">Wybierz konto</string>
+  <string name="send_google_docs">Dokumenty Google</string>
+  <string name="send_google_no_account_message">Nie znaleziono konta do przesyłu.</string>
+  <string name="send_google_no_account_title">Znaleziono nowe konto</string>
+  <string name="send_google_progress_preparing_track">Przygotowywanie trasy...</string>
+  <string name="send_google_progress_reading_track">Czytanie trasy...</string>
+  <string name="send_google_recorded">Zapisana</string>
+  <string name="send_google_result_share_url">Podziel się trasą z przyjaciółmi</string>
+  <string name="send_google_send_now">Wyślij teraz</string>
+  <string name="send_google_title">Wyślij do...</string>
+  <string name="send_google_track_part_label">(Część %d)</string>
+  <string name="sensor_state_connected">Podłączony</string>
+  <string name="sensor_state_connecting">Łączenie</string>
+  <string name="sensor_state_disconnected">Rozłączony</string>
+  <string name="sensor_state_last_sensor_time">Czas Danych Czujnika</string>
+  <string name="sensor_state_sending">Przesyłanie</string>
+  <string name="settings_backup">Kopia zapasowa (BETA)</string>
+  <string name="settings_backup_now">Utwórz kopię</string>
+  <string name="settings_backup_now_progress_message">Zapisywanie wszystkich tras i ustawień na kartę SD. To może trochę potrwać...</string>
+  <string name="settings_backup_now_summary">Tworzy kopię zapasową wszystkich tras i ustawień i zapisuje je na karcie SD</string>
+  <string name="settings_backup_restore">Odtwórz z kopii</string>
+  <string name="settings_backup_restore_confirm_message">Odtworzenie z kopii zapasowej z karty SD zastąpi wszystkie bieżące trasy i ustawienia. Jesteś tego pewien?</string>
+  <string name="settings_backup_restore_no_backup">Nie znaleziono kopii zapasowych.</string>
+  <string name="settings_backup_restore_progress_message">Odczytywanie wszystkich tras i ustawień z karty SD. To może trochę potrwać...</string>
+  <string name="settings_backup_restore_select_title">Wybierz kopię do odtworzenia</string>
+  <string name="settings_backup_restore_summary">Odtwarza wszystkie trasy i ustawienia z kopii zapasowej z karty SD</string>
+  <string name="settings_backup_sd_card">Kopia zapasowa na kartę SD</string>
+  <string name="settings_display">Wyświetlanie</string>
+  <string name="settings_display_metric">Używaj jednostek metrycznych</string>
+  <string name="settings_display_metric_summary_off">Wszystkie odległości będą wyświetlane w jednostkach imperialnych</string>
+  <string name="settings_display_metric_summary_on">Wszystkie odległości będą wyświetlane w jednostkach metrycznych</string>
+  <string name="settings_display_speed">Wyświetlanie prędkości</string>
+  <string name="settings_display_speed_summary_off">Tempo będzie wyświetlane</string>
+  <string name="settings_display_speed_summary_on">Prędkość będzie wyświetlana</string>
+  <string name="settings_recording">Rejestrowanie</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="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_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_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_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_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_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_sensor">Opcje Czujników</string>
-
-  <!-- Bluetooth Sensor -->
-  <string name="bluetooth_connected">Połączony z %s</string>
-  <string name="bluetooth_connecting">Łączenie urządzenia Bluetooth w toku...</string>
-  <string name="bluetooth_not_connected">Urządzenie Bluetooth niepołączone</string>
-
-  <!-- Sensor State -->
-  <string name="sensor_data_time">Czas Danych Czujnika</string>
-  <string name="power_meter_enabled">Miernik mocy aktywny</string>
-  <string name="heart_rate_monitor_enabled">Pulsometr aktywny</string>
-  <string name="no_sensor_manager">Brak Ustawień Czujników</string>
-  <string name="enabled">Aktywny</string>
-  <string name="connecting">Łączenie</string>
-  <string name="connected">Podłączony</string>
-  <string name="disconnected">Rozłączony</string>
-  <string name="no_sensor_service">Brak Serwisu Czujników</string>
-  <string name="searching">Wykrywanie</string>
-  <string name="sending">Przesyłanie</string>
+  <string name="settings_sensor_ant_options">Opce ANT</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="settings_sensor_bluetooth_sensor">Czujnik bluetooth</string>
+  <string name="settings_sensor_bluetooth_sensor_summary">Czujnik bluetooth do podłączenia.</string>
+  <string name="settings_sensor_type">Typ Czujnika</string>
+  <string name="settings_sensor_type_summary">Typ czujnika do podłączenia.</string>
+  <string name="settings_sharing">Dzielenie</string>
+  <string name="settings_sharing_map_public">Ustaw mapy jako publiczne</string>
+  <string name="settings_sharing_map_public_summary_off">Przesłane mapy nie będą dostępne publicznie na maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_on">Przesłane mapy będą dostępne dla wszystkich na maps.google.com</string>
+  <string name="settings_sharing_url_only">Dziel się tylko odnośnikiem</string>
+  <string name="settings_sharing_url_only_summary_off">Zawartość trasy będzie również przesyłana</string>
+  <string name="settings_title">Ustawienia My Tracks</string>
+  <string name="share_track_file_body_format">Myślę, że może Cię zainteresować ta trasa.\n\nTrasę możesz obejrzeć w Google Earth lub innym programie do obsługi map.</string>
+  <string name="share_track_subject">Chciałbym się z Tobą podzielić trasą</string>
+  <string name="share_track_url_body_format">Myślę, że może Cię zainteresować ta mapa:\n\n%s</string>
+  <string name="stat_average_moving_pace">Średnie tempo poruszania</string>
+  <string name="stat_average_moving_speed">Średnia prędkość poruszania</string>
+  <string name="stat_average_pace">Średnie tempo</string>
+  <string name="stat_average_speed">Średnia prędkość</string>
+  <string name="stat_elevation">Wysokość</string>
+  <string name="stat_elevation_gain">Wzrost wysokości</string>
+  <string name="stat_latitude">Szerokość</string>
+  <string name="stat_longitude">Długość</string>
+  <string name="stat_max_elevation">Maks. wysokość</string>
+  <string name="stat_max_grade">Maks. nachylenie</string>
+  <string name="stat_max_speed">Maks. prędkość</string>
+  <string name="stat_min_elevation">Min. wysokość</string>
+  <string name="stat_min_grade">Min. nachylenie</string>
+  <string name="stat_min_pace">Min. tempo</string>
+  <string name="stat_moving_time">Czas w ruchu</string>
+  <string name="stat_pace">Tempo</string>
+  <string name="stat_speed">Prędkość</string>
+  <string name="stat_total_distance">Całkowita odległość</string>
+  <string name="stat_total_time">Całkowity czas</string>
+  <string name="track_detail_activity_type">Typ aktywności (np. wspinanie, jazda rowerem, bieganie...)</string>
+  <string name="track_detail_activity_type_hint">Typ aktywności</string>
+  <string name="track_detail_title">Szczegóły trasy</string>
+  <string name="track_detail_track_description">Opis trasy</string>
+  <string name="track_detail_track_name">Nazwa trasy</string>
+  <string name="track_list_clear_map">Wyczyść mapę</string>
+  <string name="track_list_context_menu_title">Ta trasa</string>
+  <string name="track_list_delete_all">Usuń wszystkie trasy</string>
+  <string name="track_list_delete_all_confirm_message">Wszystkie trasy i znaczniki zostaną usunięte z telefonu.</string>
+  <string name="track_list_delete_track">Usuń z telefonu...</string>
+  <string name="track_list_delete_track_confirm_message">Trasa i jej znaczniki zostanie całkowicie usunięta z telefonu.</string>
+  <string name="track_list_edit_track">Edytuj szczegóły</string>
+  <string name="track_list_export_all">Eksportuj wszystkie trasy</string>
+  <string name="track_list_pick_one">Wybierz trasę. Naciśnij i przytrzymaj, aby wybrać opcje.</string>
+  <string name="track_list_save_sd">Zapisz na karcie SD...</string>
+  <string name="track_list_send_google">Wyślij do Google...</string>
+  <string name="track_list_share_track">Podziel się z przyjaciółmi...</string>
+  <string name="track_list_show_on_map">Pokaż</string>
+  <string name="track_name_format">Trasa %d</string>
+  <string name="track_record_error">Nie można rozpocząć rejestrowania. Spróbuj ponownie.</string>
+  <string name="track_record_notification">Rejestrowanie twojej trasy...</string>
+  <string name="track_record_success">Rejestrowanie nowej trasy.</string>
+  <string name="unit_feet">st.</string>
+  <string name="unit_hour">godz.</string>
+  <string name="unit_kilometer">km</string>
+  <string name="unit_kilometer_per_hour">km/h</string>
+  <string name="unit_meter">m</string>
+  <string name="unit_mile">mi</string>
+  <string name="unit_mile_per_hour">mi/h</string>
+  <string name="unit_minute">min</string>
+  <string name="unit_minute_per_kilometer">min/km</string>
+  <string name="unit_minute_per_mile">min/mi</string>
+  <string name="voice_hour">godzina</string>
+  <string name="voice_hours">godziny</string>
+  <string name="voice_kilometer_per_hour">kilometry na godzinę</string>
+  <string name="voice_kilometers">kilometerów</string>
+  <string name="voice_mile_per_hour">mile na godzinę</string>
+  <string name="voice_miles">mil</string>
+  <string name="voice_minute">minuta</string>
+  <string name="voice_minutes">minuty</string>
+  <string name="voice_no_distance">My Tracks brak odległości</string>
+  <string name="voice_per_kilometer">na kilometr</string>
+  <string name="voice_per_mile">na milę</string>
+  <string name="voice_second">sekunda</string>
+  <string name="voice_seconds">sekundy</string>
+  <string name="voice_template">My Tracks %1$.2f %2$s w %3$s w tempie %4$s %5$s</string>
+  <string name="welcome_about">O My Tracks</string>
+  <string name="welcome_title">Witamy</string>
 </resources>
diff --git a/MyTracks/res/values-pt-rBR/arrays.xml b/MyTracks/res/values-pt-rBR/arrays.xml
deleted file mode 100644
index 60090ae40..000000000
--- a/MyTracks/res/values-pt-rBR/arrays.xml
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-  <!-- Minimum recording distance -->
-  <string-array name="min_recording_distance_options">
-    <item>1 m</item>
-    <item>2 m</item>
-    <item>3 m</item>
-    <item>4 m</item>
-    <item>5 m (recomendada)</item>
-    <item>10 m</item>
-    <item>100 m</item>
-  </string-array>
-
-  <string-array name="min_recording_distance_options_ft">
-    <item>3 pés</item>
-    <item>6 pés</item>
-    <item>10 pés</item>
-    <item>13 pés</item>
-    <item>16 pés (recomendado)</item>
-    <item>33 pés</item>
-    <item>328 pés</item>
-  </string-array>
-
-  <!-- Maximum recording distance -->
-  <string-array name="max_recording_distance_options">
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (recomendado)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>5000 m</item>
-  </string-array>
-
-  <string-array name="max_recording_distance_options_ft">
-    <item>164 pés</item>
-    <item>328 pés</item>
-    <item>656 pés (recomendado)</item>
-    <item>1640 pés</item>
-    <item>0.6 milhas</item>
-    <item>3.1 milhas</item>
-  </string-array>
-
-  <!-- Minimum recording interval -->
-  <string-array name="min_recording_interval_options">
-    <item>economia de bateria (adaptativo)</item>
-    <item>alta precisão (adaptativo)</item>
-    <item>máxima (recomendada)</item>
-    <item>2 s</item>
-    <item>3 s</item>
-    <item>4 s</item>
-    <item>5 s</item>
-    <item>10 s</item>
-    <item>20 s</item>
-    <item>30 s</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-  </string-array>
-
-  <!-- Minimum required accuracy -->
-  <string-array name="min_required_accuracy_options">
-    <item>10 m (sinal de GPS excelente)</item>
-    <item>20 m</item>
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (recomendada)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>2000 m</item>
-    <item>5000 m (sinal de GPS ruim)</item>
-  </string-array>
-
-  <string-array name="min_required_accuracy_options_ft">
-    <item>33 pés (sinal de GPS excelente)</item>
-    <item>66 pés</item>
-    <item>165 pés</item>
-    <item>328 pés</item>
-    <item>656 pés (recomendado)</item>
-    <item>1640 pés</item>
-    <item>0.6 milhas</item>
-    <item>1.2 milhas</item>
-    <item>3.1 milhas (sinal de GPS ruim)</item>
-  </string-array>
-
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Desligado</item>
-    <item>100 km</item>
-    <item>50 km</item>
-    <item>25 km</item>
-    <item>10 km</item>
-    <item>5 km</item>
-    <item>1 km</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-  <string-array name="task_frequency_options_ft">
-    <item>Desligado</item>
-    <item>100 mi</item>
-    <item>50 mi</item>
-    <item>25 mi</item>
-    <item>10 mi</item>
-    <item>5 mi</item>
-    <item>1 mi</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-
-  <!-- Other non-preference arrays -->
-  <array name="activity_types">
-    <item>desconhecido</item>
-    <item>tipo misto</item>
-    <item>outros</item>
-
-    <item>corrida</item>
-    <item>corrida na rua</item>
-    <item>corrida em pista</item>
-    <item>corrida em trilha</item>
-    <item>andar</item>
-    <item>andar rápido</item>
-    <item>caminhada</item>
-    <item>caminhada em trilhada</item>
-    <item>caminhada fora de trilha</item>
-    <item>escalada</item>
-
-    <item>ciclismo</item>
-    <item>ciclismo em estrada</item>
-    <item>mountain biking</item>
-    <item>ciclismo em pista</item>
-
-    <item>patinação</item>
-    <item>patinação inline</item>
-    <item>skate</item>
-
-    <item>andar na neve</item>
-    <item>esquiar</item>
-    <item>snow boarding</item>
-    <item>trenó</item>
-    <item>velejar no gelo</item>
-
-    <item>velejar</item>
-    <item>canoa</item>
-    <item>caiaque</item>
-    <item>remo</item>
-    <item>barco a motor</item>
-    <item>balsa</item>
-    <item>barco de controle remoto</item>
-    <item>surfe</item>
-    <item>wind surfing</item>
-    <item>kite surfing</item>
-    <item>esquii aquático</item>
-    <item>wake boarding</item>
-
-    <item>avião</item>
-    <item>hidroavião</item>
-    <item>avião comercial</item>
-    <item>helicóptero</item>
-    <item>balão de ar quente</item>
-    <item>blimp</item>
-    <item>avião de controle remoto</item>
-    <item>helicóptero de controle remoto</item>
-    <item>paraquedismo</item>
-    <item>planar</item>
-    <item>asa delta</item>
-    <item>parapente</item>
-
-    <item>conduzir</item>
-    <item>andar a cavalo</item>
-    <item>andar de mula</item>
-
-    <item>dirigir carro</item>
-    <item>dirigir ônibus</item>
-    <item>trem</item>
-    <item>motocicleta</item>
-    <item>motocross</item>
-    <item>quadriciclo</item>
-
-    <item>velejar em terra</item>
-    <item>frisbee</item>
-    <item>ultimate frisbee</item>
-  </array>
-
-  <array name="waypoint_types">
-    <item>caixa eletrônico</item>
-    <item>banco</item>
-    <item>bar</item>
-    <item>churrasco</item>
-    <item>prédio</item>
-    <item>ponto de ônibus</item>
-    <item>café</item>
-    <item>fogueira</item>
-    <item>acampamento</item>
-    <item>igreja</item>
-    <item>casa de café</item>
-    <item>loja de conveniência</item>
-    <item>água potável</item>
-    <item>deslizamento de rochas</item>
-    <item>balsa</item>
-    <item>fogueira</item>
-    <item>bombeiros</item>
-    <item>fishing</item>
-    <item>posto de gasolina</item>
-    <item>campo de golfe</item>
-    <item>supermercado</item>
-    <item>cabelereiro</item>
-    <item>cais</item>
-    <item>trilha</item>
-    <item>hotel</item>
-    <item>casa</item>
-    <item>informações</item>
-    <item>intersecção</item>
-    <item>caixa de correio</item>
-    <item>mercado</item>
-    <item>ponto de encontro</item>
-    <item>ópera</item>
-    <item>estacionamento</item>
-    <item>correio</item>
-    <item>buraco</item>
-    <item>delegacia de polícia</item>
-    <item>cruzamento com ferrovia</item>
-    <item>restaurante</item>
-    <item>shopping center</item>
-    <item>mirante</item>
-    <item>loja</item>
-    <item>piscina</item>
-    <item>telefone</item>
-    <item>teatro</item>
-    <item>banheiro</item>
-    <item>informações turísticas</item>
-    <item>túnel</item>
-    <item>árvore</item>
-    <item>cachoeira</item>
-    <item>bebedouro</item>
-    <item>ponto de passagem</item>
-  </array>
-
-</resources>
diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml
index 2efa9e137..62740a36e 100644
--- a/MyTracks/res/values-pt-rBR/strings.xml
+++ b/MyTracks/res/values-pt-rBR/strings.xml
@@ -15,316 +15,164 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Used by the Menu -->
-  <string name="start_recording">Gravar caminho</string>
-  <string name="stop_recording">Para gravação</string>
-  <string name="switch_to_sat">Modo do satélite</string>
-  <string name="switch_to_map">Modo do mapa</string>
-  <string name="mylocation">Minha Localização</string>
-  <string name="list_tracks">Caminhos</string>
-  <string name="list_markers">Marcadores</string>
-  <string name="delete_all_tracks">Apagar todos os caminhos</string>
-  <string name="settings">Configurações</string>
-  <string name="elevation">Elevação</string>
-  <string name="choose_track_message">Por favor selecione o caminho a ser visto</string>
-  <string name="current_track">Caminho atual</string>
-  <string name="current_segment">Último segmento</string>
-
-  <!-- Error messages -->
-  <string name="error_no_location_manager">Gerenciador de localização não encontrado neste dispositivo!</string>
-  <string name="error_no_gps">"Provedor de posição de GPS não encontrado neste dispositivo.</string>
-  <string name="error_sending_to_fusion_tables">Ocorreu um erro ao enviar seu caminho para o Google Fusion Tables. Por favor tente novamente mais tarde.</string>
-  <string name="error_sending_to_docs">Ocorreu um erro ao enviar seu caminho para o Google Docs. Por favor tente novamente mais tarde.</string>
-  <string name="error_unable_to_start_recording">Impossível iniciar a gravação. Tente novamente.</string>
-  <string name="error_unable_to_stop_recording">Impossível interromper a gravação. Tente novamente.</string>
-  <string name="error_import_unable_to_read_file">Impossível ler do arquivo.</string>
-  <string name="error_import_invalid_gpx_format">O arquivo não tem um formato GPX válido.</string>
-  <string name="error_import_generic">Ocorreu um erro. Por favor tente novamente.</string>
-  <string name="error_export_track_does_not_exist">Caminho não existe.</string>
-  <string name="error_import_out_of_memory">O arquivo é grande demais (deve ser menos de 500KB). Abortando.</string>
-  <string name="error_unable_to_insert_marker">Impossível inserir marcador - posição indisponível.</string>
-
-  <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Esperando por um sinal melhor do GPS.  Assegure-se de que o céu está visível.</string>
-  <string name="status_now_recording">Gravando um novo caminho.</string>
-  <string name="status_stopped_recording">Gravação interrompida.</string>
-  <string name="status_need_to_enable_gps">"Por favor pressione aqui para ir aos ajustes de segurança e localização e verifique que o GPS esteja habilitado. Pressione o botão de voltar para retornar.</string>
-  <string name="status_approximate_current_location">Nota: Uma localização aproximada, determinada por torres de telefonia celular, está sendo mostrada.</string>
-  <string name="status_no_current_location">Sua localização não pôde ser determinada.  Habilite fontes adicionais de localização (veja configurações de Segurança e Localização) e assegure-se de que o céu está visível.</string>
-  <string name="status_waypoint_inserted">Um marcador de ponto de passagem foi inserido.</string>
-  <string name="status_marker_inserted">Um marcador de estatísticas foi inserido..</string>
-
-  <!-- Progress dialog -->
-  <string name="progress_title">Por favor aguarde...</string>
-  <string name="progress_message">Enviando seu caminho ao Google.</string>
-  <string name="progress_message_reading_track">Lendo caminho...</string>
-  <string name="progress_message_preparing_track">Preparando caminho...</string>
-  <string name="progress_message_authenticating_fusion_tables">Autenticando com o Google Fusion Tables...</string>
-  <string name="progress_message_authenticating_docs">Authenticando com o Google Docs...</string>
-  <string name="progress_message_sending_docs">Enviando caminho para o Google Docs...</string>
-  <string name="progress_message_sending_fusion_tables">Enviando caminho para o Google Fusion Tables...</string>
-  <string name="progress_message_creating_fusion_table">Criando nova Fusion Table...</string>
-  <string name="progress_message_import">Importando um caminho de GPS. Isso pode demorar alguns instantes.</string>
-  <string name="progress_message_export">Salvando arquivo para o cartão SD. Isso pode demorar alguns instantes.</string>
-  <string name="progress_message_updating_track">Atualizando estatísticas do caminho...</string>
-
-  <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Você tem certeza?</string>
-  <string name="all_data_will_be_permanently_deleted">Todos os seus caminhos e marcadores serão apagados deste telefone.</string>
-  <string name="track_will_be_permanently_deleted">O caminho e todos os seus marcadores serão permanentemente apagados deste telefone.</string>
-  <string name="marker_will_be_permanently_deleted">O marcador será permanentemente apagado deste telefone.</string>
-
-  <!-- Text and links when uploading to Google My Maps -->
-  <string name="new_map_description">"Criado por My Tracks no Android.</string>
-  
-  <!-- Formatting of track and marker descriptions -->
-  <string name="points">Pontos</string>
-  <string name="recorded_date">Gravado</string>
-  <string name="category">"Tipo de atividade</string>
-  <string name="waypoint_category">"Tipo de marcador</string>
-  <string name="track_part_format">"(Parte %d)</string>
-
-  <!-- Used by the track recording service -->
-  <string name="recording_your_track">"Gravando seu caminho...</string>
-  <string name="new_track_format">"Caminho %d</string>
-
-  <!-- Common -->
-  <string name="no">Não</string>
-  <string name="yes">Sim</string>
-  <!-- KEEP_PARENT name="ok" rev="7cbb95c69f35" -->
-  <string name="error">Erro</string>
-  <string name="success">Successo</string>
-  <string name="waypoint">Ponto de passagem</string>
-  <string name="cancel">Cancelar</string>
-  <string name="save">Salvar</string>
-
-  <!-- Placemark labels for start and end of track -->
-  <string name="start">(Início)</string>
-  <string name="end">(Fim)</string>
-
-  <!--  TrackList -->
-  <string name="tracklist_show_track">Mostrar</string>
-  <string name="tracklist_send_to_fusiontables">Enviar para o Google Fusion Tables</string>
-  <string name="tracklist_send_to_new_fusiontable">Enviar para nova Google Fusion Table</string>
-  <string name="tracklist_send_to_docs">Enviar para o Google Docs</string>
-  <string name="tracklist_send_to_google">Enviar para o Google...</string>
-  <string name="tracklist_delete_track">Apagar do telefone...</string>
-  <string name="tracklist_edit_track">Editar detalhes</string>
-  <string name="tracklist_write_to_sd">Salvar no cartão SD...</string>
-  <string name="tracklist_save_as_gpx">Salvar arquivo GPX</string>
-  <string name="tracklist_save_as_kml">Salvar arquivo KML</string>
-  <string name="tracklist_btn_send_all_to_fusiontables">Enviar para o Google Fusion Tables</string>
-  <string name="tracklist_btn_delete_all">Apagar todos os caminhos</string>
-  <string name="tracklist_pick_one">Escolha um caminho. Pressione&amp;segure para mais opções.</string>
-  <string name="tracklist_all_tracks">Todos os Caminhos:</string>
-  <string name="tracklist_this_track">Este Caminho</string>
-  <string name="tracklist_share_track">Compartilhar com amigos...</string>
-  <string name="tracklist_share_link">Um link para a mapa</string>
-  <string name="tracklist_share_gpx_file">Um arquivo GPX</string>
-  <string name="tracklist_share_kml_file">Um arquivo KML</string>
-  <string name="tracklist_clear_map">Limpar mapa</string>
-
-  <!-- Waypoints list -->
-  <string name="waypointslist_btn_delete_all">Apagar todos os marcadores</string>
-  <string name="waypointslist_this_waypoint">Este Marcador</string>
-  <string name="waypointslist_delete_waypoint">Apagar</string>
-  <string name="waypointslist_edit_waypoint">Editar detalhes</string>
-  <string name="waypointslist_show_waypoint">Mostrar no mapa</string>
-  <string name="waypointslist_btn_insert_waypoint">Inserir ponto no caminho</string>
-  <string name="waypointslist_btn_insert_statistics">Inserir estatísticas</string>
-  <string name="waypointslist_pick_one">Escolha um marcador.  Pressione&amp;segure para mais opções.</string>
-
-  <!-- MyTracks Details -->
-  <string name="trackdetails_title">Detalhes do Caminho</string>
-  <string name="trackdetails_name">Nome do Caminho</string>
-  <string name="trackdetails_name_hint">Nome do Caminho</string>
-  <string name="trackdetails_description">Descrição do Caminho</string>
-  <string name="trackdetails_description_hint">Descrição do Caminho</string>
-  <string name="trackdetails_category">Tipo de Atividade (por ex. caminhada, ciclismo, escalada...)</string>
-  <string name="trackdetails_category_hint">Tipo de Atividade</string>
-
-  <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Detalhes do Marcador</string>
-  <string name="waypointdetails_name">Nome do Marcador</string>
-  <string name="waypointdetails_name_hint">Nome do Marcador</string>
-  <string name="waypointdetails_description">Descrição do Marcador</string>
-  <string name="waypointdetails_description_hint">Descrição do Marcador</string>
-  <string name="waypointdetails_category">Tipo do Marcador (por ex. Prédio, Mirante, Cachoeira...)</string>
-  <string name="waypointdetails_category_hint">Tipo do Marcador</string>
-
-  <!-- MyTracks Settings -->
-  <string name="settings_title">Configurações do My Tracks</string>
-  <string name="settings_display">Exibição</string>
-  <string name="settings_recording">Gravação</string>
-  <string name="settings_sharing">Compartilhamento</string>
-  <string name="settings_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>
-  <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_metric_units">Unidades métricas</string>
-  <string name="settings_metric_units_summary_on">Todas as distâncias serão exibidas em unidades métricas</string>
-  <string name="settings_metric_units_summary_off">Todas as distâncias serão exibidas em unidades imperiais</string>
-  <string name="settings_map_public">Tornar mapas públicos</string>
-  <string name="settings_map_public_summary_on">Os mapas enviados ao maps.google.com serão visíveis por qualquer pessoa</string>
-  <string name="settings_map_public_summary_off">Os mapas enviados ao maps.google.com não serão listados publicamente</string>
-  <string name="settings_report_speed_or_pace">Exibir velocidade</string>
-  <string name="settings_report_speed_or_pace_summary_on">A velocidade será exibida</string>
-  <string name="settings_report_speed_or_pace_summary_off">O passo será exibido</string>
-  <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="pace_label">Passo</string>
-
-  <!-- MyTracksSky -->
-  <string name="mytracks_sky">Satélites de GPS</string>
-
-  <!-- Sharing -->
-  <string name="share_map_subject">Eu gostaria de compartilhar um mapa com você</string>
-  <string name="share_track_url_body_format">Eu acredito que você pode se interessar por este mapa:
-
-      %s</string>
-  <string name="share_track_subject">Eu gostaria de compartilhar um caminho com você</string>
-  <string name="share_track_file_body_format">Eu acredito que você pode se interesasr por este caminho.
-
-    Para visualizar este caminho, use o Google Earth ou outro software de mapas.</string>
-  <string name="share_track_url">Compartilhar caminho com amigos</string>
-
-  <!-- Visibility -->
-  <string name="public_map">Público</string>
-  <string name="unlisted_map">Não listado</string>
-  <string name="mapslist_no_maps_available">Você ainda não tem nenhum mapa.</string>
-
-  <!-- Statistics View -->
-  <!-- Average Moving -->
-  <string name="average_moving_speed_label">Velocidade Méd. em Movimento</string>
-  <string name="average_moving_pace_label">Passo Médio em Movimento</string>
-
-  <!-- Average -->
-  <string name="average_speed_label">Velocidade Média</string>
-  <string name="average_pace_label">Passo Médio</string>
-
-  <!-- Min -->
-  <string name="elevation_chart_name">Carta de elevação</string>
-  <string name="elevation_gain_label">Ganho de elevação</string>
-  <string name="elevation_label">Elevação</string>
-
-  <!-- Max -->
-  <string name="min_elevation_label">Elevação Mínima</string>
-  <string name="min_grade_label">Subida mínima</string>
-  <string name="min_pace_label">Passo Mínimo</string>
-
-  <string name="max_elevation_label">Elevação Máxima</string>
-   <string name="max_grade_label">Subida máxima</string>
-  <string name="max_speed_label">Velocidade Máxima</string>
-
-  <string name="loading_track">Carregando caminho...</string>
-
-  <!-- Chart Settings -->
-  <string name="chart_settings">Configurações do gráfico</string>
-  <!-- X Axis -->
-  <string name="x_axis">Eixo X</string>
-  <string name="by_distance">Por Distância</string>
-  <string name="by_time">Por Tempo</string>
-
-  <!-- Y Axis -->
-  <string name="y_axis">Eixo Y</string>
-
-  <!-- Units -->
-  <!-- Time -->
-  <string name="voice_hour">hora</string>
-  <string name="voice_hours">horas</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="unit_feet">pés</string>
-  <string name="voice_kilometers">kilômetros</string>
-  <string name="voice_miles">milhas</string>
-
-  <!-- Speed and Pace -->
-  <string name="voice_kilometer_per_hour">kilômetros por hora</string>
-  <string name="voice_per_kilometer">por kilômetro</string>
-  <string name="voice_mile_per_hour">milhas por hora</string>
-  <string name="voice_per_mile">por milha</string>
-
-  <!-- Stats Labels -->
-  <string name="moving_time_label">Tempo em Movimento</string>
-  <string name="total_time_label">Tempo Total</string>
-  <string name="time_label">Tempo</string>
-  <string name="sd_unavail">SD não disponível</string>
-  <string name="speed">Velocidade</string>
-  <string name="start_trip">Você deve começar uma viagem.</string>
-  <string name="statistics">Estatísticas</string>
-  <string name="total_distance_label">Distância Total</string>
-  <string name="distance_label">Distância</string>
-  <string name="unknown">-</string>
-  <string name="waiting">Aguardando...</string>
-
-  <!-- End User License Agreement -->
-  <string name="eula_title">Contrato de Licença de Usuário Final</string>
-  <string name="accept">Aceitar</string>
-  <string name="decline">Recusar</string>
-
-  <!-- About -->
-  <string name="about">Sobre</string>
-  <string name="help">Ajuda</string>
+  <string name="about_support">Suporte:</string>
   <string name="about_team">Equipe:</string>
   <string name="about_version">Versão:</string>
-  <string name="about_support">Suporte:</string>
-
-  <!-- Send to Google -->
-  <string name="sendtogoogle_title">Enviar para...</string>
-  <string name="sendtogoogle_google_docs">Google Docs</string>
-  <string name="sendtogoogle_send_now">Enviar agora</string>
-  <string name="sendtogoogle_send_stats">Enviar estatísticas do caminho</string>
-  <string name="sendtogoogle_send_stats_and_points">Enviar estatísticas e pontos</string>
-
-  <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Nenhuma conta encontrada</string>
-  <string name="no_account_found">Não foi encontrada nenhuma conta para a qual trilhas possam ser enviadas.</string>
-  <string name="choose_account_title">Escolher conta</string>
-
-  <!-- SD card -->
-  <string name="io_no_external_storage_found">Nenhum armazenamento externo foi encontrado. Assegure-se de que um cartão SD esteja inserido e que seu telefone não esteja montado em um computador.</string>
-  <string name="io_write_failed">Impossível gravar arquivo.</string>
-  <string name="io_create_dir_failed">Impossível criar diretório no cartão SD.</string>
-  <string name="io_write_finished">Gravação no cartão SD concluída.</string>
-
-  <!-- VersionChecker -->
-  <string name="version_check_title">Checar Atualizações</string>
-  <string name="version_check_upgrade_button">Atualizar Agora</string>
-  <string name="version_check_continue_button">Continuar sem Atualizar</string>
-  <string name="upgrade_required">Sua versão do %1$s pode não funcionar mais corretamente, e não é mais suportada. Por favor atualize para continuar usando %1$s.</string>
-  <string name="upgrade_recommended">Sua versão do %1pode não funcionar mais corretamente. Você pode atualizar agora, ou continuar usando-a por seu próprio risco. Algumas funcionalidades como sincronização com servidores podem não funcionar até que atualize.</string>
-  <string name="upgrade_available">Uma nova versão do %1$s está disponível.  Você pode continuar a usar sua versão atual sem problemas, porém não terá acesso aos novos recursos até que atualize.</string>
-
-  <!-- Welcome -->
-  <string name="welcome">Bem-vindo</string>
+  <string name="chart_settings_by_distance">Por Distância</string>
+  <string name="chart_settings_by_time">Por Tempo</string>
+  <string name="chart_settings_x_axis">Eixo X</string>
+  <string name="chart_settings_y_axis">Eixo Y</string>
+  <string name="eula_accept">Aceitar</string>
+  <string name="eula_decline">Recusar</string>
+  <string name="eula_title">Contrato de Licença de Usuário Final</string>
+  <string name="export_progress_message">Salvando arquivo para o cartão SD. Isso pode demorar alguns instantes.</string>
+  <string name="generic_cancel">Cancelar</string>
+  <string name="generic_confirm_title">Você tem certeza?</string>
+  <string name="generic_error_title">Erro</string>
+  <string name="generic_no">Não</string>
+  <string name="generic_progress_title">Por favor aguarde...</string>
+  <string name="generic_save">Salvar</string>
+  <string name="generic_success_title">Successo</string>
+  <string name="generic_yes">Sim</string>
+  <string name="gps_need_to_enable">"Por favor pressione aqui para ir aos ajustes de segurança e localização e verifique que o GPS esteja habilitado. Pressione o botão de voltar para retornar.</string>
+  <string name="gps_not_found">"Provedor de posição de GPS não encontrado neste dispositivo.</string>
+  <string name="gps_wait_for_fix">Esperando por um sinal melhor do GPS.  Assegure-se de que o céu está visível.</string>
+  <string name="marker_detail_marker_description">Descrição do Marcador</string>
+  <string name="marker_detail_marker_name">Nome do Marcador</string>
+  <string name="marker_detail_marker_type">Tipo do Marcador (por ex. Prédio, Mirante, Cachoeira...)</string>
+  <string name="marker_detail_marker_type_hint">Tipo do Marcador</string>
+  <string name="marker_detail_title">Detalhes do Marcador</string>
+  <string name="marker_insert_error">Impossível inserir marcador - posição indisponível.</string>
+  <string name="marker_insert_success">Um marcador de estatísticas foi inserido..</string>
+  <string name="marker_label_end">(Fim)</string>
+  <string name="marker_label_start">(Início)</string>
+  <string name="marker_list_context_menu_title">Este Marcador</string>
+  <string name="marker_list_delete_marker">Apagar</string>
+  <string name="marker_list_delete_marker_confirm_message">O marcador será permanentemente apagado deste telefone.</string>
+  <string name="marker_list_edit_marker">Editar detalhes</string>
+  <string name="marker_list_insert_statistics">Inserir estatísticas</string>
+  <string name="marker_list_insert_waypoint">Inserir ponto no caminho</string>
+  <string name="marker_list_pick_one">Escolha um marcador.  Pressione&amp;segure para mais opções.</string>
+  <string name="marker_list_show_on_map">Mostrar no mapa</string>
+  <string name="marker_type_statistics">Estatísticas</string>
+  <string name="marker_type_waypoint">Ponto de passagem</string>
+  <string name="menu_chart_view_chart_settings">Configurações do gráfico</string>
+  <string name="menu_help">Ajuda</string>
+  <string name="menu_map_view_map_mode">Modo do mapa</string>
+  <string name="menu_map_view_my_location">Minha Localização</string>
+  <string name="menu_map_view_satellite_mode">Modo do satélite</string>
+  <string name="menu_markers">Marcadores</string>
+  <string name="menu_record_track">Gravar caminho</string>
+  <string name="menu_settings">Configurações</string>
+  <string name="menu_stop_recording">Para gravação</string>
+  <string name="menu_tracks">Caminhos</string>
+  <string name="my_location_approximate_location">Nota: Uma localização aproximada, determinada por torres de telefonia celular, está sendo mostrada.</string>
+  <string name="my_location_no_location">Sua localização não pôde ser determinada.  Habilite fontes adicionais de localização (veja configurações de Segurança e Localização) e assegure-se de que o céu está visível.</string>
+  <string name="my_maps_list_no_maps">Você ainda não tem nenhum mapa.</string>
+  <string name="my_maps_list_public_label">Público</string>
+  <string name="my_maps_list_unlisted_label">Não listado</string>
+  <string name="sd_card_error_create_dir">Impossível criar diretório no cartão SD.</string>
+  <string name="sd_card_error_no_storage">Nenhum armazenamento externo foi encontrado. Assegure-se de que um cartão SD esteja inserido e que seu telefone não esteja montado em um computador.</string>
+  <string name="sd_card_error_write_file">Impossível gravar arquivo.</string>
+  <string name="sd_card_success_write_file">Gravação no cartão SD concluída.</string>
+  <string name="send_google_choose_account_title">Escolher conta</string>
+  <string name="send_google_docs">Google Docs</string>
+  <string name="send_google_no_account_message">Não foi encontrada nenhuma conta para a qual trilhas possam ser enviadas.</string>
+  <string name="send_google_no_account_title">Nenhuma conta encontrada</string>
+  <string name="send_google_progress_preparing_track">Preparando caminho...</string>
+  <string name="send_google_progress_reading_track">Lendo caminho...</string>
+  <string name="send_google_recorded">Gravado</string>
+  <string name="send_google_result_share_url">Compartilhar caminho com amigos</string>
+  <string name="send_google_send_now">Enviar agora</string>
+  <string name="send_google_title">Enviar para...</string>
+  <string name="send_google_track_part_label">"(Parte %d)</string>
+  <string name="settings_display">Exibição</string>
+  <string name="settings_display_metric">Unidades métricas</string>
+  <string name="settings_display_metric_summary_off">Todas as distâncias serão exibidas em unidades imperiais</string>
+  <string name="settings_display_metric_summary_on">Todas as distâncias serão exibidas em unidades métricas</string>
+  <string name="settings_display_speed">Exibir velocidade</string>
+  <string name="settings_display_speed_summary_off">O passo será exibido</string>
+  <string name="settings_display_speed_summary_on">A velocidade será exibida</string>
+  <string name="settings_not_while_recording">Não disponível durante a gravação de uma trilha</string>
+  <string name="settings_recording">Gravação</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_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_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_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="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_voice">Tempo entre anúncios</string>
+  <string name="settings_recording_voice_not_available">Não disponível na sua versão do Android</string>
+  <string name="settings_recording_voice_summary">Tempo mínimo entre dois anúncios de voz</string>
+  <string name="settings_sharing">Compartilhamento</string>
+  <string name="settings_sharing_map_public">Tornar mapas públicos</string>
+  <string name="settings_sharing_map_public_summary_off">Os mapas enviados ao maps.google.com não serão listados publicamente</string>
+  <string name="settings_sharing_map_public_summary_on">Os mapas enviados ao maps.google.com serão visíveis por qualquer pessoa</string>
+  <string name="settings_sharing_url_only">Compartilhar apenas URL</string>
+  <string name="settings_sharing_url_only_summary_off">O conteúdo do mapa também será incluído ao compartilhar</string>
+  <string name="settings_title">Configurações do My Tracks</string>
+  <string name="share_track_file_body_format">Eu acredito que você pode se interesasr por este caminho.\n\nPara visualizar este caminho, use o Google Earth ou outro software de mapas.</string>
+  <string name="share_track_subject">Eu gostaria de compartilhar um caminho com você</string>
+  <string name="share_track_url_body_format">Eu acredito que você pode se interessar por este mapa:\n\n%s</string>
+  <string name="stat_average_moving_pace">Passo Médio em Movimento</string>
+  <string name="stat_average_moving_speed">Velocidade Méd. em Movimento</string>
+  <string name="stat_average_pace">Passo Médio</string>
+  <string name="stat_average_speed">Velocidade Média</string>
+  <string name="stat_elevation">Elevação</string>
+  <string name="stat_elevation_gain">Ganho de elevação</string>
+  <string name="stat_max_elevation">Elevação Máxima</string>
+  <string name="stat_max_grade">Subida máxima</string>
+  <string name="stat_max_speed">Velocidade Máxima</string>
+  <string name="stat_min_elevation">Elevação Mínima</string>
+  <string name="stat_min_grade">Subida mínima</string>
+  <string name="stat_min_pace">Passo Mínimo</string>
+  <string name="stat_moving_time">Tempo em Movimento</string>
+  <string name="stat_pace">Passo</string>
+  <string name="stat_speed">Velocidade</string>
+  <string name="stat_total_distance">Distância Total</string>
+  <string name="stat_total_time">Tempo Total</string>
+  <string name="track_detail_activity_type">Tipo de Atividade (por ex. caminhada, ciclismo, escalada...)</string>
+  <string name="track_detail_activity_type_hint">Tipo de Atividade</string>
+  <string name="track_detail_title">Detalhes do Caminho</string>
+  <string name="track_detail_track_description">Descrição do Caminho</string>
+  <string name="track_detail_track_name">Nome do Caminho</string>
+  <string name="track_list_clear_map">Limpar mapa</string>
+  <string name="track_list_context_menu_title">Este Caminho</string>
+  <string name="track_list_delete_all">Apagar todos os caminhos</string>
+  <string name="track_list_delete_all_confirm_message">Todos os seus caminhos e marcadores serão apagados deste telefone.</string>
+  <string name="track_list_delete_track">Apagar do telefone...</string>
+  <string name="track_list_delete_track_confirm_message">O caminho e todos os seus marcadores serão permanentemente apagados deste telefone.</string>
+  <string name="track_list_edit_track">Editar detalhes</string>
+  <string name="track_list_pick_one">Escolha um caminho. Pressione&amp;segure para mais opções.</string>
+  <string name="track_list_save_sd">Salvar no cartão SD...</string>
+  <string name="track_list_send_google">Enviar para o Google...</string>
+  <string name="track_list_share_track">Compartilhar com amigos...</string>
+  <string name="track_list_share_url">Um link para a mapa</string>
+  <string name="track_list_show_on_map">Mostrar</string>
+  <string name="track_name_format">"Caminho %d</string>
+  <string name="track_record_error">Impossível iniciar a gravação. Tente novamente.</string>
+  <string name="track_record_notification">"Gravando seu caminho...</string>
+  <string name="track_record_success">Gravando um novo caminho.</string>
+  <string name="unit_feet">pés</string>
+  <string name="unit_hour">h</string>
+  <string name="voice_hour">hora</string>
+  <string name="voice_hours">horas</string>
+  <string name="voice_kilometer_per_hour">kilômetros por hora</string>
+  <string name="voice_kilometers">kilômetros</string>
+  <string name="voice_mile_per_hour">milhas por hora</string>
+  <string name="voice_miles">milhas</string>
+  <string name="voice_minute">minuto</string>
+  <string name="voice_minutes">minutos</string>
+  <string name="voice_no_distance">My Tracks sem distância</string>
+  <string name="voice_per_kilometer">por kilômetro</string>
+  <string name="voice_per_mile">por milha</string>
+  <string name="voice_second">segundo</string>
+  <string name="voice_seconds">segundos</string>
+  <string name="voice_template">My Tracks %1$.2f %2$s em %3$s a %4$s %5$s</string>
   <string name="welcome_about">Sobre My Tracks</string>
-
-  <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks sem distância</string>
-  <!-- Format:
-  $1 : Distance label
-  $2 : Distance value (5)
-  $3 : Distance units (mi, km)
-  $4 : Time description (10 minutes 5 seconds)
-  $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
-  $6 : Speed units (mph) : Pace units (per mile)
-  -->
-  <string name="announce_template">My Tracks %1$s %2$.2f %3$s em %4$s a %5$s %6$s</string>
-
+  <string name="welcome_title">Bem-vindo</string>
 </resources>
diff --git a/MyTracks/res/values-ru/arrays.xml b/MyTracks/res/values-ru/arrays.xml
deleted file mode 100755
index e8cf89568..000000000
--- a/MyTracks/res/values-ru/arrays.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-  <!-- Minimum recording distance -->
-  <string-array name="min_recording_distance_options">
-    <item>1 м</item>
-    <item>2 м</item>
-    <item>3 м</item>
-    <item>4 м</item>
-    <item>5 м (рекомендуется)</item>
-    <item>10 м</item>
-    <item>100 м</item>
-  </string-array>
-
-  <string-array name="min_recording_distance_options_ft">
-    <item>3 фута</item>
-    <item>6 футов</item>
-    <item>10 футов</item>
-    <item>13 футов</item>
-    <item>16 футов (рекомендуется)</item>
-    <item>33 фута</item>
-    <item>328 футов</item>
-  </string-array>
-
-  <!-- Maximum recording distance -->
-  <string-array name="max_recording_distance_options">
-    <item>50 м</item>
-    <item>100 м</item>
-    <item>200 м (рекомендуется)</item>
-    <item>500 м</item>
-    <item>1000 м</item>
-    <item>5000 м</item>
-  </string-array>
-
-  <string-array name="max_recording_distance_options_ft">
-    <item>164 фута</item>
-    <item>328 футов</item>
-    <item>656 фута (рекомендуется)</item>
-    <item>1640 футов</item>
-    <item>0,6 мили</item>
-    <item>3,1 мили</item>
-  </string-array>
-
-  <!-- Minimum recording interval -->
-  <string-array name="min_recording_interval_options">
-    <item>экономия батареи (адаптивная)</item>
-    <item>высокая точность (адаптивная)</item>
-    <item>высочайшая точность (рекомендуется)</item>
-    <item>2 с</item>
-    <item>3 с</item>
-    <item>4 с</item>
-    <item>5 с</item>
-    <item>10 с</item>
-    <item>20 с</item>
-    <item>30 с</item>
-    <item>1 мин</item>
-    <item>2 мин</item>
-    <item>5 мин</item>
-    <item>10 мин</item>
-    <item>15 мин</item>
-    <item>30 мин</item>
-  </string-array>
-
-  <!-- Minimum required accuracy -->
-  <string-array name="min_required_accuracy_options">
-    <item>10 м (отличный сигнал GPS)</item>
-    <item>20 м</item>
-    <item>50 м</item>
-    <item>100 м</item>
-    <item>200 м (рекомендуется)</item>
-    <item>500 м</item>
-    <item>1000 м</item>
-    <item>2000 м</item>
-    <item>5000 м (плохой сигнал GPS)</item>
-  </string-array>
-
-  <string-array name="min_required_accuracy_options_ft">
-    <item>33 фута (отличный сигнал GPS)</item>
-    <item>66 футов</item>
-    <item>165 футов</item>
-    <item>328 футов</item>
-    <item>656 футов (рекомендуется)</item>
-    <item>1640 футов</item>
-    <item>0,6 мили</item>
-    <item>1,2 мили</item>
-    <item>3,1 мили (плохой сигнал GPS)</item>
-  </string-array>
-
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Выкл.</item>
-    <item>100 км</item>
-    <item>50 км</item>
-    <item>25 км</item>
-    <item>10 км</item>
-    <item>5 км</item>
-    <item>1 км</item>
-    <item>60 мин</item>
-    <item>30 мин</item>
-    <item>15 мин</item>
-    <item>10 мин</item>
-    <item>5 мин</item>
-    <item>2 мин</item>
-    <item>1 мин</item>
-  </string-array>
-
-  <string-array name="task_frequency_options_ft">
-    <item>Выкл.</item>
-    <item>100 миль</item>
-    <item>50 миль</item>
-    <item>25 миль</item>
-    <item>10 миль</item>
-    <item>5 миль</item>
-    <item>1 миля</item>
-    <item>60 мин</item>
-    <item>30 мин</item>
-    <item>15 мин</item>
-    <item>10 мин</item>
-    <item>5 мин</item>
-    <item>2 мин</item>
-    <item>1 мин</item>
-  </string-array>
-
-  <!-- Auto-resume track timeout -->
-  <string-array name="auto_resume_track_timeout_options">
-    <item>Никогда</item>
-    <item>5 мин</item>
-    <item>10 мин</item>
-    <item>15 мин</item>
-    <item>Всегда</item>
-  </string-array>
-
-  <!-- Other non-preference arrays -->
-  <array name="activity_types">
-    <item>не определен</item>
-    <item>смешанного типа</item>
-    <item>другое</item>
-
-    <item>бег</item>
-    <item>бег по улице</item>
-    <item>бег по треку</item>
-    <item>бег по тропе</item>
-    <item>ходьба</item>
-    <item>быстрая ходьба</item>
-    <item>пешая прогулка</item>
-    <item>прогулка по туристической тропе</item>
-    <item>прогулка по бездорожью</item>
-    <item>восхождение</item>
-
-    <item>велосипедная прогулка</item>
-    <item>шоссейный велосипед</item>
-    <item>горный велосипед</item>
-    <item>велотрек</item>
-
-    <item>катание на коньках</item>
-    <item>катания на роликовых коньках</item>
-    <item>катания на роликовых коньках</item>
-
-    <item>прогулка на снегоступах</item>
-    <item>лыжи</item>
-    <item>сноубординг</item>
-    <item>сани</item>
-    <item>ледяной парусный спорт</item>
-
-    <item>парусный спорт</item>
-    <item>гребля</item>
-    <item>каякинг</item>
-    <item>академическая гребля</item>
-    <item>моторная лодка</item>
-    <item>паром</item>
-    <item>RC лодка</item>
-    <item>серфинг</item>
-    <item>виндсерфинг</item>
-    <item>кайтсерфинг</item>
-    <item>водные лыжи</item>
-    <item>вейкбординг</item>
-
-    <item>самолет</item>
-    <item>гидроплан</item>
-    <item>коммерческий самолет</item>
-    <item>вертолет</item>
-    <item>воздушный шар</item>
-    <item>дирижабль</item>
-    <item>RC самолет</item>
-    <item>RC вертолет</item>
-    <item>прыжки</item>
-    <item>планеризм</item>
-    <item>дельтаплан</item>
-    <item>парный планеризм</item>
-
-    <item>верховая езда</item>
-    <item>катание на лошадях</item>
-    <item>прогулка на осле</item>
-
-    <item>вождение автомобиля</item>
-    <item>вождение автобуса</item>
-    <item>поезд</item>
-    <item>мотоцикл</item>
-    <item>Байк</item>
-    <item>ATV</item>
-
-    <item>парусный спорт на земле</item>
-    <item>фрисби</item>
-    <item>алтимат фризби</item>
-  </array>
-
-  <array name="waypoint_types">
-    <item>банкомат</item>
-    <item>банк</item>
-    <item>бар</item>
-    <item>барбекю</item>
-    <item>здание</item>
-    <item>автобусная остановка</item>
-    <item>кафе</item>
-    <item>костер</item>
-    <item>лагерь</item>
-    <item>церковь</item>
-    <item>кофейня</item>
-    <item>удобный магазин</item>
-    <item>питьевая вода</item>
-    <item>оползень</item>
-    <item>паром</item>
-    <item>камин</item>
-    <item>пожарная станция</item>
-    <item>рыболовство</item>
-    <item>автозаправочная станция</item>
-    <item>поле для гольфа</item>
-    <item>продуктовый магазин</item>
-    <item>парикмахерская</item>
-    <item>гавань</item>
-    <item>тропа</item>
-    <item>отель</item>
-    <item>дом</item>
-    <item>информация</item>
-    <item>пересечение</item>
-    <item>почтовый ящик</item>
-    <item>рынок</item>
-    <item>место встречи</item>
-    <item>опера</item>
-    <item>парковка</item>
-    <item>почтовое отделение</item>
-    <item>выбоина</item>
-    <item>полицейский участок</item>
-    <item>железнодорожный переезд</item>
-    <item>ресторан</item>
-    <item>покупки</item>
-    <item>вид</item>
-    <item>магазин</item>
-    <item>бассейн</item>
-    <item>телефон</item>
-    <item>театр</item>
-    <item>туалет</item>
-    <item>туристическая информация</item>
-    <item>туннель</item>
-    <item>дерево</item>
-    <item>водопад</item>
-    <item>фонтан</item>
-    <item>путевая точка</item>
-  </array>
-
-</resources>
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index 9aa6ef319..186f57e87 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -15,488 +15,251 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Used by the Menu -->
-  <string name="start_recording">Запись трека</string>
-  <string name="stop_recording">Остановить запись</string>
-  <string name="switch_to_sat">Режим спутника</string>
-  <string name="switch_to_map">Режим карты</string>
-  <string name="mylocation">Мое местоположение</string>
-  <string name="list_tracks">Треки</string>
-  <string name="list_markers">Маркеры</string>
-  <string name="delete_all_tracks">Удалить все треки</string>
-  <string name="settings">Настройки</string>
-  <string name="elevation">Высота</string>
-  <string name="choose_track_message">Пожалуйста, выберите трек для просмотра</string>
-  <string name="current_track">Текущий трек</string>
-  <string name="current_segment">Последний сегмент</string>
-  <string name="sensor_state">Состояние датчика</string>
-  <string name="aggregated_stats">Совокупная статистика</string>
-
-  <!-- Error messages -->
-  <string name="error_no_location_manager">На этом устройстве не был обнаружен диспетчер местоположения!</string>
-  <string name="error_no_gps">На этом устройстве не был обнаружен поставщик GPS местоположения.</string>
-  <string name="error_sending_to_my_maps">Ошибка при отправке вашего трека в Google \"Мои карты\".</string>
-  <string name="error_sending_to_fusion_tables">Ошибка при отправке вашего трека в Google Fusion Tables.</string>
-  <string name="error_sending_to_docs">Ошибка при отправке вашего трека в Google Документы.</string>
-  <string name="error_sending_generic">Пожалуйста, повторите попытку позже.</string>
-  <string name="error_unable_to_start_recording">Не удалось начать запись. Попробуйте еще раз.</string>
-  <string name="error_unable_to_stop_recording">Не удалось остановить запись. Попробуйте еще раз.</string>
-  <string name="error_import_unable_to_read_file">Не удалось прочитать из файла.</string>
-  <string name="error_import_invalid_gpx_format">Неверный формат GPX файла.</string>
-  <string name="error_import_generic">Произошла ошибка. Пожалуйста, попробуйте еще раз.</string>
-  <string name="error_export_track_does_not_exist">Трек не существует.</string>
-  <string name="error_import_out_of_memory">Этот файл слишком большой (должен быть меньше, чем 500 КБ). Прервано.</string>
-  <string name="error_unable_to_insert_marker">Невозможно вставить маркер. Местоположение неизвестно.</string>
-
-  <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Ожидание сигнала GPS. Убедитесь в том, что вы находитесь под открытым небом.</string>
-  <string name="status_now_recording">Записывается новый трек.</string>
-  <string name="status_stopped_recording">Запись вашего трека остановлена.</string>
-  <string name="sending_to_google_additional_info">Это может занять несколько минут, прежде чем появятся новые треки.</string>
-  <string name="status_need_to_enable_gps">Пожалуйста, нажмите здесь для перехода к разделу настроек Координаты и отметьте пункт \"Спутники GPS\". Для возвращения нажмите кнопку Назад.</string>
-  <string name="status_approximate_current_location">Примечание: приблизительное местоположение определено относительно вышек сотовой связи и беспроводных сетей.</string>
-  <string name="status_no_current_location">В настоящее время местоположение не может быть определено. Включите больше источников местоположение (см. раздел настроек Координаты) и убедитесь в том, что находитесь под открытым небом. Повторите попытку позднее.</string>
-  <string name="status_waypoint_inserted">Маркер путевой точки был вставлен.</string>
-  <string name="status_marker_inserted">Маркер статистики был вставлен.</string>
-  <string name="sending_to_google_upload_status">Статус загрузки:</string>
-
-  <!-- Progress dialog -->
-  <string name="progress_title">Пожалуйста, подождите...</string>
-  <string name="progress_message">Отправка вашего трека в Google.</string>
-  <string name="progress_message_reading_track">Чтение трека...</string>
-  <string name="progress_message_preparing_track">Подготовка трека...</string>
-  <string name="progress_message_authenticating_fusion_tables">Аутентификация на Google Fusion Tables...</string>
-  <string name="progress_message_authenticating_my_maps">Аутентификация на Google Карты...</string>
-  <string name="progress_message_authenticating_docs">Аутентификация в Google Документы...</string>
-  <string name="progress_message_sending_docs">Отправка трека в Google Документы...</string>
-  <string name="progress_message_sending_my_maps">Отправка трека в Google Карты...</string>
-  <string name="progress_message_creating_map">Создание новой \"Моей карты\" ...</string>
-  <string name="progress_message_sending_fusion_tables">Отправка трека в Fusion Tables...</string>
-  <string name="progress_message_creating_fusion_table">Создание новой Fusion table...</string>
-  <string name="progress_message_import">Импорт GPS трека. Это может занять некоторое время.</string>
-  <string name="progress_message_export">Запись файла на SD карту. Это может занять некоторое время.</string>
-  <string name="progress_message_updating_track">Обновление статистики трека...</string>
-
-  <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Вы уверены?</string>
-  <string name="all_data_will_be_permanently_deleted">Все треки и маркеры будут удалены с этого телефона.</string>
-  <string name="track_will_be_permanently_deleted">Трек и его маркеры будут удалены из этого телефона.</string>
-  <string name="marker_will_be_permanently_deleted">Маркер будет удален с этого телефона.</string>
-
-  <!-- Text and links when uploading to Google Fusion Tables -->
-  <string name="new_map_description">Создано My Tracks на Android.</string>
-  
-  <!-- Text and links when uploading to Google My Maps -->
-  <string name="my_map_link">Создано &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; на Android.</string>
-  <string name="new_map_title">Новая карта</string>
-
-  <!-- Formatting of track and marker descriptions -->
-  <string name="points">Точки</string>
-  <string name="recorded_date">Записан</string>
-  <string name="category">Тип деятельности</string>
-  <string name="waypoint_category">Тип маркера</string>
-  <string name="track_part_format">(Часть %d)</string>
-
-  <!-- Used by the track recording service -->
-  <string name="recording_your_track">Запись трека...</string>
-  <string name="new_track_format">Трек %d</string>
-
-  <!-- Common -->
-  <string name="no">Нет</string>
-  <string name="yes">Да</string>
-  <string name="ok">ОК</string>
-  <string name="error">Ошибка</string>
-  <string name="success">Готово</string>
-  <string name="waypoint">Путевая точка</string>
-  <string name="license">Лицензия</string>
-  <string name="cancel">Отмена</string>
-  <string name="save">Сохранить</string>
-
-  <!-- Placemark labels for start and end of track -->
-  <string name="start">(Старт)</string>
-  <string name="end">(Конец)</string>
-
-  <!--  TrackList -->
-  <string name="tracklist_show_track">Показать</string>
-  <string name="tracklist_send_to_mymaps">Отправить в Google \"Мои карты\"</string>
-  <string name="tracklist_send_to_new_mymap">Отправить в новый Google \"Мои карты\"</string>
-  <string name="tracklist_send_to_fusiontables">Отправить в Google Fusion Tables</string>
-  <string name="tracklist_send_to_new_fusiontable">Отправить в новую Google Fusion Table</string>
-  <string name="tracklist_send_to_docs">Отправить в Google Документы</string>
-  <string name="tracklist_send_to_google">Отправить в Google ...</string>
-  <string name="tracklist_delete_track">Удалить из телефона...</string>
-  <string name="tracklist_edit_track">Править детали</string>
-  <string name="tracklist_write_to_sd">Записать на SD карту...</string>
-  <string name="tracklist_save_as_gpx">Сохранить файл GPX</string>
-  <string name="tracklist_save_as_kml">Сохранить файл KML</string>
-  <string name="tracklist_save_as_csv">Сохранить файл CSV</string>
-  <string name="tracklist_save_as_tcx">Сохранить файл TCX</string>
-  <string name="tracklist_btn_send_all_to_fusiontables">Отправить в Google Fusion Tables</string>
-  <string name="tracklist_btn_send_all_to_mymaps">Отправить в Google \"Мои карты\"</string>
-  <string name="tracklist_btn_delete_all">Удалить все</string>
-  <!-- Export All -->
-  <string name="tracklist_btn_export_all">Экспорт всех</string>
-  <string name="export_done">Экспорт закончен</string>
-  <string name="tracklist_pick_one">Выберите трек. Нажмите и удерживайте для получения дополнительных возможностей.</string>
-  <string name="tracklist_all_tracks">Все треки:</string>
-  <string name="tracklist_this_track">Этот трек</string>
-  <string name="tracklist_share_track">Поделиться с друзьями...</string>
-  <string name="tracklist_share_link">Ссылка на карту</string>
-  <string name="tracklist_share_gpx_file">Файл GPX</string>
-  <string name="tracklist_share_kml_file">Файл KML</string>
-  <string name="tracklist_share_csv_file">Файла CSV</string>
-  <string name="tracklist_share_tcx_file">Файл TCX</string>
-  <string name="tracklist_clear_map">Очистить карту</string>
-  <!-- Import All -->
-  <string name="tracklist_btn_import_all">Импорт всех</string>
-  <!-- Format:
-  $1 : Successful imports
-  $2 : Attempted imports
-  $3 : MyTracks gpx path
-  -->
-  <string name="import_multi_done">Импортировано %1$d из %2$d GPX файлов с %3$s</string>
-  <string name="import_multi_empty">GPX файлы не найденны в %s. Возможно не читается SD-карта или каталог не содержит GPX файлы.</string>
-  <string name="import_error">Ошибка импорта файла %s</string>
-
-  <!-- Waypoints list -->
-  <string name="waypointslist_btn_delete_all">Удалить все маркеры</string>
-  <string name="waypointslist_this_waypoint">Этот маркер</string>
-  <string name="waypointslist_delete_waypoint">Удалить</string>
-  <string name="waypointslist_edit_waypoint">Править детали</string>
-  <string name="waypointslist_show_waypoint">Показать на карте</string>
-  <string name="waypointslist_btn_insert_waypoint">Вставить путевую точку</string>
-  <string name="waypointslist_btn_insert_statistics">Вставить статистику</string>
-  <string name="waypointslist_pick_one">Выберите маркер. Нажмите и удерживайте для получения дополнительных возможностей.</string>
-
-  <!-- MyTracks Details -->
-  <string name="trackdetails_title">Трек детали</string>
-  <string name="trackdetails_name">Название трека</string>
-  <string name="trackdetails_name_hint">Название трека</string>
-  <string name="trackdetails_description">Описание трека</string>
-  <string name="trackdetails_description_hint">Описание трека</string>
-  <string name="trackdetails_category">Тип деятельности (например: пешая прогулка, велосипедная прогулка, бег, восхождение...)</string>
-  <string name="trackdetails_category_hint">Тип деятельности</string>
-
-  <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Маркер детали</string>
-  <string name="waypointdetails_name">Имя маркера</string>
-  <string name="waypointdetails_name_hint">Имя маркера</string>
-  <string name="waypointdetails_description">Описание маркера</string>
-  <string name="waypointdetails_description_hint">Описание маркера</string>
-  <string name="waypointdetails_category">Тип маркера (например: здание, выбоина, достопримечательность...)</string>
-  <string name="waypointdetails_category_hint">Тип маркера</string>
-
-  <!-- MyTracks Settings -->
-  <string name="settings_title">Настройки My Tracks</string>
-  <string name="settings_display">Отображение</string>
-  <string name="settings_recording">Запись</string>
-  <string name="settings_sharing">Обмен</string>
-
-  <string name="settings_announcement_frequency_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_min_recording_distance">Минимальное расстояние между точками</string>
-  <string name="settings_min_recording_distance_summary">Наименьшее расстояние между двумя записями вашей позиции</string>
-
-  <string name="settings_max_recording_distance">Максимальное расстояние между точками</string>
-  <string name="settings_max_recording_distance_summary">Если два пункта находятся дальше, чем указано, то трек будет разделен</string>
-
-  <string name="settings_min_recording_interval">Минимальное время между точками</string>
-  <string name="settings_min_recording_interval_summary">Наименьший интервал времени между двумя записями вашей позиции</string>
-
-  <string name="settings_min_required_accuracy">Минимальная точность</string>
-  <string name="settings_min_required_accuracy_summary">Запись будет приостановлена, если ваша позиция не является достаточно точной</string>
-
-  <string name="settings_metric_units">Использовать метрические единицы</string>
-  <string name="settings_metric_units_summary_on">Все расстояния будут отображаться в метрических единицах</string>
-  <string name="settings_metric_units_summary_off">Все расстояния будут отображаться в имперских единицах</string>
-
-  <string name="settings_map_public">Обнародовать карты</string>
-  <string name="settings_map_public_summary_on">Загруженные карты будут общедоступны на maps.google.com</string>
-  <string name="settings_map_public_summary_off">Загруженные карты не будут перечислены публично на maps.google.com</string>
-
-  <string name="settings_report_speed_or_pace">Отображать скорость</string>
-  <string name="settings_report_speed_or_pace_summary_on">Скорость будет отображаться</string>
-  <string name="settings_report_speed_or_pace_summary_off">Темп будет отображаться</string>
-
-  <string name="settings_share_url_only">Поделиться только URL</string>
-  <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_auto_resume_track_timeout">Автоматическое возобновление трек тайм-аут</string>
-  <string name="settings_auto_resume_track_timeout_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_reset">Восстановить значения по умолчанию</string>
-  <string name="settings_reset_summary">Восстановить значения по умолчанию во всех настройках</string>
-  <string name="settings_reset_dialog_message">Все ваши настройки будут стерты и восстановлены значения по умолчанию. Записанные треки будут сохранены. Вы уверены?</string>
-  <string name="settings_reset_done">Все настройки были возвращены к значениям по умолчанию.</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_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_modular_stats_display_title">Отображение модульной статистики</string>
-
-  <!-- Backups -->
-  <string name="settings_backup">Резервное копирование (BETA)</string>
-  <string name="settings_sd_backup">Резервное копирование SD карты</string>
-  <string name="settings_backup_to_sd">Резервировать</string>
-  <string name="settings_backup_to_sd_summary">Создать полную копию всех ваших треков и настроек на SD карту</string>
-  <string name="settings_restore_from_sd">Восстановить</string>
-  <string name="settings_restore_from_sd_summary">Восстановить все треки и параметры с SD карты</string>
-
-  <string name="restore_overwrites_warning">Восстановление резервной копии с SD карты ПЕРЕЗАПИШЕТ все текущие треки и настройки. Вы уверены?</string>
-  <string name="select_backup_to_restore">Выберите резервную копию для восстановления</string>
-  <string name="no_backups">Резервные копии не найдены.</string>
-  <string name="backup_write_progress_message">Запись на SD-карту всех треков и настроек. Это может занять некоторое время...</string>
-  <string name="backup_import_progress_message">Чтение всех треков и настроек с SD-карты. Это может занять некоторое время...</string>
-
-  <!-- MyTracksSky -->
-  <string name="mytracks_sky">Спутники GPS</string>
-
-  <!-- My Maps -->
-  <string name="select_map_message">Выберите карту из вашей учетной записи:</string>
-  <string name="create_new_map">Создать новую карту...</string>
-  <string name="map_list_title">Отправить в Google \"Мои карты\"</string>
-  <string name="maps_list_loading">Загрузка карты ...</string>
-  <string name="maps_list_failed">Ваши карты не могут быть загружены в данный момент!</string>
-  <string name="open_map">Выберите эту карту</string>
-  <string name="edit_map_details">Править детали карты</string>
-  <string name="share_track_url">Поделиться треком</string>
-  <string name="delete_map">Удалить Карту из вашей учетной записи</string>
-  <string name="map_title">Название карты:</string>
-  <string name="map_description">Описание карты:</string>
-  <string name="map_searchable_edit">Сделать чтобы карта и ее содержимое отображались в результатах поиска</string>
-  <string name="map_not_searchable_edit">Не позволить этой карте или ее содержимому отображаться в результатах поиска, хотя они все еще могут просматриваться другими через прямой URL-адрес</string>
-  <string name="map_searchable">Эта карта и ее содержимое будут отображаться в результатах поиска</string>
-  <string name="map_not_searchable">Ни эта карта, ни ее содержимое не будут отображаться в результатах поиска, но их могут по-прежнему просматривать другие через прямую ссылку</string>
-
-  <!-- Sharing -->
-  <string name="share_track_picker_title">Поделиться картой с друзьями</string>
-  <string name="share_map_subject">Я хотел бы поделиться с вами треком</string>
-  <string name="share_track_url_body_format">Я думаю, вы можете быть заинтересованы в этом треке:
-
-%s</string>
-  <string name="share_track_subject">Я хотел бы поделиться с вами треком</string>
-  <string name="share_track_file_body_format">Я думаю, вы можете быть заинтересованы в этом треке.
-
-Просмотреть трек можно с помощью Google Планета Земля или другого программного обоспечения для карт.</string>
-
-  <!-- Visibility -->
-  <string name="public_map">Общественные</string>
-  <string name="unlisted_map">Частные</string>
-  <string name="mapslist_no_maps_available">У вас пока еще нет карт.</string>
-
-  <!-- Statistics View -->
-  <!-- Average Moving -->
-  <string name="average_moving_speed_label">Средняя скорость движения</string>
-  <string name="average_moving_pace_label">Средний темп движения</string>
-
-  <!-- Average -->
-  <string name="average_speed_label">Средняя скорость</string>
-  <string name="average_pace_label">Средний темп</string>
-
-  <string name="elevation_chart_name">Диаграмма высоты</string>
-  <string name="elevation_gain_label">Набор высоты</string>
-  <string name="elevation_label">Высота</string>
-  <string name="latitude_label">Широта</string>
-  <string name="longitude_label">Долгота</string>
-
-  <!-- Min -->
-  <string name="min_elevation_label">Минимальная высота</string>
-  <string name="min_grade_label">Минимальный уклон</string>
-  <string name="min_pace_label">Минимальный темп</string>
-
-  <!-- Max -->
-  <string name="max_elevation_label">Максимальная высота</string>
-  <string name="max_grade_label">Максимальный уклон</string>
-  <string name="max_speed_label">Максимальная скорость</string>
-
-  <string name="loading_track">Загрузка трека...</string>
-
-  <!-- Chart Settings -->
-  <string name="chart_settings">Настройки диаграммы</string>
-  <!-- X Axis -->
-  <string name="x_axis">Ось X</string>
-  <string name="by_distance">По расстоянию</string>
-  <string name="by_time">По времени</string>
-
-  <!-- Y Axis -->
-  <string name="y_axis">Ось Y</string>
-
-  <!-- Units -->
-  <!-- Time  -->
-  <string name="voice_hour">час</string>
-  <string name="voice_hours">часов</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>
-  <string name="voice_seconds">секунд</string>
-  <string name="milliseconds">мс</string>
-
-  <!-- Distance -->
-  <string name="unit_meter">м</string>
-  <string name="unit_kilometer">км</string>
-  <string name="voice_kilometers">километров</string>
-  <string name="unit_feet">футов</string>
-  <string name="unit_mile">миль</string>
-  <string name="voice_miles">мили</string>
-
-  <!-- Speed and Pace -->
-  <string name="kilometer_per_hour">км/ч</string>
-  <string name="voice_kilometer_per_hour">километров в час</string>
-  <string name="min_per_kilometer">мин/км</string>
-  <string name="voice_per_kilometer">за километр</string>
-  <string name="mile_per_hour">миль/ч</string>
-  <string name="voice_mile_per_hour">миль в час</string>
-  <string name="min_per_mile">мин/миля</string>
-  <string name="voice_per_mile">за милю</string>
-
-  <!-- Sensors -->
-  <string name="watts">Вт</string>
-
-  <string name="revolutions_per_minute">об/мин</string>
-  <string name="bpm">bpm</string>
-
-  <!-- Stats Labels -->
-  <string name="moving_time_label">Время движения</string>
-  <string name="total_time_label">Общее время</string>
-  <string name="time_label">Время</string>
-  <string name="sd_unavail">SD карта недоступна</string>
-  <string name="speed">Скорость</string>
-  <string name="start_trip">Вы должны начать путешествие.</string>
-  <string name="statistics">Статистика</string>
-  <string name="total_distance_label">Общее расстояние</string>
-  <string name="distance_label">Расстояние</string>
-  <string name="power">Мощность</string>
-  <string name="cadence">Каденс</string>
-  <string name="heart_rate">Пульс</string>
-  <string name="max_heart_rate">Максимальный пульс</string>
-  <string name="unknown">-</string>
-  <string name="waiting">Ожидание...</string>
-
-  <!-- End User License Agreement -->
-  <string name="eula_title">Лицензионное соглашение</string>
-  <string name="accept">Принять</string>
-  <string name="decline">Отклонить</string>
-
-  <!-- About -->
-  <string name="about">О программе</string>
-  <string name="help">Справка</string>
+  <string name="about_license">Лицензия</string>
+  <string name="about_privacy">Приватность:</string>
+  <string name="about_support">Поддержка:</string>
   <string name="about_team">Команда:</string>
   <string name="about_version">Версия:</string>
-  <string name="about_support">Поддержка:</string>
-  <string name="about_privacy">Приватность:</string>
-
-  <!-- Send to Google -->
-  <string name="sendtogoogle_title">Отправить...</string>
-  <string name="sendtogoogle_google_fusiontables">Google Fusion Tables</string>
-  <string name="sendtogoogle_google_mymaps">Google \"Мои карты\"</string>
-  <string name="sendtogoogle_google_docs">Google Документы</string>
-  <string name="sendtogoogle_send_now">Отправить</string>
-  <string name="sendtogoogle_create_new_map">Создать новую карту</string>
-  <string name="sendtogoogle_pick_existing_map">Выбрать существующую карту</string>
-  <string name="sendtogoogle_send_stats">Отправить статистику трека</string>
-  <string name="sendtogoogle_send_stats_and_points">Отправить статистику и точки</string>
-
-  <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Учетная запись не найдена</string>
-  <string name="no_account_found">Не найдена учетная запись для загрузки треков.</string>
-  <string name="choose_account_title">Выбор учетной записи</string>
-
-  <!-- SD card -->
-  <string name="io_no_external_storage_found">Не обнаружено внешнее устройство хранения данных. Убедитесь, что SD карта вставлена, и что ваш телефон не подключен к компьютеру.</string>
-  <string name="io_write_failed">Невозможно записать файл.</string>
-  <string name="io_read_failed">Невозможно прочитать из файла.</string>
-  <string name="io_create_dir_failed">Невозможно создать папку на SD карте.</string>
-  <string name="io_write_finished">Запись на SD карту закончена.</string>
-  <string name="io_read_finished">Чтение с SD карты закончено.</string>
-
-  <!-- VersionChecker -->
-  <string name="version_check_title">Проверить обновления</string>
-  <string name="version_check_upgrade_button">Обновить сейчас</string>
-  <string name="version_check_continue_button">Продолжить без обновления</string>
-  <string name="upgrade_required">Ваша версия %1$S больше не может работать должным образом, и больше не поддерживается. Обновите %1$s для продолжения использования.</string>
-  <string name="upgrade_recommended">Ваша версия %1$S больше не может работать должным образом. Вы можете обновить ее сейчас, либо продолжать использовать ее на свой страх и риск. Некоторые функции, такие как синхронизация с сервером может не функционировать до обновления.</string>
-  <string name="upgrade_available">Доступна новая версия %1$s. Вы можете продолжать использовать текущую версию без проблем, но вы не получите новейшие функции, до тех пор, пока не обновитесь.</string>
-
-  <!-- Welcome -->
-  <string name="welcome">Добро пожаловать</string>
-  <string name="welcome_read_later">Ок</string>
-  <string name="welcome_about">О My Tracks</string>
-
-  <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks нет расстояния</string>
-  <!-- Format:
-  $1 : Distance label
-  $2 : Distance value (5)
-  $3 : Distance units (mi, km)
-  $4 : Time description (10 minutes 5 seconds)
-  $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
-  $6 : Speed units (mph) : Pace units (per mile)
-  -->
-  <string name="announce_template">Мои треки %1$s %2$.2f %3$s в %4$s на %5$s %6$s</string>
-
-  <!-- Check Units -->
-  <string name="check_units_title">Единицы измерения обратите внимание</string>
- 
-  <!-- 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="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
-  <string name="ant_options">Параметры ANT</string>
+  <string name="chart_settings_by_distance">По расстоянию</string>
+  <string name="chart_settings_by_time">По времени</string>
+  <string name="chart_settings_x_axis">Ось X</string>
+  <string name="chart_settings_y_axis">Ось Y</string>
+  <string name="eula_accept">Принять</string>
+  <string name="eula_decline">Отклонить</string>
+  <string name="eula_title">Лицензионное соглашение</string>
+  <string name="export_progress_message">Запись файла на SD карту. Это может занять некоторое время.</string>
+  <string name="export_success">Экспорт закончен</string>
+  <string name="generic_cancel">Отмена</string>
+  <string name="generic_confirm_title">Вы уверены?</string>
+  <string name="generic_error_title">Ошибка</string>
+  <string name="generic_no">Нет</string>
+  <string name="generic_ok">ОК</string>
+  <string name="generic_progress_title">Пожалуйста, подождите...</string>
+  <string name="generic_save">Сохранить</string>
+  <string name="generic_success_title">Готово</string>
+  <string name="generic_yes">Да</string>
+  <string name="gps_need_to_enable">Пожалуйста, нажмите здесь для перехода к разделу настроек Координаты и отметьте пункт \"Спутники GPS\". Для возвращения нажмите кнопку Назад.</string>
+  <string name="gps_not_found">На этом устройстве не был обнаружен поставщик GPS местоположения.</string>
+  <string name="gps_wait_for_fix">Ожидание сигнала GPS. Убедитесь в том, что вы находитесь под открытым небом.</string>
+  <string name="import_error">Ошибка импорта файла %s</string>
+  <string name="import_no_file">GPX файлы не найденны в %s. Возможно не читается SD-карта или каталог не содержит GPX файлы.</string>
+  <string name="import_success">Импортировано %1$d из %2$d GPX файлов с %3$s</string>
+  <string name="marker_detail_marker_description">Описание маркера</string>
+  <string name="marker_detail_marker_name">Имя маркера</string>
+  <string name="marker_detail_marker_type">Тип маркера (например: здание, выбоина, достопримечательность...)</string>
+  <string name="marker_detail_marker_type_hint">Тип маркера</string>
+  <string name="marker_detail_title">Маркер детали</string>
+  <string name="marker_insert_error">Невозможно вставить маркер. Местоположение неизвестно.</string>
+  <string name="marker_insert_success">Маркер статистики был вставлен.</string>
+  <string name="marker_label_end">(Конец)</string>
+  <string name="marker_label_start">(Старт)</string>
+  <string name="marker_list_context_menu_title">Этот маркер</string>
+  <string name="marker_list_delete_marker">Удалить</string>
+  <string name="marker_list_delete_marker_confirm_message">Маркер будет удален с этого телефона.</string>
+  <string name="marker_list_edit_marker">Править детали</string>
+  <string name="marker_list_insert_statistics">Вставить статистику</string>
+  <string name="marker_list_insert_waypoint">Вставить путевую точку</string>
+  <string name="marker_list_pick_one">Выберите маркер. Нажмите и удерживайте для получения дополнительных возможностей.</string>
+  <string name="marker_list_show_on_map">Показать на карте</string>
+  <string name="marker_type_statistics">Статистика</string>
+  <string name="marker_type_waypoint">Путевая точка</string>
+  <string name="menu_aggregated_statistics">Совокупная статистика</string>
+  <string name="menu_chart_view_chart_settings">Настройки диаграммы</string>
+  <string name="menu_help">Справка</string>
+  <string name="menu_map_view_map_mode">Режим карты</string>
+  <string name="menu_map_view_my_location">Мое местоположение</string>
+  <string name="menu_map_view_satellite_mode">Режим спутника</string>
+  <string name="menu_markers">Маркеры</string>
+  <string name="menu_record_track">Запись трека</string>
+  <string name="menu_sensor_state">Состояние датчика</string>
+  <string name="menu_settings">Настройки</string>
+  <string name="menu_stop_recording">Остановить запись</string>
+  <string name="menu_tracks">Треки</string>
+  <string name="my_location_approximate_location">Примечание: приблизительное местоположение определено относительно вышек сотовой связи и беспроводных сетей.</string>
+  <string name="my_location_no_location">В настоящее время местоположение не может быть определено. Включите больше источников местоположение (см. раздел настроек Координаты) и убедитесь в том, что находитесь под открытым небом. Повторите попытку позднее.</string>
+  <string name="my_maps_list_error">Ваши карты не могут быть загружены в данный момент!</string>
+  <string name="my_maps_list_loading">Загрузка карты ...</string>
+  <string name="my_maps_list_no_maps">У вас пока еще нет карт.</string>
+  <string name="my_maps_list_pick_map">Выберите карту из вашей учетной записи:</string>
+  <string name="my_maps_list_public_label">Общественные</string>
+  <string name="my_maps_list_title">Отправить в Google \"Мои карты\"</string>
+  <string name="my_maps_list_unlisted_label">Частные</string>
+  <string name="permission_notification_description">Получать уведомления, при старте или останове записи трека.</string>
+  <string name="permission_notification_label">получать уведомления о записи трека</string>
+  <string name="permission_read_description">Иметь возможность читать данные трека, такие как точки и путевые точки.</string>
+  <string name="permission_read_label">чтение записанных данных трека</string>
+  <string name="permission_write_description">Иметь возможность записать данные трека, такие как начало записи или добавление путевых точек.</string>
+  <string name="permission_write_label">запись данных трека, старт/стоп записи треков</string>
+  <string name="sd_card_error_create_dir">Невозможно создать папку на SD карте.</string>
+  <string name="sd_card_error_no_storage">Не обнаружено внешнее устройство хранения данных. Убедитесь, что SD карта вставлена, и что ваш телефон не подключен к компьютеру.</string>
+  <string name="sd_card_error_read_file">Невозможно прочитать из файла.</string>
+  <string name="sd_card_error_write_file">Невозможно записать файл.</string>
+  <string name="sd_card_success_read_file">Чтение с SD карты закончено.</string>
+  <string name="sd_card_success_write_file">Запись на SD карту закончена.</string>
+  <string name="send_google_choose_account_title">Выбор учетной записи</string>
+  <string name="send_google_docs">Google Документы</string>
+  <string name="send_google_existing_map">Выбрать существующую карту</string>
+  <string name="send_google_fusion_tables">Google Fusion Tables</string>
+  <string name="send_google_my_maps">Google \"Мои карты\"</string>
+  <string name="send_google_new_map">Создать новую карту</string>
+  <string name="send_google_no_account_message">Не найдена учетная запись для загрузки треков.</string>
+  <string name="send_google_no_account_title">Учетная запись не найдена</string>
+  <string name="send_google_progress_preparing_track">Подготовка трека...</string>
+  <string name="send_google_progress_reading_track">Чтение трека...</string>
+  <string name="send_google_recorded">Записан</string>
+  <string name="send_google_result_header">Статус загрузки:</string>
+  <string name="send_google_result_share_url">Поделиться треком</string>
+  <string name="send_google_send_now">Отправить</string>
+  <string name="send_google_success_footer">Это может занять несколько минут, прежде чем появятся новые треки.</string>
+  <string name="send_google_title">Отправить...</string>
+  <string name="send_google_track_part_label">(Часть %d)</string>
+  <string name="sensor_state_cadence">Каденс</string>
+  <string name="sensor_state_connected">Подключено</string>
+  <string name="sensor_state_connecting">Подключение</string>
+  <string name="sensor_state_disconnected">Отключено</string>
+  <string name="sensor_state_heart_rate">Пульс</string>
+  <string name="sensor_state_last_sensor_time">Датчик времени</string>
+  <string name="sensor_state_power">Мощность</string>
+  <string name="sensor_state_sending">Отправка</string>
+  <string name="settings_backup">Резервное копирование (BETA)</string>
+  <string name="settings_backup_now">Резервировать</string>
+  <string name="settings_backup_now_progress_message">Запись на SD-карту всех треков и настроек. Это может занять некоторое время...</string>
+  <string name="settings_backup_now_summary">Создать полную копию всех ваших треков и настроек на SD карту</string>
+  <string name="settings_backup_restore">Восстановить</string>
+  <string name="settings_backup_restore_confirm_message">Восстановление резервной копии с SD карты ПЕРЕЗАПИШЕТ все текущие треки и настройки. Вы уверены?</string>
+  <string name="settings_backup_restore_no_backup">Резервные копии не найдены.</string>
+  <string name="settings_backup_restore_progress_message">Чтение всех треков и настроек с SD-карты. Это может занять некоторое время...</string>
+  <string name="settings_backup_restore_select_title">Выберите резервную копию для восстановления</string>
+  <string name="settings_backup_restore_summary">Восстановить все треки и параметры с SD карты</string>
+  <string name="settings_backup_sd_card">Резервное копирование SD карты</string>
+  <string name="settings_display">Отображение</string>
+  <string name="settings_display_metric">Использовать метрические единицы</string>
+  <string name="settings_display_metric_summary_off">Все расстояния будут отображаться в имперских единицах</string>
+  <string name="settings_display_metric_summary_on">Все расстояния будут отображаться в метрических единицах</string>
+  <string name="settings_display_speed">Отображать скорость</string>
+  <string name="settings_display_speed_summary_off">Темп будет отображаться</string>
+  <string name="settings_display_speed_summary_on">Скорость будет отображаться</string>
+  <string name="settings_not_while_recording">Не доступно во время записи трека</string>
+  <string name="settings_recording">Запись</string>
+  <string name="settings_recording_auto_resume">Автоматическое возобновление трек тайм-аут</string>
+  <string name="settings_recording_auto_resume_summary">Максимальное время в минутах, после которого предыдущая запись трека не будет возобновлена на перезагруженном телефоне</string>
+  <string name="settings_recording_distance">Минимальное расстояние между точками</string>
+  <string name="settings_recording_distance_summary">Наименьшее расстояние между двумя записями вашей позиции</string>
+  <string name="settings_recording_gps_accuracy">Минимальная точность</string>
+  <string name="settings_recording_gps_accuracy_summary">Запись будет приостановлена, если ваша позиция не является достаточно точной</string>
+  <string name="settings_recording_interval">Минимальное время между точками</string>
+  <string name="settings_recording_interval_summary">Наименьший интервал времени между двумя записями вашей позиции</string>
+  <string name="settings_recording_marker">Частота деления</string>
+  <string name="settings_recording_marker_summary">Максимальное время или расстояние, после которого будет вставлен новый маркер деления</string>
+  <string name="settings_recording_name">Штамп времени как название дорожки</string>
+  <string name="settings_recording_name_summary_off">Названия треков будут иметь прирост чисел для каждого нового трека.</string>
+  <string name="settings_recording_name_summary_on">По умолчанию имя трека будет складываться из даты и времени старта трека</string>
+  <string name="settings_recording_track_distance">Максимальное расстояние между точками</string>
+  <string name="settings_recording_track_distance_summary">Если два пункта находятся дальше, чем указано, то трек будет разделен</string>
+  <string name="settings_recording_voice">Частота объявлений</string>
+  <string name="settings_recording_voice_not_available">Не доступен в вашем версии Android</string>
+  <string name="settings_recording_voice_summary">Минимальное время между двумя голосовыми объявлениями</string>
+  <string name="settings_reset">Восстановить значения по умолчанию</string>
+  <string name="settings_reset_dialog_message">Все ваши настройки будут стерты и восстановлены значения по умолчанию. Записанные треки будут сохранены. Вы уверены?</string>
+  <string name="settings_reset_done">Все настройки были возвращены к значениям по умолчанию.</string>
+  <string name="settings_reset_summary">Восстановить значения по умолчанию во всех настройках</string>
   <string name="settings_sensor">Параметры датчика</string>
-
-  <!-- Bluetooth Sensor -->
-  <string name="bluetooth_connected">Подключен к %s</string>
-  <string name="bluetooth_connecting">Подключение Bluetooth датчика...</string>
-  <string name="bluetooth_not_connected">Bluetooth датчик не подключен</string>
-
-  <!-- Sensor State -->
-  <string name="sensor_data_time">Датчик времени</string>
-  <string name="power_meter_enabled">Измеритель мощности включен</string>
-  <string name="heart_rate_monitor_enabled">Монитор пульса включен</string>
-  <string name="no_sensor_manager">Нет диспетчера датчиков</string>
-  <string name="enabled">Включено</string>
-  <string name="connecting">Подключение</string>
-  <string name="connected">Подключено</string>
-  <string name="disconnected">Отключено</string>
-  <string name="no_sensor_service">Нет службы датчиков</string>
-  <string name="searching">Поиск</string>
-  <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>
-
-  <!-- Manifest description (not seen inside the app) -->
-  <string name="notification_permission_label">получать уведомления о записи трека</string>
-  <string name="read_tracks_permission_label">чтение записанных данных трека</string>
-  <string name="write_tracks_permission_label">запись данных трека, старт/стоп записи треков</string>
-  <string name="notification_permission_description">Получать уведомления, при старте или останове записи трека.</string>
-  <string name="read_tracks_permission_description">Иметь возможность читать данные трека, такие как точки и путевые точки.</string>
-  <string name="write_tracks_permission_description">Иметь возможность записать данные трека, такие как начало записи или добавление путевых точек.</string>
+  <string name="settings_sensor_ant_not_paired">ANT датчик не подсоединен</string>
+  <string name="settings_sensor_ant_options">Параметры ANT</string>
+  <string name="settings_sensor_ant_paired">ANT датчик подсоединен с: %d</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="settings_sensor_bluetooth_sensor">Bluetooth датчик</string>
+  <string name="settings_sensor_bluetooth_sensor_summary">Подключенный bluetooth датчик</string>
+  <string name="settings_sensor_type">Тип датчика</string>
+  <string name="settings_sensor_type_ant">ANT+ Датчик</string>
+  <string name="settings_sensor_type_none">Нет</string>
+  <string name="settings_sensor_type_srm">SRM ANT+ Bridge</string>
+  <string name="settings_sensor_type_summary">Тип подключенного датчика</string>
+  <string name="settings_sensor_unpair_ant">Очистить ANT подсоединенного датчика пульса</string>
+  <string name="settings_sensor_unpair_srm">Очистить ANT подсоединенного датчика SRM</string>
+  <string name="settings_sharing">Обмен</string>
+  <string name="settings_sharing_map_public">Обнародовать карты</string>
+  <string name="settings_sharing_map_public_summary_off">Загруженные карты не будут перечислены публично на maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_on">Загруженные карты будут общедоступны на maps.google.com</string>
+  <string name="settings_sharing_url_only">Поделиться только URL</string>
+  <string name="settings_sharing_url_only_summary_off">Содержимое трека будет также включено при обмене</string>
+  <string name="settings_title">Настройки My Tracks</string>
+  <string name="share_track_file_body_format">Я думаю, вы можете быть заинтересованы в этом треке.\n\nПросмотреть трек можно с помощью Google Планета Земля или другого программного обоспечения для карт.</string>
+  <string name="share_track_picker_title">Поделиться картой с друзьями</string>
+  <string name="share_track_subject">Я хотел бы поделиться с вами треком</string>
+  <string name="share_track_url_body_format">Я думаю, вы можете быть заинтересованы в этом треке:\n\n%s</string>
+  <string name="stat_average_moving_pace">Средний темп движения</string>
+  <string name="stat_average_moving_speed">Средняя скорость движения</string>
+  <string name="stat_average_pace">Средний темп</string>
+  <string name="stat_average_speed">Средняя скорость</string>
+  <string name="stat_elevation">Высота</string>
+  <string name="stat_elevation_gain">Набор высоты</string>
+  <string name="stat_latitude">Широта</string>
+  <string name="stat_longitude">Долгота</string>
+  <string name="stat_max_elevation">Максимальная высота</string>
+  <string name="stat_max_grade">Максимальный уклон</string>
+  <string name="stat_max_speed">Максимальная скорость</string>
+  <string name="stat_min_elevation">Минимальная высота</string>
+  <string name="stat_min_grade">Минимальный уклон</string>
+  <string name="stat_min_pace">Минимальный темп</string>
+  <string name="stat_moving_time">Время движения</string>
+  <string name="stat_pace">Темп</string>
+  <string name="stat_speed">Скорость</string>
+  <string name="stat_total_distance">Общее расстояние</string>
+  <string name="stat_total_time">Общее время</string>
+  <string name="track_detail_activity_type">Тип деятельности (например: пешая прогулка, велосипедная прогулка, бег, восхождение...)</string>
+  <string name="track_detail_activity_type_hint">Тип деятельности</string>
+  <string name="track_detail_title">Трек детали</string>
+  <string name="track_detail_track_description">Описание трека</string>
+  <string name="track_detail_track_name">Название трека</string>
+  <string name="track_list_clear_map">Очистить карту</string>
+  <string name="track_list_context_menu_title">Этот трек</string>
+  <string name="track_list_delete_all">Удалить все</string>
+  <string name="track_list_delete_all_confirm_message">Все треки и маркеры будут удалены с этого телефона.</string>
+  <string name="track_list_delete_track">Удалить из телефона...</string>
+  <string name="track_list_delete_track_confirm_message">Трек и его маркеры будут удалены из этого телефона.</string>
+  <string name="track_list_edit_track">Править детали</string>
+  <string name="track_list_export_all">Экспорт всех</string>
+  <string name="track_list_import_all">Импорт всех</string>
+  <string name="track_list_pick_one">Выберите трек. Нажмите и удерживайте для получения дополнительных возможностей.</string>
+  <string name="track_list_save_sd">Записать на SD карту...</string>
+  <string name="track_list_send_google">Отправить в Google ...</string>
+  <string name="track_list_share_track">Поделиться с друзьями...</string>
+  <string name="track_list_share_url">Ссылка на карту</string>
+  <string name="track_list_show_on_map">Показать</string>
+  <string name="track_name_format">Трек %d</string>
+  <string name="track_record_error">Не удалось начать запись. Попробуйте еще раз.</string>
+  <string name="track_record_notification">Запись трека...</string>
+  <string name="track_record_success">Записывается новый трек.</string>
+  <string name="unit_beat_per_minute">bpm</string>
+  <string name="unit_feet">футов</string>
+  <string name="unit_hour">ч</string>
+  <string name="unit_kilometer">км</string>
+  <string name="unit_kilometer_per_hour">км/ч</string>
+  <string name="unit_meter">м</string>
+  <string name="unit_mile">миль</string>
+  <string name="unit_mile_per_hour">миль/ч</string>
+  <string name="unit_minute">мин</string>
+  <string name="unit_minute_per_kilometer">мин/км</string>
+  <string name="unit_minute_per_mile">мин/миля</string>
+  <string name="unit_revolution_per_minute">об/мин</string>
+  <string name="unit_watt">Вт</string>
+  <string name="voice_hour">час</string>
+  <string name="voice_hours">часов</string>
+  <string name="voice_kilometer_per_hour">километров в час</string>
+  <string name="voice_kilometers">километров</string>
+  <string name="voice_mile_per_hour">миль в час</string>
+  <string name="voice_miles">мили</string>
+  <string name="voice_minute">минута</string>
+  <string name="voice_minutes">минут</string>
+  <string name="voice_no_distance">My Tracks нет расстояния</string>
+  <string name="voice_per_kilometer">за километр</string>
+  <string name="voice_per_mile">за милю</string>
+  <string name="voice_second">секунда</string>
+  <string name="voice_seconds">секунд</string>
+  <string name="voice_template">Мои треки %1$.2f %2$s в %3$s на %4$s %5$s</string>
+  <string name="welcome_about">О My Tracks</string>
+  <string name="welcome_title">Добро пожаловать</string>
 </resources>
diff --git a/MyTracks/res/values-sv/arrays.xml b/MyTracks/res/values-sv/arrays.xml
deleted file mode 100644
index fef8a4ec9..000000000
--- a/MyTracks/res/values-sv/arrays.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-  <!-- Minimum recording distance -->
-  <string-array name="min_recording_distance_options">
-    <item>1 m</item>
-    <item>2 m</item>
-    <item>3 m</item>
-    <item>4 m</item>
-    <item>5 m (rekommenderad)</item>
-    <item>10 m</item>
-    <item>100 m</item>
-  </string-array>
-
-  <string-array name="min_recording_distance_options_ft">
-    <item>3 ft</item>
-    <item>6 ft</item>
-    <item>10 ft</item>
-    <item>13 ft</item>
-    <item>16 ft (rekommenderad)</item>
-    <item>33 ft</item>
-    <item>328 ft</item>
-  </string-array>
-
-  <!-- Maximum recording distance -->
-  <string-array name="max_recording_distance_options">
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (rekommenderad)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>5000 m</item>
-  </string-array>
-
-  <string-array name="max_recording_distance_options_ft">
-    <item>164 ft</item>
-    <item>328 ft</item>
-    <item>656 ft (rekommenderad)</item>
-    <item>1640 ft</item>
-    <item>0.6 miles</item>
-    <item>3.1 miles</item>
-  </string-array>
-
-  <!-- Minimum recording interval -->
-  <string-array name="min_recording_interval_options">
-    <item>batterioptimerad (anpassningsbar)</item>
-    <item>hög precision (anpassningsbar)</item>
-    <item>högsta (rekommenderad)</item>
-    <item>2 s</item>
-    <item>3 s</item>
-    <item>4 s</item>
-    <item>5 s</item>
-    <item>10 s</item>
-    <item>20 s</item>
-    <item>30 s</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-  </string-array>
-
-  <!-- Minimum required accuracy -->
-  <string-array name="min_required_accuracy_options">
-    <item>10 m (bra GPS-signal)</item>
-    <item>20 m</item>
-    <item>50 m</item>
-    <item>100 m</item>
-    <item>200 m (rekommenderad)</item>
-    <item>500 m</item>
-    <item>1000 m</item>
-    <item>2000 m</item>
-    <item>5000 m (dålig GPS-signal)</item>
-  </string-array>
-
-  <string-array name="min_required_accuracy_options_ft">
-    <item>33 ft (bra GPS-signal)</item>
-    <item>66 ft</item>
-    <item>165 ft</item>
-    <item>328 ft</item>
-    <item>656 ft (rekommenderad)</item>
-    <item>1640 ft</item>
-    <item>0.6 miles</item>
-    <item>1.2 miles</item>
-    <item>3.1 miles (dålig GPS-signal)</item>
-  </string-array>
-
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Av</item>
-    <item>100 km</item>
-    <item>50 km</item>
-    <item>25 km</item>
-    <item>10 km</item>
-    <item>5 km</item>
-    <item>1 km</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-  <string-array name="task_frequency_options_ft">
-    <item>Av</item>
-    <item>100 mi</item>
-    <item>50 mi</item>
-    <item>25 mi</item>
-    <item>10 mi</item>
-    <item>5 mi</item>
-    <item>1 mi</item>
-    <item>60 min</item>
-    <item>30 min</item>
-    <item>15 min</item>
-    <item>10 min</item>
-    <item>5 min</item>
-    <item>2 min</item>
-    <item>1 min</item>
-  </string-array>
-
-  <!-- Other non-preference arrays -->
-  <array name="activity_types">
-    <item>okänd</item>
-    <item>blandat</item>
-    <item>annat</item>
-
-    <item>löpning</item>
-    <item>väglöpning</item>
-    <item>banlöpning</item>
-    <item>spårlöpning</item>
-    <item>gång</item>
-    <item>gångsport</item>
-    <item>vandring</item>
-    <item>spårvandring</item>
-    <item>vildmarksvandring</item>
-    <item>klättring</item>
-
-    <item>cykling</item>
-    <item>vägcyckling</item>
-    <item>mountainbikeåkning</item>
-    <item>bancyckling</item>
-
-    <item>skridskoåkning</item>
-    <item>inlineåkning</item>
-    <item>skateboardåkning</item>
-
-    <item>snöskovandring</item>
-    <item>skidåkning</item>
-    <item>snowboardåkning</item>
-    <item>kälke</item>
-    <item>issegling</item>
-
-    <item>segling</item>
-    <item>paddling</item>
-    <item>kayakpaddling</item>
-    <item>rodd</item>
-    <item>motorbåtsåkning</item>
-    <item>färja</item>
-    <item>RC båt</item>
-    <item>surfning</item>
-    <item>vindsurfning</item>
-    <item>kite surfing</item>
-    <item>vattenskidåkning</item>
-    <item>wakeboardåkning</item>
-
-    <item>flygplan</item>
-    <item>sjöflygplan</item>
-    <item>kommersiellt flygplan</item>
-    <item>helikopter</item>
-    <item>varmlyftsballong</item>
-    <item>luftskepp</item>
-    <item>RC flygplan</item>
-    <item>RC helicopter</item>
-    <item>falskärmshoppning</item>
-    <item>segelflygning</item>
-    <item>hängflygning</item>
-    <item>skärmflygning</item>
-
-    <item>ridning</item>
-    <item>hästridning</item>
-    <item>åsneridning</item>
-
-    <item>köra bil</item>
-    <item>köra buss</item>
-    <item>tåg</item>
-    <item>motorcykel</item>
-    <item>motorcross</item>
-    <item>fyrhjuling</item>
-
-    <item>landsegling</item>
-    <item>frisbee</item>
-    <item>ultimate frisbee</item>
-  </array>
-
-  <array name="waypoint_types">
-    <item>bankomat</item>
-    <item>bank</item>
-    <item>bar</item>
-    <item>barbeque</item>
-    <item>byggnad</item>
-    <item>bushållplats</item>
-    <item>café</item>
-    <item>lägereld</item>
-    <item>kampingklatts</item>
-    <item>kyrka</item>
-    <item>kaffestuga</item>
-    <item>närbutik</item>
-    <item>driksvatten</item>
-    <item>fallande stenar</item>
-    <item>färja</item>
-    <item>äldplats</item>
-    <item>brandstation</item>
-    <item>fiske</item>
-    <item>bensinstation</item>
-    <item>golfbana</item>
-    <item>mataffär</item>
-    <item>hårfrissör</item>
-    <item>hamn</item>
-    <item>vandringsled</item>
-    <item>hotel</item>
-    <item>hus</item>
-    <item>information</item>
-    <item>korsning</item>
-    <item>postlåda</item>
-    <item>marknad</item>
-    <item>mötesplats</item>
-    <item>opera</item>
-    <item>parkering</item>
-    <item>postkontor</item>
-    <item>grop</item>
-    <item>polisstation</item>
-    <item>järnvägskorssning</item>
-    <item>restaurant</item>
-    <item>shopping</item>
-    <item>sevärdhet</item>
-    <item>affär</item>
-    <item>simbassäng</item>
-    <item>telefon</item>
-    <item>teater</item>
-    <item>toalett</item>
-    <item>turistinformation</item>
-    <item>tunnel</item>
-    <item>träd</item>
-    <item>vatenfall</item>
-    <item>wattenfontän</item>
-    <item>etappmål</item>
-  </array>
-</resources>
diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml
index 38116b013..123d4df31 100644
--- a/MyTracks/res/values-sv/strings.xml
+++ b/MyTracks/res/values-sv/strings.xml
@@ -15,344 +15,174 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-
-  <!-- Used by the Menu -->
-  <string name="start_recording">Spela in spår</string>
-  <string name="stop_recording">Stoppa inspelning</string>
-  <string name="switch_to_sat">Satellitläge</string>
-  <string name="switch_to_map">Kartläge</string>
-  <string name="mylocation">Min plats</string>
-  <string name="list_tracks">Spår</string>
-  <string name="list_markers">Markörer</string>
-  <string name="delete_all_tracks">Ta bort alla spår</string>
-  <string name="settings">Inställningar</string>
-  <string name="elevation">Höjd</string>
-  <string name="choose_track_message">Välj ett spår att visa</string>
-  <string name="current_track">Nuvarande spår</string>
-  <string name="current_segment">Senaste segmentet</string>
-
-  <!-- Error messages -->
-  <string name="error_no_location_manager">Ingen platshanterare hittades på denna enhet!</string>
-  <string name="error_no_gps">Ingen GPS-positioneringstjänst hittades på denna enhet.</string>
-  <string name="error_sending_to_fusion_tables">Det uppstod ett fel i sändningen av ditt spår till Google Fusion Tables. Försök igen senare.</string>
-  <string name="error_sending_to_docs">Det uppstod ett fel i sändningen av ditt spår till Google Dokument. Försök igen senare.</string>
-  <string name="error_unable_to_start_recording">Kan inte starta inspelningen. Försök igen.</string>
-  <string name="error_unable_to_stop_recording">Kan inte stoppa inspelningen. Försök igen.</string>
-  <string name="error_import_unable_to_read_file">Kan inte läsa från fil.</string>
-  <string name="error_import_invalid_gpx_format">Filen har inte ett giltigt GPX-format.</string>
-  <string name="error_import_generic">Ett fel uppstod. Försök igen.</string>
-  <string name="error_export_track_does_not_exist">Spåret finns inte.</string>
-  <string name="error_import_out_of_memory">Den här filen är för stor (måste vara mindre än 500 KB). Avbryter.</string>
-  <string name="error_unable_to_insert_marker">Kan inte skapa markör. Ingen position tillgänglig.</string>
-
-  <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">Väntar på bättre GPS-position. Se till att himlen är synlig.</string>
-  <string name="status_now_recording">Spelar nu in ett nytt spår.</string>
-  <string name="status_stopped_recording">Stoppade inspelning av ditt spår.</string>
-  <string name="status_need_to_enable_gps">Klicka här för att gå till Säkerhet och Platsinställningar och kryssa i \'aktivera gps-satteliter\'. Tryck på tillbakaknappen för att återgå.</string>
-  <string name="status_approximate_current_location">OBS: En ungefärlig position som avgörs från mobilmaster och WIFI-nät visas.</string>
-  <string name="status_no_current_location">En position kan för närvarande inte fastställas. Aktivera mer platskällor (se Säkerhet och Platsinställningar) och se till att himlen är synlig. Försök igen senare.</string>
-  <string name="status_waypoint_inserted">En positionsmarkör har lagts in.</string>
-  <string name="status_marker_inserted">En statistikmarkör har lagts in.</string>
-
-  <!-- Progress dialog -->
-  <string name="progress_title">Var god vänta...</string>
-  <string name="progress_message">Skickar ditt spår till Google.</string>
-  <string name="progress_message_reading_track">Läser spår...</string>
-  <string name="progress_message_preparing_track">Förbereder spår...</string>
-  <!-- <string name="progress_message_authenticating_fusion_tables">Autentiserar till Google Kartor...</string> -->
-  <string name="progress_message_authenticating_docs">Autentiserar till Google Dokument...</string>
-  <string name="progress_message_sending_docs">Skickar spår till Google Dokument...</string>
-  <!-- <string name="progress_message_sending_fusion_tables">Skickar spår till Google Kartor...</string> -->
-  <!-- <string name="progress_message_creating_fusion_table">Skapar en ny Min Karta...</string> -->
-  <string name="progress_message_import">Importerar ett GPS-spår. Detta kan ta en stund.</string>
-  <string name="progress_message_export">Skriver till SD-kortet. Detta kan ta en stund.</string>
-  <string name="progress_message_updating_track">Uppdaterar spårstatistik...</string>
-
-  <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">Är du säker?</string>
-  <string name="all_data_will_be_permanently_deleted">Alla spår och markörer kommer att tas bort från telefonen.</string>
-  <string name="track_will_be_permanently_deleted">Spåret och dess markörer kommer att permanent tas bort från telefonen.</string>
-  <string name="marker_will_be_permanently_deleted">Markören kommer att permanent tas bort från telefonen.</string>
-
-  <!-- Text and links when uploading to Google My Maps -->
-  <string name="new_map_description">Skapad av My Tracks på Android.</string>
-
-  <!-- Formatting of track and marker descriptions -->
-  <string name="points">Punkter</string>
-  <string name="recorded_date">Inspelad</string>
-  <string name="category">Aktivitetstyp</string>
-  <string name="waypoint_category">Markörtyp</string>
-  <string name="track_part_format">(Del %d)</string>
-
-  <!-- Used by the track recording service -->
-  <string name="recording_your_track">Spelar in ditt spår...</string>
-  <string name="new_track_format">Spår %d</string>
-
-  <!-- Common -->
-  <string name="no">Nej</string>
-  <string name="yes">Ja</string>
-  <string name="ok">OK</string>
-  <string name="error">Fel</string>
-  <string name="success">Lyckades</string>
-  <string name="waypoint">Positionsmärke</string>
-  <string name="cancel">Avbryt</string>
-  <string name="save">Spara</string>
-
-  <!-- Placemark labels for start and end of track -->
-  <string name="start">(Start)</string>
-  <string name="end">(Slut)</string>
-
-  <!--  TrackList -->
-  <string name="tracklist_show_track">Visa</string>
-  <!-- <string name="tracklist_send_to_fusiontables">Skicka till Google Mina Kartor</string> -->
-  <!-- <string name="tracklist_send_to_new_fusiontable">Skicka till ny Google Mina Kartor</string> -->
-  <string name="tracklist_send_to_docs">Skicka till Google Dokument</string>
-  <string name="tracklist_send_to_google">Skicka till Google...</string>
-  <string name="tracklist_delete_track">Ta bort från telefonen...</string>
-  <string name="tracklist_edit_track">Ändra detaljer</string>
-  <string name="tracklist_write_to_sd">Skriv till SD-kort...</string>
-  <string name="tracklist_save_as_gpx">Spara en GPX-fil</string>
-  <string name="tracklist_save_as_kml">Spara en KML-fil</string>
-  <string name="tracklist_save_as_csv">Spara en CSV-fil</string>
-  <!-- <string name="tracklist_btn_send_all_to_fusiontables">Skicka till Google Mina Kartor</string> -->
-  <string name="tracklist_btn_delete_all">Ta bort alla spår</string>
-  <!-- Export All -->
-  <string name="tracklist_btn_export_all">Exportera alla spår</string>
-  <string name="export_done">Exporteringen slutfördes</string>
-  <string name="tracklist_pick_one">Välj ett spår. Tryck &amp; håll för fler alternativ.</string>
-  <string name="tracklist_all_tracks">Alla spår:</string>
-  <string name="tracklist_this_track">Det här spåret</string>
-  <string name="tracklist_share_track">Dela med vänner...</string>
-  <string name="tracklist_share_gpx_file">En GPX-fil</string>
-  <string name="tracklist_share_kml_file">En KML-fil</string>
-  <string name="tracklist_share_csv_file">En CSV-fil</string>
-  <string name="tracklist_clear_map">Rensa karta</string>
-
-  <!-- Waypoints list -->
-  <string name="waypointslist_btn_delete_all">Ta bort alla markörer</string>
-  <string name="waypointslist_this_waypoint">Den här markören</string>
-  <string name="waypointslist_delete_waypoint">Ta bort</string>
-  <string name="waypointslist_edit_waypoint">Ändra detaljer</string>
-  <string name="waypointslist_show_waypoint">Visa på karta</string>
-  <string name="waypointslist_btn_insert_waypoint">Infoga positionspunkt</string>
-  <string name="waypointslist_btn_insert_statistics">Infoga statistik</string>
-  <string name="waypointslist_pick_one">Välj en markör. Tryck &amp; håll för fler alternativ.</string>
-
-  <!-- MyTracks Details -->
-  <string name="trackdetails_title">Spårdetaljer</string>
-  <string name="trackdetails_name">Spårnamn</string>
-  <string name="trackdetails_name_hint">Spårnamn</string>
-  <string name="trackdetails_description">Spårbeskrivning</string>
-  <string name="trackdetails_description_hint">Spårbeskrivning</string>
-  <string name="trackdetails_category">Aktivitetstyp (t ex vandring, cyckling, löpning, klättring...)</string>
-  <string name="trackdetails_category_hint">Aktivitetstyp</string>
-
-  <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Markördetaljer</string>
-  <string name="waypointdetails_name">Markörnamn</string>
-  <string name="waypointdetails_name_hint">Markörnamn</string>
-  <string name="waypointdetails_description">Markörbeskrivning</string>
-  <string name="waypointdetails_description_hint">Markörbeskrivning</string>
-  <string name="waypointdetails_category">Markörtyp (e.g. byggnad, grop, sevärdhet...)</string>
-  <string name="waypointdetails_category_hint">Markörtyp</string>
-
-  <!-- MyTracks Settings -->
-  <string name="settings_title">My Tracks inställningar</string>
-  <string name="settings_display">Visning</string>
-  <string name="settings_recording">Inspelning</string>
-  <string name="settings_sharing">Delning</string>
-
-  <string name="settings_announcement_frequency">Meddelandefrekvens</string>
-  <string name="settings_announcement_frequency_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_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_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_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_metric_units">Använd metersystemet</string>
-  <string name="settings_metric_units_summary_on">Alla distanser kommer att visas i metriska enheter</string>
-  <string name="settings_metric_units_summary_off">Alla distanser kommer att visas i brittiska enheter</string>
-
-  <string name="settings_map_public">Gör kartor offentliga</string>
-  <string name="settings_map_public_summary_on">Uppladdade kartor kommer att vara synliga för alla på maps.google.com</string>
-  <string name="settings_map_public_summary_off">Uppladdade kartor kommer inte att visas offentligt på maps.google.com</string>
-
-  <string name="settings_report_speed_or_pace">Visa hastighet</string>
-  <string name="settings_report_speed_or_pace_summary_on">Hastighet kommer att visas</string>
-  <string name="settings_report_speed_or_pace_summary_off">Tempo kommer att visas</string>
-
-  <string name="settings_share_url_only">Dela bara länk</string>
-  <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="pace_label">Tempo</string>
-
-  <!-- MyTracksSky -->
-  <string name="mytracks_sky">GPS-satelliter</string>
-
-  <!-- Sharing -->
-  <string name="share_map_subject">Jag vill dela en karta med dig</string>
-  <string name="share_track_url_body_format">Jag tror att du skulle vara intresserad av den här kartan:
-
-      %s</string>
-  <string name="share_track_subject">Jag vill dela ett spår med dig</string>
-  <string name="share_track_file_body_format">Jag tror att du skulle vara intresserad av det här spåret.
-
-    För att se det här spåret använd Google Earth eller något annat kartprogram.</string>
-  <string name="share_track_url">Dela spår med vänner</string>
-
-  <!-- Visibility -->
-  <string name="public_map">Publik</string>
-  <string name="unlisted_map">Olistat</string>
-  <string name="mapslist_no_maps_available">Du har inga kartor än.</string>
-
-  <!-- Statistics View -->
-  <!-- Average Moving -->
-  <string name="average_moving_speed_label">Genomsnittlig rörlig hastighet</string>
-  <string name="average_moving_pace_label">Genomsnittlig rörligt tempo</string>
-
-  <!-- Average -->
-  <string name="average_speed_label">Genomsnittlig hastighet</string>
-  <string name="average_pace_label">Genomsnittligt tempo</string>
-
-  <string name="elevation_chart_name">Höjddiagram</string>
-  <string name="elevation_gain_label">Höjdvinst</string>
-  <string name="elevation_label">Höjd</string>
-  <string name="latitude_label">Latitud</string>
-  <string name="longitude_label">Longitud</string>
-
-  <!-- Min -->
-  <string name="min_elevation_label">Minimihöjd</string>
-  <string name="min_grade_label">Minimilutning</string>
-  <string name="min_pace_label">Minimitempo</string>
-
-  <!-- Max -->
-  <string name="max_elevation_label">Maxhöjd</string>
-  <string name="max_grade_label">Maxlutning</string>
-  <string name="max_speed_label">Maxhastighet</string>
-
-  <string name="loading_track">Laddar spår...</string>
-
-  <!-- Chart Settings -->
-  <string name="chart_settings">Diagraminställningar</string>
-  <!-- X Axis -->
-  <string name="x_axis">X-axel</string>
-  <string name="by_distance">Efter distans</string>
-  <string name="by_time">Efter tid</string>
-
-  <!-- Y Axis -->
-  <string name="y_axis">Y-axel</string>
-
-  <!-- Units -->
-  <!-- Time  -->
-  <string name="voice_hour">timme</string>
-  <string name="voice_hours">timmar</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="unit_meter">m</string>
-  <string name="unit_kilometer">km</string>
-  <string name="voice_kilometers">kilometer</string>
-  <string name="unit_feet">ft</string>
-  <string name="unit_mile">mi</string>
-  <string name="voice_miles">miles</string>
-
-  <!-- Speed and Pace -->
-  <string name="kilometer_per_hour">km/h</string>
-  <string name="voice_kilometer_per_hour">kilometer i timmen</string>
-  <string name="min_per_kilometer">min/km</string>
-  <string name="voice_per_kilometer">per kilometer</string>
-  <string name="mile_per_hour">mi/h</string>
-  <string name="voice_mile_per_hour">miles i timmen</string>
-  <string name="min_per_mile">min/mi</string>
-  <string name="voice_per_mile">per mile</string>
-
-  <!-- Stats Labels -->
-  <string name="moving_time_label">Rörlig tid</string>
-  <string name="total_time_label">Total tid</string>
-  <string name="time_label">Tid</string>
-  <string name="sd_unavail">SD otillgängligt</string>
-  <string name="speed">Hastighet</string>
-  <string name="start_trip">Du måste starta en tur.</string>
-  <string name="statistics">Statistik</string>
-  <string name="total_distance_label">Total distans</string>
-  <string name="distance_label">Distans</string>
-  <string name="unknown">-</string>
-  <string name="waiting">Väntar...</string>
-
-  <!-- End User License Agreement -->
-  <string name="eula_title">Licensavtal för slutanvändare</string>
-  <string name="accept">Acceptera</string>
-  <string name="decline">Avböj</string>
-
-  <!-- About -->
-  <string name="about">Om</string>
-  <string name="help">Hjälp</string>
+  <string name="about_support">Support:</string>
   <string name="about_team">Team:</string>
   <string name="about_version">Version:</string>
-  <string name="about_support">Support:</string>
-
-  <!-- Send to Google -->
-  <string name="sendtogoogle_title">Skicka till...</string>
-  <!--<string name="sendtogoogle_google_fusiontables">Google Mina Kartor</string>-->
-  <string name="sendtogoogle_google_docs">Google Dokument</string>
-  <string name="sendtogoogle_send_now">Skicka nu</string>
-  <string name="sendtogoogle_send_stats">Skicka spårstatistik</string>
-  <string name="sendtogoogle_send_stats_and_points">Skicka statistik och punkter</string>
-
-  <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">Inget konto hittades</string>
-  <string name="no_account_found">Inget konto hittades att ladda upp spåret till.</string>
-  <string name="choose_account_title">Välj konto</string>
-
-  <!-- SD card -->
-  <string name="io_no_external_storage_found">Ingen extern lagring hittades. Se till att ett SD-kort sitter i och att telefonen inte är monterad till en dator.</string>
-  <string name="io_write_failed">Kan inte skriva till filen.</string>
-  <string name="io_create_dir_failed">Kunde inte skapa katalog på SD-kort.</string>
-  <string name="io_write_finished">Slutförde skrivningen av spåret till SD-kort.</string>
-
-  <!-- VersionChecker -->
-  <string name="version_check_title">Uppgraderingskoll</string>
-  <string name="version_check_upgrade_button">Uppgradera nu</string>
-  <string name="version_check_continue_button">Fortsätt utan att uppgradera</string>
-  <string name="upgrade_required">Din version av %1$s kanske inte fungerar korrekt längre, och stöds inte längre. Uppgradera för att fortsätta använda %1$s.</string>
-  <string name="upgrade_recommended">Din version av %1$s kanske inte fungerar korrekt längre. Du kan uppgradera den nu, eller fortsätta att använda den på egen risk. Vissa funktioner såsom synkronisering kanske inte fungerar förrän du uppgraderar.</string>
-  <string name="upgrade_available">En ny version av %1$s finns tillgänglig. Du kan fortsätta använda din nuvarande version utan problem, men du kommer inte få de senaste funktionerna förrän du uppgraderar.</string>
-
-  <!-- Welcome -->
-  <string name="welcome">Välkommen</string>
-  <string name="welcome_read_later">Ok</string>
+  <string name="chart_settings_by_distance">Efter distans</string>
+  <string name="chart_settings_by_time">Efter tid</string>
+  <string name="chart_settings_x_axis">X-axel</string>
+  <string name="chart_settings_y_axis">Y-axel</string>
+  <string name="eula_accept">Acceptera</string>
+  <string name="eula_decline">Avböj</string>
+  <string name="eula_title">Licensavtal för slutanvändare</string>
+  <string name="export_progress_message">Skriver till SD-kortet. Detta kan ta en stund.</string>
+  <string name="export_success">Exporteringen slutfördes</string>
+  <string name="generic_cancel">Avbryt</string>
+  <string name="generic_confirm_title">Är du säker?</string>
+  <string name="generic_error_title">Fel</string>
+  <string name="generic_no">Nej</string>
+  <string name="generic_ok">OK</string>
+  <string name="generic_progress_title">Var god vänta...</string>
+  <string name="generic_save">Spara</string>
+  <string name="generic_success_title">Lyckades</string>
+  <string name="generic_yes">Ja</string>
+  <string name="gps_need_to_enable">Klicka här för att gå till Säkerhet och Platsinställningar och kryssa i \'aktivera gps-satteliter\'. Tryck på tillbakaknappen för att återgå.</string>
+  <string name="gps_not_found">Ingen GPS-positioneringstjänst hittades på denna enhet.</string>
+  <string name="gps_wait_for_fix">Väntar på bättre GPS-position. Se till att himlen är synlig.</string>
+  <string name="marker_detail_marker_description">Markörbeskrivning</string>
+  <string name="marker_detail_marker_name">Markörnamn</string>
+  <string name="marker_detail_marker_type">Markörtyp (e.g. byggnad, grop, sevärdhet...)</string>
+  <string name="marker_detail_marker_type_hint">Markörtyp</string>
+  <string name="marker_detail_title">Markördetaljer</string>
+  <string name="marker_insert_error">Kan inte skapa markör. Ingen position tillgänglig.</string>
+  <string name="marker_insert_success">En statistikmarkör har lagts in.</string>
+  <string name="marker_label_end">(Slut)</string>
+  <string name="marker_label_start">(Start)</string>
+  <string name="marker_list_context_menu_title">Den här markören</string>
+  <string name="marker_list_delete_marker">Ta bort</string>
+  <string name="marker_list_delete_marker_confirm_message">Markören kommer att permanent tas bort från telefonen.</string>
+  <string name="marker_list_edit_marker">Ändra detaljer</string>
+  <string name="marker_list_insert_statistics">Infoga statistik</string>
+  <string name="marker_list_insert_waypoint">Infoga positionspunkt</string>
+  <string name="marker_list_pick_one">Välj en markör. Tryck &amp; håll för fler alternativ.</string>
+  <string name="marker_list_show_on_map">Visa på karta</string>
+  <string name="marker_type_statistics">Statistik</string>
+  <string name="marker_type_waypoint">Positionsmärke</string>
+  <string name="menu_chart_view_chart_settings">Diagraminställningar</string>
+  <string name="menu_help">Hjälp</string>
+  <string name="menu_map_view_map_mode">Kartläge</string>
+  <string name="menu_map_view_my_location">Min plats</string>
+  <string name="menu_map_view_satellite_mode">Satellitläge</string>
+  <string name="menu_markers">Markörer</string>
+  <string name="menu_record_track">Spela in spår</string>
+  <string name="menu_settings">Inställningar</string>
+  <string name="menu_stop_recording">Stoppa inspelning</string>
+  <string name="menu_tracks">Spår</string>
+  <string name="my_location_approximate_location">OBS: En ungefärlig position som avgörs från mobilmaster och WIFI-nät visas.</string>
+  <string name="my_location_no_location">En position kan för närvarande inte fastställas. Aktivera mer platskällor (se Säkerhet och Platsinställningar) och se till att himlen är synlig. Försök igen senare.</string>
+  <string name="my_maps_list_no_maps">Du har inga kartor än.</string>
+  <string name="my_maps_list_public_label">Publik</string>
+  <string name="my_maps_list_unlisted_label">Olistat</string>
+  <string name="sd_card_error_create_dir">Kunde inte skapa katalog på SD-kort.</string>
+  <string name="sd_card_error_no_storage">Ingen extern lagring hittades. Se till att ett SD-kort sitter i och att telefonen inte är monterad till en dator.</string>
+  <string name="sd_card_error_write_file">Kan inte skriva till filen.</string>
+  <string name="sd_card_success_write_file">Slutförde skrivningen av spåret till SD-kort.</string>
+  <string name="send_google_choose_account_title">Välj konto</string>
+  <string name="send_google_docs">Google Dokument</string>
+  <string name="send_google_no_account_message">Inget konto hittades att ladda upp spåret till.</string>
+  <string name="send_google_no_account_title">Inget konto hittades</string>
+  <string name="send_google_progress_preparing_track">Förbereder spår...</string>
+  <string name="send_google_progress_reading_track">Läser spår...</string>
+  <string name="send_google_recorded">Inspelad</string>
+  <string name="send_google_result_share_url">Dela spår med vänner</string>
+  <string name="send_google_send_now">Skicka nu</string>
+  <string name="send_google_title">Skicka till...</string>
+  <string name="send_google_track_part_label">(Del %d)</string>
+  <string name="settings_display">Visning</string>
+  <string name="settings_display_metric">Använd metersystemet</string>
+  <string name="settings_display_metric_summary_off">Alla distanser kommer att visas i brittiska enheter</string>
+  <string name="settings_display_metric_summary_on">Alla distanser kommer att visas i metriska enheter</string>
+  <string name="settings_display_speed">Visa hastighet</string>
+  <string name="settings_display_speed_summary_off">Tempo kommer att visas</string>
+  <string name="settings_display_speed_summary_on">Hastighet kommer att visas</string>
+  <string name="settings_recording">Inspelning</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_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_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_recording_marker">Delningsfrekvens</string>
+  <string name="settings_recording_marker_summary">Maximala tiden eller distansen varefter en ny delningsmarkör kommer infogas</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_recording_voice">Meddelandefrekvens</string>
+  <string name="settings_recording_voice_summary">Minimumtid mellan två röstmeddelanden</string>
+  <string name="settings_sharing">Delning</string>
+  <string name="settings_sharing_map_public">Gör kartor offentliga</string>
+  <string name="settings_sharing_map_public_summary_off">Uppladdade kartor kommer inte att visas offentligt på maps.google.com</string>
+  <string name="settings_sharing_map_public_summary_on">Uppladdade kartor kommer att vara synliga för alla på maps.google.com</string>
+  <string name="settings_sharing_url_only">Dela bara länk</string>
+  <string name="settings_sharing_url_only_summary_off">Innehållet i spåret kommer också att inkluderas vid delning</string>
+  <string name="settings_title">My Tracks inställningar</string>
+  <string name="share_track_file_body_format">Jag tror att du skulle vara intresserad av det här spåret.\n\nFör att se det här spåret använd Google Earth eller något annat kartprogram.</string>
+  <string name="share_track_subject">Jag vill dela ett spår med dig</string>
+  <string name="share_track_url_body_format">Jag tror att du skulle vara intresserad av den här kartan:\n\n%s</string>
+  <string name="stat_average_moving_pace">Genomsnittlig rörligt tempo</string>
+  <string name="stat_average_moving_speed">Genomsnittlig rörlig hastighet</string>
+  <string name="stat_average_pace">Genomsnittligt tempo</string>
+  <string name="stat_average_speed">Genomsnittlig hastighet</string>
+  <string name="stat_elevation">Höjd</string>
+  <string name="stat_elevation_gain">Höjdvinst</string>
+  <string name="stat_latitude">Latitud</string>
+  <string name="stat_longitude">Longitud</string>
+  <string name="stat_max_elevation">Maxhöjd</string>
+  <string name="stat_max_grade">Maxlutning</string>
+  <string name="stat_max_speed">Maxhastighet</string>
+  <string name="stat_min_elevation">Minimihöjd</string>
+  <string name="stat_min_grade">Minimilutning</string>
+  <string name="stat_min_pace">Minimitempo</string>
+  <string name="stat_moving_time">Rörlig tid</string>
+  <string name="stat_pace">Tempo</string>
+  <string name="stat_speed">Hastighet</string>
+  <string name="stat_total_distance">Total distans</string>
+  <string name="stat_total_time">Total tid</string>
+  <string name="track_detail_activity_type">Aktivitetstyp (t ex vandring, cyckling, löpning, klättring...)</string>
+  <string name="track_detail_activity_type_hint">Aktivitetstyp</string>
+  <string name="track_detail_title">Spårdetaljer</string>
+  <string name="track_detail_track_description">Spårbeskrivning</string>
+  <string name="track_detail_track_name">Spårnamn</string>
+  <string name="track_list_clear_map">Rensa karta</string>
+  <string name="track_list_context_menu_title">Det här spåret</string>
+  <string name="track_list_delete_all">Ta bort alla spår</string>
+  <string name="track_list_delete_all_confirm_message">Alla spår och markörer kommer att tas bort från telefonen.</string>
+  <string name="track_list_delete_track">Ta bort från telefonen...</string>
+  <string name="track_list_delete_track_confirm_message">Spåret och dess markörer kommer att permanent tas bort från telefonen.</string>
+  <string name="track_list_edit_track">Ändra detaljer</string>
+  <string name="track_list_export_all">Exportera alla spår</string>
+  <string name="track_list_pick_one">Välj ett spår. Tryck &amp; håll för fler alternativ.</string>
+  <string name="track_list_save_sd">Skriv till SD-kort...</string>
+  <string name="track_list_send_google">Skicka till Google...</string>
+  <string name="track_list_share_track">Dela med vänner...</string>
+  <string name="track_list_show_on_map">Visa</string>
+  <string name="track_name_format">Spår %d</string>
+  <string name="track_record_error">Kan inte starta inspelningen. Försök igen.</string>
+  <string name="track_record_notification">Spelar in ditt spår...</string>
+  <string name="track_record_success">Spelar nu in ett nytt spår.</string>
+  <string name="unit_feet">ft</string>
+  <string name="unit_hour">tim</string>
+  <string name="unit_kilometer">km</string>
+  <string name="unit_kilometer_per_hour">km/h</string>
+  <string name="unit_meter">m</string>
+  <string name="unit_mile">mi</string>
+  <string name="unit_mile_per_hour">mi/h</string>
+  <string name="unit_minute">min</string>
+  <string name="unit_minute_per_kilometer">min/km</string>
+  <string name="unit_minute_per_mile">min/mi</string>
+  <string name="voice_hour">timme</string>
+  <string name="voice_hours">timmar</string>
+  <string name="voice_kilometer_per_hour">kilometer i timmen</string>
+  <string name="voice_kilometers">kilometer</string>
+  <string name="voice_mile_per_hour">miles i timmen</string>
+  <string name="voice_miles">miles</string>
+  <string name="voice_minute">minut</string>
+  <string name="voice_minutes">minuter</string>
+  <string name="voice_no_distance">My Tracks ingen distans</string>
+  <string name="voice_per_kilometer">per kilometer</string>
+  <string name="voice_per_mile">per mile</string>
+  <string name="voice_second">sekund</string>
+  <string name="voice_seconds">sekunder</string>
+  <string name="voice_template">My Tracks %1$.2f %2$s på %3$s i %4$s %5$s</string>
   <string name="welcome_about">Om My Tracks</string>
-
-  <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks ingen distans</string>
-  <!-- Format:
-  $1 : Distance label
-  $2 : Distance value (5)
-  $3 : Distance units (mi, km)
-  $4 : Time description (10 minutes 5 seconds)
-  $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
-  $6 : Speed units (mph) : Pace units (per mile)
-  -->
-  <string name="announce_template">My Tracks %1$s %2$.2f %3$s på %4$s i %5$s %6$s</string>
-
-  <!-- Check Units -->
-  <string name="check_units_title">Mätenheter</string>
+  <string name="welcome_title">Välkommen</string>
 </resources>
diff --git a/MyTracks/res/values-zh-rCN/arrays.xml b/MyTracks/res/values-zh-rCN/arrays.xml
deleted file mode 100644
index 0834e6f05..000000000
--- a/MyTracks/res/values-zh-rCN/arrays.xml
+++ /dev/null
@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-  <!-- Minimum recording distance -->
-  <string-array name="min_recording_distance_options">
-    <item>1 米</item>
-    <item>2 米</item>
-    <item>3 米</item>
-    <item>4 米</item>
-    <item>5 米 (推荐)</item>
-    <item>10 米</item>
-    <item>100 米</item>
-  </string-array>
-
-  <string-array name="min_recording_distance_options_ft">
-    <item>3 英尺</item>
-    <item>6 英尺</item>
-    <item>10 英尺</item>
-    <item>13 英尺</item>
-    <item>16 英尺 (推荐)</item>
-    <item>33 英尺</item>
-    <item>328 英尺</item>
-  </string-array>
-
-  <!-- Maximum recording distance -->
-  <string-array name="max_recording_distance_options">
-    <item>50 米</item>
-    <item>100 米</item>
-    <item>200 米 (推荐)</item>
-    <item>500 米</item>
-    <item>1000 米</item>
-    <item>5000 米</item>
-  </string-array>
-
-  <string-array name="max_recording_distance_options_ft">
-    <item>164 英尺</item>
-    <item>328 英尺</item>
-    <item>656 英尺 (推荐)</item>
-    <item>1640 英尺</item>
-    <item>0.6 英里</item>
-    <item>3.1 英里</item>
-  </string-array>
-
-  <!-- Minimum recording interval -->
-  <string-array name="min_recording_interval_options">
-    <item>省电 (自适应)</item>
-    <item>高精度 (自适应)</item>
-    <item>最高 (推荐)</item>
-    <item>2 秒</item>
-    <item>3 秒</item>
-    <item>4 秒</item>
-    <item>5 秒</item>
-    <item>10 秒</item>
-    <item>20 秒</item>
-    <item>30 秒</item>
-    <item>1 分钟</item>
-    <item>2 分钟</item>
-    <item>5 分钟</item>
-    <item>10 分钟</item>
-    <item>15 分钟</item>
-    <item>30 分钟</item>
-  </string-array>
-
-  <!-- Minimum required accuracy -->
-  <string-array name="min_required_accuracy_options">
-    <item>10 米 (良好的 GPS 信号)</item>
-    <item>20 米</item>
-    <item>50 米</item>
-    <item>100 米</item>
-    <item>200 米 (推荐)</item>
-    <item>500 米</item>
-    <item>1000 米</item>
-    <item>2000 米</item>
-    <item>5000 米 (糟糕的 GPS 信号)</item>
-  </string-array>
-
-  <string-array name="min_required_accuracy_options_ft">
-    <item>33 英尺 (良好的 GPS 信号)</item>
-    <item>66 英尺</item>
-    <item>165 英尺</item>
-    <item>328 英尺</item>
-    <item>656 英尺 (推荐)</item>
-    <item>1640 英尺</item>
-    <item>0.6 英里</item>
-    <item>1.2 英里</item>
-    <item>3.1 英里 (糟糕的 GPS 信号)</item>
-  </string-array>
-
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>关闭</item>
-    <item>100 千米</item>
-    <item>50 千米</item>
-    <item>25 千米</item>
-    <item>10 千米</item>
-    <item>5 千米</item>
-    <item>1 千米</item>
-    <item>60 分钟</item>
-    <item>30 分钟</item>
-    <item>15 分钟</item>
-    <item>10 分钟</item>
-    <item>5 分钟</item>
-    <item>2 分钟</item>
-    <item>1 分钟</item>
-  </string-array>
-
-  <string-array name="task_frequency_options_ft">
-    <item>关闭</item>
-    <item>100 英里</item>
-    <item>50 英里</item>
-    <item>25 英里</item>
-    <item>10 英里</item>
-    <item>5 英里</item>
-    <item>1 英里</item>
-    <item>60 分钟</item>
-    <item>30 分钟</item>
-    <item>15 分钟</item>
-    <item>10 分钟</item>
-    <item>5 分钟</item>
-    <item>2 分钟</item>
-    <item>1 分钟</item>
-  </string-array>
-
-  <!-- Auto-resume track timeout -->
-  <string-array name="auto_resume_track_timeout_options">
-    <item>从不</item>
-    <item>5 分钟</item>
-    <item>10 分钟</item>
-    <item>15 分钟</item>
-    <item>总是</item>
-  </string-array>
-
-  <!-- Other non-preference arrays -->
-  <array name="activity_types">
-    <item>未知</item>
-    <item>多种类型</item>
-    <item>其它</item>
-
-    <item>跑步</item>
-    <item>街头跑步</item>
-    <item>赛道跑步</item>
-    <item>户外跑步</item>
-    <item>行走</item>
-    <item>快步行走</item>
-    <item>徒步</item>
-    <item>沿路徒步</item>
-    <item>野外徒步</item>
-    <item>攀岩</item>
-
-    <item>骑行</item>
-    <item>道路骑行</item>
-    <item>山地骑行</item>
-    <item>赛道骑行</item>
-
-    <item>滑冰</item>
-    <item>轮滑</item>
-    <item>滑板</item>
-
-    <item>滚轮滑雪 (传统)</item>
-    <item>滚轮滑雪 (滑板)</item>
-    <item>越野滑雪 (传统)</item>
-    <item>越野滑雪 (滑板)</item>
-
-    <item>雪攀</item>
-    <item>滑雪</item>
-    <item>雪板</item>
-    <item>雪撬</item>
-    <item>浮冰</item>
-
-    <item>航海</item>
-    <item>划水</item>
-    <item>皮划艇</item>
-    <item>赛艇</item>
-    <item>摩托艇</item>
-    <item>摆渡</item>
-    <item>遥控船</item>
-    <item>冲浪</item>
-    <item>帆板</item>
-    <item>风筝冲浪</item>
-    <item>滑水</item>
-    <item>托板</item>
-
-    <item>飞机</item>
-    <item>水上飞机</item>
-    <item>商业飞机</item>
-    <item>直升机</item>
-    <item>热气球</item>
-    <item>软式飞艇</item>
-    <item>遥控飞机</item>
-    <item>遥控直升机</item>
-    <item>蹦极</item>
-    <item>滑翔</item>
-    <item>悬挂滑翔</item>
-    <item>滑翔伞</item>
-
-    <item>马术</item>
-    <item>骑马</item>
-    <item>骑驴</item>
-
-    <item>驾车</item>
-    <item>巴士</item>
-    <item>火车</item>
-    <item>摩托车</item>
-    <item>越野摩托</item>
-    <item>全地形车</item>
-
-    <item>陆帆</item>
-    <item>飞盘</item>
-    <item>极限飞盘</item>
-  </array>
-
-  <array name="waypoint_types">
-    <item>提款机</item>
-    <item>银行</item>
-    <item>酒吧</item>
-    <item>烧烤</item>
-    <item>建筑物</item>
-    <item>公交站</item>
-    <item>咖啡</item>
-    <item>营火</item>
-    <item>营地</item>
-    <item>教堂</item>
-    <item>咖啡店</item>
-    <item>便利店</item>
-    <item>饮用水</item>
-    <item>落石</item>
-    <item>渡口</item>
-    <item>明火点</item>
-    <item>消防站</item>
-    <item>钓鱼</item>
-    <item>加油站</item>
-    <item>高尔夫球场</item>
-    <item>杂货店</item>
-    <item>理发店</item>
-    <item>港口</item>
-    <item>徒步路线</item>
-    <item>宾馆</item>
-    <item>房屋</item>
-    <item>问讯处</item>
-    <item>交叉口</item>
-    <item>邮箱</item>
-    <item>超市</item>
-    <item>集合点</item>
-    <item>剧场</item>
-    <item>停车场</item>
-    <item>邮局</item>
-    <item>凹陷</item>
-    <item>警察局</item>
-    <item>铁路岔口</item>
-    <item>餐馆</item>
-    <item>购物</item>
-    <item>景点</item>
-    <item>商店</item>
-    <item>游泳池</item>
-    <item>电话</item>
-    <item>剧院</item>
-    <item>厕所</item>
-    <item>游客咨询点</item>
-    <item>隧道</item>
-    <item>树</item>
-    <item>瀑布</item>
-    <item>水泉</item>
-    <item>路点</item>
-  </array>
-
-</resources>
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index ff8205959..05765b4e1 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -15,460 +15,232 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Used by the Menu -->
-  <string name="start_recording">记录轨迹</string>
-  <string name="stop_recording">停止记录</string>
-  <string name="switch_to_sat">卫星图模式</string>
-  <string name="switch_to_map">地图模式</string>
-  <string name="mylocation">我的位置</string>
-  <string name="list_tracks">轨迹列表</string>
-  <string name="list_markers">标记</string>
-  <string name="delete_all_tracks">删除所有轨迹</string>
-  <string name="settings">设置</string>
-  <string name="elevation">海拔</string>
-  <string name="choose_track_message">请选择要查看的轨迹</string>
-  <string name="current_track">当前轨迹</string>
-  <string name="current_segment">上一段轨迹</string>
-  <string name="sensor_state">感应器状态</string>
-  <string name="aggregated_stats">累积统计</string>
-
-  <!-- Error messages -->
-  <string name="error_no_location_manager">此设备上没有位置管理器!</string>
-  <string name="error_no_gps">此设备上没有 GPS 定位装置.</string>
-  <string name="error_sending_to_my_maps">发送轨迹到 Google My Map 时发生错误.</string>
-  <string name="error_sending_to_fusion_tables">发送轨迹到 Google Fusion Tables 时发生错误. 请稍后重试.</string>
-  <string name="error_sending_to_docs">发送轨迹到 Google Docs 时发生错误. 请稍后重试.</string>
-  <string name="error_sending_generic">请稍后再试.</string>
-  <string name="error_unable_to_start_recording">无法开始记录. 请重试.</string>
-  <string name="error_unable_to_stop_recording">无法停止记录. 请重试.</string>
-  <string name="error_import_unable_to_read_file">无法读取文件.</string>
-  <string name="error_import_invalid_gpx_format">文件不是有效的 GPX 格式.</string>
-  <string name="error_import_generic">发生错误. 请重试.</string>
-  <string name="error_export_track_does_not_exist">轨迹不存在.</string>
-  <string name="error_export_operation_canceled">操作已被取消.</string>
-  <string name="error_import_out_of_memory">文件太大 (必须小于 500 KB). 中止操作.</string>
-  <string name="error_unable_to_insert_marker">无法插入标记. 定位尚未完成.</string>
-
-  <!-- Status messages -->
-  <string name="status_wait_for_gps_fix">等待更准确的 GPS 定位. 请确定可以看见天空.</string>
-  <string name="status_now_recording">现在开始记录新的轨迹.</string>
-  <string name="status_stopped_recording">停止记录你的轨迹.</string>
-  <string name="sending_to_google_additional_info">可能需要等待几分钟才能看见新的轨迹.</string>
-  <string name="status_need_to_enable_gps">请点击这里进入\'安全和位置设置\'并勾选上\'启用 GPS 卫星\'. 然后用后退键返回.</string>
-  <string name="status_approximate_current_location">注意: 当前显示的位置是根据无线信号和无线网络计算的近似位置.</string>
-  <string name="status_no_current_location">目前无法定位. 请启用更多的位置来源 (在\'安全和位置设置\'中) 并确认天空是可见的. 再重试.</string>
-  <string name="status_waypoint_inserted">插入了一个路点标记.</string>
-  <string name="status_marker_inserted">插入了一个统计标记.</string>
-  <string name="sending_to_google_upload_status">上传状态:</string>
-
-  <!-- Progress dialog -->
-  <string name="progress_title">请稍候...</string>
-  <string name="progress_message">发送你的轨迹到 Google.</string>
-  <string name="progress_message_reading_track">读取轨迹中...</string>
-  <string name="progress_message_preparing_track">准备轨迹中...</string>
-  <string name="progress_message_authenticating_fusion_tables">登录 Google Fusion Tables 中...</string>
-  <string name="progress_message_authenticating_docs">登录 Google Docs 中...</string>
-  <string name="progress_message_sending_docs">发送轨迹到 Google Docs 中...</string>
-  <string name="progress_message_sending_fusion_tables">发送轨迹到 Google Fusion Tables 中...</string>
-  <string name="progress_message_creating_fusion_table">创建新的 Fusion Table 中...</string>
-  <string name="progress_message_creating_map">创建新的 My Map...</string>
-  <string name="progress_message_sending_fusion_tables">发送轨迹到 Fusion Tables...</string>
-  <string name="progress_message_creating_fusion_table">创建新的 Fusion table...</string>
-  <string name="progress_message_import">导入 GPS 轨迹中. 请稍候.</string>
-  <string name="progress_message_export">写入文件到 SD 卡中. 请稍候.</string>
-  <string name="progress_message_updating_track">更新轨迹统计信息中...</string>
-
-  <!-- Used by DeleteAllDataHandler -->
-  <string name="confirmation_title_are_you_sure">请确认</string>
-  <string name="all_data_will_be_permanently_deleted">所以轨迹和标记都将被从本机删除.</string>
-  <string name="track_will_be_permanently_deleted">选定轨迹和它相关的标记都将被从本机彻底删除.</string>
-  <string name="marker_will_be_permanently_deleted">选定标记将被从本机删除.</string>
-
-  <!-- Text and links when uploading to Google Fusion Tables -->
-  <string name="new_map_description">由 Android 平台的 My Tracks 创建.</string>
-  <string name="new_map_title">新地图</string>
-
-  <!-- Formatting of track and marker descriptions -->
-  <string name="points">路点</string>
-  <string name="recorded_date">记录日期</string>
-  <string name="category">活动类型</string>
-  <string name="waypoint_category">标记类型</string>
-  <string name="track_part_format">(第 %d 部分)</string>
-
-  <!-- Used by the track recording service -->
-  <string name="recording_your_track">记录轨迹中...</string>
-  <string name="new_track_format">轨迹 %d</string>
-
-  <!-- Common -->
-  <string name="no">否</string>
-  <string name="yes">是</string>
-  <string name="ok">确定</string>
-  <string name="error">错误</string>
-  <string name="success">成功</string>
-  <string name="waypoint">路点</string>
-  <string name="license">授权</string>
-  <string name="cancel">取消</string>
-  <string name="save">保存</string>
-
-  <!-- Placemark labels for start and end of track -->
-  <string name="start">(开始)</string>
-  <string name="end">(结束)</string>
-
-  <!--  TrackList -->
-  <string name="tracklist_show_track">显示</string>
-  <string name="tracklist_send_to_mymaps">发送到 Google My Maps</string>
-  <string name="tracklist_send_to_new_mymap">发送到新建的 Google My Map</string>
-  <string name="tracklist_send_to_fusiontables">发送到 Google Fusion Table</string>
-  <string name="tracklist_send_to_new_fusiontable">发送到新建的 Google Fusion Table</string>
-  <string name="tracklist_send_to_docs">发送到 Google Docs</string>
-  <string name="tracklist_send_to_google">发送到 Google...</string>
-  <string name="tracklist_delete_track">从手机上删除...</string>
-  <string name="tracklist_edit_track">编辑详细信息</string>
-  <string name="tracklist_write_to_sd">保存到 SD 卡...</string>
-  <string name="tracklist_save_as_gpx">保存为 GPX 文件</string>
-  <string name="tracklist_save_as_kml">保存为 KML 文件</string>
-  <string name="tracklist_save_as_csv">保存为 CSV 文件</string>
-  <string name="tracklist_save_as_tcx">保存为 TCX 文件</string>
-  <string name="tracklist_btn_send_all_to_fusiontables">发送到 Google Fusion Tables</string>
-  <string name="tracklist_btn_send_all_to_mymaps">发送到 Google My Maps</string>
-  <string name="tracklist_btn_delete_all">删除所有轨迹</string>
-  <!-- Export All -->
-  <string name="tracklist_btn_export_all">导出所有轨迹</string>
-  <string name="export_done">导出完毕</string>
-  <string name="tracklist_pick_one">选择一个轨迹. 长按弹出操作菜单.</string>
-  <string name="tracklist_all_tracks">全部轨迹:</string>
-  <string name="tracklist_this_track">此轨迹</string>
-  <string name="tracklist_share_track">与朋友分享...</string>
-  <string name="tracklist_share_link">访问地图的超链接</string>
-  <string name="tracklist_share_gpx_file">GPX 文件</string>
-  <string name="tracklist_share_kml_file">KML 文件</string>
-  <string name="tracklist_share_csv_file">CSV 文件</string>
-  <string name="tracklist_share_tcx_file">TCX 文件</string>
-  <string name="tracklist_clear_map">清除地图</string>
-  <!-- Import All -->
-  <string name="tracklist_btn_import_all">全部导入</string>
-  <!-- Format:
-  $1 : Successful imports
-  $2 : Attempted imports
-  $3 : MyTracks gpx path
-  -->
-  <string name="import_done">已从 %3$s 导入 %1$d 个 GPX 文件, 共 %2$d 个.</string>
-  <string name="import_empty">在 %s 中未找到 GPX 文件. SD 存储卡不可用或者目录中没有 GPX 文件.</string>
-  <string name="import_error">导入文件 %s 出错.</string>
-
-  <!-- Waypoints list -->
-  <string name="waypointslist_btn_delete_all">删除所有标记</string>
-  <string name="waypointslist_this_waypoint">此标记</string>
-  <string name="waypointslist_delete_waypoint">删除</string>
-  <string name="waypointslist_edit_waypoint">编辑详情</string>
-  <string name="waypointslist_show_waypoint">在地图上显示</string>
-  <string name="waypointslist_btn_insert_waypoint">插入路点</string>
-  <string name="waypointslist_btn_insert_statistics">插入统计信息</string>
-  <string name="waypointslist_pick_one">选择一个标记. 长按弹出操作菜单.</string>
-
-  <!-- MyTracks Details -->
-  <string name="trackdetails_title">轨迹详细信息</string>
-  <string name="trackdetails_name">轨迹名称</string>
-  <string name="trackdetails_name_hint">轨迹名称</string>
-  <string name="trackdetails_description">轨迹描述</string>
-  <string name="trackdetails_description_hint">轨迹描述</string>
-  <string name="trackdetails_category">活动类型 (例如: 徒步, 骑行, 跑步, 攀岩...)</string>
-  <string name="trackdetails_category_hint">活动类型</string>
-
-  <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">标记详细信息</string>
-  <string name="waypointdetails_name">标记名称</string>
-  <string name="waypointdetails_name_hint">标记名称</string>
-  <string name="waypointdetails_description">标记描述</string>
-  <string name="waypointdetails_description_hint">标记描述</string>
-  <string name="waypointdetails_category">标记类型 (例如: 建筑, 陷坑, 景点...)</string>
-  <string name="waypointdetails_category_hint">标记类型</string>
-
-  <!-- MyTracks Settings -->
-  <string name="settings_title">My Tracks 设置</string>
-  <string name="settings_display">显示</string>
-  <string name="settings_recording">记录</string>
-  <string name="settings_sharing">分享</string>
-
-  <string name="settings_announcement_frequency_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_min_recording_distance">最小记录间距</string>
-  <string name="settings_min_recording_distance_summary">位置记录的最小间隔距离</string>
-
-  <string name="settings_max_recording_distance">最大记录间距</string>
-  <string name="settings_max_recording_distance_summary">如果记录点之间的距离大于这个值, 轨迹将被切割</string>
-
-  <string name="settings_min_recording_interval">最小记录时间间隔</string>
-  <string name="settings_min_recording_interval_summary">记录位置的最小时间间隔</string>
-
-  <string name="settings_min_required_accuracy">最小精度</string>
-  <string name="settings_min_required_accuracy_summary">如果位置信息达不到此精度, 记录将被暂停</string>
-
-  <string name="settings_metric_units">使用公制单位</string>
-  <string name="settings_metric_units_summary_on">所有的距离都将以公制单位显示</string>
-  <string name="settings_metric_units_summary_off">所有的距离都将以英制单位显示</string>
-
-  <string name="settings_map_public">公开地图</string>
-  <string name="settings_map_public_summary_on">上传的地图将对所有 maps.google.com 访问者可见</string>
-  <string name="settings_map_public_summary_off">上传的地图不会在 maps.google.com 上公开</string>
-
-  <string name="settings_report_speed_or_pace">显示速度</string>
-  <string name="settings_report_speed_or_pace_summary_on">显示速度信息</string>
-  <string name="settings_report_speed_or_pace_summary_off">显示步速</string>
-
-  <string name="settings_share_url_only">只分享 URL</string>
-  <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_auto_resume_track_timeout">自动恢复追踪等待时间</string>
-  <string name="settings_auto_resume_track_timeout_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_reset">恢复默认值</string>
-  <string name="settings_reset_summary">将所有设置恢复到默认值</string>
-  <string name="settings_reset_dialog_message">你的所有设置都将恢复到默认值. 已保存的轨迹不会丢失. 确定要继续吗?</string>
-  <string name="settings_reset_done">所有设置已恢复到默认值.</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_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_modular_stats_display_title">模块化状态显示</string>
-
-  <!-- Backups -->
-  <string name="settings_backup">备份 (测试版)</string>
-  <string name="settings_sd_backup">SD 存储卡备份</string>
-  <string name="settings_backup_to_sd">立即备份</string>
-  <string name="settings_backup_to_sd_summary">将你所有轨迹和设置的完整备份写入到 SD 存储卡</string>
-  <string name="settings_restore_from_sd">立即恢复</string>
-  <string name="settings_restore_from_sd_summary">从 SD 存储卡恢复所有轨迹和设置</string>
-
-  <string name="restore_overwrites_warning">从 SD 存储卡恢复备份数据将覆盖掉你当前的所有轨迹和设置. 确定要继续吗?</string>
-  <string name="select_backup_to_restore">请选择要恢复的备份文件</string>
-  <string name="no_backups">没有找到备份文件.</string>
-  <string name="backup_write_progress_message">将所有轨迹和设置写入 SD 存储卡中. 这需要一些时间...</string>
-  <string name="backup_import_progress_message">从 SD 存储卡读取轨迹和设置中. 这需要一些时间...</string>
-
-  <!-- MyTracksSky -->
-  <string name="mytracks_sky">GPS 卫星</string>
-
-  <!-- My Maps -->
-  <string name="select_map_message">从你的帐号中选择一个地图:</string>
-  <string name="create_new_map">创建新地图...</string>
-  <string name="map_list_title">发送到 Google My Maps</string>
-  <string name="maps_list_loading">载入地图中...</string>
-  <string name="maps_list_failed">现在无法载入你的地图!</string>
-  <string name="open_map">选择此地图</string>
-  <string name="edit_map_details">编辑地图详细信息</string>
-  <string name="share_track_url">分享轨迹</string>
-  <string name="delete_map">从你的帐号删除地图</string>
-  <string name="map_title">地图标题:</string>
-  <string name="map_description">地图描述:</string>
-  <string name="map_searchable_edit">让此地图和它的内容出现在搜索结果中</string>
-  <string name="map_not_searchable_edit">不要让这个地图的的内容出现在搜索结果中, 但其它用户依然可以通过直接 URL 访问它</string>
-  <string name="map_searchable">此地图和它的内容将在搜索结果中出现</string>
-  <string name="map_not_searchable">此地图和它的内容不会在搜索结果中出现, 但其它用户依然可以通过直接 URL 访问它</string>
-
-  <!-- Sharing -->
-  <string name="share_track_picker_title">与朋友分享地图</string>
-  <string name="share_map_subject">我想与你分享一张地图</string>
-  <string name="share_track_url_body_format">我想你可能会对这个地图感兴趣:
-
-      %s</string>
-  <string name="share_track_subject">我想与你分享一条轨迹</string>
-  <string name="share_track_file_body_format">我想你可能会对这条轨迹感兴趣.
-
-    请用 Google Earth 或其它地图软件查看此轨迹.</string>
-
-  <!-- Visibility -->
-  <string name="public_map">公开</string>
-  <string name="unlisted_map">未公布</string>
-  <string name="mapslist_no_maps_available">你还没有保存任何地图.</string>
-
-  <!-- Statistics View -->
-  <!-- Average Moving -->
-  <string name="average_moving_speed_label">平均移动速度</string>
-  <string name="average_moving_pace_label">平均移动步速</string>
-
-  <!-- Average -->
-  <string name="average_speed_label">平均速度</string>
-  <string name="average_pace_label">平均步速</string>
-
-  <string name="elevation_chart_name">海拔图表</string>
-  <string name="elevation_gain_label">爬升</string>
-  <string name="elevation_label">海拔</string>
-  <string name="latitude_label">纬度</string>
-  <string name="longitude_label">经度</string>
-
-  <!-- Min -->
-  <string name="min_elevation_label">最小海拔</string>
-  <string name="min_grade_label">最小落差</string>
-  <string name="min_pace_label">最小步速</string>
-
-  <!-- Max -->
-  <string name="max_elevation_label">最大海拔</string>
-  <string name="max_grade_label">最大落差</string>
-  <string name="max_speed_label">最大速度</string>
-
-  <string name="loading_track">载入轨迹中...</string>
-
-  <!-- Chart Settings -->
-  <string name="chart_settings">图表设置</string>
-  <!-- X Axis -->
-  <string name="x_axis">横轴</string>
-  <string name="by_distance">按距离显示</string>
-  <string name="by_time">按时间显示</string>
-
-  <!-- Y Axis -->
-  <string name="y_axis">纵轴</string>
-
-  <!-- Units -->
-  <!-- Time  -->
-  <string name="voice_hour">小时</string>
-  <string name="voice_hours">小时</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>
-  <string name="voice_seconds">秒</string>
-
-  <!-- Distance -->
-  <string name="voice_kilometers">千米</string>
-  <string name="voice_miles">英里</string>
-
-  <!-- Speed and Pace -->
-  <string name="voice_kilometer_per_hour">千米每小时</string>
-  <string name="voice_per_kilometer">每千米</string>
-  <string name="voice_mile_per_hour">英里每小时</string>
-  <string name="voice_per_mile">每英里</string>
-
-  <!-- Stats Labels -->
-  <string name="moving_time_label">移动时间</string>
-  <string name="total_time_label">总时间</string>
-  <string name="time_label">时间</string>
-  <string name="sd_unavail">没有 SD 卡</string>
-  <string name="speed">速度</string>
-  <string name="start_trip">你必须先记录轨迹.</string>
-  <string name="statistics">统计</string>
-  <string name="total_distance_label">总距离</string>
-  <string name="distance_label">距离</string>
-  <string name="power">电源</string>
-  <string name="cadence">节奏</string>
-  <string name="heart_rate">心率</string>
-  <string name="max_heart_rate">最大心率</string>
-  <string name="waiting">请稍候...</string>
-
-  <!-- End User License Agreement -->
-  <string name="eula_title">最终用户协议</string>
-  <string name="accept">同意</string>
-  <string name="decline">拒绝</string>
-
-  <!-- About -->
-  <string name="about">关于</string>
-  <string name="help">帮助</string>
+  <string name="about_license">授权</string>
+  <string name="about_privacy">隐私策略:</string>
+  <string name="about_support">技术支持:</string>
   <string name="about_team">开发团队:</string>
   <string name="about_version">版本:</string>
-  <string name="about_support">技术支持:</string>
-  <string name="about_privacy">隐私策略:</string>
-
-  <!-- Send to Google -->
-  <string name="sendtogoogle_title">发送到...</string>
-  <string name="sendtogoogle_send_now">立即发送</string>
-  <string name="sendtogoogle_create_new_map">创建新地图</string>
-  <string name="sendtogoogle_pick_existing_map">选择已有地图</string>
-  <string name="sendtogoogle_send_stats">发送轨迹统计信息</string>
-  <string name="sendtogoogle_send_stats_and_points">发送统计信息和路点</string>
-
-  <!-- Getting the account to upload to. -->
-  <string name="no_account_found_title">没有帐户</string>
-  <string name="no_account_found">没有可用于上传轨迹的帐户.</string>
-  <string name="choose_account_title">选择帐户</string>
-
-  <!-- SD card -->
-  <string name="io_no_external_storage_found">没有发现存储设备. 请确认插入了 SD 存储卡并且你的手机没有将挂载 SD 卡到电脑.</string>
-  <string name="io_write_failed">无法写入文件.</string>
-  <string name="io_create_dir_failed">无法在 SD 存储卡上创建目录.</string>
-  <string name="io_create_dir_failed">无法在 SD 存储卡上创建目录card.</string>
-  <string name="io_write_finished">轨迹已导出到 SD 存储卡.</string>
-  <string name="io_read_finished">从 SD 存储卡读取完毕.</string>
-
-  <!-- VersionChecker -->
-  <string name="version_check_title">检查更新</string>
-  <string name="version_check_upgrade_button">立即更新</string>
-  <string name="version_check_continue_button">放弃更新并继续</string>
-  <string name="upgrade_required">你所使用的 %1$s 版本可能无法继续正常工作, 技术支持也将结束. 请升级以便继续使用 %1$s.</string>
-  <string name="upgrade_recommended">你所使用的 %1$s 版本可能无法继续正常工作. 你可以现在就更新它, 或者自负风险继续使用. 一些如服务器同步之类的功能在更新前可能不能使用.</string>
-  <string name="upgrade_available">%1$s 的新版本已经发布. 你可以继续使用现在的版本, 但在更新前无法使用到最新的功能.</string>
-
-  <!-- Welcome -->
-  <string name="welcome">欢迎</string>
-  <string name="welcome_read_later">确定</string>
-  <string name="welcome_about">关于 My Tracks</string>
-
-  <!-- Announcement -->
-  <string name="announce_no_distance">My Tracks 无距离</string>
-  <!-- Format:
-  $1 : Distance label
-  $2 : Distance value (5)
-  $3 : Distance units (mi, km)
-  $4 : Time description (10 minutes 5 seconds)
-  $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
-  $6 : Speed units (mph) : Pace units (per mile)
-  -->
-  <string name="announce_template">My Tracks %1$s %2$.2f %3$s 用时 %4$s 速度 %5$s %6$s</string>
-
-  <!-- Check Units -->
-  <string name="check_units_title">测量单位提示</string>
-
-  <!-- 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="chart_settings_by_distance">按距离显示</string>
+  <string name="chart_settings_by_time">按时间显示</string>
+  <string name="chart_settings_x_axis">横轴</string>
+  <string name="chart_settings_y_axis">纵轴</string>
+  <string name="eula_accept">同意</string>
+  <string name="eula_decline">拒绝</string>
+  <string name="eula_title">最终用户协议</string>
+  <string name="export_canceled">操作已被取消.</string>
+  <string name="export_progress_message">写入文件到 SD 卡中. 请稍候.</string>
+  <string name="export_success">导出完毕</string>
+  <string name="generic_cancel">取消</string>
+  <string name="generic_confirm_title">请确认</string>
+  <string name="generic_error_title">错误</string>
+  <string name="generic_no">否</string>
+  <string name="generic_ok">确定</string>
+  <string name="generic_progress_title">请稍候...</string>
+  <string name="generic_save">保存</string>
+  <string name="generic_success_title">成功</string>
+  <string name="generic_yes">是</string>
+  <string name="gps_need_to_enable">请点击这里进入\'安全和位置设置\'并勾选上\'启用 GPS 卫星\'. 然后用后退键返回.</string>
+  <string name="gps_not_found">此设备上没有 GPS 定位装置.</string>
+  <string name="gps_wait_for_fix">等待更准确的 GPS 定位. 请确定可以看见天空.</string>
+  <string name="import_error">导入文件 %s 出错.</string>
+  <string name="import_no_file">在 %s 中未找到 GPX 文件. SD 存储卡不可用或者目录中没有 GPX 文件.</string>
+  <string name="import_success">已从 %3$s 导入 %1$d 个 GPX 文件, 共 %2$d 个.</string>
+  <string name="marker_detail_marker_description">标记描述</string>
+  <string name="marker_detail_marker_name">标记名称</string>
+  <string name="marker_detail_marker_type">标记类型 (例如: 建筑, 陷坑, 景点...)</string>
+  <string name="marker_detail_marker_type_hint">标记类型</string>
+  <string name="marker_detail_title">标记详细信息</string>
+  <string name="marker_insert_error">无法插入标记. 定位尚未完成.</string>
+  <string name="marker_insert_success">插入了一个统计标记.</string>
+  <string name="marker_label_end">(结束)</string>
+  <string name="marker_label_start">(开始)</string>
+  <string name="marker_list_context_menu_title">此标记</string>
+  <string name="marker_list_delete_marker">删除</string>
+  <string name="marker_list_delete_marker_confirm_message">选定标记将被从本机删除.</string>
+  <string name="marker_list_edit_marker">编辑详情</string>
+  <string name="marker_list_insert_statistics">插入统计信息</string>
+  <string name="marker_list_insert_waypoint">插入路点</string>
+  <string name="marker_list_pick_one">选择一个标记. 长按弹出操作菜单.</string>
+  <string name="marker_list_show_on_map">在地图上显示</string>
+  <string name="marker_type_statistics">统计</string>
+  <string name="marker_type_waypoint">路点</string>
+  <string name="menu_aggregated_statistics">累积统计</string>
+  <string name="menu_chart_view_chart_settings">图表设置</string>
+  <string name="menu_help">帮助</string>
+  <string name="menu_map_view_map_mode">地图模式</string>
+  <string name="menu_map_view_my_location">我的位置</string>
+  <string name="menu_map_view_satellite_mode">卫星图模式</string>
+  <string name="menu_markers">标记</string>
+  <string name="menu_record_track">记录轨迹</string>
+  <string name="menu_sensor_state">感应器状态</string>
+  <string name="menu_settings">设置</string>
+  <string name="menu_stop_recording">停止记录</string>
+  <string name="menu_tracks">轨迹列表</string>
+  <string name="my_location_approximate_location">注意: 当前显示的位置是根据无线信号和无线网络计算的近似位置.</string>
+  <string name="my_location_no_location">目前无法定位. 请启用更多的位置来源 (在\'安全和位置设置\'中) 并确认天空是可见的. 再重试.</string>
+  <string name="my_maps_list_error">现在无法载入你的地图!</string>
+  <string name="my_maps_list_loading">载入地图中...</string>
+  <string name="my_maps_list_no_maps">你还没有保存任何地图.</string>
+  <string name="my_maps_list_pick_map">从你的帐号中选择一个地图:</string>
+  <string name="my_maps_list_public_label">公开</string>
+  <string name="my_maps_list_title">发送到 Google My Maps</string>
+  <string name="my_maps_list_unlisted_label">未公布</string>
+  <string name="sd_card_error_create_dir">无法在 SD 存储卡上创建目录.</string>
+  <string name="sd_card_error_no_storage">没有发现存储设备. 请确认插入了 SD 存储卡并且你的手机没有将挂载 SD 卡到电脑.</string>
+  <string name="sd_card_error_write_file">无法写入文件.</string>
+  <string name="sd_card_success_read_file">从 SD 存储卡读取完毕.</string>
+  <string name="sd_card_success_write_file">轨迹已导出到 SD 存储卡.</string>
+  <string name="send_google_choose_account_title">选择帐户</string>
+  <string name="send_google_existing_map">选择已有地图</string>
+  <string name="send_google_new_map">创建新地图</string>
+  <string name="send_google_no_account_message">没有可用于上传轨迹的帐户.</string>
+  <string name="send_google_no_account_title">没有帐户</string>
+  <string name="send_google_progress_preparing_track">准备轨迹中...</string>
+  <string name="send_google_progress_reading_track">读取轨迹中...</string>
+  <string name="send_google_recorded">记录日期</string>
+  <string name="send_google_result_header">上传状态:</string>
+  <string name="send_google_result_share_url">分享轨迹</string>
+  <string name="send_google_send_now">立即发送</string>
+  <string name="send_google_success_footer">可能需要等待几分钟才能看见新的轨迹.</string>
+  <string name="send_google_title">发送到...</string>
+  <string name="send_google_track_part_label">(第 %d 部分)</string>
+  <string name="sensor_state_cadence">节奏</string>
+  <string name="sensor_state_connected">已连接</string>
+  <string name="sensor_state_connecting">连接中</string>
+  <string name="sensor_state_disconnected">未连接</string>
+  <string name="sensor_state_heart_rate">心率</string>
+  <string name="sensor_state_last_sensor_time">感应器数据时间</string>
+  <string name="sensor_state_power">电源</string>
+  <string name="sensor_state_sending">发送中</string>
+  <string name="settings_backup">备份 (测试版)</string>
+  <string name="settings_backup_now">立即备份</string>
+  <string name="settings_backup_now_progress_message">将所有轨迹和设置写入 SD 存储卡中. 这需要一些时间...</string>
+  <string name="settings_backup_now_summary">将你所有轨迹和设置的完整备份写入到 SD 存储卡</string>
+  <string name="settings_backup_restore">立即恢复</string>
+  <string name="settings_backup_restore_confirm_message">从 SD 存储卡恢复备份数据将覆盖掉你当前的所有轨迹和设置. 确定要继续吗?</string>
+  <string name="settings_backup_restore_no_backup">没有找到备份文件.</string>
+  <string name="settings_backup_restore_progress_message">从 SD 存储卡读取轨迹和设置中. 这需要一些时间...</string>
+  <string name="settings_backup_restore_select_title">请选择要恢复的备份文件</string>
+  <string name="settings_backup_restore_summary">从 SD 存储卡恢复所有轨迹和设置</string>
+  <string name="settings_backup_sd_card">SD 存储卡备份</string>
+  <string name="settings_display">显示</string>
+  <string name="settings_display_metric">使用公制单位</string>
+  <string name="settings_display_metric_summary_off">所有的距离都将以英制单位显示</string>
+  <string name="settings_display_metric_summary_on">所有的距离都将以公制单位显示</string>
+  <string name="settings_display_speed">显示速度</string>
+  <string name="settings_display_speed_summary_off">显示步速</string>
+  <string name="settings_display_speed_summary_on">显示速度信息</string>
+  <string name="settings_not_while_recording">在记录轨迹时不可用</string>
+  <string name="settings_recording">记录</string>
+  <string name="settings_recording_auto_resume">自动恢复追踪等待时间</string>
+  <string name="settings_recording_auto_resume_summary">手机重启后自动继续上次轨迹记录的最大间隔时间</string>
+  <string name="settings_recording_distance">最小记录间距</string>
+  <string name="settings_recording_distance_summary">位置记录的最小间隔距离</string>
+  <string name="settings_recording_gps_accuracy">最小精度</string>
+  <string name="settings_recording_gps_accuracy_summary">如果位置信息达不到此精度, 记录将被暂停</string>
+  <string name="settings_recording_interval">最小记录时间间隔</string>
+  <string name="settings_recording_interval_summary">记录位置的最小时间间隔</string>
+  <string name="settings_recording_marker">切割频度</string>
+  <string name="settings_recording_marker_summary">插入新切割标记所需要达到的最大时间或距离</string>
+  <string name="settings_recording_name">使用时间作为轨迹名称</string>
+  <string name="settings_recording_name_summary_off">轨迹使用自动递增的数字进行命名.</string>
+  <string name="settings_recording_name_summary_on">使用轨迹记录的开始时间作为默认名称</string>
+  <string name="settings_recording_track_distance">最大记录间距</string>
+  <string name="settings_recording_track_distance_summary">如果记录点之间的距离大于这个值, 轨迹将被切割</string>
+  <string name="settings_recording_voice">通知频度</string>
+  <string name="settings_recording_voice_not_available">不支持当前使用的 Android 版本</string>
+  <string name="settings_recording_voice_summary">语音通知的最小时间间隔</string>
+  <string name="settings_reset">恢复默认值</string>
+  <string name="settings_reset_dialog_message">你的所有设置都将恢复到默认值. 已保存的轨迹不会丢失. 确定要继续吗?</string>
+  <string name="settings_reset_done">所有设置已恢复到默认值.</string>
+  <string name="settings_reset_summary">将所有设置恢复到默认值</string>
   <string name="settings_sensor">感应器选项</string>
-
-  <!-- Bluetooth Sensor -->
-  <string name="bluetooth_connected">连接到 %s</string>
-  <string name="bluetooth_connecting">蓝牙感应器连接中 ...</string>
-  <string name="bluetooth_not_connected">未连接蓝牙感应器</string>
-
-  <!-- Sensor State -->
-  <string name="sensor_data_time">感应器数据时间</string>
-  <string name="power_meter_enabled">电源计量器已启用</string>
-  <string name="heart_rate_monitor_enabled">心率监视器已启用</string>
-  <string name="no_sensor_manager">没有感应器管理器</string>
-  <string name="enabled">已启用</string>
-  <string name="connecting">连接中</string>
-  <string name="connected">已连接</string>
-  <string name="disconnected">未连接</string>
-  <string name="no_sensor_service">没有感应器服务</string>
-  <string name="searching">搜索中</string>
-  <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_ant_not_paired">ANT 感应器未关联</string>
+  <string name="settings_sensor_ant_paired">ANT 感应器已关联到: %d</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_bluetooth_sensor">蓝牙感应器</string>
+  <string name="settings_sensor_bluetooth_sensor_summary">想要连接的蓝牙感应器</string>
+  <string name="settings_sensor_type">感应器类型</string>
+  <string name="settings_sensor_type_ant">ANT+ 感应器</string>
+  <string name="settings_sensor_type_none">无</string>
+  <string name="settings_sensor_type_polar">Polar Bluetooth</string>
+  <string name="settings_sensor_type_srm">SRM ANT+ 转接器</string>
+  <string name="settings_sensor_type_summary">要连接到的感应器类型</string>
+  <string name="settings_sensor_type_zephyr">Zephyr 蓝牙设备</string>
+  <string name="settings_sensor_unpair_ant">清除 ANT 心率计的设备关联</string>
+  <string name="settings_sensor_unpair_srm">清除 ANT SRM 桥接感应器的设备关联</string>
+  <string name="settings_sharing">分享</string>
+  <string name="settings_sharing_map_public">公开地图</string>
+  <string name="settings_sharing_map_public_summary_off">上传的地图不会在 maps.google.com 上公开</string>
+  <string name="settings_sharing_map_public_summary_on">上传的地图将对所有 maps.google.com 访问者可见</string>
+  <string name="settings_sharing_url_only">只分享 URL</string>
+  <string name="settings_sharing_url_only_summary_off">在分享时也包括轨迹的内容</string>
+  <string name="settings_title">My Tracks 设置</string>
+  <string name="share_track_file_body_format">我想你可能会对这条轨迹感兴趣.\n\n请用 Google Earth 或其它地图软件查看此轨迹.</string>
+  <string name="share_track_picker_title">与朋友分享地图</string>
+  <string name="share_track_subject">我想与你分享一条轨迹</string>
+  <string name="share_track_url_body_format">我想你可能会对这个地图感兴趣:\n\n%s</string>
+  <string name="stat_average_moving_pace">平均移动步速</string>
+  <string name="stat_average_moving_speed">平均移动速度</string>
+  <string name="stat_average_pace">平均步速</string>
+  <string name="stat_average_speed">平均速度</string>
+  <string name="stat_elevation">海拔</string>
+  <string name="stat_elevation_gain">爬升</string>
+  <string name="stat_latitude">纬度</string>
+  <string name="stat_longitude">经度</string>
+  <string name="stat_max_elevation">最大海拔</string>
+  <string name="stat_max_grade">最大落差</string>
+  <string name="stat_max_speed">最大速度</string>
+  <string name="stat_min_elevation">最小海拔</string>
+  <string name="stat_min_grade">最小落差</string>
+  <string name="stat_min_pace">最小步速</string>
+  <string name="stat_moving_time">移动时间</string>
+  <string name="stat_pace">节奏</string>
+  <string name="stat_speed">速度</string>
+  <string name="stat_total_distance">总距离</string>
+  <string name="stat_total_time">总时间</string>
+  <string name="track_detail_activity_type">活动类型 (例如: 徒步, 骑行, 跑步, 攀岩...)</string>
+  <string name="track_detail_activity_type_hint">活动类型</string>
+  <string name="track_detail_title">轨迹详细信息</string>
+  <string name="track_detail_track_description">轨迹描述</string>
+  <string name="track_detail_track_name">轨迹名称</string>
+  <string name="track_list_clear_map">清除地图</string>
+  <string name="track_list_context_menu_title">此轨迹</string>
+  <string name="track_list_delete_all">删除所有轨迹</string>
+  <string name="track_list_delete_all_confirm_message">所以轨迹和标记都将被从本机删除.</string>
+  <string name="track_list_delete_track">从手机上删除...</string>
+  <string name="track_list_delete_track_confirm_message">选定轨迹和它相关的标记都将被从本机彻底删除.</string>
+  <string name="track_list_edit_track">编辑详细信息</string>
+  <string name="track_list_export_all">导出所有轨迹</string>
+  <string name="track_list_import_all">全部导入</string>
+  <string name="track_list_pick_one">选择一个轨迹. 长按弹出操作菜单.</string>
+  <string name="track_list_save_sd">保存到 SD 卡...</string>
+  <string name="track_list_send_google">发送到 Google...</string>
+  <string name="track_list_share_track">与朋友分享...</string>
+  <string name="track_list_share_url">访问地图的超链接</string>
+  <string name="track_list_show_on_map">显示</string>
+  <string name="track_name_format">轨迹 %d</string>
+  <string name="track_record_error">无法开始记录. 请重试.</string>
+  <string name="track_record_notification">记录轨迹中...</string>
+  <string name="track_record_success">现在开始记录新的轨迹.</string>
+  <string name="unit_hour">时</string>
+  <string name="unit_minute">分</string>
+  <string name="voice_hour">小时</string>
+  <string name="voice_hours">小时</string>
+  <string name="voice_kilometer_per_hour">千米每小时</string>
+  <string name="voice_kilometers">千米</string>
+  <string name="voice_mile_per_hour">英里每小时</string>
+  <string name="voice_miles">英里</string>
+  <string name="voice_minute">分钟</string>
+  <string name="voice_minutes">分钟</string>
+  <string name="voice_no_distance">My Tracks 无距离</string>
+  <string name="voice_per_kilometer">每千米</string>
+  <string name="voice_per_mile">每英里</string>
+  <string name="voice_second">秒</string>
+  <string name="voice_seconds">秒</string>
+  <string name="voice_template">My Tracks %1$.2f %2$s 用时 %3$s 速度 %4$s %5$s</string>
+  <string name="welcome_about">关于 My Tracks</string>
+  <string name="welcome_title">欢迎</string>
 </resources>
diff --git a/MyTracks/res/values/arrays_do_not_translate.xml b/MyTracks/res/values/arrays_do_not_translate.xml
index 291d07608..b6cde022b 100644
--- a/MyTracks/res/values/arrays_do_not_translate.xml
+++ b/MyTracks/res/values/arrays_do_not_translate.xml
@@ -16,127 +16,8 @@ limitations under the License.
 -->
 <resources>
   <!-- Do not translate any arrays in this file. -->
-  
-  <!-- Display settings -->
-  <string-array name="track_color_mode_options">
-    <item>@string/track_color_mode_option_none</item>
-    <item>@string/track_color_mode_option_fixed</item>
-    <item>@string/track_color_mode_option_dynamic</item>
-  </string-array>
 
-  <string-array name="track_color_mode_values">
-    <item>@string/track_color_mode_value_none</item>
-    <item>@string/track_color_mode_value_fixed</item>
-    <item>@string/track_color_mode_value_dynamic</item>
-  </string-array>
-  
-  <!-- Recording settings -->
-  <string-array name="task_frequency_values">
-    <item>0</item>
-    <item>-100</item>
-    <item>-50</item>
-    <item>-25</item>
-    <item>-10</item>
-    <item>-5</item>
-    <item>-1</item>
-    <item>60</item>
-    <item>30</item>
-    <item>15</item>
-    <item>10</item>
-    <item>5</item>
-    <item>2</item>
-    <item>1</item>
-  </string-array>
- 
-  <string-array name="min_recording_interval_values">
-    <item>-2</item>
-    <item>-1</item>
-    <item>0</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-    <item>5</item>
-    <item>10</item>
-    <item>20</item>
-    <item>30</item>
-    <item>60</item>
-    <item>120</item>
-    <item>300</item>
-    <item>480</item>
-    <item>900</item>
-    <item>1800</item>
-  </string-array>
-    
-  <string-array name="min_recording_distance_values">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-    <item>5</item>
-    <item>10</item>
-    <item>100</item>
-  </string-array>
-  
-  <string-array name="max_recording_distance_values">
-    <item>50</item>
-    <item>100</item>
-    <item>200</item>
-    <item>500</item>
-    <item>1000</item>
-    <item>5000</item>
-  </string-array>  
-  
-  <string-array name="min_required_accuracy_values">
-    <item>10</item>
-    <item>20</item>
-    <item>50</item>
-    <item>100</item>
-    <item>200</item>
-    <item>500</item>
-    <item>1000</item>
-    <item>2000</item>
-    <item>5000</item>
-  </string-array>
-  
-  <string-array name="auto_resume_track_timeout_values">
-    <item>0</item>
-    <item>5</item>
-    <item>10</item>
-    <item>15</item>
-    <item>-1</item>
-  </string-array>
-
-  <!-- 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>
-  </array>
-  
-  <array name="sensor_type_values">
-    <item>@string/sensor_type_value_none</item>
-    <item>@string/sensor_type_value_ant</item>
-    <item>@string/sensor_type_value_srm_ant_bridge</item>
-    <item>@string/sensor_type_value_polar</item>
-    <item>@string/sensor_type_value_zephyr</item>
-  </array>
-  
-  <string-array name="ant_sensor_type_values">
-    <item>@string/sensor_type_value_ant</item>
-    <item>@string/sensor_type_value_srm_ant_bridge</item>
-  </string-array>
-  
-  <!-- Others -->
-  <array name="export_formats">
-    <item>GPX</item>
-    <item>KML</item>
-    <item>CSV</item>
-    <item>TCX</item>
-  </array>
-  
-  <array name="activity_types">
+  <string-array name="activity_types">
     <item>@string/activity_type_airplane</item>
     <item>@string/activity_type_atv</item>
     <item>@string/activity_type_blimp</item>
@@ -202,13 +83,128 @@ limitations under the License.
     <item>@string/activity_type_walking</item>
     <item>@string/activity_type_water_skiing</item>
     <item>@string/activity_type_wind_surfing</item>
-  </array>
-      
-  <array name="waypoint_types">
+  </string-array>
+
+  <string-array name="display_track_color_options">
+    <item>@string/settings_display_track_color_single</item>
+    <item>@string/settings_display_track_color_fixed</item>
+    <item>@string/settings_display_track_color_dynamic</item>
+  </string-array>
+
+  <string-array name="display_track_color_values">
+    <item>@string/display_track_color_value_none</item>
+    <item>@string/display_track_color_value_fixed</item>
+    <item>@string/display_track_color_value_dynamic</item>
+  </string-array>
+
+  <string-array name="file_types">
+    <item>GPX</item>
+    <item>KML</item>
+    <item>CSV</item>
+    <item>TCX</item>
+  </string-array>
+
+  <string-array name="recording_auto_resume_timeout_values">
+    <item>0</item>
+    <item>5</item>
+    <item>10</item>
+    <item>15</item>
+    <item>-1</item>
+  </string-array>
+
+  <string-array name="recording_distance_values">
+    <item>1</item>
+    <item>2</item>
+    <item>3</item>
+    <item>4</item>
+    <item>5</item>
+    <item>10</item>
+    <item>100</item>
+  </string-array>
+
+  <string-array name="recording_gps_accuracy_values">
+    <item>10</item>
+    <item>20</item>
+    <item>50</item>
+    <item>100</item>
+    <item>200</item>
+    <item>500</item>
+    <item>1000</item>
+    <item>2000</item>
+    <item>5000</item>
+  </string-array>
+
+  <string-array name="recording_interval_values">
+    <item>-2</item>
+    <item>-1</item>
+    <item>0</item>
+    <item>2</item>
+    <item>3</item>
+    <item>4</item>
+    <item>5</item>
+    <item>10</item>
+    <item>20</item>
+    <item>30</item>
+    <item>60</item>
+    <item>120</item>
+    <item>300</item>
+    <item>480</item>
+    <item>900</item>
+    <item>1800</item>
+  </string-array>
+
+  <string-array name="recording_task_frequency_values">
+    <item>0</item>
+    <item>-100</item>
+    <item>-50</item>
+    <item>-25</item>
+    <item>-10</item>
+    <item>-5</item>
+    <item>-1</item>
+    <item>60</item>
+    <item>30</item>
+    <item>15</item>
+    <item>10</item>
+    <item>5</item>
+    <item>2</item>
+    <item>1</item>
+  </string-array>
+
+  <string-array name="recording_track_distance_values">
+    <item>50</item>
+    <item>100</item>
+    <item>200</item>
+    <item>500</item>
+    <item>1000</item>
+    <item>5000</item>
+  </string-array>
+
+  <string-array name="sensor_type_ant_values">
+    <item>@string/sensor_type_value_ant</item>
+    <item>@string/sensor_type_value_srm_ant_bridge</item>
+  </string-array>
+
+  <string-array name="sensor_type_options">
+    <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>
+  </string-array>
+
+  <string-array name="sensor_type_values">
+    <item>@string/sensor_type_value_none</item>
+    <item>@string/sensor_type_value_ant</item>
+    <item>@string/sensor_type_value_srm_ant_bridge</item>
+    <item>@string/sensor_type_value_polar</item>
+    <item>@string/sensor_type_value_zephyr</item>
+  </string-array>
+
+  <string-array name="waypoint_types">
     <item>@string/waypoint_type_atm</item>
     <item>@string/waypoint_type_bank</item>
     <item>@string/waypoint_type_bar</item>
-    <item>@string/waypoint_type_barbeque</item>
+    <item>@string/waypoint_type_barbecue</item>
     <item>@string/waypoint_type_building</item>
     <item>@string/waypoint_type_bus_stop</item>
     <item>@string/waypoint_type_cafe</item>
@@ -253,9 +249,8 @@ limitations under the License.
     <item>@string/waypoint_type_tourist_information</item>
     <item>@string/waypoint_type_tree</item>
     <item>@string/waypoint_type_tunnel</item>
-    <item>@string/waypoint_type_water_fountain</item>
     <item>@string/waypoint_type_waterfall</item>
+    <item>@string/waypoint_type_water_fountain</item>
     <item>@string/waypoint_type_way_point</item>
-  </array>      
-</resources>
-
+  </string-array>
+</resources>
\ No newline at end of file
diff --git a/MyTracks/res/values/do_not_translate.xml b/MyTracks/res/values/do_not_translate.xml
index fa8935ed5..bb943732e 100644
--- a/MyTracks/res/values/do_not_translate.xml
+++ b/MyTracks/res/values/do_not_translate.xml
@@ -16,56 +16,40 @@ limitations under the License.
 -->
 <resources>
   <!-- DO NOT TRANSLATE ANY STRINGS IN THIS FILE. -->
-
-  <!-- Application Name -->
-  <string name="app_name">My Tracks</string>
-
-  <string name="my_tracks_web_url">mytracks.appspot.com</string>
-  
-  <!-- About Dialog -->
-  <string name="about_googlegroups">mytracks@googlegroups.com</string>
-  <string name="about_privacy_weburl">m.google.com/privacy</string>
-  <string name="about_bart">Bartłomiej Niechwiej</string>
+  <string name="about_bart">Bart Niechwiej</string>
   <string name="about_dylan">Dylan Casey</string>
-  <string name="about_leif">Leif Hendrik Wilden</string>
-  <string name="about_rdamazio">Rodrigo Damazio Bovendorp</string>
+  <string name="about_jimmy">Jimmy Shih</string>
+  <string name="about_leif">Leif Wilden</string>
+  <string name="about_rodrigo">Rodrigo Damazio</string>
   <string name="about_sandor">Sandor Dornbush</string>
-
-  <!-- Sensor Type Values -->
-  <string name="sensor_type_value_none">NONE</string>
-  <string name="sensor_type_value_ant">ANT</string>
-  <string name="sensor_type_value_srm_ant_bridge">SRM_ANT_BRIDGE</string>
-  <string name="sensor_type_value_polar">POLAR</string>
-  <string name="sensor_type_value_zephyr">ZEPHYR</string>
-  
-  <!-- Track Color Mode Values -->
-  <string name="track_color_mode_value_none">NONE</string>
-  <string name="track_color_mode_value_fixed">FIXED</string>
-  <string name="track_color_mode_value_dynamic">DYNAMIC</string>
-
-  <!-- When a value is unknown. E.g. when speed is unknown '- km/hr'. -->
-  <string name="unknown">-</string>
-      
-  <!-- Send to Google URLs -->
-  <string name="send_google_fusion_tables_url">google.com/fusiontables</string>
-  <string name="send_google_my_maps_url">maps.google.com</string>
-  <string name="send_google_docs_url">docs.google.com</string>
-  
-  <!-- Google Analytics ID -->
-  <string name="google_analytics_id">UA-7222692-2</string>
-
-  <!--  Symbols -->
-  <string name="percent">%</string>
-  
-  <!-- Intent Actions -->
-  <string name="save_intent_action">android.intent.action.SAVE</string>
-  <string name="start_new_track_action">com.google.android.apps.mytracks.START_NEW_TRACK</string>
-  <string name="end_current_track_action">
-    com.google.android.apps.mytracks.END_CURRENT_TRACK
+  <string name="display_track_color_value_dynamic">DYNAMIC</string>
+  <string name="display_track_color_value_fixed">FIXED</string>
+  <string name="display_track_color_value_none">NONE</string>
+  <string name="marker_statistics_icon_url">
+    http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png
   </string>
-  
-  <!--My Tracks Notifications Permission. -->
-  <string name="mytracks_notifications_permission">
+  <string name="marker_waypoint_icon_url">
+    http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png
+  </string>
+  <string name="my_tracks_analytics_id">UA-7222692-2</string> 
+  <string name="my_tracks_app_name">My Tracks</string>
+  <string name="my_tracks_privacy_url">m.google.com/privacy</string>
+  <string name="my_tracks_recording_service_name">My Tracks Recording Service</string>
+  <string name="my_tracks_web_url">mytracks.appspot.com</string>
+  <string name="permission_notification_value">
     com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS
   </string>
-</resources>
+  <string name="send_google_docs_url">docs.google.com</string>
+  <string name="send_google_fusion_tables_url">google.com/fusiontables</string>
+  <string name="send_google_my_maps_url">maps.google.com</string>
+  <string name="sensor_type_value_ant">ANT</string>    
+  <string name="sensor_type_value_none">NONE</string>
+  <string name="sensor_type_value_polar">POLAR</string>
+  <string name="sensor_type_value_srm_ant_bridge">SRM_ANT_BRIDGE</string>
+  <string name="sensor_type_value_zephyr">ZEPHYR</string>
+  <string name="track_action_end">com.google.android.apps.mytracks.END_CURRENT_TRACK</string>
+  <string name="track_action_save">android.intent.action.SAVE</string>
+  <string name="track_action_start">com.google.android.apps.mytracks.START_NEW_TRACK</string>
+  <string name="unit_percent">%</string>
+  <string name="value_unknown">-</string>
+ </resources>
diff --git a/MyTracks/res/values/keys.xml b/MyTracks/res/values/keys.xml
index 1c023e303..1087f589e 100644
--- a/MyTracks/res/values/keys.xml
+++ b/MyTracks/res/values/keys.xml
@@ -23,7 +23,7 @@ limitations under the License.
   <string name="auto_resume_track_timeout_key">autoResumeTrackTimeout</string>
   <string name="bluetooth_pairing_key">bluetoothPairing</string>
   <string name="bluetooth_sensor_key">bluetoothSensor</string>
-  <string name="default_category_key">defaultCategory</string>
+  <string name="default_activity_key">defaultActivity</string>
   <string name="default_map_public_key">defaultMapPublic</string>
   <string name="max_recording_distance_key">maxRecordingDistance</string>
   <string name="metric_units_key">metricUnits</string>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 7e8dbb15d..a0f956cb9 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -15,1455 +15,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Menu items for the map, chart, and stat view. -->
-  <string name="start_recording"
-    translation_description="In the menu, to start recording a track.">
-    Record Track
-  </string>
-  <string name="stop_recording"
-    translation_description="In the menu, to stop recording a track.">
-    Stop Recording
-  </string>
-  <string name="list_tracks"
-    translation_description="In the menu, to show a list of all the tracks.">
-    Tracks
-  </string>
-  <string name="list_markers"
-    translation_description="In the menu, to show a list of markers for the curren track.">
-    Markers
-  </string>
-  <string name="sensor_state"
-    translation_description="In the menu, to go to the sensor state page.">
-    Sensor State
-  </string>
-  <string name="settings"
-    translation_description="In the menu, to go to the settings page.">
-    Settings
-  </string>
-  <string name="aggregated_stats"
-    translation_description="In the menu, to go to the aggregated statistics page.">
-    Aggregated Statistics
-  </string>
-  <string name="help"
-    translation_description="In the menu, to go to the help page.">
-    Help
-  </string>
 
-  <!--  Additional menu items for the map view. -->
-  <string name="mylocation"
-    translation_description="In the menu for the map view, to display user's current location.">
-    My Location
+  <!-- About Page -->
+  <string name="about_copyright_notice"
+    translation_description="In the 'About My Tracks' page, the copyright notice.">
+    Copyright 2009 Google Inc.
   </string>
-    <string name="switch_to_sat"
-    translation_description="In the menu for the map view, to switch the display to the satellite
-        mode.">
-    Satellite Mode
-  </string>
-  <string name="switch_to_map"
-    translation_description="In the menu for the map view, to switch the display to the map mode.">
-    Map Mode
-  </string>
-  
-  <!--  Additional menu items for the chart view. -->
-  <string name="chart_settings"
-    translation_description="In the menu for the chart view, to change the chart settings.">
-    Chart Settings
-  </string>  
- 
-  <!-- Error messages when there is no GPS. -->
-  <string name="error_no_gps"
-    translation_description="On application start, message when there is no GPS on the device.">
-    No GPS is found on the device.
-  </string>
-  <string name="error_unable_to_start_recording"
-    translation_description="When starting a recording, message when not able to start due to no GPS
-      location and asking the user to try again.">
-    Unable to start recording. No GPS location. Try again.
-  </string>
-  <string name="error_unable_to_insert_marker"
-    translation_description="When inserting a marker, message when not able to insert due to no GPS
-      location and asking the user to try again.">
-    Unable to insert marker. No GPS location. Try again.
-  </string>  
-
-  <!-- Error messages when sending to Google. -->
-  <string name="error_sending_to_google"
-    translation_description="When sending a track to Google, a message indicating that an error has
-      occurred and ask the user to try again.">
-    An error occurred. Please try again.
-  </string>
-  <string name="error_sending_to_my_maps"
-    translation_description="When sending a track to Google My Maps, a message indicating that an
-      error has occured.">
-    There was an error while sending your track to Google My Maps.
-  </string>
-  <string name="error_sending_to_fusion_tables"
-    translation_description="When sending a track to Google Fusion Table, a message indicating that
-      an error has occurred.">
-    There was an error while sending your track to Google Fusion Tables.
-  </string>
-  <string name="error_sending_to_docs"
-    translation_description="When sending a track to Google Docs, a message indicating that an error
-      has occurred.">
-    There was an error while sending your track to Google Docs.
-  </string>  
-
-  <!--  Error messages when exporting a track. -->
-  <string name="error_export_generic"
-    translation_description="When exporting a track to the SD card, a generic error message
-      indicating unable to export.">
-    Unable to export.
-  </string>
-  <string name="error_export_operation_canceled"
-    translation_description="When exporting a track to the SD card, a message indicating that the
-      export operation was canceled.">
-    The operation was canceled.
-  </string>
-
-  <!-- GPS status messages. -->
-  <string name="status_wait_for_gps_fix"
-    translation_description="In the main view, the message on the top indicating My Tracks is
-      waiting for a better GPS fix.">
-    Waiting for a better GPS fix. Make sure the sky is visible.
-  </string>
-  <string name="status_need_to_enable_gps"
-    translation_description="In the main view, the message on the top asking the user to enable
-      GPS.">     
-    Please tap here to go to \'Location &amp; security\' settings and check \'Use GPS satellites\'.
-    Press the back button to return.
-  </string>
-  <string name="status_approximate_current_location"
-    translation_description="When displaying the user's current location, a status message
-      indicating that GPS is not available and an approximate location is used instead.">
-    GPS is not available. An approximate location based on cell towers and WIFI networks is shown.
-  </string>
-  <string name="status_no_current_location"
-    translation_description="When displaying the user's current location, a status message
-      indicating that the current location cannot be determined.">
-    GPS is not available. Current location cannot be determined. Enable more location sources (see
-    \'Location &amp; security\' settings) and make sure the sky is visible. Try again later.
-  </string>
-  
-  <!-- Record track status message. -->
-  <string name="status_now_recording"
-    translation_description="When starting a new track recording, a status message indicating
-      success.">
-    Now recording a new track.
-  </string>
-  
-  <!-- Insert marker status message. -->
-  <string name="status_marker_inserted"
-    translation_description="When inserting a new marker, a message indicating success.">
-    A marker was inserted.
-  </string>
-  
-  <!-- Sending to Google status messages. -->
-  <string name="sending_to_google_upload_status"
-    translation_description="When sending a track to Google, the header on the top of the result
-      page.">
-    Upload status:
-  </string>
-  <string name="sending_to_google_additional_info"
-    translation_description="When sending a track to Google, the additional comment on the bottom of
-      the result page.">
-    It may take a few minutes before new tracks appear.
-  </string>
-  <string name="send_google_docs_existing_doc_success"
-    translation_description="When sending a track to Google Docs, the message on the result page
-      indicating that the track is sent to an existing spreadsheet. E.g., 'Your track has been sent
-      to docs.google.com.'.">      
-    Your track has been sent to %s.
-  </string>
-  <string name="send_google_docs_new_doc_success"
-    translation_description="When sending a track to Google Docs, the message on the result page
-      indicating that a new spreadsheet is created. E.g., 'A new spreadsheet is created at
-      docs.google.com.'.">
-    A new spreadsheet is created at %s.
-  </string>
-  <string name="send_google_fusion_tables_success"
-    translation_description="When sending a track to Google Fusion Tables, the message on the result
-      page indicating success. E.g., 'A new Google Fusion table has been created at
-      google.com/fusiontables.'">
-    A new Google Fusion table has been created at %s.
-  </string>  
-  <string name="send_google_my_maps_existing_map_success"
-    translation_description="When sending a track to Google My Maps, the message on the result page
-      indicating that the track is sent to an existing map. E.g., 'Your track has been sent to
-      maps.google.com.'">
-    Your track has been sent to %s.
-  </string>
-  <string name="send_google_my_maps_new_map_success"
-    translation_description="When sending a track to Google My Maps, the message on the result page
-      indicating that a new map is created. E.g., 'A new Google My Map has been created at
-      maps.google.com.'.">
-    A new Google My Map has been created at %s.
-  </string>
-    
-  <!-- Progress dialog title -->
-  <string name="progress_title"
-    translation_description="When displaying a progress dialog, the title on the dialog asking the
-      user to wait.">
-    Please wait...
-  </string>
-  
-  <!-- Progress dialog messages when sending to Google. -->
-  <string name="progress_message_authenticating_my_maps"
-    translation_description="When sending a track to Google My Maps, the messsage on the progress
-      dialog indicating authenticating to Google My Maps.">
-    Authenticating to Google My Maps...
-  </string>
-  <string name="progress_message_authenticating_fusion_tables"
-    translation_description="When sending a track to Google Fusion Tables, the messsage on the
-      progress dialog indicating authenticating to Google Fusion Tables.">
-    Authenticating to Google Fusion Tables...
-  </string>
-  <string name="progress_message_authenticating_docs"
-    translation_description="When sending a track to Google Docs, the messsage on the progress
-      dialog indicating authenticating to Google Docs.">
-    Authenticating to Google Docs...
-  </string>    
-  <string name="progress_message_reading_track"
-    translation_description="When sending a track to Google, the message on the progress dialog
-      indicating My Tracks is reading the track from its database.">
-    Reading track...
-  </string>  
-  <string name="progress_message_preparing_track"
-    translation_description="When sending a track to Google My Maps, the message on the progress
-      dialog indicating My Tracks is preparing the track's data for upload.">
-    Preparing track...
-  </string> 
-  <string name="progress_message_creating_map"
-    translation_description="When sending a track to Google My Maps, the messsage on the progress
-      dialog indicating My Tracks is creating a new map in Google My Maps.">
-    Creating a new My Map...
-  </string>
-  <string name="progress_message_creating_fusion_table"
-    translation_description="When sending a track to Google Fusion Tables, the messsage on the
-      progress dialog indicating My Tracks is creating a new Fusion Table in Google Fusion Tables.">
-    Creating a new Fusion Table...
-  </string>  
-  <string name="progress_message_sending_my_maps"
-    translation_description="When sending a track to Google My Maps, the message on the progress
-      dialog indicating My Tracks is sending the track data.">
-    Sending a track to Google My Maps...
-  </string>
-  <string name="progress_message_sending_fusion_tables"
-    translation_description="When sending a track to Google Fusion Tables, the message on the
-      progress dialog indicating My Tracks is sending the track data.">
-    Sending a track to Google Fusion Tables...
-  </string>
-  <string name="progress_message_sending_docs"
-    translation_description="When sending a track to Google Docs, the message on the progress dialog
-      indicating My Tracks is sending the track data.">
-    Sending a track to Google Docs...
-  </string>
-  
-  <!-- Export progress messages. -->
-  <string name="progress_message_export"
-    translation_description="When exporting a track to the SD card, the message on the progress
-      dialog indicating that it may take a while.">
-    Exporting a track to the SD card. This may take a while.
-  </string>
-
-  <!-- Used by deletion actions -->
-  <string name="confirmation_title_are_you_sure"
-    translation_description="When deleting data (e.g., deleting all tracks, deleting a track,
-      deleting a marker, etc.), the title on the confirmation dialog asking the user if he is sure."
-      >
-    Are you sure?
-  </string>
-  <string name="all_data_will_be_permanently_deleted"
-    translation_description="When deleting all tracks, the message on the confirmation dialog
-      informing the user that all tracks and markers will be permanently deleted from the phone.">
-    All tracks and markers will be permanently deleted from the phone.
-  </string>
-  <string name="track_will_be_permanently_deleted"
-    translation_description="When deleting a track, the message on the confirmation dialog informing
-      the user that the track and its markers will be permanently deleted from the phone.">
-    The track and its markers will be permanently deleted from the phone.
-  </string>
-  <string name="marker_will_be_permanently_deleted"
-    translation_description="When deleting a marker, the message on the confirmation dialog
-      informing the user that the marker will be permanently deleted from the phone.">
-    The marker will be permanently deleted from the phone.
-  </string>
-
-  <!-- Text and link when uploading to Google. -->
-  <string name="send_google_by_my_tracks"
-    translation_description="When sending a track to Google, a note indicating it is created by
-      My Tracks on Android. The two string placeholders are used to insert the html link tags around 
-      'My Tracks'. E.g., 'Created by &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks
-      &lt;/a&gt; on Android.'.">
-    Created by %1$sMy Tracks%2$s on Android.
-  </string>
-
-  <!-- Tags for a track description. -->
-  <string name="recorded_date"
-    translation_description="When sending a track to Google, in the track description, a tag
-      for the track recorded date. E.g., 'Recorded: Tue Sep 06 15:08:30 PDT 2011'.">        
-    Recorded
-  </string>
-  <string name="category"
-    translation_description="When sending a track to Google, in the track desription, a tag
-      for the activity type. E.g., 'Activity type: hiking'.">
-    Activity type
-  </string>
-
-  <!-- Used by the track recording service -->
-  <string name="recording_your_track"
-    translation_description="When recording a track, the message on the My Tracks notification 
-      informing the user that My Tracks is actively recording his track.">
-    Recording your track...
-  </string>
-  <string name="new_track_format"
-    translation_description="When creating a new track, the string format to name the track. E.g.,
-      'Track 1'.">
-    Track %d
-  </string>  
-  <string name="track_part_format"
-    translation_description="When sending a track to Google, the string format to name segments
-      when splitting a large track. E.g., '(Part 1)'.">
-    (Part %d)
-  </string>
-      
-  <!-- Button texts -->
-  <string name="yes"
-    translation_description="Text on the button to say yes.">
-    Yes
-  </string>
-  <string name="no"
-    translation_description="Text on the button to say no.">
-    No
-  </string>
-  <string name="ok"
-    translation_description="Text on the button to say ok.">
-    OK
-  </string>
-  <string name="save"
-    translation_description="Text on the button to say save.">
-    Save
-  </string>
-  <string name="cancel"
-    translation_description="Text on the button to say cancel.">
-    Cancel
-  </string>
-  
-  <!-- Alert dialog titles -->    
-  <string name="success"
-    translation_description="The title on the alert dialog to indicate success.">
-    Success
-  </string>
-  <string name="error"
-    translation_description="The title on the alert dialog to indicate error.">
-    Error
-  </string>
-
-  <!-- Insert markers -->
-  <string name="waypoint"
-    translation_description="When inserting a waypoint marker, the default name of the marker.">
-    Waypoint
-  </string>
-  <string name="statistics"
-    translation_description="When inserting a statistics marker, the default name of the marker.">
-    Statistics
-  </string>
-  
-  <!--  Welcome dialog -->
-  <string name="license"
-    translation_description="In the welcome dialog, the text on the bottom button to view the terms
-      of service agreement.">
+  <string name="about_license"
+    translation_description="In the 'About My Tracks' page, the button on the bottom to view the
+      terms of service agreement.">
     License
   </string>
-  
-  <!-- Labels for start and end of a track -->
-  <string name="start"
-    translation_description="When inserting a marker to indicate the beginning of a track, the label
-      at the end of the marker name. E.g., the marker is named 'track_name (Start)'.">
-    (Start)
+  <string name="about_privacy"
+    translation_description="In the 'About My Tracks' page, label for the privacy link. E.g.,
+      'Privacy: m.google.com/privacy'.">
+    Privacy:
   </string>
-  <string name="end"
-    translation_description="When inserting a marker to indicate the end of a track, the label at
-      the end of the marker name. E.g., the marker is named 'track_name (End)'."> 
-    (End)
+  <string name="about_support"
+    translation_description="In the 'About My Tracks' page, label for the support link. E.g.,
+      'Support: mytracks.appspot.com'.">
+    Support:
   </string>
-
-  <!--  Tracks page -->
-  <string name="tracklist_pick_one"
-    translation_description="In the Tracks page, the instruction at the top of the page informing
-      the user he can press and hold a track for more options.">
-    Pick a track. Press&amp;hold for more options.
-  </string>
-  <string name="tracklist_btn_import_all"
-    translation_description="In the Tracks page, the button on the bottom to import all tracks.">
-    Import all
-  </string>
-  <string name="tracklist_btn_export_all"
-    translation_description="In the Tracks page, the button on the bottom to export all tracks.">
-    Export all
-  </string>  
-  <string name="tracklist_btn_delete_all"
-    translation_description="In the Tracks page, the button on the bottom to delete all tracks.">
-    Delete all
-  </string>
-  
-  <!-- A track's context menu -->
-  <string name="tracklist_this_track"
-    translation_description="In the context menu for a track, the title indicating that all the menu
-      options below are for this track.">
-    This Track
-  </string>
-  <string name="tracklist_show_track"
-    translation_description="In the context menu for a track, the menu option to show the track on
-      the map.">
-    Show on map
-  </string>
-  <string name="tracklist_edit_track"
-    translation_description="In the context menu for a track, the menu option to edit the track's 
-      metadata (e.g., title, activity type, etc.).">
-    Edit
-  </string>
-  <string name="tracklist_send_to_google"
-    translation_description="In the context menu for a track, the menu option to send the track to
-      Google.">
-    Send to Google...
-  </string>
-  <string name="tracklist_share_track"
-    translation_description="In the context menu for a track, the menu option to share the track
-      with friends through other applications.">
-    Share with friends...
-  </string>
-  <string name="tracklist_write_to_sd"
-    translation_description="In the context menu for a track, the menu option to write the track to
-      the SD card.">       
-    Write to SD card...
-  </string>      
-  <string name="tracklist_clear_map"
-    translation_description="In the context menu for a track, the menu option to clear the map
-      of any track.">
-    Clear map
-  </string>
-  <string name="tracklist_delete_track"
-    translation_description="In the context menu for a track, the menu option to delete the
-      track from the phone.">
-    Delete from phone...
-  </string>
-  
-  <!--  'Share with friends...' menu options. -->
-  <string name="tracklist_share_link"
-    translation_description="In the context menu for a track, under the 'Share with friends...'
-      option, the menu option to save a track to My Maps or Fusion Tables and share the URL with
-      friends.">
-    My Map or Fusion Table URL
-  </string>
-  <string name="tracklist_share_gpx_file"
-    translation_description="In the context menu for a track, under the 'Share with friends...'
-      option, the menu option to share the track as a GPX file with friends.">     
-    A GPX file
-  </string>
-  <string name="tracklist_share_kml_file"
-    translation_description="In the context menu for a track, under the 'Share with friends...'
-      option, the menu option to share the track as a KML file with friends.">
-    A KML file
-  </string>
-  <string name="tracklist_share_csv_file"
-    translation_description="In the context menu for a track, under the 'Share with friends...'
-      option, the menu option to share the track as a CSV file with friends.">  
-    A CSV file
-  </string>
-  <string name="tracklist_share_tcx_file"
-    translation_description="In the context menu for a track, under the 'Share with friends...'
-      option, the menu option to share the track as a TCX file with friends."> 
-   A TCX file
-  </string>  
-
-  <!-- 'Write to SD card...' menu options. -->
-  <string name="tracklist_save_as_gpx"
-    translation_description="In the context menu for a track, under the 'Write to SD card...'
-      option, the menu option to save the track as a GPX file.">     
-    Save as a GPX file
-  </string>
-  <string name="tracklist_save_as_kml"
-    translation_description="In the context menu for a track, under the 'Write to SD card...'
-      option, the menu option to save the track as a KML file.">           
-    Save as a KML file
-  </string>
-  <string name="tracklist_save_as_csv"
-    translation_description="In the context menu for a track, under the 'Write to SD card...'
-      option, the menu option to save the track as a CSV file.">      
-    Save as a CSV file
-  </string>
-  <string name="tracklist_save_as_tcx"
-    translation_description="In the context menu for a track, under the 'Write to SD card...'
-      option, the menu option to save the track as a TCX file.">       
-    Save as a TCX file
-  </string>
-  
-  <!-- Export -->
-  <string name="export_done"
-    translation_description="After exporting all the tracks, a toast message indicating success.">
-    Export finished
-  </string>
-
-  <string name="import_multi_done"
-    translation_description="After importing all the tracks from the SD card, the alert message
-      indicating success. E.g., 'Imported 5 of 6 GPX files from /mnt/sdcard/MyTracks/gpx/'.">
-    Imported to My Tracks %1$d of %2$d GPX files from %3$s
-  </string>
-  <string name="import_multi_empty"
-    translation_description="After importing all the tracks from the SD card, the alert message
-      indicating that no track is imported. E.g., 'No GPX file found in /mnt/sdcard/MyTracks/gpx/.
-      SD card may be unreadable or directory may not contain any GPX file.'.">
-    No GPX file found in %s. SD card may be unreadable or directory may not contain any GPX file.
-  </string>
-  <string name="import_error"
-    translation_description="When importing all the tracks, a toast message indicating error for
-      one of the tracks. E.g., 'Import error for file /mnt/sdcard/MyTacks/gpx/1.gpx'."> 
-    Import error for file %s
-  </string>
-
-  <!-- Markers page. -->
-  <string name="waypointslist_pick_one"
-    translation_description="In the Markers page, the instruction at the top of the page informing
-      the user he can press and hold a marker for more options.">
-    Pick a marker. Press&amp;hold for more options.
-  </string>
-  <string name="waypointslist_btn_insert_waypoint"
-    translation_description="In the Markers page, the button on the bottom to insert a waypoint
-      marker.">      
-    Insert waypoint
-  </string>
-  <string name="waypointslist_btn_insert_statistics"
-    translation_description="In the Markers page, the button on the bottom to insert a statistics
-      marker.">            
-    Insert statistics
-  </string>
-  <string name="waypointslist_this_waypoint"
-    translation_description="In the context menu for a marker, the title indicating that all the 
-      menu options below are for this marker.">      
-    This Marker
-  </string>
-  <string name="waypointslist_show_waypoint"
-    translation_description="In the context menu for a marker, the menu option to show the marker
-      on the map.">      
-    Show on map
-  </string>
-  <string name="waypointslist_edit_waypoint"
-    translation_description="In the context menu for a marker, the menu option to edit the marker's
-      metadata (e.g., title, type, etc.)."> 
-    Edit
-  </string>
-  <string name="waypointslist_delete_waypoint"
-    translation_description="In the context menu for a marker, the menu option to delete the
-      marker.">   
-    Delete
-  </string>
-
-  <!-- Track detail page -->
-  <string name="trackdetails_title"
-    translation_description="In the detail page for a track, the title of the page.">
-    Track Details
-  </string>
-  <string name="trackdetails_name"
-    translation_description="In the detail page for a track, the text field for the track name.">
-    Track Name
-  </string>
-  <string name="trackdetails_name_hint"
-    translation_description="In the detail page for a track, the hint in the 'Track Name' text field
-      when it is empty.">  
-    Track Name
-  </string>
-  <string name="trackdetails_category"
-    translation_description="In the detail page for a track, the text field for the activity type,
-      including for examples.">
-    Activity Type (e.g. hiking, cycling, running, climbing...)
-  </string>
-  <string name="trackdetails_category_hint"
-    translation_description="In the detail page for a track, the hint in the 'Activity Type' text
-      field when it is empty.">  
-    Activity Type
-  </string>
-  <string name="trackdetails_description"
-    translation_description="In the detail page for a track, the text field for the track 
-      description.">  
-    Track Description
-  </string>
-  <string name="trackdetails_description_hint"
-    translation_description="In the detail page for a track, the hint in the 'Track Description'
-      text field when it is empty.">    
-    Track Description
-  </string>
-
-  <!-- Waypoint marker and statistics marker detail page -->
-  <string name="waypointdetails_title"
-    translation_description="In the detail page for a waypoint or statistics marker, the title of
-      the page.">
-    Marker Details
-  </string>
-  <string name="waypointdetails_name"
-    translation_description="In the detail page for a waypoint or statistics marker, text field for
-      the marker name.">      
-    Marker Name
-  </string>
-  <string name="waypointdetails_name_hint"
-    translation_description="In the detail page for a waypoint or statistics marker, the hint in the 
-      'Marker Name' text field when it is empty.">   
-    Marker Name
-  </string>
-  <string name="waypointdetails_category"
-    translation_description="In the detail page for a waypoint marker, the text field for the
-      marker type, including examples.">       
-    Marker Type (e.g. Building, Pothole, Sight...)
-  </string>
-  <string name="waypointdetails_category_hint"
-    translation_description="In the detail page for a waypoint marker, the hint in the 'Marker Type'
-      text field when it is empty.">
-    Marker Type
-  </string>
-  <string name="waypointdetails_description"
-    translation_description="In the detail page for a waypoint marker, the text field for the marker
-      description.">     
-    Marker Description
-  </string>
-  <string name="waypointdetails_description_hint"
-    translation_description="In the detail page for a waypoint marker, the hint in the 'Marker
-      Description' text field when it is empty.">     
-    Marker Description
-  </string>
-
-  <!-- Settings page -->
-  <string name="settings_title"
-    translation_description="The title of the Settings page.">  
-    My Tracks Settings
-  </string>
-  <string name="settings_display"
-    translation_description="In the Settings page, the option to change the display related
-      settings.">  
-    Display
-  </string>
-  <string name="settings_recording"
-    translation_description="In the Settings page, the option to change the track recording related
-      settings.">  
-    Recording
-  </string>
-  <string name="settings_sensor"
-    translation_description="In the Settings page, the option to change the sensor related
-      settings.">
-    Sensor
-  </string>
-  <string name="settings_sharing"
-    translation_description="In the Settings page, the option to change the track sharing related
-      settings.">   
-    Sharing
-  </string>
-  <string name="settings_backup"
-    translation_description="In the Settings page, the option to change the data backup related
-      settings."> 
-    Backup
-  </string>
-  <string name="settings_reset"
-    translation_description="In the Settings page, the option to reset everything to defaults."> 
-    Reset to defaults
-  </string>
-  <string name="settings_reset_summary"
-    translation_description="In the Settings page, the summary for the 'Reset to defaults'
-      option explaining reverting all the settings to the default values."> 
-    Revert all your settings to the default values
-  </string>
-  
-  <!--  Display settings -->
-  <string name="settings_metric_units"
-    translation_description="In the Display settings, the checkbox option to use the metrics units."
-      >
-    Use metric units
-  </string>
-  <string name="settings_metric_units_summary_on"
-    translation_description="In the Display settings, the summary for the 'Use metric units'
-      checkbox when it is checked explaining using the metrics units to display distances.">
-    Use metrics units to display distances
-  </string>
-  <string name="settings_metric_units_summary_off"
-    translation_description="In the Display settings, the summary for the 'Use metrics units'
-      checkbox when it is unchecked explaining using the imperial units to display distances.">
-    Use imperial units to display distances
-  </string>
-  <string name="settings_report_speed_or_pace"
-    translation_description="In the Display settings, the checkbox option to display speed (e.g., 5
-      miles per hour) instead of pace (e.g., 0.2 hours per mile).">  
-    Display speed
-  </string>
-  <string name="settings_report_speed_or_pace_summary_on"
-    translation_description="In the Display settings, the summary for the 'Display speed' checkbox
-      when it is checked explaining that speed (e.g., 5 miles per hour) will be used instead of pace
-      (e.g., 0.2 hours per mile).">  
-    Display speed (e.g., miles/hour)
-  </string>
-  <string name="settings_report_speed_or_pace_summary_off"
-    translation_description="In the Display settings, the summary for the 'Display speed' checkbox
-      when it is unchecked explaining that pace (e.g., 0.2 hours per mile) will be used instead of
-      speed (e.g., 5 miles per hour).">  
-    Display pace (e.g., hours/mile)
-  </string>
-  <string name="settings_track_color_mode"
-    translation_description="In the Display settings, the dropdown option to choose a track color
-      mode for how to use different colors to color a track based on speed.">
-    Track color mode
-  </string>
-  <string name="settings_track_color_mode_summary"
-    translation_description="In the Display settings, the summary for the 'Track color mode'
-      dropdown option explaining that it configures how colors are used to color a track based on
-      speed."
-      >
-    The way to color a track based on speed
-  </string>    
-  <string name="settings_track_color_mode_fixed_speed_slow"
-    translation_description="In the Display settings, the option for configuring the slow speed
-      threshold. Thus any speed lower than the threshold will be colored by the slow speed color.">
-    Slow speed threshold
-  </string>
-  <string name="settings_track_color_mode_fixed_speed_slow_summary"
-    translation_description="In the Display settings, the summary for the 'Slow speed threshold'
-      option explaining that it sets a cutoff speed for the slow speed color.">
-    Slow speed top value
-  </string>
-  <string name="settings_track_color_mode_fixed_speed_medium"
-    translation_description="In the Display settings, the option for configuring the medium speed
-      threshold. Thus any speed lower than the threshold but greater than the slow speed threshold
-      will be colored by the medium speed color.">
-    Medium speed threshold
-  </string>
-  <string name="settings_track_color_mode_fixed_speed_medium_summary"
-    translation_description="In the Display settings, the summary for the 'Medium speed threshold'
-      option explaining that it sets a cutoff speed for the medium speed color.">
-    Medium speed top value
-  </string> 
-  <string name="settings_track_color_mode_dynamic_speed_variation"
-    translation_description="In the Display settings, the option for configuring the dynamic
-      speed threshold for using colors to color a track based on speed.">
-    Medium speed range
-  </string>
-  <string name="settings_track_color_mode_dynamic_speed_variation_summary"
-    translation_description="In the Display settings, the summary for the 'Medium speed range'
-      option explaining that it sets a percentage from the average speed to determine the
-      medium speed range for using colors to color a track based on speed.">
-    Percentage from the average speed for the medium speed
-  </string>
-  
-  <!-- Recording settings -->
-  <!-- TODO decide if voice frequency should be under the Recording settings. -->
-  <string name="settings_announcement_frequency"
-    translation_description="In the Recording settings, the dropdown option to configure the voice
-      announcement frequency.">
-    Voice frequency
-  </string>
-  <string name="settings_announcement_frequency_summary"
-    translation_description="In the Recording settings, the summary for the 'Voice frequency'
-      dropdown option explaining that it configures the time or distance between two voice
-      announcements.">
-    Time/distance between two voice announcements
-  </string>
-  <string name="settings_announcement_frequency_not_available"
-    translation_description="In the Recording settings, the summary for the 'Voice frequency'
-      explaining that this option is not available on your Android phone.">
-    Voice announcement is not available on your Android phone
-  </string>
-  <string name="settings_split_frequency"
-    translation_description="In the Recording settings, the dropdown option to configure the
-      time or distance a new marker will be inserted.">
-    Marker frequency
-  </string>
-  <string name="settings_split_frequency_summary"
-    translation_description="In the Recording settings, the summary for the 'Marker frequency' 
-      dropdown option explaining that it configures the time or distance after which a new
-      marker will be inserted.">
-    Time/distance after which a new marker will be inserted
-  </string>
-  <string name="settings_min_recording_interval"
-    translation_description="In the Recording settings, the dropdown option to configure the
-      time between two recorded points.">
-    Time between points
-  </string>
-  <string name="settings_min_recording_interval_summary"
-    translation_description="In the Recording settings, the summary for the 'Time between points'
-      dropdown option explaining that it configures the smallest time interval between two
-      recordings of your position.">
-    Smallest time interval between two recordings of your position
-  </string>    
-  <string name="settings_min_recording_distance"
-    translation_description="In the Recording settings, the dropdown option to configure the
-      distance between two recorded points.">
-    Distance between points
-  </string>
-  <string name="settings_min_recording_distance_summary"
-    translation_description="In the Recording settings, the summary for the 'Distance between
-      points' dropdown option explaining that it configures the smallest distance between two
-      recordings of your position.">
-    Smallest distance between two recordings of your position
-  </string>
-  <string name="settings_max_recording_distance"
-    translation_description="In the Recording settings, the dropdown option to configure the 
-      distance between two tracks.">
-    Distance between tracks
-  </string>
-  <string name="settings_max_recording_distance_summary"
-    translation_description="In the Recording settings, the summary for the 'Distance between
-      tracks' dropdown option explaining that it configures the maximum distance for two recorded
-      points for them to be still considered as the same track.">
-    Track will be split if two recordings of your position are further than this
-  </string>
-  <string name="settings_min_required_accuracy"
-    translation_description="In the Recording settings, the dropdown option to configure the 
-      required GPS accuracy. If a GPS position's accuracy is below the requirement, then it will
-      not be used.">
-    GPS accuracy
-  </string>
-  <string name="settings_min_required_accuracy_summary"
-    translation_description="In the Recording settings, the summary for the 'GPS accuracy' dropdown
-      option explaining that it configures the required accuracy for your position.
-      If a GPS position's accuracy is below the requirement, then it will not be used.">
-    GPS position will be ignored if it is not this accurate
-  </string>
-  <string name="settings_auto_resume_track_timeout"
-    translation_description="In the Recording settings, the dropdown option to configure the timeout
-      after which a recorded track will not be continued after phone reboot.">
-    Auto-resume timeout
-  </string>
-  <string name="settings_auto_resume_track_timeout_summary"
-    translation_description="In the Recording settings, the summary for the 'Auto-resume timeout'
-      dropdown option explaining that it configures the maximum time after which a previous
-      recording will not resumed after phone reboot.">
-    Maximum time after which a previously recording track will not be resumed on phone reboot
-  </string>      
-  <string name="settings_timestamp_track_name"
-    translation_description="In the Recording settings, the checkbox on whether the track should be
-      named based on the track's start time or based on a number.">
-    Use time for track name
-  </string>
-  <string name="settings_timestamp_track_name_summary_on"
-    translation_description="In the Recording settings, the summary for the 'Use time for track
-      name' checkbox when it is checked explaining using the track's start time as the default track
-      name.">
-    Use the track\'s start time as the default track name
-  </string>
-  <string name="settings_timestamp_track_name_summary_off"
-    translation_description="In the Recording settings, the summary for the 'Use time for track
-      name' checkbox when it is unchecked explaining using a number as the default track name.">
-    Use a number as the default track name
-  </string>
-  <string name="settings_default_category"
-    translation_description="In the Recording settings, the option to specify a new track's default
-	  activity type.">
-    Default activity type
-  </string>
-  <string name="settings_default_category_summary"
-    translation_description="In the Recording settings, the summary for the 'Default activity type'
-      option explaining that it sets the default activity type for a new track.">
-    Default activity type for a new track.
-  </string>
-  
-  <!-- Sensor settings -->
-  <string name="settings_sensor_type"
-    translation_description="In the Sensor settings, the dropdown option to choose a sensor type.">
-    Sensor Type
-  </string>
-  <string name="settings_sensor_type_summary"
-    translation_description="In the Sensor settings, the summary for the 'Sensor Type' option
-      explaining that it is to configure the type of sensor to connect to.">
-    The type of sensor to connect to
-  </string>
-  <string name="bluetooth_options" 
-    translation_description="In the Sensor settings, the section title to configure the Bluetooth
-      options.">
-   Bluetooth Options
-  </string>
-  <string name="bluetooth_sensor_title"
-    translation_description="In the Sensor settings, the dropdown option to pick a Bluetooth
-      sensor.">
-    Bluetooth sensor
-  </string>
-  <string name="bluetooth_sensor_summary"
-    translation_description="In the Sensor settings, the summary for the 'Bluetooth sensor' dropdown
-      option explaining it is to pick a Bluetooth sensor to connect to.">
-    The Bluetooth sensor to connect to
-  </string>
-  <string name="bluetooth_pairing"
-    translation_description="In the Sensor settings, the option to pair with a Bluetooth device.">
-    Bluetooth pairing
-  </string>
-  <string name="bluetooth_pairing_summary"
-    translation_description="In the Sensor settings, the summary for the 'Bluetooth pairing' option
-      explaining that it will open the Android's Bluetooth settings to pair a device.">
-    Open Android\'s Bluetooth settings to pair a device
-  </string>
-  <string name="ant_options"
-    translation_description="In the Sensor settings, the section title to configure the ANT+
-      options.">
-    ANT+ Options
-  </string>    
-  <string name="settings_heart_rate_ant_sensor_id"
-    translation_description="In the Sensor settings, the option to unpair an ANT+ heart rate
-      sensor.">
-    Unpair ANT+ heart rate sensor
-  </string>
-  <string name="settings_srm_bridge_ant_sensor_id"
-    translation_description="In the Sensor settings, the option to unpair a SRM ANT+ bridge.">
-    Unpair SRM ANT+ bridge
-  </string>    
-  <string name="settings_ant_not_paired"
-    translation_description="In the Sensor settings, the summary under 'Clear ANT+ sensor' or 'Clear
-      SRM ANT+ bridge' when there no ANT+ device paired.">
-    Not paired
-  </string>
-  <string name="settings_ant_paired"
-    translation_description="In the Sensor settings, the summary under 'Clear ANT+ sensor' or 'Clear
-      SRM ANT+ bridge' when there is an ANT+ device paired. E.g., 'Paired with: 1'.">
-    Paired with: %d
-  </string>
-  
-  <!-- Sharing settings -->
-  <string name="settings_map_public"
-    translation_description="In the Sharing settings, the checkbox option to make a new map created
-      in Google My Maps public."> 
-    Make new maps public
-  </string>
-  <string name="settings_map_public_summary_on"
-    translation_description="In the Sharing settings, the summary for the 'Make new maps public'
-      checkbox option when it is checked explaining that new maps created in Google My Maps will
-      be public, as opposed to unlisted.">
-    Make new maps created in Google My Maps public
-  </string>
-  <string name="settings_map_public_summary_off"
-    translation_description="In the Sharing settings, the summary for the 'Make new maps public'
-      checkbox option when it is unchecked explaining that new maps created in Google My Maps will
-      be unlisted, as opposed to public.">
-    Make new maps created in Goolge My Maps unlisted
-  </string>
-  <string name="settings_share_url_only"
-    translation_description="In the Sharing settings, the checkbox option to share only the URL 
-      link when sharing a link with friends.">  
-    Share only URL link
-  </string>
-  <string name="settings_share_url_only_summary_on" 
-    translation_description="In the Sharing settings, the summary for the 'Share only URL link'
-      checkbox option when it is checked explaining that only the URL link will be sent when sharing
-      a link with friends.">  
-   Only the URL link will be sent when sharing a link with friends
-  </string>
-  <string name="settings_share_url_only_summary_off"
-    translation_description="In the Sharing settings, the summary for the 'Share only URL link'
-      checkbox option when it is unchecked explaining that some text and the the URL link will be
-      sent when sharing a link with friends.">  
-    Some text and the URL link will be sent when sharing a link with friends
-  </string>
-  <string name="settings_allow_access"
-   translation_description="In the Sharing settings, the checkbox option to allow third party apps
-     access to My Tracks data.">
-    Allow access
-  </string>
-  <string name="settings_allow_access_summary_on"
-  translation_description="In the Sharing settings, the summary for the 'Allow access' checkbox
-      option when it is checked explaining that other apps can read, write, start/stop recording My
-      Tracks data.">
-    Other apps can read, write, start/stop recording My Tracks data.
-  </string>
-  <string name="settings_allow_access_summary_off"
-   translation_description="In the Sharing settings, the summary for the 'Allow access' checkbox
-      option when it is unchecked explaining that other apps cannot read, write, start/stop
-      recording My Tracks data.">
-    Other apps cannot read, write, start/stop recording My Tracks data.
-  </string>
-  <string name="settings_allow_access_dialog_message"
-    translation_description="In the Sharing settings, after checking the 'Allow access' checkbox,
-      the confirmation dialog asking the user if he wants to allow other apps, including apps
-      installed in the future, to control and access My Tracks data. In addition, no further
-      notification of third party app access will be shown.">
-    Are you sure you want to allow other apps, including future apps, to control and access My
-    Tracks data? There will be no further notification.
-  </string>
-  
-  <!-- Backup settings -->
-  <string name="settings_sd_backup"
-    translation_description="In the Backup settings, the section title for configuring backup to the
-      SD card.">
-    SD Card Backup
-  </string>
-  <string name="settings_backup_to_sd"
-    translation_description="In the Backup settings, the option to backup to the SD card now.">
-    Backup now
-  </string>
-  <string name="settings_backup_to_sd_summary"
-    translation_description="In the Backup settings, the summary for the 'Backup now' option
-      explaining that all tracks and settings will be written to the SD card.">
-    Write a full copy of all your tracks and settings to the SD card
-  </string>
-  <string name="settings_restore_from_sd"
-    translation_description="In the Backup settings, the option to restore everything from the SD
-      card.">
-    Restore now
-  </string>
-  <string name="settings_restore_from_sd_summary"
-    translation_description="In the Backup settings, the summary for the 'Restore now' option
-      explaining that it restores all tracks and settings from the SD card.">
-    Restore all tracks and settings from the SD card
-  </string>  
-      
-  <!-- Reset to defaults -->    
-  <string name="settings_reset_dialog_message"
-    translation_description="In the Settings page, after pressing the 'Reset to defaults' option,
-      the confirmation dialog asking the user to confirm reverting all settings to defaults. But
-      the saved tracks will be preserved.">
-    All your settings will be erased and reverted to the default values. Saved tracks will be
-    preserved. Are you sure?
-  </string>
-  <string name="settings_reset_done"
-    translation_description="In the Settings page, after pressing the 'Reset to defaults' option,
-      the confirmation dialog informing the user that all settings have been reverted to their
-      defaults.">
-    All settings have been reverted to their defaults.
-  </string>
- 
-  <!-- Settings others -->    
-  <string name="settings_not_while_recording"
-    translation_description="In the Settings page, the summary for an option that is not available 
-      during a track recording.">
-    Not available while recording a track
-  </string>
- 
-  <!-- Backup now -->
-  <string name="backup_write_progress_message"
-    translation_description="In the Backup settings, after pressing the 'Backup now' option, the
-      progress dialog telling the user that it is writing all tracks and settings and that it may
-      take a while.">
-    Writing all tracks and settings to the SD card. This may take a while...
-  </string>
-  
-  <!-- Restore now -->
-  <string name="restore_overwrites_warning"
-    translation_description="In the Backup settings, after pressing the 'Restore now' option, the
-      message in the alert dialog asking the user to confirm that he wants to restore from a backup
-      and it will overwrite all the current tracks and settings.">
-    Restoring a backup from the SD card will OVERWRITE all your current tracks and settings. Are you
-    sure?
-  </string>
-  <string name="select_backup_to_restore"
-    translation_description="In the Backup settings, after pressing the 'Restore now' option, the
-      message in the alert dialog asking the user to select a backup.">
-    Select the backup to restore
-  </string>
-  <string name="no_backups"
-    translation_description="In the Backup settings, after pressing the 'Restore now' option, the
-      message in the alert dialog informing the user that there is no backup.">
-    No backup found.
-  </string>
-  <string name="backup_import_progress_message"
-    translation_description="In the Backup settings, after pressing the 'Restore now' option, the
-      message on the progress dialog indicating that My Tracks is reading all tracks and settings
-      from the backup on the SD card and that it may take a while.">
-    Reading all tracks and settings from the SD card. This may take a while...
-  </string>
-       
-  <!-- Google My Maps -->
-  <string name="map_list_title"
-    translation_description="When sending a track to an existing Google My Map, the title of the
-      page listing the user's maps in Google My Maps.">
-    Your Google My Maps
-  </string>
-  <string name="select_map_message"
-    translation_description="When sending a track to an existing Google My Map, the text on 'Your
-      Google My Maps' page asking the user to pick one of his maps.">
-    Pick a map:
-  </string>
-  <string name="mapslist_no_maps_available"
-    translation_description="When showing a track to an existing Google My Map, the text on 'Your
-      Google My Maps' page informing the user that he doesn't have any map."> 
-    You don\'t have any maps.
-  </string>
-  <string name="maps_list_loading"
-    translation_description="When sending a track to an existing Google My Map, a progress message
-      informing the user that My Tracks is loading his maps.">
-    Loading maps...
-  </string>
-  <string name="maps_list_failed"
-     translation_description="When sending a track to an existing Google My Map, a message informing
-       the user that My Tracks cannot load his maps.">
-    Your maps could not be loaded at this time.
-  </string>
-  <string name="public_map"
-    translation_description="In the 'Your Google My Maps' page, tag next to the maps that are public
-      (as opposed to being not listed).">
-    Public
-  </string>
-  <string name="unlisted_map"
-    translation_description="In the 'Your Google My Maps' page, tag next to the maps that are not
-      listed (as opposed to being public).">
-    Unlisted
-  </string>
-  
-  <!-- Share Track -->
-  <string name="share_track_url"
-    translation_description="After sending a track to Google, in the confirmation dialog, a
-      button to share the track URL with friends.">    
-    Share track URL
-  </string>
-  <string name="share_track_picker_title"
-    translation_description="When sharing a track with friends, the title on the picker to
-      ask the user which application he wants to use.">
-    Share track using:
-  </string>
-  <string name="share_track_subject"
-    translation_description="When sharing a track with friends, the subject line.">    
-    I would like to share a track with you
-  </string>
-  <string name="share_track_url_body_format"
-    translation_description="When sharing a track URL with friends, the body of the message. E.g.,
-    'I think you might be interested in this track:\n\nhttps://maps.google.com/maps'.">
-    I think you might be interested in this track:\n\n%s
-  </string>
-  <string name="share_track_file_body_format"
-    translation_description="When sharing a track file with friends, the body of the message.">
-    I think you might be interested in this track.\n\nTo view this track use Google Earth or other
-    mapping software.
-  </string>
-
-  <!-- Statistics view -->
-  <string name="speed"
-    translation_description="In the Statistic view, the speed like miles per hour.">    
-    Speed
-  </string>
-  <string name="pace_label"
-    translation_description="In the Statistic view, the pace like hours per mile.">    
-    Pace
-  </string> 
-  <string name="total_distance_label"
-    translation_description="In the Statistic view, the total distance.">    
-    Total Distance
-  </string>
-  <string name="total_time_label"
-    translation_description="In the Statistic view, the total time.">    
-    Total Time
-  </string>
-  <string name="moving_time_label"
-    translation_description="In the Statistic view, the moving time.">  
-    Moving Time
-  </string>      
-  <string name="max_speed_label"
-    translation_description="In the Statistic view, the maximum speed.">    
-    Max Speed
-  </string>
-  <string name="average_speed_label"
-    translation_description="In the Statistic view, the average speed.">    
-    Average Speed
-  </string>
-  <string name="average_moving_speed_label"
-    translation_description="In the Statistic view, the average moving speed.">    
-    Average Moving Speed
-  </string>    
-  <string name="min_pace_label"
-    translation_description="In the Statistic view, the minimum pace.">    
-    Min Pace
-  </string>
-  <string name="average_pace_label"
-    translation_description="In the Statistic view, the average pace.">    
-    Average Pace
-  </string>
-  <string name="average_moving_pace_label"
-    translation_description="In the Statistic view, the average moving pace.">    
-    Average Moving Pace
-  </string>  
-  <string name="elevation_label"
-    translation_description="In the Statistic view, the current elevation.">  
-    Elevation
-  </string>
-  <string name="elevation_gain_label"
-    translation_description="In the Statistic view, the elevation gain.">
-    Elevation Gain
-  </string>
-  <string name="max_elevation_label"
-    translation_description="In the Statistic view, the maximum elevation.">
-    Max Elevation
-  </string>
-  <string name="min_elevation_label"
-    translation_description="In the Statistic view, the minimum elevation.">
-    Min Elevation
-  </string>    
-  <string name="min_grade_label"
-    translation_description="In the Statistic view, the minimum grade.">
-    Min Grade
-  </string>
-  <string name="max_grade_label"
-    translation_description="In the Statistic view, the maximum grade.">
-    Max Grade
-  </string>  
-  <string name="latitude_label"
-    translation_description="In the Statistic view, the current latitude.">
-    Latitude
-  </string>
-  <string name="longitude_label"
-    translation_description="In the Statistic view, the current longitude.">
-    Longitude
-  </string>
-
-  <!-- Chart Settings -->
-  <string name="x_axis"
-    translation_description="In the Chart Settings, the section label for configuring the X axis.">
-    X Axis
-  </string>
-  <string name="by_distance"
-    translation_description="In the Chart Settings, under the 'X Axis' section, the radio option 
-      to show the graphics by distance. The other radio option is to show by time. User can only
-      choose one of the options.">
-    By Distance
-  </string>
-  <string name="by_time"
-    translation_description="In the Chart Settings, under the 'X Axis' section, the radio option 
-      to show the graphics by time. The other radio option is to show by distance. User can only
-      choose one of the options.">
-    By Time
-  </string>
-  <string name="y_axis"
-    translation_description="In the Chart Settings, the section label for configuring the Y axis.">
-    Y Axis
-  </string>
-  <string name="power"
-    translation_description="In the Chart Settings, under the 'Y Axis' section, the checkbox option
-      to graph power (for cycling, the power output of the rider).">    
-    Power
-  </string>
-  <string name="cadence"
-    translation_description="In the Chart Settings, under the 'Y Axis' section, the checkbox option
-      to graph cadence (for cycling, the number of revolutions of the crank per minute).">    
-    Cadence
-  </string>
-  <string name="heart_rate"
-    translation_description="In the Chart Settings, under the 'Y Axis' section, the checkbox option
-      to graph heart rate.">
-    Heart Rate
-  </string>
-      
-  <!-- Voice -->
-  <string name="voice_hour"
-    translation_description="For voice announcement, to say hour like 'one hour'.">
-    hour
-  </string>
-  <string name="voice_hours"
-    translation_description="For voice announcement, to say hours like 'two hours'.">  
-    hours
-  </string>
-  <string name="voice_kilometer_per_hour"
-    translation_description="For voice announcement, to say 'kilometers per hour' for speed like
-      'two kilometers per hour'.">
-    kilometers per hour
-  </string>
-  <string name="voice_kilometers"
-    translation_description="For voice announcement, to say kilometers like 'two kilometers'.">
-    kilometers
-  </string>
-  <string name="voice_mile_per_hour"
-    translation_description="For voice announcement, to say 'miles per hour' for speed like 'two
-      miles per hour'.">
-    miles per hour
-  </string>
-  <string name="voice_miles"
-    translation_description="For voice announcement, to say miles like 'two miles'.">
-    miles
-  </string>
-  <string name="voice_minute"
-    translation_description="For voice announcement, to say minute like 'one minute'.">
-    minute
-  </string>
-  <string name="voice_minutes"
-    translation_description="For voice announcement, to say minutes like 'two minutes'.">
-    minutes
-  </string>
-  <string name="voice_per_kilometer"
-    translation_description="For voice announcement, to say 'per kilometer' for pace like 'two
-      minutes per kilometer'.">
-    per kilometer
-  </string>
-  <string name="voice_per_mile"
-    translation_description="For voice announcement, to say 'per mile' for pace like 'two minutes
-      per mile'.">
-    per mile
-  </string>
-  <string name="voice_second"
-    translation_description="For voice announcement, to say second like 'one second'.">
-    second
-  </string>
-  <string name="voice_seconds"
-    translation_description="For voice announcement, to say seconds like 'two seconds'.">
-    seconds
-  </string> 
-      
-  <!-- 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'.">
-    km/h
-  </string>
-  <string name="mile_per_hour"
-    translation_description="For speed unit, abbreviation for miles per hour. E.g, '5 mi/h'.">
-    mi/h
-  </string>
-  
-  <!-- Pace unit -->
-  <string name="min_per_kilometer"
-    translation_description="For pace unit, abbreviation for minutes per kilometer. E.g,
-      '5 min/km'.">
-    min/km
-  </string>
-  <string name="min_per_mile"
-    translation_description="For pace unit, abbreviation for minutes per mile. E.g, '5 min/mi'.">
-    min/mi
-  </string>
-      
-  <!-- Sensor State -->    
-  <string name="battery_level"
-    translation_description="In the Sensor State page, the label for battery level on the bike
-      sensor. E.g, battery level like '50 %'.">
-    Battery Level
-  </string>
-  
-  <!-- Sensor State unit -->
-  <string name="watts"
-    translation_description="Abbreviation for watts, unit for power. E.g., power of '80 W'.">  
-    W
-  </string>
-  <string name="revolutions_per_minute"
-    translation_description="Abbreviation for revolutions per minute, unit for cadence. E.g.,
-    cadence of '80 rpm'.">  
-    rpm
-  </string>
-  <string name="bpm"
-    translation_description="Abbreviation for beats per minute, unit for heart rate. E.g.,
-    heart rate of '80 bpm'.">
-    bpm
-  </string>
-  
-  <!-- End User License Agreement -->
-  <string name="eula_title"
-    translation_description="The title for the terms of service dialog, asking the user to accept
-      or decline.">
-    End User License Agreement
-  </string>
-  <string name="accept"
-    translation_description="In the 'End User License Agreement' dialog, the button to accept.">
-    Accept
-  </string>
-  <string name="decline"
-    translation_description="In the 'End User License Agreement' dialog, the button to decline.">
-    Decline
-  </string>
-
-  <!-- About My Tracks page -->
   <string name="about_team"
     translation_description="In the 'About My Tracks' page, label for the team members. E.g.,
       'Team: Sandor Dornbush, Rodrigo Damazio'.">
@@ -1474,266 +46,8 @@ limitations under the License.
       'Version: 1.1.10'.">
     Version:
   </string>
-  <string name="about_support"
-    translation_description="In the 'About My Tracks' page, label for the support link. E.g.,
-      'Support: mytracks.appspot.com'.">
-    Support:
-  </string>
-  <string name="about_privacy"
-    translation_description="In the 'About My Tracks' page, label for the privacy link. E.g.,
-      'Privacy: m.google.com/privacy'.">
-    Privacy:
-  </string>
 
-  <string name="about_copyright_message"
-    translation_description="In the 'About' page, the copy right notice.">
-    Copyright 2009 Google Inc.
-  </string>
-        
-  <!-- Send to Google dialog -->
-  <string name="sendtogoogle_title"
-    translation_description="When sending a track to Google, the dialog title to choose the Google
-      services to send the track to. The user can choose Google My Maps, Google Fusion
-      Tables, and Google Docs.">
-    Send to...
-  </string>
-  <string name="sendtogoogle_google_mymaps"
-    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
-      checkbox option to send to Google My Maps.">
-    Google My Maps
-  </string>
-  <string name="sendtogoogle_create_new_map"
-    translation_description="When sending a track to Google My Maps, the radio option to create a
-      new map as opposed to use an existing map.">
-    Create a new map
-  </string>
-  <string name="sendtogoogle_pick_existing_map"
-    translation_description="When sending a track to Google My Maps, the radio option to use an
-      existing map as opposed to create a new map.">
-    Use an existing map
-  </string>
-  <string name="sendtogoogle_google_fusiontables"
-    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
-      checkbox option to send to Google Fusion Tables.">
-    Google Fusion Tables
-  </string>
-  <string name="sendtogoogle_google_docs"
-    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
-      checkbox option to send to Google Docs.">
-    Google Docs
-  </string>
-  <string name="sendtogoogle_send_now"
-    translation_description="When sending a track to Google, under the 'Send to...' dialog, the 
-      button on the bottom to send the track to the selected Google services.">
-    Send now
-  </string>
-
-  <!-- Getting the account to upload to. -->
-  <string name="choose_account_title"
-    translation_description="When sending to Google, the dialog title to choose a Google account.">
-    Choose Account
-  </string>
-  <string name="no_account_found_title"
-    translation_description="When sending to Google, the dialog title when no Google account is
-      found.">
-    No Account Found
-  </string>
-  <string name="no_account_found"
-    translation_description="When sending to Google, the dialog message when no Google account is
-      found.">
-    No account found to upload tracks to.
-  </string>
-
-  <!-- writing to SD card -->
-  <string name="io_no_external_storage_found"
-    translation_description="When writing to the SD card, the error message when the SD card is not
-      found.">
-    No external storage was found. Make sure that a SD card is inserted and that your phone is not
-    mounted to a computer.
-  </string>
-  <string name="io_create_dir_failed"
-    translation_description="When writing to the SD card, the error message when not able to create
-      a directory on the SD card.">
-    Unable to create directory on SD card.
-  </string>
-  <string name="io_write_failed"
-    translation_description="When writing to the SD card, the error message when not able to write a
-      file to the SD card.">
-    Unable to write to file.
-  </string>
-  <string name="io_write_finished"
-    translation_description="When writing to the SD card, the success message when finish writing to
-      the SD card.">
-    Finished writing to SD card.
-  </string>
-  
-  <!--  reading from SD card -->
-  <string name="io_read_failed"
-    translation_description="When reading from the SD card, the error message when not able to read
-      a file.">
-    Unable to read from file.
-  </string>
-  <string name="io_read_finished"
-    translation_description="When reading from the SD card, the success message when finish reading
-      from the SD card.">
-    Finished reading from SD card.
-  </string>
-
-  <!-- Welcome -->
-  <string name="welcome"
-    translation_description="The title of the welcome page.">
-    Welcome
-  </string>
-  <string name="welcome_about"
-    translation_description="In the 'Welcome' page, the button on the bottom to read the 'About'
-      page.">
-    About My Tracks
-  </string>
-
-  <!-- Announcement -->
-  <string name="announce_no_distance"
-    translation_description="For the voice announcement, the announcement when the current track's
-      total distance is zero.">
-    My Tracks no distance
-  </string>
-  <string name="announce_template"
-    translation_description="For the voice announcement, the template to make an announcement. E.g.,
-      'My Tracks total distance 5.2 miles in 2 hours 30 minutes at 2.2 miles per hour'. Below is the
-      list of the parameters:
-       
-      %1$.2f: Distance value (E.g., 5.2)
-      %2$s: Distance unit (miles or kilometers)
-      %3$s: Time value (E.g., 2 hours and 30 minutes)
-      %4$s: Speed value (E.g., 2.2) or pace value (E.g., 2 hours and 30 minutes)
-      %5$s: Speed unit (miles per hour or kilometers per hour) or pace unit (per mile or per
-        kilometer)">
-      My Tracks total distance %1$.2f %2$s in %3$s at %4$s %5$s
-  </string>
-
-  <!--  Preferred Units -->
-  <string name="preferred_units_title"
-    translation_description="The title of the dialog asking the user to choose a preferred units,
-      metric or imperial.">
-    Preferred Units
-  </string>
-  <string name="preferred_units_metric"
-    translation_description="In the dialog asking the user to choose a preferred units, the option
-      to choose the metric units.">
-    Metric
-  </string>
-  <string name="preferred_units_imperial"
-    translation_description="In the dialog asking the user to choose a preferred units, the option
-      to choose the imperial units.">
-    Imperial
-  </string>
-        
-  <!-- Sensor State page -->
-  <string name="sensor_data_time"
-    translation_description="In the 'Sensor State' page, the label for the last time the sensor has
-      sent data. E.g., 'Sensor Date Time' 10:05 am.">
-    Sensor Data Time
-  </string>
-
-  <!-- sensor states -->
-  <string name="connecting"
-    translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor is
-      connecting.">
-    Connecting
-  </string>
-  <string name="connected"
-    translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor
-      has connected.">
-    Connected
-  </string>
-  <string name="disconnected"
-    translation_description="In the 'Sensor State' page, the 'Sensor State' value the sensor has
-      disconnected.">
-    Disconnected
-  </string>
-  <string name="sending"
-    translation_description="In the 'Sensor State' page, the 'Sensor State' value when the sensor
-      is sending data.">
-    Sending
-  </string>
-      
-  <!-- Manifest description (not seen inside the app) -->
-  <string name="notification_permission_label"
-    translation_description="When installing a third-party app that wants to receive My Tracks 
-      notifications, the permission label that the Android Market shows to the user.">
-    receive My Tracks notifications
-  </string>
-  <string name="notification_permission_description"
-    translation_description="When installing a third-party app that wants to receive My Tracks 
-      notifications, the permission description that the Android Market shows to the user.">
-    Allows the application to receive notifications when My Tracks starts or stops a recording.
-  </string>
-  <string name="read_tracks_permission_label"
-    translation_description="When installing a third-party app that wants to read My Tracks data,
-      the permission label that the Android Market shows to the user.">
-    read My Tracks data
-  </string>
-  <string name="read_tracks_permission_description"
-    translation_description="When installing a third-party app that wants to read My Tracks data,
-      the permission description that the Android Market shows to the user.">
-    Allows the application to read My Tracks data.</string>
-  <string name="write_tracks_permission_label"
-    translation_description="When installing a third-party app that wants to write data to My
-      Tracks, the permission label that the Android Market shows to the user.">
-    write data to My Tracks and start/stop My Tracks recording
-  </string>
-  <string name="write_tracks_permission_description"
-    translation_description="When installing a third-party app that wants to write data to My
-      Tracks, the permission description that the Android Market shows to the user.">
-    Allows the application to write data to My Tracks and start/stop My Tracks recording.
-  </string>
-
-  <!-- Sensor Type Options -->
-  <string name="sensor_type_option_none"
-    translation_description="In the Sensor Options settings page, for the Sensor Type picker, the
-        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>
-
-  <!-- Track Color Mode Options -->
-  <string name="track_color_mode_option_none"
-    translation_description="In the Display settings page, for the Track Color Mode picker, the
-        dropdown option to only use one color to color a track.">
-    One Color
-  </string>
-  <string name="track_color_mode_option_fixed"
-    translation_description="In the Display settings page, for the Track Color Mode picker, the 
-        dropdown option to use different colors to color a track based on fixed speed thresholds.">
-    Fixed Thresholds
-  </string>
-  <string name="track_color_mode_option_dynamic"
-    translation_description="In the Display settings page, for the Track Color Mode picker, the
-        dropdown option to use different colors to color a track based on dynamically determined
-        speed thresholds. E.g., use one color for segments where the speed is below the average
-        speed of the track.">
-    Dynamic Thresholds
-  </string> 
-      
-  <!-- Activity Types -->
+  <!-- Activity Type -->
   <string name="activity_type_airplane"
     translation_description="When entering the Activity Type, an option for airplane.">
     airplane
@@ -2000,9 +314,1573 @@ limitations under the License.
   <string name="activity_type_wind_surfing"
     translation_description="When entering the Activity Type, an option for wind surfing.">
     wind surfing
-  </string>      
-      
-  <!-- Marker Types --> 
+  </string>
+
+  <!-- Chart Settings -->
+  <string name="chart_settings_by_distance"
+    translation_description="In the Chart Settings, under the 'X axis' section, the radio option
+      to show the charts by distance. The other radio option is to show by time. User can only
+      choose one of the options.">
+    By distance
+  </string>
+  <string name="chart_settings_by_time"
+    translation_description="In the Chart Settings, under the 'X axis' section, the radio option
+      to show the charts by time. The other radio option is to show by distance. User can only
+      choose one of the options.">
+    By time
+  </string>
+  <string name="chart_settings_x_axis"
+    translation_description="In the Chart Settings, the section label for configuring the X axis.">
+    X axis
+  </string>
+  <string name="chart_settings_y_axis"
+    translation_description="In the Chart Settings, the section label for configuring the Y axis.">
+    Y axis
+  </string>
+
+  <!-- EULA -->
+  <string name="eula_accept"
+    translation_description="In the 'End User License Agreement' dialog, the button to accept.">
+    Accept
+  </string>
+  <string name="eula_decline"
+    translation_description="In the 'End User License Agreement' dialog, the button to decline.">
+    Decline
+  </string>
+  <string name="eula_title"
+    translation_description="The title for the terms of service dialog, asking the user to accept
+      or decline.">
+    End User License Agreement
+  </string>
+
+  <!-- Export -->
+  <string name="export_canceled"
+    translation_description="When exporting a track to the SD card, a message indicating that the
+      export operation was canceled.">
+    The operation was canceled.
+  </string>
+  <string name="export_error"
+    translation_description="When exporting a track to the SD card, a generic error message
+      indicating unable to export.">
+    Unable to export.
+  </string>
+  <string name="export_progress_message"
+    translation_description="When exporting a track to the SD card, the message on the progress
+      dialog indicating that it may take a while.">
+    Exporting a track to the SD card. This may take a while.
+  </string>
+  <string name="export_success"
+    translation_description="After exporting all the tracks to the SD card, a toast message
+      indicating success.">
+    Export finished.
+  </string>
+
+  <!-- Generic Strings -->
+  <string name="generic_cancel"
+    translation_description="The text on a button to say cancel.">
+    Cancel
+  </string>
+  <string name="generic_confirm_title"
+    translation_description="The title on a confirmation dialog asking the user if he is sure?">
+    Are you sure?
+  </string>
+  <string name="generic_error_title"
+    translation_description="The title on an alert dialog indicating error.">
+    Error
+  </string>
+  <string name="generic_no"
+    translation_description="The text on a button to say no.">
+    No
+  </string>
+  <string name="generic_ok"
+    translation_description="The text on a button to say ok.">
+    OK
+  </string>
+  <string name="generic_progress_title"
+    translation_description="The title on a progress dialog asking the user to wait.">
+    Please wait...
+  </string>
+  <string name="generic_save"
+    translation_description="The text on a button to say save.">
+    Save
+  </string>
+  <string name="generic_success_title"
+    translation_description="The title on an alert dialog indicating success.">
+    Success
+  </string>
+  <string name="generic_yes"
+    translation_description="The text on a button to say yes.">
+    Yes
+  </string>
+
+  <!-- GPS -->
+  <string name="gps_need_to_enable"
+    translation_description="In the main view, the message on the top asking the user to enable
+      GPS.">
+    Please tap here to go to \'Location &amp; security\' settings &amp; check
+    \'Use GPS satellites\'. Press the back button to return.
+  </string>
+  <string name="gps_not_found"
+    translation_description="On application start, message when there is no GPS on the device.">
+    No GPS is found on the device.
+  </string>
+  <string name="gps_wait_for_fix"
+    translation_description="In the main view, the message on the top indicating My Tracks is
+      waiting for a better GPS fix.">
+    Waiting for a better GPS fix. Make sure the sky is visible.
+  </string>
+
+  <!-- Import -->
+  <string name="import_error"
+    translation_description="When importing all the tracks, a toast message indicating import error
+      for one of the tracks.
+
+      %1$s: file path of the track encountering error. E.g., '/mnt/sdcard/MyTacks/gpx/1.gpx'.">
+    Import error for file %1$s.
+  </string>
+  <string name="import_no_file"
+    translation_description="After importing all the tracks from the SD card, the alert message
+      indicating that no track is imported.
+
+      %1$s: file path of the import directory. E.g., '/mnt/sdcard/MyTracks/gpx/'.">
+    No GPX file found in %1$s. The SD card may be unreadable or the directory may not contain any
+    GPX file.
+  </string>
+  <string name="import_success"
+    translation_description="After importing all the tracks from the SD card, the alert message
+      indicating success.
+
+      %1$d the number of successfully imported tracks. E.g., '5'.
+      %2$d the number of total tracks to be imported. E.g., '6'.
+      %3$s file path of the import directory. E.g., '/mnt/sdcard/MyTracks/gpx/'.">
+    Imported to My Tracks %1$d of %2$d GPX files from %3$s.
+  </string>
+
+  <!-- Marker -->
+  <string name="marker_detail_marker_description"
+    translation_description="In the detail page for a waypoint marker, the text field for the marker
+      description.">
+    Marker description
+  </string>
+  <string name="marker_detail_marker_name"
+    translation_description="In the detail page for a waypoint or statistics marker, text field for
+      the marker name.">
+    Marker name
+  </string>
+  <string name="marker_detail_marker_type"
+    translation_description="In the detail page for a waypoint marker, the text field for the
+      marker type, including examples.">
+    Marker type (e.g. building, pothole, sight...)
+  </string>
+  <string name="marker_detail_marker_type_hint"
+    translation_description="In the detail page for a waypoint marker, the hint in the 'Marker type'
+      text field when it is empty.">
+    Marker type
+  </string>
+  <string name="marker_detail_title"
+    translation_description="In the detail page for a waypoint or statistics marker, the title of
+      the page.">
+    Marker details
+  </string>
+  <string name="marker_insert_error"
+    translation_description="When inserting a marker, message when not able to insert due to no GPS
+      location and asking the user to try again.">
+    Unable to insert a marker. No GPS location. Try again.
+  </string>
+  <string name="marker_insert_success"
+    translation_description="When inserting a new marker, a message indicating success.">
+    A marker was inserted.
+  </string>
+  <string name="marker_label_end"
+    translation_description="When inserting a marker to indicate the end of a track, the label at
+      the end of the marker name. E.g., the marker is named 'track_name (End)'.">
+    (End)
+  </string>
+  <string name="marker_label_start"
+    translation_description="When inserting a marker to indicate the beginning of a track, the label
+      at the end of the marker name. E.g., the marker is named 'track_name (Start)'.">
+    (Start)
+  </string>
+  <string name="marker_list_context_menu_title"
+    translation_description="In the context menu for a marker, the title indicating that all the
+      menu options below are for this marker.">
+    This marker
+  </string>
+  <string name="marker_list_delete_marker"
+    translation_description="In the context menu for a marker, the menu option to delete the
+      marker.">
+    Delete
+  </string>
+  <string name="marker_list_delete_marker_confirm_message"
+    translation_description="In the context menu for a marker, when pressing the 'Delete' option,
+      the confirmation dialog message informing the user that the marker will be permanently
+      deleted from the phone.">
+    The marker will be permanently deleted from the phone.
+  </string>
+  <string name="marker_list_edit_marker"
+    translation_description="In the context menu for a marker, the menu option to edit the marker's
+      metadata (e.g., name, type, etc.).">
+    Edit
+  </string>
+  <string name="marker_list_insert_statistics"
+    translation_description="In the Markers page, the button on the bottom to insert a statistics
+      marker.">
+    Insert statistics
+  </string>
+  <string name="marker_list_insert_waypoint"
+    translation_description="In the Markers page, the button on the bottom to insert a waypoint
+      marker.">
+    Insert waypoint
+  </string>
+  <string name="marker_list_pick_one"
+    translation_description="In the Markers page, the instruction at the top of the page informing
+      the user he can press and hold a marker for more options.">
+    Pick a marker. Press &amp; hold for more options.
+  </string>
+  <string name="marker_list_show_on_map"
+    translation_description="In the context menu for a marker, the menu option to show the marker
+      on the map.">
+    Show on map
+  </string>
+  <string name="marker_type_statistics"
+    translation_description="When inserting a statistics marker, the default name of the marker.">
+    Statistics
+  </string>
+  <string name="marker_type_waypoint"
+    translation_description="When inserting a waypoint marker, the default name of the marker.">
+    Waypoint
+  </string>
+
+  <!-- Menu Items -->
+  <string name="menu_aggregated_statistics"
+    translation_description="In the menu, to go to the aggregated statistics page.">
+    Aggregated statistics
+  </string>
+  <string name="menu_chart_view_chart_settings"
+    translation_description="In the menu for the chart view, to change the chart settings.">
+    Chart settings
+  </string>
+  <string name="menu_help"
+    translation_description="In the menu, to go to the help page.">
+    Help
+  </string>
+  <string name="menu_map_view_map_mode"
+    translation_description="In the menu for the map view, to switch the display to the map mode.">
+    Map mode
+  </string>
+  <string name="menu_map_view_my_location"
+    translation_description="In the menu for the map view, to display user's current location.">
+    My location
+  </string>
+  <string name="menu_map_view_satellite_mode"
+    translation_description="In the menu for the map view, to switch the display to the satellite
+      mode.">
+    Satellite mode
+  </string>
+  <string name="menu_markers"
+    translation_description="In the menu, to show a list of markers for the current track.">
+    Markers
+  </string>
+  <string name="menu_record_track"
+    translation_description="In the menu, to start recording a track.">
+    Record track
+  </string>
+  <string name="menu_sensor_state"
+    translation_description="In the menu, to go to the sensor state page.">
+    Sensor state
+  </string>
+  <string name="menu_settings"
+    translation_description="In the menu, to go to the settings page.">
+    Settings
+  </string>
+  <string name="menu_stop_recording"
+    translation_description="In the menu, to stop recording a track.">
+    Stop recording
+  </string>
+  <string name="menu_tracks"
+    translation_description="In the menu, to show a list of all the tracks.">
+    Tracks
+  </string>
+
+  <!-- My Location -->
+  <string name="my_location_approximate_location"
+    translation_description="When displaying the user's current location, a status message
+      indicating that GPS is not available and an approximate location is used instead.">
+    GPS is not available. An approximate location based on cell towers and WiFi networks is shown.
+  </string>
+  <string name="my_location_no_location"
+    translation_description="When displaying the user's current location, a status message
+      indicating that the current location cannot be determined.">
+    GPS is not available. Current location cannot be determined. Enable more location sources (see
+    \'Location &amp; security\' settings) &amp; make sure the sky is visible. Try again later.
+  </string>
+
+  <!-- My Maps List -->
+  <string name="my_maps_list_error"
+    translation_description="When sending a track to an existing Google My Map, the text on the
+      'My Maps' list page informing the user that his maps cannot be loaded at this time.">
+    Your maps could not be loaded at this time.
+  </string>
+  <string name="my_maps_list_loading"
+    translation_description="When sending a track to an existing Google My Map, the progress dialog
+      message informing the user that his maps are being loaded.">
+    Loading maps...
+  </string>
+  <string name="my_maps_list_no_maps"
+    translation_description="When sending a track to an existing Google My Map, the text on the
+      'My Maps' list page informing the user that he doesn't have any maps.">
+    You don\'t have any maps.
+  </string>
+  <string name="my_maps_list_pick_map"
+    translation_description="When sending a track to an existing Google My Map, the text on the
+      'My Maps' list page asking the user to pick one of his maps.">
+    Pick a map:
+  </string>
+  <string name="my_maps_list_public_label"
+    translation_description="When sending a track to an existing Google My Map, in the 'My Maps'
+      list page, the label next to the maps that are public, as opposed to being unlisted.">
+    Public
+  </string>
+  <string name="my_maps_list_title"
+    translation_description="When sending a track to an existing Google My Map, the title of the
+      page listing the user's maps in Google My Maps.">
+    Your Google My Maps
+  </string>
+  <string name="my_maps_list_unlisted_label"
+    translation_description="When sending a track to an existing Google My Map, in the 'My Maps'
+      list page, the label next to the maps that are unlisted, as opposed to being public.">
+    Unlisted
+  </string>
+
+  <!-- My Tracks Service -->
+  <string name="my_tracks_recording_service"
+    translation_description="When viewing the 'Running services' on Android, the name of the My
+      Tracks service that is recording a track in the background.">
+    Track recording service
+  </string>
+
+  <!-- Permission -->
+  <string name="permission_notification_description"
+    translation_description="When installing a third-party app that wants to receive My Tracks
+      notifications, the permission description that the Android Market shows to the user.">
+    Allows the application to receive notifications when My Tracks starts or stops a recording.
+  </string>
+  <string name="permission_notification_label"
+    translation_description="When installing a third-party app that wants to receive My Tracks
+      notifications, the permission label that the Android Market shows to the user.">
+    receive My Tracks notifications
+  </string>
+  <string name="permission_read_description"
+    translation_description="When installing a third-party app that wants to read My Tracks data,
+      the permission description that the Android Market shows to the user.">
+    Allows the application to read My Tracks data.
+  </string>
+  <string name="permission_read_label"
+    translation_description="When installing a third-party app that wants to read My Tracks data,
+      the permission label that the Android Market shows to the user.">
+    read My Tracks data
+  </string>
+  <string name="permission_write_description"
+    translation_description="When installing a third-party app that wants to write data to My
+      Tracks, the permission description that the Android Market shows to the user.">
+    Allows the application to write data to My Tracks and start/stop My Tracks recording.
+  </string>
+  <string name="permission_write_label"
+    translation_description="When installing a third-party app that wants to write data to My
+      Tracks, the permission label that the Android Market shows to the user.">
+    write data to My Tracks and start/stop My Tracks recording
+  </string>
+
+  <!-- Preferred Units -->
+  <string name="preferred_units_imperial"
+    translation_description="In the dialog asking the user to choose a preferred units, the option
+      to choose the imperial units.">
+    Imperial
+  </string>
+  <string name="preferred_units_metric"
+    translation_description="In the dialog asking the user to choose a preferred units, the option
+      to choose the metric units.">
+    Metric
+  </string>
+  <string name="preferred_units_title"
+    translation_description="The title of the dialog asking the user to choose a preferred units,
+      metric or imperial.">
+    Preferred units
+  </string>
+
+  <!-- SD Card -->
+  <string name="sd_card_error_create_dir"
+    translation_description="When writing to the SD card, the error message when not able to create
+      a directory on the SD card.">
+    Unable to create a directory on the SD card.
+  </string>
+  <string name="sd_card_error_no_storage"
+    translation_description="When writing to the SD card, the error message when the SD card is not
+      found.">
+    No external storage was found. Make sure that a SD card is inserted and that your phone is not
+    mounted to a computer.
+  </string>
+  <string name="sd_card_error_read_file"
+    translation_description="When reading from the SD card, the error message when not able to read
+      a file.">
+    Unable to read from a file.
+  </string>
+  <string name="sd_card_error_write_file"
+    translation_description="When writing to the SD card, the error message when not able to write a
+      file.">
+    Unable to write to a file.
+  </string>
+  <string name="sd_card_success_read_file"
+    translation_description="When reading from the SD card, the success message when finish reading
+      from the SD card.">
+    Finished reading from the SD card.
+  </string>
+  <string name="sd_card_success_write_file"
+    translation_description="When writing to the SD card, the success message when finish writing to
+      the SD card.">
+    Finished writing to the SD card.
+  </string>
+
+  <!-- Send Google -->
+  <string name="send_google_by_my_tracks"
+    translation_description="When sending a track to Google, a note indicating it is created by
+      My Tracks on Android.
+
+      %1$s: html anchor opening tag. E.g., '&lt;a href=\'http://mytracks.appspot.com\'&gt;'.
+      %2$s: html anchor closing tag. E.g., '&lt;/a&gt;'.">
+    Created by %1$sMy Tracks%2$s on Android.
+  </string>
+  <string name="send_google_choose_account_title"
+    translation_description="When sending to Google, the dialog title to choose a Google account.">
+    Choose account
+  </string>
+  <string name="send_google_docs"
+    translation_description="When sending a track to Google, under the 'Send to...' dialog, the
+      checkbox option to send to Google Docs.">
+    Google Docs
+  </string>
+  <string name="send_google_error"
+    translation_description="When sending a track to Google, a message indicating that an error has
+      occurred and ask the user to try again.">
+    An error has occurred. Please try again.
+  </string>
+  <string name="send_google_error_service"
+    translation_description="When sending a track to a Google service, a message indicating that an
+      error has occurred.
+
+      %1$s: service name. E.g., 'Google Docs'.">
+    There was an error while sending your track to %1$s.
+  </string>
+  <string name="send_google_existing_map"
+    translation_description="When sending a track to Google My Maps, the radio option to use an
+      existing map as opposed to create a new map.">
+    Use an existing map
+  </string>
+  <string name="send_google_fusion_tables"
+    translation_description="When sending a track to Google, under the 'Send to...' dialog, the
+      checkbox option to send to Google Fusion Tables.">
+    Google Fusion Tables
+  </string>
+  <string name="send_google_my_maps"
+    translation_description="When sending a track to Google, under the 'Send to...' dialog, the
+      checkbox option to send to Google My Maps.">
+    Google My Maps
+  </string>
+  <string name="send_google_new_map"
+    translation_description="When sending a track to Google My Maps, the radio option to create a
+      new map as opposed to use an existing map.">
+    Create a new map
+  </string>
+  <string name="send_google_no_account_message"
+    translation_description="When sending to Google, the dialog message when no Google account is
+      found.">
+    No account found to upload tracks to.
+  </string>
+  <string name="send_google_no_account_title"
+    translation_description="When sending to Google, the dialog title when no Google account is
+      found.">
+    No account found
+  </string>
+  <string name="send_google_progress_authenticating"
+    translation_description="When sending a track to a Google service, the message on the progress
+      dialog indicating authenticating to the service.
+
+      %1$s: service name. E.g., 'Google Docs'.">
+    Authenticating to %1$s...
+  </string>
+  <string name="send_google_progress_creating"
+    translation_description="When sending a track to a Google service, the message on the progress
+      dialog indicating creating a new service item.
+
+      %1$s: service name. E.g., 'Google Docs'.">
+    Creating a new %1$s item...
+  </string>
+  <string name="send_google_progress_preparing_track"
+    translation_description="When sending a track to Google My Maps, the message on the progress
+      dialog indicating My Tracks is preparing the track's data for upload.">
+    Preparing track...
+  </string>
+  <string name="send_google_progress_reading_track"
+    translation_description="When sending a track to Google, the message on the progress dialog
+      indicating My Tracks is reading the track from its database.">
+    Reading track...
+  </string>
+  <string name="send_google_progress_sending"
+    translation_description="When sending a track to Google service, the message on the progress
+      dialog indicating My Tracks is sending the track data.
+
+      %1$s: service name. E.g., 'Google Docs'.">
+    Sending a track to %1$s...
+  </string>
+  <string name="send_google_recorded"
+    translation_description="When sending a track to Google, in the track description, a tag
+      for the track recorded date. E.g., 'Recorded: Tue Sep 06 15:08:30 PDT 2011'.">
+    Recorded
+  </string>
+  <string name="send_google_result_header"
+    translation_description="When sending a track to Google, the header on the top of the result
+      page.">
+    Upload status:
+  </string>
+  <string name="send_google_result_share_url"
+    translation_description="When sending a track to Google, in the result dialog, the button on
+      the bottom to share with friends the URL of the uploaded track.">
+    Share track URL
+  </string>
+  <string name="send_google_send_now"
+    translation_description="When sending a track to Google, under the 'Send to...' dialog, the
+      button on the bottom to send the track to the selected Google services.">
+    Send now
+  </string>
+  <string name="send_google_success_existing"
+    translation_description="When sending a track to a Google service, the message on the result
+      page indicating that the track is sent to an existing item in the service.
+
+      %1$s: service name. E.g., 'Google Docs'.
+      %2$s: service url. E.g., 'docs.google.com'.">
+    Your track has been sent to %1$s %2$s.
+  </string>
+  <string name="send_google_success_footer"
+    translation_description="When sending a track to Google, the additional comment on the bottom of
+      the result page.">
+    It may take a few minutes before new tracks appear.
+  </string>
+  <string name="send_google_success_new"
+    translation_description="When sending a track to a Google service, the message on the result
+      page indicating that a new item has been created.
+
+      %1$s: service name. E.g., 'Google Docs'.
+      %2$s: service url. E.g., 'docs.google.com'.">
+    A new item has been created at %1$s %2$s.
+  </string>
+  <string name="send_google_title"
+    translation_description="When sending a track to Google, the dialog title to choose the Google
+      services to send the track to. The user can choose Google My Maps, Google Fusion
+      Tables, and Google Docs.">
+    Send to...
+  </string>
+  <string name="send_google_track_part_label"
+    translation_description="When sending a track to Google, the label to name segments when
+      splitting a large track.
+
+      %1$d: part number. E.g., '1'.">
+    (Part %1$d)
+  </string>
+
+  <!-- Sensor State -->
+  <string name="sensor_state_battery"
+    translation_description="In the 'Sensor state' page, the label for the battery level on the bike
+      sensor. E.g, 'Battery level: 50 %'.">
+    Battery level
+  </string>
+  <string name="sensor_state_cadence"
+    translation_description="In the 'Sensor state' page, the label for the cadence on the bike
+      sensor. Cadence is the number of revolutions of the crank per minute. E.g.,
+      'Cadence: 80 rpm'.">
+    Cadence
+  </string>
+  <string name="sensor_state_connected"
+    translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor
+      has connected.">
+    Connected
+  </string>
+  <string name="sensor_state_connecting"
+    translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor is
+      connecting.">
+    Connecting
+  </string>
+  <string name="sensor_state_disconnected"
+    translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor
+      has disconnected.">
+    Disconnected
+  </string>
+  <string name="sensor_state_heart_rate"
+    translation_description="In the 'Sensor state' page, the label for the heart rate from a heart
+      rate sensor. E.g., 'Hear rate: 100 bpm'.">
+    Heart rate
+  </string>
+  <string name="sensor_state_last_sensor_time"
+    translation_description="In the 'Sensor state' page, the label for the last time the sensor has
+      sent a data. E.g., 'Last sensor time: 10:05 am'.">
+    Last sensor time
+  </string>
+  <string name="sensor_state_power"
+    translation_description="In the 'Sensor state' page, the label for the power from the bike
+      sensor. Power is the power output of the rider. E.g., 'Power: 50 W'.">
+    Power
+  </string>
+  <string name="sensor_state_sending"
+    translation_description="In the 'Sensor state' page, the 'Sensor state' value when the sensor
+      is sending data.">
+    Sending
+  </string>
+
+  <!-- Settings -->
+  <string name="settings_backup"
+    translation_description="In the Settings page, the option to change the data backup related
+      settings.">
+    Backup
+  </string>
+  <string name="settings_backup_now"
+    translation_description="In the Backup settings, under the 'SD card backup' section, the option
+      to backup to the SD card now.">
+    Backup now
+  </string>
+  <string name="settings_backup_now_progress_message"
+    translation_description="In the Backup settings, after pressing the 'Backup now' option, the
+      progress dialog telling the user that it is writing all tracks and settings and that it may
+      take a while.">
+    Writing all tracks and settings to the SD card. This may take a while...
+  </string>
+  <string name="settings_backup_now_summary"
+    translation_description="In the Backup settings, under the 'SD card backup' section, the summary
+      for the 'Backup now' option explaining that all tracks and settings will be written to the SD
+      card.">
+    Write a full copy of all your tracks and settings to the SD card.
+  </string>
+  <string name="settings_backup_restore"
+    translation_description="In the Backup settings, under the 'SD card backup' section, the option
+      to restore everything from the SD card.">
+    Restore now
+  </string>
+  <string name="settings_backup_restore_confirm_message"
+    translation_description="In the Backup settings, after pressing the 'Restore now' option, the
+      message in the alert dialog asking the user to confirm that he wants to restore from a backup
+      and it will overwrite all the current tracks and settings.">
+    Restoring a backup from the SD card will overwrite all your current tracks and settings. Are you
+    sure?
+  </string>
+  <string name="settings_backup_restore_no_backup"
+    translation_description="In the Backup settings, after pressing the 'Restore now' option, the
+      message in the alert dialog informing the user that there is no backup to restore from.">
+    No backup found.
+  </string>
+  <string name="settings_backup_restore_progress_message"
+    translation_description="In the Backup settings, after pressing the 'Restore now' option, the
+      message on the progress dialog indicating that My Tracks is reading all tracks and settings
+      from the backup on the SD card and that it may take a while.">
+    Reading all tracks and settings from the SD card. This may take a while...
+  </string>
+  <string name="settings_backup_restore_select_title"
+    translation_description="In the Backup settings, after pressing the 'Restore now' option, the
+      title in the picker dialog asking the user to select a backup.">
+    Select a backup to restore
+  </string>
+  <string name="settings_backup_restore_summary"
+    translation_description="In the Backup settings, under the 'SD card backup' section, the summary
+      for the 'Restore now' option explaining that it restores all tracks and settings from the SD
+      card.">
+    Restore all tracks and settings from the SD card.
+  </string>
+  <string name="settings_backup_sd_card"
+    translation_description="In the Backup settings, the section header for configuring backup to
+      the SD card.">
+    SD card backup
+  </string>
+  <string name="settings_display"
+    translation_description="In the Settings page, the option to change the display related
+      settings.">
+    Display
+  </string>
+  <string name="settings_display_metric"
+    translation_description="In the Display settings, the checkbox option to use the metric units.">
+    Use metric units
+  </string>
+  <string name="settings_display_metric_summary_off"
+    translation_description="In the Display settings, the summary for the 'Use metric units'
+      checkbox when it is unchecked explaining using the imperial units to display distances.">
+    Use imperial units to display distances.
+  </string>
+  <string name="settings_display_metric_summary_on"
+    translation_description="In the Display settings, the summary for the 'Use metric units'
+      checkbox when it is checked explaining using the metric units to display distances.">
+    Use metric units to display distances.
+  </string>
+  <string name="settings_display_speed"
+    translation_description="In the Display settings, the checkbox option to display speed (e.g., 5
+      miles per hour) instead of pace (e.g., 0.2 hours per mile).">
+    Display speed
+  </string>
+  <string name="settings_display_speed_summary_off"
+    translation_description="In the Display settings, the summary for the 'Display speed' checkbox
+      when it is unchecked explaining that pace (e.g., 0.2 hours per mile) will be used instead of
+      speed (e.g., 5 miles per hour).">
+    Display pace (e.g., hours/mile).
+  </string>
+  <string name="settings_display_speed_summary_on"
+    translation_description="In the Display settings, the summary for the 'Display speed' checkbox
+      when it is checked explaining that speed (e.g., 5 miles per hour) will be used instead of pace
+      (e.g., 0.2 hours per mile).">
+    Display speed (e.g., miles/hour).
+  </string>
+  <string name="settings_display_track_color"
+    translation_description="In the Display settings, the dropdown option to choose a track color
+      mode for how to use different colors to color a track based on speed.">
+    Track color mode
+  </string>
+  <string name="settings_display_track_color_dynamic"
+    translation_description="In the Display settings, for the 'Track color mode' dropdown, the
+      option to use different colors to color a track based on dynamically determined 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="settings_display_track_color_dynamic_medium"
+    translation_description="In the Display settings, under the 'Dynamic thresholds' configurations,
+      the option for configuring the percentage from the average speed to be considered as the
+      medium speed. The track color mode will use different colors to color a track depending on
+      whether the speed is above, in, or below the medium speed range.">
+    Medium percentage
+  </string>
+  <string name="settings_display_track_color_dynamic_medium_summary"
+    translation_description="In the Display settings, under the 'Dynamic thresholds' configurations,
+      the summary for the 'Medium percentage' option explaining that it sets the percentage from
+      the average speed to be considered as the medium speed. The track color mode will use
+      different colors to color a track depending on whether the speed is above, in, or below the
+      medium speed range.">
+    Percentage from the average speed for the medium speed range.
+  </string>
+  <string name="settings_display_track_color_fixed"
+    translation_description="In the Display settings, for the 'Track color mode' dropdown, the
+      option to use different colors to color a track based on fixed speed thresholds. E.g., use
+      one color for segments where the speed is below a fixed speed threshold.">
+    Fixed thresholds
+  </string>
+  <string name="settings_display_track_color_fixed_medium"
+    translation_description="In the Display settings, under the 'Fixed thresholds' configurations,
+      the option for configuring the medium speed threshold. Thus any speed lower than the
+      threshold but greater than the slow speed threshold will be colored by the medium speed
+      color.">
+    Medium speed threshold
+  </string>
+  <string name="settings_display_track_color_fixed_medium_summary"
+    translation_description="In the Display settings, under the 'Fixed thresholds' configurations,
+      the summary for the 'Medium speed threshold' option explaining that it sets a cutoff speed
+      for the medium speed color.">
+    Medium speed top value.
+  </string>
+  <string name="settings_display_track_color_fixed_slow"
+    translation_description="In the Display settings, under the 'Fixed thresholds' configurations,
+      the option for configuring the slow speed threshold. Thus any speed lower than the threshold
+      will be colored by the slow speed color.">
+    Slow speed threshold
+  </string>
+  <string name="settings_display_track_color_fixed_slow_summary"
+    translation_description="In the Display settings, under the 'Fixed thresholds' configurations,
+      the summary for the 'Slow speed threshold' option explaining that it sets a cutoff speed for
+      the slow speed color.">
+    Slow speed top value.
+  </string>
+  <string name="settings_display_track_color_single"
+    translation_description="In the Display settings, for the 'Track color mode' dropdown, the
+      option to only use a single color to color a track.">
+    Single color
+  </string>
+  <string name="settings_display_track_color_summary"
+    translation_description="In the Display settings, the summary for the 'Track color mode'
+      dropdown explaining that it configures how colors are used to color a track based on speed.">
+    The way to color a track based on slow, medium, and high speed.
+  </string>
+  <string name="settings_not_while_recording"
+    translation_description="In the Settings page, the summary for an option that is not available
+      during a track recording.">
+    Not available while recording a track.
+  </string>
+  <string name="settings_recording"
+    translation_description="In the Settings page, the option to change the track recording related
+      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 after phone reboot.
+  </string>
+  <string name="settings_recording_default_activity"
+    translation_description="In the Recording settings, the option to specify a new track's default
+      activity type.">
+    Default activity type
+  </string>
+  <string name="settings_recording_default_activity_summary"
+    translation_description="In the Recording settings, the summary for the 'Default activity type'
+      option explaining that it sets the default activity type for a new track.">
+    Default activity type for a new track.
+  </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_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_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_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
+  </string>
+  <string name="settings_reset_dialog_message"
+    translation_description="In the Settings page, after pressing the 'Reset to defaults' option,
+      the confirmation dialog asking the user to confirm reverting all settings to defaults. But
+      the saved tracks will be preserved.">
+    All your settings will be erased and reverted to the default values. Saved tracks will be
+    preserved. Are you sure?
+  </string>
+  <string name="settings_reset_done"
+    translation_description="In the Settings page, after pressing the 'Reset to defaults' option,
+      the confirmation dialog informing the user that all settings have been reverted to their
+      defaults.">
+    All settings have been reverted to their defaults.
+  </string>
+  <string name="settings_reset_summary"
+    translation_description="In the Settings page, the summary for the 'Reset to defaults'
+      option explaining reverting all the settings to the default values.">
+    Revert all your settings to the default values.
+  </string>
+  <string name="settings_sensor"
+    translation_description="In the Settings page, the option to change the sensor related
+      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 header 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.
+
+      %1$d: sensor id number. E.g., '1'.">
+    Paired with: %1$d.
+  </string>
+  <string name="settings_sensor_bluetooth_options"
+    translation_description="In the Sensor settings, the section header 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.">
+    Sharing
+  </string>
+  <string name="settings_sharing_allow_access"
+    translation_description="In the Sharing settings, the checkbox option to allow third party apps
+     access to the My Tracks data.">
+    Allow access
+  </string>
+  <string name="settings_sharing_allow_access_confirm_message"
+    translation_description="In the Sharing settings, after checking the 'Allow access' checkbox,
+      the confirmation dialog asking the user if he wants to allow other apps, including apps
+      installed in the future, to control and access My Tracks data. In addition, no further
+      notification of third party app access will be shown.">
+    Are you sure you want to allow other apps, including future apps, to control and access My
+    Tracks data? There will be no further notification.
+  </string>
+  <string name="settings_sharing_allow_access_summary_off"
+    translation_description="In the Sharing settings, the summary for the 'Allow access' checkbox
+      option when it is unchecked explaining that other apps cannot read, write, start/stop
+      recording My Tracks data.">
+    Other apps cannot read, write, start/stop recording My Tracks data.
+  </string>
+  <string name="settings_sharing_allow_access_summary_on"
+    translation_description="In the Sharing settings, the summary for the 'Allow access' checkbox
+      option when it is checked explaining that other apps can read, write, start/stop recording My
+      Tracks data.">
+    Other apps can read, write, start/stop recording My Tracks data.
+  </string>
+  <string name="settings_sharing_map_public"
+    translation_description="In the Sharing settings, the checkbox option to make a new map created
+      in Google My Maps public.">
+    Make new maps public
+  </string>
+  <string name="settings_sharing_map_public_summary_off"
+    translation_description="In the Sharing settings, the summary for the 'Make new maps public'
+      checkbox option when it is unchecked explaining that new maps created in Google My Maps will
+      be unlisted, as opposed to public.">
+    Make new maps created in Google My Maps unlisted.
+  </string>
+  <string name="settings_sharing_map_public_summary_on"
+    translation_description="In the Sharing settings, the summary for the 'Make new maps public'
+      checkbox option when it is checked explaining that new maps created in Google My Maps will
+      be public, as opposed to unlisted.">
+    Make new maps created in Google My Maps public.
+  </string>
+  <string name="settings_sharing_url_only"
+    translation_description="In the Sharing settings, the checkbox option to share only the URL
+      link, without any additional text, when sharing the URL with friends.">
+    Share only URL link
+  </string>
+  <string name="settings_sharing_url_only_summary_off"
+    translation_description="In the Sharing settings, the summary for the 'Share only URL link'
+      checkbox option when it is unchecked explaining that some text and the the URL link will be
+      sent when sharing the URL with friends.">
+    Some text and the URL link will be sent when sharing the URL with friends.
+  </string>
+  <string name="settings_sharing_url_only_summary_on"
+    translation_description="In the Sharing settings, the summary for the 'Share only URL link'
+      checkbox option when it is checked explaining that only the URL link, without any additional
+      text, will be sent when sharing the URL with friends.">
+   Only the URL link will be sent when sharing the URL with friends.
+  </string>
+  <string name="settings_title"
+    translation_description="The title of the Settings page.">
+    My Tracks settings
+  </string>
+
+  <!-- Share Track -->
+  <string name="share_track_file_body_format"
+    translation_description="When sharing a track file with friends, the body of the message.">
+    I think you might be interested in this track.\n\nTo view this track use Google Earth or other
+    mapping software.
+  </string>
+  <string name="share_track_picker_title"
+    translation_description="When sharing a track with friends, the title on the picker to
+      ask the user which application he wants to use.">
+    Share track using:
+  </string>
+  <string name="share_track_subject"
+    translation_description="When sharing a track with friends, the subject line.">
+    I would like to share a track with you
+  </string>
+  <string name="share_track_url_body_format"
+    translation_description="When sharing a track URL with friends, the body of the message.
+
+      %1$s: url. E.g, 'https://maps.google.com/maps'.">
+    I think you might be interested in this track:\n\n%1$s
+  </string>
+
+  <!-- Stat Page -->
+  <string name="stat_average_moving_pace"
+    translation_description="In the Statistic view, the average moving pace.">
+    Average moving pace
+  </string>
+  <string name="stat_average_moving_speed"
+    translation_description="In the Statistic view, the average moving speed.">
+    Average moving speed
+  </string>
+  <string name="stat_average_pace"
+    translation_description="In the Statistic view, the average pace.">
+    Average pace
+  </string>
+  <string name="stat_average_speed"
+    translation_description="In the Statistic view, the average speed.">
+    Average speed
+  </string>
+  <string name="stat_elevation"
+    translation_description="In the Statistic view, the elevation.">
+    Elevation
+  </string>
+  <string name="stat_elevation_gain"
+    translation_description="In the Statistic view, the elevation gain.">
+    Elevation gain
+  </string>
+  <string name="stat_latitude"
+    translation_description="In the Statistic view, the latitude.">
+    Latitude
+  </string>
+  <string name="stat_longitude"
+    translation_description="In the Statistic view, the longitude.">
+    Longitude
+  </string>
+  <string name="stat_max_elevation"
+    translation_description="In the Statistic view, the maximum elevation.">
+    Max elevation
+  </string>
+  <string name="stat_max_grade"
+    translation_description="In the Statistic view, the maximum grade.">
+    Max grade
+  </string>
+  <string name="stat_max_speed"
+    translation_description="In the Statistic view, the maximum speed.">
+    Max speed
+  </string>
+  <string name="stat_min_elevation"
+    translation_description="In the Statistic view, the minimum elevation.">
+    Min elevation
+  </string>
+  <string name="stat_min_grade"
+    translation_description="In the Statistic view, the minimum grade.">
+    Min grade
+  </string>
+  <string name="stat_min_pace"
+    translation_description="In the Statistic view, the minimum pace.">
+    Min pace
+  </string>
+  <string name="stat_moving_time"
+    translation_description="In the Statistic view, the moving time.">
+    Moving time
+  </string>
+  <string name="stat_pace"
+    translation_description="In the Statistic view, the pace like hours per mile.">
+    Pace
+  </string>
+  <string name="stat_speed"
+    translation_description="In the Statistic view, the speed like miles per hour.">
+    Speed
+  </string>
+  <string name="stat_total_distance"
+    translation_description="In the Statistic view, the total distance.">
+    Total distance
+  </string>
+  <string name="stat_total_time"
+    translation_description="In the Statistic view, the total time.">
+    Total time
+  </string>
+
+  <!-- Track -->
+  <string name="track_detail_activity_type"
+    translation_description="In the detail page for a track, the text field for the activity type,
+      including for examples.">
+    Activity type (e.g. hiking, cycling, running, climbing...)
+  </string>
+  <string name="track_detail_activity_type_hint"
+    translation_description="In the detail page for a track, the hint in the 'Activity type' text
+      field when it is empty.">
+    Activity type
+  </string>
+  <string name="track_detail_title"
+    translation_description="In the detail page for a track, the title of the page.">
+    Track details
+  </string>
+  <string name="track_detail_track_description"
+    translation_description="In the detail page for a track, the text field for the track
+      description.">
+    Track description
+  </string>
+  <string name="track_detail_track_name"
+    translation_description="In the detail page for a track, the text field for the track name.">
+    Track name
+  </string>
+  <string name="track_list_clear_map"
+    translation_description="In the context menu for a track, the menu option to clear the map
+      of any track.">
+    Clear map
+  </string>
+  <string name="track_list_context_menu_title"
+    translation_description="In the context menu for a track, the title indicating that all the menu
+      options below are for this track.">
+    This track
+  </string>
+  <string name="track_list_delete_all"
+    translation_description="In the Tracks page, the button on the bottom to delete all tracks.">
+    Delete all
+  </string>
+  <string name="track_list_delete_all_confirm_message"
+    translation_description="In the Tracks page, when pressing the 'Delete all' button, the
+      confirmation dialog message informing the user that all tracks and markers will be permanently
+      deleted from the phone.">
+    All tracks and markers will be permanently deleted from the phone.
+  </string>
+  <string name="track_list_delete_track"
+    translation_description="In the context menu for a track, the menu option to delete the
+      track from the phone.">
+    Delete from phone...
+  </string>
+  <string name="track_list_delete_track_confirm_message"
+    translation_description="In the context menu for a track, when pressing the 'Delete from
+      phone...' option, the confirmation dialog message informing the user that the track and its
+      markers will be permanently deleted from the phone.">
+    The track and its markers will be permanently deleted from the phone.
+  </string>
+  <string name="track_list_edit_track"
+    translation_description="In the context menu for a track, the menu option to edit the track's
+      metadata (e.g., name, activity type, etc.).">
+    Edit
+  </string>
+  <string name="track_list_export_all"
+    translation_description="In the Tracks page, the button on the bottom to export all tracks.">
+    Export all
+  </string>
+  <string name="track_list_export_file"
+    translation_description="In the Tracks page, after pressing the 'Export all' button, the menu
+      option to export all the tracks as a certain file format.
+
+      %1$s: file format. E.g, 'GPX'.">
+    Export as %1$s
+  </string>
+  <string name="track_list_import_all"
+    translation_description="In the Tracks page, the button on the bottom to import all tracks.">
+    Import all
+  </string>
+  <string name="track_list_pick_one"
+    translation_description="In the Tracks page, the instruction at the top of the page informing
+      the user he can press and hold a track for more options.">
+    Pick a track. Press &amp; hold for more options.
+  </string>
+  <string name="track_list_save_file"
+    translation_description="In the context menu for a track, under the 'Save to SD card...'
+      option, the menu option to save the track as a certain file format.
+
+      %1$s: file format. E.g, 'GPX'.">
+    As a %1$s file
+  </string>
+  <string name="track_list_save_sd"
+    translation_description="In the context menu for a track, the menu option to save the track to
+      the SD card.">
+    Save to SD card...
+  </string>
+  <string name="track_list_send_google"
+    translation_description="In the context menu for a track, the menu option to send the track to
+      Google.">
+    Send to Google...
+  </string>
+  <string name="track_list_share_file"
+    translation_description="In the context menu for a track, under the 'Share with friends...'
+      option, the menu option to share the track as a certain file format.
+
+      %1$s: file format. E.g, 'GPX'.">
+    A %1$s file
+  </string>
+  <string name="track_list_share_track"
+    translation_description="In the context menu for a track, the menu option to share the track
+      with friends through other applications.">
+    Share with friends...
+  </string>
+  <string name="track_list_share_url"
+    translation_description="In the context menu for a track, under the 'Share with friends...'
+      option, the menu option to save a track to My Maps or Fusion Tables and share the URL with
+      friends.">
+    My Map or Fusion Table URL
+  </string>
+  <string name="track_list_show_on_map"
+    translation_description="In the context menu for a track, the menu option to show the track on
+      the map.">
+    Show on map
+  </string>
+  <string name="track_name_format"
+    translation_description="When creating a new track, the string format to name the track.
+
+      %1$d: track number. E.g., '1'.">
+    Track %1$d
+  </string>
+  <string name="track_record_error"
+    translation_description="When starting a recording, message when not able to start due to no GPS
+      location and asking the user to try again.">
+    Unable to start recording. No GPS location. Try again.
+  </string>
+  <string name="track_record_notification"
+    translation_description="When recording a track, the message on the My Tracks notification
+      informing the user that My Tracks is actively recording his track.">
+    Recording your track...
+  </string>
+  <string name="track_record_success"
+    translation_description="When starting a new track recording, a status message indicating
+      success.">
+    Now recording a new track.
+  </string>
+
+  <!-- Unit -->
+  <string name="unit_beat_per_minute"
+    translation_description="Abbreviation for beats per minute, unit for heart rate. E.g.,
+      'Heart rate: 80 bpm'.">
+    bpm
+  </string>
+  <string name="unit_feet"
+    translation_description="Abbreviation for feet. E.g., '2 ft'.">
+    ft
+  </string>
+  <string name="unit_hour"
+    translation_description="Abbreviation for hours. E.g, '2 hr'.">
+    hr
+  </string>
+  <string name="unit_kilometer"
+    translation_description="Abbreviation for kilometers. E.g., '2 km'.">
+    km
+  </string>
+  <string name="unit_kilometer_per_hour"
+    translation_description="Abbreviation for kilometers per hour. E.g, '5 km/h'.">
+    km/h
+  </string>
+  <string name="unit_meter"
+    translation_description="Abbreviation for meters. E.g., '2 m'.">
+    m
+  </string>
+  <string name="unit_mile"
+    translation_description="Abbreviation for miles. E.g., '2 mi'.">
+    mi
+  </string>
+  <string name="unit_mile_per_hour"
+    translation_description="Abbreviation for miles per hour. E.g, '5 mi/h'.">
+    mi/h
+  </string>
+  <string name="unit_minute"
+    translation_description="Abbreviation for minutes. E.g, '2 min'.">
+    min
+  </string>
+  <string name="unit_minute_per_kilometer"
+    translation_description="Abbreviation for minutes per kilometer. E.g, '5 min/km'.">
+    min/km
+  </string>
+  <string name="unit_minute_per_mile"
+    translation_description="Abbreviation for minutes per mile. E.g, '5 min/mi'.">
+    min/mi
+  </string>
+  <string name="unit_revolution_per_minute"
+    translation_description="Abbreviation for revolutions per minute, unit for cadence. E.g.,
+      'Cadence: 80 rpm'.">
+    rpm
+  </string>
+  <string name="unit_watt"
+    translation_description="Abbreviation for watts, unit for power. E.g., 'Power: 80 W'.">
+    W
+  </string>
+
+  <!-- Value -->
+  <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.
+
+      %1$.1f: mile as a float number. E.g., '2.2'">
+    %1$.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.
+
+      %1$.1f: mile as a float number. E.g., '2.2'">
+    %1$.1f mi (poor GPS)
+  </string>
+  <string name="value_integer_feet"
+    translation_description="In a setting picker, an integer value in feet.
+
+      %1$d: feet as an integer value. E.g., '2'">
+    %1$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.
+
+      %1$d: feet as an integer value. E.g., '2'">
+    %1$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.
+
+      %1$d: feet as an integer value. E.g., '2'">
+    %1$d ft (recommended)
+  </string>
+  <string name="value_integer_kilometer"
+    translation_description="In a setting picker, an integer value in kilometers.
+
+      %1$d: kilometer as an integer value. E.g., '2'">
+    %1$d km
+  </string>
+  <string name="value_integer_meter"
+    translation_description="In a setting picker, an integer value in meters.
+
+      %1$d: meter as an integer value. E.g., '2'">
+    %1$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.
+
+      %1$d: meter as an integer value. E.g., '2'">
+    %1$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.
+
+      %1$d: meter as an integer value. E.g., '2'">
+    %1$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.
+
+      %1$d: meter as an integer value. E.g., '2'">
+    %1$d m (recommended)
+  </string>
+  <string name="value_integer_mile"
+    translation_description="In a setting picker, an integer value in miles.
+
+      %1$d: mile as an integer value. E.g., '2'">
+    %1$d mi
+  </string>
+  <string name="value_integer_minute"
+    translation_description="In a setting picker, an integer value in minutes.
+
+      %1$d: minute as an integer value. E.g., '2'">
+    %1$d min
+  </string>
+  <string name="value_integer_second"
+    translation_description="In a setting picker, an integer value in seconds.
+
+      %1$d: second as an integer value. E.g., '2'">
+    %1$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>
+
+  <!-- Voice -->
+  <string name="voice_hour"
+    translation_description="For voice announcement, to say hour like 'one hour'.">
+    hour
+  </string>
+  <string name="voice_hours"
+    translation_description="For voice announcement, to say hours like 'two hours'.">
+    hours
+  </string>
+  <string name="voice_kilometer_per_hour"
+    translation_description="For voice announcement, to say 'kilometers per hour' for speed like
+      'two kilometers per hour'.">
+    kilometers per hour
+  </string>
+  <string name="voice_kilometers"
+    translation_description="For voice announcement, to say kilometers like 'two kilometers'.">
+    kilometers
+  </string>
+  <string name="voice_mile_per_hour"
+    translation_description="For voice announcement, to say 'miles per hour' for speed like 'two
+      miles per hour'.">
+    miles per hour
+  </string>
+  <string name="voice_miles"
+    translation_description="For voice announcement, to say miles like 'two miles'.">
+    miles
+  </string>
+  <string name="voice_minute"
+    translation_description="For voice announcement, to say minute like 'one minute'.">
+    minute
+  </string>
+  <string name="voice_minutes"
+    translation_description="For voice announcement, to say minutes like 'two minutes'.">
+    minutes
+  </string>
+  <string name="voice_no_distance"
+    translation_description="For the voice announcement, the announcement when the current track's
+      total distance is zero.">
+    My Tracks no distance.
+  </string>
+  <string name="voice_per_kilometer"
+    translation_description="For voice announcement, to say 'per kilometer' for pace like 'two
+      minutes per kilometer'.">
+    per kilometer
+  </string>
+  <string name="voice_per_mile"
+    translation_description="For voice announcement, to say 'per mile' for pace like 'two minutes
+      per mile'.">
+    per mile
+  </string>
+  <string name="voice_second"
+    translation_description="For voice announcement, to say second like 'one second'.">
+    second
+  </string>
+  <string name="voice_seconds"
+    translation_description="For voice announcement, to say seconds like 'two seconds'.">
+    seconds
+  </string>
+  <string name="voice_template"
+    translation_description="For the voice announcement, the template to make an announcement.
+
+      %1$.2f: distance value. E.g., '5.2'.
+      %2$s: distance unit. E.g., 'miles'.
+      %3$s: time value. E.g., '2 hours and 30 minutes'.
+      %4$s: speed/pace value. E.g., '2 hours and 30 minutes'.
+      %5$s: speed/pace unit. E.g., 'per mile'.">
+    My Tracks total distance %1$.2f %2$s in %3$s at %4$s %5$s.
+  </string>
+
+  <!-- Waypoint Type -->
   <string name="waypoint_type_atm"
     translation_description="When entering the Marker Type, an option for an ATM.">
     ATM
@@ -2015,9 +1893,9 @@ limitations under the License.
     translation_description="When entering the Marker Type, an option for a bar.">
     bar
   </string>
-  <string name="waypoint_type_barbeque"
-    translation_description="When entering the Marker Type, an option for a barbeque.">
-    barbeque
+  <string name="waypoint_type_barbecue"
+    translation_description="When entering the Marker Type, an option for a barbecue.">
+    barbecue
   </string>
   <string name="waypoint_type_building"
     translation_description="When entering the Marker Type, an option for a building.">
@@ -2195,16 +2073,27 @@ limitations under the License.
     translation_description="When entering the Marker Type, an option for a tunnel.">
     tunnel
   </string>
-  <string name="waypoint_type_water_fountain"
-    translation_description="When entering the Marker Type, an option for a water fountain.">
-    water fountain
-  </string>
   <string name="waypoint_type_waterfall"
     translation_description="When entering the Marker Type, an option for a waterfall.">
     waterfall
   </string>
+  <string name="waypoint_type_water_fountain"
+    translation_description="When entering the Marker Type, an option for a water fountain.">
+    water fountain
+  </string>
   <string name="waypoint_type_way_point"
     translation_description="When entering the Marker Type, an option for a way point.">
     way point
   </string>
+
+  <!-- Welcome Page -->
+  <string name="welcome_about"
+    translation_description="In the 'Welcome' page, the button on the bottom to read the 'About My
+      Tracks' page.">
+    About My Tracks
+  </string>
+  <string name="welcome_title"
+    translation_description="The title of the welcome page.">
+    Welcome
+  </string>
 </resources>
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index 6b09d846e..dea880078 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -38,7 +38,7 @@ limitations under the License.
     <item name="android:gravity">right</item>
     <item name="android:layout_marginBottom">-9dip</item>
     <item name="android:layout_marginTop">-9dip</item>
-    <item name="android:text">@string/unknown</item>
+    <item name="android:text">@string/value_unknown</item>
     <item name="android:textColor">@color/stat_label_text</item>
     <item name="android:textSize">40sp</item>
   </style>
diff --git a/MyTracks/res/values/urls.xml b/MyTracks/res/values/urls.xml
deleted file mode 100644
index 14ab85638..000000000
--- a/MyTracks/res/values/urls.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-  <!-- DO NOT TRANSLATE -->
-  <string name="waypoint_icon_url">http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png</string>
-  <string name="stats_icon_url">http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png</string>
-</resources>
\ No newline at end of file
diff --git a/MyTracks/res/xml/preferences.xml b/MyTracks/res/xml/preferences.xml
index 491cb6380..00765d88f 100644
--- a/MyTracks/res/xml/preferences.xml
+++ b/MyTracks/res/xml/preferences.xml
@@ -21,64 +21,64 @@ limitations under the License.
   <PreferenceScreen android:title="@string/settings_display">
     <CheckBoxPreference
         android:key="@string/metric_units_key"
-        android:title="@string/settings_metric_units"
-        android:summaryOn="@string/settings_metric_units_summary_on"
-        android:summaryOff="@string/settings_metric_units_summary_off"
+        android:title="@string/settings_display_metric"
+        android:summaryOn="@string/settings_display_metric_summary_on"
+        android:summaryOff="@string/settings_display_metric_summary_off"
         android:defaultValue="true" />
 
     <CheckBoxPreference
         android:key="@string/report_speed_key"
-        android:title="@string/settings_report_speed_or_pace"
-        android:summaryOn="@string/settings_report_speed_or_pace_summary_on"
-        android:summaryOff="@string/settings_report_speed_or_pace_summary_off"
+        android:title="@string/settings_display_speed"
+        android:summaryOn="@string/settings_display_speed_summary_on"
+        android:summaryOff="@string/settings_display_speed_summary_off"
         android:defaultValue="true" />
         
     <ListPreference android:key="@string/track_color_mode_key"
-        android:title="@string/settings_track_color_mode"
-        android:summary="@string/settings_track_color_mode_summary"
-        android:entries="@array/track_color_mode_options"
-        android:entryValues="@array/track_color_mode_values"
-        android:defaultValue="@string/track_color_mode_value_none"/>
+        android:title="@string/settings_display_track_color"
+        android:summary="@string/settings_display_track_color_summary"
+        android:entries="@array/display_track_color_options"
+        android:entryValues="@array/display_track_color_values"
+        android:defaultValue="@string/display_track_color_value_none"/>
 
-    <PreferenceCategory android:title="@string/track_color_mode_option_fixed" 
+    <PreferenceCategory android:title="@string/settings_display_track_color_fixed" 
         android:key="@string/track_color_mode_fixed_speed_options_key">
         <EditTextPreference android:key="@string/track_color_mode_fixed_speed_slow_key" 
-            android:title="@string/settings_track_color_mode_fixed_speed_slow" 
-            android:summary="@string/settings_track_color_mode_fixed_speed_slow_summary" 
+            android:title="@string/settings_display_track_color_fixed_slow" 
+            android:summary="@string/settings_display_track_color_fixed_slow_summary" 
             android:defaultValue="9" 
             android:inputType="number"
             android:maxLength="3">
         </EditTextPreference>
         
         <EditTextPreference android:key="@string/track_color_mode_fixed_speed_slow_display_key" 
-            android:title="@string/settings_track_color_mode_fixed_speed_slow" 
-            android:summary="@string/settings_track_color_mode_fixed_speed_slow_summary" 
+            android:title="@string/settings_display_track_color_fixed_slow" 
+            android:summary="@string/settings_display_track_color_fixed_slow_summary" 
             android:defaultValue="9" 
             android:inputType="number"
             android:maxLength="3">
         </EditTextPreference>
         
         <EditTextPreference android:key="@string/track_color_mode_fixed_speed_medium_key" 
-            android:title="@string/settings_track_color_mode_fixed_speed_medium" 
-            android:summary="@string/settings_track_color_mode_fixed_speed_medium_summary" 
+            android:title="@string/settings_display_track_color_fixed_medium" 
+            android:summary="@string/settings_display_track_color_fixed_medium_summary" 
             android:defaultValue="15"
             android:inputType="number"
             android:maxLength="3">
         </EditTextPreference>
         
         <EditTextPreference android:key="@string/track_color_mode_fixed_speed_medium_display_key" 
-            android:title="@string/settings_track_color_mode_fixed_speed_medium" 
-            android:summary="@string/settings_track_color_mode_fixed_speed_medium_summary" 
+            android:title="@string/settings_display_track_color_fixed_medium" 
+            android:summary="@string/settings_display_track_color_fixed_medium_summary" 
             android:defaultValue="15"
             android:inputType="number"
             android:maxLength="3">
         </EditTextPreference>
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/track_color_mode_option_dynamic">
+    <PreferenceCategory android:title="@string/settings_display_track_color_dynamic">
         <EditTextPreference android:key="@string/track_color_mode_dynamic_speed_variation_key" 
-            android:title="@string/settings_track_color_mode_dynamic_speed_variation" 
-            android:summary="@string/settings_track_color_mode_dynamic_speed_variation_summary" 
+            android:title="@string/settings_display_track_color_dynamic_medium" 
+            android:summary="@string/settings_display_track_color_dynamic_medium_summary" 
             android:defaultValue="25" 
             android:inputType="number"
             android:maxLength="2">
@@ -90,64 +90,64 @@ 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:entryValues="@array/task_frequency_values"
+        android:title="@string/settings_recording_voice"
+        android:summary="@string/settings_recording_voice_summary"
+        android:entryValues="@array/recording_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:entryValues="@array/task_frequency_values"
+        android:title="@string/settings_recording_marker"
+        android:summary="@string/settings_recording_marker_summary"
+        android:entryValues="@array/recording_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:entryValues="@array/min_recording_interval_values"
+        android:title="@string/settings_recording_interval"
+        android:summary="@string/settings_recording_interval_summary"
+        android:entryValues="@array/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:entryValues="@array/min_recording_distance_values"
+        android:title="@string/settings_recording_distance"
+        android:summary="@string/settings_recording_distance_summary"
+        android:entryValues="@array/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:entryValues="@array/max_recording_distance_values"
+        android:title="@string/settings_recording_track_distance"
+        android:summary="@string/settings_recording_track_distance_summary"
+        android:entryValues="@array/recording_track_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:entryValues="@array/min_required_accuracy_values"
+        android:title="@string/settings_recording_gps_accuracy"
+        android:summary="@string/settings_recording_gps_accuracy_summary"
+        android:entryValues="@array/recording_gps_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:entryValues="@array/auto_resume_track_timeout_values"
+        android:title="@string/settings_recording_auto_resume"
+        android:summary="@string/settings_recording_auto_resume_summary"
+        android:entryValues="@array/recording_auto_resume_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" />
         
     <com.google.android.apps.mytracks.AutoCompleteTextPreference
-        android:key="@string/default_category_key"
-        android:title="@string/settings_default_category"
-        android:summary="@string/settings_default_category_summary"
+        android:key="@string/default_activity_key"
+        android:title="@string/settings_recording_default_activity"
+        android:summary="@string/settings_recording_default_activity_summary"
         android:defaultValue="" />
 
   </PreferenceScreen>
@@ -163,26 +163,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"/>
+	        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>
 
@@ -190,38 +190,38 @@ limitations under the License.
   <PreferenceScreen android:title="@string/settings_sharing">
     <CheckBoxPreference
         android:key="@string/default_map_public_key"
-        android:title="@string/settings_map_public"
-        android:summaryOn="@string/settings_map_public_summary_on"
-        android:summaryOff="@string/settings_map_public_summary_off"
+        android:title="@string/settings_sharing_map_public"
+        android:summaryOn="@string/settings_sharing_map_public_summary_on"
+        android:summaryOff="@string/settings_sharing_map_public_summary_off"
         android:defaultValue="true" />
 
     <CheckBoxPreference
         android:key="@string/share_url_only_key"
-        android:title="@string/settings_share_url_only"
-        android:summaryOn="@string/settings_share_url_only_summary_on"
-        android:summaryOff="@string/settings_share_url_only_summary_off"
+        android:title="@string/settings_sharing_url_only"
+        android:summaryOn="@string/settings_sharing_url_only_summary_on"
+        android:summaryOff="@string/settings_sharing_url_only_summary_off"
         android:defaultValue="false" />
 
     <CheckBoxPreference
         android:key="@string/allow_access_key"
-        android:title="@string/settings_allow_access"
-        android:summaryOn="@string/settings_allow_access_summary_on"
-        android:summaryOff="@string/settings_allow_access_summary_off"
+        android:title="@string/settings_sharing_allow_access"
+        android:summaryOn="@string/settings_sharing_allow_access_summary_on"
+        android:summaryOff="@string/settings_sharing_allow_access_summary_off"
         android:defaultValue="false" />
   </PreferenceScreen>
 
   <!-- Backup settings -->
   <PreferenceScreen android:title="@string/settings_backup">
-    <PreferenceCategory android:title="@string/settings_sd_backup">
+    <PreferenceCategory android:title="@string/settings_backup_sd_card">
       <Preference
           android:key="@string/backup_to_sd_key"
-          android:title="@string/settings_backup_to_sd"
-          android:summary="@string/settings_backup_to_sd_summary"
+          android:title="@string/settings_backup_now"
+          android:summary="@string/settings_backup_now_summary"
           android:persistent="false" />
       <Preference
           android:key="@string/restore_from_sd_key"
-          android:title="@string/settings_restore_from_sd"
-          android:summary="@string/settings_restore_from_sd_summary"
+          android:title="@string/settings_backup_restore"
+          android:summary="@string/settings_backup_restore_summary"
           android:persistent="false" />
     </PreferenceCategory>
   </PreferenceScreen>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java b/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java
index 69d0aaa7d..bc8dc5707 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java
@@ -78,9 +78,9 @@ public class AccountChooser {
     // Let the user choose.
     Log.e(Constants.TAG, "Multiple matching accounts found.");
     final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-    builder.setTitle(R.string.choose_account_title);
+    builder.setTitle(R.string.send_google_choose_account_title);
     builder.setCancelable(false);
-    builder.setPositiveButton(R.string.ok,
+    builder.setPositiveButton(R.string.generic_ok,
         new DialogInterface.OnClickListener() {
       public void onClick(DialogInterface dialog, int which) {
         dialog.dismiss();
@@ -92,7 +92,7 @@ public class AccountChooser {
         handler.onAccountSelected(selectedAccount);
       }
     });
-    builder.setNegativeButton(R.string.cancel,
+    builder.setNegativeButton(R.string.generic_cancel,
         new DialogInterface.OnClickListener() {
       public void onClick(DialogInterface dialog, int which) {
         dialog.dismiss();
@@ -124,10 +124,10 @@ public class AccountChooser {
       final AccountHandler handler) {
     Log.e(Constants.TAG, "No matching accounts found.");
     final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-    builder.setTitle(R.string.no_account_found_title);
-    builder.setMessage(R.string.no_account_found);
+    builder.setTitle(R.string.send_google_no_account_title);
+    builder.setMessage(R.string.send_google_no_account_message);
     builder.setCancelable(true);
-    builder.setPositiveButton(R.string.ok,
+    builder.setPositiveButton(R.string.generic_ok,
         new DialogInterface.OnClickListener() {
           public void onClick(DialogInterface dialog, int which) {
             dialog.dismiss();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
index 3e2767bf2..302891967 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
@@ -74,7 +74,7 @@ public class AggregatedStatsActivity extends Activity implements
     }
     utils.setMetricUnits(metricUnits);
     utils.updateUnits();
-    utils.setSpeedLabel(R.id.speed_label, R.string.speed, R.string.pace_label);
+    utils.setSpeedLabel(R.id.speed_label, R.string.stat_speed, R.string.stat_pace);
     utils.setSpeedLabels();
 
     DisplayMetrics metrics = new DisplayMetrics();
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/AutoCompleteTextPreference.java b/MyTracks/src/com/google/android/apps/mytracks/AutoCompleteTextPreference.java
index 0096b1815..0469acf04 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/AutoCompleteTextPreference.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/AutoCompleteTextPreference.java
@@ -31,7 +31,7 @@ public class AutoCompleteTextPreference extends EditTextPreference {
     mEditText.setThreshold(0);
 
     // Gets autocomplete values for 'Default Activity' preference
-    if (getKey().equals(context.getString(R.string.default_category_key))) {
+    if (getKey().equals(context.getString(R.string.default_activity_key))) {
       ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(context,
           R.array.activity_types, android.R.layout.simple_dropdown_item_1line);
       mEditText.setAdapter(adapter);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
index 48ef7d865..49f4c7114 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
@@ -190,7 +190,7 @@ public class ChartActivity extends Activity implements TrackDataListener {
     super.onCreateOptionsMenu(menu);
     chartSettingsMenuItem =
         menu.add(0, Constants.MENU_CHART_SETTINGS, 0,
-            R.string.chart_settings);
+            R.string.menu_chart_view_chart_settings);
     chartSettingsMenuItem.setIcon(R.drawable.chart_settings);
     return true;
   }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
index 51734556f..09bc9e002 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
@@ -210,7 +210,7 @@ public class ChartView extends View {
                              R.color.elevation_border,
                              new ZoomSettings(MAX_INTERVALS,
                                  new int[] {5, 10, 25, 50, 100, 250, 500, 1000, 2500, 5000}),
-                             R.string.elevation_label);
+                             R.string.stat_elevation);
 
     series[SPEED_SERIES] =
         new ChartValueSeries(context,
@@ -219,14 +219,14 @@ public class ChartView extends View {
                              R.color.speed_border,
                              new ZoomSettings(MAX_INTERVALS, 0, Integer.MIN_VALUE,
                                  new int[] {1, 5, 10, 20, 50}),
-                             R.string.speed);
+                             R.string.stat_speed);
     series[POWER_SERIES] =
         new ChartValueSeries(context,
                              "###,###",
                              R.color.power_fill,
                              R.color.power_border,
                              new ZoomSettings(MAX_INTERVALS, 0, 1000, new int[] {5, 50, 100, 200}),
-                             R.string.power);
+                             R.string.sensor_state_power);
     series[CADENCE_SERIES] =
         new ChartValueSeries(context,
                              "###,###",
@@ -234,7 +234,7 @@ public class ChartView extends View {
                              R.color.cadence_border,
                              new ZoomSettings(MAX_INTERVALS, 0, Integer.MIN_VALUE,
                                  new int[] {5, 10, 25, 50}),
-                             R.string.cadence);
+                             R.string.sensor_state_cadence);
     series[HEART_RATE_SERIES] =
         new ChartValueSeries(context,
                              "###,###",
@@ -242,7 +242,7 @@ public class ChartView extends View {
                              R.color.heartrate_border,
                              new ZoomSettings(MAX_INTERVALS, 0, Integer.MIN_VALUE,
                                  new int[] {25, 50}),
-                             R.string.heart_rate);
+                             R.string.sensor_state_heart_rate);
   }
 
   public void clearWaypoints() {
@@ -269,8 +269,8 @@ public class ChartView extends View {
 
   public void setReportSpeed(boolean reportSpeed, Context c) {
     series[SPEED_SERIES].setTitle(c.getString(reportSpeed
-                                              ? R.string.speed
-                                              : R.string.pace_label));
+                                              ? R.string.stat_speed
+                                              : R.string.stat_pace));
   }
 
   private void addDataPointInternal(double[] theData) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/CheckUnits.java b/MyTracks/src/com/google/android/apps/mytracks/CheckUnits.java
index a35f4409d..a732ff67d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/CheckUnits.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/CheckUnits.java
@@ -57,7 +57,7 @@ class CheckUnits {
       }
     });
     builder.setCancelable(true);
-    builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+    builder.setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
       public void onClick(DialogInterface dialog, int which) {
         recordCheckPerformed(checkUnitsSharedPreferences);
         SharedPreferences useMetricPreferences = context.getSharedPreferences(
diff --git a/MyTracks/src/com/google/android/apps/mytracks/DeleteAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/DeleteAllTracks.java
index ff1f35fe9..20f6509ac 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/DeleteAllTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/DeleteAllTracks.java
@@ -51,10 +51,10 @@ public class DeleteAllTracks extends Handler {
     AlertDialog dialog = null;
     AlertDialog.Builder builder = new AlertDialog.Builder(context);
     builder.setMessage(
-        context.getString(R.string.all_data_will_be_permanently_deleted));
-    builder.setTitle(context.getString(R.string.confirmation_title_are_you_sure));
+        context.getString(R.string.track_list_delete_all_confirm_message));
+    builder.setTitle(context.getString(R.string.generic_confirm_title));
     builder.setIcon(android.R.drawable.ic_dialog_alert);
-    builder.setPositiveButton(context.getString(R.string.yes),
+    builder.setPositiveButton(context.getString(R.string.generic_yes),
         new DialogInterface.OnClickListener() {
           public void onClick(DialogInterface dialogInterface, int i) {
             dialogInterface.dismiss();
@@ -72,7 +72,7 @@ public class DeleteAllTracks extends Handler {
             }
           }
         });
-    builder.setNegativeButton(context.getString(R.string.no),
+    builder.setNegativeButton(context.getString(R.string.generic_no),
         new DialogInterface.OnClickListener() {
           public void onClick(DialogInterface dialogInterface, int i) {
             dialogInterface.dismiss();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/DeleteTrack.java b/MyTracks/src/com/google/android/apps/mytracks/DeleteTrack.java
index a0746a9e1..7b799758c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/DeleteTrack.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/DeleteTrack.java
@@ -77,11 +77,11 @@ public class DeleteTrack extends Activity
     }
 
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setMessage(getString(R.string.track_will_be_permanently_deleted));
-    builder.setTitle(getString(R.string.confirmation_title_are_you_sure));
+    builder.setMessage(getString(R.string.track_list_delete_track_confirm_message));
+    builder.setTitle(getString(R.string.generic_confirm_title));
     builder.setIcon(android.R.drawable.ic_dialog_alert);
-    builder.setPositiveButton(getString(R.string.yes), this);
-    builder.setNegativeButton(getString(R.string.no), this);
+    builder.setPositiveButton(getString(R.string.generic_yes), this);
+    builder.setNegativeButton(getString(R.string.generic_no), this);
     builder.setOnCancelListener(this);
     return builder.create();
   }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/Eula.java b/MyTracks/src/com/google/android/apps/mytracks/Eula.java
index 59936ce80..39ea5b319 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/Eula.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/Eula.java
@@ -52,14 +52,14 @@ class Eula {
     }
 
     final AlertDialog.Builder builder = initDialog(activity);
-    builder.setPositiveButton(R.string.accept,
+    builder.setPositiveButton(R.string.eula_accept,
         new DialogInterface.OnClickListener() {
           @Override
           public void onClick(DialogInterface dialog, int which) {
             accept(activity, preferences);
           }
         });
-    builder.setNegativeButton(R.string.decline,
+    builder.setNegativeButton(R.string.eula_decline,
         new DialogInterface.OnClickListener() {
           @Override
           public void onClick(DialogInterface dialog, int which) {
@@ -82,7 +82,7 @@ class Eula {
    */
   static void showEula(Context context) {
     AlertDialog.Builder builder = initDialog(context);
-    builder.setPositiveButton(R.string.ok, null);
+    builder.setPositiveButton(R.string.generic_ok, null);
     builder.show();
   }
   
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
index a78674bf0..e71af1a5a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
@@ -78,10 +78,18 @@ public class ExportAllTracks {
     this.activity = activity;
     Log.i(Constants.TAG, "ExportAllTracks: Starting");
 
+    String exportFileFormat = activity.getString(R.string.track_list_export_file);
+    String fileTypes[] = activity.getResources().getStringArray(R.array.file_types);
+    
+    String[] choices = new String[fileTypes.length];
+    for (int i = 0; i < fileTypes.length; i++) {
+      choices[i] = String.format(exportFileFormat, fileTypes[i]);
+    }
+    
     AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-    builder.setSingleChoiceItems(R.array.export_formats, 0, itemClick);
-    builder.setPositiveButton(R.string.ok, positiveClick);
-    builder.setNegativeButton(R.string.cancel, null);
+    builder.setSingleChoiceItems(choices, 0, itemClick);
+    builder.setPositiveButton(R.string.generic_ok, positiveClick);
+    builder.setNegativeButton(R.string.generic_cancel, null);
     builder.show();
   }
 
@@ -126,11 +134,11 @@ public class ExportAllTracks {
       Log.i(Constants.TAG, "ExportAllTracks: Releasing wake lock.");
     }
     Log.i(Constants.TAG, "ExportAllTracks: Done");
-    showToast(R.string.export_done, Toast.LENGTH_SHORT);
+    showToast(R.string.export_success, Toast.LENGTH_SHORT);
   }
 
   private void makeProgressDialog(final int trackCount) {
-    String exportMsg = activity.getString(R.string.tracklist_btn_export_all);
+    String exportMsg = activity.getString(R.string.track_list_export_all);
     progress = new ProgressDialog(activity);
     progress.setIcon(android.R.drawable.ic_dialog_info);
     progress.setTitle(exportMsg);
@@ -183,7 +191,7 @@ public class ExportAllTracks {
         TrackWriter writer =
             TrackWriterFactory.newWriter(activity, providerUtils, id, format);
         if (writer == null) {
-          showToast(R.string.error_export_generic, Toast.LENGTH_LONG);
+          showToast(R.string.export_error, Toast.LENGTH_LONG);
           return;
         }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java
index 248899c65..4bd2aefbe 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java
@@ -126,12 +126,12 @@ public class ImportAllTracks {
     Log.i(Constants.TAG, "ImportAllTracks: Done");
     AlertDialog.Builder builder = new AlertDialog.Builder(activity);
     if (gpxFileCount == 0) {
-      builder.setMessage(activity.getString(R.string.import_multi_empty, gpxPath));
+      builder.setMessage(activity.getString(R.string.import_no_file, gpxPath));
     } else {
-      builder.setMessage(activity.getString(R.string.import_multi_done, importSuccessCount, gpxFileCount,
-          gpxPath));
+      builder.setMessage(
+          activity.getString(R.string.import_success, importSuccessCount, gpxFileCount, gpxPath));
     }
-    builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+    builder.setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
       @Override
       public void onClick(DialogInterface dialog, int which) {
         if (singleTrackSelected) {
@@ -150,7 +150,7 @@ public class ImportAllTracks {
   }
 
   private void makeProgressDialog(final int trackCount) {
-    String importMsg = activity.getString(R.string.tracklist_btn_import_all);
+    String importMsg = activity.getString(R.string.track_list_import_all);
     progress = new ProgressDialog(activity);
     progress.setIcon(android.R.drawable.ic_dialog_info);
     progress.setTitle(importMsg);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
index 0e5e03803..1d2319f89 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
@@ -358,39 +358,43 @@ public class MapActivity extends com.google.android.maps.MapActivity
         @Override
         public void onCreateContextMenu(ContextMenu menu, View v,
             ContextMenuInfo menuInfo) {
-          menu.setHeaderTitle(R.string.tracklist_this_track);
+          menu.setHeaderTitle(R.string.track_list_context_menu_title);
           menu.add(0, Constants.MENU_EDIT, 0,
-              R.string.tracklist_edit_track);
+              R.string.track_list_edit_track);
           if (!dataHub.isRecordingSelected()) {
+            String saveFileFormat = getString(R.string.track_list_save_file);
+            String shareFileFormat = getString(R.string.track_list_share_file);
+            String fileTypes[] = getResources().getStringArray(R.array.file_types);
+
             menu.add(0, Constants.MENU_SEND_TO_GOOGLE, 0,
-                R.string.tracklist_send_to_google);
+                R.string.track_list_send_google);
             SubMenu share = menu.addSubMenu(0, Constants.MENU_SHARE, 0,
-                R.string.tracklist_share_track);
+                R.string.track_list_share_track);
             share.add(0, Constants.MENU_SHARE_LINK, 0,
-                R.string.tracklist_share_link);
-            share.add(0, Constants.MENU_SHARE_GPX_FILE, 0,
-                R.string.tracklist_share_gpx_file);
-            share.add(0, Constants.MENU_SHARE_KML_FILE, 0,
-                R.string.tracklist_share_kml_file);
-            share.add(0, Constants.MENU_SHARE_CSV_FILE, 0,
-                R.string.tracklist_share_csv_file);
-            share.add(0, Constants.MENU_SHARE_TCX_FILE, 0,
-                R.string.tracklist_share_tcx_file);
+                R.string.track_list_share_url);
+            share.add(
+                0, Constants.MENU_SHARE_GPX_FILE, 0, String.format(shareFileFormat, fileTypes[0]));
+            share.add(
+                0, Constants.MENU_SHARE_KML_FILE, 0, String.format(shareFileFormat, fileTypes[1]));
+            share.add(
+                0, Constants.MENU_SHARE_CSV_FILE, 0, String.format(shareFileFormat, fileTypes[2]));
+            share.add(
+                0, Constants.MENU_SHARE_TCX_FILE, 0, String.format(shareFileFormat, fileTypes[3]));
             SubMenu save = menu.addSubMenu(0,
                 Constants.MENU_WRITE_TO_SD_CARD, 0,
-                R.string.tracklist_write_to_sd);
-            save.add(0, Constants.MENU_SAVE_GPX_FILE, 0,
-                R.string.tracklist_save_as_gpx);
-            save.add(0, Constants.MENU_SAVE_KML_FILE, 0,
-                R.string.tracklist_save_as_kml);
-            save.add(0, Constants.MENU_SAVE_CSV_FILE, 0,
-                R.string.tracklist_save_as_csv);
-            save.add(0, Constants.MENU_SAVE_TCX_FILE, 0,
-                R.string.tracklist_save_as_tcx);
+                R.string.track_list_save_sd);
+            save.add(
+                0, Constants.MENU_SAVE_GPX_FILE, 0, String.format(saveFileFormat, fileTypes[0]));
+            save.add(
+                0, Constants.MENU_SAVE_KML_FILE, 0, String.format(saveFileFormat, fileTypes[1]));
+            save.add(
+                0, Constants.MENU_SAVE_CSV_FILE, 0, String.format(saveFileFormat, fileTypes[2]));
+            save.add(
+                0, Constants.MENU_SAVE_TCX_FILE, 0, String.format(saveFileFormat, fileTypes[3]));
             menu.add(0, Constants.MENU_CLEAR_MAP, 0,
-                R.string.tracklist_clear_map);
+                R.string.track_list_clear_map);
             menu.add(0, Constants.MENU_DELETE, 0,
-                R.string.tracklist_delete_track);
+                R.string.track_list_delete_track);
           }
         }
       };
@@ -441,10 +445,10 @@ public class MapActivity extends com.google.android.maps.MapActivity
   public boolean onCreateOptionsMenu(Menu menu) {
     super.onCreateOptionsMenu(menu);
     myLocation = menu.add(0, Constants.MENU_MY_LOCATION, 0,
-        R.string.mylocation);
+        R.string.menu_map_view_my_location);
     myLocation.setIcon(android.R.drawable.ic_menu_mylocation);
     toggleLayers = menu.add(0, Constants.MENU_TOGGLE_LAYERS, 0,
-        R.string.switch_to_sat);
+        R.string.menu_map_view_satellite_mode);
     toggleLayers.setIcon(android.R.drawable.ic_menu_mapmode);
     return true;
   }
@@ -452,7 +456,7 @@ public class MapActivity extends com.google.android.maps.MapActivity
   @Override
   public boolean onPrepareOptionsMenu(Menu menu) {
     toggleLayers.setTitle(mapView.isSatellite() ?
-        R.string.switch_to_map : R.string.switch_to_sat);
+        R.string.menu_map_view_map_mode : R.string.menu_map_view_satellite_mode);
     return super.onPrepareOptionsMenu(menu);
   }
 
@@ -465,6 +469,9 @@ public class MapActivity extends com.google.android.maps.MapActivity
         if (mapView.getZoomLevel() < 18) {
           mapView.getController().setZoom(18);
         }
+        if (currentLocation != null) {
+          showCurrentLocation();
+        }
         return true;
       }
       case Constants.MENU_TOGGLE_LAYERS: {
@@ -504,12 +511,12 @@ public class MapActivity extends com.google.android.maps.MapActivity
     final boolean isGpsDisabled;
     switch (state) {
       case DISABLED:
-        messageId = R.string.status_need_to_enable_gps;
+        messageId = R.string.gps_need_to_enable;
         isGpsDisabled = true;
         break;
       case NO_FIX:
       case BAD_FIX:
-        messageId = R.string.status_wait_for_gps_fix;
+        messageId = R.string.gps_wait_for_fix;
         isGpsDisabled = false;
         break;
       case GOOD_FIX:
@@ -531,7 +538,7 @@ public class MapActivity extends com.google.android.maps.MapActivity
           if (isGpsDisabled) {
             // Give a warning about this state.
             Toast.makeText(MapActivity.this,
-                R.string.error_no_gps,
+                R.string.gps_not_found,
                 Toast.LENGTH_LONG).show();
 
             // Make clicking take the user to the location settings.
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java
index 58f9d1f63..468680efd 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java
@@ -42,10 +42,9 @@ class MenuManager {
 
   public void onPrepareOptionsMenu(Menu menu, boolean hasRecorded,
       boolean isRecording, boolean hasSelectedTrack) {
-    menu.findItem(R.id.menu_list_tracks);
-    menu.findItem(R.id.menu_list_markers)
+    menu.findItem(R.id.menu_markers)
         .setEnabled(hasRecorded && hasSelectedTrack);
-    menu.findItem(R.id.menu_start_recording)
+    menu.findItem(R.id.menu_record_track)
         .setEnabled(!isRecording)
         .setVisible(!isRecording);
     menu.findItem(R.id.menu_stop_recording)
@@ -55,7 +54,7 @@ class MenuManager {
 
   public boolean onOptionsItemSelected(MenuItem item) {
     switch (item.getItemId()) {
-      case R.id.menu_start_recording: {
+      case R.id.menu_record_track: {
         activity.startRecording();
         return true;
       }
@@ -63,12 +62,12 @@ class MenuManager {
         activity.stopRecording();
         return true;
       }
-      case R.id.menu_list_tracks: {
+      case R.id.menu_tracks: {
 	    activity.startActivityForResult(new Intent(activity, TrackList.class),
 	    		Constants.SHOW_TRACK);
         return true;
       }
-      case R.id.menu_list_markers: {
+      case R.id.menu_markers: {
         Intent startIntent = new Intent(activity, WaypointsList.class);
         startIntent.putExtra("trackid", activity.getSelectedTrackId());
         activity.startActivityForResult(startIntent, Constants.SHOW_WAYPOINT);
@@ -80,7 +79,7 @@ class MenuManager {
       case R.id.menu_settings: {
         return startActivity(SettingsActivity.class);
       }
-      case R.id.menu_aggregated_stats: {
+      case R.id.menu_aggregated_statistics: {
         return startActivity(AggregatedStatsActivity.class);
       }
       case R.id.menu_help: {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyMapsListAdapter.java b/MyTracks/src/com/google/android/apps/mytracks/MyMapsListAdapter.java
index 5780a950b..8b26da6d3 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyMapsListAdapter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyMapsListAdapter.java
@@ -99,10 +99,10 @@ public class MyMapsListAdapter implements ListAdapter {
       (TextView) convertView.findViewById(R.id.maplistpublic);
     if (publicList.get(position)) {
       publicUnlisted.setTextColor(Color.RED);
-      publicUnlisted.setText(R.string.public_map);
+      publicUnlisted.setText(R.string.my_maps_list_public_label);
     } else {
       publicUnlisted.setTextColor(Color.GREEN);
-      publicUnlisted.setText(R.string.unlisted_map);
+      publicUnlisted.setText(R.string.my_maps_list_unlisted_label);
     }
 
     return convertView;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
index 27436e122..6c95bedcf 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
@@ -139,7 +139,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
 
     tracker = GoogleAnalyticsTracker.getInstance();
     // Start the tracker in manual dispatch mode...
-    tracker.start(getString(R.string.google_analytics_id), getApplicationContext());
+    tracker.start(getString(R.string.my_tracks_analytics_id), getApplicationContext());
     tracker.setProductVersion("android-mytracks", SystemUtils.getMyTracksVersion(this));
     tracker.trackPageView("/appstart");
     tracker.dispatch();
@@ -369,13 +369,11 @@ public class MyTracks extends TabActivity implements OnTouchListener {
     try {
       long waypointId = trackRecordingService.insertWaypoint(request);
       if (waypointId >= 0) {
-        Toast.makeText(this, R.string.status_marker_inserted,
-            Toast.LENGTH_LONG).show();
+        Toast.makeText(this, R.string.marker_insert_success, Toast.LENGTH_LONG).show();
       }
       return waypointId;
     } catch (RemoteException e) {
-      Toast.makeText(this, R.string.error_unable_to_insert_marker,
-          Toast.LENGTH_LONG).show();
+      Toast.makeText(this, R.string.marker_insert_error, Toast.LENGTH_LONG).show();
       throw e;
     }
   }
@@ -386,14 +384,11 @@ public class MyTracks extends TabActivity implements OnTouchListener {
       long recordingTrackId = trackRecordingService.startNewTrack();
       // Select the recording track.
       dataHub.loadTrack(recordingTrackId);
-      Toast.makeText(this, getString(R.string.status_now_recording),
-          Toast.LENGTH_SHORT).show();
+      Toast.makeText(this, getString(R.string.track_record_success), Toast.LENGTH_SHORT).show();
       // TODO: We catch Exception, because after eliminating the service process
       // all exceptions it may throw are no longer wrapped in a RemoteException.
     } catch (Exception e) {
-      Toast.makeText(this,
-          getString(R.string.error_unable_to_start_recording),
-          Toast.LENGTH_SHORT).show();
+      Toast.makeText(this, getString(R.string.track_record_error), Toast.LENGTH_SHORT).show();
       Log.w(TAG, "Unable to start recording.", e);
     }
   }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ProgressIndicator.java b/MyTracks/src/com/google/android/apps/mytracks/ProgressIndicator.java
index c4a99ccf2..da75e6557 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ProgressIndicator.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ProgressIndicator.java
@@ -23,7 +23,7 @@ package com.google.android.apps.mytracks;
  */
 public interface ProgressIndicator {
 
-  public void setProgressMessage(int resId);
+  public void setProgressMessage(String message);
   public void clearProgressMessage();
 
   public void setProgressValue(int percent);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
index 6bf1a5547..615161fdd 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
@@ -126,8 +126,7 @@ public class SettingsActivity extends PreferenceActivity {
               getString(R.string.announcement_frequency_key));
       announcementFrequency.setEnabled(false);
       announcementFrequency.setValue(TASK_FREQUENCY_OFF);
-      announcementFrequency.setSummary(
-          R.string.settings_announcement_frequency_not_available);
+      announcementFrequency.setSummary(R.string.settings_recording_voice_not_available);
     }
     
     setRecordingIntervalOptions();
@@ -172,8 +171,8 @@ public class SettingsActivity extends PreferenceActivity {
         if ((Boolean) newValue) {
           AlertDialog dialog = new AlertDialog.Builder(SettingsActivity.this)
               .setCancelable(true)
-              .setTitle(getString(R.string.settings_allow_access))
-              .setMessage(getString(R.string.settings_allow_access_dialog_message))
+              .setTitle(getString(R.string.settings_sharing_allow_access))
+              .setMessage(getString(R.string.settings_sharing_allow_access_confirm_message))
               .setPositiveButton(android.R.string.ok, new OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialogInterface, int button) {
@@ -195,7 +194,7 @@ public class SettingsActivity extends PreferenceActivity {
    * Sets the display options for the 'Time between points' option.
    */
   private void setRecordingIntervalOptions() {
-    String[] values = getResources().getStringArray(R.array.min_recording_interval_values);
+    String[] values = getResources().getStringArray(R.array.recording_interval_values);
     String[] options = new String[values.length];
     for (int i = 0; i < values.length; i++) {
       if (values[i].equals(RECORDING_INTERVAL_ADAPT_BATTERY_LIFE)) {
@@ -225,7 +224,7 @@ public class SettingsActivity extends PreferenceActivity {
    * Sets the display options for the 'Auto-resume timeout' option.
    */
   private void setAutoResumeTimeoutOptions() {
-    String[] values = getResources().getStringArray(R.array.auto_resume_track_timeout_values);
+    String[] values = getResources().getStringArray(R.array.recording_auto_resume_timeout_values);
     String[] options = new String[values.length];
     for (int i = 0; i < values.length; i++) {
       if (values[i].equals(AUTO_RESUME_TIMEOUT_NEVER)) {
@@ -264,7 +263,7 @@ public class SettingsActivity extends PreferenceActivity {
 
       Set<Integer> toRemove = new HashSet<Integer>();
 
-      String[] antValues = getResources().getStringArray(R.array.ant_sensor_type_values);
+      String[] antValues = getResources().getStringArray(R.array.sensor_type_ant_values);
       for (String antValue : antValues) {
         toRemove.add(sensorTypePreference.findIndexOfValue(antValue));
       }
@@ -335,10 +334,10 @@ public class SettingsActivity extends PreferenceActivity {
     resetPreference.setEnabled(!recording);
     backupNowPreference.setSummary(
         recording ? R.string.settings_not_while_recording
-                  : R.string.settings_backup_to_sd_summary);
+                  : R.string.settings_backup_now_summary);
     restoreNowPreference.setSummary(
         recording ? R.string.settings_not_while_recording
-                  : R.string.settings_restore_from_sd_summary);
+                  : R.string.settings_backup_restore_summary);
     resetPreference.setSummary(
         recording ? R.string.settings_not_while_recording
                   : R.string.settings_reset_summary);
@@ -396,10 +395,10 @@ public class SettingsActivity extends PreferenceActivity {
   }
 
   private void updateTrackColorModeSettings(String trackColorMode) {
-    boolean usesFixedSpeed = trackColorMode.equals(
-        getString(R.string.track_color_mode_value_fixed));
-    boolean usesDynamicSpeed = trackColorMode.equals(
-        getString(R.string.track_color_mode_value_dynamic));
+    boolean usesFixedSpeed =
+        trackColorMode.equals(getString(R.string.display_track_color_value_fixed));
+    boolean usesDynamicSpeed =
+        trackColorMode.equals(getString(R.string.display_track_color_value_dynamic));
 
     findPreference(getString(R.string.track_color_mode_fixed_speed_slow_display_key))
         .setEnabled(usesFixedSpeed);
@@ -426,7 +425,7 @@ public class SettingsActivity extends PreferenceActivity {
    * Sets the display options for a periodic task.
    */
   private void setTaskOptions(boolean isMetric, int listId) {
-    String[] values = getResources().getStringArray(R.array.task_frequency_values);
+    String[] values = getResources().getStringArray(R.array.recording_task_frequency_values);
     String[] options = new String[values.length];
     for (int i = 0; i < values.length; i++) {
       if (values[i].equals(TASK_FREQUENCY_OFF)) {
@@ -451,7 +450,7 @@ public class SettingsActivity extends PreferenceActivity {
    * Sets the display options for 'Distance between points' option.
    */
   private void setRecordingDistanceOptions(boolean isMetric, int listId) {
-    String[] values = getResources().getStringArray(R.array.min_recording_distance_values);
+    String[] values = getResources().getStringArray(R.array.recording_distance_values);
     String[] options = new String[values.length];
     for (int i = 0; i < values.length; i++) {
       int value = Integer.parseInt(values[i]);
@@ -478,7 +477,7 @@ public class SettingsActivity extends PreferenceActivity {
    * Sets the display options for 'Distance between Tracks'.
    */
   private void setTrackDistanceOptions(boolean isMetric, int listId) {
-    String[] values = getResources().getStringArray(R.array.max_recording_distance_values);
+    String[] values = getResources().getStringArray(R.array.recording_track_distance_values);
     String[] options = new String[values.length];
     for (int i = 0; i < values.length; i++) {
       int value = Integer.parseInt(values[i]);
@@ -511,7 +510,7 @@ public class SettingsActivity extends PreferenceActivity {
    * Sets the display options for 'GPS accuracy'.
    */
   private void setGpsAccuracyOptions(boolean isMetric, int listId) {
-    String[] values = getResources().getStringArray(R.array.min_required_accuracy_values);
+    String[] values = getResources().getStringArray(R.array.recording_gps_accuracy_values);
     String[] options = new String[values.length];
     for (int i = 0; i < values.length; i++) {
       int value = Integer.parseInt(values[i]);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
index f44be3ffa..346793781 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
@@ -177,7 +177,7 @@ public class StatsActivity extends Activity implements TrackDataListener {
       @Override
       public void run() {
         utils.updateUnits();
-        utils.setSpeedLabel(R.id.speed_label, R.string.speed, R.string.pace_label);
+        utils.setSpeedLabel(R.id.speed_label, R.string.stat_speed, R.string.stat_pace);
         utils.setSpeedLabels();
       }
     });
diff --git a/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java b/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java
index c54107c0d..8bc0b02d9 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java
@@ -77,7 +77,7 @@ public class StatsUtilities {
   }
 
   public void setUnknown(int id) {
-    ((TextView) activity.findViewById(id)).setText(R.string.unknown);
+    ((TextView) activity.findViewById(id)).setText(R.string.value_unknown);
   }
 
   public void setText(int id, double d, NumberFormat format) {
@@ -251,13 +251,13 @@ public class StatsUtilities {
 
   public void setSpeedLabels() {
     setSpeedLabel(R.id.average_speed_label,
-                  R.string.average_speed_label,
-                  R.string.average_pace_label);
+                  R.string.stat_average_speed,
+                  R.string.stat_average_pace);
     setSpeedLabel(R.id.average_moving_speed_label,
-                  R.string.average_moving_speed_label,
-                  R.string.average_moving_pace_label);
+                  R.string.stat_average_moving_speed,
+                  R.string.stat_average_moving_pace);
     setSpeedLabel(R.id.max_speed_label,
-                  R.string.max_speed_label,
-                  R.string.min_pace_label);
+                  R.string.stat_max_speed,
+                  R.string.stat_min_pace);
   }
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
index 84f6bc565..baa4004db 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java
@@ -75,44 +75,48 @@ public class TrackList extends ListActivity
         @Override
         public void onCreateContextMenu(ContextMenu menu, View v,
             ContextMenuInfo menuInfo) {
-          menu.setHeaderTitle(R.string.tracklist_this_track);
+          menu.setHeaderTitle(R.string.track_list_context_menu_title);
           AdapterView.AdapterContextMenuInfo info =
               (AdapterView.AdapterContextMenuInfo) menuInfo;
           contextPosition = info.position;
           trackId = TrackList.this.listView.getAdapter().getItemId(
               contextPosition);
           menu.add(0, Constants.MENU_SHOW, 0,
-              R.string.tracklist_show_track);
+              R.string.track_list_show_on_map);
           menu.add(0, Constants.MENU_EDIT, 0,
-              R.string.tracklist_edit_track);
+              R.string.track_list_edit_track);
           if (!isRecording() || trackId != recordingTrackId) {
+            String saveFileFormat = getString(R.string.track_list_save_file);
+            String shareFileFormat = getString(R.string.track_list_share_file);
+            String fileTypes[] = getResources().getStringArray(R.array.file_types);
+            
             menu.add(0, Constants.MENU_SEND_TO_GOOGLE, 0,
-                R.string.tracklist_send_to_google);
+                R.string.track_list_send_google);
             SubMenu share = menu.addSubMenu(0, Constants.MENU_SHARE, 0,
-                R.string.tracklist_share_track);
+                R.string.track_list_share_track);
             share.add(0, Constants.MENU_SHARE_LINK, 0,
-                R.string.tracklist_share_link);
-            share.add(0, Constants.MENU_SHARE_GPX_FILE, 0,
-                R.string.tracklist_share_gpx_file);
-            share.add(0, Constants.MENU_SHARE_KML_FILE, 0,
-                R.string.tracklist_share_kml_file);
-            share.add(0, Constants.MENU_SHARE_CSV_FILE, 0,
-                R.string.tracklist_share_csv_file);
-            share.add(0, Constants.MENU_SHARE_TCX_FILE, 0,
-                R.string.tracklist_share_tcx_file);
+                R.string.track_list_share_url);
+            share.add(
+                0, Constants.MENU_SHARE_GPX_FILE, 0, String.format(shareFileFormat, fileTypes[0]));
+            share.add(
+                0, Constants.MENU_SHARE_KML_FILE, 0, String.format(shareFileFormat, fileTypes[1]));
+            share.add(
+                0, Constants.MENU_SHARE_CSV_FILE, 0, String.format(shareFileFormat, fileTypes[2]));
+            share.add(
+                0, Constants.MENU_SHARE_TCX_FILE, 0, String.format(shareFileFormat, fileTypes[3]));
             SubMenu save = menu.addSubMenu(0,
                 Constants.MENU_WRITE_TO_SD_CARD, 0,
-                R.string.tracklist_write_to_sd);
-            save.add(0, Constants.MENU_SAVE_GPX_FILE, 0,
-                R.string.tracklist_save_as_gpx);
-            save.add(0, Constants.MENU_SAVE_KML_FILE, 0,
-                R.string.tracklist_save_as_kml);
-            save.add(0, Constants.MENU_SAVE_CSV_FILE, 0,
-                R.string.tracklist_save_as_csv);
-            save.add(0, Constants.MENU_SAVE_TCX_FILE, 0,
-                R.string.tracklist_save_as_tcx);
+                R.string.track_list_save_sd);
+            save.add(
+                0, Constants.MENU_SAVE_GPX_FILE, 0, String.format(saveFileFormat, fileTypes[0]));
+            save.add(
+                0, Constants.MENU_SAVE_KML_FILE, 0, String.format(saveFileFormat, fileTypes[1]));
+            save.add(
+                0, Constants.MENU_SAVE_CSV_FILE, 0, String.format(saveFileFormat, fileTypes[2]));
+            save.add(
+                0, Constants.MENU_SAVE_TCX_FILE, 0, String.format(saveFileFormat, fileTypes[3]));
             menu.add(0, Constants.MENU_DELETE, 0,
-                R.string.tracklist_delete_track);
+                R.string.track_list_delete_track);
           }
         }
       };
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
index 5e04c6ba8..4f60969ef 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
@@ -73,7 +73,7 @@ public class WaypointsList extends ListActivity
       new OnCreateContextMenuListener() {
         public void onCreateContextMenu(ContextMenu menu, View v,
             ContextMenuInfo menuInfo) {
-          menu.setHeaderTitle(R.string.waypointslist_this_waypoint);
+          menu.setHeaderTitle(R.string.marker_list_context_menu_title);
           AdapterView.AdapterContextMenuInfo info =
               (AdapterView.AdapterContextMenuInfo) menuInfo;
           contextPosition = info.position;
@@ -83,11 +83,11 @@ public class WaypointsList extends ListActivity
           if (waypoint != null) {
             int type = waypoint.getType();
             menu.add(0, Constants.MENU_SHOW, 0,
-                R.string.waypointslist_show_waypoint);
+                R.string.marker_list_show_on_map);
             menu.add(0, Constants.MENU_EDIT, 0,
-                R.string.waypointslist_edit_waypoint);
+                R.string.marker_list_edit_marker);
             menu.add(0, Constants.MENU_DELETE, 0,
-                R.string.waypointslist_delete_waypoint).setEnabled(
+                R.string.marker_list_delete_marker).setEnabled(
                     recordingTrackId < 0 || type == Waypoint.TYPE_WAYPOINT ||
                     info.id != providerUtils.getLastWaypointId(recordingTrackId));
           }
@@ -211,8 +211,7 @@ public class WaypointsList extends ListActivity
     }
     long id = insertWaypoint(request);
     if (id < 0) {
-      Toast.makeText(this, R.string.error_unable_to_insert_marker,
-          Toast.LENGTH_LONG).show();
+      Toast.makeText(this, R.string.marker_insert_error, Toast.LENGTH_LONG).show();
       Log.e(Constants.TAG, "Failed to insert marker.");
       return;
     }
@@ -227,8 +226,7 @@ public class WaypointsList extends ListActivity
       if (trackRecordingService != null) {
         long waypointId = trackRecordingService.insertWaypoint(request);
         if (waypointId >= 0) {
-          Toast.makeText(this, R.string.status_marker_inserted,
-              Toast.LENGTH_LONG).show();
+          Toast.makeText(this, R.string.marker_insert_success, Toast.LENGTH_LONG).show();
           return waypointId;
         }
       } else {
@@ -295,10 +293,10 @@ public class WaypointsList extends ListActivity
   public void deleteWaypoint(final long waypointId) {
     AlertDialog dialog = null;
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setMessage(getString(R.string.marker_will_be_permanently_deleted));
-    builder.setTitle(getString(R.string.confirmation_title_are_you_sure));
+    builder.setMessage(getString(R.string.marker_list_delete_marker_confirm_message));
+    builder.setTitle(getString(R.string.generic_confirm_title));
     builder.setIcon(android.R.drawable.ic_dialog_alert);
-    builder.setPositiveButton(getString(R.string.yes),
+    builder.setPositiveButton(getString(R.string.generic_yes),
         new DialogInterface.OnClickListener() {
           @Override
           public void onClick(DialogInterface dialogInterface, int i) {
@@ -307,7 +305,7 @@ public class WaypointsList extends ListActivity
                 new StringUtils(WaypointsList.this));
           }
         });
-    builder.setNegativeButton(getString(R.string.no),
+    builder.setNegativeButton(getString(R.string.generic_no),
         new DialogInterface.OnClickListener() {
           @Override
           public void onClick(DialogInterface dialogInterface, int i) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
index 91b5eef13..cde40f9a2 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
@@ -71,8 +71,8 @@ public class WelcomeActivity extends Activity {
     View view = li.inflate(R.layout.about, null);
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
     builder.setView(view);
-    builder.setPositiveButton(R.string.ok, null);
-    builder.setNegativeButton(R.string.license, new DialogInterface.OnClickListener() {
+    builder.setPositiveButton(R.string.generic_ok, null);
+    builder.setNegativeButton(R.string.about_license, new DialogInterface.OnClickListener() {
       @Override 
       public void onClick(DialogInterface dialog, int which) {
         Eula.showEula(WelcomeActivity.this);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/DataSourcesWrapperImpl.java b/MyTracks/src/com/google/android/apps/mytracks/content/DataSourcesWrapperImpl.java
index 18fc8b7d9..6e4e51de9 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/content/DataSourcesWrapperImpl.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/content/DataSourcesWrapperImpl.java
@@ -147,10 +147,10 @@ class DataSourcesWrapperImpl implements DataSourcesWrapper {
       // We don't have a recent GPS fix, just use cell towers if available
       loc = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
 
-      int toastResId = R.string.status_approximate_current_location;
+      int toastResId = R.string.my_location_approximate_location;
       if (loc == null || loc.getTime() < now - MAX_NETWORK_AGE_MS) {
         // We don't have a recent cell tower location, let the user know:
-        toastResId = R.string.status_no_current_location;
+        toastResId = R.string.my_location_no_location;
       }
 
       // Let the user know we have only an approximate location:
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java b/MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java
index 2ba84887f..9778bd3e1 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java
@@ -93,7 +93,9 @@ public class SendToDocs {
 
   private void doUpload(long trackId) {
     // TODO
-    statusMessage = activity.getString(R.string.error_sending_to_fusion_tables);
+    String errorFormat = activity.getString(R.string.send_google_error_service);
+    String serviceName = activity.getString(SendType.DOCS.getServiceName());
+    statusMessage = String.format(errorFormat, serviceName);
     success = false;
 
     try {
@@ -116,13 +118,11 @@ public class SendToDocs {
       Log.d(Constants.TAG, "SendToDocs: Uploading to spreadsheet");
       success = uploadToDocs(track);
       if (success) {
-        String format = createdNewSpreadSheet 
-            ? activity.getString(R.string.send_google_docs_new_doc_success) 
-            : activity.getString(R.string.send_google_docs_existing_doc_success);
+        String successFormat = createdNewSpreadSheet 
+            ? activity.getString(R.string.send_google_success_new)
+            : activity.getString(R.string.send_google_success_existing);
         String url = activity.getString(SendType.DOCS.getServiceUrl());
-        statusMessage = String.format(format, url);
-      } else {
-        statusMessage = activity.getString(R.string.error_sending_to_docs);
+        statusMessage = String.format(successFormat, serviceName, url);
       }
       Log.d(Constants.TAG, "SendToDocs: Done.");
     } finally {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java b/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
index 571ee6dfd..e38b6f462 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
@@ -169,11 +169,14 @@ public class SendToFusionTables implements Runnable {
   }
 
   private void doUpload() {
-    String statusMessage = context.getString(R.string.error_sending_to_fusion_tables);
+    String errorFormat = context.getString(R.string.send_google_error_service);
+    String serviceName = context.getString(SendType.FUSION_TABLES.getServiceName());
+    String statusMessage = String.format(errorFormat, serviceName);
     boolean success = true;
     try {
       progressIndicator.setProgressValue(PROGRESS_INITIALIZATION);
-      progressIndicator.setProgressMessage(R.string.progress_message_reading_track);
+      progressIndicator.setProgressMessage(
+          context.getString(R.string.send_google_progress_reading_track));
 
       // Get the track meta-data
       Track track = providerUtils.getTrack(trackId);
@@ -186,13 +189,15 @@ public class SendToFusionTables implements Runnable {
 
       // Create a new table:
       progressIndicator.setProgressValue(PROGRESS_FUSION_TABLE_CREATE);
-      progressIndicator.setProgressMessage(R.string.progress_message_creating_fusion_table);
+      String creatingFormat = context.getString(R.string.send_google_progress_creating);
+      progressIndicator.setProgressMessage(String.format(creatingFormat, serviceName));
       if (!createNewTable(track) || !makeTableUnlisted()) {
         return;
       }
 
       progressIndicator.setProgressValue(PROGRESS_UPLOAD_DATA_MIN);
-      progressIndicator.setProgressMessage(R.string.progress_message_sending_fusion_tables);
+      String sendingFormat = context.getString(R.string.send_google_progress_sending);
+      progressIndicator.setProgressMessage(String.format(sendingFormat, serviceName));
 
       // Upload all of the segments of the track plus start/end markers
       if (!uploadAllTrackPoints(track, originalDescription)) {
@@ -206,9 +211,9 @@ public class SendToFusionTables implements Runnable {
         return;
       }
 
-      String format = context.getString(R.string.send_google_fusion_tables_success);
+      String successFormat = context.getString(R.string.send_google_success_new);
       String url = context.getString(SendType.FUSION_TABLES.getServiceUrl());
-      statusMessage = String.format(format, url);
+      statusMessage = String.format(successFormat, serviceName, url);
       Log.d(Constants.TAG, "SendToFusionTables: Done: " + success);
       progressIndicator.setProgressValue(PROGRESS_COMPLETE);
     } finally {
@@ -341,7 +346,7 @@ public class SendToFusionTables implements Runnable {
 
         if (totalLocationsRead == 0) {
           // Put a marker at the first point of the first valid segment:
-          String name = track.getName() + " " + context.getString(R.string.start);
+          String name = track.getName() + " " + context.getString(R.string.marker_label_start);
           createNewPoint(name, "", loc, MARKER_TYPE_START);
         }
 
@@ -387,7 +392,7 @@ public class SendToFusionTables implements Runnable {
         track.setDescription("<p>" + originalDescription + "</p><p>"
             + stringUtils.generateTrackDescription(track, distances, elevations)
             + "</p>");
-        String name = track.getName() + " " + context.getString(R.string.end);
+        String name = track.getName() + " " + context.getString(R.string.marker_label_end);
         return createNewPoint(name, track.getDescription(), lastLocation, MARKER_TYPE_END);
       }
 
@@ -464,7 +469,7 @@ public class SendToFusionTables implements Runnable {
       if (totalSegmentsUploaded > 1) {
         splitTrack.setName(splitTrack.getName() + " "
             + String.format(
-                context.getString(R.string.track_part_format), totalSegmentsUploaded));
+                context.getString(R.string.send_google_track_part_label), totalSegmentsUploaded));
       }
       totalSegmentsUploaded++;
       Log.d(Constants.TAG,
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java b/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java
index 9c38d9b8a..d70746023 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java
@@ -99,11 +99,13 @@ public class SendToMyMaps implements Runnable {
   }
 
   private void doUpload() {
-    String statusMessage = context.getString(R.string.error_sending_to_my_maps);
+    String errorFormat = context.getString(R.string.send_google_error_service);
+    String serviceName = context.getString(SendType.MYMAPS.getServiceName());
+    String statusMessage = String.format(errorFormat, serviceName);
     boolean success = true;
     try {
       progressIndicator.setProgressMessage(
-          R.string.progress_message_reading_track);
+          context.getString(R.string.send_google_progress_reading_track));
 
       // Get the track meta-data
       Track track = providerUtils.getTrack(trackId);
@@ -129,8 +131,8 @@ public class SendToMyMaps implements Runnable {
               context.getString(R.string.default_map_public_key), true);
         }
 
-        progressIndicator.setProgressMessage(
-            R.string.progress_message_creating_map);
+        String creatingFormat = context.getString(R.string.send_google_progress_creating);
+        progressIndicator.setProgressMessage(String.format(creatingFormat, serviceName));
 
         StringBuilder mapIdBuilder = new StringBuilder();
         success = mapsClient.createNewMap(
@@ -174,11 +176,10 @@ public class SendToMyMaps implements Runnable {
       }
 
       if (success) {
-        String format = isNewMap 
-            ? context.getString(R.string.send_google_my_maps_new_map_success)
-            : context.getString(R.string.send_google_my_maps_existing_map_success);
+        String successFormat = isNewMap ? context.getString(R.string.send_google_success_new)
+                                        : context.getString(R.string.send_google_success_existing);
         String url = context.getString(SendType.MYMAPS.getServiceUrl());
-        statusMessage = String.format(format, url);
+        statusMessage = String.format(successFormat, serviceName, url);
       }
       Log.d(TAG, "SendToMyMaps: Done: " + success);
       progressIndicator.setProgressValue(100);
@@ -239,7 +240,7 @@ public class SendToMyMaps implements Runnable {
 
       List<Location> locations = new ArrayList<Location>(MAX_POINTS_PER_UPLOAD);
       progressIndicator.setProgressMessage(
-          R.string.progress_message_reading_track);
+          context.getString(R.string.send_google_progress_reading_track));
       Location lastLocation = null;
       do {
         if (totalLocationsRead % 100 == 0) {
@@ -313,7 +314,7 @@ public class SendToMyMaps implements Runnable {
 
   private boolean prepareAndUploadPoints(Track track, List<Location> locations) {
     progressIndicator.setProgressMessage(
-        R.string.progress_message_preparing_track);
+        context.getString(R.string.send_google_progress_preparing_track));
     updateProgress();
 
     int numLocations = locations.size();
@@ -327,13 +328,14 @@ public class SendToMyMaps implements Runnable {
     ArrayList<Track> splitTracks = prepareLocations(track, locations);
 
     // Start uploading them
-    progressIndicator.setProgressMessage(
-        R.string.progress_message_sending_my_maps);
+    String sendingFormat = context.getString(R.string.send_google_progress_sending);
+    String serviceName = context.getString(SendType.MYMAPS.getServiceName());
+    progressIndicator.setProgressMessage(String.format(sendingFormat, serviceName));
     for (Track splitTrack : splitTracks) {
       if (totalSegmentsUploaded > 1) {
         splitTrack.setName(splitTrack.getName() + " "
             + String.format(
-                context.getString(R.string.track_part_format), totalSegmentsUploaded));
+                context.getString(R.string.send_google_track_part_label), totalSegmentsUploaded));
       }
       totalSegmentsUploaded++;
       Log.d(TAG,
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java
index caaabd991..60d0af6f4 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java
@@ -74,19 +74,19 @@ public class BackupActivityHelper {
    */
   public void writeBackup() {
     if (!fileUtils.isSdCardAvailable()) {
-      showToast(R.string.io_no_external_storage_found);
+      showToast(R.string.sd_card_error_no_storage);
       return;
     }
 
     if (!backup.isBackupsDirectoryAvailable(true)) {
-      showToast(R.string.io_create_dir_failed);
+      showToast(R.string.sd_card_error_create_dir);
       return;
     }
 
     final ProgressDialog progressDialog = ProgressDialog.show(
         activity,
-        activity.getString(R.string.progress_title),
-        activity.getString(R.string.backup_write_progress_message),
+        activity.getString(R.string.generic_progress_title),
+        activity.getString(R.string.settings_backup_now_progress_message),
         true);
 
     // Do the writing in another thread
@@ -95,10 +95,10 @@ public class BackupActivityHelper {
       public void run() {
         try {
           backup.writeToDefaultFile();
-          showToast(R.string.io_write_finished);
+          showToast(R.string.sd_card_success_write_file);
         } catch (IOException e) {
           Log.e(Constants.TAG, "Failed to write backup", e);
-          showToast(R.string.io_write_failed);
+          showToast(R.string.sd_card_error_write_file);
         } finally {
           dismissDialog(progressDialog);
         }
@@ -114,25 +114,25 @@ public class BackupActivityHelper {
   public void restoreBackup() {
     // Get the list of existing backups
     if (!fileUtils.isSdCardAvailable()) {
-      showToast(R.string.io_no_external_storage_found);
+      showToast(R.string.sd_card_error_no_storage);
       return;
     }
 
     if (!backup.isBackupsDirectoryAvailable(false)) {
-      showToast(R.string.no_backups);
+      showToast(R.string.settings_backup_restore_no_backup);
       return;
     }
 
     final Date[] backupDates = backup.getAvailableBackups();
     if (backupDates == null || backupDates.length == 0) {
-      showToast(R.string.no_backups);
+      showToast(R.string.settings_backup_restore_no_backup);
       return;
     }
     Arrays.sort(backupDates, REVERSE_DATE_ORDER);
 
     // Show a confirmation dialog
     Builder confirmationDialogBuilder = new AlertDialog.Builder(activity);
-    confirmationDialogBuilder.setMessage(R.string.restore_overwrites_warning);
+    confirmationDialogBuilder.setMessage(R.string.settings_backup_restore_confirm_message);
     confirmationDialogBuilder.setCancelable(true);
     confirmationDialogBuilder.setPositiveButton(android.R.string.yes,
         new OnClickListener() {
@@ -166,7 +166,7 @@ public class BackupActivityHelper {
     // Show a dialog for the user to pick which backup to restore
     Builder dialogBuilder = new AlertDialog.Builder(activity);
     dialogBuilder.setCancelable(true);
-    dialogBuilder.setTitle(R.string.select_backup_to_restore);
+    dialogBuilder.setTitle(R.string.settings_backup_restore_select_title);
     dialogBuilder.setItems(backupDateStrs, new OnClickListener() {
       @Override
       public void onClick(DialogInterface dialog, int which) {
@@ -186,8 +186,8 @@ public class BackupActivityHelper {
     // Show a progress dialog
     ProgressDialog.show(
         activity,
-        activity.getString(R.string.progress_title),
-        activity.getString(R.string.backup_import_progress_message),
+        activity.getString(R.string.generic_progress_title),
+        activity.getString(R.string.settings_backup_restore_progress_message),
         true);
 
     // Do the actual importing in another thread (don't block the UI)
@@ -196,10 +196,10 @@ public class BackupActivityHelper {
       public void run() {
         try {
           backup.restoreFromDate(date);
-          showToast(R.string.io_read_finished);
+          showToast(R.string.sd_card_success_read_file);
         } catch (IOException e) {
           Log.e(Constants.TAG, "Failed to restore backup", e);
-          showToast(R.string.io_read_failed);
+          showToast(R.string.sd_card_error_read_file);
         } finally {
           // Data may have been restored, "reboot" the app to catch it
           restartApplication();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java b/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java
index f642f2be8..99a07a4bc 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java
@@ -282,7 +282,7 @@ public class DocsHelper {
     String distanceUnit = context.getString(metricUnits ?
         R.string.unit_kilometer : R.string.unit_mile);
     String speedUnit = context.getString(metricUnits ?
-        R.string.kilometer_per_hour : R.string.mile_per_hour);
+        R.string.unit_kilometer_per_hour : R.string.unit_mile_per_hour);
     String elevationUnit = context.getString(metricUnits ?
         R.string.unit_meter : R.string.unit_feet);
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
index cfef0cfac..aa7ae5888 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
@@ -74,9 +74,9 @@ public class SaveActivity extends Activity {
     String action = intent.getAction();
     String type = intent.getType();
     Uri data = intent.getData();
-    if (!getString(R.string.save_intent_action).equals(action) ||
-        !TracksColumns.CONTENT_ITEMTYPE.equals(type) ||
-        !UriUtils.matchesContentUri(data, TracksColumns.CONTENT_URI)) {
+    if (!getString(R.string.track_action_save).equals(action)
+        || !TracksColumns.CONTENT_ITEMTYPE.equals(type)
+        || !UriUtils.matchesContentUri(data, TracksColumns.CONTENT_URI)) {
       Log.e(TAG, "Got bad save intent: " + intent);
       finish();
       return;
@@ -169,7 +169,7 @@ public class SaveActivity extends Activity {
 
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
     builder.setMessage(writer.getErrorMessage());
-    builder.setPositiveButton(R.string.ok, new OnClickListener() {
+    builder.setPositiveButton(R.string.generic_ok, new OnClickListener() {
       @Override
       public void onClick(DialogInterface dialog, int arg1) {
         dialog.dismiss();
@@ -185,7 +185,7 @@ public class SaveActivity extends Activity {
     });
     builder.setIcon(success ? android.R.drawable.ic_dialog_info :
         android.R.drawable.ic_dialog_alert);
-    builder.setTitle(success ? R.string.success : R.string.error);
+    builder.setTitle(success ? R.string.generic_success_title : R.string.generic_error_title);
     return builder.create();
   }
 
@@ -228,7 +228,7 @@ public class SaveActivity extends Activity {
     Uri uri = ContentUris.withAppendedId(TracksColumns.CONTENT_URI, trackId);
 
     Intent intent = new Intent(ctx, SaveActivity.class);
-    intent.setAction(ctx.getString(R.string.save_intent_action));
+    intent.setAction(ctx.getString(R.string.track_action_save));
     intent.setDataAndType(uri, TracksColumns.CONTENT_ITEMTYPE);
     intent.putExtra(EXTRA_FILE_FORMAT, exportFormat.ordinal());
     intent.putExtra(EXTRA_SHARE_FILE, shareFile);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
index 84abd201f..4432e21d7 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java
@@ -114,7 +114,7 @@ class TrackWriterImpl implements TrackWriter {
   private void doWriteTrack() {
     // Open the input and output
     success = false;
-    errorMessage = R.string.error_export_generic;
+    errorMessage = R.string.export_error;
     if (track != null) {
       if (openFile()) {
         try {
@@ -127,7 +127,7 @@ class TrackWriterImpl implements TrackWriter {
             }
           }
           success = false;
-          errorMessage = R.string.error_export_operation_canceled;
+          errorMessage = R.string.export_canceled;
         }
       }
     }
@@ -208,7 +208,7 @@ class TrackWriterImpl implements TrackWriter {
       writer.prepare(track, newOutputStream(fileName));
     } catch (FileNotFoundException e) {
       Log.e(Constants.TAG, "Failed to open output file.", e);
-      errorMessage = R.string.io_write_failed;
+      errorMessage = R.string.sd_card_error_write_file;
       return false;
     }
     return true;
@@ -226,12 +226,12 @@ class TrackWriterImpl implements TrackWriter {
 
     if (!fileUtils.isSdCardAvailable()) {
       Log.i(Constants.TAG, "Could not find SD card.");
-      errorMessage = R.string.io_no_external_storage_found;
+      errorMessage = R.string.sd_card_error_no_storage;
       return false;
     }
     if (!fileUtils.ensureDirectoryExists(directory)) {
       Log.i(Constants.TAG, "Could not create export directory.");
-      errorMessage = R.string.io_create_dir_failed;
+      errorMessage = R.string.sd_card_error_create_dir;
       return false;
     }
 
@@ -297,7 +297,7 @@ class TrackWriterImpl implements TrackWriter {
     writer.close();
     success = true;
     Log.d(Constants.TAG, "Done writing track.");
-    errorMessage = R.string.io_write_finished;
+    errorMessage = R.string.sd_card_success_write_file;
   }
 
   private void writeLocations() throws InterruptedException {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java
index e40ef6895..15b48cf1d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java
@@ -79,9 +79,9 @@ class WriteProgressController {
   public ProgressDialog createProgressDialog() {
     dialog = new ProgressDialog(activity);
     dialog.setIcon(android.R.drawable.ic_dialog_info);
-    dialog.setTitle(activity.getString(R.string.progress_title));
+    dialog.setTitle(activity.getString(R.string.generic_progress_title));
     dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
-    dialog.setMessage(activity.getString(R.string.progress_message_export));
+    dialog.setMessage(activity.getString(R.string.export_progress_message));
     dialog.setIndeterminate(true);
     dialog.setOnCancelListener(dialogCancelListener);
     return dialog;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java b/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java
index 722f614c1..3848f877b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java
@@ -202,8 +202,8 @@ public class MapsFacade {
       iconUrl = END_ICON_URL;
     }
     String title = trackName + " "
-        + (isStart ? context.getString(R.string.start)
-                   : context.getString(R.string.end));
+        + (isStart ? context.getString(R.string.marker_label_start)
+                   : context.getString(R.string.marker_label_end));
     String description = isStart ? "" : trackDescription;
     return buildMyMapsPlacemarkFeature(title, description, iconUrl, geoPoint);
   }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java
index 419a25cf1..ec03581a5 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java
@@ -72,16 +72,16 @@ public class ResultDialogFactory {
         .setView(makeDialogContent(activity, results, success));
 
     if (success) {
-      builder.setTitle(R.string.success);
+      builder.setTitle(R.string.generic_success_title);
       builder.setIcon(android.R.drawable.ic_dialog_info);
     } else {
-      builder.setTitle(R.string.error);
+      builder.setTitle(R.string.generic_error_title);
       builder.setIcon(android.R.drawable.ic_dialog_alert);
     }
 
-    builder.setPositiveButton(activity.getString(R.string.ok), onOkClickListener);
+    builder.setPositiveButton(activity.getString(R.string.generic_ok), onOkClickListener);
     if (onShareClickListener != null) {
-      builder.setNegativeButton(activity.getString(R.string.share_track_url),
+      builder.setNegativeButton(activity.getString(R.string.send_google_result_share_url),
           onShareClickListener);
     }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
index 395688c92..f6d3657ad 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java
@@ -163,7 +163,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
 
     tracker = GoogleAnalyticsTracker.getInstance();
     // Start the tracker in manual dispatch mode...
-    tracker.start(getString(R.string.google_analytics_id),
+    tracker.start(getString(R.string.my_tracks_analytics_id),
         getApplicationContext());
     tracker.setProductVersion("android-mytracks",
         SystemUtils.getMyTracksVersion(this));
@@ -392,7 +392,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
     progressDialog = new ProgressDialog(this);
     progressDialog.setCancelable(false);
     progressDialog.setIcon(android.R.drawable.ic_dialog_info);
-    progressDialog.setTitle(R.string.progress_title);
+    progressDialog.setTitle(R.string.generic_progress_title);
     progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
     progressDialog.setMax(100);
     progressDialog.setProgress(0);
@@ -403,8 +403,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
   private SendState authenticateToGoogleMaps() {
     Log.d(TAG, "SendActivity.authenticateToGoogleMaps");
     progressDialog.setProgress(0);
-    progressDialog.setMessage(getString(
-        R.string.progress_message_authenticating_my_maps));
+    progressDialog.setMessage(getAuthenticatingProgressMessage(SendType.MYMAPS));
     authenticate(Constants.AUTHENTICATE_TO_MY_MAPS, MyMapsConstants.SERVICE_NAME);
     // AUTHENTICATE_TO_MY_MAPS callback calls sendToGoogleMaps
     return SendState.NOT_READY;
@@ -479,8 +478,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
 
   private SendState authenticateToFusionTables() {
     progressDialog.setProgress(0);
-    progressDialog.setMessage(getString(
-        R.string.progress_message_authenticating_fusion_tables));
+    progressDialog.setMessage(getAuthenticatingProgressMessage(SendType.FUSION_TABLES));
     authenticate(Constants.AUTHENTICATE_TO_FUSION_TABLES, SendToFusionTables.SERVICE_ID);
     // AUTHENTICATE_TO_FUSION_TABLES callback calls sendToFusionTables
     return SendState.NOT_READY;
@@ -535,8 +533,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
 
   private SendState authenticateToGoogleDocs() {
     setProgressValue(0);
-    setProgressMessage(
-        R.string.progress_message_authenticating_docs);
+    setProgressMessage(getAuthenticatingProgressMessage(SendType.DOCS));
     authenticate(Constants.AUTHENTICATE_TO_DOCLIST, SendToDocs.GDATA_SERVICE_NAME_DOCLIST);
     // AUTHENTICATE_TO_DOCLIST callback calls authenticateToGoogleTrix
     return SendState.NOT_READY;
@@ -544,8 +541,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
 
   private SendState authenticateToGoogleTrix() {
     setProgressValue(30);
-    setProgressMessage(
-        R.string.progress_message_authenticating_docs);
+    setProgressMessage(getAuthenticatingProgressMessage(SendType.DOCS));
     authenticate(Constants.AUTHENTICATE_TO_TRIX, SendToDocs.GDATA_SERVICE_NAME_TRIX);
     // AUTHENTICATE_TO_TRIX callback calls sendToGoogleDocs
     return SendState.NOT_READY;
@@ -556,7 +552,9 @@ public class SendActivity extends Activity implements ProgressIndicator {
     tracker.trackPageView("/send/docs");
 
     setProgressValue(50);
-    setProgressMessage(R.string.progress_message_sending_docs);
+    String format = getString(R.string.send_google_progress_sending);
+    String serviceName = getString(SendType.DOCS.getServiceName());
+    setProgressMessage(String.format(format, serviceName));
     final SendToDocs sender = new SendToDocs(this,
         authMap.get(SendToDocs.GDATA_SERVICE_NAME_TRIX),
         authMap.get(SendToDocs.GDATA_SERVICE_NAME_DOCLIST),
@@ -882,12 +880,24 @@ public class SendActivity extends Activity implements ProgressIndicator {
     sendToFusionTablesTableId = null;
   }
 
+  /**
+   * Gets a progress message indicating My Tracks is authenticating to a
+   * service.
+   *
+   * @param type the type of service
+   */
+  private String getAuthenticatingProgressMessage(SendType type) {
+    String format = getString(R.string.send_google_progress_authenticating);
+    String serviceName = getString(type.getServiceName());
+    return String.format(format, serviceName);
+  }
+
   @Override
-  public void setProgressMessage(final int resId) {
+  public void setProgressMessage(final String message) {
     runOnUiThread(new Runnable() {
       public void run() {
         if (progressDialog != null) {
-          progressDialog.setMessage(getString(resId));
+          progressDialog.setMessage(message);
         }
       }
     });
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendType.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendType.java
index 37d382a63..010771358 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendType.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendType.java
@@ -23,11 +23,11 @@ import com.google.android.maps.mytracks.R;
  * @author Matthew Simmons
  */
 public enum SendType {
-  MYMAPS(R.string.sendtogoogle_google_mymaps,
+  MYMAPS(R.string.send_google_my_maps,
       R.string.send_google_my_maps_url),
-  FUSION_TABLES(R.string.sendtogoogle_google_fusiontables,
+  FUSION_TABLES(R.string.send_google_fusion_tables,
       R.string.send_google_fusion_tables_url),
-  DOCS(R.string.sendtogoogle_google_docs,
+  DOCS(R.string.send_google_docs,
       R.string.send_google_docs_url);
 
   private int serviceName;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactory.java b/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactory.java
index a287d4caa..b1cf9e97d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactory.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactory.java
@@ -49,12 +49,13 @@ public class TrackPathPainterFactory {
     String colorMode = prefs.getString(context.getString(R.string.track_color_mode_key), null);
     Log.i(TAG, "Creating track path painter of type: " + colorMode);
 
-    if (colorMode == null || colorMode.equals(context.getString(R.string.track_color_mode_value_none))) {
+    if (colorMode == null
+        || colorMode.equals(context.getString(R.string.display_track_color_value_none))) {
       return new SingleColorTrackPathPainter(context);
-    } else if (colorMode.equals(context.getString(R.string.track_color_mode_value_fixed))) {
+    } else if (colorMode.equals(context.getString(R.string.display_track_color_value_fixed))) {
       return new DynamicSpeedTrackPathPainter(context, 
           new FixedSpeedTrackPathDescriptor(context));
-    } else if (colorMode.equals(context.getString(R.string.track_color_mode_value_dynamic))) {
+    } else if (colorMode.equals(context.getString(R.string.display_track_color_value_dynamic))) {
       return new DynamicSpeedTrackPathPainter(context, 
           new DynamicSpeedTrackPathDescriptor(context));
     } else {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/ControlRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/ControlRecordingService.java
index 8c8f3cc70..4232ba0d4 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/ControlRecordingService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/ControlRecordingService.java
@@ -97,9 +97,9 @@ public class ControlRecordingService extends IntentService implements ServiceCon
     String action = intent.getAction();
     if (action != null) {
       try {
-        if (action.equals(getString(R.string.start_new_track_action))) {
+        if (action.equals(getString(R.string.track_action_start))) {
           trackRecordingService.startNewTrack();
-        } else if (action.equals(getString(R.string.end_current_track_action))) {
+        } else if (action.equals(getString(R.string.track_action_end))) {
           trackRecordingService.endCurrentTrack();
         }
       } catch (RemoteException e) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java b/MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java
index 84f5bfa24..e59b03d30 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java
@@ -51,7 +51,7 @@ class DefaultTrackNameFactory {
       SimpleDateFormat formatter = new SimpleDateFormat(TIMESTAMP_DATE_FORMAT);
       return formatter.format(new Date(startTime));
     } else {
-      return String.format(context.getString(R.string.new_track_format), trackId);
+      return String.format(context.getString(R.string.track_name_format), trackId);
     }
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
index c266cf26b..be6418fa0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
@@ -494,8 +494,8 @@ public class TrackRecordingService extends Service {
       PendingIntent contentIntent = PendingIntent.getActivity(
           this, 0 /* requestCode */, new Intent(this, MyTracks.class),
           0 /* flags */);
-      notification.setLatestEventInfo(this, getString(R.string.app_name),
-          getString(R.string.recording_your_track), contentIntent);
+      notification.setLatestEventInfo(this, getString(R.string.my_tracks_app_name),
+          getString(R.string.track_record_notification), contentIntent);
       notification.flags += Notification.FLAG_NO_CLEAR;
       apiLevelAdapter.startForeground(this, notificationManager, 1,
           notification);
@@ -562,7 +562,7 @@ public class TrackRecordingService extends Service {
   
   private String getDefaultActivityType(Context context) {
     SharedPreferences prefs = context.getSharedPreferences(Constants.SETTINGS_NAME, 0);
-    return prefs.getString(context.getString(R.string.default_category_key), "");
+    return prefs.getString(context.getString(R.string.default_activity_key), "");
   }
 
   /*
@@ -963,12 +963,12 @@ public class TrackRecordingService extends Service {
   private void buildMarker(Waypoint wpt, WaypointCreationRequest request) {
     wpt.setType(Waypoint.TYPE_WAYPOINT);
     if (request.getIconUrl() == null) {
-      wpt.setIcon(getString(R.string.waypoint_icon_url));
+      wpt.setIcon(getString(R.string.marker_waypoint_icon_url));
     } else {
       wpt.setIcon(request.getIconUrl());
     }
     if (request.getName() == null) {
-      wpt.setName(getString(R.string.waypoint));
+      wpt.setName(getString(R.string.marker_type_waypoint));
     } else {
       wpt.setName(request.getName());
     }
@@ -996,10 +996,10 @@ public class TrackRecordingService extends Service {
 
     // Set the rest of the waypoint data
     waypoint.setType(Waypoint.TYPE_STATISTICS);
-    waypoint.setName(getString(R.string.statistics));
+    waypoint.setName(getString(R.string.marker_type_statistics));
     waypoint.setStatistics(waypointStatsBuilder.getStatistics());
     waypoint.setDescription(utils.generateWaypointDescription(waypoint));
-    waypoint.setIcon(getString(R.string.stats_icon_url));
+    waypoint.setIcon(getString(R.string.marker_statistics_icon_url));
 
     waypoint.setStartId(providerUtils.getLastLocationId(recordingTrackId));
 
@@ -1054,7 +1054,7 @@ public class TrackRecordingService extends Service {
     Intent broadcastIntent = new Intent()
         .setAction(getString(actionResId))
         .putExtra(getString(R.string.track_id_broadcast_extra), trackId);
-    sendBroadcast(broadcastIntent, getString(R.string.mytracks_notifications_permission));
+    sendBroadcast(broadcastIntent, getString(R.string.permission_notification_value));
     
     SharedPreferences sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, 0);
     if (sharedPreferences.getBoolean(getString(R.string.allow_access_key), false)) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorUtils.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorUtils.java
index 6c1d99f71..a1e2f94a5 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorUtils.java
@@ -101,13 +101,13 @@ public class SensorUtils {
       case NONE:
         return c.getString(R.string.sensor_type_value_none);
       case CONNECTING:
-        return c.getString(R.string.connecting);
+        return c.getString(R.string.sensor_state_connecting);
       case CONNECTED:
-        return c.getString(R.string.connected);
+        return c.getString(R.string.sensor_state_connected);
       case DISCONNECTED:
-        return c.getString(R.string.disconnected);
+        return c.getString(R.string.sensor_state_disconnected);
       case SENDING:
-        return c.getString(R.string.sending);
+        return c.getString(R.string.sensor_state_sending);
       default:
         return "";
     }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java b/MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java
index 9e66f8d37..d3b1691aa 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java
@@ -166,7 +166,7 @@ public class StatusAnnouncerTask implements PeriodicTask {
     double d =  stats.getTotalDistance() / 1000;
     double s =  stats.getAverageMovingSpeed() * 3.6;
     if (d == 0) {
-      return context.getString(R.string.announce_no_distance);
+      return context.getString(R.string.voice_no_distance);
     }
 
     int speedLabel;
@@ -188,7 +188,7 @@ public class StatusAnnouncerTask implements PeriodicTask {
 
     String speed = null;
     if ((s == 0) || Double.isNaN(s)) {
-      speed = context.getString(R.string.unknown);
+      speed = context.getString(R.string.value_unknown);
     } else {
       if (reportSpeed) {
         speed = String.format("%.1f", s);
@@ -200,7 +200,7 @@ public class StatusAnnouncerTask implements PeriodicTask {
       }
     }
 
-    return context.getString(R.string.announce_template,
+    return context.getString(R.string.voice_template,
         d,
         context.getString(metricUnits
                           ? R.string.voice_kilometers
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/ChartURLGenerator.java b/MyTracks/src/com/google/android/apps/mytracks/util/ChartURLGenerator.java
index 5c0336192..cc05d91ea 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/ChartURLGenerator.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/ChartURLGenerator.java
@@ -58,7 +58,7 @@ public class ChartURLGenerator {
     }
 
     return getChartUrl(distances, elevations, track,
-        context.getString(R.string.elevation_label), metricUnits);
+        context.getString(R.string.stat_elevation), metricUnits);
   }
 
   /**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
index b86ca9162..448dda67c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
@@ -264,7 +264,7 @@ public class StringUtils implements DescriptionGenerator {
       minGrade = Math.round(trackMinGrade * 100);
     }
 
-    String category = context.getString(R.string.unknown);
+    String category = context.getString(R.string.value_unknown);
     String trackCategory = track.getCategory();
     if (trackCategory != null && trackCategory.length() > 0) {
       category = trackCategory;
@@ -272,20 +272,20 @@ public class StringUtils implements DescriptionGenerator {
 
     String averageSpeed =
         getSpeedString(trackStats.getAverageSpeed(),
-            R.string.average_speed_label,
-            R.string.average_pace_label,
+            R.string.stat_average_speed,
+            R.string.stat_average_pace,
             displaySpeed);
 
     String averageMovingSpeed =
         getSpeedString(trackStats.getAverageMovingSpeed(),
-            R.string.average_moving_speed_label,
-            R.string.average_moving_pace_label,
+            R.string.stat_average_moving_speed,
+            R.string.stat_average_moving_pace,
             displaySpeed);
 
     String maxSpeed =
         getSpeedString(trackStats.getMaxSpeed(),
-            R.string.max_speed_label,
-            R.string.min_pace_label,
+            R.string.stat_max_speed,
+            R.string.stat_min_pace,
             displaySpeed);
 
     return String.format("%s<p>"
@@ -306,48 +306,48 @@ public class StringUtils implements DescriptionGenerator {
         getCreatedByMyTracks(context, true),
 
         // Line 2
-        context.getString(R.string.total_distance_label),
+        context.getString(R.string.stat_total_distance),
         distanceInKm, context.getString(R.string.unit_kilometer),
         distanceInMiles, context.getString(R.string.unit_mile),
 
         // Line 3
-        context.getString(R.string.total_time_label),
+        context.getString(R.string.stat_total_time),
         StringUtils.formatTime(trackStats.getTotalTime()),
 
         // Line 4
-        context.getString(R.string.moving_time_label),
+        context.getString(R.string.stat_moving_time),
         StringUtils.formatTime(trackStats.getMovingTime()),
 
         // Line 5
         averageSpeed, averageMovingSpeed, maxSpeed,
 
         // Line 6
-        context.getString(R.string.min_elevation_label),
+        context.getString(R.string.stat_min_elevation),
         minElevationInMeters, context.getString(R.string.unit_meter),
         minElevationInFeet, context.getString(R.string.unit_feet),
 
         // Line 7
-        context.getString(R.string.max_elevation_label),
+        context.getString(R.string.stat_max_elevation),
         maxElevationInMeters, context.getString(R.string.unit_meter),
         maxElevationInFeet, context.getString(R.string.unit_feet),
 
         // Line 8
-        context.getString(R.string.elevation_gain_label),
+        context.getString(R.string.stat_elevation_gain),
         elevationGainInMeters, context.getString(R.string.unit_meter),
         elevationGainInFeet, context.getString(R.string.unit_feet),
 
         // Line 9
-        context.getString(R.string.max_grade_label), maxGrade,
+        context.getString(R.string.stat_max_grade), maxGrade,
 
         // Line 10
-        context.getString(R.string.min_grade_label), minGrade,
+        context.getString(R.string.stat_min_grade), minGrade,
 
         // Line 11
-        context.getString(R.string.recorded_date),
+        context.getString(R.string.send_google_recorded),
         new Date(trackStats.getStartTime()),
 
         // Line 12
-        context.getString(R.string.category), category,
+        context.getString(R.string.track_detail_activity_type_hint), category,
 
         // Line 13
         ChartURLGenerator.getChartUrl(distances, elevations, track, context));
@@ -376,8 +376,8 @@ public class StringUtils implements DescriptionGenerator {
     if (displaySpeed) {
       return String.format("%s: %.2f %s (%.1f %s)<br>",
           context.getString(speedLabel),
-          speedInKph, context.getString(R.string.kilometer_per_hour),
-          speedInMph, context.getString(R.string.mile_per_hour));
+          speedInKph, context.getString(R.string.unit_kilometer_per_hour),
+          speedInMph, context.getString(R.string.unit_mile_per_hour));
     } else {
       double paceInKm;
       double paceInMi;
@@ -390,8 +390,8 @@ public class StringUtils implements DescriptionGenerator {
       }
       return String.format("%s: %.2f %s (%.1f %s)<br>",
           context.getString(paceLabel),
-          paceInKm, context.getString(R.string.min_per_kilometer),
-          paceInMi, context.getString(R.string.min_per_mile));
+          paceInKm, context.getString(R.string.unit_minute_per_kilometer),
+          paceInMi, context.getString(R.string.unit_minute_per_mile));
     }
   }
 
@@ -450,34 +450,34 @@ public class StringUtils implements DescriptionGenerator {
         + "%s: %d %s (%d %s)\n"
         + "%s: %d %s\n"
         + "%s: %d %s\n",
-        context.getString(R.string.total_distance_label),
+        context.getString(R.string.stat_total_distance),
             distanceInKm, context.getString(R.string.unit_kilometer),
             distanceInMiles, context.getString(R.string.unit_mile),
-        context.getString(R.string.total_time_label),
+        context.getString(R.string.stat_total_time),
             StringUtils.formatTime(stats.getTotalTime()),
-        context.getString(R.string.moving_time_label),
+        context.getString(R.string.stat_moving_time),
             StringUtils.formatTime(stats.getMovingTime()),
-        context.getString(R.string.average_speed_label),
-            averageSpeedInKmh, context.getString(R.string.kilometer_per_hour),
-            averageSpeedInMph, context.getString(R.string.mile_per_hour),
-        context.getString(R.string.average_moving_speed_label),
-            movingSpeedInKmh, context.getString(R.string.kilometer_per_hour),
-            movingSpeedInMph, context.getString(R.string.mile_per_hour),
-        context.getString(R.string.max_speed_label),
-            maxSpeedInKmh, context.getString(R.string.kilometer_per_hour),
-            maxSpeedInMph, context.getString(R.string.mile_per_hour),
-        context.getString(R.string.min_elevation_label),
+        context.getString(R.string.stat_average_speed),
+            averageSpeedInKmh, context.getString(R.string.unit_kilometer_per_hour),
+            averageSpeedInMph, context.getString(R.string.unit_mile_per_hour),
+        context.getString(R.string.stat_average_moving_speed),
+            movingSpeedInKmh, context.getString(R.string.unit_kilometer_per_hour),
+            movingSpeedInMph, context.getString(R.string.unit_mile_per_hour),
+        context.getString(R.string.stat_max_speed),
+            maxSpeedInKmh, context.getString(R.string.unit_kilometer_per_hour),
+            maxSpeedInMph, context.getString(R.string.unit_mile_per_hour),
+        context.getString(R.string.stat_min_elevation),
             minElevationInMeters, context.getString(R.string.unit_meter),
             minElevationInFeet, context.getString(R.string.unit_feet),
-        context.getString(R.string.max_elevation_label),
+        context.getString(R.string.stat_max_elevation),
             maxElevationInMeters, context.getString(R.string.unit_meter),
             maxElevationInFeet, context.getString(R.string.unit_feet),
-        context.getString(R.string.elevation_gain_label),
+        context.getString(R.string.stat_elevation_gain),
             elevationGainInMeters, context.getString(R.string.unit_meter),
             elevationGainInFeet, context.getString(R.string.unit_feet),
-        context.getString(R.string.max_grade_label),
+        context.getString(R.string.stat_max_grade),
             theMaxGrade, percent,
-        context.getString(R.string.min_grade_label),
+        context.getString(R.string.stat_min_grade),
             theMinGrade, percent);
   }
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
index bac7cacbd..545d4d437 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
@@ -92,7 +92,7 @@ public class TrackWidgetProvider
     this.context = aContext;
     trackObserver = new TrackObserver();
     providerUtils = MyTracksProviderUtils.Factory.get(context);
-    unknown = context.getString(R.string.unknown);
+    unknown = context.getString(R.string.value_unknown);
 
     sharedPreferences = context.getSharedPreferences(SETTINGS_NAME, 0);
     sharedPreferences.registerOnSharedPreferenceChangeListener(this);
@@ -173,13 +173,11 @@ public class TrackWidgetProvider
     if (TRACK_STARTED_ACTION.equals(action)) {
       // If a new track is started by this appwidget or elsewhere,
       // toggle the button to active and have it disable the track if pressed.
-      setButtonIntent(
-          views, R.string.end_current_track_action, R.drawable.appwidget_button_enabled);
+      setButtonIntent(views, R.string.track_action_end, R.drawable.appwidget_button_enabled);
     } else {
       // If a track is stopped by this appwidget or elsewhere,
       // toggle the button to inactive and have it start a new track if pressed.
-      setButtonIntent(
-          views, R.string.start_new_track_action, R.drawable.appwidget_button_disabled);
+      setButtonIntent(views, R.string.track_action_start, R.drawable.appwidget_button_disabled);
     }
   }
 
@@ -253,8 +251,10 @@ public class TrackWidgetProvider
     if (key == null || key.equals(metricUnitsKey)) {
       isMetric = prefs.getBoolean(metricUnitsKey, true);
       distanceLabel = context.getString(isMetric ? R.string.unit_kilometer : R.string.unit_mile);
-      speedLabel = context.getString(isMetric ? R.string.kilometer_per_hour : R.string.mile_per_hour);
-      paceLabel = context.getString(isMetric ? R.string.min_per_kilometer : R.string.min_per_mile);
+      speedLabel = context.getString(
+          isMetric ? R.string.unit_kilometer_per_hour : R.string.unit_mile_per_hour);
+      paceLabel = context.getString(
+          isMetric ? R.string.unit_minute_per_kilometer : R.string.unit_minute_per_mile);
     }
 
     String reportSpeedKey = context.getString(R.string.report_speed_key);
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java
index b3623c892..c9e3311c2 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java
@@ -34,7 +34,7 @@ public class ChartValueSeriesTest extends AndroidTestCase {
         R.color.elevation_fill,
         R.color.elevation_border,
         new ZoomSettings(5, new int[] {100}),
-        R.string.elevation_label);
+        R.string.stat_elevation);
   }
 
   public void testInitialConditions() {
@@ -44,7 +44,7 @@ public class ChartValueSeriesTest extends AndroidTestCase {
     assertEquals(0, series.getMax());
     assertEquals(0.0, series.getSpread());
     assertEquals(Style.STROKE, series.getPaint().getStyle());
-    assertEquals(getContext().getString(R.string.elevation_label),
+    assertEquals(getContext().getString(R.string.stat_elevation),
         series.getTitle());
     assertTrue(series.isEnabled());
   }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java
index b0052a655..d908e0e37 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java
@@ -126,14 +126,14 @@ public class DocsHelper_AddTrackRowTest extends TestCase {
     if (useMetric) {
       AndroidMock.expect(mockResources.getString(R.string.unit_kilometer))
           .andReturn("km");
-      AndroidMock.expect(mockResources.getString(R.string.kilometer_per_hour))
+      AndroidMock.expect(mockResources.getString(R.string.unit_kilometer_per_hour))
           .andReturn("kph");
       AndroidMock.expect(mockResources.getString(R.string.unit_meter))
           .andReturn("meter");
     } else {
       AndroidMock.expect(mockResources.getString(R.string.unit_mile))
           .andReturn("mile");
-      AndroidMock.expect(mockResources.getString(R.string.mile_per_hour))
+      AndroidMock.expect(mockResources.getString(R.string.unit_mile_per_hour))
           .andReturn("mph");
       AndroidMock.expect(mockResources.getString(R.string.unit_feet))
           .andReturn("feet");
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java
index abb9a2d17..ada16bc30 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java
@@ -214,7 +214,7 @@ public class TrackWriterTest extends AndroidTestCase {
     mocksControl.verify();
 
     assertFalse(writer.wasSuccess());
-    assertEquals(R.string.error_export_operation_canceled, writer.getErrorMessage());
+    assertEquals(R.string.export_canceled, writer.getErrorMessage());
   }
 
   public void testWriteTrack_openFails() {
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java
index 4c7d83f7b..0e654a1fa 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java
@@ -46,11 +46,11 @@ public class TrackPathPainterFactoryTest extends TrackPathPainterTestCase {
       return;
     }
     
-    testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_value_none, 
+    testTrackPathPainterFactorySpecific(context, prefs, R.string.display_track_color_value_none, 
         SingleColorTrackPathPainter.class);
-    testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_value_fixed, 
+    testTrackPathPainterFactorySpecific(context, prefs, R.string.display_track_color_value_fixed, 
         DynamicSpeedTrackPathPainter.class);
-    testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_value_dynamic, 
+    testTrackPathPainterFactorySpecific(context, prefs, R.string.display_track_color_value_dynamic, 
         DynamicSpeedTrackPathPainter.class);
   }
   
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
index 71fe422d1..d6a9ea709 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
@@ -382,7 +382,7 @@ public class TrackRecordingServiceTest
     Track track = providerUtils.getTrack(id);
     assertNotNull(track);
     assertEquals(id, track.getId());
-    assertEquals(sharedPreferences.getString(context.getString(R.string.default_category_key), ""),
+    assertEquals(sharedPreferences.getString(context.getString(R.string.default_activity_key), ""),
         track.getCategory());
     assertEquals(id, sharedPreferences.getLong(
         context.getString(R.string.recording_track_key), -1));
@@ -491,9 +491,9 @@ public class TrackRecordingServiceTest
     assertEquals(2, service.insertWaypoint(WaypointCreationRequest.DEFAULT_STATISTICS));
 
     Waypoint wpt = providerUtils.getWaypoint(1);
-    assertEquals(getContext().getString(R.string.stats_icon_url),
+    assertEquals(getContext().getString(R.string.marker_statistics_icon_url),
         wpt.getIcon());
-    assertEquals(getContext().getString(R.string.statistics),
+    assertEquals(getContext().getString(R.string.marker_type_statistics),
         wpt.getName());
     assertEquals(Waypoint.TYPE_STATISTICS, wpt.getType());
     assertEquals(123, wpt.getTrackId());
@@ -527,9 +527,9 @@ public class TrackRecordingServiceTest
 
     assertEquals(1, service.insertWaypoint(WaypointCreationRequest.DEFAULT_MARKER));
     Waypoint wpt = providerUtils.getWaypoint(1);
-    assertEquals(getContext().getString(R.string.waypoint_icon_url),
+    assertEquals(getContext().getString(R.string.marker_waypoint_icon_url),
         wpt.getIcon());
-    assertEquals(getContext().getString(R.string.waypoint),
+    assertEquals(getContext().getString(R.string.marker_type_waypoint),
         wpt.getName());
     assertEquals(Waypoint.TYPE_WAYPOINT, wpt.getType());
     assertEquals(123, wpt.getTrackId());