From fb32fc074eceba917714c4bab73e57d00bab66c2 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Thu, 21 Nov 2019 20:06:03 +0800
Subject: [PATCH] up

---
 app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt | 6 +++---
 app/src/main/res/values/strings.xml                         | 2 ++
 app/src/main/res/xml/pref_config_web_dav.xml                | 5 +++++
 app/src/main/res/xml/pref_main.xml                          | 4 ++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt b/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt
index 6329cb2e3..52d197a08 100644
--- a/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt
@@ -19,7 +19,7 @@ class ConfigActivity : VMBaseActivity<ConfigViewModel>(R.layout.activity_config)
 
         when (viewModel.configType) {
             ConfigViewModel.TYPE_CONFIG -> {
-                title_bar.title = "设置"
+                title_bar.title = getString(R.string.setting)
                 val fTag = "configFragment"
                 var configFragment = supportFragmentManager.findFragmentByTag(fTag)
                 if (configFragment == null) configFragment = ConfigFragment()
@@ -28,7 +28,7 @@ class ConfigActivity : VMBaseActivity<ConfigViewModel>(R.layout.activity_config)
                     .commit()
             }
             ConfigViewModel.TYPE_THEME_CONFIG -> {
-                title_bar.title = "主题设置"
+                title_bar.title = getString(R.string.theme_setting)
                 val fTag = "themeConfigFragment"
                 var configFragment = supportFragmentManager.findFragmentByTag(fTag)
                 if (configFragment == null) configFragment = ThemeConfigFragment()
@@ -37,7 +37,7 @@ class ConfigActivity : VMBaseActivity<ConfigViewModel>(R.layout.activity_config)
                     .commit()
             }
             ConfigViewModel.TYPE_WEB_DAV_CONFIG -> {
-                title_bar.title = "WebDav设置"
+                title_bar.title = getString(R.string.backup_restore)
                 val fTag = "webDavFragment"
                 var configFragment = supportFragmentManager.findFragmentByTag(fTag)
                 if (configFragment == null) configFragment = WebDavConfigFragment()
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f940f389f..d1d0625be 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -90,6 +90,8 @@
     <string name="ps_auto_refresh">打开软件时自动更新书籍</string>
     <string name="pt_auto_download">自动下载最新章节</string>
     <string name="ps_auto_download">更新书籍时自动下载最新章节</string>
+    <string name="backup_restore">备份与恢复</string>
+    <string name="web_dav_set_import_old">WebDav设置/导入旧版本数据</string>
     <string name="backup">备份</string>
     <string name="restore">恢复</string>
     <string name="backup_permission">备份请给与存储权限</string>
diff --git a/app/src/main/res/xml/pref_config_web_dav.xml b/app/src/main/res/xml/pref_config_web_dav.xml
index 9591ca1b4..51234ec1a 100644
--- a/app/src/main/res/xml/pref_config_web_dav.xml
+++ b/app/src/main/res/xml/pref_config_web_dav.xml
@@ -30,4 +30,9 @@
         android:title="恢复"
         app:iconSpaceReserved="false" />
 
+    <androidx.preference.Preference
+        android:key="import_old"
+        android:title="导入旧版本数据"
+        app:iconSpaceReserved="false" />
+
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_main.xml b/app/src/main/res/xml/pref_main.xml
index 9eec8a697..c80565e03 100644
--- a/app/src/main/res/xml/pref_main.xml
+++ b/app/src/main/res/xml/pref_main.xml
@@ -30,8 +30,8 @@
 
         <androidx.preference.Preference
             android:key="web_dav_setting"
-            android:summary="通过WebDav云备份"
-            android:title="云备份设置"
+            android:summary="@string/web_dav_set_import_old"
+            android:title="@string/backup_restore"
             app:iconSpaceReserved="false" />
 
         <androidx.preference.Preference