From 3cf77374c4ecf3ac6781a2e907aff837581f34e1 Mon Sep 17 00:00:00 2001
From: Bartlomiej Niechwiej <Bartlomiej Niechwiej@localhost>
Date: Tue, 26 Oct 2010 20:19:54 -0700
Subject: [PATCH] Fix merge.

---
 MyTracks/res/values-zh-rCN/strings.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index 36abe5d0f..648550a39 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -239,9 +239,6 @@ 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>
 
@@ -421,7 +418,6 @@ limitations under the License.
   <!-- SD card -->
   <string name="io_no_external_storage_found">没有发现存贮设备. 请确认插入了 SD 卡并且你的手机没有将挂载 SD 卡到电脑.</string>
   <string name="io_write_failed">无法写入文件.</string>
-  <string name="io_create_dir_failed">无法在 SD 卡上创建目录.</string>
   <string name="io_create_dir_failed">无法在 SD 存储卡上创建目录.</string>
   <string name="io_write_finished">轨迹已导出到 SD 卡.</string>
   <string name="io_read_finished">从 SD 存储卡读取完毕.</string>