Updating version number to 1.0.16 in preparation for release.

Fixing version display (missed merge).
Merging changes from head.
2026-10-02 01:23:06 +02:00 · 2010-08-30 18:42:48 -03:00 · 2010-08-30 18:36:16 -03:00 · 2010-08-27 17:21:33 -07:00 · 2010-08-24 22:48:49 -03:00 · 2010-08-24 17:02:36 -03:00
333 changed files with 5873 additions and 25578 deletions
@@ -2,6 +2,4 @@ syntax:glob

 */bin
 */gen/**
-*/proguard/**
 .metadata
-MyTracksTest/annotations.log
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="lib" path="libs/googleloginclient-helper.jar"/>
 	<classpathentry kind="lib" path="libs/google-common.jar"/>
 	<classpathentry kind="lib" path="libs/accounts.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client-1.2.2-alpha.jar"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
-	<classpathentry kind="src" path="MyTracksLib_src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
@@ -30,11 +30,4 @@
 		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
-	<linkedResources>
-		<link>
-			<name>MyTracksLib_src</name>
-			<type>2</type>
-			<locationURI>_android_MyTracksLib_e2802071/src</locationURI>
-		</link>
-	</linkedResources>
 </projectDescription>
@@ -1,4 +1,4 @@
-#Wed Sep 29 18:44:16 BRT 2010
+#Thu Aug 12 18:54:52 BRT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
@@ -1,37 +1,16 @@
 <?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.
-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="com.google.android.maps.mytracks"
-          android:installLocation="auto"
-          android:versionCode="27"
-          android:versionName="1.1.4">
+          android:versionCode="17"
+          android:versionName="1.0.16">
  <application android:icon="@drawable/arrow_icon"
-               android:label="@string/app_name"
-               android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent">
+               android:label="@string/app_name">
    <uses-library android:name="com.google.android.maps" />

-    <meta-data android:name="com.google.android.backup.api_key"
-               android:value="AEdPqrEAAAAIi-_QiwoRSc9_bAC9cmuNXTQyU8ajJmGtKdhskQ" />
-
    <provider android:name="com.google.android.apps.mytracks.content.MyTracksProvider"
-              android:authorities="com.google.android.maps.mytracks"
-              android:exported="true"
-              android:readPermission="com.google.android.apps.mytracks.READ_TRACK_DATA"
-              android:writePermission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
+              android:multiprocess="true"
+              android:authorities="com.google.android.maps.mytracks" />
+

    <activity android:name="com.google.android.apps.mytracks.MyTracks"
              android:label="My Tracks"
@@ -53,19 +32,20 @@ limitations under the License.
    </activity>

    <activity android:name="com.google.android.apps.mytracks.MyTracksMap"
-              android:label="MyTracks"
-              android:exported="false" />
+              android:label="MyTracks" />

-    <activity android:name="com.google.android.apps.mytracks.MyMapsList"
+    <activity android:name="com.google.android.apps.mymaps.MyMapsList"
              android:label="@string/map_list_title"
-              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale"
-              android:exported="false" />
+              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale">
+    </activity>

    <activity android:name="com.google.android.apps.mytracks.MyTracksList"
-              android:label="Recorded Tracks" />
+              android:label="Recorded Tracks">
+    </activity>

    <activity android:name="com.google.android.apps.mytracks.MyTracksWaypointsList"
-              android:label="Recorded Waypoints" />
+              android:label="Recorded Waypoints">
+    </activity>

    <activity android:name="com.google.android.apps.mytracks.MyTracksDetails"
              android:label="@string/trackdetails_title" />
@@ -76,110 +56,45 @@ limitations under the License.
    <activity android:name="com.google.android.apps.mytracks.MyTracksSettings"
              android:label="@string/mytracks_settings" />

-    <activity android:name="com.google.android.apps.mytracks.AggregatedStatsActivity"
-              android:label="@string/aggregated_stats" />
-
    <activity android:name="com.google.android.apps.mytracks.StatsActivity"
-              android:label="@string/statistics"
-              android:exported="false" />
-
-    <activity android:name="com.google.android.apps.mytracks.SensorStateActivity"
-              android:label="@string/sensor_state" />
+              android:label="@string/statistics"/>

    <activity android:name="com.google.android.apps.mytracks.ChartActivity"
-              android:label="@string/elevation_label"
-              android:exported="false" />
+              android:label="@string/elevation_label"/>

    <activity android:name="com.google.android.apps.mytracks.WelcomeActivity"
-              android:label="@string/welcome"
-              android:exported="false" />
+          android:label="@string/welcome"/>

    <service android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
+             android:process=":trackrecord"
             android:label="Track Recording Service"
             android:icon="@drawable/arrow_320"
             android:enabled="true"
-             android:exported="true"
-             android:permission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
+             android:exported="true" />

-    <receiver android:name="com.google.android.apps.mytracks.MyTracksReceiver">
-      <intent-filter>
-        <action android:name="android.intent.action.BOOT_COMPLETED" />
-	  </intent-filter>
-    </receiver>
  </application>

-  <!-- Permissions to initialize service -->
-  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
  <!-- Permissions for recording tracks and showing maps -->
  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
  <uses-permission android:name="android.permission.INTERNET" />
  <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-permission android:name="android.permission.BLUETOOTH" />
-  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-
-  <uses-permission android:name="com.dsi.ant.permission.ANT" />
-  <uses-permission android:name="com.dsi.ant.permission.ANT_ADMIN" />

  <!-- Permissions for uploading tracks -->
  <uses-permission android:name="android.permission.GET_ACCOUNTS" />
  <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
  <uses-permission android:name="android.permission.USE_CREDENTIALS" />
  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
-  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.fusiontables" />
  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.local" />
  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.wise" />
  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.writely" />
  <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />

-  <!-- Permissions for misc services -->
-  <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-
-  <!-- Exported permissions (for other apps to use our features) -->
-  <!-- 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:protectionLevel="normal" />
-  <!-- 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: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:protectionLevel="dangerous" />
-
-  <!-- We read and write raw track data, obviously. -->
-  <uses-permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA" />
-  <uses-permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
-  <uses-permission android:name="com.google.android.apps.mytracks.TRACK_NOTIFICATIONS" />
-
-  <!-- Features required -->
-  <uses-feature android:name="android.hardware.location" android:required="true"/>
-  <uses-feature android:name="android.hardware.location.gps" android:required="true"/>
-
-  <!-- Features optional -->
-  <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
-  <uses-feature android:name="android.hardware.faketouch" android:required="false"/>
-  <uses-feature android:name="android.hardware.location.network" android:required="false"/>
-  <uses-feature android:name="android.hardware.sensor.compass" android:required="false"/>
-  <uses-feature android:name="android.hardware.telephony" android:required="false"/>
-  <uses-feature android:name="android.hardware.telephony.gsm" android:required="false"/>
-  <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-  <uses-feature android:name="android.hardware.touchscreen.multitouch" android:required="false"/>
-
  <uses-sdk android:minSdkVersion="3"/>
  <supports-screens
-          android:xlargeScreens="true"
          android:largeScreens="true"
          android:normalScreens="true"
          android:smallScreens="true"
          android:anyDensity="true" />
 </manifest>
+
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="com.android.ide.eclipse.adt.debug.LaunchConfigType">
 <intAttribute key="com.android.ide.eclipse.adt.action" value="0"/>
 <stringAttribute key="com.android.ide.eclipse.adt.commandline" value=""/>
@@ -9,15 +9,13 @@
 <booleanAttribute key="com.android.ide.eclipse.adt.wipedata" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/MyTracks"/>
-<listEntry value="/MyTracks/AndroidManifest.xml"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
-<listEntry value="1"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MyTracks"/>
@@ -10,10 +10,4 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=Google Inc.:Google APIs:11
-android.library.reference.1=../MyTracksLib/
-
-# ProGuard is turned off while we investigate the removal of code that
-# isn't actually dead from Fusion Tables.  See issue 303 for an example of
-# the result of that removal.  
-#proguard.config=proguard.cfg
+target=Google Inc.:Google APIs:8
@@ -1,17 +0,0 @@
-The libraries contained here in binary format are licensed according to their
-own licenses, which allow their usage for the My Tracks application. Any other
-applications that wish to use these files should consult the appropriate
-licenses or the JAR's authors.
-
-References are provided to the libraries:
-
-accounts.jar (Android accounts library):
-http://code.google.com/p/libs-for-android/wiki/AccountsLibrary
-
-google-api-client-*.jar (GData client):
-http://code.google.com/p/google-api-java-client/
-
-google-common.jar,
-googleloginclient-helper.jar,
-libmymaps.jar (Google My Maps upload library):
-Licensed exclusively for use in My Tracks and derived Android applications.
@@ -1,53 +0,0 @@
-target 6
-optimizationpasses 5
-dontusemixedcaseclassnames
-dontskipnonpubliclibraryclasses
-dontpreverify
-verbose
-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
-
-# Add the libraries, but ignore warnings about them
-libraryjars libs
-libraryjars ../MyTracksLib/libs
-dontwarn com.google.android.googleapps.**
-dontwarn com.android.common.**
-dontwarn com.google.android.gsf.**
-dontwarn org.codehaus.**
-dontwarn com.google.appengine.**
-
-# Make our stack traces useful
-# Line numbers will be correct, file names will be replaced by "MT" since the
-# class name is enough to get the file name.
-renamesourcefileattribute MT
-keepattributes SourceFile,LineNumberTable
-
-# Keep everything android references from XMLs
-keep public class * extends android.app.Activity
-keep public class * extends android.app.Application
-keep public class * extends android.app.Service
-keep public class * extends android.app.backup.BackupAgent
-keep public class * extends android.content.BroadcastReceiver
-keep public class * extends android.content.ContentProvider
-keep public class * extends android.preference.Preference
-keep public class com.android.vending.licensing.ILicensingService
-
-keepclasseswithmembernames class * {
-    native <methods>;
-}
-
-keepclasseswithmembernames class * {
-    public <init>(android.content.Context, android.util.AttributeSet);
-}
-
-keepclasseswithmembernames class * {
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
-keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
-keep class * implements android.os.Parcelable {
-  public static final android.os.Parcelable$Creator *;
-}
@@ -17,11 +17,11 @@ limitations under the License.
 <selector xmlns:android="http://schemas.android.com/apk/res/android">

  <item android:state_window_focused="false"
-        android:drawable="@drawable/left_arrow_track" />
+      android:drawable="@drawable/btn_arrow_left_default" />

  <item android:state_pressed="true"
-        android:drawable="@drawable/left_arrow_track_press" />
+      android:drawable="@drawable/btn_arrow_left_press" />

-  <item android:drawable="@drawable/left_arrow_track" />
+  <item android:drawable="@drawable/btn_arrow_left_default" />

 </selector>
@@ -17,11 +17,11 @@ limitations under the License.
 <selector xmlns:android="http://schemas.android.com/apk/res/android">

  <item android:state_window_focused="false"
-        android:drawable="@drawable/left_arrow_stats" />
+      android:drawable="@drawable/btn_arrow_right_default" />

  <item android:state_pressed="true"
-        android:drawable="@drawable/left_arrow_stats_press" />
+      android:drawable="@drawable/btn_arrow_right_press" />

-  <item android:drawable="@drawable/left_arrow_stats" />
+  <item android:drawable="@drawable/btn_arrow_right_default" />

 </selector>
@@ -1,27 +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.
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <item android:state_window_focused="false"
-        android:drawable="@drawable/left_arrow_chart" />
-
-  <item android:state_pressed="true"
-        android:drawable="@drawable/left_arrow_chart_press" />
-
-  <item android:drawable="@drawable/left_arrow_chart" />
-
-</selector>
@@ -1,27 +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.
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <item android:state_window_focused="false"
-        android:drawable="@drawable/right_arrow_chart" />
-
-  <item android:state_pressed="true"
-        android:drawable="@drawable/right_arrow_chart_press" />
-
-  <item android:drawable="@drawable/right_arrow_chart" />
-
-</selector>
@@ -1,27 +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.
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <item android:state_window_focused="false"
-        android:drawable="@drawable/right_arrow_stats" />
-
-  <item android:state_pressed="true"
-        android:drawable="@drawable/right_arrow_stats_press" />
-
-  <item android:drawable="@drawable/right_arrow_stats" />
-
-</selector>
@@ -1,27 +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.
-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <item android:state_window_focused="false"
-        android:drawable="@drawable/right_arrow_track" />
-
-  <item android:state_pressed="true"
-        android:drawable="@drawable/right_arrow_track_press" />
-
-  <item android:drawable="@drawable/right_arrow_track" />
-
-</selector>
@@ -41,7 +41,8 @@ limitations under the License.
    </LinearLayout>
  </TableRow>

-  <View android:layout_height="2dip" />
+  <View
+    android:layout_height="2dip" />

  <TableRow>
    <TextView
@@ -57,11 +58,6 @@ limitations under the License.
      android:layout_height="wrap_content"
      android:layout_width="wrap_content"
      android:orientation="vertical">
-      <TextView
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:text="@string/about_bart"
-        android:textSize="20sp" />
      <TextView
        android:layout_height="wrap_content"
        android:layout_width="wrap_content"
@@ -85,7 +81,8 @@ limitations under the License.
    </LinearLayout>
  </TableRow>

-  <View android:layout_height="2dip" />
+  <View
+    android:layout_height="2dip" />

  <TableRow>
    <TextView
@@ -104,7 +101,8 @@ limitations under the License.
      android:textSize="20sp" />
  </TableRow>

-  <View android:layout_height="2dip" />
+  <View
+    android:layout_height="2dip" />

  <TableRow>
    <TextView
@@ -123,25 +121,7 @@ limitations under the License.
      android:textSize="18sp" />
  </TableRow>

-  <View android:layout_height="2dip" />
-  
-  <TableRow>
-    <TextView
-      android:paddingLeft="10dip"
-      android:paddingRight="10dip"
-      android:layout_column="1"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      android:text="@string/about_privacy"
-      android:textSize="20sp" />
-    <TextView
-      android:autoLink="web"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      android:text="@string/about_privacy_weburl"
-      android:textSize="18sp" />
-  </TableRow>
-  
-  <View android:layout_height="4dip" />
+  <View
+    android:layout_height="4dip" />

 </TableLayout>
@@ -103,21 +103,6 @@ limitations under the License.
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
            android:text="@string/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"/>
-          <CheckBox android:id="@+id/chart_settings_cadence"
-            android:checked="true"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/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"/>
        </LinearLayout>
      </TableRow>
    </TableLayout>
@@ -30,15 +30,13 @@ limitations under the License.
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
-    android:padding="10dip"
    android:layout_weight="0">
    <ZoomControls android:id="@+id/elevation_zoom"
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_gravity="center_horizontal"
      android:layout_alignParentBottom="true"
-      android:layout_centerHorizontal="true"
-      android:layout_alignParentRight="true"/>
+      android:layout_centerHorizontal="true"/>
  </RelativeLayout>
  <LinearLayout android:id="@+id/elevation_busypane"
    android:orientation="vertical"
@@ -50,12 +50,6 @@ limitations under the License.
      android:layout_width="wrap_content"
      android:layout_height="wrap_content"
      android:layout_weight="1"/>
-    <Button android:id="@+id/tracklist_btn_import_all"
-      android:layout_width="wrap_content"
-      android:layout_height="48dip"
-      android:layout_gravity="left|top"
-      android:text="@string/tracklist_btn_import_all"
-      android:textSize="14dip"/>
    <Button android:id="@+id/tracklist_btn_export_all"
      android:layout_width="wrap_content"
      android:layout_height="48dip"
@@ -41,8 +41,6 @@ limitations under the License.
      android:stretchColumns="1"
      android:layout_marginTop="5dip"
      android:layout_marginLeft="5dip">
-      
-      <!-- My Maps -->
      <TableRow>
        <ImageView android:src="@drawable/mymaps_icon"
          android:layout_width="wrap_content"
@@ -72,27 +70,6 @@ limitations under the License.
          </RadioGroup>
        </LinearLayout>
      </TableRow>
-
-      <!-- Fusion Tables -->
-      <TableRow>
-        <ImageView android:src="@drawable/googledocs_icon"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"/>
-        <LinearLayout
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:orientation="vertical"
-          android:layout_marginLeft="10dip">
-          <CheckBox android:id="@+id/sendtogoogle_google_fusiontables"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/sendtogoogle_google_fusiontables"
-            android:textSize="20dip"
-            android:checked="true"/>
-        </LinearLayout>
-      </TableRow>
-
-      <!-- Google Docs -->
      <TableRow>
        <ImageView android:src="@drawable/googledocs_icon"
          android:layout_width="wrap_content"
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2011 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.
-->
-<!--
-This layout is used as the content view for the send-to-Google result dialog.
-It is used to summarize the results of uploading track data to one or more
-services.
-->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="5dip"
-    android:paddingBottom="5dip"
-    android:paddingLeft="14dip"
-    android:paddingRight="14dip"
-    android:orientation="vertical">
-  <TextView
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:text="@string/status_track_upload_status"
-      style="?android:attr/textAppearanceLarge"/>
-  <TableLayout
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:gravity="center_horizontal">
-    <!-- We don't want a divider, so we set its color to transparent. -->
-    <!-- We do this explicitly, rather than with a color resource, because -->
-    <!-- an apparent bug causes the divider to be wildly misrendered on -->
-    <!-- a Mini X10 running 2.1. -->
-    <ListView
-        android:id="@+id/send_to_google_result_list"
-        android:clickable="false"
-        android:paddingTop="10dip"
-        android:paddingBottom="10dip"
-        android:divider="#00000000"/>
-  </TableLayout>
-  <TextView
-      android:id="@+id/send_to_google_result_comment"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:text="@string/status_mymap_info"
-      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_please_try_again_later"
-      android:visibility="gone"
-      style="?android:attr/textAppearanceLarge"/>
-</LinearLayout>
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2011 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.
-->
-<!--
-This layout represents the result of sending track data to a single service.
-It will be instantiated by a custom ListAdapter - once for each service to
-which track data was uploaded.
-->
-<TableRow
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-  <ImageView
-      android:id="@+id/send_to_google_result_icon"
-      android:src="@drawable/success"
-      android:layout_width="wrap_content"
-      android:layout_height="fill_parent"
-      android:layout_gravity="top"/>
-  <LinearLayout
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:orientation="vertical">
-    <TextView
-        android:id="@+id/send_to_google_result_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Google Docs"
-        style="?android:attr/textAppearanceMedium"/>
-    <TextView
-        android:id="@+id/send_to_google_result_url"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="http://google.com"
-        style="?android:attr/textAppearanceSmall"/>
-  </LinearLayout>
-</TableRow>
@@ -1,131 +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.
-->
-<RelativeLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="wrap_content"
-  android:orientation="horizontal"
-  android:layout_width="fill_parent">
-
-  <ScrollView
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent">
-
-    <LinearLayout
-      android:layout_height="wrap_content"
-      android:layout_width="fill_parent">
-
-      <TableLayout
-        android:layout_height="wrap_content"
-        android:stretchColumns="1,4"
-        android:layout_width="fill_parent">
-
-        <!--  Layout the sensor state on one line.  -->
-        <TableRow>
-          <TextView
-            android:layout_span="5"
-            android:text="@string/sensor_state" />
-        </TableRow>
-        <TableRow
-          android:background="@color/stat_label_background">
-          <TextView
-            android:id="@+id/sensor_state_register"
-            android:layout_column="1"
-            android:layout_span="5"
-            style="@style/StatsRegister" />
-        </TableRow>
-
-        <!--  Layout the sensor data age on one line. -->
-        <TableRow>
-          <TextView
-            android:layout_span="5"
-            android:text="@string/sensor_data_time" />
-        </TableRow>
-        <TableRow
-          android:background="@color/stat_label_background">
-          <TextView
-            android:id="@+id/sensor_data_time_register"
-            android:layout_column="1"
-            android:layout_span="5"
-            style="@style/StatsRegister" />
-        </TableRow>
-
-        <!-- Power meter -->
-        <TableRow
-          android:padding="1dip">
-          <TextView
-            android:layout_column="1"
-            android:layout_span="3"
-            android:text="@string/power" />
-        </TableRow>
-        <TableRow
-          android:background="@color/stat_label_background">
-          <TextView
-            style="@style/StatsRegister.Big"
-            android:id="@+id/power_state_register"
-            android:layout_column="1"
-            android:layout_span="4" />
-          <TextView
-            style="@style/StatsUnitSolo" />
-            android:layout_column="5"
-            android:text="@string/watts" />
-        </TableRow>
-        
-        <!-- Cadence -->
-        <TableRow
-          android:padding="1dip">
-          <TextView
-            android:layout_column="1"
-            android:layout_span="3"
-            android:text="@string/cadence" />
-        </TableRow>
-        <TableRow
-          android:background="@color/stat_label_background">
-          <TextView
-            style="@style/StatsRegister.Big"
-            android:id="@+id/cadence_state_register"
-            android:layout_column="4" />
-          <TextView
-            style="@style/StatsUnitSolo" />
-            android:layout_column="2"
-            android:text="@string/revolutions_per_minute" />
-        </TableRow>
-
-        <!-- Heart Rate -->
-        <TableRow
-          android:padding="1dip">
-          <TextView
-            android:layout_column="1"
-            android:layout_span="3"
-            android:text="@string/heart_rate" />
-        </TableRow>
-        <TableRow
-          android:background="@color/stat_label_background">
-          <TextView
-            style="@style/StatsRegister.Big"
-            android:id="@+id/heart_rate_register"
-            android:layout_column="1"
-            android:layout_span="4" />
-          <TextView
-            style="@style/StatsUnitSolo"
-            android:layout_column="5"
-            android:text="@string/bpm" />
-        </TableRow>
-
-      </TableLayout>
-    </LinearLayout>
-  </ScrollView>
-</RelativeLayout>
@@ -42,10 +42,15 @@ limitations under the License.
      <TableRow
        android:background="@color/stat_label_background">
        <TextView
-          style="@style/StatsRegister.Big"
+          android:gravity="right"
          android:id="@+id/speed_register"
          android:layout_column="1"
-          android:layout_span="4"/>
+          android:layout_marginBottom="-13dip"
+          android:layout_marginTop="-13dip"
+          android:layout_span="4"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="50sp" />
        <LinearLayout
          android:gravity="bottom"
          android:layout_column="5"
@@ -57,12 +62,24 @@ limitations under the License.
            android:layout_width="fill_parent" />
          <TextView
            android:id="@+id/speed_unit_label_top"
-	          style="@style/StatsUnit" />
+            android:gravity="bottom"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="2dip"
+            android:layout_marginTop="2dip"
+            android:layout_width="wrap_content"
+            android:textColor="@color/stat_label_text" />
          <TextView
-	          style="@style/StatsDivider" />
+            android:background="@color/black"
+            android:layout_height="3dip"
+            android:layout_width="fill_parent" />
          <TextView
            android:id="@+id/speed_unit_label_bottom"
-	          style="@style/StatsUnit" />
+            android:gravity="bottom"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="2dip"
+            android:layout_marginTop="2dip"
+            android:layout_width="wrap_content"
+            android:textColor="@color/stat_label_text" />
        </LinearLayout>
      </TableRow>

@@ -83,25 +100,43 @@ limitations under the License.
      <TableRow
        android:background="@color/stat_label_background">
        <TextView
-          style="@style/StatsRegister"
+          android:gravity="right"
          android:id="@+id/total_distance_register"
-          android:layout_column="1" />
+          android:layout_column="1"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
        <TextView
+          android:gravity="left"
          android:id="@+id/total_distance_unit_label"
          android:layout_column="2"
-	        style="@style/StatsUnitSolo" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/mile"
+          android:textColor="@color/stat_label_text" />
        <!-- TODO 4/08/2009
        The following is a bad hack to get a spacer the same size as the
        text.  Ideally this should just be a View, however I don't know how to
        set the view height properly.  fill_parent on this element causes as
        NullPointerException. This same filler is repeated on each line.-->
        <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
+          android:background="@color/black"
+          android:layout_column="3"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="5dip"
+          android:textSize="40sp" />
        <TextView
+          android:gravity="right"
          android:id="@+id/max_speed_register"
-          style="@style/StatsRegister"
-          android:layout_column="4" />
+          android:layout_column="4"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
        <LinearLayout
          android:gravity="bottom"
          android:layout_column="5"
@@ -110,12 +145,24 @@ limitations under the License.
          android:orientation="vertical">
          <TextView
            android:id="@+id/max_speed_unit_label_top"
-            style="@style/StatsUnit" />
+            android:gravity="bottom"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-1dip"
+            android:layout_marginTop="-1dip"
+            android:layout_width="wrap_content"
+            android:textColor="@color/stat_label_text" />
          <TextView
-	          style="@style/StatsDivider" />
+            android:background="@color/black"
+            android:layout_height="3dip"
+            android:layout_width="fill_parent" />
          <TextView
            android:id="@+id/max_speed_unit_label_bottom"
-            style="@style/StatsUnit" />
+            android:gravity="bottom"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-1dip"
+            android:layout_marginTop="-1dip"
+            android:layout_width="wrap_content"
+            android:textColor="@color/stat_label_text" />
        </LinearLayout>
      </TableRow>

@@ -135,19 +182,33 @@ limitations under the License.
      <TableRow
        android:background="@color/stat_label_background">
        <TextView
+          android:gravity="right"
          android:id="@+id/total_time_register"
          android:layout_column="1"
          android:layout_height="wrap_content"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
          android:layout_span="2"
          android:layout_width="fill_parent"
-          style="@style/StatsRegister" />
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
        <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
+          android:background="@color/black"
+          android:layout_column="3"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="5dip"
+          android:textSize="40sp" />
        <TextView
+          android:gravity="right"
          android:id="@+id/average_speed_register"
          android:layout_column="4"
-          style="@style/StatsRegister" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
        <LinearLayout
          android:gravity="bottom"
          android:layout_column="5"
@@ -156,12 +217,24 @@ limitations under the License.
          android:orientation="vertical">
          <TextView
            android:id="@+id/average_speed_unit_label_top"
-            style="@style/StatsUnit" />
+            android:gravity="bottom"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-1dip"
+            android:layout_marginTop="-1dip"
+            android:layout_width="wrap_content"
+            android:textColor="@color/stat_label_text" />
          <TextView
-	          style="@style/StatsDivider" />
+            android:background="@color/black"
+            android:layout_height="3dip"
+            android:layout_width="fill_parent" />
          <TextView
            android:id="@+id/average_speed_unit_label_bottom"
-            style="@style/StatsUnit" />
+            android:gravity="bottom"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-1dip"
+            android:layout_marginTop="-1dip"
+            android:layout_width="wrap_content"
+            android:textColor="@color/stat_label_text" />
        </LinearLayout>
      </TableRow>

@@ -181,18 +254,33 @@ limitations under the License.
      <TableRow
        android:background="@color/stat_label_background">
        <TextView
+          android:gravity="right"
          android:id="@+id/moving_time_register"
          android:layout_column="1"
          android:layout_height="wrap_content"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
          android:layout_span="2"
          android:layout_width="fill_parent"
-          style="@style/StatsRegister" />
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
        <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
+          android:background="@color/black"
+          android:layout_column="3"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="5dip"
+          android:textSize="40sp" />
        <TextView
+          android:gravity="right"
          android:id="@+id/average_moving_speed_register"
-          style="@style/StatsRegister" />
+          android:layout_column="4"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
        <LinearLayout
          android:gravity="bottom"
          android:layout_column="5"
@@ -201,14 +289,24 @@ limitations under the License.
          android:orientation="vertical">
          <TextView
            android:id="@+id/average_moving_speed_unit_label_top"
-            style="@style/StatsUnit" />
+            android:gravity="bottom"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-1dip"
+            android:layout_marginTop="-1dip"
+            android:layout_width="wrap_content"
+            android:textColor="@color/stat_label_text" />
          <TextView
-	          style="@style/StatsDivider" />
+            android:background="@color/black"
            android:layout_height="3dip"
            android:layout_width="fill_parent" />
          <TextView
            android:id="@+id/average_moving_speed_unit_label_bottom"
-            style="@style/StatsUnit" />
+            android:gravity="bottom"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-1dip"
+            android:layout_marginTop="-1dip"
+            android:layout_width="wrap_content"
+            android:textColor="@color/stat_label_text" />
        </LinearLayout>
      </TableRow>

@@ -228,24 +326,46 @@ limitations under the License.
      <TableRow
        android:background="@color/stat_label_background">
        <TextView
+          android:gravity="right"
          android:id="@+id/elevation_register"
          android:layout_column="1"
-          style="@style/StatsRegister" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
        <TextView
+          android:gravity="left"
          android:id="@+id/elevation_unit_label"
          android:layout_column="2"
-          style="@style/StatsUnitSolo" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/feet"
+          android:textColor="@color/stat_label_text"/>
        <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
+          android:background="@color/black"
+          android:layout_column="3"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="5dip"
+          android:textSize="40sp" />
        <TextView
+          android:gravity="right"
          android:id="@+id/elevation_gain_register"
          android:layout_column="4"
-          style="@style/StatsRegister" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
        <TextView
+          android:gravity="right"
          android:id="@+id/elevation_gain_unit_label"
          android:layout_column="5"
-          style="@style/StatsUnitSolo" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/feet"
+          android:textColor="@color/stat_label_text" />
      </TableRow>

      <!-- Min and max elevation -->
@@ -264,24 +384,46 @@ limitations under the License.
      <TableRow
        android:background="@color/stat_label_background">
        <TextView
+          android:gravity="right"
          android:id="@+id/min_elevation_register"
          android:layout_column="1"
-          style="@style/StatsRegister" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
        <TextView
+          android:gravity="left"
          android:id="@+id/min_elevation_unit_label"
          android:layout_column="2"
-          style="@style/StatsUnitSolo" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/feet"
+          android:textColor="@color/stat_label_text" />
        <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
+          android:background="@color/black"
+          android:layout_column="3"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="5dip"
+          android:textSize="40sp" />
        <TextView
+          android:gravity="right"
          android:id="@+id/max_elevation_register"
          android:layout_column="4"
-          style="@style/StatsRegister" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
        <TextView
+          android:gravity="right"
          android:id="@+id/max_elevation_unit_label"
          android:layout_column="5"
-          style="@style/StatsUnitSolo" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/feet"
+          android:textColor="@color/stat_label_text" />
      </TableRow>

      <!-- Min and max grade -->
@@ -300,18 +442,36 @@ limitations under the License.
      <TableRow
        android:background="@color/stat_label_background">
        <TextView
+          android:gravity="right"
          android:id="@+id/min_grade_register"
          android:layout_column="1"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="fill_parent"
          android:layout_span="2"
-          style="@style/StatsRegister" />
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
        <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
+          android:background="@color/black"
+          android:layout_column="3"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="5dip"
+          android:textSize="40sp" />
        <TextView
+          android:gravity="right"
          android:id="@+id/max_grade_register"
          android:layout_column="4"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="fill_parent"
          android:layout_span="2"
-          style="@style/StatsRegister" />
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
      </TableRow>

      <!-- Latitude and Longitude -->
@@ -328,19 +488,36 @@ limitations under the License.
      <TableRow
        android:background="@color/stat_label_background">
        <TextView
+          android:gravity="right"
          android:id="@+id/latitude_register"
          android:layout_column="1"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="-5dip"
+          android:layout_marginTop="-5dip"
+          android:layout_width="fill_parent"
          android:layout_span="2"
-          style="@style/StatsRegister.Small" />
-        <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
          android:textSize="25sp" />
        <TextView
+          android:background="@color/black"
+          android:layout_column="3"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="5dip"
+          android:textSize="25sp" />
+        <TextView
+          android:gravity="right"
          android:id="@+id/longitude_register"
          android:layout_column="4"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="-5dip"
+          android:layout_marginTop="-5dip"
+          android:layout_width="fill_parent"
          android:layout_span="2"
-          style="@style/StatsRegister.Small" />
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="25sp" />
      </TableRow>

    </TableLayout>
@@ -1,38 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
  <item android:id="@+id/menu_start_recording"
-    android:icon="@drawable/ic_menu_recordtrack"
+    android:icon="@drawable/menu_record"
    android:title="@string/start_recording"/>

  <item android:id="@+id/menu_stop_recording"
-    android:icon="@drawable/ic_menu_stoprecording"
+    android:icon="@drawable/menu_stop"
    android:title="@string/stop_recording"/>

  <item android:id="@+id/menu_list_tracks"
-    android:icon="@drawable/ic_menu_tracklist"
+    android:icon="@drawable/menu_list_tracks"
    android:title="@string/list_tracks"/>

  <item android:id="@+id/menu_list_markers"
-    android:icon="@drawable/ic_menu_waypoints"
+    android:icon="@drawable/menu_marker"
    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"/>

-  <item android:id="@+id/menu_sensor_state"
-    android:icon="@drawable/ic_menu_sensorstatus"
-    android:orderInCategory="1000"
-    android:title="@string/sensor_state"/>
-    
  <item android:id="@+id/menu_help"
    android:icon="@android:drawable/ic_menu_info_details"
-    android:orderInCategory="1003"
+    android:orderInCategory="1002"
    android:title="@string/help"/>

 </menu>
@@ -1,292 +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>
-
-  <!-- Split frequency -->
-  <string-array name="split_frequency_options">
-    <item>Sense divisió</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>No splitting</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>
-
-  <array name="sensor_type_options">
-    <item>Cap</item>
-    <item>Zephyr Bluetooth</item>
-  </array>
-
-</resources>
@@ -1,412 +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>
-  <!-- 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_location_provider">No s\'ha trobat cap proveïdor d\'ubicació GPS en aquest dispositiu.</string>
-  <string name="error_sending_to_fusiontables">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_unable_to_read_file">No es pot llegir des del fitxer.</string>
-  <string name="error_invalid_gpx_format">El fitxer no conté un format GPX vàlid.</string>
-  <string name="error_generic">S\'ha produït un error. Proveu de nou.</string>
-  <string name="error_track_does_not_exist">No existeix la ruta.</string>
-  <string name="error_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="wait_for_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_new_fusiontable_has_been_created">S\'ha creat un Google Fusion Table nou a google.com/fusiontables.</string>
-  <string name="status_tracks_have_been_uploaded">S\'ha enviat la ruta a maps.google.com.</string>
-  <string name="status_tracks_have_been_uploaded_to_new_doc">S\'ha enviat la ruta a un full de càlcul a docs.google.com.</string>
-  <string name="status_tracks_have_been_uploaded_to_docs">S\'ha enviat la ruta a docs.google.com.</string>
-  <string name="status_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_location">Nota: Es mostra una ubicació determinada a partir de les xarxes sense fils i antenes telefòniques.</string>
-  <string name="status_no_location">No es pot determinar la ubicació. Habiliteu més fonts d\'ubicació (vegeu els paràmetres de seguretat i ubicació) i assegureu-vos que el cel és visible. Proveu de nou més tard.</string>
-  <string name="status_waypoint_inserted">S\'ha inserit un marcader de punt de ruta.</string>
-  <string name="status_statistics_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_fusiontables">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_fusiontables">S\'està enviant a Google Fusion Tables...</string>
-  <string name="progress_message_creating_fusiontable">S\'està creant un Fusion Table nou...</string>
-  <string name="import_progress_message">S\'està imporant una ruta GPS. Això pot trigar una estona.</string>
-  <string name="write_progress_message">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="are_you_sure_question">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>
-  <string name="fusiontable_link">Creat per &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; a l\'Android.</string>
-
-  <!-- Formatting of track and marker descriptions -->
-  <string name="points">Punts</string>
-  <string name="recorded_date">Enregistrat</string>
-  <string name="category">Tipus d\'activitat</string>
-  <string name="waypoint_category">Tipus de marcador</string>
-  <string name="part">(Part %d)</string>
-
-  <!-- Used by the track recording service -->
-  <string name="recording_your_track">S\'està enregistrant la ruta...</string>
-  <string name="new_track">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="close">Tanca</string>
-  <string name="edit">Edita</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_description">Descripció de la ruta</string>
-  <string name="trackdetails_category">Tipus d\'activitat (p.e. senderisme, bicicleta, còrrer, escalada...)</string>
-
-  <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">Detalls del marcador</string>
-  <string name="waypointdetails_name">Nom del marcador</string>
-  <string name="waypointdetails_description">Descripció del marcador</string>
-  <string name="waypointdetails_category">Tipus de marcador (e.g. edifici, sot, vista...)</string>
-
-  <!-- MyTracks Settings -->
-  <string name="mytracks_settings">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_not_available_summary">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_map_body_format">Em sembla que estaràs interessat en aquest mapa:
-
-      %s</string>
-  <string name="send_track_subject">M\'agradaria compartir una ruta amb tu</string>
-  <string name="send_track_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">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="hour">hora</string>
-  <string name="hours">hores</string>
-  <string name="minute">minut</string>
-  <string name="minutes">minuts</string>
-  <string name="second">segon</string>
-  <string name="seconds">segons</string>
-
-  <!-- Distance -->
-  <string name="kilometers_long">kilòmetres</string>
-  <string name="miles_long">milles</string>
-
-  <!-- Speed and Pace -->
-  <string name="kilometer_per_hour_long">kilòmetres per hora</string>
-  <string name="per_kilometer">per kilòmetre</string>
-  <string name="mile_per_hour_long">milles per hora</string>
-  <string name="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_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>
-  <string name="check_units_message">Les unitats són mètriques per defecte. Voleu canviar aquest paràmetre?</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="sensor_options">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>
-
-</resources>
@@ -17,7 +17,7 @@ limitations under the License.
 <resources>
  <!-- Task frequency -->
  <string-array name="task_frequency_options">
-    <item>Aus</item>
+    <item>Off</item>
    <item>1 min</item>
    <item>2 min</item>
    <item>5 min</item>
@@ -70,8 +70,8 @@ limitations under the License.

  <!-- Minimum recording interval -->
  <string-array name="min_recording_interval_options">
-    <item>batteriesparend (adaptiv)</item>
-    <item>hohe Genauigkeit (adaptiv)</item>
+    <item>batterie sparend (adaptiv)</item>
+    <item>hohe genauigkeit (adaptiv)</item>
    <item>maximal (empfohlen)</item>
    <item>2 s</item>
    <item>3 s</item>
@@ -133,12 +133,12 @@ limitations under the License.

  <string-array name="split_frequency_options_ft">
    <item>Nicht zerteilen</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>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>
@@ -159,7 +159,7 @@ limitations under the License.
    <item>Laufbahn</item>
    <item>Geländelauf</item>
    <item>Gehen</item>
-    <item>Gehen (Sport)</item>
+    <item>Schnelles Gehen</item>
    <item>Wandern</item>
    <item>Bergwandern</item>
    <item>Bergsteigen</item>
@@ -181,11 +181,11 @@ limitations under the License.
    <item>Eissegeln</item>

    <item>Segeln</item>
-    <item>Paddeln</item>
-    <item>Kajak fahren</item>
+    <item>Kanadierfahren</item>
+    <item>Kajakfahren</item>
    <item>Kanuwandern</item>
    <item>Rudern</item>
-    <item>Motorboot fahren</item>
+    <item>Motorbootfahren</item>
    <item>Fähre</item>
    <item>Ferngesteuertes Boot</item>
    <item>Surfen</item>
@@ -229,14 +229,13 @@ limitations under the License.
    <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>Lagerfeuer</item>
    <item>Campingplatz</item>
    <item>Zeltplatz</item>
    <item>Kirche</item>
@@ -279,7 +278,6 @@ limitations under the License.
    <item>Tunnel</item>
    <item>Baum</item>
    <item>Wasserfall</item>
-    <item>Springbrunnen</item>
    <item>Wegpunkt</item>
  </array>

@@ -15,64 +15,63 @@ 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="choose_track_message">Bitte wählen Sie 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_location_provider">Es wurde kein GPS-Empfänger auf diesem Gerät gefunden.</string>
-  <string name="error_sending_to_fusiontables">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_unable_to_read_file">Konnte Datei nicht lesen.</string>
+  <string name="error_no_location_manager">Es wurde kein \'Location Manager\' auf diesem Gerät gefunden.</string>
+  <string name="error_no_gps_location_provider">Konnte keinen GPS-Empfänger auf diesem Gerät finden.</string>
+  <string name="error_sending_to_mymap">Beim Senden Ihres Tracks an Google My Maps ist ein Fehler aufgetreten. Bitte versuchen Sie es später nochmal.</string>
+  <string name="error_sending_to_docs">Beim Senden Ihres Tracks an Google Docs ist ein Fehler aufgetreten. Bitte versuchen Sie es später nochmal.</string>
+  <string name="error_unable_to_start_recording">Aufzeichnen fehlgeschlagen. Bitte versuchen Sie es nochmal.</string>
+  <string name="error_unable_to_stop_recording">Anhalten unmöglich. Bitte versuchen Sie es nochmal.</string>
+  <string name="error_unable_to_read_file">Datei nicht lesbar.</string>
  <string name="error_invalid_gpx_format">Datei ist nicht im GPX-Format.</string>
-  <string name="error_generic">Ein Fehler ist aufgetreten. Bitte versuche es noch einmal.</string>
+  <string name="error_generic">Ein Fehler ist aufgetreten. Bitte versuchen Sie es nochmal.</string>
  <string name="error_track_does_not_exist">Track existiert nicht.</string>
-  <string name="error_out_of_memory">Die Datei ist zu groß (maximal 500 KB). Operation abgebrochen.</string>
+  <string name="error_out_of_memory">Die Datei ist zu groß (Obergrenze sind 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="wait_for_fix">Warte auf ein besseres GPS-Signal. Bitte stelle sicher, dass der Himmel sichtbar ist.</string>
+  <string name="wait_for_fix">Warten auf ein besseres GPS-Signal. Bitte stellen Sie 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_new_fusiontable_has_been_created">Eine neue Tabelle wurde auf google.com/fusiontables erstellt.</string>
-  <string name="status_tracks_have_been_uploaded">Dein Track wurde auf maps.google.com gespeichert.</string>
-  <string name="status_tracks_have_been_uploaded_to_new_doc">Dein Track wurde in einer neuen Tabelle bei docs.google.com gespeichert.</string>
-  <string name="status_tracks_have_been_uploaded_to_docs">Dein Track wurde an docs.google.com gesendet.</string>
-  <string name="status_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_location">Anmerkung: Eine ungefähre Position wird angezeigt, bestimmt mittels Mobilfunkstationen und WiFi-Netzwerken.</string>
-  <string name="status_no_location">Die Position kann derzeit nicht bestimmt werden. Aktiviere mehr Positionsquellen (siehe Sicherheits- und Positionseinstellungen) und stelle sicher, dass der Himmel sichtbar ist.</string>
+  <string name="status_stopped_recording">Die Aufzeichnung wurde beendet.</string>
+  <string name="status_new_mymap_has_been_created">Eine neue Karte wurde auf maps.google.com erstellt.</string>
+  <string name="status_tracks_have_been_uploaded">Ihr Track wurde auf maps.google.com gespeichert.</string>
+  <string name="status_tracks_have_been_uploaded_to_new_doc">Ihr Track wurde in einer neuen Tabelle bei docs.google.com gespeichert.</string>
+  <string name="status_tracks_have_been_uploaded_to_docs">Ihr Track wurde an docs.google.com gesendet.</string>
+  <string name="status_mymap_info">Manchmal dauert es ein paar Minuten, bis neue Tracks bei maps.google.com erscheinen.</string>
+  <string name="status_enable_gps">Berühren Sie hier um zu den Sicherheits- und Positionseinstellungen zu gelangen. Aktiviere \'GPS-Satelliten\'. Drücken Sie dann den Zurück-Knopf um zurückzukehren.</string>
+  <string name="status_approximate_location">Anmerkung: Eine ungefähre Position wird angezeigt, bestimmt mittels Funktürmen und WiFi-Netzwerken.</string>
+  <string name="status_no_location">Ihre Position kann derzeit nicht bestimmt werden. Aktivieren Sie mehr Positionsquellen (siehe Sicherheits- und Positionseinstellungen) und stellen Sie sicher, dass der Himmel sichtbar ist.</string>
  <string name="status_waypoint_inserted">Ein Wegpunkt wurde eingefügt.</string>
  <string name="status_statistics_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_fusiontables">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_fusiontables">Track wird an Google Fusion Tables gesendet...</string>
-  <string name="progress_message_creating_fusiontable">Neue \'Fusion Tabelle\' wird erstellt...</string>
-  <string name="import_progress_message">Importiere GPS-Track. Das kann ein wenig dauern.</string>
-  <string name="write_progress_message">Schreibe Datei auf SD-Karte. Das kann ein wenig dauern.</string>
-  <string name="progress_message_updating_track">Aktualisiere Trackstatistik...</string>
+  <string name="progress_message">Ihr GPS-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_mymaps">Anmelden bei Google Maps</string>
+  <string name="progress_message_authenticating_docs">Anmelden bei Google Docs</string>
+  <string name="progress_message_sending_docs">Track an Google Docs senden</string>
+  <string name="progress_message_sending_mymaps">Track an Google Maps senden</string>
+  <string name="progress_message_creating_map">Neue \'Meine Karte\' erstellen</string>
+  <string name="import_progress_message">Importiere GPS-Track. Das dauert ein wenig.</string>
+  <string name="write_progress_message">Schreibe Datei auf SD-Karte. Das dauert ein wenig.</string>
+  <string name="progress_message_updating_track">Aktualisiere Trackstatistik</string>

  <!-- Used by DeleteAllDataHandler -->
  <string name="are_you_sure_question">Bist Du Dir wirklich sicher?</string>
@@ -80,65 +79,50 @@ limitations under the License.
  <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>
-  <string name="fusiontable_link">Erstellt von &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; für Android.</string>
+  <!-- Text and links when uploading to Google MyMaps -->
+  <string name="new_map_title">Neue Karte</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="part">(Teil %d)</string>
+  <string name="category">"Aktivität"</string>
+  <string name="waypoint_category">"Art des Wegpunktes"</string>
+  <string name="part">"(Teil %d)"</string>

  <!-- Used by the track recording service -->
-  <string name="recording_your_track">Dein Track wird aufgezeichnet…</string>
-  <!--string name="new_track">Track %d</string-->
+  <string name="recording_your_track">"Ihr Track wird aufgezeichnet…"</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="close">Schließen</string>
-  <string name="edit">Bearbeiten</string>
-  <string name="save">Sichern</string>

  <!-- Placemark labels for start and end of track -->
-  <!--string name="start">(Start)</string-->
+  <string name="start">(Anfang)</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_mymaps">An eine Google MyMaps-Karte senden</string>
+  <string name="tracklist_send_to_new_mymap">An eine neue Google MyMaps-Karte senden</string>
+  <string name="tracklist_send_to_docs">An Google Docs 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_send_all_to_mymaps">An Google MyMaps 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_pick_one">Eine 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_link">Ein Link zur Google MyMaps-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 -->
@@ -166,86 +150,74 @@ limitations under the License.
  <!-- MyTracks Settings -->
  <string name="mytracks_settings">Einstellungen für My Tracks</string>
  <string name="settings_display">Anzeige</string>
-  <string name="settings_recording">Aufzeichnung</string>
-  <string name="settings_sharing">Mit Freunden teilen</string>
+  <string name="settings_recording">Aufzeichnen</string>
+  <string name="settings_sharing">Mit Freunden Teilen</string>

-  <string name="settings_not_available_summary">In dieser Android-Version nicht verfügbar</string>
+  <string name="settings_announcement_frequency">Dauer zwischen Ansagen:</string>
+  <string name="settings_announcement_frequency_summary">Kürzeste Zeit zwichen zwei Ansagen</string>
+  <string name="settings_announcement_not_available_summary">Gesprochene Ansagen sind mit Ihrer Version von Android 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">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_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_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_min_required_accuracy">Aufzeichnung pausieren wenn Genauigkeit kleiner als:</string>
+  <string name="settings_min_required_accuracy_summary">Die Aufzeichnung wird kurzfristig angehalten, wenn Ihre 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_metric_units_summary_off">Alle Entfernungen werden in britischen 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">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_report_speed_or_pace_summary_off">Gangart 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_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_signal_sampling_frequency">Empfangsstärke Aufzeichnungsfrequenz</string>
+  <string name="settings_signal_sampling_frequency_summary">Dauer zwischen zwei Aufzeichnungen der Telefonempfangsstärke.</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_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>
+  <string name="settings_split_frequency">Zerteilungs Frequenz</string>
+  <string name="settings_split_frequency_summary">Längste Dauer oder Entfernung nach der automatisch ein Marker eingefügt wird.</string>
+  <string name="pace_label">Tempo</string>

  <!-- MyTracksSky -->
  <string name="mytracks_sky">GPS-Satelliten</string>

-  <!-- Sharing -->
+  <!-- MyMaps -->
+  <string name="select_map_message">Wähle eine Karte von Deinem Konto aus:</string>
+  <string name="create_new_map">Neue Karte erstellen…</string>
+  <string name="map_list_title">An Google My Maps senden</string>
+  <string name="maps_list_loading">Karten werden geladen…</string>
+  <string name="maps_list_failed">Ihre Karten konnten im Augenblick nicht geladen werden!</string>
+  <string name="open_map">Diese Karte auswählen</string>
+  <string name="edit_map_details">Kartendetails bearbeiten</string>
  <string name="share_map">Karte mit Freunden teilen</string>
+  <string name="share_track">Track mit Freunden teilen</string>
+  <string name="delete_map">Karte vom Konto löschen</string>
+  <string name="map_title">Kartentitel:</string>
+  <string name="map_description">Trackbeschreibung:</string>
+  <string name="map_searchable_edit">Diese Karte und Ihren Inhalt in Suchergebnissen sichtbar machen.</string>
+  <string name="map_not_searchable_edit">Diese Karte und Ihren Inhalt nicht in Suchergebnissen sichtbar machen.</string>
+  <string name="map_searchable">Diese Karte und Ihr Inhalt sind in Suchergebnissen sichtbar.</string>
+  <string name="map_not_searchable">Weder diese Karte noch Ihr Inhalt sind in Suchergebnissen sichtbar, allerdings können Sie trotzdem von anderen durch einen direkten Link angezeigt werden.</string>
+  <string name="close">Schließen</string>
+  <string name="edit">Bearbeiten</string>
+  <string name="cancel">Abbrechen</string>
+  <string name="save">Sichern</string>
+
+  <!-- Sharing -->
  <string name="share_map_subject">Ich möchte gerne eine Karte mit Dir teilen.</string>
  <string name="share_map_body_format">Vielleicht interessierst Du Dich für diese Karte:

@@ -253,10 +225,7 @@ limitations under the License.
  <string name="send_track_subject">Ich möchte einen GPS-Track mit Dir teilen</string>
  <string name="send_track_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">Track mit Freunden teilen</string>
-
-  <!-- Visibility -->
+      %s.</string>
  <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>
@@ -264,11 +233,11 @@ limitations under the License.
  <!-- Statistics View -->
  <!-- Average Moving -->
  <string name="average_moving_speed_label">Durchschnitt in Bew.</string>
-  <string name="average_moving_pace_label">Pace in Bew.</string>
+  <string name="average_moving_pace_label">Durchschnitt in Bew.</string>

  <!-- Average -->
  <string name="average_speed_label">Durchschnittsgeschw.</string>
-  <string name="average_pace_label">Durchschnitts-Pace</string>
+  <string name="average_pace_label">Durchschnittstempo</string>

  <string name="elevation_chart_name">Höhenprofil</string>
  <string name="elevation_gain_label">Höhengewinn</string>
@@ -279,7 +248,7 @@ limitations under the License.
  <!-- 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>
+  <string name="min_pace_label">Schnellstes Tempo</string>

  <!-- Max -->
  <string name="max_elevation_label">Höchste Höhenlage</string>
@@ -289,50 +258,35 @@ limitations under the License.
  <string name="loading_track">Lade Track…</string>

  <!-- Chart Settings -->
-  <string name="chart_settings">Diagramm-Einstellungen</string>
+  <string name="chart_settings">Diagram Einstellungen</string>
  <!-- X Axis -->
-  <string name="x_axis">X-Achse</string>
+  <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>
+  <string name="y_axis">Y Achse</string>

  <!-- Units -->
  <!-- Time  -->
  <string name="hour">Stunde</string>
  <string name="hours">Stunden</string>
  <string name="hr">Std</string>
-  <string name="min">Min</string>
  <string name="minute">Minute</string>
  <string name="minutes">Minuten</string>
  <string name="second">Sekunde</string>
  <string name="seconds">Sekunden</string>
-  <!--string name="milliseconds">ms</string-->

  <!-- Distance -->
-  <!--string name="meter">m</string-->
-  <!--string name="kilometer">km</string-->
-  <string name="kilometers_long">Kilometer</string>
  <string name="feet">Fuß</string>
-  <!--string name="mile">mi</string-->
+  <string name="kilometers_long">Kilometer</string>
  <string name="miles_long">Meilen</string>

  <!-- Speed and Pace -->
-  <!--string name="kilometer_per_hour">km/h</string-->
  <string name="kilometer_per_hour_long">Kilometer pro Stunde</string>
-  <!--string name="min_per_kilometer">min/km</string-->
  <string name="per_kilometer">pro Kilometer</string>
-  <!--string name="mile_per_hour">mi/h</string-->
  <string name="mile_per_hour_long">Meilen pro Stunde</string>
-  <!--string name="min_per_mile">min/mi</string-->
-  <string name="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="per_mile">pro meile</string>

  <!-- Stats Labels -->
  <string name="moving_time_label">Zeit in Bewegung</string>
@@ -340,15 +294,10 @@ limitations under the License.
  <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="start_trip">Sie müssen erst eine Strecke zurücklegen.</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 -->
@@ -359,43 +308,37 @@ limitations under the License.
  <!-- 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>
+  <string name="about_email">Unterstützung</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_create_new_map">Neue Karte erstellen</string>
+  <string name="sendtogoogle_pick_existing_map">Eine Karte auswählen</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>
+  <string name="no_account_found">Kein Konto gefunden um Tracks zu versenden.</string>
+  <string name="choose_account_title">Wählen Sei 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_no_external_storage_found">Keine externes Speichermedium verfügbar. Stellen Sie 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>
+  <string name="version_check_continue_button">Fortfahren ohne zu aktualisieren</string>
+  <string name="upgrade_required">Ihre Version von %1$s funktioniert möglicherweise nicht mehr richtig und wird nicht mehr unterstützt. Bitte aktualisieren Sie %1$s.</string>
+  <string name="upgrade_recommended">Ihre Version von %1$s funktioniert möglicherweise nicht mehr richtig. Sie können sie jetzt aktualisieren, oder auf sie auf eigene Gefahr weiterverwenden. Einige Funktionen wie Datenaustausch mit Google-Diensten wird möglicherweise nicht mehr funktionieren, solange Sie die Software nicht aktualisieren.</string>
+  <string name="upgrade_available">Eine neue Version von %1$s ist jetzt verfügbar. Sie können Ihre aktuelle Version ohne Probleme weiterverwenden, aber um die neuesten Funktionen in Anspruch nehmen zu können, müssen sie die Software aktualisieren.</string>

  <!-- Welcome -->
  <string name="welcome">Willkommen</string>
-  <string name="welcome_read_later">OK</string>
  <string name="welcome_about">Über My Tracks</string>

  <!-- Announcement -->
@@ -409,42 +352,4 @@ limitations under the License.
  $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>
-  <string name="check_units_message">Voreingestellt sind metrische Einheiten. Willst Du diese Einstellung ändern?</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="sensor_options">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>
 </resources>
@@ -1,153 +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>
-
-  <array name="sensor_type_options">
-    <item>Ninguna</item>
-    <item>ANT+ Sensores</item>
-    <item>SRM ANT+ Puente</item>
-    <item>Zephyr Bluetooth</item>
-  </array>
-
-</resources>
@@ -1,131 +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>
-  <!-- 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="close">Cerrar</string>
-  <string name="edit">Editar</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_not_available_summary">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_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)
-  -->
-
-</resources>
@@ -32,7 +32,7 @@ limitations under the License.
  <!-- Error messages -->
  <string name="error_no_location_manager">Ningún administrador de ubicación fue hallado en este aparato! </string>
  <string name="error_no_gps_location_provider">Ningún proveedor GPS de ubicación fue hallado en este aparato.</string>
-  <string name="error_sending_to_fusiontables">Hubo un error al mandar su recorrido a Google Fusion Tables. Por favor inténtelo de nuevo más tarde.</string>
+  <string name="error_sending_to_mymap">Hubo un error al mandar su recorrido a Google My Map. Por favor inténtelo de nuevo más tarde.</string>
  <string name="error_sending_to_docs">Hubo un error al mandar su recorrido a Google Docs. Por favor inténtelo de nuevo más tarde.</string>
  <string name="error_unable_to_start_recording">No pude empezar a grabar. Por favor inténtelo de nuevo. </string>
  <string name="error_unable_to_stop_recording">No pude dejar de grabar. Por favor inténtelo de nuevo.</string>
@@ -47,10 +47,11 @@ limitations under the License.
  <string name="wait_for_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">Grabacíon interrumpida.</string>
-  <string name="status_new_fusiontable_has_been_created">Un mapa Google Fusion Tables nuevo has sido creado en google.com/fusiontables.</string>
+  <string name="status_new_mymap_has_been_created">Un mapa Google My Map nuevo has sido creado en maps.google.com.</string>
  <string name="status_tracks_have_been_uploaded">Su recorrido ha sido enviado a maps.google.com.</string>
  <string name="status_tracks_have_been_uploaded_to_new_doc">Su recorrido ha sido enviado a una nueva hoja de cálculo en docs.google.com.</string>
  <string name="status_tracks_have_been_uploaded_to_docs">Su recorrido ha sido enviado a docs.google.com.</string>
+  <string name="status_mymap_info">A veces nuevos recorridos pueden tardar algunos minutos en aparecer.</string>
  <string name="status_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 de regreso para regresar.</string>
  <string name="status_approximate_location">Nota: Una ubicación aproximada es mostrada, basada en informacion de torres de telefonía celular y red WIFI.</string>
  <string name="status_no_location">La ubicación actual no puede ser determinada. Habilite más fuentes de datos (vea configuraciones de Seguridad y Ubicación) y asegúrese que el cielo sea visible. Inténtelo mas tarde.</string>
@@ -62,11 +63,11 @@ limitations under the License.
  <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_fusiontables">Autenticando con Google Fusion Tables...</string>
+  <string name="progress_message_authenticating_mymaps">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_fusiontables">Enviando recorrido a Google Fusion Tables...</string>
-  <string name="progress_message_creating_fusiontable">Creando nuevo mapa Fusion Tables...</string>
+  <string name="progress_message_sending_mymaps">Enviando recorrido a Google Maps...</string>
+  <string name="progress_message_creating_map">Creando nuevo mapa My Map...</string>
  <string name="import_progress_message">Importando un recorrido GPS. Esto puede tardar.</string>
  <string name="write_progress_message">Escribiendo archivo a tarjeta SD. Esto puede tardar.</string>
  <string name="progress_message_updating_track">Actualizando estadísticas del recorrido...</string>
@@ -77,8 +78,10 @@ limitations under the License.
  <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="fusiontable_link">Creado por &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; en Android.</string>
+  <!-- Text and links when uploading to Google My Maps -->
+  <string name="new_map_description">"Creado por My Tracks en Android."</string>
+  <string name="my_map_link">"Creado por &lt;a href='http://mytracks.appspot.com'&gt;My Tracks&lt;/a&gt; en Android."</string>
+  <string name="new_map_title">Nuevo mapa</string>

  <!-- Formatting of track and marker descriptions -->
  <string name="points">Puntos</string>
@@ -95,7 +98,6 @@ limitations under the License.
  <string name="yes">Sí</string>
  <string name="success">Éxito</string>
  <string name="waypoint">Señal de recorrido</string>
-  <string name="cancel">Cancelar</string>

  <!-- Placemark labels for start and end of track -->
  <string name="start">(Inicio)</string>
@@ -103,8 +105,8 @@ limitations under the License.

  <!--  TrackList -->
  <string name="tracklist_show_track">Mostrar</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_mymaps">Enviar a Google My Maps</string>
+  <string name="tracklist_send_to_new_mymap">Enviar a nuevo Google My Map</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>
@@ -112,7 +114,7 @@ limitations under the License.
  <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_btn_send_all_to_fusiontables">Enviar a Google Fusion Tables</string>
+  <string name="tracklist_btn_send_all_to_mymaps">Enviar a Google My Maps</string>
  <string name="tracklist_btn_delete_all">Borrar todos los recorridos</string>
  <!-- Export All -->
  <string name="tracklist_btn_export_all">Exportar todos los recorridos</string>
@@ -121,6 +123,7 @@ limitations under the License.
  <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 link a Google My Map"</string>
  <string name="tracklist_share_gpx_file">Un archivo GPX"</string>
  <string name="tracklist_share_kml_file">Un archivo KML"</string>
  <string name="tracklist_clear_map">"Limpiar mapa"</string>
@@ -155,6 +158,7 @@ limitations under the License.

  <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_announcement_not_available_summary">Conversión de anuncios de texto a voz no esta disponible en su versión de Android</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>
@@ -184,46 +188,39 @@ limitations under the License.
  <string name="settings_share_url_only_summary_on">Sólo el URL del mapa será enviado al compartir</string>
  <string name="settings_share_url_only_summary_off">Los contenidos de la pista también serán incluídos al compartir</string>

+  <string name="settings_signal_sampling_frequency">Frecuencia de medición de señal</string>
+  <string name="settings_signal_sampling_frequency_summary">Tiempo entre grabaciones de la intensidad de la señal del teléfono</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="pace_label">Paso</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="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>
-
-  <!-- Backups -->
-  <string name="settings_sd_backup">Backup en tarjeta SD</string>
-  <string name="settings_backup_to_sd">Hacer backup</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 un backup desde la tarjeta SD SOBREESCRIBIRÁ todos sus recorridos y configuraciones actuales. ¿Está usted seguro?</string>
-  <string name="select_backup_to_restore">Seleccionar el backup para restaurar</string>
-  <string name="no_backups">No se han encontrado backups.</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">Elija un mapa de su cuenta:</string>
+  <string name="create_new_map">Crear mapa nuevo...</string>
+  <string name="map_list_title">Enviar a Google My Maps</string>
+  <string name="maps_list_loading">Cargando mapas...</string>
+  <string name="maps_list_failed">Sus mapas no pudieron ser cargados en este momento!</string>
+  <string name="open_map">Seleccione este mapa</string>
+  <string name="edit_map_details">Editar detalles del mapa</string>
+  <string name="share_map">Compartir mapa con amigos</string>
  <string name="share_track">Compartir recorrido con amigos</string>
+  <string name="delete_map">Borrar mapa de su cuenta</string>
+  <string name="map_title">Título del mapa:</string>
+  <string name="map_description">Descripción del mapa:</string>
+  <string name="map_searchable_edit">Permitir que este mapa y su contenido sean mostrados en resultados de búsqueda</string>
+  <string name="map_not_searchable_edit">No permitir que este mapa y su contenido sean mostrados en resultados de búsqueda, pero permitir acceso directo mediante su URL</string>
+  <string name="map_searchable">Este mapa y su contenido serán mostrados en resultados de búsqueda</string>
+  <string name="map_not_searchable">No mostrar ni este mapa ni sus contenidos en resultados de búsqueda, pero permitir acceso directo mediante su URL</string>
+  <string name="close">Cerrar</string>
+  <string name="edit">Editar</string>
+  <string name="cancel">Cancelar</string>
+  <string name="save">Guardar</string>

  <!-- Sharing -->
-  <string name="share_map">Compartir mapa con amigos</string>
  <string name="share_map_subject">Me gustaría compartir un mapa contigo</string>
  <string name="share_map_body_format">Creo que este mapa pudiera interesarte:

@@ -232,7 +229,6 @@ limitations under the License.
  <string name="send_track_body_format">Creo que este recorrido pudiera interesarte.

    Para ver este recorrido usa Google Earth o algún otro software de mapeo.</string>
-  <string name="share_track">Compartir recorrido con amigos</string>

  <!-- Visibility -->
  <string name="public_map">Público</string>
@@ -306,10 +302,6 @@ limitations under the License.
  <string name="total_distance_label">Distancia total</string>
  <string name="distance_label">Distancia</string>
  <string name="waiting">Esperando...</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>

  <!-- End User License Agreement -->
  <string name="eula_title">Contrato de Licencia de Usuario Final</string>
@@ -319,12 +311,16 @@ limitations under the License.
  <!-- About -->
  <string name="about">Sobre</string>
  <string name="help">Ayuda</string>
+  <string name="about_email">Soporte técnico</string>
+
  <string name="about_team">Equipo:</string>
  <string name="about_support">Soporte técnico:</string>

  <!-- Send to Google -->
  <string name="sendtogoogle_title">Enviar a...</string>
  <string name="sendtogoogle_send_now">Enviar ahora</string>
+  <string name="sendtogoogle_create_new_map">Crear un nuevo mapa</string>
+  <string name="sendtogoogle_pick_existing_map">Escoja 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>

@@ -357,41 +353,5 @@ limitations under the License.
  $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>
-  <string name="check_units_message">Por defecto las unidades son métricas. ¿Quiere cambiar la configuración?</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="sensor_options">Opciones del sensor</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="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>
 </resources>
+
@@ -201,7 +201,7 @@ limitations under the License.
    <item>kayak</item>
    <item>bateau à moteur</item>
    <item>ferry</item>
-    <item>bateau télécommandé</item>
+    <item>boat télécommandé</item>
    <item>surf</item>
    <item>planche à voile</item>
    <item>kite surf</item>
@@ -304,11 +304,4 @@ limitations under the License.
    <item>point de passage</item>
  </array>

-  <array name="sensor_type_options">
-    <item>Aucun</item>
-    <item>Capteur ANT+</item>
-    <item>Pont SRM ANT+</item>
-    <item>Bluetooth Zephyr</item>
-  </array>
- 
 </resources>
@@ -30,13 +30,11 @@ limitations under the License.
  <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_location_provider">Aucune source GPS de localisation n\'a été trouvée sur ce système.</string>
-  <string name="error_sending_to_fusiontables">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_mymap">Il y a eu une erreur lors de l\'envoi de votre parcours à Google Mes cartes. 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>
@@ -51,10 +49,11 @@ limitations under the License.
  <string name="wait_for_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_new_fusiontable_has_been_created">Une nouvelle table Google Fusion vient d\'être créée sur google.com/fusiontables.</string>
+  <string name="status_new_mymap_has_been_created">Une nouvelle carte Google \'Mes cartes\' vient d\'être créée sur maps.google.com.</string>
  <string name="status_tracks_have_been_uploaded">Votre parcours a été envoyé à maps.google.com.</string>
  <string name="status_tracks_have_been_uploaded_to_new_doc">Votre parcours a été envoyé dans un tableur à docs.google.com.</string>
  <string name="status_tracks_have_been_uploaded_to_docs">Votre parcours a été envoyé à docs.google.com.</string>
+  <string name="status_mymap_info">Votre parcours peut prendre quelques minutes avant d\'être visible.</string>
  <string name="status_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_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_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>
@@ -66,11 +65,11 @@ limitations under the License.
  <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_fusiontables">Authentification à Google Fusion Tables...</string>
+  <string name="progress_message_authenticating_mymaps">Authentification à Google Mes cartes...</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_fusiontables">Envoi du parcours vers Google Fusion Tables...</string>
-  <string name="progress_message_creating_fusiontable">Création d\'une nouvelle \'Fusion Table\'...</string>
+  <string name="progress_message_sending_mymaps">Envoi du parcours vers Google Mes cartes...</string>
+  <string name="progress_message_creating_map">Création d\'une nouvelle carte...</string>
  <string name="import_progress_message">Importation du parcours GPS. Patientez SVP.</string>
  <string name="write_progress_message">Enregistrement du fichier sur la carte SD. Patientez SVP.</string>
  <string name="progress_message_updating_track">Mise à jour des statistiques du parcours...</string>
@@ -83,7 +82,8 @@ limitations under the License.

  <!-- Text and links when uploading to Google My Maps -->
  <string name="new_map_description">Créée par My Tracks sous Android.</string>
-  <string name="fusiontable_link">Créée par &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; sous Android.</string>
+  <string name="my_map_link">Créée par &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; sous Android.</string>
+  <string name="new_map_title">Nouvelle carte</string>

  <!-- Formatting of track and marker descriptions -->
  <string name="recorded_date">Enregistré</string>
@@ -100,10 +100,6 @@ limitations under the License.
  <string name="yes">Oui</string>
  <string name="error">Erreur</string>
  <string name="waypoint">Point de passage</string>
-  <string name="cancel">Annuler</string>
-  <string name="close">Fermer</string>
-  <string name="edit">Modifier</string>
-  <string name="save">Enregistrer</string>

  <!-- Placemark labels for start and end of track -->
  <string name="start">(Début)</string>
@@ -111,8 +107,8 @@ limitations under the License.

  <!--  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_mymaps">Envoyer à Google Mes cartes</string>
+  <string name="tracklist_send_to_new_mymap">Envoyer et créer un nouvelle carte Google Mes cartes</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>
@@ -120,13 +116,14 @@ limitations under the License.
  <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_send_all_to_mymaps">Envoyer à Google Mes cartes</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_link">Lien sur Google Mes cartes</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>
@@ -161,6 +158,7 @@ limitations under the License.

  <string name="settings_announcement_frequency">Fréquence des annonces</string>
  <string name="settings_announcement_frequency_summary">Temps minimum entre eux annonces vocales</string>
+  <string name="settings_announcement_not_available_summary">La synthèse vocale n\'est pas disponible pour cette version d\'Android</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>
@@ -190,41 +188,39 @@ limitations under the License.
  <string name="settings_share_url_only_summary_on">Seule l\'adresse URL de la carte sera envoyée lors du partage</string>
  <string name="settings_share_url_only_summary_off">Le contenu du parcours sera également inclus lors du partage</string>

+  <string name="settings_signal_sampling_frequency">Échantillonnage du signal</string>
+  <string name="settings_signal_sampling_frequency_summary">Intervalle de temps entre deux enregistrements de la force du signal</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="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 -->
+  <!-- MyMaps -->
+  <string name="select_map_message">Choisissez une carte de votre compte :</string>
+  <string name="create_new_map">Création d\'une nouvelle carte en cours...</string>
+  <string name="map_list_title">Envoyer à Google Mes cartes</string>
+  <string name="maps_list_loading">Chargements de vos cartes...</string>
+  <string name="maps_list_failed">Vos cartes n\'ont pu être chargées</string>
+  <string name="open_map">Sélectionnez la carte</string>
+  <string name="edit_map_details">Consulter les détails de la carte</string>
  <string name="share_map">Partager.</string>
+  <string name="share_track">Partager des parcours.</string>
+  <string name="delete_map">Supprimer la carte de votre compte.</string>
+  <string name="map_title">Titre de la carte :</string>
+  <string name="map_description">Description de la carte :</string>
+  <string name="map_searchable_edit">Rendre cette carte et son contenu visibles dans les résultats de recherche.</string>
+  <string name="map_not_searchable_edit">Ne pas inclure cette carte et sont contenu dans les résultats de recherche.  Ils seront cependant consultables par d\'autres utilisateurs en utilisant l\'adresse URL exacte</string>
+  <string name="map_searchable">Cette carte et son contenu seront visibles dans les résultats de recherche</string>
+  <string name="map_not_searchable">Ni cette carte, ni son contenu seront visible dans les résultats de recherche, mais ils seront consultables en utilisant l\'adresse URL exacte</string>
+  <string name="close">Fermer</string>
+  <string name="edit">Modifier</string>
+  <string name="cancel">Annuler</string>
+  <string name="save">Enregistrer</string>
+
+  <!-- Sharing -->
  <string name="share_map_subject">Je voudrais partager ma carte avec vous</string>
  <string name="share_map_body_format">Je pense que cette carte vous intéressera :

@@ -233,7 +229,6 @@ limitations under the License.
  <string name="send_track_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">Partager des parcours.</string>

  <!-- Visibility -->
  <string name="unlisted_map">Carte non listée</string>
@@ -294,9 +289,6 @@ limitations under the License.
  <string name="mile_per_hour_long">miles/heure</string>
  <string name="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>
@@ -304,12 +296,6 @@ limitations under the License.
  <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>
@@ -328,6 +314,8 @@ limitations under the License.
  <!-- Send to Google -->
  <string name="sendtogoogle_title">Envoyer à</string>
  <string name="sendtogoogle_send_now">Envoyer maintenant</string>
+  <string name="sendtogoogle_create_new_map">Créer une nouvelle carte</string>
+  <string name="sendtogoogle_pick_existing_map">Choisir une carte</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>

@@ -366,42 +354,4 @@ limitations under the License.
  $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>
-  <string name="check_units_message">Le système métrique est utilisé par défaut. Souhaitez-vous changer ce paramètre ?</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="sensor_options">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>
-
-  <!-- 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>
 </resources>
@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
+  <string name="app_name">My Tracks</string>
+
  <!-- Used by the Menu -->
  <string name="start_recording">Registra percorso</string>
  <string name="stop_recording">Fine registrazione</string>
@@ -33,7 +35,7 @@ limitations under the License.
  <!-- Error messages -->
  <string name="error_no_location_manager">Nessuna fonte di posizione trovata su questo dispositivo.</string>
  <string name="error_no_gps_location_provider">Nessuna fonte di posizione GPS trovata su questo dispositivo.</string>
-  <string name="error_sending_to_fusiontables">Si è verificato un errore nell\'invio del percorso a Google Fusion Tables. Per favore riprova più tardi.</string>
+  <string name="error_sending_to_mymap">Si è verificato un errore nell\'invio del percorso a «Le mie mappe». 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>
@@ -48,10 +50,11 @@ limitations under the License.
  <string name="wait_for_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_new_fusiontable_has_been_created">Una nuova mappa è stata creata in «Le mie mappe» su maps.google.com.</string> -->
+  <string name="status_new_mymap_has_been_created">Una nuova mappa è stata creata in «Le mie mappe» su maps.google.com.</string>
  <string name="status_tracks_have_been_uploaded">Il tuo percorso è stato inviato a maps.google.com.</string>
  <string name="status_tracks_have_been_uploaded_to_new_doc">Il tuo percorso è stato inviato ad un nuovo foglio di calcolo su docs.google.com.</string>
  <string name="status_tracks_have_been_uploaded_to_docs">Il tuo percorso è stato inviato a docs.google.com.</string>
+  <string name="status_mymap_info">Potrebbe essere necessario aspettare qualche minuto prima che i nuovi percorsi siano visibili.</string>
  <string name="status_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_location">Nota: la posizione indicata è un\'approssimazione determinata in base alle antenne cellulari e reti WIFI vicine.</string>
  <string name="status_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>
@@ -63,11 +66,11 @@ limitations under the License.
  <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_fusiontables">Autenticazione a Google Maps in corso...</string> -->
+  <string name="progress_message_authenticating_mymaps">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_fusiontables">Invio del percorso a Google Maps in corso...</string> -->
-  <!-- <string name="progress_message_creating_fusiontable">Creazione di una nuova mappa in «Le mie mappe» in corso...</string> -->
+  <string name="progress_message_sending_mymaps">Invio del percorso a Google Maps in corso...</string>
+  <string name="progress_message_creating_map">Creazione di una nuova mappa in «Le mie mappe» in corso...</string>
  <string name="import_progress_message">Importazione del percorso GPS in corso. Attendere prego...</string>
  <string name="write_progress_message">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>
@@ -80,7 +83,8 @@ limitations under the License.

  <!-- Text and links when uploading to Google My Maps -->
  <string name="new_map_description">Creato da My Tracks su Android.</string>
-  <string name="fusiontable_link">Creato da &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; su Android.</string>
+  <string name="my_map_link">Creato da &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; su Android.</string>
+  <string name="new_map_title">Nuova mappa</string>

  <!-- Formatting of track and marker descriptions -->
  <string name="points">Punti</string>
@@ -100,10 +104,6 @@ limitations under the License.
  <string name="error">Errore</string>
  <string name="success">Successo</string>
  <string name="waypoint">Punto di passaggio</string>
-  <string name="cancel">Annulla</string>
-  <string name="close">Chiudi</string>
-  <string name="edit">Modifica</string>
-  <string name="save">Salva</string>

  <!-- Placemark labels for start and end of track -->
  <string name="start">(Inizio)</string>
@@ -111,8 +111,8 @@ limitations under the License.

  <!--  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_mymaps">Invia a «Le mie mappe» di Google</string>
+  <string name="tracklist_send_to_new_mymap">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>
@@ -120,7 +120,7 @@ limitations under the License.
  <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_send_all_to_mymaps">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>
@@ -129,7 +129,7 @@ limitations under the License.
  <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_link">Un link alla mappa in «Le mie mappe» di Google</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>
@@ -164,6 +164,7 @@ limitations under the License.

  <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_announcement_not_available_summary">Gli annunci audio non sono disponibili in questa varsione di Android</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>
@@ -193,6 +194,9 @@ limitations under the License.
  <string name="settings_share_url_only_summary_on">Solo l\'URL della mappa sarà inviata quando condividi un percorso</string>
  <string name="settings_share_url_only_summary_off">Anche il contenuto del percorso sarà inviato quando condividi un persorso</string>

+  <string name="settings_signal_sampling_frequency">Frequenza di campionamento</string>
+  <string name="settings_signal_sampling_frequency_summary">Tempo fra due registrazioni della qualità del segnale cellulare</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>
@@ -200,6 +204,28 @@ limitations under the License.
  <!-- MyTracksSky -->
  <string name="mytracks_sky">Satelliti GPS</string>

+  <!-- My Maps -->
+  <string name="select_map_message">Scegli una mappa dal tuo account:</string>
+  <string name="create_new_map">Crea una nuova mappa...</string>
+  <string name="map_list_title">Invia a «Le mie mappe» di Google</string>
+  <string name="maps_list_loading">Caricamento mappe in corso...</string>
+  <string name="maps_list_failed">Le tue mappe non possono momentaneamente essere caricate!</string>
+  <string name="open_map">Scegli questa mappa</string>
+  <string name="edit_map_details">Modifica dettagli della mappa</string>
+  <string name="share_map">Condividi la mappa con amici</string>
+  <string name="share_track">Condividi il percorso con amici</string>
+  <string name="delete_map">Elimina la mappa dal tuo account</string>
+  <string name="map_title">Titolo della mappa:</string>
+  <string name="map_description">Descrizione della mappa:</string>
+  <string name="map_searchable_edit">Rendi questa mappa e il suo contenuto visibili fra i risultati di ricerche</string>
+  <string name="map_not_searchable_edit">Rendi questa mappa e il suo contenuto invisibili fra i risultati di ricerche. Resteranno comunque visibili ad altri utilizzando l\'indirizzo URL esatto</string>
+  <string name="map_searchable">Questa mappa e il suo contenuto saranno visibili fra i risultati di ricerche</string>
+  <string name="map_not_searchable">Né questa mappa né il suo contenuto saranno visibili in risultati di ricerche, ma saranno comunque visibili ad altri tramite un link diretto.</string>
+  <string name="close">Chiudi</string>
+  <string name="edit">Modifica</string>
+  <string name="cancel">Annulla</string>
+  <string name="save">Salva</string>
+
  <!-- Sharing -->
  <string name="share_map_subject">Vorrei condividere una mappa con te</string>
  <string name="share_map_body_format">Credo che questa mappa potrebbe interessarti:
@@ -209,7 +235,6 @@ limitations under the License.
  <string name="send_track_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">Condividi il percorso con amici</string>

  <!-- Visibility -->
  <string name="public_map">Pubblica</string>
@@ -303,15 +328,19 @@ limitations under the License.
  <!-- About -->
  <string name="about">Informazioni</string>
  <string name="help">Aiuto</string>
+  <string name="about_email">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_mymaps">«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_create_new_map">Crea una nuova mappa</string>
+  <string name="sendtogoogle_pick_existing_map">Scegli una mappa esistente</string>
  <string name="sendtogoogle_send_stats">Invia statistiche del percorso</string>
  <string name="sendtogoogle_send_stats_and_points">Invia statistiche e segnaposti</string>

@@ -151,14 +151,6 @@ limitations under the License.
    <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">
@@ -257,12 +249,12 @@ limitations under the License.
    <item>ゴルフ場</item>
    <item>雑貨店</item>
    <item>美容室</item>
-    <item>船着き場</item>
+    <item>散髪屋</item>
    <item>ハイキング道</item>
    <item>ホテル</item>
    <item>家</item>
-    <item>案内所</item>
-    <item>交差点</item>
+    <item>情報</item>
+    <item>交差</item>
    <item>メールボックス</item>
    <item>市場</item>
    <item>集合場所</item>
@@ -287,11 +279,4 @@ limitations under the License.
    <item>噴水</item>
    <item>ウェイポイント</item>
  </array>
-
-  <array name="sensor_type_options">
-    <item>なし</item>
-    <item>ANT+ センサー</item>
-    <item>SRM ANT+ ブリッジ</item>
-    <item>Zephyr Bluetooth</item>
-  </array>
 </resources>
@@ -22,21 +22,18 @@ limitations under the License.
  <string name="switch_to_map">地図モード</string>
  <string name="mylocation">現在地</string>
  <string name="list_tracks">トラック</string>
-  <string name="list_markers">マーカー</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_location_provider">この端末でGPSロケーションプロバイダを発見できました．</string>
+  <string name="error_no_location_manager">この端末でロケーションマネージャを発見できませんでした</string>
+  <string name="error_no_gps_location_provider">この端末でGPSロケーションプロバイダを発見できました</string>
  <string name="error_sending_to_mymap">Googleマイマップへのトラック送信でエラーが発生しました．しばらく待って試して下さい．</string>
-  <string name="error_sending_to_fusiontables">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>
@@ -45,61 +42,54 @@ limitations under the License.
  <string name="error_generic">エラーが発生しました．もう一度試して下さい．</string>
  <string name="error_track_does_not_exist">トラックが存在しません．</string>
  <string name="error_out_of_memory">大きなファイルです(500KB未満でなければなりません)．終了します．</string>
-  <string name="error_unable_to_insert_marker">マーカーの挿入ができません．位置決定ができません．</string>
+  <string name="error_unable_to_insert_marker">マーカの挿入ができません．位置決定ができません．</string>

  <!-- Status messages -->
  <string name="wait_for_fix">GPS位置精度がよくなるまで待機しています．空が見えるところにいて下さい．</string>
  <string name="status_now_recording">新しいトラックを記録中です．</string>
  <string name="status_stopped_recording">トラック記録を停止しました．</string>
-  <string name="status_new_mymap_has_been_created">新しいマイマップをmap.google.comに作成しました．</string>
-  <string name="status_new_fusiontable_has_been_created">新しいGoogle Fusion Tableをgoogle.com/fusiontablesに作成しました．</string>
-  <string name="status_tracks_have_been_uploaded">トラックをmaps.google.comに送信しました．</string>
-  <string name="status_tracks_have_been_uploaded_to_new_doc">トラックをdocs.google.comの新しいスプレッドシートに送信しました．</string>
-  <string name="status_tracks_have_been_uploaded_to_docs">トラックをdocs.google.comに送信しました．</string>
-  <string name="status_mymap_info">新しいトラックが表示されるまでに数分かかることがあります．</string>
-  <string name="status_enable_gps">ここをタップして「位置情報とセキュリティの設定」を開いて「GPS機能を使用」にチェックを入れて下さい．バックボタンで戻ってください．</string>
+  <string name="status_new_mymap_has_been_created">新しいGoogleマイマップを maps.google.com に作成しました．</string>
+  <string name="status_tracks_have_been_uploaded">トラックを maps.google.com に送信しました．</string>
+  <string name="status_tracks_have_been_uploaded_to_new_doc">トラックを docs.google.com の新しいスプレッドシートに送信しました．</string>
+  <string name="status_tracks_have_been_uploaded_to_docs">トラックを docs.google.com に送信しました．</string>
+  <string name="status_mymap_info">新しいトラックが見えるようになるまで数分程度かかります．</string>
+  <string name="status_enable_gps">ここをタップして，セキュリティ &amp;位置情報 を開いて，「GPS機能をONにする」にチェックして下さい．バックボタンで戻ってください．</string>
  <string name="status_approximate_location">ご注意: 携帯電話中継局とWi-Fiネットワークから大まかな位置を特定します．</string>
-  <string name="status_no_location">現在位置決定ができません．位置取得源を増やし(位置情報とセキュリティの設定 をご覧ください)、空が見えるようにして下さい．もう一度試して下さい．</string>
-  <string name="status_waypoint_inserted">ウェイポイントマーカーを挿入しました．</string>
-  <string name="status_statistics_inserted">統計マーカーを挿入しました．</string>
+  <string name="status_no_location">現在位置決定ができません．位置取得源を増やし(セキュリティ&amp;位置情報をご覧ください)，空が見えるようにして下さい．もう一度試して下さい．</string>
+  <string name="status_waypoint_inserted">ウェイポイントマーカを挿入しました．</string>
+  <string name="status_statistics_inserted">統計マーカを挿入しました．</string>

  <!-- Progress dialog -->
  <string name="progress_title">お待ちください...</string>
-  <string name="progress_message">トラックをGoogleに送信しています．</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_fusiontables">Google Fusion Tablesへの認証を行っています...</string>
-  <string name="progress_message_authenticating_mymaps">Googleマップへの認証を行っています...</string>
+  <string name="progress_message_authenticating_mymaps">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_mymaps">トラックをGoogleマップに送信しています...</string>
-  <string name="progress_message_creating_map">新しいマイマップを作成しています...</string>
-  <string name="progress_message_sending_fusiontables">トラックをFusion Tablesに送信しています...</string>
-  <string name="progress_message_creating_fusiontable">新しいFusionテーブルを生成しています...</string>
+  <string name="progress_message_creating_map">新しいマイマップを生成しています...</string>
  <string name="import_progress_message">GPSトラックをインポートしています．若干時間がかかります．</string>
  <string name="write_progress_message">SDカードにデータを書き込んでいます．若干時間がかかります．</string>
  <string name="progress_message_updating_track">トラック統計情報を更新しています...</string>

  <!-- Used by DeleteAllDataHandler -->
  <string name="are_you_sure_question">よろしいですか?</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="fusiontable_link">Android用&lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt;で作成しました．</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 My Maps -->
+  <string name="new_map_description">Android用My Tracksで作成</string>
  <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="recorded_date">記録</string>
  <string name="category">活動タイプ</string>
-  <string name="waypoint_category">マーカータイプ</string>
-  <string name="part">(パート %d)</string>
+  <string name="waypoint_category">マーカタイプ</string>
+  <string name="part">(Part %d)</string>

  <!-- Used by the track recording service -->
  <string name="recording_your_track">トラックを保存中...</string>
@@ -108,14 +98,10 @@ limitations under the License.
  <!-- Common -->
  <string name="no">いいえ</string>
  <string name="yes">はい</string>
+  <string name="ok">OK</string>
  <string name="error">エラー</string>
  <string name="success">成功</string>
  <string name="waypoint">ウェイポイント</string>
-  <string name="license">ライセンス</string>
-  <string name="cancel">キャンセル</string>
-  <string name="close">閉じる</string>
-  <string name="edit">編集</string>
-  <string name="save">保存</string>

  <!-- Placemark labels for start and end of track -->
  <string name="start">(開始)</string>
@@ -123,68 +109,52 @@ limitations under the License.

  <!--  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_send_to_mymaps">Google My Mapsへ送信</string>
+  <string name="tracklist_send_to_new_mymap">新規Googleマイマップへ送信</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>
+  <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_btn_export_all">全てのトラックのエクスポート</string>
+  <string name="export_done">エクスポート終了</string>
  <string name="tracklist_pick_one">トラックを選択します．オプションを表示するには長押しして下さい．</string>
-  <string name="tracklist_all_tracks">全トラック:</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_link">Googleマイマップへのリンク</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>
-  <string name="import_done">インポート終了</string>
-  <!-- Format:
-  $1 : Successful imports
-  $2 : Attempted imports
-  $3 : MyTracks gpx path
-  -->
-  <string name="import_done">%3$s からGPXファイル %2$d件のうち %1$d件をインポートしました</string>
-  <string name="import_empty">%s ではGPXファイルがありません．SDカードを読み込めないかディレクトリにGPXファイルが無いかも知れません．</string>
-  <string name="import_error">ファイル %s のインポートエラー</string>
+  <string name="tracklist_clear_map">マップの消去</string>

  <!-- Waypoints list -->
-  <string name="waypointslist_btn_delete_all">全てのマーカーの削除</string>
-  <string name="waypointslist_this_waypoint">このマーカー</string>
+  <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>
+  <string name="waypointslist_pick_one">マーカを選択します．オプションを表示するには長押しして下さい．</string>

  <!-- MyTracks Details -->
  <string name="trackdetails_title">トラック詳細</string>
  <string name="trackdetails_name">トラック名</string>
  <string name="trackdetails_description">トラック説明</string>
-  <string name="trackdetails_category">活動タイプ(ハイキング, サイクリング、ランニング、登山...)</string>
+  <string name="trackdetails_category">活動タイプ(ハイキング, サイクリング,　ランニング, 登山...)</string>

  <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">マーカー詳細</string>
-  <string name="waypointdetails_name">マーカー名</string>
-  <string name="waypointdetails_description">マーカー説明</string>
-  <string name="waypointdetails_category">マーカータイプ(建物、洞穴、名所...)</string>
+  <string name="waypointdetails_title">マーカ詳細</string>
+  <string name="waypointdetails_name">マーカ名</string>
+  <string name="waypointdetails_description">マーカ説明</string>
+  <string name="waypointdetails_category">マーカタイプ(建物, 洞穴, 名所...)</string>

  <!-- MyTracks Settings -->
  <string name="mytracks_settings">My Tracks設定</string>
@@ -192,10 +162,9 @@ limitations under the License.
  <string name="settings_recording">記録</string>
  <string name="settings_sharing">共有</string>

-  <string name="settings_not_available_summary">このAndroidバージョンでは使用できません</string>
-
  <string name="settings_announcement_frequency">定期通知</string>
  <string name="settings_announcement_frequency_summary">音声通知間隔の最小時間</string>
+  <string name="settings_announcement_not_available_summary">お使いのAndroidの版では音声読み上げ機能がありません</string>

  <string name="settings_min_recording_distance">ポイント間の最短距離</string>
  <string name="settings_min_recording_distance_summary">位置記録間の最短距離</string>
@@ -215,7 +184,7 @@ limitations under the License.

  <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_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>
@@ -225,66 +194,41 @@ limitations under the License.
  <string name="settings_share_url_only_summary_on">共有時にマップのURLのみ送信します</string>
  <string name="settings_share_url_only_summary_off">共有時にトラックのコンテントが含まれます</string>

+  <string name="settings_signal_sampling_frequency">信号サンプリング周波数</string>
+  <string name="settings_signal_sampling_frequency_summary">端末の信号強度記録の時間間隔</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_split_frequency_summary">分割マーカを挿入する時間または距離の間隔</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="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">トラック共有</string>
-  <string name="delete_map">アカウントからマップを削除</string>
+  <string name="edit_map_details">マップ詳細の編集</string>
+  <string name="share_map">マップの共有</string>
+  <string name="share_track">トラックの共有</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>
+
+
+  <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>
+  <string name="close">閉じる</string>
+  <string name="edit">編集</string>
+  <string name="cancel">キャンセル</string>
+  <string name="save">保存</string>

  <!-- Sharing -->
-  <string name="share_map">マップ共有</string>
  <string name="share_map_subject">マップを共有したいと思います</string>
  <string name="share_map_body_format">このマップに興味を持って頂けると思います:

@@ -292,8 +236,7 @@ limitations under the License.
  <string name="send_track_subject">トラックを共有したいと思います</string>
  <string name="send_track_body_format">このトラックに興味を持って頂けると思います．

-    このトラックを閲覧するには、Google Earthまたは他のマッピングソフトウェアが必要です．</string>
-  <string name="share_track">トラックの共有</string>
+    このトラックを閲覧するには，Google Earthまたは他のマッピングソフトウェアが必要です．</string>

  <!-- Visibility -->
  <string name="public_map">公開</string>
@@ -347,16 +290,23 @@ limitations under the License.
  <string name="minutes">分</string>
  <string name="second">秒</string>
  <string name="seconds">秒</string>
-  <string name="milliseconds">ミリ秒</string>

  <!-- Distance -->
+  <string name="meter">m</string>
+  <string name="kilometer">km</string>
  <string name="kilometers_long">キロメータ</string>
+  <string name="feet">ft</string>
+  <string name="mile">mi</string>
  <string name="miles_long">マイル</string>

  <!-- Speed and Pace -->
+  <string name="kilometer_per_hour">km/h</string>
  <string name="kilometer_per_hour_long">キロメータ毎時</string>
+  <string name="min_per_kilometer">min/km</string>
  <string name="per_kilometer">毎キロメータ</string>
+  <string name="mile_per_hour">mi/h</string>
  <string name="mile_per_hour_long">マイル毎時</string>
+  <string name="min_per_mile">min/mi</string>
  <string name="per_mile">毎マイル</string>

  <!-- Stats Labels -->
@@ -369,10 +319,7 @@ limitations under the License.
  <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 -->
@@ -385,12 +332,13 @@ limitations under the License.
  <string name="help">ヘルプ</string>
  <string name="about_team">チーム:</string>
  <string name="about_version">バージョン:</string>
+  <string name="about_email">サポート</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_google_docs">Google Docs</string>
  <string name="sendtogoogle_send_now">今すぐ送信</string>
  <string name="sendtogoogle_create_new_map">新規マップ作成</string>
  <string name="sendtogoogle_pick_existing_map">既存マップ選択</string>
@@ -403,23 +351,22 @@ limitations under the License.
  <string name="choose_account_title">アカウント選択</string>

  <!-- SD card -->
-  <string name="io_no_external_storage_found">外部ストレージを発見できませんでした．SDカードが刺さっているか、端末がコンピュータにマウントされていないか確認してください．</string>
+  <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_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_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>
+  <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_read_later">Ok</string>
  <string name="welcome_about">My Tracksについて</string>

  <!-- Announcement -->
@@ -438,37 +385,11 @@ limitations under the License.
  <string name="check_units_title">計測単位についてのご注意</string>
  <string name="check_units_message">デフォルトの単位はメートルです．設定を変更しますか?</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="sensor_options">センサーオプション</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>
-
-  <!-- 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>
+  <!-- Signal Strength -->
+  <string name="error_rate"> 誤り率: %1$d</string>
+  <string name="signal_to_noise_ratio"> S/N比: %1$d</string>
+  <string name="ecio"> Ec/Io比: %1$.1f dB</string>
+  <string name="gsm_strength">GSM 強度: %1$d</string>
+  <string name="cdma_strength">CDMA 強度: %1$d dBm</string>
+  <string name="evdo_strength">EVDO 強度: %1$d dBm</string>
 </resources>
@@ -146,15 +146,6 @@ limitations under the License.
    <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">
@@ -29,12 +29,11 @@ limitations under the License.
  <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_location_provider">Brak dostawcy lokalizacji GPS na urządzeniu.</string>
-  <string name="error_sending_to_fusiontables">Podczas przesyłania pliku do Moich Map Google pojawił się błąd. Spróbuj ponownie później.</string>
+  <string name="error_sending_to_mymap">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>
@@ -49,10 +48,11 @@ limitations under the License.
  <string name="wait_for_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_new_fusiontable_has_been_created">Utworzona nową Mapę Google na maps.google.com.</string> -->
+  <string name="status_new_mymap_has_been_created">Utworzona nową Mapę Google na maps.google.com.</string>
  <string name="status_tracks_have_been_uploaded">Twoja trasa został wysłana do maps.google.com.</string>
  <string name="status_tracks_have_been_uploaded_to_new_doc">Twoja trasa została wysłana do nowego arkusza na docs.google.com.</string>
  <string name="status_tracks_have_been_uploaded_to_docs">Twoja trasa została wysłana do docs.google.com.</string>
+  <string name="status_mymap_info">Trasa będzie widoczna za kilka minut.</string>
  <string name="status_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_location">Uwaga: używana jest przybliżona lokalizacja ustalona za pomocą stacji komórkowych i sieci WIFI.</string>
  <string name="status_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>
@@ -64,24 +64,25 @@ limitations under the License.
  <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_fusiontables">Uwierzytelnianie w Mapach Google...</string> -->
+  <string name="progress_message_authenticating_mymaps">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_fusiontables">Przesyłanie trasy do Map Google...</string> -->
-  <!-- <string name="progress_message_creating_fusiontable">Tworzenie nowej Mojej Mapy...</string> -->
+  <string name="progress_message_sending_mymaps">Przesyłanie trasy do Map Google...</string>
+  <string name="progress_message_creating_map">Tworzenie nowej Mojej Mapy...</string>
  <string name="import_progress_message">Importowanie trasy GPS. Poczekaj chwilę.</string>
  <string name="write_progress_message">Zapisywanie pliku na kartę SD. Poczekaj chwilę.</string>
  <string name="progress_message_updating_track">Aktualizacja statystyk trasy...</string>

  <!-- Used by DeleteAllDataHandler -->
  <string name="are_you_sure_question">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>
+  <string name="all_data_will_be_permanently_deleted">Wszystkie trasy i znaczniki zostaną usunięte z tego telefonu.</string>
+  <string name="track_will_be_permanently_deleted">Trasy i ich znaczniki zostaną całkowicie usunięte z tego telefonu.</string>
+  <string name="marker_will_be_permanently_deleted">Znacznik zostanie całkowicie usunięty z tego telefonu.</string>

  <!-- Text and links when uploading to Google My Maps -->
  <string name="new_map_description">Utworzono za pomocą My Tracks na Android.</string>
-  <string name="fusiontable_link">Utworzona przez &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; na Android.</string>
+  <string name="my_map_link">Utworzona przez &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; na Android.</string>
+  <string name="new_map_title">Nowa mapa</string>

  <!-- Formatting of track and marker descriptions -->
  <string name="points">Punkty</string>
@@ -101,10 +102,6 @@ limitations under the License.
  <string name="error">Błąd</string>
  <string name="success">Powodzenie</string>
  <string name="waypoint">Punkt orientacyjny</string>
-  <string name="cancel">Anuluj</string>
-  <string name="close">Zamknij</string>
-  <string name="edit">Edytuj</string>
-  <string name="save">Zapisz</string>

  <!-- Placemark labels for start and end of track -->
  <string name="start">(Początek)</string>
@@ -112,8 +109,8 @@ limitations under the License.

  <!--  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_mymaps">Wyślij do Moich Map Google</string>
+  <string name="tracklist_send_to_new_mymap">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>
@@ -122,7 +119,7 @@ limitations under the License.
  <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_send_all_to_mymaps">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>
@@ -131,6 +128,7 @@ limitations under the License.
  <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_link">Link do Moich Map Google</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>
@@ -166,7 +164,7 @@ limitations under the License.

  <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_announcement_not_available_summary">Brak wsparcia dla syntezy mowy w twojej wersji Androida</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>
@@ -194,40 +192,40 @@ limitations under the License.

  <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_share_url_only_summary_off">Zawartość trasy również będzie przesyłana</string>
+
+  <string name="settings_signal_sampling_frequency">Częstotliowść próbkowania sygnału</string>
+  <string name="settings_signal_sampling_frequency_summary">Czas między dwoma zapisami siły sygnału telefonu</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>

+  <!-- My Maps -->
+  <string name="select_map_message">Wybierz mapę z twojego konta:</string>
+  <string name="create_new_map">Utwórz nową mapę...</string>
+  <string name="map_list_title">Wyślij do Moich Map Google</string>
+  <string name="maps_list_loading">Wczytywanie map...</string>
+  <string name="maps_list_failed">Nie można wczytać twoich map!</string>
+  <string name="open_map">Wybierz tę mapę</string>
+  <string name="edit_map_details">Edytuj szczegóły mapy</string>
+  <string name="share_map">Podziel się mapą z przyjaciółmi</string>
+  <string name="share_track">Podziel się trasą z przyjaciółmi</string>
+  <string name="delete_map">Usuń mapę z twojego konta</string>
+  <string name="map_title">Tytuł mapy:</string>
+  <string name="map_description">Opis mapy:</string>
+  <string name="map_searchable_edit">Pokazuj tę pamę i jej zawartość w wynikach wyszukiwania</string>
+  <string name="map_not_searchable_edit">Nie pokazuj tej mapy i jej zawartości w wynikach wyszukiwania. Dostęp do mapy będzie ciągle możliwy poprzez odnośnik</string>
+  <string name="map_searchable">Ta mapa i jej zawartość będzie dostępna w wynikach wyszukiwania</string>
+  <string name="map_not_searchable">Mapa i jej zawartość nie będzie dostępna w wynikach wyszukiwania, ale będzie dostępna przez bezpośredni odnośnik</string>
+  <string name="close">Zamknij</string>
+  <string name="edit">Edytuj</string>
+  <string name="cancel">Anuluj</string>
+  <string name="save">Zapisz</string>
+
  <!-- Sharing -->
  <string name="share_map_subject">Chciałbym się z Tobą podzielić mapą</string>
  <string name="share_map_body_format">Myślę, że może Cię zainteresować ta mapa:
@@ -237,7 +235,6 @@ limitations under the License.
  <string name="send_track_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">Podziel się trasą z przyjaciółmi</string>

  <!-- Visibility -->
  <string name="public_map">Publiczna</string>
@@ -333,14 +330,16 @@ limitations under the License.
  <string name="help">Pomoc</string>
  <string name="about_team">Zespół:</string>
  <string name="about_version">Wersja:</string>
+  <string name="about_email">Wsparcie</string>
  <string name="about_support">Wsparcie:</string>
-  <string name="about_bart">Bartłomiej Niechwiej</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_mymaps">Moje Mapy Google</string>
  <string name="sendtogoogle_google_docs">Dokumenty Google</string>
  <string name="sendtogoogle_send_now">Wyślij teraz</string>
+  <string name="sendtogoogle_create_new_map">Utwórz nową mapę</string>
+  <string name="sendtogoogle_pick_existing_map">Wybierz istniejąca mapę</string>
  <string name="sendtogoogle_send_stats">Wyślij statystyki trasy</string>
  <string name="sendtogoogle_send_stats_and_points">Wyślij statystyki i punkty</string>

@@ -352,10 +351,8 @@ limitations under the License.
  <!-- 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>  
+  <string name="io_write_finished">Zakończono zapisywanie trasy na karcie SD.</string>

  <!-- VersionChecker -->
  <string name="version_check_title">Sprawdzanie aktualizacji</string>
@@ -385,4 +382,12 @@ limitations under the License.
  <!-- Check Units -->
  <string name="check_units_title">Jednostki miary</string>
  <string name="check_units_message">Domyślnie używane są jednostki metryczne. Chcesz to zmienić?</string>
+
+  <!-- Signal Strength -->
+  <string name="error_rate"> Poziom błędów: %1$d</string>
+  <string name="signal_to_noise_ratio"> Stosunek sygnału do szumu: %1$d</string>
+  <string name="ecio"> Ec/lo: %1$.1f dB</string>
+  <string name="gsm_strength">Siła GSM: %1$d</string>
+  <string name="cdma_strength">Siła CDMA: %1$d dBm</string>
+  <string name="evdo_strength">Siła EVDO: %1$d dBm</string>
 </resources>
@@ -18,9 +18,9 @@ limitations under the License.
  <!-- 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="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>
@@ -31,10 +31,10 @@ limitations under the License.
  <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_location_provider">"Provedor de posição de GPS não encontrado neste dispositivo.</string>
-  <string name="error_sending_to_fusiontables">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_no_location_manager">Gerenciador de localização não encontrado neste dispositivo!"</string>
+  <string name="error_no_gps_location_provider">"Provedor de posição de GPS não encontrado neste dispositivo."</string>
+  <string name="error_sending_to_mymap">Ocorreu um erro ao enviar seu caminho para o Google Meu Mapa. 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_unable_to_read_file">Impossível ler do arquivo.</string>
@@ -48,11 +48,12 @@ limitations under the License.
  <string name="wait_for_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_new_fusiontable_has_been_created">Uma nova Fusion Table Google foi criada em google.com/fusiontables.</string>
+  <string name="status_new_mymap_has_been_created">Um novo Meu Mapa Google foi criado em maps.google.com.</string>
  <string name="status_tracks_have_been_uploaded">Seu caminho foi enviado para maps.google.com.</string>
  <string name="status_tracks_have_been_uploaded_to_new_doc">Seu caminho foi enviado para uma nova planilha em docs.google.com.</string>
  <string name="status_tracks_have_been_uploaded_to_docs">Seu caminho foi enviado para docs.google.com.</string>
-  <string name="status_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_mymap_info">"Pode demorar alguns minutor para que novos caminhos apareçam.</string>
+  <string name="status_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_location">Nota: Uma localização aproximada, determinada por torres de telefonia celular, está sendo mostrada.</string>
  <string name="status_no_location">Sua localização não pôde ser determinada.  Habilite fontes adicionais de localização (veja configurações de Segurança e Localização) e assegure-se de que o céu está visível.</string>
  <string name="status_waypoint_inserted">Um marcador de ponto de passagem foi inserido.</string>
@@ -63,11 +64,11 @@ limitations under the License.
  <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_fusiontables">Autenticando com o Google Fusion Tables...</string>
+  <string name="progress_message_authenticating_mymaps">Autenticando com o Google Maps...</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_fusiontables">Enviando caminho para o Google Fusion Tables...</string>
-  <string name="progress_message_creating_fusiontable">Criando nova Fusion Table...</string>
+  <string name="progress_message_sending_mymaps">Enviando caminho para o Google Maps...</string>
+  <string name="progress_message_creating_map">Criando novo Meu Mapa...</string>
  <string name="import_progress_message">Importando um caminho de GPS. Isso pode demorar alguns instantes.</string>
  <string name="write_progress_message">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>
@@ -79,19 +80,20 @@ limitations under the License.
  <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>
-  <string name="fusiontable_link">"Criado por &lt;a href='http://mytracks.appspot.com'&gt;My Tracks&lt;/a&gt; no Android.</string>
+  <string name="new_map_description">"Criado por My Tracks no Android."</string>
+  <string name="my_map_link">"Criado por &lt;a href='http://mytracks.appspot.com'&gt;My Tracks&lt;/a&gt; no Android."</string>
+  <string name="new_map_title">Novo mapa</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="part">"(Parte %d)</string>
+  <string name="recorded_date">Gravado"</string>
+  <string name="category">"Tipo de atividade"</string>
+  <string name="waypoint_category">"Tipo de marcador"</string>
+  <string name="part">"(Parte %d)"</string>

  <!-- Used by the track recording service -->
-  <string name="recording_your_track">"Gravando seu caminho...</string>
-  <string name="new_track">"Caminho %d</string>
+  <string name="recording_your_track">"Gravando seu caminho..."</string>
+  <string name="new_track">"Caminho %d"</string>

  <!-- Common -->
  <string name="no">Não</string>
@@ -99,10 +101,6 @@ limitations under the License.
  <string name="error">Erro</string>
  <string name="success">Successo</string>
  <string name="waypoint">Ponto de passagem</string>
-  <string name="cancel">Cancelar</string>
-  <string name="close">Fechar</string>
-  <string name="edit">Editar</string>
-  <string name="save">Salvar</string>

  <!-- Placemark labels for start and end of track -->
  <string name="start">(Início)</string>
@@ -110,8 +108,8 @@ limitations under the License.

  <!--  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_mymaps">Enviar para o Google Meus Mapas</string>
+  <string name="tracklist_send_to_new_mymap">Enviar para o novo Google Meu Mapa</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>
@@ -119,25 +117,25 @@ limitations under the License.
  <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_send_all_to_mymaps">Enviar para o Google Meus Mapas</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>
+  <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 o Google Meu 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_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 -->
@@ -157,10 +155,9 @@ limitations under the License.
  <string name="settings_display">Exibição</string>
  <string name="settings_recording">Gravação</string>
  <string name="settings_sharing">Compartilhamento</string>
-  <string name="settings_not_available_summary">Não disponível na sua versão do Android</string>
-  <string name="settings_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_announcement_not_available_summary">Anúncios de voz não estão disponíveis em sua versão do Android</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>
@@ -188,6 +185,28 @@ limitations under the License.
  <!-- MyTracksSky -->
  <string name="mytracks_sky">Satélites de GPS</string>

+  <!-- My Maps -->
+  <string name="select_map_message">Escolha um mapa da sua conta:</string>
+  <string name="create_new_map">Criar novo mapa...</string>
+  <string name="map_list_title">Enviar para o Google Meus Mapas</string>
+  <string name="maps_list_loading">Carregando mapas...</string>
+  <string name="maps_list_failed">Seus mapas não puderam ser carregados neste momento!</string>
+  <string name="open_map">Selecionar este Mapa</string>
+  <string name="edit_map_details">Editar detalhes do mapa</string>
+  <string name="share_map">Compartilhar mapa com amigos</string>
+  <string name="share_track">Compartilhar caminho com amigos</string>
+  <string name="delete_map">Apagar mapa da sua conta</string>
+  <string name="map_title">Título do Mapa:</string>
+  <string name="map_description">Descrição do Mapa:</string>
+  <string name="map_searchable_edit">Fazer com que o conteúdo deste mapa apareça em resultados de buscas</string>
+  <string name="map_not_searchable_edit">Não permitir que este mapa ou seu conteúdo apareçam em resultados de buscas, porém ele ainda pode ser visto por sua URL direta</string>
+  <string name="map_searchable">Este mapa e seu conteúdo vão aparecer em resultados de buscas</string>
+  <string name="map_not_searchable">Nem este mapa nem seu conteúdo vão aparecer em resultados de buscas, porém outras pessoas ainda podem vê-los se obtiverem sua URL direta</string>
+  <string name="close">Fechar</string>
+  <string name="edit">Editar</string>
+  <string name="cancel">Cancelar</string>
+  <string name="save">Salvar</string>
+
  <!-- Sharing -->
  <string name="share_map_subject">Eu gostaria de compartilhar um mapa com você</string>
  <string name="share_map_body_format">Eu acredito que você pode se interessar por este mapa:
@@ -197,7 +216,6 @@ limitations under the License.
  <string name="send_track_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">Compartilhar caminho com amigos</string>

  <!-- Visibility -->
  <string name="public_map">Público</string>
@@ -281,14 +299,19 @@ limitations under the License.
  <!-- About -->
  <string name="about">Sobre</string>
  <string name="help">Ajuda</string>
+  <string name="about_email">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_mymaps">Google Meus Mapas</string>
  <string name="sendtogoogle_google_docs">Google Docs</string>
  <string name="sendtogoogle_send_now">Enviar agora</string>
+  <string name="sendtogoogle_create_new_map">Criar novo mapa</string>
+  <string name="sendtogoogle_pick_existing_map">Escolher um mapa existente</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>

@@ -34,8 +34,8 @@ limitations under the License.
  <!-- Error messages -->
  <string name="error_no_location_manager">Ingen platshanterare hittades på denna enhet!</string>
  <string name="error_no_gps_location_provider">Ingen GPS-positioneringstjänst hittades på denna enhet.</string>
-  <string name="error_sending_to_fusiontables">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_sending_to_mymap">Det uppstod ett fel i sändningen av ditt spår till Google My Map. 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 Docs. 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_unable_to_read_file">Kan inte läsa från fil.</string>
@@ -43,18 +43,19 @@ limitations under the License.
  <string name="error_generic">Ett fel uppstod. Försök igen.</string>
  <string name="error_track_does_not_exist">Spåret finns inte.</string>
  <string name="error_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>
+  <string name="error_unable_to_insert_marker">Kan inte skapa markör. Ingen possition tillgänglig.</string>

  <!-- Status messages -->
-  <string name="wait_for_fix">Väntar på bättre GPS-position. Se till att himlen är synlig.</string>
+  <string name="wait_for_fix">Väntar på bättre GPS-posstion. 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_new_fusiontable_has_been_created">En ny Google Mina Kartor har skapats på maps.google.com.</string> -->
+  <string name="status_new_mymap_has_been_created">En ny Google My Map har skapats på maps.google.com.</string>
  <string name="status_tracks_have_been_uploaded">Ditt spår har skickats till maps.google.com.</string>
-  <string name="status_tracks_have_been_uploaded_to_new_doc">Ditt spår har skickats till ett nytt kalkylblad på docs.google.com.</string>
+  <string name="status_tracks_have_been_uploaded_to_new_doc">Ditt spår har skockats till ett nytt kalkylblad på docs.google.com.</string>
  <string name="status_tracks_have_been_uploaded_to_docs">Ditt spår har skickats till docs.google.com.</string>
+  <string name="status_mymap_info">Det kan ibland ta några minuter innan nya spår visas.</string>
  <string name="status_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_location">OBS: En ungefärlig position som avgörs från mobilmaster och WIFI-nät visas.</string>
+  <string name="status_approximate_location">OBS: En ungerfärlig position som avgörs från mobilmaster och WIFI-nät visas.</string>
  <string name="status_no_location">En position kan för närvarande inte fastställas. Aktivera mer platskällor (se Säkerhet och Platsinställningar) och se till att himlen är synlig. Försök igen senare.</string>
  <string name="status_waypoint_inserted">En positionsmarkör har lagts in.</string>
  <string name="status_statistics_inserted">En statistikmarkör har lagts in.</string>
@@ -64,13 +65,13 @@ limitations under the License.
  <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_fusiontables">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_fusiontables">Skickar spår till Google Kartor...</string> -->
-  <!-- <string name="progress_message_creating_fusiontable">Skapar en ny Min Karta...</string> -->
+  <string name="progress_message_authenticating_mymaps">Autentiserar till Google Maps...</string>
+  <string name="progress_message_authenticating_docs">Autentiserar till Google Docs...</string>
+  <string name="progress_message_sending_docs">Skickar spår till Google Docs...</string>
+  <string name="progress_message_sending_mymaps">Skickar spår till Google Maps...</string>
+  <string name="progress_message_creating_map">Skapar en ny My Map...</string>
  <string name="import_progress_message">Importerar ett GPS-spår. Detta kan ta en stund.</string>
-  <string name="write_progress_message">Skriver till SD-kortet. Detta kan ta en stund.</string>
+  <string name="write_progress_message">Skriver til till SD-kortet. Detta kan ta en stund.</string>
  <string name="progress_message_updating_track">Uppdaterar spårstatistik...</string>

  <!-- Used by DeleteAllDataHandler -->
@@ -81,7 +82,8 @@ limitations under the License.

  <!-- Text and links when uploading to Google My Maps -->
  <string name="new_map_description">Skapad av My Tracks på Android.</string>
-  <string name="fusiontable_link">Skapad av &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; på Android.</string>
+  <string name="my_map_link">Skapad av &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; på Android.</string>
+  <string name="new_map_title">Ny karta</string>

  <!-- Formatting of track and marker descriptions -->
  <string name="points">Punkter</string>
@@ -101,10 +103,6 @@ limitations under the License.
  <string name="error">Fel</string>
  <string name="success">Lyckades</string>
  <string name="waypoint">Positionsmärke</string>
-  <string name="cancel">Avbryt</string>
-  <string name="close">Stäng</string>
-  <string name="edit">Ändra</string>
-  <string name="save">Spara</string>

  <!-- Placemark labels for start and end of track -->
  <string name="start">(Start)</string>
@@ -112,9 +110,9 @@ limitations under the License.

  <!--  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_mymaps">Skicka till Google My Maps</string>
+  <string name="tracklist_send_to_new_mymap">Skicka till New Google My Map</string>
+  <string name="tracklist_send_to_docs">Skicka till Google Docs</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>
@@ -122,15 +120,16 @@ limitations under the License.
  <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_send_all_to_mymaps">Skicka till Google My Maps</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_pick_one">Välj ett spår. TryckPress&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_link">En länk till Google My Map</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>
@@ -144,13 +143,13 @@ limitations under the License.
  <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>
+  <string name="waypointslist_pick_one">Välj en markör. TryckPress&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_description">Spårbeskrivning</string>
-  <string name="trackdetails_category">Aktivitetstyp (t ex vandring, cyckling, löpning, klättring...)</string>
+  <string name="trackdetails_category">Aktivitetstyp (t ex vandring, cyckling, låpning, klättring...)</string>

  <!-- MyTracks Waypoint Details -->
  <string name="waypointdetails_title">Markördetaljer</string>
@@ -166,7 +165,7 @@ limitations under the License.

  <string name="settings_announcement_frequency">Meddelandefrekvens</string>
  <string name="settings_announcement_frequency_summary">Minimumtid mellan två röstmeddelanden</string>
-  
+  <string name="settings_announcement_not_available_summary">Text-till-talmeddelanden är inte tillgängligt i din version av Android</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>
@@ -186,7 +185,7 @@ limitations under the License.

  <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_map_public_summary_off">Uppladdad 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>
@@ -196,12 +195,37 @@ limitations under the License.
  <string name="settings_share_url_only_summary_on">Bara länken till kartan kommer att skickas vid delning</string>
  <string name="settings_share_url_only_summary_off">Innehållet i spåret kommer också att inkluderas vid delning</string>

+  <string name="settings_signal_sampling_frequency">Signalprovsfrekvens</string>
+  <string name="settings_signal_sampling_frequency_summary">Tid mellan två inspelningar av telefonens signalstyrka</string>
+
  <string name="settings_split_frequency">Delningsfrekvens</string>
-  <string name="settings_split_frequency_summary">Maximala tiden eller distansen varefter en ny delningsmarkör kommer infogas</string>
+  <string name="settings_split_frequency_summary">Maximala tiden eller distansen varefter en ny delnginsmarkör kommer infogas</string>
  <string name="pace_label">Tempo</string>

  <!-- MyTracksSky -->
-  <string name="mytracks_sky">GPS-satelliter</string>
+  <string name="mytracks_sky">GPS-satteliter</string>
+
+  <!-- My Maps -->
+  <string name="select_map_message">Välje en karta från ditt konto:</string>
+  <string name="create_new_map">Skapa en ny karta...</string>
+  <string name="map_list_title">Skicka till Google My Maps</string>
+  <string name="maps_list_loading">Laddar kartor...</string>
+  <string name="maps_list_failed">Din kartor kunde inte laddas just nu!</string>
+  <string name="open_map">Välj den här kartan</string>
+  <string name="edit_map_details">Ändra kartdetaljer</string>
+  <string name="share_map">Dela kartan med vänner</string>
+  <string name="share_track">Dela spår med vänner</string>
+  <string name="delete_map">Ta bort kartan från ditt konto</string>
+  <string name="map_title">Karttitel:</string>
+  <string name="map_description">Kartbeskrivning:</string>
+  <string name="map_searchable_edit">Gör så att kartan och dess innehåll visas i sökresultat</string>
+  <string name="map_not_searchable_edit">Låt inte kartan och dess innehåll visas i sökresultat, men de kan ändå ses av andra genom en direktlänken</string>
+  <string name="map_searchable">Kartan och dess innehåll kommer att visas i sökresultat</string>
+  <string name="map_not_searchable">Varken kartan eller dess innehåll visas i sökresultat, men de kan ändå ses av andra genom en direktlänk</string>
+  <string name="close">Stäng</string>
+  <string name="edit">Ändra</string>
+  <string name="cancel">Avbryt</string>
+  <string name="save">Spara</string>

  <!-- Sharing -->
  <string name="share_map_subject">Jag vill dela en karta med dig</string>
@@ -212,12 +236,11 @@ limitations under the License.
  <string name="send_track_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">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>
+  <string name="mapslist_no_maps_available">Du har inge kartor än.</string>

  <!-- Statistics View -->
  <!-- Average Moving -->
@@ -230,14 +253,14 @@ limitations under the License.

  <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="elevation_label">Höjt</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>
+  <string name="min_elevation_label">Min höjd</string>
+  <string name="min_grade_label">Min lutning</string>
+  <string name="min_pace_label">Min tempo</string>

  <!-- Max -->
  <string name="max_elevation_label">Maxhöjd</string>
@@ -249,12 +272,12 @@ limitations under the License.
  <!-- Chart Settings -->
  <string name="chart_settings">Diagraminställningar</string>
  <!-- X Axis -->
-  <string name="x_axis">X-axel</string>
+  <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>
+  <string name="y_axis">Y Axel</string>

  <!-- Units -->
  <!-- Time  -->
@@ -277,16 +300,16 @@ limitations under the License.

  <!-- Speed and Pace -->
  <string name="kilometer_per_hour">km/h</string>
-  <string name="kilometer_per_hour_long">kilometer i timmen</string>
+  <string name="kilometer_per_hour_long">kilometer per timme</string>
  <string name="min_per_kilometer">min/km</string>
  <string name="per_kilometer">per kilometer</string>
  <string name="mile_per_hour">mi/h</string>
-  <string name="mile_per_hour_long">miles i timmen</string>
+  <string name="mile_per_hour_long">miles per timme</string>
  <string name="min_per_mile">min/mi</string>
  <string name="per_mile">per mile</string>

  <!-- Stats Labels -->
-  <string name="moving_time_label">Rörlig tid</string>
+  <string name="moving_time_label">Rörelsetid</string>
  <string name="total_time_label">Total tid</string>
  <string name="time_label">Tid</string>
  <string name="sd_unavail">SD otillgängligt</string>
@@ -308,13 +331,16 @@ limitations under the License.
  <string name="help">Hjälp</string>
  <string name="about_team">Team:</string>
  <string name="about_version">Version:</string>
+  <string name="about_email">Support</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_google_mymaps">Google My Maps</string>
+  <string name="sendtogoogle_google_docs">Google Docs</string>
  <string name="sendtogoogle_send_now">Skicka nu</string>
+  <string name="sendtogoogle_create_new_map">Skapa en ny karta</string>
+  <string name="sendtogoogle_pick_existing_map">Välj en befintlig karta</string>
  <string name="sendtogoogle_send_stats">Skicka spårstatistik</string>
  <string name="sendtogoogle_send_stats_and_points">Skicka statistik och punkter</string>

@@ -357,4 +383,12 @@ limitations under the License.
  <!-- Check Units -->
  <string name="check_units_title">Mätenheter</string>
  <string name="check_units_message">Som standard är enheterna metriska. Vill du ändra den inställningen?</string>
+
+  <!-- Signal Strength -->
+  <string name="error_rate"> Felfrekvens: %1$d</string>
+  <string name="signal_to_noise_ratio"> Signal / brus-förhållande: %1$d</string>
+  <string name="ecio"> Ec/lo: %1$.1f dB</string>
+  <string name="gsm_strength">GSM styrka: %1$d</string>
+  <string name="cdma_strength">CDMA styrka: %1$d dBm</string>
+  <string name="evdo_strength">EVDO styrka: %1$d dBm</string>
 </resources>
@@ -1,286 +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>关闭</item>
-    <item>1 分钟</item>
-    <item>2 分钟</item>
-    <item>5 分钟</item>
-    <item>10 分钟</item>
-    <item>15 分钟</item>
-    <item>30 分钟</item>
-    <item>60 分钟</item>
-  </string-array>
-
-  <!-- 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>
-
-  <!-- Split frequency -->
-  <string-array name="split_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="split_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>
-  </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>
@@ -1,398 +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>
-  <!-- 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="aggregated_stats">累积统计</string>
-
-  <!-- Error messages -->
-  <string name="error_no_location_manager">此设备上没有位置管理器!</string>
-  <string name="error_no_gps_location_provider">此设备上没有 GPS 定位装置.</string>
-  <string name="error_sending_to_fusiontables">发送你的轨迹到 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_unable_to_read_file">无法读取文件.</string>
-  <string name="error_invalid_gpx_format">文件不是有效的 GPX 格式.</string>
-  <string name="error_generic">发生错误. 请重试.</string>
-  <string name="error_track_does_not_exist">轨迹不存在.</string>
-  <string name="error_out_of_memory">文件太大 (必须小于 500 KB). 中止操作.</string>
-  <string name="error_unable_to_insert_marker">无法插入标记. 定位尚未完成.</string>
-
-  <!-- Status messages -->
-  <string name="wait_for_fix">等待更准确的 GPS 定位. 请确定可以看见天空.</string>
-  <string name="status_now_recording">现在开始记录新的轨迹.</string>
-  <string name="status_stopped_recording">停止记录你的轨迹.</string>
-  <string name="status_new_fusiontable_has_been_created">已在 google.com/fusiontables 创建新 Google Fusion Table.</string>
-  <string name="status_tracks_have_been_uploaded">你的轨迹已经发送到 maps.google.com.</string>
-  <string name="status_tracks_have_been_uploaded_to_new_doc">你的轨迹已经作为新的电子表格发送到 docs.google.com.</string>
-  <string name="status_tracks_have_been_uploaded_to_docs">你的轨迹已经发送到 docs.google.com.</string>
-  <string name="status_enable_gps">请点击这里进入\'安全和位置设置\'并勾选上\'启用 GPS 卫星\'. 然后用后退键返回.</string>
-  <string name="status_approximate_location">注意: 当前显示的位置是根据无线信号和无线网络计算的近似位置.</string>
-  <string name="status_no_location">目前无法定位. 请启用更多的位置来源 (在\'安全和位置设置\'中) 并确认天空是可见的. 再重试.</string>
-  <string name="status_waypoint_inserted">插入了一个路点标记.</string>
-  <string name="status_statistics_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_fusiontables">登录 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_fusiontables">发送轨迹到 Google Fusion Tables 中...</string>
-  <string name="progress_message_creating_fusiontable">创建新的 Fusion Table 中...</string>
-  <string name="import_progress_message">导入 GPS 轨迹中. 请稍候.</string>
-  <string name="write_progress_message">写入文件到 SD 卡中. 请稍候.</string>
-  <string name="progress_message_updating_track">更新轨迹统计信息中...</string>
-
-  <!-- Used by DeleteAllDataHandler -->
-  <string name="are_you_sure_question">请确认</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 My Maps -->
-  <string name="new_map_description">由 Android 上的 My Tracks 生成.</string>
-  <string name="fusiontable_link">由 Android 上的 &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; 生成.</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="part">(第 %d 部分)</string>
-
-  <!-- Used by the track recording service -->
-  <string name="recording_your_track">记录轨迹中...</string>
-  <string name="new_track">轨迹 %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="cancel">取消</string>
-  <string name="close">关闭</string>
-  <string name="edit">编辑</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_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_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_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>
-
-  <!-- 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_description">轨迹描述</string>
-  <string name="trackdetails_category">活动类型 (例如: 徒步, 骑行, 跑步, 攀岩...)</string>
-
-  <!-- MyTracks Waypoint Details -->
-  <string name="waypointdetails_title">标记详细信息</string>
-  <string name="waypointdetails_name">标记名称</string>
-  <string name="waypointdetails_description">标记描述</string>
-  <string name="waypointdetails_category">标记类型 (例如: 建筑, 陷坑, 景点...)</string>
-
-  <!-- MyTracks Settings -->
-  <string name="mytracks_settings">My Tracks 设置</string>
-  <string name="settings_display">显示</string>
-  <string name="settings_recording">记录</string>
-  <string name="settings_sharing">分享</string>
-
-  <string name="settings_not_available_summary">你使用的 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="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="bluetooth_sensor_title">蓝牙感应器</string>
-  <string name="bluetooth_sensor_summary">要连接到的蓝牙感应器</string>
-
-  <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>
-
-  <!-- Backups -->
-  <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>
-
-  <!-- Sharing -->
-  <string name="share_map_subject">我想与你分享一张地图</string>
-  <string name="share_map_body_format">我想你可能会对这个地图感兴趣:
-
-      %s</string>
-  <string name="send_track_subject">我想与你分享一条轨迹</string>
-  <string name="send_track_body_format">我想你可能会对这条轨迹感兴趣.
-
-    请用 Google Earth 或其它地图软件查看此轨迹.</string>
-  <string name="share_track">与朋友分享轨迹</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="hour">小时</string>
-  <string name="hours">小时</string>
-  <string name="hr">时</string>
-  <string name="min">分</string>
-  <string name="minute">分钟</string>
-  <string name="minutes">分钟</string>
-  <string name="second">秒</string>
-  <string name="seconds">秒</string>
-
-  <!-- Distance -->
-  <string name="kilometers_long">千米</string>
-  <string name="miles_long">英里</string>
-
-  <!-- Speed and Pace -->
-  <string name="kilometer_per_hour_long">千米每小时</string>
-  <string name="per_kilometer">每千米</string>
-  <string name="mile_per_hour_long">英里每小时</string>
-  <string name="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_team">开发团队:</string>
-  <string name="about_version">版本:</string>
-  <string name="about_support">技术支持:</string>
-
-  <!-- Send to Google -->
-  <string name="sendtogoogle_title">发送到...</string>
-  <string name="sendtogoogle_send_now">立即发送</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_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>
-  <string name="check_units_message">默认单位均为公制. 你想要修改此设置吗?</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="sensor_options">感应器选项</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>
-</resources>
@@ -236,24 +236,6 @@ limitations under the License.
    <item>1</item>
  </string-array>

-  <!-- Auto-resume track timeout -->
-  <string-array name="auto_resume_track_timeout_options">
-    <item>Never</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>Always</item>
-  </string-array>
-
-  <!-- DO NOT TRANSLATE -->
-  <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>
-

  <!-- Other non-preference arrays -->
  <array name="activity_types">
@@ -390,26 +372,4 @@ limitations under the License.
    <item>CSV</item>
    <item>TCX</item>
  </array>
-
-  <array name="sensor_type_options">
-    <item>None</item>
-    <item>ANT+ Sensors</item>
-    <item>SRM ANT+ Bridge</item>
-    <item>Zephyr Bluetooth</item>
-  </array>
-
-  <!-- DO NOT TRANSLATE -->
-  <array name="sensor_type_values">
-    <item>@string/none</item>
-    <item>@string/ant_sensor_type</item>
-    <item>@string/srm_ant_bridge_sensor_type</item>
-    <item>@string/zephyr_sensor_type</item>
-  </array>
-
-  <!-- DO NOT TRANSLATE -->
-  <string-array name="ant_sensor_type_values">
-  	<item>@string/ant_sensor_type</item>
-  	<item>@string/srm_ant_bridge_sensor_type</item>
-  </string-array>
-
 </resources>
@@ -15,36 +15,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <color name="black">#FF000000</color>
-  <color name="blue">#FF0000FF</color>
-  <color name="darkgray">#FF444444</color>
  <color name="gold">#FFffd700</color>
-  <color name="gray">#FFAAAAAA</color>
+  <color name="white">#FFFFFFFF</color>
+  <color name="black">#FF000000</color>
  <color name="lightblue">#FF00FFFF</color>
-  <color name="opaque_shadow">#70000000</color>
+  <color name="blue">#FF0000FF</color>
+  <color name="blue_transparent">#400000FF</color>
  <color name="red">#FFFF0000</color>
+  <color name="green">#FF00AA00</color>
+  <color name="gray">#FFAAAAAA</color>
+  <color name="darkgray">#FF444444</color>
+  <color name="opaque_shadow">#70000000</color>
  <color name="stat_label_background">#FFF0F0F0</color>
  <color name="stat_label_text">#FF0F0F0F</color>
-  <color name="white">#FFFFFFFF</color>
-
-  <!-- Chart colors by series. -->
-  <!-- Green and a transparent green -->
-  <color name="elevation_border">#FF339933</color>
-  <color name="elevation_fill">#40B3CFB3</color>
-
-  <!-- Blue and a transparent blue -->
-  <color name="speed_border">#FF0066FF</color>
-  <color name="speed_fill">#40C8E0FF</color>
-
-  <!-- Red and a transparent red -->
-  <color name="heartrate_border">#FFCC3300</color>
-  <color name="heartrate_fill">#40E88A70</color>
-
-  <!-- Pink and a transparent pink -->
-  <color name="cadence_border">#FFF128F3</color>
-  <color name="cadence_fill">#40F128F3</color>
-
-  <!-- Purple and a transparent purple -->
-  <color name="power_border">#FF401465</color>
-  <color name="power_fill">#40401465</color>
 </resources>
@@ -1,42 +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 ANY STRINGS IN THIS FILE. -->
-  <string name="app_name">My Tracks</string>
-
-  <!-- About Dialog -->
-  <string name="about_googlegroups">mytracks@googlegroups.com</string>
-  <string name="about_weburl">mytracks.appspot.com</string>
-  <string name="about_privacy_weburl">m.google.com/privacy</string>
-  <string name="about_copyright_message">Copyright 2009 Google Inc.</string>
-  <string name="about_bart">Bartlomiej 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_sandor">Sandor Dornbush</string>
-
-  <!-- Sensor Types -->
-  <string name="none">NONE</string>
-  <string name="ant_sensor_type">ANT</string>
-  <string name="srm_ant_bridge_sensor_type">SRM_ANT_BRIDGE</string>
-  <string name="zephyr_sensor_type">ZEPHYR</string>
-
-  <!-- Send to Google URLs -->
-  <string name="sendtogoogle_google_fusiontables_url">google.com/fusiontables</string>
-  <string name="sendtogoogle_google_mymaps_url">maps.google.com</string>
-  <string name="sendtogoogle_google_docs_url">docs.google.com</string>
-</resources>
@@ -15,12 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Keys for application preferences - DO NOT TRANSLATE -->
+  <!-- These are constants used internally for preferences - DO NOT TRANSLATE -->
  <string name="announcement_frequency_key">announcementFrequency</string>
-  <string name="ant_heart_rate_sensor_id_key">antHeartRateSensorId</string>
-  <string name="ant_power_sensor_id_key">antPowerSensorId</string>
-  <string name="ant_srm_bridge_sensor_id_key">antSRMBridgeSensorId</string>
-  <string name="auto_resume_track_timeout_key">autoResumeTrackTimeout</string>
  <string name="bluetooth_device_key">bluetoothDevice</string>
  <string name="bluetooth_pairing_key">bluetoothPairing</string>
  <string name="bluetooth_sensor_key">bluetoothSensor</string>
@@ -32,25 +28,15 @@ limitations under the License.
  <string name="min_required_accuracy_key">minRequiredAccuracy</string>
  <string name="modular_stats_display_key">modularStatsDisplay</string>
  <string name="pick_existing_map_key">pickExistingMap</string>
+  <string name="recording_track_key">recordingTrack</string>
  <string name="report_speed_key">reportSpeed</string>
+  <string name="selected_track_key">selectedTrack</string>
  <string name="send_stats_and_points_key">sendStatsAndPoints</string>
  <string name="send_to_docs_key">sendToDocs</string>
  <string name="send_to_my_maps_key">sendToMyMaps</string>
-  <string name="send_to_fusion_tables_key">sendToFusionTables</string>
+  <string name="sensor_id_key">sensorId</string>
  <string name="sensor_type_key">sensorType</string>
  <string name="share_url_only_key">shareUrlOnly</string>
+  <string name="signal_sampling_frequency_key">signalSamplingFrequency</string>
  <string name="split_frequency_key">splitFrequency</string>
-  <string name="timestamp_track_name_key">timestampTrackName</string>
-
-  <!-- Preference keys which keep transient state (not user preferences) - DO NOT TRANSLATE -->
-  <string name="auto_resume_track_current_retry_key">autoResumeTrackCurrentRetry</string>
-  <string name="recording_track_key">recordingTrack</string>
-  <string name="selected_track_key">selectedTrack</string>
-
-  <!-- Keys for non-persisted preferences - DO NOT TRANSLATE -->
-  <string name="backup_to_sd_key">backupToSd</string>
-  <string name="restore_from_sd_key">restoreFromSd</string>
-  <string name="reset_key">resetToDefaults</string>
-  <string name="sensor_options_key">sensorOptions</string>
-  <string name="ant_options_key">antOptions</string>
-</resources>
+</resources>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rodrigo Damazio	e35e8bcdce	Updating version number to 1.0.16 in preparation for release.	2010-08-30 18:42:48 -03:00
Rodrigo Damazio	5f953aa47f	Fixing version display (missed merge).	2010-08-30 18:36:16 -03:00
Sandor Dornbush	3b3641c69e	Merging changes from head.	2010-08-27 17:21:33 -07:00
Rodrigo Damazio	56ccd518d6	Adding missing Eclipse configuration files for developers - these have to be manually imported	2010-08-24 22:48:49 -03:00
Rodrigo Damazio	0e119950c2	Merging Sandor's changes	2010-08-24 17:02:36 -03:00
Sandor Dornbush	4be4467fc6	Fix NPE.	2010-08-24 12:20:18 -07:00
Sandor Dornbush	06636b2a28	Fix test access modifier.	2010-08-23 09:12:12 -07:00
Sandor Dornbush	71a36d1b25	Address Rodrigo's comments.	2010-08-23 09:05:55 -07:00
Sandor Dornbush	9ba93ff8d2	Fix javadoc.	2010-08-23 08:03:54 -07:00
Sandor Dornbush	4059308dd7	Added comments and license to pref mgr. Removed sampling from track overlay.	2010-08-22 12:51:40 -07:00
sandordornbush	9f43dd2db5	Reverting classpath changes.	2010-08-20 16:11:36 -07:00
sandordornbush	28d868985e	One more minor bug fix for a NPE.	2010-08-20 13:32:53 -07:00
sandordornbush	cf1be26da2	Two minor bug fixes from the developer console.	2010-08-20 10:51:09 -07:00
Sandor Dornbush	1de9b73aa0	Address Rodrigo's comments. Add service preference manager.	2010-08-18 22:05:01 -07:00
Sandor Dornbush	beddc8e1ea	Add Track Writer test. Fix total time bug in stats activity. Fix track segments on the map overlay.	2010-08-16 17:16:43 -07:00
Rodrigo Damazio	e0c34d20a8	Removing DO NOT TRANSLATE values from Japanese translation	2010-08-16 00:57:03 -03:00
Rodrigo Damazio	cc6db5b5cc	Merging japanese translation	2010-08-16 00:54:44 -03:00
Rodrigo Damazio	c38df03add	Ignoring eclipse workspace metadata if present	2010-08-13 13:03:58 -03:00
Rodrigo Damazio	63402358d1	Fixing empty method comment	2010-08-13 04:53:07 -03:00
Rodrigo Damazio	3ae1de735e	Removing overlooked debug lines	2010-08-13 04:52:14 -03:00
Rodrigo Damazio	a701eb0e4f	Fixing 24-hour format mistake	2010-08-13 04:37:37 -03:00
Rodrigo Damazio	09caf017a9	Adding support for segments	2010-08-13 04:37:14 -03:00
Rodrigo Damazio	32b8b2093d	REAL performance improvement in importer - using a bulk insertion	2010-08-13 03:50:55 -03:00
Rodrigo Damazio	c84a4f1aa8	Moving androidmock to the right directory and making eclipse use it properly	2010-08-12 22:16:38 -03:00
Rodrigo Damazio	d90c0b5431	Optimizing the importer a little	2010-08-12 22:14:47 -03:00
Rodrigo Damazio	94f6785f0d	Removing no longer used provider utility methods	2010-08-12 22:06:58 -03:00
Rodrigo Damazio	f01c382807	Style fixing SAX importer contribution	2010-08-12 20:22:54 -03:00
Rodrigo Damazio	6d42803dd8	Updating statistics object usage in SAX importer	2010-08-12 19:43:27 -03:00
Rodrigo Damazio	61e908ccb5	Merge SAX GPX importer contribution	2010-08-12 18:37:38 -03:00
Sandor Dornbush	7bae8c34a7	Integrate most of Rodrigo's comments.	2010-08-11 22:02:49 -07:00
Sandor Dornbush	3960341640	Revert classpath	2010-08-09 16:45:36 -07:00
Sandor Dornbush	06e453dd05	Merging changes from realtime branch into mainline.	2010-08-07 10:38:41 -07:00
boiledorange73	361b1cbad4	Reverted "DO NOT TRANSLATE" entries	2010-08-04 19:51:00 +09:00
boiledorange73	56a866fca7	Modified bits of values-ja files.	2010-08-04 17:13:35 +09:00
boiledorange73	49e0d68374	res/values-ja added	2010-08-04 14:35:30 +09:00
Sandor Dornbush	c9ffd0b4bb	Exporting the TrackRecordingService.	2010-07-27 16:34:13 -07:00
Steffen Horlacher	6fd4294391	Bugfix for empty total time in trip statistics and missing first location in exported files	2010-06-06 23:31:03 +02:00
Rodrigo Damazio	88b2b85f2a	Making Track and Waypoint use the TripStatisticsData class. This grealy simplifies those classes since the fields are the same. There's certainly more cleanup to do on top of this, but I thought this was already more than enough for a single change. The only functional change expected from this is that the average speed is now calculated over the time until the last known position, which IMHO makes sense since the distance used in that calculation only includes up to that position. The visible effect is that having no GPS signal doesn't make the speed decrease. This was imported from perforce CL 15953263.	2010-06-04 14:59:09 -03:00
Rodrigo Damazio	2c1dff6ac8	Adding test project files (TODO: replace easymock with android mock)	2010-06-02 19:26:31 -03:00
Rodrigo Damazio	481b42f563	Auto-merge	2010-06-02 16:58:49 -03:00
Rodrigo Damazio	597c321009	Added tag v1.0.15 for changeset e774d13e5b6a	2010-06-02 16:57:46 -03:00
Rodrigo Damazio	76651f75d8	Automated merge with https://tnapierala-mytracks.googlecode.com/hg/	2010-06-02 16:22:24 -03:00
t napierala	3d8bae55a1	pl_PL - removed some non-translatable strings	2010-06-01 10:00:28 +02:00
Steffen Horlacher	4b6869e367	Added check for negative time changes and bugfix for files with multiple tracks	2010-05-30 20:06:22 +02:00
Steffen Horlacher	477ba7c081	Changes according to comments	2010-05-30 18:10:56 +02:00
johan helin	5b6d9725b8	Removed all strings that should not be translated in the swedish translation of arrays.xml	2010-05-30 14:01:26 +02:00
t napierala	25c3cea115	pl_PL removed colors.xml, removed non-translatable strings as per Issue 68, comment 2	2010-05-30 13:20:08 +02:00
johan helin	d90601276f	Finnished translating my tracks to swedish	2010-05-29 13:30:20 +02:00
johan helin	4f692bc698	Finnished translating strings.xml and did some more of the strings in arrays.xml	2010-05-29 12:44:30 +02:00
johan helin	d8dd02eef0	Further strings translated	2010-05-28 22:38:04 +02:00
johan helin	8ad65ae233	First commit with cleanup from english and some strings translated	2010-05-28 22:22:39 +02:00
t napierala	eabbb4569b	final translation	2010-05-26 16:34:26 +02:00
t napierala	49888b771d	first part of changes	2010-05-26 14:29:40 +02:00
ob	2b1c1cd052	Add a missing string for "Elevation" to the French strings.xml file.	2010-05-24 18:23:39 +01:00
Steffen Horlacher	61884e67ec	track rollback: javadoc and some minor other corrections	2010-05-23 12:58:50 +02:00
Steffen Horlacher	9a2f028843	code format	2010-05-23 11:26:41 +02:00
Steffen Horlacher	2b56acf164	code format	2010-05-23 11:21:27 +02:00
Steffen	98b67dcc28	Sax style GPX file importer and tests	2010-05-23 11:08:51 +02:00
Rodrigo Damazio	500dfa3107	Releasing mytracks 1.0.15	2010-05-23 00:00:00 -03:00
Rodrigo Damazio	c4efcfd2db	Fixing bug in GPX import - we were reading the last point time too soon	2010-05-22 01:17:59 -07:00
Rodrigo Damazio	81ee6bbcf6	Add a few calls back into SendToMyMaps which actually add the stats to the ending waypoint. (imported from perforce)	2010-05-22 00:41:40 -07:00
Rodrigo Damazio	e4e2e76e06	Added tag v1.0.14 for changeset 4c02a4515632	2010-05-20 16:53:43 -07:00
Rodrigo Damazio	f847862e84	Releasing 1.0.14 (no code changes, just a release mistake)	2010-05-20 16:53:40 -07:00
Rodrigo Damazio	427dbeafde	Added tag v1.0.13 for changeset 84cce31f6b83	2010-05-20 12:18:35 -07:00
Rodrigo Damazio	99ac85b40e	Releasing 1.0.13	2010-05-20 12:18:29 -07:00
Rodrigo Damazio	020388baed	Fixing uploading bug which happened in gzipped responses	2010-05-20 11:21:46 -07:00
Rodrigo Damazio	4ade79de4f	Added tag v1.0.12 for changeset 51aa4e7cf7d8	2010-05-20 05:14:00 -03:00
Rodrigo Damazio	870dda9b8b	Importing tests source	2010-05-19 17:35:08 -07:00
Rodrigo Damazio	27dd5298f7	Importing all the source code :)	2010-05-19 17:32:31 -07:00
Rodrigo Damazio	6d5d406ce9	Importing external libraries	2010-05-19 17:31:41 -07:00
Rodrigo Damazio	ffb5e7e6f7	Importing project files	2010-05-19 17:31:20 -07:00
Rodrigo Damazio	0de101c89f	Updating resources to the latest version	2010-05-19 17:30:26 -07:00
Rodrigo Damazio	bd3a0766e1	Adding service definition	2010-05-07 17:58:54 -03:00
Rodrigo Damazio	f536cc8f8a	Adding hgignore for bin and gen dirs	2010-05-07 15:59:52 -03:00
Rodrigo Damazio	826c0495fc	Initial import of MyTracks content files and their dependencies. MyTracksUtils and MyTracksConstants are cut-down versions of the original files which contain only what's used by the content package, we'll later post the rest of them.	2010-05-07 15:59:33 -03:00
Rodrigo Damazio	9eac541ce5	Initial import of MyTracks resources and assets	2010-05-07 15:57:42 -03:00