From 5951008c51b01aeb40817b752df22cc5cb4659db Mon Sep 17 00:00:00 2001
From: fisher <tiebayu@126.com>
Date: Wed, 19 May 2021 00:13:05 +0800
Subject: [PATCH 1/3] Update English

---
 app/src/main/res/values/strings.xml | 68 ++++++++++++++---------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b2ba15475..9825fd29f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -763,8 +763,8 @@
     <string name="thread_count">Thread count</string>
     <string name="all_read_time">Total read time</string>
     <string name="un_select_all">Unselect all</string>
-    <string name="import_str">Import str</string>
-    <string name="export_str">Export str</string>
+    <string name="import_str">Import</string>
+    <string name="export_str">Export</string>
     <string name="save_theme_config">Save theme config</string>
     <string name="save_day_theme_summary">Save day theme config</string>
     <string name="save_night_theme_summary">Save night theme config</string>
@@ -773,40 +773,40 @@
     <string name="share_selected_source">Share selected sources</string>
     <string name="sort_by_lastUpdateTime">Sort by update time</string>
     <string name="search_content">Search content</string>
-    <string name="rss_source_empty">关注公众号[开源阅读]获取订阅源!</string>
-    <string name="explore_empty">当前没有发现源,关注公众号[开源阅读]添加带发现的书源!</string>
+    <string name="rss_source_empty">follow Wechat official account [开源阅读] to get Subscription source</string>
+    <string name="explore_empty">empty now,Wechat official account [开源阅读] to get Discovery source</string>
     <string name="page_key_set_help">将焦点放到输入框按下物理按键会自动录入键值,多个按键会自动用英文逗号隔开.</string>
-    <string name="theme_name">主题名称</string>
-    <string name="auto_clear_expired">自动清除过期搜索数据</string>
-    <string name="auto_clear_expired_summary">超过一天的搜索数据</string>
-    <string name="re_segment">重新分段</string>
-    <string name="style_name">样式名称:</string>
-    <string name="empty_msg_import_book">点击右上角文件夹图标,选择文件夹</string>
-    <string name="scan_folder">智能扫描</string>
-    <string name="copy_url">拷贝URL</string>
-    <string name="no_book">没有书籍</string>
-    <string name="keep_original_name">保留原名</string>
-    <string name="click_regional_config">点击区域设置</string>
-    <string name="colse">关闭</string>
-    <string name="next_page">下一页</string>
-    <string name="prev_page">上一页</string>
-    <string name="non_action">无操作</string>
-    <string name="body_title">正文标题</string>
-    <string name="show_hide">显示/隐藏</string>
+    <string name="theme_name">Theme name</string>
+    <string name="auto_clear_expired">"Clear expired search histories automatically "</string>
+    <string name="auto_clear_expired_summary">Search histories more than one day</string>
+    <string name="re_segment">Re-segment</string>
+    <string name="style_name">Style name:</string>
+    <string name="empty_msg_import_book">Click the folder icon in the upper right corner and select the folder</string>
+    <string name="scan_folder">Intelligent scanning</string>
+    <string name="copy_url">Copy URL</string>
+    <string name="no_book">No books</string>
+    <string name="keep_original_name">Keep the original name</string>
+    <string name="click_regional_config">Screen touch control</string>
+    <string name="colse">Close</string>
+    <string name="next_page">Next page</string>
+    <string name="prev_page">Prior page</string>
+    <string name="non_action">None</string>
+    <string name="body_title">Title</string>
+    <string name="show_hide">Show/Hide</string>
     <string name="header_footer">footer <![CDATA[&]]> header</string>
-    <string name="rule_subscription">规则订阅</string>
+    <string name="rule_subscription">Rule Subscription</string>
     <string name="rule_sub_empty_msg">添加大佬们提供的规则导入地址\n添加后点击可导入规则</string>
