Fix nsfw sources filtering

Currently translated at 63.3% (306 of 483 strings)

Co-authored-by: Nayuki <me@nayuki.cyou>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/th/
Translation: Kotatsu/Strings

app/build.gradle

@@ -16,8 +16,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 34
-		versionCode = 577
+		versionCode = 578
-		versionName = '6.1'
+		versionName = '6.1.1'
 		generatedDensities = []
 		testInstrumentationRunner "org.koitharu.kotatsu.HiltTestRunner"
 		ksp {
@@ -81,7 +81,7 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:aae3fa3b05') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:7fbeb2e266') {
 		exclude group: 'org.json', module: 'json'
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/bookmarks/ui/BookmarksFragment.kt

@@ -14,7 +14,6 @@ import androidx.core.view.updatePadding
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.GridLayoutManager
 import coil.ImageLoader
-import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.bookmarks.domain.Bookmark
@@ -25,8 +24,7 @@ import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.list.fastscroll.FastScroller
-import org.koitharu.kotatsu.core.ui.util.ReversibleAction
+import org.koitharu.kotatsu.core.ui.util.ReversibleActionObserver
-import org.koitharu.kotatsu.core.ui.util.reverseAsync
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.databinding.FragmentListSimpleBinding
@@ -38,7 +36,6 @@ import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
 import org.koitharu.kotatsu.list.ui.adapter.TypedListSpacingDecoration
 import org.koitharu.kotatsu.list.ui.model.ListHeader
 import org.koitharu.kotatsu.main.ui.owners.AppBarOwner
-import org.koitharu.kotatsu.main.ui.owners.SnackbarOwner
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import javax.inject.Inject
@@ -105,7 +102,7 @@ class BookmarksFragment :
 			viewLifecycleOwner,
 			SnackbarErrorObserver(binding.recyclerView, this)
 		)
-		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ::onActionDone)
+		viewModel.onActionDone.observeEvent(viewLifecycleOwner, ReversibleActionObserver(binding.recyclerView))
 	}
 
 	override fun onDestroyView() {
@@ -184,17 +181,6 @@ class BookmarksFragment :
 		}
 	}
 
