From 7ef4688a90fad054485048a97a050546f40eadc1 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Thu, 19 May 2022 10:27:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/menu/main_bookshelf.xml   | 12 ++++++------
 app/src/main/res/values-es-rES/strings.xml |  7 ++++++-
 app/src/main/res/values-ja-rJP/strings.xml |  7 ++++++-
 app/src/main/res/values-pt-rBR/strings.xml |  7 ++++++-
 app/src/main/res/values-zh-rHK/strings.xml |  7 ++++++-
 app/src/main/res/values-zh-rTW/strings.xml |  7 ++++++-
 app/src/main/res/values-zh/strings.xml     |  6 ++++++
 app/src/main/res/values/non_translat.xml   |  2 ++
 app/src/main/res/values/strings.xml        | 14 ++++++--------
 9 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/app/src/main/res/menu/main_bookshelf.xml b/app/src/main/res/menu/main_bookshelf.xml
index fef446a1f..2076ceaa7 100644
--- a/app/src/main/res/menu/main_bookshelf.xml
+++ b/app/src/main/res/menu/main_bookshelf.xml
@@ -10,12 +10,6 @@
         android:title="@string/search"
         app:showAsAction="always" />
 
-    <item
-        android:id="@+id/menu_remote"
-        android:icon="@drawable/ic_add"
-        android:title="@string/add_remote_book"
-        app:showAsAction="always" />
-
     <item
         android:id="@+id/menu_update_toc"
         android:icon="@drawable/ic_refresh_black_24dp"
@@ -28,6 +22,12 @@
         android:title="@string/book_local"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/menu_remote"
+        android:icon="@drawable/ic_add"
+        android:title="@string/add_remote_book"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/menu_add_url"
         android:icon="@drawable/ic_add_online"
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 741265978..eedf3e5fe 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -982,6 +982,11 @@
     <string name="click_read_button_load">点击阅读加载目录</string>
     <string name="cookie">清除cookie</string>
     <string name="download_and_import_file">导入在线书籍文件</string>
-
+    <string name="upload_book_success">Upload Success</string>
+    <string name="upload_book_fail">Upload Fail</string>
+    <string name="download_book_success">Download Success</string>
+    <string name="download_book_fail">Download Fail</string>
+    <string name="upload_to_remote">Upload</string>
+    <string name="add_remote_book">WebDavBook</string>
     <!-- string end -->
 </resources>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index e24e9b362..e3eb55afc 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -985,6 +985,11 @@
     <string name="click_read_button_load">点击阅读加载目录</string>
     <string name="cookie">清除cookie</string>
     <string name="download_and_import_file">导入在线书籍文件</string>
-
+    <string name="upload_book_success">Upload Success</string>
+    <string name="upload_book_fail">Upload Fail</string>
+    <string name="download_book_success">Download Success</string>
+    <string name="download_book_fail">Download Fail</string>
+    <string name="upload_to_remote">Upload</string>
+    <string name="add_remote_book">WebDavBook</string>
     <!-- string end -->
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 95fb2ec20..29bca97e1 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -985,6 +985,11 @@
     <string name="click_read_button_load">点击阅读加载目录</string>
     <string name="cookie">清除cookie</string>
     <string name="download_and_import_file">导入在线书籍文件</string>
-
+    <string name="upload_book_success">Upload Success</string>
+    <string name="upload_book_fail">Upload Fail</string>
+    <string name="download_book_success">Download Success</string>
+    <string name="download_book_fail">Download Fail</string>
+    <string name="upload_to_remote">Upload</string>
+    <string name="add_remote_book">WebDavBook</string>
     <!-- string end -->
 </resources>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 3b97eaf2b..813807e00 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -982,6 +982,11 @@
     <string name="click_read_button_load">点击阅读加载目录</string>
     <string name="cookie">清除cookie</string>
     <string name="download_and_import_file">导入在线书籍文件</string>
-
+    <string name="upload_book_success">Upload Success</string>
+    <string name="upload_book_fail">Upload Fail</string>
+    <string name="download_book_success">Download Success</string>
+    <string name="download_book_fail">Download Fail</string>
+    <string name="upload_to_remote">Upload</string>
+    <string name="add_remote_book">WebDav书籍</string>
     <!-- string end -->
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 975d7dbba..498e579e7 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -984,6 +984,11 @@
     <string name="click_read_button_load">点击阅读加载目录</string>
     <string name="cookie">清除cookie</string>
     <string name="download_and_import_file">导入在线书籍文件</string>
-
+    <string name="upload_book_success">Upload Success</string>
+    <string name="upload_book_fail">Upload Fail</string>
+    <string name="download_book_success">Download Success</string>
+    <string name="download_book_fail">Download Fail</string>
+    <string name="upload_to_remote">Upload</string>
+    <string name="add_remote_book">WebDav书籍</string>
     <!-- string end -->
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 018ccb9d8..2134ba4e4 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -984,5 +984,11 @@
     <string name="click_read_button_load">点击阅读加载目录</string>
     <string name="cookie">清除cookie</string>
     <string name="download_and_import_file">导入在线书籍文件</string>
+    <string name="upload_book_success">Upload Success</string>
+    <string name="upload_book_fail">Upload Fail</string>
+    <string name="download_book_success">Download Success</string>
+    <string name="download_book_fail">Download Fail</string>
+    <string name="upload_to_remote">上传WebDav</string>
+    <string name="add_remote_book">WebDav书籍</string>
     <!-- string end -->
 </resources>
diff --git a/app/src/main/res/values/non_translat.xml b/app/src/main/res/values/non_translat.xml
index fc0439271..b53ca7e51 100644
--- a/app/src/main/res/values/non_translat.xml
+++ b/app/src/main/res/values/non_translat.xml
@@ -20,4 +20,6 @@
     <string name="vip_title">🔒%s</string>
     <string name="payed_title">🔓%s</string>
 
+    <string name="separator">丨</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e6352d380..498bd7030 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,13 +6,6 @@
     <string name="tip_perm_request_storage">Legado needs storage access to find and read books. please go "App Settings" to allow "Storage permission".</string>
 
     <!--Other-->
-    <string name="upload_book_success" translatable="false">Upload Success</string>
-    <string name="upload_book_fail" translatable="false">Upload Fail</string>
-    <string name="download_book_success" translatable="false">Download Success</string>
-    <string name="download_book_fail" translatable="false">Download Fail</string>
-    <string name="separator" translatable="false">丨</string>
-    <string name="upload_to_remote" translatable="false">Upload</string>
-    <string name="add_remote_book" translatable="false">Add Remote</string>
     <string name="menu_backup">Home</string>
     <string name="menu_restore">Restore</string>
     <string name="menu_import_old">Import Legado data</string>
@@ -992,6 +985,11 @@
     <string name="click_read_button_load">点击阅读加载目录</string>
     <string name="cookie">清除cookie</string>
     <string name="download_and_import_file">导入在线书籍文件</string>
-
+    <string name="upload_book_success">Upload Success</string>
+    <string name="upload_book_fail">Upload Fail</string>
+    <string name="download_book_success">Download Success</string>
+    <string name="download_book_fail">Download Fail</string>
+    <string name="upload_to_remote">Upload</string>
+    <string name="add_remote_book">WebDavBook</string>
     <!-- string end -->
 </resources>