Release 1.6.2

(cherry picked from commit 13324dd1a1)

.github/ISSUE_TEMPLATE.md

@@ -3,7 +3,7 @@
 I acknowledge that:
 
 - I have updated:
-  - To the latest version of the app (stable is v1.6.1)
+  - To the latest version of the app (stable is v1.6.2)
   - All extensions
 - I have tried the troubleshooting guide: https://tachiyomi.org/help/guides/troubleshooting-problems/
 - If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,7 +10,7 @@ labels: "bug"
 I acknowledge that:
 
 - I have updated:
-  - To the latest version of the app (stable is v1.6.1)
+  - To the latest version of the app (stable is v1.6.2)
   - All extensions
 - I have tried the troubleshooting guide: https://tachiyomi.org/help/guides/troubleshooting-problems/
 - If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions

.github/ISSUE_TEMPLATE/feature_request.md

@@ -10,7 +10,7 @@ labels: "feature"
 I acknowledge that:
 
 - I have updated:
-  - To the latest version of the app (stable is v1.6.1)
+  - To the latest version of the app (stable is v1.6.2)
   - All extensions
 - If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions
 - I have searched the existing issues and this is new ticket **NOT** a duplicate or related to another open issue

.github/workflows/issue_closer.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Autoclose issues
-        uses: arkon/issue-closer-action@v3.0
+        uses: arkon/issue-closer-action@v3.1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           rules: |

app/build.gradle.kts

@@ -34,8 +34,8 @@ android {
         minSdkVersion(AndroidConfig.minSdk)
         targetSdkVersion(AndroidConfig.targetSdk)
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        versionCode = 15
+        versionCode = 16
-        versionName = "1.6.1"
+        versionName = "1.6.2"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
         buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
@@ -160,7 +160,7 @@ dependencies {
     implementation("com.github.pwittchen:reactivenetwork:0.13.0")
 
     // Network client
-    val okhttpVersion = "5.0.0-alpha.2"
+    val okhttpVersion = "4.9.1"
     implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
     implementation("com.squareup.okhttp3:logging-interceptor:$okhttpVersion")
     implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:$okhttpVersion")

app/src/main/java/eu/kanade/tachiyomi/App.kt

@@ -82,6 +82,9 @@ open class App : Application(), LifecycleObserver {
         LocaleHelper.updateConfiguration(this, resources.configuration)
 
         ProcessLifecycleOwner.get().lifecycle.addObserver(this)
+
+        // Reset Incognito Mode on relaunch
+        preferences.incognitoMode().set(false)
     }
 
     override fun attachBaseContext(base: Context) {

app/src/main/java/eu/kanade/tachiyomi/Migrations.kt

@@ -1,5 +1,6 @@
 package eu.kanade.tachiyomi
 
+import android.os.Build
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import eu.kanade.tachiyomi.data.backup.BackupCreatorJob
@@ -141,6 +142,15 @@ object Migrations {
                     }
                 }
             }
+            if (oldVersion < 59) {
+                // Reset rotation to Free after replacing Lock
+                preferences.rotation().set(1)
+
+                // Disable update check for Android 5.x users
+                if (BuildConfig.INCLUDE_UPDATER && Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
+                    UpdaterJob.cancelTask(context)
+                }
+            }
             return true
         }
 

app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt

