Merge with c58e4b8519d3ed6959a96192286b83aa1b77f6f3

MyTracks/.classpath

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<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="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<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="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

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

@@ -239,6 +239,9 @@ limitations under the License.
   <string name="backup_write_progress_message">将所有轨迹和设置写入 SD 存储卡中. 这需要一些时间...</string>
   <string name="backup_import_progress_message">从 SD 存储卡读取轨迹和设置中. 这需要一些时间...</string>
 
+  <string name="settings_auto_resume_track_timeout">自动恢复追踪等待时间</string>
+  <string name="settings_auto_resume_track_timeout_summary">手机重启后自动继续上次轨迹记录的最大间隔时间</string>
+
   <!-- MyTracksSky -->
   <string name="mytracks_sky">GPS 卫星</string>
 
@@ -328,6 +331,7 @@ limitations under the License.
   <string name="seconds">秒</string>
 
 
+
   <!-- Distance -->
 
 
@@ -391,6 +395,14 @@ limitations under the License.
 
 
 
+
+
+
+
+
+
+
+
   <!-- Send to Google -->
   <string name="sendtogoogle_title">发送到...</string>