-    <string name="get_book_progress">拉取云端进度</string>
-    <string name="current_progress_exceeds_cloud">当前进度超过云端进度,是否同步?</string>
-    <string name="sync_book_progress_t">同步阅读进度</string>
-    <string name="sync_book_progress_s">进入退出阅读界面时同步阅读进度</string>
-    <string name="create_bookmark_error">创建书签失败</string>
-    <string name="single_url">单URL</string>
-    <string name="export_bookshelf">导出书单</string>
-    <string name="import_bookshelf">导入书单</string>
-    <string name="pre_download">预下载</string>
-    <string name="pre_download_s">预先下载10章正文</string>
-    <string name="sort_enable">启用排序</string>
-    <string name="background_image">背景图片</string>
+    <string name="get_book_progress">Pull the cloud  progress</string>
+    <string name="current_progress_exceeds_cloud">The current progress exceeds the cloud progress. Do you want to synchronize?</string>
+    <string name="sync_book_progress_t">"Synchronous reading progress "</string>
+    <string name="sync_book_progress_s">"Synchronize reading progress when entering / exiting the reading interface "</string>
+    <string name="create_bookmark_error">Failed to create bookmark</string>
+    <string name="single_url">Single URL</string>
+    <string name="export_bookshelf">Export the list of books</string>
+    <string name="import_bookshelf">Import the list of books</string>
+    <string name="pre_download">Download in advance</string>
+    <string name="pre_download_s">Download 10 chapters in advance</string>
+    <string name="sort_enable">Enable sorting</string>
+    <string name="background_image">Background image</string>
 
 </resources>

From 8595f5d4279c4c42b72ae651844c77105e304ae6 Mon Sep 17 00:00:00 2001
From: fisher <tiebayu@126.com>
Date: Wed, 19 May 2021 01:56:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BF=BB=E8=AF=91/?=
 =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/help/appHelp.md           |  5 +--
 app/src/main/res/layout/dialog_tip_config.xml |  6 ++--
 app/src/main/res/values-zh-rHK/strings.xml    |  3 ++
 app/src/main/res/values-zh-rTW/strings.xml    |  3 ++
 app/src/main/res/values-zh/strings.xml        |  3 ++
 app/src/main/res/values/strings.xml           | 34 +++++++++++++++++--
 6 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/app/src/main/assets/help/appHelp.md b/app/src/main/assets/help/appHelp.md
index 9b44508c5..d7e4fb12b 100644
--- a/app/src/main/assets/help/appHelp.md
+++ b/app/src/main/assets/help/appHelp.md
@@ -10,10 +10,7 @@
 2. 正文出现缺字漏字、内容缺失、排版错乱等情况，如何处理？
 * 有可能是净化规则出现问题，先关闭替换净化并刷新，再观察是否正常。如果正常说明净化规则存在误杀，如果关闭后仍然出现相关问题，请点击源链接查看原文与正文是否相同，如果不同，再进行反馈。
 
-3. “勐”、“收十”、“猫腻”、“发动机”、“沃尔沃”等词无法替换净化，如何解决？
-* 请在 界面 - 简/繁 中关闭简繁互转功能.
-
-4. 漫画源看书显示乱码，如何解决？
+3. 漫画源看书显示乱码，如何解决？
 * 异次元和阅读是两个不同的软件，**两个软件的源并不通用**，请导入阅读的支持的漫画源！
 
 ## 书源相关
diff --git a/app/src/main/res/layout/dialog_tip_config.xml b/app/src/main/res/layout/dialog_tip_config.xml
index f28421f1f..55bfb6b4e 100644
--- a/app/src/main/res/layout/dialog_tip_config.xml
+++ b/app/src/main/res/layout/dialog_tip_config.xml
@@ -47,7 +47,7 @@
         android:layout_height="wrap_content"
         android:padding="3dp"
         app:max="10"
-        app:title="字号" />
+        app:title="@string/title_font_size" />
 
     <io.legado.app.ui.widget.DetailSeekBar
         android:id="@+id/dsb_title_top"
@@ -55,7 +55,7 @@
         android:layout_height="wrap_content"
         android:padding="3dp"
         app:max="100"
-        app:title="上间距" />
+        app:title="@string/title_margin_top" />
 
     <io.legado.app.ui.widget.DetailSeekBar
         android:id="@+id/dsb_title_bottom"
@@ -63,7 +63,7 @@
         android:layout_height="wrap_content"
         android:padding="3dp"
         app:max="100"
-        app:title="下间距" />
+        app:title="@string/title_margin_bottom" />
 
     <io.legado.app.ui.widget.text.AccentTextView
         android:id="@+id/tv_header_padding"
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 00e5789b7..5e4fa1183 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -827,5 +827,8 @@
     <string name="show_unread">显示未读标志</string>
     <string name="use_default_cover">总是使用默认封面</string>
     <string name="use_default_cover_s">总是显示默认封面,不显示网络封面</string>
+    <string name="title_font_size">字號</string>
+    <string name="title_margin_top">上邊距</string>
+    <string name="title_margin_bottom">下邊距</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 55ac557d9..93a04e6d6 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -831,5 +831,8 @@
     <string name="show_unread">显示未读标志</string>
     <string name="use_default_cover">总是使用默认封面</string>
     <string name="use_default_cover_s">总是显示默认封面,不显示网络封面</string>
