From b2d697131cabc8b85a06f871b4d0ce23f08532a1 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Tue, 6 Apr 2021 23:29:13 -0400
Subject: [PATCH] Add clarification for category exclusion (closes #4777)

---
 .../eu/kanade/tachiyomi/ui/more/MoreController.kt |  2 +-
 .../ui/setting/SettingsDownloadController.kt      |  7 ++++---
 .../ui/setting/SettingsLibraryController.kt       |  7 ++++---
 app/src/main/res/values/strings.xml               | 15 +++++++--------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
index 12172ff32..843dff2ba 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
@@ -78,7 +78,7 @@ class MoreController :
                 }
             }
             preference {
-                titleRes = R.string.label_categories
+                titleRes = R.string.categories
                 iconRes = R.drawable.ic_label_24dp
                 iconTint = tintColor
                 onClick {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
index d71413351..48b0eee93 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt
@@ -100,7 +100,7 @@ class SettingsDownloadController : SettingsController() {
         val categories = listOf(Category.createDefault()) + dbCategories
 
         preferenceCategory {
-            titleRes = R.string.pref_download_new
+            titleRes = R.string.pref_category_auto_download
 
             switchPreference {
                 key = Keys.downloadNew
@@ -109,7 +109,7 @@ class SettingsDownloadController : SettingsController() {
             }
             preference {
                 key = Keys.downloadNewCategories
-                titleRes = R.string.pref_download_new_categories
+                titleRes = R.string.categories
                 onClick {
                     DownloadCategoriesDialog().showDialog(router)
                 }
@@ -241,7 +241,8 @@ class SettingsDownloadController : SettingsController() {
                 .toIntArray()
 
             return MaterialDialog(activity!!)
-                .title(R.string.pref_download_new_categories)
+                .title(R.string.categories)
+                .message(R.string.pref_download_new_categories_details)
                 .listItemsQuadStateMultiChoice(
                     items = items,
                     initialSelected = preselected
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
index bc431e56b..7dd216057 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
@@ -83,7 +83,7 @@ class SettingsLibraryController : SettingsController() {
         }
 
         preferenceCategory {
-            titleRes = R.string.pref_category_library_categories
+            titleRes = R.string.categories
 
             preference {
                 key = "pref_action_edit_categories"
@@ -171,7 +171,7 @@ class SettingsLibraryController : SettingsController() {
             }
             preference {
                 key = Keys.libraryUpdateCategories
-                titleRes = R.string.pref_library_update_categories
+                titleRes = R.string.categories
                 onClick {
                     LibraryGlobalUpdateCategoriesDialog().showDialog(router)
                 }
@@ -312,7 +312,8 @@ class SettingsLibraryController : SettingsController() {
                 .toIntArray()
 
             return MaterialDialog(activity!!)
-                .title(R.string.pref_library_update_categories)
+                .title(R.string.categories)
+                .message(R.string.pref_library_update_categories_details)
                 .listItemsQuadStateMultiChoice(
                     items = items,
                     initialSelected = preselected
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a5241411..121d455da 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,7 +18,6 @@
     <string name="label_recent_updates">Updates</string>
     <string name="label_recent_manga">History</string>
     <string name="label_sources">Sources</string>
-    <string name="label_categories">Categories</string>
     <string name="label_backup">Backup</string>
     <string name="label_migration">Migrate</string>
     <string name="label_extensions">Extensions</string>
@@ -194,8 +193,8 @@
     <string name="default_columns">Default</string>
     <string name="pref_jump_to_chapters">Jump to chapters on open</string>
 
-    <string name="pref_category_library_update">Updates</string>
-    <string name="pref_library_update_interval">Library update frequency</string>
+    <string name="pref_category_library_update">Global update</string>
+    <string name="pref_library_update_interval">Update frequency</string>
     <string name="update_never">Manual</string>
     <string name="update_1hour">Hourly</string>
     <string name="update_2hour">Every 2 hours</string>
@@ -207,8 +206,8 @@
     <string name="update_24hour">Daily</string>
     <string name="update_48hour">Every 2 days</string>
     <string name="update_weekly">Weekly</string>
-    <string name="pref_library_update_prioritization">Library update order</string>
-    <string name="pref_library_update_restriction">Library update restrictions</string>
+    <string name="pref_library_update_prioritization">Update order</string>
+    <string name="pref_library_update_restriction">Update restrictions</string>
     <string name="pref_library_update_restriction_summary">Update only when the conditions are met</string>
     <string name="network_unmetered">Unmetered network</string>
     <string name="charging">Charging</string>
@@ -217,14 +216,13 @@
     <string name="pref_library_update_refresh_metadata_summary">Check for new cover and details when updating library</string>
     <string name="pref_library_update_error_notification">Show update errors notifications</string>
 
-    <string name="pref_category_library_categories">Categories</string>
     <string name="default_category">Default category</string>
     <string name="default_category_summary">Always ask</string>
     <plurals name="num_categories">
         <item quantity="one">%d category</item>
         <item quantity="other">%d categories</item>
     </plurals>
-    <string name="pref_library_update_categories">Categories to include in global update</string>
+    <string name="pref_library_update_categories_details">Manga in excluded categories will not be updated even if they are also in included categories.</string>
     <string name="all">All</string>
     <string name="none">None</string>
     <string name="include">Include: %s</string>
@@ -364,8 +362,9 @@
     <string name="third_to_last">Third to last chapter</string>
     <string name="fourth_to_last">Fourth to last chapter</string>
     <string name="fifth_to_last">Fifth to last chapter</string>
+    <string name="pref_category_auto_download">Auto-download</string>
     <string name="pref_download_new">Download new chapters</string>
-    <string name="pref_download_new_categories">Categories to include in download</string>
+    <string name="pref_download_new_categories_details">Manga in excluded categories will not be downloaded even if they are also in included categories.</string>
 
       <!-- Tracking section -->
     <string name="pref_auto_update_manga_sync">Update chapter progress after reading</string>