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 @@
Updates
History
Sources
- Categories
Backup
Migrate
Extensions
@@ -194,8 +193,8 @@
Default
Jump to chapters on open
- Updates
- Library update frequency
+ Global update
+ Update frequency
Manual
Hourly
Every 2 hours
@@ -207,8 +206,8 @@
Daily
Every 2 days
Weekly
- Library update order
- Library update restrictions
+ Update order
+ Update restrictions
Update only when the conditions are met
Unmetered network
Charging
@@ -217,14 +216,13 @@
Check for new cover and details when updating library
Show update errors notifications
- Categories
Default category
Always ask
- %d category
- %d categories
- Categories to include in global update
+ Manga in excluded categories will not be updated even if they are also in included categories.
All
None
Include: %s
@@ -364,8 +362,9 @@
Third to last chapter
Fourth to last chapter
Fifth to last chapter
+ Auto-download
Download new chapters
- Categories to include in download
+ Manga in excluded categories will not be downloaded even if they are also in included categories.
Update chapter progress after reading