Merging to head

2011-03-11 23:55:53 -03:00
parent d52aca1d3d
commit 06fceb07cc
12 changed files with 105 additions and 19 deletions
@@ -219,7 +219,6 @@ limitations under the License.
  <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="settings_no_backup_while_recording">在记录轨迹时无法处理备份数据.</string>

  <!-- Backups -->
  <string name="restore_overwrites_warning">从 SD 存储卡恢复备份数据将覆盖掉你当前的所有轨迹和设置. 确定要继续吗?</string>