@@ -263,7 +263,7 @@ class DownloadManager(private val context: Context) {
 
         if (removeNonFavorite && !manga.favorite) {
             val mangaFolder = provider.getMangaDir(manga, source)
-            cleaned += 1 + (mangaFolder.listFiles()?.size ?: 0)
+            cleaned += 1 + mangaFolder.listFiles().orEmpty().size
             mangaFolder.delete()
             cache.removeManga(manga)
             return cleaned
@@ -284,8 +284,7 @@ class DownloadManager(private val context: Context) {
 
         if (cache.getDownloadCount(manga) == 0) {
             val mangaFolder = provider.getMangaDir(manga, source)
-            val size = mangaFolder.listFiles()?.size ?: 0
+            if (!mangaFolder.listFiles().isNullOrEmpty()) {
-            if (size == 0) {
                 mangaFolder.delete()
                 cache.removeManga(manga)
             } else {

app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt

@@ -76,7 +76,7 @@ class DownloadProvider(private val context: Context) {
      */
     fun findMangaDir(manga: Manga, source: Source): UniFile? {
         val sourceDir = findSourceDir(source)
-        return sourceDir?.findFile(getMangaDirName(manga))
+        return sourceDir?.findFile(getMangaDirName(manga), true)
     }
 
     /**
@@ -89,7 +89,7 @@ class DownloadProvider(private val context: Context) {
     fun findChapterDir(chapter: Chapter, manga: Manga, source: Source): UniFile? {
         val mangaDir = findMangaDir(manga, source)
         return getValidChapterDirNames(chapter).asSequence()
-            .mapNotNull { mangaDir?.findFile(it) ?: mangaDir?.findFile("$it.cbz") }
+            .mapNotNull { mangaDir?.findFile(it, true) ?: mangaDir?.findFile("$it.cbz", true) }
             .firstOrNull()
     }
 
@@ -123,14 +123,12 @@ class DownloadProvider(private val context: Context) {
         source: Source
     ): List<UniFile> {
         val mangaDir = findMangaDir(manga, source) ?: return emptyList()
-        return mangaDir.listFiles()!!.asList().filter {
+        return mangaDir.listFiles().orEmpty().asList().filter {
-            (
             chapters.find { chp ->
                 getValidChapterDirNames(chp).any { dir ->
                     mangaDir.findFile(dir) ?: mangaDir.findFile("$dir.cbz") != null
                 }
-                } == null
+            } == null || it.name?.endsWith(Downloader.TMP_DIR_SUFFIX) == true
-                ) || it.name?.endsWith(Downloader.TMP_DIR_SUFFIX) == true
         }
     }
     // SY <--
@@ -141,7 +139,7 @@ class DownloadProvider(private val context: Context) {
      * @param source the source to query.
      */
     fun getSourceDirName(source: Source): String {
-        return source.toString()
+        return DiskUtil.buildValidFilename(source.toString())
     }
 
     /**
@@ -178,6 +176,7 @@ class DownloadProvider(private val context: Context) {
         return listOf(
             getChapterDirName(chapter),
 
+            // TODO: remove this
             // Legacy chapter directory name used in v0.9.2 and before
             DiskUtil.buildValidFilename(chapter.name)
         )

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt

@@ -24,6 +24,7 @@ object PreferenceValues {
     enum class DarkThemeVariant {
         default,
         blue,
+        amoledblue,
         amoled,
         red,
         midnightdusk,

app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeListInterceptor.kt

@@ -11,9 +11,6 @@ class MyAnimeListInterceptor(private val myanimelist: MyAnimeList, private var t
     private val json: Json by injectLazy()
 
     private var oauth: OAuth? = null
-        set(value) {
-            field = value?.copy(expires_in = System.currentTimeMillis() + (value.expires_in * 1000))
-        }
 
     override fun intercept(chain: Interceptor.Chain): Response {
         val originalRequest = chain.request()
@@ -24,21 +21,19 @@ class MyAnimeListInterceptor(private val myanimelist: MyAnimeList, private var t
         if (oauth == null) {
             oauth = myanimelist.loadOAuth()
         }
-        // Refresh access token if null or expired.
+        // Refresh access token if expired
-        if (oauth!!.isExpired()) {
+        if (oauth != null && oauth!!.isExpired()) {
             chain.proceed(MyAnimeListApi.refreshTokenRequest(oauth!!.refresh_token)).use {
                 if (it.isSuccessful) {
                     setAuth(json.decodeFromString(it.body!!.string()))
                 }
             }
         }
-
-        // Throw on null auth.
         if (oauth == null) {
             throw Exception("No authentication token")
         }
 
-        // Add the authorization header to the original request.
+        // Add the authorization header to the original request
         val authRequest = originalRequest.newBuilder()
             .addHeader("Authorization", "Bearer ${oauth!!.access_token}")
             .build()

app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/OAuth.kt

@@ -7,8 +7,9 @@ data class OAuth(
     val refresh_token: String,
     val access_token: String,
     val token_type: String,
+    val created_at: Long = System.currentTimeMillis(),
     val expires_in: Long
 ) {
 
-    fun isExpired() = System.currentTimeMillis() > expires_in
+    fun isExpired() = System.currentTimeMillis() > created_at + (expires_in * 1000)
 }

app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt

@@ -25,6 +25,7 @@ abstract class BaseThemedActivity : AppCompatActivity() {
             when (preferences.themeDark().get()) {
                 DarkThemeVariant.default -> R.style.Theme_Tachiyomi_Dark
                 DarkThemeVariant.blue -> R.style.Theme_Tachiyomi_Dark_Blue
+                DarkThemeVariant.amoledblue -> R.style.Theme_Tachiyomi_Dark_AmoledBlue
                 DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Dark_Amoled
                 DarkThemeVariant.red -> R.style.Theme_Tachiyomi_Dark_Red
                 DarkThemeVariant.midnightdusk -> R.style.Theme_Tachiyomi_Dark_MidnightDusk

app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadHolder.kt

@@ -81,15 +81,14 @@ class DownloadHolder(private val view: View, val adapter: DownloadAdapter) :
 
     private fun showPopupMenu(view: View) {
         view.popupMenu(
-            R.menu.download_single,
+            menuRes = R.menu.download_single,
-            {
+            initMenu = {
                 findItem(R.id.move_to_top).isVisible = bindingAdapterPosition != 0
                 findItem(R.id.move_to_bottom).isVisible =
                     bindingAdapterPosition != adapter.itemCount - 1
             },
-            {
+            onMenuItemClick = {
                 adapter.downloadItemListener.onMenuItemClick(bindingAdapterPosition, this)
-                true
             }
         )
     }

app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt

@@ -155,6 +155,15 @@ class MainActivity : BaseViewBindingActivity<MainActivityBinding>() {
         tabAnimator = ViewHeightAnimator(binding.tabs, 0L)
         bottomNavAnimator = ViewHeightAnimator(binding.bottomNav)
 
+        // If bottom nav is hidden, make it visible again when the app bar is expanded
+        binding.appbar.addOnOffsetChangedListener(
+            AppBarLayout.OnOffsetChangedListener { _, verticalOffset ->
+                if (verticalOffset == 0) {
+                    showBottomNav(true)
+                }
+            }
+        )
+
         // Set behavior of bottom nav
         preferences.hideBottomBar()
             .asImmediateFlow { setBottomNavBehaviorOnScroll() }

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt

@@ -1147,8 +1147,7 @@ class MangaController :
 
     fun onChapterDownloadUpdate(download: Download) {
         chaptersAdapter?.currentItems?.find { it.id == download.chapter.id }?.let {
-            chaptersAdapter?.updateItem(it)
+            chaptersAdapter?.updateItem(it, it.status)
-            chaptersAdapter?.notifyDataSetChanged()
         }
     }
 
@@ -1424,15 +1423,26 @@ class MangaController :
 
     // OVERFLOW MENU DIALOGS
 
-    private fun getUnreadChaptersSorted() = /* SY --> */ if (presenter.source.isEhBasedSource()) presenter.chapters
+    private fun getUnreadChaptersSorted(): List<ChapterItem> {
+        val chapters = presenter.chapters
             .sortedWith(presenter.getChapterSort())
             .filter { !it.read && it.status == Download.State.NOT_DOWNLOADED }
             .distinctBy { it.name }
-    else /* SY <-- */ presenter.chapters
+            // SY -->
-        .sortedWith(presenter.getChapterSort())
+            .let {
-        .filter { !it.read && it.status == Download.State.NOT_DOWNLOADED }
+                if (presenter.source.isEhBasedSource()) {
-        .distinctBy { it.name }
+                    it.reversed()
-        .reversed()
+                } else {
+                    it
+                }
+            }
+        // SY <--
+        return if (presenter.sortDescending()) {
+            chapters.reversed()
+        } else {
+            chapters
+        }
+    }
 
     private fun downloadChapters(choice: Int) {
         val chaptersToDownload = when (choice) {

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt

@@ -891,10 +891,19 @@ class MangaPresenter(
      * Returns the next unread chapter or null if everything is read.
      */
     fun getNextUnreadChapter(): ChapterItem? {
+        val chapters = chapters.sortedWith(getChapterSort())
         return if (source.isEhBasedSource()) {
-            chapters.sortedWith(getChapterSort()).firstOrNull()?.takeUnless { it.read }
+            if (sortDescending()) {
+                chapters.firstOrNull()?.takeUnless { it.read }
             } else {
-            chapters.sortedWith(getChapterSort()).findLast { !it.read }
+                chapters.lastOrNull()?.takeUnless { it.read }
+            }
+        } else {
+            if (sortDescending()) {
+                return chapters.findLast { !it.read }
+            } else {
+                chapters.find { !it.read }
+            }
         }
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterDownloadView.kt

@@ -6,42 +6,38 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import androidx.core.view.isVisible
+import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.databinding.ChapterDownloadViewBinding
+import eu.kanade.tachiyomi.util.view.setVectorCompat
 
 class ChapterDownloadView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
     FrameLayout(context, attrs) {
 
-    private val binding: ChapterDownloadViewBinding
+    private val binding: ChapterDownloadViewBinding =
+        ChapterDownloadViewBinding.inflate(LayoutInflater.from(context), this, false)
 
     private var state = Download.State.NOT_DOWNLOADED
     private var progress = 0
 
     private var downloadIconAnimator: ObjectAnimator? = null
-    private var isAnimating = false
 
     init {
-        binding = ChapterDownloadViewBinding.inflate(LayoutInflater.from(context), this, false)
         addView(binding.root)
     }
 
     fun setState(state: Download.State, progress: Int = 0) {
         val isDirty = this.state.value != state.value || this.progress != progress
-
-        this.state = state
-        this.progress = progress
-
         if (isDirty) {
-            updateLayout()
+            updateLayout(state, progress)
         }
     }
 
-    private fun updateLayout() {
+    private fun updateLayout(state: Download.State, progress: Int) {
-        binding.downloadIconBorder.isVisible = state == Download.State.NOT_DOWNLOADED
+        binding.downloadIcon.isVisible = state == Download.State.NOT_DOWNLOADED ||
-
+            state == Download.State.DOWNLOADING || state == Download.State.QUEUE
-        binding.downloadIcon.isVisible = state == Download.State.NOT_DOWNLOADED || state == Download.State.DOWNLOADING
+        if (state == Download.State.DOWNLOADING || state == Download.State.QUEUE) {
-        if (state == Download.State.DOWNLOADING) {
+            if (downloadIconAnimator == null) {
-            if (!isAnimating) {
                 downloadIconAnimator =
                     ObjectAnimator.ofFloat(binding.downloadIcon, "alpha", 1f, 0f).apply {
                         duration = 1000
@@ -49,22 +45,36 @@ class ChapterDownloadView @JvmOverloads constructor(context: Context, attrs: Att
                         repeatMode = ObjectAnimator.REVERSE
                     }
                 downloadIconAnimator?.start()
-                isAnimating = true
             }
-        } else {
+            downloadIconAnimator?.currentPlayTime = System.currentTimeMillis() % 2000
+        } else if (downloadIconAnimator != null) {
             downloadIconAnimator?.cancel()
+            downloadIconAnimator = null
             binding.downloadIcon.alpha = 1f
-            isAnimating = false
         }
 
-        binding.downloadQueued.isVisible = state == Download.State.QUEUE
-
         binding.downloadProgress.isVisible = state == Download.State.DOWNLOADING ||
-            (state == Download.State.QUEUE && progress > 0)
+            state == Download.State.NOT_DOWNLOADED || state == Download.State.QUEUE
-        binding.downloadProgress.progress = progress
+        if (state == Download.State.DOWNLOADING) {
+            binding.downloadProgress.setProgressCompat(progress, true)
+        } else {
+            binding.downloadProgress.setProgressCompat(100, true)
+        }
 
-        binding.downloadedIcon.isVisible = state == Download.State.DOWNLOADED
+        binding.downloadStatusIcon.apply {
+            if (state == Download.State.DOWNLOADED || state == Download.State.ERROR) {
+                isVisible = true
+                if (state == Download.State.DOWNLOADED) {
+                    setVectorCompat(R.drawable.ic_check_circle_24dp, android.R.attr.textColorPrimary)
+                } else {
+                    setVectorCompat(R.drawable.ic_error_outline_24dp, R.attr.colorError)
+                }
+            } else {
+                isVisible = false
+            }
+        }
 
-        binding.errorIcon.isVisible = state == Download.State.ERROR
+        this.state = state
+        this.progress = progress
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt

@@ -61,16 +61,12 @@ class ChaptersSettingsSheet(
 
     private fun showPopupMenu(view: View) {
         view.popupMenu(
-            R.menu.default_chapter_filter,
+            menuRes = R.menu.default_chapter_filter,
-            {
+            onMenuItemClick = {
-            },
+                when (itemId) {
-            {
-                when (this.itemId) {
                     R.id.set_as_default -> {
                         SetChapterSettingsDialog(presenter.manga).showDialog(router)
-                        true
                     }
-                    else -> true
                 }
             }
         )

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/base/BaseChapterHolder.kt

@@ -29,7 +29,6 @@ open class BaseChapterHolder(
                     },
                     onMenuItemClick = {
                         adapter.clickListener.deleteChapter(position)
-                        true
                     }
                 )
             }

app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt

@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.ui.more
 
 import android.app.Dialog
+import android.os.Build
 import android.os.Bundle
 import androidx.core.os.bundleOf
 import androidx.preference.PreferenceScreen
@@ -87,6 +88,14 @@ class AboutController : SettingsController() {
                     onClick { openInBrowser(it) }
                 }
             }
+            preference {
+                key = "pref_about_facebook"
+                title = "Facebook"
+                "https://facebook.com/tachiyomiorg".also {
+                    summary = it
+                    onClick { openInBrowser(it) }
+                }
+            }
             preference {
                 key = "pref_about_twitter"
                 title = "Twitter"
@@ -117,7 +126,7 @@ class AboutController : SettingsController() {
             preference {
                 key = "pref_about_label_original_tachiyomi_github"
                 title = "Original Tachiyomi GitHub "
-                "https://github.com/tachiyomiorg/tachiyomi".also {
+                "https://github.com/tachiyomiorg".also {
                     summary = it
                     onClick { openInBrowser(it) }
                 }
@@ -153,6 +162,11 @@ class AboutController : SettingsController() {
     private fun checkVersion() {
         if (activity == null) return
 
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
+            activity?.toast(R.string.update_check_eol)
+            return
+        }
+
         activity?.toast(R.string.update_check_look_for_updates)
 
         launchNow {

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt

@@ -67,6 +67,7 @@ import eu.kanade.tachiyomi.util.system.toast
 import eu.kanade.tachiyomi.util.view.defaultBar
 import eu.kanade.tachiyomi.util.view.hideBar
 import eu.kanade.tachiyomi.util.view.isDefaultBar
+import eu.kanade.tachiyomi.util.view.popupMenu
 import eu.kanade.tachiyomi.util.view.setTooltip
 import eu.kanade.tachiyomi.util.view.showBar
 import eu.kanade.tachiyomi.widget.SimpleAnimationListener
@@ -457,8 +458,12 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
             setTooltip(R.string.viewer)
 
             setOnClickListener {
-                val newReadingMode =
+                popupMenu(
-                    ReadingModeType.getNextReadingMode(presenter.getMangaViewer(resolveDefault = false))
+                    items = ReadingModeType.values().map { it.prefValue to it.stringRes },
+                    selectedItemId = presenter.getMangaViewer(resolveDefault = false),
+                ) {
+                    val newReadingMode = ReadingModeType.fromPreference(itemId)
+
                     presenter.setMangaViewer(newReadingMode.prefValue)
 
                     menuToggleToast?.cancel()
@@ -467,14 +472,18 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
                     }
                 }
             }
+        }
 
         // Rotation
         with(binding.actionRotation) {
             setTooltip(R.string.pref_rotation_type)
 
             setOnClickListener {
-                val newOrientation =
+                popupMenu(
-                    OrientationType.getNextOrientation(preferences.rotation().get(), resources)
+                    items = OrientationType.values().map { it.prefValue to it.stringRes },
+                    selectedItemId = preferences.rotation().get(),
+                ) {
+                    val newOrientation = OrientationType.fromPreference(itemId)
 
                     preferences.rotation().set(newOrientation.prefValue)
                     setOrientation(newOrientation.flag)
@@ -483,6 +492,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
                     menuToggleToast = toast(newOrientation.stringRes)
                 }
             }
+        }
         preferences.rotation().asImmediateFlow { updateRotationShortcut(it) }
             .launchIn(lifecycleScope)
          */
@@ -722,7 +732,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
     // EXH <--
 
     /*private fun updateRotationShortcut(preference: Int) {
-        val orientation = OrientationType.fromPreference(preference, resources)
+        val orientation = OrientationType.fromPreference(preference)
         binding.actionRotation.setImageResource(orientation.iconRes)
     }*/
 
@@ -1182,7 +1192,7 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
      * Forces the user preferred [orientation] on the activity.
      */
     private fun setOrientation(orientation: Int) {
-        val newOrientation = OrientationType.fromPreference(orientation, resources)
+        val newOrientation = OrientationType.fromPreference(orientation)
         if (newOrientation.flag != requestedOrientation) {
             requestedOrientation = newOrientation.flag
         }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/OrientationType.kt

@@ -1,43 +1,20 @@
 package eu.kanade.tachiyomi.ui.reader.setting
 
 import android.content.pm.ActivityInfo
-import android.content.res.Configuration
-import android.content.res.Resources
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.util.lang.next
 
 enum class OrientationType(val prefValue: Int, val flag: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) {
     FREE(1, ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED, R.string.rotation_free, R.drawable.ic_screen_rotation_24dp),
-    LOCKED_PORTRAIT(2, ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT, R.string.rotation_lock, R.drawable.ic_screen_lock_rotation_24dp),
+    PORTRAIT(2, ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT, R.string.rotation_portrait, R.drawable.ic_stay_current_portrait_24dp),
-    LOCKED_LANDSCAPE(2, ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, R.string.rotation_lock, R.drawable.ic_screen_lock_rotation_24dp),
+    LANDSCAPE(3, ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, R.string.rotation_landscape, R.drawable.ic_stay_current_landscape_24dp),
-    PORTRAIT(3, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, R.string.rotation_force_portrait, R.drawable.ic_screen_lock_portrait_24dp),
+    LOCKED_PORTRAIT(4, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, R.string.rotation_force_portrait, R.drawable.ic_screen_lock_portrait_24dp),
-    LANDSCAPE(4, ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, R.string.rotation_force_landscape, R.drawable.ic_screen_lock_landscape_24dp);
+    LOCKED_LANDSCAPE(5, ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, R.string.rotation_force_landscape, R.drawable.ic_screen_lock_landscape_24dp),
+    ;
 
     companion object {
-        fun fromPreference(preference: Int, resources: Resources): OrientationType = when (preference) {
+        fun fromPreference(preference: Int): OrientationType =
-            2 -> {
+            values().find { it.prefValue == preference } ?: FREE
-                val currentOrientation = resources.configuration.orientation
-                if (currentOrientation == Configuration.ORIENTATION_PORTRAIT) {
-                    LOCKED_PORTRAIT
-                } else {
-                    LOCKED_LANDSCAPE
-                }
-            }
-            3 -> PORTRAIT
-            4 -> LANDSCAPE
-            else -> FREE
-        }
-
-        fun getNextOrientation(preference: Int, resources: Resources): OrientationType {
-            val current = if (preference == 2) {
-                // Avoid issue due to 2 types having the same prefValue
-                LOCKED_LANDSCAPE
-            } else {
-                fromPreference(preference, resources)
-            }
-            return current.next()
-        }
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt

@@ -22,7 +22,7 @@ class ReaderSettingsSheet(
     init {
         val sheetBehavior = BottomSheetBehavior.from(binding.root.parent as ViewGroup)
         sheetBehavior.isFitToContents = false
-        sheetBehavior.halfExpandedRatio = 0.5f
+        sheetBehavior.halfExpandedRatio = 0.25f
 
         val filterTabIndex = getTabViews().indexOf(colorFilterSettings)
         binding.tabs.addOnTabSelectedListener(object : SimpleTabSelectedListener() {
@@ -36,11 +36,6 @@ class ReaderSettingsSheet(
                 if (activity.menuVisible != !isFilterTab) {
                     activity.setMenuVisibility(!isFilterTab)
                 }
-
-                // Partially collapse the sheet for better preview
-                if (isFilterTab) {
-                    sheetBehavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED
-                }
             }
         })
 

app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReadingModeType.kt

@@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.ui.reader.setting
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.util.lang.next
 
 enum class ReadingModeType(val prefValue: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) {
     DEFAULT(0, R.string.default_viewer, R.drawable.ic_reader_default_24dp),
@@ -17,11 +16,6 @@ enum class ReadingModeType(val prefValue: Int, @StringRes val stringRes: Int, @D
     companion object {
         fun fromPreference(preference: Int): ReadingModeType = values().find { it.prefValue == preference } ?: DEFAULT
 
-        fun getNextReadingMode(preference: Int): ReadingModeType {
-            val current = fromPreference(preference)
-            return current.next()
-        }
-
         fun isPagerType(preference: Int): Boolean {
             val mode = fromPreference(preference)
             return mode == LEFT_TO_RIGHT || mode == RIGHT_TO_LEFT || mode == VERTICAL

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt

@@ -250,16 +250,13 @@ class PagerPageHolder(
         readImageHeaderSubscription = Observable
             .fromCallable {
                 val stream = streamFn().buffered(16)
-                openStream = stream
+                openStream = process(stream)
 
                 ImageUtil.findImageType(stream) == ImageUtil.ImageType.GIF
             }
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .doOnNext { isAnimated ->
-                if (viewer.config.dualPageSplit) {
-                    openStream = processDualPageSplit(openStream!!)
-                }
                 if (!isAnimated) {
                     // SY -->
                     if (readerTheme >= 3) {
@@ -295,21 +292,31 @@ class PagerPageHolder(
             .subscribe({}, {})
     }
 
-    private fun processDualPageSplit(openStream: InputStream): InputStream {
+    private fun process(imageStream: InputStream): InputStream {
-        var inputStream = openStream
+        if (!viewer.config.dualPageSplit) {
-        val (isDoublePage, stream) = when (page) {
+            return imageStream
-            is InsertPage -> Pair(true, inputStream)
-            else -> ImageUtil.isDoublePage(inputStream)
         }
-        inputStream = stream
 
-        if (!isDoublePage) return inputStream
+        if (page is InsertPage) {
+            return splitInHalf(imageStream)
+        }
 
+        val isDoublePage = ImageUtil.isDoublePage(imageStream)
+        if (!isDoublePage) {
+            return imageStream
+        }
+
+        onPageSplit()
+
+        return splitInHalf(imageStream)
+    }
+
+    private fun splitInHalf(imageStream: InputStream): InputStream {
         var side = when {
             viewer is L2RPagerViewer && page is InsertPage -> ImageUtil.Side.RIGHT
-            (viewer is R2LPagerViewer || viewer is VerticalPagerViewer) && page is InsertPage -> ImageUtil.Side.LEFT
+            viewer !is L2RPagerViewer && page is InsertPage -> ImageUtil.Side.LEFT
             viewer is L2RPagerViewer && page !is InsertPage -> ImageUtil.Side.LEFT
-            (viewer is R2LPagerViewer || viewer is VerticalPagerViewer) && page !is InsertPage -> ImageUtil.Side.RIGHT
+            viewer !is L2RPagerViewer && page !is InsertPage -> ImageUtil.Side.RIGHT
             else -> error("We should choose a side!")
         }
 
@@ -320,11 +327,7 @@ class PagerPageHolder(
             }
         }
 
-        if (page !is InsertPage) {
+        return ImageUtil.splitInHalf(imageStream, side)
-            onPageSplit()
-        }
-
-        return ImageUtil.splitInHalf(inputStream, side)
     }
 
     private fun onPageSplit() {

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt

@@ -385,8 +385,11 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer {
     }
 
     fun onPageSplit(currentPage: ReaderPage, newPage: InsertPage) {
+        activity.runOnUiThread {
+            // Need to insert on UI thread else images will go blank
             adapter.onPageSplit(currentPage, newPage, this::class.java)
         }
+    }
 
     private fun cleanupPageSplit() {
         adapter.cleanupPageSplit()

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt

@@ -281,22 +281,13 @@ class WebtoonPageHolder(
         readImageHeaderSubscription = Observable
             .fromCallable {
                 val stream = streamFn().buffered(16)
-                openStream = stream
+                openStream = process(stream)
 
                 ImageUtil.findImageType(stream) == ImageUtil.ImageType.GIF
             }
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .doOnNext { isAnimated ->
-                if (viewer.config.dualPageSplit) {
-                    val (isDoublePage, stream) = ImageUtil.isDoublePage(openStream!!)
-                    openStream = if (!isDoublePage) {
-                        stream
-                    } else {
-                        val upperSide = if (viewer.config.dualPageInvert) ImageUtil.Side.LEFT else ImageUtil.Side.RIGHT
-                        ImageUtil.splitAndMerge(stream, upperSide)
-                    }
-                }
                 if (!isAnimated) {
                     val subsamplingView = initSubsamplingImageView()
                     subsamplingView.isVisible = true
@@ -315,6 +306,20 @@ class WebtoonPageHolder(
         addSubscription(readImageHeaderSubscription)
     }
 
+    private fun process(imageStream: InputStream): InputStream {
+        if (!viewer.config.dualPageSplit) {
+            return imageStream
+        }
+
+        val isDoublePage = ImageUtil.isDoublePage(imageStream)
+        if (!isDoublePage) {
+            return imageStream
+        }
+
+        val upperSide = if (viewer.config.dualPageInvert) ImageUtil.Side.LEFT else ImageUtil.Side.RIGHT
+        return ImageUtil.splitAndMerge(imageStream, upperSide)
+    }
+
     /**
      * Called when the page has an error.
      */

app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt

@@ -242,8 +242,7 @@ class UpdatesController :
         adapter?.currentItems
             ?.filterIsInstance<UpdatesItem>()
             ?.find { it.chapter.id == download.chapter.id }?.let {
-                adapter?.updateItem(it)
+                adapter?.updateItem(it, it.status)
-                adapter?.notifyDataSetChanged()
             }
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt

@@ -41,6 +41,7 @@ import eu.kanade.tachiyomi.util.preference.preferenceCategory
 import eu.kanade.tachiyomi.util.preference.summaryRes
 import eu.kanade.tachiyomi.util.preference.switchPreference
 import eu.kanade.tachiyomi.util.preference.titleRes
+import eu.kanade.tachiyomi.util.storage.DiskUtil
 import eu.kanade.tachiyomi.util.system.powerManager
 import eu.kanade.tachiyomi.util.system.toast
 import exh.debug.SettingsDebugController
@@ -48,12 +49,8 @@ import exh.log.EHLogLevel
 import exh.source.BlacklistedSources
 import exh.source.EH_SOURCE_ID
 import exh.source.EXH_SOURCE_ID
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.launch
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
@@ -347,29 +344,30 @@ class SettingsAdvancedController : SettingsController() {
     private fun cleanupDownloads(removeRead: Boolean, removeNonFavorite: Boolean) {
         if (job?.isActive == true) return
         activity?.toast(R.string.starting_cleanup)
-        job = GlobalScope.launch(Dispatchers.IO, CoroutineStart.DEFAULT) {
+        job = launchIO {
             val mangaList = db.getMangas().executeAsBlocking()
-            val sourceManager: SourceManager = Injekt.get()
             val downloadManager: DownloadManager = Injekt.get()
             var foldersCleared = 0
-            val sources = sourceManager.getOnlineSources()
+            Injekt.get<SourceManager>().getOnlineSources().forEach { source ->
-
-            for (source in sources) {
                 val mangaFolders = downloadManager.getMangaFolders(source)
-                val sourceManga = mangaList.filter { it.source == source.id }
+                val sourceManga = mangaList
+                    .asSequence()
+                    .filter { it.source == source.id }
+                    .map { it to DiskUtil.buildValidFilename(it.originalTitle) }
+                    .toList()
 
-                for (mangaFolder in mangaFolders) {
+                mangaFolders.forEach mangaFolder@{ mangaFolder ->
-                    val manga = sourceManga.find { it.originalTitle == mangaFolder.name }
+                    val manga = sourceManga.find { (_, folderName) -> folderName == mangaFolder.name }?.first
                     if (manga == null) {
                         // download is orphaned delete it
-                        foldersCleared += 1 + (mangaFolder.listFiles()?.size ?: 0)
+                        foldersCleared += 1 + (mangaFolder.listFiles().orEmpty().size)
                         mangaFolder.delete()
-                        continue
+                    } else {
-                    }
                         val chapterList = db.getChapters(manga).executeAsBlocking()
                         foldersCleared += downloadManager.cleanupChapters(chapterList, manga, source, removeRead, removeNonFavorite)
                     }
                 }
+            }
             withUIContext {
                 val activity = activity ?: return@withUIContext
                 val cleanupString =

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt

@@ -132,6 +132,7 @@ class SettingsGeneralController : SettingsController() {
                 entriesRes = arrayOf(
                     R.string.theme_dark_default,
                     R.string.theme_dark_blue,
+                    R.string.theme_dark_amoledblue,
                     R.string.theme_dark_amoled,
                     R.string.theme_dark_red,
                     R.string.theme_dark_midnightdusk,
@@ -140,6 +141,7 @@ class SettingsGeneralController : SettingsController() {
                 entryValues = arrayOf(
                     Values.DarkThemeVariant.default.name,
                     Values.DarkThemeVariant.blue.name,
+                    Values.DarkThemeVariant.amoledblue.name,
                     Values.DarkThemeVariant.amoled.name,
                     Values.DarkThemeVariant.red.name,
                     Values.DarkThemeVariant.midnightdusk.name,

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt

@@ -93,11 +93,12 @@ class SettingsReaderController : SettingsController() {
                 titleRes = R.string.pref_rotation_type
                 entriesRes = arrayOf(
                     R.string.rotation_free,
-                    R.string.rotation_lock,
+                    R.string.rotation_portrait,
+                    R.string.rotation_landscape,
                     R.string.rotation_force_portrait,
-                    R.string.rotation_force_landscape
+                    R.string.rotation_force_landscape,
                 )
-                entryValues = arrayOf("1", "2", "3", "4")
+                entryValues = arrayOf("1", "2", "3", "4", "5")
                 defaultValue = "1"
                 summary = "%s"
             }

app/src/main/java/eu/kanade/tachiyomi/util/lang/EnumExtensions.kt

@@ -1,7 +0,0 @@
-package eu.kanade.tachiyomi.util.lang
-
-inline fun <reified T : Enum<T>> T.next(): T {
-    val values = enumValues<T>()
-    val nextOrdinal = (ordinal + 1) % values.size
-    return values[nextOrdinal]
-}

app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt

@@ -84,15 +84,20 @@ object ImageUtil {
     }
 
     /**
-     * Check whether the image is a double image (width > height), return the result and original stream
+     * Check whether the image is a double-page spread
+     * @return true if the width is greater than the height
      */
-    fun isDoublePage(imageStream: InputStream): Pair<Boolean, InputStream> {
+    fun isDoublePage(imageStream: InputStream): Boolean {
+        imageStream.mark(imageStream.available() + 1)
+
         val imageBytes = imageStream.readBytes()
 
         val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
         BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size, options)
 
-        return Pair(options.outWidth > options.outHeight, ByteArrayInputStream(imageBytes))
+        imageStream.reset()
+
+        return options.outWidth > options.outHeight
     }
 
     /**

app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt

@@ -2,6 +2,7 @@
 
 package eu.kanade.tachiyomi.util.view
 
+import android.annotation.SuppressLint
 import android.graphics.Point
 import android.view.Gravity
 import android.view.Menu
@@ -9,14 +10,18 @@ import android.view.MenuItem
 import android.view.View
 import androidx.annotation.MenuRes
 import androidx.annotation.StringRes
+import androidx.appcompat.view.menu.MenuBuilder
 import androidx.appcompat.widget.PopupMenu
 import androidx.appcompat.widget.TooltipCompat
+import androidx.core.content.ContextCompat
+import androidx.core.view.forEach
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 import com.google.android.material.snackbar.Snackbar
 import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.util.system.getResourceColor
 
 /**
  * Returns coordinates of view.
@@ -63,7 +68,7 @@ inline fun View.setTooltip(@StringRes stringRes: Int) {
 inline fun View.popupMenu(
     @MenuRes menuRes: Int,
     noinline initMenu: (Menu.() -> Unit)? = null,
-    noinline onMenuItemClick: MenuItem.() -> Boolean
+    noinline onMenuItemClick: MenuItem.() -> Unit
 ): PopupMenu {
     val popup = PopupMenu(context, this, Gravity.NO_GRAVITY, R.attr.actionOverflowMenuStyle, 0)
     popup.menuInflater.inflate(menuRes, popup.menu)
@@ -71,7 +76,50 @@ inline fun View.popupMenu(
     if (initMenu != null) {
         popup.menu.initMenu()
     }
-    popup.setOnMenuItemClickListener { it.onMenuItemClick() }
+    popup.setOnMenuItemClickListener {
+        it.onMenuItemClick()
+        true
+    }
+
+    popup.show()
+    return popup
+}
+
+/**
+ * Shows a popup menu on top of this view.
+ *
+ * @param items menu item names to inflate the menu with. List of itemId to stringRes pairs.
+ * @param selectedItemId optionally show a checkmark beside an item with this itemId.
+ * @param onMenuItemClick function to execute when a menu item is clicked.
+ */
+@SuppressLint("RestrictedApi")
+inline fun View.popupMenu(
+    items: List<Pair<Int, Int>>,
+    selectedItemId: Int? = null,
+    noinline onMenuItemClick: MenuItem.() -> Unit
+): PopupMenu {
+    val popup = PopupMenu(context, this, Gravity.NO_GRAVITY, R.attr.actionOverflowMenuStyle, 0)
+    items.forEach { (id, stringRes) ->
+        popup.menu.add(0, id, 0, stringRes)
+    }
+
+    if (selectedItemId != null) {
+        (popup.menu as? MenuBuilder)?.setOptionalIconsVisible(true)
+        val emptyIcon = ContextCompat.getDrawable(context, R.drawable.ic_blank_24dp)
+        popup.menu.forEach { item ->
+            item.icon = when (item.itemId) {
+                selectedItemId -> ContextCompat.getDrawable(context, R.drawable.ic_check_24dp)?.mutate()?.apply {
+                    setTint(context.getResourceColor(android.R.attr.textColorPrimary))
+                }
+                else -> emptyIcon
+            }
+        }
+    }
+
+    popup.setOnMenuItemClickListener {
+        it.onMenuItemClick()
+        true
+    }
 
     popup.show()
     return popup

app/src/main/java/exh/EXHMigrations.kt

@@ -1,6 +1,7 @@
 package exh
 
 import android.content.Context
+import android.os.Build
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import com.pushtorefresh.storio.sqlite.queries.Query
@@ -34,6 +35,8 @@ import exh.source.MERGED_SOURCE_ID
 import exh.source.PERV_EDEN_EN_SOURCE_ID
 import exh.source.PERV_EDEN_IT_SOURCE_ID
 import exh.source.TSUMINO_SOURCE_ID
+import exh.util.over
+import exh.util.under
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
@@ -65,12 +68,14 @@ object EXHMigrations {
                 // Fresh install
                 if (oldVersion == 0) {
                     // Set up default background tasks
+                    if (BuildConfig.INCLUDE_UPDATER && Build.VERSION.SDK_INT over Build.VERSION_CODES.LOLLIPOP_MR1) {
                         UpdaterJob.setupTask(context)
+                    }
                     ExtensionUpdateJob.setupTask(context)
                     LibraryUpdateJob.setupTask(context)
                     return false
                 }
-                if (oldVersion < 4) {
+                if (oldVersion under 4) {
                     db.inTransaction {
                         updateSourceId(HBROWSE_SOURCE_ID, 6912)
                         // Migrate BHrowse URLs
@@ -96,20 +101,20 @@ object EXHMigrations {
                             .executeAsBlocking()
                     }
                 }
-                if (oldVersion < 5) {
+                if (oldVersion under 5) {
                     db.inTransaction {
                         // Migrate Hitomi source IDs
                         updateSourceId(Hitomi.otherId, 6910)
                     }
                 }
-                if (oldVersion < 6) {
+                if (oldVersion under 6) {
                     db.inTransaction {
                         updateSourceId(PERV_EDEN_EN_SOURCE_ID, 6905)
                         updateSourceId(PERV_EDEN_IT_SOURCE_ID, 6906)
                         updateSourceId(NHentai.otherId, 6907)
                     }
                 }
-                if (oldVersion < 7) {
+                if (oldVersion under 7) {
                     db.inTransaction {
                         val mergedMangas = db.db.get()
                             .listOfObjects(Manga::class.java)
@@ -209,12 +214,12 @@ object EXHMigrations {
                         }
                     }
                 }
-                if (oldVersion < 12) {
+                if (oldVersion under 12) {
                     // Force MAL log out due to login flow change
                     val trackManager = Injekt.get<TrackManager>()
                     trackManager.myAnimeList.logout()
                 }
-                if (oldVersion < 14) {
+                if (oldVersion under 14) {
                     // Migrate DNS over HTTPS setting
                     val prefs = PreferenceManager.getDefaultSharedPreferences(context)
                     val wasDohEnabled = prefs.getBoolean("enable_doh", false)
@@ -225,8 +230,16 @@ object EXHMigrations {
                         }
                     }
                 }
+                if (oldVersion under 16) {
+                    // Reset rotation to Free after replacing Lock
+                    preferences.rotation().set(1)
+                    // Disable update check for Android 5.x users
+                    if (BuildConfig.INCLUDE_UPDATER && Build.VERSION.SDK_INT under Build.VERSION_CODES.M) {
+                        UpdaterJob.cancelTask(context)
+                    }
+                }
 
-                // if (oldVersion < 1) { } (1 is current release version)
+                // if (oldVersion under 1) { } (1 is current release version)
                 // do stuff here when releasing changed crap
 
                 // TODO BE CAREFUL TO NOT FUCK UP MergedSources IF CHANGING URLs

app/src/main/java/exh/util/Boolean.kt

@@ -0,0 +1,9 @@
+package exh.util
+
+infix fun Int.over(other: Int) = this > other
+
+infix fun Int.overEq(other: Int) = this >= other
+
+infix fun Int.under(other: Int) = this < other
+
+infix fun Int.underEq(other: Int) = this <= other

app/src/main/res/drawable/border_circle.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval"
-    android:thicknessRatio="2">
-    <solid android:color="@android:color/transparent" />
-    <size
-        android:width="25dp"
-        android:height="25dp" />
-    <stroke
-        android:width="2dp"
-        android:color="?colorAccent" />
-</shape>

app/src/main/res/drawable/ic_stay_current_landscape_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M1.01,7L1,17c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2V7c0,-1.1 -0.9,-2 -2,-2H3c-1.1,0 -1.99,0.9 -1.99,2zM19,7v10H5V7h14z" />
+</vector>

app/src/main/res/drawable/ic_stay_current_portrait_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M17,1.01L7,1c-1.1,0 -1.99,0.9 -1.99,2v18c0,1.1 0.89,2 1.99,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z" />
+</vector>

app/src/main/res/layout/chapter_download_view.xml

@@ -7,16 +7,6 @@
     android:padding="8dp"
     android:background="?selectableItemBackgroundBorderless">
 
-    <ImageView
-        android:id="@+id/download_icon_border"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="2dp"
-        android:scaleType="fitXY"
-        app:srcCompat="@drawable/border_circle"
-        app:tint="?android:attr/textColorHint"
-        tools:ignore="ContentDescription" />
-
     <ImageView
         android:id="@+id/download_icon"
         android:layout_width="match_parent"
@@ -32,42 +22,17 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:padding="1dp"
-        android:visibility="gone"
+        android:progress="100"
-        app:indicatorColor="?android:attr/textColorHint"
-        app:indicatorInset="0dp"
-        app:indicatorSize="24dp"
-        app:trackThickness="2dp" />
-
-    <com.google.android.material.progressindicator.CircularProgressIndicator
-        android:id="@+id/download_queued"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:indeterminate="true"
-        android:padding="1dp"
-        android:visibility="gone"
         app:indicatorColor="?android:attr/textColorHint"
         app:indicatorInset="0dp"
         app:indicatorSize="24dp"
         app:trackThickness="2dp" />
 
     <ImageView
-        android:id="@+id/downloaded_icon"
+        android:id="@+id/download_status_icon"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="fitXY"
-        android:visibility="gone"
-        app:srcCompat="@drawable/ic_check_circle_24dp"
-        app:tint="?android:attr/textColorPrimary"
-        tools:ignore="ContentDescription" />
-
-    <ImageView
-        android:id="@+id/error_icon"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="fitXY"
-        android:visibility="gone"
-        app:srcCompat="@drawable/ic_error_outline_24dp"
-        app:tint="?attr/colorError"
         tools:ignore="ContentDescription" />
 
 </FrameLayout>

app/src/main/res/raw/changelog_release.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog bulletedList="true">
+    <changelogversion versionName="1.6.2" changeDate="Apr 28,2021">
+        <changelogtext>[b]Based on Tachiyomi stable 0.10.12(from 0.10.11)[/b]</changelogtext>
+        <changelogtext>[b]New[/b] Add Dark Blue AMOLED theme (by E-SHL)</changelogtext>
+        <changelogtext>Fix bug with clean orphaned downloads deleting manga downloads it shouldn't have</changelogtext>
+    </changelogversion>
     <changelogversion versionName="1.6.1" changeDate="Apr 19,2021">
         <changelogtext>[b]Based on Tachiyomi stable 0.10.11(from 0.10.10)[/b]</changelogtext>
         <changelogtext>Add a debug function to address really old SY full backups reader mode bug</changelogtext>

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

@@ -227,7 +227,6 @@
     <string name="pref_always_show_chapter_transition">ሁልጊዜ የምዕራፍ ሽግግርን ያሳዩ</string>
     <string name="rotation_force_landscape">የመሬት ገጽታን ያስገድዱ</string>
     <string name="rotation_force_portrait">የግዳጅ ምስል</string>
-    <string name="rotation_lock">ቆልፍ</string>
     <string name="rotation_free">ፍርይ</string>
     <string name="pref_rotation_type">ማሽከርከር</string>
     <string name="double_tap_anim_speed_fast">በፍጥነት</string>

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

@@ -137,7 +137,6 @@
     <string name="zoom_start_center">المركز</string>
     <string name="pref_rotation_type">الدوران</string>
     <string name="rotation_free">حر</string>
-    <string name="rotation_lock">مغلق</string>
     <string name="rotation_force_portrait">الوضع الرأسي اﻹجباري</string>
     <string name="rotation_force_landscape">الوضع الأفقي اﻹجباري</string>
     <string name="pref_download_directory">موقع التنزيل</string>
@@ -522,7 +521,6 @@
         <item quantity="other">متبقي %1$s عناصر</item>
     </plurals>
     <string name="downloaded_only_summary">يقوم بترشيح المانجا ضمن مكتبتك</string>
-    <string name="notices">عرض ملاحظات النسخة</string>
     <string name="pref_search_pinned_sources_only">تضمين المصادر المثبتة فقط</string>
     <string name="pref_webtoon_side_padding">المساحة الجانبية</string>
     <string name="vertical_plus_viewer">عمودي مستمر</string>

app/src/main/res/values-b+es+419/strings.xml

@@ -129,7 +129,6 @@
     <string name="color_filter_r_value">R</string>
     <string name="rotation_force_landscape">Forzar landscape</string>
     <string name="rotation_force_portrait">Forzar portrait</string>
-    <string name="rotation_lock">Bloqueado</string>
     <string name="rotation_free">Libre</string>
     <string name="pref_rotation_type">Rotación</string>
     <string name="double_tap_anim_speed_fast">Rápido</string>
@@ -421,7 +420,6 @@
     <string name="updated_version">Actualizado a v%1$s</string>
     <string name="check_for_updates">Buscar actualizaciones</string>
     <string name="licenses">Licencias de código abierto</string>
-    <string name="notices">Notas de versiones recientes</string>
     <string name="whats_new">Qué hay de nuevo</string>
     <string name="build_time">Hora de compilación</string>
     <string name="version">Versión</string>
@@ -652,4 +650,6 @@
     <string name="update_8hour">Cada 8 horas</string>
     <string name="update_4hour">Cada 4 horas</string>
     <string name="action_display_show_number_of_items">Mostrar cantidad de elementos</string>
+    <string name="none">Ninguno</string>
+    <string name="action_show_errors">Mostrar errores</string>
 </resources>

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

@@ -126,7 +126,6 @@
     <string name="zoom_start_center">Центрирано</string>
     <string name="pref_rotation_type">Въртене</string>
     <string name="rotation_free">Включено</string>
-    <string name="rotation_lock">Заключено</string>
     <string name="rotation_force_portrait">Портретно</string>
     <string name="rotation_force_landscape">Пейзажно</string>
     <string name="color_filter_r_value">R</string>
@@ -475,7 +474,6 @@
     <string name="label_downloaded_only">Само изтеглени</string>
     <string name="check_for_updates">Провери за ъпдейт</string>
     <string name="licenses">Лицензи за отворен код</string>
-    <string name="notices">Известия за предвартилени билдове</string>
     <string name="website">Уебсайт</string>
     <string name="battery_optimization_disabled">Оптимизацията на батерията е изключена</string>
     <string name="pref_disable_battery_optimization_summary">Помага при фонови обновявания на библиотеката и резервни копия</string>

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

@@ -141,7 +141,6 @@
     <string name="zoom_start_center">মাঝে</string>
     <string name="pref_rotation_type">ঘূর্ণন</string>
     <string name="rotation_free">মুক্ত</string>
-    <string name="rotation_lock">বন্ধ</string>
     <string name="rotation_force_portrait">সোঁজাসুজি রাখুন</string>
     <string name="rotation_force_landscape">আড়াআড়ি রাখুন</string>
     <string name="color_filter_r_value">ল</string>
@@ -605,7 +604,6 @@
     <string name="updated_version">হালনাগাদ করা হয়েছে v%1$s তে</string>
     <string name="check_for_updates">হালনাগাদ এর জন্য অনুসন্ধান করুন</string>
     <string name="licenses">ওপেন সোর্স লাইসেন্স</string>
-    <string name="notices">প্রিভিউ বিল্ড বিজ্ঞপ্তি</string>
     <string name="whats_new">কি কি নতুন</string>
     <string name="website">ওয়েবসাইট</string>
     <string name="pref_clear_history">ইতিহাস সাফ করুন</string>

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

@@ -167,7 +167,6 @@
     <string name="double_tap_anim_speed_fast">Ràpida</string>
     <string name="pref_rotation_type">Rotació</string>
     <string name="rotation_free">Lliure</string>
-    <string name="rotation_lock">Bloca</string>
     <string name="rotation_force_portrait">Força vertical</string>
     <string name="rotation_force_landscape">Força horitzontal</string>
     <string name="color_filter_r_value">R</string>
@@ -447,7 +446,6 @@
         <item quantity="one">Per a 1 títol</item>
         <item quantity="other">Per a %d títols</item>
     </plurals>
-    <string name="notices">Avisos de compilacions de previsualització</string>
     <string name="pref_theme_light">Tema clar</string>
     <string name="theme_light_default">Per defecte</string>
     <string name="theme_light_blue">Blau clar</string>

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

@@ -94,7 +94,6 @@
     <string name="right_to_left_viewer">Zprava doleva</string>
     <string name="pref_rotation_type">Otáčení</string>
     <string name="rotation_free">Volné</string>
-    <string name="rotation_lock">Zamknuté</string>
     <string name="rotation_force_portrait">Na výšku</string>
     <string name="rotation_force_landscape">Na šířku</string>
     <string name="color_filter_r_value">R</string>

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

@@ -271,7 +271,6 @@
     <string name="color_filter_a_value">Тӑрӑлӑх мар</string>
     <string name="rotation_force_landscape">Тӑрӑхскер</string>
     <string name="rotation_force_portrait">Урлӑскер</string>
-    <string name="rotation_lock">Ҫаклатнӑскер</string>
     <string name="rotation_free">Ирӗклӗ</string>
     <string name="pref_rotation_type">Урлӑ-тӑрӑх</string>
     <string name="double_tap_anim_speed_0">Энимсӗр</string>
@@ -330,7 +329,6 @@
     <string name="custom_filter">Усӑҫ али</string>
     <string name="sorting_mode">Уйӑру меслечӗ</string>
     <string name="pref_acra_summary">Кирек мӗнле йӑнӑшсене тӳрлетме пулӑшать. Нимӗнле харкам пӗлӗм те ярӑнмасть</string>
-    <string name="notices">Малтанлӑх верссисем ҫинчен ҫырни</string>
     <string name="invalid_download_dir">Йӑнӑшлӑ тиев вырӑнӗ</string>
     <string name="chapter_downloaded">Тиенӗ</string>
     <string name="label_downloaded_only">Тиенӗсене ҫеҫ</string>

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

@@ -135,9 +135,8 @@
     <string name="zoom_start_center">Mitte</string>
     <string name="pref_rotation_type">Ausrichtung</string>
     <string name="rotation_free">Frei</string>
-    <string name="rotation_lock">Gesperrt</string>
+    <string name="rotation_force_portrait">Hochformat sperren</string>
-    <string name="rotation_force_portrait">Hochformat erzwingen</string>
+    <string name="rotation_force_landscape">Querformat sperren</string>
-    <string name="rotation_force_landscape">Querformat erzwingen</string>
     <string name="color_filter_r_value">R</string>
     <string name="color_filter_g_value">G</string>
     <string name="color_filter_b_value">B</string>
@@ -197,7 +196,7 @@
     <string name="login_success">Angemeldet</string>
     <string name="invalid_login">Anmeldung fehlgeschlagen</string>
     <string name="unknown_error">Unbekannter Fehler</string>
-    <string name="library_search_hint">Titel oder Autor …</string>
+    <string name="library_search_hint">Titel oder Autor…</string>
     <string name="updating_category">Kategorie wird aktualisiert</string>
     <string name="source_requires_login">Für diese Quelle musst du dich anmelden</string>
     <string name="select_source">Wähle eine Quelle</string>
@@ -205,7 +204,7 @@
     <string name="no_more_results">Keine weiteren Ergebnisse</string>
     <string name="local_source">Lokale Quelle</string>
     <string name="invalid_combination">Standard kann nicht zusammen mit anderen Kategorien gewählt werden</string>
-    <string name="added_to_library">Der Manga wurde Ihrer Bibliothek hinzugefügt</string>
+    <string name="added_to_library">Der Manga wurde der Bibliothek hinzugefügt</string>
     <string name="manga_not_in_db">Dieser Manga wurde aus der Datenbank entfernt.</string>
     <string name="manga_detail_tab">Infos</string>
     <string name="description">Beschreibung</string>
@@ -447,7 +446,6 @@
         <item quantity="one">Für 1 Titel</item>
         <item quantity="other">Für %d Titel</item>
     </plurals>
-    <string name="notices">Preview-Build-Notizen</string>
     <string name="pref_theme_light">Helldesign</string>
     <string name="theme_light_default">Standard</string>
     <string name="theme_light_blue">Hellblau</string>
@@ -501,7 +499,7 @@
     <string name="check_for_updates">Nach Aktualisierungen suchen</string>
     <string name="last_used_source">Zuletzt genutzt</string>
     <string name="local_source_help_guide">Anleitung für lokale Quellen</string>
-    <string name="restore_duration">%02d Min. %02d Sk.</string>
+    <string name="restore_duration">%02d Min. %02d Sek.</string>
     <string name="downloaded_only_summary">Filtert alle Manga in deiner Bibliothek</string>
     <plurals name="download_queue_summary">
         <item quantity="one">1 verbleibend</item>
@@ -675,4 +673,6 @@
     <string name="action_show_errors">Fehler anzeigen</string>
     <string name="update_check_eol">Diese Android-Version wird nicht mehr unterstützt</string>
     <string name="clipboard_copy_error">Kopieren in die Zwischenablage fehlgeschlagen</string>
+    <string name="rotation_landscape">Querformat</string>
+    <string name="rotation_portrait">Porträt</string>
 </resources>

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

@@ -168,9 +168,8 @@
     <string name="double_tap_anim_speed_fast">Γρήγορη</string>
     <string name="pref_rotation_type">Περιστροφή</string>
     <string name="rotation_free">Ελεύθερο</string>
-    <string name="rotation_lock">Κλείδωμα</string>
+    <string name="rotation_force_portrait">Κλειδωμένο κατακόρυφα</string>
-    <string name="rotation_force_portrait">Υποχρεωτικά κατακόρυφα</string>
+    <string name="rotation_force_landscape">Κλειδωμένο οριζόντια</string>
-    <string name="rotation_force_landscape">Υποχρεωτικά οριζόντια</string>
     <string name="color_filter_r_value">R</string>
     <string name="color_filter_g_value">G</string>
     <string name="color_filter_b_value">B</string>
@@ -391,7 +390,6 @@
     <string name="add_tracking">Προσθήκη παρακολούθησης</string>
     <string name="pinned_sources">Καρφιτσωμένα</string>
     <string name="confirm_exit">Πατήστε ξανά για έξοδο</string>
-    <string name="notices">Ανακοινώσεις έκδοσης Preview</string>
     <string name="restore_duration">%02d λεπτά, %02d δευτερόλεπτα</string>
     <string name="action_select_inverse">Επιλογή αντίστροφου</string>
     <string name="channel_ext_updates">Ενημερώσεις επεκτάσεων</string>
@@ -633,7 +631,7 @@
     <string name="myanimelist_creds_missing">Τα διαπιστευτήρια σύνδεσης MAL δεν βρέθηκαν</string>
     <string name="pref_viewer_nav">Διάταξη πλοήγησης</string>
     <string name="edge_nav">Άκρη</string>
-    <string name="kindlish_nav">Kindle-ish</string>
+    <string name="kindlish_nav">Σαν Kindle</string>
     <string name="l_nav">Σχήματος L</string>
     <string name="default_nav">Προεπιλογή</string>
     <string name="channel_crash_logs">Αρχεία καταγραφής σφαλμάτων</string>
@@ -675,4 +673,6 @@
     <string name="action_show_errors">Εμφάνιση σφαλμάτων</string>
     <string name="update_check_eol">Αυτή η έκδοση Android δεν υποστηρίζεται πλέον</string>
     <string name="clipboard_copy_error">Απέτυχε η αντιγραφή στο πρόχειρο</string>
+    <string name="rotation_landscape">Οριζόντια</string>
+    <string name="rotation_portrait">Κατακόρυφα</string>
 </resources>

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

@@ -189,7 +189,6 @@
     <string name="color_filter_b_value">Blu</string>
     <string name="color_filter_g_value">Verd</string>
     <string name="color_filter_r_value">Ruĝ</string>
-    <string name="rotation_lock">Ŝlosita</string>
     <string name="rotation_free">Libera</string>
     <string name="pref_rotation_type">Orientiĝo</string>
     <string name="double_tap_anim_speed_fast">Rapida</string>

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

@@ -60,7 +60,7 @@
     <string name="portrait">Vertical</string>
     <string name="landscape">Horizontal</string>
     <string name="default_columns">Predeterminado</string>
-    <string name="pref_library_update_interval">Frecuencia de actualización de biblioteca</string>
+    <string name="pref_library_update_interval">Frecuencia de actualización</string>
     <string name="update_never">Manual</string>
     <string name="update_1hour">Cada hora</string>
     <string name="update_2hour">Cada 2 horas</string>
@@ -69,7 +69,7 @@
     <string name="update_12hour">Cada 12 horas</string>
     <string name="update_24hour">Cada día</string>
     <string name="update_48hour">Cada 2 días</string>
-    <string name="pref_library_update_restriction">Restricciones de actualización de biblioteca</string>
+    <string name="pref_library_update_restriction">Restricciones de actualización</string>
     <string name="pref_library_update_restriction_summary">Actualizar solo cuando se cumplan las condiciones</string>
     <string name="charging">Cargando</string>
     <string name="pref_update_only_non_completed">Solo actualizar manga no finalizada</string>
@@ -108,9 +108,8 @@
     <string name="zoom_start_center">Centro</string>
     <string name="pref_rotation_type">Rotación</string>
     <string name="rotation_free">Libre</string>
-    <string name="rotation_lock">Bloqueado</string>
     <string name="rotation_force_portrait">Forzar retrato</string>
-    <string name="rotation_force_landscape">Forzar apaisado</string>
+    <string name="rotation_force_landscape">Forzar en paisaje</string>
     <!-- Downloads section -->
     <string name="pref_download_directory">Ubicación de descargas</string>
     <string name="pref_download_only_over_wifi">Descargar sólo a través de Wi-Fi</string>
@@ -129,7 +128,7 @@
     <string name="cookies_cleared">Cookies borradas</string>
     <string name="pref_clear_database">Borrar redundancia de la base de datos</string>
     <string name="pref_clear_database_summary">Borrar el historial de mangas que no están guardados en la biblioteca</string>
-    <string name="clear_database_confirmation">¿Lo confirma\? Se perderán los capítulos leídos y el progreso de los mangas que no estén en la biblioteca</string>
+    <string name="clear_database_confirmation">¿Estás seguro\? Los capítulos leídos y el progreso del título que no esté en la biblioteca se perderá</string>
     <string name="clear_database_completed">Entradas eliminadas</string>
     <!-- About section -->
     <string name="version">Versión</string>
@@ -157,7 +156,7 @@
     <string name="description">Descripción</string>
     <string name="ongoing">En publicación</string>
     <string name="unknown">Desconocido</string>
-    <string name="licensed">Licenciado</string>
+    <string name="licensed">En hiatus</string>
     <string name="remove_from_library">Eliminar de biblioteca</string>
     <!-- Manga chapters fragment -->
     <string name="manga_chapters_tab">Capítulos</string>
@@ -251,8 +250,8 @@
     <string name="action_sort_alpha">Alfabéticamente</string>
     <string name="action_sort_total">Total de capítulos</string>
     <string name="action_sort_last_read">Último leído</string>
-    <string name="action_bookmark">Añadir marcador</string>
+    <string name="action_bookmark">Marcar Capitulo</string>
-    <string name="action_remove_bookmark">Quitar marcador</string>
+    <string name="action_remove_bookmark">Desmarcar capítulo</string>
     <string name="action_add">Añadir</string>
     <string name="download_notifier_no_network">No hay ninguna conexión de red disponible</string>
     <string name="download_notifier_download_paused">Descarga en pausa</string>
@@ -408,7 +407,7 @@
     <string name="filter_mode_lighten">Subexponer / Aclarar</string>
     <string name="filter_mode_darken">Quemar / Oscurecer</string>
     <string name="label_help">Ayuda</string>
-    <string name="pref_library_update_prioritization">Orden de actualización de la biblioteca</string>
+    <string name="pref_library_update_prioritization">Orden de actualización</string>
     <string name="no_results_found">No se han encontrado resultados</string>
     <string name="migration_selection_prompt">Selecciona una fuente para migrar</string>
     <string name="action_webview_back">Atrás</string>
@@ -419,11 +418,11 @@
     <string name="ext_obsolete">Obsoleto</string>
     <string name="obsolete_extension_message">Esta extensión ya no está disponible.</string>
     <string name="pref_date_format">Formato de fecha</string>
-    <string name="pref_category_library_update">Actualizaciones</string>
+    <string name="pref_category_library_update">Actualizacion Global</string>
     <string name="logout">Cerrar sesión</string>
     <string name="logout_success">Has cerrado sesión</string>
     <string name="currently_reading">Leyendo actualmente</string>
-    <string name="paused">En pausa</string>
+    <string name="paused">Pausado</string>
     <string name="logout_title">¿Cerrar sesión de %1$s\?</string>
     <string name="want_to_read">Quiero leer</string>
     <string name="label_more">Más</string>
@@ -479,7 +478,6 @@
         <item quantity="one">Para 1 título</item>
         <item quantity="other">Para %d títulos</item>
     </plurals>
-    <string name="notices">Nota de versiones recientes</string>
     <string name="pref_theme_light">Tema claro</string>
     <string name="theme_light_default">Predeterminado</string>
     <string name="theme_light_blue">Azul y blanco</string>
@@ -533,7 +531,7 @@
     <string name="error_invalid_date_supplied">Fecha indicada invalida</string>
     <string name="last_used_source">Ultímo usado</string>
     <string name="check_for_updates">Comprobar las actualizaciones</string>
-    <string name="local_source_help_guide">Instruccion local de fuente</string>
+    <string name="local_source_help_guide">Guía de fuente local</string>
     <plurals name="download_queue_summary">
         <item quantity="one">Queda 1</item>
         <item quantity="other">Quedan %1$s</item>
@@ -680,4 +678,32 @@
     <string name="action_order_by_upload_date">Por fecha de subida</string>
     <string name="action_filter_tracked">Rastreado</string>
     <string name="right_and_left_nav">Derecha e Izquierda</string>
+    <string name="backup_restore_content_full">Se restaurarán los datos del archivo de respaldo.
+\n
+\n Deberá instalar las extensiones que falten e iniciar sesión en los servicios de seguimiento después para usarlas.</string>
+    <string name="update_check_eol">Esta versión de Android ya no es compatible</string>
+    <string name="clipboard_copy_error">No se pudo copiar al portapapeles</string>
+    <string name="pref_dns_over_https">DNS sobre HTTPS</string>
+    <string name="pref_download_new_categories_details">Los manga de las categorías excluidas no se descargarán incluso si también están en las categorías incluidas.</string>
+    <string name="pref_category_auto_download">Auto-descarga</string>
+    <string name="rotation_landscape">Paisaje</string>
+    <string name="rotation_portrait">Retrato</string>
+    <string name="nav_zone_right">Derecha</string>
+    <string name="nav_zone_left">Izquierda</string>
+    <string name="nav_zone_next">Proximo</string>
+    <string name="nav_zone_prev">Anterior</string>
+    <string name="pref_dual_page_invert_summary">Si la ubicación de la división de página dual no coincide con la dirección de lectura</string>
+    <string name="pref_dual_page_invert">Invertir la ubicación de la división de página dual</string>
+    <string name="pref_dual_page_split">División de página dual</string>
+    <string name="pref_show_navigation_mode_summary">Mostrar zonas de tap cuando se abre el lector</string>
+    <string name="pref_show_navigation_mode">Mostrar superposición de diseño de navegación</string>
+    <string name="exclude">Excluir: %s</string>
+    <string name="include">Incluir: %s</string>
+    <string name="none">Ninguno</string>
+    <string name="pref_library_update_categories_details">Los manga de las categorías excluidas no se actualizarán incluso si también están en las categorías incluidas.</string>
+    <string name="update_8hour">Cada 8 horas</string>
+    <string name="update_4hour">Cada 4 horas</string>
+    <string name="action_show_errors">Mostrar Errores</string>
+    <string name="action_display_show_number_of_items">Mostrar número de artículos</string>
+    <string name="action_sort_chapter_fetch_date">Fecha obtenida</string>
 </resources>

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

@@ -260,7 +260,6 @@
     <string name="color_filter_r_value">قرمز</string>
     <string name="rotation_force_landscape">تحمیل حالت افقی</string>
     <string name="rotation_force_portrait">تحمیل حالت عمودی</string>
-    <string name="rotation_lock">قفل</string>
     <string name="rotation_free">آزاد</string>
     <string name="pref_rotation_type">چرخش</string>
     <string name="double_tap_anim_speed_fast">سریع</string>
@@ -470,7 +469,6 @@
     <string name="pref_enable_acra">ارسال گزارش های خرابی</string>
     <string name="check_for_updates">بررسی برای به آپدیت‌ها</string>
     <string name="licenses">مجوزهای منبع باز</string>
-    <string name="notices">اطلاعیه های نسخه پیش نمایش</string>
     <string name="build_time">زمان ساخت</string>
     <string name="version">نسخهٔ</string>
     <string name="website">وب سایت</string>

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

@@ -147,7 +147,7 @@
     <string name="pref_category_advanced">Kehittyneet</string>
     <string name="pref_category_about">Tietoja</string>
     <string name="pref_library_columns">Kohteita per rivi</string>
-    <string name="portrait">Pystysuunnassa</string>
+    <string name="portrait">Pystysuunta</string>
     <string name="landscape">Vaakatasossa</string>
     <string name="default_columns">Oletus</string>
     <string name="pref_library_update_interval">Päivitystiheys</string>
@@ -234,9 +234,8 @@
     <string name="double_tap_anim_speed_fast">Nopea</string>
     <string name="pref_rotation_type">Rotaatio</string>
     <string name="rotation_free">Vapaa</string>
-    <string name="rotation_lock">Lukitse</string>
+    <string name="rotation_force_portrait">Lukittu pystysuunta</string>
-    <string name="rotation_force_portrait">Pakota pystysuunta</string>
+    <string name="rotation_force_landscape">Lukittu vaakataso</string>
-    <string name="rotation_force_landscape">Pakota vaakatso</string>
     <string name="color_filter_r_value">Punainen</string>
     <string name="color_filter_g_value">Vihreä</string>
     <string name="color_filter_b_value">Sininen</string>
@@ -447,7 +446,6 @@
         <item quantity="one">Yhdelle sarjalle</item>
         <item quantity="other">%d sarjalle</item>
     </plurals>
-    <string name="notices">Esikatsele koontiversion ilmoituksia</string>
     <string name="pref_theme_light">Vaalea teema</string>
     <string name="theme_light_default">Oletus</string>
     <string name="theme_light_blue">Vaaleansininen</string>
@@ -675,4 +673,6 @@
     <string name="action_show_errors">Näytä virheet</string>
     <string name="update_check_eol">Tätä Android-versiota ei enää tueta</string>
     <string name="clipboard_copy_error">Kopiointi leikepöydälle epäonnistui</string>
+    <string name="rotation_landscape">Vaakatasossa</string>
+    <string name="rotation_portrait">Pystysuunnassa</string>
 </resources>

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

@@ -169,7 +169,6 @@
     <string name="color_filter_a_value">A</string>
     <string name="rotation_force_landscape">Piliting nakahiga</string>
     <string name="rotation_force_portrait">Piliting nakatayo</string>
-    <string name="rotation_lock">Nakasara</string>
     <string name="rotation_free">Malaya</string>
     <string name="pref_rotation_type">Pag-ikot</string>
     <string name="double_tap_anim_speed_fast">Mabilis</string>
@@ -536,7 +535,6 @@
     <string name="updated_version">In-update patungong bersyon %1$s</string>
     <string name="check_for_updates">Tumingin ng update</string>
     <string name="licenses">Mga lisensiyang open-source</string>
-    <string name="notices">Mga abiso sa panilip na gawa (preview build)</string>
     <string name="whats_new">Anong bago</string>
     <string name="build_time">Oras ng paggawa (build time)</string>
     <string name="version">Bersyon</string>

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

@@ -123,9 +123,8 @@
     <string name="zoom_start_center">Centre</string>
     <string name="pref_rotation_type">Rotation</string>
     <string name="rotation_free">Libre</string>
-    <string name="rotation_lock">Verrouillée</string>
+    <string name="rotation_force_portrait">Bloqué sur portrait</string>
-    <string name="rotation_force_portrait">Forcer portrait</string>
+    <string name="rotation_force_landscape">Bloqué sur paysage</string>
-    <string name="rotation_force_landscape">Forcer paysage</string>
     <string name="color_filter_r_value">R</string>
     <string name="color_filter_g_value">V</string>
     <string name="color_filter_b_value">B</string>
@@ -381,7 +380,7 @@
     <string name="track_author">Auteur</string>
     <string name="migration_dialog_what_to_include">Sélectionner les données à inclure</string>
     <string name="label_migration">Migrer</string>
-    <string name="label_extension_info">Information complémentaire</string>
+    <string name="label_extension_info">Informations de l\'extension</string>
     <string name="all_lang">Toutes</string>
     <string name="ext_trust">Fiable</string>
     <string name="ext_untrusted">Non fiable</string>
@@ -487,7 +486,6 @@
     <string name="action_reorganize_by">Réorganiser</string>
     <string name="action_newest">Plus récent</string>
     <string name="action_oldest">Plus ancien</string>
-    <string name="notices">Notes de version</string>
     <string name="pref_theme_light">Thème clair</string>
     <string name="action_move_to_top">Déplacer au début</string>
     <string name="action_move_to_bottom">Déplacer à la fin</string>
@@ -709,4 +707,6 @@
     <string name="action_show_errors">Afficher les erreurs</string>
     <string name="update_check_eol">Cette version d\'Android n\'est plus supportée</string>
     <string name="clipboard_copy_error">Échec de la copie dans le presse-papiers</string>
+    <string name="rotation_landscape">Paysage</string>
+    <string name="rotation_portrait">Portrait</string>
 </resources>

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

@@ -32,7 +32,6 @@
     <string name="color_filter_r_value">R</string>
     <string name="rotation_force_landscape">Forzar horizontal</string>
     <string name="rotation_force_portrait">Forzar vertical</string>
-    <string name="rotation_lock">Bloqueada</string>
     <string name="rotation_free">Libre</string>
     <string name="pref_rotation_type">Rotación</string>
     <string name="double_tap_anim_speed_fast">Rápido</string>

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

@@ -294,7 +294,6 @@
     <string name="action_rename_category">שנה שם קטגוריה</string>
     <string name="action_edit_categories">ערוך קטגוריות</string>
     <string name="action_add_category">הוסף קטגוריה</string>
-    <string name="notices">הודעות</string>
     <string name="build_time">זמן בנייה</string>
     <string name="version">גרסה</string>
     <string name="battery_optimization_disabled">אופטימיזציית סוללה כבר מושבתת</string>
@@ -348,7 +347,6 @@
     <string name="color_filter_r_value">אדום</string>
     <string name="rotation_force_landscape">כפה מצב מאוזן</string>
     <string name="rotation_force_portrait">כפה מצב מאונך</string>
-    <string name="rotation_lock">נעול</string>
     <string name="rotation_free">חופשי</string>
     <string name="pref_rotation_type">סיבוב</string>
     <string name="double_tap_anim_speed_fast">מהירה</string>

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

@@ -141,7 +141,6 @@
     <string name="zoom_start_center">मध्यविंदु</string>
     <string name="pref_rotation_type">नियमित आवर्तन</string>
     <string name="rotation_free">मुक्त</string>
-    <string name="rotation_lock">ताला</string>
     <string name="rotation_force_portrait">मजबूर चित्र</string>
     <string name="rotation_force_landscape">मजबूर लैंडस्केप</string>
     <string name="color_filter_r_value">R</string>
@@ -447,7 +446,6 @@
         <item quantity="one">1 शीर्षक के लिए</item>
         <item quantity="other">%d शीर्षक के लिए</item>
     </plurals>
-    <string name="notices">पूर्वावलोकन बनाएँ नोटिस</string>
     <string name="pref_theme_light">लाइट थीम</string>
     <string name="theme_light_default">डिफ़ॉल्ट</string>
     <string name="theme_light_blue">हल्का नीला</string>

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

@@ -55,7 +55,7 @@
     <string name="pref_library_update_interval">Učestalost ažuriranja</string>
     <string name="pref_category_library_update">Globalno ažuriranje</string>
     <string name="default_columns">Standardno</string>
-    <string name="landscape">Polegnuto</string>
+    <string name="landscape">Ležeće</string>
     <string name="portrait">Uspravno</string>
     <string name="pref_library_columns">Broj elemenata po retku</string>
     <string name="pref_category_display">Prikaz</string>
@@ -215,7 +215,7 @@
     <string name="third_to_last">Pretpredzadnje poglavlje</string>
     <string name="second_to_last">Predzadnje poglavlje</string>
     <string name="last_read_chapter">Zadnje pročitano poglavlje</string>
-    <string name="disabled">Isključeno</string>
+    <string name="disabled">Deaktivirano</string>
     <string name="custom_dir">Prilagođeno mjesto</string>
     <string name="pref_remove_after_read">Nakon čitanja</string>
     <string name="pref_remove_after_marked_as_read">Nakon ručnog označivanja kao pročitano</string>
@@ -233,9 +233,8 @@
     <string name="color_filter_b_value">B</string>
     <string name="color_filter_g_value">G</string>
     <string name="color_filter_r_value">R</string>
-    <string name="rotation_force_landscape">Prisili vodoravno</string>
+    <string name="rotation_force_landscape">Zaključaj ležeće</string>
-    <string name="rotation_force_portrait">Prisili okomito</string>
+    <string name="rotation_force_portrait">Zaključaj uspravno</string>
-    <string name="rotation_lock">Zaključaj</string>
     <string name="rotation_free">Slobodno</string>
     <string name="pref_rotation_type">Okretanje</string>
     <string name="double_tap_anim_speed_fast">Brzo</string>
@@ -256,7 +255,7 @@
     <string name="pref_image_decoder">Dekoder slika</string>
     <string name="pager_viewer">Pregled stranica</string>
     <string name="vertical_plus_viewer">Kontinuirano okomito</string>
-    <string name="webtoon_viewer">Webtoon</string>
+    <string name="webtoon_viewer">Digitalni strip</string>
     <string name="vertical_viewer">Okomito</string>
     <string name="right_to_left_viewer">S desna na lijevo</string>
     <string name="left_to_right_viewer">S lijeva na desno</string>
@@ -466,7 +465,6 @@
     <string name="pref_enable_acra">Pošalji izvještaj o padu programa</string>
     <string name="check_for_updates">Traži nove verzije</string>
     <string name="licenses">Licence otvorenog koda</string>
-    <string name="notices">Pregledaj napomene uz izdanje</string>
     <string name="build_time">Datum izdanja</string>
     <string name="version">Verzija</string>
     <string name="website">Web-stranica</string>
@@ -685,4 +683,8 @@
     <string name="pref_library_update_categories_details">Manga u isključenim kategorijama neće se ažurirati čak niti ako se također nalaze u uključenim kategorijama.</string>
     <string name="action_sort_chapter_fetch_date">Datum preuzimanja</string>
     <string name="action_show_errors">Prikaži greške</string>
+    <string name="update_check_eol">Ove verzija androida više nije podržana</string>
+    <string name="clipboard_copy_error">Kopiranje nije uspješno</string>
+    <string name="rotation_landscape">Ležeće</string>
+    <string name="rotation_portrait">Uspravno</string>
 </resources>

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

@@ -120,7 +120,7 @@
     <string name="action_display_mode">Megjelenítési mód</string>
     <string name="action_display">Megjelenés</string>
     <string name="action_sort">Rendezés</string>
-    <string name="chapter_downloading">Letöltődik</string>
+    <string name="chapter_downloading">Letöltés</string>
     <string name="chapter_queued">Várakozik</string>
     <string name="action_select_all">Összes kijelölése</string>
     <string name="action_cancel">Mégse</string>
@@ -208,7 +208,7 @@
     <string name="update_check_notification_update_available">Új verzió érhető el!</string>
     <string name="update_check_notification_download_error">Letöltési hiba</string>
     <string name="update_check_notification_download_complete">Letöltés kész</string>
-    <string name="email">Ímélcím</string>
+    <string name="email">E-mail cím</string>
     <string name="pref_category_nsfw_content">NSFW (18+) források</string>
     <string name="pref_hide_bottom_bar_on_scroll">Az alsó sáv elrejtése görgetéskor</string>
     <string name="show_chapter_number">Fejezetszám</string>
@@ -277,8 +277,8 @@
     <string name="description">Leírás</string>
     <string name="manga_detail_tab">Infó</string>
     <string name="login_success">Bejelentkezve</string>
-    <string name="remove_from_library">Eltávolítva a könyvtárból</string>
+    <string name="remove_from_library">Eltávolítás a könyvtárból</string>
-    <string name="in_library">A könyvtárban</string>
+    <string name="in_library">Könyvtárban</string>
     <string name="pref_category_reading">Olvasás</string>
     <string name="label_data">Adat</string>
     <string name="backup_created">Biztonsági mentés létrehozva</string>
@@ -341,4 +341,43 @@
     <string name="filter_mode_default">Alapértelmezett</string>
     <string name="copy">Másolás</string>
     <string name="migrate">Áttelepítés</string>
+    <string name="chapter_downloaded">Letöltött</string>
+    <string name="display_mode_chapter">%1$s. fejezet</string>
+    <string name="channel_crash_logs">Összeomlási naplók</string>
+    <string name="information_webview_required">A Tachiyomi működéséhez WebView szükséges</string>
+    <string name="description_cover">Manga borító</string>
+    <string name="notification_chapters_multiple">%1$s. fejezetek</string>
+    <string name="notification_chapters_single_and_more">A(z) %1$s. fejezet és %2$d egyéb fejezetek</string>
+    <string name="share_page_info">%1$s:%2$s, %3$d. oldal</string>
+    <string name="repeating">Újraolvasás</string>
+    <string name="invalid_download_dir">Érvénytelen letöltési hely</string>
+    <string name="confirm_delete_chapters">Biztosan törölni akarja a kijelölt fejezeteket\?</string>
+    <string name="download_unread">Olvasatlan</string>
+    <string name="download_all">Összes</string>
+    <string name="download_custom">Egyéni</string>
+    <string name="download_10">Következő 10 fejezet</string>
+    <string name="download_5">Következő 5 fejezet</string>
+    <string name="download_1">Következő fejezet</string>
+    <string name="fetch_chapters_error">A fejezetek nem érhetőek el</string>
+    <string name="chapter_paused">Szünetel</string>
+    <string name="snack_add_to_library">Manga könyvtárhoz adása\?</string>
+    <string name="source_not_installed">Forrás nincs telepítve: %1$s</string>
+    <string name="ongoing">Folyamatban van</string>
+    <string name="last_used_source">Utoljára használt</string>
+    <string name="downloaded_chapters">Letöltött fejezetek</string>
+    <string name="updating_category">Kategóriák frissítése</string>
+    <string name="library_search_hint">Cím vagy szerző…</string>
+    <string name="unknown_error">Ismeretlen hiba</string>
+    <string name="invalid_login">Sikertelen bejelentkezés</string>
+    <string name="logout_success">Mostmár ki van jelentkezve</string>
+    <string name="logout">Kijelentkezés</string>
+    <string name="password">Jelszó</string>
+    <string name="username">Felhasználónév</string>
+    <string name="cookies_cleared">Sütik törölve</string>
+    <string name="requires_app_restart">A változtatások érvénybe lépéséhez újra kell indítania az applikációt</string>
+    <string name="invalid_backup_file">Érvénytelen backup fájl</string>
+    <string name="edge_nav">Él</string>
+    <string name="updating_library">Könyvtár frissítése</string>
+    <string name="no_chapters_error">Nem található fejezet</string>
+    <string name="licensed">Licenszelt</string>
 </resources>

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

@@ -137,7 +137,6 @@
     <string name="zoom_start_center">Tengah</string>
     <string name="pref_rotation_type">Rotasi</string>
     <string name="rotation_free">Bebas</string>
-    <string name="rotation_lock">Kunci</string>
     <string name="rotation_force_portrait">Paksa tegak</string>
     <string name="rotation_force_landscape">Paksa menyamping</string>
     <string name="color_filter_r_value">R</string>
@@ -435,7 +434,6 @@
     <string name="pref_disable_battery_optimization">Nonaktifkan optimisasi baterai</string>
     <string name="battery_optimization_disabled">Optimalisasi baterai sudah dimatikan</string>
     <string name="email">Alamat surel</string>
-    <string name="notices">Pemberitahuan</string>
     <string name="theme_light_default">Terang standar</string>
     <string name="secure_screen">Amankan layar</string>
     <string name="logout_title">Keluar dari %1$s\?</string>

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

@@ -122,7 +122,6 @@
     <string name="zoom_start_center">Centro</string>
     <string name="pref_rotation_type">Orientamento</string>
     <string name="rotation_free">Libero</string>
-    <string name="rotation_lock">Bloccato</string>
     <string name="rotation_force_portrait">Blocca verticale</string>
     <string name="rotation_force_landscape">Blocca orizzontale</string>
     <string name="color_filter_r_value">R</string>
@@ -264,7 +263,7 @@
     <string name="update_check_look_for_updates">Ricerca aggiornamenti…</string>
     <!--UpdateCheck Notifications-->
     <string name="update_check_notification_file_download">Scarica aggiornamento</string>
-    <string name="update_check_notification_download_in_progress">Download in corso…</string>
+    <string name="update_check_notification_download_in_progress">Scaricamento…</string>
     <string name="update_check_notification_download_complete">Download completato</string>
     <string name="update_check_notification_download_error">Errore di download</string>
     <string name="update_check_notification_update_available">Aggiornamento disponibile!</string>
@@ -482,7 +481,6 @@
     <string name="notification_check_updates">Controllando nuove pubblicazioni</string>
     <string name="http_error_hint">Controlla il sito in WebView</string>
     <string name="email">Indirizzo e-mail</string>
-    <string name="notices">Anteprima avvisi di versione</string>
     <string name="battery_optimization_disabled">Ottimizzazione batteria già disattivata</string>
     <string name="pref_disable_battery_optimization_summary">Facilita gli aggiornamenti in background e i backup</string>
     <string name="pref_disable_battery_optimization">Disattiva ottimizzazione batteria</string>
@@ -504,7 +502,7 @@
     <string name="pref_skip_filtered_chapters">Salta capitoli filtrati</string>
     <string name="action_pin">Fissa</string>
     <string name="add_tracking">Aggiungi monitoraggio</string>
-    <string name="in_library">In libreria</string>
+    <string name="in_library">Nella libreria</string>
     <string name="add_to_library">Aggiungi alla libreria</string>
     <string name="pinned_sources">Fissato</string>
     <string name="webtoon_side_padding_25">25%</string>
@@ -706,4 +704,6 @@
     <string name="pref_show_navigation_mode">Mostra schema di navigazione</string>
     <string name="pref_show_navigation_mode_summary">Mostra zone di tocco quando il lettore viene aperto</string>
     <string name="action_show_errors">Mostra errori</string>
+    <string name="update_check_eol">Questa versione di Android non è più supportata</string>
+    <string name="clipboard_copy_error">Copia negli appunti fallito</string>
 </resources>

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

@@ -141,7 +141,6 @@
     <string name="double_tap_anim_speed_fast">速い</string>
     <string name="pref_rotation_type">回転</string>
     <string name="rotation_free">自動回転</string>
-    <string name="rotation_lock">ロック</string>
     <string name="rotation_force_portrait">横向き画面を強制</string>
     <string name="color_filter_r_value">R</string>
     <string name="color_filter_g_value">G</string>
@@ -429,7 +428,6 @@
     <string name="label_downloaded_only">ダウンロード済みのみ</string>
     <string name="check_for_updates">更新を確認</string>
     <string name="licenses">オープンソースライセンス</string>
-    <string name="notices">プレビュービルドの更新情報</string>
     <string name="website">Webサイト</string>
     <string name="battery_optimization_setting_activity_not_found">デバイス設定を開きませんでした</string>
     <string name="battery_optimization_disabled">バッテリー最適化は既に無効です</string>

app/src/main/res/values-ka-rGE/strings.xml

@@ -204,7 +204,6 @@
     <string name="double_tap_anim_speed_fast">სწარფი</string>
     <string name="pref_rotation_type">გადმოტრიალება</string>
     <string name="rotation_free">თავისუფალი</string>
-    <string name="rotation_lock">დაფიქსირებული</string>
     <string name="rotation_force_portrait">პორტრეტის რეჟიმი</string>
     <string name="rotation_force_landscape">პეიზაჟის რეჟიმი</string>
     <string name="color_filter_r_value">R</string>
@@ -481,7 +480,6 @@
     <string name="pref_disable_battery_optimization">გამორთე ბატარეის ოპტიმიზაცია</string>
     <string name="pref_disable_battery_optimization_summary">ეხმარება უკანა ფონში მიმდინარე ბიბლიოთეკის განახლებებსდა რეზერვს</string>
     <string name="build_time">აწყობის დრო</string>
-    <string name="notices">აწყობის განცხადებების გადახედვა</string>
     <string name="licenses">ღია კოდის ლიცენზია</string>
     <string name="pinned_sources">მიმაგრებული</string>
     <string name="local_source_help_guide">ლოკალური წყაროს გიდი</string>

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

@@ -192,7 +192,6 @@
     <string name="color_filter_r_value">R</string>
     <string name="rotation_force_landscape">ಬಲವಂತದ ಅಗಲಚಿತ್ರ</string>
     <string name="rotation_force_portrait">ಬಲವಂತದ ಉದ್ದಚಿತ್ರ</string>
-    <string name="rotation_lock">ಲಾಕ್</string>
     <string name="rotation_free">ಉಚಿತ</string>
     <string name="pref_rotation_type">ತಿರುಗಿಸು</string>
     <string name="double_tap_anim_speed_fast">ವೇಗವಾಗಿ</string>
@@ -491,7 +490,6 @@
     <string name="pref_enable_acra">ಕ್ರ್ಯಾಶ್ ವರದಿಗಳನ್ನು ಕಳುಹಿಸಿ</string>
     <string name="check_for_updates">ನವೀಕರಣಗಳಿಗಾಗಿ ಪರಿಶೀಲಿಸಿ</string>
     <string name="licenses">ಓಪನ್ ಸೋರ್ಸ್ ಪರವಾನಗಿಗಳು</string>
-    <string name="notices">ಬಿಲ್ಡ್ ಪ್ರಕಟಣೆಗಳ ಪೂರ್ವವೀಕ್ಷಣೆ</string>
     <string name="build_time">ನಿರ್ಮಿಸಿದ ಸಮಯ</string>
     <string name="version">ಆವೃತ್ತಿ</string>
     <string name="website">ವೆಬ್ಸೈಟ್</string>

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

@@ -152,7 +152,6 @@
     <string name="double_tap_anim_speed_fast">빠름</string>
     <string name="pref_rotation_type">회전</string>
     <string name="rotation_free">자유</string>
-    <string name="rotation_lock">잠금</string>
     <string name="rotation_force_portrait">세로로 고정</string>
     <string name="rotation_force_landscape">가로로 고정</string>
     <string name="pref_download_only_over_wifi">Wi-Fi만 사용해서 다운로드</string>

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

@@ -101,7 +101,7 @@
     <string name="pref_auto_update_manga_sync">Kemas kini bab selepas dibaca</string>
     <string name="pref_start_screen">Skrin permulaan</string>
     <string name="pref_language">Bahasa</string>
-    <string name="system_default">Sistem asal</string>
+    <string name="system_default">Lalai</string>
     <string name="default_category">Kategori lalai</string>
     <string name="default_category_summary">Sentiasa tanya</string>
     <string name="pref_fullscreen">Skrin penuh</string>
@@ -140,9 +140,8 @@
     <string name="zoom_start_center">Tengah</string>
     <string name="pref_rotation_type">Putaran skrin</string>
     <string name="rotation_free">Bebas</string>
-    <string name="rotation_lock">Kunci</string>
+    <string name="rotation_force_portrait">Kekal potret</string>
-    <string name="rotation_force_portrait">Hanya potret</string>
+    <string name="rotation_force_landscape">Kekal landskap</string>
-    <string name="rotation_force_landscape">Hanya landskap</string>
     <string name="color_filter_r_value">R</string>
     <string name="color_filter_g_value">G</string>
     <string name="color_filter_b_value">B</string>
@@ -152,7 +151,7 @@
     <string name="pref_remove_after_marked_as_read">Selepas ditandakan sebagai dibaca secara manual</string>
     <string name="pref_remove_after_read">Setelah membaca</string>
     <string name="custom_dir">Lokasi tersuai</string>
-    <string name="disabled">Di nyahkan</string>
+    <string name="disabled">Dinyahkan</string>
     <string name="last_read_chapter">Bab terakhir dibaca</string>
     <string name="second_to_last">Bab kedua terakhir</string>
     <string name="third_to_last">Bab ketiga terakhir</string>
@@ -212,7 +211,7 @@
     <string name="local_source">Sumber lokal</string>
     <string name="other_source">Lain</string>
     <string name="invalid_combination">Lalai tidak boleh dipilih bersama kategori lain</string>
-    <string name="added_to_library">Ditambah ke pustaka</string>
+    <string name="added_to_library">Manga ini telah ditambahkan ke Pustaka anda</string>
     <string name="action_global_search_hint">Carian keseluruhan…</string>
     <string name="latest">Terkini</string>
     <string name="browse">Semak imbas</string>
@@ -229,7 +228,7 @@
     <string name="display_mode_chapter">Bab %1$s</string>
     <string name="chapter_downloaded">Dimuat turun</string>
     <string name="chapter_queued">Diaturkan</string>
-    <string name="chapter_downloading">Muat turun dalam progres</string>
+    <string name="chapter_downloading">Memuat turun</string>
     <string name="chapter_downloading_progress">Memuat turun (%1$d/%2$d)</string>
     <string name="chapter_error">Ralat</string>
     <string name="chapter_paused">Ditangguh</string>
@@ -244,7 +243,7 @@
     <string name="download_5">5 bab seterusnya</string>
     <string name="download_10">10 bab seterusnya</string>
     <string name="download_all">Semua</string>
-    <string name="download_unread">Muat turun yang belum di baca</string>
+    <string name="download_unread">Belum dibaca</string>
     <string name="confirm_delete_chapters">Adakah anda pasti ingin memadamkan bab yang dipilih\?</string>
     <string name="manga_tracking_tab">Penjejakan</string>
     <string name="reading">Sedang baca</string>
@@ -274,7 +273,7 @@
     <string name="chapter_subtitle">Bab %1$s</string>
     <string name="no_next_chapter">Bab seterusnya tidak dijumpai</string>
     <string name="no_previous_chapter">Bab sebelumnya tidak dijumpai</string>
-    <string name="decode_image_error">Imej tidak dapat di muatkan</string>
+    <string name="decode_image_error">Imej tidak dapat dimuatkan</string>
     <string name="confirm_set_image_as_cover">Guna imej ini sebagai muka hadapan\?</string>
     <string name="download_queue_error">Memuat turun bab tidak berjaya. Anda boleh mencuba lagi di bahagian muat turun</string>
     <string name="notification_update_progress">Progres kemas kini: %1$d/%2$d</string>
@@ -319,7 +318,7 @@
     <string name="ext_update">Kemaskini</string>
     <string name="ext_install">Pasang</string>
     <string name="ext_pending">Masih menunggu</string>
-    <string name="ext_downloading">Menuat turun</string>
+    <string name="ext_downloading">Memuat turun</string>
     <string name="ext_installing">Memasang</string>
     <string name="ext_installed">Dipasang</string>
     <string name="ext_trust">Dipercayai</string>
@@ -391,9 +390,9 @@
     <string name="logout_title">Log keluar daripada %1$s\?</string>
     <string name="logout">Log keluar</string>
     <string name="logout_success">Anda telah log keluar</string>
-    <string name="currently_reading">Sedang di baca</string>
+    <string name="currently_reading">Sedang baca</string>
     <string name="paused">Ditangguh</string>
-    <string name="want_to_read">Hendak di baca</string>
+    <string name="want_to_read">Ingin baca</string>
     <string name="label_more">Lain-lain</string>
     <string name="action_sort_latest_chapter">Bab terkini</string>
     <string name="action_view_chapters">Buka bab</string>
@@ -408,7 +407,7 @@
     <string name="theme_dark_amoled">AMOLED</string>
     <string name="pref_manage_notifications">Uruskan pemberitahuan</string>
     <string name="pref_category_security">Keselamatan</string>
-    <string name="lock_with_biometrics">Kunci dengan biometrik</string>
+    <string name="lock_with_biometrics">Memerlukan buka kunci</string>
     <string name="lock_when_idle">Kunci apabila terbiar</string>
     <string name="lock_always">Selalu</string>
     <string name="lock_never">Tidak</string>
@@ -443,7 +442,6 @@
     <plurals name="notification_new_chapters_summary">
         <item quantity="other">Untuk %d tajuk</item>
     </plurals>
-    <string name="notices">Notis binaan Preview</string>
     <string name="pref_theme_light">Tema terang</string>
     <string name="theme_light_default">Lalai</string>
     <string name="theme_light_blue">Biru terang</string>
@@ -663,4 +661,6 @@
     <string name="action_show_errors">Tunjuk ralat</string>
     <string name="update_check_eol">Versi Android ini tidak lagi disokong</string>
     <string name="clipboard_copy_error">Gagal menyalin ke papan keratan</string>
+    <string name="rotation_landscape">Landskap</string>
+    <string name="rotation_portrait">Potret</string>
 </resources>

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

@@ -95,7 +95,7 @@
     <string name="unlock_app">Tachiyomi ကိုဖွင့်ပါ</string>
     <string name="history">မှတ်တမ်း</string>
     <string name="track">ခြေရာခံမှု</string>
-    <string name="chapters">အခန်းများ</string>
+    <string name="chapters">အပိုင်းများ</string>
     <string name="manga">Manga</string>
     <string name="categories">အမျိုးအစားများ</string>
     <string name="information_empty_category">အမျိုးအစားများမရှိသေးပါ။သင့်စာအုပ်စင်ကို အမျိုးအစားခွဲခြားမှုပြုလုပ်ရန် အပေါင်းခလုပ်ကိုနှိပ်ပါ။</string>
@@ -129,4 +129,13 @@
     <string name="action_webview_refresh">ပြန်ရယူမည်</string>
     <string name="action_webview_forward">ရှေ့သို့</string>
     <string name="action_webview_back">နောက်သို့</string>
+    <string name="updating_library">Library ကိုအပ်ဒိတ်လုပ်နေပါတယ်</string>
+    <string name="default_category">ပုံသေအမျိုးအစား</string>
+    <string name="no_chapters_error">မည်သည့်အပိုင်းမျှမရှိပါ</string>
+    <string name="lock_when_idle">အသုံးမပြုချိန်တွင်သော့ခတ်မည်</string>
+    <string name="completed">ထုတ်ဝေမှုပြီးစီး</string>
+    <string name="licensed">လိုင်စင်လုပ်ပြီး</string>
+    <string name="unknown">မသိရှိပါ</string>
+    <string name="ongoing">Ongoing</string>
+    <string name="title">နာမည်</string>
 </resources>

app/src/main/res/values-nb-rNO/strings.xml

@@ -163,7 +163,6 @@
     <string name="double_tap_anim_speed_fast">Rask</string>
     <string name="pref_rotation_type">Rotasjon</string>
     <string name="rotation_free">Fri</string>
-    <string name="rotation_lock">Låst</string>
     <string name="rotation_force_portrait">Tving stående</string>
     <string name="rotation_force_landscape">Tving liggende</string>
     <string name="color_filter_r_value">R</string>
@@ -445,7 +444,6 @@
     <string name="manga_info_collapse">Mindre</string>
     <string name="manga_info_expand">Mer</string>
     <string name="pinned_sources">Festet</string>
-    <string name="notices">Merknader</string>
     <string name="website">Nettside</string>
     <string name="creating_backup_error">Sikkerhetskopiering mislyktes</string>
     <string name="webtoon_side_padding_0">Ingen</string>
@@ -673,4 +671,8 @@
     <string name="pref_category_auto_download">Last ned automatisk</string>
     <string name="pref_library_update_categories_details">Manga i utelukkede kategorier vil ikke bli oppdatert selv om de også er i inkluderte kategorier.</string>
     <string name="action_show_errors">Vis feil</string>
+    <string name="clipboard_copy_error">Klarte ikke å kopiere til utklippstavle</string>
+    <string name="update_check_eol">Denne Android-versjonen støttes ikke lenger</string>
+    <string name="rotation_landscape">Liggende</string>
+    <string name="rotation_portrait">Stående</string>
 </resources>

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

@@ -114,7 +114,6 @@
     <string name="zoom_start_center">Midden</string>
     <string name="pref_rotation_type">Rotatie</string>
     <string name="rotation_free">Vrij</string>
-    <string name="rotation_lock">Vergrendeld</string>
     <string name="color_filter_r_value">R</string>
     <string name="color_filter_g_value">G</string>
     <string name="color_filter_b_value">B</string>
@@ -480,7 +479,6 @@
     <string name="label_downloaded_only">Alleen gedownloade</string>
     <string name="check_for_updates">Controleer op updates</string>
     <string name="licenses">Open-sourcelicenties</string>
-    <string name="notices">Voorbeeldversie mededelingen</string>
     <string name="website">Website</string>
     <string name="battery_optimization_disabled">Batterijoptimalisatie is al uitgeschakeld</string>
     <string name="pref_disable_battery_optimization_summary">Helpt bij het bijwerken van bibliotheek en back-ups op de achtergrond</string>
@@ -673,4 +671,6 @@
     <string name="action_sort_chapter_fetch_date">Datum opgehaald</string>
     <string name="none">Geen</string>
     <string name="action_show_errors">Fouten weergeven</string>
+    <string name="update_check_eol">Deze Android versie wordt niet meer ondersteund</string>
+    <string name="clipboard_copy_error">Mislukt om naar het klemboord te kopiëren</string>
 </resources>

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

@@ -150,7 +150,7 @@
     <string name="portrait">Orientacja pionowa</string>
     <string name="landscape">Orientacja pozioma</string>
     <string name="default_columns">Domyślnie</string>
-    <string name="pref_library_update_interval">Częstotliwość aktualizacji biblioteki</string>
+    <string name="pref_library_update_interval">Częstotliwość aktualizacji</string>
     <string name="update_never">Ręcznie</string>
     <string name="update_1hour">Co godzinę</string>
     <string name="update_2hour">Co 2 godziny</string>
@@ -161,7 +161,7 @@
     <string name="update_48hour">Co 2 dni</string>
     <string name="update_weekly">Co tydzień</string>
     <string name="all">Wszystko</string>
-    <string name="pref_library_update_restriction">Warunki aktualizacji biblioteki</string>
+    <string name="pref_library_update_restriction">Warunki aktualizacji</string>
     <string name="pref_library_update_restriction_summary">Aktualizuje tylko, kiedy spełnione są te warunki</string>
     <string name="charging">Ładowanie</string>
     <string name="pref_update_only_non_completed">Aktualizuj tylko nieukończone mangi</string>
@@ -206,9 +206,8 @@
     <string name="zoom_start_center">Od środka</string>
     <string name="pref_rotation_type">Orientacja ekranu</string>
     <string name="rotation_free">Dowolna</string>
-    <string name="rotation_lock">Zablokowana</string>
+    <string name="rotation_force_portrait">Wymuś pionowo</string>
-    <string name="rotation_force_portrait">Wymuś pionową</string>
+    <string name="rotation_force_landscape">Wymuś poziomo</string>
-    <string name="rotation_force_landscape">Wymuś poziomą</string>
     <string name="color_filter_r_value">R</string>
     <string name="color_filter_g_value">G</string>
     <string name="color_filter_b_value">B</string>
@@ -375,7 +374,7 @@
     <string name="filter_mode_lighten">Rozjaśnienie</string>
     <string name="filter_mode_darken">Ściemnienie</string>
     <string name="label_help">Pomoc</string>
-    <string name="pref_library_update_prioritization">Kolejność aktualizacji biblioteki</string>
+    <string name="pref_library_update_prioritization">Kolejność aktualizacji</string>
     <string name="action_webview_back">Wstecz</string>
     <string name="filter_mode_screen">Ekran</string>
     <string name="no_results_found">Nie znaleziono wyników</string>
@@ -527,7 +526,6 @@
     <string name="action_display_unread_badge">Plakietki nieprzeczytanych rozdziałów</string>
     <string name="action_view_chapters">Przeglądaj rozdziały</string>
     <string name="add_tracking">Dodaj śledzenie</string>
-    <string name="notices">Uwagi dotyczące kompilacji podglądowej</string>
     <string name="battery_optimization_setting_activity_not_found">Niepowodzenie otwarcia ustawień urządzenia</string>
     <string name="pref_refresh_library_covers">Odśwież okładki</string>
     <string name="restoring_backup_error">Przywracanie kopii zapasowej zakończone niepowodzeniem</string>
@@ -691,4 +689,12 @@
     <string name="exclude">Wyklucz: %s</string>
     <string name="include">Uwzględnij: %s</string>
     <string name="none">Brak</string>
+    <string name="update_check_eol">Ta wersja Androida nie jest już wspierana</string>
+    <string name="clipboard_copy_error">Nie udało się skopiować do schowka</string>
+    <string name="pref_library_update_categories_details">Tytuły w wykluczonych kategoriach nie będą aktualizowane, nawet jeśli są również w uwzględnionych kategoriach.</string>
+    <string name="pref_download_new_categories_details">Tytuły w wykluczonych kategoriach nie będą pobierane, nawet jeśli są również w uwzględnionych kategoriach.</string>
+    <string name="pref_category_auto_download">Automatyczne pobieranie</string>
+    <string name="rotation_landscape">Poziomo</string>
+    <string name="rotation_portrait">Pionowo</string>
+    <string name="action_show_errors">Pokaż błędy</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -137,9 +137,8 @@
     <string name="zoom_start_center">Centro</string>
     <string name="pref_rotation_type">Orientação</string>
     <string name="rotation_free">Automática</string>
-    <string name="rotation_lock">Bloqueada</string>
+    <string name="rotation_force_portrait">Retrato bloqueado</string>
-    <string name="rotation_force_portrait">Forçar retrato</string>
+    <string name="rotation_force_landscape">Paisagem bloqueado</string>
-    <string name="rotation_force_landscape">Forçar paisagem</string>
     <string name="color_filter_r_value">R</string>
     <string name="color_filter_g_value">G</string>
     <string name="color_filter_b_value">B</string>
@@ -447,7 +446,6 @@
         <item quantity="one">Para 1 título</item>
         <item quantity="other">Para %d títulos</item>
     </plurals>
-    <string name="notices">Avisos da compilação de preview</string>
     <string name="pref_theme_light">Tema claro</string>
     <string name="theme_light_default">Padrão</string>
     <string name="theme_light_blue">Azul claro</string>
@@ -675,4 +673,6 @@
     <string name="action_show_errors">Mostrar erros</string>
     <string name="update_check_eol">Esta versão do Android não é mais suportada</string>
     <string name="clipboard_copy_error">Erro ao copiar para a área de transferência</string>
+    <string name="rotation_landscape">Paisagem</string>
+    <string name="rotation_portrait">Retrato</string>
 </resources>

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

@@ -108,7 +108,6 @@
     <string name="zoom_start_center">Centro</string>
     <string name="pref_rotation_type">Rotação</string>
     <string name="rotation_free">Livre</string>
-    <string name="rotation_lock">Bloqueado</string>
     <string name="rotation_force_portrait">Forçar retrato</string>
     <string name="rotation_force_landscape">Forçar paisagem</string>
     <!-- Downloads section -->
@@ -472,7 +471,6 @@
         <item quantity="one">Para 1 título</item>
         <item quantity="other">Para %d títulos</item>
     </plurals>
-    <string name="notices">Avisos de build de preview</string>
     <string name="pref_theme_light">Tema claro</string>
     <string name="theme_light_default">Padrão</string>
     <string name="theme_light_blue">Azul claro</string>

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

@@ -168,7 +168,6 @@
     <string name="double_tap_anim_speed_fast">Rapid</string>
     <string name="pref_rotation_type">Rotație</string>
     <string name="rotation_free">Liberă</string>
-    <string name="rotation_lock">Blocată</string>
     <string name="rotation_force_portrait">Forțată portret</string>
     <string name="rotation_force_landscape">Forțată peisaj</string>
     <string name="color_filter_r_value">R</string>
@@ -451,7 +450,6 @@
         <item quantity="few">Pentru %d titluri</item>
         <item quantity="other">Pentru %d titluri</item>
     </plurals>
-    <string name="notices">Previzualizați notificările de construire</string>
     <string name="pref_theme_light">Temă deschisă</string>
     <string name="theme_light_default">Implicit</string>
     <string name="theme_light_blue">Albastru deschis</string>

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

@@ -5,7 +5,7 @@
     <string name="action_bookmark">Закладка главы</string>
     <string name="action_cancel">Отмена</string>
     <string name="action_delete">Удалить</string>
-    <string name="action_display">Отобразить</string>
+    <string name="action_display">Вид</string>
     <string name="action_display_grid">Компактная сетка</string>
     <string name="action_display_list">Список</string>
     <string name="action_display_mode">Режим отображения</string>
@@ -19,9 +19,9 @@
     <string name="action_filter_empty">Удалить фильтр</string>
     <string name="action_filter_unread">Не прочитано</string>
     <string name="action_install">Установить</string>
-    <string name="action_mark_as_read">Отметить как прочитанное</string>
+    <string name="action_mark_as_read">Отметить как \"Прочитано\"</string>
-    <string name="action_mark_as_unread">Пометить как непрочитанное</string>
+    <string name="action_mark_as_unread">Пометить как \"Не прочитано\"</string>
-    <string name="action_mark_previous_as_read">Отметить предыдущее как прочитанное</string>
+    <string name="action_mark_previous_as_read">Отметить предыдущее как \"Прочитано\"</string>
     <string name="action_move_category">Добавить в категории</string>
     <string name="action_next_chapter">Следующая глава</string>
     <string name="action_next_unread">Следующая непрочитанная</string>
@@ -53,7 +53,7 @@
     <string name="black_background">Черный</string>
     <string name="build_time">Дата сборки</string>
     <string name="cache_delete_error">Возникла ошибка при удалении кэша</string>
-    <string name="cache_deleted">Кэш очищен. %1$d файл(ов/а) был(о) удален(о)</string>
+    <string name="cache_deleted">Кэш очищен. %1$d файлов было удалено</string>
     <string name="chapter_downloaded">Загружено</string>
     <string name="chapter_downloading">Загружается</string>
     <string name="chapter_downloading_progress">Загружается (%1$d/%2$d)</string>
@@ -71,7 +71,7 @@
     <string name="color_filter_g_value">G</string>
     <string name="color_filter_b_value">B</string>
     <string name="completed">Завершено</string>
-    <string name="confirm_delete_chapters">Вы уверены что хотите удалить выбранн(ые/ую) глав(ы/у)\?</string>
+    <string name="confirm_delete_chapters">Вы уверены что хотите удалить выбранные главы\?</string>
     <string name="confirm_set_image_as_cover">Использовать эту картинку как обложку\?</string>
     <string name="cookies_cleared">Куки удалены</string>
     <string name="cover_updated">Обложка обновлена</string>
@@ -92,14 +92,14 @@
     <string name="download_all">Всё</string>
     <string name="download_notifier_downloader_title">Загрузчик</string>
     <string name="download_notifier_no_network">Нет сетевого соединения</string>
-    <string name="download_notifier_page_error">Страница отсутствует в каталоге</string>
+    <string name="download_notifier_page_error">Страница отсутствует в директории</string>
     <string name="download_notifier_page_ready_error">Страница не загружена</string>
     <string name="download_notifier_text_only_wifi">Нет Wi-Fi соединения</string>
     <string name="download_notifier_title_error">Ошибка</string>
-    <string name="download_notifier_unknown_error">Не могу скачать главу из-за непревиденной ошибки</string>
+    <string name="download_notifier_unknown_error">Невозможно скачать главу из-за непревиденной ошибки</string>
-    <string name="download_progress">Загружен(о) %1$d%%</string>
+    <string name="download_progress">Загружено %1$d%%</string>
     <string name="download_queue_error">Невозможно скачать главы. Можете попробовать еще раз в разделе загрузок</string>
-    <string name="download_unread">Непрочитано</string>
+    <string name="download_unread">Не прочитано</string>
     <string name="downloading">Загружается…</string>
     <string name="dropped">Заброшено</string>
     <string name="error_category_exists">Категория с таким именем уже существует!</string>
@@ -108,7 +108,7 @@
     <string name="file_select_backup">Выбрать файл резервной копии</string>
     <string name="file_select_cover">Выбрать обложку</string>
     <string name="fourth_to_last">Четвёртая от прочитанной главы</string>
-    <string name="information_empty_library">Ваша библиотека пуста. Добавьте тайтлы в библиотеку из Поиска.</string>
+    <string name="information_empty_library">Ваша библиотека пуста. Добавьте тайтлы в библиотеку из \"Поисковик\".</string>
     <string name="information_no_downloads">Нет загрузок</string>
     <string name="information_no_recent">Нет новых обновлений</string>
     <string name="information_no_recent_manga">В последнее время ничего не прочитано</string>
@@ -119,7 +119,7 @@
     <string name="label_recent_manga">История</string>
     <string name="label_recent_updates">Обновления</string>
     <string name="label_settings">Настройки</string>
-    <string name="landscape">Ландшафтный режим</string>
+    <string name="landscape">Альбомная</string>
     <string name="last_read_chapter">Последняя прочитанная глава</string>
     <string name="left_to_right_viewer">Слева направо</string>
     <string name="library_search_hint">Название или автор…</string>
@@ -137,7 +137,7 @@
     <string name="name">Название</string>
     <string name="no_next_chapter">Следующая глава не найдена</string>
     <string name="no_previous_chapter">Предыдущая глава не найдена</string>
-    <string name="no_valid_sources">Пожалуйста, включите хотя бы один источник</string>
+    <string name="no_valid_sources">Пожалуйста, включите хотя бы, один, действительный источник</string>
     <string name="notification_cover_update_failed">Не удалось обновить обложку</string>
     <string name="notification_first_add_to_library">Пожалуйста, добавьте мангу в свою библиотеку, перед тем как делать это</string>
     <string name="notification_new_chapters">Найдены новые главы</string>
@@ -147,13 +147,13 @@
     <string name="notification_not_connected_to_ac_title">Синхронизация отменена</string>
     <string name="notification_update_progress">Статус обновления: %1$d/%2$d</string>
     <string name="on_hold">Заморожено</string>
-    <string name="ongoing">Выпускается</string>
+    <string name="ongoing">Не завершено</string>
     <string name="options">Опции</string>
     <string name="page_downloaded">Страница скопирована в %1$s</string>
     <string name="password">Пароль</string>
     <string name="picture_saved">Картинка сохранена</string>
     <string name="plan_to_read">Планирую прочитать</string>
-    <string name="portrait">Портретный режим</string>
+    <string name="portrait">Портретная</string>
     <string name="pref_acra_summary">Помогает исправлять любые баги. Личные данные не передаются</string>
     <string name="pref_auto_update_manga_sync">Обновлять прогресс глав после прочтения</string>
     <string name="pref_category_about">Информация</string>
@@ -195,13 +195,12 @@
     <string name="pref_update_only_non_completed">Обновлять только незавершенную мангу</string>
     <string name="pref_viewer_type">Режим чтения по умолчанию</string>
     <string name="pref_zoom_start">Стартовая позиция увеличения</string>
-    <string name="reading">В процессе чтения</string>
+    <string name="reading">Читаю</string>
     <string name="remove_from_library">Удалить из библиотеки</string>
     <string name="right_to_left_viewer">Справа налево</string>
-    <string name="rotation_force_landscape">Горизонтальная</string>
+    <string name="rotation_force_landscape">Заблокированная альбомная</string>
-    <string name="rotation_force_portrait">Вертикальная</string>
+    <string name="rotation_force_portrait">Заблокированная портретная</string>
     <string name="rotation_free">Свободная</string>
-    <string name="rotation_lock">Заблокированная</string>
     <string name="saving_picture">Сохраняю картинку</string>
     <string name="scale_type_fit_height">По высоте</string>
     <string name="scale_type_fit_screen">Уместить в экран</string>
@@ -311,10 +310,10 @@
     <string name="browse">Поисковик</string>
     <string name="channel_common">Общий</string>
     <string name="channel_library">Библиотека</string>
-    <string name="information_empty_category">У вас нет категорий. Нажмите кнопку + чтобы создать категорию для организации вашей библиотеки.</string>
+    <string name="information_empty_category">У вас нет категорий. Нажмите кнопку \"+\" чтобы создать категорию для организации вашей библиотеки.</string>
     <string name="label_migration">Мигрировать</string>
-    <string name="label_extensions">Дополнения</string>
+    <string name="label_extensions">Расширения</string>
-    <string name="label_extension_info">Информация о дополнении</string>
+    <string name="label_extension_info">Информация о расширении</string>
     <string name="all_lang">Все</string>
     <string name="ext_update">Обновление</string>
     <string name="ext_install">Установить</string>
@@ -337,10 +336,10 @@
     <string name="double_tap_anim_speed_0">Без анимации</string>
     <string name="double_tap_anim_speed_normal">Нормальная</string>
     <string name="double_tap_anim_speed_fast">Быстрая</string>
-    <string name="manga_info_full_title_label">Заголовок</string>
+    <string name="manga_info_full_title_label">Название</string>
     <string name="manga_added_library">Добавлено в библиотеку</string>
     <string name="manga_removed_library">Удалено из библиотеки</string>
-    <string name="copied_to_clipboard">Скопированно в буфер обмена:
+    <string name="copied_to_clipboard">Скопировано в буфер обмена:
 \n\"%1$s\"</string>
     <string name="custom_download">Загрузить определенное количество</string>
     <string name="download_custom">Другое кол-во</string>
@@ -356,8 +355,8 @@
     <string name="track_start_date">Начато</string>
     <string name="track_type">Тип</string>
     <string name="track_author">Автор</string>
-    <string name="transition_finished">Закончено:</string>
+    <string name="transition_finished">Закончена:</string>
-    <string name="transition_current">Текущий:</string>
+    <string name="transition_current">Текущая:</string>
     <string name="transition_next">Следующая:</string>
     <string name="transition_previous">Предыдущая:</string>
     <string name="transition_no_next">Следующей главы нет</string>
@@ -401,7 +400,7 @@
     <string name="pref_theme_mode">Тёмный режим</string>
     <string name="theme_light">Выключено</string>
     <string name="theme_dark">Включено</string>
-    <string name="theme_system">Системная</string>
+    <string name="theme_system">В соответствии с системной темой</string>
     <string name="pref_theme_dark">Тёмная тема</string>
     <string name="theme_dark_default">По умолчанию</string>
     <string name="theme_dark_blue">Темно-синяя</string>
@@ -413,9 +412,10 @@
     <string name="lock_always">Всегда</string>
     <string name="lock_never">Никогда</string>
     <plurals name="lock_after_mins">
-        <item quantity="one">После 1 минуты</item>
+        <item quantity="one">После %1$s минуты</item>
         <item quantity="few">После %1$s минут</item>
         <item quantity="many">После %1$s минут</item>
+        <item quantity="other">После %1$s минут</item>
     </plurals>
     <string name="secure_screen">Защита экрана</string>
     <string name="ext_updates_pending">Доступны обновления</string>
@@ -433,27 +433,26 @@
     <string name="notification_chapters_single">Глава %1$s</string>
     <string name="pref_category_display">Отобразить</string>
     <plurals name="notification_chapters_generic">
-        <item quantity="one">1 новая глава</item>
+        <item quantity="one">%1$d новая глава</item>
         <item quantity="few">%1$d новые главы</item>
         <item quantity="many">%1$d новых глав</item>
         <item quantity="other">%1$d новых глав</item>
     </plurals>
     <plurals name="notification_new_chapters_summary">
-        <item quantity="one">Для 1 тайтла</item>
+        <item quantity="one">Для %d названия</item>
-        <item quantity="few">Для %d тайтлов</item>
+        <item quantity="few">Для %d названий</item>
-        <item quantity="many">Для %d тайтлов</item>
+        <item quantity="many">Для %d названий</item>
-        <item quantity="other">Для %d тайтлов</item>
+        <item quantity="other">Для %d названий</item>
     </plurals>
-    <string name="notices">Примечания к предварительной сборке</string>
     <string name="notification_check_updates">Проверка наличия новых глав</string>
     <string name="updating_library">Обновление библиотеки</string>
-    <string name="http_error_hint">Проверить страницу в WebView</string>
+    <string name="http_error_hint">Проверить вебстраницу в WebView</string>
     <string name="battery_optimization_disabled">Оптимизация батареи уже выключена</string>
     <string name="pref_disable_battery_optimization_summary">Помогает с фоновым обновлением библиотеки и резевной копии</string>
     <string name="pref_disable_battery_optimization">Выключить оптимизацию батареи</string>
     <string name="theme_light_default">По умолчанию</string>
     <plurals name="update_check_notification_ext_updates">
-        <item quantity="one">Доступно обновление для расширения</item>
+        <item quantity="one">Доступно обновление для %d расширения</item>
         <item quantity="few">Доступны обновления для %d расширений</item>
         <item quantity="many">Доступны обновления для %d расширений</item>
         <item quantity="other">Доступны обновления для %d расширений</item>
@@ -477,7 +476,7 @@
     <string name="label_sources">Источники</string>
     <string name="pref_category_reading">Чтение</string>
     <string name="pref_skip_filtered_chapters">Пропускать фильтрованные главы</string>
-    <string name="action_select_inverse">Инверсия</string>
+    <string name="action_select_inverse">Выбрать наоборот</string>
     <string name="vertical_plus_viewer">Непрерывно вертикально</string>
     <string name="pref_webtoon_side_padding">Боковой отступ</string>
     <string name="webtoon_side_padding_25">25%</string>
@@ -513,7 +512,7 @@
     <string name="restore_duration">%02d мин, %02d сек</string>
     <string name="pref_search_pinned_sources_only">Включать только закрепленные источники</string>
     <plurals name="download_queue_summary">
-        <item quantity="one">Осталось 1</item>
+        <item quantity="one">Осталось %1$s</item>
         <item quantity="few">Осталось %1$s</item>
         <item quantity="many">Осталось %1$s</item>
         <item quantity="other">Осталось %1$s</item>
@@ -539,7 +538,7 @@
     <string name="tracking_info">Односторонняя синхронизация для обновления прогресса глав в сервисах отслеживания. Настройте отслеживание отдельных записей манги при помощи их кнопок отслеживания.</string>
     <string name="action_display_unread_badge">Значки непрочитанных</string>
     <plurals name="notification_update_error">
-        <item quantity="one">1 неудачное обновление</item>
+        <item quantity="one">%1$d неудачное обновление</item>
         <item quantity="few">%1$d неудачных обновления</item>
         <item quantity="many">%1$d неудачных обновлений</item>
         <item quantity="other">%1$d неудачных обновлений</item>
@@ -572,7 +571,7 @@
     <string name="action_disable">Отключить</string>
     <string name="action_open_in_settings">Открыть в Настройках</string>
     <plurals name="manga_num_chapters">
-        <item quantity="one">1 глава</item>
+        <item quantity="one">%1$s глава</item>
         <item quantity="few">%1$s главы</item>
         <item quantity="many">%1$s глав</item>
         <item quantity="other">%1$s глав</item>
@@ -585,11 +584,11 @@
     <string name="tapping_inverted_vertical">Вертикально</string>
     <string name="tapping_inverted_horizontal">Горизонтально</string>
     <string name="tapping_inverted_none">Нет</string>
-    <string name="pref_read_with_tapping_inverted">Инверсия нажатия</string>
+    <string name="pref_read_with_tapping_inverted">Нажатие наоборот</string>
     <string name="unknown_status">Неизвестный статус</string>
     <string name="unknown_author">Неизвестный автор</string>
     <string name="action_download_unread">Загрузить непрочитанные главы</string>
-    <string name="updated_version">Обновлено до v%1$s</string>
+    <string name="updated_version">Обновлено до в%1$s</string>
     <string name="whats_new">Что нового</string>
     <string name="download_insufficient_space">Невозможно загрузить главы из-за нехватки места на диске</string>
     <string name="action_global_search_query">Искать \"%1$s\" глобально</string>
@@ -598,7 +597,7 @@
     <string name="pref_category_theme">Тема</string>
     <string name="action_sort_date_added">Дата добавления</string>
     <plurals name="num_trackers">
-        <item quantity="one">1 трекер</item>
+        <item quantity="one">%d трекер</item>
         <item quantity="few">%d трекера</item>
         <item quantity="many">%d трекеров</item>
         <item quantity="other">%d трекеров</item>
@@ -607,24 +606,24 @@
     <string name="download_notifier_download_finish">Загрузка завершена</string>
     <string name="group_backup_restore">Резервирование и восстановление</string>
     <string name="group_downloader">Загрузки</string>
-    <string name="channel_complete">Завершение</string>
+    <string name="channel_complete">Завершено</string>
     <string name="channel_progress">Прогресс</string>
     <string name="channel_errors">Ошибки</string>
-    <string name="backup_restore_missing_trackers">Не выполнен вход в трекеры:</string>
+    <string name="backup_restore_missing_trackers">Сервисы отслеживания в которые не выполнен вход:</string>
     <string name="pref_remove_bookmarked_chapters">Удалять главы с закладками</string>
     <string name="pref_category_delete_chapters">Удаление глав</string>
     <string name="ext_nsfw_warning">Может содержать контент NSFW (18+)</string>
     <string name="ext_nsfw_short">18+</string>
     <string name="parental_controls_info">Это не предотвращает появление внутри приложения контента NSFW (18+) из неофициальных или потенциально неправильно помеченных расширений.</string>
     <plurals name="missing_chapters_warning">
-        <item quantity="one">Отсутствует 1 глава</item>
+        <item quantity="one">Отсутствует %d глава</item>
         <item quantity="few">Отсутствуют %d главы</item>
         <item quantity="many">Отсутствуют %d глав</item>
         <item quantity="other">Отсутствуют %d глав</item>
     </plurals>
     <string name="no_chapters_error">Нет глав</string>
     <string name="chapter_settings_updated">Обновлены настройки главы по умолчанию</string>
-    <string name="set_chapter_settings_as_default">По умолчанию</string>
+    <string name="set_chapter_settings_as_default">Установить по умолчанию</string>
     <string name="also_set_chapter_settings_for_library">Также применить для всей манги в моей библиотеке</string>
     <string name="confirm_set_chapter_settings">Вы уверены, что хотите сохранить эти настройки по умолчанию\?</string>
     <string name="chapter_settings">Настройки главы</string>
@@ -653,15 +652,15 @@
     <string name="file_picker_error">Приложение для выбора файлов не найдено</string>
     <string name="myanimelist_relogin">Пожалуйста, войдите в MAL снова</string>
     <string name="myanimelist_creds_missing">Учетные данные входа в MAL не найдены</string>
-    <string name="pref_viewer_nav">Разметка навигации</string>
+    <string name="pref_viewer_nav">Схема навигации</string>
-    <string name="edge_nav">Край</string>
+    <string name="edge_nav">Края</string>
     <string name="kindlish_nav">Kindle-подобная</string>
     <string name="l_nav">L-образная</string>
     <string name="default_nav">По умолчанию</string>
-    <string name="channel_crash_logs">Логи вылетов</string>
+    <string name="channel_crash_logs">Логи о вылетах</string>
     <string name="track_finished_reading_date">Дата окончания чтения</string>
     <string name="track_started_reading_date">Дата начала чтения</string>
-    <string name="crash_log_saved">Логи вылета сохранены</string>
+    <string name="crash_log_saved">Логи о вылетах сохранены</string>
     <string name="pref_dump_crash_logs_summary">Сохраняет логи ошибок в файл для отправки разработчикам</string>
     <string name="pref_dump_crash_logs">Выгрузка логов о вылетах</string>
     <string name="network_unmetered">Безлимитная сеть</string>
@@ -697,4 +696,6 @@
     <string name="action_show_errors">Показать ошибки</string>
     <string name="update_check_eol">Эта версия Андроида больше не поддерживается</string>
     <string name="clipboard_copy_error">Не удалось скопировать в буфер обмена</string>
+    <string name="rotation_landscape">Альбомная</string>
+    <string name="rotation_portrait">Портретная</string>
 </resources>

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

@@ -699,6 +699,7 @@
     </plurals>
     <string name="humanize_fallback">мгновение назад</string>
     <!-- Themes -->
+    <string name="theme_dark_amoledblue">AMOLED синяя</string>
     <string name="theme_dark_red">Чёрное и Красное</string>
     <string name="theme_dark_midnightdusk">Полуночные Сумерки</string>
     <string name="theme_dark_hotpink">Горячий Розовый</string>

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

@@ -198,7 +198,6 @@
     <string name="color_filter_r_value">Кыһыл</string>
     <string name="rotation_force_landscape">Сытыары</string>
     <string name="rotation_force_portrait">Туруору</string>
-    <string name="rotation_lock">Хатаммыт</string>
     <string name="rotation_free">Босхо</string>
     <string name="pref_rotation_type">Эргичийии</string>
     <string name="ext_language_info">Тыл: %1$s</string>
@@ -355,7 +354,6 @@
     <string name="battery_optimization_disabled">Батарея тупсуруута араарыллынна</string>
     <string name="group_backup_restore">Хаппаас куопуйаны оҥоруу уонна төнүҥнэрии</string>
     <string name="file_select_backup">Хаппаас куопуйа билэтин талыы</string>
-    <string name="notices">Инники биэрсиялар бэлиэтэ</string>
     <string name="whats_new">Туох саҥа баарый</string>
     <string name="build_time">Тахсыбыт кэмэ</string>
     <string name="version">Биэрсия</string>

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

@@ -169,9 +169,8 @@
     <string name="double_tap_anim_speed_fast">Lestra</string>
     <string name="pref_rotation_type">Rotatzione</string>
     <string name="rotation_free">Lìbera</string>
-    <string name="rotation_lock">Blocada</string>
+    <string name="rotation_force_portrait">Blocadu in verticale</string>
-    <string name="rotation_force_portrait">Bloca in verticale</string>
+    <string name="rotation_force_landscape">Blocadu in orizontale</string>
-    <string name="rotation_force_landscape">Bloca in orizontale</string>
     <string name="color_filter_r_value">R</string>
     <string name="color_filter_g_value">G</string>
     <string name="color_filter_b_value">B</string>
@@ -447,7 +446,6 @@
         <item quantity="one">Pro 1 tìtulu</item>
         <item quantity="other">Pro %d tìtulos</item>
     </plurals>
-    <string name="notices">Avisos de versiones de anteprima</string>
     <string name="pref_theme_light">Tema craru</string>
     <string name="theme_light_default">Predefinidu</string>
     <string name="theme_light_blue">Biaitu craru</string>
@@ -573,7 +571,7 @@
     <string name="updated_version">Agiornadu a v%1$s</string>
     <string name="whats_new">Ite b\'at de nou</string>
     <string name="action_download_unread">Iscàrriga sos capìtulos non lèghidos</string>
-    <string name="download_insufficient_space">Iscarrigamentu de sos capìtulos fallidu pro more de su pagu ispàtziu lìberu in su discu</string>
+    <string name="download_insufficient_space">Iscarrigamentu de sos capìtulos fallidu pro neghe de su pagu ispàtziu lìberu in su discu</string>
     <string name="action_global_search_query">Chirca «%1$s» globalmente</string>
     <string name="pref_category_reading_mode">Modalidade de leghidura</string>
     <string name="pref_category_locale">Limba</string>
@@ -675,4 +673,6 @@
     <string name="action_show_errors">Ammustra sos errores</string>
     <string name="clipboard_copy_error">Còpia in punta de billete fallida</string>
     <string name="update_check_eol">Custa versione de Android no est prus suportada</string>
+    <string name="rotation_landscape">Orizontale</string>
+    <string name="rotation_portrait">Verticale</string>
 </resources>

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

@@ -181,7 +181,6 @@
     <string name="double_tap_anim_speed_fast">Rýchlo</string>
     <string name="pref_rotation_type">Rotácia</string>
     <string name="rotation_free">Voľná</string>
-    <string name="rotation_lock">Zamknúť</string>
     <string name="rotation_force_portrait">Iba na výšku</string>
     <string name="rotation_force_landscape">Iba na šírku</string>
     <string name="color_filter_r_value">R</string>

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

@@ -168,7 +168,6 @@
     <string name="double_tap_anim_speed_fast">Brzo</string>
     <string name="pref_rotation_type">Rotacija</string>
     <string name="rotation_free">Slovodno</string>
-    <string name="rotation_lock">Zaključano</string>
     <string name="rotation_force_portrait">Forsirano vertikalno</string>
     <string name="rotation_force_landscape">Forsirano horizontalno</string>
     <string name="color_filter_r_value">R</string>

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

@@ -168,9 +168,8 @@
     <string name="double_tap_anim_speed_fast">Snabb</string>
     <string name="pref_rotation_type">Rotering</string>
     <string name="rotation_free">Upplåst</string>
-    <string name="rotation_lock">Lås</string>
+    <string name="rotation_force_portrait">Låst porträtt</string>
-    <string name="rotation_force_portrait">Tvinga stående</string>
+    <string name="rotation_force_landscape">Låst liggande</string>
-    <string name="rotation_force_landscape">Tvinga liggande</string>
     <string name="color_filter_r_value">R</string>
     <string name="color_filter_g_value">G</string>
     <string name="color_filter_b_value">B</string>
@@ -447,7 +446,6 @@
         <item quantity="one">För 1 titel</item>
         <item quantity="other">För %d titlar</item>
     </plurals>
-    <string name="notices">Byggmeddelanden</string>
     <string name="pref_theme_light">Ljust tema</string>
     <string name="theme_light_default">Standard</string>
     <string name="theme_light_blue">Ljusblå</string>
@@ -675,4 +673,6 @@
     <string name="action_show_errors">Visa fel</string>
     <string name="update_check_eol">Denna Android-version stöds inte längre</string>
     <string name="clipboard_copy_error">Kunde inte kopiera till urklipp</string>
+    <string name="rotation_landscape">Liggande</string>
+    <string name="rotation_portrait">Porträtt</string>
 </resources>

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

@@ -170,7 +170,6 @@
     <string name="double_tap_anim_speed_fast">เร็ว</string>
     <string name="pref_rotation_type">การหมุน</string>
     <string name="rotation_free">ว่าง</string>
-    <string name="rotation_lock">ล็อค</string>
     <string name="rotation_force_portrait">บังคับแนวตั้ง</string>
     <string name="rotation_force_landscape">บังคับแนวนอน</string>
     <string name="color_filter_r_value">R</string>

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

@@ -168,9 +168,8 @@
     <string name="double_tap_anim_speed_fast">Hızlı</string>
     <string name="pref_rotation_type">Döndürme</string>
     <string name="rotation_free">Serbest</string>
-    <string name="rotation_lock">Kilitle</string>
+    <string name="rotation_force_portrait">Kilitli dikey</string>
-    <string name="rotation_force_portrait">Dikeyi zorla</string>
+    <string name="rotation_force_landscape">Kilitli yatay</string>
-    <string name="rotation_force_landscape">Yatayı zorla</string>
     <string name="color_filter_r_value">K</string>
     <string name="color_filter_g_value">Y</string>
     <string name="color_filter_b_value">M</string>
@@ -447,7 +446,6 @@
         <item quantity="one">1 başlık için</item>
         <item quantity="other">%d başlık için</item>
     </plurals>
-    <string name="notices">Derleme notlarını göster</string>
     <string name="pref_theme_light">Aydınlık tema</string>
     <string name="theme_light_default">Öntanımlı</string>
     <string name="theme_light_blue">Açık mavi</string>
@@ -675,4 +673,6 @@
     <string name="action_show_errors">Hataları göster</string>
     <string name="update_check_eol">Bu Android sürümü artık desteklenmiyor</string>
     <string name="clipboard_copy_error">Panoya kopyalanamadı</string>
+    <string name="rotation_landscape">Yatay</string>
+    <string name="rotation_portrait">Dikey</string>
 </resources>

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

@@ -168,9 +168,8 @@
     <string name="double_tap_anim_speed_fast">Швидка</string>
     <string name="pref_rotation_type">Орієнтація</string>
     <string name="rotation_free">Вільна</string>
-    <string name="rotation_lock">Заблокована</string>
+    <string name="rotation_force_portrait">Заблокована портретна</string>
-    <string name="rotation_force_portrait">Вертикальна</string>
+    <string name="rotation_force_landscape">Заблокована альбомна</string>
-    <string name="rotation_force_landscape">Горизонтальна</string>
     <string name="color_filter_r_value">R</string>
     <string name="color_filter_g_value">G</string>
     <string name="color_filter_b_value">B</string>
@@ -452,7 +451,6 @@
         <item quantity="few">Для %d тайтлів</item>
         <item quantity="many">Для %d тайтлів</item>
     </plurals>
-    <string name="notices">Примітки білдів</string>
     <string name="pref_theme_light">Світла тема</string>
     <string name="theme_light_default">За замовчуванням</string>
     <string name="theme_light_blue">Блакитна</string>
@@ -693,4 +691,8 @@
     <string name="pref_library_update_categories_details">Мангу в виключених категоріях не буде оновлено, навіть якщо вона також знаходиться у включених категоріях.</string>
     <string name="action_sort_chapter_fetch_date">Дата отримання</string>
     <string name="action_show_errors">Показати помилки</string>
+    <string name="update_check_eol">Ця версія Android більше не підтримується</string>
+    <string name="clipboard_copy_error">Не вдалось скопіювати до буферу обміну</string>
+    <string name="rotation_landscape">Альбомна</string>
+    <string name="rotation_portrait">Портретна</string>
 </resources>

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

@@ -126,7 +126,6 @@
     <string name="zoom_start_center">Giữa</string>
     <string name="pref_rotation_type">Xoay</string>
     <string name="rotation_free">Tự do</string>
-    <string name="rotation_lock">Khóa</string>
     <string name="rotation_force_portrait">Bắt buộc theo chiều dọc</string>
     <string name="rotation_force_landscape">Bắt buộc theo chiều ngang</string>
     <string name="color_filter_r_value">R</string>
@@ -434,7 +433,6 @@
     <string name="logout">Đăng xuất</string>
     <string name="logout_title">Đăng xuất khỏi %1$s\?</string>
     <string name="email">Địa chỉ email</string>
-    <string name="notices">Thông báo</string>
     <string name="battery_optimization_disabled">Tối ưu pin đã được tắt</string>
     <string name="pref_disable_battery_optimization_summary">Giúp cập nhật và sao lưu thư viện nền</string>
     <string name="pref_disable_battery_optimization">Tắt tối ưu pin</string>

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

@@ -84,8 +84,8 @@
     <string name="pref_category_advanced">高级</string>
     <string name="pref_category_about">关于</string>
     <string name="pref_library_columns">书架界面网格</string>
-    <string name="portrait">纵向</string>
+    <string name="portrait">竖屏</string>
-    <string name="landscape">横向</string>
+    <string name="landscape">横屏</string>
     <string name="default_columns">预设</string>
     <string name="pref_library_update_interval">更新频率</string>
     <string name="update_never">手动</string>
@@ -168,9 +168,8 @@
     <string name="double_tap_anim_speed_fast">快速</string>
     <string name="pref_rotation_type">屏幕方向</string>
     <string name="rotation_free">自动</string>
-    <string name="rotation_lock">锁定</string>
+    <string name="rotation_force_portrait">锁定的竖屏</string>
-    <string name="rotation_force_portrait">强制竖向</string>
+    <string name="rotation_force_landscape">锁定的横屏</string>
-    <string name="rotation_force_landscape">强制横向</string>
     <string name="color_filter_r_value">R</string>
     <string name="color_filter_g_value">G</string>
     <string name="color_filter_b_value">B</string>
@@ -446,7 +445,6 @@
     <string name="pref_theme_light">浅色主题</string>
     <string name="theme_light_default">默认</string>
     <string name="theme_light_blue">浅蓝</string>
-    <string name="notices">预览版本公告</string>
     <string name="action_menu">菜单</string>
     <string name="action_reorganize_by">重新排序</string>
     <string name="action_newest">最新</string>
@@ -663,4 +661,6 @@
     <string name="action_show_errors">显示错误</string>
     <string name="update_check_eol">英勇不再支持此 Android 版本</string>
     <string name="clipboard_copy_error">未能复制到剪贴板</string>
+    <string name="rotation_landscape">横屏</string>
+    <string name="rotation_portrait">竖屏</string>
 </resources>

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

@@ -125,7 +125,6 @@
     <string name="double_tap_anim_speed_fast">快速</string>
     <string name="pref_rotation_type">螢幕方向</string>
     <string name="rotation_free">自動</string>
-    <string name="rotation_lock">鎖定</string>
     <string name="rotation_force_portrait">強制縱向</string>
     <string name="rotation_force_landscape">強制橫向</string>
     <string name="color_filter_r_value">R</string>
@@ -402,7 +401,6 @@
     <string name="confirm_exit">再按一次以離開</string>
     <string name="downloaded_only_summary">將套用至你書櫃中的漫畫</string>
     <string name="label_downloaded_only">僅限下載內容</string>
-    <string name="notices">預覽版本公告</string>
     <string name="licenses">開放原始碼授權</string>
     <string name="website">網站</string>
     <string name="check_for_updates">檢查更新</string>

app/src/main/res/values/arrays.xml

@@ -66,7 +66,8 @@
 
     <string-array name="rotation_type">
         <item>@string/rotation_free</item>
-        <item>@string/rotation_lock</item>
+        <item>@string/rotation_portrait</item>
+        <item>@string/rotation_landscape</item>
         <item>@string/rotation_force_portrait</item>
         <item>@string/rotation_force_landscape</item>
     </string-array>
@@ -76,6 +77,7 @@
         <item>2</item>
         <item>3</item>
         <item>4</item>
+        <item>5</item>
     </string-array>
 
     <string-array name="color_filter_modes">

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

@@ -332,9 +332,10 @@
     <string name="double_tap_anim_speed_fast">Fast</string>
     <string name="pref_rotation_type">Rotation</string>
     <string name="rotation_free">Free</string>
-    <string name="rotation_lock">Lock</string>
+    <string name="rotation_portrait">Portrait</string>
-    <string name="rotation_force_portrait">Force portrait</string>
+    <string name="rotation_landscape">Landscape</string>
-    <string name="rotation_force_landscape">Force landscape</string>
+    <string name="rotation_force_portrait">Locked portrait</string>
+    <string name="rotation_force_landscape">Locked landscape</string>
     <string name="color_filter_r_value">R</string>
     <string name="color_filter_g_value">G</string>
     <string name="color_filter_b_value">B</string>

app/src/main/res/values/strings_sy.xml

@@ -163,6 +163,7 @@
     <string name="log_extreme_desc">network inspection mode</string>
 
     <!-- General Settings -->
+    <string name="theme_dark_amoledblue">AMOLED blue</string>
     <string name="theme_dark_red">Black-Red</string>
     <string name="theme_dark_midnightdusk">Midnight Dusk</string>
     <string name="theme_dark_hotpink">Hot Pink</string>

app/src/main/res/values/themes_sy.xml

@@ -4,6 +4,14 @@
     <!--=============-->
     <!-- Dark Themes -->
     <!--=============-->
+    <style name="Theme.Tachiyomi.Dark.AmoledBlue" parent="Theme.Tachiyomi.Dark.Amoled">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
+        <item name="colorPrimaryVariant">@color/colorPrimary</item>
+        <item name="background">@color/colorPrimary</item>
+        <item name="colorSurface">@color/dialogDark</item>
+    </style>
+
     <style name="Theme.Tachiyomi.Dark.Red" parent="Theme.Tachiyomi.Dark.Amoled">
         <item name="actionBarTheme">@style/Theme.Toolbar.Red</item>
         <item name="colorPrimary">@color/md_black_1000</item>