+    <string name="title_font_size">字號</string>
+    <string name="title_margin_top">上邊距</string>
+    <string name="title_margin_bottom">下邊距</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 1da9bdf53..79cb504bf 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -831,5 +831,8 @@
     <string name="show_unread">显示未读标志</string>
     <string name="use_default_cover">总是使用默认封面</string>
     <string name="use_default_cover_s">总是显示默认封面,不显示网络封面</string>
+    <string name="title_font_size">字号</string>
+    <string name="title_margin_top">上边距</string>
+    <string name="title_margin_bottom">下边距</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 712d51e07..5af97d9d2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -352,7 +352,7 @@
     <string name="sort">Sort</string>
     <string name="sort_auto">Sort automatically</string>
     <string name="sort_manual">Sort manually</string>
-    <string name="sort_name">Sort name</string>
+    <string name="sort_name">Sort by name</string>
     <string name="go_to_top">Scroll to the top</string>
     <string name="go_to_bottom">Scroll to the bottom</string>
     <string name="read_y">Read: %s</string>
@@ -765,7 +765,7 @@
     <string name="import_str">Import</string>
     <string name="export_str">Export</string>
     <string name="save_theme_config">Save theme config</string>
-    <string name="save_day_theme_summary">Save day theme config</string>
+    <string name="save_day_theme_summary">在状态栏</string>
     <string name="save_night_theme_summary">Save night theme config</string>
     <string name="theme_list">Theme list</string>
     <string name="theme_list_summary">Save, Import, Share theme</string>
@@ -807,5 +807,33 @@
     <string name="pre_download_s">Download 10 chapters in advance</string>
     <string name="sort_enable">Enable sorting</string>
     <string name="background_image">Background image</string>
-
+    <string name="copy_book_url">Copy book URL</string>
+    <string name="copy_toc_url">Copy chapters URL</string>
+    <string name="export_folder">Export to a folder</string>
+    <string name="export_charset">Exported text coding</string>
+    <string name="export_to_web_dav">Export to WebDav</string>
+    <string name="reverse_content">Reverse content</string>
+    <string name="debug">Debug</string>
+    <string name="crash_log">Crash log</string>
+    <string name="use_zh_layout">Custom Chinese line feed</string>
+    <string name="image_style">Style of Images</string>
+    <string name="system_tts">System tts</string>
+    <string name="export_type">Exported file format</string>
+    <string name="checkAuthor">Check by author</string>
+    <string name="url_already">"This URL has subscribed "</string>
+    <string name="high_brush_title">High screen refresh rate</string>
+    <string name="high_brush_summary">Use maximum screen refresh rate</string>
+    <string name="export_all">Export all</string>
+    <string name="complete">Finished</string>
+    <string name="show_unread">"Show unread flag "</string>
+    <string name="use_default_cover">Always show default cover</string>
+    <string name="use_default_cover_s">Always show the default cover, do not show the network cover</string>
+    <string name="search_src">Search source code</string>
+    <string name="boo_src">Book source code</string>
+     <string name="toc_src">Chapters source code</string>
+    <string name="content_src">Content source code</string>
+    <string name="list_src">List source code</string>
+    <string name="title_font_size">Font size</string>
+    <string name="title_margin_top">Margin top</string>
+    <string name="title_margin_bottom">Marigin bottom</string>
 </resources>

From d2995f3328401d50ac7f6f9bdd653ecab25f895b Mon Sep 17 00:00:00 2001
From: fisher <tiebayu@126.com>
Date: Wed, 19 May 2021 02:00:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5af97d9d2..624db85d0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -723,7 +723,7 @@
     <string name="disabled">Disabled</string>
     <string name="starting_download">Starting download</string>
     <string name="already_in_download">This book is already in Download list</string>
-    <string name="click_to_open">click to open</string>
+    <string name="click_to_open">Click to open</string>
     <string name="follow_public_account_summary">Follow [开源阅读] to support me by clicking on ads</string>
     <string name="weChat_appreciation_code">WeChat Tipping Code</string>
     <string name="alipay">AliPay</string>
@@ -765,7 +765,7 @@
     <string name="import_str">Import</string>
     <string name="export_str">Export</string>
     <string name="save_theme_config">Save theme config</string>
-    <string name="save_day_theme_summary">在状态栏</string>
+    <string name="save_day_theme_summary">Save day theme config</string>
     <string name="save_night_theme_summary">Save night theme config</string>
     <string name="theme_list">Theme list</string>
     <string name="theme_list_summary">Save, Import, Share theme</string>