-	private fun onActionDone(action: ReversibleAction) {
-		val handle = action.handle
-		val length = if (handle == null) Snackbar.LENGTH_SHORT else Snackbar.LENGTH_LONG
-		val snackbar =
-			Snackbar.make((activity as SnackbarOwner).snackbarHost, action.stringResId, length)
-		if (handle != null) {
-			snackbar.setAction(R.string.undo) { handle.reverseAsync() }
-		}
-		snackbar.show()
-	}
-
 	private inner class SpanSizeLookup : GridLayoutManager.SpanSizeLookup(), Runnable {
 
 		init {

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/list/fastscroll/FastScroller.kt

@@ -19,13 +19,13 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
 import androidx.core.content.withStyledAttributes
 import androidx.core.view.GravityCompat
+import androidx.core.view.ancestors
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.getThemeColor
 import org.koitharu.kotatsu.core.util.ext.isLayoutReversed
-import org.koitharu.kotatsu.core.util.ext.parents
 import org.koitharu.kotatsu.databinding.FastScrollerBinding
 import kotlin.math.roundToInt
 import com.google.android.material.R as materialR
@@ -522,7 +522,7 @@ class FastScroller @JvmOverloads constructor(
 		return BubbleSize.entries.getOrNull(ordinal) ?: defaultValue
 	}
 
-	private fun findValidParent(view: View): ViewGroup? = view.parents.firstNotNullOfOrNull { p ->
+	private fun findValidParent(view: View): ViewGroup? = view.ancestors.firstNotNullOfOrNull { p ->
 		if (p is FrameLayout || p is ConstraintLayout || p is CoordinatorLayout || p is RelativeLayout) {
 			p as ViewGroup
 		} else {

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/sheet/AdaptiveSheetHeaderBar.kt

@@ -9,10 +9,10 @@ import androidx.annotation.AttrRes
 import androidx.annotation.StringRes
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.withStyledAttributes
+import androidx.core.view.ancestors
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.core.util.ext.parents
 import org.koitharu.kotatsu.databinding.LayoutSheetHeaderAdaptiveBinding
 
 class AdaptiveSheetHeaderBar @JvmOverloads constructor(
@@ -81,14 +81,9 @@ class AdaptiveSheetHeaderBar @JvmOverloads constructor(
 	}
 
 	private fun findParentSheetBehavior(): AdaptiveSheetBehavior? {
-		for (p in parents) {
+		return ancestors.firstNotNullOfOrNull {
-			val layoutParams = (p as? View)?.layoutParams
+			((it as? View)?.layoutParams as? CoordinatorLayout.LayoutParams)
-			if (layoutParams is CoordinatorLayout.LayoutParams) {
+				?.let { params -> AdaptiveSheetBehavior.from(params) }
-				AdaptiveSheetBehavior.from(layoutParams)?.let {
-					return it
-				}
-			}
 		}
-		return null
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/View.kt

@@ -5,10 +5,10 @@ import android.graphics.Rect
 import android.view.View
 import android.view.View.MeasureSpec
 import android.view.ViewGroup
-import android.view.ViewParent
 import android.view.inputmethod.InputMethodManager
 import android.widget.Checkable
 import androidx.core.view.children
+import androidx.core.view.descendants
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
@@ -89,23 +89,8 @@ fun Slider.setValueRounded(newValue: Float) {
 	value = roundedValue.coerceIn(valueFrom, valueTo)
 }
 
-fun <T : View> ViewGroup.findViewsByType(clazz: Class<T>): Sequence<T> {
-	if (childCount == 0) {
-		return emptySequence()
-	}
-	return sequence {
-		for (view in children) {
-			if (clazz.isInstance(view)) {
-				yield(clazz.cast(view)!!)
-			} else if (view is ViewGroup && view.childCount != 0) {
-				yieldAll(view.findViewsByType(clazz))
-			}
-		}
-	}
-}
-
 fun RecyclerView.invalidateNestedItemDecorations() {
-	findViewsByType(RecyclerView::class.java).forEach {
+	descendants.filterIsInstance<RecyclerView>().forEach {
 		it.invalidateItemDecorations()
 	}
 }
@@ -113,15 +98,6 @@ fun RecyclerView.invalidateNestedItemDecorations() {
 val View.parentView: ViewGroup?
 	get() = parent as? ViewGroup
 
-val View.parents: Sequence<ViewParent>
-	get() = sequence {
-		var p: ViewParent? = parent
-		while (p != null) {
-			yield(p)
-			p = p.parent
-		}
-	}
-
 fun View.measureDimension(desiredSize: Int, measureSpec: Int): Int {
 	var result: Int
 	val specMode = MeasureSpec.getMode(measureSpec)

app/src/main/kotlin/org/koitharu/kotatsu/explore/data/MangaSourcesRepository.kt

@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.explore.data
 import androidx.room.withTransaction
 import dagger.Reusable
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
@@ -11,12 +12,12 @@ import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.dao.MangaSourcesDao
 import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
 import org.koitharu.kotatsu.core.model.MangaSource
+import org.koitharu.kotatsu.core.model.isNsfw
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.observeAsFlow
 import org.koitharu.kotatsu.core.ui.util.ReversibleHandle
 import org.koitharu.kotatsu.parsers.model.ContentType
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.move
 import java.util.Collections
 import java.util.EnumSet
 import javax.inject.Inject
@@ -76,14 +77,6 @@ class MangaSourcesRepository @Inject constructor(
 		}
 	}
 
-	suspend fun setSourcesEnabled(sources: Iterable<MangaSource>, isEnabled: Boolean) {
-		db.withTransaction {
-			for (s in sources) {
-				dao.setEnabled(s.name, isEnabled)
-			}
-		}
-	}
-
 	suspend fun disableAllSources() {
 		db.withTransaction {
 			assimilateNewSources()
@@ -99,46 +92,20 @@ class MangaSourcesRepository @Inject constructor(
 		}
 	}
 
-	suspend fun setPosition(source: MangaSource, index: Int) {
+	fun observeNewSources(): Flow<Set<MangaSource>> = combine(
-		db.withTransaction {
+		dao.observeAll(),
-			val all = dao.findAll().toMutableList()
+		observeIsNsfwDisabled(),
-			val sourceIndex = all.indexOfFirst { x -> x.source == source.name }
+	) { entities, skipNsfw ->
-			if (sourceIndex !in all.indices) {
-				val entity = MangaSourceEntity(
-					source = source.name,
-					isEnabled = false,
-					sortKey = index,
-				)
-				all.add(index, entity)
-				dao.upsert(entity)
-			} else {
-				all.move(sourceIndex, index)
-			}
-			for ((i, e) in all.withIndex()) {
-				if (e.sortKey != i) {
-					dao.setSortKey(e.source, i)
-				}
-			}
-		}
-	}
-
-	fun observeNewSources(): Flow<Set<MangaSource>> = dao.observeAll().map { entities ->
 		val result = EnumSet.copyOf(remoteSources)
 		for (e in entities) {
 			result.remove(MangaSource(e.source))
 		}
+		if (skipNsfw) {
+			result.removeAll { x -> x.isNsfw() }
+		}
 		result
 	}.distinctUntilChanged()
 
-	suspend fun getNewSources(): Set<MangaSource> {
-		val entities = dao.findAll()
-		val result = EnumSet.copyOf(remoteSources)
-		for (e in entities) {
-			result.remove(MangaSource(e.source))
-		}
-		return result
-	}
-
 	suspend fun assimilateNewSources(): Set<MangaSource> {
 		val new = getNewSources()
 		if (new.isEmpty()) {
@@ -153,6 +120,9 @@ class MangaSourcesRepository @Inject constructor(
 			)
 		}
 		dao.insertIfAbsent(entities)
+		if (settings.isNsfwContentDisabled) {
+			new.removeAll { x -> x.isNsfw() }
+		}
 		return new
 	}
 
@@ -160,6 +130,15 @@ class MangaSourcesRepository @Inject constructor(
 		return dao.findAll().isEmpty()
 	}
 
+	private suspend fun getNewSources(): MutableSet<MangaSource> {
+		val entities = dao.findAll()
+		val result = EnumSet.copyOf(remoteSources)
+		for (e in entities) {
+			result.remove(MangaSource(e.source))
+		}
+		return result
+	}
+
 	private fun List<MangaSourceEntity>.toSources(skipNsfwSources: Boolean): List<MangaSource> {
 		val result = ArrayList<MangaSource>(size)
 		for (entity in this) {

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt

@@ -3,9 +3,9 @@ package org.koitharu.kotatsu.reader.ui.pager.webtoon
 import android.content.Context
 import android.graphics.PointF
 import android.util.AttributeSet
+import androidx.core.view.ancestors
 import androidx.recyclerview.widget.RecyclerView
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
-import org.koitharu.kotatsu.core.util.ext.parents
 import org.koitharu.kotatsu.parsers.util.toIntUp
 
 private const val SCROLL_UNKNOWN = -1
@@ -93,7 +93,7 @@ class WebtoonImageView @JvmOverloads constructor(
 		if (oldh == h || oldw == 0 || oldh == 0 || scrollRange == SCROLL_UNKNOWN) return
 
 		computeScrollRange()
-		val container = parents.firstNotNullOfOrNull { it as? WebtoonFrameLayout } ?: return
+		val container = ancestors.firstNotNullOfOrNull { it as? WebtoonFrameLayout } ?: return
 		val parentHeight = parentHeight()
 		if (scrollPos != 0 && container.bottom < parentHeight) {
 			scrollTo(scrollRange)
@@ -115,6 +115,6 @@ class WebtoonImageView @JvmOverloads constructor(
 	}
 
 	private fun parentHeight(): Int {
-		return parents.firstNotNullOfOrNull { it as? RecyclerView }?.height ?: 0
+		return ancestors.firstNotNullOfOrNull { it as? RecyclerView }?.height ?: 0
 	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/settings/nav/NavConfigFragment.kt

@@ -114,7 +114,7 @@ class NavConfigFragment : BaseFragment<FragmentSettingsSourcesBinding>(), Recycl
 			recyclerView: RecyclerView,
 			viewHolder: RecyclerView.ViewHolder,
 			target: RecyclerView.ViewHolder,
-		): Boolean = true
+		): Boolean = target.itemViewType == ListItemType.NAV_ITEM.ordinal
 
 		override fun onMoved(
 			recyclerView: RecyclerView,

app/src/main/kotlin/org/koitharu/kotatsu/settings/nav/NavConfigViewModel.kt

@@ -63,9 +63,13 @@ class NavConfigViewModel @Inject constructor(
 	}
 
 	fun removeItem(item: NavItem) {
-		items.value = items.value.minus(item).also {
+		val newList = items.value.toMutableList()
-			commit(it)
+		newList.remove(item)
+		if (newList.isEmpty()) {
+			newList.add(NavItem.EXPLORE)
 		}
+		items.value = newList
+		commit(newList)
 	}
 
 	private fun commit(value: List<NavItem>) {

app/src/main/res/values-ar/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="detailed_list">تفاصيل القائمة</string>
     <string name="error_occurred">حدث خطأ</string>
     <string name="details">التفاصيل</string>
@@ -19,7 +19,7 @@
     <string name="history">السجل</string>
     <string name="list">قائمة</string>
     <string name="clear_history">محو سجل</string>
-    <string name="add_to_favourites">ضع هذا في المفضلة</string>
+    <string name="add_to_favourites">أضف للمفضلة</string>
     <string name="add">أضف</string>
     <string name="save">حفظ</string>
     <string name="history_is_empty">لا سجل بعد</string>
@@ -48,11 +48,11 @@
     <string name="clear">أزل</string>
     <string name="remove">ازالة</string>
     <string name="popular">شائع</string>
-    <string name="add_new_category">قائمة جديدة</string>
+    <string name="add_new_category">أضف فئة جديدة</string>
     <string name="download_complete">تم التنزيل</string>
     <string name="text_clear_history_prompt">هل تريد محو سجل القراءة بالكامل بشكل دائم؟</string>
     <string name="save_page">احفظ الصفحة</string>
-    <string name="page_saved">حفظت</string>
+    <string name="page_saved">تم الحفظ</string>
     <string name="standard">اساسي</string>
     <string name="no_description">لا يوجد وصف</string>
     <string name="clear_pages_cache">مسح ذاكرة التخزين المؤقت للصفحة</string>
@@ -61,7 +61,7 @@
     <string name="search_on_s">بحث على %s</string>
     <string name="delete_manga">حذف المانغا</string>
     <string name="text_delete_local_manga">حذف \"%s\" من الجهاز نهائيا؟</string>
-    <string name="reader_settings">إعدادات القراءة</string>
+    <string name="reader_settings">إعدادات القارىء</string>
     <string name="switch_pages">تغییر صفحات</string>
     <string name="delete">حذف</string>
     <string name="share_image">شارك الصورة</string>
@@ -71,8 +71,110 @@
     <string name="grid_size">حجم الشبكة</string>
     <string name="volume_buttons">أزرار الصوت</string>
     <string name="taps_on_edges">النقر على حواف الشاشة</string>
-    <string name="_continue">يكمل</string>
+    <string name="_continue">أكمل</string>
-    <string name="error">خطاء</string>
+    <string name="error">خطأ</string>
     <string name="clear_search_history">مسح تاريخ البحث</string>
     <string name="disable_nsfw">تعطيل NSFW</string>
+    <string name="updates">التحديثات</string>
+    <string name="sync_host_description">يمكنك استخدام سيرفر التزامن ذاتياً أو السيرفر الافتراضي. لا تغير هذا إن لم تكن متأكداً مما تفعله.</string>
+    <string name="text_clear_cookies_prompt">سيتم تسجيل خروجك من جميع المصادر</string>
+    <string name="clear_cookies">مسح ملفات تعريف الارتباط</string>
+    <string name="favourites_categories">الفئات المفضلة</string>
+    <string name="enabled_sources">المصادر المستخدمة</string>
+    <string name="gestures_only">الإيماءات فقط</string>
+    <string name="clear_thumbs_cache">مسح ذاكرة التخزين المؤقت للصور المصغرة</string>
+    <string name="rotate_screen">تدوير الشاشة</string>
+    <string name="text_clear_updates_feed_prompt">هل تريد مسح سجل التحديث بشكل دائم؟</string>
+    <string name="suggestions_enable">تفعيل الاقتراحات</string>
+    <string name="clear_feed">مسح الخلاصة</string>
+    <string name="welcome">مرحبا</string>
+    <string name="about_app_translation_summary">ترجمة هذا التطبيق</string>
+    <string name="vibration">اهتزاز</string>
+    <string name="no_update_available">لا يوجد تحديثات</string>
+    <string name="remove_category">حذف الفئة</string>
+    <string name="internal_storage">التخزين الداخلي</string>
+    <string name="read_later">اقرأ لاحقا</string>
+    <string name="backup_saved">تم حفظ النسخة الاحتياطية</string>
+    <string name="create_backup">إنشاء نسخة احتياطية</string>
+    <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">تمكين %1$d من %2$d</string>
+    <string name="tap_to_try_again">انقر لإعادة المحاولة</string>
+    <string name="ignore_ssl_errors">تجاهل أخطاء SSL</string>
+    <string name="auth_required">سجل الدخول لمشاهدة المحتوى</string>
+    <string name="next">التالي</string>
+    <string name="restore_backup">استعادة من نسخة احتياطية</string>
+    <string name="password_length_hint">كلمة السر يجب أن تكون 4 أحرف أو أكثر</string>
+    <string name="server_address">عنوان السيرفر</string>
+    <string name="text_feed_holder">فصول جديدة من ما تقرأه تظهر هنا</string>
+    <string name="text_suggestion_holder">ابدأ بقراءة المانجا وستحصل على اقتراحات مخصصة</string>
+    <string name="find_similar">ابحث عن متشابه</string>
+    <string name="data_restored">تم الاستعادة</string>
+    <string name="protect_application_subtitle">أدخل كلمة السر لبدء التطبيق</string>
+    <string name="suggestions">الاقتراحات</string>
+    <string name="enabled">مفعل</string>
+    <string name="text_clear_search_history_prompt">هل تريد إزالة استعلامات البحث الأخيرة نهائيًا؟</string>
+    <string name="updates_feed_cleared">تم المسح</string>
+    <string name="update">تحديث</string>
+    <string name="feed_will_update_soon">سيبدأ تحديث الخلاصة قريبًا</string>
+    <string name="app_update_available">تتوفر نسخة جديدة من التطبيق</string>
+    <string name="new_version_s">نسخة جديدة: %s</string>
+    <string name="sync_settings">إعدادات التزامن</string>
+    <string name="create_category">أضف فئة جديدة</string>
+    <string name="notification_sound">صوت الإشعار</string>
+    <string name="backup_restore">النسخ الاحتياطي و الاستعادة</string>
+    <string name="show_pages_numbers">إظهار أرقام الصفحات</string>
+    <string name="search_history_cleared">تم المسح</string>
+    <string name="_s_deleted_from_local_storage">تم ازالة \"%s\" من التخزين المحلي</string>
+    <string name="saved_manga">المانجا المحفوظة</string>
+    <string name="open_in_browser">الفتح في المتصفح</string>
+    <string name="about_app_translation">ترجمة</string>
+    <string name="notifications">الإشعارات</string>
+    <string name="reverse">العكس</string>
+    <string name="track_sources">البحث عن تحديثات</string>
+    <string name="wrong_password">كلمة سر خاطئة</string>
+    <string name="group">المجموعة</string>
+    <string name="just_now">الآن</string>
+    <string name="download">تنزيل</string>
+    <string name="chapter_is_missing">الفصل مفقود</string>
+    <string name="size_s">الحجم: %s</string>
+    <string name="about">حول</string>
+    <string name="check_for_new_chapters">التحقق من الفصول الجديدة</string>
+    <string name="captcha_solve">حل</string>
+    <string name="data_restored_with_errors">أستعيدت البيانات، لكن هناك أخطاء</string>
+    <string name="new_chapters">فصول جديدة</string>
+    <string name="exit_confirmation">تأكيد الخروج</string>
+    <string name="protect_application">حماية التطبيق</string>
+    <string name="passwords_mismatch">كلمة السر غير مطابقة</string>
+    <string name="yesterday">أمس</string>
+    <string name="check_for_updates">تحقق من وجود تحديثات</string>
+    <string name="protect_application_summary">اطلب كلمة السر عند تشغيل كوتاتسو</string>
+    <string name="right_to_left">من اليمين الى اليسار</string>
+    <string name="reader_mode_hint">سيتم تذكر الاعدادات المختارة لهذه المانجا</string>
+    <string name="default_s">الافتراضي: %s</string>
+    <string name="confirm">تأكد</string>
+    <string name="clear_updates_feed">مسح موجز التحديثات</string>
+    <string name="disabled">معطل</string>
+    <string name="long_ago">منذ فترة</string>
+    <string name="notifications_settings">إعدادات الإشعارات</string>
+    <string name="save_manga">حفظ</string>
+    <string name="large_manga_save_confirm">تحتوي هذه المانجا على s%. حفظ الكل؟</string>
+    <string name="read_more">اقرأ المزيد</string>
+    <string name="search_results">نتائج البحث</string>
+    <string name="file_not_found">الملف غير موجود</string>
+    <string name="app_version">نسخة %s</string>
+    <string name="cookies_cleared">تمت إزالة جميع ملفات تعريف الارتباط</string>
+    <string name="state_finished">انتهت</string>
+    <string name="state_ongoing">مستمرة</string>
+    <string name="suggestions_summary">أقترح المانجا بناء على تفضيلاتك</string>
+    <string name="preparing_">جارٍ التحضير…</string>
+    <string name="exit_confirmation_summary">اضغط مرتين للخروج من التطبيق</string>
+    <string name="enter_password">ادخل كلمة السر</string>
+    <string name="repeat_password">كرر كلمة السر</string>
+    <string name="data_restored_success">استعيدت جميع البيانات</string>
+    <string name="backup_information">يمكنك إنشاء نسخة احتياطية من السجل الخاص بك والمفضلة واستعادتها</string>
+    <string name="available_sources">المصادر المتاحة</string>
+    <string name="external_storage">التخزين الخارجي</string>
+    <string name="silent">صامت</string>
+    <string name="today">اليوم</string>
+    <string name="system_default">الافتراضي</string>
+    <string name="sign_in">تسجبل الدخول</string>
 </resources>

app/src/main/res/values-be/strings.xml

@@ -472,4 +472,11 @@
     <string name="advanced">Пашыраныя</string>
     <string name="default_section">Раздзел па змаўчанні</string>
     <string name="manga_list">Спіс мангі</string>
+    <string name="error_corrupted_file">Вяртаюцца няправільныя дадзеныя ці файл пашкоджаны</string>
+    <string name="on_device">На прыладзе</string>
+    <string name="moved_to_top">Перанесены ўверх</string>
+    <string name="items_limit_exceeded">Больш нельга дадаваць элементы</string>
+    <string name="directories">Каталогі</string>
+    <string name="main_screen_sections">Раздзелы галоўнага экрана</string>
+    <string name="to_top">Уверх</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -472,4 +472,11 @@
     <string name="advanced">Avanzado</string>
     <string name="default_section">Sección predeterminada</string>
     <string name="manga_list">Lista de mangas</string>
+    <string name="error_corrupted_file">Los datos que devuelve el archivo no son válidos o el archivo está dañado</string>
+    <string name="on_device">En el dispositivo</string>
+    <string name="moved_to_top">Movido hacia arriba</string>
+    <string name="items_limit_exceeded">No se pueden añadir más elementos</string>
+    <string name="directories">Directorios</string>
+    <string name="main_screen_sections">Secciones de la pantalla principal</string>
+    <string name="to_top">Hasta arriba</string>
 </resources>

app/src/main/res/values-fil/strings.xml

@@ -467,4 +467,10 @@
     <string name="unknown">Di-alam</string>
     <string name="in_progress">Isinasagawa</string>
     <string name="disable_nsfw">I-disable ang NSFW</string>
+    <string name="error_corrupted_file">Ang hindi wastong data ay ibinalik nito o ang file ay nasira</string>
+    <string name="related_manga_summary">Magpakita ng listahan ng mga kaugnay na manga. Sa ilang mga kaso, ito ay maaaring may mali o nawawala</string>
+    <string name="advanced">Advanced</string>
+    <string name="too_many_requests_message">Masyadong maraming request. Subukang ulit mamaya</string>
+    <string name="default_section">Default na seksyon</string>
+    <string name="manga_list">Listahan ng Manga</string>
 </resources>

app/src/main/res/values-in/strings.xml

@@ -472,4 +472,9 @@
     <string name="advanced">Lanjutan</string>
     <string name="default_section">Bagian default</string>
     <string name="manga_list">Daftar manga</string>
+    <string name="error_corrupted_file">Data yang dikembalikan tidak valid atau file rusak</string>
+    <string name="on_device">Dari perangkat</string>
+    <string name="items_limit_exceeded">Tidak ada lagi item yang bisa ditambahkan</string>
+    <string name="directories">Direktori</string>
+    <string name="main_screen_sections">Bagian layar utama</string>
 </resources>

app/src/main/res/values-ja/strings.xml

@@ -273,7 +273,7 @@
     <string name="show_reading_indicators_summary">履歴とお気に入りに既読率を表示する</string>
     <string name="clear_cookies_summary">いくつかの問題の場合に助けることができる。すべての認証が無効になります</string>
     <string name="show_reading_indicators">読書の進行状況インジケーターを表示</string>
-    <string name="exclude_nsfw_from_history_summary">NSFWとマークされたマンガは履歴に追加されず、進行状況も保存されない</string>
+    <string name="exclude_nsfw_from_history_summary">NSFWとしてマークされたマンガは履歴に追加されず、進行状況は保存されません</string>
     <string name="show_all">すべて表示</string>
     <string name="invalid_domain_message">無効なドメイン</string>
     <string name="select_range">範囲を選択</string>
@@ -350,13 +350,13 @@
     <string name="nothing_here">ここには何もありません</string>
     <string name="scrobbling_empty_hint">読書の進捗状況を確認するには、マンガの詳細画面で「メニュー」→「追跡」を選択します。</string>
     <string name="services">サービス</string>
-    <string name="enable_logging_summary">デバッグ目的でいくつかのアクションを記録する</string>
+    <string name="enable_logging_summary">デバッグ目的でいくつかのアクションを記録します。 何をしているのか分からない場合はオンにしないでください</string>
     <string name="theme_name_miku">ミク</string>
     <string name="user_agent">ユーザー エージェント ヘッダー</string>
     <string name="prefetch_content">コンテンツのプリロード</string>
     <string name="share_logs">ログを共有</string>
     <string name="allow_unstable_updates">不安定な更新を許可</string>
-    <string name="allow_unstable_updates_summary">アプリのベータ版へのアップデートを提案する</string>
+    <string name="allow_unstable_updates_summary">不安定なビルドに関する通知を受け取る</string>
     <string name="download_started">ダウンロードが開始されました</string>
     <string name="language">言語</string>
     <string name="source_disabled">ソースが無効になっています</string>
@@ -401,7 +401,7 @@
     <string name="speed">速度</string>
     <string name="ignore_ssl_errors">SSLエラーを無視する</string>
     <string name="mirror_switching">ミラーを自動的に選択する</string>
-    <string name="mirror_switching_summary">ミラーがある場合、エラー時にリモートソースのドメインを自動で切り替える</string>
+    <string name="mirror_switching_summary">ミラーが利用可能な場合、エラー時にマンガ ソースのドメインを自動的に切り替える</string>
     <string name="resume">履歴書</string>
     <string name="paused">一時停止</string>
     <string name="cancel_all">全てキャンセル</string>
@@ -466,4 +466,17 @@
     <string name="languages">言語</string>
     <string name="unknown">不明</string>
     <string name="in_progress">進行状況</string>
+    <string name="error_corrupted_file">無効なデータが返されたか、ファイルが破損しています</string>
+    <string name="related_manga_summary">関連漫画のリストを表示します。場合によっては不正確または欠落している可能性があります</string>
+    <string name="advanced">高度</string>
+    <string name="too_many_requests_message">リクエストが多すぎます。 後でもう一度お試しください</string>
+    <string name="default_section">デフォルトセクション</string>
+    <string name="manga_list">漫画一覧</string>
+    <string name="disable_nsfw">NSFWを非表示にする</string>
+    <string name="on_device">デバイス上</string>
+    <string name="items_limit_exceeded">これ以上アイテムを追加出来ません</string>
+    <string name="directories">ディレクトリ</string>
+    <string name="main_screen_sections">メイン画面のセクション</string>
+    <string name="moved_to_top">上部に移動しました</string>
+    <string name="to_top">最上部へ移動</string>
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -472,4 +472,11 @@
     <string name="advanced">Расширенные</string>
     <string name="default_section">Раздел по умолчанию</string>
     <string name="manga_list">Список манги</string>
+    <string name="error_corrupted_file">Возвращаются неверные данные или файл поврежден</string>
+    <string name="on_device">На устройстве</string>
+    <string name="moved_to_top">Перемещено наверх</string>
+    <string name="items_limit_exceeded">Больше нельзя добавлять элементы</string>
+    <string name="directories">Каталоги</string>
+    <string name="main_screen_sections">Разделы главного экрана</string>
+    <string name="to_top">Наверх</string>
 </resources>

app/src/main/res/values-th/strings.xml

@@ -269,4 +269,36 @@
     <string name="status_on_hold">พักไว้</string>
     <string name="disable_all">ปิดการใช้งานทั้งหมด</string>
     <string name="report">รีพอร์ต</string>
+    <string name="text_clear_cookies_prompt">คุณจะออกจากระบบจากทุกแหล่ง</string>
+    <string name="clear_all_history">ลบประวัติทั้งหมด</string>
+    <string name="data_deletion">การลบข้อมูล</string>
+    <string name="show_reading_indicators">แสดงตัวบอกความคืบหน้าในการอ่าน</string>
+    <string name="show_notification_new_chapters_off">คุณจะไม่ได้รับการแจ้งเตือน แต่บทใหม่จะถูกเน้นในรายการ</string>
+    <string name="text_clear_search_history_prompt">ลบคำค้นหาล่าสุดทั้งหมดอย่างถาวรไหม\?</string>
+    <string name="filter_load_error">ไม่สามารถโหลดรายการประเภทได้</string>
+    <string name="detect_reader_mode_summary">ตรวจสอบอัตโนมัติว่ามังงะเป็นเว็บตูนหรือไม่</string>
+    <string name="appwidget_recent_description">มังงะที่คุณอ่านล่าสุด</string>
+    <string name="appearance">รูปร่าง</string>
+    <string name="bookmark_remove">ลบบุ๊คมาร์ค</string>
+    <string name="auth_not_supported_by">%s ไม่รองรับการเข้าสู่ระบบ</string>
+    <string name="last_2_hours">2 ชั่วโมงที่ผ่านมา</string>
+    <string name="edit_category">แก้ไขหมวดหมู่</string>
+    <string name="bookmark_removed">บุ๊คมาร์คถูกลบแล้ว</string>
+    <string name="suggestions_excluded_genres_summary">ระบุประเภทที่คุณไม่ต้องการเห็นในคำแนะนำ</string>
+    <string name="dns_over_https">DNS บน HTTPS</string>
+    <string name="appwidget_shelf_description">มังงะจากรายการโปรดของคุณ</string>
+    <string name="bookmark_add">เพิ่มบุ๊คมาร์ค</string>
+    <string name="logged_in_as">เข้าสู่ระบบด้วย %s</string>
+    <string name="history_cleared">ลบประวัติแล้ว</string>
+    <string name="bookmark_added">บุ๊คมาร์คได้ถูกเพิ่มแล้ว</string>
+    <string name="suggestions_excluded_genres">ยกเว้นประเภท</string>
+    <string name="exclude_nsfw_from_history_summary">มังงะที่เป็น NSFW จะไม่ถูกเพิ่มเข้าไปในประวัติ และความคืบหน้าของคุณจะไม่ถูกบันทึก</string>
+    <string name="show_reading_indicators_summary">แสดงเปอร์เซ็นต์การอ่านในประวัติและรายการโปรด</string>
+    <string name="manage">จัดการ</string>
+    <string name="logout">ออกจากระบบ</string>
+    <string name="no_bookmarks_yet">ยังไม่มีบุ๊คมาร์ก</string>
+    <string name="bookmarks">บุ๊คมาร์ค</string>
+    <string name="show_all">แสดงทั้งหมด</string>
+    <string name="empty_favourite_categories">ไม่มีหมวดหมู่ที่ชื่นชอบ</string>
+    <string name="invalid_domain_message">โดเมนไม่ถูกต้อง</string>
 </resources>

app/src/main/res/values-uk/strings.xml

@@ -472,4 +472,11 @@
     <string name="advanced">Розширені</string>
     <string name="default_section">Розділ за замовчуванням</string>
     <string name="manga_list">Список манґи</string>
+    <string name="error_corrupted_file">Повертаються неправильні дані або файл пошкоджено</string>
+    <string name="on_device">На пристрої</string>
+    <string name="moved_to_top">Перенесено вгору</string>
+    <string name="items_limit_exceeded">Більше не можна додавати елементи</string>
+    <string name="directories">Каталоги</string>
+    <string name="main_screen_sections">Розділи головного екрана</string>
+    <string name="to_top">Вгору</string>
 </resources>

app/src/main/res/values-zh-rCN/plurals.xml

@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<plurals name="items">
+    <plurals name="items">
-		<item quantity="other">%1$d 个项目</item>
+        <item quantity="other">%1$d 个项目</item>
-	</plurals>
+    </plurals>
-	<plurals name="new_chapters">
+    <plurals name="new_chapters">
-		<item quantity="other">%1$d 个新章节</item>
+        <item quantity="other">%1$d 个新章节</item>
-	</plurals>
+    </plurals>
-	<plurals name="chapters">
+    <plurals name="chapters">
-		<item quantity="other">%1$d 个章节</item>
+        <item quantity="other">%1$d 个章节</item>
-	</plurals>
+    </plurals>
-	<plurals name="minutes_ago">
+    <plurals name="minutes_ago">
-		<item quantity="other">%1$d 分钟前</item>
+        <item quantity="other">%1$d 分钟前</item>
-	</plurals>
+    </plurals>
-	<plurals name="hours_ago">
+    <plurals name="hours_ago">
-		<item quantity="other">%1$d 小时前</item>
+        <item quantity="other">%1$d 小时前</item>
-	</plurals>
+    </plurals>
-	<plurals name="days_ago">
+    <plurals name="days_ago">
-		<item quantity="other">%1$d 天前</item>
+        <item quantity="other">%1$d 天前</item>
-	</plurals>
+    </plurals>
-</resources>
+    <plurals name="months_ago">
+        <item quantity="other">%1$d 个月前</item>
+    </plurals>
+</resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -2,31 +2,31 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="settings">设置</string>
     <string name="local_storage">本地存储</string>
-    <string name="favourites">喜欢</string>
+    <string name="favourites">收藏</string>
     <string name="history">历史</string>
     <string name="error_occurred">发生了一个错误</string>
     <string name="network_error">网络错误</string>
     <string name="chapters">章节</string>
-    <string name="list">列表</string>
+    <string name="list">紧凑</string>
-    <string name="data_restored_with_errors">数据被恢复了，但有错误</string>
+    <string name="data_restored_with_errors">数据已恢复，但有一些错误</string>
     <string name="processing_">正在处理…</string>
     <string name="newest">最新</string>
     <string name="by_rating">评分</string>
-    <string name="cookies_cleared">已删除所有 cookie</string>
+    <string name="cookies_cleared">已清除所有 cookie</string>
-    <string name="data_restored_success">所有数据都被恢复了</string>
+    <string name="data_restored_success">数据已全部恢复</string>
     <string name="silent">无声</string>
     <string name="preparing_">准备…</string>
     <string name="file_not_found">未找到文件</string>
     <string name="yesterday">昨日</string>
     <string name="backup_information">你可以创建你的历史和收藏的备份并恢复它</string>
-    <string name="just_now">现在</string>
+    <string name="just_now">刚刚</string>
     <string name="long_ago">很久以前</string>
-    <string name="group">组</string>
+    <string name="group">分组</string>
-    <string name="tap_to_try_again">轻点以重试</string>
+    <string name="tap_to_try_again">轻击重试</string>
-    <string name="reader_mode_hint">所选择的配置将因这部漫画而被记住</string>
+    <string name="reader_mode_hint">所选配置将被这部漫画记住</string>
     <string name="captcha_required">需要验证码</string>
     <string name="captcha_solve">解决</string>
-    <string name="today">今天</string>
+    <string name="today">今日</string>
     <string name="clear_cookies">清除cookies</string>
     <string name="new_sources_text">有新的漫画源可用</string>
     <string name="suggestions_summary">根据你的喜好推荐漫画</string>
@@ -36,24 +36,24 @@
     <string name="nsfw">18+</string>
     <string name="various_languages">各种语言</string>
     <string name="search_chapters">查找章节</string>
-    <string name="suggestions_excluded_genres">排除流派</string>
+    <string name="suggestions_excluded_genres">排除分类</string>
-    <string name="suggestions_updating">建议更新</string>
+    <string name="suggestions_updating">漫画推荐更新</string>
-    <string name="check_new_chapters_title">检查新的章节并通知有关情况</string>
+    <string name="check_new_chapters_title">检查新章节并通知检查结果</string>
     <string name="details">详细内容</string>
-    <string name="detailed_list">详细列表</string>
+    <string name="detailed_list">详细</string>
     <string name="grid">网格</string>
     <string name="list_mode">列表模式</string>
     <string name="remote_sources">漫画源</string>
     <string name="loading_">加载中…</string>
     <string name="computing_">计算中…</string>
-    <string name="chapter_d_of_d">%1$d/%2$d章节</string>
+    <string name="chapter_d_of_d">章节 %1$d/%2$d</string>
     <string name="close">关闭</string>
     <string name="try_again">再试一次</string>
     <string name="clear_history">清除历史</string>
-    <string name="nothing_found">没有发现</string>
+    <string name="nothing_found">未找到</string>
     <string name="history_is_empty">尚无历史</string>
     <string name="read">阅读</string>
-    <string name="you_have_not_favourites_yet">尚无收藏夹</string>
+    <string name="you_have_not_favourites_yet">尚无收藏</string>
     <string name="add_to_favourites">收藏此漫画</string>
     <string name="add_new_category">新分类</string>
     <string name="add">添加</string>
@@ -68,14 +68,14 @@
     <string name="downloads">下载</string>
     <string name="by_name">名称</string>
     <string name="popular">热门</string>
-    <string name="updated">更新</string>
+    <string name="updated">已更新</string>
-    <string name="sort_order">排序顺序</string>
+    <string name="sort_order">排序</string>
-    <string name="filter">过滤器</string>
+    <string name="filter">筛选</string>
     <string name="theme">主题</string>
     <string name="dark">深色</string>
     <string name="light">浅色</string>
     <string name="automatic">跟随系统</string>
-    <string name="pages">页数</string>
+    <string name="pages">页面</string>
     <string name="clear">清除</string>
     <string name="text_clear_history_prompt">永久清除所有阅读历史\?</string>
     <string name="remove">删除</string>
@@ -86,8 +86,8 @@
     <string name="_import">导入</string>
     <string name="delete">删除</string>
     <string name="operation_not_supported">不支持此操作</string>
-    <string name="text_file_not_supported">选择 ZIP 或 CBZ 文件.</string>
+    <string name="text_file_not_supported">选择 ZIP 或 CBZ 文件。</string>
-    <string name="no_description">无描述</string>
+    <string name="no_description">无简介</string>
     <string name="clear_pages_cache">清除页面缓存</string>
     <string name="text_file_sizes">B|kB|MB|GB|TB</string>
     <string name="standard">标准</string>
@@ -98,21 +98,21 @@
     <string name="delete_manga">删除漫画</string>
     <string name="text_delete_local_manga">从设备中永久删除\"%s\"\?</string>
     <string name="reader_settings">阅读器设置</string>
-    <string name="switch_pages">切换页面</string>
+    <string name="switch_pages">翻页方式</string>
     <string name="volume_buttons">音量按钮</string>
     <string name="_continue">继续</string>
     <string name="taps_on_edges">边缘点击</string>
     <string name="error">错误</string>
     <string name="clear_thumbs_cache">清除缩略图缓存</string>
     <string name="clear_search_history">清除搜索历史</string>
-    <string name="search_history_cleared">清除</string>
+    <string name="search_history_cleared">已清除</string>
     <string name="gestures_only">仅限手势</string>
     <string name="internal_storage">内部存储</string>
     <string name="external_storage">外部存储</string>
     <string name="domain">范围</string>
     <string name="app_update_available">新版本应用程序已经推出</string>
     <string name="open_in_browser">在网络浏览器中打开</string>
-    <string name="large_manga_save_confirm">这部漫画有%s.全部保存\?</string>
+    <string name="large_manga_save_confirm">这部漫画有 %s 。全部保存？</string>
     <string name="save_manga">保存</string>
     <string name="notifications">通知</string>
     <string name="new_chapters">新章节</string>
@@ -121,34 +121,34 @@
     <string name="notification_sound">通知声音</string>
     <string name="light_indicator">LED指示器</string>
     <string name="vibration">振动</string>
-    <string name="favourites_categories">收藏夹分类</string>
+    <string name="favourites_categories">收藏分类</string>
     <string name="remove_category">删除</string>
     <string name="text_empty_holder_primary">这里有点空…</string>
     <string name="text_search_holder_secondary">尝试重新表述查询。</string>
-    <string name="text_history_holder_primary">你所读的内容将在这里显示</string>
+    <string name="text_history_holder_primary">你看过的内容将在这里显示</string>
-    <string name="text_history_holder_secondary">在 «探索»部分找到要读的内容</string>
+    <string name="text_history_holder_secondary">在【浏览】部分找到要读的内容</string>
     <string name="text_local_holder_primary">先保存内容</string>
-    <string name="text_local_holder_secondary">从在线来源保存或导入文件.</string>
+    <string name="text_local_holder_secondary">从在线来源保存或导入文件。</string>
     <string name="manga_shelf">书架</string>
     <string name="recent_manga">最近</string>
-    <string name="pages_animation">页面动画</string>
+    <string name="pages_animation">翻页动画</string>
     <string name="manga_save_location">下载文件夹</string>
-    <string name="not_available">不详</string>
+    <string name="not_available">不可用</string>
     <string name="cannot_find_available_storage">没有可用的存储空间</string>
     <string name="other_storage">其他存储</string>
     <string name="done">完成</string>
-    <string name="all_favourites">所有收藏夹</string>
+    <string name="all_favourites">所有收藏</string>
-    <string name="favourites_category_empty">空分类</string>
+    <string name="favourites_category_empty">空白分类</string>
     <string name="read_later">稍后阅读</string>
-    <string name="updates">更新</string>
+    <string name="updates">更新内容</string>
     <string name="text_feed_holder">你正在阅读的新章节显示在这里</string>
     <string name="search_results">搜索结果</string>
     <string name="new_version_s">新版本: %s</string>
-    <string name="clear_updates_feed">清除更新源</string>
+    <string name="clear_updates_feed">清除订阅更新记录</string>
     <string name="updates_feed_cleared">已清除</string>
     <string name="rotate_screen">旋转屏幕</string>
     <string name="update">更新</string>
-    <string name="feed_will_update_soon">源更新即将开始</string>
+    <string name="feed_will_update_soon">订阅更新即将开始</string>
     <string name="track_sources">查找更新</string>
     <string name="dont_check">不要检查</string>
     <string name="enter_password">输入密码</string>
@@ -167,14 +167,14 @@
     <string name="zoom_mode_fit_center">适应中心</string>
     <string name="zoom_mode_fit_height">适应高度</string>
     <string name="zoom_mode_fit_width">适应宽度</string>
-    <string name="zoom_mode_keep_start">从头开始</string>
+    <string name="zoom_mode_keep_start">保持原始比例</string>
     <string name="black_dark_theme">黑色</string>
-    <string name="black_dark_theme_summary">在AMOLED屏幕上使用更少电池</string>
+    <string name="black_dark_theme_summary">在AMOLED屏幕上更省电</string>
-    <string name="backup_restore">备份和还原</string>
+    <string name="backup_restore">备份与恢复</string>
     <string name="create_backup">创建数据备份</string>
     <string name="restore_backup">从备份中恢复</string>
     <string name="data_restored">恢复</string>
-    <string name="clear_feed">清除文件</string>
+    <string name="clear_feed">清除订阅</string>
     <string name="text_clear_updates_feed_prompt">永久地清除所有的更新历史？</string>
     <string name="check_for_new_chapters">检查新的章节</string>
     <string name="reverse">倒序</string>
@@ -185,64 +185,64 @@
     <string name="protect_application_subtitle">输入密码以启动应用程序</string>
     <string name="confirm">确认</string>
     <string name="password_length_hint">密码必须是4个字符或以上</string>
-    <string name="text_clear_search_history_prompt">永久地删除所有最近的搜索查询？</string>
+    <string name="text_clear_search_history_prompt">永久删除所有搜索记录？</string>
     <string name="welcome">欢迎</string>
-    <string name="backup_saved">保存备份</string>
+    <string name="backup_saved">备份已保存</string>
-    <string name="tracker_warning">一些设备有不同的系统行为, 这可能会破坏后台任务.</string>
+    <string name="tracker_warning">一些设备有不同的系统行为，这可能会破坏后台任务。</string>
-    <string name="read_more">阅读更多</string>
+    <string name="read_more">了解详情</string>
     <string name="queued">排队</string>
     <string name="chapter_is_missing">该章缺失</string>
     <string name="about_app_translation_summary">翻译此应用程序</string>
     <string name="about_app_translation">翻译</string>
     <string name="auth_complete">授权</string>
     <string name="auth_not_supported_by">不支持在%s上登录</string>
-    <string name="text_clear_cookies_prompt">你将退出登录所有来源</string>
+    <string name="text_clear_cookies_prompt">你将在所有漫画源退出登录</string>
     <string name="genres">类型</string>
     <string name="state_ongoing">连载中</string>
     <string name="state_finished">已完结</string>
     <string name="system_default">默认</string>
-    <string name="exclude_nsfw_from_history">将NSFW漫画排除在历史之外</string>
+    <string name="exclude_nsfw_from_history">从历史中排除NSFW漫画</string>
     <string name="show_pages_numbers">页数</string>
-    <string name="enabled_sources">使用图源</string>
+    <string name="enabled_sources">已用漫画源</string>
-    <string name="available_sources">现有图源</string>
+    <string name="available_sources">可用漫画源</string>
-    <string name="screenshots_policy">屏幕截图</string>
+    <string name="screenshots_policy">截图策略</string>
     <string name="screenshots_allow">允许</string>
-    <string name="screenshots_block_nsfw">禁止18+</string>
+    <string name="screenshots_block_nsfw">屏蔽 NSFW</string>
-    <string name="screenshots_block_all">始终阻止</string>
+    <string name="screenshots_block_all">始终屏蔽</string>
-    <string name="suggestions">建议</string>
+    <string name="suggestions">漫画推荐</string>
-    <string name="suggestions_enable">启用建议</string>
+    <string name="suggestions_enable">启用漫画推荐</string>
-    <string name="text_suggestion_holder">开始阅读漫画，你会得到个性化的建议</string>
+    <string name="text_suggestion_holder">开始阅读漫画，你会获取个性化推荐</string>
-    <string name="exclude_nsfw_from_suggestions">请勿推荐18+漫画</string>
+    <string name="exclude_nsfw_from_suggestions">请勿推荐 NSFW 漫画</string>
     <string name="enabled">启用</string>
     <string name="disabled">禁用</string>
-    <string name="filter_load_error">无法加载流派列表</string>
+    <string name="filter_load_error">无法加载分类列表</string>
-    <string name="reset_filter">重置过滤器</string>
+    <string name="reset_filter">重置筛选</string>
-    <string name="onboard_text">选择你想看的漫画的语言. 你可以在以后的设置中改变它.</string>
+    <string name="onboard_text">选择您想阅读漫画的语言。稍候您可以在设置中更改它。</string>
-    <string name="only_using_wifi">只在Wi-Fi上使用</string>
+    <string name="only_using_wifi">仅 Wi-Fi</string>
     <string name="always">总是</string>
     <string name="preload_pages">预加载页面</string>
     <string name="logged_in_as">以%s身份登录</string>
     <string name="chapters_empty">这部漫画中没有章节</string>
     <string name="appearance">外观</string>
-    <string name="suggestions_excluded_genres_summary">指定您不希望在建议中看到的类型</string>
+    <string name="suggestions_excluded_genres_summary">指定您不希望在推荐中看到的分类</string>
-    <string name="text_delete_local_manga_batch">从设备中永久删除所选项目\?</string>
+    <string name="text_delete_local_manga_batch">从设备中永久删除所选项目？</string>
-    <string name="removal_completed">删除已完成</string>
+    <string name="removal_completed">删除完毕</string>
     <string name="download_slowdown">下载速度减慢</string>
     <string name="download_slowdown_summary">有助于避免阻断你的IP地址</string>
-    <string name="local_manga_processing">保存的漫画处理</string>
+    <string name="local_manga_processing">已保存漫画处理中</string>
     <string name="chapters_will_removed_background">章节将在后台被删除</string>
     <string name="hide">隐藏</string>
     <string name="show_notification_new_chapters_off">你将不会收到通知但新的章节将在列表中突出显示</string>
     <string name="notifications_enable">启用通知</string>
-    <string name="name">命名</string>
+    <string name="name">名称</string>
     <string name="edit">编辑</string>
     <string name="edit_category">编辑分类</string>
-    <string name="empty_favourite_categories">没有收藏夹分类</string>
+    <string name="empty_favourite_categories">没有收藏分类</string>
     <string name="bookmark_add">添加书签</string>
     <string name="bookmark_remove">删除书签</string>
     <string name="bookmarks">书签</string>
-    <string name="bookmark_removed">删除书签</string>
+    <string name="bookmark_removed">书签已删除</string>
-    <string name="bookmark_added">添加书签</string>
+    <string name="bookmark_added">书签已添加</string>
     <string name="undo">撤销</string>
     <string name="removed_from_history">从历史中删除</string>
     <string name="dns_over_https">DNS over HTTPS</string>
@@ -250,8 +250,8 @@
     <string name="detect_reader_mode">自动检测阅读器模式</string>
     <string name="detect_reader_mode_summary">自动检测漫画是否为条漫</string>
     <string name="disable_battery_optimization">禁用电池优化</string>
-    <string name="disable_battery_optimization_summary">帮助进行背景更新检查</string>
+    <string name="disable_battery_optimization_summary">有助于进行后台更新检查</string>
-    <string name="crash_text">出了点问题. 请向开发人员提交一份错误报告以帮助我们修复它.</string>
+    <string name="crash_text">出了点问题。请向开发人员提交一份错误报告以帮助我们修复它。</string>
     <string name="send">发送</string>
     <string name="disable_all">全部禁用</string>
     <string name="status_planned">计划</string>
@@ -263,13 +263,13 @@
     <string name="status_re_reading">重读</string>
     <string name="status_completed">完成</string>
     <string name="use_fingerprint">使用指纹</string>
-    <string name="appwidget_shelf_description">你喜欢的漫画</string>
+    <string name="appwidget_shelf_description">你收藏的漫画</string>
     <string name="appwidget_recent_description">您最近阅读的漫画</string>
-    <string name="show_reading_indicators_summary">在历史和收藏夹中显示阅读百分比</string>
+    <string name="show_reading_indicators_summary">在历史和收藏中显示阅读百分比</string>
-    <string name="show_reading_indicators">显示阅读进度指标</string>
+    <string name="show_reading_indicators">显示阅读进度</string>
     <string name="data_deletion">数据删除</string>
-    <string name="exclude_nsfw_from_history_summary">标记为NSFW的漫画将永远不会被添加到历史中你的进度也不会被保存</string>
+    <string name="exclude_nsfw_from_history_summary">标记为 NSFW 的漫画将永远不会被添加到历史中，你的阅读进度也不会被保存</string>
-    <string name="clear_cookies_summary">可以在出现一些问题时提供帮助. 所有授权将被视为无效</string>
+    <string name="clear_cookies_summary">能对部分问题起到一点作用。所有网站授权将失效</string>
     <string name="show_all">显示全部</string>
     <string name="manga_error_description_pattern">错误详情：&lt;br&gt;&lt;tt&gt;%1$s&lt;/tt&gt;&lt;br&gt;&lt;br&gt;1.尝试&lt;a href=%2$s&gt;在网络浏览器中打开漫画&lt;/a&gt;以确保在其来源中可用&lt;br&gt;2. 请确保您使用的是&lt;a href=kotatsu://about&gt;最新版本的Kotatsu&lt;/a&gt;&lt;br&gt;3.如果可用，请向开发人员发送错误报告。</string>
     <string name="invalid_domain_message">无效域名</string>
@@ -289,23 +289,23 @@
     <string name="bookmarks_removed">书签已移除</string>
     <string name="history_cleared">历史已清除</string>
     <string name="manage">管理</string>
-    <string name="no_bookmarks_yet">还没有书签</string>
+    <string name="no_bookmarks_yet">尚无书签</string>
     <string name="no_bookmarks_summary">您可以在阅读漫画时创建书签</string>
     <string name="no_manga_sources">无漫画源</string>
-    <string name="no_manga_sources_text">启用漫画源以在线阅读漫画</string>
+    <string name="no_manga_sources_text">启用漫画源即可在线阅读漫画</string>
     <string name="random">随机</string>
-    <string name="categories_delete_confirm">您确定要删除选定的收藏夹吗？
+    <string name="categories_delete_confirm">您确定要删除选定的收藏分类吗？
-\n所有收藏夹中的漫画将丢失且无法恢复。</string>
+\n该分类中的所有漫画将丢失且无法恢复。</string>
     <string name="reorder">重新排序</string>
-    <string name="empty">留空</string>
+    <string name="empty">空分类</string>
     <string name="explore">浏览</string>
     <string name="automatic_scroll">自动滚动</string>
     <string name="reader_info_bar">在阅读器中显示信息栏</string>
     <string name="comics_archive">漫画压缩包</string>
     <string name="folder_with_images">图片文件夹</string>
     <string name="importing_manga">漫画导入中</string>
-    <string name="reader_info_pattern">Ch. %1$d/%2$d Pg. %3$d/%4$d</string>
+    <string name="reader_info_pattern">章节 %1$d/%2$d 页码 %3$d/%4$d</string>
-    <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">%1$d 的 %2$d 启用</string>
+    <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">已启用 %1$d / %2$d</string>
     <string name="size_s">大小：%s</string>
     <string name="confirm_exit">再按一次返回键退出</string>
     <string name="exit_confirmation_summary">按两次返回键退出应用</string>
@@ -322,10 +322,10 @@
     <string name="import_completed">导入完毕</string>
     <string name="import_completed_hint">您可以从存储中删除原文件以节省空间</string>
     <string name="import_will_start_soon">即将开始导入</string>
-    <string name="feed">订阅源</string>
+    <string name="feed">订阅</string>
     <string name="memory_usage_pattern">%s - %s</string>
     <string name="not_found_404">内容未找到或已移除</string>
-    <string name="reader_control_ltr_summary">点击屏幕右侧或按下右键翻到下一页</string>
+    <string name="reader_control_ltr_summary">点击屏幕右侧或按下右键始终翻到下一页</string>
     <string name="reader_control_ltr">高效阅读器控制</string>
     <string name="history_shortcuts_summary">长按应用图标显示最近阅读的漫画</string>
     <string name="history_shortcuts">显示最近阅读漫画的快捷方式</string>
@@ -337,21 +337,21 @@
     <string name="text_unsaved_changes_prompt">保存还是放弃未保存的更改？</string>
     <string name="discard">放弃</string>
     <string name="error_no_space_left">设备上没有剩余空间</string>
-    <string name="reader_slider">显示换页滑块</string>
+    <string name="reader_slider">显示翻页滑块</string>
-    <string name="webtoon_zoom">Webtoon 缩放</string>
+    <string name="webtoon_zoom">条漫缩放</string>
     <string name="different_languages">不同语言</string>
     <string name="network_unavailable">网络不可用</string>
     <string name="network_unavailable_hint">打开 Wi-Fi 或移动网络在线阅读漫画</string>
-    <string name="clear_new_chapters_counters">同样清除新章节信息</string>
+    <string name="clear_new_chapters_counters">同时清除新章节信息</string>
     <string name="server_error">服务器端错误 (%1$d)。请稍后再试</string>
     <string name="compact">紧凑</string>
-    <string name="source_disabled">已禁用图源</string>
+    <string name="source_disabled">漫画源已禁用</string>
     <string name="prefetch_content">内容预加载</string>
     <string name="mark_as_current">标为当前</string>
     <string name="language">语言</string>
     <string name="enable_logging">启用日志记录</string>
     <string name="share_logs">分享日志</string>
-    <string name="enable_logging_summary">出于调试目的记录某些操作</string>
+    <string name="enable_logging_summary">出于调试目的记录某些操作，如果你不了解你在做什么，请不要启用该选项</string>
     <string name="show_suspicious_content">显示可疑内容</string>
     <string name="theme_name_dynamic">动态</string>
     <string name="color_theme">颜色方案</string>
@@ -365,10 +365,10 @@
     <string name="theme_name_mamimi">Mamimi</string>
     <string name="theme_name_kanade">Kanade</string>
     <string name="nothing_here">这里什么也没有</string>
-    <string name="scrobbling_empty_hint">要跟踪阅读进度，在漫画详情屏幕上选中“菜单→ 跟踪。</string>
+    <string name="scrobbling_empty_hint">要跟踪阅读进度，在漫画详情屏幕上选中【菜单】→【跟踪】。</string>
     <string name="allow_unstable_updates">允许不稳定更新</string>
-    <string name="allow_unstable_updates_summary">提示更新到测试版</string>
+    <string name="allow_unstable_updates_summary">接收不稳定版本更新的通知</string>
-    <string name="download_started">已开始下载</string>
+    <string name="download_started">下载已开始</string>
     <string name="user_agent">UserAgent 标头</string>
     <string name="settings_apply_restart_required">要应用这些更改请重启程序</string>
     <string name="sources_reorder_tip">点击并长按项目排序</string>
@@ -383,10 +383,10 @@
     <string name="web_view_unavailable">WebView不可用：检查是否已安装WebView</string>
     <string name="sync_host_description">你可以使用自建同步服务器或默认服务器。如果你不知道自己在干什么请不要修改此处。</string>
     <string name="mirror_switching">自动选择镜像</string>
-    <string name="mirror_switching_summary">如果存在可用镜像，在出错时自动切换域名</string>
+    <string name="mirror_switching_summary">如果存在可用镜像，在出错时自动切换漫画源域名</string>
     <string name="paused">已暂停</string>
     <string name="downloads_wifi_only_summary">切换到移动网络时停止下载</string>
-    <string name="remove_completed">移除已完成</string>
+    <string name="remove_completed">删除完毕</string>
     <string name="cancel_all">取消所有</string>
     <string name="downloads_wifi_only">仅通过Wi-Fi下载</string>
     <string name="enable">启用</string>
@@ -397,17 +397,17 @@
     <string name="resume">恢复</string>
     <string name="ignore_ssl_errors">忽略SSL错误</string>
     <string name="text_downloads_list_holder">没有下载项</string>
-    <string name="downloads_resumed">下载已经恢复</string>
+    <string name="downloads_resumed">下载已恢复</string>
-    <string name="downloads_paused">暂停下载</string>
+    <string name="downloads_paused">下载已暂停</string>
-    <string name="downloads_removed">下载已被移除</string>
+    <string name="downloads_removed">下载已移除</string>
-    <string name="downloads_cancelled">下载被取消</string>
+    <string name="downloads_cancelled">下载已取消</string>
     <string name="suggestions_enable_prompt">你想要接收个性化的漫画推荐吗？</string>
     <string name="suggestion_manga">推荐：%s</string>
-    <string name="suggestions_notifications_summary">偶尔显示建议漫画通知</string>
+    <string name="suggestions_notifications_summary">偶尔显示漫画推荐通知</string>
     <string name="more">更多</string>
     <string name="cancel_all_downloads_confirm">所有进行中的下载都将被取消，未下载完成的数据将丢失</string>
     <string name="remove_completed_downloads_confirm">你的下载历史将会永久删除</string>
-    <string name="sync_auth_hint">你可以登陆一个已有账号或创建新账号</string>
+    <string name="sync_auth_hint">你可以登陆已有账号或创建新账号</string>
     <string name="address">地址</string>
     <string name="clear_network_cache">清除网络缓存</string>
     <string name="proxy">代理</string>
@@ -420,10 +420,61 @@
     <string name="clear_source_cookies_summary">仅清除特定域名的 cookies。大多数情况下会使网站授权失效</string>
     <string name="data_and_privacy">数据与隐私</string>
     <string name="reader_info_bar_summary">在屏幕顶部显示当前时间和阅读进度</string>
-    <string name="webtoon_zoom_summary">条漫模式下允许以手势缩放</string>
+    <string name="webtoon_zoom_summary">条漫模式下允许使用缩放手势</string>
     <string name="invalid_port_number">无效端口</string>
     <string name="no_access_to_file">您无法访问该文件或目录</string>
     <string name="local_manga_directories">本地漫画目录</string>
     <string name="port">端口</string>
     <string name="manga_branch_title_template">%1$s (%2$s)</string>
+    <string name="download_option_all_unread">所有未读章节</string>
+    <string name="pick_custom_directory">选择自定义目录</string>
+    <string name="password">密码</string>
+    <string name="download_option_whole_manga">整部漫画</string>
+    <string name="download_option_manual_selection">手动选择章节</string>
+    <string name="description">简介</string>
+    <string name="images_proxy_title">图片加载优化</string>
+    <string name="username">用户名</string>
+    <string name="download_option_all_unread_b">所有未读章节 (%s)</string>
+    <string name="authorization_optional">授权 (可选项)</string>
+    <string name="download_option_first_n_chapters">前 %s 章</string>
+    <string name="downloaded">已下载</string>
+    <string name="custom_directory">自定义目录</string>
+    <string name="pages_animation_summary">翻页动画</string>
+    <string name="download_option_next_unread_n_chapters">后 %s 章</string>
+    <string name="images_procy_description">尽可能使用 wsrv.nl 代理服务减少流量使用并加快图片加载</string>
+    <string name="invert_colors">颜色反转</string>
+    <string name="related_manga">相关漫画</string>
+    <string name="voice_search">语音搜索</string>
+    <string name="this_month">本月</string>
+    <string name="languages">语言</string>
+    <string name="captcha_required_summary">%s 需通过验证码才能正常工作</string>
+    <string name="progress">阅读进度</string>
+    <string name="error_corrupted_file">无效数据回传或文件已损坏</string>
+    <string name="related_manga_summary">显示相关漫画。可能并不准确或缺失</string>
+    <string name="tracker_wifi_only_summary">使用计量网络时停止检查新章节</string>
+    <string name="order_added">添加日期</string>
+    <string name="on_device">本地</string>
+    <string name="moved_to_top">移动到顶部</string>
+    <string name="data_not_restored_text">请确认你选择了正确的备份文件</string>
+    <string name="unknown">未知</string>
+    <string name="in_progress">进行中</string>
+    <string name="items_limit_exceeded">无可添加项</string>
+    <string name="data_not_restored">数据未恢复</string>
+    <string name="directories">目录</string>
+    <string name="manage_categories">漫画类别</string>
+    <string name="color_light">浅色</string>
+    <string name="search_hint">输入漫画名、漫画类型或漫画源名称</string>
+    <string name="main_screen_sections">主页栏目</string>
+    <string name="advanced">高级</string>
+    <string name="color_dark">深色</string>
+    <string name="too_many_requests_message">请求次数过多，稍候再尝试</string>
+    <string name="suggestions_wifi_only_summary">使用计量网络时停止推荐漫画</string>
+    <string name="default_section">默认栏目</string>
+    <string name="background">阅读背景色</string>
+    <string name="manga_list">漫画列表</string>
+    <string name="disable_nsfw">禁用 NSFW 源</string>
+    <string name="color_white">白色</string>
+    <string name="to_top">置顶</string>
+    <string name="show">显示</string>
+    <string name="color_black">黑色</string>
 </resources>