From 6bf20a1ade53545884ec93352b67b9ce4c32c3d2 Mon Sep 17 00:00:00 2001
From: Osten <11805592+LagradOst@users.noreply.github.com>
Date: Sun, 8 Mar 2026 01:18:04 +0100
Subject: [PATCH 001/177] Fixed shared pool, closes #2082

---
 .../lagradost/cloudstream3/CommonActivity.kt  | 11 -------
 .../lagradost/cloudstream3/ui/BaseAdapter.kt  | 29 +++++++++++++++++++
 .../ui/home/HomeChildItemAdapter.kt           |  7 ++---
 .../cloudstream3/ui/home/HomeFragment.kt      |  1 +
 .../ui/home/HomeParentItemAdapter.kt          |  6 ++--
 .../ui/home/HomeParentItemAdapterPreview.kt   |  1 +
 .../cloudstream3/ui/home/HomeViewModel.kt     |  5 ----
 .../cloudstream3/ui/player/GeneratorPlayer.kt |  2 +-
 .../ui/quicksearch/QuickSearchFragment.kt     |  1 +
 .../cloudstream3/ui/result/ActorAdaptor.kt    |  4 +--
 .../cloudstream3/ui/result/EpisodeAdapter.kt  | 13 ++++-----
 .../cloudstream3/ui/result/ImageAdapter.kt    |  4 +--
 .../ui/result/ResultFragmentPhone.kt          |  4 +--
 .../ui/result/ResultFragmentTv.kt             |  2 +-
 .../cloudstream3/ui/search/SearchAdaptor.kt   |  4 +--
 .../cloudstream3/ui/search/SearchFragment.kt  |  1 +
 .../cloudstream3/ui/settings/SettingsUI.kt    |  2 +-
 .../ui/settings/extensions/PluginAdapter.kt   |  7 ++---
 .../ui/settings/extensions/PluginsFragment.kt |  1 +
 19 files changed, 57 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index abf56dcbd..c806cac63 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -234,19 +234,8 @@ object CommonActivity {
     fun init(act: Activity) {
         setActivityInstance(act)
         ioSafe { Torrent.deleteAllFiles() }
-
-        // Clear all pools to apply the correct theme
-        for (pool in arrayOf(
-            PluginAdapter.sharedPool, HomeChildItemAdapter.sharedPool,
-            ParentItemAdapter.sharedPool, ActorAdaptor.sharedPool, EpisodeAdapter.sharedPool,
-            SearchAdapter.sharedPool, ImageAdapter.sharedPool
-        )) {
-            pool.clear()
-        }
-
         val componentActivity = activity as? ComponentActivity ?: return
 
-
         componentActivity.updateLocale()
         componentActivity.updateTv()
         AccountManager.initMainAPI()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt
index 2bc1af833..4ebb7564c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.ui
 
+import android.content.Context
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
@@ -11,6 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import androidx.viewbinding.ViewBinding
 import coil3.dispose
+import java.util.WeakHashMap
 import java.util.concurrent.CopyOnWriteArrayList
 
 open class ViewHolderState<T>(val view: ViewBinding) : ViewHolder(view.root) {
@@ -22,6 +24,33 @@ abstract class NoStateAdapter<T : Any>(
     diffCallback: DiffUtil.ItemCallback<T> = BaseDiffCallback()
 ) : BaseAdapter<T, Any>(0, diffCallback)
 
+/** Creates a new shared pool, using the supplied lambda as a constructor.
+ *
+ * The reason for this complicated structure is that a pool should not be shared between contexts
+ * as it makes coil fuck up, and theming.
+ * */
+fun newSharedPool(lambda: RecyclerView.RecycledViewPool.() -> Unit = { }): Pair<WeakHashMap<Context, RecyclerView.RecycledViewPool>, RecyclerView.RecycledViewPool.() -> Unit> =
+    WeakHashMap<Context, RecyclerView.RecycledViewPool>() to lambda
+
+/** Sets the shared pool of the recyclerview */
+fun RecyclerView.setRecycledViewPool(pool: Pair<WeakHashMap<Context, RecyclerView.RecycledViewPool>, RecyclerView.RecycledViewPool.() -> Unit>) {
+    val ctx = context ?: return
+    synchronized(pool.first) {
+        this.setRecycledViewPool(pool.first.getOrPut(ctx) {
+            RecyclerView.RecycledViewPool().apply(pool.second)
+        })
+    }
+}
+
+/** Clears the shared pool of views */
+fun Pair<WeakHashMap<Context, RecyclerView.RecycledViewPool>, RecyclerView.RecycledViewPool.() -> Unit>.clear() {
+    synchronized(this.first) {
+        for (pool in this.first.values) {
+            pool?.clear()
+        }
+    }
+}
+
 /**
  * BaseAdapter is a persistent state stored adapter that supports headers and footers.
  * This should be used for restoring eg scroll or focus related to a view when it is recreated.
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
index 4cd4197df..43f6d19ff 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
@@ -5,12 +5,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import android.widget.ImageView
-import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
-import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
-import coil3.load
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.databinding.HomeRemoveGridBinding
@@ -20,6 +16,7 @@ import com.lagradost.cloudstream3.databinding.HomeResultGridExpandedBinding
 import com.lagradost.cloudstream3.ui.BaseAdapter
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
@@ -165,7 +162,7 @@ open class HomeChildItemAdapter(
         // The vast majority of the lag comes from creating the view
         // This simply shares the views between all HomeChildItemAdapter
         val sharedPool =
-            RecyclerView.RecycledViewPool().apply { this.setMaxRecycledViews(CONTENT, 20) }
+            newSharedPool { setMaxRecycledViews(CONTENT, 20) }
 
         var minPosterSize: Int = 0
         var maxPosterSize: Int = 0
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index a254e1aec..375b2313f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -52,6 +52,7 @@ import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_PLAY_FILE
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper.handleSearchClickCallback
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
index 0d08dc898..6bdd1bf49 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
@@ -6,10 +6,8 @@ import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
-import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.HomepageParentBinding
@@ -17,9 +15,11 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.BaseAdapter
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
@@ -48,7 +48,7 @@ open class ParentItemAdapter(
 ) {
     companion object {
         val sharedPool =
-            RecyclerView.RecycledViewPool().apply { this.setMaxRecycledViews(CONTENT, 4) }
+            newSharedPool { setMaxRecycledViews(CONTENT, 4) }
     }
 
     data class ParentItemHolder(val binding: ViewBinding) : ViewHolderState<Bundle>(binding) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
index 26e3477ef..a292c2da2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
@@ -60,6 +60,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarMargin
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView
 import com.lagradost.cloudstream3.utils.UIHelper.populateChips
 import androidx.core.graphics.toColorInt
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 
 class HomeParentItemAdapterPreview(
     val fragment: LifecycleOwner,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
index a066bf151..e0609c0e5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
@@ -15,7 +15,6 @@ import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.MainActivity
-import com.lagradost.cloudstream3.MainActivity.Companion.lastError
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.mvvm.Resource
@@ -57,7 +56,6 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.withContext
 import java.util.EnumSet
 import java.util.concurrent.CopyOnWriteArrayList
-import kotlin.collections.set
 
 class HomeViewModel : ViewModel() {
     companion object {
@@ -518,9 +516,6 @@ class HomeViewModel : ViewModel() {
                 return@ioSafe
             }
 
-            HomeChildItemAdapter.sharedPool.clear()
-            ParentItemAdapter.sharedPool.clear()
-
             val api = getApiFromNameNull(preferredApiName)
             if (preferredApiName == noneApi.name) {
                 // just set to random
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index 7138e8dad..d20e85707 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -90,6 +90,7 @@ import com.lagradost.cloudstream3.ui.result.ResultFragment
 import com.lagradost.cloudstream3.ui.result.ResultViewModel2
 import com.lagradost.cloudstream3.ui.result.SyncViewModel
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
@@ -128,7 +129,6 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import java.io.Serializable
 import java.util.Calendar
-import kotlin.math.abs
 
 @OptIn(UnstableApi::class)
 class GeneratorPlayer : FullScreenPlayer() {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
index 724276ab7..cf9bc9975 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
@@ -32,6 +32,7 @@ import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchHelper
 import com.lagradost.cloudstream3.ui.search.SearchViewModel
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt
index 733933913..056588d0b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt
@@ -6,7 +6,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.ActorData
 import com.lagradost.cloudstream3.ActorRole
 import com.lagradost.cloudstream3.R
@@ -14,6 +13,7 @@ import com.lagradost.cloudstream3.databinding.CastItemBinding
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.NoStateAdapter
 import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
@@ -26,7 +26,7 @@ class ActorAdaptor(
 })) {
     companion object {
         val sharedPool =
-            RecyclerView.RecycledViewPool().apply { this.setMaxRecycledViews(CONTENT, 10) }
+            newSharedPool { setMaxRecycledViews(CONTENT, 10) }
     }
 
     // Easier to store it here than to store it in the ActorData
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
index 7ff3904d8..5e5504164 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
@@ -1,6 +1,5 @@
 package com.lagradost.cloudstream3.ui.result
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -8,8 +7,6 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.setPadding
 import androidx.preference.PreferenceManager
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
 import coil3.dispose
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.CommonActivity
@@ -24,6 +21,7 @@ import com.lagradost.cloudstream3.ui.ViewHolderState
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK
 import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
@@ -93,11 +91,10 @@ class EpisodeAdapter(
         }
 
         val sharedPool =
-            RecyclerView.RecycledViewPool()
-                .apply {
-                    this.setMaxRecycledViews(HAS_POSTER or CONTENT, 10)
-                    this.setMaxRecycledViews(HAS_NO_POSTER or CONTENT, 10)
-                }
+            newSharedPool {
+                setMaxRecycledViews(HAS_POSTER or CONTENT, 10)
+                setMaxRecycledViews(HAS_NO_POSTER or CONTENT, 10)
+            }
     }
 
     override fun onClearView(holder: ViewHolderState<Any>) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt
index 0513564fe..54657ed57 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt
@@ -2,11 +2,11 @@ package com.lagradost.cloudstream3.ui.result
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.databinding.ResultMiniImageBinding
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.NoStateAdapter
 import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
@@ -27,7 +27,7 @@ class ImageAdapter(
     ) {
     companion object {
         val sharedPool =
-            RecyclerView.RecycledViewPool().apply { this.setMaxRecycledViews(CONTENT, 10) }
+            newSharedPool { setMaxRecycledViews(CONTENT, 10) }
     }
 
     override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
index 74285f552..c9da385f6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
@@ -30,7 +30,6 @@ import com.discord.panels.PanelState
 import com.discord.panels.PanelsChildGestureRegionObserver
 import com.google.android.gms.cast.framework.CastButtonFactory
 import com.google.android.gms.cast.framework.CastContext
-import com.google.android.gms.cast.framework.CastState
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
 import com.lagradost.cloudstream3.APIHolder
@@ -66,6 +65,7 @@ import com.lagradost.cloudstream3.ui.result.ResultFragment.getStoredData
 import com.lagradost.cloudstream3.ui.result.ResultFragment.updateUIEvent
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
 import com.lagradost.cloudstream3.utils.AppContextUtils.isCastApiAvailable
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadCache
@@ -88,9 +88,9 @@ import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
 import com.lagradost.cloudstream3.utils.UIHelper.populateChips
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
-import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
 import com.lagradost.cloudstream3.utils.UIHelper.setListViewHeightBasedOnItems
 import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
 import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
 import com.lagradost.cloudstream3.utils.getImageFromDrawable
 import com.lagradost.cloudstream3.utils.setText
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
index 19f85bf3e..70ca11743 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
@@ -42,6 +42,7 @@ import com.lagradost.cloudstream3.ui.result.ResultFragment.updateUIEvent
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_FOCUSED
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
@@ -61,7 +62,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.populateChips
 import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
-import com.lagradost.cloudstream3.utils.UiImage
 import com.lagradost.cloudstream3.utils.getImageFromDrawable
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.setTextHtml
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
index 9338d4942..7b63b6ede 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
@@ -4,7 +4,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.databinding.SearchResultGridBinding
 import com.lagradost.cloudstream3.databinding.SearchResultGridExpandedBinding
@@ -12,6 +11,7 @@ import com.lagradost.cloudstream3.ui.AutofitRecyclerView
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.NoStateAdapter
 import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.utils.UIHelper.isBottomLayout
 import kotlin.math.roundToInt
 
@@ -43,7 +43,7 @@ class SearchAdapter(
 })) {
     companion object {
         val sharedPool =
-            RecyclerView.RecycledViewPool().apply { this.setMaxRecycledViews(CONTENT, 10) }
+            newSharedPool { setMaxRecycledViews(CONTENT, 10) }
     }
 
     var hasNext: Boolean = false
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index 6bbd569b7..b79ba1707 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -56,6 +56,7 @@ import com.lagradost.cloudstream3.ui.home.HomeViewModel
 import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
index 9e61a0b40..f4c522bf9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
@@ -12,13 +12,13 @@ import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchQuality
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.BasePreferenceFragmentCompat
+import com.lagradost.cloudstream3.ui.clear
 import com.lagradost.cloudstream3.ui.home.HomeChildItemAdapter
 import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
-import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.updateTv
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hideOn
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt
index 47b0b3da3..d0f9ff565 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt
@@ -8,7 +8,6 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getActivity
 import com.lagradost.cloudstream3.PROVIDER_STATUS_DOWN
@@ -16,15 +15,13 @@ import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.databinding.RepositoryItemBinding
 import com.lagradost.cloudstream3.plugins.PluginManager
-import com.lagradost.cloudstream3.plugins.VotingApi.getVotes
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.NoStateAdapter
 import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.html
-import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getNameNextToFlagEmoji
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
@@ -204,7 +201,7 @@ class PluginAdapter(
     companion object {
         // A high count as we can render in the entire list as the same time
         val sharedPool =
-            RecyclerView.RecycledViewPool().apply { this.setMaxRecycledViews(CONTENT, 15) }
+            newSharedPool { setMaxRecycledViews(CONTENT, 15) }
 
         private tailrec fun findClosestBase2(target: Int, current: Int = 16, max: Int = 512): Int {
             if (current >= max) return max
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
index ee333abad..534ffa62a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
@@ -15,6 +15,7 @@ import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.bindChips
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout

From 618f9cde65d8db19bf6ebfe0cf275555995daba4 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Mon, 9 Mar 2026 19:09:54 +0100
Subject: [PATCH 002/177] Translated using Weblate (Vietnamese)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 99.8% (724 of 725 strings)

Translated using Weblate (Hungarian)

Currently translated at 82.0% (595 of 725 strings)

Translated using Weblate (Korean)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Belarusian)

Currently translated at 99.5% (722 of 725 strings)

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Translated using Weblate (Belarusian)

Currently translated at 99.5% (722 of 725 strings)

Translated using Weblate (Filipino)

Currently translated at 21.2% (154 of 725 strings)

Translated using Weblate (Hungarian)

Currently translated at 77.3% (561 of 725 strings)

Translated using Weblate (Dutch)

Currently translated at 89.1% (646 of 725 strings)

Translated using Weblate (Tamil)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (German)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Tamil)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Hungarian)

Currently translated at 75.4% (547 of 725 strings)

Co-authored-by: Aron Folkerts <aronfolkerts@gmail.com>
Co-authored-by: David Hermann <theumis@users.noreply.hosted.weblate.org>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Nguyễn Tiến Đạt <dn16092000@gmail.com>
Co-authored-by: Romhányi-Kakucska Viktor <viktor@romhanyi.dev>
Co-authored-by: Sasha Glazko <lenify@users.noreply.hosted.weblate.org>
Co-authored-by: Wacky Wars <wackywars21@gmail.com>
Co-authored-by: clearstripe <sakurasan000510@gmail.com>
Co-authored-by: தமிழ்நேரம் <tamilneram247@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/be/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fil/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hu/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ko/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ta/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/vi/
Translation: Cloudstream/App
---
 app/src/main/res/values-b+de/strings.xml  |  12 ++-
 app/src/main/res/values-b+fil/strings.xml | 104 ++++++++++++++++++++++
 app/src/main/res/values-b+hu/strings.xml  |  62 +++++++++++++
 app/src/main/res/values-b+ko/strings.xml  |  61 +++++++++----
 app/src/main/res/values-b+nl/strings.xml  |  30 ++++++-
 app/src/main/res/values-b+ta/strings.xml  |  65 +++++++++++++-
 app/src/main/res/values-b+vi/strings.xml  |  14 +++
 app/src/main/res/values-be/strings.xml    |  26 +++++-
 8 files changed, 346 insertions(+), 28 deletions(-)

diff --git a/app/src/main/res/values-b+de/strings.xml b/app/src/main/res/values-b+de/strings.xml
index 8989ce795..9a67f9d20 100644
--- a/app/src/main/res/values-b+de/strings.xml
+++ b/app/src/main/res/values-b+de/strings.xml
@@ -744,9 +744,19 @@
     <string name="video_info">Medieninfo</string>
     <string name="source_name">Quellname</string>
     <string name="download_all">Alle herunterladen</string>
-    <string name="download_episode_range">Möchtest du Episode%s herunter laden?</string>
+    <string name="download_episode_range">Möchtest du Episode %s herunter laden?</string>
     <plurals name="downloads_active">
         <item quantity="one">%d aktiver Download</item>
         <item quantity="other">%d aktive Downloads</item>
     </plurals>
+    <string name="cancel_queue_message">Möchtest du alle Downloads in der Warteschlange abbrechen?</string>
+    <string name="cancel_all">Alles abbrechen</string>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d Download in Warteschlange</item>
+        <item quantity="other">%d Downloads in Warteschlange</item>
+    </plurals>
+    <string name="download_queue">Download in Warteschlange</string>
+    <string name="queue_empty_message">Es befinden sich keine Downloads in der Warteschlange.</string>
+    <string name="source_priority">Quellpriorität</string>
+    <string name="source_priority_help">Entscheide, wie Videoquellen im Player sortiert werden sollen</string>
 </resources>
diff --git a/app/src/main/res/values-b+fil/strings.xml b/app/src/main/res/values-b+fil/strings.xml
index d4844d1d7..be54aa959 100644
--- a/app/src/main/res/values-b+fil/strings.xml
+++ b/app/src/main/res/values-b+fil/strings.xml
@@ -52,4 +52,108 @@
     <string name="pref_filter_search_quality">Itago ang napiling quality ng video sa mga resulta ng paghahanap</string>
     <string name="automatic_plugin_download_mode_title">Pumili ng mode upang i-filter ang pag-download ng mga plugin</string>
     <string name="automatic_plugin_download_summary">Awtomatikong i-install ang lahat ng hindi pa naka-install na plugin mula sa mga idinagdag na repository.</string>
+    <string name="cast_format" formatted="true">Tauhan: %s</string>
+    <string name="next_episode_format" formatted="true">Kabanata %d ay ipapalabas sa</string>
+    <string name="next_season_episode_format" formatted="true">Season %1$d Kabanata %2$d ay ipapalabas sa</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$da %2$do %3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$do %2$dm</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$do %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="episode_poster_img_des">Poster ng Kabanata</string>
+    <string name="home_next_random_img_des">Susunod na Kahit Ano</string>
+    <string name="go_back_img_des">Bumalik</string>
+    <string name="play_from_beginning_img_des">Ipatugtog mula sa Simula</string>
+    <string name="home_change_provider_img_des">Baguhin ang Tagatustos</string>
+    <string name="preview_background_img_des">Background ng Pasilip</string>
+    <string name="player_speed_text_format" formatted="true">Bilis (%.2fx)</string>
+    <string name="rated_format" formatted="true">Na-rate: %.1f</string>
+    <string name="new_update_format" formatted="true">May nakitang bagong update!\n%1$s -&gt; %2$s</string>
+    <string name="duration_format" formatted="true">%d min</string>
+    <string name="play_with_app_name">Ipatugtog sa CloudStream</string>
+    <string name="title_home">Bahay</string>
+    <string name="title_search">Maghanap</string>
+    <string name="title_downloads">Mga Download</string>
+    <string name="download_queue">Nakapila na download</string>
+    <string name="title_settings">Mga pagpipilian</string>
+    <string name="search_hint">Maghanap…</string>
+    <string name="search_hint_site" formatted="true">Maghanap %s…</string>
+    <string name="begin_speaking">Magsimulang magsalita…</string>
+    <string name="no_data">Walang Data</string>
+    <string name="episode_more_options_des">Iba pang Mga Pagpipilian</string>
+    <string name="next_episode">Susunod na kabanata</string>
+    <string name="result_tags">Mga Genre</string>
+    <string name="result_share">Ibahagi</string>
+    <string name="browser">Browser</string>
+    <string name="skip_loading">Laktawan ang paglo-load</string>
+    <string name="loading">Naglo-load…</string>
+    <string name="type_watching">Pinapanood</string>
+    <string name="type_on_hold">Nakabinbin</string>
+    <string name="type_completed">Nakumpleto</string>
+    <string name="type_plan_to_watch">Pinaplanong Panoorin</string>
+    <string name="type_re_watching">Pinapanood muli</string>
+    <string name="play_movie_button">Ipatugtog ang Pelikula</string>
+    <string name="play_trailer_button">Ipatugtog ang Trailer</string>
+    <string name="play_livestream_button">Ipatugtog ang Livestream</string>
+    <string name="play_full_series_button">Ipatugtog ang Buong Serye</string>
+    <string name="pick_source">Mga Mapagkukunan</string>
+    <string name="pick_subtitle">Mga saling-teksto</string>
+    <string name="reload_error">Subukang muli kumonekta…</string>
+    <string name="go_back">Bumalik</string>
+    <string name="play_episode">Ipatugtog ang Kabanata</string>
+    <string name="play_torrent_button">I-stream ang Torrent</string>
+    <string name="download">I-download</string>
+    <string name="downloaded">Na-download</string>
+    <string name="downloading">Dina-download</string>
+    <string name="download_paused">Hininto ang pag-download</string>
+    <string name="download_started">Sinimulan ang pag-download</string>
+    <string name="download_failed">Nabigong ma-download</string>
+    <string name="download_canceled">Kinansela ang pag-download</string>
+    <string name="download_done">Natapos ang pag-download</string>
+    <string name="queue_empty_message">Kasalukuyang walang nakapilang mga download.</string>
+    <string name="update_started">Sinimulan ang pag-update</string>
+    <string name="open_local_video">Buksan ang local video</string>
+    <string name="error_loading_links_toast">Nagkamali sa paglo-load ng mga link</string>
+    <string name="links_reloaded_toast">Ini-load muli ang mga link</string>
+    <string name="download_storage_text">Imbakan</string>
+    <string name="app_dubbed_text">Dub</string>
+    <string name="app_subbed_text">Sub</string>
+    <string name="popup_delete_file">Burahin ang File</string>
+    <string name="popup_play_file">Ipatugtog ang File</string>
+    <string name="popup_resume_download">Ipagpatuloy ang pag-download</string>
+    <string name="popup_pause_download">Ihinto ang pag-download</string>
+    <string name="home_more_info">Higit pang impormasyon</string>
+    <string name="home_expanded_hide">Itago</string>
+    <string name="home_play">Ipatugtog</string>
+    <string name="home_info">Impormasyon</string>
+    <string name="filter_bookmarks">I-filter ang Mga Bookmark</string>
+    <string name="error_bookmarks_text">Mga Bookmark</string>
+    <string name="action_remove_from_bookmarks">Alisin</string>
+    <string name="action_add_to_bookmarks">Itakda ang kapalaran ng panonood</string>
+    <string name="sort_apply">Ilapat</string>
+    <string name="sort_copy">Ikopya</string>
+    <string name="sort_close">Isara</string>
+    <string name="sort_clear">Alisin</string>
+    <string name="sort_save">I-save</string>
+    <string name="repo_copy_label">Pangalan ng repository at URL</string>
+    <string name="toast_copied">nakopya!</string>
+    <string name="subscribe_tooltip">Bagong notipikasyon ng kabanata</string>
+    <string name="result_search_tooltip">Maghanap sa iba pang mga extension</string>
+    <string name="recommendations_tooltip">Ipakita ang mga rekomendasyon</string>
+    <string name="player_speed">Bilis ng Manlalaro</string>
+    <string name="subtitles_settings">Pagpipilian sa Saling-teksto</string>
+    <string name="subs_text_color">Kulay ng Teksto</string>
+    <string name="subs_outline_color">Kulay ng Balangkas</string>
+    <string name="subs_background_color">Kulay ng Likuran</string>
+    <string name="subs_window_color">Kulay ng Bintana</string>
+    <string name="subs_subtitle_elevation">Kataasan ng Saling-teksto</string>
+    <string name="subs_font">Font</string>
+    <string name="subs_font_size">Laki ng Font</string>
+    <string name="search_provider_text_providers">Maghanap gamit ang mga tagatustos</string>
+    <string name="search_provider_text_types">Maghanap gamit ang mga uri</string>
+    <string name="benene_count_text">%d Benenes naibigay sa mga dev</string>
+    <string name="benene_count_text_none">Walang Benenes na binigay</string>
+    <string name="subs_auto_select_language">Awtomatikong Piliin ang Wika</string>
+    <string name="subs_download_languages">Mag-download ng Mga Wika</string>
 </resources>
diff --git a/app/src/main/res/values-b+hu/strings.xml b/app/src/main/res/values-b+hu/strings.xml
index ae018207b..8bd2ac7ac 100644
--- a/app/src/main/res/values-b+hu/strings.xml
+++ b/app/src/main/res/values-b+hu/strings.xml
@@ -591,4 +591,66 @@
     <string name="offline_file">Elérhető offline megtekintésre</string>
     <string name="select_all">Mindet Kiválaszt</string>
     <string name="deselect_all">Mindent Kijelölés Eltávolítása</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="download_queue">Letöltési sor</string>
+    <string name="speech_recognition_unavailable">Beszédfelismerés nem elérhető</string>
+    <string name="begin_speaking">Kezdjen beszélni…</string>
+    <string name="play_full_series_button">Teljes sorozat lejátszása</string>
+    <string name="queue_empty_message">Jelenleg nincs sorban álló letöltés.</string>
+    <string name="extra_brightness_settings">Extra fényerő</string>
+    <string name="extra_brightness_settings_des">A fényerő szűrő engedélyezése, ha a kijelző fényereje meghaladja a 100% -ot</string>
+    <string name="extra_brightness_key">extra_brightness_enabled</string>
+    <string name="search_suggestions">Keresési javaslatok</string>
+    <string name="search_suggestions_des">Mutasson keresési javaslatok gépelés közben</string>
+    <string name="clear_suggestions">Javaslatok törlése</string>
+    <string name="show_cast_in_details">Szereplők panel megjelenítése</string>
+    <string name="install_prerelease">Telepít kiadás előtti verziót</string>
+    <string name="prerelease_already_installed">Az előzetes verzió már telepítve van.</string>
+    <string name="prerelease_install_failed">Az előzetes verzió telepítése sikertelen.</string>
+    <string name="delete_files">Fájlok törlése</string>
+    <string name="delete_message_series_only" formatted="true">Biztosan törölni szeretné az alábbi sorozat összes megjelenését?\n\n%s</string>
+    <string name="resume_remaining" formatted="true">%s \nmaradék</string>
+    <string name="music_singlar">Zene</string>
+    <string name="audio_book_singular">Hangoskönyv</string>
+    <string name="custom_media_singluar">Média</string>
+    <string name="audio_singluar">Hang</string>
+    <string name="podcast_singluar">Podcast</string>
+    <string name="encoding_error">Kódolási hiba</string>
+    <string name="unsupported_error">Hiba nem támogatott</string>
+    <string name="delete_format" formatted="true">Törlés (%1$d | %2$s)</string>
+    <string name="test_warning">Figyelem</string>
+    <string name="delete_message_multiple" formatted="true">Biztosan véglegesen szeretné törölni a következő tételeket?\n\n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Biztosan véglegesen szeretné törölni a következő epizódokat?\n\n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">A következő sorozatok összes epizódját is véglegesen törli:\n\n%s</string>
+    <string name="episode_action_play_mirror">Lejátszás tükrözve</string>"
+    <string name="show_rating">Értékelési címke</string>
+    <string name="show_episode_text">Epizód szövege</string>
+    <string name="pref_category_security">Biztonság</string>
+    <string name="pref_category_accounts">Fiókok</string>
+    <string name="auth_locally">Helyi hitelesítés</string>
+    <string name="player_load_one_subtitle_online">Töltse be az első létezőt</string>
+    <string name="qr_image">QR kód képe</string>
+    <string name="video_info">Média információ</string>
+    <string name="delete_plugin">Plugin törlése</string>
+    <string name="player_settings_always_ask">Mindig kérdezzen</string>
+    <string name="player_settings_select_cast_device">Válassza ki a lejátszó eszközt</string>
+    <string name="clipboard_permission_error">Hiba történt a vágólap elérésénél, kérjük, próbálkozzon újra.</string>
+    <string name="clipboard_unknown_error">Hiba történt a másolás során. Kérjük, másolja a logcat fájlt, és vegye fel a kapcsolatot az alkalmazás ügyfélszolgálatával.</string>
+    <string name="ok">Rendben</string>
+    <string name="dismiss">Elutasítás</string>
+    <string name="password_pin_authentication_title">Jelszó/PIN-kód hitelesítés</string>
+    <string name="biometric_unsupported">A biometrikus hitelesítés nem támogatott ezen az eszközön</string>
+    <string name="biometric_setting_summary">Az alkalmazás feloldása ujjlenyomat, arcfelismerés, PIN-kód, minta vagy jelszó segítségével.</string>
+    <string name="biometric_prompt_description">Néhány sikertelen kísérlet után a parancssor bezárul. Egyszerűen indítsa újra az alkalmazást, és próbálja meg újra.</string>
+    <string name="reset_btn">Visszaállítás</string>
+    <string name="cs3wiki">CloudStream Wiki</string>
+    <string name="device_pin_url_message">Látogasson el <b>%s</b> okostelefonján vagy számítógépén, és írja be a fenti kódot</string>
+    <string name="device_pin_error_message">Nem működik az eszköz PIN-kódja, próbálkozzon helyi hitelesítéssel</string>
+    <string name="device_pin_expired_message">A PIN-kód most lejárt!</string>
+    <string name="device_pin_counter_text">A kód %1$dm %2$ds után lejár</string>
+    <string name="sort_release_date_new">Kiadás dátuma (újabbaktól régebbi felé)</string>
+    <string name="sort_release_date_old">Kiadás dátuma (régitől újig)</string>
+    <string name="hide_player_control_names">A lejátszó vezérlői neveinek elrejtése</string>
 </resources>
diff --git a/app/src/main/res/values-b+ko/strings.xml b/app/src/main/res/values-b+ko/strings.xml
index 90504ec95..04c113b5b 100644
--- a/app/src/main/res/values-b+ko/strings.xml
+++ b/app/src/main/res/values-b+ko/strings.xml
@@ -109,7 +109,7 @@
     <string name="player_subtitles_settings_des">플레이어 자막 설정</string>
     <string name="chromecast_subtitles_settings">Chromecast 자막</string>
     <string name="chromecast_subtitles_settings_des">Chromecast 자막 설정</string>
-    <string name="eigengraumode_settings">배속 모드</string>
+    <string name="eigengraumode_settings">Playback 속도</string>
     <string name="swipe_to_seek_settings">스와이프하여 탐색</string>
     <string name="swipe_to_seek_settings_des">좌우로 스와이프하여 동영상 위치 제어하기</string>
     <string name="swipe_to_change_settings">스와이프하여 설정 변경</string>
@@ -142,7 +142,7 @@
     <string name="automatic_plugin_download_summary">추가된 저장소에서 아직 설치되지 않은 모든 플러그인을 자동으로 설치합니다.</string>
     <string name="updates_settings">앱 업데이트 표시</string>
     <string name="updates_settings_des">앱을 시작한 후 새 업데이트를 자동으로 검색합니다.</string>
-    <string name="apk_installer_settings_des">일부 휴대폰은 새 패키지 설치 프로그램을 지원하지 않습니다. 업데이트가 설치되지 않으면 레거시 옵션을 사용해 보세요.</string>
+    <string name="apk_installer_settings_des">일부 장치는 새 패키지 설치 프로그램을 지원하지 않습니다. 업데이트가 설치되지 않으면 레거시 옵션을 사용해보십시오.</string>
     <string name="lightnovel">같은 개발자가 만든 라이트 노벨 앱</string>
     <string name="anim">같은 개발자가 만든 애니메이션 앱</string>
     <string name="discord">Discord에 참여하기</string>
@@ -198,12 +198,12 @@
     <string name="skip_update">이 업데이트 건너뛰기</string>
     <string name="watch_quality_pref">선호하는 화질 (WiFi)</string>
     <string name="watch_quality_pref_data">선호하는 화질 (모바일 데이터)</string>
-    <string name="limit_title_rez">동영상 플레이어 해상도</string>
+    <string name="limit_title_rez">본문 바로가기</string>
     <string name="video_buffer_size_settings">동영상 버퍼 크기</string>
     <string name="video_buffer_clear_settings">동영상 및 이미지 캐시 지우기</string>
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="jsdelivr_enabled">GitHub에 연결할 수 없습니다. jsDelivr 프록시를 켜는 중…</string>
-    <string name="jsdelivr_proxy_summary">jsDelivr을 사용하여 GitHub 차단을 우회합니다. 업데이트가 며칠 지연될 수 있습니다.</string>
+    <string name="jsdelivr_proxy_summary">JsDelivr를 사용하여 원시 github URL 차단을 우회하십시오. 몇 일 지연 될 업데이트가 발생할 수 있습니다.</string>
     <string name="add_site_pref">복제 사이트</string>
     <string name="remove_site_pref">사이트 삭제</string>
     <string name="add_site_summary">다른 URL을 사용하여 기존 사이트의 복제본을 추가합니다</string>
@@ -217,10 +217,10 @@
     <string name="category_general">일반</string>
     <string name="pref_category_player_features">플레이어 기능</string>
     <string name="pref_category_ui_features">기능</string>
-    <string name="provider_lang_settings">소스 언어</string>
+    <string name="provider_lang_settings">확장 언어</string>
     <string name="app_layout">앱 레이아웃</string>
     <string name="preferred_media_settings">선호하는 미디어</string>
-    <string name="enable_nsfw_on_providers">지원되는 공급업체에서 19금 사용 설정</string>
+    <string name="enable_nsfw_on_providers">지원된 연장에 NSFW 활성화</string>
     <string name="subtitles_encoding">자막 인코딩</string>
     <string name="category_providers">소스</string>
     <string name="category_provider_test">소스 테스트</string>
@@ -305,11 +305,11 @@
     <string name="view_public_repositories_button">커뮤니티 저장소 보기</string>
     <string name="view_public_repositories_button_short">공개 목록</string>
     <string name="uppercase_all_subtitles">모든 자막 대문자화</string>
-    <string name="download_all_plugins_from_repo">이 저장소에서 모든 플러그인을 다운로드하시겠습니까?경고: CloudStream 3은 타 사 확장 프로그램 사용에 대해 책임을 지지 않으며 이를 지원하지 않습니다!</string>
+    <string name="download_all_plugins_from_repo">경고: CloudStream은 제3자 확장을 이용하여 어떠한 책임도 지지 않습니다!</string>
     <string name="single_plugin_disabled" formatted="true">%s (사용불가)</string>
     <string name="add_repository">저장소 추가</string>
-    <string name="repository_name_hint">저장소 이름</string>
-    <string name="repository_url_hint">저장소 URL</string>
+    <string name="repository_name_hint">저장소 이름 (선택 사항)</string>
+    <string name="repository_url_hint">저장소 URL 또는 단축 코드</string>
     <string name="plugin_loaded">플러그인이 로드됨</string>
     <string name="plugin_downloaded">플러그인 다운로드</string>
     <string name="plugin_deleted">플러그인 삭제됨</string>
@@ -380,7 +380,7 @@
     <string name="dont_show_again">다시 표시하지 않음</string>
     <string name="no_update_found">업데이트를 찾을 수 없음</string>
     <string name="update">업데이트</string>
-    <string name="jsdelivr_proxy">raw.githubusercontent.com 프록시</string>
+    <string name="jsdelivr_proxy">GitHub 프록시</string>
     <string name="video_buffer_length_settings">동영상 버퍼 길이</string>
     <string name="video_buffer_disk_settings">저장소에 동영상 캐시</string>
     <string name="video_ram_description">Android TV와 같이 메모리가 부족한 디바이스에서 너무 높게 설정하면 충돌이 발생할 수 있습니다.</string>
@@ -397,12 +397,12 @@
     <string name="pref_category_app_updates">앱 업데이트</string>
     <string name="pref_category_extensions">확장 기능</string>
     <string name="logout">로그아웃</string>
-    <string name="example_site_url">사이트 URL</string>
+    <string name="example_site_url">https://example.com</string>
     <string name="example_password">비밀번호</string>
     <string name="account">계정</string>
     <string name="example_username">사용자 이름</string>
     <string name="example_lang_name">언어 코드 (ko)</string>
-    <string name="example_site_name">사이트 이름</string>
+    <string name="example_site_name">새사이트이름</string>
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="subtitle_offset_extra_hint_before_format">자막이 %d ms 너무 늦게 표시되는 경우, 사용하세요</string>
     <string name="subtitle_offset_extra_hint_none_format">자막 지연 없음</string>
@@ -497,16 +497,16 @@
     <string name="pref_category_actions">동작</string>
     <string name="pref_category_looks">외형</string>
     <string name="random_button_settings">랜덤 버튼</string>
-    <string name="random_button_settings_desc">홈페이지에 랜덤 버튼 표시</string>
+    <string name="random_button_settings_desc">홈페이지 및 도서관에서 임의 버튼 표시</string>
     <string name="bottom_title_settings_des">포스터 아래에 제목을 이동</string>
     <string name="subtitles_depressed">내려감</string>
     <string name="subtitles_raised">올라감</string>
     <string name="subtitles_example_text">다람쥐 헌 쳇바퀴에 타고파</string>
     <string name="subtitles_remove_bloat">자막에서 부풀림 제거</string>
     <string name="extras">엑스트라</string>
-    <string name="network_adress_example">스트림 링크</string>
+    <string name="network_adress_example">https://example.com/example.mp4</string>
     <string name="tracks">트랙</string>
-    <string name="referer">레퍼러</string>
+    <string name="referer">Referer (선택)</string>
     <string name="skip_type_recap">요약</string>
     <string name="action_mark_as_watched">시청함으로 표시</string>
     <string name="revert">되돌리기</string>
@@ -600,7 +600,7 @@
     <string name="automatic_plugin_download_mode_title">플러그인 다운로드를 필터링할 모드 선택</string>
     <string name="biometric_warning">데이터가 백업되었습니다. 장치에 따라 동작이 다를 수 있으며 앱 접근이 차단될 경우 앱 데이터를 완전히 지우고 백업에서 복원하세요. 이로 인해 발생하는 불편을 사과드립니다.</string>
     <string name="device_pin_url_message">스마트폰이나 컴퓨터에서 <b>%s</b>를 방문하여 위의 코드를 입력하세요</string>
-    <string name="battery_dialog_message">구독 TV 프로그램에 대한 중단 없는 다운로드 및 알림을 보장하기 위해 CloudStream은 백그라운드에서 실행할 수 있는 권한이 필요합니다. 확인을 누르면 App info로 이동합니다. 거기서 𝘼𝙥𝙥 𝙗𝙖𝙩𝙩𝙚𝙧𝙮 𝙪𝙨𝙖𝙜𝙚로 스크롤하여 배터리 사용량을 𝙐𝙣𝙧𝙚𝙨𝙩𝙧𝙞𝙘𝙩𝙚𝙙로 설정합니다. 이 권한은 CS3가 배터리를 소모한다는 의미가 아닙니다. 알림을 받거나 공식 확장에서 동영상을 다운로드하는 등 필요할 때만 백그라운드에서 작동합니다. 취소를 선택한 경우 나중에 𝙂𝙚𝙣𝙚𝙧𝙖𝙡 𝙎𝙚𝙩𝙩𝙞𝙣𝙜𝙨에서 이 설정을 조정할 수 있습니다.</string>
+    <string name="battery_dialog_message">구독 된 TV 프로그램에 대한 특이성 다운로드 및 알림을 보려면 클라우드 스트림은 배경에서 오른쪽으로 실행할 권리가 필요합니다. 확인을 눌러 요청 대화 상자를 표시하십시오. 필요한 경우 필요에 따라 CP3에 제한되지 않고 공식을 다운로드하거나 공식화에서 확대를 누릴 필요가 있습니다.</string>
     <string name="quality_profile_help">여기서 소스의 순서를 변경할 수 있습니다. 비디오의 우선 순위가 높은 경우에는 소스 선택에 더 높게 나타납니다. 소스 우선 순위와 품질 우선 순위의 합이 비디오 우선 순위입니다.
 \n
 \n참고 A: 3
@@ -651,7 +651,7 @@
     <string name="torrent_info">이 동영상은 토렌트이므로 동영상 활동이 추적될 수 있습니다.\n계속하기 전에 토렌트에 대해 충분히 이해했는지 확인하세요.</string>
     <string name="audio_singluar">오디오</string>
     <string name="podcast_singluar">팟캐스트</string>
-    <string name="begin_speaking">음성 시작…</string>
+    <string name="begin_speaking">시작하기 …</string>
     <string name="encoding_error">인코딩 오류</string>
     <string name="unsupported_error">지원되지 않는 오류</string>
     <string name="speech_recognition_unavailable">음성 인식 사용 불가</string>
@@ -732,4 +732,31 @@
     <string name="top_left">왼쪽 위</string>
     <string name="top_center">중앙 위</string>
     <string name="top_right">오른쪽 위</string>
+    <string name="source_priority_help">비디오 소스가 플레이어에서 정렬되어야하는 방법 결정</string>
+    <string name="extra_brightness_settings_des">100% 표시 광도가 초과될 때 Enable 광도 여과기</string>
+    <string name="cancel_queue_message">모든 퀴즈 다운로드를 취소하시겠습니까?</string>
+    <string name="download_episode_range">에피소드를 다운로드 하시겠습니까 %s?</string>
+    <string name="queue_empty_message">현재 누락된 다운로드가 없습니다.</string>
+    <plurals name="downloads_active">
+        <item quantity="other">%d 활성 다운로드</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="other">%d 다운로드</item>
+    </plurals>
+    <string name="search_suggestions_des">검색 결과 표시</string>
+    <string name="show_cast_in_details">회사 소개</string>
+    <string name="background_radius">배경 반경</string>
+    <string name="reload_provider">Reload 공급자</string>
+    <string name="search_suggestions">검색 제안</string>
+    <string name="clear_suggestions">자주 묻는 질문</string>
+    <string name="video_info">미디어 정보</string>
+    <string name="source_name">근원 이름</string>
+    <string name="extra_brightness_settings">추가 밝기</string>
+    <string name="download_queue">다운로드 queue</string>
+    <string name="download_all">다운로드</string>
+    <string name="cancel_all">모든 것</string>
+    <string name="source_priority">근원 우선권</string>
+    <string name="overscan_settings">구름 많음</string>
+    <string name="action_reload">관련 상품</string>
+    <string name="extra_brightness_key">추가_brightness_enabled</string>
 </resources>
diff --git a/app/src/main/res/values-b+nl/strings.xml b/app/src/main/res/values-b+nl/strings.xml
index 10588a3fc..30b8b2def 100644
--- a/app/src/main/res/values-b+nl/strings.xml
+++ b/app/src/main/res/values-b+nl/strings.xml
@@ -249,7 +249,7 @@
     <string name="update">Update</string>
     <string name="watch_quality_pref">Voorkeurskwaliteit voor kijken (WiFi)</string>
     <string name="limit_title">Maximaal aantal tekens voor titel van videospeler</string>
-    <string name="limit_title_rez">Videospeler Resolutie</string>
+    <string name="limit_title_rez">Toon spelerinformatie</string>
     <string name="video_buffer_size_settings">Grootte videobuffer</string>
     <string name="video_buffer_length_settings">Lengte videobuffer</string>
     <string name="video_buffer_disk_settings">Video cache op schijf</string>
@@ -289,7 +289,7 @@
     <string name="example_username">Gebruikersnaam</string>
     <string name="example_email">hello@Wereld.com</string>
     <string name="example_ip">127.0.0.1</string>
-    <string name="example_site_name">MyCoolSite</string>
+    <string name="example_site_name">NieuweSiteNaam</string>
     <string name="example_site_url">https://voorbeeld.com</string>
     <string name="example_lang_name">Taalcode (nl)</string>
     <string name="login_format" formatted="true">%1$s %2$s</string>
@@ -432,7 +432,7 @@
     <string name="repository_name_hint">Repository naam (Optioneel)</string>
     <string name="plugin_downloaded">Plugin Gedownload</string>
     <string name="test_failed">Mislukt</string>
-    <string name="jsdelivr_proxy_summary">Omzeilt de blokkering van GitHub met behulp van jsDelivr, waardoor updates enkele dagen vertraging kunnen oplopen.</string>
+    <string name="jsdelivr_proxy_summary">Omzeil de blokkering van ruwe GitHub-URL’s via jsDelivr. Hierdoor kunnen updates enkele dagen vertraagd zijn.</string>
     <string name="repository_url_hint">Repository URL of Shortcode</string>
     <string name="batch_download_finish_format" formatted="true">Download %1$d %2$s voltooid</string>
     <string name="hls_playlist">HLS Afspeellijst</string>
@@ -658,4 +658,28 @@
     <string name="device_pin_url_message">Ga naar <b>%s</b> op je smartphone of computer en voeren de bovenstaande code in</string>
     <string name="device_pin_expired_message">PIN-code is nu verlopen!</string>
     <string name="device_pin_counter_text">Code verloopt in %1$dm %2$ds</string>
+    <string name="download_queue">Downloadwachtrij</string>
+    <string name="queue_empty_message">Er staan momenteel geen downloads in de wachtrij.</string>
+    <string name="extra_brightness_settings">Extra helderheid</string>
+    <string name="extra_brightness_settings_des">Schakel het helderheidsfilter in zodra de schermhelderheid boven 100% komt</string>
+    <string name="extra_brightness_key">extra_helderheid_ingeschakeld</string>
+    <string name="search_suggestions">Zoeksuggesties</string>
+    <string name="search_suggestions_des">Zoeksuggesties laten zien tijdens het typen</string>
+    <string name="clear_suggestions">Suggesties verwijderen</string>
+    <string name="show_cast_in_details">Castpaneel weergeven</string>
+    <string name="install_prerelease">Pre-releaseversie installeren</string>
+    <string name="prerelease_already_installed">Pre-releaseversie is al geïnstaleerd.</string>
+    <string name="prerelease_install_failed">Installatie van de pre-release is mislukt.</string>
+    <string name="episode_action_cast_mirror">Schermspiegeling</string>
+    <string name="episode_action_play_mirror">Spiegeling spelen</string>"
+    <string name="show_rating">Beoordelingslabel</string>
+    <string name="show_episode_text">Afleveringstekst</string>
+    <string name="test_extensions_summary">Deze test is alleen bedoeld voor ontwikkelaars en bevestigt noch ontkent de werking van een extensie.</string>
+    <string name="auth_locally">Lokale authenticatie</string>
+    <string name="video_info">Media info</string>
+    <string name="download_all_plugins_from_repo">Waarschuwing: Cloudstream is niet verandwoordelijk voor het gebruik van extensies van derden en biedt hier ook geen ondersteuning voor!</string>
+    <string name="player_settings_select_cast_device">Cast apparaat selecteren</string>
+    <string name="clipboard_permission_error">Fout bij toegang tot het Klembord, Probeer het opnieuw.</string>
+    <string name="clipboard_unknown_error">Fout bij het kopiëren. Kopieer alsjeblieft de logcat en neem contact op met de app-ondersteuning.</string>
+    <string name="dismiss">Afwijzen</string>
 </resources>
diff --git a/app/src/main/res/values-b+ta/strings.xml b/app/src/main/res/values-b+ta/strings.xml
index e223f6c60..626554c18 100644
--- a/app/src/main/res/values-b+ta/strings.xml
+++ b/app/src/main/res/values-b+ta/strings.xml
@@ -278,7 +278,7 @@
     <string name="resume">தற்குறிப்பு</string>
     <string name="go_back_30">-30</string>
     <string name="other_singular">ஒளிதோற்றம்</string>
-    <string name="limit_title_rez">வீடியோ பிளேயர் தீர்மானம்</string>
+    <string name="limit_title_rez">பிளேயர் தகவலைக் காட்டு</string>
     <string name="video_buffer_size_settings">வீடியோ இடையக அளவு</string>
     <string name="add_site_pref">நகலி தளம்</string>
     <string name="jsdelivr_proxy">அறிவிலிமையம் பதிலாள்</string>
@@ -286,7 +286,7 @@
     <string name="no_repository_found_error">களஞ்சியம் கிடைக்கவில்லை, முகவரி ஐ சரிபார்த்து VPN ஐ முயற்சிக்கவும்</string>
     <string name="batch_download">தொகுதி பதிவிறக்கம்</string>
     <string name="plugin_singular">சொருகு</string>
-    <string name="download_all_plugins_from_repo">எச்சரிக்கை: கிளவுட்ச்ட்ரீம் 3 மூன்றாம் தரப்பு நீட்டிப்புகளைப் பயன்படுத்துவதற்கான எந்தப் பொறுப்பையும் ஏற்காது, அவர்களுக்கு எந்த ஆதரவையும் வழங்காது!</string>
+    <string name="download_all_plugins_from_repo">எச்சரிக்கை: மூன்றாம் தரப்பு நீட்டிப்புகளைப் பயன்படுத்துவதற்கு CloudStream எந்தப் பொறுப்பையும் ஏற்காது, அவற்றிற்கு எந்த ஆதரவையும் வழங்காது!</string>
     <string name="extension_language">மொழி</string>
     <string name="revert">திரும்பவும்</string>
     <string name="subscription_deleted">%s இலிருந்து குழுவிலகப்பட்டது</string>
@@ -555,7 +555,7 @@
     <string name="update">புதுப்பிப்பு</string>
     <string name="logout">விடுபதிகை</string>
     <string name="quality_webrip">விரலிடைத் தோல்</string>
-    <string name="apk_installer_settings_des">சில தொலைபேசிகள் புதிய தொகுப்பு நிறுவியை ஆதரிக்கவில்லை. புதுப்பிப்புகள் நிறுவப்படாவிட்டால் மரபு விருப்பத்தை முயற்சிக்கவும்.</string>
+    <string name="apk_installer_settings_des">சில சாதனங்கள் புதிய தொகுப்பு நிறுவியை ஆதரிக்கவில்லை. புதுப்பிப்புகள் நிறுவப்படவில்லை என்றால், மரபு விருப்பத்தை முயற்சிக்கவும்.</string>
     <string name="battery_dialog_message">சந்தா தொலைக்காட்சி நிகழ்ச்சிகளுக்கான தடையற்ற பதிவிறக்கங்கள் மற்றும் அறிவிப்புகளை உறுதிப்படுத்த, கிளவுட்ச்ட்ரீம் பின்னணியில் இயங்க இசைவு தேவை. சரி என்பதை அழுத்துவதன் மூலம், உங்களுக்கு கோரிக்கை உரையாடல் காண்பிக்கப்படும். தயவுசெய்து \'இசைவு\' என்பதை அழுத்தவும். \n\nதயவுசெய்து கவனிக்கவும், இந்த இசைவு CS3 உங்கள் பேட்டரியை வெளியேற்றும் என்று அர்த்தமல்ல. அறிவிப்புகளைப் பெறும்போது அல்லது உத்தியோகபூர்வ நீட்டிப்புகளிலிருந்து வீடியோக்களைப் பதிவிறக்குவது போன்ற பின்னணியில் மட்டுமே இது செயல்படும்.</string>
     <string name="app_unrestricted_toast">பயன்பாட்டு பேட்டரி பயன்பாடு ஏற்கனவே கட்டுப்பாடற்றதாக அமைக்கப்பட்டுள்ளது</string>
     <string name="update_notification_installing">பயன்பாட்டு புதுப்பிப்பை நிறுவுகிறது…</string>
@@ -648,7 +648,7 @@
     <string name="torrent_preferred_media">அமைப்புகள்/வழங்குநர்கள்/விருப்பமான ஊடகங்களில் டொரெண்டை இயக்கவும்</string>
     <string name="torrent_not_accepted">பயன்பாட்டை மறுதொடக்கம் செய்து, தொடர ச்ட்ரீம் டொரண்ட் பாப்-அப் ஏற்றுக்கொள்ளுங்கள்.</string>
     <string name="software_decoding">மென்பொருள் டிகோடிங்</string>
-    <string name="software_decoding_desc">மென்பொருள் டிகோடிங் உங்கள் தொலைபேசியால் ஆதரிக்கப்படாத வீடியோ கோப்புகளை இயக்க பிளேயருக்கு உதவுகிறது, ஆனால் உயர் தெளிவுத்திறனில் பின்னடைவு அல்லது நிலையற்ற பின்னணியை ஏற்படுத்தக்கூடும்</string>
+    <string name="software_decoding_desc">மென்பொருள் டிகோடிங் உங்கள் சாதனத்தால் ஆதரிக்கப்படாத வீடியோ கோப்புகளை பிளேயருக்கு இயக்க உதவுகிறது, ஆனால் உயர் தெளிவுத்திறனில் பின்னடைவு அல்லது நிலையற்ற பிளேபேக்கை ஏற்படுத்தலாம்.</string>
     <string name="volume_exceeded_100">தொகுதி 100% ஐ தாண்டியுள்ளது</string>
     <string name="slide_up_again_to_exceed_100">100% க்கு அப்பால் செல்ல மீண்டும் சறுக்கவும்</string>
     <string name="update_plugins">செருகுநிரல்களைப் புதுப்பிக்கவும்</string>
@@ -676,4 +676,61 @@
     <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d மணி %2$d நிமிடம் %3$d விநாடி</string>
     <string name="download_time_left_min_sec_format" formatted="true">%1$d நிமிடம் %2$d விநாடி</string>
     <string name="download_time_left_sec_format" formatted="true">%1$d விநாடி</string>
+    <string name="download_queue">பதிவிறக்க வரிசை</string>
+    <string name="play_full_series_button">முழு தொடரையும் விளையாடு</string>
+    <string name="queue_empty_message">தற்போது வரிசைப்படுத்தப்பட்ட பதிவிறக்கங்கள் எதுவும் இல்லை.</string>
+    <string name="extra_brightness_settings">கூடுதல் ஒளி</string>
+    <string name="extra_brightness_settings_des">100% காட்சி பிரகாசத்தை மீறும் போது பிரகாச வடிப்பானை இயக்கவும்</string>
+    <string name="extra_brightness_key">கூடுதல்_பிரகாசம்_செயல்படுத்தப்பட்டது</string>
+    <string name="search_suggestions">தேடல் பரிந்துரைகள்</string>
+    <string name="search_suggestions_des">தட்டச்சு செய்யும் போது தேடல் பரிந்துரைகளைக் காட்டு</string>
+    <string name="clear_suggestions">தெளிவான பரிந்துரைகள்</string>
+    <string name="show_cast_in_details">காச்ட் பேனலைக் காட்டு</string>
+    <string name="install_prerelease">வெளியீட்டிற்கு முந்தைய பதிப்பை நிறுவவும்</string>
+    <string name="prerelease_already_installed">முன் வெளியீடு ஏற்கனவே நிறுவப்பட்டுள்ளது.</string>
+    <string name="prerelease_install_failed">முன் வெளியீட்டை நிறுவுவதில் தோல்வி.</string>
+    <string name="episode_action_play_mirror">கண்ணாடியை விளையாடு</string>"
+    <string name="show_rating">மதிப்பீடு சிட்டை</string>
+    <string name="show_episode_text">எபிசோட் உரை</string>
+    <string name="video_info">மீடியா செய்தி</string>
+    <string name="player_settings_always_ask">எப்போதும் கேளுங்கள்</string>
+    <string name="source_priority">மூல முன்னுரிமை</string>
+    <string name="source_priority_help">பிளேயரில் வீடியோ ஆதாரங்கள் எவ்வாறு வரிசைப்படுத்தப்பட வேண்டும் என்பதைத் தீர்மானிக்கவும்</string>
+    <string name="no_account">கணக்கு இல்லை</string>
+    <string name="speedup_title">LongPress விரைவு மாற்று</string>
+    <string name="speedup_summary">2x வேகத்தைப் பெற அழுத்திப் பிடிக்கவும்</string>
+    <string name="edit_profile_image_title">சுயவிவரப் படத்தைத் திருத்து</string>
+    <string name="edit_profile_image_hint">சுயவிவரப் பட முகவரி ஐ உள்ளிடவும்</string>
+    <string name="edit_profile_image_error_empty">முகவரி இல்லை</string>
+    <string name="edit_profile_image_error_invalid">தவறான முகவரி அல்லது படம்</string>
+    <string name="edit_profile_image_success">படம் வெற்றிகரமாக புதுப்பிக்கப்பட்டது</string>
+    <string name="action_mark_watched_up_to_this_episode">இந்த எபிசோட் வரை பார்த்ததாகக் குறிக்கவும்</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">இந்த எபிசோட் வரை பார்த்ததை அகற்று</string>
+    <string name="action_reload">மீண்டும் ஏற்றப்பட்டது</string>
+    <string name="reload_provider">மறுஏற்றம் வழங்குநர்</string>
+    <string name="name">பெயர்</string>
+    <string name="source_name">மூலப் பெயர்</string>
+    <string name="resolution_and_name">தீர்மானம் மற்றும் பெயர்</string>
+    <string name="download_all">அனைத்தையும் பதிவிறக்கவும்</string>
+    <string name="cancel_all">அனைத்தையும் ரத்து வெற்றி</string>
+    <string name="download_episode_range">அத்தியாயம் %s ஐ பதிவிறக்க விரும்புகிறீர்களா?</string>
+    <string name="cancel_queue_message">வரிசைப்படுத்தப்பட்ட அனைத்து பதிவிறக்கங்களையும் ரத்துசெய்ய விரும்புகிறீர்களா?</string>
+    <string name="subs_subtitle_alignment">வசன சீரமைப்பு</string>
+    <string name="bottom_left">கீழே இடது</string>
+    <string name="bottom_center">கீழ் நடுவண்</string>
+    <string name="bottom_right">கீழ் வலது</string>
+    <string name="middle_left">நடுத்தர இடது</string>
+    <string name="middle_center">நடுத்தர நடுவண்</string>
+    <string name="middle_right">நடுத்தர வலது</string>
+    <string name="top_left">மேல் இடது</string>
+    <string name="top_center">மேல் நடுவண்</string>
+    <string name="top_right">மேல் வலது</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d செயலில் பதிவிறக்கம்</item>
+        <item quantity="other">%d செயலில் உள்ள பதிவிறக்கங்கள்</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d பதிவிறக்கம் வரிசையில் உள்ளது</item>
+        <item quantity="other">%d பதிவிறக்கங்கள் வரிசையில் உள்ளன</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values-b+vi/strings.xml b/app/src/main/res/values-b+vi/strings.xml
index a4804c9d4..7999feb99 100644
--- a/app/src/main/res/values-b+vi/strings.xml
+++ b/app/src/main/res/values-b+vi/strings.xml
@@ -757,4 +757,18 @@
     <string name="video_info">Thông tin âm thanh</string>
     <string name="extra_brightness_settings">Độ sáng bổ sung</string>
     <string name="source_name">Tên nguồn</string>
+    <string name="download_queue">Hàng đợi tải xuống</string>
+    <string name="queue_empty_message">Hiện tại không có tệp nào đang chờ tải xuống.</string>
+    <string name="source_priority_help">Hãy quyết định cách sắp xếp các nguồn video trong trình phát.</string>
+    <string name="source_priority">Ưu tiên nguồn</string>
+    <string name="download_all">Tải xuống tất cả</string>
+    <string name="cancel_all">Hủy tất cả</string>
+    <string name="download_episode_range">Bạn có muốn tải xuống tập %s không?</string>
+    <string name="cancel_queue_message">Bạn có muốn hủy tất cả các lượt tải xuống đang chờ xử lý không?</string>
+    <plurals name="downloads_active">
+        <item quantity="other">%d đang tải xuống</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="other">%d lượt tải xuống đang chờ xử lý</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 4c9a88313..690296ca6 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -179,10 +179,10 @@
     <string name="kitsu_settings">Паказваць плакаты з Kitsu</string>
     <string name="pref_filter_search_quality">Схаваць выбраную якасць відэа з вынікаў пошуку</string>
     <string name="automatic_plugin_updates">Аўтаматычнае абнаўленне пашырэнняў</string>
-    <string name="automatic_plugin_download">Аўтаматычная спампоўка ўбудоваў</string>
+    <string name="automatic_plugin_download">Аўтаматычная спампоўка ўбудоў</string>
     <string name="apk_installer_settings_des">Некаторыя прылады не падтрымліваюць новы ўсталёўшчык пакетаў. Калі абнаўленні не ўсталёўваюцца, паспрабуйце ранейшую версію.</string>
     <string name="github">Github</string>
-    <string name="automatic_plugin_download_mode_title">Выберыце рэжым фільтравання спампоўвання убудоваў</string>
+    <string name="automatic_plugin_download_mode_title">Выберыце рэжым фільтравання спампоўвання убудоў</string>
     <string name="search_suggestions">Прапановы пошуку</string>
     <string name="search_suggestions_des">Паказваць прапановы пошуку падчас уводу тэксту</string>
     <string name="clear_suggestions">Ачысціць прапановы</string>
@@ -673,7 +673,7 @@
     <string name="update_plugins_manually">Абнавіць убудовы ўручную</string>
     <string name="starting_plugin_update_manually">Пачынаецца абнаўленне ўбудоў!</string>
     <string name="plugins_updated_manually">Абноўлена %d убудова(ы/ў)!</string>
-    <string name="no_plugins_updated_manually">Не абнавілася ніводная ўбудова.</string>
+    <string name="no_plugins_updated_manually">Ніводнай убудовы не было абноўлена.</string>
     <string name="player_notification_channel_name">Апавяшчэнні прайгравальніка</string>
     <string name="player_notification_channel_description">Апавяшчэнне прайгравальніка для кіравання прайграваннем у фонавым рэжыме</string>
     <string name="subtitles_from_embedded">Убудаваны</string>
@@ -715,4 +715,24 @@
     <string name="top_left">Зверху злева</string>
     <string name="top_center">Зверху па цэнтру</string>
     <string name="top_right">Зверху справа</string>
+    <string name="download_queue">Чагра спампоўванняў</string>
+    <string name="queue_empty_message">У чарзе пакуль што няма спампоўванняў.</string>
+    <string name="source_priority">Прыярытэт крыніц</string>
+    <string name="source_priority_help">Выберыце, як сартаваць крыніцы відэа ў прайгравальніку</string>
+    <string name="download_all">Спампаваць усё</string>
+    <string name="cancel_all">Скасаваць усё</string>
+    <string name="download_episode_range">Спампаваць %s серыю?</string>
+    <string name="cancel_queue_message">Скасаваць усе спампоўванні ў чарзе?</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d актыўнае спампоўванне</item>
+        <item quantity="few">%d актыўных спампоўвання</item>
+        <item quantity="many">%d актыўных спампоўванняў</item>
+        <item quantity="other">%d актыўных спампоўванняў</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d спампоўванне ў чарзе</item>
+        <item quantity="few">%d спампоўвання ў чарзе</item>
+        <item quantity="many">%d спампоўванняў у чарзе</item>
+        <item quantity="other">%d спампоўванняў у чарзе</item>
+    </plurals>
 </resources>

From b0d3731faa16cabaa51b6d01ce6b500ebdcfcf82 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 11 Mar 2026 15:19:57 +0100
Subject: [PATCH 003/177] feat(extractors): add vide0 doodstream mirror (#2558)

---
 .../com/lagradost/cloudstream3/extractors/DoodExtractor.kt  | 6 ++++--
 .../kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
index 0cef9eb4c..25c8ea9e7 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
@@ -4,11 +4,9 @@ import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.INFER_TYPE
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
 import java.net.URI
-import kotlin.random.Random
 
 class Doodspro : DoodLaExtractor() {
     override var mainUrl = "https://doods.pro"
@@ -81,6 +79,10 @@ class Ds2video : DoodLaExtractor() {
     override var mainUrl = "https://ds2video.com"
 }
 
+class Vide0Net: DoodLaExtractor() {
+    override var mainUrl = "https://vide0.net"
+}
+
 class MyVidPlay : DoodLaExtractor() {
     override var mainUrl = "https://myvidplay.com"
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index f796f3fdd..3dc0cc7ff 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -281,6 +281,7 @@ import com.lagradost.cloudstream3.extractors.Vidoza
 import com.lagradost.cloudstream3.extractors.VinovoSi
 import com.lagradost.cloudstream3.extractors.VinovoTo
 import com.lagradost.cloudstream3.extractors.VidNest
+import com.lagradost.cloudstream3.extractors.Vide0Net
 import com.lagradost.cloudstream3.extractors.VkExtractor
 import com.lagradost.cloudstream3.extractors.Voe
 import com.lagradost.cloudstream3.extractors.Voe1
@@ -1227,6 +1228,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     ByseVepoin(),
     ByseBuho(),
     MyVidPlay(),
+    Vide0Net(),
     Up4Stream(),
     Up4FunTop(),
     GUpload(),

From ccc0a45065de49c888651b7dac23608413b9eb0d Mon Sep 17 00:00:00 2001
From: Osten <11805592+LagradOst@users.noreply.github.com>
Date: Fri, 13 Mar 2026 22:54:11 +0100
Subject: [PATCH 004/177] Fixed shared pool, closes #2082 (#2553)

---
 .../lagradost/cloudstream3/CommonActivity.kt  | 11 -------
 .../lagradost/cloudstream3/ui/BaseAdapter.kt  | 29 +++++++++++++++++++
 .../ui/home/HomeChildItemAdapter.kt           |  7 ++---
 .../cloudstream3/ui/home/HomeFragment.kt      |  1 +
 .../ui/home/HomeParentItemAdapter.kt          |  6 ++--
 .../ui/home/HomeParentItemAdapterPreview.kt   |  1 +
 .../cloudstream3/ui/home/HomeViewModel.kt     |  5 ----
 .../cloudstream3/ui/player/GeneratorPlayer.kt |  2 +-
 .../ui/quicksearch/QuickSearchFragment.kt     |  1 +
 .../cloudstream3/ui/result/ActorAdaptor.kt    |  4 +--
 .../cloudstream3/ui/result/EpisodeAdapter.kt  | 13 ++++-----
 .../cloudstream3/ui/result/ImageAdapter.kt    |  4 +--
 .../ui/result/ResultFragmentPhone.kt          |  4 +--
 .../ui/result/ResultFragmentTv.kt             |  2 +-
 .../cloudstream3/ui/search/SearchAdaptor.kt   |  4 +--
 .../cloudstream3/ui/search/SearchFragment.kt  |  1 +
 .../cloudstream3/ui/settings/SettingsUI.kt    |  2 +-
 .../ui/settings/extensions/PluginAdapter.kt   |  7 ++---
 .../ui/settings/extensions/PluginsFragment.kt |  1 +
 19 files changed, 57 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index abf56dcbd..c806cac63 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -234,19 +234,8 @@ object CommonActivity {
     fun init(act: Activity) {
         setActivityInstance(act)
         ioSafe { Torrent.deleteAllFiles() }
-
-        // Clear all pools to apply the correct theme
-        for (pool in arrayOf(
-            PluginAdapter.sharedPool, HomeChildItemAdapter.sharedPool,
-            ParentItemAdapter.sharedPool, ActorAdaptor.sharedPool, EpisodeAdapter.sharedPool,
-            SearchAdapter.sharedPool, ImageAdapter.sharedPool
-        )) {
-            pool.clear()
-        }
-
         val componentActivity = activity as? ComponentActivity ?: return
 
-
         componentActivity.updateLocale()
         componentActivity.updateTv()
         AccountManager.initMainAPI()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt
index 2bc1af833..4ebb7564c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.ui
 
+import android.content.Context
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
@@ -11,6 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import androidx.viewbinding.ViewBinding
 import coil3.dispose
+import java.util.WeakHashMap
 import java.util.concurrent.CopyOnWriteArrayList
 
 open class ViewHolderState<T>(val view: ViewBinding) : ViewHolder(view.root) {
@@ -22,6 +24,33 @@ abstract class NoStateAdapter<T : Any>(
     diffCallback: DiffUtil.ItemCallback<T> = BaseDiffCallback()
 ) : BaseAdapter<T, Any>(0, diffCallback)
 
+/** Creates a new shared pool, using the supplied lambda as a constructor.
+ *
+ * The reason for this complicated structure is that a pool should not be shared between contexts
+ * as it makes coil fuck up, and theming.
+ * */
+fun newSharedPool(lambda: RecyclerView.RecycledViewPool.() -> Unit = { }): Pair<WeakHashMap<Context, RecyclerView.RecycledViewPool>, RecyclerView.RecycledViewPool.() -> Unit> =
+    WeakHashMap<Context, RecyclerView.RecycledViewPool>() to lambda
+
+/** Sets the shared pool of the recyclerview */
+fun RecyclerView.setRecycledViewPool(pool: Pair<WeakHashMap<Context, RecyclerView.RecycledViewPool>, RecyclerView.RecycledViewPool.() -> Unit>) {
+    val ctx = context ?: return
+    synchronized(pool.first) {
+        this.setRecycledViewPool(pool.first.getOrPut(ctx) {
+            RecyclerView.RecycledViewPool().apply(pool.second)
+        })
+    }
+}
+
+/** Clears the shared pool of views */
+fun Pair<WeakHashMap<Context, RecyclerView.RecycledViewPool>, RecyclerView.RecycledViewPool.() -> Unit>.clear() {
+    synchronized(this.first) {
+        for (pool in this.first.values) {
+            pool?.clear()
+        }
+    }
+}
+
 /**
  * BaseAdapter is a persistent state stored adapter that supports headers and footers.
  * This should be used for restoring eg scroll or focus related to a view when it is recreated.
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
index 4cd4197df..43f6d19ff 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt
@@ -5,12 +5,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import android.widget.ImageView
-import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
-import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
-import coil3.load
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.databinding.HomeRemoveGridBinding
@@ -20,6 +16,7 @@ import com.lagradost.cloudstream3.databinding.HomeResultGridExpandedBinding
 import com.lagradost.cloudstream3.ui.BaseAdapter
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
@@ -165,7 +162,7 @@ open class HomeChildItemAdapter(
         // The vast majority of the lag comes from creating the view
         // This simply shares the views between all HomeChildItemAdapter
         val sharedPool =
-            RecyclerView.RecycledViewPool().apply { this.setMaxRecycledViews(CONTENT, 20) }
+            newSharedPool { setMaxRecycledViews(CONTENT, 20) }
 
         var minPosterSize: Int = 0
         var maxPosterSize: Int = 0
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index a254e1aec..375b2313f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -52,6 +52,7 @@ import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_PLAY_FILE
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper.handleSearchClickCallback
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
index 0d08dc898..6bdd1bf49 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt
@@ -6,10 +6,8 @@ import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
-import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.HomepageParentBinding
@@ -17,9 +15,11 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.BaseAdapter
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
@@ -48,7 +48,7 @@ open class ParentItemAdapter(
 ) {
     companion object {
         val sharedPool =
-            RecyclerView.RecycledViewPool().apply { this.setMaxRecycledViews(CONTENT, 4) }
+            newSharedPool { setMaxRecycledViews(CONTENT, 4) }
     }
 
     data class ParentItemHolder(val binding: ViewBinding) : ViewHolderState<Bundle>(binding) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
index 26e3477ef..a292c2da2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
@@ -60,6 +60,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarMargin
 import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView
 import com.lagradost.cloudstream3.utils.UIHelper.populateChips
 import androidx.core.graphics.toColorInt
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 
 class HomeParentItemAdapterPreview(
     val fragment: LifecycleOwner,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
index a066bf151..e0609c0e5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
@@ -15,7 +15,6 @@ import com.lagradost.cloudstream3.HomePageList
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.MainActivity
-import com.lagradost.cloudstream3.MainActivity.Companion.lastError
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.mvvm.Resource
@@ -57,7 +56,6 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.withContext
 import java.util.EnumSet
 import java.util.concurrent.CopyOnWriteArrayList
-import kotlin.collections.set
 
 class HomeViewModel : ViewModel() {
     companion object {
@@ -518,9 +516,6 @@ class HomeViewModel : ViewModel() {
                 return@ioSafe
             }
 
-            HomeChildItemAdapter.sharedPool.clear()
-            ParentItemAdapter.sharedPool.clear()
-
             val api = getApiFromNameNull(preferredApiName)
             if (preferredApiName == noneApi.name) {
                 // just set to random
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index 7138e8dad..d20e85707 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -90,6 +90,7 @@ import com.lagradost.cloudstream3.ui.result.ResultFragment
 import com.lagradost.cloudstream3.ui.result.ResultViewModel2
 import com.lagradost.cloudstream3.ui.result.SyncViewModel
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
@@ -128,7 +129,6 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import java.io.Serializable
 import java.util.Calendar
-import kotlin.math.abs
 
 @OptIn(UnstableApi::class)
 class GeneratorPlayer : FullScreenPlayer() {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
index 724276ab7..cf9bc9975 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
@@ -32,6 +32,7 @@ import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchHelper
 import com.lagradost.cloudstream3.ui.search.SearchViewModel
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt
index 733933913..056588d0b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt
@@ -6,7 +6,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.ActorData
 import com.lagradost.cloudstream3.ActorRole
 import com.lagradost.cloudstream3.R
@@ -14,6 +13,7 @@ import com.lagradost.cloudstream3.databinding.CastItemBinding
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.NoStateAdapter
 import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
@@ -26,7 +26,7 @@ class ActorAdaptor(
 })) {
     companion object {
         val sharedPool =
-            RecyclerView.RecycledViewPool().apply { this.setMaxRecycledViews(CONTENT, 10) }
+            newSharedPool { setMaxRecycledViews(CONTENT, 10) }
     }
 
     // Easier to store it here than to store it in the ActorData
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
index 7ff3904d8..5e5504164 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt
@@ -1,6 +1,5 @@
 package com.lagradost.cloudstream3.ui.result
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -8,8 +7,6 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.setPadding
 import androidx.preference.PreferenceManager
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
 import coil3.dispose
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.CommonActivity
@@ -24,6 +21,7 @@ import com.lagradost.cloudstream3.ui.ViewHolderState
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK
 import com.lagradost.cloudstream3.ui.download.DownloadClickEvent
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
@@ -93,11 +91,10 @@ class EpisodeAdapter(
         }
 
         val sharedPool =
-            RecyclerView.RecycledViewPool()
-                .apply {
-                    this.setMaxRecycledViews(HAS_POSTER or CONTENT, 10)
-                    this.setMaxRecycledViews(HAS_NO_POSTER or CONTENT, 10)
-                }
+            newSharedPool {
+                setMaxRecycledViews(HAS_POSTER or CONTENT, 10)
+                setMaxRecycledViews(HAS_NO_POSTER or CONTENT, 10)
+            }
     }
 
     override fun onClearView(holder: ViewHolderState<Any>) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt
index 0513564fe..54657ed57 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt
@@ -2,11 +2,11 @@ package com.lagradost.cloudstream3.ui.result
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.databinding.ResultMiniImageBinding
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.NoStateAdapter
 import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
@@ -27,7 +27,7 @@ class ImageAdapter(
     ) {
     companion object {
         val sharedPool =
-            RecyclerView.RecycledViewPool().apply { this.setMaxRecycledViews(CONTENT, 10) }
+            newSharedPool { setMaxRecycledViews(CONTENT, 10) }
     }
 
     override fun onCreateContent(parent: ViewGroup): ViewHolderState<Any> {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
index 74285f552..c9da385f6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
@@ -30,7 +30,6 @@ import com.discord.panels.PanelState
 import com.discord.panels.PanelsChildGestureRegionObserver
 import com.google.android.gms.cast.framework.CastButtonFactory
 import com.google.android.gms.cast.framework.CastContext
-import com.google.android.gms.cast.framework.CastState
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
 import com.lagradost.cloudstream3.APIHolder
@@ -66,6 +65,7 @@ import com.lagradost.cloudstream3.ui.result.ResultFragment.getStoredData
 import com.lagradost.cloudstream3.ui.result.ResultFragment.updateUIEvent
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
 import com.lagradost.cloudstream3.utils.AppContextUtils.isCastApiAvailable
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadCache
@@ -88,9 +88,9 @@ import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
 import com.lagradost.cloudstream3.utils.UIHelper.populateChips
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
-import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
 import com.lagradost.cloudstream3.utils.UIHelper.setListViewHeightBasedOnItems
 import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
+import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
 import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
 import com.lagradost.cloudstream3.utils.getImageFromDrawable
 import com.lagradost.cloudstream3.utils.setText
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
index 19f85bf3e..70ca11743 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
@@ -42,6 +42,7 @@ import com.lagradost.cloudstream3.ui.result.ResultFragment.updateUIEvent
 import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_FOCUSED
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
@@ -61,7 +62,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.populateChips
 import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
-import com.lagradost.cloudstream3.utils.UiImage
 import com.lagradost.cloudstream3.utils.getImageFromDrawable
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.setTextHtml
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
index 9338d4942..7b63b6ede 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt
@@ -4,7 +4,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.recyclerview.widget.RecyclerView
 import com.lagradost.cloudstream3.SearchResponse
 import com.lagradost.cloudstream3.databinding.SearchResultGridBinding
 import com.lagradost.cloudstream3.databinding.SearchResultGridExpandedBinding
@@ -12,6 +11,7 @@ import com.lagradost.cloudstream3.ui.AutofitRecyclerView
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.NoStateAdapter
 import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.utils.UIHelper.isBottomLayout
 import kotlin.math.roundToInt
 
@@ -43,7 +43,7 @@ class SearchAdapter(
 })) {
     companion object {
         val sharedPool =
-            RecyclerView.RecycledViewPool().apply { this.setMaxRecycledViews(CONTENT, 10) }
+            newSharedPool { setMaxRecycledViews(CONTENT, 10) }
     }
 
     var hasNext: Boolean = false
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index 6bbd569b7..b79ba1707 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -56,6 +56,7 @@ import com.lagradost.cloudstream3.ui.home.HomeViewModel
 import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
index 9e61a0b40..f4c522bf9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
@@ -12,13 +12,13 @@ import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.SearchQuality
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.BasePreferenceFragmentCompat
+import com.lagradost.cloudstream3.ui.clear
 import com.lagradost.cloudstream3.ui.home.HomeChildItemAdapter
 import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
-import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.updateTv
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hideOn
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt
index 47b0b3da3..d0f9ff565 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt
@@ -8,7 +8,6 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getActivity
 import com.lagradost.cloudstream3.PROVIDER_STATUS_DOWN
@@ -16,15 +15,13 @@ import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.databinding.RepositoryItemBinding
 import com.lagradost.cloudstream3.plugins.PluginManager
-import com.lagradost.cloudstream3.plugins.VotingApi.getVotes
 import com.lagradost.cloudstream3.ui.BaseDiffCallback
 import com.lagradost.cloudstream3.ui.NoStateAdapter
 import com.lagradost.cloudstream3.ui.ViewHolderState
+import com.lagradost.cloudstream3.ui.newSharedPool
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.html
-import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getNameNextToFlagEmoji
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
@@ -204,7 +201,7 @@ class PluginAdapter(
     companion object {
         // A high count as we can render in the entire list as the same time
         val sharedPool =
-            RecyclerView.RecycledViewPool().apply { this.setMaxRecycledViews(CONTENT, 15) }
+            newSharedPool { setMaxRecycledViews(CONTENT, 15) }
 
         private tailrec fun findClosestBase2(target: Int, current: Int = 16, max: Int = 512): Int {
             if (current >= max) return max
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
index ee333abad..534ffa62a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
@@ -15,6 +15,7 @@ import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.bindChips
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
+import com.lagradost.cloudstream3.ui.setRecycledViewPool
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout

From 8d3846d2a3ead72efdef26982d5e0f76e14842f7 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 13 Mar 2026 22:59:59 +0100
Subject: [PATCH 005/177] feat(extractors): add support for vidara.to (#2556)

* feat(extractors): add support for vidara.to

* Allow soft subtitle failure in Streamup
---
 .../cloudstream3/extractors/Streamup.kt       | 28 ++++++++++++++++---
 .../cloudstream3/utils/ExtractorApi.kt        |  2 ++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamup.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamup.kt
index b043186ed..ea85a005e 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamup.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamup.kt
@@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.extractors
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.newSubtitleFile
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
@@ -13,10 +14,17 @@ class Streamix(): Streamup() {
     override val mainUrl = "https://streamix.so"
 }
 
+class Vidara(): Streamup() {
+    override val name: String = "Vidara"
+    override val mainUrl = "https://vidara.to"
+    override val apiPath: String = "/api/stream"
+}
+
 open class Streamup() : ExtractorApi() {
     override val name: String = "Streamup"
     override val mainUrl: String = "https://strmup.to"
     override val requiresReferer: Boolean = false
+    open val apiPath: String = "/ajax/stream"
 
     override suspend fun getUrl(
         url: String,
@@ -25,7 +33,7 @@ open class Streamup() : ExtractorApi() {
         callback: (ExtractorLink) -> Unit
     ) {
         val fileCode = url.substringAfterLast("/")
-        val fileInfo = app.get("$mainUrl/ajax/stream?filecode=$fileCode")
+        val fileInfo = app.get("$mainUrl$apiPath?filecode=$fileCode")
             .parsed<StreamUpFileInfo>()
 
         callback.invoke(
@@ -36,6 +44,12 @@ open class Streamup() : ExtractorApi() {
                 type = ExtractorLinkType.M3U8
             )
         )
+
+        fileInfo.subtitles?.forEach { subtitle ->
+            subtitleCallback.invoke(
+                newSubtitleFile(subtitle.language, subtitle.filePath)
+            )
+        }
     }
 
     private data class StreamUpFileInfo(
@@ -43,7 +57,13 @@ open class Streamup() : ExtractorApi() {
         val thumbnail: String,
         @JsonProperty("streaming_url")
         val streamingUrl: String,
-        // subtitles seems to always be empty
-        // val subtitles: List<Any>
+        val subtitles: List<StreamUpSubtitle>?
     )
-}
\ No newline at end of file
+
+    private data class StreamUpSubtitle(
+        @JsonProperty("file_path")
+        val filePath: String,
+        @JsonProperty("language")
+        val language: String,
+    )
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 3dc0cc7ff..0a3c33ff2 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -281,6 +281,7 @@ import com.lagradost.cloudstream3.extractors.Vidoza
 import com.lagradost.cloudstream3.extractors.VinovoSi
 import com.lagradost.cloudstream3.extractors.VinovoTo
 import com.lagradost.cloudstream3.extractors.VidNest
+import com.lagradost.cloudstream3.extractors.Vidara
 import com.lagradost.cloudstream3.extractors.Vide0Net
 import com.lagradost.cloudstream3.extractors.VkExtractor
 import com.lagradost.cloudstream3.extractors.Voe
@@ -1101,6 +1102,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     StreamoUpload(),
     Streamup(),
     Streamix(),
+    Vidara(),
 
     GamoVideo(),
     Gdriveplayerapi(),

From 904dda0c60fff774ea94c4cf69897cc62dc59be9 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 13 Mar 2026 23:03:27 +0100
Subject: [PATCH 006/177] feat(extractors): add new extractor for vidsonic.net
 (#2557)

---
 .../cloudstream3/extractors/Vidsonic.kt       | 61 +++++++++++++++++++
 .../cloudstream3/utils/ExtractorApi.kt        |  2 +
 2 files changed, 63 insertions(+)
 create mode 100644 library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidsonic.kt

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidsonic.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidsonic.kt
new file mode 100644
index 000000000..5c871b54b
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidsonic.kt
@@ -0,0 +1,61 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.newExtractorLink
+
+class Vidsonic() : ExtractorApi() {
+    override val name: String = "Vidsonic"
+    override val mainUrl: String = "https://vidsonic.net"
+    override val requiresReferer: Boolean = false
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        // Extracted JavaScript code that decodes the encrypted m3u8 stream URL:
+        //
+        // const _0x1 = '3363616238|3638666534|6264323565|3666616366|6636333662|6230626339|30613d3564|6d26743130|6b74693170|336563793d|64695f656c|6966263634|3332363033|3737313d73|6572697078|6526333d64|695f726576|7265733f38|75336d2e72|657473616d|2f7431306b|7469317033|6563792f38|392f657275|6365732f74|656e2e6369|6e6f736469|762e31302d|73752d7473|2f2f3a7370|747468';
+        // const _0x2 = function(_0x3) {
+        //    const _0x4 = _0x3.split('|').join('');
+        //    let _0x5 = '';
+        //     for (let _0x6 = 0; _0x6 < _0x4.length; _0x6 += 2) {
+        //       _0x5 += String.fromCharCode(parseInt(_0x4.substr(_0x6, 2), 16));
+        //     }
+        //     return _0x5.split('').reverse().join('');
+        // };
+        // const _0x7 = _0x2(_0x1); <-- now contains the stream URL
+
+        val response = app.get(url).text
+        val encodedStreamUrl = response
+            .substringAfter("const _0x1 = ")
+            .substringBefore(";")
+            .replace("'", "")
+
+        // (improved) Java implementation of the JavaScript code from above
+        val streamUrl = encodedStreamUrl
+            .replace("|", "")
+            // always two base16 digits together build one ASCII char
+            .chunked(2)
+            .map {
+                Integer.parseInt(it, 16).toChar()
+            }
+            .joinToString("")
+            .reversed()
+
+        callback.invoke(
+            newExtractorLink(
+                source = name,
+                name = name,
+                url = streamUrl,
+                type = ExtractorLinkType.M3U8
+            )
+        )
+    }
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 0a3c33ff2..a21087601 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -283,6 +283,7 @@ import com.lagradost.cloudstream3.extractors.VinovoTo
 import com.lagradost.cloudstream3.extractors.VidNest
 import com.lagradost.cloudstream3.extractors.Vidara
 import com.lagradost.cloudstream3.extractors.Vide0Net
+import com.lagradost.cloudstream3.extractors.Vidsonic
 import com.lagradost.cloudstream3.extractors.VkExtractor
 import com.lagradost.cloudstream3.extractors.Voe
 import com.lagradost.cloudstream3.extractors.Voe1
@@ -1213,6 +1214,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Wishonly(),
     Ds2play(),
     Ds2video(),
+    Vidsonic(),
     InternetArchive(),
     VidStack(),
     GDMirrorbot(),

From ef07f761d73711ad45d98c1dc1e668be9f75fb2b Mon Sep 17 00:00:00 2001
From: Nivin <89772187+NivinCNC@users.noreply.github.com>
Date: Sat, 14 Mar 2026 03:47:53 +0530
Subject: [PATCH 007/177] Prefer player default live position for HLS/DASH
 (#2547)

---
 .../com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index 7f6586912..a134ae911 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -1868,6 +1868,13 @@ class CS3IPlayer : IPlayer {
                 )
             }
 
+            // For DASH or HLS single streams (non-playlist), prefer the player's default
+            // live position instead of starting at 0. Use TIME_UNSET to let ExoPlayer pick
+            // the live/default position when no explicit start position was provided.
+            if (playbackPosition == 0L && (link.type == ExtractorLinkType.M3U8 || link.type == ExtractorLinkType.DASH)) {
+                playbackPosition = TIME_UNSET
+            }
+
             val provider = getApiFromNameNull(link.source)
             val interceptor: Interceptor? = provider?.getVideoInterceptor(link)
 

From 86cca03dd7d8c2669ce377b90b8c7da31397e859 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Fri, 13 Mar 2026 16:39:34 -0600
Subject: [PATCH 008/177] Use a new method to pass if debug to fix debug
 logging in library (#2330)

* Use a new method to pass if debug to fix debug logging in library
---
 app/build.gradle.kts                             | 16 +++++-----------
 .../com/lagradost/cloudstream3/CloudStreamApp.kt |  4 ++++
 library/build.gradle.kts                         | 13 ++++---------
 .../kotlin/com/lagradost/cloudstream3/MainAPI.kt |  9 +++++++++
 .../cloudstream3/mvvm/ArchComponentExt.kt        | 12 ++++++------
 .../com/lagradost/cloudstream3/utils/AppDebug.kt |  9 +++++++++
 6 files changed, 37 insertions(+), 26 deletions(-)
 create mode 100644 library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppDebug.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5f6f55575..722fcf58e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -226,16 +226,7 @@ dependencies {
     implementation(libs.work.runtime.ktx)
     implementation(libs.nicehttp) // HTTP Lib
 
-    implementation(project(":library") {
-        // There does not seem to be a good way of getting the android flavor.
-        val isDebug = gradle.startParameter.taskRequests.any { task ->
-            task.args.any { arg ->
-                arg.contains("debug", true)
-            }
-        }
-
-        this.extra.set("isDebug", isDebug)
-    })
+    implementation(project(":library"))
 }
 
 tasks.register<Jar>("androidSourcesJar") {
@@ -272,8 +263,11 @@ tasks.withType<KotlinJvmCompile> {
     compilerOptions {
         jvmTarget.set(javaTarget)
         jvmDefault.set(JvmDefaultMode.ENABLE)
-        optIn.add("com.lagradost.cloudstream3.Prerelease")
         freeCompilerArgs.add("-Xannotation-default-target=param-property")
+        optIn.addAll(
+            "com.lagradost.cloudstream3.InternalAPI",
+            "com.lagradost.cloudstream3.Prerelease",
+        )
     }
 }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt b/app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt
index b78327998..ffd5ea812 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt
@@ -13,6 +13,7 @@ import coil3.ImageLoader
 import coil3.PlatformContext
 import coil3.SingletonImageLoader
 import com.lagradost.api.setContext
+import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.mvvm.safeAsync
 import com.lagradost.cloudstream3.plugins.PluginManager
@@ -20,6 +21,7 @@ import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.openBrowser
+import com.lagradost.cloudstream3.utils.AppDebug
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.getKeys
@@ -81,6 +83,8 @@ class CloudStreamApp : Application(), SingletonImageLoader.Factory {
             exceptionHandler = it
             Thread.setDefaultUncaughtExceptionHandler(it)
         }
+
+        AppDebug.isDebug = BuildConfig.DEBUG
     }
 
     override fun attachBaseContext(base: Context?) {
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index e73ed970d..14ef644f0 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -46,7 +46,10 @@ kotlin {
 
     sourceSets {
         all {
-            languageSettings.optIn("com.lagradost.cloudstream3.Prerelease")
+            languageSettings {
+                optIn("com.lagradost.cloudstream3.InternalAPI")
+                optIn("com.lagradost.cloudstream3.Prerelease")
+            }
         }
 
         commonMain.dependencies {
@@ -73,14 +76,6 @@ buildkonfig {
     exposeObjectWithName = "BuildConfig"
 
     defaultConfigs {
-        val isDebug = kotlin.runCatching { extra.get("isDebug") }.getOrNull() == true
-        if (isDebug) {
-            logger.quiet("Compiling library with debug flag")
-        } else {
-            logger.quiet("Compiling library with release flag")
-        }
-        buildConfigField(FieldSpec.Type.BOOLEAN, "DEBUG", isDebug.toString())
-
         // Reads local.properties
         val localProperties = gradleLocalProperties(rootDir, project.providers)
         buildConfigField(
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index 91cd375db..2be9f61fd 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -46,6 +46,15 @@ import kotlin.math.roundToInt
 )
 annotation class Prerelease
 
+@Retention(AnnotationRetention.BINARY) // This is only an IDE hint, and will not be used in the runtime
+@RequiresOptIn(
+    message = "This API is marked as internal and should not be used by extensions. " +
+              "Using it could cause catastrophic build or runtime errors and may " +
+              "be changed or removed at any time.",
+    level = RequiresOptIn.Level.ERROR
+)
+annotation class InternalAPI
+
 /**
  * Defines the constant for the all languages preference, if this is set then it is
  * the equivalent of all languages being set
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
index 97aaf357d..e13bcf5ec 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt
@@ -1,8 +1,8 @@
 package com.lagradost.cloudstream3.mvvm
 
-import com.lagradost.api.BuildConfig
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.utils.AppDebug
 import kotlinx.coroutines.*
 import java.io.InterruptedIOException
 import java.net.SocketTimeoutException
@@ -18,31 +18,31 @@ const val DEBUG_PRINT = "DEBUG PRINT"
 class DebugException(message: String) : Exception("$DEBUG_EXCEPTION\n$message")
 
 inline fun debugException(message: () -> String) {
-    if (BuildConfig.DEBUG) {
+    if (AppDebug.isDebug) {
         throw DebugException(message.invoke())
     }
 }
 
 inline fun debugPrint(tag: String = DEBUG_PRINT, message: () -> String) {
-    if (BuildConfig.DEBUG) {
+    if (AppDebug.isDebug) {
         Log.d(tag, message.invoke())
     }
 }
 
 inline fun debugWarning(message: () -> String) {
-    if (BuildConfig.DEBUG) {
+    if (AppDebug.isDebug) {
         logError(DebugException(message.invoke()))
     }
 }
 
 inline fun debugAssert(assert: () -> Boolean, message: () -> String) {
-    if (BuildConfig.DEBUG && assert.invoke()) {
+    if (AppDebug.isDebug && assert.invoke()) {
         throw DebugException(message.invoke())
     }
 }
 
 inline fun debugWarning(assert: () -> Boolean, message: () -> String) {
-    if (BuildConfig.DEBUG && assert.invoke()) {
+    if (AppDebug.isDebug && assert.invoke()) {
         logError(DebugException(message.invoke()))
     }
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppDebug.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppDebug.kt
new file mode 100644
index 000000000..e07f32c0a
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppDebug.kt
@@ -0,0 +1,9 @@
+package com.lagradost.cloudstream3.utils
+
+import com.lagradost.cloudstream3.InternalAPI
+
+@InternalAPI
+object AppDebug {
+    @Volatile
+    var isDebug: Boolean = false
+}

From 19efb1ffc3f7516e3d80284335d0b8646e99a5d7 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Fri, 13 Mar 2026 17:21:12 -0600
Subject: [PATCH 009/177] Fix BuildConfig import (#2566)

---
 .../com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 2dfbb5598..bc10285e3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -54,7 +54,7 @@ import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.SimpleItemAnimator
 import com.google.android.material.button.MaterialButton
-import com.lagradost.api.BuildConfig
+import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.CommonActivity.keyEventListener
 import com.lagradost.cloudstream3.CommonActivity.playerEventListener
 import com.lagradost.cloudstream3.CommonActivity.screenHeightWithOrientation

From 51bd1c4a6c85bbc170e8ce7dead5542adae07108 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Fri, 20 Mar 2026 10:09:56 +0100
Subject: [PATCH 010/177] Translated using Weblate (Slovak)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 62.6% (454 of 725 strings)

Translated using Weblate (Esperanto)

Currently translated at 23.7% (172 of 725 strings)

Translated using Weblate (Chinese (Traditional Han script))

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Chinese (Traditional Han script))

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Bulgarian)

Currently translated at 99.1% (719 of 725 strings)

Translated using Weblate (Latvian)

Currently translated at 81.2% (589 of 725 strings)

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Translated using Weblate (Esperanto)

Currently translated at 17.5% (127 of 725 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Vietnamese)

Currently translated at 99.8% (724 of 725 strings)

Translated using Weblate (Hungarian)

Currently translated at 82.0% (595 of 725 strings)

Translated using Weblate (Korean)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Belarusian)

Currently translated at 99.5% (722 of 725 strings)

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Translated using Weblate (Belarusian)

Currently translated at 99.5% (722 of 725 strings)

Translated using Weblate (Filipino)

Currently translated at 21.2% (154 of 725 strings)

Translated using Weblate (Hungarian)

Currently translated at 77.3% (561 of 725 strings)

Translated using Weblate (Dutch)

Currently translated at 89.1% (646 of 725 strings)

Translated using Weblate (Tamil)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (German)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Tamil)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Hungarian)

Currently translated at 75.4% (547 of 725 strings)

Co-authored-by: Aron Folkerts <aronfolkerts@gmail.com>
Co-authored-by: Daniel Konstantinov <bgshadow2010@gmail.com>
Co-authored-by: David Hermann <theumis@users.noreply.hosted.weblate.org>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Jen Xie <aulaul825879@gmail.com>
Co-authored-by: Nguyễn Tiến Đạt <dn16092000@gmail.com>
Co-authored-by: Romhányi-Kakucska Viktor <viktor@romhanyi.dev>
Co-authored-by: Sasha Glazko <lenify@users.noreply.hosted.weblate.org>
Co-authored-by: Wacky Wars <wackywars21@gmail.com>
Co-authored-by: clearstripe <sakurasan000510@gmail.com>
Co-authored-by: jpkaster 77 <jpkaster81@gmail.com>
Co-authored-by: programutox <programutox@disroot.org>
Co-authored-by: tomas293 <tomaskopodstreleny@gmail.com>
Co-authored-by: தமிழ்நேரம் <tamilneram247@gmail.com>
Co-authored-by: ℂ𝕠𝕠𝕠𝕝 (𝕘𝕚𝕥𝕙𝕦𝕓.𝕔𝕠𝕞/ℂ𝕠𝕠𝕠𝕝) <coool@mail.lv>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/be/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bg/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/eo/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fil/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hu/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ko/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/lv/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pt/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ta/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/vi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hant/
Translation: Cloudstream/App
---
 app/src/main/res/values-b+bg/strings.xml    |  60 +++++++++-
 app/src/main/res/values-b+eo/strings.xml    |  57 ++++++++-
 app/src/main/res/values-b+lv/strings.xml    |  29 +++--
 app/src/main/res/values-b+pt/strings.xml    |  31 ++++-
 app/src/main/res/values-b+sk/strings.xml    |  44 +++++--
 app/src/main/res/values-b+zh+TW/strings.xml | 123 +++++++++++++++++---
 6 files changed, 303 insertions(+), 41 deletions(-)

diff --git a/app/src/main/res/values-b+bg/strings.xml b/app/src/main/res/values-b+bg/strings.xml
index 2c238b968..096e9f66b 100644
--- a/app/src/main/res/values-b+bg/strings.xml
+++ b/app/src/main/res/values-b+bg/strings.xml
@@ -252,7 +252,7 @@
     <string name="update">Актуализация</string>
     <string name="watch_quality_pref">Предпочитано качество за гледане (през WiFi)</string>
     <string name="limit_title">Максимален брой знаци за заглавие във видеоплейъра</string>
-    <string name="limit_title_rez">Разделителна способност на видео плейъра</string>
+    <string name="limit_title_rez">Покажи информация за плейъра</string>
     <string name="video_buffer_size_settings">Размер на видео буфера</string>
     <string name="video_buffer_length_settings">Дължина на видео буфера</string>
     <string name="video_buffer_disk_settings">Видео кеш на диск</string>
@@ -411,7 +411,7 @@
     <string name="view_public_repositories_button">Вижте хранилищата на общността</string>
     <string name="view_public_repositories_button_short">Публичен списък</string>
     <string name="uppercase_all_subtitles">Всички субтитри с главни букви</string>
-    <string name="download_all_plugins_from_repo">Предупреждение: CloudStream 3 не носи отговорност за използването на трети страни разширения и не предоставя поддръжка за тях!</string>
+    <string name="download_all_plugins_from_repo">Предупреждение: CloudStream не носи отговорност за използването на трети страни разширения и не предоставя поддръжка за тях!</string>
     <string name="single_plugin_disabled" formatted="true">%s (Деактивиран)</string>
     <string name="tracks">Потоци</string>
     <string name="audio_tracks">Аудио потоци</string>
@@ -456,7 +456,7 @@
     <string name="clear_history">Изчистване на историята</string>
     <string name="automatic_plugin_download_summary">Автоматично инсталиране на всички все още неинсталирани добавки от добавени хранилища.</string>
     <string name="apk_installer_settings">APK Инсталатор</string>
-    <string name="apk_installer_settings_des">Някои телефони не поддържат новия пакет за инсталиране. Опитайте предпоследената опция, ако актуализациите не се инсталират.</string>
+    <string name="apk_installer_settings_des">Някои устройства не поддържат новия пакет за инсталиране. Опитайте предпоследената опция, ако актуализациите не се инсталират.</string>
     <string name="play_trailer_button">Пусни трейлър</string>
     <string name="pref_category_links">Връзки</string>
     <string name="pref_category_app_updates">Актуализации на приложението</string>
@@ -639,7 +639,7 @@
     <string name="no_plugins_updated_manually">Няма актуализирани плъгини.</string>
     <string name="delete_message_series_only" formatted="true">Are you sure you wСигурни ли сте, че искате трайно да изтриете всички епизоди от тази поредица?\n\n%s</string>
     <string name="torrent_not_accepted">Рестартирайте приложението и приемете изскачащото съобщение за Stream Torrent, за да продължите.</string>
-    <string name="software_decoding_desc">Софтуерното декодиране позволява на плейъра да възпроизвежда видео файлове, които не се поддържат от телефона ви, но може да причини забавяне или нестабилно възпроизвеждане при висока резолюция</string>
+    <string name="software_decoding_desc">Софтуерното декодиране позволява на плейъра да възпроизвежда видео файлове, които не се поддържат от устройството ви, но може да причини забавяне или нестабилно възпроизвеждане при висока резолюция</string>
     <string name="player_notification_channel_name">Известия на плейъра</string>
     <string name="sort_episodes_number_desc">Епизод (низходящо)</string>
     <string name="starting_plugin_update_manually">Започва процесът на актуализация на плъгините!</string>
@@ -700,4 +700,56 @@
     <string name="player_settings_always_ask">Винаги изпращай запитване</string>
     <string name="speedup_summary">Задръжте, за да удвоите скоростта</string>
     <string name="speedup_title">Дълго задържане за смяна на скоростта</string>
+    <string name="download_queue">Опашка за изтегляне</string>
+    <string name="play_full_series_button">Пусни цялата поредица</string>
+    <string name="queue_empty_message">В момента няма изтегляния в опашката.</string>
+    <string name="extra_brightness_settings">Допълнителна яркост</string>
+    <string name="extra_brightness_settings_des">Активирай филтъра за яркост, когато яркостта на екрана надвиши 100%</string>
+    <string name="search_suggestions">Предложения за търсене</string>
+    <string name="search_suggestions_des">Показвай предложения за търсене по време на писане</string>
+    <string name="clear_suggestions">Изтрий предложения</string>
+    <string name="show_cast_in_details">Покажи панела за излъчване</string>
+    <string name="install_prerelease">Инсталирай предварителна версия</string>
+    <string name="prerelease_already_installed">Предварителна версия вече е изтеглена.</string>
+    <string name="prerelease_install_failed">Неуспешна инсталация на предварителната версия.</string>
+    <string name="show_rating">Етикет за рейтинг</string>
+    <string name="show_episode_text">Текст на епизода</string>
+    <string name="video_info">Информация за медията</string>
+    <string name="source_priority">Приоритет на източника</string>
+    <string name="source_priority_help">Определи как източниците на видеото да се сортират в плейъра</string>
+    <string name="no_account">Няма акаунт</string>
+    <string name="edit_profile_image_title">Редактирай профилната снимка</string>
+    <string name="edit_profile_image_hint">Въведи линк за профилна снимка</string>
+    <string name="edit_profile_image_error_empty">Няма намерен URL</string>
+    <string name="edit_profile_image_error_invalid">Невалиден URL или снимка</string>
+    <string name="edit_profile_image_success">Успешно актуализирана снимка</string>
+    <string name="action_mark_watched_up_to_this_episode">Маркирай като гледано до този епизод</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Премахни маркирането като гледано до този епизод</string>
+    <string name="action_reload">Презаредено</string>
+    <string name="reload_provider">Презареди доставчика</string>
+    <string name="name">Име</string>
+    <string name="source_name">Име на източника</string>
+    <string name="resolution_and_name">Резолюция и име</string>
+    <string name="download_all">Изтегли всички</string>
+    <string name="cancel_all">Откажи всички</string>
+    <string name="download_episode_range">Искаш ли да изтеглиш епизод %s?</string>
+    <string name="cancel_queue_message">Искаш ли да отмениш всички изтегляния в опашката?</string>
+    <string name="subs_subtitle_alignment">Подравняване на субтитрите</string>
+    <string name="bottom_left">Долу вляво</string>
+    <string name="bottom_center">Долу в центъра</string>
+    <string name="bottom_right">Долу вдясно</string>
+    <string name="middle_left">В средата вляво</string>
+    <string name="middle_center">В средата в центъра</string>
+    <string name="middle_right">В средата вдясно</string>
+    <string name="top_left">Горе вляво</string>
+    <string name="top_center">Горе в центъра</string>
+    <string name="top_right">Горе вдясно</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d активно изтегляне</item>
+        <item quantity="other">%d активни изтегляния</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d изтегляне в опашката</item>
+        <item quantity="other">%d изтегляния в опашката</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values-b+eo/strings.xml b/app/src/main/res/values-b+eo/strings.xml
index f957da076..6809ceb7d 100644
--- a/app/src/main/res/values-b+eo/strings.xml
+++ b/app/src/main/res/values-b+eo/strings.xml
@@ -49,7 +49,7 @@
     <string name="result_tags">Ĝenroj</string>
     <string name="all_languages_preference">Ĉiuj lingvoj</string>
     <string name="search">Serĉi</string>
-    <string name="category_account">Kontoj</string>
+    <string name="category_account">Kontoj kaj Sekureco</string>
     <string name="github">GitHub</string>
     <string name="season">Sezono</string>
     <string name="episode">Epizodo</string>
@@ -127,4 +127,59 @@
     <string name="downloaded">Elŝutite</string>
     <string name="downloading">Elŝutante</string>
     <string name="download_failed">Elŝuto Malsukcesite</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="next_season_episode_format" formatted="true">Sezono %1$d epizodo %2$d publikiĝos en</string>
+    <string name="play_from_beginning_img_des">Legi ekde la komenco</string>
+    <string name="download_queue">Elsûtovico</string>
+    <string name="speech_recognition_unavailable">La parolrekono ne haveblas</string>
+    <string name="begin_speaking">Komencu paroli…</string>
+    <string name="downloads_empty">Ne estas elŝuto ĉimomente.</string>
+    <string name="select_all">Selekti Ĉion</string>
+    <string name="deselect_all">Malselekti Ĉion</string>
+    <string name="open_local_video">Malfermi lokan videon</string>
+    <string name="popup_delete_file">Forigi Dosieron</string>
+    <string name="popup_resume_download">Daŭrigi Elŝuton</string>
+    <string name="popup_pause_download">Paŭzigi Elŝuton</string>
+    <string name="home_more_info">Pli da informoj</string>
+    <string name="home_expanded_hide">Kaŝi</string>
+    <string name="filter_bookmarks">Filtri Legosignojn</string>
+    <string name="error_bookmarks_text">Legosignoj</string>
+    <string name="repo_copy_label">Nomo kaj URL de la deponejo</string>
+    <string name="toast_copied">Kopiita!</string>
+    <string name="subscribe_tooltip">Sciigo de novo epizodo</string>
+    <string name="result_search_tooltip">Serĉi en aliaj kromprogramoj</string>
+    <string name="recommendations_tooltip">Montri la rekomendojn</string>
+    <string name="subtitles_settings">Subtekstaj Agordoj</string>
+    <string name="subs_outline_color">Kontura Koloro</string>
+    <string name="subs_background_color">Fona Koloro</string>
+    <string name="subs_edge_type">Randa Tipo</string>
+    <string name="search_provider_text_providers">Serĉi uzante provizantojn</string>
+    <string name="search_provider_text_types">Serĉi uzante tipojn</string>
+    <string name="subs_subtitle_languages">Subteksta Lingvo</string>
+    <string name="action_open_watching">Pli da informoj</string>
+    <string name="action_open_play">\@string/home_play</string>
+    <string name="torrent_plot">Priskribo</string>
+    <string name="torrent_no_plot">Neniu Priskribo Trovita</string>
+    <string name="player_size_settings_des">Forigi nigrajn borderaĵojn</string>
+    <string name="player_subtitles_settings">Subtekstoj</string>
+    <string name="search_suggestions">Serĉaj Sugestoj</string>
+    <string name="discord">Aligi Diskordon</string>
+    <string name="no_links_found_toast">Neniu Ligilo Trovita</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
+    <string name="no_season">Neniu Sezono</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
+    <string name="no_episodes_found">Neniu Epizodo Trovita</string>
+    <string name="delete">Forigi</string>
+    <string name="delete_file">Forigi Dosieron</string>
+    <string name="delete_files">Forigi Dosierojn</string>
+    <string name="delete_format" formatted="true">Forigi (%1$d | %2$s)</string>
+    <string name="cancel">Nuligi</string>
+    <string name="pause">Paŭzigi</string>
+    <string name="resume">Daŭrigi</string>
+    <string name="duration">Daŭro</string>
+    <string name="synopsis">Sinoptiko</string>
+    <string name="no_subtitles">Neniu Subteksto</string>
 </resources>
diff --git a/app/src/main/res/values-b+lv/strings.xml b/app/src/main/res/values-b+lv/strings.xml
index 18d3177f5..055732644 100644
--- a/app/src/main/res/values-b+lv/strings.xml
+++ b/app/src/main/res/values-b+lv/strings.xml
@@ -199,16 +199,16 @@
 \natlikušas</string>
     <string name="status_completed">Pabeigts</string>
     <string name="status">Statuss</string>
-    <string name="year">gads</string>
-    <string name="rating">Reitings</string>
+    <string name="year">Gads</string>
+    <string name="rating">Vērtējums</string>
     <string name="duration">Ilgums</string>
-    <string name="site">Saite</string>
-    <string name="synopsis">Synopsis</string>
-    <string name="queued">Gaida</string>
+    <string name="site">Vietne</string>
+    <string name="synopsis">Konspekts</string>
+    <string name="queued">ievietots rindā</string>
     <string name="used_storage">Lietotie</string>
     <string name="app_storage">Aplikācija</string>
     <string name="movies">Filmas</string>
-    <string name="tv_series">Seriāli</string>
+    <string name="tv_series">Seriāli, raidījumi</string>
     <string name="cartoons">Animācija</string>
     <string name="anime">Anime</string>
     <string name="torrent">Torrenti</string>
@@ -219,7 +219,7 @@
     <string name="nsfw">NSFW</string>
     <string name="others">Citi</string>
     <string name="movies_singular">Filmas</string>
-    <string name="tv_series_singular">Sērijas</string>
+    <string name="tv_series_singular">Seriāls, raidījums</string>
     <string name="cartoons_singular">Animācija</string>
     <string name="anime_singular">Anime</string>
     <string name="ova_singular">OVA</string>
@@ -464,7 +464,7 @@
     <string name="subscription_deleted">Anulēts %s abonements</string>
     <string name="subscription_episode_released">%d sērija izlaista!</string>
     <string name="apk_installer_settings">Apk insteletājs</string>
-    <string name="github">Github</string>
+    <string name="github">GitHub</string>
     <string name="no_subtitles">Nav subtitru</string>
     <string name="play_episode_toast">Atskaņot epizodi</string>
     <string name="status_ongoing">Iet</string>
@@ -596,4 +596,17 @@
     <string name="all_subtitles_italic">Padarīt visus subtitrus slīprakstā</string>
     <string name="speed_setting_summary">Pievieno atskaņošanas ātruma izvēli atskaņotājā</string>
     <string name="delete_format" formatted="true">Dzēst (%1$d | %2$s)</string>
+    <plurals name="downloads_active">
+        <item quantity="zero">%d aktīvas lejupielādes</item>
+        <item quantity="one">%d aktīva lejupielāde</item>
+        <item quantity="other">%d aktīvas lejupielādes</item>
+    </plurals>
+    <string name="download_queue">Lejupielādes rinda</string>
+    <string name="auto_rotate_video">Automātiski pagriezt</string>
+    <string name="biometric_authentication_title">Atbloķēt CloudStream</string>
+    <string name="password_pin_authentication_title">Paroles/PIN autentifikācija</string>
+    <string name="play_full_series_button">Atskaņot visas epizodes</string>
+    <string name="delete_message_series_episodes" formatted="true">Vai tiešām vēlaties neatgriezeniski dzēst šīs %1$s epizodes?\n\n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Jūs arī neatgriezeniski izdzēsīsiet visas šī seriāla, raidījuma epizodes:\n\n%s</string>
+    <string name="delete_message_series_only" formatted="true">Vai tiešām vēlaties neatgriezeniski dzēst visas šī seriāla, raidījuma epizodes?\n\n%s</string>
 </resources>
diff --git a/app/src/main/res/values-b+pt/strings.xml b/app/src/main/res/values-b+pt/strings.xml
index e7b3623e6..a1abfa338 100644
--- a/app/src/main/res/values-b+pt/strings.xml
+++ b/app/src/main/res/values-b+pt/strings.xml
@@ -242,7 +242,7 @@
     <string name="update">Atualizar</string>
     <string name="watch_quality_pref">Qualidade Preferida (WiFi)</string>
     <string name="limit_title">Máximo de caracteres do título no player de video</string>
-    <string name="limit_title_rez">Resolução do player de vídeo</string>
+    <string name="limit_title_rez">Mostrar informações do player de vídeo</string>
     <string name="video_buffer_size_settings">Tamanho do buffer do vídeo</string>
     <string name="video_buffer_length_settings">Comprimento do buffer do vídeo</string>
     <string name="video_buffer_disk_settings">Cache do vídeo em disco</string>
@@ -663,7 +663,7 @@
     <string name="torrent_preferred_media">Ativar torrent nas Configurações/Provedores/Mídia preferida</string>
     <string name="torrent_not_accepted">Reinicie a aplicação e aceite o pop-up do Stream Torrent para continuar.</string>
     <string name="software_decoding">Descodificação por software</string>
-    <string name="software_decoding_desc">Descodificação por software permite que o leitor reproduza ficheiros não suportados pelo seu dispositivo, mas pode resultar numa reprodução desfasada ou instável em altas resoluções</string>
+    <string name="software_decoding_desc">Descodificação por software permite que o leitor reproduza ficheiros não suportados pelo seu dispositivo, mas pode resultar numa reprodução desfasada ou instável em altas resoluções.</string>
     <string name="subtitles_from_embedded">Incorporada</string>
     <string name="subtitles_from_online">Online</string>
     <string name="sort_episodes_number_asc">Episódio (Ascendente)</string>
@@ -734,4 +734,31 @@
     <string name="prerelease_already_installed">Versão de pré-lançamento já instalada.</string>
     <string name="prerelease_install_failed">Falha ao instalar pré-lançamento.</string>
     <string name="show_episode_text">Texto do Episódio</string>
+    <string name="download_queue">Fila de downloads</string>
+    <string name="queue_empty_message">Não há downloads na fila no momento.</string>
+    <string name="extra_brightness_settings">Brilho extra</string>
+    <string name="extra_brightness_settings_des">Ativar filtro de brilho quando o brilho da tela exceder 100%</string>
+    <string name="extra_brightness_key">extra_brightness_enabled</string>
+    <string name="search_suggestions">Sugestões de pesquisa</string>
+    <string name="search_suggestions_des">Mostrar sugestões de pesquisa enquanto digita</string>
+    <string name="clear_suggestions">Limpar Sugestões</string>
+    <string name="show_cast_in_details">Mostrar Painel de Elenco</string>
+    <string name="video_info">Informações da mídia</string>
+    <string name="source_priority">Prioridade da fonte</string>
+    <string name="source_priority_help">Decida como as fontes de vídeo devem ser classificadas no player</string>
+    <string name="source_name">Nome da fonte</string>
+    <string name="download_all">Baixar tudo</string>
+    <string name="cancel_all">Cancelar tudo</string>
+    <string name="download_episode_range">Deseja baixar o episódio %s?</string>
+    <string name="cancel_queue_message">Deseja cancelar todos os downloads em fila?</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d download ativo</item>
+        <item quantity="many">%d downloads ativos</item>
+        <item quantity="other">%d downloads ativos</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d download na fila</item>
+        <item quantity="many">%d downloads na fila</item>
+        <item quantity="other">%d downloads na fila</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values-b+sk/strings.xml b/app/src/main/res/values-b+sk/strings.xml
index 93505971c..462a02ad5 100644
--- a/app/src/main/res/values-b+sk/strings.xml
+++ b/app/src/main/res/values-b+sk/strings.xml
@@ -118,7 +118,7 @@
     <string name="browser">Prehliadač</string>
     <string name="normal_no_plot">Zhrnutie sa nenašlo</string>
     <string name="double_tap_to_pause_settings">Dvojitým ťuknutím pozastaviť</string>
-    <string name="category_updates">Aktualizácie a zálohovanie</string>
+    <string name="category_updates">Aktualizácie a Zálohovanie</string>
     <string name="settings_info">Informácie</string>
     <string name="advanced_search">Rozšírené vyhľadávanie</string>
     <string name="kitsu_settings">Zobraziť plagáty z Kitsu</string>
@@ -126,7 +126,7 @@
     <string name="pref_filter_search_quality">Skryť vybranú kvalitu videa vo výsledkoch vyhľadávania</string>
     <string name="show_fillers_settings">Zobraziť výplňovú epizódu pre anime</string>
     <string name="apk_installer_settings">APK inštalátor</string>
-    <string name="apk_installer_settings_des">Niektoré telefóny nepodporujú nový inštalátor balíčkov. Ak sa aktualizácie nenainštalujú, skúste použiť staršiu možnosť.</string>
+    <string name="apk_installer_settings_des">Niektoré zariadenia nepodporujú nový inštalátor balíčkov. Ak sa aktualizácie nenainštalujú, skúste použiť staršiu možnosť.</string>
     <string name="lightnovel">Nenáročná aplikácia pre romány od rovnakých vývojárov</string>
     <string name="app_language">Jazyk aplikácie</string>
     <string name="no_links_found_toast">Nenašli sa žiadne odkazy</string>
@@ -157,7 +157,7 @@
     <string name="player_subtitles_settings_des">Nastavenia titulkov prehrávača</string>
     <string name="autoplay_next_settings_des">Spustiť ďalšiu epizódu po skončení aktuálnej</string>
     <string name="chromecast_subtitles_settings">Chromecast titulky</string>
-    <string name="eigengraumode_settings">Eigengravy režim</string>
+    <string name="eigengraumode_settings">Rýchlosť prehrávania (Eigengravy režim)</string>
     <string name="swipe_to_seek_settings">Potiahnutím pretočiť</string>
     <string name="autoplay_next_settings">Automaticky prehrať ďalšiu epizódu</string>
     <string name="episode_sync_settings">Aktualizovať priebeh sledovania</string>
@@ -168,7 +168,7 @@
     <string name="library">Knižnica</string>
     <string name="github">GitHub</string>
     <string name="search">Hľadať</string>
-    <string name="category_account">Účty</string>
+    <string name="category_account">Účty a Zabezpečenie</string>
     <string name="chromecast_subtitles_settings_des">Nastavenia Chromecast titulkov</string>
     <string name="swipe_to_seek_settings_des">Potiahnutím zo strany na stranu môžete ovládať svoju pozíciu vo videu</string>
     <string name="restore_failed_format" formatted="true">Nepodarilo sa obnoviť dáta zo súboru %s</string>
@@ -203,7 +203,7 @@
     <string name="app_layout">Rozloženie aplikácie</string>
     <string name="example_email">ahoj@svet.sk</string>
     <string name="test_passed">Úspešné</string>
-    <string name="example_username">MojeSuperMeno</string>
+    <string name="example_username">Meno</string>
     <string name="tv_series">Seriály</string>
     <string name="tv_series_singular">Seriál</string>
     <string name="episode_short">E</string>
@@ -227,7 +227,7 @@
     <string name="episode_action_play_in_app">Prehrať v aplikácii</string>
     <string name="episodes_range">%1$d-%2$d</string>
     <string name="video_ram_description">Spôsobuje zlyhania, ak je nastavená príliš vysoko na zariadeniach s nízkou pamäťou, ako je Android TV.</string>
-    <string name="jsdelivr_proxy">raw.githubusercontent.com Proxy</string>
+    <string name="jsdelivr_proxy">GitHub Proxy</string>
     <string name="duration">Trvanie</string>
     <string name="app_storage">Aplikácia</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
@@ -242,7 +242,7 @@
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="resize_zoom">Priblížiť</string>
     <string name="torrent">Torrenty</string>
-    <string name="limit_title_rez">Rozlíšenie prehrávača</string>
+    <string name="limit_title_rez">Informácie o prehrávači</string>
     <string name="bottom_title_settings_des">Umiestniť názov pod plagát</string>
     <string name="watch_quality_pref">Preferovaná kvalita sledovania (WiFi)</string>
     <string name="pref_category_extensions">Rozšírenia</string>
@@ -260,11 +260,11 @@
     <string name="no_season">Žiadna sezóna</string>
     <string name="episode">Epizóda</string>
     <string name="episode_action_reload_links">Znova načítať odkazy</string>
-    <string name="provider_lang_settings">Jazyky poskytovateľa</string>
+    <string name="provider_lang_settings">Jazyky rozšírenia</string>
     <string name="start">Spustiť</string>
     <string name="livestreams">Živé prenosy</string>
     <string name="episode_action_download_subtitle">Stiahnuť titulky</string>
-    <string name="enable_nsfw_on_providers">Povoliť NSFW u podporovaných poskytovateľov</string>
+    <string name="enable_nsfw_on_providers">Povoliť NSFW u podporovaných rozšírení</string>
     <string name="pref_category_bypass">Obchádzanie ISP</string>
     <string name="poster_ui_settings">Prepnúť UI prvky na plagáte</string>
     <string name="pref_category_player_layout">Rozloženie</string>
@@ -290,7 +290,7 @@
     <string name="pref_category_looks">Vzhľad</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="jsdelivr_proxy_summary">Obchádza blokovanie GitHubu pomocou jsDelivr. Môže spôsobiť oneskorenie aktualizácií o niekoľko dní.</string>
-    <string name="random_button_settings_desc">Zobraziť náhodné tlačidlo na domovskej stránke</string>
+    <string name="random_button_settings_desc">Zobraziť náhodné tlačidlo na domovskej stránke a Knižnici</string>
     <string name="logout">Odhlásiť sa</string>
     <string name="update">Aktualizovať</string>
     <string name="site">Stránka</string>
@@ -305,7 +305,7 @@
     <string name="add_site_pref">Klonovať stránku</string>
     <string name="ova">OVA</string>
     <string name="movies">Filmy</string>
-    <string name="example_site_url">príklad.sk</string>
+    <string name="example_site_url">https://example.com</string>
     <string name="pref_category_cache">Vyrovnávacia pamäť</string>
     <string name="jsdelivr_enabled">Nepodarilo sa pripojiť na GitHub. Zapína sa proxy jsDelivr…</string>
     <string name="no_episodes_found">Nenašli sa žiadne epizódy</string>
@@ -328,7 +328,7 @@
     <string name="category_providers">Poskytovatelia</string>
     <string name="tv_layout">TV rozloženie</string>
     <string name="example_lang_name">Kód jazyka (sk)</string>
-    <string name="example_site_name">MôjSuperWeb</string>
+    <string name="example_site_name">NovyNazovWebu</string>
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="legal_notice">Vylúčenie zodpovednosti</string>
     <string name="nsfw">NSFW</string>
@@ -457,4 +457,24 @@
     <string name="podcast_singluar">Podcast</string>
     <string name="all">Všetko</string>
     <string name="encoding_error">Chyba kódovania</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
+    <string name="download_queue">Poradie sťahovania</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="speech_recognition_unavailable">Rozpoznanie reči nie je k dispozícii</string>
+    <string name="begin_speaking">Začnite hovoriť…</string>
+    <string name="queue_empty_message">Momentálne nie sú žiadne sťahovania v poradí.</string>
+    <string name="result_search_tooltip">Vyhľadávanie v iných rozšíreniach</string>
+    <string name="extra_brightness_settings">Extra Jas</string>
+    <string name="extra_brightness_settings_des">Spustiť filter jasu, keď je prekročený 100% jas displeja</string>
+    <string name="extra_brightness_key">extra_jas_zapnuty</string>
+    <string name="search_suggestions">Návrhy vyhľadávania</string>
+    <string name="search_suggestions_des">Zobraziť návrhy vyhľadávania pri písaní</string>
+    <string name="clear_suggestions">Vyčistiť Návrhy</string>
+    <string name="install_prerelease">Nainštalujte pre-release verziu</string>
+    <string name="prerelease_already_installed">Pre-release je už nainštalovaný.</string>
+    <string name="prerelease_install_failed">Nepodarilo sa nainštalovať pre-release.</string>
+    <string name="unsupported_error">Nepodporovaná chyba</string>
+    <string name="show_episode_text">Text Epizódy</string>
+    <string name="auth_locally">Lokálna verifikácia</string>
 </resources>
diff --git a/app/src/main/res/values-b+zh+TW/strings.xml b/app/src/main/res/values-b+zh+TW/strings.xml
index 7dc4b48f2..c8f9df9a2 100644
--- a/app/src/main/res/values-b+zh+TW/strings.xml
+++ b/app/src/main/res/values-b+zh+TW/strings.xml
@@ -155,7 +155,7 @@
     <string name="show_trailers_settings">顯示預告片</string>
     <string name="kitsu_settings">顯示來自 Kitsu 的封面</string>
     <string name="pref_filter_search_quality">在搜尋結果中隱藏所選的影片畫質</string>
-    <string name="automatic_plugin_updates">自動更新外掛程式</string>
+    <string name="automatic_plugin_updates">自動更新外掛</string>
     <string name="updates_settings">顯示應用程式更新</string>
     <string name="updates_settings_des">啟動應用程式後自動搜尋更新。</string>
     <string name="github">Github</string>
@@ -258,7 +258,7 @@
     <string name="update">更新</string>
     <string name="watch_quality_pref">偏好播放畫質 (WiFi)</string>
     <string name="limit_title">影片播放器標題最大字數</string>
-    <string name="limit_title_rez">影片播放器標題</string>
+    <string name="limit_title_rez">顯示播放器資訊</string>
     <string name="video_buffer_size_settings">影片緩衝大小</string>
     <string name="video_buffer_length_settings">影片緩衝長度</string>
     <string name="video_buffer_disk_settings">磁碟上的影片快取</string>
@@ -397,16 +397,16 @@
     <string name="repository_name_hint">資源庫名稱（選填）</string>
     <string name="repository_url_hint">資源庫 URL 或簡碼</string>
     <string name="plugin_loaded">外掛程式已載入</string>
-    <string name="plugin_deleted">外掛程式已刪除</string>
+    <string name="plugin_deleted">外掛已刪除</string>
     <string name="plugin_load_fail" formatted="true">無法載入 %s</string>
     <string name="is_adult">18+</string>
     <string name="batch_download_start_format" formatted="true">開始下載 %1$d %2$s …</string>
     <string name="batch_download_finish_format" formatted="true">已下載 %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">全部 %s 已經下載</string>
     <string name="batch_download">批次下載</string>
-    <string name="plugin_singular">外掛程式</string>
-    <string name="plugin">外掛程式</string>
-    <string name="delete_repository_plugins">這也將刪除所有在資源庫中的外掛程式</string>
+    <string name="plugin_singular">外掛</string>
+    <string name="plugin">外掛</string>
+    <string name="delete_repository_plugins">這也將刪除所有在資源庫中的外掛</string>
     <string name="delete_repository">刪除資源庫</string>
     <string name="setup_extensions_subtext">下載你所需的片源</string>
     <string name="plugins_downloaded" formatted="true">已下載：%d</string>
@@ -419,14 +419,14 @@
     <string name="view_public_repositories_button">查看</string>
     <string name="view_public_repositories_button_short">公開清單</string>
     <string name="uppercase_all_subtitles">字幕全大寫</string>
-    <string name="download_all_plugins_from_repo">警告：CloudStream 3 不對使用第三方擴充功能承擔任何責任，也不提供任何支援！</string>
+    <string name="download_all_plugins_from_repo">警告：CloudStream 不對使用第三方擴充功能承擔任何責任，也不提供任何支援！</string>
     <string name="single_plugin_disabled" formatted="true">%s （停用）</string>
     <string name="tracks">軌道</string>
     <string name="audio_tracks">音頻軌道</string>
     <string name="video_tracks">影片軌道</string>
     <string name="apply_on_restart">重新啟動應用程式以查看變更。</string>
     <string name="safe_mode_title">安全模式已啟用</string>
-    <string name="safe_mode_description">由於程式崩潰，所有外掛程式皆已關閉，以協助您找到導致問題的程式。</string>
+    <string name="safe_mode_description">由於程式當掉，為了協助您找到導致問題的程式，所有外掛皆已關閉。</string>
     <string name="safe_mode_crash_info">查看程式崩潰資訊</string>
     <string name="extension_rating" formatted="true">評分：%s</string>
     <string name="extension_description">簡介</string>
@@ -436,7 +436,7 @@
     <string name="extension_authors">作者</string>
     <string name="extension_types">類型</string>
     <string name="extension_language">語言</string>
-    <string name="extension_install_first">請先安裝外掛程式</string>
+    <string name="extension_install_first">請先安裝外掛</string>
     <string name="hls_playlist">HLS 播放清單</string>
     <string name="player_pref">偏好影片播放器</string>
     <string name="player_settings_play_in_app">內部播放器</string>
@@ -452,13 +452,13 @@
     <string name="skip_type_intro">介紹</string>
     <string name="clear_history">清除歷史紀錄</string>
     <string name="history">歷史紀錄</string>
-    <string name="automatic_plugin_download">自動下載外掛程式</string>
+    <string name="automatic_plugin_download">自動下載外掛</string>
     <string name="confirm_exit_dialog">你確定要離開？</string>
     <string name="automatic_plugin_download_summary">從新增的資源庫自動安裝所有尚未安裝的外掛程式。</string>
     <string name="enable_skip_op_from_database_des">在開始/結束顯示跳過彈出視窗</string>
     <string name="update_notification_failed">無法安裝新版本的應用程式</string>
     <string name="apk_installer_settings">APK 安裝器</string>
-    <string name="apk_installer_settings_des">有些手機不支援新的軟體包安裝程式。 如果未安裝更新，請嘗試使用舊版選項。</string>
+    <string name="apk_installer_settings_des">部分裝置不支援新的軟體安裝程式。 如果未安裝更新，請嘗試使用舊版選項。</string>
     <string name="clipboard_too_large">文字太多。 無法儲存到剪貼簿。</string>
     <string name="yes">是</string>
     <string name="update_notification_downloading">正在下載應用程式更新…</string>
@@ -619,7 +619,7 @@
     <string name="app_info_intent_error">無法開啟 CloudStream 的應用程式資訊頁面。</string>
     <string name="biometric_warning">您的 CloudStream 資料已完成備份。儘管可能性非常低，但因不同裝置的行為都有所不同，在極少數情況下，您可能會無法存取本應用程式。此時請完全清除本應用程式的資料，再使用已有的備份進行還原。若因此造成任何不便，我們深感抱歉。</string>
     <string name="test_extensions_summary">此測試是供開發人員參考，而不是用以驗證任何擴充功能的正常運作與否。</string>
-    <string name="battery_dialog_message">為了確保下載與通知已訂閱的電視節目的不間斷，CloudStream 需要取得在背景執行的權限。若點選「確定」，將移至「應用程式資訊」，請找到「應用程式電池使用」並將電池用量設置為「無限制」。請注意，取得此權限並不表示 CS3 會明顯增加電池用量，而是只在必要時在背景執行，例如取得通知或使用官方擴充功能下載影片時。若選擇「取消」，您可以稍後在「一般設定」中調整此設定。</string>
+    <string name="battery_dialog_message">為了確保已訂閱的電視節目的不間斷下載與通知，CloudStream 需要取得在背景執行的權限。若點選「確定」，將顯示「請求權限」，請選擇「允許」。\n\n請注意，取得此權限並不表示本程式會明顯增加電池用量，而是只在必要時在背景執行，例如取得通知或使用擴充功能下載影片。</string>
     <string name="cs3wiki">CloudStream Wiki</string>
     <string name="biometric_unsupported">此裝置不支援生物特徵認證</string>
     <string name="device_pin_error_message">無法取得裝置 PIN 碼，請嘗試本機驗證</string>
@@ -663,9 +663,104 @@
     <string name="subs_edge_size">subs_edge_size</string>
     <string name="audio_singluar">音樂</string>
     <string name="encoding_error">編碼錯誤</string>
-    <string name="unsupported_error">因為不支持造成的錯誤</string>
+    <string name="unsupported_error">因為不支援造成錯誤</string>
     <string name="podcast_singluar">播客</string>
     <string name="software_decoding">軟體解碼</string>
-    <string name="torrent_not_accepted">不接受的種子</string>
+    <string name="torrent_not_accepted">重開程式並「同意」線上播放 Torrent 視窗。</string>
     <string name="player_load_one_subtitle_online">載入第一個可用的</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d小時 %2$d分鐘 %3$d秒</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$d分鐘 %2$d秒</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$d秒</string>
+    <string name="download_queue">下載佇列</string>
+    <string name="speech_recognition_unavailable">不支援語音辨識</string>
+    <string name="begin_speaking">開始說話……</string>
+    <string name="play_full_series_button">播放全劇</string>
+    <string name="queue_empty_message">目前佇列中無下載影片。</string>
+    <string name="extra_brightness_settings">額外亮度</string>
+    <string name="extra_brightness_settings_des">超過100%亮度時開啟亮度調整</string>
+    <string name="extra_brightness_key">已開啟額外亮度</string>
+    <string name="search_suggestions">搜尋建議</string>
+    <string name="search_suggestions_des">輸入時顯示搜尋建議</string>
+    <string name="clear_suggestions">清除建議</string>
+    <string name="show_cast_in_details">顯示投影控制板</string>
+    <string name="install_prerelease">安裝提前發行版</string>
+    <string name="prerelease_already_installed">已安裝提前發行版。</string>
+    <string name="prerelease_install_failed">提前發行版安裝失敗。</string>
+    <string name="episode_action_play_mirror">鏡像播放</string>"
+    <string name="show_rating">評分標籤</string>
+    <string name="show_episode_text">影劇文本</string>
+    <string name="video_info">媒體資訊</string>
+    <string name="player_settings_always_ask">總是詢問</string>
+    <string name="plugins_updated_manually">成功更新了 %d 外掛！</string>
+    <string name="no_plugins_updated_manually">沒有需要更新的外掛。</string>
+    <string name="player_notification_channel_name">播放器通知</string>
+    <string name="player_notification_channel_description">控制背景播放的通知</string>
+    <string name="subtitles_from_embedded">內嵌</string>
+    <string name="subtitles_from_online">線上</string>
+    <string name="all_subtitles_bold">所有字幕變為粗體</string>
+    <string name="all_subtitles_italic">所有字幕變為斜體</string>
+    <string name="background_radius">背景寬度</string>
+    <string name="download_parallel_settings_des">允許同時下載幾個項目</string>
+    <string name="parallel_downloads">同時下載</string>
+    <string name="concurrent_connections">同時連接量</string>
+    <string name="concurrent_connections_settings_des">下載時，每個下載可同時使用的連接量</string>
+    <string name="go_to_downloads">前往下載</string>
+    <string name="no_internet_connection">無網際網路。\n\n請連接網路後重試，或者以離線模式觀看已下載項目。</string>
+    <string name="overscan_settings_des">更改螢幕邊界</string>
+    <string name="overscan_settings">放大符合螢幕</string>
+    <string name="poster_size_settings_des">更改圖片尺寸</string>
+    <string name="poster_size_settings">圖片尺寸</string>
+    <string name="speedup_title">長按以切換速度</string>
+    <string name="speedup_summary">2 倍速（按住）</string>
+    <string name="edit_profile_image_title">編輯帳戶圖片</string>
+    <string name="edit_profile_image_hint">輸入需使用的網址 URL 以更改帳戶圖片</string>
+    <string name="edit_profile_image_error_empty">未找到該網址</string>
+    <string name="edit_profile_image_error_invalid">無效網址或圖片</string>
+    <string name="edit_profile_image_success">已成功更新圖片</string>
+    <string name="action_mark_watched_up_to_this_episode">將這集及之前集數標示為「已觀看」</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">移除至此前所有集數「已觀看」狀態</string>
+    <string name="action_reload">已重新載入</string>
+    <string name="reload_provider">重新載入來源</string>
+    <string name="name">名稱</string>
+    <string name="source_name">來源名</string>
+    <string name="resolution_and_name">解析度與名稱</string>
+    <string name="download_all">全部下載</string>
+    <string name="cancel_all">全部取消</string>
+    <string name="download_episode_range">需要下載第 %s 集嗎？</string>
+    <string name="cancel_queue_message">需取消佇列中的所有下載嗎？</string>
+    <string name="subs_subtitle_alignment">字幕對齊</string>
+    <string name="bottom_left">左下</string>
+    <string name="bottom_center">底部置中</string>
+    <string name="bottom_right">右下</string>
+    <string name="middle_left">左中</string>
+    <string name="middle_center">正中</string>
+    <string name="middle_right">右中</string>
+    <string name="top_left">左上</string>
+    <string name="top_center">頂部置中</string>
+    <string name="top_right">右上</string>
+    <plurals name="downloads_active">
+        <item quantity="other">%d 個正在下載</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="other">佇列中有 %d 個下載</item>
+    </plurals>
+    <string name="sort_episodes_number_asc">集數（由舊至新）</string>
+    <string name="sort_episodes_number_desc">集數（由新至舊）</string>
+    <string name="sort_episodes_rating_high_low">評分（最高）</string>
+    <string name="sort_episodes_rating_low_high">評分（最低）</string>
+    <string name="sort_episodes_date_newest">播放日期（最新）</string>
+    <string name="sort_episodes_date_oldest">播放日期（最舊）</string>
+    <string name="sort_button_episode">第 %s 集</string>
+    <string name="sort_button_rating">評分 %s</string>
+    <string name="sort_button_date">日期 %s</string>
+    <string name="slide_up_again_to_exceed_100">讓音量超過 100%（再次上滑）</string>
+    <string name="update_plugins">更新外掛</string>
+    <string name="update_plugins_manually">手動更新外掛</string>
+    <string name="starting_plugin_update_manually">正在更新外掛！</string>
+    <string name="source_priority">來源優先順序</string>
+    <string name="source_priority_help">決定影片來源的排列順序</string>
+    <string name="no_account">帳戶不存在</string>
+    <string name="torrent_preferred_media">在「設定/影片來源/首選媒體」中啟用 Torrent下載</string>
+    <string name="software_decoding_desc">軟體解碼使程式可以播放裝置不支援的影片，但可能導致播放高解析的影片時的延遲或不穩定。</string>
+    <string name="volume_exceeded_100">音量已超過 100%</string>
 </resources>

From ee1e90e0f476823d5c4a15059ed172d3c4839d7f Mon Sep 17 00:00:00 2001
From: Osten <11805592+LagradOst@users.noreply.github.com>
Date: Sun, 22 Mar 2026 08:34:43 +0100
Subject: [PATCH 011/177] Emergency fix for OOM and leaks

---
 .../lagradost/cloudstream3/CommonActivity.kt  | 12 ++++++++++++
 .../cloudstream3/extractors/Videa.kt          | 18 ++++++++++++++----
 .../cloudstream3/utils/UnshortenUrl.kt        | 19 ++++++++++++-------
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index c806cac63..dddcd4892 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -9,6 +9,8 @@ import android.content.res.Configuration
 import android.content.res.Resources
 import android.Manifest
 import android.os.Build
+import android.os.Handler
+import android.os.Looper
 import android.util.DisplayMetrics
 import android.util.Log
 import android.view.Gravity
@@ -191,6 +193,16 @@ object CommonActivity {
             currentToast = toast
             toast.show()
 
+            val handler = Handler(Looper.getMainLooper())
+            val ref = WeakReference(toast)
+
+            /* Clean up activity leak */
+            handler.postDelayed({
+                if (ref.get() == currentToast) {
+                    currentToast = null
+                }
+            }, 10_000)
+
         } catch (e: Exception) {
             logError(e)
         }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Videa.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Videa.kt
index 121e221ad..bbcce2755 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Videa.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Videa.kt
@@ -25,12 +25,17 @@ class Videa : ExtractorApi() {
     ) {
         var currentUrl = url
         var key = ""
-        var lastUrl: String? = null
         // Handle redirect loop until we get valid XML
-        while (true) {
+        val visitedUrls = mutableSetOf<String>()
+        var count = 10
+        while (!visitedUrls.contains(currentUrl) && count > 0) {
+            visitedUrls += currentUrl
+            count -= 1
+
             val webUrl = getXmlUrl(currentUrl) { cookie -> /* no-op, cookie not used */ } ?: return
             val response = app.get(webUrl)
-            val rawBytes = response.body.bytes()
+            val body = response.body // TODO CLOSE?
+            val rawBytes = body.bytes()
 
             // Check if response starts with XML declaration
             val isXml = rawBytes.size >= 5 &&
@@ -53,7 +58,6 @@ class Videa : ExtractorApi() {
             val redirectMatch = """<error.*?"noembed".*>(.*)</error>""".toRegex().find(videaXml)
 
             if (redirectMatch != null && redirectMatch.groupValues[1] != currentUrl) {
-                lastUrl = currentUrl
                 currentUrl = redirectMatch.groupValues[1]
             } else {
                 parseVideoSources(videaXml, callback)
@@ -64,6 +68,12 @@ class Videa : ExtractorApi() {
 
     private suspend fun getXmlUrl(url: String, cookieCallback: (String) -> Unit = {}): String? {
         val response = app.get(url)
+        val size = response.size
+        /* OOM Protection */
+        if(size != null && size > 5_000_000) {
+            // You tried to use a video here
+            return null
+        }
         val html = response.text
 
         // Extract sl cookie if present
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt
index 1a9867f50..206b0f29f 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt
@@ -51,16 +51,18 @@ object ShortLink {
     suspend fun unshorten(uri: String, type: String? = null): String {
         var currentUrl = uri
 
-        while (true) {
-            val oldurl = currentUrl
+        val visitedUrls = mutableSetOf<String>()
+        var count = 10
+        while (!visitedUrls.contains(currentUrl) && count > 0) {
+            visitedUrls += currentUrl
+            count -= 1
+
             val domain =
-                URI(currentUrl.trim()).host ?: throw IllegalArgumentException("No domain found in URI!")
+                URI(currentUrl.trim()).host
+                    ?: throw IllegalArgumentException("No domain found in URI!")
             currentUrl = shortList.firstOrNull {
                 it.regex.find(domain) != null || type == it.type
             }?.function?.let { it(currentUrl) } ?: break
-            if (oldurl == currentUrl) {
-                break
-            }
         }
         return currentUrl.trim()
     }
@@ -112,8 +114,10 @@ object ShortLink {
             uri.contains("delta") -> uri = uri.replace("/delta/", "/adelta/")
             (uri.contains("/ga/") || uri.contains("/ga2/")) -> uri =
                 base64Decode(uri.split('/').last()).trim()
+
             uri.contains("/speedx/") -> uri =
                 uri.replace("http://linkup.pro/speedx", "http://speedvideo.net")
+
             else -> {
                 r = app.get(uri, allowRedirects = true)
                 uri = r.url
@@ -187,8 +191,9 @@ object ShortLink {
     fun unshortenDavisonbarker(uri: String): String {
         return URLDecoder.decode(uri.substringAfter("dest="), "UTF-8")
     }
+
     suspend fun unshortenIsecure(uri: String): String {
         val doc = app.get(uri).document
-        return doc.selectFirst("iframe")?.attr("src")?.trim()?: uri
+        return doc.selectFirst("iframe")?.attr("src")?.trim() ?: uri
     }
 }
\ No newline at end of file

From a74a0840d60925fbc7bb2b72d7f0ca8d1ea726c8 Mon Sep 17 00:00:00 2001
From: Osten <11805592+LagradOst@users.noreply.github.com>
Date: Sun, 22 Mar 2026 13:04:22 +0100
Subject: [PATCH 012/177] Fixed BackPressedCallbackHelper activity leak

---
 .../lagradost/cloudstream3/utils/BackPressedCallbackHelper.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BackPressedCallbackHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BackPressedCallbackHelper.kt
index d68b254b0..10736e13e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackPressedCallbackHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackPressedCallbackHelper.kt
@@ -56,7 +56,7 @@ object BackPressedCallbackHelper {
     fun ComponentActivity.detachBackPressedCallback(id: String) {
         val callbackMap = backPressedCallbacks[this] ?: return
         callbackMap[id]?.let { callback ->
-            callback.isEnabled = false
+            callback.remove()
             callbackMap.remove(id)
         }
 

From 45699b72a8c8d0a0a74867ff75ef5be78c2221df Mon Sep 17 00:00:00 2001
From: Osten <11805592+LagradOst@users.noreply.github.com>
Date: Sun, 22 Mar 2026 13:41:12 +0100
Subject: [PATCH 013/177] Added .close to m3u8 hslLazy

---
 .../kotlin/com/lagradost/cloudstream3/extractors/Videa.kt | 3 ++-
 .../kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Videa.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Videa.kt
index bbcce2755..47840a08a 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Videa.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Videa.kt
@@ -34,8 +34,9 @@ class Videa : ExtractorApi() {
 
             val webUrl = getXmlUrl(currentUrl) { cookie -> /* no-op, cookie not used */ } ?: return
             val response = app.get(webUrl)
-            val body = response.body // TODO CLOSE?
+            val body = response.body
             val rawBytes = body.bytes()
+            body.close()
 
             // Check if response starts with XML declaration
             val isXml = rawBytes.size >= 5 &&
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
index a852bdc03..23226418b 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
@@ -233,7 +233,9 @@ object M3u8Helper2 {
             val ts = allTsLinks[index]
 
             val tsResponse = app.get(ts.url, headers = headers, verify = false)
-            val tsData = tsResponse.body.bytes()
+            val body = tsResponse.body
+            val tsData = body.bytes()
+            body.close()
             if (tsData.isEmpty()) throw ErrorLoadingException("no data")
 
             return if (isEncrypted) {
@@ -329,7 +331,9 @@ object M3u8Helper2 {
             encryptionIv = match[3].toByteArray()
             val encryptionKeyResponse =
                 app.get(encryptionUri, headers = playlistStream.headers, verify = false)
-            encryptionData = encryptionKeyResponse.body.bytes()
+            val body = encryptionKeyResponse.body
+            encryptionData = body.bytes()
+            body.close()
         } else {
             encryptionState = false
         }

From f5b46949ecd15ac5c37ea2762cc02e32b54de4e7 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 22 Mar 2026 17:16:39 -0600
Subject: [PATCH 014/177] Add support for configuration cache with keystore
 (#2328)

---
 app/build.gradle.kts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 722fcf58e..20ce54077 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,8 +12,6 @@ plugins {
 }
 
 val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
-val tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
-val prereleaseStoreFile: File? = File(tmpFilePath).listFiles()?.first()
 
 fun getGitCommitHash(): String {
     return try {
@@ -46,9 +44,14 @@ android {
     }
 
     signingConfigs {
-        if (prereleaseStoreFile != null) {
+        // We just use SIGNING_KEY_ALIAS here since it won't change
+        // so won't kill the configuration cache.
+        if (System.getenv("SIGNING_KEY_ALIAS") != null) {
             create("prerelease") {
-                storeFile = file(prereleaseStoreFile)
+                val tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
+                val prereleaseStoreFile: File? = File(tmpFilePath).listFiles()?.first()
+
+                storeFile = prereleaseStoreFile?.let { file(it) }
                 storePassword = System.getenv("SIGNING_STORE_PASSWORD")
                 keyAlias = System.getenv("SIGNING_KEY_ALIAS")
                 keyPassword = System.getenv("SIGNING_KEY_PASSWORD")

From f674b427ac709d56a6a0ab4414f7f1b013063701 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Mon, 23 Mar 2026 15:48:48 -0600
Subject: [PATCH 015/177] Use assemblePrereleaseRelease for building prerelease
 (#2365)

---
 .github/workflows/build_to_archive.yml | 3 ++-
 .github/workflows/prerelease.yml       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_to_archive.yml b/.github/workflows/build_to_archive.yml
index 07096014a..f72dd10c6 100644
--- a/.github/workflows/build_to_archive.yml
+++ b/.github/workflows/build_to_archive.yml
@@ -61,13 +61,14 @@ jobs:
         cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
     - name: Run Gradle
-      run: ./gradlew assemblePrerelease
+      run: ./gradlew assemblePrereleaseRelease
       env:
         SIGNING_KEY_ALIAS: "key0"
         SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
         SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
         SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
         SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
+        MDL_API_KEY: ${{ secrets.MDL_API_KEY }}
 
     - uses: actions/checkout@v6
       with:
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index c7dee13eb..03cb68cbc 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -52,7 +52,7 @@ jobs:
         cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
     - name: Run Gradle
-      run: ./gradlew assemblePrerelease build androidSourcesJar makeJar
+      run: ./gradlew assemblePrereleaseRelease androidSourcesJar makeJar
       env:
         SIGNING_KEY_ALIAS: "key0"
         SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}

From d06afa32fdeab8264d5cf6c7880b07d5ad0dc7ad Mon Sep 17 00:00:00 2001
From: Phisher98 <153359846+phisher98@users.noreply.github.com>
Date: Tue, 24 Mar 2026 03:44:48 +0530
Subject: [PATCH 016/177] Tracks naming fix and minor UI improvements (#2480)

---
 .../cloudstream3/ui/player/GeneratorPlayer.kt | 140 ++++++++++++------
 1 file changed, 97 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index d20e85707..a2cef1122 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -1434,45 +1434,42 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 val audioArrayAdapter = ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
 
-                audioArrayAdapter.addAll(currentAudioTracks.mapIndexed { index, track ->
-                    val language = track.language?.let { fromTagToLanguageName(it) ?: it } 
-                        ?: track.label 
-                        ?: "Audio"
-                    
-                    val codec = track.sampleMimeType?.let { mimeType ->
-                    when {
-                            mimeType.contains("mp4a") || mimeType.contains("aac") -> "aac"
-                            mimeType.contains("ac-3") || mimeType.contains("ac3") -> "ac3"
-                            mimeType.contains("eac3-joc") -> "Dolby Atmos"
-                            mimeType.contains("eac3") -> "eac3"
-                            mimeType.contains("opus") -> "opus"
-                            mimeType.contains("vorbis") -> "vorbis"
-                            mimeType.contains("mp3") || mimeType.contains("mpeg") -> "mp3"
-                            mimeType.contains("flac") -> "flac"
-                            mimeType.contains("dts") -> "dts"
-                            else -> mimeType.substringAfter("/")
+                audioArrayAdapter.addAll(
+                    currentAudioTracks.mapIndexed { _, track ->
+
+                        val language = (
+                                track.language?.trim()?.let { raw ->
+                                    fromTagToLanguageName(raw)
+                                        ?: fromTagToLanguageName(raw.replace('_','-').substringBefore('-').lowercase())
+                                        ?: raw
+                                }
+                                    ?: track.label
+                                    ?: "Audio"
+                                ).replaceFirstChar { it.uppercaseChar() }
+
+                        val codec = audioCodecName(track.sampleMimeType)
+
+                        val channelCount = track.channelCount
+
+                        val channels = when {
+                            // May be below 1 or null when unknown
+                            channelCount == null || channelCount <= 0 -> ""
+                            channelCount == 1 -> "Mono"
+                            channelCount == 2 -> "Stereo"
+                            channelCount == 6 -> "5.1"
+                            channelCount == 8 -> "7.1"
+                            else -> "${channelCount}ch"
                         }
-                    } ?: "codec?"
 
-                    
-                    val channels: Int = track.channelCount ?: 0
-                    val channelConfig = when (channels) {
-                        1 -> "mono"
-                        2 -> "stereo"
-                        6 -> "5.1"
-                        8 -> "7.1"
-                        else -> "${channels}Ch"
+                        listOfNotNull(
+                            language.takeIf { it.isNotBlank() }?.replaceFirstChar { it.uppercaseChar() },
+                            channels.takeIf { it.isNotBlank() },
+                            codec.takeIf { it.isNotBlank() }?.uppercase()
+                        ).joinToString(" • ")
+
+
                     }
-
-                    listOfNotNull(
-                        "[$index]",
-                        language.replaceFirstChar { it.uppercaseChar() },
-                        codec.uppercase(),
-                        channelConfig.replaceFirstChar { it.uppercaseChar() }
-                    ).joinToString(" • ")
-                    
-                    "[$index] $language $codec $channelConfig"
-                })
+                )
 
                 audioList.adapter = audioArrayAdapter
                 audioList.choiceMode = AbsListView.CHOICE_MODE_SINGLE
@@ -1830,6 +1827,42 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
+
+    private fun videoCodecName(mime: String?): String? {
+        val m = mime?.lowercase() ?: return null
+        return when {
+            m.contains("avc") || m.contains("h264") -> "AVC"
+            m.contains("hevc") || m.contains("h265") -> "HEVC"
+            m.contains("av1") -> "AV1"
+            m.contains("vp9") -> "VP9"
+            m.contains("vp8") -> "VP8"
+            "/" in m -> m.substringAfter("/").uppercase()
+            else -> m.uppercase()
+        }
+    }
+
+    private fun audioCodecName(mime: String?): String {
+        val m = mime?.lowercase()?.trim().orEmpty()
+        if (m.isBlank()) return ""
+        return when {
+            m.contains("eac3-joc") -> "Dolby Atmos"
+            m.contains("truehd") -> "TrueHD"
+            m.contains("eac3") -> "E-AC3"
+            m.contains("ac-3") || m.contains("ac3") -> "AC3"
+            m.contains("aac") || m.contains("mp4a") -> "AAC"
+            m.contains("opus") -> "Opus"
+            m.contains("vorbis") -> "Vorbis"
+            m.contains("mp3") -> "MP3"
+            m.contains("flac") -> "FLAC"
+            m.contains("dts") -> "DTS"
+            m.contains("pcm") -> "PCM"
+            m.contains("alac") -> "ALAC"
+            m.contains("amr") -> "AMR"
+            m.contains("/") -> m.substringAfter("/").uppercase().takeIf { it.isNotBlank() } ?: ""
+            else -> ""
+        }
+    }
+
     private fun updatePlayerInfo() {
         val tracks = player.getVideoTracks()
 
@@ -1840,14 +1873,35 @@ class GeneratorPlayer : FullScreenPlayer() {
         val prefs = PreferenceManager.getDefaultSharedPreferences(ctx)
         showMediaInfo = prefs.getBoolean(ctx.getString(R.string.show_media_info_key), false)
 
-        val videoCodec = videoTrack?.sampleMimeType?.substringAfterLast('/')?.uppercase()
-        val audioCodec = audioTrack?.sampleMimeType?.substringAfterLast('/')?.uppercase()
-        val language = listOfNotNull(
-            audioTrack?.label,
-            fromTagToLanguageName(audioTrack?.language)?.let { "[$it]" }
-        ).joinToString(" ")
+        val videoCodec = videoCodecName(videoTrack?.sampleMimeType)
+        val audioCodec = audioCodecName(audioTrack?.sampleMimeType)
+        val languageName = fromTagToLanguageName(audioTrack?.language)
+        val label = audioTrack?.label
 
-        val stats = arrayOf(videoCodec, audioCodec, language).filter { !it.isNullOrBlank() }.joinToString(" • ")
+        val channelCount = audioTrack?.channelCount
+
+        val channels = when {
+            // May be below 1 or null when unknown
+            channelCount == null || channelCount <= 0 -> ""
+            channelCount == 1 -> "Mono"
+            channelCount == 2 -> "Stereo"
+            channelCount == 6 -> "5.1"
+            channelCount == 8 -> "7.1"
+            else -> "${channelCount}ch"
+        }
+
+        val language = languageName?.takeIf { it.isNotBlank() }?.let { lang ->
+            label?.takeIf { it.isNotBlank() && !it.equals(lang, true) }
+                ?.let { lang }
+                ?: lang
+        } ?: label?.takeIf { it.isNotBlank() }
+
+        val stats = arrayOf(
+            videoCodec,
+            language,
+            channels,
+            audioCodec
+        ).filter { !it.isNullOrBlank() }.joinToString(" • ")
 
         playerBinding?.playerVideoInfo?.apply {
             text = stats

From 89400be5e5e7f49ac1fbb14f163d18ecdd68d467 Mon Sep 17 00:00:00 2001
From: Osten <11805592+LagradOst@users.noreply.github.com>
Date: Wed, 25 Mar 2026 18:31:57 +0100
Subject: [PATCH 017/177] Remove google dependenciesInfo + bumb nicehttp

---
 app/build.gradle.kts      | 8 ++++++++
 gradle/libs.versions.toml | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 20ce54077..3be4e2ea7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -39,6 +39,14 @@ android {
         unitTests.isReturnDefaultValues = true
     }
 
+    // Looks like google likes to add metadata only they can read https://gitlab.com/IzzyOnDroid/repo/-/work_items/491
+    dependenciesInfo {
+        // Disables dependency metadata when building APKs.
+        includeInApk = false
+        // Disables dependency metadata when building Android App Bundles.
+        includeInBundle = false
+    }
+
     viewBinding {
         enable = true
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1e5a2ade9..c79726d01 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -31,7 +31,7 @@ media3 = "1.9.2"
 navigationKtx = "2.9.7"
 newpipeextractor = "v0.25.2"
 nextlibMedia3 = "1.9.1-0.11.0"
-nicehttp = "0.4.16"
+nicehttp = "0.4.17"
 overlappingpanels = "0.1.5"
 paletteKtx = "1.0.0"
 preferenceKtx = "1.2.1"

From a23c136d81d12035091751d36a070e7b68ef6896 Mon Sep 17 00:00:00 2001
From: Osten <11805592+LagradOst@users.noreply.github.com>
Date: Thu, 26 Mar 2026 01:13:13 +0100
Subject: [PATCH 018/177] Fixed partial downloads + resume bugs

---
 .../utils/downloader/DownloadManager.kt       | 67 +++++++++++++++----
 .../utils/downloader/DownloadObjects.kt       |  4 +-
 2 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
index fd1715e22..a561dbbe8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
@@ -21,6 +21,7 @@ import androidx.core.net.toUri
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.BuildConfig
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
@@ -182,6 +183,13 @@ object VideoDownloadManager {
     /** the process failed due to some reason, so we retry and also try the next mirror */
     private val DOWNLOAD_FAILED = DownloadStatus(retrySame = true, tryNext = true, success = false)
 
+    /** The download only downloaded partial */
+    private val DOWNLOAD_PARTIAL_SUCCESS =
+        DownloadStatus(retrySame = true, tryNext = false, success = true)
+
+    /** 10MB minimum size */
+    const val DOWNLOAD_PARTIAL_MIN_SIZE = 1_048_576L * 10L
+
     /** bad config, skip all mirrors as every call to download will have the same bad config */
     private val DOWNLOAD_BAD_CONFIG =
         DownloadStatus(retrySame = false, tryNext = false, success = false)
@@ -523,6 +531,7 @@ object VideoDownloadManager {
     /** This class handles the notifications, as well as the relevant key */
     data class DownloadMetaData(
         private val id: Int?,
+        private val linkHash : Int,
         var bytesDownloaded: Long = 0,
         var bytesWritten: Long = 0,
 
@@ -534,7 +543,7 @@ object VideoDownloadManager {
         private val createNotificationCallback: (CreateNotificationMetadata) -> Unit,
 
         private var internalType: DownloadType = DownloadType.IsPending,
-
+        val isHLS : Boolean,
         // how many segments that we have downloaded
         var hlsProgress: Int = 0,
         // how many segments that exist
@@ -552,13 +561,17 @@ object VideoDownloadManager {
             lastDownloadedBytes = length
         }
 
+        /** Returns the appropriate failed status based on download progress */
+        fun failedStatus() = if (this.bytesWritten > DOWNLOAD_PARTIAL_MIN_SIZE)
+            DOWNLOAD_PARTIAL_SUCCESS
+        else
+            DOWNLOAD_FAILED
+
         val approxTotalBytes: Long
             get() = totalBytes ?: hlsTotal?.let { total ->
                 (bytesDownloaded * (total / hlsProgress.toFloat())).toLong()
             } ?: bytesDownloaded
 
-        private val isHLS get() = hlsTotal != null
-
         private var stopListener: (() -> Unit)? = null
 
         /** on cancel button pressed or failed invoke this once and only once */
@@ -593,11 +606,32 @@ object VideoDownloadManager {
         private fun updateFileInfo() {
             if (id == null) return
             downloadFileInfoTemplate?.let { template ->
+                /** This looks strange, but fixes an issue where we do an instant retry, and it fails immediately,
+                 * eg. by turning off wifi */
+                val totalBytesValue = if (approxTotalBytes <= bytesDownloaded) {
+                    val prevInfo = getKey<DownloadedFileInfo>(
+                        KEY_DOWNLOAD_INFO,
+                        id.toString()
+                    )
+
+                    /** If this link is the same as the last cached video link metadata */
+                    if (prevInfo != null && prevInfo.linkHash == linkHash) {
+                        /** Try to use totalBytes if it exists, otherwise the max of the prev data,
+                         * and download size to ensure total >= downloaded */
+                        totalBytes ?: maxOf(prevInfo.totalBytes, bytesDownloaded)
+                    } else {
+                        approxTotalBytes
+                    }
+                } else {
+                    approxTotalBytes
+                }
+
                 setKey(
                     KEY_DOWNLOAD_INFO,
                     id.toString(),
                     template.copy(
-                        totalBytes = approxTotalBytes,
+                        linkHash = linkHash,
+                        totalBytes = totalBytesValue,
                         extraInfo = if (isHLS) hlsWrittenProgress.toString() else null
                     )
                 )
@@ -982,6 +1016,8 @@ object VideoDownloadManager {
             bytesDownloaded = 0,
             createNotificationCallback = createNotificationCallback,
             id = parentId,
+            linkHash = link.url.hashCode(),
+            isHLS = false
         )
         try {
             // get the file path
@@ -1171,7 +1207,7 @@ object VideoDownloadManager {
             if (!stream.exists) metadata.type = DownloadType.IsStopped
 
             if (metadata.type == DownloadType.IsFailed) {
-                return@withContext DOWNLOAD_FAILED
+                return@withContext metadata.failedStatus()
             }
 
             if (metadata.type == DownloadType.IsStopped) {
@@ -1201,11 +1237,11 @@ object VideoDownloadManager {
             throw e
         } catch (t: Throwable) {
             // some sort of network error, will error
-
+            logError(t)
             // note that when failing we don't want to delete the file,
             // only user interaction has that power
             metadata.type = DownloadType.IsFailed
-            return@withContext DOWNLOAD_FAILED
+            return@withContext metadata.failedStatus()
         } finally {
             fileStream?.closeQuietly()
             //requestStream?.closeQuietly()
@@ -1227,7 +1263,9 @@ object VideoDownloadManager {
 
         val metadata = DownloadMetaData(
             createNotificationCallback = createNotificationCallback,
-            id = parentId
+            id = parentId,
+            linkHash = link.url.hashCode(),
+            isHLS = true
         )
         var fileStream: OutputStream? = null
         try {
@@ -1385,7 +1423,7 @@ object VideoDownloadManager {
             if (!stream.exists) metadata.type = DownloadType.IsStopped
 
             if (metadata.type == DownloadType.IsFailed) {
-                return@withContext DOWNLOAD_FAILED
+                return@withContext metadata.failedStatus()
             }
 
             if (metadata.type == DownloadType.IsStopped) {
@@ -1401,7 +1439,7 @@ object VideoDownloadManager {
         } catch (t: Throwable) {
             logError(t)
             metadata.type = DownloadType.IsFailed
-            return@withContext DOWNLOAD_FAILED
+            return@withContext metadata.failedStatus()
         } finally {
             fileStream?.closeQuietly()
             metadata.close()
@@ -1983,7 +2021,8 @@ object VideoDownloadManager {
             linkLoadingJob?.join()
 
             // Remove link loading notification
-            NotificationManagerCompat.from(context).cancel(DOWNLOAD_NOTIFICATION_TAG, downloadItem.episode.id)
+            NotificationManagerCompat.from(context)
+                .cancel(DOWNLOAD_NOTIFICATION_TAG, downloadItem.episode.id)
 
             if (linkLoadingJob?.isCancelled == true) {
                 // Same as if no links, but no toast.
@@ -2009,8 +2048,10 @@ object VideoDownloadManager {
             }
 
             // Profiles should always contain a download type
-            val profile = QualityDataHelper.getProfiles().first { it.types.contains(
-                QualityDataHelper.QualityProfileType.Download)
+            val profile = QualityDataHelper.getProfiles().first {
+                it.types.contains(
+                    QualityDataHelper.QualityProfileType.Download
+                )
             }
 
             val sortedLinks = currentLinks.sortedBy { link ->
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadObjects.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadObjects.kt
index 1d945a6b4..25a9fdf2a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadObjects.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadObjects.kt
@@ -133,7 +133,9 @@ object DownloadObjects {
         @JsonProperty("relativePath") val relativePath: String,
         @JsonProperty("displayName") val displayName: String,
         @JsonProperty("extraInfo") val extraInfo: String? = null,
-        @JsonProperty("basePath") val basePath: String? = null // null is for legacy downloads. See getBasePath()
+        @JsonProperty("basePath") val basePath: String? = null, // null is for legacy downloads. See getBasePath()
+        // Hash of the link associated with this DownloadFile, used so not override old data in the DownloadedFileInfo
+        @JsonProperty("linkHash") val linkHash : Int? = null
     )
 
     data class DownloadedFileInfoResult(

From 07eb9973f8f32dcba0756c1d55e8740a8345441c Mon Sep 17 00:00:00 2001
From: Osten <11805592+LagradOst@users.noreply.github.com>
Date: Sun, 29 Mar 2026 13:54:51 +0200
Subject: [PATCH 019/177] Increased  DOWNLOAD_PARTIAL_MIN_SIZE to 50MB

---
 .../cloudstream3/utils/downloader/DownloadManager.kt          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
index a561dbbe8..11c35e9ec 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
@@ -187,8 +187,8 @@ object VideoDownloadManager {
     private val DOWNLOAD_PARTIAL_SUCCESS =
         DownloadStatus(retrySame = true, tryNext = false, success = true)
 
-    /** 10MB minimum size */
-    const val DOWNLOAD_PARTIAL_MIN_SIZE = 1_048_576L * 10L
+    /** 50MB minimum size */
+    const val DOWNLOAD_PARTIAL_MIN_SIZE = 1_048_576L * 50L
 
     /** bad config, skip all mirrors as every call to download will have the same bad config */
     private val DOWNLOAD_BAD_CONFIG =

From 235863f9d29b8c8d78ea603fcfe261712860182c Mon Sep 17 00:00:00 2001
From: Osten <11805592+LagradOst@users.noreply.github.com>
Date: Sun, 29 Mar 2026 14:06:17 +0200
Subject: [PATCH 020/177] Bump to 4.7.0

---
 app/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3be4e2ea7..97d24c4fb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -73,8 +73,8 @@ android {
         applicationId = "com.lagradost.cloudstream3"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
-        versionCode = 67
-        versionName = "4.6.2"
+        versionCode = 68
+        versionName = "4.7.0"
 
         resValue("string", "commit_hash", getGitCommitHash())
 

From 81c7d90a5f30015749bccbb0126433bd5959df3b Mon Sep 17 00:00:00 2001
From: Nguyen Van Nam <nam.nv205106@gmail.com>
Date: Mon, 30 Mar 2026 01:15:34 +0700
Subject: [PATCH 021/177] Fix: Subtitle deletion matches on substring
 extension, can delete non-subtitle files (#2584)

---
 .../java/com/lagradost/cloudstream3/utils/SubtitleUtils.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleUtils.kt
index 18d465e3c..c0068f91a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleUtils.kt
@@ -43,7 +43,7 @@ object SubtitleUtils {
         cleanDisplay: String
     ): Boolean {
         // Check if the file has a valid subtitle extension
-        val hasValidExtension = allowedExtensions.any { name.contains(it, ignoreCase = true) }
+        val hasValidExtension = allowedExtensions.any { name.endsWith(it, ignoreCase = true) }
 
         // We can't have the exact same file as a subtitle
         val isNotDisplayName = !name.equals(display, ignoreCase = true)
@@ -57,4 +57,4 @@ object SubtitleUtils {
     fun cleanDisplayName(name: String): String {
         return name.substringBeforeLast('.').trim()
     }
-}
\ No newline at end of file
+}

From 76a2feb79ce6a56bbedbae265e81742790c1e218 Mon Sep 17 00:00:00 2001
From: PiterDev <71133634+PiterWeb@users.noreply.github.com>
Date: Sun, 29 Mar 2026 20:33:36 +0200
Subject: [PATCH 022/177] Add fallback url for kitsu sync (#2552)

---
 .../syncproviders/providers/KitsuApi.kt       | 82 ++++++++++++++-----
 1 file changed, 63 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/KitsuApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/KitsuApi.kt
index 3f079d9d5..29c3c0c17 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/KitsuApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/KitsuApi.kt
@@ -5,11 +5,11 @@ import androidx.annotation.StringRes
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
-import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.Score
 import com.lagradost.cloudstream3.ShowStatus
 import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.AuthData
 import com.lagradost.cloudstream3.syncproviders.AuthLoginRequirement
@@ -22,18 +22,16 @@ import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.txt
-import kotlinx.coroutines.flow.asFlow
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.withIndex
+import okhttp3.Interceptor
+import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.Response
 import java.text.SimpleDateFormat
 import java.time.Instant
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 import java.util.Date
 import java.util.Locale
-import kotlin.collections.set
 
 const val KITSU_MAX_SEARCH_LIMIT = 20
 
@@ -42,7 +40,9 @@ class KitsuApi: SyncAPI() {
     override val idPrefix = "kitsu"
 
     private val apiUrl = "https://kitsu.io/api/edge"
+    private val fallbackApiUrl = "https://kitsu.app/api/edge"
     private val oauthUrl = "https://kitsu.io/api/oauth"
+    private val fallbackOauthUrl = "https://kitsu.app/api/oauth"
     override val hasInApp = true
     override val mainUrl = "https://kitsu.app"
     override val icon = R.drawable.kitsu_icon
@@ -63,6 +63,33 @@ class KitsuApi: SyncAPI() {
         email = true
     )
 
+    private class FallbackInterceptor(private val apiUrl: String, private val fallbackApiUrl: String) : Interceptor {
+        override fun intercept(chain: Interceptor.Chain): Response {
+            val request: Request = chain.request()
+
+            try {
+
+                val response = chain.proceed(request);
+
+                if (response.isSuccessful) return response
+
+                response.close()
+
+            } catch (_: Exception) {
+            }
+
+            val fallbackRequest: Request = request.newBuilder()
+                .url(request.url.toString().replaceFirst(apiUrl, fallbackApiUrl))
+                .build()
+
+            return chain.proceed(fallbackRequest)
+
+        }
+    }
+
+    private val apiFallbackInterceptor = FallbackInterceptor(apiUrl, fallbackApiUrl)
+    private val oauthFallbackInterceptor = FallbackInterceptor(oauthUrl, fallbackOauthUrl)
+
     override suspend fun login(form: AuthLoginResponse): AuthToken? {
         val username = form.email ?: return null
         val password = form.password ?: return null
@@ -75,8 +102,10 @@ class KitsuApi: SyncAPI() {
                 "grant_type" to grantType,
                 "username" to username,
                 "password" to password
-            )
+            ),
+            interceptor = oauthFallbackInterceptor
         ).parsed<ResponseToken>()
+
         return AuthToken(
             accessTokenLifetime = unixTime + token.expiresIn.toLong(),
             refreshToken = token.refreshToken,
@@ -90,7 +119,8 @@ class KitsuApi: SyncAPI() {
             data = mapOf(
                 "grant_type" to "refresh_token",
                 "refresh_token" to token.refreshToken!!
-            )
+            ),
+            interceptor = oauthFallbackInterceptor
         ).parsed<ResponseToken>()
 
         return AuthToken(
@@ -105,7 +135,8 @@ class KitsuApi: SyncAPI() {
             "$apiUrl/users?filter[self]=true",
             headers = mapOf(
                 "Authorization" to "Bearer ${token?.accessToken ?: return null}"
-            ), cacheTime = 0
+            ), cacheTime = 0,
+            interceptor = apiFallbackInterceptor
         ).parsed<KitsuResponse>()
 
         if (user.data.isEmpty()) {
@@ -123,11 +154,14 @@ class KitsuApi: SyncAPI() {
         val auth = auth?.token?.accessToken ?: return null
         val animeSelectedFields = arrayOf("titles","canonicalTitle","posterImage","episodeCount")
         val url = "$apiUrl/anime?filter[text]=$query&page[limit]=$KITSU_MAX_SEARCH_LIMIT&fields[anime]=${animeSelectedFields.joinToString(",")}"
+
         val res = app.get(
             url, headers = mapOf(
                 "Authorization" to "Bearer $auth",
-            ), cacheTime = 0
+            ), cacheTime = 0,
+            interceptor = apiFallbackInterceptor
         ).parsed<KitsuResponse>()
+
         return res.data.map {
             val attributes = it.attributes
 
@@ -160,7 +194,8 @@ class KitsuApi: SyncAPI() {
         val anime = app.get(
             url, headers = mapOf(
                 "Authorization" to "Bearer $auth"
-            )
+            ),
+            interceptor = apiFallbackInterceptor
         ).parsed<KitsuResponse>().data.attributes
 
         return SyncResult(
@@ -201,7 +236,8 @@ class KitsuApi: SyncAPI() {
         val anime = app.get(
             url, headers = mapOf(
                 "Authorization" to "Bearer $accessToken"
-            )
+            ),
+            interceptor = apiFallbackInterceptor
         ).parsed<KitsuResponse>().data.firstOrNull()?.attributes
 
         if (anime == null) {
@@ -224,7 +260,8 @@ class KitsuApi: SyncAPI() {
 
         val animeSelectedFields = arrayOf("titles","canonicalTitle")
         val url = "$apiUrl/anime?filter[text]=$title&page[limit]=$KITSU_MAX_SEARCH_LIMIT&fields[anime]=${animeSelectedFields.joinToString(",")}"
-        val res = app.get(url).parsed<KitsuResponse>()
+
+        val res = app.get(url, interceptor = apiFallbackInterceptor).parsed<KitsuResponse>()
 
         return res.data.firstOrNull()?.id
 
@@ -269,8 +306,10 @@ class KitsuApi: SyncAPI() {
                     headers = mapOf(
                         "Authorization" to "Bearer ${auth.token.accessToken}"
                     ),
+                    interceptor = apiFallbackInterceptor
                 )
 
+
                 return res.isSuccessful
 
             }
@@ -316,7 +355,8 @@ class KitsuApi: SyncAPI() {
                 "content-type" to "application/vnd.api+json",
                 "Authorization" to "Bearer ${auth.token.accessToken}"
             ),
-            requestBody = data.toJson().toRequestBody()
+            requestBody = data.toJson().toRequestBody(),
+            interceptor = apiFallbackInterceptor
         )
 
         return res.isSuccessful
@@ -349,9 +389,11 @@ class KitsuApi: SyncAPI() {
                 "content-type" to "application/vnd.api+json",
                 "Authorization" to "Bearer ${auth.token.accessToken}"
             ),
-            requestBody = data.toJson().toRequestBody()
+            requestBody = data.toJson().toRequestBody(),
+            interceptor = apiFallbackInterceptor
         )
 
+
         return res.isSuccessful
 
     }
@@ -365,6 +407,7 @@ class KitsuApi: SyncAPI() {
             headers = mapOf(
                 "Authorization" to "Bearer ${auth.token.accessToken}"
             ),
+            interceptor = apiFallbackInterceptor
         ).parsed<KitsuResponse>().data.firstOrNull() ?: return null
 
         return res.id.toInt()
@@ -439,7 +482,8 @@ class KitsuApi: SyncAPI() {
         val res = app.get(
             url, headers = mapOf(
                 "Authorization" to "Bearer ${token.accessToken}",
-            )
+            ),
+            interceptor = apiFallbackInterceptor
         ).parsed<KitsuResponse>()
         return res
     }
@@ -474,7 +518,7 @@ class KitsuApi: SyncAPI() {
 
             val animeId = animeItem?.id
 
-            val description: String? = animeItem?.attributes?.synopsis
+            val synopsis: String? = animeItem?.attributes?.synopsis
 
             return LibraryItem(
                 canonicalTitle ?: titles?.enJp ?: titles?.jaJp.orEmpty(),
@@ -489,7 +533,7 @@ class KitsuApi: SyncAPI() {
                 posterImage?.large ?: posterImage?.medium,
                 null,
                 null,
-                plot = description,
+                plot = synopsis,
                 releaseDate = if (startDate == null) null else try {
                     Date.from(
                         Instant.from(
@@ -770,4 +814,4 @@ query {
             val canonical: String? = null
         )
     }
-}
\ No newline at end of file
+}

From 7a2222b252c98a5e422f98fd59d068eff9cca2ed Mon Sep 17 00:00:00 2001
From: Phisher98 <153359846+phisher98@users.noreply.github.com>
Date: Mon, 30 Mar 2026 03:41:58 +0530
Subject: [PATCH 023/177] Adding Metdata on Player (Initial Draft) (TV) (#2461)

---
 .../ui/player/FullScreenPlayer.kt             | 68 ++++++++++++++-
 .../cloudstream3/ui/player/GeneratorPlayer.kt | 50 +++++++++++
 .../cloudstream3/utils/AppContextUtils.kt     |  8 ++
 .../bg_player_metadata_scrim_netflix.xml      |  7 ++
 .../res/drawable/metadata_overlay_icon.xml    | 36 ++++++++
 .../main/res/layout/player_custom_layout.xml  | 72 ++++++++++++++++
 .../res/layout/player_custom_layout_tv.xml    | 83 +++++++++++++++++--
 .../main/res/layout/trailer_custom_layout.xml | 73 +++++++++++++++-
 .../res/values/donottranslate-strings.xml     |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/xml/settings_ui.xml          |  5 ++
 11 files changed, 392 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/res/drawable/bg_player_metadata_scrim_netflix.xml
 create mode 100644 app/src/main/res/drawable/metadata_overlay_icon.xml

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index bc10285e3..90274c938 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -35,6 +35,7 @@ import android.view.animation.AccelerateDecelerateInterpolator
 import android.view.animation.AlphaAnimation
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
+import android.view.animation.DecelerateInterpolator
 import android.widget.LinearLayout
 import androidx.annotation.OptIn
 import androidx.appcompat.app.AlertDialog
@@ -97,6 +98,8 @@ import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.round
 import kotlin.math.roundToInt
+import com.lagradost.cloudstream3.utils.AppContextUtils.shouldShowPlayerMetadata
+
 
 // You can zoom out more than 100%, but it will zoom back into 100%
 const val MINIMUM_ZOOM = 0.95f
@@ -133,7 +136,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     private var uiShowingBeforeGesture = false
     protected var isLocked = false
     protected var timestampShowState = false
-
+    private var metadataVisibilityToken = 0
     protected var hasEpisodes = false
         private set
     // protected val hasEpisodes
@@ -235,10 +238,55 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 requestUpdateBrightnessOverlayOnNextLayout()
             }
         }
-
         return root
     }
 
+    private fun scheduleMetadataVisibility() {
+        val metadataScrim = playerBinding?.playerMetadataScrim ?: return
+        val ctx = metadataScrim.context ?: return
+
+        if (!ctx.shouldShowPlayerMetadata()) {
+            metadataScrim.isVisible = false
+            metadataVisibilityToken++
+            return
+        }
+
+        if (isLayout(PHONE)) {
+            metadataScrim.isVisible = false
+            metadataVisibilityToken++
+            return
+        }
+
+        val isPaused = currentPlayerStatus == CSPlayerLoading.IsPaused
+        val token = ++metadataVisibilityToken
+
+        if (isPaused) {
+            metadataScrim.postDelayed({
+                if (token != metadataVisibilityToken) return@postDelayed
+                metadataScrim.alpha = 0f
+                metadataScrim.isVisible = true
+                metadataScrim.animate()
+                    .alpha(1f)
+                    .setDuration(500L)
+                    .setInterpolator(DecelerateInterpolator())
+                    .start()
+                hidePlayerUI()
+            }, 8000L)
+        } else {
+            if (metadataScrim.isVisible) {
+                metadataScrim.animate()
+                    .alpha(0f)
+                    .setDuration(300L)
+                    .setInterpolator(AccelerateDecelerateInterpolator())
+                    .withEndAction {
+                        metadataScrim.alpha = 0f      // force final state
+                        metadataScrim.isVisible = false
+                    }
+                    .start()
+            }
+        }
+    }
+
     @SuppressLint("UnsafeOptInUsageError")
     override fun playerUpdated(player: Any?) {
         super.playerUpdated(player)
@@ -456,6 +504,12 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 start()
             }
         }
+        playerBinding?.playerMetadataScrim?.let {
+            ObjectAnimator.ofFloat(it, "translationY", 1f).apply {
+                duration = 200
+                start()
+            }
+        }
 
         val playerBarMove = if (isShowing) 0f else 50.toPx.toFloat()
         playerBinding?.bottomPlayerBar?.let {
@@ -522,7 +576,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     override fun subtitlesChanged() {
         val tracks = player.getVideoTracks()
         val isBuiltinSubtitles = tracks.currentTextTracks.all { track ->
-            track.sampleMimeType == MimeTypes.APPLICATION_MEDIA3_CUES
+            track.sampleMimeType  == MimeTypes.APPLICATION_MEDIA3_CUES
         }
         // Subtitle offset is not possible on built-in media3 tracks
         playerBinding?.playerSubtitleOffsetBtt?.isGone =
@@ -1013,7 +1067,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             // BOTTOM
             playerLockHolder.startAnimation(fadeAnimation)
             // player_go_back_holder?.startAnimation(fadeAnimation)
-
             shadowOverlay.isVisible = true
             shadowOverlay.startAnimation(fadeAnimation)
         }
@@ -1084,6 +1137,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
 
     override fun playerStatusChanged() {
         super.playerStatusChanged()
+        scheduleMetadataVisibility()
         delayHide()
     }
 
@@ -2177,6 +2231,12 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     }
 
     protected fun uiReset() {
+        metadataVisibilityToken++
+        playerBinding?.playerMetadataScrim?.let {
+            it.animate().cancel()
+            it.alpha = 0f
+            it.isVisible = false
+        }
         isShowing = false
         toggleEpisodesOverlay(false)
         // if nothing has loaded these buttons should not be visible
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index a2cef1122..de1b32467 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -87,6 +87,7 @@ import com.lagradost.cloudstream3.ui.result.EpisodeAdapter
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.ui.result.ResultFragment
+import com.lagradost.cloudstream3.ui.result.ResultFragment.bindLogo
 import com.lagradost.cloudstream3.ui.result.ResultViewModel2
 import com.lagradost.cloudstream3.ui.result.SyncViewModel
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
@@ -98,6 +99,7 @@ import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.ui.subtitles.SUBTITLE_AUTO_SELECT_KEY
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.getAutoSelectLanguageTagIETF
+import com.lagradost.cloudstream3.utils.AppContextUtils.getShortSeasonText
 import com.lagradost.cloudstream3.utils.AppContextUtils.html
 import com.lagradost.cloudstream3.utils.AppContextUtils.sortSubs
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
@@ -1546,6 +1548,54 @@ class GeneratorPlayer : FullScreenPlayer() {
             return
         }
         loadLink(links.first(), false)
+        showPlayerMetadata()
+    }
+
+    private fun showPlayerMetadata() {
+        val overlay = playerBinding?.playerMetadataScrim ?: return
+
+        val titleView = overlay.findViewById<TextView>(R.id.player_movie_title)
+        val logoView = overlay.findViewById<ImageView>(R.id.player_movie_logo)
+        val metaView = overlay.findViewById<TextView>(R.id.player_movie_meta)
+        val descView = overlay.findViewById<TextView>(R.id.player_movie_overview)
+
+        val load = viewModel.getLoadResponse() ?: return
+        val episode = currentMeta as? ResultEpisode
+        titleView.text = load.name
+
+        bindLogo(
+            url = load.logoUrl,
+            headers = load.posterHeaders,
+            titleView = titleView,
+            logoView = logoView
+        )
+
+        val meta = arrayOf(
+            load.tags?.takeIf { it.isNotEmpty() }?.joinToString(", "),
+            load.year?.toString(),
+            if (!load.type.isMovieType())
+                context?.getShortSeasonText(
+                    episode = episode?.episode,
+                    season = episode?.season
+                )
+            else null,
+            load.score?.let { "⭐ $it" }
+        ).filterNotNull()
+            .joinToString(" • ")
+
+        metaView.text = meta
+        metaView.isVisible = meta.isNotBlank()
+
+
+        val description = load.plot
+
+        if (!description.isNullOrBlank()) {
+            descView.isVisible = true
+            descView.text = description
+        } else {
+            descView.isVisible = false
+
+        }
     }
 
     override fun nextEpisode() {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt
index 6a9ab28d8..1377ccd08 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt
@@ -449,6 +449,14 @@ object AppContextUtils {
         return settingsManager.getBoolean(this.getString(R.string.show_trailers_key), true)
     }
 
+    fun Context.shouldShowPlayerMetadata(): Boolean {
+        val prefs = PreferenceManager.getDefaultSharedPreferences(this)
+        return prefs.getBoolean(
+            getString(R.string.show_player_metadata_key),
+            true
+        )
+    }
+
     fun Context.filterProviderByPreferredMedia(hasHomePageIsRequired: Boolean = true): List<MainAPI> {
         // We are getting the weirdest crash ever done:
         // java.lang.ClassCastException: com.lagradost.cloudstream3.TvType cannot be cast to com.lagradost.cloudstream3.TvType
diff --git a/app/src/main/res/drawable/bg_player_metadata_scrim_netflix.xml b/app/src/main/res/drawable/bg_player_metadata_scrim_netflix.xml
new file mode 100644
index 000000000..b4701e42a
--- /dev/null
+++ b/app/src/main/res/drawable/bg_player_metadata_scrim_netflix.xml
@@ -0,0 +1,7 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#E6000000"
+        android:centerColor="#99000000"
+        android:endColor="#00000000"
+        android:angle="0" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/metadata_overlay_icon.xml b/app/src/main/res/drawable/metadata_overlay_icon.xml
new file mode 100644
index 000000000..6d1b6510a
--- /dev/null
+++ b/app/src/main/res/drawable/metadata_overlay_icon.xml
@@ -0,0 +1,36 @@
+<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:attr/colorControlNormal"
+        android:fillAlpha="0.4"
+        android:pathData="
+            M4,6
+            h12
+            a2,2 0 0,1 2,2
+            v8
+            a2,2 0 0,1 -2,2
+            h-12
+            a2,2 0 0,1 -2,-2
+            v-8
+            a2,2 0 0,1 2,-2
+            z" />
+
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="
+            M7,4
+            h12
+            a2,2 0 0,1 2,2
+            v8
+            a2,2 0 0,1 -2,2
+            h-12
+            a2,2 0 0,1 -2,-2
+            v-8
+            a2,2 0 0,1 2,-2
+            z" />
+
+</vector>
diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml
index 7974159c4..72024a918 100644
--- a/app/src/main/res/layout/player_custom_layout.xml
+++ b/app/src/main/res/layout/player_custom_layout.xml
@@ -7,6 +7,78 @@
     android:orientation="vertical"
     tools:orientation="vertical">
 
+    <FrameLayout
+        android:id="@+id/player_metadata_scrim"
+        android:layout_width="640dp"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_player_metadata_scrim_netflix"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <LinearLayout
+            android:id="@+id/player_metadata_overlay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_gravity="center_vertical"
+            android:paddingStart="64dp"
+            android:paddingEnd="32dp"
+            android:paddingBottom="32dp">
+
+            <!-- TITLE / LOGO -->
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="88dp">
+
+                <ImageView
+                    android:id="@+id/player_movie_logo"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:adjustViewBounds="true"
+                    android:scaleType="fitStart"
+                    android:visibility="gone"
+                    tools:visibility="visible"/>
+
+                <TextView
+                    android:id="@+id/player_movie_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@android:color/white"
+                    android:textSize="30sp"
+                    android:textStyle="bold"
+                    android:maxLines="2"
+                    android:ellipsize="end"
+                    tools:text="Zootopia 2"/>
+            </FrameLayout>
+
+            <!-- GENRES / YEAR / RATING -->
+            <TextView
+                android:id="@+id/player_movie_meta"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:textColor="#B3FFFFFF"
+                android:textSize="14sp"
+                android:maxLines="2"
+                tools:text="Animation • Action • Adventure • 2025 • ⭐ 7.6"/>
+
+            <!-- SYNOPSIS -->
+            <TextView
+                android:id="@+id/player_movie_overview"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:textColor="#E6FFFFFF"
+                android:textSize="16sp"
+                android:lineSpacingExtra="8dp"
+                android:maxLines="5"
+                tools:text="Brave rabbit cop Judy Hopps and her friend, the fox Nick Wilde, team up again to crack a new case."/>
+
+        </LinearLayout>
+    </FrameLayout>
+
     <ImageView
         android:visibility="gone"
         android:id="@+id/video_outline"
diff --git a/app/src/main/res/layout/player_custom_layout_tv.xml b/app/src/main/res/layout/player_custom_layout_tv.xml
index c096ec4d9..ed06ef2b6 100644
--- a/app/src/main/res/layout/player_custom_layout_tv.xml
+++ b/app/src/main/res/layout/player_custom_layout_tv.xml
@@ -8,14 +8,83 @@
     android:tag="television"
     tools:orientation="vertical">
 
-    <ImageView
-        android:visibility="gone"
-        android:id="@+id/video_outline"
-        android:src="@drawable/video_outline"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    </ImageView>
+    <FrameLayout
+        android:id="@+id/player_metadata_scrim"
+        android:layout_width="640dp"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_player_metadata_scrim_netflix"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
 
+        <LinearLayout
+            android:id="@+id/player_metadata_overlay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_gravity="center_vertical"
+            android:paddingStart="64dp"
+            android:paddingEnd="32dp"
+            android:paddingBottom="32dp">
+
+            <!-- TITLE / LOGO -->
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="88dp">
+
+                <ImageView
+                    android:id="@+id/player_movie_logo"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:adjustViewBounds="true"
+                    android:scaleType="fitStart"
+                    android:visibility="gone"
+                    tools:visibility="visible"/>
+
+                <TextView
+                    android:id="@+id/player_movie_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@android:color/white"
+                    android:textSize="30sp"
+                    android:textStyle="bold"
+                    android:maxLines="2"
+                    android:ellipsize="end"
+                    tools:text="Zootopia 2"/>
+            </FrameLayout>
+
+            <!-- GENRES / YEAR / RATING -->
+            <TextView
+                android:id="@+id/player_movie_meta"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:textColor="#B3FFFFFF"
+                android:textSize="14sp"
+                android:maxLines="2"
+                tools:text="Animation • Action • Adventure • 2025 • ⭐ 7.6"/>
+
+            <!-- SYNOPSIS -->
+            <TextView
+                android:id="@+id/player_movie_overview"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:textColor="#E6FFFFFF"
+                android:textSize="16sp"
+                android:lineSpacingExtra="8dp"
+                android:maxLines="5"
+                tools:text="Brave rabbit cop Judy Hopps and her friend, the fox Nick Wilde, team up again to crack a new case."/>
+
+        </LinearLayout>
+        <ImageView
+            android:id="@+id/video_outline"
+            android:visibility="gone"
+            android:src="@drawable/video_outline"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+    </FrameLayout>
 
     <FrameLayout
         android:id="@+id/piphide"
diff --git a/app/src/main/res/layout/trailer_custom_layout.xml b/app/src/main/res/layout/trailer_custom_layout.xml
index 74c3e47e2..52b5c7b2c 100644
--- a/app/src/main/res/layout/trailer_custom_layout.xml
+++ b/app/src/main/res/layout/trailer_custom_layout.xml
@@ -7,6 +7,78 @@
     android:orientation="vertical"
     tools:orientation="vertical">
 
+    <FrameLayout
+        android:id="@+id/player_metadata_scrim"
+        android:layout_width="640dp"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_player_metadata_scrim_netflix"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <LinearLayout
+            android:id="@+id/player_metadata_overlay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_gravity="center_vertical"
+            android:paddingStart="64dp"
+            android:paddingEnd="32dp"
+            android:paddingBottom="32dp">
+
+            <!-- TITLE / LOGO -->
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="88dp">
+
+                <ImageView
+                    android:id="@+id/player_movie_logo"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:adjustViewBounds="true"
+                    android:scaleType="fitStart"
+                    android:visibility="gone"
+                    tools:visibility="visible"/>
+
+                <TextView
+                    android:id="@+id/player_movie_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:textColor="@android:color/white"
+                    android:textSize="30sp"
+                    android:textStyle="bold"
+                    android:maxLines="2"
+                    android:ellipsize="end"
+                    tools:text="Zootopia 2"/>
+            </FrameLayout>
+
+            <!-- GENRES / YEAR / RATING -->
+            <TextView
+                android:id="@+id/player_movie_meta"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:textColor="#B3FFFFFF"
+                android:textSize="14sp"
+                android:maxLines="2"
+                tools:text="Animation • Action • Adventure • 2025 • ⭐ 7.6"/>
+
+            <!-- SYNOPSIS -->
+            <TextView
+                android:id="@+id/player_movie_overview"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:textColor="#E6FFFFFF"
+                android:textSize="16sp"
+                android:lineSpacingExtra="8dp"
+                android:maxLines="5"
+                tools:text="Brave rabbit cop Judy Hopps and her friend, the fox Nick Wilde, team up again to crack a new case."/>
+
+        </LinearLayout>
+    </FrameLayout>
+
     <ImageView
         android:visibility="gone"
         android:id="@+id/video_outline"
@@ -15,7 +87,6 @@
         android:layout_height="match_parent">
     </ImageView>
 
-
     <TextView
         android:id="@+id/player_time_text"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/donottranslate-strings.xml b/app/src/main/res/values/donottranslate-strings.xml
index acc5a2127..0b7aab4cb 100644
--- a/app/src/main/res/values/donottranslate-strings.xml
+++ b/app/src/main/res/values/donottranslate-strings.xml
@@ -40,6 +40,7 @@
     <string name="autoplay_next_key">autoplay_next_key</string>
     <string name="display_sub_key">display_sub_key</string>
     <string name="show_fillers_key">show_fillers_key</string>
+    <string name="show_player_metadata_key">show_player_metadata_key</string>
     <string name="show_trailers_key">show_trailers_key</string>
     <string name="show_kitsu_posters_key">show_kitsu_posters_key</string>
     <string name="show_cast_in_details_key">show_cast_in_details_key</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a1a4fdc3f..e9dd2748f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -190,6 +190,7 @@
     <string name="search_suggestions_des">Show search suggestions while typing</string>
     <string name="clear_suggestions">Clear Suggestions</string>
     <string name="show_fillers_settings">Show filler episode for anime</string>
+    <string name="show_player_metadata_overlay">Show Player Metadata Overlay</string>
     <string name="show_trailers_settings">Show trailers</string>
     <string name="kitsu_settings">Show posters from Kitsu</string>
     <string name="show_cast_in_details">Show cast panel</string>
diff --git a/app/src/main/res/xml/settings_ui.xml b/app/src/main/res/xml/settings_ui.xml
index 83d0e83c0..1b516ffa3 100644
--- a/app/src/main/res/xml/settings_ui.xml
+++ b/app/src/main/res/xml/settings_ui.xml
@@ -84,6 +84,11 @@
             android:icon="@drawable/ic_baseline_skip_next_24"
             android:key="@string/show_fillers_key"
             android:title="@string/show_fillers_settings" />
+        <SwitchPreference
+            android:defaultValue="true"
+            android:icon="@drawable/metadata_overlay_icon"
+            android:key="@string/show_player_metadata_key"
+            android:title="@string/show_player_metadata_overlay" />
         <SwitchPreference
             android:icon="@drawable/ic_baseline_play_arrow_24"
             android:summary="@string/random_button_settings_desc"

From 673569a7479f7340b004485acb147d72963e16a5 Mon Sep 17 00:00:00 2001
From: "recloudstream[bot]"
 <111277985+recloudstream[bot]@users.noreply.github.com>
Date: Sun, 29 Mar 2026 22:12:16 +0000
Subject: [PATCH 024/177] chore(locales): fix locale issues

---
 app/src/main/res/values-b+eo/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-b+eo/strings.xml b/app/src/main/res/values-b+eo/strings.xml
index 6809ceb7d..ccd18eae3 100644
--- a/app/src/main/res/values-b+eo/strings.xml
+++ b/app/src/main/res/values-b+eo/strings.xml
@@ -159,7 +159,7 @@
     <string name="search_provider_text_types">Serĉi uzante tipojn</string>
     <string name="subs_subtitle_languages">Subteksta Lingvo</string>
     <string name="action_open_watching">Pli da informoj</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="torrent_plot">Priskribo</string>
     <string name="torrent_no_plot">Neniu Priskribo Trovita</string>
     <string name="player_size_settings_des">Forigi nigrajn borderaĵojn</string>

From c26f2362027197f36e5591653ccb1ebb66ed20b7 Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Mon, 30 Mar 2026 00:29:27 +0200
Subject: [PATCH 025/177] Fix: Minor UX bugs with #2461

---
 .../ui/player/FullScreenPlayer.kt             | 64 +++++++++++++++++++
 .../cloudstream3/ui/player/GeneratorPlayer.kt | 13 ++--
 2 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 90274c938..fad4a53e1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -241,6 +241,53 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         return root
     }
 
+    /**
+     * Wet code but this can not be made into a function as it is a setter.
+     *
+     * The reason for this setter is to fix a bug with the titlecard popup, as we want it to autohide
+     * when pressing back.
+     *
+     * Note that we move the call to autoHide after field assignment with prevField to avoid inf recursion. */
+    protected var selectSourceDialog: Dialog? = null
+        set(value) {
+            val prevField = field
+            field = value
+            if (value == null && prevField != null) {
+                autoHide()
+            }
+        }
+    protected var selectTrackDialog: Dialog? = null
+        set(value) {
+            val prevField = field
+            field = value
+            if (value == null && prevField != null) {
+                autoHide()
+            }
+        }
+    protected var selectSpeedDialog: Dialog? = null
+        set(value) {
+            val prevField = field
+            field = value
+            if (value == null && prevField != null) {
+                autoHide()
+            }
+        }
+    protected var selectSubtitlesDialog: Dialog? = null
+        set(value) {
+            val prevField = field
+            field = value
+            if (value == null && prevField != null) {
+                autoHide()
+            }
+        }
+
+    /** Checks if any top level dialog is open and showing */
+    fun isDialogOpen() =
+        selectSourceDialog?.isShowing == true
+                || selectTrackDialog?.isShowing == true
+                || selectSpeedDialog?.isShowing == true
+                || selectSubtitlesDialog?.isShowing == true
+
     private fun scheduleMetadataVisibility() {
         val metadataScrim = playerBinding?.playerMetadataScrim ?: return
         val ctx = metadataScrim.context ?: return
@@ -262,7 +309,15 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
 
         if (isPaused) {
             metadataScrim.postDelayed({
+                /** Make sure the user has not interacted with anything */
                 if (token != metadataVisibilityToken) return@postDelayed
+                /** If already visible, then do not rerun the animation */
+                if (metadataScrim.isVisible) return@postDelayed
+                /** Failsafe, as this should only be shown when paused */
+                if (currentPlayerStatus != CSPlayerLoading.IsPaused) return@postDelayed
+                /** We do not want to show the logo in the background when the user is within another screen */
+                if (isDialogOpen()) return@postDelayed
+
                 metadataScrim.alpha = 0f
                 metadataScrim.isVisible = true
                 metadataScrim.animate()
@@ -751,6 +806,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         val dialog = Dialog(ctx, R.style.DialogFullscreenPlayer).apply {
             setContentView(binding.root)
         }
+        this.selectSubtitlesDialog = dialog
         dialog.show()
 
         val isPortrait =
@@ -840,20 +896,24 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             }
 
             dialog.setOnDismissListener {
+                selectSubtitlesDialog = null
                 if (isFullScreenPlayer)
                     activity?.hideSystemUI()
             }
             applyBtt.setOnClickListener {
+                selectSubtitlesDialog = null
                 subtitleDelay = currentOffset
                 dialog.dismissSafe(activity)
                 player.seekTime(1L)
             }
             resetBtt.setOnClickListener {
+                selectSubtitlesDialog = null
                 subtitleDelay = 0
                 dialog.dismissSafe(activity)
                 player.seekTime(1L)
             }
             cancelBtt.setOnClickListener {
+                selectSubtitlesDialog = null
                 dialog.dismissSafe(activity)
             }
         }
@@ -916,6 +976,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             if (isPlaying) {
                 player.handleEvent(CSPlayerEvent.Play, PlayerEventSource.UI)
             }
+            selectSpeedDialog = null
         }
 
         // if (isLayout(PHONE)) {
@@ -930,6 +991,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 .setView(binding.root)
         builder.setOnDismissListener(dismiss)
         val dialog = builder.create()
+        this.selectSpeedDialog = dialog
         dialog.show()
         //}
     }
@@ -1124,8 +1186,10 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
 
     private var currentTapIndex = 0
     protected fun autoHide() {
+        metadataVisibilityToken++
         currentTapIndex++
         delayHide()
+        scheduleMetadataVisibility()
     }
 
     protected fun hidePlayerUI() {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index de1b32467..ad7c8915f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -896,6 +896,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         viewModel.addSubtitles(subtitleData.toSet())
 
         selectSourceDialog?.dismissSafe()
+        selectSourceDialog = null
 
         showToast(
             String.format(ctx.getString(R.string.player_loaded_subtitles), selectedSubtitle.name),
@@ -936,10 +937,6 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
         }
 
-    private var selectSourceDialog: Dialog? = null
-    // var selectTracksDialog: AlertDialog? = null
-
-
     /** Will toast both when an error is found and when a subtitle is selected,
      * so only use from a user click and not a background process */
     private fun addFirstSub(query: SubtitleSearch) =
@@ -1072,6 +1069,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     loadFromOpenSubsFooter.setOnClickListener {
                         shouldDismiss = false
                         sourceDialog.dismissSafe(activity)
+                        selectSourceDialog = null
                         openOnlineSubPicker(it.context, currentLoadResponse) {
                             dismiss()
                         }
@@ -1092,6 +1090,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                         loadFromFirstSubsFooter.setOnClickListener {
                             sourceDialog.dismissSafe(activity)
+                            selectSourceDialog = null
                             showToast(R.string.loading)
                             addFirstSub(
                                 SubtitleSearch(
@@ -1267,6 +1266,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 binding.cancelBtt.setOnClickListener {
                     sourceDialog.dismissSafe(activity)
+                    this.selectSourceDialog = null
                 }
 
                 fun setProfileName(profile: Int) {
@@ -1317,6 +1317,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                     shouldDismiss = false
                     sourceDialog.dismissSafe(activity)
+                    selectSourceDialog = null
 
                     val index = prefValues.indexOf(currentPrefMedia)
                     activity?.showDialog(
@@ -1355,6 +1356,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                         }
                     }
                     sourceDialog.dismissSafe(activity)
+                    selectSourceDialog = null
                 }
             }
         } catch (e: Exception) {
@@ -1378,6 +1380,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 val binding: PlayerSelectTracksBinding =
                     PlayerSelectTracksBinding.inflate(LayoutInflater.from(ctx), null, false)
                 val trackDialog = Dialog(ctx, R.style.DialogFullscreenPlayer)
+                this.selectTrackDialog = trackDialog
                 trackDialog.setContentView(binding.root)
                 trackDialog.show()
 
@@ -1486,6 +1489,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 binding.cancelBtt.setOnClickListener {
                     trackDialog.dismissSafe(activity)
+                    this.selectTrackDialog = null
                 }
 
                 binding.applyBtt.setOnClickListener {
@@ -1503,6 +1507,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                         player.setMaxVideoSize(width, height, currentVideo?.id)
                     }
                     trackDialog.dismissSafe(activity)
+                    this.selectTrackDialog = null
                 }
             }
         } catch (e: Exception) {

From d23fb0ac4ca0f81d6d0de16322b3a63dec9e691e Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Mon, 30 Mar 2026 17:10:00 +0200
Subject: [PATCH 026/177] Translated using Weblate (Swedish)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Ukrainian)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (4 of 4 strings)

Translated using Weblate (Korean)

Currently translated at 100.0% (725 of 725 strings)

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Translated using Weblate (Korean)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Korean)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Slovak)

Currently translated at 62.6% (454 of 725 strings)

Translated using Weblate (Esperanto)

Currently translated at 23.7% (172 of 725 strings)

Translated using Weblate (Chinese (Traditional Han script))

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Chinese (Traditional Han script))

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Bulgarian)

Currently translated at 99.1% (719 of 725 strings)

Translated using Weblate (Latvian)

Currently translated at 81.2% (589 of 725 strings)

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Translated using Weblate (Esperanto)

Currently translated at 17.5% (127 of 725 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Vietnamese)

Currently translated at 99.8% (724 of 725 strings)

Translated using Weblate (Hungarian)

Currently translated at 82.0% (595 of 725 strings)

Translated using Weblate (Korean)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Belarusian)

Currently translated at 99.5% (722 of 725 strings)

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Translated using Weblate (Belarusian)

Currently translated at 99.5% (722 of 725 strings)

Translated using Weblate (Filipino)

Currently translated at 21.2% (154 of 725 strings)

Translated using Weblate (Hungarian)

Currently translated at 77.3% (561 of 725 strings)

Translated using Weblate (Dutch)

Currently translated at 89.1% (646 of 725 strings)

Translated using Weblate (Tamil)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (German)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Tamil)

Currently translated at 100.0% (725 of 725 strings)

Translated using Weblate (Hungarian)

Currently translated at 75.4% (547 of 725 strings)

Co-authored-by: Ardev Prisec <prisecardev@gmail.com>
Co-authored-by: Aron Folkerts <aronfolkerts@gmail.com>
Co-authored-by: Daniel Konstantinov <bgshadow2010@gmail.com>
Co-authored-by: David Hermann <theumis@users.noreply.hosted.weblate.org>
Co-authored-by: Fjuro <fjuro@users.noreply.hosted.weblate.org>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Jen Xie <aulaul825879@gmail.com>
Co-authored-by: Massimo Pissarello <mapi68@gmail.com>
Co-authored-by: Matthaiks <kitynska@gmail.com>
Co-authored-by: Nguyễn Tiến Đạt <dn16092000@gmail.com>
Co-authored-by: Romhányi-Kakucska Viktor <viktor@romhanyi.dev>
Co-authored-by: Sasha Glazko <lenify@users.noreply.hosted.weblate.org>
Co-authored-by: Wacky Wars <wackywars21@gmail.com>
Co-authored-by: bittin1ddc447d824349b2 <bittin@reimu.nl>
Co-authored-by: clearstripe <sakurasan000510@gmail.com>
Co-authored-by: hollow <ichigo0404@hotmail.com>
Co-authored-by: hou1234 <gjqmgjsl3@gmail.com>
Co-authored-by: jpkaster 77 <jpkaster81@gmail.com>
Co-authored-by: programutox <programutox@disroot.org>
Co-authored-by: tomas293 <tomaskopodstreleny@gmail.com>
Co-authored-by: தமிழ்நேரம் <tamilneram247@gmail.com>
Co-authored-by: ℂ𝕠𝕠𝕠𝕝 (𝕘𝕚𝕥𝕙𝕦𝕓.𝕔𝕠𝕞/ℂ𝕠𝕠𝕠𝕝) <coool@mail.lv>
Co-authored-by: 大王叫我来巡山 <hamburger2048@users.noreply.hosted.weblate.org>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/be/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bg/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/cs/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/eo/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fil/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hu/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/it/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ko/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/lv/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pt/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sv/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ta/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/uk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/vi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hant/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/fastlane/ar/
Translation: Cloudstream/App
Translation: Cloudstream/Fastlane
---
 app/src/main/res/values-b+ar/strings.xml      |  24 ++++
 app/src/main/res/values-b+cs/strings.xml      |   1 +
 app/src/main/res/values-b+it/strings.xml      |   1 +
 app/src/main/res/values-b+ko/strings.xml      | 126 +++++++++---------
 app/src/main/res/values-b+pl/strings.xml      |   1 +
 app/src/main/res/values-b+sv/strings.xml      |   1 +
 app/src/main/res/values-b+uk/strings.xml      |  58 ++++----
 app/src/main/res/values-b+zh/strings.xml      |   1 +
 .../metadata/android/ar/full_description.txt  |   8 +-
 9 files changed, 124 insertions(+), 97 deletions(-)

diff --git a/app/src/main/res/values-b+ar/strings.xml b/app/src/main/res/values-b+ar/strings.xml
index c68a5a649..91f8f0e64 100644
--- a/app/src/main/res/values-b+ar/strings.xml
+++ b/app/src/main/res/values-b+ar/strings.xml
@@ -756,4 +756,28 @@
     <string name="show_episode_text">نص الحلقة</string>
     <string name="video_info">معلومات الوسائط</string>
     <string name="source_name">اسم المصدر</string>
+    <string name="download_queue">شريط التنزيلات</string>
+    <string name="queue_empty_message">لا يوجد تنزيلات قيد الانتظار حاليا.</string>
+    <string name="source_priority">أولوية المصدر</string>
+    <string name="source_priority_help">حَدِّد كيف يجب ترتيب مصادر الفيديو في المُشَّغِل</string>
+    <string name="download_all">تنزيل الكل</string>
+    <string name="cancel_all">إلغاء الكل</string>
+    <string name="download_episode_range">هل ترغب في تنزيل الحلقة %s ؟</string>
+    <string name="cancel_queue_message">هل ترغب في إلغاء جميع التنزيلات قيد الانتظار؟</string>
+    <plurals name="downloads_active">
+        <item quantity="zero">%d لا يوجد تنزيل نشط</item>
+        <item quantity="one">%d تنزيل واحد نشط</item>
+        <item quantity="two">%d تنزيلان نشطان</item>
+        <item quantity="few">%d تنزيلات نشطة</item>
+        <item quantity="many">%d تنزيل نشط</item>
+        <item quantity="other">%d تنزيل نشط</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="zero">%d لا يوجد تنزيلات في قائمة الانتظار</item>
+        <item quantity="one">%d تنزيل واحد قيد الانتظار</item>
+        <item quantity="two">%d تنزيلان قيد الانتظار</item>
+        <item quantity="few">%d تنزيلات قيد الانتظار</item>
+        <item quantity="many">%d تنزيل قيد الانتظار</item>
+        <item quantity="other">%d تنزيل قيد الانتظار</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values-b+cs/strings.xml b/app/src/main/res/values-b+cs/strings.xml
index 3f7675534..96110d9c1 100644
--- a/app/src/main/res/values-b+cs/strings.xml
+++ b/app/src/main/res/values-b+cs/strings.xml
@@ -778,4 +778,5 @@
     </plurals>
     <string name="source_priority">Priorita zdrojů</string>
     <string name="source_priority_help">Rozhodněte, jak mají být řazeny zdroje videí v přehrávači</string>
+    <string name="show_player_metadata_overlay">Zobrazit překrytí metadat v přehrávači</string>
 </resources>
diff --git a/app/src/main/res/values-b+it/strings.xml b/app/src/main/res/values-b+it/strings.xml
index e75b4eb8c..08a1572d6 100644
--- a/app/src/main/res/values-b+it/strings.xml
+++ b/app/src/main/res/values-b+it/strings.xml
@@ -783,4 +783,5 @@
     </plurals>
     <string name="source_priority">Priorità sorgente</string>
     <string name="source_priority_help">Decidi come le sorgenti video devono essere ordinate nel lettore</string>
+    <string name="show_player_metadata_overlay">Mostra sovrapposizione metadati lettore</string>
 </resources>
diff --git a/app/src/main/res/values-b+ko/strings.xml b/app/src/main/res/values-b+ko/strings.xml
index 04c113b5b..868e2736e 100644
--- a/app/src/main/res/values-b+ko/strings.xml
+++ b/app/src/main/res/values-b+ko/strings.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="cast_format" formatted="true">출연: %s</string>
-    <string name="next_episode_format" formatted="true">에피소드 %d이(가) 공개됩니다</string>
+    <string name="next_episode_format" formatted="true">에피소드 %d이(가) 공개 예정</string>
     <string name="search_poster_img_des">포스터</string>
     <string name="episode_poster_img_des">에피소드 포스터</string>
     <string name="home_main_poster_img_des">메인 포스터</string>
-    <string name="home_next_random_img_des">다음 랜덤</string>
+    <string name="home_next_random_img_des">다음 추천</string>
     <string name="go_back_img_des">뒤로가기</string>
     <string name="home_change_provider_img_des">소스 변경</string>
     <string name="preview_background_img_des">미리보기 배경</string>
@@ -33,7 +33,7 @@
     <string name="type_watching">시청</string>
     <string name="type_on_hold">보류</string>
     <string name="type_completed">시청 완료</string>
-    <string name="type_dropped">포기</string>
+    <string name="type_dropped">시청 포기</string>
     <string name="type_plan_to_watch">시청 예정</string>
     <string name="type_re_watching">다시보기</string>
     <string name="play_movie_button">영화 재생</string>
@@ -46,10 +46,10 @@
     <string name="play_episode">에피소드 재생</string>
     <string name="download">다운로드</string>
     <string name="popup_play_file">파일 재생</string>
-    <string name="popup_resume_download">계속 다운로드</string>
+    <string name="popup_resume_download">다운로드 재개</string>
     <string name="popup_pause_download">다운로드 일시정지</string>
     <string name="home_more_info">상세 정보</string>
-    <string name="home_expanded_hide">닫기</string>
+    <string name="home_expanded_hide">숨기기</string>
     <string name="home_play">재생</string>
     <string name="home_info">정보</string>
     <string name="action_add_to_bookmarks">시청 상태 설정</string>
@@ -109,7 +109,7 @@
     <string name="player_subtitles_settings_des">플레이어 자막 설정</string>
     <string name="chromecast_subtitles_settings">Chromecast 자막</string>
     <string name="chromecast_subtitles_settings_des">Chromecast 자막 설정</string>
-    <string name="eigengraumode_settings">Playback 속도</string>
+    <string name="eigengraumode_settings">재생 속도</string>
     <string name="swipe_to_seek_settings">스와이프하여 탐색</string>
     <string name="swipe_to_seek_settings_des">좌우로 스와이프하여 동영상 위치 제어하기</string>
     <string name="swipe_to_change_settings">스와이프하여 설정 변경</string>
@@ -150,13 +150,13 @@
     <string name="benene_des">바나나 줌</string>
     <string name="app_language">앱 언어</string>
     <string name="no_links_found_toast">링크를 찾을 수 없음</string>
-    <string name="copy_link_toast">클립보드에 링크 복사됨</string>
+    <string name="copy_link_toast">클립보드에 링크 복사함</string>
     <string name="play_episode_toast">에피소드 재생</string>
     <string name="subs_default_reset_toast">기본값으로 재설정</string>
     <string name="episodes">에피소드</string>
     <string name="episodes_range">%1$d-%2$d</string>
-    <string name="status_ongoing">진행중</string>
-    <string name="status_completed">시청 완료</string>
+    <string name="status_ongoing">방영 중</string>
+    <string name="status_completed">완결</string>
     <string name="status">상태</string>
     <string name="year">년</string>
     <string name="rating">평점</string>
@@ -183,7 +183,7 @@
     <string name="episode_action_play_in_app">앱에서 재생</string>
     <string name="episode_action_play_in_format">%s에서 재생</string>
     <string name="episode_action_auto_download">자동 다운로드</string>
-    <string name="episode_action_download_mirror">다운로드 미러</string>
+    <string name="episode_action_download_mirror">다운로드 가능 목록 보기</string>
     <string name="episode_action_reload_links">링크 새로고침</string>
     <string name="episode_action_download_subtitle">자막 다운로드</string>
     <string name="show_hd">화질 탭</string>
@@ -198,7 +198,7 @@
     <string name="skip_update">이 업데이트 건너뛰기</string>
     <string name="watch_quality_pref">선호하는 화질 (WiFi)</string>
     <string name="watch_quality_pref_data">선호하는 화질 (모바일 데이터)</string>
-    <string name="limit_title_rez">본문 바로가기</string>
+    <string name="limit_title_rez">플레이어 내 표시 정보</string>
     <string name="video_buffer_size_settings">동영상 버퍼 크기</string>
     <string name="video_buffer_clear_settings">동영상 및 이미지 캐시 지우기</string>
     <string name="dns_pref">DNS over HTTPS</string>
@@ -217,10 +217,10 @@
     <string name="category_general">일반</string>
     <string name="pref_category_player_features">플레이어 기능</string>
     <string name="pref_category_ui_features">기능</string>
-    <string name="provider_lang_settings">확장 언어</string>
+    <string name="provider_lang_settings">확장프로그램 언어</string>
     <string name="app_layout">앱 레이아웃</string>
     <string name="preferred_media_settings">선호하는 미디어</string>
-    <string name="enable_nsfw_on_providers">지원된 연장에 NSFW 활성화</string>
+    <string name="enable_nsfw_on_providers">확장프로그램에서 NSFW 활성화</string>
     <string name="subtitles_encoding">자막 인코딩</string>
     <string name="category_providers">소스</string>
     <string name="category_provider_test">소스 테스트</string>
@@ -277,7 +277,7 @@
     <string name="error_invalid_data">잘못된 데이터</string>
     <string name="error_invalid_url">잘못된 URL</string>
     <string name="error">오류</string>
-    <string name="subtitles_remove_captions">자막에서 선택 캡션 제거</string>
+    <string name="subtitles_remove_captions">자막에서 청각 장애인용 자막 요소 제거</string>
     <string name="subtitles_filter_lang">선호하는 미디어 언어로 필터링</string>
     <string name="trailer">예고편</string>
     <string name="next">다음</string>
@@ -324,7 +324,7 @@
     <string name="subscription_episode_released">에피소드 %d 공개!</string>
     <string name="picture_in_picture">Picture-in-picture</string>
     <string name="player_size_settings">플레이어 크기 조정 버튼</string>
-    <string name="picture_in_picture_des">다른 앱 위에 있는 미니어처 플레이어에서 재생을 계속합니다</string>
+    <string name="picture_in_picture_des">미니플레이어를 통해 다른 앱 상단에서 계속 재생됩니다</string>
     <string name="player_size_settings_des">검은색 테두리 제거</string>
     <string name="double_tap_to_seek_settings_des">오른쪽 또는 왼쪽을 두 번 탭하여 앞뒤로 탐색하기</string>
     <string name="player_subtitles_settings">자막</string>
@@ -353,8 +353,8 @@
     <string name="test_failed">실패</string>
     <string name="sync_score">평점</string>
     <string name="extension_rating" formatted="true">평점: %s</string>
-    <string name="sort_rating_desc">평점 (높음에서 낮음으로)</string>
-    <string name="sort_rating_asc">평점 (낮음에서 높음으로)</string>
+    <string name="sort_rating_desc">평점 (높은순)</string>
+    <string name="sort_rating_asc">평점 (낮은순)</string>
     <string name="nsfw_singular">19금</string>
     <string name="documentaries">다큐멘터리</string>
     <string name="livestreams">라이브 방송</string>
@@ -461,8 +461,8 @@
     <string name="delayed_update_notice">앱 종료시 업데이트됩니다</string>
     <string name="sort_by">정렬 기준</string>
     <string name="sort">정렬</string>
-    <string name="sort_updated_new">업데이트됨 (새로움에서 오래된 순)</string>
-    <string name="sort_updated_old">업데이트 (오래됨에서 새로운 순)</string>
+    <string name="sort_updated_new">업데이트 (최신순)</string>
+    <string name="sort_updated_old">업데이트 (오래된순)</string>
     <string name="sort_alphabetical_a">알파벳순 (A에서 Z)</string>
     <string name="sort_alphabetical_z">알파벳순 (Z에서 A)</string>
     <string name="open_with">다음으로 열기</string>
@@ -497,12 +497,12 @@
     <string name="pref_category_actions">동작</string>
     <string name="pref_category_looks">외형</string>
     <string name="random_button_settings">랜덤 버튼</string>
-    <string name="random_button_settings_desc">홈페이지 및 도서관에서 임의 버튼 표시</string>
+    <string name="random_button_settings_desc">홈페이지 및 라이브러리에서 랜덤 버튼 표시</string>
     <string name="bottom_title_settings_des">포스터 아래에 제목을 이동</string>
     <string name="subtitles_depressed">내려감</string>
     <string name="subtitles_raised">올라감</string>
     <string name="subtitles_example_text">다람쥐 헌 쳇바퀴에 타고파</string>
-    <string name="subtitles_remove_bloat">자막에서 부풀림 제거</string>
+    <string name="subtitles_remove_bloat">자막에서 불필요한 요소/코드 제거</string>
     <string name="extras">엑스트라</string>
     <string name="network_adress_example">https://example.com/example.mp4</string>
     <string name="tracks">트랙</string>
@@ -515,13 +515,13 @@
     <string name="subscription_new">구독 %s</string>
     <string name="subscription_deleted">구독 취소 %s</string>
     <string name="pref_category_security">보안</string>
-    <string name="pref_category_accounts">장부</string>
+    <string name="pref_category_accounts">계정</string>
     <string name="no_plugins_found_error">리포지토리에서 플러그인을 찾을 수 없습니다</string>
     <string name="toast_copied">복사됨!</string>
     <string name="repo_copy_label">레포지토리 이름 및 URL</string>
     <string name="test_extensions_summary">본 테스트는 개발자만을 대상으로 하며, 확장자의 작업을 확인하거나 거부하지 않습니다.</string>
     <string name="cs3wiki">클라우스스트림 위키</string>
-    <string name="links_reloaded_toast">다시 기록된 링크</string>
+    <string name="links_reloaded_toast">링크 새로고침 완료</string>
     <string name="backup_frequency">백업 빈도</string>
     <string name="favorites_list_name">즐겨찾기</string>
     <string name="qr_image">QR 이미지</string>
@@ -608,12 +608,12 @@
 \n총 비디오 우선 순위는 10입니다.
 \n
 \n참고: 합이 10 이상이면 해당 링크가 로드되면 플레이어는 자동으로 로드를 건너뜁니다!</string>
-    <string name="next_season_episode_format" formatted="true">시즌 %1$d 에피소드 %2$d이(가) 출시됩니다</string>
+    <string name="next_season_episode_format" formatted="true">시즌 %1$d 에피소드 %2$d이(가) 공개 예정</string>
     <string name="result_search_tooltip">다른 확장자에서 검색</string>
     <string name="subscribe_tooltip">새로운 에피소드 알림</string>
-    <string name="recommendations_tooltip">권장 사항 표시</string>
+    <string name="recommendations_tooltip">추천목록 보기</string>
     <string name="speed_setting_summary">플레이어에 속도 옵션을 추가합니다</string>
-    <string name="episode_upcoming_format" formatted="true">%s로 출시 예정</string>
+    <string name="episode_upcoming_format" formatted="true">%s 후 공개 예정</string>
     <string name="resume_remaining" formatted="true">%s
 \n남음</string>
     <string name="duplicate_title">잠재적 중복 발견</string>
@@ -623,8 +623,8 @@
     <string name="delete_plugin">플러그인 삭제</string>
     <string name="test_warning">경고</string>
     <string name="preview_seekbar">탐색바 미리보기</string>
-    <string name="preview_seekbar_desc">탐색바에서 미리보기 화면 활성화</string>
-    <string name="play_from_beginning_img_des">처음부터 시작</string>
+    <string name="preview_seekbar_desc">탐색바에서 화면 미리보기 활성화</string>
+    <string name="play_from_beginning_img_des">처음부터 재생</string>
     <string name="downloads_empty">현재 다운로드가 없습니다.</string>
     <string name="downloads_delete_select">삭제할 항목을 선택하십시오</string>
     <string name="offline_file">오프라인 시청가능</string>
@@ -645,10 +645,10 @@
     <string name="delete_message_series_only" formatted="true">다음 시리즈의 모든 에피소드를 영구적으로 삭제 하시겠습니까??
 \n
 \n%s</string>
-    <string name="sort_release_date_new">출시일 (새로운 것부터 오래된 것)</string>
-    <string name="sort_release_date_old">출시일 (오래된것부터 새로운것)</string>
-    <string name="hide_player_control_names">플레이어 컨트롤 이름 숨기기</string>
-    <string name="torrent_info">이 동영상은 토렌트이므로 동영상 활동이 추적될 수 있습니다.\n계속하기 전에 토렌트에 대해 충분히 이해했는지 확인하세요.</string>
+    <string name="sort_release_date_new">공개일 (최신순)</string>
+    <string name="sort_release_date_old">공개일 (오래된순)</string>
+    <string name="hide_player_control_names">플레이어 내 버튼명 숨기기</string>
+    <string name="torrent_info">이 동영상은 토렌트이므로 시청 활동이 추적될 수 있습니다.\n계속하기 전에 토렌트에 대해 충분히 이해했는지 확인하세요.</string>
     <string name="audio_singluar">오디오</string>
     <string name="podcast_singluar">팟캐스트</string>
     <string name="begin_speaking">시작하기 …</string>
@@ -662,7 +662,7 @@
     <string name="install_prerelease">출시 전 버전 설치</string>
     <string name="prerelease_already_installed">출시 전 버전이 이미 설치되어 있습니다.</string>
     <string name="prerelease_install_failed">출시 전 버전 설치 실패.</string>
-    <string name="episode_action_play_mirror">미러 재생</string>"
+    <string name="episode_action_play_mirror">재생 가능 목록 보기</string>"
     <string name="show_rating">평가 라벨</string>
     <string name="show_episode_text">에피소드 본문</string>
     <string name="player_load_one_subtitle_online">사용 가능한 자막 불러오기</string>
@@ -671,24 +671,24 @@
     <string name="sort_episodes_number_desc">에피소드 (내림차순)</string>
     <string name="sort_episodes_rating_high_low">평가 (높은순)</string>
     <string name="sort_episodes_rating_low_high">평가 (낮은순)</string>
-    <string name="sort_episodes_date_newest">방영 날짜 (최신순)</string>
-    <string name="sort_episodes_date_oldest">방영 날짜 (오래된순)</string>
+    <string name="sort_episodes_date_newest">공개일 (최신순)</string>
+    <string name="sort_episodes_date_oldest">공개일 (오래된순)</string>
     <string name="sort_button_episode">에피소드 %s</string>
     <string name="sort_button_rating">평가 %s</string>
     <string name="sort_button_date">날짜 %s</string>
     <string name="no_account">계정 없음</string>
-    <string name="no_subtitles_loaded">자막을 아직 불러오지 않았습니다</string>
+    <string name="no_subtitles_loaded">자막이 아직 로드되지 않음</string>
     <string name="backup_path_title">백업 폴더 위치</string>
     <string name="custom">커스텀</string>
     <string name="confirm_before_exiting_title">나가기 전에 확인</string>
-    <string name="confirm_before_exiting_desc">이 문항을 앱에서 나가기 전에 보이기</string>
+    <string name="confirm_before_exiting_desc">이 알림을 앱 종료 전에 표시</string>
     <string name="show">보이기</string>
     <string name="dont_show">보이지 않기</string>
     <string name="subs_edge_size">테두리 크기</string>
     <string name="torrent_preferred_media">Settings/Providers/Preferred media 에서 토렌트 활성화</string>
     <string name="torrent_not_accepted">진행하려면 앱 재시작 후 토렌트 스트리밍 팝업란의 수락이 필요합니다.</string>
     <string name="software_decoding">소프트웨어 디코딩</string>
-    <string name="software_decoding_desc">소프트웨어 디코딩은 당신의 기기에서 지원되지 않는 영상 파일들을 재생할 수 있지만, 높은 화질에서 렉 또는 불안정한 재생을 유발할 수 있습니다.</string>
+    <string name="software_decoding_desc">소프트웨어 디코딩은 해당 기기에서 지원되지 않는 영상 파일들을 재생할 수 있지만, 높은 화질에서 렉 또는 불안정한 재생을 유발할 수 있습니다.</string>
     <string name="volume_exceeded_100">볼륨이 100%를 초과하였습니다</string>
     <string name="slide_up_again_to_exceed_100">100% 너머로 높이려면 한번 더 슬라이드 하십시오</string>
     <string name="update_plugins">플러그인 업데이트하기</string>
@@ -697,18 +697,18 @@
     <string name="plugins_updated_manually">성공적으로 %d 플러그인을 업데이트 하였습니다!</string>
     <string name="no_plugins_updated_manually">업데이트 된 플러그인이 없습니다.</string>
     <string name="player_notification_channel_name">플레이어 알림</string>
-    <string name="player_notification_channel_description">백그라운드에서 재생을 조종할 수 있는 플레이어 알림</string>
-    <string name="subtitles_from_embedded">내장된</string>
+    <string name="player_notification_channel_description">백그라운드에서 재생을 제어하기 위한 플레이어 알림</string>
+    <string name="subtitles_from_embedded">내장 자막</string>
     <string name="subtitles_from_online">온라인</string>
-    <string name="all_subtitles_bold">모든 자막 굵게</string>
-    <string name="all_subtitles_italic">모든 자막 기울기</string>
+    <string name="all_subtitles_bold">자막 글꼴 굵게 표시</string>
+    <string name="all_subtitles_italic">자막 글꼴 기울게 표시</string>
     <string name="download_parallel_settings_des">병렬로 다운로드 할 수 있는 아이템의 수</string>
     <string name="parallel_downloads">병렬 다운로드</string>
     <string name="concurrent_connections">동시 연결수</string>
     <string name="concurrent_connections_settings_des">다운로드 시 각 항목마다 사용할 수 있는 동시 연결의 수</string>
     <string name="go_to_downloads">다운로드로 가기</string>
     <string name="no_internet_connection">인터넷 연결 없음.\n\n인터넷에 연결 한 후 재시도 하거나, 혹은 이미 다운로드 된 항목을 재생하십시오.</string>
-    <string name="overscan_settings_des">화면 경계 조정</string>
+    <string name="overscan_settings_des">화면의 잘림 현상을 방지하기 위해 경계를 조정합니다</string>
     <string name="poster_size_settings_des">포스터 크기 변경</string>
     <string name="poster_size_settings">포스터 크기</string>
     <string name="speedup_title">길게 눌러 배속 활성화</string>
@@ -718,8 +718,8 @@
     <string name="edit_profile_image_error_empty">URL을 찾을 수 없습니다</string>
     <string name="edit_profile_image_error_invalid">잘못된 URL 혹은 이미지 입니다</string>
     <string name="edit_profile_image_success">이미지 업데이트 성공</string>
-    <string name="action_mark_watched_up_to_this_episode">이 에피소드 까지 봤음 표시</string>
-    <string name="action_remove_mark_watched_up_to_this_episode">이 에피소드 까지 봤음 표시 제거</string>
+    <string name="action_mark_watched_up_to_this_episode">이 에피소드까지 시청함으로 표시</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">이 에피소드까지 시청함 표시 제거</string>
     <string name="name">이름</string>
     <string name="resolution_and_name">해상도 및 이름</string>
     <string name="subs_subtitle_alignment">자막 정렬</string>
@@ -732,9 +732,9 @@
     <string name="top_left">왼쪽 위</string>
     <string name="top_center">중앙 위</string>
     <string name="top_right">오른쪽 위</string>
-    <string name="source_priority_help">비디오 소스가 플레이어에서 정렬되어야하는 방법 결정</string>
-    <string name="extra_brightness_settings_des">100% 표시 광도가 초과될 때 Enable 광도 여과기</string>
-    <string name="cancel_queue_message">모든 퀴즈 다운로드를 취소하시겠습니까?</string>
+    <string name="source_priority_help">비디오 소스가 플레이어에서 정렬되는 순서 설정</string>
+    <string name="extra_brightness_settings_des">디스플레이 밝기가 100%를 초과하면 밝기 필터를 활성화합니다</string>
+    <string name="cancel_queue_message">모든 다운로드 큐를 취소하시겠습니까?</string>
     <string name="download_episode_range">에피소드를 다운로드 하시겠습니까 %s?</string>
     <string name="queue_empty_message">현재 누락된 다운로드가 없습니다.</string>
     <plurals name="downloads_active">
@@ -743,20 +743,20 @@
     <plurals name="downloads_queued">
         <item quantity="other">%d 다운로드</item>
     </plurals>
-    <string name="search_suggestions_des">검색 결과 표시</string>
-    <string name="show_cast_in_details">회사 소개</string>
-    <string name="background_radius">배경 반경</string>
-    <string name="reload_provider">Reload 공급자</string>
-    <string name="search_suggestions">검색 제안</string>
-    <string name="clear_suggestions">자주 묻는 질문</string>
+    <string name="search_suggestions_des">입력하는 동안 검색어 제안 표시</string>
+    <string name="show_cast_in_details">출연진 정보 표시</string>
+    <string name="background_radius">배경 모서리 곡률</string>
+    <string name="reload_provider">공급자 새로고침</string>
+    <string name="search_suggestions">검색어 제안</string>
+    <string name="clear_suggestions">제안 삭제</string>
     <string name="video_info">미디어 정보</string>
-    <string name="source_name">근원 이름</string>
-    <string name="extra_brightness_settings">추가 밝기</string>
-    <string name="download_queue">다운로드 queue</string>
-    <string name="download_all">다운로드</string>
-    <string name="cancel_all">모든 것</string>
-    <string name="source_priority">근원 우선권</string>
-    <string name="overscan_settings">구름 많음</string>
-    <string name="action_reload">관련 상품</string>
-    <string name="extra_brightness_key">추가_brightness_enabled</string>
+    <string name="source_name">소스 이름</string>
+    <string name="extra_brightness_settings">최대 밝기 확장</string>
+    <string name="download_queue">다운로드 큐</string>
+    <string name="download_all">모두 다운로드</string>
+    <string name="cancel_all">모두 취소</string>
+    <string name="source_priority">소스 우선순위</string>
+    <string name="overscan_settings">오버스캔(화면 경계) 설정</string>
+    <string name="action_reload">새로고침</string>
+    <string name="extra_brightness_key">최대 밝기 확장 활성화</string>
 </resources>
diff --git a/app/src/main/res/values-b+pl/strings.xml b/app/src/main/res/values-b+pl/strings.xml
index fc167da5a..c8126f2fe 100644
--- a/app/src/main/res/values-b+pl/strings.xml
+++ b/app/src/main/res/values-b+pl/strings.xml
@@ -766,4 +766,5 @@
     </plurals>
     <string name="source_priority">Priorytet źródła</string>
     <string name="source_priority_help">Zdecyduj, jak mają być sortowane źródła wideo w odtwarzaczu</string>
+    <string name="show_player_metadata_overlay">Pokaż nakładkę metadanych odtwarzacza</string>
 </resources>
diff --git a/app/src/main/res/values-b+sv/strings.xml b/app/src/main/res/values-b+sv/strings.xml
index ddc7636b1..e388b67e1 100644
--- a/app/src/main/res/values-b+sv/strings.xml
+++ b/app/src/main/res/values-b+sv/strings.xml
@@ -759,4 +759,5 @@
     <string name="all_subtitles_bold">Gör alla undertexter fetstilta</string>
     <string name="all_subtitles_italic">Gör alla undertexter kursivstila</string>
     <string name="background_radius">Bakgrundsradie</string>
+    <string name="show_player_metadata_overlay">Visa spelarens metadata överlägg</string>
 </resources>
diff --git a/app/src/main/res/values-b+uk/strings.xml b/app/src/main/res/values-b+uk/strings.xml
index b97c16a7e..cec3b6738 100644
--- a/app/src/main/res/values-b+uk/strings.xml
+++ b/app/src/main/res/values-b+uk/strings.xml
@@ -45,8 +45,8 @@
     <string name="download_done">Завантаження Завершено</string>
     <string name="app_dubbed_text">Дуб.</string>
     <string name="app_subbed_text">Суб.</string>
-    <string name="popup_delete_file">Видалити файл</string>
-    <string name="popup_resume_download">Відновити завантаження</string>
+    <string name="popup_delete_file">Видалити Файл</string>
+    <string name="popup_resume_download">Відновити Завантаження</string>
     <string name="home_expanded_hide">Приховати</string>
     <string name="home_play">Переглянути</string>
     <string name="home_info">Подробиці</string>
@@ -57,28 +57,28 @@
     <string name="sort_copy">Скопіювати</string>
     <string name="sort_close">Закрити</string>
     <string name="sort_save">Зберегти</string>
-    <string name="player_speed">Швидкість плеєра</string>
-    <string name="subs_window_color">Колір вікна</string>
-    <string name="subs_edge_type">Тип обведення</string>
+    <string name="player_speed">Швидкість Плеєра</string>
+    <string name="subs_window_color">Колір Вікна</string>
+    <string name="subs_edge_type">Тип Межі</string>
     <string name="subs_font">Шрифт</string>
-    <string name="subs_font_size">Розмір шрифту</string>
+    <string name="subs_font_size">Розмір Шрифту</string>
     <string name="search_provider_text_providers">Пошук за постачальниками</string>
     <string name="search_provider_text_types">Пошук за типами</string>
-    <string name="benene_count_text_none">Жодного банана не надано</string>
-    <string name="subs_auto_select_language">Автовибір мови</string>
-    <string name="subs_download_languages">Завантажити мови</string>
-    <string name="subs_subtitle_languages">Мова субтитрів</string>
+    <string name="benene_count_text_none">Жодного Benenes не надано</string>
+    <string name="subs_auto_select_language">Авто-Вибір Мови</string>
+    <string name="subs_download_languages">Завантажити Мови</string>
+    <string name="subs_subtitle_languages">Мова Субтитрів</string>
     <string name="subs_hold_to_reset_to_default">Утримуйте, щоби скинути до типових налаштувань</string>
     <string name="subs_import_text" formatted="true">Імпортуйте шрифти, помістивши їх до %s</string>
-    <string name="continue_watching">Продовжити перегляд</string>
+    <string name="continue_watching">Продовжити Перегляд</string>
     <string name="action_remove_watching">Вилучити</string>
     <string name="action_open_watching">Докладніше</string>
     <string name="vpn_torrent">Цей постачальник є торентом, рекомендується використовувати VPN</string>
     <string name="torrent_plot">Опис</string>
-    <string name="normal_no_plot">Сюжет не знайдено</string>
-    <string name="torrent_no_plot">Опис не знайдено</string>
+    <string name="normal_no_plot">Сюжет Не Знайдено</string>
+    <string name="torrent_no_plot">Опис Не Знайдено</string>
     <string name="show_log_cat">Показати Logcat 🐈</string>
-    <string name="picture_in_picture_des">Продовжувати відтворення в малому програвачі поверх інших застосунків</string>
+    <string name="picture_in_picture_des">Продовжувати відтворення в мініатюрному програвачі поверх інших застосунків</string>
     <string name="player_size_settings_des">Прибрати чорні смуги</string>
     <string name="player_subtitles_settings">Субтитри</string>
     <string name="chromecast_subtitles_settings">Субтитри Chromecast</string>
@@ -106,19 +106,19 @@
     <string name="download_failed">Завантаження не Вдалося</string>
     <string name="update_started">Оновлення Розпочато</string>
     <string name="error_loading_links_toast">Помилка Завантаження Посилань</string>
-    <string name="popup_pause_download">Призупинити завантаження</string>
-    <string name="popup_play_file">Переглянути файл</string>
+    <string name="popup_pause_download">Призупинити Завантаження</string>
+    <string name="popup_play_file">Переглянути Файл</string>
     <string name="home_more_info">Докладніше</string>
-    <string name="filter_bookmarks">Фільтр закладок</string>
+    <string name="filter_bookmarks">Фільтрувати Закладки</string>
     <string name="sort_clear">Очистити</string>
-    <string name="subtitles_settings">Налаштування субтитрів</string>
-    <string name="subs_background_color">Колір тла</string>
-    <string name="subs_subtitle_elevation">Висота субтитрів</string>
-    <string name="subs_text_color">Колір тексту</string>
-    <string name="subs_outline_color">Колір обведення</string>
+    <string name="subtitles_settings">Налаштування Субтитрів</string>
+    <string name="subs_background_color">Колір Тла</string>
+    <string name="subs_subtitle_elevation">Висота Субтитрів</string>
+    <string name="subs_text_color">Колір Тексту</string>
+    <string name="subs_outline_color">Колір Обведення</string>
     <string name="autoplay_next_settings">Автовідтворення наступного епізоду</string>
     <string name="swipe_to_seek_settings_des">Проведіть збоку в бік, щоби керувати часом відтворення у відео</string>
-    <string name="benene_count_text">%d бананів надано розробникам</string>
+    <string name="benene_count_text">%d Benenes надано розробникам</string>
     <string name="player_size_settings">Кнопка зміни розміру програвача</string>
     <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Для коректної роботи цього постачальника може знадобитися VPN</string>
@@ -128,7 +128,7 @@
     <string name="swipe_to_seek_settings">Провести, щоби перемотати</string>
     <string name="double_tap_to_seek_settings">Натиснути двічі, щоби перемотати</string>
     <string name="double_tap_to_pause_settings">Натиснути двічі, щоби призупинити</string>
-    <string name="double_tap_to_seek_amount_settings">Крок перемотування (у секундах)</string>
+    <string name="double_tap_to_seek_amount_settings">Крок перемотування (Секунди)</string>
     <string name="double_tap_to_pause_settings_des">Натисніть двічі посередині, щоби призупинити відтворення</string>
     <string name="use_system_brightness_settings">Використовувати системну яскравість</string>
     <string name="episode_sync_settings">Оновлювати прогрес перегляду</string>
@@ -138,10 +138,10 @@
     <string name="backup_success">Дані збережено</string>
     <string name="backup_failed_error_format">Помилка резервного копіювання %s</string>
     <string name="search">Пошук</string>
-    <string name="category_account">Облікові записи та безпека</string>
-    <string name="category_updates">Оновлення та резервне копіювання</string>
+    <string name="category_account">Облікові Записи та Безпека</string>
+    <string name="category_updates">Оновлення та Резервне Копіювання</string>
     <string name="settings_info">Подробиці</string>
-    <string name="advanced_search">Розширений пошук</string>
+    <string name="advanced_search">Розширений Пошук</string>
     <string name="advanced_search_des">Показувати результати пошуку, розділені за постачальниками</string>
     <string name="show_fillers_settings">Показувати наповнювачі для аніме</string>
     <string name="show_trailers_settings">Показувати трейлери</string>
@@ -490,7 +490,7 @@
     <string name="test_failed">Провалено</string>
     <string name="test_passed">Пройдено</string>
     <string name="restart">Перезапустити</string>
-    <string name="test_log">Журнал</string>
+    <string name="test_log">Лог</string>
     <string name="start">Відновити</string>
     <string name="stop">Зупинити</string>
     <string name="category_provider_test">Перевірка постачальників</string>
@@ -706,7 +706,7 @@
     <string name="prerelease_already_installed">Попередня версія вже встановлена.</string>
     <string name="prerelease_install_failed">Не вдалося встановити попередню версію.</string>
     <string name="show_episode_text">Текст епізоду</string>
-    <string name="search_suggestions">Пропозиції пошуку</string>
+    <string name="search_suggestions">Пропозиції Пошуку</string>
     <string name="search_suggestions_des">Показувати підказки пошуку під час введення тексту</string>
     <string name="clear_suggestions">Очистити пропозиції</string>
     <string name="extra_brightness_settings">Додаткова яскравість</string>
diff --git a/app/src/main/res/values-b+zh/strings.xml b/app/src/main/res/values-b+zh/strings.xml
index e8e02d51f..bc7c2ca0e 100644
--- a/app/src/main/res/values-b+zh/strings.xml
+++ b/app/src/main/res/values-b+zh/strings.xml
@@ -771,4 +771,5 @@
     <string name="source_priority">源优先级</string>
     <string name="source_priority_help">确定在播放器中如何排列视频源的顺序</string>
     <string name="extra_brightness_key">已启用额外亮度</string>
+    <string name="show_player_metadata_overlay">显示播放器元数据遮罩层</string>
 </resources>
diff --git a/fastlane/metadata/android/ar/full_description.txt b/fastlane/metadata/android/ar/full_description.txt
index 9bbe01ef2..81859f665 100644
--- a/fastlane/metadata/android/ar/full_description.txt
+++ b/fastlane/metadata/android/ar/full_description.txt
@@ -3,10 +3,8 @@
 يأتي التطبيق بدون أي إعلانات وتحليلات.
 و يدعم العديد من مواقع البث الاولي(التريلر) والأفلام والمزيد. وتشمل الميزات:
 
-إشارات مرجعية
+الإشارات المرجعية
 
-قم بتنزيل ودفق الأفلام والبرامج التلفزيونية والأنيمي
+تنزيل الترجمات
 
-تنزيلات الترجمة
-
-دعم كروم كاست
+دعم الكروم كاست (Chromecast)

From 736c6374a6502f057a08866a75f189759e755457 Mon Sep 17 00:00:00 2001
From: Nguyen Van Nam <nam.nv205106@gmail.com>
Date: Tue, 31 Mar 2026 04:23:02 +0700
Subject: [PATCH 027/177] Fix: thread-safe HashMap for image bitmap cache

---
 .../cloudstream3/utils/downloader/DownloadUtils.kt       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadUtils.kt
index b436bb49c..9f2c31d9a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadUtils.kt
@@ -20,16 +20,17 @@ import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getFol
 import com.lagradost.cloudstream3.utils.txt
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.runBlocking
+import java.util.concurrent.ConcurrentHashMap
 
 /** Separate object with helper functions for the downloader */
 object DownloadUtils {
-    private val cachedBitmaps = hashMapOf<String, Bitmap>()
+    private val cachedBitmaps = ConcurrentHashMap<String, Bitmap>()
     internal fun Context.getImageBitmapFromUrl(
         url: String,
         headers: Map<String, String>? = null
     ): Bitmap? = safe {
-        if (cachedBitmaps.containsKey(url)) {
-            return@safe cachedBitmaps[url]
+        cachedBitmaps[url]?.let {
+            return@safe it
         }
 
         val imageLoader = SingletonImageLoader.get(this)
@@ -50,7 +51,7 @@ object DownloadUtils {
         }
 
         bitmap?.let {
-            cachedBitmaps[url] = it
+            cachedBitmaps.putIfAbsent(url, it)
         }
 
         return@safe bitmap

From db154a8cd25aaad2f942931f33714ca2423f395c Mon Sep 17 00:00:00 2001
From: Phisher98 <153359846+phisher98@users.noreply.github.com>
Date: Fri, 3 Apr 2026 20:06:42 +0530
Subject: [PATCH 028/177] Adding IntroDB (#2599)

---
 .../lagradost/cloudstream3/utils/AniSkip.kt   | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt
index 820a01f9f..bbdadbf3f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt
@@ -2,8 +2,10 @@ package com.lagradost.cloudstream3.utils
 
 import android.util.Log
 import androidx.annotation.StringRes
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import com.lagradost.cloudstream3.*
+import com.lagradost.cloudstream3.LoadResponse.Companion.getImdbId
 import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
@@ -86,7 +88,57 @@ object EpisodeSkip {
                     out.addAll(list)
                 }
             }
+        } else if (data.type == TvType.TvSeries || data.type == TvType.AsianDrama) {
+            val season = episode.season
+            val imdbId = data.getImdbId()
+
+            if (season != null && imdbId != null) {
+                val result = IntroDbSkip.getResult(
+                    imdbId,
+                    season,
+                    episode.episode
+                )
+
+                result?.let { res ->
+                    listOfNotNull(
+                        res.intro?.let {
+                            val start = it.startMs ?: return@let null
+                            val end = it.endMs ?: return@let null
+                            SkipStamp(
+                                type = SkipType.Opening,
+                                skipToNextEpisode = hasNextEpisode &&
+                                        shouldSkipToNextEpisode(end, episodeDurationMs),
+                                startMs = start,
+                                endMs = end
+                            )
+                        },
+                        res.recap?.let {
+                            val start = it.startMs ?: return@let null
+                            val end = it.endMs ?: return@let null
+                            SkipStamp(
+                                type = SkipType.Recap,
+                                skipToNextEpisode = hasNextEpisode &&
+                                        shouldSkipToNextEpisode(end, episodeDurationMs),
+                                startMs = start,
+                                endMs = end
+                            )
+                        },
+                        res.outro?.let {
+                            val start = it.startMs ?: return@let null
+                            val end = it.endMs ?: return@let null
+                            SkipStamp(
+                                type = SkipType.Credits,
+                                skipToNextEpisode = hasNextEpisode &&
+                                        shouldSkipToNextEpisode(end, episodeDurationMs),
+                                startMs = start,
+                                endMs = end
+                            )
+                        }
+                    ).let { out.addAll(it) }
+                }
+            }
         }
+
         if (out.isNotEmpty())
             cachedStamps[episode.id] = out
         return out
@@ -136,4 +188,43 @@ object AniSkip {
         @JsonSerialize val startTime: Double,
         @JsonSerialize val endTime: Double
     )
+}
+
+object IntroDbSkip {
+    private const val TAG = "IntroDb"
+
+    suspend fun getResult(
+        imdbId: String,
+        season: Int,
+        episode: Int,
+    ): IntroDbResponse? {
+        return try {
+            val url =
+                "https://api.introdb.app/segments?imdb_id=$imdbId&season=$season&episode=$episode"
+            app.get(url).parsed<IntroDbResponse>()
+        } catch (t: Throwable) {
+            Log.i(TAG, "error = ${t.message}")
+            logError(t)
+            null
+        }
+    }
+
+    data class IntroDbResponse(
+        @JsonProperty("imdb_id") val imdbId: String?,
+        val season: Int?,
+        val episode: Int?,
+        val intro: Segment?,
+        val recap: Segment?,
+        val outro: Segment?,
+    )
+
+    data class Segment(
+        @JsonProperty("start_sec") val startSec: Double?,
+        @JsonProperty("end_sec") val endSec: Double?,
+        @JsonProperty("start_ms") val startMs: Long?,
+        @JsonProperty("end_ms") val endMs: Long?,
+        val confidence: Double?,
+        @JsonProperty("submission_count") val submissionCount: Int?,
+        @JsonProperty("updated_at") val updatedAt: String?,
+    )
 }
\ No newline at end of file

From ba9413e972e5586bceecc91bfc74b9de2a46fec5 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 4 Apr 2026 12:26:17 -0600
Subject: [PATCH 029/177] Change param name in interface to match everywhere
 else (#2611)

---
 .../main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
index 183f26f73..08b8ee795 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
@@ -307,7 +307,7 @@ interface IPlayer {
     fun setMaxVideoSize(width: Int = Int.MAX_VALUE, height: Int = Int.MAX_VALUE, id: String? = null)
 
     /** If no trackLanguage is set it'll default to first track. Specifying the id allows for track overrides as the language can be identical. */
-    fun setPreferredAudioTrack(trackLanguage: String?, id: String? = null, trackIndex: Int? = null)
+    fun setPreferredAudioTrack(trackLanguage: String?, id: String? = null, formatIndex: Int? = null)
 
     /** Get the current subtitle cues, for use with syncing */
     fun getSubtitleCues(): List<SubtitleCue>

From bb295ded09ee4059a1a180b9c319a162239b7ffe Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Sat, 4 Apr 2026 20:26:35 +0200
Subject: [PATCH 030/177] Translated using Weblate (Vietnamese)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Korean)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Belarusian)

Currently translated at 99.5% (723 of 726 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Korean)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Latvian)

Currently translated at 80.8% (587 of 726 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (726 of 726 strings)

Co-authored-by: Ardev Prisec <prisecardev@gmail.com>
Co-authored-by: Dan <jonweblin2205@protonmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Man <thebroker2308@gmail.com>
Co-authored-by: Posemartonis <weblate.drainage895@passmail.net>
Co-authored-by: Sasha Glazko <lenify@users.noreply.hosted.weblate.org>
Co-authored-by: blueocean2308 <bluewhale2308@gmail.com>
Co-authored-by: hou1234 <gjqmgjsl3@gmail.com>
Co-authored-by: opakholis <opakholis@users.noreply.hosted.weblate.org>
Co-authored-by: ℂ𝕠𝕠𝕠𝕝 (𝕘𝕚𝕥𝕙𝕦𝕓.𝕔𝕠𝕞/ℂ𝕠𝕠𝕠𝕝) <coool@mail.lv>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/be/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/id/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ko/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/lv/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/uk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/vi/
Translation: Cloudstream/App
---
 app/src/main/res/values-b+fr/strings.xml |   1 +
 app/src/main/res/values-b+in/strings.xml |   1 +
 app/src/main/res/values-b+ko/strings.xml | 125 ++++++------
 app/src/main/res/values-b+lv/strings.xml |  76 ++++----
 app/src/main/res/values-b+uk/strings.xml | 235 ++++++++++++-----------
 app/src/main/res/values-b+vi/strings.xml | 192 +++++++++---------
 app/src/main/res/values-be/strings.xml   |   5 +-
 7 files changed, 318 insertions(+), 317 deletions(-)

diff --git a/app/src/main/res/values-b+fr/strings.xml b/app/src/main/res/values-b+fr/strings.xml
index f39de53f7..1cbee687f 100644
--- a/app/src/main/res/values-b+fr/strings.xml
+++ b/app/src/main/res/values-b+fr/strings.xml
@@ -753,4 +753,5 @@
         <item quantity="many">%d téléchargements en attente</item>
         <item quantity="other">%d téléchargements en attente</item>
     </plurals>
+    <string name="show_player_metadata_overlay">Afficher les métadata de l\'overlay du lecteur vidéo</string>
 </resources>
diff --git a/app/src/main/res/values-b+in/strings.xml b/app/src/main/res/values-b+in/strings.xml
index 7fa837b23..d5bf2d4b0 100644
--- a/app/src/main/res/values-b+in/strings.xml
+++ b/app/src/main/res/values-b+in/strings.xml
@@ -764,4 +764,5 @@
     <string name="cancel_all">Batalkan semua</string>
     <string name="download_episode_range">Apakah kamu ingin mengunduh episode %s?</string>
     <string name="cancel_queue_message">Apakah kamu ingin membatalkan semua unduhan dalam antrean?</string>
+    <string name="show_player_metadata_overlay">Tampilkan overlay metadata pemutar</string>
 </resources>
diff --git a/app/src/main/res/values-b+ko/strings.xml b/app/src/main/res/values-b+ko/strings.xml
index 868e2736e..29a0a703e 100644
--- a/app/src/main/res/values-b+ko/strings.xml
+++ b/app/src/main/res/values-b+ko/strings.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="cast_format" formatted="true">출연: %s</string>
-    <string name="next_episode_format" formatted="true">에피소드 %d이(가) 공개 예정</string>
+    <string name="next_episode_format" formatted="true">에피소드 %d 공개 예정</string>
     <string name="search_poster_img_des">포스터</string>
     <string name="episode_poster_img_des">에피소드 포스터</string>
     <string name="home_main_poster_img_des">메인 포스터</string>
     <string name="home_next_random_img_des">다음 추천</string>
     <string name="go_back_img_des">뒤로가기</string>
     <string name="home_change_provider_img_des">소스 변경</string>
-    <string name="preview_background_img_des">미리보기 배경</string>
+    <string name="preview_background_img_des">배경 미리보기</string>
     <string name="player_speed_text_format" formatted="true">속도 (%.2fx)</string>
     <string name="rated_format" formatted="true">평점: %.1f</string>
     <string name="new_update_format" formatted="true">새로운 업데이트!
@@ -55,14 +55,14 @@
     <string name="action_add_to_bookmarks">시청 상태 설정</string>
     <string name="sort_save">저장</string>
     <string name="player_speed">재생 속도</string>
-    <string name="subs_text_color">글자 색깔</string>
-    <string name="subs_outline_color">외곽선 색깔</string>
-    <string name="subs_background_color">배경 색깔</string>
-    <string name="subs_window_color">창 색깔</string>
-    <string name="subs_edge_type">가장자리 타입</string>
+    <string name="subs_text_color">글자 색상</string>
+    <string name="subs_outline_color">윤곽선 색상</string>
+    <string name="subs_background_color">배경 색상</string>
+    <string name="subs_window_color">배경 색상</string>
+    <string name="subs_edge_type">윤곽선 유형</string>
     <string name="subs_subtitle_elevation">자막 높이</string>
     <string name="subs_font">폰트</string>
-    <string name="subs_font_size">폰트 크기</string>
+    <string name="subs_font_size">자막 크기</string>
     <string name="downloaded">다운로드됨</string>
     <string name="downloading">다운로드중</string>
     <string name="download_paused">다운로드 일시정지</string>
@@ -119,7 +119,7 @@
     <string name="double_tap_to_seek_settings">두 번 탭하여 탐색</string>
     <string name="double_tap_to_pause_settings">두 번 탭하여 일시정지</string>
     <string name="double_tap_to_seek_amount_settings">플레이어 탐색 시간 (초)</string>
-    <string name="double_tap_to_pause_settings_des">가운데를 두 번 탭하여 일시중지</string>
+    <string name="double_tap_to_pause_settings_des">가운데를 두 번 탭하여 일시정지</string>
     <string name="use_system_brightness_settings">시스템 밝기 사용</string>
     <string name="use_system_brightness_settings_des">어두운 오버레이 대신 앱 플레이어의 시스템 밝기를 사용합니다</string>
     <string name="episode_sync_settings">시청 진행 상황 업데이트</string>
@@ -135,14 +135,14 @@
     <string name="category_account">계정 및 보안</string>
     <string name="advanced_search_des">소스별로 구분된 검색 결과를 제공합니다</string>
     <string name="show_trailers_settings">예고편 보기</string>
-    <string name="kitsu_settings">Kitsu에서 포스터 보기</string>
+    <string name="kitsu_settings">Kitsu에서 포스터 가져오기</string>
     <string name="pref_filter_search_quality">검색 결과에서 선택한 동영상 품질 숨기기</string>
     <string name="automatic_plugin_download">플러그인 자동 다운로드</string>
     <string name="automatic_plugin_updates">플러그인 자동 업데이트</string>
     <string name="automatic_plugin_download_summary">추가된 저장소에서 아직 설치되지 않은 모든 플러그인을 자동으로 설치합니다.</string>
     <string name="updates_settings">앱 업데이트 표시</string>
     <string name="updates_settings_des">앱을 시작한 후 새 업데이트를 자동으로 검색합니다.</string>
-    <string name="apk_installer_settings_des">일부 장치는 새 패키지 설치 프로그램을 지원하지 않습니다. 업데이트가 설치되지 않으면 레거시 옵션을 사용해보십시오.</string>
+    <string name="apk_installer_settings_des">일부 기기에서는 최신 방식의 설치 프로그램이 작동하지 않을 수 있습니다. 업데이트가 안 된다면 \'기본 방식\' 설정을 사용해 보세요.</string>
     <string name="lightnovel">같은 개발자가 만든 라이트 노벨 앱</string>
     <string name="anim">같은 개발자가 만든 애니메이션 앱</string>
     <string name="discord">Discord에 참여하기</string>
@@ -181,29 +181,29 @@
     <string name="torrent">토렌트</string>
     <string name="episode_action_chromecast_mirror">Chromecast 미러링</string>
     <string name="episode_action_play_in_app">앱에서 재생</string>
-    <string name="episode_action_play_in_format">%s에서 재생</string>
+    <string name="episode_action_play_in_format">%s부터 재생</string>
     <string name="episode_action_auto_download">자동 다운로드</string>
-    <string name="episode_action_download_mirror">다운로드 가능 목록 보기</string>
+    <string name="episode_action_download_mirror">다운로드 소스 목록</string>
     <string name="episode_action_reload_links">링크 새로고침</string>
     <string name="episode_action_download_subtitle">자막 다운로드</string>
-    <string name="show_hd">화질 탭</string>
-    <string name="show_dub">더빙 탭</string>
-    <string name="show_sub">자막 탭</string>
+    <string name="show_hd">화질 라벨</string>
+    <string name="show_dub">더빙 라벨</string>
+    <string name="show_sub">자막 라벨</string>
     <string name="show_title">제목</string>
     <string name="check_for_update">업데이트 확인</string>
     <string name="video_lock">잠금</string>
     <string name="video_aspect_ratio_resize">크기 조정</string>
     <string name="video_source">소스</string>
-    <string name="video_skip_op">오프닝 건너뛰기</string>
+    <string name="video_skip_op">오프닝 스킵</string>
     <string name="skip_update">이 업데이트 건너뛰기</string>
     <string name="watch_quality_pref">선호하는 화질 (WiFi)</string>
     <string name="watch_quality_pref_data">선호하는 화질 (모바일 데이터)</string>
     <string name="limit_title_rez">플레이어 내 표시 정보</string>
     <string name="video_buffer_size_settings">동영상 버퍼 크기</string>
-    <string name="video_buffer_clear_settings">동영상 및 이미지 캐시 지우기</string>
+    <string name="video_buffer_clear_settings">비디오 및 이미지 캐시 삭제</string>
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="jsdelivr_enabled">GitHub에 연결할 수 없습니다. jsDelivr 프록시를 켜는 중…</string>
-    <string name="jsdelivr_proxy_summary">JsDelivr를 사용하여 원시 github URL 차단을 우회하십시오. 몇 일 지연 될 업데이트가 발생할 수 있습니다.</string>
+    <string name="jsdelivr_proxy_summary">jsDelivr를 사용하여 차단된 GitHub 주소를 우회합니다. 단, 업데이트 반영이 며칠 정도 늦어질 수 있습니다.</string>
     <string name="add_site_pref">복제 사이트</string>
     <string name="remove_site_pref">사이트 삭제</string>
     <string name="add_site_summary">다른 URL을 사용하여 기존 사이트의 복제본을 추가합니다</string>
@@ -251,7 +251,7 @@
     <string name="all">전부</string>
     <string name="max">최대</string>
     <string name="min">최소</string>
-    <string name="subtitles_outline">윤곽선</string>
+    <string name="subtitles_outline">윤곽선 효과</string>
     <string name="subtitles_shadow">그림자</string>
     <string name="subtitle_offset">자막 동기화</string>
     <string name="subtitle_offset_hint">1000 ms</string>
@@ -277,7 +277,7 @@
     <string name="error_invalid_data">잘못된 데이터</string>
     <string name="error_invalid_url">잘못된 URL</string>
     <string name="error">오류</string>
-    <string name="subtitles_remove_captions">자막에서 청각 장애인용 자막 요소 제거</string>
+    <string name="subtitles_remove_captions">청각 장애인용 자막 요소 제거</string>
     <string name="subtitles_filter_lang">선호하는 미디어 언어로 필터링</string>
     <string name="trailer">예고편</string>
     <string name="next">다음</string>
@@ -304,8 +304,8 @@
 \nDiscord에 가입하거나 온라인으로 검색해 보세요.</string>
     <string name="view_public_repositories_button">커뮤니티 저장소 보기</string>
     <string name="view_public_repositories_button_short">공개 목록</string>
-    <string name="uppercase_all_subtitles">모든 자막 대문자화</string>
-    <string name="download_all_plugins_from_repo">경고: CloudStream은 제3자 확장을 이용하여 어떠한 책임도 지지 않습니다!</string>
+    <string name="uppercase_all_subtitles">자막 대문자화 표시</string>
+    <string name="download_all_plugins_from_repo">경고: CloudStream은 외부 확장 프로그램 사용에 대해 어떠한 책임도 지지 않으며, 관련 기술 지원을 제공하지 않습니다!</string>
     <string name="single_plugin_disabled" formatted="true">%s (사용불가)</string>
     <string name="add_repository">저장소 추가</string>
     <string name="repository_name_hint">저장소 이름 (선택 사항)</string>
@@ -322,13 +322,13 @@
     <string name="safe_mode_crash_info">충돌 정보 보기</string>
     <string name="extension_language">언어</string>
     <string name="subscription_episode_released">에피소드 %d 공개!</string>
-    <string name="picture_in_picture">Picture-in-picture</string>
+    <string name="picture_in_picture">PIP 모드</string>
     <string name="player_size_settings">플레이어 크기 조정 버튼</string>
-    <string name="picture_in_picture_des">미니플레이어를 통해 다른 앱 상단에서 계속 재생됩니다</string>
-    <string name="player_size_settings_des">검은색 테두리 제거</string>
+    <string name="picture_in_picture_des">미니플레이어를 통해 다른 앱 상단에서 계속 재생합니다</string>
+    <string name="player_size_settings_des">레터박스 제거</string>
     <string name="double_tap_to_seek_settings_des">오른쪽 또는 왼쪽을 두 번 탭하여 앞뒤로 탐색하기</string>
     <string name="player_subtitles_settings">자막</string>
-    <string name="restore_success">로드된 백업 파일</string>
+    <string name="restore_success">백업 파일을 성공적으로 로드하였습니다</string>
     <string name="settings_info">정보</string>
     <string name="advanced_search">고급 검색</string>
     <string name="redo_setup_process">설정 프로세스 다시 실행</string>
@@ -374,7 +374,7 @@
     <string name="anime_singular">애니</string>
     <string name="ova_singular">OVA</string>
     <string name="remote_error">원격 오류</string>
-    <string name="storage_error">다운로드 오류, 저장 권한 확인</string>
+    <string name="storage_error">다운로드 오류, 저장소 권한을 확인하세요</string>
     <string name="episode_action_chromecast_episode">Chromecast 에피소드</string>
     <string name="unexpected_error">예기치 않은 플레이어 오류</string>
     <string name="dont_show_again">다시 표시하지 않음</string>
@@ -382,7 +382,7 @@
     <string name="update">업데이트</string>
     <string name="jsdelivr_proxy">GitHub 프록시</string>
     <string name="video_buffer_length_settings">동영상 버퍼 길이</string>
-    <string name="video_buffer_disk_settings">저장소에 동영상 캐시</string>
+    <string name="video_buffer_disk_settings">디스크 비디오 캐시</string>
     <string name="video_ram_description">Android TV와 같이 메모리가 부족한 디바이스에서 너무 높게 설정하면 충돌이 발생할 수 있습니다.</string>
     <string name="resize_fill">화면 크기에 맞춤</string>
     <string name="video_disk_description">Android TV와 같이 저장 공간이 부족한 기기에서 너무 높게 설정하면 문제가 발생할 수 있습니다.</string>
@@ -456,7 +456,7 @@
     <string name="update_notification_downloading">앱 업데이트 다운로드 중…</string>
     <string name="update_notification_installing">앱 업데이트 설치 중…</string>
     <string name="update_notification_failed">새 버전의 앱을 설치할 수 없습니다</string>
-    <string name="apk_installer_legacy">레거시</string>
+    <string name="apk_installer_legacy">기본 방식</string>
     <string name="apk_installer_package_installer">패키지 인스톨러</string>
     <string name="delayed_update_notice">앱 종료시 업데이트됩니다</string>
     <string name="sort_by">정렬 기준</string>
@@ -489,20 +489,20 @@
     <string name="show_fillers_settings">애니메이션용 필러 에피소드 표시</string>
     <string name="test_passed">통과</string>
     <string name="resume">계속</string>
-    <string name="limit_title">동영상 플레이어 제목 최대 글자 수</string>
-    <string name="android_tv_interface_on_seek_settings">표시된 플레이어 - 빨리 감기 및 되감기 초</string>
-    <string name="android_tv_interface_on_seek_settings_summary">플레이어가 보일 때 사용되는 탐색량</string>
-    <string name="android_tv_interface_off_seek_settings">플레이어 숨김 - 빨리 감기 및 되감기 초</string>
-    <string name="android_tv_interface_off_seek_settings_summary">플레이어가 숨겨져 있을 때 사용되는 탐색량</string>
+    <string name="limit_title">플레이어 표시 제목의 최대 글자 수</string>
+    <string name="android_tv_interface_on_seek_settings">플레이어 표시 시 탐색 시간</string>
+    <string name="android_tv_interface_on_seek_settings_summary">플레이어 표시 중 탐색 간격</string>
+    <string name="android_tv_interface_off_seek_settings">플레이어 미표시 시 탐색 시간</string>
+    <string name="android_tv_interface_off_seek_settings_summary">플레이어 미표시 시 탐색 간격</string>
     <string name="pref_category_actions">동작</string>
     <string name="pref_category_looks">외형</string>
     <string name="random_button_settings">랜덤 버튼</string>
     <string name="random_button_settings_desc">홈페이지 및 라이브러리에서 랜덤 버튼 표시</string>
     <string name="bottom_title_settings_des">포스터 아래에 제목을 이동</string>
-    <string name="subtitles_depressed">내려감</string>
-    <string name="subtitles_raised">올라감</string>
+    <string name="subtitles_depressed">음각</string>
+    <string name="subtitles_raised">양각</string>
     <string name="subtitles_example_text">다람쥐 헌 쳇바퀴에 타고파</string>
-    <string name="subtitles_remove_bloat">자막에서 불필요한 요소/코드 제거</string>
+    <string name="subtitles_remove_bloat">불필요한 요소/코드 제거</string>
     <string name="extras">엑스트라</string>
     <string name="network_adress_example">https://example.com/example.mp4</string>
     <string name="tracks">트랙</string>
@@ -531,7 +531,7 @@
     <string name="dismiss">취소</string>
     <string name="open_downloaded_repo">저장소 열기</string>
     <string name="enter_current_pin">현재 PIN 입력</string>
-    <string name="auto_rotate_video_desc">비디오 방향에 따라 화면 방향을 자동으로 전환합니다</string>
+    <string name="auto_rotate_video_desc">비디오 방향에 따라 화면 방향을 자동으로 회전합니다</string>
     <string name="device_pin_error_message">장치 PIN 코드를 가져올 수 없습니다, 로컬 인증을 시도하세요</string>
     <string name="device_pin_expired_message">PIN 코드가 만료되었습니다!</string>
     <string name="device_pin_counter_text">코드 만료까지 남은 시간: %1$dm %2$ds</string>
@@ -546,7 +546,7 @@
     <string name="profiles">프로필</string>
     <string name="ok">확인</string>
     <string name="battery_dialog_title">배터리 최적화 사용 안 함</string>
-    <string name="app_unrestricted_toast">앱 배터리 사용량이 이미 무제한으로 설정되었습니다</string>
+    <string name="app_unrestricted_toast">배터리 사용량이 \'제한 없음\'으로 이미 설정되어 있습니다</string>
     <string name="app_info_intent_error">CloudStream의 App 정보를 열 수 없습니다.</string>
     <string name="favorite_added">즐겨찾기에 %s 추가</string>
     <string name="profile_number">프로필 %d</string>
@@ -567,7 +567,7 @@
     <string name="mobile_data">모바일 데이터</string>
     <string name="disable">사용 불가능</string>
     <string name="player_settings_select_cast_device">캐스트 장치 선택</string>
-    <string name="clipboard_unknown_error">복사하는 중 오류가 발생했습니다. 로그캣을 복사하고 문의하십시오.</string>
+    <string name="clipboard_unknown_error">복사하는 중 오류가 발생했습니다. 로그캣을 복사하고 개발자에게 문의하십시오.</string>
     <string name="action_unsubscribe">구독 취소</string>
     <string name="set_default">기본값 설정</string>
     <string name="action_subscribe">구독</string>
@@ -586,7 +586,7 @@
     <string name="select_an_account">계정 선택</string>
     <string name="use_default_account">기본 계정 사용</string>
     <string name="rotate_video">회전</string>
-    <string name="rotate_video_desc">화면 방향을 전환할 토글 버튼 표시</string>
+    <string name="rotate_video_desc">화면 방향 전환 버튼 표시</string>
     <string name="manage_accounts">계정 관리</string>
     <string name="lock_profile">프로필 잠금</string>
     <string name="pin_error_incorrect">잘못된 PIN입니다. 다시 시도하세요.</string>
@@ -598,17 +598,11 @@
     <string name="biometric_prompt_description">여러 번 실패하면 프롬프트가 닫힙니다. 다시 시도하려면 앱을 다시 시작하세요.</string>
     <string name="reset_btn">재설정</string>
     <string name="automatic_plugin_download_mode_title">플러그인 다운로드를 필터링할 모드 선택</string>
-    <string name="biometric_warning">데이터가 백업되었습니다. 장치에 따라 동작이 다를 수 있으며 앱 접근이 차단될 경우 앱 데이터를 완전히 지우고 백업에서 복원하세요. 이로 인해 발생하는 불편을 사과드립니다.</string>
+    <string name="biometric_warning">CloudStream 데이터 백업이 완료되었습니다. 드문 경우지만, 기기에 따라 앱 접속이 안 되는 오류가 발생할 수 있습니다. 만약 앱이 열리지 않는다면, 앱 데이터를 완전히 삭제(초기화)한 후 이 백업 파일로 복구해 주시기 바랍니다. 이용에 불편을 드려 대단히 죄송합니다.</string>
     <string name="device_pin_url_message">스마트폰이나 컴퓨터에서 <b>%s</b>를 방문하여 위의 코드를 입력하세요</string>
-    <string name="battery_dialog_message">구독 된 TV 프로그램에 대한 특이성 다운로드 및 알림을 보려면 클라우드 스트림은 배경에서 오른쪽으로 실행할 권리가 필요합니다. 확인을 눌러 요청 대화 상자를 표시하십시오. 필요한 경우 필요에 따라 CP3에 제한되지 않고 공식을 다운로드하거나 공식화에서 확대를 누릴 필요가 있습니다.</string>
-    <string name="quality_profile_help">여기서 소스의 순서를 변경할 수 있습니다. 비디오의 우선 순위가 높은 경우에는 소스 선택에 더 높게 나타납니다. 소스 우선 순위와 품질 우선 순위의 합이 비디오 우선 순위입니다.
-\n
-\n참고 A: 3
-\n품질 B: 7
-\n총 비디오 우선 순위는 10입니다.
-\n
-\n참고: 합이 10 이상이면 해당 링크가 로드되면 플레이어는 자동으로 로드를 건너뜁니다!</string>
-    <string name="next_season_episode_format" formatted="true">시즌 %1$d 에피소드 %2$d이(가) 공개 예정</string>
+    <string name="battery_dialog_message">구독 중인 TV 쇼의 알림을 받고 다운로드를 끊김 없이 완료하려면, CloudStream의 백그라운드 실행 권한이 필요합니다. \'확인\'을 누른 후 나타나는 요청 창에서 \'허용\'을 선택해 주세요.\n\n참고로, 이 권한을 허용한다고 해서 배터리가 계속 소모되는 것은 아닙니다. 알림을 받거나 공식 확장 프로그램에서 영상을 다운로드할 때처럼 꼭 필요한 상황에서만 백그라운드 작업을 수행합니다.</string>
+    <string name="quality_profile_help">여기서 소스의 순서를 변경할 수 있습니다. 비디오의 우선 순위가 높은 경우에는 소스 선택 화면에 더 높게 나타납니다. 소스 우선 순위와 품질 우선 순위의 합이 비디오 우선 순위입니다. \n \n참고 A: 3 \n품질 B: 7 \n총 비디오 우선 순위는 10입니다. \n \n참고: 합이 10 이상이면 해당 링크가 로드되면 플레이어는 자동으로 로드를 건너뜁니다!</string>
+    <string name="next_season_episode_format" formatted="true">시즌 %1$d 에피소드 %2$d 공개 예정</string>
     <string name="result_search_tooltip">다른 확장자에서 검색</string>
     <string name="subscribe_tooltip">새로운 에피소드 알림</string>
     <string name="recommendations_tooltip">추천목록 보기</string>
@@ -619,7 +613,7 @@
     <string name="duplicate_title">잠재적 중복 발견</string>
     <string name="enter_pin_with_name" formatted="true">%s의 PIN 입력</string>
     <string name="action_remove_from_favorites">즐겨찾기에서 제거</string>
-    <string name="episode_action_cast_mirror">캐스트미러</string>
+    <string name="episode_action_cast_mirror">Cast 소스 목록</string>
     <string name="delete_plugin">플러그인 삭제</string>
     <string name="test_warning">경고</string>
     <string name="preview_seekbar">탐색바 미리보기</string>
@@ -627,7 +621,7 @@
     <string name="play_from_beginning_img_des">처음부터 재생</string>
     <string name="downloads_empty">현재 다운로드가 없습니다.</string>
     <string name="downloads_delete_select">삭제할 항목을 선택하십시오</string>
-    <string name="offline_file">오프라인 시청가능</string>
+    <string name="offline_file">오프라인 시청 가능</string>
     <string name="select_all">모두 선택</string>
     <string name="deselect_all">모두 선택해제</string>
     <string name="open_local_video">로컬 비디오 열기</string>
@@ -653,7 +647,7 @@
     <string name="podcast_singluar">팟캐스트</string>
     <string name="begin_speaking">시작하기 …</string>
     <string name="encoding_error">인코딩 오류</string>
-    <string name="unsupported_error">지원되지 않는 오류</string>
+    <string name="unsupported_error">미지원 오류</string>
     <string name="speech_recognition_unavailable">음성 인식 사용 불가</string>
     <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d시간 %2$d분 %3$d초</string>
     <string name="download_time_left_min_sec_format" formatted="true">%1$d분 %2$d초</string>
@@ -662,7 +656,7 @@
     <string name="install_prerelease">출시 전 버전 설치</string>
     <string name="prerelease_already_installed">출시 전 버전이 이미 설치되어 있습니다.</string>
     <string name="prerelease_install_failed">출시 전 버전 설치 실패.</string>
-    <string name="episode_action_play_mirror">재생 가능 목록 보기</string>"
+    <string name="episode_action_play_mirror">재생 소스 목록</string>"
     <string name="show_rating">평가 라벨</string>
     <string name="show_episode_text">에피소드 본문</string>
     <string name="player_load_one_subtitle_online">사용 가능한 자막 불러오기</string>
@@ -684,7 +678,7 @@
     <string name="confirm_before_exiting_desc">이 알림을 앱 종료 전에 표시</string>
     <string name="show">보이기</string>
     <string name="dont_show">보이지 않기</string>
-    <string name="subs_edge_size">테두리 크기</string>
+    <string name="subs_edge_size">윤곽선 굵기</string>
     <string name="torrent_preferred_media">Settings/Providers/Preferred media 에서 토렌트 활성화</string>
     <string name="torrent_not_accepted">진행하려면 앱 재시작 후 토렌트 스트리밍 팝업란의 수락이 필요합니다.</string>
     <string name="software_decoding">소프트웨어 디코딩</string>
@@ -700,19 +694,19 @@
     <string name="player_notification_channel_description">백그라운드에서 재생을 제어하기 위한 플레이어 알림</string>
     <string name="subtitles_from_embedded">내장 자막</string>
     <string name="subtitles_from_online">온라인</string>
-    <string name="all_subtitles_bold">자막 글꼴 굵게 표시</string>
-    <string name="all_subtitles_italic">자막 글꼴 기울게 표시</string>
+    <string name="all_subtitles_bold">자막 굵게 표시</string>
+    <string name="all_subtitles_italic">자막 기울게 표시</string>
     <string name="download_parallel_settings_des">병렬로 다운로드 할 수 있는 아이템의 수</string>
     <string name="parallel_downloads">병렬 다운로드</string>
     <string name="concurrent_connections">동시 연결수</string>
     <string name="concurrent_connections_settings_des">다운로드 시 각 항목마다 사용할 수 있는 동시 연결의 수</string>
-    <string name="go_to_downloads">다운로드로 가기</string>
+    <string name="go_to_downloads">다운로드로 이동</string>
     <string name="no_internet_connection">인터넷 연결 없음.\n\n인터넷에 연결 한 후 재시도 하거나, 혹은 이미 다운로드 된 항목을 재생하십시오.</string>
     <string name="overscan_settings_des">화면의 잘림 현상을 방지하기 위해 경계를 조정합니다</string>
     <string name="poster_size_settings_des">포스터 크기 변경</string>
     <string name="poster_size_settings">포스터 크기</string>
     <string name="speedup_title">길게 눌러 배속 활성화</string>
-    <string name="speedup_summary">길게 눌러 2배속</string>
+    <string name="speedup_summary">길게 눌러 2배속 재생</string>
     <string name="edit_profile_image_title">프로필 사진 변경</string>
     <string name="edit_profile_image_hint">프로필 사진 URL 입력</string>
     <string name="edit_profile_image_error_empty">URL을 찾을 수 없습니다</string>
@@ -734,9 +728,9 @@
     <string name="top_right">오른쪽 위</string>
     <string name="source_priority_help">비디오 소스가 플레이어에서 정렬되는 순서 설정</string>
     <string name="extra_brightness_settings_des">디스플레이 밝기가 100%를 초과하면 밝기 필터를 활성화합니다</string>
-    <string name="cancel_queue_message">모든 다운로드 큐를 취소하시겠습니까?</string>
+    <string name="cancel_queue_message">모든 다운로드 작업을 취소하시겠습니까?</string>
     <string name="download_episode_range">에피소드를 다운로드 하시겠습니까 %s?</string>
-    <string name="queue_empty_message">현재 누락된 다운로드가 없습니다.</string>
+    <string name="queue_empty_message">다운로드 대기열이 비어 있습니다.</string>
     <plurals name="downloads_active">
         <item quantity="other">%d 활성 다운로드</item>
     </plurals>
@@ -745,18 +739,19 @@
     </plurals>
     <string name="search_suggestions_des">입력하는 동안 검색어 제안 표시</string>
     <string name="show_cast_in_details">출연진 정보 표시</string>
-    <string name="background_radius">배경 모서리 곡률</string>
+    <string name="background_radius">배경 테두리 곡률</string>
     <string name="reload_provider">공급자 새로고침</string>
     <string name="search_suggestions">검색어 제안</string>
     <string name="clear_suggestions">제안 삭제</string>
     <string name="video_info">미디어 정보</string>
     <string name="source_name">소스 이름</string>
     <string name="extra_brightness_settings">최대 밝기 확장</string>
-    <string name="download_queue">다운로드 큐</string>
+    <string name="download_queue">다운로드 작업</string>
     <string name="download_all">모두 다운로드</string>
     <string name="cancel_all">모두 취소</string>
     <string name="source_priority">소스 우선순위</string>
     <string name="overscan_settings">오버스캔(화면 경계) 설정</string>
     <string name="action_reload">새로고침</string>
     <string name="extra_brightness_key">최대 밝기 확장 활성화</string>
+    <string name="show_player_metadata_overlay">플레이어에 메타데이터 오버레이 표시</string>
 </resources>
diff --git a/app/src/main/res/values-b+lv/strings.xml b/app/src/main/res/values-b+lv/strings.xml
index 055732644..89003317a 100644
--- a/app/src/main/res/values-b+lv/strings.xml
+++ b/app/src/main/res/values-b+lv/strings.xml
@@ -2,11 +2,11 @@
 <resources>
     <string name="search_poster_img_des">Plakāts</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep %2$d</string>
-    <string name="cast_format" formatted="true">Cast: %s</string>
+    <string name="cast_format" formatted="true">Lomās: %s</string>
     <string name="result_poster_img_des">Plakāts</string>
     <string name="episode_poster_img_des">Epizodes plakāts</string>
     <string name="home_main_poster_img_des">Galvenais plakāts</string>
-    <string name="home_next_random_img_des">Nākamais random</string>
+    <string name="home_next_random_img_des">Nākamais nejaušais</string>
     <string name="go_back_img_des">Iet atpakaļ</string>
     <string name="home_change_provider_img_des">Nomainīt dvēju</string>
     <string name="preview_background_img_des">Apskatīt background</string>
@@ -15,15 +15,15 @@
     <string name="new_update_format" formatted="true">Jauns atjauninājums atrasts!
 \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d galvenais</string>
-    <string name="app_name">Claudstream</string>
+    <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">Atskaņo ar cloudstream</string>
-    <string name="title_home">Mājas</string>
+    <string name="title_home">Sākums</string>
     <string name="title_search">Meklēt</string>
     <string name="search_hint_site" formatted="true">Meklēt %s…</string>
     <string name="no_data">Nav datu</string>
     <string name="episode_more_options_des">Vairāk opcijas</string>
     <string name="next_episode">Nākamā epizode</string>
-    <string name="browser">Internets</string>
+    <string name="browser">Pārlūks</string>
     <string name="skip_loading">Izlaist ladešanos</string>
     <string name="loading">Lādējas…</string>
     <string name="type_watching">Skaties</string>
@@ -42,14 +42,14 @@
     <string name="go_back">Iet atpakaļ</string>
     <string name="play_episode">Palaist epizodi</string>
     <string name="download">Ieladēt</string>
-    <string name="download_paused">Lādēšana pauzēta</string>
+    <string name="download_paused">Lejupielāde iepauzēta</string>
     <string name="download_started">Lādēšana sakās</string>
-    <string name="download_failed">Ielādēt neizdevās</string>
-    <string name="download_canceled">Ielādēšana atcelta</string>
-    <string name="download_done">Pabeidza ieladēt</string>
-    <string name="update_started">Atjauninājums sakās</string>
+    <string name="download_failed">Lejupielāde neizdevās</string>
+    <string name="download_canceled">Lejupielāde atcelta</string>
+    <string name="download_done">Lejupielāde pabeigta</string>
+    <string name="update_started">Atjaunināšana sākta</string>
     <string name="stream">Tīkla plūsma</string>
-    <string name="error_loading_links_toast">Kļūda padejot linkus</string>
+    <string name="error_loading_links_toast">Kļūda, ielādējot saites</string>
     <string name="download_storage_text">Iekšējā atmiņa</string>
     <string name="app_dubbed_text">Dub</string>
     <string name="popup_delete_file">Dzēst datni</string>
@@ -78,13 +78,13 @@
     <string name="search_provider_text_providers">Meklēt izmantojot devējus</string>
     <string name="search_provider_text_types">Meklēt izmantojot tipus</string>
     <string name="benene_count_text">%d Banāni iedoti veidotājiem</string>
-    <string name="next_episode_format" formatted="true">Episode %d būs izlaista</string>
+    <string name="next_episode_format" formatted="true">%d. epizode būs pieejama</string>
     <string name="filler" formatted="true">Filtrs</string>
-    <string name="title_downloads">Ieladētas</string>
+    <string name="title_downloads">Lejupielādes</string>
     <string name="search_hint">Meklēt…</string>
-    <string name="title_settings">Settingi</string>
+    <string name="title_settings">Iestatījumi</string>
     <string name="result_tags">Žanrs</string>
-    <string name="result_share">Dalities</string>
+    <string name="result_share">Kopīgot</string>
     <string name="result_open_in_browser">Atvērt pārlūkā</string>
     <string name="downloaded">Ieladēts</string>
     <string name="downloading">Lādējas</string>
@@ -95,9 +95,9 @@
     <string name="sort_clear">Iztīrīt</string>
     <string name="subs_text_color">Teksta krāsa</string>
     <string name="subs_auto_select_language">Automātiski-iestādīt valodu</string>
-    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
-    <string name="next_episode_time_min_format" formatted="true">%dm</string>
-    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dst. %2$dmin.</string>
+    <string name="next_episode_time_min_format" formatted="true">%dmin.</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd. %2$dst. %3$dmin.</string>
     <string name="subs_download_languages">Ielādēt valodas</string>
     <string name="subs_subtitle_languages">Subtitru valoda</string>
     <string name="subs_hold_to_reset_to_default">Tūri lai restartētu uz sākumu</string>
@@ -115,7 +115,7 @@
     <string name="show_log_cat">Rādīt Logcat 🐈</string>
     <string name="test_log">Log</string>
     <string name="picture_in_picture">Bilde bildē</string>
-    <string name="picture_in_picture_des">Turpina spēlēt mazā lodziņā virs aplikācijām</string>
+    <string name="picture_in_picture_des">Turpina atskaņošanu miniatūrā atskaņotājā virs citām lietotnēm</string>
     <string name="player_size_settings">Players izmēra poga</string>
     <string name="player_size_settings_des">Noņemt melnās malas</string>
     <string name="player_subtitles_settings">Subtitri</string>
@@ -135,7 +135,7 @@
     <string name="double_tap_to_seek_settings_des">Uzpied divreiz pa labi vai kreisi lai palaistu atpakaļ vai uz priekšu</string>
     <string name="double_tap_to_pause_settings_des">Uzpied divreiz vidū lai pauzētu</string>
     <string name="use_system_brightness_settings">Lietot sistēmas gaišums</string>
-    <string name="use_system_brightness_settings_des">Lietot sistēmas gaišumu aplikācijas playerī nevis tumšunu</string>
+    <string name="use_system_brightness_settings_des">Izmanto sistēmas spilgtumu, nevis atskaņotāja tumšo pārklājumu</string>
     <string name="episode_sync_settings">Atjaunināt skatīšanos progresu</string>
     <string name="episode_sync_settings_des">Automātiski sync savu pašreizējo epizodes progresu</string>
     <string name="restore_settings">Atgūt datus no backupa</string>
@@ -160,15 +160,15 @@
     <string name="automatic_plugin_download">Automātiski lejupielādēt papildinājumus</string>
     <string name="automatic_plugin_download_summary">Automātiski uzstāda visus vēl neuzstādītos papildinājumus no pievienotajiem repozitorijiem.</string>
     <string name="updates_settings">Rādīt lietotņu atjauninājumus</string>
-    <string name="updates_settings_des">Automātiski meklēt jaunus atjauninājumus kad palaiž aplikāciju.</string>
+    <string name="updates_settings_des">Automātiski pārbauda atjauninājumus, kad atver lietotni.</string>
     <string name="redo_setup_process">Atsākt uzstādīšanas procesu</string>
     <string name="apk_installer_settings_des">Dažas ierīces neatbalsta jauno pakotnes uzstādītāju. Izmantojiet legacy (veco) uzstādītāju, ja atjauninājumus nevar uzstādīt.</string>
-    <string name="lightnovel">Noveles aplikācija no šiem izstrādātājiem</string>
-    <string name="anim">Anime aplikāciju no tiem pašiem izstradatājiem</string>
+    <string name="lightnovel">Viegla romānu lietotne no šiem pašiem izstrādātājiem</string>
+    <string name="anim">Anime lietotne no šiem pašiem izstrādātājiem</string>
     <string name="discord">Ienāc discordā</string>
     <string name="benene">Iedot banānu izstrādātājiem</string>
     <string name="benene_des">Iedotie banāni</string>
-    <string name="app_language">Aplikācijas valoda</string>
+    <string name="app_language">Lietotnes valoda</string>
     <string name="no_chromecast_support_toast">Šim devējam nav Chromecast pieņemšana</string>
     <string name="no_links_found_toast">Nav linku strastu</string>
     <string name="copy_link_toast">Links kopēts cliobordā</string>
@@ -206,7 +206,7 @@
     <string name="synopsis">Konspekts</string>
     <string name="queued">ievietots rindā</string>
     <string name="used_storage">Lietotie</string>
-    <string name="app_storage">Aplikācija</string>
+    <string name="app_storage">Lietotne</string>
     <string name="movies">Filmas</string>
     <string name="tv_series">Seriāli, raidījumi</string>
     <string name="cartoons">Animācija</string>
@@ -235,7 +235,7 @@
     <string name="storage_error">Ielādēšanas kļūda, pārbaudi atmiņas atļauju</string>
     <string name="episode_action_chromecast_episode">Chromecast epizode</string>
     <string name="episode_action_chromecast_mirror">Chromecast morror</string>
-    <string name="episode_action_play_in_app">Palaist aplikācijā</string>
+    <string name="episode_action_play_in_app">Atskaņot lietotnē</string>
     <string name="episode_action_play_in_format">Atskaņot uekšā %s</string>
     <string name="episode_action_auto_download">Automātiski ielādēt</string>
     <string name="episode_action_download_mirror">Ielādēt spoguli</string>
@@ -277,7 +277,7 @@
     <string name="legal_notice">Atruna</string>
     <string name="pref_category_bypass">ISP Izlaists</string>
     <string name="pref_category_links">Links</string>
-    <string name="pref_category_app_updates">Aplikācijas atjauninājumus</string>
+    <string name="pref_category_app_updates">Lietotnes atjauninājumi</string>
     <string name="pref_category_backup">Dublējums</string>
     <string name="pref_category_extensions">Papildinājumi</string>
     <string name="pref_category_actions">Akcijas</string>
@@ -294,7 +294,7 @@
     <string name="random_button_settings">Randomā poga</string>
     <string name="random_button_settings_desc">Rādīt izlases pogu Sākums un Bibliotēka sadaļās</string>
     <string name="provider_lang_settings">Papildinājuma valodas</string>
-    <string name="app_layout">Aplikācijas izskats</string>
+    <string name="app_layout">Lietotnes izkārtojums</string>
     <string name="preferred_media_settings">Izvēlētā media</string>
     <string name="enable_nsfw_on_providers">Iespējot nepiedienīgu, izaicinošu saturu (NSFW) atbalstītajos papildinājumos</string>
     <string name="subtitles_encoding">Subtitru kodējums</string>
@@ -345,7 +345,7 @@
     <string name="subtitles_example_text">Fogts čuhņā mīļi lenc - ģērbj, žvadz, pūkšķ</string>
     <string name="player_loaded_subtitles" formatted="true">Ielādēti %s</string>
     <string name="player_load_subtitles">Ielādēt no datnes</string>
-    <string name="app_theme_settings">Aplikācijas theme</string>
+    <string name="app_theme_settings">Lietotnes motīvs</string>
     <string name="player_load_subtitles_online">Lejupielādēt no interneta</string>
     <string name="downloaded_file">Lejupielādēta datne</string>
     <string name="actor_main">Galvenais</string>
@@ -430,7 +430,7 @@
     <string name="hls_playlist">HLS atskaņošanas saraksts</string>
     <string name="player_pref">Vēlamais video atskaņotājs</string>
     <string name="player_settings_play_in_app">Iekšējais atskaņotājs</string>
-    <string name="app_not_found_error">Aplikācijs nav atrasta</string>
+    <string name="app_not_found_error">Lietotne nav atrasta</string>
     <string name="all_languages_preference">Visas valodas</string>
     <string name="skip_type_ed">Beigas</string>
     <string name="skip_type_recap">Kopsavilkums</string>
@@ -498,7 +498,7 @@
     <string name="setup_extensions_subtext">Lejupielādējiet to vietņu sarakstu, kuras vēlaties izmantot</string>
     <string name="extension_install_first">Vispirms uzstādīt papildinājumu</string>
     <string name="skip_type_op">Atvēršana</string>
-    <string name="skip_type_intro">Sākums</string>
+    <string name="skip_type_intro">Ievads</string>
     <string name="skip_type_format" formatted="true">Izlaist %s</string>
     <string name="action_remove_from_watched">Noņemt no skatītajiem</string>
     <string name="action_mark_as_watched">Atzīmēt kā skatītu</string>
@@ -509,16 +509,16 @@
     <string name="subscription_in_progress_notification">Abonēto šovu atjaunināšana</string>
     <string name="subscription_list_name">Abonēts</string>
     <string name="subscription_new">Abonēts %s</string>
-    <string name="next_season_episode_format" formatted="true">%1$d. sezona un %2$d. sērija tiks izlaista pēc</string>
-    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
-    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
-    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="next_season_episode_format" formatted="true">%1$d. sezonas %2$d. epizode būs pieejama</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dst. %2$dmin. %3$dsek.</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dmin. %2$dsek.</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$dsek.</string>
     <string name="play_from_beginning_img_des">Atskaņot no sākuma</string>
     <string name="speech_recognition_unavailable">Runas atpazīšana nav pieejama</string>
     <string name="begin_speaking">Sāciet runāt…</string>
     <string name="torrent_info">Šis video ir torrenta fails, kas nozīmē, ka jūsu video aktivitātes var izsekot.\nPirms turpināt, pārliecinieties, ka saprotat torrenta failu lietošanu.</string>
-    <string name="downloads_delete_select">Atlasiet dzēšamos vienumus</string>
-    <string name="downloads_empty">Pašlaik nav lejupielāžu.</string>
+    <string name="downloads_delete_select">Atlasiet vienumus, ko dzēst</string>
+    <string name="downloads_empty">Pašlaik nav pieejama neviena lejupielāde.</string>
     <string name="offline_file">Pieejams skatīšanai bezsaistē</string>
     <string name="wifi">Bezvadu (Wi-Fi)</string>
     <string name="use">Izmantot</string>
@@ -609,4 +609,6 @@
     <string name="delete_message_series_episodes" formatted="true">Vai tiešām vēlaties neatgriezeniski dzēst šīs %1$s epizodes?\n\n%2$s</string>
     <string name="delete_message_series_section" formatted="true">Jūs arī neatgriezeniski izdzēsīsiet visas šī seriāla, raidījuma epizodes:\n\n%s</string>
     <string name="delete_message_series_only" formatted="true">Vai tiešām vēlaties neatgriezeniski dzēst visas šī seriāla, raidījuma epizodes?\n\n%s</string>
+    <string name="queue_empty_message">Pašlaik nav nevienas rindā ievietotas lejupielādes.</string>
+    <string name="open_local_video">Atvērt vietējo video</string>
 </resources>
diff --git a/app/src/main/res/values-b+uk/strings.xml b/app/src/main/res/values-b+uk/strings.xml
index cec3b6738..2eb6e2451 100644
--- a/app/src/main/res/values-b+uk/strings.xml
+++ b/app/src/main/res/values-b+uk/strings.xml
@@ -6,10 +6,10 @@
     <string name="home_change_provider_img_des">Змінити Постачальника</string>
     <string name="go_back_img_des">Назад</string>
     <string name="rated_format" formatted="true">Рейтинг: %.1f</string>
-    <string name="cast_format" formatted="true">Актори: %s</string>
+    <string name="cast_format" formatted="true">У ролях: %s</string>
     <string name="next_episode_format" formatted="true">Епізод %d вийде через</string>
     <string name="result_poster_img_des">Плакат</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Еп. %2$d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Еп %2$d</string>
     <string name="next_episode_time_day_format" formatted="true">%1$dд %2$dгод %3$dхв</string>
     <string name="next_episode_time_hour_format" formatted="true">%1$dгод %2$dхв</string>
     <string name="next_episode_time_min_format" formatted="true">%dхв</string>
@@ -148,23 +148,23 @@
     <string name="pref_filter_search_quality">Приховати вибрану якість відео у результатах пошуку</string>
     <string name="automatic_plugin_download">Автозавантаження розширень</string>
     <string name="updates_settings">Показувати оновлення застосунку</string>
-    <string name="redo_setup_process">Налаштувати повторно</string>
-    <string name="apk_installer_settings">Установлювач APK</string>
+    <string name="redo_setup_process">Налаштувати повторно процес встановлення</string>
+    <string name="apk_installer_settings">Встановлювач APK</string>
     <string name="github">Github</string>
     <string name="lightnovel">Застосунок для ранобе від тих самих розробників</string>
     <string name="anim">Застосунок для аніме від тих самих розробників</string>
-    <string name="benene">Дати банан розробникам</string>
-    <string name="app_language">Мова застосунку</string>
+    <string name="benene">Дати benene розробникам</string>
+    <string name="app_language">Мова Застосунку</string>
     <string name="no_chromecast_support_toast">Цей постачальник не має підтримування Chromecast</string>
-    <string name="no_links_found_toast">Посилань не знайдено</string>
-    <string name="play_episode_toast">Переглянути епізод</string>
+    <string name="no_links_found_toast">Посилань Не Знайдено</string>
+    <string name="play_episode_toast">Переглянути Епізод</string>
     <string name="subs_default_reset_toast">Скинути до типових значень</string>
-    <string name="no_season">Немає сезона</string>
-    <string name="episodes">Епізодів</string>
+    <string name="no_season">Немає Сезону</string>
+    <string name="episodes">Епізоди</string>
     <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="season_short">С</string>
     <string name="episode_short">Е</string>
-    <string name="delete_file">Видалити файл</string>
+    <string name="delete_file">Видалити Файл</string>
     <string name="delete">Видалити</string>
     <string name="cancel">Скасувати</string>
     <string name="resume">Відновити</string>
@@ -185,15 +185,15 @@
     <string name="cartoons">Мультфільми</string>
     <string name="anime">Аніме</string>
     <string name="ova">OVA</string>
-    <string name="asian_drama">Азіатські драми</string>
-    <string name="livestreams">Прямі трансляції</string>
+    <string name="asian_drama">Азіатські Драми</string>
+    <string name="livestreams">Прямі Трансляції</string>
     <string name="others">Інші</string>
     <string name="tv_series_singular">Серіал</string>
     <string name="cartoons_singular">Мультфільм</string>
     <string name="anime_singular">Аніме</string>
-    <string name="documentaries_singular">Документальний фільм</string>
-    <string name="asian_drama_singular">Азіатська драма</string>
-    <string name="live_singular">Пряма трансляція</string>
+    <string name="documentaries_singular">Документальний Фільм</string>
+    <string name="asian_drama_singular">Азіатська Драма</string>
+    <string name="live_singular">Пряма Трансляція</string>
     <string name="other_singular">Відео</string>
     <string name="source_error">Помилка джерела</string>
     <string name="remote_error">Віддалена помилка</string>
@@ -203,7 +203,7 @@
     <string name="episode_action_play_in_format">Переглянути в %s</string>
     <string name="episode_action_auto_download">Автозавантаження</string>
     <string name="episode_action_download_mirror">Завантажити дзеркало</string>
-    <string name="check_for_update">Перевірити наявність оновлень</string>
+    <string name="check_for_update">Перевірити Наявність Оновлень</string>
     <string name="video_lock">Забл./Розбл.</string>
     <string name="video_skip_op">Пропустити ОП</string>
     <string name="dont_show_again">Не показувати знову</string>
@@ -211,7 +211,7 @@
     <string name="watch_quality_pref">Бажана якість перегляду (WiFi)</string>
     <string name="show_title">Заголовок</string>
     <string name="poster_ui_settings">Перемкнути елементи інтерфейсу на плакаті</string>
-    <string name="no_update_found">Оновлення не знайдено</string>
+    <string name="no_update_found">Оновлення Не Знайдено</string>
     <string name="double_tap_to_seek_settings_des">Натисніть двічі праворуч або ліворуч, щоби перемотати вперед або назад</string>
     <string name="use_system_brightness_settings_des">Використовувати системну яскравість у програвачі замість темного накладання</string>
     <string name="restore_success">Завантажено файл резервної копії</string>
@@ -220,12 +220,12 @@
     <string name="backup_failed">Немає дозволу на зберігання. Спробуйте ще раз.</string>
     <string name="kitsu_settings">Показувати плакати від Kitsu</string>
     <string name="automatic_plugin_updates">Автооновлення розширень</string>
-    <string name="automatic_plugin_download_summary">Автоматично встановлювати всі розширення, які ще не встановлено, з доданих репозиторіїв.</string>
+    <string name="automatic_plugin_download_summary">Автоматично встановлювати всі розширення, які ще не встановлено, з доданих сховищ.</string>
     <string name="updates_settings_des">Автоматично перевіряти нові оновлення після запуску застосунку.</string>
     <string name="copy_link_toast">Покликання скопійовано до буфера обміну</string>
     <string name="apk_installer_settings_des">Деякі пристрої не підтримують новий інсталятор пакетів. Спробуйте старий варіант, якщо оновлення не встановлюються.</string>
     <string name="discord">Приєднуйтеся до Discord</string>
-    <string name="benene_des">Дано бананів</string>
+    <string name="benene_des">Дано benene</string>
     <string name="year">Рік</string>
     <string name="go_forward_30">+30</string>
     <string name="season_format">%1$s %2$d%3$s</string>
@@ -239,8 +239,8 @@
     <string name="video_aspect_ratio_resize">Змінити розмір</string>
     <string name="synopsis">Стислий зміст</string>
     <string name="movies">Фільми</string>
-    <string name="episode_action_reload_links">Перезавантажити покликання</string>
-    <string name="documentaries">Документальні фільми</string>
+    <string name="episode_action_reload_links">Перезавантажити посилання</string>
+    <string name="documentaries">Документальні Фільми</string>
     <string name="nsfw">NSFW</string>
     <string name="movies_singular">Фільм</string>
     <string name="ova_singular">OVA</string>
@@ -249,25 +249,25 @@
     <string name="nsfw_singular">NSFW</string>
     <string name="unexpected_error">Несподівана помилка програвача</string>
     <string name="storage_error">Помилка завантаження, перевірте дозвіл на зберігання</string>
-    <string name="episode_action_chromecast_episode">Дивитися через Chromecast</string>
+    <string name="episode_action_chromecast_episode">Chromecast епізод</string>
     <string name="show_sub">Мітка субтитрів</string>
     <string name="video_source">Джерело</string>
     <string name="episode_action_download_subtitle">Завантажити субтитри</string>
     <string name="show_dub">Мітка дубляжу</string>
-    <string name="skip_update">Пропустити це оновлення</string>
+    <string name="skip_update">Пропустити це Оновлення</string>
     <string name="all">Усе</string>
     <string name="resize_fit">На весь екран</string>
-    <string name="resize_fill">Заповнити</string>
+    <string name="resize_fill">Розтягнути</string>
     <string name="resize_zoom">Збільшити</string>
     <string name="tracks">Доріжки</string>
     <string name="pref_category_app_updates">Оновлення застосунку</string>
     <string name="pref_category_cache">Кеш</string>
     <string name="pref_category_gestures">Жести</string>
-    <string name="pref_category_player_features">Особливості програвача</string>
+    <string name="pref_category_player_features">Функції програвача</string>
     <string name="pref_category_subtitles">Субтитри</string>
     <string name="pref_category_defaults">Типово</string>
     <string name="pref_category_looks">Вигляд</string>
-    <string name="pref_category_ui_features">Особливості</string>
+    <string name="pref_category_ui_features">Функції</string>
     <string name="category_general">Загальні</string>
     <string name="random_button_settings">Випадкова кнопка</string>
     <string name="random_button_settings_desc">Показувати кнопку випадкового вибору на головній сторінці та бібліотеці</string>
@@ -275,14 +275,14 @@
     <string name="app_layout">Макет застосунку</string>
     <string name="preferred_media_settings">Бажані медіа</string>
     <string name="automatic">Автоматично</string>
-    <string name="tv_layout">Макет телевізора</string>
-    <string name="phone_layout">Макет телефону</string>
-    <string name="emulator_layout">Макет емулятора</string>
+    <string name="tv_layout">Телевізійна Обгортка</string>
+    <string name="phone_layout">Телефона обгортка</string>
+    <string name="emulator_layout">Емуляторна обгортка</string>
     <string name="primary_color_settings">Основний колір</string>
     <string name="app_theme_settings">Тема застосунку</string>
     <string name="bottom_title_settings">Розташування назви плаката</string>
     <string name="bottom_title_settings_des">Розмістити назву під плакатом</string>
-    <string name="example_password">Пароль123</string>
+    <string name="example_password">password123</string>
     <string name="example_username">Імʼя користувача</string>
     <string name="example_email">hello@world.com</string>
     <string name="example_site_name">НоваНазваСайту</string>
@@ -296,7 +296,7 @@
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">%s автентифіковано</string>
-    <string name="authenticated_user_fail" formatted="true">Не вдалося ввійти в %s</string>
+    <string name="authenticated_user_fail" formatted="true">Не вдалося увійти в %s</string>
     <string name="none">Нічого</string>
     <string name="normal">Звичайний</string>
     <string name="min">Мін.</string>
@@ -319,7 +319,7 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-    <string name="poster_image">Зображення плаката</string>
+    <string name="poster_image">Зображення Плаката</string>
     <string name="category_player">Програвач</string>
     <string name="resolution_and_title">Роздільна здатність та заголовок</string>
     <string name="error_invalid_id">Недійсний ID</string>
@@ -341,21 +341,21 @@
     <string name="dns_pref">DNS через HTTPS</string>
     <string name="download_path_pref">Шлях завантаження</string>
     <string name="add_site_summary">Додайте двійника наявного сайту, з іншою URL-адресою</string>
-    <string name="display_subbed_dubbed_settings">Показувати мітку Дубляж/Субтитри для аніме</string>
+    <string name="display_subbed_dubbed_settings">Показувати Дубльоване/З Субтитрами Аніме</string>
     <string name="legal_notice">Застереження</string>
     <string name="pref_category_extensions">Розширення</string>
     <string name="pref_category_actions">Дії</string>
     <string name="example_ip">127.0.0.1</string>
     <string name="pref_category_player_layout">Макет</string>
     <string name="subtitles_encoding">Кодування субтитрів</string>
-    <string name="enable_nsfw_on_providers">Увімкнути NSFW вміст на підтримуваних розширеннях</string>
-    <string name="category_ui">Макет</string>
+    <string name="enable_nsfw_on_providers">Увімкнути NSFW вміст на підтримуваних Розширеннях</string>
+    <string name="category_ui">Обгортка</string>
     <string name="category_providers">Постачальники</string>
     <string name="example_site_url">https://example.com</string>
-    <string name="login_format" formatted="true">%2$s %1$s</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="subtitles_depressed">Опущені</string>
     <string name="account">обліковий запис</string>
-    <string name="create_account">Створити</string>
+    <string name="create_account">Створити обліковий запис</string>
     <string name="added_sync_format" formatted="true">Додано %s</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_score">Рейтинг</string>
@@ -396,7 +396,7 @@
     <string name="setup_done">Готово</string>
     <string name="extensions">Розширення</string>
     <string name="add_repository">Додати репозиторій</string>
-    <string name="repository_name_hint">Назва репозиторію (необов’язково)</string>
+    <string name="repository_name_hint">Назва репозиторію (Опціонально)</string>
     <string name="repository_url_hint">URL-адреса репозиторію або короткий код</string>
     <string name="plugin_loaded">Розширення завантажено</string>
     <string name="plugin_downloaded">Розширення завантажено</string>
@@ -404,17 +404,17 @@
     <string name="batch_download_start_format" formatted="true">Почалося завантаження %1$d %2$s…</string>
     <string name="batch_download_finish_format" formatted="true">Завантажено %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Усі %s вже завантажено</string>
-    <string name="batch_download">Завантажити пакунки</string>
+    <string name="batch_download">Завантажити пакунком</string>
     <string name="plugin_singular">розширення</string>
-    <string name="plugin">розширень</string>
-    <string name="delete_repository">Видалити репозиторій</string>
+    <string name="plugin">розширення</string>
+    <string name="delete_repository">Видалити сховище</string>
     <string name="setup_extensions_subtext">Завантажте список сайтів, які ви хочете використовувати</string>
     <string name="plugins_downloaded" formatted="true">Завантажено: %d</string>
     <string name="plugins_disabled" formatted="true">Вимкнено: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Не завантажено: %d</string>
     <string name="plugins_updated" formatted="true">Оновлено %d розширень</string>
-    <string name="blank_repo_message">Типово у CloudStream немає жодного встановленого сайту. Вам потрібно встановити сайти з репозиторіїв.\n\nПриєднуйтеся до нашого Discord або шукайте в інтернеті.</string>
-    <string name="view_public_repositories_button">Переглянути репозиторії спільноти</string>
+    <string name="blank_repo_message">Типово у CloudStream немає жодного встановленого сайту. Вам потрібно встановити сайти зі сховищ.\n\nПриєднуйтеся до нашого Discord або шукайте в інтернеті.</string>
+    <string name="view_public_repositories_button">Переглянути сховища спільноти</string>
     <string name="view_public_repositories_button_short">Публічний список</string>
     <string name="uppercase_all_subtitles">Усі субтитри великими літерами</string>
     <string name="single_plugin_disabled" formatted="true">%s (вимкнено)</string>
@@ -449,10 +449,10 @@
     <string name="update_notification_installing">Установлення оновлення застосунку…</string>
     <string name="update_notification_failed">Не вдалося встановити нову версію застосунку</string>
     <string name="apk_installer_legacy">Застарілий</string>
-    <string name="apk_installer_package_installer">Установлювач пакунків</string>
+    <string name="apk_installer_package_installer">Встановлювач Пакунків</string>
     <string name="delayed_update_notice">Застосунок буде оновлено після виходу</string>
-    <string name="delete_repository_plugins">Це також призведе до видалення всіх розширень репозиторію</string>
-    <string name="all_languages_preference">Усі мови</string>
+    <string name="delete_repository_plugins">Це також призведе до видалення всіх розширень сховища</string>
+    <string name="all_languages_preference">Усі Мови</string>
     <string name="previous">Назад</string>
     <string name="app_layout_subtext">Змініть вигляд застосунку відповідно до вашого пристрою</string>
     <string name="plugin_deleted">Розширення видалено</string>
@@ -467,24 +467,24 @@
     <string name="app_not_found_error">Застосунок не знайдено</string>
     <string name="skip_type_mixed_op">Змішаний опенінґ</string>
     <string name="action_remove_from_watched">Вилучити з переглянутого</string>
-    <string name="sort_updated_old">Оновленням (від старого до нового)</string>
-    <string name="sort_updated_new">Оновленням (від нового до старого)</string>
+    <string name="sort_updated_old">Оновленням (від Старого до Нового)</string>
+    <string name="sort_updated_new">Оновленням (від Нового до Старого)</string>
     <string name="library">Бібліотека</string>
     <string name="sort">Сортувати</string>
-    <string name="sort_rating_desc">Рейтингом (від високого до низького)</string>
+    <string name="sort_rating_desc">Рейтингом (від Високого до Низького)</string>
     <string name="sort_by">Сортувати за</string>
     <string name="sort_alphabetical_a">Алфавітом (від А до Я)</string>
-    <string name="sort_rating_asc">Рейтингом (від низького до високого)</string>
+    <string name="sort_rating_asc">Рейтингом (від Низького до Високого)</string>
     <string name="empty_library_no_accounts_message">Ваша бібліотека порожня :(\nУвійдіть в обліковий запис бібліотеки або додайте щось до вашої локальної бібліотеки.</string>
     <string name="sort_alphabetical_z">Алфавітом (від Я до А)</string>
-    <string name="select_library">Оберіть бібліотеку</string>
-    <string name="open_with">Відкрити</string>
+    <string name="select_library">Оберіть Бібліотеку</string>
+    <string name="open_with">Відкрити з</string>
     <string name="browser">Браузер</string>
     <string name="empty_library_logged_in_message">Цей список порожній. Спробуйте перейти до іншого.</string>
     <string name="safe_mode_file">Файл безпечного режиму знайдено!\nРозширення не завантажуватимуться під час запуску, доки файл не буде видалено.</string>
     <string name="pref_category_android_tv">Android TV</string>
-    <string name="android_tv_interface_off_seek_settings">Прогрвач приховано – крок перемотування</string>
-    <string name="android_tv_interface_on_seek_settings">Програвач показано – крок перемотування</string>
+    <string name="android_tv_interface_off_seek_settings">Прогрвач Приховано – Крок Перемотування</string>
+    <string name="android_tv_interface_on_seek_settings">Програвач Показано – Крок Перемотування</string>
     <string name="android_tv_interface_on_seek_settings_summary">Крок перемотування, який використовується, коли програвач видимий</string>
     <string name="android_tv_interface_off_seek_settings_summary">Крок перемотування, який використовується, коли плеєр прихований</string>
     <string name="test_failed">Провалено</string>
@@ -500,15 +500,15 @@
     <string name="subscription_deleted">Ви відписалися від %s</string>
     <string name="subscription_episode_released">Епізод %d випущено!</string>
     <string name="revert">Повернути</string>
-    <string name="jsdelivr_proxy">GitHub проксі</string>
+    <string name="jsdelivr_proxy">GitHub Проксі</string>
     <string name="jsdelivr_enabled">Не вдалось отримати доступ до GitHub. Увімкнення проксі-сервера jsDelivr…</string>
     <string name="pref_category_bypass">Обходи ISP</string>
-    <string name="jsdelivr_proxy_summary">Обхід блокування GitHub за допомогою jsDelivr. Можлива затримка оновлень на кілька днів.</string>
+    <string name="jsdelivr_proxy_summary">Обхід блокування чистих gitHub URLs за допомогою jsDelivr. Можлива затримка оновлень на кілька днів.</string>
     <string name="watch_quality_pref_data">Бажана якість перегляду (мобільні дані)</string>
-    <string name="set_default">Змінити на типові</string>
+    <string name="set_default">Встановити типові</string>
     <string name="profiles">Профілі</string>
     <string name="help">Довідка</string>
-    <string name="quality_profile_help">Тут можна змінити порядок джерел. Відео з вищим пріоритетом з’являтиметься вище в списку джерел. Сума пріоритету джерела та пріоритету якості утворює пріоритет відео.\n\nДжерело А: 3\nЯкість Б: 7\nЗагальний пріоритет відео дорівнюватиме 10.\n\nПРИМІТКА: Якщо сума пріоритетів дорівнюватиме 10 або більше, програвач автоматично пропустить завантаження цього покликання!</string>
+    <string name="quality_profile_help">Тут можна змінити порядок джерел. Відео з вищим пріоритетом з’являтиметься вище в списку джерел. Сума пріоритету джерела та пріоритету якості утворює пріоритет відео.\n\nДжерело А: 3\nЯкість Б: 7\nЗагальний пріоритет відео дорівнюватиме 10.\n\nПРИМІТКА: Якщо сума пріоритетів дорівнюватиме 10 або більше, програвач автоматично пропустить завантаження цього посилання!</string>
     <string name="profile_number">Профіль %d</string>
     <string name="wifi">Wi-Fi</string>
     <string name="mobile_data">Мобільні дані</string>
@@ -523,11 +523,11 @@
     <string name="no_plugins_found_error">Не знайдено жодного розширення в репозиторії</string>
     <string name="already_voted">Ви вже проголосували</string>
     <string name="backup_frequency">Частота резервного копіювання</string>
-    <string name="favorite_removed">%s вилучено з обраного</string>
-    <string name="favorites_list_name">Обране</string>
-    <string name="favorite_added">%s додано до обраного</string>
+    <string name="favorite_removed">%s вилучено з вподобаних</string>
+    <string name="favorites_list_name">Вподобані</string>
+    <string name="favorite_added">%s додано до вподобаних</string>
     <string name="duplicate_message_multiple" formatted="true">У вашій бібліотеці виявлено можливі дублікати:\n\n%s\n\nУсе одно хочете додати цей елемент, замінити наявні чи скасувати дію?</string>
-    <string name="duplicate_title">Знайдено можливий дублікат</string>
+    <string name="duplicate_title">Знайдено Можливий Дублікат</string>
     <string name="lock_profile">Заблокувати профіль</string>
     <string name="action_add_to_favorites">Додати до обраного</string>
     <string name="duplicate_replace_all">Замінити все</string>
@@ -538,16 +538,16 @@
     <string name="duplicate_add">Додати</string>
     <string name="action_subscribe">Підписатися</string>
     <string name="action_remove_from_favorites">Вилучити з обраного</string>
-    <string name="select_an_account">Оберіть обліковий запис</string>
-    <string name="duplicate_message_single">Схоже, що у вашій бібліотеці вже є можливий дублікат: «%s.»\n\nУсе одно хочете додати цей елемент, замінити наявний чи скасувати дію?</string>
+    <string name="select_an_account">Оберіть Обліковий Запис</string>
+    <string name="duplicate_message_single">Схоже, що у вашій бібліотеці вже є можливий дублікат: \'%s.\'\n\nУсе одно хочете додати цей елемент, замінити наявний чи скасувати дію?</string>
     <string name="enter_pin">Уведіть PIN-код</string>
     <string name="pin">PIN-код</string>
     <string name="enter_current_pin">Уведіть поточний PIN-код</string>
     <string name="logged_account" formatted="true">Увійшли як %s</string>
     <string name="enter_pin_with_name" formatted="true">Уведіть PIN-код для %s</string>
-    <string name="use_default_account">Використовувати типовий обліковий запис</string>
+    <string name="use_default_account">Використовувати Типовий Обліковий Запис</string>
     <string name="skip_startup_account_select_pref">Пропускати вибір облікового запису під час запуску</string>
-    <string name="manage_accounts">Керувати обліковими записами</string>
+    <string name="manage_accounts">Керувати Обліковими Записами</string>
     <string name="edit_account">Редагувати обліковий запис</string>
     <string name="rotate_video_desc">Показувати кнопку перемикання орієнтації екрана</string>
     <string name="rotate_video">Обернути</string>
@@ -555,28 +555,28 @@
     <string name="auto_rotate_video">Автообертання</string>
     <string name="auto_rotate_video_desc">Увімкнути автоматичну зміну орієнтації екрана відповідно до відео</string>
     <string name="speed_setting_summary">Додати налаштування швидкості до програвача</string>
-    <string name="test_extensions">Перевірити всі розширення</string>
+    <string name="test_extensions">Перевірити всі Розширення</string>
     <string name="result_search_tooltip">Пошук в інших розширеннях</string>
     <string name="recommendations_tooltip">Показати рекомендації</string>
-    <string name="test_extensions_summary">Ця перевірка лише для розробників і не підтверджує або заперечує роботу жодного розширення.</string>
+    <string name="test_extensions_summary">Ця Перевірка лише для розробників і не підтверджує або заперечує роботу жодного розширення.</string>
     <string name="subscribe_tooltip">Сповіщення про новий епізод</string>
-    <string name="password_pin_authentication_title">Автентифікація за паролем/PIN-кодом</string>
+    <string name="password_pin_authentication_title">Автентифікація за Паролем/PIN-кодом</string>
     <string name="biometric_authentication_title">Розблокуйте CloudStream</string>
-    <string name="biometric_setting">Біометричне блокування</string>
-    <string name="biometric_setting_summary">Розблоковуйте застосунок за допомогою відбитка пальця, Face ID, PIN-коду, графічного ключа або пароля.</string>
+    <string name="biometric_setting">Біометричне Блокування</string>
+    <string name="biometric_setting_summary">Розблоковуйте застосунок за допомогою відбитка пальця, Face ID, PIN-коду, Графічного Ключа або Пароля.</string>
     <string name="biometric_warning">Щойно було виконано резервне копіювання даних CloudStream. Хоча ймовірність цього вкрай мала, усі пристрої можуть поводитися по-різному. У рідкісних випадках, якщо ви втратите доступ до застосунку, повністю очистіть дані застосунку та відновіть їх із резервної копії. Просимо вибачення за будь-які незручності, що можуть виникнути.</string>
     <string name="biometric_unsupported">Біометрична автентифікація не підтримується на цьому пристрої</string>
     <string name="biometric_prompt_description">Після кількох невдалих спроб вікно запиту зникне. Перезапустіть застосунок, щоби спробувати ще раз.</string>
     <string name="resume_remaining" formatted="true">%s\nзалишилося</string>
-    <string name="unfavorite">Вилучити з обраного</string>
-    <string name="favorite">Додати до обраного</string>
+    <string name="unfavorite">Вилучити з вподобаного</string>
+    <string name="favorite">Додати до вподобаного</string>
     <string name="toast_copied">скопійовано!</string>
     <string name="repo_copy_label">Назва репозиторію та URL</string>
-    <string name="clipboard_unknown_error">Помилка копіювання, скопіюйте logcat та зверніться до служби підтримки застосунку.</string>
-    <string name="clipboard_permission_error">Помилка доступу до буфера обміну, спробуйте ще раз.</string>
-    <string name="ok">Гаразд</string>
+    <string name="clipboard_unknown_error">Помилка копіювання, Будь-ласка скопіюйте logcat та зверніться до служби підтримки застосунку.</string>
+    <string name="clipboard_permission_error">Помилка доступу до буфера обміну, Будь-ласка спробуйте ще раз.</string>
+    <string name="ok">OK</string>
     <string name="battery_dialog_title">Вимкнути оптимізацію батареї</string>
-    <string name="battery_dialog_message">Щоби забезпечити безперервне завантаження та сповіщення про підписані телепередачі, CloudStream потребує дозволу на роботу у фоновому режимі. Натиснувши «Гаразд», ви побачите діалогове вікно запиту. Натисніть «Дозволити».\n\nЗверніть увагу, що цей дозвіл не означає, що CS3 розряджатиме ваш акумулятор. Він працюватиме у фоновому режимі лише за необхідності, наприклад, під час отримання сповіщень або завантаження відео з офіційних розширень.</string>
+    <string name="battery_dialog_message">Щоби забезпечити безперервне завантаження та сповіщення про підписані телепередачі, CloudStream потребує дозволу на роботу у фоновому режимі. Натиснувши OK, ви побачите діалогове вікно запиту. Натисніть \'Дозволити\'.\n\nЗверніть увагу, що цей дозвіл не означає, що CS3 розряджатиме ваш акумулятор. Він працюватиме у фоновому режимі лише за необхідності, наприклад, під час отримання сповіщень або завантаження відео з офіційних розширень.</string>
     <string name="app_unrestricted_toast">Споживання батареї застосунком уже змінено на необмежене</string>
     <string name="app_info_intent_error">Не вдається відкрити подробиці про застосунок CloudStream.</string>
     <string name="audio_book_singular">Аудіокнига</string>
@@ -587,16 +587,16 @@
     <string name="next_season_episode_format" formatted="true">Сезон %1$d Епізод %2$d вийде через</string>
     <string name="player_settings_select_cast_device">Оберіть пристрій для трансляції</string>
     <string name="episode_action_cast_mirror">Трансляція через дзеркало</string>
-    <string name="cs3wiki">Довідник CloudStream</string>
+    <string name="cs3wiki">CloudStream Wiki</string>
     <string name="pref_category_security">Безпека</string>
     <string name="pref_category_accounts">Облікові записи</string>
     <string name="qr_image">Зображення QR-коду</string>
-    <string name="open_downloaded_repo">Відкрити репозиторій</string>
+    <string name="open_downloaded_repo">Відкрити сховище</string>
     <string name="device_pin_url_message">Відвідайте <b>%s</b> на своєму смартфоні або комп\'ютері та введіть вищевказаний код</string>
-    <string name="device_pin_error_message">Не вдається отримати PIN-код пристрою, спробуйте локальну автентифікацію</string>
-    <string name="device_pin_expired_message">PIN-код застарів!</string>
+    <string name="device_pin_error_message">Не вдається отримати PIN-код пристрою, спробуйте локальну аутентифікацію</string>
+    <string name="device_pin_expired_message">PIN-код зараз закінчився !</string>
     <string name="device_pin_counter_text">Термін дії коду закінчується через %1$dхв %2$dс</string>
-    <string name="auth_locally">Локальна автентифікація</string>
+    <string name="auth_locally">Локальна Аутентифікація</string>
     <string name="dismiss">Відхилити</string>
     <string name="play_from_beginning_img_des">Відтворити з Початку</string>
     <string name="test_warning">Попередження</string>
@@ -604,25 +604,25 @@
     <string name="downloads_empty">Наразі завантажень немає.</string>
     <string name="hide_player_control_names">Приховати назви елементів керування в програвачі</string>
     <string name="open_local_video">Відкрити локальне відео</string>
-    <string name="sort_release_date_new">Датою випуску (від нових до старих)</string>
-    <string name="sort_release_date_old">Датою випуску (від старих до нових)</string>
+    <string name="sort_release_date_new">Датою випуску (від Нових до Старих)</string>
+    <string name="sort_release_date_old">Датою випуску (від Старих до Нових)</string>
     <string name="downloads_delete_select">Оберіть Елементи для Видалення</string>
     <string name="select_all">Обрати Все</string>
     <string name="deselect_all">Зняти Вибір Всіх</string>
     <string name="delete_format" formatted="true">Видалити (%1$d | %2$s)</string>
-    <string name="delete_message_series_episodes" formatted="true">Ви впевнені, що хочете назавжди видалити такі епізоди «%1$s»?\n\n%2$s</string>
+    <string name="delete_message_series_episodes" formatted="true">Ви впевнені, що хочете назавжди видалити такі епізоди в %1$s?\n\n%2$s</string>
     <string name="delete_message_series_section" formatted="true">Ви також назавжди видалите всі епізоди в такому серіалі:\n\n%s</string>
     <string name="offline_file">Доступно для перегляду в оффлайн режимі</string>
-    <string name="delete_files">Видалити файли</string>
+    <string name="delete_files">Видалити Файли</string>
     <string name="delete_message_multiple" formatted="true">Ви впевнені, що хочете назавжди видалити такі елементи?\n\n%s</string>
     <string name="delete_message_series_only" formatted="true">Ви впевнені, що хочете назавжди видалити всі епізоди в такому серіалі?\n\n%s</string>
     <string name="preview_seekbar">Попередній перегляд на шкалі перегляду</string>
     <string name="preview_seekbar_desc">Увімкнути мініатюру попереднього перегляду на шкалі перегляду</string>
     <string name="no_subtitles_loaded">Субтитри ще не завантажено</string>
     <string name="confirm_before_exiting_title">Підтвердіть перед виходом</string>
-    <string name="show">Показувати</string>
+    <string name="show">Відобразити</string>
     <string name="confirm_before_exiting_desc">Показувати діалог перед виходом із застосунку</string>
-    <string name="dont_show">Не показувати</string>
+    <string name="dont_show">Не відображати</string>
     <string name="backup_path_title">Розташування теки для резервних копій</string>
     <string name="custom">Власний</string>
     <string name="torrent_info">Це відео – Торрент, це означає, що ваша відео діяльність може відстежуватися.\nПереконайтеся, що розумієте, що таке Торрент, перед тим як продовжити.</string>
@@ -631,21 +631,21 @@
     <string name="podcast_singluar">Подкаст</string>
     <string name="unsupported_error">Непідтримувана помилка</string>
     <string name="encoding_error">Помилка кодування</string>
-    <string name="player_load_one_subtitle_online">Завантажити перші доступні</string>
-    <string name="torrent_preferred_media">Увімкніть торент у Налаштування/Постачальники/Бажані медіа</string>
+    <string name="player_load_one_subtitle_online">Завантажити перший доступний</string>
+    <string name="torrent_preferred_media">Увімкніть торент в Налаштування/Постачальники/Бажані медіа</string>
     <string name="torrent_not_accepted">Перезапустіть застосунок та прийміть спливне вікно Stream Torrent, щоби продовжити.</string>
     <string name="software_decoding">Програмне декодування</string>
     <string name="software_decoding_desc">Програмне декодування дозволяє плеєру відтворювати відеофайли, які не підтримуються вашим пристроєм, але може спричинити затримки або нестабільне відтворення у високій роздільній здатності.</string>
-    <string name="sort_episodes_date_newest">Датою виходу (найновіша)</string>
-    <string name="sort_episodes_number_asc">Епізодом (за зростанням)</string>
-    <string name="sort_episodes_rating_low_high">Рейтингом (найнижчий)</string>
+    <string name="sort_episodes_date_newest">Датою виходу (Найновіша)</string>
+    <string name="sort_episodes_number_asc">Епізодом (За Зростанням)</string>
+    <string name="sort_episodes_rating_low_high">Рейтингом (Найнижчий)</string>
     <string name="sort_button_rating">Рейтинг %s</string>
-    <string name="sort_episodes_number_desc">Епізодом (за спаданням)</string>
-    <string name="sort_episodes_rating_high_low">Рейтингом (найвищий)</string>
-    <string name="sort_episodes_date_oldest">Датою виходу (найстаріша)</string>
+    <string name="sort_episodes_number_desc">Епізодом (за Спаданням)</string>
+    <string name="sort_episodes_rating_high_low">Рейтингом (Найвищий)</string>
+    <string name="sort_episodes_date_oldest">Датою виходу (Найстаріша)</string>
     <string name="sort_button_episode">Еп. %s</string>
     <string name="sort_button_date">Дата %s</string>
-    <string name="update_plugins">Оновити розширення</string>
+    <string name="update_plugins">Оновити Розширення</string>
     <string name="plugins_updated_manually">Успішно оновлено %d розширення(-ь)!</string>
     <string name="update_plugins_manually">Оновити розширення вручну</string>
     <string name="starting_plugin_update_manually">Починається оновлення розширень!</string>
@@ -656,22 +656,22 @@
     <string name="begin_speaking">Почніть Говорити…</string>
     <string name="subtitles_from_embedded">Вбудовані</string>
     <string name="subtitles_from_online">Мережеві</string>
-    <string name="background_radius">Радіус тла</string>
-    <string name="all_subtitles_bold">Зробити всі субтитри жирним</string>
+    <string name="background_radius">Радіус Тла</string>
+    <string name="all_subtitles_bold">Зробити всі субтитри потовщеним</string>
     <string name="all_subtitles_italic">Зробити всі субтитри курсивом</string>
     <string name="volume_exceeded_100">Гучність перевищила 100%</string>
     <string name="slide_up_again_to_exceed_100">Ще раз проведіть угору, щоби перевищити 100%</string>
     <string name="concurrent_connections">Одночасних з’єднань</string>
     <string name="overscan_settings_des">Змінює межі екрана</string>
     <string name="overscan_settings">Обрізання зображення</string>
-    <string name="go_to_downloads">Перейти до завантажень</string>
+    <string name="go_to_downloads">Перейти до Завантажень</string>
     <string name="no_internet_connection">Немає підключення до Інтернету.\n\nБудь ласка, підключіться до Інтернету та спробуйте ще раз або перегляньте завантажені відео офлайн.</string>
     <string name="download_parallel_settings_des">Скільки різних елементів можна завантажити паралельно</string>
     <string name="parallel_downloads">Паралельних завантажень</string>
     <string name="concurrent_connections_settings_des">Скільки одночасних з’єднань може використовувати кожне завантаження</string>
     <string name="poster_size_settings_des">Зміна розміру плакатів</string>
     <string name="poster_size_settings">Розмір постера</string>
-    <string name="player_settings_always_ask">Завжди запитуйте</string>
+    <string name="player_settings_always_ask">Завжди запитувати</string>
     <string name="speedup_title">Змінювати швидкість при утриманні</string>
     <string name="speedup_summary">Утримуйте, щоб отримати 2-кратну швидкість</string>
     <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dгод %2$dхв %3$dс</string>
@@ -679,19 +679,19 @@
     <string name="download_time_left_sec_format" formatted="true">%1$dс</string>
     <string name="show_rating">Мітка рейтингу</string>
     <string name="no_account">Немає облікового запису</string>
-    <string name="edit_profile_image_title">Редагувати зображення профілю</string>
-    <string name="edit_profile_image_hint">Введіть URL-адресу зображення профілю</string>
-    <string name="edit_profile_image_error_empty">URL-адресу не знайдено</string>
-    <string name="edit_profile_image_error_invalid">Недійсна URL-адреса або зображення</string>
-    <string name="edit_profile_image_success">Зображення успішно оновлено</string>
+    <string name="edit_profile_image_title">Редагувати Зображення Профілю</string>
+    <string name="edit_profile_image_hint">Введіть URL-адресу Зображення Профілю</string>
+    <string name="edit_profile_image_error_empty">URL-адресу Не Знайдено</string>
+    <string name="edit_profile_image_error_invalid">Недійсна URL-адреса або Зображення</string>
+    <string name="edit_profile_image_success">Зображення Успішно Оновлено</string>
     <string name="action_mark_watched_up_to_this_episode">Позначити як переглянуте до цього епізоду</string>
     <string name="action_remove_mark_watched_up_to_this_episode">Вилучити переглянуті до цього епізоду</string>
     <string name="action_reload">Перезавантажено</string>
-    <string name="reload_provider">Постачальник послуг поповнення рахунку</string>
-    <string name="episode_action_play_mirror">Грати в дзеркало</string>"
-    <string name="name">Ім\'я</string>
+    <string name="reload_provider">Перезавантажити Постачальника Послуг</string>
+    <string name="episode_action_play_mirror">Переглянути в дзеркалі</string>"
+    <string name="name">Назва</string>
     <string name="resolution_and_name">Роздільна здатність та назва</string>
-    <string name="subs_subtitle_alignment">Вирівнювання субтитрів</string>
+    <string name="subs_subtitle_alignment">Вирівнювання Субтитрів</string>
     <string name="bottom_left">Внизу ліворуч</string>
     <string name="bottom_center">Внизу по центру</string>
     <string name="bottom_right">Внизу праворуч</string>
@@ -702,18 +702,18 @@
     <string name="top_center">Верхній центр</string>
     <string name="top_right">Угорі праворуч</string>
     <string name="play_full_series_button">Відтворити Повні Серії</string>
-    <string name="install_prerelease">Встановити передрелізну версію</string>
-    <string name="prerelease_already_installed">Попередня версія вже встановлена.</string>
-    <string name="prerelease_install_failed">Не вдалося встановити попередню версію.</string>
-    <string name="show_episode_text">Текст епізоду</string>
+    <string name="install_prerelease">Встановити перед-релізну версію</string>
+    <string name="prerelease_already_installed">Перед-релізна версія вже встановлена.</string>
+    <string name="prerelease_install_failed">Не вдалося встановити перед-релізну версію.</string>
+    <string name="show_episode_text">Текст Епізоду</string>
     <string name="search_suggestions">Пропозиції Пошуку</string>
     <string name="search_suggestions_des">Показувати підказки пошуку під час введення тексту</string>
-    <string name="clear_suggestions">Очистити пропозиції</string>
+    <string name="clear_suggestions">Очистити Пропозиції</string>
     <string name="extra_brightness_settings">Додаткова яскравість</string>
     <string name="extra_brightness_settings_des">Увімкнути фільтр яскравості при перевищенні 100% яскравості дисплея</string>
     <string name="extra_brightness_key">extra_brightness_enabled</string>
     <string name="show_cast_in_details">Показати панель трансляції</string>
-    <string name="video_info">Інформація про медіа</string>
+    <string name="video_info">Інформація Про Медіа</string>
     <string name="source_name">Назва джерела</string>
     <string name="download_queue">Черга завантаження</string>
     <string name="queue_empty_message">Наразі немає завантажень у черзі.</string>
@@ -735,4 +735,5 @@
     </plurals>
     <string name="source_priority">Пріоритетне джерело</string>
     <string name="source_priority_help">Виберіть спосіб сортування джерел відео у програвачі</string>
+    <string name="show_player_metadata_overlay">Показувати Накладання Метаданих Програвача</string>
 </resources>
diff --git a/app/src/main/res/values-b+vi/strings.xml b/app/src/main/res/values-b+vi/strings.xml
index 7999feb99..895184652 100644
--- a/app/src/main/res/values-b+vi/strings.xml
+++ b/app/src/main/res/values-b+vi/strings.xml
@@ -6,17 +6,17 @@
     <string name="cast_format" formatted="true">Diễn viên: %s</string>
     <string name="next_episode_format" formatted="true">Tập %d sẽ ra mắt sau</string>
     <string name="next_episode_time_day_format" formatted="true">%1$dng %2$dg %3$dph</string>
-    <string name="next_episode_time_hour_format" formatted="true">%1$dgi %2$dph</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">Ảnh bìa</string>
-    <string name="episode_poster_img_des">Episode Poster</string>
-    <string name="home_main_poster_img_des">Main Poster</string>
-    <string name="home_next_random_img_des">Next Random</string>
-    <string name="go_back_img_des">Quay trở lại</string>
-    <string name="home_change_provider_img_des">Change Provider</string>
-    <string name="preview_background_img_des">Preview Background</string>
+    <string name="search_poster_img_des">Poster</string>
+    <string name="episode_poster_img_des">Poster tập phim</string>
+    <string name="home_main_poster_img_des">Poster chính</string>
+    <string name="home_next_random_img_des">Tập tiếp theo ngẫu nhiên</string>
+    <string name="go_back_img_des">Quay lại</string>
+    <string name="home_change_provider_img_des">Thay đổi nguồn phát</string>
+    <string name="preview_background_img_des">Xem trước hình nền</string>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Tốc độ (%.2fx)</string>
     <string name="rated_format" formatted="true">Đánh giá: %.1f</string>
@@ -38,12 +38,12 @@
     <string name="result_tags">Thể loại</string>
     <string name="result_share">Chia sẻ</string>
     <string name="result_open_in_browser">Mở bằng trình duyệt</string>
-    <string name="skip_loading">Bỏ qua</string>
+    <string name="skip_loading">Bỏ qua quá trình tải</string>
     <string name="loading">Đang tải…</string>
     <string name="type_watching">Đang xem</string>
     <string name="type_on_hold">Đang chờ</string>
     <string name="type_completed">Đã xem</string>
-    <string name="type_dropped">Bỏ qua</string>
+    <string name="type_dropped">Bỏ xem</string>
     <string name="type_plan_to_watch">Xem sau</string>
     <string name="type_re_watching">Xem lại</string>
     <string name="play_movie_button">Xem Ngay</string>
@@ -58,11 +58,11 @@
     <string name="download">Tải xuống</string>
     <string name="downloaded">Đã tải</string>
     <string name="downloading">Đang tải</string>
-    <string name="download_paused">Tạm dừng</string>
+    <string name="download_paused">Đã tạm dừng tải xuống</string>
     <string name="download_started">Đã bắt đầu tải</string>
     <string name="download_failed">Tải lỗi</string>
-    <string name="download_canceled">Đã hủy</string>
-    <string name="download_done">Tải thành công</string>
+    <string name="download_canceled">Đã hủy tải xuống</string>
+    <string name="download_done">Tải xuống thành công</string>
     <string name="stream">Luồng mạng</string>
     <string name="error_loading_links_toast">Lỗi khi tải liên kết</string>
     <string name="download_storage_text">Bộ nhớ trong</string>
@@ -76,17 +76,17 @@
     <string name="home_expanded_hide">Ẩn</string>
     <string name="home_play">Xem ngay</string>
     <string name="home_info">Thông tin</string>
-    <string name="filter_bookmarks">Lọc theo danh sách đã lưu</string>
-    <string name="error_bookmarks_text">Danh sách đã lưu</string>
+    <string name="filter_bookmarks">Lọc danh sách của tôi</string>
+    <string name="error_bookmarks_text">Danh sách của tôi</string>
     <string name="action_remove_from_bookmarks">Xóa</string>
     <string name="action_add_to_bookmarks">Đặt trạng thái xem</string>
     <string name="sort_apply">Áp dụng</string>
     <string name="sort_copy">Sao chép</string>
     <string name="sort_close">Đóng</string>
-    <string name="sort_clear">Huỷ bỏ</string>
+    <string name="sort_clear">Xóa</string>
     <string name="sort_save">Lưu</string>
     <string name="player_speed">Tốc độ phát</string>
-    <string name="subtitles_settings">Cài đặt hiển thị phụ đề</string>
+    <string name="subtitles_settings">Cài đặt phụ đề</string>
     <string name="subs_text_color">Màu chữ</string>
     <string name="subs_outline_color">Màu viền chữ</string>
     <string name="subs_background_color">Màu nền</string>
@@ -97,45 +97,45 @@
     <string name="subs_font_size">Kích thước chữ</string>
     <string name="search_provider_text_providers">Tìm kiếm theo nguồn phim</string>
     <string name="search_provider_text_types">Tìm kiếm theo thể loại</string>
-    <string name="benene_count_text">%d lời cảm ơn đã được gửi tặng nhà phát triển</string>
-    <string name="benene_count_text_none">Hãy tặng cho nhà phát triển một lời cảm ơn</string>
+    <string name="benene_count_text">%d lượt ủng hộ đã gửi đến nhà phát triển</string>
+    <string name="benene_count_text_none">Không có lượt ủng hộ đã nhận</string>
     <string name="subs_auto_select_language">Tự động chọn ngôn ngữ</string>
     <string name="subs_download_languages">Ngôn ngữ khi tải xuống</string>
     <string name="subs_subtitle_languages">Ngôn ngữ phụ đề</string>
-    <string name="subs_hold_to_reset_to_default">Giữ để làm mới toàn bộ</string>
+    <string name="subs_hold_to_reset_to_default">Nhấn giữ để đặt lại về mặc định</string>
     <string name="subs_import_text" formatted="true">Thêm phông chữ tại %s</string>
     <string name="continue_watching">Tiếp tục xem</string>
     <string name="action_remove_watching">Loại bỏ</string>
     <string name="action_open_watching">Thông tin thêm</string>
     <string name="action_open_play">@string/home_play</string>
-    <string name="vpn_might_be_needed">Bạn có thể sẽ cần sử dụng VPN để xem phim này</string>
-    <string name="vpn_torrent">Phim này được chiếu dưới dạng Torrent. Hãy sử dụng VPN để xem</string>
+    <string name="vpn_might_be_needed">Có thể cần dùng VPN để nguồn này hoạt động đúng</string>
+    <string name="vpn_torrent">Nguồn này là một torrent, khuyến nghị dùng VPN</string>
     <string name="torrent_plot">Thông tin phim</string>
-    <string name="normal_no_plot">Đang cập nhật</string>
-    <string name="torrent_no_plot">Không tìm thấy thông tin</string>
+    <string name="normal_no_plot">Không tìm thấy nội dung</string>
+    <string name="torrent_no_plot">Không tìm thấy thông tin chi tiết</string>
     <string name="show_log_cat">Hiển thị Logcat 🐈</string>
-    <string name="picture_in_picture">Chế độ cửa sổ nhỏ</string>
-    <string name="picture_in_picture_des">Tiếp tục xem phim khi thoát ứng dụng hoặc khi tìm kiếm</string>
-    <string name="player_size_settings">Bật nút thu phóng khi xem</string>
-    <string name="player_size_settings_des">Xóa khoảng đen của phim</string>
+    <string name="picture_in_picture">Hình trong hình</string>
+    <string name="picture_in_picture_des">Tiếp tục phát trong trình phát thu nhỏ trên các ứng dụng khác</string>
+    <string name="player_size_settings">Nút thay đổi kích cỡ trình phát</string>
+    <string name="player_size_settings_des">Xóa bỏ các viền đen</string>
     <string name="player_subtitles_settings">Phụ đề</string>
     <string name="player_subtitles_settings_des">Cài đặt phụ đề</string>
     <string name="chromecast_subtitles_settings">Phụ đề Chromecast</string>
     <string name="chromecast_subtitles_settings_des">Cài đặt phụ đề Chromecast</string>
     <string name="eigengraumode_settings">Tốc độ phát</string>
     <string name="swipe_to_seek_settings">Vuốt để tua nhanh</string>
-    <string name="swipe_to_seek_settings_des">Vuốt sang trái hoặc phải để tua video</string>
-    <string name="swipe_to_change_settings">Vuốt để chỉnh độ sáng và âm lượng</string>
-    <string name="swipe_to_change_settings_des">Vuốt lên hoặc vuốt xuống ở hai bên để điều chỉnh độ sáng và âm lượng</string>
+    <string name="swipe_to_seek_settings_des">Vuốt ngang qua lại để tua video</string>
+    <string name="swipe_to_change_settings">Vuốt để thay đổi cài đặt</string>
+    <string name="swipe_to_change_settings_des">Vuốt lên hoặc xuống cạnh trái hoặc phải để điều chỉnh độ sáng hoặc âm lượng</string>
     <string name="autoplay_next_settings">Tự động phát tập tiếp theo</string>
     <string name="autoplay_next_settings_des">Phát tập tiếp theo sau khi hết tập hiện tại</string>
     <string name="double_tap_to_seek_settings">Nhấn 2 lần để tua</string>
     <string name="double_tap_to_pause_settings">Nhấn 2 lần để tạm dừng</string>
     <string name="double_tap_to_seek_amount_settings">Thời lượng tua (Giây)</string>
-    <string name="double_tap_to_seek_settings_des">Nhấn 2 lần vào bên trái hoặc bên phải màn hình để tua trước hoặc sau</string>
+    <string name="double_tap_to_seek_settings_des">Nhấn 2 lần vào cạnh trái hoặc phải để tua về trước hoặc sau</string>
     <string name="double_tap_to_pause_settings_des">Nhấn vào giữa hai lần để tạm dừng</string>
     <string name="use_system_brightness_settings">Sử dụng độ sáng hệ thống</string>
-    <string name="use_system_brightness_settings_des">Sử dụng độ sáng hệ thống trong trình phát ứng dụng</string>
+    <string name="use_system_brightness_settings_des">Dùng độ sáng hệ thống thay cho lớp phủ tối trong trình phát ứng dụng</string>
     <string name="episode_sync_settings">Cập nhật tiến trình xem</string>
     <string name="episode_sync_settings_des">Tự động đồng bộ tiến trình hiện tại của bạn</string>
     <string name="restore_settings">Khôi phục dữ liệu từ bản sao lưu</string>
@@ -182,28 +182,27 @@
     <string name="delete_file">Xóa Tệp</string>
     <string name="delete">Xóa</string>
     <string name="cancel">Hủy bỏ</string>
-    <string name="pause">Tạm Dừng</string>
-    <string name="resume">Tiếp Tục</string>
+    <string name="pause">Tạm dừng</string>
+    <string name="resume">Tiếp tục</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
     <string name="delete_message">%s sẽ bị xoá vĩnh viễn
 \nBạn có chắc chắn muốn xóa?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\ncòn lại</string>
+    <string name="resume_time_left" formatted="true">%d phút\ncòn lại</string>
     <string name="status_ongoing">Đang chiếu</string>
-    <string name="status_completed">Hoàn Thành</string>
+    <string name="status_completed">Hoàn thành</string>
     <string name="status">Trạng Thái</string>
     <string name="year">Năm</string>
-    <string name="rating">Đánh Giá</string>
-    <string name="duration">Thời Lượng</string>
+    <string name="rating">Đánh giá</string>
+    <string name="duration">Thời lượng</string>
     <string name="site">Nguồn</string>
     <string name="synopsis">Thông tin</string>
     <string name="queued">Hàng chờ</string>
     <string name="no_subtitles">Không có phụ đề</string>
-    <string name="action_default">Mặc Định</string>
+    <string name="action_default">Mặc định</string>
     <string name="free_storage">Còn trống</string>
     <string name="used_storage">Đã sử dụng</string>
-    <string name="app_storage">App</string>
+    <string name="app_storage">Ứng dụng</string>
     <!--plural-->
     <string name="movies">Phim Lẻ</string>
     <string name="tv_series">Phim Bộ</string>
@@ -229,14 +228,14 @@
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">Video</string>
     <string name="source_error">Lỗi nguồn phim</string>
-    <string name="remote_error">Lỗi kết nối tới máy chủ</string>
-    <string name="render_error">Không thể render</string>
+    <string name="remote_error">Lỗi nguồn từ xa</string>
+    <string name="render_error">Lỗi kết xuất</string>
     <string name="unexpected_error">Đã có lỗi xảy ra. Vui lòng thử lại sau</string>
     <string name="storage_error">Lỗi tải xuống. Hãy kiểm tra quyền truy cập bộ nhớ của ứng dụng</string>
     <string name="episode_action_chromecast_episode">Tập Chromecast</string>
     <string name="episode_action_chromecast_mirror">Chiếu Chromecast</string>
-    <string name="episode_action_play_in_app">Xem với trình phát mặc định</string>
-    <string name="episode_action_play_in_format">Xem với trình phát %s</string>
+    <string name="episode_action_play_in_app">Xem trong ứng dụng</string>
+    <string name="episode_action_play_in_format">Xem trong %s</string>
     <string name="episode_action_auto_download">Tự động tải xuống</string>
     <string name="episode_action_download_mirror">Nguồn tải xuống</string>
     <string name="episode_action_reload_links">Lấy link mới nhất</string>
@@ -244,45 +243,45 @@
     <string name="show_hd">Nhãn chất lượng phim</string>
     <string name="show_dub">Nhãn lồng tiếng</string>
     <string name="show_sub">Nhãn phụ đề</string>
-    <string name="show_title">Tiêu đề</string>
-    <string name="poster_ui_settings">Thay đổi giao diện trên poster</string>
+    <string name="show_title">Tên</string>
+    <string name="poster_ui_settings">Thành phần giao diện trên poster</string>
     <string name="no_update_found">Bạn đang dùng phiên bản mới nhất</string>
     <string name="check_for_update">Kiểm tra cập nhật</string>
     <string name="video_lock">Khóa</string>
-    <string name="video_aspect_ratio_resize">Thu Phóng</string>
-    <string name="video_source">Nguồn &amp; Phụ đề</string>
-    <string name="video_skip_op">Bỏ qua OP</string>
+    <string name="video_aspect_ratio_resize">Thu phóng</string>
+    <string name="video_source">Nguồn</string>
+    <string name="video_skip_op">Bỏ qua giới thiệu</string>
     <string name="dont_show_again">Không hiện lại</string>
     <string name="skip_update">Bỏ qua bản cập nhật này</string>
     <string name="update">Cập nhật</string>
     <string name="watch_quality_pref">Chất lượng xem ưu tiên (WiFi)</string>
-    <string name="limit_title">Kí tự tối đa trên tiêu đề</string>
+    <string name="limit_title">Số ký tự tối đa trên tiêu đề trình phát video</string>
     <string name="limit_title_rez">Hiện thông tin trình phát</string>
     <string name="video_buffer_size_settings">Kích thước bộ nhớ đệm video</string>
     <string name="video_buffer_length_settings">Thời lượng bộ nhớ đệm</string>
     <string name="video_buffer_disk_settings">Lưu bộ nhớ đệm video trên ổ cứng</string>
     <string name="video_buffer_clear_settings">Xoá bộ nhớ đệm hình ảnh và video</string>
-    <string name="video_ram_description">Sẽ gây lỗi nếu đặt quá cao trên máy có dung lượng ram thấp như Android TV.</string>
+    <string name="video_ram_description">Sẽ gây lỗi nếu đặt quá cao trên thiết bị có bộ nhớ thấp như Android TV.</string>
     <string name="video_disk_description">Sẽ gây lỗi nếu đặt quá cao trên máy có dung lượng lưu trữ thấp như Android TV.</string>
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Rất hữu ích để bỏ chặn ISP</string>
     <string name="add_site_pref">Sao chép trang web</string>
     <string name="remove_site_pref">Xoá trang web</string>
-    <string name="add_site_summary">Thêm bản sao của một trang web, với một địa chỉ khác</string>
+    <string name="add_site_summary">Thêm bản sao của trang hiện có bằng một URL khác</string>
     <string name="download_path_pref">Đường dẫn tải xuống</string>
     <string name="nginx_url_pref">Địa chỉ máy chủ Nginx</string>
-    <string name="display_subbed_dubbed_settings">Hiển thị nhãn Phụ đề hoặc Thuyết minh</string>
+    <string name="display_subbed_dubbed_settings">Hiển thị Anime Lồng tiếng/Phụ đề</string>
     <string name="resize_fit">Vừa màn hình</string>
     <string name="resize_fill">Kéo dãn</string>
     <string name="resize_zoom">Phóng to</string>
-    <string name="legal_notice">Disclaimer</string>
+    <string name="legal_notice">Tuyên bố miễn trừ trách nhiệm</string>
     <string name="category_general">Tổng quan</string>
     <string name="random_button_settings">Nút ngẫu nhiên</string>
     <string name="random_button_settings_desc">Hiện nút ngẫu nhiên trên Trang chủ và Thư viện</string>
     <string name="provider_lang_settings">Ngôn ngữ mở rộng</string>
-    <string name="app_layout">Giao diện App</string>
+    <string name="app_layout">Bố cục ứng dụng</string>
     <string name="preferred_media_settings">Thể loại ưu tiên</string>
-    <string name="enable_nsfw_on_providers">Kích hoạt NSFW trên các tiện ích mở rộng được hỗ trợ</string>
+    <string name="enable_nsfw_on_providers">Kích hoạt NSFW trên các Tiện ích mở rộng được hỗ trợ</string>
     <string name="subtitles_encoding">Mã hoá phụ đề</string>
     <string name="category_providers">Nguồn phim</string>
     <string name="category_ui">Giao diện</string>
@@ -291,7 +290,7 @@
     <string name="phone_layout">Giao diện điện thoại</string>
     <string name="emulator_layout">Giao diện giả lập</string>
     <string name="primary_color_settings">Màu chính</string>
-    <string name="app_theme_settings">Chủ đề App</string>
+    <string name="app_theme_settings">Chủ đề ứng dụng</string>
     <string name="bottom_title_settings">Vị trí tiêu đề</string>
     <string name="bottom_title_settings_des">Đặt tiêu đề dưới poster</string>
     <!-- account stuff -->
@@ -299,7 +298,7 @@
     <string name="example_username">Tài khoản</string>
     <string name="example_email">Email</string>
     <string name="example_ip">127.0.0.1</string>
-    <string name="example_site_name">Tên mới</string>
+    <string name="example_site_name">Tên trang mới</string>
     <string name="example_site_url">https://example.com</string>
     <string name="example_lang_name">Mã ngôn ngữ (vi)</string>
     <string name="login_format" formatted="true">%1$s %2$s</string>
@@ -329,10 +328,10 @@
     <string name="subtitles_shadow">Đổ bóng</string>
     <string name="subtitles_raised">Nâng</string>
     <string name="subtitle_offset">Chỉnh phụ đề</string>
-    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_hint">1000 mili giây</string>
     <string name="subtitle_offset_title">Độ trễ phụ đề</string>
-    <string name="subtitle_offset_extra_hint_later_format">Dùng nếu phụ đề bị nhanh %dms</string>
-    <string name="subtitle_offset_extra_hint_before_format">Dùng nếu phụ đề bị trễ %dms</string>
+    <string name="subtitle_offset_extra_hint_later_format">Dùng nếu phụ đề bị nhanh %d mili giây</string>
+    <string name="subtitle_offset_extra_hint_before_format">Dùng nếu phụ đề bị trễ %d mili giây</string>
     <string name="subtitle_offset_extra_hint_none_format">Không chỉnh</string>
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
@@ -368,10 +367,10 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-    <string name="poster_image">Ảnh áp phích</string>
+    <string name="poster_image">Ảnh Poster</string>
     <string name="category_player">Trình phát</string>
-    <string name="resolution_and_title">Độ phân giải và Tên nguồn</string>
-    <string name="title">Tên nguồn</string>
+    <string name="resolution_and_title">Độ phân giải và Tên</string>
+    <string name="title">Tên</string>
     <string name="resolution">Độ phân giải</string>
     <string name="error_invalid_id">Id không hợp lệ</string>
     <string name="error_invalid_data">Lỗi dữ liệu</string>
@@ -387,14 +386,14 @@
     <string name="next">Tiếp theo</string>
     <string name="provider_languages_tip">Xem video bằng các ngôn ngữ này</string>
     <string name="previous">Trước đó</string>
-    <string name="skip_setup">Bỏ qua cài đặt setup</string>
-    <string name="app_layout_subtext">Chọn giao diện phù hợp với thiết bị của bạn</string>
+    <string name="skip_setup">Bỏ qua thiết lập lần đầu</string>
+    <string name="app_layout_subtext">Thay đổi giao diện phù hợp với thiết bị của bạn</string>
     <string name="preferred_media_subtext">Bạn muốn xem gì</string>
     <string name="setup_done">Hoàn tất</string>
     <string name="extensions">Tiện ích mở rộng</string>
-    <string name="add_repository">Thêm kho lưu trữ</string>
-    <string name="repository_name_hint">Tên kho lưu trữ (Tùy chọn)</string>
-    <string name="repository_url_hint">Đường dẫn kho lưu trữ hoặc Mã ngắn</string>
+    <string name="add_repository">Thêm kho tiện ích</string>
+    <string name="repository_name_hint">Tên kho tiện ích (Tùy chọn)</string>
+    <string name="repository_url_hint">URL kho tiện ích hoặc Mã ngắn</string>
     <string name="plugin_loaded">Đã tải plugin</string>
     <string name="plugin_deleted">Plugin đã xoá</string>
     <string name="plugin_load_fail" formatted="true">Không tải được %s</string>
@@ -405,8 +404,8 @@
     <string name="batch_download">Tải hàng loạt</string>
     <string name="plugin_singular">plugin</string>
     <string name="plugin">plugin</string>
-    <string name="delete_repository_plugins">Tất cả plugin của kho lưu trữ sẽ bị xoá</string>
-    <string name="delete_repository">Xoá kho lưu trữ</string>
+    <string name="delete_repository_plugins">Việc này sẽ xóa tất cả tiện ích mở rộng trong kho tiện ích</string>
+    <string name="delete_repository">Xoá kho tiện ích</string>
     <string name="setup_extensions_subtext">Tải nguồn phim bạn muốn dùng</string>
     <string name="plugins_downloaded" formatted="true">Đã tải: %d</string>
     <string name="plugins_disabled" formatted="true">Đã vô hiệu: %d</string>
@@ -417,7 +416,7 @@
     <string name="view_public_repositories_button">Xem kho lưu trữ của cộng đồng</string>
     <string name="view_public_repositories_button_short">Danh sách công khai</string>
     <string name="uppercase_all_subtitles">In hoa toàn bộ phụ đề</string>
-    <string name="download_all_plugins_from_repo">Cảnh báo: CloudStream không chịu trách nhiệm về các tiện ích bên thứ ba và không cung cấp bất kỳ sự hỗ trợ nào!</string>
+    <string name="download_all_plugins_from_repo">Cảnh báo: CloudStream không chịu trách nhiệm về các tiện ích mở rộng bên thứ ba và không cung cấp bất kỳ sự hỗ trợ nào!</string>
     <string name="single_plugin_disabled" formatted="true">%s (Đã vô hiệu hoá)</string>
     <string name="tracks">Âm thanh &amp; Chất lượng</string>
     <string name="audio_tracks">Âm thanh</string>
@@ -446,7 +445,7 @@
     <string name="extension_authors">Tác giả</string>
     <string name="pref_category_app_updates">Cập nhật ứng dụng</string>
     <string name="pref_category_backup">Sao lưu</string>
-    <string name="pref_category_extensions">Tiện ích</string>
+    <string name="pref_category_extensions">Tiện ích mở rộng</string>
     <string name="pref_category_actions">Hành động</string>
     <string name="pref_category_cache">Cache</string>
     <string name="pref_category_gestures">Cử chỉ</string>
@@ -462,7 +461,7 @@
     <string name="extension_size">Kích thước</string>
     <string name="extension_types">Hỗ trợ</string>
     <string name="extension_language">Ngôn ngữ</string>
-    <string name="extension_install_first">Cài đặt tiện ích trước</string>
+    <string name="extension_install_first">Cài đặt tiện ích mở rộng trước</string>
     <string name="app_not_found_error">Không thấy ứng dụng</string>
     <string name="all_languages_preference">Tất cả ngôn ngữ</string>
     <string name="skip_type_format" formatted="true">Tua %s</string>
@@ -474,7 +473,7 @@
     <string name="skip_type_creddits">Danh đề</string>
     <string name="skip_type_intro">Giới thiệu</string>
     <string name="clear_history">Xoá lịch sử</string>
-    <string name="enable_skip_op_from_database_des">Hiển thị nút tua nhanh cho mở đầu/kết thúc</string>
+    <string name="enable_skip_op_from_database_des">Hiện các popup bỏ qua cho mở đầu/kết thúc</string>
     <string name="clipboard_too_large">Văn bản quá dài. Không thể lưu vào khay nhớ tạm.</string>
     <string name="action_remove_from_watched">Xoá khỏi đã xem</string>
     <string name="confirm_exit_dialog">Bạn có chắc muốn thoát?</string>
@@ -492,7 +491,7 @@
     <string name="empty_library_no_accounts_message">Thư viện của bạn đang trống :(
 \nĐăng nhập vào tài khoản thư viện hoặc thêm phim vào thư viện cục bộ.</string>
     <string name="open_with">Mở với</string>
-    <string name="provider_info_meta">Thông tin dữ liệu không được cung cấp bởi trang web, video sẽ không tìm thấy link nếu nó không tồn tại trên trang web.</string>
+    <string name="provider_info_meta">Siêu dữ liệu không được cung cấp bởi trang web, video sẽ không tải được nếu nó không tồn tại trên trang web.</string>
     <string name="apk_installer_package_installer">PackageInstaller</string>
     <string name="sort">Sắp xếp</string>
     <string name="sort_rating_desc">Xếp hạng (Cao đến Thấp)</string>
@@ -511,22 +510,22 @@
     <string name="jsdelivr_proxy">GitHub Proxy</string>
     <string name="jsdelivr_enabled">Không thể kết nối được tới GitHub. Đang bật jsDelivr proxy…</string>
     <string name="pref_category_android_tv">Android TV</string>
-    <string name="restart">Khởi động lại</string>
+    <string name="restart">Phát từ đầu</string>
     <string name="subscription_new">Đã đăng kí %s</string>
     <string name="subscription_episode_released">Tập %d đã ra mắt!</string>
     <string name="subscription_list_name">Đã đăng kí</string>
     <string name="stop">Dừng lại</string>
-    <string name="pref_category_bypass">Bỏ qua ISP</string>
+    <string name="pref_category_bypass">Bỏ chặn nhà mạng</string>
     <string name="subscription_deleted">Đã bỏ đăng ký %s</string>
     <string name="safe_mode_file">Tìm thấy tệp Safe mode!
 \nKhông tải bất cứ tiện ích mở rộng nào khi khởi động cho đến khi loại bỏ tệp.</string>
     <string name="revert">Đảo ngược lại</string>
     <string name="subscription_in_progress_notification">Đang cập nhật các phim đã đăng kí</string>
-    <string name="jsdelivr_proxy_summary">Bỏ qua chặn đường link GitHub bằng cách dùng jsDelivr. Có thể gây ra việc cập nhật bị chậm vài ngày.</string>
-    <string name="android_tv_interface_off_seek_settings_summary">Lượng tua thêm được sử dụng khi trình phát ẩn</string>
-    <string name="android_tv_interface_off_seek_settings">Lượng tua thêm</string>
+    <string name="jsdelivr_proxy_summary">Bỏ chặn các URL gốc của GitHub bằng jsDelivr. Có thể làm cập nhật bị trễ vài ngày.</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Thời lượng tua khi trình phát bị ẩn</string>
+    <string name="android_tv_interface_off_seek_settings">Thời lượng tua</string>
     <string name="android_tv_interface_on_seek_settings_summary">Lượng tua thêm được sử dụng khi trình phát hiện lên</string>
-    <string name="android_tv_interface_on_seek_settings">Lượng tua thêm</string>
+    <string name="android_tv_interface_on_seek_settings">Thời lượng tua</string>
     <string name="profile_number">Hồ sơ %d</string>
     <string name="mobile_data">Dữ liệu di động</string>
     <string name="set_default">Đặt mặc định</string>
@@ -546,8 +545,8 @@
     <string name="qualities">Các chất lượng</string>
     <string name="already_voted">Bạn đã bình chọn</string>
     <string name="disable">Vô hiệu hoá</string>
-    <string name="no_repository_found_error">Không tìm thấy tiện ích, hãy kiểm tra URL và thử lại với VPN</string>
-    <string name="no_plugins_found_error">Không tìm thấy plugin</string>
+    <string name="no_repository_found_error">Không tìm thấy kho tiện ích, hãy kiểm tra URL và thử lại với VPN</string>
+    <string name="no_plugins_found_error">Không tìm thấy tiện ích mở rộng</string>
     <string name="unable_to_inflate">Không thể khởi tạo UI, đây là một LỖI LỚN và cần được báo cáo ngay lập tức tới %s</string>
     <string name="automatic_plugin_download_mode_title">Chọn chế độ để lọc plugin tải xuống</string>
     <string name="favorite_removed">%s đã loại bỏ khỏi mục yêu thích</string>
@@ -584,9 +583,9 @@
     <string name="manage_accounts">Quản lý tài khoản</string>
     <string name="edit_account">Chỉnh sửa tài khoản</string>
     <string name="links_reloaded_toast">Tải lại liên kết</string>
-    <string name="result_search_tooltip">Tìm kiếm tiện ích khác</string>
+    <string name="result_search_tooltip">Tìm kiếm tiện ích mở rộng khác</string>
     <string name="recommendations_tooltip">Hiển thị đề xuất</string>
-    <string name="test_extensions">Kiểm tra nguồn phim</string>
+    <string name="test_extensions">Kiểm tra tất cả Tiện ích mở rộng</string>
     <string name="rotate_video">Xoay</string>
     <string name="subscribe_tooltip">Thông báo tập mới</string>
     <string name="speed_setting_summary">Chỉnh tốc độ trong trình phát</string>
@@ -605,17 +604,16 @@
     <string name="music_singlar">Nhạc</string>
     <string name="audio_book_singular">Sách nói</string>
     <string name="biometric_setting">Khóa với sinh trắc học</string>
-    <string name="resume_remaining" formatted="true">%s
-\ncòn lại</string>
+    <string name="resume_remaining" formatted="true">%s\ncòn lại</string>
     <string name="biometric_unsupported">Xác thực bằng sinh trắc học không được hỗ trợ trên thiết bị này</string>
     <string name="password_pin_authentication_title">Mật khẩu/PIN Xác thực</string>
     <string name="biometric_warning">Dữ liệu CloudStream của bạn hiện đã được sao lưu. Mặc dù khả năng xảy ra điều này là rất thấp nhưng tất cả các thiết bị đều có thể hoạt động khác nhau. Trong trường hợp hiếm gặp là bạn bị khóa truy cập ứng dụng, hãy xóa hoàn toàn dữ liệu ứng dụng và khôi phục từ bản sao lưu. Chúng tôi rất xin lỗi vì bất kỳ sự bất tiện nào phát sinh từ việc này.</string>
     <string name="biometric_setting_summary">Mở khóa ứng dụng bằng Vân tay, Khuôn mặt, PIN, Hình vẽ và Mật khẩu.</string>
     <string name="biometric_prompt_description">Màn hình bị đóng sau nhiều lần thử thất bại. Hãy khởi động lại ứng dụng.</string>
-    <string name="test_extensions_summary">Bài kiểm tra này chỉ dành cho các nhà phát triển và không xác nhận hay phủ nhận việc hoạt động của bất kỳ nguồn phim nào.</string>
+    <string name="test_extensions_summary">Bài kiểm tra này chỉ dành cho các nhà phát triển và không xác nhận hay phủ nhận việc hoạt động của bất kỳ tiện ích mở rộng nào.</string>
     <string name="app_unrestricted_toast">Chế độ tiêu thụ pin của ứng dụng đã được đặt ở mức không giới hạn</string>
     <string name="custom_media_singluar">Phương tiện</string>
-    <string name="repo_copy_label">Tên và URL kho lưu trữ</string>
+    <string name="repo_copy_label">Tên và URL kho tiện ích</string>
     <string name="reset_btn">Đặt lại</string>
     <string name="battery_dialog_message">Để đảm bảo quá trình tải xuống và thông báo cho các chương trình truyền hình đã đăng ký không bị gián đoạn, CloudStream cần có quyền chạy ở chế độ nền. Bằng cách nhấn OK, một hộp thoại yêu cầu sẽ hiển thị. Hãy nhấn \"Cho phép\".\n\nXin lưu ý, quyền này không có nghĩa là CS3 sẽ làm hao pin của bạn. Nó sẽ chỉ hoạt động ở chế độ nền khi cần thiết, chẳng hạn như khi nhận được thông báo hoặc tải xuống video từ các tiện ích mở rộng chính thức.</string>
     <string name="next_season_episode_format" formatted="true">Mùa %1$d Tập %2$d sẽ được phát hành vào</string>
@@ -625,7 +623,7 @@
     <string name="pref_category_accounts">Tài khoản</string>
     <string name="qr_image">Mã QR</string>
     <string name="dismiss">Bỏ qua</string>
-    <string name="open_downloaded_repo">Mở tiện ích mở rộng</string>
+    <string name="open_downloaded_repo">Mở kho tiện ích</string>
     <string name="cs3wiki">CloudStream Wiki</string>
     <string name="device_pin_url_message">Truy cập <b>%s</b> trên điện thoại hoặc máy tính và nhập mã bên trên</string>
     <string name="device_pin_expired_message">Mã PIN đã hết hạn!</string>
@@ -751,10 +749,10 @@
     <string name="install_prerelease">Cài đặt phiên bản phát hành trước</string>
     <string name="prerelease_already_installed">Bản phát hành trước đã được cài đặt.</string>
     <string name="prerelease_install_failed">Cài đặt bản phát hành trước thất bại.</string>
-    <string name="show_episode_text">Chữ của tập</string>
-    <string name="extra_brightness_settings_des">Kích hoạt bộ lọc độ sáng khi độ sáng màn hình vượt quá 100%</string>
+    <string name="show_episode_text">Thông tin tập</string>
+    <string name="extra_brightness_settings_des">Bật bộ lọc độ sáng khi độ sáng màn hình vượt quá 100%</string>
     <string name="show_cast_in_details">Hiển thị bảng điều khiển</string>
-    <string name="video_info">Thông tin âm thanh</string>
+    <string name="video_info">Thông tin video</string>
     <string name="extra_brightness_settings">Độ sáng bổ sung</string>
     <string name="source_name">Tên nguồn</string>
     <string name="download_queue">Hàng đợi tải xuống</string>
@@ -771,4 +769,6 @@
     <plurals name="downloads_queued">
         <item quantity="other">%d lượt tải xuống đang chờ xử lý</item>
     </plurals>
+    <string name="extra_brightness_key">Đã bật độ sáng bổ sung</string>
+    <string name="show_player_metadata_overlay">Hiển thị lớp phủ siêu dữ liệu trình phát</string>
 </resources>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 690296ca6..ee2c24972 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -174,11 +174,11 @@
     <string name="settings_info">Звесткі</string>
     <string name="advanced_search">Пашыраны пошук</string>
     <string name="advanced_search_des">Паказвае пошукавыя вынікі, падзеленыя па пастаўшчыкам</string>
-    <string name="show_fillers_settings">Паказваць серыі-запаўнялнікі для анімэ</string>
+    <string name="show_fillers_settings">Паказваць серыі-запаўняльнікі для анімэ</string>
     <string name="show_trailers_settings">Паказваць трэйлеры</string>
     <string name="kitsu_settings">Паказваць плакаты з Kitsu</string>
     <string name="pref_filter_search_quality">Схаваць выбраную якасць відэа з вынікаў пошуку</string>
-    <string name="automatic_plugin_updates">Аўтаматычнае абнаўленне пашырэнняў</string>
+    <string name="automatic_plugin_updates">Аўтаматычнае абнаўленне ўбудоў</string>
     <string name="automatic_plugin_download">Аўтаматычная спампоўка ўбудоў</string>
     <string name="apk_installer_settings_des">Некаторыя прылады не падтрымліваюць новы ўсталёўшчык пакетаў. Калі абнаўленні не ўсталёўваюцца, паспрабуйце ранейшую версію.</string>
     <string name="github">Github</string>
@@ -735,4 +735,5 @@
         <item quantity="many">%d спампоўванняў у чарзе</item>
         <item quantity="other">%d спампоўванняў у чарзе</item>
     </plurals>
+    <string name="show_player_metadata_overlay">Паказваць накладанне з метаданымі ў прайгравальніку</string>
 </resources>

From 562a5d8192f8a274767dd155ed46ad083b8da437 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 4 Apr 2026 12:26:55 -0600
Subject: [PATCH 031/177] Fix CustomSubripParser to match assertion usage
 upstream (#2612)

Also suppresses a deprecation to fix build warnings. Fixes all other warnings in assertions by changing them because that is what it uses upstream also.
---
 .../cloudstream3/ui/player/CustomSubripParser.kt       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubripParser.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubripParser.kt
index 198c965df..c26a4f2df 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubripParser.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubripParser.kt
@@ -29,7 +29,6 @@ import androidx.media3.common.Format
 import androidx.media3.common.Format.CueReplacementBehavior
 import androidx.media3.common.text.Cue
 import androidx.media3.common.text.Cue.AnchorType
-import androidx.media3.common.util.Assertions
 import androidx.media3.common.util.Consumer
 import androidx.media3.common.util.Log
 import androidx.media3.common.util.ParsableByteArray
@@ -37,6 +36,7 @@ import androidx.media3.common.util.UnstableApi
 import androidx.media3.extractor.text.CuesWithTiming
 import androidx.media3.extractor.text.SubtitleParser
 import androidx.media3.extractor.text.SubtitleParser.OutputOptions
+import com.google.common.base.Preconditions.checkNotNull
 import com.google.common.collect.ImmutableList
 import java.nio.charset.Charset
 import java.nio.charset.StandardCharsets
@@ -115,6 +115,7 @@ class CustomSubripParser : SubtitleParser {
                 currentLine = parsableByteArray.readLine(charset)
             }
 
+            @Suppress("DEPRECATION")
             val text = Html.fromHtml(textBuilder.toString())
 
             var alignmentTag: String? = null
@@ -259,10 +260,9 @@ class CustomSubripParser : SubtitleParser {
         private fun parseTimecode(matcher: Matcher, groupOffset: Int): Long {
             val hours = matcher.group(groupOffset + 1)
             var timestampMs = if (hours != null) hours.toLong() * 60 * 60 * 1000 else 0
-            timestampMs +=
-                Assertions.checkNotNull<String?>(matcher.group(groupOffset + 2))
-                    .toLong() * 60 * 1000
-            timestampMs += Assertions.checkNotNull<String?>(matcher.group(groupOffset + 3))
+            timestampMs += checkNotNull(matcher.group(groupOffset + 2))
+                .toLong() * 60 * 1000
+            timestampMs += checkNotNull(matcher.group(groupOffset + 3))
                 .toLong() * 1000
             val millis = matcher.group(groupOffset + 4)
 

From 154cd7500b1fd2c01cb975f7f6089bf6866ae102 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Mon, 6 Apr 2026 15:32:58 -0600
Subject: [PATCH 032/177] Remove `@prerelease` annotations and enable some
 deprecations (#2614)

---
 .../lagradost/cloudstream3/AcraApplication.kt | 91 +++++++------------
 .../lagradost/cloudstream3/CloudStreamApp.kt  |  3 -
 .../com/lagradost/cloudstream3/MainAPI.kt     |  4 -
 .../cloudstream3/extractors/ByseSX.kt         |  6 --
 .../cloudstream3/extractors/HubCloud.kt       |  2 -
 .../cloudstream3/extractors/OkRuExtractor.kt  |  4 -
 .../extractors/PixelDrainExtractor.kt         |  1 -
 .../cloudstream3/extractors/VkExtractor.kt    |  2 -
 8 files changed, 33 insertions(+), 80 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
index 80f084b08..bbe7d97de 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt
@@ -1,103 +1,78 @@
 package com.lagradost.cloudstream3
 
-import android.content.Context
-import com.lagradost.api.setContext
-import com.lagradost.cloudstream3.utils.DataStore.getKey
-import com.lagradost.cloudstream3.utils.DataStore.removeKeys
-import com.lagradost.cloudstream3.utils.DataStore.setKey
-import java.lang.ref.WeakReference
-
 /**
  * Deprecated alias for CloudStreamApp for backwards compatibility with plugins.
  * Use CloudStreamApp instead.
  */
-// Deprecate after next stable
-/*@Deprecated(
+@Deprecated(
     message = "AcraApplication is deprecated, use CloudStreamApp instead",
     replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp"),
     level = DeprecationLevel.WARNING
-)*/
+)
 class AcraApplication {
-	// All methods here can be changed to be a wrapper around CloudStream app
-	// without a seperate deprecation after next stable. All methods should
-	// also be deprecated at that time.
 	companion object {
 
-		// This can be removed without deprecation after next stable
-		private var _context: WeakReference<Context>? = null
-		/*@Deprecated(
+		@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.context"),
 		    level = DeprecationLevel.WARNING
-		)*/
-		var context
-		get() = _context?.get()
-		internal set(value) {
-			_context = WeakReference(value)
-			setContext(WeakReference(value))
-		}
+		)
+		val context get() = CloudStreamApp.context
 
-		/*@Deprecated(
+		@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.removeKeys(folder)"),
 		    level = DeprecationLevel.WARNING
-		)*/
-		fun removeKeys(folder: String): Int? {
-            return context?.removeKeys(folder)
-        }
+		)
+		fun removeKeys(folder: String): Int? =
+		    CloudStreamApp.removeKeys(folder)
 
-		/*@Deprecated(
+		@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.setKey(path, value)"),
 		    level = DeprecationLevel.WARNING
-		)*/
-		fun <T> setKey(path: String, value: T) {
-			context?.setKey(path, value)
-		}
+		)
+		fun <T> setKey(path: String, value: T) =
+			CloudStreamApp.setKey(path, value)
 
-		/*@Deprecated(
+		@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.setKey(folder, path, value)"),
 		    level = DeprecationLevel.WARNING
-		)*/
-		fun <T> setKey(folder: String, path: String, value: T) {
-			context?.setKey(folder, path, value)
-		}
+		)
+		fun <T> setKey(folder: String, path: String, value: T) =
+			CloudStreamApp.setKey(folder, path, value)
 
-		/*@Deprecated(
+		@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(path, defVal)"),
 		    level = DeprecationLevel.WARNING
-		)*/
-		inline fun <reified T : Any> getKey(path: String, defVal: T?): T? {
-			return context?.getKey(path, defVal)
-		}
+		)
+		inline fun <reified T : Any> getKey(path: String, defVal: T?): T? =
+			CloudStreamApp.getKey(path, defVal)
 
-		/*@Deprecated(
+		@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(path)"),
 		    level = DeprecationLevel.WARNING
-		)*/
-		inline fun <reified T : Any> getKey(path: String): T? {
-			return context?.getKey(path)
-		}
+		)
+		inline fun <reified T : Any> getKey(path: String): T? =
+			CloudStreamApp.getKey(path)
 
-		/*@Deprecated(
+		@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(folder, path)"),
 		    level = DeprecationLevel.WARNING
-		)*/
-		inline fun <reified T : Any> getKey(folder: String, path: String): T? {
-			return context?.getKey(folder, path)
-		}
+		)
+		inline fun <reified T : Any> getKey(folder: String, path: String): T? =
+		    CloudStreamApp.getKey(folder, path)
 
-		/*@Deprecated(
+		@Deprecated(
 		    message = "AcraApplication is deprecated, use CloudStreamApp instead",
 		    replaceWith = ReplaceWith("com.lagradost.cloudstream3.CloudStreamApp.getKey(folder, path, defVal)"),
 		    level = DeprecationLevel.WARNING
-		)*/
-		inline fun <reified T : Any> getKey(folder: String, path: String, defVal: T?): T? {
-			return context?.getKey(folder, path, defVal)
-		}
+		)
+		inline fun <reified T : Any> getKey(folder: String, path: String, defVal: T?): T? =
+			CloudStreamApp.getKey(folder, path, defVal)
 	}
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt b/app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt
index ffd5ea812..a9cd9c01e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CloudStreamApp.kt
@@ -67,7 +67,6 @@ class ExceptionHandler(
     }
 }
 
-@Prerelease
 class CloudStreamApp : Application(), SingletonImageLoader.Factory {
 
     override fun onCreate() {
@@ -90,8 +89,6 @@ class CloudStreamApp : Application(), SingletonImageLoader.Factory {
     override fun attachBaseContext(base: Context?) {
         super.attachBaseContext(base)
         context = base
-        // This can be removed without deprecation after next stable
-        AcraApplication.context = context
     }
 
     override fun newImageLoader(context: PlatformContext): ImageLoader {
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index 2be9f61fd..81eabbe77 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -1159,7 +1159,6 @@ suspend fun newSubtitleFile(
  * @property headers Optional headers for the audio file request.
  * @see newAudioFile
  * */
-@Prerelease
 @ConsistentCopyVisibility
 data class AudioFile internal constructor(
     var url: String,
@@ -1171,7 +1170,6 @@ data class AudioFile internal constructor(
  * @param initializer Lambda to configure additional properties like headers.
  * @return Configured AudioFile instance.
  * */
-@Prerelease
 suspend fun newAudioFile(
     url: String,
     initializer: suspend AudioFile.() -> Unit = { }
@@ -1786,7 +1784,6 @@ interface LoadResponse {
     var posterHeaders: Map<String, String>?
     var backgroundPosterUrl: String?
 
-    @Prerelease
     var logoUrl: String?
     var contentRating: String?
 
@@ -1893,7 +1890,6 @@ interface LoadResponse {
             this.addSimklId(SimklSyncServices.Mal, id.toString())
         }
 
-        @Prerelease
         fun LoadResponse.addKitsuId(id: Int?) {
             this.syncData[kitsuIdPrefix] = (id ?: return).toString()
         }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt
index 404112d3e..38d35da2e 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt
@@ -1,7 +1,6 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.Prerelease
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.base64DecodeArray
@@ -15,31 +14,26 @@ import javax.crypto.Cipher
 import javax.crypto.spec.GCMParameterSpec
 import javax.crypto.spec.SecretKeySpec
 
-@Prerelease
 class Bysezejataos  : ByseSX() {
     override var name = "Bysezejataos"
     override var mainUrl = "https://bysezejataos.com"
 }
 
-@Prerelease
 class ByseBuho : ByseSX() {
     override var name = "ByseBuho"
     override var mainUrl = "https://bysebuho.com"
 }
 
-@Prerelease
 class ByseVepoin : ByseSX() {
     override var name = "ByseVepoin"
     override var mainUrl = "https://bysevepoin.com"
 }
 
-@Prerelease
 class ByseQekaho : ByseSX() {
     override var name = "ByseQekaho"
     override var mainUrl = "https://byseqekaho.com"
 }
 
-@Prerelease
 open class ByseSX : ExtractorApi() {
     override var name = "Byse"
     override var mainUrl = "https://byse.sx"
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HubCloud.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HubCloud.kt
index 3ee950256..4f83bad25 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HubCloud.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HubCloud.kt
@@ -1,7 +1,6 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.lagradost.api.Log
-import com.lagradost.cloudstream3.Prerelease
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
@@ -12,7 +11,6 @@ import com.lagradost.cloudstream3.utils.loadExtractor
 import com.lagradost.cloudstream3.utils.newExtractorLink
 import java.net.URI
 
-@Prerelease
 class HubCloud : ExtractorApi() {
     override val name = "Hub-Cloud"
     override val mainUrl = "https://hubcloud.*"
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt
index f5f258cfe..d9803fa3e 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt
@@ -2,8 +2,6 @@
 
 package com.lagradost.cloudstream3.extractors
 
-import com.lagradost.cloudstream3.Prerelease
-
 open class OkRuSSL : Odnoklassniki() {
     override var name    = "OkRuSSL"
     override var mainUrl = "https://ok.ru"
@@ -14,12 +12,10 @@ open class OkRuHTTP : Odnoklassniki() {
     override var mainUrl = "http://ok.ru"
 }
 
-@Prerelease
 class OkRuSSLMobile : OkRuSSL() {
     override var mainUrl = "https://m.ok.ru"
 }
 
-@Prerelease
 class OkRuHTTPMobile : OkRuHTTP() {
     override var mainUrl = "http://m.ok.ru"
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PixelDrainExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PixelDrainExtractor.kt
index 3426289f8..d97e1ca06 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PixelDrainExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PixelDrainExtractor.kt
@@ -5,7 +5,6 @@ package com.lagradost.cloudstream3.extractors
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
 
-@Prerelease
 class PixelDrainDev : PixelDrain() {
     override var mainUrl = "https://pixeldrain.dev"
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VkExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VkExtractor.kt
index 5009cea3e..8e4540874 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VkExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VkExtractor.kt
@@ -1,7 +1,6 @@
 // Made by @kraptor123 for cs-kraptor
 package com.lagradost.cloudstream3.extractors
 
-import com.lagradost.cloudstream3.Prerelease
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
@@ -10,7 +9,6 @@ import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
 
-@Prerelease
 open class VkExtractor : ExtractorApi() {
     override val name = "Vk"
     override val mainUrl = "https://vkvideo.ru"

From ae9a374a83704fb912e6ee6cbe87e13438cb3cd2 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Mon, 6 Apr 2026 15:36:49 -0600
Subject: [PATCH 033/177] Don't keep screen on when ended (#2619)

---
 .../cloudstream3/ui/player/AbstractPlayerFragment.kt       | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
index 1fbdd9f4e..ea6babb20 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
@@ -152,12 +152,11 @@ abstract class AbstractPlayerFragment(
         isPlaying: CSPlayerLoading
     ) {
         val isPlayingRightNow = CSPlayerLoading.IsPlaying == isPlaying
-        val isPausedRightNow = CSPlayerLoading.IsPaused == isPlaying
+        val isBuffering = CSPlayerLoading.IsBuffering == isPlaying
         currentPlayerStatus = isPlaying
 
-        keepScreenOn(!isPausedRightNow)
+        keepScreenOn(isPlayingRightNow || isBuffering)
 
-        val isBuffering = CSPlayerLoading.IsBuffering == isPlaying
         if (isBuffering) {
             playerPausePlayHolderHolder?.isVisible = false
             playerBuffering?.isVisible = true
@@ -165,7 +164,7 @@ abstract class AbstractPlayerFragment(
             playerPausePlayHolderHolder?.isVisible = true
             playerBuffering?.isVisible = false
 
-            if(isPlaying == CSPlayerLoading.IsEnded && isLayout(PHONE)){
+            if (isPlaying == CSPlayerLoading.IsEnded && isLayout(PHONE)) {
                 playerPausePlay?.setImageResource(R.drawable.ic_baseline_replay_24)
             } else if (wasPlaying != isPlaying) {
                 playerPausePlay?.setImageResource(if (isPlayingRightNow) R.drawable.play_to_pause else R.drawable.pause_to_play)

From 62e6895d8ee0a5892050cd3c33b2be1f3fe81163 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Mon, 6 Apr 2026 15:39:27 -0600
Subject: [PATCH 034/177] Replace deprecated `viewBinding { enable = true }` in
 Gradle (#2623)

---
 app/build.gradle.kts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 97d24c4fb..c1e0e1960 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -47,10 +47,6 @@ android {
         includeInBundle = false
     }
 
-    viewBinding {
-        enable = true
-    }
-
     signingConfigs {
         // We just use SIGNING_KEY_ALIAS here since it won't change
         // so won't kill the configuration cache.
@@ -161,6 +157,7 @@ android {
     buildFeatures {
         buildConfig = true
         resValues = true
+        viewBinding = true
     }
 
     packaging {

From 08b1d97152b6fd5325592a2e8e9389887329012b Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 6 Apr 2026 23:45:29 +0200
Subject: [PATCH 035/177] feat(extractors): add playmogo (doodstream mirror)
 (#2620)

---
 .../com/lagradost/cloudstream3/extractors/DoodExtractor.kt  | 6 ++++++
 .../kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
index 25c8ea9e7..12bc5a0c5 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.extractors
 
+import com.lagradost.cloudstream3.Prerelease
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
@@ -87,6 +88,11 @@ class MyVidPlay : DoodLaExtractor() {
     override var mainUrl = "https://myvidplay.com"
 }
 
+@Prerelease
+class Playmogo : DoodLaExtractor() {
+    override var mainUrl = "https://playmogo.com"
+}
+
 open class DoodLaExtractor : ExtractorApi() {
     override var name = "DoodStream"
     override var mainUrl = "https://dood.la"
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index a21087601..4f3f05df6 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -174,6 +174,7 @@ import com.lagradost.cloudstream3.extractors.PlayLtXyz
 import com.lagradost.cloudstream3.extractors.PlayRu
 import com.lagradost.cloudstream3.extractors.PlayerVoxzer
 import com.lagradost.cloudstream3.extractors.Playerwish
+import com.lagradost.cloudstream3.extractors.Playmogo
 import com.lagradost.cloudstream3.extractors.Rabbitstream
 import com.lagradost.cloudstream3.extractors.RapidVid
 import com.lagradost.cloudstream3.extractors.Rasacintaku
@@ -1232,6 +1233,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     ByseVepoin(),
     ByseBuho(),
     MyVidPlay(),
+    Playmogo(),
     Vide0Net(),
     Up4Stream(),
     Up4FunTop(),

From d495cbe32d13f5482147f89d4c5db845fe02b4b6 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Mon, 6 Apr 2026 19:01:57 -0600
Subject: [PATCH 036/177] Use short commit hashes for libs

---
 gradle/libs.versions.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c79726d01..482f776b6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ appcompat = "1.7.1"
 biometric = "1.4.0-alpha05"
 buildkonfigGradlePlugin = "0.17.1"
 coil = "3.3.0"
-colorpicker = "6b46b49bd5"
+colorpicker = "6b46b49"
 conscryptAndroid = { strictly = "2.5.2" } # 2.5.3 crashes everything
 constraintlayout = "2.2.1"
 coreKtx = "1.17.0"
@@ -41,7 +41,7 @@ rhino = { strictly = "1.8.1" } # Requires minSdk 26 or later beginning at versio
 safefile = "0.0.8"
 shimmer = "0.5.0"
 tmdbJava = "2.13.0"
-torrentserver = "7861970e038b35cd8c6918384e49caf26903e09e"
+torrentserver = "7861970"
 tvprovider = "1.1.0"
 video = "1.0.0"
 workRuntimeKtx = "2.11.1"

From 418cf08ad432af5dee9d887f9a0f5532db8ab1d0 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Wed, 8 Apr 2026 19:10:18 +0200
Subject: [PATCH 037/177] Translated using Weblate (Albanian)

Currently translated at 57.0% (414 of 726 strings)

Translated using Weblate (Albanian)

Currently translated at 100.0% (4 of 4 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (726 of 726 strings)

Added translation using Weblate (Albanian)

Translated using Weblate (Hindi)

Currently translated at 56.6% (411 of 726 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Korean)

Currently translated at 100.0% (726 of 726 strings)

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Chinese (Traditional Han script))

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Korean)

Currently translated at 100.0% (726 of 726 strings)

Co-authored-by: 007 <juri.malaj@gmail.com>
Co-authored-by: ByAyzen <Ayzenxyz@proton.me>
Co-authored-by: Hariom Jha <hariom.jha5499@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Man <thebroker2308@gmail.com>
Co-authored-by: hou1234 <gjqmgjsl3@gmail.com>
Co-authored-by: muhaco <cemusa10@gmail.com>
Co-authored-by: xinshoutw <me@xinshou.tw>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ko/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sq/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/vi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hant/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/fastlane/sq/
Translation: Cloudstream/App
Translation: Cloudstream/Fastlane
---
 app/src/main/res/values-b+hi/strings.xml      |   4 +
 app/src/main/res/values-b+ko/strings.xml      |  20 +-
 app/src/main/res/values-b+tr/strings.xml      |  13 +-
 app/src/main/res/values-b+vi/strings.xml      | 326 +++++++-------
 app/src/main/res/values-b+zh+TW/strings.xml   |   1 +
 app/src/main/res/values-sq/strings.xml        | 417 ++++++++++++++++++
 fastlane/metadata/android/sq/changelogs/2.txt |   1 +
 .../metadata/android/sq/full_description.txt  |  10 +
 .../metadata/android/sq/short_description.txt |   1 +
 fastlane/metadata/android/sq/title.txt        |   1 +
 10 files changed, 613 insertions(+), 181 deletions(-)
 create mode 100644 app/src/main/res/values-sq/strings.xml
 create mode 100644 fastlane/metadata/android/sq/changelogs/2.txt
 create mode 100644 fastlane/metadata/android/sq/full_description.txt
 create mode 100644 fastlane/metadata/android/sq/short_description.txt
 create mode 100644 fastlane/metadata/android/sq/title.txt

diff --git a/app/src/main/res/values-b+hi/strings.xml b/app/src/main/res/values-b+hi/strings.xml
index 2c5247238..d3f257679 100644
--- a/app/src/main/res/values-b+hi/strings.xml
+++ b/app/src/main/res/values-b+hi/strings.xml
@@ -418,4 +418,8 @@
     <string name="added_sync_format" formatted="true">जोड़ा गया %s</string>
     <string name="upload_sync">Sync</string>
     <string name="sync_score">रेटेड</string>
+    <string name="download_queue">कतार डाउनलोड करें</string>
+    <string name="queue_empty_message">फिलहाल कोई डाउनलोड कतार में नहीं है।</string>
+    <string name="extra_brightness_settings">अतिरिक्त चमक</string>
+    <string name="extra_brightness_settings_des">डिस्प्ले की चमक 100% से अधिक होने पर ब्राइटनेस फ़िल्टर चालू करें</string>
 </resources>
diff --git a/app/src/main/res/values-b+ko/strings.xml b/app/src/main/res/values-b+ko/strings.xml
index 29a0a703e..256fc26e9 100644
--- a/app/src/main/res/values-b+ko/strings.xml
+++ b/app/src/main/res/values-b+ko/strings.xml
@@ -15,7 +15,7 @@
 \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d분</string>
     <string name="app_name">CloudStream</string>
-    <string name="play_with_app_name">CloudStream에서 재생</string>
+    <string name="play_with_app_name">CloudStream으로 재생</string>
     <string name="title_home">홈</string>
     <string name="title_downloads">다운로드</string>
     <string name="title_settings">설정</string>
@@ -26,7 +26,7 @@
     <string name="next_episode">다음 에피소드</string>
     <string name="result_tags">장르</string>
     <string name="result_share">공유</string>
-    <string name="result_open_in_browser">브라우저에서 열기</string>
+    <string name="result_open_in_browser">브라우저로 열기</string>
     <string name="browser">브라우저</string>
     <string name="skip_loading">로딩 건너뛰기</string>
     <string name="loading">로딩중…</string>
@@ -62,7 +62,7 @@
     <string name="subs_edge_type">윤곽선 유형</string>
     <string name="subs_subtitle_elevation">자막 높이</string>
     <string name="subs_font">폰트</string>
-    <string name="subs_font_size">자막 크기</string>
+    <string name="subs_font_size">글자 크기</string>
     <string name="downloaded">다운로드됨</string>
     <string name="downloading">다운로드중</string>
     <string name="download_paused">다운로드 일시정지</string>
@@ -180,8 +180,8 @@
     <string name="anime">애니</string>
     <string name="torrent">토렌트</string>
     <string name="episode_action_chromecast_mirror">Chromecast 미러링</string>
-    <string name="episode_action_play_in_app">앱에서 재생</string>
-    <string name="episode_action_play_in_format">%s부터 재생</string>
+    <string name="episode_action_play_in_app">앱으로 재생</string>
+    <string name="episode_action_play_in_format">%s로 재생</string>
     <string name="episode_action_auto_download">자동 다운로드</string>
     <string name="episode_action_download_mirror">다운로드 소스 목록</string>
     <string name="episode_action_reload_links">링크 새로고침</string>
@@ -489,7 +489,7 @@
     <string name="show_fillers_settings">애니메이션용 필러 에피소드 표시</string>
     <string name="test_passed">통과</string>
     <string name="resume">계속</string>
-    <string name="limit_title">플레이어 표시 제목의 최대 글자 수</string>
+    <string name="limit_title">플레이어 내 표시 제목의 최대 글자 수</string>
     <string name="android_tv_interface_on_seek_settings">플레이어 표시 시 탐색 시간</string>
     <string name="android_tv_interface_on_seek_settings_summary">플레이어 표시 중 탐색 간격</string>
     <string name="android_tv_interface_off_seek_settings">플레이어 미표시 시 탐색 시간</string>
@@ -508,7 +508,7 @@
     <string name="tracks">트랙</string>
     <string name="referer">Referer (선택)</string>
     <string name="skip_type_recap">요약</string>
-    <string name="action_mark_as_watched">시청함으로 표시</string>
+    <string name="action_mark_as_watched">시청 완료로 표시</string>
     <string name="revert">되돌리기</string>
     <string name="subscription_in_progress_notification">구독한 프로그램 업데이트</string>
     <string name="subscription_list_name">구독중</string>
@@ -520,7 +520,7 @@
     <string name="toast_copied">복사됨!</string>
     <string name="repo_copy_label">레포지토리 이름 및 URL</string>
     <string name="test_extensions_summary">본 테스트는 개발자만을 대상으로 하며, 확장자의 작업을 확인하거나 거부하지 않습니다.</string>
-    <string name="cs3wiki">클라우스스트림 위키</string>
+    <string name="cs3wiki">CloudStream 위키</string>
     <string name="links_reloaded_toast">링크 새로고침 완료</string>
     <string name="backup_frequency">백업 빈도</string>
     <string name="favorites_list_name">즐겨찾기</string>
@@ -603,7 +603,7 @@
     <string name="battery_dialog_message">구독 중인 TV 쇼의 알림을 받고 다운로드를 끊김 없이 완료하려면, CloudStream의 백그라운드 실행 권한이 필요합니다. \'확인\'을 누른 후 나타나는 요청 창에서 \'허용\'을 선택해 주세요.\n\n참고로, 이 권한을 허용한다고 해서 배터리가 계속 소모되는 것은 아닙니다. 알림을 받거나 공식 확장 프로그램에서 영상을 다운로드할 때처럼 꼭 필요한 상황에서만 백그라운드 작업을 수행합니다.</string>
     <string name="quality_profile_help">여기서 소스의 순서를 변경할 수 있습니다. 비디오의 우선 순위가 높은 경우에는 소스 선택 화면에 더 높게 나타납니다. 소스 우선 순위와 품질 우선 순위의 합이 비디오 우선 순위입니다. \n \n참고 A: 3 \n품질 B: 7 \n총 비디오 우선 순위는 10입니다. \n \n참고: 합이 10 이상이면 해당 링크가 로드되면 플레이어는 자동으로 로드를 건너뜁니다!</string>
     <string name="next_season_episode_format" formatted="true">시즌 %1$d 에피소드 %2$d 공개 예정</string>
-    <string name="result_search_tooltip">다른 확장자에서 검색</string>
+    <string name="result_search_tooltip">다른 확장프로그램에서 검색</string>
     <string name="subscribe_tooltip">새로운 에피소드 알림</string>
     <string name="recommendations_tooltip">추천목록 보기</string>
     <string name="speed_setting_summary">플레이어에 속도 옵션을 추가합니다</string>
@@ -712,7 +712,7 @@
     <string name="edit_profile_image_error_empty">URL을 찾을 수 없습니다</string>
     <string name="edit_profile_image_error_invalid">잘못된 URL 혹은 이미지 입니다</string>
     <string name="edit_profile_image_success">이미지 업데이트 성공</string>
-    <string name="action_mark_watched_up_to_this_episode">이 에피소드까지 시청함으로 표시</string>
+    <string name="action_mark_watched_up_to_this_episode">이 에피소드까지 시청 완료로 표시</string>
     <string name="action_remove_mark_watched_up_to_this_episode">이 에피소드까지 시청함 표시 제거</string>
     <string name="name">이름</string>
     <string name="resolution_and_name">해상도 및 이름</string>
diff --git a/app/src/main/res/values-b+tr/strings.xml b/app/src/main/res/values-b+tr/strings.xml
index 273a3140c..e84d5271e 100644
--- a/app/src/main/res/values-b+tr/strings.xml
+++ b/app/src/main/res/values-b+tr/strings.xml
@@ -412,13 +412,11 @@
     <string name="plugins_disabled" formatted="true">Devre dışı: %d</string>
     <string name="plugins_not_downloaded" formatted="true">İndirilmeyen: %d</string>
     <string name="plugins_updated" formatted="true">%d eklentiler güncellendi</string>
-    <string name="blank_repo_message">CloudStream, varsayılan olarak hiçbir site ile gelmez. Siteleri depolardan kurmanız gerekir.
-\n
-\nDiscord\'umuza katılın veya çevrimiçi arama yapın.</string>
+    <string name="blank_repo_message">CloudStream, varsayılan olarak hiçbir site ile gelmez. Siteleri depolardan kurmanız gerekir. \n \nDiscord\'umuza katılın veya internet üzerinden arama yapın.</string>
     <string name="view_public_repositories_button">Topluluk depolarını görüntüle</string>
     <string name="view_public_repositories_button_short">Herkese açık liste</string>
     <string name="uppercase_all_subtitles">Tüm altyazılar büyük harf</string>
-    <string name="download_all_plugins_from_repo">Uyarı: CloudStream 3, üçüncü taraf uzantıların kullanımı için herhangi bir sorumluluk kabul etmez ve bunlar için herhangi bir destek sağlamaz!</string>
+    <string name="download_all_plugins_from_repo">Uyarı: CloudStream 3.taraf uzantıların kullanımı için herhangi bir sorumluluk kabul etmez ve bunlar için herhangi bir destek sağlamaz!</string>
     <string name="single_plugin_disabled" formatted="true">%s (Devre dışı)</string>
     <string name="tracks">Parçalar</string>
     <string name="audio_tracks">Ses parçaları</string>
@@ -471,7 +469,7 @@
     <string name="update_notification_downloading">Uygulama güncellemesi indiriliyor…</string>
     <string name="update_notification_failed">Uygulamanın yeni sürümü kurulamadı</string>
     <string name="clear_history">Geçmişi temizle</string>
-    <string name="apk_installer_package_installer">PaketKurucu</string>
+    <string name="apk_installer_package_installer">Paket Kurucu</string>
     <string name="apk_installer_legacy">Eski</string>
     <string name="pref_category_gestures">Hareketler</string>
     <string name="all_languages_preference">Tüm Diller</string>
@@ -572,7 +570,7 @@
     <string name="action_remove_from_favorites">Favorilerden çıkar</string>
     <string name="select_an_account">Hesap Seç</string>
     <string name="disable">Devre dışı bırak</string>
-    <string name="no_repository_found_error">Depo bulunamadı, bağlantı adresini kontrol edin ve VPN deneyin</string>
+    <string name="no_repository_found_error">Depo bulunamadı, bağlantı adresini kontrol edin veya VPN ile deneyin</string>
     <string name="already_voted">Zaten oyladınız</string>
     <string name="no_plugins_found_error">Depoda eklenti bulunamadı</string>
     <string name="duplicate_message_single" formatted="true">Görünüşe göre potansiyel bir kopya kütüphanenizde zaten bulunuyor: \'%s\'
@@ -724,7 +722,7 @@
     <string name="edit_profile_image_error_empty">URL bulunamadı</string>
     <string name="edit_profile_image_error_invalid">Geçersiz Bağlantı veya Görsel</string>
     <string name="edit_profile_image_success">Görsel Başarıyla Güncellendi</string>
-    <string name="episode_action_play_mirror">Ekranda oynat</string>"
+    <string name="episode_action_play_mirror">Şu kaynaktan oynat</string>"
     <string name="action_mark_watched_up_to_this_episode">Bu bölüme kadar izlenmiş olarak işaretle</string>
     <string name="action_remove_mark_watched_up_to_this_episode">Bu bölümü izlenmemiş olarak işaretle</string>
     <string name="action_reload">Yeniden yükle</string>
@@ -771,4 +769,5 @@
     </plurals>
     <string name="source_priority">Öncelikli kaynak</string>
     <string name="source_priority_help">Oynatıcıda video kaynaklarının nasıl sıralanacağını belirleyin</string>
+    <string name="show_player_metadata_overlay">Meta Verileri Katmanını Göster</string>
 </resources>
diff --git a/app/src/main/res/values-b+vi/strings.xml b/app/src/main/res/values-b+vi/strings.xml
index 895184652..a51a3551d 100644
--- a/app/src/main/res/values-b+vi/strings.xml
+++ b/app/src/main/res/values-b+vi/strings.xml
@@ -5,9 +5,9 @@
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Tập %2$d</string>
     <string name="cast_format" formatted="true">Diễn viên: %s</string>
     <string name="next_episode_format" formatted="true">Tập %d sẽ ra mắt sau</string>
-    <string name="next_episode_time_day_format" formatted="true">%1$dng %2$dg %3$dph</string>
-    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
-    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$d ngày %2$d giờ %3$d phút</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$d giờ %2$d phút</string>
+    <string name="next_episode_time_min_format" formatted="true">%d phút</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">Poster</string>
@@ -15,7 +15,7 @@
     <string name="home_main_poster_img_des">Poster chính</string>
     <string name="home_next_random_img_des">Tập tiếp theo ngẫu nhiên</string>
     <string name="go_back_img_des">Quay lại</string>
-    <string name="home_change_provider_img_des">Thay đổi nguồn phát</string>
+    <string name="home_change_provider_img_des">Thay đổi Nguồn phim</string>
     <string name="preview_background_img_des">Xem trước hình nền</string>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Tốc độ (%.2fx)</string>
@@ -25,10 +25,10 @@
     <string name="filler" formatted="true">Bộ lọc</string>
     <string name="duration_format" formatted="true">%d phút</string>
     <string name="app_name">CloudStream</string>
-    <string name="play_with_app_name">Mở với CloudStream</string>
+    <string name="play_with_app_name">Phát bằng CloudStream</string>
     <string name="title_home">Trang Chủ</string>
     <string name="title_search">Tìm Kiếm</string>
-    <string name="title_downloads">Tải Về</string>
+    <string name="title_downloads">Tải xuống</string>
     <string name="title_settings">Cài Đặt</string>
     <string name="search_hint">Tìm kiếm…</string>
     <string name="search_hint_site" formatted="true">Tìm kiếm %s…</string>
@@ -38,7 +38,7 @@
     <string name="result_tags">Thể loại</string>
     <string name="result_share">Chia sẻ</string>
     <string name="result_open_in_browser">Mở bằng trình duyệt</string>
-    <string name="skip_loading">Bỏ qua quá trình tải</string>
+    <string name="skip_loading">Bỏ tải</string>
     <string name="loading">Đang tải…</string>
     <string name="type_watching">Đang xem</string>
     <string name="type_on_hold">Đang chờ</string>
@@ -46,35 +46,35 @@
     <string name="type_dropped">Bỏ xem</string>
     <string name="type_plan_to_watch">Xem sau</string>
     <string name="type_re_watching">Xem lại</string>
-    <string name="play_movie_button">Xem Ngay</string>
-    <string name="play_livestream_button">Phát trực tiếp</string>
-    <string name="play_torrent_button">Xem Torrent</string>
-    <string name="pick_source">Nguồn Phim</string>
+    <string name="play_movie_button">Phát</string>
+    <string name="play_livestream_button">Phát Livestream</string>
+    <string name="play_torrent_button">Phát Torrent</string>
+    <string name="pick_source">Nguồn phim</string>
     <string name="pick_subtitle">Phụ đề</string>
     <string name="reload_error">Thử kết nối lại…</string>
     <string name="go_back">Quay lại</string>
-    <string name="play_episode">Xem Tập Phim</string>
+    <string name="play_episode">Phát Tập phim</string>
     <!--<string name="need_storage">Allow to download episodes</string>-->
     <string name="download">Tải xuống</string>
-    <string name="downloaded">Đã tải</string>
-    <string name="downloading">Đang tải</string>
+    <string name="downloaded">Đã tải xuống</string>
+    <string name="downloading">Đang tải xuống</string>
     <string name="download_paused">Đã tạm dừng tải xuống</string>
-    <string name="download_started">Đã bắt đầu tải</string>
-    <string name="download_failed">Tải lỗi</string>
-    <string name="download_canceled">Đã hủy tải xuống</string>
+    <string name="download_started">Tải xuống đã bắt đầu</string>
+    <string name="download_failed">Tải xuống thất bại</string>
+    <string name="download_canceled">Tải xuống đã hủy</string>
     <string name="download_done">Tải xuống thành công</string>
     <string name="stream">Luồng mạng</string>
-    <string name="error_loading_links_toast">Lỗi khi tải liên kết</string>
+    <string name="error_loading_links_toast">Lỗi tải liên kết</string>
     <string name="download_storage_text">Bộ nhớ trong</string>
     <string name="app_dubbed_text">Lồng tiếng</string>
     <string name="app_subbed_text">Phụ đề</string>
     <string name="popup_delete_file">Xóa Tệp</string>
-    <string name="popup_play_file">Xem Tệp</string>
-    <string name="popup_resume_download">Tiếp tục tải</string>
-    <string name="popup_pause_download">Tạm dừng tải</string>
+    <string name="popup_play_file">Phát Tệp</string>
+    <string name="popup_resume_download">Tiếp tục tải xuống</string>
+    <string name="popup_pause_download">Tạm dừng tải xuống</string>
     <string name="home_more_info">Thông tin thêm</string>
     <string name="home_expanded_hide">Ẩn</string>
-    <string name="home_play">Xem ngay</string>
+    <string name="home_play">Phát</string>
     <string name="home_info">Thông tin</string>
     <string name="filter_bookmarks">Lọc danh sách của tôi</string>
     <string name="error_bookmarks_text">Danh sách của tôi</string>
@@ -92,7 +92,7 @@
     <string name="subs_background_color">Màu nền</string>
     <string name="subs_window_color">Màu cửa sổ</string>
     <string name="subs_edge_type">Kiểu viền</string>
-    <string name="subs_subtitle_elevation">Độ nâng</string>
+    <string name="subs_subtitle_elevation">Độ nâng phụ đề</string>
     <string name="subs_font">Kiểu chữ</string>
     <string name="subs_font_size">Kích thước chữ</string>
     <string name="search_provider_text_providers">Tìm kiếm theo nguồn phim</string>
@@ -100,12 +100,12 @@
     <string name="benene_count_text">%d lượt ủng hộ đã gửi đến nhà phát triển</string>
     <string name="benene_count_text_none">Không có lượt ủng hộ đã nhận</string>
     <string name="subs_auto_select_language">Tự động chọn ngôn ngữ</string>
-    <string name="subs_download_languages">Ngôn ngữ khi tải xuống</string>
+    <string name="subs_download_languages">Ngôn ngữ tải xuống</string>
     <string name="subs_subtitle_languages">Ngôn ngữ phụ đề</string>
     <string name="subs_hold_to_reset_to_default">Nhấn giữ để đặt lại về mặc định</string>
     <string name="subs_import_text" formatted="true">Thêm phông chữ tại %s</string>
     <string name="continue_watching">Tiếp tục xem</string>
-    <string name="action_remove_watching">Loại bỏ</string>
+    <string name="action_remove_watching">Xóa</string>
     <string name="action_open_watching">Thông tin thêm</string>
     <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Có thể cần dùng VPN để nguồn này hoạt động đúng</string>
@@ -116,14 +116,14 @@
     <string name="show_log_cat">Hiển thị Logcat 🐈</string>
     <string name="picture_in_picture">Hình trong hình</string>
     <string name="picture_in_picture_des">Tiếp tục phát trong trình phát thu nhỏ trên các ứng dụng khác</string>
-    <string name="player_size_settings">Nút thay đổi kích cỡ trình phát</string>
+    <string name="player_size_settings">Nút thay đổi kích thước trình phát</string>
     <string name="player_size_settings_des">Xóa bỏ các viền đen</string>
     <string name="player_subtitles_settings">Phụ đề</string>
     <string name="player_subtitles_settings_des">Cài đặt phụ đề</string>
     <string name="chromecast_subtitles_settings">Phụ đề Chromecast</string>
     <string name="chromecast_subtitles_settings_des">Cài đặt phụ đề Chromecast</string>
     <string name="eigengraumode_settings">Tốc độ phát</string>
-    <string name="swipe_to_seek_settings">Vuốt để tua nhanh</string>
+    <string name="swipe_to_seek_settings">Vuốt để tua</string>
     <string name="swipe_to_seek_settings_des">Vuốt ngang qua lại để tua video</string>
     <string name="swipe_to_change_settings">Vuốt để thay đổi cài đặt</string>
     <string name="swipe_to_change_settings_des">Vuốt lên hoặc xuống cạnh trái hoặc phải để điều chỉnh độ sáng hoặc âm lượng</string>
@@ -140,44 +140,44 @@
     <string name="episode_sync_settings_des">Tự động đồng bộ tiến trình hiện tại của bạn</string>
     <string name="restore_settings">Khôi phục dữ liệu từ bản sao lưu</string>
     <string name="backup_settings">Sao lưu dữ liệu</string>
-    <string name="restore_success">Đã tải dữ liệu sao lưu</string>
+    <string name="restore_success">Đã tải tệp sao lưu</string>
     <string name="restore_failed_format" formatted="true">Không thể khôi phục dữ liệu từ %s</string>
-    <string name="backup_success">Sao lưu dữ liệu thành công</string>
-    <string name="backup_failed">Thiếu quyền truy cập bộ nhớ, hãy thử lại.</string>
+    <string name="backup_success">Dữ liệu đã lưu</string>
+    <string name="backup_failed">Thiếu quyền truy cập bộ nhớ. Vui lòng thử lại.</string>
     <string name="backup_failed_error_format">Lỗi khi sao lưu %s</string>
     <string name="search">Tìm kiếm</string>
     <string name="category_account">Tài khoản và Bảo mật</string>
     <string name="category_updates">Cập nhật và Sao lưu</string>
     <string name="settings_info">Thông tin</string>
     <string name="advanced_search">Tìm kiếm nâng cao</string>
-    <string name="advanced_search_des">Cho phép tìm kiếm theo bộ lọc từng nhà cung cấp</string>
+    <string name="advanced_search_des">Cung cấp cho bạn kết quả tìm kiếm được phân loại theo từng nguồn phim</string>
     <string name="show_fillers_settings">Hiển thị tập phụ cho anime</string>
     <string name="show_trailers_settings">Hiển thị trailer</string>
     <string name="kitsu_settings">Hiển thị poster từ Kitsu</string>
     <string name="pref_filter_search_quality">Ẩn chất lượng video trong kết quả tìm kiếm</string>
-    <string name="automatic_plugin_updates">Tự động cập nhật plugin</string>
+    <string name="automatic_plugin_updates">Tự động cập nhật tiện ích mở rộng</string>
     <string name="updates_settings">Hiển thị thông báo cập nhật ứng dụng</string>
     <string name="updates_settings_des">Tự động tìm kiếm bản cập nhật mới sau khi khởi động ứng dụng.</string>
     <string name="github">Github</string>
     <string name="lightnovel">Ứng dụng đọc tiểu thuyết của cùng nhà phát triển</string>
     <string name="anim">Ứng dụng xem Anime của cùng nhà phát triển</string>
     <string name="discord">Tham gia cộng đồng trên Discord</string>
-    <string name="benene">Gửi lời cảm ơn tới nhà phát triển</string>
-    <string name="benene_des">Gửi lời cảm ơn</string>
+    <string name="benene">Gửi ủng hộ tới nhà phát triển</string>
+    <string name="benene_des">Gửi ủng hộ</string>
     <string name="app_language">Ngôn ngữ ứng dụng</string>
     <string name="no_chromecast_support_toast">Nguồn phim này chưa hỗ trợ Chromecast</string>
     <string name="no_links_found_toast">Không tìm thấy liên kết</string>
     <string name="copy_link_toast">Đã sao chép liên kết vào bộ nhớ tạm</string>
-    <string name="play_episode_toast">Xem Phim</string>
-    <string name="subs_default_reset_toast">Thiết lập lại giá trị mặc định</string>
+    <string name="play_episode_toast">Phát Tập phim</string>
+    <string name="subs_default_reset_toast">Đặt lại giá trị mặc định</string>
     <string name="season">Mùa</string>
     <string name="no_season">Không có mùa nào</string>
     <string name="episode">Tập</string>
     <string name="episodes">Tập</string>
     <string name="episodes_range">%1$d-%2$d</string>
     <string name="episode_format" formatted="true">%1$d %2$s</string>
-    <string name="season_short">M</string>
-    <string name="episode_short">T</string>
+    <string name="season_short">Mùa</string>
+    <string name="episode_short">Tập</string>
     <string name="no_episodes_found">Không có tập nào</string>
     <string name="delete_file">Xóa Tệp</string>
     <string name="delete">Xóa</string>
@@ -196,7 +196,7 @@
     <string name="rating">Đánh giá</string>
     <string name="duration">Thời lượng</string>
     <string name="site">Nguồn</string>
-    <string name="synopsis">Thông tin</string>
+    <string name="synopsis">Tóm tắt phim</string>
     <string name="queued">Hàng chờ</string>
     <string name="no_subtitles">Không có phụ đề</string>
     <string name="action_default">Mặc định</string>
@@ -231,20 +231,20 @@
     <string name="remote_error">Lỗi nguồn từ xa</string>
     <string name="render_error">Lỗi kết xuất</string>
     <string name="unexpected_error">Đã có lỗi xảy ra. Vui lòng thử lại sau</string>
-    <string name="storage_error">Lỗi tải xuống. Hãy kiểm tra quyền truy cập bộ nhớ của ứng dụng</string>
-    <string name="episode_action_chromecast_episode">Tập Chromecast</string>
-    <string name="episode_action_chromecast_mirror">Chiếu Chromecast</string>
-    <string name="episode_action_play_in_app">Xem trong ứng dụng</string>
-    <string name="episode_action_play_in_format">Xem trong %s</string>
+    <string name="storage_error">Lỗi tải xuống. Hãy kiểm tra quyền truy cập bộ nhớ</string>
+    <string name="episode_action_chromecast_episode">Phát tập phim bằng Chromecast</string>
+    <string name="episode_action_chromecast_mirror">Phản chiếu màn hình bằng Chromecast</string>
+    <string name="episode_action_play_in_app">Phát bằng ứng dụng</string>
+    <string name="episode_action_play_in_format">Phát bằng %s</string>
     <string name="episode_action_auto_download">Tự động tải xuống</string>
-    <string name="episode_action_download_mirror">Nguồn tải xuống</string>
-    <string name="episode_action_reload_links">Lấy link mới nhất</string>
-    <string name="episode_action_download_subtitle">Tải phụ đề</string>
+    <string name="episode_action_download_mirror">Nguồn tải dự phòng</string>
+    <string name="episode_action_reload_links">Tải lại các liên kết</string>
+    <string name="episode_action_download_subtitle">Tải xuống phụ đề</string>
     <string name="show_hd">Nhãn chất lượng phim</string>
     <string name="show_dub">Nhãn lồng tiếng</string>
     <string name="show_sub">Nhãn phụ đề</string>
-    <string name="show_title">Tên</string>
-    <string name="poster_ui_settings">Thành phần giao diện trên poster</string>
+    <string name="show_title">Tên phim</string>
+    <string name="poster_ui_settings">Hiển thị các thông tin trên poster</string>
     <string name="no_update_found">Bạn đang dùng phiên bản mới nhất</string>
     <string name="check_for_update">Kiểm tra cập nhật</string>
     <string name="video_lock">Khóa</string>
@@ -255,17 +255,17 @@
     <string name="skip_update">Bỏ qua bản cập nhật này</string>
     <string name="update">Cập nhật</string>
     <string name="watch_quality_pref">Chất lượng xem ưu tiên (WiFi)</string>
-    <string name="limit_title">Số ký tự tối đa trên tiêu đề trình phát video</string>
+    <string name="limit_title">Số ký tự tối đa tiêu đề trình phát</string>
     <string name="limit_title_rez">Hiện thông tin trình phát</string>
     <string name="video_buffer_size_settings">Kích thước bộ nhớ đệm video</string>
     <string name="video_buffer_length_settings">Thời lượng bộ nhớ đệm</string>
-    <string name="video_buffer_disk_settings">Lưu bộ nhớ đệm video trên ổ cứng</string>
+    <string name="video_buffer_disk_settings">Bộ nhớ đệm video trên thiết bị</string>
     <string name="video_buffer_clear_settings">Xoá bộ nhớ đệm hình ảnh và video</string>
     <string name="video_ram_description">Sẽ gây lỗi nếu đặt quá cao trên thiết bị có bộ nhớ thấp như Android TV.</string>
     <string name="video_disk_description">Sẽ gây lỗi nếu đặt quá cao trên máy có dung lượng lưu trữ thấp như Android TV.</string>
     <string name="dns_pref">DNS over HTTPS</string>
     <string name="dns_pref_summary">Rất hữu ích để bỏ chặn ISP</string>
-    <string name="add_site_pref">Sao chép trang web</string>
+    <string name="add_site_pref">Bản sao trang web</string>
     <string name="remove_site_pref">Xoá trang web</string>
     <string name="add_site_summary">Thêm bản sao của trang hiện có bằng một URL khác</string>
     <string name="download_path_pref">Đường dẫn tải xuống</string>
@@ -291,8 +291,8 @@
     <string name="emulator_layout">Giao diện giả lập</string>
     <string name="primary_color_settings">Màu chính</string>
     <string name="app_theme_settings">Chủ đề ứng dụng</string>
-    <string name="bottom_title_settings">Vị trí tiêu đề</string>
-    <string name="bottom_title_settings_des">Đặt tiêu đề dưới poster</string>
+    <string name="bottom_title_settings">Vị trí tên phim</string>
+    <string name="bottom_title_settings_des">Đặt tên phim dưới poster</string>
     <!-- account stuff -->
     <string name="example_password">Mật khẩu</string>
     <string name="example_username">Tài khoản</string>
@@ -328,23 +328,23 @@
     <string name="subtitles_shadow">Đổ bóng</string>
     <string name="subtitles_raised">Nâng</string>
     <string name="subtitle_offset">Chỉnh phụ đề</string>
-    <string name="subtitle_offset_hint">1000 mili giây</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
     <string name="subtitle_offset_title">Độ trễ phụ đề</string>
-    <string name="subtitle_offset_extra_hint_later_format">Dùng nếu phụ đề bị nhanh %d mili giây</string>
-    <string name="subtitle_offset_extra_hint_before_format">Dùng nếu phụ đề bị trễ %d mili giây</string>
-    <string name="subtitle_offset_extra_hint_none_format">Không chỉnh</string>
+    <string name="subtitle_offset_extra_hint_later_format">Dùng nếu phụ đề bị nhanh %d ms</string>
+    <string name="subtitle_offset_extra_hint_before_format">Dùng nếu phụ đề bị trễ %d ms</string>
+    <string name="subtitle_offset_extra_hint_none_format">Không điều chỉnh</string>
     <!--
     Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
     see: 
 	https://en.wikipedia.org/w/index.php?title=Pangram&oldid=225849300
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
-    <string name="subtitles_example_text">Xem trước mẫu phụ đề</string>
+    <string name="subtitles_example_text">Bạch kim rất quý nên sẽ dùng để lắp vô xương</string>
     <string name="recommended">Được đề xuất</string>
     <string name="player_loaded_subtitles" formatted="true">Đã tải %s</string>
-    <string name="player_load_subtitles">Chọn từ máy</string>
+    <string name="player_load_subtitles">Chọn từ tệp</string>
     <string name="player_load_subtitles_online">Chọn từ Internet</string>
-    <string name="downloaded_file">Tệp đã tải</string>
+    <string name="downloaded_file">Tệp đã tải xuống</string>
     <string name="actor_main">Vai chính</string>
     <string name="actor_supporting">Vai phụ</string>
     <string name="actor_background">Lý lịch</string>
@@ -376,9 +376,9 @@
     <string name="error_invalid_data">Lỗi dữ liệu</string>
     <string name="error_invalid_url">Lỗi đường dẫn</string>
     <string name="error">Lỗi</string>
-    <string name="subtitles_remove_captions">Xoá phụ đề đã dùng</string>
-    <string name="subtitles_remove_bloat">Loại bỏ mã hoá phụ đề</string>
-    <string name="subtitles_filter_lang">Lọc theo ngôn ngữ media được chuộng hơn</string>
+    <string name="subtitles_remove_captions">Xóa bỏ chú thích chi tiết trong phụ đề</string>
+    <string name="subtitles_remove_bloat">Xóa bỏ nội dung thừa trong phụ đề</string>
+    <string name="subtitles_filter_lang">Lọc theo ngôn ngữ ưu tiên</string>
     <string name="extras">Thêm</string>
     <string name="trailer">Trailer</string>
     <string name="network_adress_example">https://example.com/example.mp4</string>
@@ -394,22 +394,22 @@
     <string name="add_repository">Thêm kho tiện ích</string>
     <string name="repository_name_hint">Tên kho tiện ích (Tùy chọn)</string>
     <string name="repository_url_hint">URL kho tiện ích hoặc Mã ngắn</string>
-    <string name="plugin_loaded">Đã tải plugin</string>
-    <string name="plugin_deleted">Plugin đã xoá</string>
+    <string name="plugin_loaded">Tiện ích mở rộng đã tải</string>
+    <string name="plugin_deleted">Tiện ích mở rộng đã xoá</string>
     <string name="plugin_load_fail" formatted="true">Không tải được %s</string>
     <string name="is_adult">18+</string>
     <string name="batch_download_start_format" formatted="true">Đã bắt đầu tải xuống %1$d %2$s…</string>
     <string name="batch_download_finish_format" formatted="true">Đã tải xuống %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Toàn bộ %s đã được tải xuống</string>
-    <string name="batch_download">Tải hàng loạt</string>
-    <string name="plugin_singular">plugin</string>
-    <string name="plugin">plugin</string>
+    <string name="batch_download">Tải xuống hàng loạt</string>
+    <string name="plugin_singular">tiện ích mở rộng</string>
+    <string name="plugin">tiện ích mở rộng</string>
     <string name="delete_repository_plugins">Việc này sẽ xóa tất cả tiện ích mở rộng trong kho tiện ích</string>
     <string name="delete_repository">Xoá kho tiện ích</string>
-    <string name="setup_extensions_subtext">Tải nguồn phim bạn muốn dùng</string>
-    <string name="plugins_downloaded" formatted="true">Đã tải: %d</string>
+    <string name="setup_extensions_subtext">Tải xuống danh sách các trang web bạn muốn sử dụng</string>
+    <string name="plugins_downloaded" formatted="true">Đã tải xuống: %d</string>
     <string name="plugins_disabled" formatted="true">Đã vô hiệu: %d</string>
-    <string name="plugins_not_downloaded" formatted="true">Không tải: %d</string>
+    <string name="plugins_not_downloaded" formatted="true">Chưa tải xuống: %d</string>
     <string name="blank_repo_message">CloudStream không có sẵn trang web nào. Bạn cần cài đặt các trang web từ kho lưu trữ.
 \n
 \nHãy tham gia Discord của chúng tôi hoặc tìm kiếm trực tuyến.</string>
@@ -418,27 +418,27 @@
     <string name="uppercase_all_subtitles">In hoa toàn bộ phụ đề</string>
     <string name="download_all_plugins_from_repo">Cảnh báo: CloudStream không chịu trách nhiệm về các tiện ích mở rộng bên thứ ba và không cung cấp bất kỳ sự hỗ trợ nào!</string>
     <string name="single_plugin_disabled" formatted="true">%s (Đã vô hiệu hoá)</string>
-    <string name="tracks">Âm thanh &amp; Chất lượng</string>
+    <string name="tracks">Âm thanh &amp; Độ phân giải</string>
     <string name="audio_tracks">Âm thanh</string>
-    <string name="video_tracks">Chất lượng Video</string>
-    <string name="apply_on_restart">Áp dụng khi khởi động lại ứng dụng.</string>
+    <string name="video_tracks">Độ phân giải video</string>
+    <string name="apply_on_restart">Khởi động lại ứng dụng để thấy câc thay đổi.</string>
     <string name="safe_mode_title">Chế độ an toàn được bật</string>
-    <string name="safe_mode_description">Đã xảy ra sự cố và chúng tôi đã tự động tắt tất cả các tiện ích mở rộng, hãy tìm và xóa tiện ích mở rộng đang gây ra sự cố.</string>
+    <string name="safe_mode_description">Tất cả tiện ích mở rộng đã được tắt do ứng dụng bị ngừng bất thường để giúp bạn tìm ra vấn đề gây lỗi.</string>
     <string name="safe_mode_crash_info">Xem thông tin sự cố</string>
     <string name="history">Lịch sử</string>
     <string name="action_mark_as_watched">Đánh dấu là đã xem</string>
-    <string name="automatic_plugin_download">Tự động tải xuống plugin</string>
-    <string name="redo_setup_process">Làm lại tiến trình cài đặt</string>
-    <string name="apk_installer_settings">Bộ cài APK</string>
-    <string name="apk_installer_settings_des">Một số thiết bị không hỗ trợ trình cài đặt gói mới. Hãy thử tùy chọn cũ nếu các bản cập nhật không cài đặt.</string>
+    <string name="automatic_plugin_download">Tự động tải xuống tiện ích mở rộng</string>
+    <string name="redo_setup_process">Làm lại tiến trình thiết lập</string>
+    <string name="apk_installer_settings">Trình cài đặt APK</string>
+    <string name="apk_installer_settings_des">Một số thiết bị không hỗ trợ trình cài đặt gói mới. Hãy thử chọn chế độ tương thích cũ nếu các bản cập nhật không cài đặt.</string>
     <string name="season_format">%1$s %2$d%3$s</string>
-    <string name="play_trailer_button">Xem Trailer</string>
-    <string name="automatic_plugin_download_summary">Tự động cài đặt tất cả plugin chưa được cài đặt từ những kho lưu trữ đã thêm vào.</string>
+    <string name="play_trailer_button">Phát Trailer</string>
+    <string name="automatic_plugin_download_summary">Tự động cài đặt tất cả tiện ích mở rộng chưa được cài đặt từ những kho tiện ích đã thêm.</string>
     <string name="update_started">Bắt đầu cập nhật</string>
     <string name="pref_category_links">Liên kết</string>
     <string name="hls_playlist">Danh sách HLS</string>
     <string name="player_pref">Trình phát ưu tiên</string>
-    <string name="player_settings_play_in_app">Trình phát mặc định</string>
+    <string name="player_settings_play_in_app">Trình phát tích hợp</string>
     <string name="extension_rating" formatted="true">Đánh giá: %s</string>
     <string name="no">Không</string>
     <string name="extension_version">Phiên bản</string>
@@ -447,7 +447,7 @@
     <string name="pref_category_backup">Sao lưu</string>
     <string name="pref_category_extensions">Tiện ích mở rộng</string>
     <string name="pref_category_actions">Hành động</string>
-    <string name="pref_category_cache">Cache</string>
+    <string name="pref_category_cache">Bộ nhớ đệm</string>
     <string name="pref_category_gestures">Cử chỉ</string>
     <string name="pref_category_player_features">Tính năng trình phát</string>
     <string name="pref_category_subtitles">Phụ đề</string>
@@ -464,41 +464,41 @@
     <string name="extension_install_first">Cài đặt tiện ích mở rộng trước</string>
     <string name="app_not_found_error">Không thấy ứng dụng</string>
     <string name="all_languages_preference">Tất cả ngôn ngữ</string>
-    <string name="skip_type_format" formatted="true">Tua %s</string>
+    <string name="skip_type_format" formatted="true">Bỏ qua %s</string>
     <string name="skip_type_op">Mở đầu</string>
     <string name="skip_type_ed">Kết thúc</string>
-    <string name="skip_type_recap">Tóm tắt</string>
-    <string name="skip_type_mixed_ed">Các kết thúc hỗn hợp</string>
-    <string name="skip_type_mixed_op">Các mở đầu hỗn hợp</string>
+    <string name="skip_type_recap">Điểm lại nội dung</string>
+    <string name="skip_type_mixed_ed">Kết thúc hỗn hợp</string>
+    <string name="skip_type_mixed_op">Mở đầu hỗn hợp</string>
     <string name="skip_type_creddits">Danh đề</string>
     <string name="skip_type_intro">Giới thiệu</string>
     <string name="clear_history">Xoá lịch sử</string>
     <string name="enable_skip_op_from_database_des">Hiện các popup bỏ qua cho mở đầu/kết thúc</string>
-    <string name="clipboard_too_large">Văn bản quá dài. Không thể lưu vào khay nhớ tạm.</string>
+    <string name="clipboard_too_large">Văn bản quá dài. Không thể lưu vào bộ nhớ tạm.</string>
     <string name="action_remove_from_watched">Xoá khỏi đã xem</string>
     <string name="confirm_exit_dialog">Bạn có chắc muốn thoát?</string>
     <string name="yes">Có</string>
-    <string name="update_notification_downloading">Đang tải bản cập nhật…</string>
+    <string name="update_notification_downloading">Đang tải xuống bản cập nhật…</string>
     <string name="update_notification_installing">Đang cài bản cập nhật…</string>
     <string name="update_notification_failed">Không thể cài đặt phiên bản mới</string>
-    <string name="delayed_update_notice">Ứng dụng sẽ được cập nhật khi thoát</string>
+    <string name="delayed_update_notice">Ứng dụng sẽ được cập nhật sau khi thoát</string>
     <string name="library">Thư viện</string>
     <string name="browser">Trình duyệt</string>
-    <string name="plugin_downloaded">Plugin đã tải</string>
-    <string name="apk_installer_legacy">Legacy</string>
+    <string name="plugin_downloaded">Tiện ích mở rộng đã tải xuống</string>
+    <string name="apk_installer_legacy">Chế độ tương thích cũ</string>
     <string name="sort_updated_new">Đã cập nhật (Mới đến Cũ)</string>
     <string name="sort_updated_old">Đã cập nhật (Cũ đến Mới)</string>
     <string name="empty_library_no_accounts_message">Thư viện của bạn đang trống :(
 \nĐăng nhập vào tài khoản thư viện hoặc thêm phim vào thư viện cục bộ.</string>
-    <string name="open_with">Mở với</string>
+    <string name="open_with">Mở bằng</string>
     <string name="provider_info_meta">Siêu dữ liệu không được cung cấp bởi trang web, video sẽ không tải được nếu nó không tồn tại trên trang web.</string>
-    <string name="apk_installer_package_installer">PackageInstaller</string>
+    <string name="apk_installer_package_installer">Trình cài đặt gói</string>
     <string name="sort">Sắp xếp</string>
     <string name="sort_rating_desc">Xếp hạng (Cao đến Thấp)</string>
     <string name="sort_rating_asc">Xếp hạng (Thấp đến Cao)</string>
     <string name="sort_alphabetical_z">Chữ cái (Z đến A)</string>
     <string name="sort_by">Sắp xếp theo</string>
-    <string name="empty_library_logged_in_message">Danh sách này trống, hãy thử chuyển sang danh sách khác.</string>
+    <string name="empty_library_logged_in_message">Danh sách này trống. Vui lòng thử chuyển sang danh sách khác.</string>
     <string name="sort_alphabetical_a">Chữ cái (A đến Z)</string>
     <string name="select_library">Chọn Thư viện</string>
     <string name="test_log">Nhật ký</string>
@@ -514,18 +514,18 @@
     <string name="subscription_new">Đã đăng kí %s</string>
     <string name="subscription_episode_released">Tập %d đã ra mắt!</string>
     <string name="subscription_list_name">Đã đăng kí</string>
-    <string name="stop">Dừng lại</string>
+    <string name="stop">Dừng</string>
     <string name="pref_category_bypass">Bỏ chặn nhà mạng</string>
     <string name="subscription_deleted">Đã bỏ đăng ký %s</string>
     <string name="safe_mode_file">Tìm thấy tệp Safe mode!
 \nKhông tải bất cứ tiện ích mở rộng nào khi khởi động cho đến khi loại bỏ tệp.</string>
-    <string name="revert">Đảo ngược lại</string>
+    <string name="revert">Hoàn tác</string>
     <string name="subscription_in_progress_notification">Đang cập nhật các phim đã đăng kí</string>
     <string name="jsdelivr_proxy_summary">Bỏ chặn các URL gốc của GitHub bằng jsDelivr. Có thể làm cập nhật bị trễ vài ngày.</string>
-    <string name="android_tv_interface_off_seek_settings_summary">Thời lượng tua khi trình phát bị ẩn</string>
-    <string name="android_tv_interface_off_seek_settings">Thời lượng tua</string>
-    <string name="android_tv_interface_on_seek_settings_summary">Lượng tua thêm được sử dụng khi trình phát hiện lên</string>
-    <string name="android_tv_interface_on_seek_settings">Thời lượng tua</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Lượng thời gian tua được dùng khi trình phát đang bị ẩn</string>
+    <string name="android_tv_interface_off_seek_settings">Thời lượng tua khi trình phát đang ẩn</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Lượng thời gian tua được dùng khi trình phát đang hiển thị</string>
+    <string name="android_tv_interface_on_seek_settings">Thời lượng tua khi trình phát đang hiện</string>
     <string name="profile_number">Hồ sơ %d</string>
     <string name="mobile_data">Dữ liệu di động</string>
     <string name="set_default">Đặt mặc định</string>
@@ -542,14 +542,14 @@
 \nSẽ có mức độ ưu tiên video kết hợp là 10.
 \n
 \nLƯU Ý: Nếu tổng là 10 hoặc nhiều hơn, trình phát sẽ tự động bỏ tải khi liên kết đó được tải!</string>
-    <string name="qualities">Các chất lượng</string>
+    <string name="qualities">Chất lượng</string>
     <string name="already_voted">Bạn đã bình chọn</string>
     <string name="disable">Vô hiệu hoá</string>
     <string name="no_repository_found_error">Không tìm thấy kho tiện ích, hãy kiểm tra URL và thử lại với VPN</string>
     <string name="no_plugins_found_error">Không tìm thấy tiện ích mở rộng</string>
     <string name="unable_to_inflate">Không thể khởi tạo UI, đây là một LỖI LỚN và cần được báo cáo ngay lập tức tới %s</string>
-    <string name="automatic_plugin_download_mode_title">Chọn chế độ để lọc plugin tải xuống</string>
-    <string name="favorite_removed">%s đã loại bỏ khỏi mục yêu thích</string>
+    <string name="automatic_plugin_download_mode_title">Chọn chế độ lọc tiện ích mở rộng tải xuống</string>
+    <string name="favorite_removed">%s đã xóa khỏi mục yêu thích</string>
     <string name="favorites_list_name">Yêu thích</string>
     <string name="favorite_added">%s đã thêm vào mục yêu thích</string>
     <string name="duplicate_message_multiple" formatted="true">Các mục có thể trùng lặp đã được tìm thấy trong thư viện của bạn:
@@ -562,60 +562,60 @@
     <string name="lock_profile">Khóa hồ sơ</string>
     <string name="action_add_to_favorites">Thêm vào mục yêu thích</string>
     <string name="duplicate_replace_all">Thay thế tất cả</string>
-    <string name="pin_error_incorrect">Mã PIN không chính xác. Vui lòng thử lại.</string>
+    <string name="pin_error_incorrect">Mã PIN không đúng. Vui lòng thử lại.</string>
     <string name="action_unsubscribe">Hủy đăng ký</string>
     <string name="pin_error_length">Mã PIN phải có 4 ký tự</string>
     <string name="duplicate_replace">Thay thế</string>
     <string name="duplicate_add">Thêm vào</string>
     <string name="action_subscribe">Đăng ký</string>
-    <string name="action_remove_from_favorites">Loại bỏ khỏi mục yêu thích</string>
-    <string name="select_an_account">Chọn một tài khoản</string>
+    <string name="action_remove_from_favorites">Xóa khỏi mục yêu thích</string>
+    <string name="select_an_account">Ai đang xem</string>
     <string name="duplicate_message_single">Có vẻ như một mục có khả năng trùng lặp đã tồn tại trong thư viện của bạn: \'%s.\'
 \n
 \nBạn vẫn muốn thêm mục này, thay thế mục hiện có hay hủy hành động?</string>
-    <string name="enter_pin">Nhập PIN</string>
+    <string name="enter_pin">Nhập mã PIN</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">Nhập mã PIN hiện tại</string>
     <string name="logged_account" formatted="true">Đã đăng nhập với tư cách %s</string>
     <string name="enter_pin_with_name" formatted="true">Nhập mã PIN cho %s</string>
-    <string name="use_default_account">Sử dụng tài khoản mặc định</string>
-    <string name="skip_startup_account_select_pref">Bỏ qua lựa chọn tài khoản khi khởi động</string>
-    <string name="manage_accounts">Quản lý tài khoản</string>
-    <string name="edit_account">Chỉnh sửa tài khoản</string>
+    <string name="use_default_account">Sử dụng Hồ sơ mặc định</string>
+    <string name="skip_startup_account_select_pref">Bỏ qua lựa chọn hồ sơ lúc khởi động</string>
+    <string name="manage_accounts">Quản lý hồ sơ</string>
+    <string name="edit_account">Chỉnh sửa hồ sơ</string>
     <string name="links_reloaded_toast">Tải lại liên kết</string>
     <string name="result_search_tooltip">Tìm kiếm tiện ích mở rộng khác</string>
     <string name="recommendations_tooltip">Hiển thị đề xuất</string>
     <string name="test_extensions">Kiểm tra tất cả Tiện ích mở rộng</string>
     <string name="rotate_video">Xoay</string>
     <string name="subscribe_tooltip">Thông báo tập mới</string>
-    <string name="speed_setting_summary">Chỉnh tốc độ trong trình phát</string>
+    <string name="speed_setting_summary">Thêm tùy chọn tốc độ phát trong trình phát</string>
     <string name="rotate_video_desc">Hiển thị nút xoay màn hình</string>
-    <string name="auto_rotate_video_desc">Kích hoạt chế độ xoay màn hình tự động</string>
+    <string name="auto_rotate_video_desc">Bật tự động xoay màn hình theo hướng của video</string>
     <string name="auto_rotate_video">Tự động xoay</string>
     <string name="toast_copied">đã sao chép!</string>
-    <string name="clipboard_permission_error">Vấn đề truy cập Bảng ghi tạm, Hãy thử lại.</string>
-    <string name="clipboard_unknown_error">Lỗi sao chép, Hãy sao chép logcat và liên hệ hỗ trợ ứng dụng.</string>
+    <string name="clipboard_permission_error">Lỗi truy cập Bộ nhớ tạm, Vui lòng thử lại.</string>
+    <string name="clipboard_unknown_error">Lỗi sao chép, Vui lòng sao chép logcat và liên hệ hỗ trợ ứng dụng.</string>
     <string name="favorite">Yêu thích</string>
     <string name="ok">OK</string>
-    <string name="battery_dialog_title">Vô hiệu Tối ưu pin</string>
-    <string name="app_info_intent_error">Không thể mở thông tin ứng dụng của CloudStream.</string>
-    <string name="unfavorite">Không thích</string>
+    <string name="battery_dialog_title">Tắt tối ưu hóa pin</string>
+    <string name="app_info_intent_error">Không thể mở thông tin ứng dụng CloudStream.</string>
+    <string name="unfavorite">Bỏ yêu thích</string>
     <string name="biometric_authentication_title">Mở khóa Cloudstream</string>
     <string name="music_singlar">Nhạc</string>
     <string name="audio_book_singular">Sách nói</string>
-    <string name="biometric_setting">Khóa với sinh trắc học</string>
+    <string name="biometric_setting">Khóa bằng sinh trắc học</string>
     <string name="resume_remaining" formatted="true">%s\ncòn lại</string>
     <string name="biometric_unsupported">Xác thực bằng sinh trắc học không được hỗ trợ trên thiết bị này</string>
-    <string name="password_pin_authentication_title">Mật khẩu/PIN Xác thực</string>
+    <string name="password_pin_authentication_title">Xác thực bằng Mật khẩu/PIN</string>
     <string name="biometric_warning">Dữ liệu CloudStream của bạn hiện đã được sao lưu. Mặc dù khả năng xảy ra điều này là rất thấp nhưng tất cả các thiết bị đều có thể hoạt động khác nhau. Trong trường hợp hiếm gặp là bạn bị khóa truy cập ứng dụng, hãy xóa hoàn toàn dữ liệu ứng dụng và khôi phục từ bản sao lưu. Chúng tôi rất xin lỗi vì bất kỳ sự bất tiện nào phát sinh từ việc này.</string>
     <string name="biometric_setting_summary">Mở khóa ứng dụng bằng Vân tay, Khuôn mặt, PIN, Hình vẽ và Mật khẩu.</string>
-    <string name="biometric_prompt_description">Màn hình bị đóng sau nhiều lần thử thất bại. Hãy khởi động lại ứng dụng.</string>
+    <string name="biometric_prompt_description">Sau vài lần thử thất bại, hộp thoại sẽ tự đóng. Chỉ cần khởi động lại ứng dụng để thử lại.</string>
     <string name="test_extensions_summary">Bài kiểm tra này chỉ dành cho các nhà phát triển và không xác nhận hay phủ nhận việc hoạt động của bất kỳ tiện ích mở rộng nào.</string>
     <string name="app_unrestricted_toast">Chế độ tiêu thụ pin của ứng dụng đã được đặt ở mức không giới hạn</string>
     <string name="custom_media_singluar">Phương tiện</string>
     <string name="repo_copy_label">Tên và URL kho tiện ích</string>
     <string name="reset_btn">Đặt lại</string>
-    <string name="battery_dialog_message">Để đảm bảo quá trình tải xuống và thông báo cho các chương trình truyền hình đã đăng ký không bị gián đoạn, CloudStream cần có quyền chạy ở chế độ nền. Bằng cách nhấn OK, một hộp thoại yêu cầu sẽ hiển thị. Hãy nhấn \"Cho phép\".\n\nXin lưu ý, quyền này không có nghĩa là CS3 sẽ làm hao pin của bạn. Nó sẽ chỉ hoạt động ở chế độ nền khi cần thiết, chẳng hạn như khi nhận được thông báo hoặc tải xuống video từ các tiện ích mở rộng chính thức.</string>
+    <string name="battery_dialog_message">Để đảm bảo quá trình tải xuống và thông báo cho các chương trình truyền hình đã đăng ký không bị gián đoạn, CloudStream cần có quyền chạy ở chế độ nền. Bằng cách nhấn OK, một hộp thoại yêu cầu sẽ hiển thị. Vui lòng nhấn \"Cho phép\".\n\nXin lưu ý, quyền này không có nghĩa là CS3 sẽ làm hao pin của bạn. Nó sẽ chỉ hoạt động ở chế độ nền khi cần thiết, chẳng hạn như khi nhận được thông báo hoặc tải xuống video từ các tiện ích mở rộng chính thức.</string>
     <string name="next_season_episode_format" formatted="true">Mùa %1$d Tập %2$d sẽ được phát hành vào</string>
     <string name="episode_upcoming_format" formatted="true">Sắp tới sau %s</string>
     <string name="player_settings_select_cast_device">Chọn thiết bị truyền</string>
@@ -627,12 +627,12 @@
     <string name="cs3wiki">CloudStream Wiki</string>
     <string name="device_pin_url_message">Truy cập <b>%s</b> trên điện thoại hoặc máy tính và nhập mã bên trên</string>
     <string name="device_pin_expired_message">Mã PIN đã hết hạn!</string>
-    <string name="device_pin_counter_text">Mã sẽ hết hạn trong %1$dm %2$ds</string>
-    <string name="device_pin_error_message">Không lấy được mã PIN, hãy thử xác thực cục bộ</string>
-    <string name="downloads_empty">Hiện không có bản tải xuống nào.</string>
+    <string name="device_pin_counter_text">Mã sẽ hết hạn trong %1$d phút %2$d giây</string>
+    <string name="device_pin_error_message">Không lấy được mã PIN, vui lòng thử xác thực cục bộ</string>
+    <string name="downloads_empty">Không có tải xuống nào.</string>
     <string name="auth_locally">Xác thực cục bộ</string>
     <string name="episode_action_cast_mirror">Phản chiếu màn hình</string>
-    <string name="play_from_beginning_img_des">Xem từ đầu</string>
+    <string name="play_from_beginning_img_des">Phát từ đầu</string>
     <string name="open_local_video">Mở video có sẵn</string>
     <string name="test_warning">Cảnh báo</string>
     <string name="sort_release_date_new">Ngày phát hành (Mới đến Cũ)</string>
@@ -648,20 +648,18 @@
     <string name="delete_message_series_episodes" formatted="true">Bạn có chắc chắn muốn xóa vĩnh viễn các tập trong %1$s?
 \n
 \n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">Bạn cũng sẽ xóa vĩnh viễn tất cả các tập trong loạt phim sau:
-\n
-\n%s</string>
+    <string name="delete_message_series_section" formatted="true">Bạn cũng sẽ xóa vĩnh viễn tất cả các tập trong loạt phim: \n \n%s</string>
     <string name="delete_message_series_only" formatted="true">Bạn có chắc chắn muốn xóa vĩnh viễn tất cả các tập trong loạt phim này không?
 \n
 \n%s</string>
-    <string name="delete_plugin">Xóa plugin</string>
+    <string name="delete_plugin">Xóa tiện ích mở rộng</string>
     <string name="sort_release_date_old">Ngày phát hành (Cũ đến mới)</string>
-    <string name="hide_player_control_names">Ẩn tên các nút điều khiển</string>
-    <string name="preview_seekbar_desc">Bật chế độ xem trước hình thu nhỏ trên seekbar</string>
-    <string name="preview_seekbar">Xem trước Seekbar</string>
-    <string name="no_subtitles_loaded">Chưa tải phụ đề</string>
+    <string name="hide_player_control_names">Ẩn tên các nút điều khiển trình phát</string>
+    <string name="preview_seekbar_desc">Bật xem trước hình thu nhỏ trên thanh tua</string>
+    <string name="preview_seekbar">Xem trước trên thanh tua</string>
+    <string name="no_subtitles_loaded">Chưa tải phụ đề nào</string>
     <string name="confirm_before_exiting_title">Xác nhận trước khi thoát</string>
-    <string name="confirm_before_exiting_desc">Hiện hộp thoại xác nhận thoát ứng dụng</string>
+    <string name="confirm_before_exiting_desc">Hiện hộp thoại xác nhận trước khi thoát ứng dụng</string>
     <string name="dont_show">Không hiển thị</string>
     <string name="show">Hiển thị</string>
     <string name="backup_path_title">Vị trí thư mục sao lưu</string>
@@ -683,16 +681,16 @@
     <string name="sort_button_rating">Xếp hạng %s</string>
     <string name="sort_button_date">Ngày %s</string>
     <string name="sort_button_episode">Tập %s</string>
-    <string name="update_plugins">Cập nhật plugin</string>
-    <string name="no_plugins_updated_manually">Không có plugin nào được cập nhật.</string>
-    <string name="sort_episodes_date_oldest">Ngày phát hành (Cũ nhất)</string>
-    <string name="plugins_updated_manually">Đã cập nhật thành công %d plugin!</string>
+    <string name="update_plugins">Cập nhật tiện ích mở rộng</string>
+    <string name="no_plugins_updated_manually">Không có tiện ích mở rộng nào được cập nhật.</string>
+    <string name="sort_episodes_date_oldest">Ngày phát sóng (Cũ nhất)</string>
+    <string name="plugins_updated_manually">Đã cập nhật thành công %d tiện ích mở rộng!</string>
     <string name="sort_episodes_rating_high_low">Xếp hạng (Cao nhất)</string>
-    <string name="update_plugins_manually">Cập nhật plugin thủ công</string>
+    <string name="update_plugins_manually">Cập nhật tiện ích mở rộng thủ công</string>
     <string name="sort_episodes_number_desc">Tập (Giảm dần)</string>
-    <string name="starting_plugin_update_manually">Bắt đầu quá trình cập nhật plugin!</string>
+    <string name="starting_plugin_update_manually">Bắt đầu quá trình cập nhật tiện ích mở rộng!</string>
     <string name="player_notification_channel_name">Thông báo trình phát</string>
-    <string name="player_notification_channel_description">Thông báo trình phát để điều khiển phát lại từ nền</string>
+    <string name="player_notification_channel_description">Điều khiển phát lại trong nền bằng thông báo của trình phát</string>
     <string name="begin_speaking">Bắt đầu nói…</string>
     <string name="speech_recognition_unavailable">Tìm kiếm giọng nói không khả dụng</string>
     <string name="subtitles_from_online">Trực tuyến</string>
@@ -705,33 +703,33 @@
     <string name="player_settings_always_ask">Luôn hỏi</string>
     <string name="show_rating">Nhãn đánh giá</string>
     <string name="download_parallel_settings_des">Số lượng mục khác nhau có thể tải xuống cùng lúc</string>
-    <string name="parallel_downloads">Tải xuống song song</string>
+    <string name="parallel_downloads">Tải xuống đồng thời</string>
     <string name="concurrent_connections">Kết nối đồng thời</string>
-    <string name="concurrent_connections_settings_des">Số lượng kết nối đồng thời có thể sử dụng cho mỗi lượt tải</string>
-    <string name="go_to_downloads">Đến mục tải xuống</string>
+    <string name="concurrent_connections_settings_des">Số lượng kết nối đồng thời mà mỗi lần tải xuống có thể sử dụng</string>
+    <string name="go_to_downloads">Đến mục Tải xuống</string>
     <string name="no_internet_connection">Không có kết nối Internet. \n\nVui lòng kết nối Internet rồi thử lại, hoặc xem các nội dung đã tải xuống khi đang ngoại tuyến.</string>
     <string name="overscan_settings_des">Thay đổi khung hiển thị màn hình</string>
     <string name="overscan_settings">Vượt khung</string>
-    <string name="poster_size_settings_des">Thay đổi kích thước của hình poster</string>
+    <string name="poster_size_settings_des">Thay đổi kích thước poster</string>
     <string name="poster_size_settings">Kích thước poster</string>
     <string name="speedup_title">Tăng tốc độ phát khi nhấn giữ</string>
     <string name="speedup_summary">Nhấn giữ để tăng tốc độ phát 2x</string>
-    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
-    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
-    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d giờ %2$d phút %3$d giây</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$d phút %2$d giây</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$d giây</string>
     <string name="no_account">Không có tài khoản</string>
-    <string name="edit_profile_image_title">Đổi hình đại điện</string>
-    <string name="edit_profile_image_hint">Nhập url hình đại diện</string>
-    <string name="edit_profile_image_error_empty">Không tìm thấy url</string>
-    <string name="edit_profile_image_error_invalid">URL hoặc hình không hợp lệ</string>
-    <string name="edit_profile_image_success">Tải hình lên thành công</string>
+    <string name="edit_profile_image_title">Chỉnh sửa ảnh Hồ sơ</string>
+    <string name="edit_profile_image_hint">Nhập URL ảnh Hồ sơ</string>
+    <string name="edit_profile_image_error_empty">Không tìm thấy URL</string>
+    <string name="edit_profile_image_error_invalid">URL hoặc ảnh không hợp lệ</string>
+    <string name="edit_profile_image_success">Đã cập nhật ảnh thành công</string>
     <string name="action_mark_watched_up_to_this_episode">Đánh dấu là đã xem đến tập này</string>
     <string name="action_remove_mark_watched_up_to_this_episode">Xóa những tập đã xem đến tập này</string>
     <string name="action_reload">Đã tải lại</string>
-    <string name="reload_provider">Tải lại nguồn phát</string>
+    <string name="reload_provider">Tải lại nguồn phim</string>
     <string name="name">Tên</string>
     <string name="resolution_and_name">Độ phân giải và tên</string>
-    <string name="episode_action_play_mirror">Xem phản chiếu</string>"
+    <string name="episode_action_play_mirror">Phản chiếu màn hình</string>"
     <string name="subs_subtitle_alignment">Căn chỉnh phụ đề</string>
     <string name="bottom_left">Dưới trái</string>
     <string name="bottom_center">Dưới giữa</string>
@@ -749,25 +747,25 @@
     <string name="install_prerelease">Cài đặt phiên bản phát hành trước</string>
     <string name="prerelease_already_installed">Bản phát hành trước đã được cài đặt.</string>
     <string name="prerelease_install_failed">Cài đặt bản phát hành trước thất bại.</string>
-    <string name="show_episode_text">Thông tin tập</string>
+    <string name="show_episode_text">Tập</string>
     <string name="extra_brightness_settings_des">Bật bộ lọc độ sáng khi độ sáng màn hình vượt quá 100%</string>
-    <string name="show_cast_in_details">Hiển thị bảng điều khiển</string>
+    <string name="show_cast_in_details">Hiển thị bảng diễn viên</string>
     <string name="video_info">Thông tin video</string>
     <string name="extra_brightness_settings">Độ sáng bổ sung</string>
     <string name="source_name">Tên nguồn</string>
     <string name="download_queue">Hàng đợi tải xuống</string>
-    <string name="queue_empty_message">Hiện tại không có tệp nào đang chờ tải xuống.</string>
-    <string name="source_priority_help">Hãy quyết định cách sắp xếp các nguồn video trong trình phát.</string>
+    <string name="queue_empty_message">Không có tải xuống đang chờ nào.</string>
+    <string name="source_priority_help">Quyết định cách sắp xếp các nguồn video trong trình phát.</string>
     <string name="source_priority">Ưu tiên nguồn</string>
     <string name="download_all">Tải xuống tất cả</string>
     <string name="cancel_all">Hủy tất cả</string>
     <string name="download_episode_range">Bạn có muốn tải xuống tập %s không?</string>
-    <string name="cancel_queue_message">Bạn có muốn hủy tất cả các lượt tải xuống đang chờ xử lý không?</string>
+    <string name="cancel_queue_message">Bạn có muốn hủy tất cả tải xuống đang chờ không?</string>
     <plurals name="downloads_active">
         <item quantity="other">%d đang tải xuống</item>
     </plurals>
     <plurals name="downloads_queued">
-        <item quantity="other">%d lượt tải xuống đang chờ xử lý</item>
+        <item quantity="other">%d tải xuống đang chờ</item>
     </plurals>
     <string name="extra_brightness_key">Đã bật độ sáng bổ sung</string>
     <string name="show_player_metadata_overlay">Hiển thị lớp phủ siêu dữ liệu trình phát</string>
diff --git a/app/src/main/res/values-b+zh+TW/strings.xml b/app/src/main/res/values-b+zh+TW/strings.xml
index c8f9df9a2..78ba57310 100644
--- a/app/src/main/res/values-b+zh+TW/strings.xml
+++ b/app/src/main/res/values-b+zh+TW/strings.xml
@@ -763,4 +763,5 @@
     <string name="torrent_preferred_media">在「設定/影片來源/首選媒體」中啟用 Torrent下載</string>
     <string name="software_decoding_desc">軟體解碼使程式可以播放裝置不支援的影片，但可能導致播放高解析的影片時的延遲或不穩定。</string>
     <string name="volume_exceeded_100">音量已超過 100%</string>
+    <string name="show_player_metadata_overlay">顯示播放器元資料遮罩層</string>
 </resources>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
new file mode 100644
index 000000000..1aa5f0a92
--- /dev/null
+++ b/app/src/main/res/values-sq/strings.xml
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep %2$d</string>
+    <string name="cast_format" formatted="true">Kasti: %s</string>
+    <string name="next_episode_format" formatted="true">Episodi %d do të publikohet në</string>
+    <string name="next_season_episode_format" formatted="true">Sezoni %1$d Episodi %2$d do të publikohet në</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$do %3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$do %2$dm</string>
+    <string name="next_episode_time_min_format" formatted="true">%dm</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$do %2$dm %3$ds</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
+    <string name="result_poster_img_des">Posteri</string>
+    <string name="search_poster_img_des">Posteri</string>
+    <string name="episode_poster_img_des">Posteri i episodit</string>
+    <string name="home_main_poster_img_des">Posteri kryesor</string>
+    <string name="home_next_random_img_des">Tjetër rastësore</string>
+    <string name="go_back_img_des">Kthehu prapa</string>
+    <string name="play_from_beginning_img_des">Luaj nga fillimi</string>
+    <string name="home_change_provider_img_des">Ndrysho ofruesin</string>
+    <string name="preview_background_img_des">Parashikim sfondi</string>
+    <string name="player_speed_text_format" formatted="true">Shpejtësia (%.2fx)</string>
+    <string name="rated_format" formatted="true">Vlerësuar: %.1f</string>
+    <string name="new_update_format" formatted="true">U gjet update i ri!\n%1$s -&gt; %2$s</string>
+    <string name="filler" formatted="true">Filler</string>
+    <string name="duration_format" formatted="true">%d min</string>
+    <string name="app_name">CloudStream</string>
+    <string name="play_with_app_name">Luaj me CloudStream</string>
+    <string name="title_home">Kryefaqja</string>
+    <string name="title_search">Kërko</string>
+    <string name="title_downloads">Shkarkimet</string>
+    <string name="download_queue">Radhë shkarkimesh</string>
+    <string name="title_settings">Cilësimet</string>
+    <string name="search_hint">Kërko…</string>
+    <string name="search_hint_site" formatted="true">Kërko %s…</string>
+    <string name="speech_recognition_unavailable">Njohja e të folurit nuk është e disponueshme</string>
+    <string name="begin_speaking">Fillo të flasësh…</string>
+    <string name="no_data">Nuk ka të dhëna</string>
+    <string name="episode_more_options_des">Më shumë opsione</string>
+    <string name="next_episode">Episodi i radhës</string>
+    <string name="result_tags">Zhanri</string>
+    <string name="result_share">Shpërndaje</string>
+    <string name="result_open_in_browser">Hap në Browser</string>
+    <string name="browser">Browser</string>
+    <string name="skip_loading">Anashkalo ngarkimin</string>
+    <string name="loading">Duke u ngarkuar…</string>
+    <string name="type_watching">Duke parë</string>
+    <string name="type_on_hold">Në pritje</string>
+    <string name="type_completed">Përfunduar</string>
+    <string name="type_dropped">Braktisur</string>
+    <string name="type_plan_to_watch">Planifikoni të shikoni</string>
+    <string name="type_re_watching">Duke rishikuar</string>
+    <string name="play_movie_button">Luaj Filmin</string>
+    <string name="play_trailer_button">Luaj Trailerin</string>
+    <string name="play_livestream_button">Luaj Transmetimin Live</string>
+    <string name="play_torrent_button">Transmeto Torrent</string>
+    <string name="play_full_series_button">Luaj serinë e plotë</string>
+    <string name="torrent_info">Kjo video është një Torrent, kjo do të thotë që aktiviteti juaj i videos mund të gjurmohet.\nSigurohuni që kuptoni Torrent-in para se të vazhdoni.</string>
+    <string name="pick_source">Burime</string>
+    <string name="pick_subtitle">Titrat</string>
+    <string name="reload_error">Ripovo lidhjen…</string>
+    <string name="go_back">Kthehu mbrapa</string>
+    <string name="play_episode">Luaj Episodin</string>
+    <string name="download">Shkarko</string>
+    <string name="downloaded">U shkarkua</string>
+    <string name="downloading">Duke u shkarkuar</string>
+    <string name="download_paused">Shkarkimi u ndërpre</string>
+    <string name="download_started">Shkarkimi filloi</string>
+    <string name="download_failed">Shkarkimi dështoi</string>
+    <string name="download_canceled">Shkarkimi u anulua</string>
+    <string name="download_done">Shkarkimi u krye</string>
+    <string name="downloads_delete_select">Zgjidhni artikuj për të fshirë</string>
+    <string name="downloads_empty">Momentalisht nuk ka shkarkime.</string>
+    <string name="queue_empty_message">Momentalisht nuk ka shkarkime në radhë.</string>
+    <string name="offline_file">E disponueshme për shikim offline</string>
+    <string name="select_all">Zgjidh të gjitha</string>
+    <string name="deselect_all">Çzgjidh të gjitha</string>
+    <string name="update_started">Update-i filloi</string>
+    <string name="stream">Transmetim në rrjet</string>
+    <string name="open_local_video">Hap video lokale</string>
+    <string name="error_loading_links_toast">Gabim gjatë ngarkimit të lidhjeve</string>
+    <string name="links_reloaded_toast">Lidhjet u ringarkuan</string>
+    <string name="download_storage_text">Memorie e brendshme</string>
+    <string name="app_dubbed_text">Dublim</string>
+    <string name="app_subbed_text">Titra</string>
+    <string name="popup_delete_file">Fshi Skedarin</string>
+    <string name="popup_play_file">Luaj skedarin</string>
+    <string name="popup_resume_download">Rifillo shkarkimin</string>
+    <string name="popup_pause_download">Ndalo shkarkimin</string>
+    <string name="home_more_info">Më shumë info</string>
+    <string name="home_expanded_hide">Fsheh</string>
+    <string name="home_play">Luaj</string>
+    <string name="home_info">Informacion</string>
+    <string name="filter_bookmarks">Filtro të ruajturat</string>
+    <string name="error_bookmarks_text">Të ruajturat</string>
+    <string name="action_remove_from_bookmarks">Hiq</string>
+    <string name="action_add_to_bookmarks">Vendos statusin e shikueshmërisë</string>
+    <string name="sort_apply">Apliko</string>
+    <string name="sort_copy">Kopjo</string>
+    <string name="sort_close">Mbyll</string>
+    <string name="sort_clear">Fshi</string>
+    <string name="sort_save">Ruaj</string>
+    <string name="repo_copy_label">Emri i repository-t dhe URL</string>
+    <string name="toast_copied">U kopjua!</string>
+    <string name="subscribe_tooltip">Njoftimi i episodeve të reja</string>
+    <string name="result_search_tooltip">Kërko në shtesat e tjera</string>
+    <string name="recommendations_tooltip">Shfaq rekomandime</string>
+    <string name="player_speed">Shpejtësia e luajtësit</string>
+    <string name="subtitles_settings">Cilësimet e titrave</string>
+    <string name="subs_text_color">Ngjyra e tekstit</string>
+    <string name="subs_outline_color">Ngjyra e konturit</string>
+    <string name="subs_background_color">Ngjyra e sfondit</string>
+    <string name="subs_window_color">Ngjyra e faqes</string>
+    <string name="subs_edge_type">Lloji i konturit</string>
+    <string name="subs_subtitle_elevation">Lartësia e titrave</string>
+    <string name="subs_font">Stili i shkrimit</string>
+    <string name="subs_font_size">Madhësia e shkrimit</string>
+    <string name="search_provider_text_providers">Kërko duke përdorur ofruesit</string>
+    <string name="search_provider_text_types">Kërko duke përdorur tipet</string>
+    <string name="benene_count_text">%d Banane të dhëna per developer-at</string>
+    <string name="benene_count_text_none">Asnjë Banane e dhënë</string>
+    <string name="subs_auto_select_language">Zgjedhje automatike e gjuhës</string>
+    <string name="subs_download_languages">Shkarko gjuhët</string>
+    <string name="subs_subtitle_languages">Gjuha e titrave</string>
+    <string name="subs_hold_to_reset_to_default">Mbaje shtupur për ti rikthyer në gjendjen fillestare</string>
+    <string name="subs_import_text" formatted="true">Importo stilin e shkrimit duke i vendosur në %s</string>
+    <string name="continue_watching">Vazhdo shikimin</string>
+    <string name="action_remove_watching">Hiq</string>
+    <string name="action_open_watching">Më shumë informacion</string>
+    <string name="action_open_play">\@string/home_play</string>
+    <string name="vpn_might_be_needed">Një VPN mund të nevojitet që ky ofrues të funksionojë në rregull</string>
+    <string name="vpn_torrent">Ky ofrues është Torrent, rekomandohet një VPN</string>
+    <string name="provider_info_meta">Metadata nuk ofrohet nga kjo faqe, ngarkimi i videos do të dështojë nëse nuk ekziston në këtë faqe.</string>
+    <string name="torrent_plot">Përshkrimi</string>
+    <string name="normal_no_plot">Skenari nuk u gjet</string>
+    <string name="torrent_no_plot">Përshkrimi nuk u gjet</string>
+    <string name="show_log_cat">Shfaq regjistrin Logcat 🐈</string>
+    <string name="test_log">Rregjistër</string>
+    <string name="picture_in_picture">Imazh-brenda-imazhit</string>
+    <string name="picture_in_picture_des">Vazhdo shikimin në një luajtës të vogël mbi aplikacionet e tjera</string>
+    <string name="player_size_settings">Butoni për ndryshimin e madhësisë së luajtësit</string>
+    <string name="player_size_settings_des">Hiq kufijtë e errët</string>
+    <string name="player_subtitles_settings">Titrat</string>
+    <string name="player_subtitles_settings_des">Cilësimet e titrave të luajtësit</string>
+    <string name="chromecast_subtitles_settings">Titrat e Chromecast</string>
+    <string name="chromecast_subtitles_settings_des">Cilësimet e titrave të Chromecast</string>
+    <string name="eigengraumode_settings">Shpejtësia e rikthimit</string>
+    <string name="speed_setting_summary">Shto një opsion shpejtësie në luajtës</string>
+    <string name="swipe_to_seek_settings">Rrëshqit për të kaluar</string>
+    <string name="swipe_to_seek_settings_des">Rrëshqit nga njëra anë në tjetrën për të lëvizur pozicionin e shikimit në video</string>
+    <string name="swipe_to_change_settings">Rrëshqit per te ndryshuar cilësimet</string>
+    <string name="swipe_to_change_settings_des">Rrëshqit lart ose poshtë në të djathtë ose të majtë për të ndryshuar nivelin e ndriçimit dhe volumin</string>
+    <string name="autoplay_next_settings">Luaj episodin tjetër automatikisht</string>
+    <string name="autoplay_next_settings_des">Luaj episodin tjetër kur episodi aktual mbaron</string>
+    <string name="double_tap_to_seek_settings">Shtyp dy herë për të kaluar</string>
+    <string name="double_tap_to_pause_settings">Shtyp dy herë për të ndaluar</string>
+    <string name="double_tap_to_seek_amount_settings">Sasia e kalimit të luajtësit (sekonda)</string>
+    <string name="double_tap_to_seek_settings_des">Shtyp dy herë në të djathtë ose të majtë për ta kaluar para ose mbrapa</string>
+    <string name="double_tap_to_pause_settings_des">Shtyp dy herë në mes për të ndaluar</string>
+    <string name="use_system_brightness_settings">Përdor nivelin e ndriçimit të sitemit</string>
+    <string name="use_system_brightness_settings_des">Përdor ndriçimin e sistemit në luajtësin e aplikacionit në vend të një mbivendosjeje të errët</string>
+    <string name="extra_brightness_settings">Ndriçim ekstra</string>
+    <string name="extra_brightness_settings_des">Aktivizo filtrin e ndriçimit kur ndriçimi i ekranit kalon 100%</string>
+    <string name="extra_brightness_key">extra_brightness_enabled</string>
+    <string name="episode_sync_settings">Përditëso progresin e shikimit</string>
+    <string name="episode_sync_settings_des">Sinkronizo automatikisht progresin e episodit aktual</string>
+    <string name="restore_settings">Rikthe të dhënat nga kopja rezervë</string>
+    <string name="backup_settings">Të dhënat e kopjes rezervë</string>
+    <string name="backup_frequency">Shpeshtësia e kopjimit rezervë</string>
+    <string name="restore_success">Kopja rezervë u ngarkua</string>
+    <string name="restore_failed_format" formatted="true">Dështoi rikthimi i të dhënave nga skedari %s</string>
+    <string name="backup_success">Të dhënat u ruajtën</string>
+    <string name="backup_failed">Lejet për ruajtje mungojnë. Ju lutem provoni përsëri.</string>
+    <string name="backup_failed_error_format">Gabim gjatë kopjimit rezervë të %s</string>
+    <string name="search">Kërko</string>
+    <string name="library">Bilblioteka</string>
+    <string name="category_account">Llogaritë dhe Siguria</string>
+    <string name="category_updates">Përditësime dhe Kopje Rezervë</string>
+    <string name="settings_info">Informacion</string>
+    <string name="advanced_search">Kërkim i avancuar</string>
+    <string name="advanced_search_des">Tregon rezultatet e kërkimit të ndara sipas ofruesit</string>
+    <string name="search_suggestions">Kërkime të sugjeruara</string>
+    <string name="search_suggestions_des">Trego sugjerimet ndërkohë që shkruani</string>
+    <string name="clear_suggestions">Pastro sugjerimet</string>
+    <string name="show_fillers_settings">Trego episodin Filler për anime</string>
+    <string name="show_player_metadata_overlay">Shfaq informacionin e Metadata-s mbi video</string>
+    <string name="show_trailers_settings">Shfaq trailerat</string>
+    <string name="kitsu_settings">Shfaq posterat nga Kitsu</string>
+    <string name="show_cast_in_details">Shfaq panelin e aktorëve</string>
+    <string name="pref_filter_search_quality">Mos shfaq cilësinë e videos së përzgjedhur në rezultatet e kërkimit</string>
+    <string name="automatic_plugin_updates">Përditësim automatik i shtesave</string>
+    <string name="automatic_plugin_download">Shkarkim automatik i shtesave</string>
+    <string name="automatic_plugin_download_mode_title">Zgjidh modalitetin për të filtruar shtesat që shkarkohen</string>
+    <string name="automatic_plugin_download_summary">Instalo automatikisht të gjitha shtesat që janë shtuar dhe ende nuk janë instaluar nga repository-t.</string>
+    <string name="updates_settings">Shfaq përditësimet e aplikacionit</string>
+    <string name="updates_settings_des">Kërko automatikisht për përditësime të reja kur hapet aplikacioni.</string>
+    <string name="redo_setup_process">Ribëj procesin e konfigurimit</string>
+    <string name="install_prerelease">Instalo versione beta</string>
+    <string name="prerelease_already_installed">Versioni beta është i instaluar.</string>
+    <string name="prerelease_install_failed">Dështoi instalimi i versionit beta.</string>
+    <string name="apk_installer_settings">Instaluesi i APK-ve</string>
+    <string name="apk_installer_settings_des">Disa pajisje nuk mbështesin instaluesin e ri të paketës. Provoni opsionin e vjetër nëse përditësimet nuk instalohen.</string>
+    <string name="github">Github</string>
+    <string name="lightnovel">Aplikacioni Light Novel nga të njëjtit developer-a</string>
+    <string name="anim">Aplikacioni i Anime-ve nga të njëjtit developer-a</string>
+    <string name="discord">Na u bashko në Discord</string>
+    <string name="benene">Jep një banane për developer-at</string>
+    <string name="benene_des">Banane të dhëna</string>
+    <string name="app_language">Gjuha e aplikacionit</string>
+    <string name="no_chromecast_support_toast">Ky ofrues nuk suporton Chromecast</string>
+    <string name="no_links_found_toast">Nuk u gjetën lidhje</string>
+    <string name="copy_link_toast">Lidhja u kopjua në kujtesën e përkohshme</string>
+    <string name="play_episode_toast">Luaj Episodin</string>
+    <string name="subs_default_reset_toast">Rikthe në vlerën fillestare</string>
+    <string name="season">Sezoni</string>
+    <string name="season_format">%1$s %2$d%3$s</string>
+    <string name="no_season">Asnje sezon</string>
+    <string name="episode">Episodi</string>
+    <string name="episodes">Episodet</string>
+    <string name="episodes_range">%1$d-%2$d</string>
+    <string name="episode_format" formatted="true">%1$d %2$s</string>
+    <string name="episode_upcoming_format" formatted="true">Vazhdon në %s</string>
+    <string name="season_short">S</string>
+    <string name="episode_short">E</string>
+    <string name="no_episodes_found">Nuk u gjet asnjë episod</string>
+    <string name="delete">Fshij</string>
+    <string name="delete_file">Fshij skedarin</string>
+    <string name="delete_files">Fshij skedarët</string>
+    <string name="delete_format" formatted="true">Fshij (%1$d | %2$s)</string>
+    <string name="cancel">Anulo</string>
+    <string name="pause">Ndalo</string>
+    <string name="start">Fillo</string>
+    <string name="test_failed">Dështoi</string>
+    <string name="test_passed">Kaloi</string>
+    <string name="test_warning">Paralajmërim</string>
+    <string name="resume">Vazhdo</string>
+    <string name="go_back_30">-30</string>
+    <string name="go_forward_30">+30</string>
+    <string name="delete_message" formatted="true">Kjo do të fshijë përgjithmonë %s\nJeni të sigurt?</string>
+    <string name="delete_message_multiple" formatted="true">Jeni të sigurt që dëshironi të fshini përgjithmonë artikujt e mëposhtëm?\n\n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Jeni të sigurt që dëshironi të fshini përgjithmonë episodet e mëposhtme në %1$s?\n\n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Do të fshini gjithashtu përgjithmonë të gjitha episodet në seritë e mëposhtme:\n\n%s</string>
+    <string name="delete_message_series_only" formatted="true">Jeni të sigurt që dëshironi të fshini përfundimisht të gjitha episodet në serinë e mëposhtme?\n\n%s</string>
+    <string name="resume_time_left" formatted="true">%dm\ntë mbetura</string>
+    <string name="resume_remaining" formatted="true">%s\ntë mbetura</string>
+    <string name="status_ongoing">Në vazhdim</string>
+    <string name="status_completed">Përfunduar</string>
+    <string name="status">Statusi</string>
+    <string name="year">Viti</string>
+    <string name="rating">Vlerësimi</string>
+    <string name="duration">Kohëzgjatja</string>
+    <string name="site">Faqja</string>
+    <string name="synopsis">Sinopsisi</string>
+    <string name="queued">në rradhë</string>
+    <string name="no_subtitles">Pa titra</string>
+    <string name="action_default">Parazgjedhur</string>
+    <string name="free_storage">Falas</string>
+    <string name="used_storage">Përdorur</string>
+    <string name="app_storage">Aplikacion</string>
+    <string name="movies">Filmat</string>
+    <string name="tv_series">Seriale televizive</string>
+    <string name="cartoons">Vizatimore</string>
+    <string name="anime">Anime</string>
+    <string name="torrent">Torrents</string>
+    <string name="documentaries">Dokumentarë</string>
+    <string name="ova">OVA</string>
+    <string name="asian_drama">Drama aziatike</string>
+    <string name="livestreams">Transmetime live</string>
+    <string name="nsfw">NSFW</string>
+    <string name="others">Tjera</string>
+    <string name="movies_singular">Film</string>
+    <string name="tv_series_singular">Seri</string>
+    <string name="cartoons_singular">Vizatimorë</string>
+    <string name="anime_singular">Anime</string>
+    <string name="ova_singular">OVA</string>
+    <string name="torrent_singular">Torrent</string>
+    <string name="documentaries_singular">Dokumentar</string>
+    <string name="asian_drama_singular">Dramë aziatike</string>
+    <string name="live_singular">Transmetim live</string>
+    <string name="nsfw_singular">NSFW</string>
+    <string name="other_singular">Video</string>
+    <string name="music_singlar">Muzikë</string>
+    <string name="audio_book_singular">Libër audio</string>
+    <string name="custom_media_singluar">Media</string>
+    <string name="audio_singluar">Audio</string>
+    <string name="podcast_singluar">Podkast</string>
+    <string name="source_error">Gabim në burim</string>
+    <string name="remote_error">Gabim në distancë</string>
+    <string name="render_error">Gabim në renderer</string>
+    <string name="encoding_error">Gabim në enkodim</string>
+    <string name="unsupported_error">Gabim i pasuportueshëm</string>
+    <string name="unexpected_error">Gabim i papritur i luajtësit</string>
+    <string name="storage_error">Gabim në shkarkim, kontrolloni lejet e memories</string>
+    <string name="episode_action_chromecast_episode">Episod Chromecast-i</string>
+    <string name="episode_action_chromecast_mirror">Pasqyrim Chromecast</string>
+    <string name="episode_action_cast_mirror">Pasqyrim Cast</string>
+    <string name="episode_action_play_in_app">Luaj në aplikacion</string>
+    <string name="episode_action_play_mirror">Luaj pasqyrimin</string>"
+    <string name="episode_action_play_in_format">Luaj në %s</string>
+    <string name="episode_action_auto_download">Shkarko automatikisht</string>
+    <string name="episode_action_download_mirror">Pasqyrim shkarkimi</string>
+    <string name="episode_action_reload_links">Ringarko lidhjet</string>
+    <string name="episode_action_download_subtitle">Shkarko titrat</string>
+    <string name="show_hd">Etiketa e cilësisë</string>
+    <string name="show_dub">Etiketa e dublimit</string>
+    <string name="show_sub">Etiketa e titrave</string>
+    <string name="show_rating">Etiketa e vlerësimit</string>
+    <string name="show_title">Titulli</string>
+    <string name="show_episode_text">Teksti i episodit</string>
+    <string name="poster_ui_settings">Zgjidh elementët e ndërfaqes mbi poster</string>
+    <string name="no_update_found">Nuk u gjet asnjë përditësim</string>
+    <string name="check_for_update">Kontrollo për përditësim</string>
+    <string name="video_lock">Çelës</string>
+    <string name="video_aspect_ratio_resize">Ndrysho madhësinë</string>
+    <string name="video_source">Burimi</string>
+    <string name="video_skip_op">Kalo Intron</string>
+    <string name="dont_show_again">Mos e shfaq përsëri</string>
+    <string name="skip_update">Anashkalo këtë përditësim</string>
+    <string name="update">Përditëso</string>
+    <string name="watch_quality_pref">Cilësia e preferuar e shikimit (WiFi)</string>
+    <string name="watch_quality_pref_data">Cilësia e preferuar e shikimit (Mobile Data)</string>
+    <string name="limit_title">Numri maksimal i karaktereve të titullit</string>
+    <string name="limit_title_rez">Shfaq informacionin e luajtësit</string>
+    <string name="video_buffer_size_settings">Madhësia e bufferit të videos</string>
+    <string name="video_buffer_length_settings">Gjatësia e bufferit të videos</string>
+    <string name="video_buffer_disk_settings">Video cache në disk</string>
+    <string name="video_buffer_clear_settings">Pastro cache-në e videove dhe imazheve</string>
+    <string name="android_tv_interface_on_seek_settings">Sasia e kalimit - Luajtësi i dukshëm</string>
+    <string name="android_tv_interface_on_seek_settings_summary">Sasia e kalimit kur luajtësi është i dukshëm</string>
+    <string name="android_tv_interface_off_seek_settings">Sasia e kalimit - Luajtësi i fshehur</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Sasia e kalimit kur luajtësi është i fshehur</string>
+    <string name="video_ram_description">Shkakton keqfunksionim nëse vendoset shumë lartë në pajisje me memorie të ulët, si Android TV.</string>
+    <string name="video_disk_description">Shkakton probleme nëse vendoset shumë lartë në pajisje me memorie të ulët, si Android TV.</string>
+    <string name="dns_pref">DNS në vend të HTTPS</string>
+    <string name="dns_pref_summary">E dobishme për të anashkaluar bllokimet e ISP-së</string>
+    <string name="jsdelivr_proxy">GitHub Proxy</string>
+    <string name="jsdelivr_enabled">Nuk mund të arrihej GitHub. Po aktivizohet proxy jsDelivr…</string>
+    <string name="jsdelivr_proxy_summary">Anashkalon bllokimin e URL-ve të GitHub duke përdorur jsDelivr. Mund të shkaktojë vonesa të disa ditëve në përditësime.</string>
+    <string name="add_site_pref">Klono faqen</string>
+    <string name="remove_site_pref">Fshi faqen</string>
+    <string name="add_site_summary">Shto një klonim të një faqeje ekzistuese, me një URL tjetër</string>
+    <string name="download_path_pref">Destinacioni i shkarkimit</string>
+    <string name="nginx_url_pref">URL e serverit NGINX</string>
+    <string name="display_subbed_dubbed_settings">Shfaq Anime të Dubluar/me Titra</string>
+    <string name="resize_fit">Përshtat me ekranin</string>
+    <string name="resize_fill">Shtrij</string>
+    <string name="resize_zoom">Zmadho</string>
+    <string name="legal_notice">Mohim përgjegjësie</string>
+    <string name="pref_category_bypass">Tejkalues ISP-je</string>
+    <string name="pref_category_links">Lidhjet</string>
+    <string name="pref_category_app_updates">Përditësimet e aplikacionit</string>
+    <string name="pref_category_backup">Kopja rezervë</string>
+    <string name="pref_category_extensions">Shtesat</string>
+    <string name="pref_category_actions">Veprimet</string>
+    <string name="pref_category_cache">Cache</string>
+    <string name="pref_category_android_tv">Android TV</string>
+    <string name="pref_category_gestures">Gjeste</string>
+    <string name="pref_category_security">Siguria</string>
+    <string name="pref_category_accounts">Llogaritë</string>
+    <string name="pref_category_player_features">Veçoritë e luajtësit</string>
+    <string name="pref_category_subtitles">Titrat</string>
+    <string name="pref_category_player_layout">Paraqitja</string>
+    <string name="pref_category_defaults">Parazgjedhjet</string>
+    <string name="pref_category_looks">Pamja</string>
+    <string name="pref_category_ui_features">Veçoritë</string>
+    <string name="category_general">Të përgjithshme</string>
+    <string name="random_button_settings">Buton i rastësishëm</string>
+    <string name="random_button_settings_desc">Shfaq butonin e rastësishëm në Faqen kryesore dhe Bibliotekë</string>
+    <string name="select_library">Zgjidh Bibliotekën</string>
+    <string name="empty_library_no_accounts_message">Biblioteka juaj është bosh :(\nHyni në një llogari biblioteke ose shtoni shfaqje në bibliotekën tuaj lokale.</string>
+    <string name="provider_lang_settings">Gjuha e shtesave</string>
+    <string name="app_layout">Paraqitja e aplikacionit</string>
+    <string name="preferred_media_settings">Media e preferuar</string>
+    <string name="enable_nsfw_on_providers">Aktivizo NSFW për shtesat që e suportojnë</string>
+    <string name="subtitles_encoding">Enkodimi i titrave</string>
+    <string name="category_providers">Ofruesit</string>
+    <string name="category_provider_test">Testim i ofruesve</string>
+    <string name="test_extensions">Testo të gjitha shtesat</string>
+    <string name="test_extensions_summary">Ky test është vetëm për developer-a dhe nuk verifikon apo mohon funksionimin e asnjë shtese.</string>
+    <string name="category_ui">Paraqitja</string>
+    <string name="automatic">Automatikisht</string>
+    <string name="tv_layout">Paraqitja për TV</string>
+    <string name="phone_layout">Paraqitja për Celular</string>
+    <string name="emulator_layout">Paraqitja për emulator</string>
+    <string name="primary_color_settings">Ngjyra kryesore</string>
+    <string name="app_theme_settings">Pamja e aplikacionit</string>
+    <string name="bottom_title_settings">Vendodhja e titullit te posterit</string>
+    <string name="bottom_title_settings_des">Vendos titullin poshte posterit</string>
+    <string name="example_password">Fjalëkalimi123</string>
+    <string name="example_username">Emri i përdoruesit</string>
+    <string name="example_email">përshëndetje@shqipëri.com</string>
+    <string name="example_ip">127.0.0.1</string>
+    <string name="example_site_name">EmriRiFaqes</string>
+    <string name="example_site_url">https://shembull.com</string>
+    <string name="example_lang_name">Kodi i gjuhës (al)</string>
+    <string name="login_format" formatted="true">%1$s %2$s</string>
+    <string name="account">llogaria</string>
+    <string name="logout">Çkycu</string>
+    <string name="login">Hyr</string>
+    <string name="auth_locally">Autentifikohu lokalisht</string>
+    <string name="switch_account">Ndrysho llogari</string>
+    <string name="add_account">Shto llogari</string>
+    <string name="create_account">Krijo një llogari</string>
+    <string name="add_sync">Shto gjurmim</string>
+    <string name="added_sync_format" formatted="true">U shtua %s</string>
+    <string name="upload_sync">Rifresko</string>
+    <string name="sync_score">Vlerësuar</string>
+    <string name="sync_score_format" formatted="true">%d / 10</string>
+    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_some" formatted="true">/%d</string>
+    <string name="authenticated_user" formatted="true">%s u autentifikua</string>
+    <string name="authenticated_user_fail" formatted="true">Nuk mund të hysh në %s</string>
+    <string name="disable">Çaktivizuar</string>
+    <string name="none">Asnjë</string>
+    <string name="normal">Normal</string>
+    <string name="all">Të gjitha</string>
+</resources>
diff --git a/fastlane/metadata/android/sq/changelogs/2.txt b/fastlane/metadata/android/sq/changelogs/2.txt
new file mode 100644
index 000000000..209d5f4c7
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/2.txt
@@ -0,0 +1 @@
+- U shtua regjistri i ndryshimeve!
diff --git a/fastlane/metadata/android/sq/full_description.txt b/fastlane/metadata/android/sq/full_description.txt
new file mode 100644
index 000000000..f9d6e6f9e
--- /dev/null
+++ b/fastlane/metadata/android/sq/full_description.txt
@@ -0,0 +1,10 @@
+CloudStream-3 ju lejon të shikoni dhe shkarkoni filma, seriale televizive dhe anime.
+
+Aplikacioni vjen pa asnjë reklamë dhe analitikë
+dhe suporton faqe të shumta trailerash dhe filmash dhe më shumë, p.sh.
+
+Të ruajturat
+
+Shkarkime titrash
+
+Chromecast
diff --git a/fastlane/metadata/android/sq/short_description.txt b/fastlane/metadata/android/sq/short_description.txt
new file mode 100644
index 000000000..a2a07e19c
--- /dev/null
+++ b/fastlane/metadata/android/sq/short_description.txt
@@ -0,0 +1 @@
+Shiko dhe shkarko filma, seriale televizive dhe anime.
diff --git a/fastlane/metadata/android/sq/title.txt b/fastlane/metadata/android/sq/title.txt
new file mode 100644
index 000000000..dde89d58f
--- /dev/null
+++ b/fastlane/metadata/android/sq/title.txt
@@ -0,0 +1 @@
+CloudStream

From f51885fb6ed19c606bad21f94341bb048534406a Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Wed, 8 Apr 2026 17:00:53 -0600
Subject: [PATCH 038/177] Fix MotionEvent gestures getting stuck in player
 (#2629)

---
 .../lagradost/cloudstream3/ui/player/FullScreenPlayer.kt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index fad4a53e1..eb5ac8f36 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -1660,7 +1660,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         playerBinding?.playerIntroPlay?.isGone = true
 
         // Handle pan with two fingers
-        if (event.pointerCount == 2 && !isLocked && isFullScreenPlayer && !hasTriggeredSpeedUp && currentTouchAction == null) {
+        if ((event.pointerCount == 2 || lastPan != null) && !isLocked && isFullScreenPlayer && !hasTriggeredSpeedUp && currentTouchAction == null) {
             holdhandler.removeCallbacks(holdRunnable) // remove 2x speed
 
             // Gesture detectors for zoom & pan
@@ -1695,7 +1695,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                     lastPan = newPan
                 }
 
-                MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_UP -> {
+                MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_UP -> {
                     // Reset touch
                     lastPan = null
                     currentTouchStart = null
@@ -1777,7 +1777,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                     }
                 }
 
-                MotionEvent.ACTION_UP -> {
+                MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> {
                     holdhandler.removeCallbacks(holdRunnable)
                     if (hasTriggeredSpeedUp) {
                         player.setPlaybackSpeed(DataStoreHelper.playBackSpeed)

From 1d03b05a7cceeb9656d28f27227f957f8097251d Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Wed, 8 Apr 2026 23:04:39 +0000
Subject: [PATCH 039/177] Refactor: New SkipAPI for SkipStamp (#2601)

---
 .../ui/player/AbstractPlayerFragment.kt       |   6 +-
 .../cloudstream3/ui/player/CS3IPlayer.kt      |  15 +-
 .../cloudstream3/ui/player/GeneratorPlayer.kt |   6 +-
 .../cloudstream3/ui/player/IPlayer.kt         |   8 +-
 .../ui/player/PlayerGeneratorViewModel.kt     |   9 +-
 .../lagradost/cloudstream3/utils/AniSkip.kt   | 230 ------------------
 .../cloudstream3/utils/videoskip/AniSkip.kt   |  68 ++++++
 .../utils/videoskip/IntroDbSkip.kt            |  77 ++++++
 .../cloudstream3/utils/videoskip/SkipAPI.kt   | 104 ++++++++
 9 files changed, 271 insertions(+), 252 deletions(-)
 delete mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AniSkip.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
index ea6babb20..1e6d827e6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
@@ -54,10 +54,10 @@ import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
 import com.lagradost.cloudstream3.utils.AppContextUtils
 import com.lagradost.cloudstream3.utils.AppContextUtils.requestLocalAudioFocus
 import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.UIHelper
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
+import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
 import java.net.SocketTimeoutException
 
 enum class PlayerResize(@StringRes val nameRes: Int) {
@@ -127,11 +127,11 @@ abstract class AbstractPlayerFragment(
         throw NotImplementedError()
     }
 
-    open fun onTimestamp(timestamp: EpisodeSkip.SkipStamp?) {
+    open fun onTimestamp(timestamp: VideoSkipStamp?) {
 
     }
 
-    open fun onTimestampSkipped(timestamp: EpisodeSkip.SkipStamp) {
+    open fun onTimestampSkipped(timestamp: VideoSkipStamp) {
 
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index a134ae911..43b281a28 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -95,14 +95,13 @@ import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
 import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import com.lagradost.cloudstream3.utils.DrmExtractorLink
-import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkPlayList
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.PLAYREADY_UUID
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToLanguageName
 import com.lagradost.cloudstream3.utils.WIDEVINE_UUID
-import io.github.anilbeesetti.nextlib.media3ext.ffdecoder.NextRenderersFactory
+import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
 import kotlinx.coroutines.delay
 import okhttp3.Interceptor
 import org.chromium.net.CronetEngine
@@ -884,10 +883,10 @@ class CS3IPlayer : IPlayer {
         private var currentTextRenderer: TextRenderer? = null
     }
 
-    private fun getCurrentTimestamp(writePosition: Long? = null): EpisodeSkip.SkipStamp? {
+    private fun getCurrentTimestamp(writePosition: Long? = null): VideoSkipStamp? {
         val position = writePosition ?: this@CS3IPlayer.getPosition() ?: return null
         for (lastTimeStamp in lastTimeStamps) {
-            if (lastTimeStamp.startMs <= position && (position + (toleranceBeforeUs / 1000L) + 1) < lastTimeStamp.endMs) {
+            if (lastTimeStamp.timestamp.startMs <= position && (position + (toleranceBeforeUs / 1000L) + 1) < lastTimeStamp.timestamp.endMs) {
                 return lastTimeStamp
             }
         }
@@ -999,7 +998,7 @@ class CS3IPlayer : IPlayer {
                             if (lastTimeStamp.skipToNextEpisode) {
                                 handleEvent(CSPlayerEvent.NextEpisode, source)
                             } else {
-                                seekTo(lastTimeStamp.endMs + 1L)
+                                seekTo(lastTimeStamp.timestamp.endMs + 1L)
                             }
                             event(TimestampSkippedEvent(timestamp = lastTimeStamp, source = source))
                         }
@@ -1578,9 +1577,9 @@ class CS3IPlayer : IPlayer {
         }
     }
 
-    private var lastTimeStamps: List<EpisodeSkip.SkipStamp> = emptyList()
+    private var lastTimeStamps: List<VideoSkipStamp> = emptyList()
 
-    override fun addTimeStamps(timeStamps: List<EpisodeSkip.SkipStamp>) {
+    override fun addTimeStamps(timeStamps: List<VideoSkipStamp>) {
         lastTimeStamps = timeStamps
         timeStamps.forEach { timestamp ->
             exoPlayer?.createMessage { _, _ ->
@@ -1589,7 +1588,7 @@ class CS3IPlayer : IPlayer {
                 //    onTimestampInvoked?.invoke(payload)
             }
                 ?.setLooper(Looper.getMainLooper())
-                ?.setPosition(timestamp.startMs)
+                ?.setPosition(timestamp.timestamp.startMs)
                 //?.setPayload(timestamp)
                 ?.setDeleteAfterDelivery(false)
                 ?.send()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index ad7c8915f..16b03e4f6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -106,7 +106,6 @@ import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
-import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.Qualities
@@ -124,6 +123,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.downloader.DownloadUtils.getImageBitmapFromUrl
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.txt
+import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
 import com.lagradost.safefile.SafeFile
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
@@ -2052,11 +2052,11 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
-    override fun onTimestampSkipped(timestamp: EpisodeSkip.SkipStamp) {
+    override fun onTimestampSkipped(timestamp: VideoSkipStamp) {
         displayTimeStamp(false)
     }
 
-    override fun onTimestamp(timestamp: EpisodeSkip.SkipStamp?) {
+    override fun onTimestamp(timestamp: VideoSkipStamp?) {
         if (timestamp != null) {
             playerBinding?.skipChapterButton?.setText(timestamp.uiText)
             displayTimeStamp(true)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
index 08b8ee795..43ec756ed 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
@@ -4,8 +4,8 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.util.Rational
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
-import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
 
 enum class PlayerEventType(val value: Int) {
     Pause(0),
@@ -86,13 +86,13 @@ data class ErrorEvent(
 
 /** Event when timestamps appear, null when it should disappear */
 data class TimestampInvokedEvent(
-    val timestamp: EpisodeSkip.SkipStamp,
+    val timestamp: VideoSkipStamp,
     override val source: PlayerEventSource = PlayerEventSource.Player,
 ) : PlayerEvent()
 
 /** Event for when a chapter is skipped, aka when event is handled (or for future use when skip automatically ads/sponsor) */
 data class TimestampSkippedEvent(
-    val timestamp: EpisodeSkip.SkipStamp,
+    val timestamp: VideoSkipStamp,
     override val source: PlayerEventSource = PlayerEventSource.Player,
 ) : PlayerEvent()
 
@@ -254,7 +254,7 @@ interface IPlayer {
     fun updateSubtitleStyle(style: SaveCaptionStyle)
     fun saveData()
 
-    fun addTimeStamps(timeStamps: List<EpisodeSkip.SkipStamp>)
+    fun addTimeStamps(timeStamps: List<VideoSkipStamp>)
 
     fun loadPlayer(
         context: Context,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
index d8c5e777c..96468490a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
@@ -13,9 +13,10 @@ import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.mvvm.safeApiCall
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import com.lagradost.cloudstream3.utils.EpisodeSkip
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.videoskip.SkipAPI
+import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 
@@ -35,8 +36,8 @@ class PlayerGeneratorViewModel : ViewModel() {
     private val _loadingLinks = MutableLiveData<Resource<Boolean?>>()
     val loadingLinks: LiveData<Resource<Boolean?>> = _loadingLinks
 
-    private val _currentStamps = MutableLiveData<List<EpisodeSkip.SkipStamp>>(emptyList())
-    val currentStamps: LiveData<List<EpisodeSkip.SkipStamp>> = _currentStamps
+    private val _currentStamps = MutableLiveData<List<VideoSkipStamp>>(emptyList())
+    val currentStamps: LiveData<List<VideoSkipStamp>> = _currentStamps
 
     private val _currentSubtitleYear = MutableLiveData<Int?>(null)
     val currentSubtitleYear: LiveData<Int?> = _currentSubtitleYear
@@ -181,7 +182,7 @@ class PlayerGeneratorViewModel : ViewModel() {
             if (page != null && meta is ResultEpisode) {
                 _currentStamps.postValue(listOf())
                 _currentStamps.postValue(
-                    EpisodeSkip.getStamps(
+                    SkipAPI.videoStamps(
                         page,
                         meta,
                         duration,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt
deleted file mode 100644
index bbdadbf3f..000000000
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt
+++ /dev/null
@@ -1,230 +0,0 @@
-package com.lagradost.cloudstream3.utils
-
-import android.util.Log
-import androidx.annotation.StringRes
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.fasterxml.jackson.databind.annotation.JsonSerialize
-import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.LoadResponse.Companion.getImdbId
-import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.ui.result.ResultEpisode
-import java.lang.Long.min
-
-object EpisodeSkip {
-    private const val TAG = "EpisodeSkip"
-
-    enum class SkipType(@StringRes name: Int) {
-        Opening(R.string.skip_type_op),
-        Ending(R.string.skip_type_ed),
-        Recap(R.string.skip_type_recap),
-        MixedOpening(R.string.skip_type_mixed_op),
-        MixedEnding(R.string.skip_type_mixed_ed),
-        Credits(R.string.skip_type_creddits),
-        Intro(R.string.skip_type_creddits),
-    }
-
-    data class SkipStamp(
-        val type: SkipType,
-        val skipToNextEpisode: Boolean,
-        val startMs: Long,
-        val endMs: Long,
-    ) {
-        val uiText = if (skipToNextEpisode) txt(R.string.next_episode) else txt(
-            R.string.skip_type_format,
-            txt(type.name)
-        )
-    }
-
-    private val cachedStamps = HashMap<Int, List<SkipStamp>>()
-
-    private fun shouldSkipToNextEpisode(endMs: Long, episodeDurationMs: Long): Boolean {
-        return episodeDurationMs - endMs < 20_000L // some might have outro that we don't care about tbh
-    }
-
-    suspend fun getStamps(
-        data: LoadResponse,
-        episode: ResultEpisode,
-        episodeDurationMs: Long,
-        hasNextEpisode: Boolean,
-    ): List<SkipStamp> {
-        cachedStamps[episode.id]?.let { list ->
-            return list
-        }
-
-        val out = mutableListOf<SkipStamp>()
-        Log.i(TAG, "Requesting SkipStamp from ${data.syncData}")
-
-        if (data is AnimeLoadResponse && (data.type == TvType.Anime || data.type == TvType.OVA)) {
-            data.getMalId()?.toIntOrNull()?.let { malId ->
-                val (resultLength, stamps) = AniSkip.getResult(
-                    malId,
-                    episode.episode,
-                    episodeDurationMs
-                ) ?: return@let null
-                // because it also returns an expected episode length we use that just in case it is mismatched with like 2s next episode will still work
-                val dur = min(episodeDurationMs, resultLength)
-                stamps.mapNotNull { stamp ->
-                    val skipType = when (stamp.skipType) {
-                        "op" -> SkipType.Opening
-                        "ed" -> SkipType.Ending
-                        "recap" -> SkipType.Recap
-                        "mixed-ed" -> SkipType.MixedEnding
-                        "mixed-op" -> SkipType.MixedOpening
-                        else -> null
-                    } ?: return@mapNotNull null
-                    val end = (stamp.interval.endTime * 1000.0).toLong()
-                    val start = (stamp.interval.startTime * 1000.0).toLong()
-                    SkipStamp(
-                        type = skipType,
-                        skipToNextEpisode = hasNextEpisode && shouldSkipToNextEpisode(
-                            end,
-                            dur
-                        ),
-                        startMs = start,
-                        endMs = end
-                    )
-                }.let { list ->
-                    out.addAll(list)
-                }
-            }
-        } else if (data.type == TvType.TvSeries || data.type == TvType.AsianDrama) {
-            val season = episode.season
-            val imdbId = data.getImdbId()
-
-            if (season != null && imdbId != null) {
-                val result = IntroDbSkip.getResult(
-                    imdbId,
-                    season,
-                    episode.episode
-                )
-
-                result?.let { res ->
-                    listOfNotNull(
-                        res.intro?.let {
-                            val start = it.startMs ?: return@let null
-                            val end = it.endMs ?: return@let null
-                            SkipStamp(
-                                type = SkipType.Opening,
-                                skipToNextEpisode = hasNextEpisode &&
-                                        shouldSkipToNextEpisode(end, episodeDurationMs),
-                                startMs = start,
-                                endMs = end
-                            )
-                        },
-                        res.recap?.let {
-                            val start = it.startMs ?: return@let null
-                            val end = it.endMs ?: return@let null
-                            SkipStamp(
-                                type = SkipType.Recap,
-                                skipToNextEpisode = hasNextEpisode &&
-                                        shouldSkipToNextEpisode(end, episodeDurationMs),
-                                startMs = start,
-                                endMs = end
-                            )
-                        },
-                        res.outro?.let {
-                            val start = it.startMs ?: return@let null
-                            val end = it.endMs ?: return@let null
-                            SkipStamp(
-                                type = SkipType.Credits,
-                                skipToNextEpisode = hasNextEpisode &&
-                                        shouldSkipToNextEpisode(end, episodeDurationMs),
-                                startMs = start,
-                                endMs = end
-                            )
-                        }
-                    ).let { out.addAll(it) }
-                }
-            }
-        }
-
-        if (out.isNotEmpty())
-            cachedStamps[episode.id] = out
-        return out
-    }
-}
-
-// taken from https://github.com/saikou-app/saikou/blob/3803f8a7a59b826ca193664d46af3a22bbc989f7/app/src/main/java/ani/saikou/others/AniSkip.kt
-// the following is GPLv3 code https://github.com/saikou-app/saikou/blob/main/LICENSE.md
-object AniSkip {
-    private const val TAG = "AniSkip"
-    suspend fun getResult(
-        malId: Int,
-        episodeNumber: Int,
-        episodeLength: Long
-    ): Pair<Long, List<Stamp>>? {
-        return try {
-            val url =
-                "https://api.aniskip.com/v2/skip-times/$malId/$episodeNumber?types[]=ed&types[]=mixed-ed&types[]=mixed-op&types[]=op&types[]=recap&episodeLength=${episodeLength / 1000L}"
-            Log.i(TAG, "Requesting $url")
-
-            val a = app.get(url)
-            val res = a.parsed<AniSkipResponse>()
-            Log.i(TAG, "Found ${res.found} with ${res.results?.size} results")
-            if (res.found && !res.results.isNullOrEmpty()) (res.results[0].episodeLength * 1000).toLong() to res.results else null
-        } catch (t: Throwable) {
-            Log.i(TAG, "error = ${t.message}")
-            logError(t)
-            null
-        }
-    }
-
-    data class AniSkipResponse(
-        @JsonSerialize val found: Boolean,
-        @JsonSerialize val results: List<Stamp>?,
-        @JsonSerialize val message: String?,
-        @JsonSerialize val statusCode: Int
-    )
-
-    data class Stamp(
-        @JsonSerialize val interval: AniSkipInterval,
-        @JsonSerialize val skipType: String,
-        @JsonSerialize val skipId: String,
-        @JsonSerialize val episodeLength: Double
-    )
-
-    data class AniSkipInterval(
-        @JsonSerialize val startTime: Double,
-        @JsonSerialize val endTime: Double
-    )
-}
-
-object IntroDbSkip {
-    private const val TAG = "IntroDb"
-
-    suspend fun getResult(
-        imdbId: String,
-        season: Int,
-        episode: Int,
-    ): IntroDbResponse? {
-        return try {
-            val url =
-                "https://api.introdb.app/segments?imdb_id=$imdbId&season=$season&episode=$episode"
-            app.get(url).parsed<IntroDbResponse>()
-        } catch (t: Throwable) {
-            Log.i(TAG, "error = ${t.message}")
-            logError(t)
-            null
-        }
-    }
-
-    data class IntroDbResponse(
-        @JsonProperty("imdb_id") val imdbId: String?,
-        val season: Int?,
-        val episode: Int?,
-        val intro: Segment?,
-        val recap: Segment?,
-        val outro: Segment?,
-    )
-
-    data class Segment(
-        @JsonProperty("start_sec") val startSec: Double?,
-        @JsonProperty("end_sec") val endSec: Double?,
-        @JsonProperty("start_ms") val startMs: Long?,
-        @JsonProperty("end_ms") val endMs: Long?,
-        val confidence: Double?,
-        @JsonProperty("submission_count") val submissionCount: Int?,
-        @JsonProperty("updated_at") val updatedAt: String?,
-    )
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AniSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AniSkip.kt
new file mode 100644
index 000000000..0db90afea
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AniSkip.kt
@@ -0,0 +1,68 @@
+package com.lagradost.cloudstream3.utils.videoskip
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize
+import com.lagradost.cloudstream3.AnimeLoadResponse
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+
+// taken from https://github.com/saikou-app/saikou/blob/3803f8a7a59b826ca193664d46af3a22bbc989f7/app/src/main/java/ani/saikou/others/AniSkip.kt
+// the following is GPLv3 code https://github.com/saikou-app/saikou/blob/main/LICENSE.md
+class AniSkip : SkipAPI() {
+    override val name: String = "AniSkip"
+    override val supportedTypes: Set<TvType> = setOf(TvType.Anime, TvType.OVA)
+
+    override suspend fun stamps(
+        data: LoadResponse,
+        episode: ResultEpisode,
+        episodeDurationMs: Long
+    ): List<SkipStamp>? {
+        if (data !is AnimeLoadResponse) return null // Filter actual anime
+
+        val malId = data.getMalId()?.toIntOrNull() ?: return null
+        val url =
+            "https://api.aniskip.com/v2/skip-times/$malId/${episode.episode}?types[]=ed&types[]=mixed-ed&types[]=mixed-op&types[]=op&types[]=recap&episodeLength=${episodeDurationMs / 1000L}"
+
+        val response = app.get(url).parsed<AniSkipResponse>()
+
+        // because it also returns an expected episode length we use that just in case it is mismatched with like 2s next episode will still work
+        return response.results?.mapNotNull { stamp ->
+            val skipType = when (stamp.skipType) {
+                "op" -> SkipType.Opening
+                "ed" -> SkipType.Ending
+                "recap" -> SkipType.Recap
+                "mixed-ed" -> SkipType.MixedEnding
+                "mixed-op" -> SkipType.MixedOpening
+                else -> null
+            } ?: return@mapNotNull null
+            val end = (stamp.interval.endTime * 1000.0).toLong()
+            val start = (stamp.interval.startTime * 1000.0).toLong()
+            SkipStamp(
+                type = skipType,
+                startMs = start,
+                endMs = end,
+            )
+        }
+    }
+
+    data class AniSkipResponse(
+        @JsonSerialize val found: Boolean,
+        @JsonSerialize val results: List<Stamp>?,
+        @JsonSerialize val message: String?,
+        @JsonSerialize val statusCode: Int
+    )
+
+    data class Stamp(
+        @JsonSerialize val interval: AniSkipInterval,
+        @JsonSerialize val skipType: String,
+        @JsonSerialize val skipId: String,
+        @JsonSerialize val episodeLength: Double
+    )
+
+    data class AniSkipInterval(
+        @JsonSerialize val startTime: Double,
+        @JsonSerialize val endTime: Double
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt
new file mode 100644
index 000000000..ce284f3fe
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt
@@ -0,0 +1,77 @@
+package com.lagradost.cloudstream3.utils.videoskip
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.LoadResponse.Companion.getImdbId
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+
+class IntroDbSkip : SkipAPI() {
+    override val name = "IntroDb"
+
+    override val supportedTypes = setOf(TvType.TvSeries, TvType.AsianDrama)
+
+    override suspend fun stamps(
+        data: LoadResponse,
+        episode: ResultEpisode,
+        episodeDurationMs: Long
+    ): List<SkipStamp>? {
+        val season = episode.season ?: return null
+        val imdbId = data.getImdbId() ?: return null
+
+        val url =
+            "https://api.introdb.app/segments?imdb_id=$imdbId&season=$season&episode=${episode.episode}"
+        val response = app.get(url).parsed<IntroDbResponse>()
+
+        return listOfNotNull(
+            response.intro?.let {
+                val start = it.startMs ?: return@let null
+                val end = it.endMs ?: return@let null
+                SkipStamp(
+                    type = SkipType.Opening,
+                    startMs = start,
+                    endMs = end
+                )
+            },
+            response.recap?.let {
+                val start = it.startMs ?: return@let null
+                val end = it.endMs ?: return@let null
+                SkipStamp(
+                    type = SkipType.Recap,
+                    startMs = start,
+                    endMs = end
+                )
+            },
+            response.outro?.let {
+                val start = it.startMs ?: return@let null
+                val end = it.endMs ?: return@let null
+                SkipStamp(
+                    type = SkipType.Credits,
+                    startMs = start,
+                    endMs = end
+                )
+            }
+        )
+    }
+
+
+    data class IntroDbResponse(
+        @JsonProperty("imdb_id") val imdbId: String?,
+        val season: Int?,
+        val episode: Int?,
+        val intro: Segment?,
+        val recap: Segment?,
+        val outro: Segment?,
+    )
+
+    data class Segment(
+        @JsonProperty("start_sec") val startSec: Double?,
+        @JsonProperty("end_sec") val endSec: Double?,
+        @JsonProperty("start_ms") val startMs: Long?,
+        @JsonProperty("end_ms") val endMs: Long?,
+        val confidence: Double?,
+        @JsonProperty("submission_count") val submissionCount: Int?,
+        @JsonProperty("updated_at") val updatedAt: String?,
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt
new file mode 100644
index 000000000..df16d77ca
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt
@@ -0,0 +1,104 @@
+package com.lagradost.cloudstream3.utils.videoskip
+
+import androidx.annotation.StringRes
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.mvvm.safeAsync
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.txt
+import java.util.concurrent.ConcurrentHashMap
+
+
+enum class SkipType(@StringRes val res: Int) {
+    Opening(R.string.skip_type_op),
+    Ending(R.string.skip_type_ed),
+    Recap(R.string.skip_type_recap),
+    MixedOpening(R.string.skip_type_mixed_op),
+    MixedEnding(R.string.skip_type_mixed_ed),
+    Credits(R.string.skip_type_creddits),
+    Intro(R.string.skip_type_creddits),
+}
+
+data class SkipStamp(
+    val type: SkipType,
+    /** Start position in milliseconds of the skip, where it should start showing up */
+    val startMs: Long,
+    /** End position in milliseconds of the skip, where it will skip to */
+    val endMs: Long,
+    /** Custom visual label instead of using the type. Only use this for content not covered by SkipType */
+    val label: String? = null,
+)
+
+data class VideoSkipStamp(
+    val timestamp: SkipStamp,
+    val skipToNextEpisode: Boolean,
+    val source: String,
+) {
+    val uiText =
+        if (skipToNextEpisode) txt(R.string.next_episode) else
+            txt(
+                R.string.skip_type_format,
+                timestamp.label?.let { txt(it) } ?: txt(timestamp.type.res)
+            )
+}
+
+abstract class SkipAPI {
+    open val name: String = "NONE"
+
+    /** On what types SkipAPI should trigger on */
+    abstract val supportedTypes: Set<TvType>
+
+    /** Get all video skip stamps of the associated episode */
+    @Throws
+    open suspend fun stamps(
+        data: LoadResponse,
+        episode: ResultEpisode,
+        episodeDurationMs: Long,
+    ): List<SkipStamp>? {
+        throw NotImplementedError()
+    }
+
+    companion object {
+        private val skipApis: List<SkipAPI> = listOf(AniSkip(), IntroDbSkip())
+        private val cachedStamps = ConcurrentHashMap<Int, List<VideoSkipStamp>>()
+
+        /** Get all video timestamps from an episode */
+        suspend fun videoStamps(
+            data: LoadResponse,
+            episode: ResultEpisode,
+            episodeDurationMs: Long,
+            hasNextEpisode: Boolean,
+        ): List<VideoSkipStamp> {
+            cachedStamps[episode.id]?.let { list ->
+                return list
+            }
+
+            for (api in skipApis) {
+                /** Unsupported type, so we do not waste a get call */
+                if (!api.supportedTypes.contains(data.type)) {
+                    continue
+                }
+
+                /** Find first non-empty stamps */
+                val stamps = safeAsync { api.stamps(data, episode, episodeDurationMs) }
+                if (stamps.isNullOrEmpty()) {
+                    continue
+                }
+
+                return stamps.map { stamp ->
+                    VideoSkipStamp(
+                        timestamp = stamp,
+                        skipToNextEpisode = hasNextEpisode && episodeDurationMs - stamp.endMs < 20_000L,
+                        source = api.name
+                    )
+                }.also { stamps ->
+                    /** Put in cache, this is such small data, it should be fine to never clear it */
+                    cachedStamps[episode.id] = stamps
+                }
+            }
+            return emptyList()
+        }
+    }
+}
+

From b5109420274c6cdce5c643cd6d67fb2e33f07553 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Wed, 8 Apr 2026 17:11:40 -0600
Subject: [PATCH 040/177] Bump newpipeextractor to v0.26.0 (#2624)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 482f776b6..3b060a53c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -29,7 +29,7 @@ lifecycleKtx = "2.10.0"
 material = "1.14.0-alpha09"
 media3 = "1.9.2"
 navigationKtx = "2.9.7"
-newpipeextractor = "v0.25.2"
+newpipeextractor = "v0.26.0"
 nextlibMedia3 = "1.9.1-0.11.0"
 nicehttp = "0.4.17"
 overlappingpanels = "0.1.5"

From f28924f704c99fe210e6110b6d7d826ded61d54f Mon Sep 17 00:00:00 2001
From: CranberrySoup <142951702+CranberrySoup@users.noreply.github.com>
Date: Wed, 8 Apr 2026 23:17:21 +0000
Subject: [PATCH 041/177] Fix intent launches (#2554)

---
 app/src/main/AndroidManifest.xml              | 38 ++++++++++---------
 .../ui/account/AccountSelectActivity.kt       | 18 ++++++++-
 .../cloudstream3/ui/search/SearchFragment.kt  | 13 +++++--
 .../lagradost/cloudstream3/utils/UIHelper.kt  |  6 ++-
 4 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 56622aab9..b2c7091b0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -108,14 +108,31 @@
         android:launchMode="singleTask"
         is a bit experimental, it makes loading repositories from browser still stay on the same page
         no idea about side effects
+
+        Not exported to prevent bypassing the AccountSelectActivity
         -->
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden|navigation|uiMode"
-            android:exported="true"
+            android:exported="false"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
-            android:supportsPictureInPicture="true">
+            android:supportsPictureInPicture="true" />
+
+        <activity
+            android:name=".ui.account.AccountSelectActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden"
+            android:exported="true">
+            <intent-filter android:exported="true">
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
 
             <!-- cloudstreamplayer://encodedUrl?name=Dune -->
             <intent-filter>
@@ -173,7 +190,7 @@
                 <data android:scheme="cloudstreamcontinuewatching" />
             </intent-filter>
 
-            <intent-filter>
+            <intent-filter android:autoVerify="false">
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -186,21 +203,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".ui.account.AccountSelectActivity"
-            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden"
-            android:exported="true">
-            <intent-filter android:exported="true">
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
         <receiver
             android:name=".receivers.VideoDownloadRestartReceiver"
             android:enabled="false"
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
index 42f68067b..29c35dea6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
@@ -38,11 +38,24 @@ import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
 
 class AccountSelectActivity : FragmentActivity(), BiometricCallback {
 
+    companion object {
+        var hasLoggedIn: Boolean = false
+    }
+
     val accountViewModel: AccountViewModel by viewModels()
 
     @SuppressLint("NotifyDataSetChanged")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        // Sometimes we start this activity when we have already logged in
+        // For example when using cloudstreamsearch://
+        // In those cases we want to just go to the main activity instantly
+        if (hasLoggedIn) {
+            navigateToMainActivity()
+            return
+        }
+
         loadThemes(this)
 
         enableEdgeToEdgeCompat()
@@ -188,8 +201,11 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
         askBiometricAuth()
     }
 
+    @SuppressLint("UnsafeIntentLaunch")
     private fun navigateToMainActivity() {
-        openActivity(MainActivity::class.java)
+        hasLoggedIn = true
+        // We want to propagate any intent we get here to MainActivity since this is just an intermediary
+        openActivity(MainActivity::class.java, baseIntent = intent)
         finish() // Finish the account selection activity
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index b79ba1707..5f5b064b5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -23,6 +23,7 @@ import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.view.doOnLayout
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
@@ -414,7 +415,7 @@ class SearchFragment : BaseFragment<FragmentSearchBinding>(
             binding.searchFilter.isFocusable = true
             binding.searchFilter.isFocusableInTouchMode = true
         }
-        
+
         // Hide suggestions when search view loses focus (phone only)
         if (isLayout(PHONE)) {
             binding.mainSearch.setOnQueryTextFocusChangeListener { _, hasFocus ->
@@ -572,7 +573,7 @@ class SearchFragment : BaseFragment<FragmentSearchBinding>(
                     removeKey("$currentAccount/$SEARCH_HISTORY_KEY", searchItem.key)
                     searchViewModel.updateHistory()
                 }
-                
+
                 SEARCH_HISTORY_CLEAR -> {
                     // Show confirmation dialog (from footer button)
                     activity?.let { ctx ->
@@ -653,7 +654,11 @@ class SearchFragment : BaseFragment<FragmentSearchBinding>(
 
             sq?.let { query ->
                 if (query.isBlank()) return@let
-                mainSearch.setQuery(query, true)
+
+                // Queries are dropped if you are submitted before layout finishes
+                mainSearch.doOnLayout {
+                    mainSearch.setQuery(query, true)
+                }
                 // Clear the query as to not make it request the same query every time the page is opened
                 arguments?.remove(SEARCH_QUERY)
                 savedInstanceState?.remove(SEARCH_QUERY)
@@ -674,7 +679,7 @@ class SearchFragment : BaseFragment<FragmentSearchBinding>(
             val hasSuggestions = suggestions.isNotEmpty()
             binding.searchSuggestionsRecycler.isVisible = hasSuggestions
             (binding.searchSuggestionsRecycler.adapter as? SearchSuggestionAdapter?)?.submitList(suggestions)
-            
+
             // On non-phone layouts, redirect focus and handle back button
             if (!isLayout(PHONE)) {
                 if (hasSuggestions) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
index ebd7b2988..c12674816 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
@@ -259,10 +259,12 @@ object UIHelper {
     }
 
     // Open activities from an activity outside the nav graph
-    fun Context.openActivity(activity: Class<*>, args: Bundle? = null) {
+    fun Context.openActivity(activity: Class<*>, args: Bundle? = null, baseIntent: Intent? = null) {
         val tag = "NavComponent"
         try {
-            val intent = Intent(this, activity)
+            val intent = baseIntent ?: Intent()
+            intent.setClass(this, activity)
+
             if (args != null) {
                 intent.putExtras(args)
             }

From f6920fb05d2de026a43c9f28463b46849fe294c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Onur=20Civano=C4=9Flu?= <onur.civanoglu@outlook.com>
Date: Thu, 9 Apr 2026 02:22:57 +0300
Subject: [PATCH 042/177] feat: Force landscape orientation and pillarbox
 portrait videos on TV and emulator devices. (#2560)

---
 .../lagradost/cloudstream3/ui/player/FullScreenPlayer.kt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index eb5ac8f36..4bec57f9c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -2707,6 +2707,11 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     }
 
     override fun playerDimensionsLoaded(width: Int, height: Int) {
+        // On TV, don't rotate for portrait videos; display with pillarbox (black bars on sides)
+        if (isLayout(TV or EMULATOR)) {
+            isVerticalOrientation = false
+            return
+        }
         isVerticalOrientation = height > width
         updateOrientation()
     }
@@ -2730,6 +2735,10 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     }
 
     private fun dynamicOrientation(): Int {
+        // TV should always remain in landscape mode
+        if (isLayout(TV or EMULATOR)) {
+            return ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+        }
         return if (autoPlayerRotateEnabled) {
             if (isVerticalOrientation) {
                 ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT

From e22a596d0c8f203c456c3a2ac1a4806c933239f4 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Thu, 9 Apr 2026 09:09:56 +0200
Subject: [PATCH 043/177] Translated using Weblate (Arabic)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Albanian)

Currently translated at 68.0% (494 of 726 strings)

Co-authored-by: 007 <juri.malaj@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: hollow04 <ichigo0404@hotmail.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sq/
Translation: Cloudstream/App
---
 app/src/main/res/values-b+ar/strings.xml |  1 +
 app/src/main/res/values-sq/strings.xml   | 80 ++++++++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/app/src/main/res/values-b+ar/strings.xml b/app/src/main/res/values-b+ar/strings.xml
index 91f8f0e64..17e809d8d 100644
--- a/app/src/main/res/values-b+ar/strings.xml
+++ b/app/src/main/res/values-b+ar/strings.xml
@@ -780,4 +780,5 @@
         <item quantity="many">%d تنزيل قيد الانتظار</item>
         <item quantity="other">%d تنزيل قيد الانتظار</item>
     </plurals>
+    <string name="show_player_metadata_overlay">عرض واجهة منبثقة للبيانات الوصفية للمشغِّل</string>
 </resources>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 1aa5f0a92..977fd597a 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -414,4 +414,84 @@
     <string name="none">Asnjë</string>
     <string name="normal">Normal</string>
     <string name="all">Të gjitha</string>
+    <string name="max">Maksimumi</string>
+    <string name="min">Minimumi</string>
+    <string name="subtitles_outline">Kontur</string>
+    <string name="subtitles_depressed">Të zhytura</string>
+    <string name="subtitles_shadow">Hije</string>
+    <string name="subtitles_raised">Të ngritura</string>
+    <string name="subtitle_offset">Sinkronizo titrat</string>
+    <string name="subtitle_offset_hint">1000 ms</string>
+    <string name="subtitle_offset_title">Vonesa e titrave</string>
+    <string name="subtitle_offset_extra_hint_later_format">Përdore nëse titrat shfaqen %d ms më herët</string>
+    <string name="subtitle_offset_extra_hint_before_format">Përdore nëse titrat shfaqen %d ms më vonë</string>
+    <string name="subtitle_offset_extra_hint_none_format">Pa vonesë titrash</string>
+    <string name="subtitles_example_text">Dhelpra e shpejtë ngjyra kafe kërcen mbi qenin dembel</string>
+    <string name="recommended">E rekomanduar</string>
+    <string name="player_loaded_subtitles" formatted="true">U ngarkua %s</string>
+    <string name="player_load_subtitles">Ngarko nga skedari</string>
+    <string name="player_load_subtitles_online">Ngarko nga interneti</string>
+    <string name="player_load_one_subtitle_online">Ngarko të parën e disponueshme</string>
+    <string name="downloaded_file">Skedar i shkarkuar</string>
+    <string name="actor_main">Kryesor</string>
+    <string name="actor_supporting">Mbështetës</string>
+    <string name="actor_background">Figurant</string>
+    <string name="home_source">Burimi</string>
+    <string name="home_random">Rastësor</string>
+    <string name="coming_soon">Së shpejti…</string>
+    <string name="quality_cam">Kamera</string>
+    <string name="quality_cam_rip">Kamera</string>
+    <string name="quality_cam_hd">Kamera</string>
+    <string name="quality_hq">HQ</string>
+    <string name="quality_hd">HD</string>
+    <string name="quality_ts">TS</string>
+    <string name="quality_tc">TC</string>
+    <string name="quality_blueray">Blu-ray</string>
+    <string name="quality_workprint">WP</string>
+    <string name="quality_dvd">DVD</string>
+    <string name="quality_4k">4K</string>
+    <string name="quality_sd">SD</string>
+    <string name="quality_uhd">UHD</string>
+    <string name="quality_hdr">HDR</string>
+    <string name="quality_sdr">SDR</string>
+    <string name="quality_webrip">Web</string>
+    <string name="poster_image">Imazhi i posterit</string>
+    <string name="qr_image">Imazhi i kodit QR</string>
+    <string name="category_player">Luajtësi</string>
+    <string name="resolution_and_title">Rezolucioni dhe titulli</string>
+    <string name="title">Titulli</string>
+    <string name="resolution">Rezolucioni</string>
+    <string name="video_info">Informacion i medias</string>
+    <string name="error_invalid_id">ID e pavlefshme</string>
+    <string name="error_invalid_data">Të dhëna të pavlefshme</string>
+    <string name="error_invalid_url">URL e pavlefshme</string>
+    <string name="error">Gabim</string>
+    <string name="subtitles_remove_captions">Hiq titrat e mbyllura</string>
+    <string name="subtitles_remove_bloat">Hiq të tepërtat nga titrat</string>
+    <string name="subtitles_filter_lang">Filtro sipas gjuhës së preferuar të medias</string>
+    <string name="extras">Ekstra</string>
+    <string name="trailer">Traileri</string>
+    <string name="network_adress_example">https://shembull.com/shembull.mp4</string>
+    <string name="referer">Referues (opsional)</string>
+    <string name="next">Tjetër</string>
+    <string name="provider_languages_tip">Shiko videot në këto gjuhë</string>
+    <string name="previous">E mëparshme</string>
+    <string name="skip_setup">Kalo konfigurimin</string>
+    <string name="app_layout_subtext">Ndrysho pamjen e aplikacionit për tu përshtatur me pajisjen tuaj</string>
+    <string name="preferred_media_subtext">Çfarë dëshironi të shihni</string>
+    <string name="setup_done">U krye</string>
+    <string name="extensions">Shtesat</string>
+    <string name="add_repository">Shto repository</string>
+    <string name="repository_name_hint">Emri i repository-t (Opsional)</string>
+    <string name="repository_url_hint">URL-ja ose kodi i shkurtër i repository-t</string>
+    <string name="plugin_loaded">Shtesa u ngarkua</string>
+    <string name="plugin_downloaded">Shtesa u shkarkua</string>
+    <string name="plugin_deleted">Shtesa u fshi</string>
+    <string name="plugin_load_fail" formatted="true">Nuk mund të ngarkohej %s</string>
+    <string name="is_adult">18+</string>
+    <string name="batch_download_start_format" formatted="true">Filloi shkarkimi i %1$d %2$s…</string>
+    <string name="batch_download_finish_format" formatted="true">U shkarkuan %1$d %2$s</string>
+    <string name="batch_download_nothing_to_download_format" formatted="true">Të gjitha %s janë shkarkuar tashmë</string>
+    <string name="no_plugins_found_error">Asnjë shtesë nuk u gjet në repository</string>
+    <string name="no_repository_found_error">Repository nuk u gjet, verifiko URL-në ose provoje me VPN</string>
 </resources>

From 04b22ba4dfe5cadc02534a3768868dd2fdaf2fd6 Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Thu, 9 Apr 2026 10:11:15 +0000
Subject: [PATCH 044/177] Small backup fix

---
 .../java/com/lagradost/cloudstream3/utils/BackupUtils.kt    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
index 29410ab4d..88cb7481c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
@@ -62,6 +62,7 @@ object BackupUtils {
         AccountManager.ACCOUNT_TOKEN,
         AccountManager.ACCOUNT_IDS,
 
+        // TODO proper getter for string res keys to ensure that they are updated
         "biometric_key", // can lock down users if backup is shared on a incompatible device
         "nginx_user", // Nginx user key
 
@@ -103,7 +104,10 @@ object BackupUtils {
         // Prevent backups from automatically starting downloads
         KEY_RESUME_IN_QUEUE,
         KEY_RESUME_PACKAGES,
-        QUEUE_KEY
+        QUEUE_KEY,
+
+        // Prevent automatic plugin download after restoring backup
+        "auto_download_plugins_key2"
     )
 
     /** false if key should not be contained in backup */

From 8bdc1a83d706713317a17f0e5d01ca3f3186a8eb Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 9 Apr 2026 04:12:53 -0600
Subject: [PATCH 045/177] Use InternalAPI rather than permanent deprecations in
 PluginManager (#2615)

---
 .../lagradost/cloudstream3/MainActivity.kt    |  2 -
 .../cloudstream3/plugins/PluginManager.kt     | 49 +++++--------------
 .../services/SubscriptionWorkManager.kt       |  2 +-
 .../ui/settings/SettingsUpdates.kt            |  1 -
 4 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index a7c0a8a27..709e92a41 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -274,7 +274,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
          * @return true if the str has launched an app task (be it successful or not)
          * @param isWebview does not handle providers and opening download page if true. Can still add repos and login.
          * */
-        @Suppress("DEPRECATION_ERROR")
         fun handleAppIntentUrl(
             activity: FragmentActivity?,
             str: String?,
@@ -1169,7 +1168,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         }
     }
 
-    @Suppress("DEPRECATION_ERROR")
     override fun onCreate(savedInstanceState: Bundle?) {
         app.initClient(this)
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
index ba3357102..feb0ba6d4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -26,6 +26,7 @@ import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.InternalAPI
 import com.lagradost.cloudstream3.MainAPI
 import com.lagradost.cloudstream3.MainAPI.Companion.settingsForProvider
 import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent
@@ -259,12 +260,8 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName", "DEPRECATION_ERROR")
-    @Deprecated(
-        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
-        replaceWith = ReplaceWith("loadPlugin"),
-        level = DeprecationLevel.ERROR
-    )
+    @Suppress("FunctionName")
+    @InternalAPI
     @Throws
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_updateAllOnlinePluginsAndLoadThem(activity: Activity) {
         assertNonRecursiveCallstack()
@@ -340,12 +337,8 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName", "DEPRECATION_ERROR")
-    @Deprecated(
-        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
-        replaceWith = ReplaceWith("loadPlugin"),
-        level = DeprecationLevel.ERROR
-    )
+    @Suppress("FunctionName")
+    @InternalAPI
     @Throws
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_downloadNotExistingPluginsAndLoad(
         activity: Activity,
@@ -454,12 +447,8 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName", "DEPRECATION_ERROR")
-    @Deprecated(
-        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
-        replaceWith = ReplaceWith("loadPlugin"),
-        level = DeprecationLevel.ERROR
-    )
+    @Suppress("FunctionName")
+    @InternalAPI
     @Throws
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_loadAllOnlinePlugins(context: Context) {
         assertNonRecursiveCallstack()
@@ -480,13 +469,9 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName", "DEPRECATION_ERROR")
+    @Suppress("FunctionName")
+    @InternalAPI
     @Throws
-    @Deprecated(
-        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
-        replaceWith = ReplaceWith("loadPlugin"),
-        level = DeprecationLevel.ERROR
-    )
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_hotReloadAllLocalPlugins(activity: FragmentActivity?) {
         assertNonRecursiveCallstack()
 
@@ -505,12 +490,8 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName", "DEPRECATION_ERROR")
-    @Deprecated(
-        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
-        replaceWith = ReplaceWith("loadPlugin"),
-        level = DeprecationLevel.ERROR
-    )
+    @Suppress("FunctionName")
+    @InternalAPI
     @Throws
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_loadAllLocalPlugins(context: Context, forceReload: Boolean) {
         assertNonRecursiveCallstack()
@@ -814,13 +795,9 @@ object PluginManager {
      * DO NOT USE THIS IN A PLUGIN! It may case an infinite recursive loop lagging or crashing everyone's devices.
      * If you use it from a plugin, do not expect a stable jvmName, SO DO NOT USE IT!
      */
-    @Suppress("FunctionName", "DEPRECATION_ERROR")
+    @Suppress("FunctionName")
+    @InternalAPI
     @Throws
-    @Deprecated(
-        "Calling this function from a plugin will lead to crashes, use loadPlugin and unloadPlugin",
-        replaceWith = ReplaceWith("loadPlugin"),
-        level = DeprecationLevel.ERROR
-    )
     suspend fun ___DO_NOT_CALL_FROM_A_PLUGIN_manuallyReloadAndUpdatePlugins(activity: Activity) {
         assertNonRecursiveCallstack()
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt b/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt
index 242f08129..7134650ed 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt
@@ -97,7 +97,7 @@ class SubscriptionWorkManager(val context: Context, workerParams: WorkerParamete
                 .build()
         )
     }
-    @Suppress("DEPRECATION_ERROR")
+
     override suspend fun doWork(): Result {
         try {
 //        println("Update subscriptions!")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
index 2b74eab4c..118d89ac4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
@@ -67,7 +67,6 @@ class SettingsUpdates : BasePreferenceFragmentCompat() {
         }
     }
 
-    @Suppress("DEPRECATION_ERROR")
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         hideKeyboard()
         setPreferencesFromResource(R.xml.settings_updates, rootKey)

From ca96aa68916891caf4ba0324bebd52a48079f47d Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 9 Apr 2026 04:16:24 -0600
Subject: [PATCH 046/177] Bump actions (#2588)

* Keep gradle/actions/setup-gradle@v5 for now
---
 .github/workflows/generate_dokka.yml | 2 +-
 .github/workflows/pull_request.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/generate_dokka.yml b/.github/workflows/generate_dokka.yml
index e3dac3857..91f03a434 100644
--- a/.github/workflows/generate_dokka.yml
+++ b/.github/workflows/generate_dokka.yml
@@ -52,7 +52,7 @@ jobs:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Set up Android SDK
-        uses: android-actions/setup-android@v3
+        uses: android-actions/setup-android@v4
 
       - name: Generate Dokka
         run: |
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index a9d480c02..a5a7d56e3 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -27,7 +27,7 @@ jobs:
       run: ./gradlew assemblePrereleaseDebug lint
 
     - name: Upload Artifact
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: pull-request-build
         path: "app/build/outputs/apk/prerelease/debug/*.apk"

From c9a24e198c71202a1d738c5f8d7957d94cc16260 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 9 Apr 2026 04:32:41 -0600
Subject: [PATCH 047/177] Add true configuration cache support for git commit
 hash (#2285)

Co-authored-by: firelight <147925818+fire-light42@users.noreply.github.com>
---
 app/build.gradle.kts                          | 78 +++++++++++++------
 .../ui/settings/SettingsFragment.kt           |  6 +-
 .../lagradost/cloudstream3/utils/GitInfo.kt   | 20 +++++
 .../cloudstream3/utils/InAppUpdater.kt        |  3 +-
 app/src/main/res/layout/main_settings.xml     |  5 +-
 5 files changed, 83 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/GitInfo.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c1e0e1960..0b201d1cb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -13,26 +13,52 @@ plugins {
 
 val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
 
-fun getGitCommitHash(): String {
-    return try {
-        val headFile = file("${project.rootDir}/.git/HEAD")
+abstract class GenerateGitHashTask : DefaultTask() {
 
-        // Read the commit hash from .git/HEAD
-        if (headFile.exists()) {
-            val headContent = headFile.readText().trim()
-            if (headContent.startsWith("ref:")) {
-                val refPath = headContent.substring(5) // e.g., refs/heads/main
-                val commitFile = file("${project.rootDir}/.git/$refPath")
-                if (commitFile.exists()) commitFile.readText().trim() else ""
-            } else headContent // If it's a detached HEAD (commit hash directly)
-        } else {
-            "" // If .git/HEAD doesn't exist
-        }.take(7) // Return the short commit hash
-    } catch (_: Throwable) {
-        "" // Just return an empty string if any exception occurs
+    @get:InputFile
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    abstract val headFile: RegularFileProperty
+
+    @get:InputDirectory
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    abstract val headsDir: DirectoryProperty
+
+    @get:OutputDirectory
+    abstract val outputDir: DirectoryProperty
+
+    @TaskAction
+    fun generate() {
+        val head = headFile.get().asFile
+
+        val hash = try {
+            if (head.exists()) {
+                // Read the commit hash from .git/HEAD
+                val headContent = head.readText().trim()
+                if (headContent.startsWith("ref:")) {
+                    val refPath = headContent.substring(5) // e.g., refs/heads/main
+                    val commitFile = File(head.parentFile, refPath)
+                    if (commitFile.exists()) commitFile.readText().trim() else ""
+                } else headContent // If it's a detached HEAD (commit hash directly)
+            } else "" // If .git/HEAD doesn't exist
+        } catch (_: Throwable) {
+            "" // Just set to an empty string if any exception occurs
+        }.take(7) // Get the short commit hash
+
+        val outFile = outputDir.file("git-hash.txt").get().asFile
+        outFile.parentFile.mkdirs()
+        outFile.writeText(hash)
     }
 }
 
+val generateGitHash = tasks.register<GenerateGitHashTask>("generateGitHash") {
+    val gitDir = layout.projectDirectory.dir("../.git")
+
+    headFile.set(gitDir.file("HEAD"))
+    headsDir.set(gitDir.dir("refs/heads"))
+
+    outputDir.set(layout.buildDirectory.dir("generated/git"))
+}
+
 android {
     @Suppress("UnstableApiUsage")
     testOptions {
@@ -47,6 +73,15 @@ android {
         includeInBundle = false
     }
 
+    androidComponents {
+        onVariants { variant ->
+            variant.sources.assets?.addGeneratedSourceDirectory(
+                generateGitHash,
+                GenerateGitHashTask::outputDir
+            )
+        }
+    }
+
     signingConfigs {
         // We just use SIGNING_KEY_ALIAS here since it won't change
         // so won't kill the configuration cache.
@@ -72,8 +107,6 @@ android {
         versionCode = 68
         versionName = "4.7.0"
 
-        resValue("string", "commit_hash", getGitCommitHash())
-
         manifestPlaceholders["target_sdk_version"] = libs.versions.targetSdk.get()
 
         // Reads local.properties
@@ -142,11 +175,11 @@ android {
     }
 
     java {
-	    // Use Java 17 toolchain even if a higher JDK runs the build.
+        // Use Java 17 toolchain even if a higher JDK runs the build.
         // We still use Java 8 for now which higher JDKs have deprecated.
-	    toolchain {
-		    languageVersion.set(JavaLanguageVersion.of(libs.versions.jdkToolchain.get()))
-    	}
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(libs.versions.jdkToolchain.get()))
+        }
     }
 
     lint {
@@ -156,7 +189,6 @@ android {
 
     buildFeatures {
         buildConfig = true
-        resValues = true
         viewBinding = true
     }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
index 097eb2c60..e41109b59 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
@@ -27,6 +27,7 @@ import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.GitInfo.currentCommitHash
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
 import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
@@ -247,7 +248,7 @@ class SettingsFragment : BaseFragment<MainSettingsBinding>(
         }
 
         val appVersion = BuildConfig.VERSION_NAME
-        val commitInfo = getString(R.string.commit_hash)
+        val commitHash = activity?.currentCommitHash() ?: ""
         val buildTimestamp = SimpleDateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG,
             Locale.getDefault()
         ).apply { timeZone = TimeZone.getTimeZone("UTC")
@@ -255,8 +256,9 @@ class SettingsFragment : BaseFragment<MainSettingsBinding>(
 
         binding.appVersion.text = appVersion
         binding.buildDate.text = buildTimestamp
+        binding.commitHash.text = commitHash
         binding.appVersionInfo.setOnLongClickListener {
-            clipboardHelper(txt(R.string.extension_version), "$appVersion $commitInfo $buildTimestamp")
+            clipboardHelper(txt(R.string.extension_version), "$appVersion $commitHash $buildTimestamp")
             true
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/GitInfo.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/GitInfo.kt
new file mode 100644
index 000000000..58ff44bb2
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/GitInfo.kt
@@ -0,0 +1,20 @@
+package com.lagradost.cloudstream3.utils
+
+import android.content.Context
+
+/**
+ * Simple helper to get the short commit hash from assets.
+ * The hash is generated at build and stored as an asset
+ * that can be accessed at runtime for Gradle
+ * configuration cache support.
+ */
+object GitInfo {
+    fun Context.currentCommitHash(): String = try {
+        assets.open("git-hash.txt")
+            .bufferedReader()
+            .readText()
+            .trim()
+    } catch (_: Exception) {
+        ""
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
index 057923eb0..9380285ca 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
@@ -24,6 +24,7 @@ import com.lagradost.cloudstream3.services.PackageInstallerService
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
+import com.lagradost.cloudstream3.utils.GitInfo.currentCommitHash
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import okio.BufferedSink
@@ -170,7 +171,7 @@ object InAppUpdater {
         Log.d(LOG_TAG, "Fetched GitHub tag: $updateCommitHash")
 
         return Update(
-            getString(R.string.commit_hash) != updateCommitHash,
+            currentCommitHash() != updateCommitHash,
             foundAsset.browserDownloadUrl,
             updateCommitHash,
             found.body,
diff --git a/app/src/main/res/layout/main_settings.xml b/app/src/main/res/layout/main_settings.xml
index ba3774554..5c05599e8 100644
--- a/app/src/main/res/layout/main_settings.xml
+++ b/app/src/main/res/layout/main_settings.xml
@@ -134,8 +134,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="10dp"
-                    android:text="@string/commit_hash"
-                    android:textColor="?attr/textColor" />
+                    android:textColor="?attr/textColor"
+                    tools:text="1234567" />
 
                 <TextView
                     android:id="@+id/delimiter1"
@@ -152,7 +152,6 @@
                     android:textColor="?attr/textColor"
                     tools:text="21/03/2024 09:02 pm" />
             </LinearLayout>
-
         </LinearLayout>
     </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From bb4e5da5c9c3433968fb91961e7db13f52d3bc7a Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 9 Apr 2026 09:07:10 -0600
Subject: [PATCH 048/177] Bump androidx libraries (#2607)

---
 gradle/libs.versions.toml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3b060a53c..576ccd782 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,16 +1,16 @@
 # https://docs.gradle.org/current/userguide/plugins.html#sec:version_catalog_plugin_application
 # https://docs.gradle.org/current/userguide/dependency_versions.html#sec:strict-version
 [versions]
-activityKtx = "1.12.4"
+activityKtx = "1.13.0"
 androidGradlePlugin = "8.13.2"
 appcompat = "1.7.1"
-biometric = "1.4.0-alpha05"
+biometric = "1.4.0-alpha06"
 buildkonfigGradlePlugin = "0.17.1"
 coil = "3.3.0"
 colorpicker = "6b46b49"
 conscryptAndroid = { strictly = "2.5.2" } # 2.5.3 crashes everything
 constraintlayout = "2.2.1"
-coreKtx = "1.17.0"
+coreKtx = "1.18.0"
 desugar_jdk_libs_nio = "2.1.5"
 dokkaGradlePlugin = "2.1.0"
 espressoCore = "3.7.0"
@@ -44,7 +44,7 @@ tmdbJava = "2.13.0"
 torrentserver = "7861970"
 tvprovider = "1.1.0"
 video = "1.0.0"
-workRuntimeKtx = "2.11.1"
+workRuntimeKtx = "2.11.2"
 zipline = "1.24.0"
 
 jvmTarget = "1.8"

From fe0829ff64fa52dba63d02d5462a900ecc719d4e Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 9 Apr 2026 09:11:17 -0600
Subject: [PATCH 049/177] Bump material (#2609)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 576ccd782..c1048028b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ juniversalchardet = "2.5.0"
 kotlinGradlePlugin = "2.3.0"
 kotlinxCoroutinesCore = "1.10.2"
 lifecycleKtx = "2.10.0"
-material = "1.14.0-alpha09"
+material = "1.14.0-alpha10"
 media3 = "1.9.2"
 navigationKtx = "2.9.7"
 newpipeextractor = "v0.26.0"

From d7b030e7ef446155619eebe3ad5d820a779fcbb1 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 9 Apr 2026 09:19:57 -0600
Subject: [PATCH 050/177] Update gradle to 9.4.1 (#2610)

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 46175 -> 48966 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 gradlew                                  |   2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 61285a659d17295f1de7c53e24fdf13ad755c379..d997cfc60f4cff0e7451d19d49a82fa986695d07 100644
GIT binary patch
delta 39855
zcmXVXQ+TCK*K{%yXUE#HZQHhO+vc9wwrx+$i8*m5wl%T&&+~r&Ngv!-pWN44UDd0q
zdi&(t$mh2PCnV6y+L8_uoB`iaN$a}!Vy7BP$w_57W_S6jHBPo!x>*~H3E@!NHJR5n
zxF3}>CVFmQ;Faa4z^^SqupNL0u)AhC`5<y8M6XEpC1H~L$~kjY4_Eo*w>XDvqE|eW
zxDYB9iI_{E3$_gIvlD|{AHj^enK;3z&B%)#(R@Fow?F81U63)Bn1oKuO$0f29&ygL
zJVL(^sX6+&1hl4Dgs%DC0U0Cgo0V#?m&-9$knN2@%cv6E$i_opz66&ZXFVUQSt_o%
zAt3X+x+`1B(&?H=gM?$C(o3aNMEAX%6UbKAyfDlj{4scw@2;a}sZX%!SpcbPZzYl~
z>@NoDW1zM}tqD?2l4%jOLgJtT#~Iz^TnYGaUaW8s`irY13k|dLDknw)4hH6w+!%zP
zoWo3z>|22WGFM$!KvPE74{rt7hs(l?Uk7m+SjozYJG7AZA~TYS$B-k(FqX51pZ2+x
zWoDwrCVtHlUaQAS%?>?Zcs`@`M)*S6$a-<VvG~@v%&b`ke0)59@8e6u-Xg@~W9(J7
z(c45zD@#FlmmH_A+O)!<cmk|XaN5Z$ZK0Iy)D^^o+%J#*bSgb<Xbh^$@NT$?D_Ebs
zKsg>E5SkXYj<pPvSGh<1{mf0XRvD<hd#4K>m`9L>8EtTzxP%`iXPCgUJhF)LmcO8N
zeCq?6sCOM!>?In*g-Nf^!FLX_tD>tdP}Qu&LbWx+5!Z5l7?X!!hk3jRFlKDb!=Jb4
z7y6)re6Y!QE1a;yXoZC*S$_|pT`pA*(6Wwg%;_Q+d*jw;i=|e$DQU=EcB-K+hg9=O
z{1{BQsH*V!6t5tw;`ONRF!yo~+cF<y>4p}|xHPE&)@e@Lv4qTL%3}vh4G|Gb$6%Eu
zF`<gWNn`s*NTBqShXo>@mf2gOj$jYquFnvFCfb9%(9@mOC4N7VWF#;<t#L{3d*EpD
z?_Ot7lTiWu!w9`w2br>_-4Hr`(ikV(L)V=*hH^P3I<8RXOBnd0%J)*S^v*+L=*srT
zh$IKKg?&n5H(Rho@`U^AyL=sN%WY)ZC9U)pfGVfaJpz+_n0|qnr<o@Mx{i!o?w16h
zT#Rtd6Ka-wO@5!hw%r}O(LW$gN$0MRDdOEI;$OZ&X-EjJhA@(@5=;P0BBoKreNV(A
zF7{6^9w$iwAW54ynBs8YTa0aZ`=?;9a}0IZ#69yZ;EE}a+%avJ@@T2oi0%nPR+msA
z00aj!=|(Z<8bp0B6(LoE@M#nzLA8hXiR~OjM~XYH@+L`S1%SK@{RIE7S&eH#|HdWz
zquGEk;|yfMQLgp*gkJ~dfEcvw6jCN8^FL6AQy49L+j<Ck)@>i_sF-g>-w^_4A;{;3
z2zTOH6bxZt<Z-T&a#u5tGc$8@KR%8}8Nr?sO`qMIu75uFSGZIYm)O_fXiRCb)bu%a
z62xx^Wd#_)|D@f8C4h5T^0v}(H)bD5Bg6q!vtNdqj9c-P&19FY$K4ck4*X3G4^baB
z4X8czHiJ3e=$6$b#@B=^)H_XZSFA{IN$hF&bL_BMGnskjf*UDtgrql*w5+29{ubhf
zlyqK4gPe4QKM%ZewN9s=hp!VUJX*F%RLY+6*ewj>8k`rB(X<oiL&cE*CN05+^izTI
zVP^x^%Lh_`5(HiIv3X2%W>AAo>wufzcNZRTJSseFF{MmVV&4XVmKoPC0qRQJG-r9i
z#yqN9hrZoA&Zp?DMIJLUtN3A!LZ89wr@`lge7butX>Q;1Yyi18b3#kDs|o$Q-f=a?
zS;F_#_D1zk={}uf4ziZ+zjshKO^HC9-@G@n%RhXcLA%&TP#874IHEe;@#u!C3X@nY
zaHpT0mAZ-N7)vR8Z|0maGSnM=QxJ8gamH0hLc#sW`>p;KU>wz515s9BDjB0eaqI1(
z-&+*wV~o4?ha@KJ;U1zi`2(eKXkxc`NMkKxnz>GSlA0~7IHQ4KQWUPKD<}r@FOC_{
zQIDL`U!eq4@;?!9qWmvk%A6XHbxR<allBFfRmbs7NWM5cLnaM*xSN{e668E?4g3EP
zP%lqrO{+&ZN9ev>Y5BPh%#HKP`2>-jhY*TfF#gwLOR~f=$-<ZpAjbtQWd63PrCR4x
zTW|V?k}@`XR8ApcdEB(pzqcxrq9L^@B!Lb&>qCq2V;*bz#LtA+nS@}dcA9S9exiGl
z^t`RA_OgVRSg5O!GyJTc)4w-v(m~t)U{2ti*am#Q9`)B^wNC!pE9&ktf6^Cgs(3X9
znK~S~S}nNMh1+T6K>hr}(e9VlKKdt<1`D@~mE;aSB-I=?S;M$lD9`O$<99XzLG2F4
zg8`M+SrA_Cb-Bfo#>)U*nB@lBkUE&<;vN{rnAmuX<|-}ae2*aJG4k@$v%Rc;IM}_v
z<ieh=DWA9?Ps(|&h1phpcW}z!$-j#@6+u2q-g^F0YEjw(Vj%8kLb3HNM>)wgICOxg
ze%Zi6<pJ`%ckUwOnkyaeZ=gr|k2fHEu?#*WdcC&AAlEtUVMt=3yA@T#3koR{?f(G4
zLSuL0XOp;nP&tGRC%%mOg&xZ}EW3~kO4&Q}vf$vV(4u6!2xT?<>xg$romfi!Wy}i|
zT8L+Xa*7}ZVYkJGkOKG>+S57jEDu7AiCi}B5m-HgeIInYmDQX8g6_Liajf_Dx@k^H
zg*_C0VY^d-Ta|p6or>0LP}E$ZB{BKT?Up&p1Y|j7746nM)xXv!Tbpbo+eiB_F>?By
zkhP<XSvVSXFWTIWs0P75K%a<zJ9@Iw%@Y0=A<hFqLkbvC56Ig>*}9ZfjtUYuZUHP^
z>k3^hW#o2WXM~+rrPq9-S8e7APJzY^smW%tJr+s9W{Vi(i`b0pOOfxG`?0-rvo|Fu
z#?Do52Z*<X7n^YOX+hNJ=5l+egN69rVnvLTz|s0QY<|}+bg!&k^LN0i%l#vb;?SD{
zd0r}rId~h0+QfEk%`=zPD+m2opdO;Bi;}5#vzcZ90p)&<FZqOh$mcESM&fI&@89}l
zd+&z+_Z~9Ejr$IBGxGw+$AI+tzA(Km;sJ>#p<p}w)E$uG2wgMiIQs!b`4c4k5mI<t
zI|Eb<pB;0(uP4<nD{uT=e2+8TqciHoePc?1HR<|SrxHZ+!5N@Em>Pec0jqtd!y(#T
zT|aPAx4<9ST0a)9E5r8l8Y4V0L4;bA_y?{VLNbAme_|R39vQ}m8Ix2Ay0~v%g}07A
z86rGJYvG6Be<uuuDOpVAI~Z6pbaEk?aIzu}B}iKrcNseXIs|%X1<~vKdZfAccVgl0
zAqt^QFlSU~@Vb5_Ziggco(N{rSU%Qo$!s1^<kD?!<nq}J3L9(==OuI=UTa5HSUrwk
zLcXhn2^{h#z7nWoL|6;inXbKe^jB?pcj@ulZ=^p=wUn;UQfV!9^O53CZk!VpAl8F!
z=0HYVz%~`^!A1Q+8A%llkpu^L)swiL-Hc1IJyQ~aOEXo4275J5d=x~Bq{NiGNTAB7
zDCy|K&<)x_i!S_avGxL4KlTD?cn8L5Nh0O|$Go%(Wys%I%+uN_$!uLxSY{NzLe!{l
zUq4b?_V<_v(cu)dJbsc}pTnv)56Ksou7hMs@7+jb<SpISQ64|@n%OfiXQXzxCw^3S
ziG(WlC$fjij@c^}XcKt%rD|a`i(M%zDirAVhvj^O?EfOpN+$Mn_si508DdSOLM@RB
zCGDrNGQibIbVXeaaj*z2HqyN>5-4ml(;u`uZMOHPvEiySJ7Jm+^Hu3@33Ko4X$4i=
z`nC#q;)J6=<0x<<T2~Bf2&&nsHk5`K(s)o&IgT+ey(x$1;#`W#W6(6{ijr3yoPi?*
zs7<O11&77DU@SJkW*^!J(k{q&u8rHtl;}h1BXq!I`S7eJAqnsMETCx7TF~HV#rtfX
z?Wl!G*Hg1>*q_BM)Def2(Xf%!7=adUcN5IX)Yw?1f*V=O+4!h3b)2;N{b>uUxh6KU
zFO)rh!~d~HK-z83C*6m5@*(L@qJC@#9TY`${f#|l=ZoRMp7&rBx+gM))6PcXsA0v!
z5eQ5U2zyP2%erLHmg=vZbWV&{KE@|FET}xun4QZ+j8GfNg+mtsW-R6kjeuGyVnU=K
zB<Oh)u6iS+Hv{$dp%C$%5ZN{N&`m|sQl|X`^+>iAQ(?wz7!cz3VX?;-Xic;#aO&xN
z-%mu;`sXgYc3{cqb|L1|aGf5UQDzrp1yHOB(HMD^+cpK9SIuM4E5cl5UM~-my<gF%
zC-@MkxOy!Nd=N&7TlG*>bU^`JdHZ6$#~n_V)iQ+PAHacfSa#|SN;k`n%p(7#uf)Q>
zlHE8+)PczLFiHEnu~aXa{<u`*%LyC{krf(&{n3S$@kU*;ih@?Pt-Mf%E}IbZ0!x-|
zdJHj{)(`y{W$|w!Yq*C-G|KceEB2{%>g_hI94R&V(ZF;Wxh%tFIgmzT8f&bA)>us*
zNA*!XoNoV-UPx|T<+mz&aZktvj-_f#m<jP#I7AAr1P%P^_TN>eX&88P?CcuJY<%Iz
z9~lFd)ITw&2kg3C!vE$_NDd!s8Mn5lu-na9mcBg$=B^<tKklAM;#pdqv@E&Fr){2~
zLPGA${lq(;)E|`vh(I{K4A!w;%KaneC_k&cw9}+W=B!yH9}vXhy66|kXuLnh3EnAs
z)ngrZ)^o<=ZgOU?qws#ZKRaO5nRpue_$GBkpF_hbJX**v@2Kh9pinYV+d0peUP#t3
z4`Q@l>ioWX6p8iLP&hule^!6j67i0mYIxNfR>X!CfH?G;y9Tl5)Q+4#bAL!BH~e%-
zPkNQrOZIc5s*qXJ;9&h7_s5AJYt*oo2A?tQ*W<o@WKq(?{-&ec9R3=7`j+Fht{}ni
z70_3=qy{$Z4&NKAC)TqEE}=vWMC{Gl5i&jDx~1Oh(5sRuHC_J9CF`L?n20nz^|SZ&
zXC;cUFZ$xOhzjV%qi!b(39`=SfVKbaE^+7MMeO?1PsJ-IhN$)0H@b^7rEcfTh{|JE
z<b|)5v4CNTHD13^dt;j|ntxaOBKEh5VUHsw^cFauJhU?v;}=Qk<g*}QR{s{Z*w%0&
zr&EnJV(mf&?65_J86y6mtJlHNw@#CTwT1n+?*y^plcJ#SE%EG|1Ic$MAF7c}p99z}
z>AM`iaFre%Av|~a>uh&Pzl}s%(oCEd$G1=Km=P=^Tf==pM>*RcAANEI6hw9Vl<3&v
zSEdp|TFrt)z!kqdUdibz_*TSj9WEbzlm+6Oym9gQk~vz@*OmO2cWHk$mMEtd*b*r7
z)drx#>)3)0d`ZeHYcf+1exTAWv9*UhjwA1*)%MKl5*IH}epmne{i8njH@p|m(oyy(
zD{I8)8qH_SnUA6WFkaH2e4`UtYtt5I_@a<NQXvrSC!@>_w%%E(o8bb0;@{8i`s?+C
zGTz{xBP2eyi~$TfW3N(-R|c<p;;{Ylf9cP>))j)dk$yggJDLo-Ur;A@or+w#Fuaqk
zx#9j&Vv2ob(sZQpA{>3KU?H*Hf87&w!P(9lj3uA8s_0vlDtUVyIOvgPV@#~%%rVt@
zw<Xh4T0SDRJN<iAj`gMR?CQd=cnB)K{XU6(Dfx%QN2yS)NMV>6BW$7zKDvf#*ftc&
z`H~cLVIoq;Ffl<QKYYFc{x$IZD=@z+zG1tVn~><@kX=47^^aG^#9GFmQE6-w$GApb
zd5u1D4@*oJ9mk=`1HaHs?x`)mSd1G?<qadpX(QUtNc-m>?$5*?JEn_`4Ckr-e%Lv8
zcB#IIsb5(CF>u-E29hB(7#I%{7?_gmcZlQ@Vk=OvyPfz5I?DDe+*)JmOOPpev2s!5
zIK)0cqIa_;UB%ily_J+%A|T>dKT_6--1`pFwIsG;*K~n)&@9E%hVLui3^)JrM*gqf
zFR%tc@a|xLfAk1%?bH-MF}=Myt7mhS#jC-nv-iRC{I#EKf*^9;PGLcO7a!YiedEhe
zeMZothG#o&RMk==LcAw{a;bg2&b7K%WTk+4=gLh#9dDO`(_v0oYCTZ|BCdJ7i!ms{
zB=J|Hn`Nc3mWiQn{&&-{ws!}kD9Sim;8}pt^2HC`x{Ay?Roy54c-d-cnHg{7D5K9z
zv@o)c)kswkaHTdvQly_s^g+sDyCjBAbP1%W229JAba?|uqOL*t$|KD^5g3dLKn=Xb
z9IW_k?k*)kVn>2Rqj3QejshvLqX<Cjm=Fj>Q*1NVJuhKbcUhCA`nKZE_RACNfT&L*
zI$YUQJO#8X!-yd3ATPe6yf7LIrHOsIX=b_STgI2a#J8f~@@ll&;%8Kx5|0McAwYlI
zNs3<DE59V~2c6aRM)U~Moy3Q|^&+Bcn9=<@b|?EC1#vX~?1xIvmsnr;h)B@XnG(l&
z2WKUk2^tBcVTwv9;`~x*3o~Z%aCGZwg)z8orDYPI(mc6jS(~Gqb%=TNMz^Y+wT8lu
zNua0eo%S27oX|uUBn>D#p)W1q4pJN<DplcG7`zx2tCz7&qmyl}1X6pYp|hG%V*V;v
z8T=#D5^kHXGUZKI(r~Kg$`_{YGYg%-g83z6@)uo1rv5dvQ7ix=bNj#kvJGY{NX{k;
z07bVp%L+Rjl9Zsbk*%N-p}vcjbq)S(=pt{@4FP&1=l2uZw3B5$g9)VE&_N!ixp8K0
zzD#@ex@NNe`g(tcG(vX;<j2Qp{3QHCvg{dZTcKLjTUw^xb8w-}@l=~s%}p+f%n(Z7
zPC3>-#V@~&`C6yx!RKxhy`Cpk?OS$q4dS1IV;hOu-vH(l)%`YjbxgI-26N1|9c;#^
zv+fX)nq-IF#F{VG3bBNiglftne*B||U<63~qoRGb*J2JI7MaAxT6Pdd&(djcek2<=
zsBapXlGbq_5`*;^l;cX+-Yulze+duS0ywRjUgkT)#(DTchjKp+>*L;RCt;mZ0$n-k
z8u*<cKGr&c`;NHKgVJ{8i+Fl`o)5aHNUQ+Gh)+Npv}kZ-aajmB6J<6cyo@!V4qkv3
zx?06OErRKZ6y4uz|GdTyTMLbk9lf&TE9{h^ob*K~RfKlM08VPS&d5Ed{G<NpJ#Ze<
z6Jf@dx`QLx%hKoSuAyoTzX!ewkhcGyGtJpiCq=yHq~j88kC1a;H7#<t)wT;c1(|?$
zGw)9~beg=d8wlsHR$dsmJm!#g<Bb!!!gf-(d>%CMZ{sj|raK-MZ8XXWWlW)mEyE%K
ztogoO4IMeUy1H89tZs(Vig2oUO8UKwC9>3rBxqq_g|@NvW(7NtqQTVfAn$BnHFI4O
zZ}Lgk1PBRc%zl^=?B=SeX?x|xi9m0-pMZ}xi`&b{XcL+s=~>u6(+ldBR)}&hKUL9P
zVzKOnJ?rBrkSm1gfFcFtn7^rsiJ5L4iyp}T`Y6l7WI}Urs8CuV<`%O12R%B%<N<kR
zz5D&-blC6JRciIiy`Dn@G_ftLYs($4N3J8JFm72Qp$?w=Mwr*)=kj^PZ9afg+sxeo
zQIQY%85=;N1#FAnPt`NxTAo*=WJfgWW>pvcko(+GnA~)<SNQ+BT0G2sWa%3im<;5<
zxdks7no1FrH7_J9sL)fxMHXRx3XLqRUMXHB6jfk@4DHa=l^olDuD`lfp#muw0_v|+
zLHYpyP>yiUirPXJc=q1P_Rh-`<op%zz0cQ+eCO=;R`*L1+0;dW2f-uA47~<YIx$_P
zFgX<Qj)eROfm%eCE^aPtJR`|f_mE=+yYOc-W{Nf_!xUTQsuA1KxU*%dqwK3bK#h7h
z1mE;IOmseTQB2}2W)&8D62!c12x{9xQq6+Ex+8*U4i`5^eI>zw_0r9tn*fwW6^V^o
z)sML@p8m+~EowB=h?CjA+cr9xRfa$NmNxAalqixbE_s7ZUI!@;K82(r`=l&XyUwfq
z!`lnA7>3ylx!48Wlgz>P-lb~w$b6a5+oec>)-d-M;nIHp7nFy0n24)&YO=>S0Z(Yp
zO+c<;-(@g9FLsB2vu7RO!0A0{9UTU@frfuP7NgNzHlBvJ+!4@JygLpm{!|eyBtPp4
z3y<F%Jtp=~{`K?PxvYUf#&|vUvBfPKBfJ+i_uUR>mxmEb*`x(!{EU%z)C~WOHhb@J
zfye(U_Ml~XTl7!d_W$<3ishk^C-c#ef)<t>Ds^SywIDI{mDc9%P1WrBo{1tAiAHb$
zy&0#M4f-qfza8F84nQaWL~S&xNQzG|P>PQy{7o@?vfOk|$I}L{<>eEhVJ~=lJjGym
zaWU54Hl1|b@B!8q_o<a-oUGlhz`xgHkNlet^1|KdasP;Jk^srQm@;Ot;VNtm^eW&f
zGB^88*3-LSy>TS?5{Gk{K&8em|M=<&KRlvg^r6cQJ<r@%L~6Y$0v`rjg??{+%6F>O
zAu8~Z0eU3i>e=5qqP&$9=w_%xFYB^^LO<B3o85cvGP6NadaM^F!f*xQJd;bcq@G}$
zA+Ym(%cb42#iJ8?AOhVCdtOfm1URhSPA^VD2&>7LLiRHA^|;S4F6ANMoL=;hZq->=
zcSZ^2L)TMD99%?aFwzkZ2$=wMj1ihM{noHe=8-z}K}`R$`FI!B97|x@V}UbVRgO1y
z5V37pra5X%7**FZt$6qSDskj3OMr8Dr{wqUpW?%Gj+WaI7IGC{QiQ_?6;BUws?iy9
zr?uCbV7fBv7#rQ!;fPu!Qv?;xMp~V;dS54b?$6MVY(Ljrd4$RVQ^uG=kJ!W`a>&%8
z{N;cW{8i2M^VZ<jIzo-TZJtqkXRtD{XutiSlF+L_m{vrhFjmX)$~2l`?Vkj9hK=o-
zAl14Y5#EvC$ev*p0b+*~F?C<kAQ>4>D@LN0do<RN3=x5Ih@WKqI;UiGAOCBdW`8UB
z<Ul%8(6%hDF!HEntTbCzmWF-4AGe>B%ye<{pMpKn(ja8DnCG4Kjm?9foo%>}4B#jq
zqVJ5aYS;aOeS$JPxW(!)UQWD%y-oS6x&B_=UC=)Wuf_ZRPE9$VPrx&G65;!18!SF#
z8JNxYs%6L)e=H6SdCNvIkz)F0yeP*PMcXA<fVM2K)FtHW^Pj07{ZD~{gYGfQob5}k
zc~73uGR`FDg<r9v^O1{U8fPI*qCc^p_WW%BzUfTHTc7C9{6JPZ%?OOOQlvqhW#fQF
zjczO=QejzPw~pd*U_FJgm+*KPcXRn&30U}MbIdg)RHzU%c%4(!4Il?EwXZbqB`r{L
z1m#Q*0)A^005HH89zI5_A)}`2OTDmBi|qndJd=?d^c=sA-CaDNYezDFRLwb_O;aq&
zudD_<@hJ9brmvwgS>6ZE&C~|S^US~Pw2fuW)yo8&XHYgy&QKWjlOsY|OFcq}iu28r
z#83E>BRjZsGq~O-)*9))zhWJIa`hY?aJ)2j4|v$nY39=H+-39&s0#Ldiy?@So(>2a
zR{k?D8-7N01QN4s>pMqB|38Z$v%);7COMHI81xK@5d)h9j70z{1BQk+E)CK`H@l`b
z>1|^8B4&1w<l!hj|1<se?Wos?qzChJJ6NA`xLKQ?mahl}!8eBK29G~JunyyWQgypT
z)?R}g>`%ov;oh^(Z^jTxcA;Af+EMfV9qa=RBm`SstuEtDq=!)Y%g~~VWxT;-_Q6;X
z_oe!AJ3ptQr}_)<m--VQT*&%HySU{4cLkK({<#7+%H4XMsx-K*D+_`TKbXyyf;xW=
znJ%LNp1vPu#O<|G%1ydX9ritSG}8{<=Ts|IoNBsgLR}r$(5D5U>qdK#%}cRtT*3%K
zE>9)EnWh)2ol4C@>6=M89Wntx8XnICocs*<uJlp7Wor2kNRtKmW)8P2_U{m<0Xs6B
zK4U~KU#uP!T-nd>JfbX5Y`^LX36EK&NUMp1dkspMN`wbHR&eKLgSS?2O;0?<?nA<5
zCo11WBo+f0eo5~Np_WEz482)V=Z)GifR=<UzDaA^<VA#pNz0j4>>XODKO444mdhRf
z4lUz}Wk$%=Dbhd}WWZ;M!Aq@^tg~dG9u`#FVA5G+iaqaX55onBmg`B8VttXe%0v9!
z)2!wlh{C+f#(~QiCyFPbH_hBa85E*3DNR0Nq6T>-KgacFeg|M7G1=f5z2nXf>GusU
z{SEjTW2bp5OX~@XR;$;VDvN>Wd}vF{A6jjHT9<q}{_DhB1+RD%4i^_8M!+_q2+E<C
zKjfw}@CMjt#6eD0fq#~>5|&jUMh6r5KbbNfCQ8!vAKi~a{NIp-4h91Q0|o|0oZLW$
z@Xsk_2kB~}X#zJ#At;Bm$P3so&9iJ^0~2Trkh_N?Qoq5XE=n}tGr3AhP_Q~%43ugR
z>iJ*l2%MQ3`q@`Q>S)^Mzs(cQZO_d+TC`&XRcq6-9{XA5`}a2entZ>RVRQt~8TmFC
zO{qBYMlf97!9ojQ-y+ns*xPg-u2Eyp<;}7#0nwDvj5)ySJL%4vWUf<}(xqs3X*BMC
zu<Esmdv@!{sC%)OcHmi-&A2>Va1ZGCpTAk!bSgk~{Z^&4rin?ifHAg~h^%oP_<2hA
z^XcLK@xD}z84HB>%@hXfcUEb{c@_iEY=Nd!7E{wbQNxWsmz@^Fp@MXXZG>J|3pEG;
z4I;ee&RgnGmN_mbgc(k3NH63T<X}#jkw0W94pueIjEwBR!4tI``o4@Ouc%u@hB<G#
z;T&QPn2p=tpit0+c+0Z5v(~QwTrdoRH=SwMGhpKV(}gw%T!YsSl?~jn+v~FL+G4Z^
zb2x853Br1?*hF0!m?2Pe+eo>71RG0PflRE{`iTp<V=&pok^4U-*mjsiPrm7IQgStT
zFVrYZ%S15aX@u5li%iw<8alPBHudaZN?e1l4R8e&ql7fhl-gNZ$!>JLKlGdx$2cs~
z#8YxgR93!?Pa_MMS#63_z!EY`1#~L?P>D>GPxrHj;_*!73POA4irGJjAPSLK24yNF
zjbf$m>Y4l`Sij`np_S{rQk5Ir%`!%c77r8E&Anwc=~E{OCD7bp8)m~882=)R17(F6
zObD&-rkQTf<=k@Axu-{*1E#|&3#Jo+7?(=!T7Vwi##NR!xIJTeU{nR^c*U<sGVb^Q
z&7?q{tolGQy$!CBxSgN4v$E|2AmnX62dQQ8$aCy!wQ86_Y(1qA%D9kfK(e+2u#D7I
zJ=MSQFb>Tl{I`83?m6Z#KF(`VcUkH02b)Y)4W%iXpCZe<aN=`iSt-0K_*=GB#grko
z=mXdbBwxVk<wV<`3Tz%lB<*pE`qGXUB%PYv`Jsu!Orl?3-HFjR1JpCBATIr1<GadX
zkMC*nIQH}O{eQ%@F<4VHX##K6rrhV12c|q*OW(83LLV+}2QnM!dZqsOM3?M6Mpz`P
zQKELi@7uc=lTG6L5scWQkLM3PsvD+^Gf_Cjs|@K~ajkc$3b)G{8dW7G7+zZOHPabq
z@x)4iAH_*`_;EG<NiAgO1tnG>8&hQ%M_lTq3z3t~J&{mi=D-jX*b}n-W`RIpVQMDh
z@!aALf&*Y#s!Ucb!7OQ(|JcqI!&O5v?qFBIfoQtNH(62KRLU$};@N$4wJCH+acP-o
zZs3E@s(_cicL$IhaggsA{r;O`X6=&A)PucscLa{3d{<@}Ycbl*4MLX3Oh@q#PTRX?
zK_mx>oFh4bh`WCU+K&<-t>f8i4K(g7XeJcjV2~LQp9bd_!fy&>438B;{iOHo=>fL8
zHUH)HOTFOnsS<p~scqar74QzsZZx`IM13_N`XEiJyBR=bnVEZ*|IwrOafk48c&9!g
zYA{f%0U2Me&d3Uz6!go!>DZ$&-hPcTYIv>=V?%%BV|hoGD%R}-kh{wrM`o>N{)}Jl
zdZ1P13p<^gUJY^wDb`)}<MG!Ez5WBi+M?wy<Z(Y7D|>x$+D9p?1SZ6qB5ZKSBI%SI
zHb+Y1-B@PDFQ!I+*?GP@Hh|YfAn1Q4`~gZZ<M}^KoCk;b->o`_87&#7mM9sM6AP&b
z*s=0$xQNUsHdW%(JSmxvlMke+Y~=NLf7<h$-XD{+xf_O)18d>hFU4ew8I@JXm1Qjk
zUp67_=$uQ-Q68@wg+JwRa}lRcv(lfLQ?$;9N_SKYSql6k7Gs-fEuPz}(5lhBn@@Yn
zLw!L{&LdsFF=h*OoMv$#-8D&{?UE=Uz|4*kU**U7oC+NytdL1gI|*{M=COpy&=5##
zLsvg;tf?Emq)D6lL*AsM1Yj4wA#2B0u%qpgk<*Ovv*T}?YKjXn1&mG=QH>h-CAo-c
zge6B-8IRB1uSA(RlBe#`iGt?#I5=}2vb?*rqj(2???JkzS4&!ayf>Os!)x@a5jm;=
z*k0(h(r(ELR|oD^azGYV)AC^pruZcBf<{iUv4YooTz)KM&)9zUT;w@P%wWH;2=4C-
za4pwrs4_yDSf*iVv3my2=o!1&PwlI!zw^O@V`GI#6269RibKU8ImtT9$r2Gb2KjZ>
z<v*A}q>Gm+LxJ8rVfO*3jTW(W6*`-ui~|w(Bq3D6>lIas>>v|P_BfK!>$rw&JI4Uk
zbzAuareUX-UsUrAJrt%odUZL+jz0XeDn`YW21CxGW!{<A#G0{^s7DoLCXq4`@hzIO
zb*EZK^4+vJuLQwQ(MhM*kfJ@NHc*497D;qwc6(Y&+AQw5?=Y^i%{W9wE194(OxdhD
zm$RWamNfA{pCC@mKOE+6S-D6)jU+xR|He+I@Qf<-=w@_ak?CLUHMHeqC3aXc@jP}Y
zj<bIKy#!N^vbvU;2P1<GQJMCQCleG|7UuXPqbh-)tbr)Js8+f4S#|C(q0_<fuwK*6
zaB%Ji63{#GpFQM~5d?dQG2V76?Kp^G9dS?BUqDHFXAsJth(dg=`9!pQQIwo9CW!1#
z@!T0&pM8QfLQC)5*~RjHovOZ*2!0$UIm&`tJa8pSzA;!APa#8nHeD7jHk@JdwLbuV
z>hMoQtEmmF?jP};#B*Pv*<?DLWG_P^m3dpQ(&t4s!oHZ4Cmo`WjAPZ=)AfUeZa#O&
zl#@UyN)Vzm&pSTUBp2nu9T^h)_@KESvP;5&EHqFy#LzfsSNC_aQ|K;xT^e()0>R!Z
zxW%{;y$)-|J7&}p{gLIy8<6ij4$sJV-}~?hD<n|3{Fq4(<9A`SlXSD%HRU(dGU=Mx
zd9+^y{k=Tzjum)Vx#LRMlc#?~H(X|V2JFMkN<eYew|*swEH?m`v0pwv9uR1jz6y~C
z_LR}|U1w;2g&|(gZK0$^e~U(9fSs&?D+?+-%MN)tdm{vvT(M!f^EJ6;I`EjL7!isx
zHa2#~%es+0GRsNct{^4MXWP~(P2elIOR9Xj-IEKfR%0FwmOs}JScQIbpW`MdvL#7a
zUFLKvt`;ojZPtWR>=MsV*W@~!2_O4HUKhj<y!>9>r?>_2vkDz+5pwx|${|ob208d2
zxTyRewhZx#fEE{ZwmaPuL#?a<MN35_QvI=^Q9-kZY#s9D3P~)<=wkPx@9<bEO4r}t
zscu?#rl$_Ok2W%2K3|@{IfcjvE~lrjk0dXr?tU*#^gIjYuRjXaW>M2QqLKX|i;i#?
z%_<@1c$<GU&L4o*C0pYCD{WtSgkUO|C~7Fr6W8UA4f><VWs3tk_6=R4Tj{+=%22_n
zP8q9Uvv3z1xn)?weG7j>5G+c3(hEYS+BOe`J(aOWT^X0d8<LR73R0@xk-(8vW|c+F
zl%T(~MWWR7V5V*0Ng&0x${Z2y;w@nEWM*U%OzI?}ZTOS*DqiR2Wc?3^sI&8(cl1hW
zejz(~Xg*!iQkgaaurLB+LAMNPlUl;1L8zFROyTT-s}#SmY~}PmP5UEys8N$S@^F8*
z?lOH_s?KFj6KI_8ATVutjeFoU%JT4<?t6j!PsBpK(dJVACyCVjFYlL!hLjw^FNF&s
zLyZ&)h9eKpA%vi|YvGa%$o(CXDJ?60O`m+uj}2OYE*%oT%zWby*uDy=e}BL76a-s|
z)&;0?Isl#wqtV+1C~8d1h>FrlZXz5sZNtX-2U}6qyQritVN{(o6MhbCh8Uo{X6V*;
zCI+H%>Z8OjPDIkwlLI0f>t{!!{olryPV=7_|HvmpID}GqEU0Ul526k**RV*BhVHA-
zC4rtOpUB?O#F+^?>VlXdTs=1DhNTD50kG@T<r9dEStRCKc}{c=Will)xkm<vF@xlY
zoC`@gPUy}56w0H0K697q93J&{Iyc3B7m=w0hB&jZxO|*(=7u`}ae8_P1ooafTr+8w
z|3&&8*<^569wtAyAgwC0i4x#RtmR0a1q4ylH67mYjW+m1#1n>who=Ex9K};$f)HG_
zo;HdwX};3TWz{*5o71j>mBxT56XUMM$jp&oDKpG^54F4>cN_;a2sO5+9XR+CY+1T&
zaf_o~I4A1QI;b!nLleQ|)=@Nqf4LeLBOP{%oHzK0Xg7%H6Gdu6u}n>QUUcdf4Z;gS
z9%jHM9cg$^Fvi|W{3>*12;o8%9*|F}w48L4UEx-WmZD!wGRhxyuzveCXk%#j1YmVv
zbbdBla;l8+#U4=Pr8y~<Obexi&ul$UJH{eL6A?soGZBOWt`%o$vxEn&gb%7g1p7!^
z7@^<`>RBi#xETz|&VQWvEmGdYf#y?aaAJs^|G@7;Xn5>#DX36ILjY`xqFFiDBSK!_
zSmrO)O?FnBtaWU<5)SF0%-@N95E(JkOS}-3HQw0_((7^3pcCz7Db#aH{Ztv}3c{F3
z9`wC};pA~_{8Nv%u8NQ)EV~Zn!|3B1S<9#=Hhz0=pi$PH6;ZSW1w{kSLFw~+8l1n2
z@c5=1c5B!zR?*TZWQ*zVSALX<AQkOAfz|(^;u2MC7Pp)VoLi8kl8ukz3kzx|^CwkA
z;X6w?S2y;K=E?$$=dN$&X6@Rf{k7IhHm!4(tOxFkkeXVmG~w4u#1?BWGNqtId!^cy
zPgL4L>onhlVp=<@*W=WUf%JHU)yNGW5*(%xpj-C2&oI~JClY8V^7KfP>nN+>ti0V+
zaPvJbvYfidk?RUsBie4JyIZz@XzL!k#5pRJ&df8wTc)2yO!#{J`hK<dUF80vhMzcx
z&Hi>&*P+pUvdu3f{!mwdcnK{`y_r%EBVWa}+`47qTjA2|D3teK0ElsnzK2CN+rPqq
z9%eLs7SjMK^wSB*F##!MXzvC!C!I7S?FT=JLUg*_2&Eyv8}F;-k6WnaW&a(w{92c;
zyE2eo^_d!T>kPz~)8Bf*fAO2}lAtFTqw!Kr@q16OXJb`4uRAoS>1J_n0ViR;L{%XF
z%LU-^5ZagUhsGmY9Eh)vIgC!<(4svy*7?;Zc31KO^g|VZa3FEXK{$-d)nwG<yH!Ff
z2ozWr3V?$qn>xzBxrX$%|GWfsvxnAtX8#)L&Fe3H2f)4LMepvhiG7#&o?gx@u~Gf<
zcvX1N6sW~u_p}wxi*Qw#pTc;8CqCK<LRLjFm!I$!62|ghaDZiNT>VAMRX6L#xWVjc
zE4f~S`3&zbKj9!mk;{hL=Lg{@{cFlhaY50yE7rpZZ1CV2BlQG}W{`BgvclA_m2Gw`
z47q{A??Iq$doUbf0|1h6f5EK&1^!+H<#!qQ_0I%_hJiw`vm${61Jn3F>M@f34;m4Z
z73!El=F0sJ3qr{L>tyc9Bh7`S8~!%MotQ-k%F#51a0+TLQ4`)hd0gu?%W2DT704gR
z0Y6+7VG!}Sua)~&X!iODEIhY-?=0Bf?v~rGzz}bgb{3|lvQNW_(rkn|VB@~C!#{pc
zwG8F>Ip2ZM#78_L%R+|F%$?4l=Bfg(Y01C^%9Gx=5~P}EN*1rcjW6~hNghXAN?Z8#
z(6k1G+RzJ&=OWLxkyW$FX6Y=McV-+ZhmJ=oGZvZL*~ba#+aal!6=!TF4ovQrD{fAS
zER<T0lA)DnGo@ka&}mS=fA3*wS(t3y$y7Pm=xAmsofp+Kx|3lrHzT7p9M&wML8|@+
zs#a|I^QThC((}qCg8d%)nh6<be#=wFn#}8?Z(H@drEmIja!Kr1S$1q?c6^IG`YV`!
z1MQ@e0^bDf!`;q^tl_~Ch9Eu4Vv?X0qSLaQ2K=jNZ<{N9czpzd^xiA$s78ow(AlqV
zHNvsq)A1ehysfq%p7@>D$3@aH2GmE$02=lWoH^<3GH;k9AzXi7GY*VT-NpmkWgamq
zxBv6<{lD_9mQ5b!{v$Su|I_+ukdTsT#4$jkF6L(D4sO=QcCHMjcE+x*>S~Z+|F(gF
z#j0<*qN$^QZBm?4SpV=-q9Ig|ky?<SkMR4`s%CA^OktnUY!s!#k)7?fKIO1t7ljXH
z@PRvIS<dKRfe4W>w_7>=eDz$iuQjt-g1)wsFylMJfBZiElIuG2d2_}13!Do&dKc9H
z@wOaxB@rFfIS{MjMpl(p99dzbVVhOAl4VU+Z4sHgvB#r%mV=m{;-jL!cP7)LTq`L#
z5oK^3X;qt4L(@`1;g`c`pd^FEkW|OsZEEOn!UKCID{~95?@*otOw&(QB)FyOx(|@N
zT+gl+?wUo`OI&&P1K+)yj4S<g7C_vh8_hJ8QKczvc{VFqdGmm5-LRr^2Q8V}ky`2K
z^mb!g^dtyQQ73I}b(KyNHI<G%7EOEDO#s1qi5d35>gIkoy$H5Bmy+697LVbv#u`;N
zVAC|KaCIN>z47DhjXZc6Td%SI9Q=Og2O%mV)K2IOG*S@wvu-uhpzyj*7ii#bb(*yC
zx-H<&@t~L7*@cl4ppH((zG)DH=rKXru1T>A6Kr;qRaY@|nz(Xc20aM2HJ~i`>SQ+>
z`aO$XUHlkTfvLUz(8ZNe%I`GAZhM4R;C`P>G~V7~idPN$3_on4@na3Yzt~IhN509)
zx-ZY%>^*ARzsM(>&J@#uI4GvD?R#*o$XEb?NTCH?-XsN>l&kg>xh93KfGRp59<?i0
z^IeybHV-9=kj2Zs$$iX;Yl(T(m5b4hkqPfBze)yJ7FXK$(4zloaCV}(=Meo3*l&d-
zFaSKP$qK7l@wGF|W?hZjH|_tRG@EqfJfZnp=mG5+m{jBBtD<>U0z&mBmzI?36&Oxw
zhgbj<ZsO@8o`eOo9&5Dldk(-EeanAKln7I@{zfl9ujO2)lcl2!BSyP@VU&eP6ka`W
z4<F_7RnUGep2uTt$B>?xh5uxdXCV|@^vhJIG}(NC=X4l>XE_G-i$jy5K}+YE&Pcey
zExBLQ5&itH3SngF0tjFF17{oNLA?L)oDIED*(|}cvXhRFwu--aQQ@$~M*jHJrp1_6
zJXaB$O@u6ED?{{{Cgo$NK!~&pIN-USDZyTzWbwSVRp&paO*`w`5JQ79N7EnJEsuoc
z!a`YO!j)3mFR)&L*>Na^Tog$;cUKmz!3JlIff}6f$zK2-2m<@aYUV}6>IoEeDZB=T
z@5Lj_@QEByMx-N!&#h~)jVn=2kLdzs$NCF*OwdL_BVF>{`QBlHLES(CzZfwzLWuAz
zF5Gf)G_3qR6|B7C`h?XW$t}4M=+m9sIJaaxmc<iJnATX?5TZiGB3ZJ%+&(j0zr5R%
zqOZhfOopUj5UugdUi^tcINfOeV6uONQcka8!UsXmt*Dq4ma|8aFTTTanC(7f64K?Y
zA(uF3ERhA%dKj1d3v7g`OCX>5n85i9hDza1(%q%kCv2TPS5C+fjP+^*LHjt|vjQfB
z*`RBRAhu&aR&Sm*wC51(E+f8k3DX;Icg%rhQhy=^sFx<@tKp+uD7yVMyPcfqZL=*)
z$ud6>OJc+2mN_l1lU2-1DFDvL1J%^*(l|3@!-NwJD|&~2FWVzqp+`IpKH(FE57CbF
z!ih(S&?tM)UG}>9ai|%Yd^f4jQ$462$mG1%*7TL_bIS38lw3@edk9l6^@{m7bAdqL
z=>u8`;U6-}zzQU<|C_1K{*Tyj#f?CJDpr*CgMnyhFkw+;@e6<ddKmF^W#&E(k0IS?
zUaO%>`?23hR(e)e2%~Xk=5DYaZ}`sSzP$cjump=ohVk3j-md$Fw8pYUx&XTr)Q-Ct
z#P!!wMz&l9?QsE-*+Dw_cO;T83(`Kpu<uJjKD4cVrE3+WHtM4}W);ck{$myBqDH{D
zt~URq>w7Ksm@kW8A91D_Hc7SIz)6DLbPKS)o=>kb93KaYu#6aDV#>|P)TfdSc2PB3
zEHV{eey)!ipL%}`r?S{n!vcF1i^fx<1zLQcSEIf>jFoj*RN5#&6Vbe+RJy44kzsgx
zFr`n0k0Lh-Zlm4-4_*xi;}0$f_t&Ak=KZD?foPasbJIr^@y-{vFBQBTzq&++<+s!`
z!Fxyl=L~vNDA#Y6XfE=3w)wFP8tGqUZyBR6L4La>^D|3)bS{C0w-yqOXI0NF&C{dv
zTCU1F(_aYqoNgU4aCI<pohkO$8&%~oukB&ykf&in*17eXMy;pMkoFTA7qND>d&Y_b
zqBo6<a(Afh!*i}FO#Qx2A(<MscU#2Mu?^Rd@RAkHmrD}uZV}a_8+;Y`c(#srAjCc1
zXzioM_;2(qIsHRO{}JDEIcodbKSmq<KjO2MlmNN^yQ_<!wlm;ejGe1PK+r~V{TQN#
zftAHWPJguX<)6O1u(7a1jPQfm?hA!a<oaiWq06j;gQKQfySuBqPyLS1-|qeH72*q*
z&%j`SBrrree{9$E%(b-Nj&)vDBQM;q#z9>j1L>*9<ejz~;#WjjGxJe%e{+)oH`CKT
zoeWAk8=~VQh>xS<^&!#Ye6A&&i4p-5EId%sY3*qIJ-wng%gxK!1wnXE_y{dMa`$Zd
zU8az`#zNr^UbR7_&BZ&5cLGjfo43l=<Fu&?PC)7|DFz?PC2%u%5T+VVS2asjCt+$q
zvzYoE*;wD$F*1ur-%E!EYpW=7R!K{ceF+p&4o91NnT?s%zA6@y29UC?3m*8GUfq68
zZW81TGj`5SzSIr<I8TrkW~Eg;O#1Ba`b^RLuKP9AnI^WP5g`L7@&MPB`<2=11l=Wn
zVWepM(9uo3rj_gjhkKjOSt6sueI>J;R#j4mueY~^Wdyr9a#Vj4H>+79(ew9F^8y)U
zfVzm9)Q|CBdB!<WGLr?Q{XibcTx4NF5Du*&YZP&XKlVpvMMM+v0F@@_W|gS;S8>bP
zHJ+OvP6<^mr?H}ndMAbak1>lO5i+x?v=90Bg!f`^)8EKz!Q3^oo^mboGN1M{Up`j%
zDZ!?VLwCEnJeO?^vGE-oU}sp;5Snc1fMwf+TnzDe+q6&qvd9E5nxJc?S(Es1^CrsQ
zwM>`cBQEJ(g<4Ed9vw5#=8}2Ny{d;A?vd@ne-A$$E;=DX_zeU^Rd-k8D8+WXI0{8k
zLeQhH*Y;M2byiVD_s^A?plT0C1F7qH>WnJh0`(ieJ9HHN#J}zrf=H$PY(0M6;Bgjr
z^S+Q^JkE#g#gAaJ;{h3y@u5^mv6^wdBxveguBNt3mobrIkOD~S9M?&VGVFUPgjls}
zSYvb+zhz6Nj14cNd^u9ME$#{vg~btue>p*5oQeZ#gkSWW_$Xf^cD;7#VKF#?DxrH}
zan5G!6&Z`nQF2glWo}kpl0Mw{JR>EZ8N`-75lc~C=;5^dXQ1E)V9LOmjkD>23hwwQ
z(`S|ZviG8@bBxHt3%;~HTNDDmcX#zJ*AdyJ7tfZjfZ$C%W*Z50eN-~wETOAW>s$pj
zRHE_4P(fc3TpZ!5c*yA>mc3f5;8JR+xLFbFF;{dLg8s&wj!$**3A#O}!Fv<~-3$c-
z!91soC^WUL0VI%6(*#h39lW89ZBe|+Fd-rgiMj(w8rti}_l%uJ`=84KSl?W`R^i|O
z9$XyT_*WE$na}$;qhq<@^()6hkn}9j-fI9yqzGNlc?dUBvVjy?_i7G9A8|0K5XoYi
z(v|4mWZd4#D%WDXN!b_Rl_V5a-C|9A^C4iWrH{w)AgAj^#IjXH#8MBYJElZG6^fgn
zcW8+d=-zS5OHe$cjNtC9qm^Y#4Z9~JXeNK;VyUfi-IwW+DgV#LdXI;?_Ya&K3zrF`
ziWC>Pmj!Nfq;d~u3SL9?0AcR(i@gncxM$Llx{ny0u6vk=@|TV`BqoYeXhzhhG{92t
zBP~m*{QCxjK!B9{^d8w-g^V(4S4efF{;-dUE}M)mSUUA7cF9*z_o$rs12zjyikr`#
z;@L1IM4akqoO0&f&=y&~gX4Vl;{P<lc9jgvWN>*$P%Wlf_crFD{pm0*x*B@47dR<6
zJBPr(1kY@pgXj4LCfUEVDw4o!jfCvt&~r(opbX#SaC4|wmYe5M&Q;D`F6;Kim7w9T
z@9h!RVVskbO&yv(iP<xuwx`9N-1X&d3)O1&;n1zeWwd$ZV+^6B?TlmEM*(Ye@OK@C
z)z7adAU;pO#QEw{w@}RmkBohle{ae}2SZXjrk-E2_7nOU@9w$R;M&Z({^fY+6WxWS
z@@*3N(>oHzOX(X6e#HebSGXF;XPL}<K!}bcm)c3YOrorck5{V`H=%76oqKKIWF&4)
zmfq+nVLBLP^Iew&d4%;^`UP6*qnPRX<pP{Rpm8LzP!eiYBlvvdr+b`U%oT-4f_ejs
zlWvnP52le>+vaD~cp!<yULq7m791oqg0h=?;rA|V#56IcL4VL(vWBR&O>*J3l-$>T
z3x5R7DD_~Cmol0FN<f2JDJ(EHP#yt+jhNAPCAf#U+#m3rH&Uq~ztGg;@pJ#%;At)<
zh&w`5pX<k<yxFN7;dD~#UaZ-;$a66lW)jbI0lN=+j@bz!G(}GzD}T80l|{qgriupx
zOsWX%D|3O!D0SFJ?G`TkdLu;c1vUnhiJMEIh+Z_Yy`6ju`<nzGhO`NjTq4Pfc~xNz
z!K;WwqHzS&7LV58YC>e7E1;1=o2p$1^s~UgDkj$b3M(I$)vBt?c-{$CbkmJ6+}fhH
z20e!9LZ`g3GKESCpRA=CF#1JG3b}0cGccXem79Uw(8P)pRq+;Q#94Hh>XvQXe&mkq
zSKWE`zfi4;D3Z@$aF_h9cjxTly`IoE;Oq&UktgUK{{RYDdxAJy6}v>!dFq`G^6+nV
zEN;u9t1(*Mu^bX4dVdJX<YaQ3i-YMg{~6aC&vlD<H!gxtc~&y27y$}a2KsddiQ%7a
z(ea;geL;3`y!Tn{ZYjo)=?ZJ=2&w*>UFGF?Kv;%XGa(Ug*S$)nZNCeMeL?3(DzwK?
zL{YY4+a;`y2&7)rkBF#wz<7a2{EuD^;G;oM{~l8b|6eFERf!R#3G0RX2jw%L)Ye>F
z+KwBR3oB~ecrtAmMWmqvHF>awUc`(tqC|dqeho9x<DVNA*&%b4J+GouK-n`tPg@v?
zx9`$CJFD{VV{3EseXo@@JVN`|dMe&aglwfC$cOiC>vuNi-AuPPk|5}*2W%+<GjP5B
zSHOCw?b+Mn0Rc!}@lV?l<=c7od9nmY`gDcI+AOIyX=$RP4Yqs>n*w5$1{rq+`IFX5
zjr#Uly#-xuhX5z?cvXj#&KXy^V{Mj>FT--yxy<dyi(DAMRw*_|T4e!xzOyXT+W*H!
zPnNYa<Lz=w&gM^sr1{4s!{cD&>(SWm%tek;)~r60K|D|dVulS(vG`M_4MTb6oNSE0
z&xn#L9N)J;npM7ktR((G7o|VySCZR98h|^F0D-e|6Q1(L1(TU}#ZJ>~P;yg0JLl7C
zPgQn;P9bD?>)OT6HSe&y#2j<U7}Rw{-=|%|f;@DZAdcL*Igb9iQLNP-wOiHIt-b+V
z6%~1^vAsdMLT)fQNo;OD!*Pnrvx`b)yF+5Srr5sGHVB;)wq;Bh5T{9Z3qEVTN=6!@
z`;TBprh$YlT2xFRo=rFfjBD#od&K_-f<S%0#WfmO(@?${S#1F<!eT$_utZ?agee8f
zD4Vu5Q?(7cbm0Wqjv}85LRdZ<r=eaTICWmZ3IT=4i)s69f5+-80$7FBv#}Bl0v_FA
z&oAjNLjX00(InS33)D{V{fdq9L<*P&-T}?-)P@2$L#~bDOxkQ4aa-bZvR;=<y=P;M
z9}3RlT8eL1GkGn5b6o}NCV<fuQP4`$b27y18m1aLl{4*W&c_8ZR*c<Q4Kv_*8Z>k?
zZkP5h48Vt~e=1aBLjVEHkzbbxwEZ7YSFlN7*-YlRDBI%4W^@GL$85Q4X8?0CPkwa^
zEFt3i(*t=^qxStn>+|*?5tmLnRVaW<B}6N+l`yc>ey!I`J3Bh3WCBHdw{?{KRU!of
z<+OqxfhtBS&gzwAsJ6@a^<oEAlDoyQ>;Muj?+TZ<f7LKuw9)2Wc&VIuS#d_S2LpJy
zyIOS-a9Lh638AFRObN^;bCanKWO<MP`dvQplxvs@rx(KMcyVH`@6&SgD_I1~eG(ti
zZFT>~{Yfn+-K-!Zu;_$>ZFxo@tCh{`OrlLHt8pr18=;(PT3U#De8>reXFgWXplR$=
z`!ZV5e<0Hj11xBB2W>mol9NI2wKUU*{Dd0fl&pP>!hkG2tENeuY13o~SI@?NT*Hbh
z^;_i|Tqn>n6WS*OP}ZMUur4)Bs@?86Ug^gTcoi$#xML@YzJ}MBrP;+CVg$-yJ7KA#
z@O5~-AFst5SZ38!YGN7)G){tiIn~u}=sHi&e}&XEq4v9OVIhAD{cUPj<<q7XGxQiQ
z<p6HP)qcDcZ>z@DOvY;`Ik^O)sjO<;EKq-fo!0jnd$eemn(a%e-I}fTt4W@U74{b9
zLiPkh;F0njigJ_~G*VksoiVXibQ#8;d~RlZPY~=G%4sid(%o`q*~Y1}?P?|y=fy^_
zf4v*G`tdH@HqVRO1u6-r3=i2d1utcEe_nSY72Q<)pqlsMeL*&6?<ZzctgL3bFE3|$
z&5REp{I8eBG=Un=h8yuA8R8GSU5>oghY0e$>6A=|kFrn}bD)O@(|tI=Hlr*-9D~z3
z?_yoeM0dDL+f6Mck;(Q?!6yhS-ldyae;AAE1$zI7Dt8i>OndEq5})$pPJCKm^$Xg;
z&C<_GnS-VBH~oGJ?jlf&u5e4mVaB4!*s59<`?Qn~1@>o?x7m<SXHxPeJnF}Y?4-O>
zNarmOc|qA!l;`<I@p-A@9$twJ?K3aDPcFP){;&y|)2CYLq%^xj?>BsSpu8kaf2a-$
zzT{p`rNsd}<X%o+CVHK6>BGZ30t*GhE3ja?s>=@S5q!;$HayBpVaNJyv5wg0P_IQB
zLtA=!wuXH8#w5`R5&4$1``g^mmY`#Koi5nl#rLWhxbG998#L9_%uo@cKNP4tX}h7|
z$JDz)`oo8x2xLPO>uAVeZyi$ge^6Stv?N=OP;%Tk@?J|7Z-NkoLYti(Lgg9R658s#
zhNPG!lPHuQKX$yuhoAAf;-e#gpUYD|hF>r`(gMRwU+oy+!!OxK6i?*ClL0*79`rZ#
zx??xFzbo~S4qD08)~-?T2i_(O-9|mhhm|QoQeIZvRV#|Kbl{)xXFvXkf4>MUcfpW0
zqRBydZ`<@TE1znn+FhD?{1n~R+p}pm+t)>1Q`Q&PQS0CFbQS)Ff4Gg$h9O(NOvc->
zX+#=#vf2C>o{?~QR^Zf=S*+kVONr(XJ>w1d!iJq2rmY3fW6Y1|_+&!(gvRxKj1+Gg
z+2Y63*<42J$Y%4lY(3nLe_vEgsvRfqz$H?J$1i4yO8($X`9tRfd8Td54$T@bcmYu*
zi_9_MFCEWOwBEAhBg)V>nkJh85nw^+D3;QYCV8!)UOr!P+>T9E@<de)S+;6xEj}^#
zBnjx)R_zyaL=7!Us+nY-Z+1;4_4)xSVUA0omc1-PhUpXYiw$v0fAP8P6D(8nTu$}`
zlW#r6uv&CAtNFwtqK(A(<PvvMHIsuru}t>DPIm0`i4dc3hEMSQws@r#U1^0HR$6V&
ze`DFFPw*k<?KjM<O8d^6ra0`Jxxp)iUaS(U2__+5f9(VdGmLOf?qSe-WTfRwJFRQ6
ze729*n#-x)U>LT<e@4!|*)7!YNult{_3(?2B7W7#$B8rYY2=K2qHy$bwwja>VNy3^
z7G;2VcoemX&S9KVz|s+%F3{C9f<}Sca2`J*0{0`DNOX_jEP(>n#zt_SV6pXy?gN<9
z>`-KPha=4eT(slB*n{DNR4YUie_P-gLl6}TY8Ad;@f^Ymf1(Q7#%PPj<&xq*m|9g#
zg88_(Xy6$%SQ@w@oY=K%80(vkpuPDBHjZL*qO)ljF9{z(*U}@16>!-h$iFIVL%b+`
z3n}TAi$>9#kQxfOyi;@)u(P{>-4_<n*Xk)iYppC`u+<xGYF=9BsjIB>4r9;3&QTbN
z;8o#a*!MX~e`fQcoTV3QoH2+6&bSbD&bS!MoH2ycopB}3az@t$0f;e@^oT-UjeG?b
zO^h=Ff@4$oFg6DFj^Nq~`nATPu6L+os2Rl#3CS78tB>N1@|+cpS}!V=Jc~J^ncsd?
zU<FmJ=2(L_;mz&_6-|VOmmBvvJ0y<crX6?V13)6ye-ymqC_b_y_%ZoQp9DW1If~CD
zT0PE=cP3(W9x;qV2VggGmi*umcR^*HCpauWW5>`IIfipbF_NgO+&zrD3%IwswSX@~
z_))+YV^UA6ClY*+d)!Z$bIqYTPwW6f)cKV}thiOHM?~aSV^4}!&w;VWBM-rIh$}7+
zesy;Ne_y{HYa_J2y;E+~75wHfzH=BqI0k?4M_dji_|sNTxT%h@yf^r`yK@0gM1sHS
zbe1iaVv*g!U%PVdg02GyM-Jn+$8fQn4*s5#NAXw5x(oj-;NJxyiYuE(#Vmq9+%zn_
z1)=a9%?07(P!O{Zjfy#mS}|`}1n(P<i-o{(e+lT%jiDQriu~_Y7)XUTBc4I!!sC*4
zC)1))Cct9~MmX)v9>**vGioI4OUyAWm+RWf7^|Fh&i^r)HcK23T*w>`5(E)~;Cv!$
zC$;1WfSU+`TPb}PtHYyAiYEw{r-<mM5fE(z&?d|kJ1AQtYO$t>%sb$BaDR(T973m7
ze=KnD$a8l(<S8Yx%OUGZWVb^uE|D>ZTv{SqJq~@^I9*xoy9Y{wo9t@!&Z-s5<DOb^
zdb~0c_ttshN?m2#7minZo8r|<bG%lptn(ffjR&1vuiz1#UlDPW4DTW5?RW>?`5#bA
z2M9B)4G&NY0012p002-+0|XQR2nYxOldU8Wl7SbK-C8YwyZu11qM-Q2s!$TP8>3=_
z!~~_lLk*<0CO$Q{yVLE`{mR|l8e-&!_%DnJ8cqBG{wU+LXpG{6FZa%znKN@{?)~=t
z^H%^5uq^QI__$enV|1lGpwKZk47+En8Fm!Jo-b1`3e6yLh;c<e$%HuAmx*cj$sQzG
zkQf_1=_j;*X2h-;$k_BoH6C`?rL+Esb5-pZznA$w14&<+_t>S-^+F=$g)XB*QVI8B
zyjHzmt(guDjkh|4K%o_7%BCI9CxMknxt6P><CFDT$v7ru?T+1cLTWDxs1ZejEY>h7
zFncJ6((+~KTKnBYvQrJy0t?&qovn7`MQ69UwcV(HciOFbv$MDVye?2~{ARS$k+R1E
z`ljuBp_e`p$W>Nf3e5kV^fdE)hm?kr!1U%gw}f*j7BGYJ0{M)kRr{<>$Av#swT_aM
z0u2`hiY}!GD&l$4BZ1}0StYAyp%O0PashLg=f<ODgpPpuU)-OXxx^J*9SL3JNv-PX
zYIR&%XD^LTQw8QK|7?B}w?@pR5_IJAn8Iy=$!Gl7y!$C={J{iQ=h)cNQ9zOJyX>uC
zf-PY23uaz@#B90z2@5B<R=&Z<35*Z8^Bx$}a(qr8_XAK%2MDdJXG)XdTq2Vy4-b=X
zNeGh~T@imIL1T1jZ*DGQY+-YARa6B40RR9105y)mPQx$^h8+rY?8Gxf96&6q5HPCU
zxUdsK0twD;>bBX^v`X57gxG`dC>(eI9tz=t@WJx`*}v_t?~hLaxPYmE_wDvReU%yN
z4Y^z{r7q-5>ZWdu#m+QN)lE*!Jz2s)+^jGtU6Fs@guV`PS)dIxlWnPLY?T>zTxJW*
z7gs#%(|>=_TgxC+sLoiDD~%)a#+6J5@_}zLPv__JROK|tw+RRV(}$+_nr@6G0jG^G
zlhR{uDS7tTw&au5uYCGbw`knawI2VDVOPN68V5`)x-z-T)}*@__65ZBLb~sGVRU@*
z$Y320Vi-fPWda9d1rg^Rh<*T2O9u!+{qJ}90000ild*ywlLK8hf6ZEXd{ouF|NYJ^
zcXBg8NC+@2GD47SlL#te5HVp5BmoIahef=Zxk*N5iL(UaLe*-mt=nsDD{A|!wM}d7
zW^oct743rB+EriezP#>>-B+vTeb2dfl9^-z`rbc}Pr|+ToZs(ve%tvi=j2PTJ@y0<
zoh#nUbobGtJ62t_f4IvC9WvwL#Z8Mt-HYoNhZ3>ANYqG267fJR5jHWNG^3`GGBMd}
zqynK{Gju4GiKP}dbsN!?S--fiClE9G0uf2$ysni-c;)$kO|Ht}cW0te45WIEz;b+=
z@t#QBG?S5d4@UdVWD09xd{x6a4XXlSvw!h59%3fFGm%M#f6R@MsL527NcJ@LB#m&?
zY&@Ja`ufad<0kdF$NFkFB5{qJOl6lF{YGQdi1##Z>$=<wr8ROhIb)b-nq9rGZG65n
zEtyzdvzuwg_~^Q*kxFT#Ggb7M>Fvox8brY2`h-PeadnMFBV~p%$w+#jaU#rWFL`O2
zPNg)R>5Nmue`-|5Gz|-_gR(4%nHEf1Vtf|F%c(-AnKX-O?o?13&1NbE*|tPT854@h
z5sjPa#$7wwKxi)cbeco+n7sKj8ZBUQr4ze$v`#{61=<<3NT-G5FGOqAXfaa>*6f6j
z#30739BRI{y;Ma@by`Aa!7AM_u7|1%tY*P!RLkTxf3L{E$CxUs+a{WIb<JKc)l)#H
zI%<HeEKVYcMoF`AyOHjN5zl6FfFbx#b)gVBneySm+6p>Hr{#1mQ~Bh1jaGuCbi(q;
zF}(mpjsSZVT~JErQxmu;;$|9MnDYiT+>ub8w%+XCn8?J#8<NRHQlpD<O0~&qbTN}A
z9T6OOf2qaN-8wLGVI&?&Uo=5CV=nEb4YX0GX4=Fwy)S9@8OhvMVcK478x%@Y)Ao9H
zTvfAjWys!2TXb^KR;Ic)fT&SBq%)7efz!~bqgpb)jkcFk2VKH6Z=A^;nRq%9GdCOw
znSB;!C(}jijCeee_J_^1nT#Q-_(M{qeNdIZe>;)%+spg67)gJ3G7<BKutB;I%lylh
zrj|8$XczPdz?cCSxuA$1_Z4xwVlKUh-X#4nsMAiV@cH?^);SPQ8%OdO-;aHpzt+y)
zWa6;VC6%tscB!Ot(ArAdVYYbMONO+2Gj&<M&|$<(FNLi!=*_*q;c_Ec<)I#I`i8z_
ze*!|MBWB7&5x5hKA2nnkO{O5`sv=?*aiC&S9-^p}GRCy*^$}6xBqWo4R*<vAkq+ji
zBwZk9u)F<v9uta25XNFLBOY#pL4lAmu`M!^(srHt=`ePe5sfAe?}{IaCl1HADXoGE
zBOVOUl_h|=3ST`Qx(2({A{)qnN}x9pe?zo+GxU|{vtr`;Me{-1)cjbhK^NE2^^%*n
zoRa%(w#9FR6^vw0CI;bm4)nodGxL^JVE`m=qPLaMTj^#ne}#wMfe?H}CSs;NbSp;I
zd+2r;H#Lw-o3Vg2v4{QxTU(LIq$APBwnz%O?p+Y7(@gs<K)>w^1O7y}KizBkf4A&z
z_g9+@Jq`ZA`q+S+T@xGVH=-G{2HWA?SRrhtLdl4&pYmdE@Lsx0@_8&5wbkm)$)quW
zh<gvTYosJEOiQb$-alh3gW&t<{W{%C|2bKg%KYIxjcW7(C~us?W+T-LaW(oNa=2yH
zRLg+HDjcP)5VGCq!*U;@4@)N*f1E@J(;9sg0w{%~<TlOcc3mPGHFNRqWAu<t57Nh(
zeAUHaEbsrMP7lzhWaZH|iEA6=VV&-$&oHe#-8QIdF%hh+jog{(vgb8=glSXtDV)~A
zUOf?Fl5%Z+hIGo(a4rQZ+qELT$_S;=V@#fi{7NU1QmT9fwc6uQ&u8iJe^MHuCz$F_
zE0y)=OdDy?e=@gj0Y!~IhscNWv%@@+R(S%O{R{NPQu;idL>&=V!-e&R?QdRshMtvh
zUxL5JjDao_D<#w0Y!5G*Jwg0A`if3Z(N~#7AmE{|GX+j7NOL#Xwd0XS-;^8R_3Hcu
zot~%vf{cN{zDw5}sPoW^fA~ONLMfH<(sv{`b@W{%g;b_1WxID}b!*W${eAj@g#IC7
zZX#YF?cUcJ{7);YMKI5DSoX*C6REQQW?J#a@iqDxqM6OEv~qJ25}sZCI(RAM;urKw
zoqkTg0=4S3sTy0KYZ_`j^c$!&5)Ye4wspg2puAQu{f=Iey86BJf92Mx)cHpV@+Y(;
ziFmUe#+h1*dCnW<_Am5T$?e~eAQZQfS;gx=5WT997i1!bJFSnT<o*kL>0efgdl{kH
z#t0mc2(RS20mV;q4%03xU(;z+rq0q(0@X+)p4w^-c+q5`e14Dx)0~N-v}7XDFfuQr
zrQ(2x-8#EuY2%g^e^opT%%b8?L1wj=OIQa9E=BxEC#*>?PeTcVL9|KJQ5_&G=G5!u
zGWsGk!!woEp~k)_iaak@DDyIUA9oa;WV%;HgH|uk<~gtu&xMSMct^sn3%oo}YWOLh
zkKM26<jk=l9`^D=SyMd4XUI?v?OgbJOgd=`kJkizCPF!*e+xS6_2Fn-g<ae>A&c5s
z@nd{e2`}Ykx!$G_K;s&nYh{4tH6E^?B9KW3=LV^lMkey`a%ihBGqDP^Bju@U-CQ{3
zbNF28H0L3GS`y|LoP0jhlIp@%Vv53$W%<Wwma2<14BN*@N)nr)wWxH)3$3QSQx!Mk
zFieXkteKyde^l1zi+HWhYZ%>BdG&-zi=7rJm29k_pyp`Q%l6R5u`04bR*?;=isa2O
za<QhgSOQwXTO^^ag>9~qLF0B=)v0p^Rj7G+8>(#X;O&Us1#D`(!)oPH*dJq6@5B;E
zmK9#!$-7G6iMz4cavR>uZ<4$H0S?M2nA#BQlZ)-ce=g%%MoZ#MMXtpDx)j?80|zH%
zmpo|<34vB*QC@+7vZu$0s<1ZR>M-KOe2Y~-lD9vWiKZji$bPH9YVdHk&ZZ12i)^TH
z!c6&POV?}kn|>ocV1WV>oy@W+JIh@#%x2i7Es;2sfu;^27_Q&2v3Xb9&V!qFG_P;l
zaBx@We})|gH*ag-;N=(!SdMbsIw8qveu6<y(Fk!LUm;C|0;p^vbq`~Axk1*9_j|eD
z0z_zWC(T%*9||6@oZ(8lA<FaN!fJDT1`A%z*GM`?QR5VY(D+)NualnYE25&dL{E?0
zJa3UnZ?EO-H|l%?zm@5dJ<U5hT01uRTYKUte=WoQP$rc|qim_wFCE@59o`?c&ymnV
z$Gamv83`MSPl9Xmd-!cA#UWaAS1J)jTdxi-`0c7$Wpp);XabS{R@x|8xJ@4N96>yT
zf8HS@elw%1SzJU4`|x0cIx9d*<99)18MK!b4L1{YXo>wEo$uuLVogg5rlQ9j_EPI?
ze@P81yz?=>y9DUyaOM|5T8~~dnlQo|zpuEb7Ne>$nx5%#GkrLbJhU?sGZQj6Gt$`y
z`2G^UkI~l50k8d#Vsg-{tDZvEVr>t9h(E0J`x$M|it1ugTW+$t2yUyTypKxs2g?YN
zX-?FLb%l+p!h@x%vzcxyN_&FwRu?;de>w$Ar%?CmV#XiK0=vEZasGr(F8<^UH=_+(
zJicxu-k&&RHnu5A+Re1lZG^zvfW{9aFvP|On4ZfI3^pDxdJ|zQGo`Amz*8jEO@%0r
z0seQB){>{jt(iQ#&WJ`kBeLk^<NS!upW!T2GQ{-Q|0|2V!DGj5{Af85qbseqf9L(<
z)remn-KwL$@w}pf4bsVHndTK)sx_WULs1$(QFs_JR+k`{$=W*BrRtF<Cs!VmJP<qQ
zb2>l8pJzI7%8hqQot=&sdnIJ^6O4}78;-~>u`6TsebXl#;qx>6tPC&ciMi3k&%xoN
zMk?KEHAi0ls#P?84b#xoH&8L8e~fN(R}xA1j44ji$4EcVFUUZFW_DUS(cHPNwKZ4m
zzo-tc`P;|=?d#9;@ON`3rDGQu?Pe-v^qA`-J*F&izi(w|Wt6zQ7+F4bhAvJ6{QQuA
zr1KB>$4stWJ2wVac^Dn42V`3Y(lUz9E=F@-i<f`KKbK1Q1=2;PFKoyIe`;6tz7`o&
ze#O6*G=G!J$7s}h8(Shht?{&}a_#Sc6jmI_q^rpNp8p_m{)n0CRz(K(`m@e2@n2*k
z^aJ_!H`!$&r<LWKuf<5AZuqAxTJGb2!4}(hY}>M7-A)hxdjh1DYG1V=UjyWokv@ej
zNR0`$#uS`zSYv4L=9x!Af6+`T(ywmYnnNL|u-%A5izso{<ojL(0w&`|)VdWxQE&+A
zYTPg-`f9Im3$27t2oKYOsW)8Ja!u$=$y08oLQgBUC2VR%=Za=^Wd-5YMX8u(d4)QS
zMO|HRmSi8%iW#CzCrzL!bv8sphdiPJ){GqrN0KS8s8scfkQZ+ee>Ch#Q)LgYm}`yu
zn9g38$V9^`4uz5?Jj&mv4#fT89JIQ&kZQGJmq(y)^~8;MLKX+A)!pJ13&k0z2E`&5
z$$v9iE_M*V@MNz4hqiVgMI>UDA=D+3K%cpA>_#ipYsBMbG^Mn<&ic^AS-Ja`Ng!?D
zM-$adB6-*&YIU(xf3|J9RF(zCbY^wljao7KP+mYZ09Bw9)zZlUNmNFYsqo}Hkd})T
zx>zR8VOsrva6?VVc2%AJt&1j7<|XoAJvuPH`LVj1$X&yT^TjG%tP~d%^lUqOVYRR(
zRwELmqNdp=H}@6^zD8W6iwnitT(e$yv7?D*K!)I%Ua^jzf0f?09$K(3*1cjQZP!JO
z*d&YNNS8;nqA)Gu!7YhI8k^ndlQ~cwl%eLr#@VWiHW@WaqKE}jcKB~i;ZBMhF{zcb
zOceVj+*^tcu}wPY_S`X$eGROfz75$&>Tid<tMS{{!fjr$OI{r>5$G^0Cv1}(#+wiv
z$9na=8F^wpe`#-7Q{ZK<*r$u2*zYC7db?E0vaj&wdJ1f7Ghe2QPGKPXARoxhWf^Va
z>99451w$e%Er-ojnUc5g@T?>00(R$BPraV#5xo*!CPrAS!9FO68ku;g*Gx88rHize
zM;wwC0;U~dmY$~D%*C9Th)X>rJmj(N1g$!c>EhE|e^^=s@<}GmZh1RlSBjvW6e*ob
zMY`bZun<ZU{fKc^5jo+K)IJh8%_V8>;6NM^1G+dY(D}MTa<6&C)za@f#WhSD#v`NZ
zG);9|Wp|f3ZThz~@5pO9^E01)p)1~u;A{6$^2*C2u9JUFQRG}V?_g5A1zA_zz|`o6
zPhg?2fB&!%Ndrhl<FVZ6H&jURrxPkTqtzAYpxrXT%6GKArT$3DpRw*GJ>u;J!C?GU
zMBD<N#^vormj$W%z_E3(4>8ad*Pi;Qe!``(xI?F%0<E)C{tXD6AK@W%2+iA034?}Q
z9y)epVqIp^9w{4-Cd$q!f?Y^cDaAo0<iRhCe|O>QD;Rg+87g;WX-1YRvot?TX9nA{
zw5+@)OO3~<wr-ftdz26t+Xkt8&j>XK+v~Eleuy^Lx5>%2M`;Jsr$=aK(D^uN!L5$E
z&hp*0!?bsZ_MO-&$7_e^vJ-?#g{D)G4$yq6qH0=8Lfk3;WQm-k_!Jtg(P#;=Mr%g_
ze`tL-6OED%Tsei;*+2lq0r74{O)?MH#e56ib@{gnmS~y}Lh3}$hidC`JcsbxUEW)M
zd6wcsbVZiZ)=%3A^#}Lw?--&Z&PV8K*W*+d3_8k>b~?+i?aa~*<#mtH+jFD0VDvUQ
zx+gbs2S(m0M}p;d0<io&kI>!2bl(Wwe;;gej?e?az;XIWmOe2=pB|#)Ba{s`xdJ}t
z5Iy=RonUHm``nMx(@e+sS)WV3f0^k?kZ#hl^tEIB5uaB64P}a%BlJ9QCF-{ZN1wy^
zx3l!UW8?#x1_S=cryb1FPqXyvCfDHTLzw@qns1QvWoxqZhm{hr5}<#!Kr3C&f6LU{
zkFxZ4iF6o9|5QkRiR2sy^=a;Lu<Z}izwf5G0De^gy9cRsghqqtIZp(D2FNB4r1p8T
z>^MfVBrUv;@m3bFX*ZQfs1gNrqt7+MuAr~vU<GSK3{-EHXJC?k3aPVPevB$|l3IMc
z_KXkXl}#?!N>8Q7r)Al9|7*v6f38Z8^D-%FrANuy<WY1zg>)4=Kn9G@(*z2Gqffw6
zR~N7=i4VSJOwE}Mu~wpFd4YUC$LEx6EgGQ*gB?TcFTW$pOOA7Omg`_Vmt||(B;RtD
zc2{s9%V!5yYWEU!gU=ONUb$y*^m%+#YCgB4Qj>zXotH^7yAN8kk4Vq1f2-hCL%e#J
zo10v6$zb51&o#vBv%IN-TeI9|t#FdO`1HAl`I0?8XR!Pz#=zH}<Gja*m%YcR(+6*D
zZgQ6&#W=iAv3$UJy>uY!<1*(5X^zjWz8qN&fil9tAekd<1}nH{h<i_1ub0c$hdHqa
zYYuZttzRj*ZGtes@o7!)f0;l9XNLL66tgqbh#OQel$*7LRdP1L;*c7mDmkw@Nt$zz
zoDMnJRO0jaN^*KoBiM5;Ux_s^%x{(^x_*Rj2zE$q+=8u|(*|Dl4)IOLXkkEEU4zwc
zR#v~oGJKYAug~&3kJ0K8z7vSG*v-NE5xx%o|L!5a>p0)Lb%fs^e{2ub9_I(J)-ZqM
z;1GYT-si4+j7Nw*l@~1QJ1h9{T(m?qQ!$Zmrv;;QKWSDBR6qS1-LKJ88hxJV6<VoL
z-J)~P8l`d>)khH?Jw;&wCc&%l9HmV~fPS6>8b!b?nTiI>`SqkvHE;b$pgB_jAtYM>
zXP%1FQ7R?(*fd#_e{y(!-mpdwstM41l^P{?|D=UdCEPhm+oe8qnKLFKa3|5304&AO
zt5jo6T+E{s%2zbsAX!y;=OUS3)VoSICuunn4T@a+zXVea<fIkIpe^L4&4AmB%z6k~
z?8D+o2$CT$9ieG-7ZTMyG=rX}GWs6P6a!Q)uA>U^R+=Slf2K<DeVQ$PM{~r#X|7{7
z`5g0Uo?{Wschu7Y#|5;|v60SjTuO@^Ve&h!q%$2yX|dxZEphybs+_ZEsdE9H<*cD)
z&Hz<A&!ZaWg;eX@O?A#B)jRts;Jk(!oYzvL^ENu$c_(Dh<;kg)Cf&!tcPYw(yJ|=H
zL=bNK6t<iUe_%uWg?a>^A$}U}9Be<%Uk-L4?W<Vzl`MZ<#VYL5=`uj6up|>%1%ER)
zr~BMZ+8|9E3tn1%5LAZwTUq{2lc$2eH_Sg#8?}NFMt_;*-;VH02(r$V*lK^O^kB>U
zwX7=3f46tx5dQ=FPp$4fXzj!%O-3xwaef(u5KL5>f7E@>rV`XDK8(B~N5maIS5ry7
zj0locy`*%UN5_cC$StX<z|xGABt)=D&yjOWQhJV56-YU25n7z%q=c)Gl>O=+qk3GF
zjEGW13gCGHwe>?{dRADqRB)?IBWXLmND--9k`S}TurVEM&x$#B({d~9Osmg|d5ST=
z3?ve_fA(O7Sdbs1WHjM+?id#SS>nuCg;;W<alV^n0(zP{?a|rpJMX29BVs9nsjEWN
z)gBxYpnWzhEzS+LKTQjLuE4Np!p}^4=Eh-h@gV72eXjOFF0aQ!rt*ik4l;<Iq!$o4
z#Rm9{D=RhwL$2NQBsFhUVz$>-h%HhWDL{=Sf577U5z!WG9}?~Oz9iUwlFI6zaNb9H
zy<<iDAi21`{v>sdh|b{tt$^5>6?@tdH5UdEG>653tN^=R!=k%3D=x1P(X8mhY$;-D
z`I^oOaRr7mV-+dm>#99jadf;;ZFAHD?Akgz_D<lO+fU?_3#(L!>y=fOWW|jY;wEX{
zf06=S*VfyL8pHDGu!)s7fcTDa&@q6LDF9T>Tp@0+9TM+6fdJn}{f>8tTWNr9QqNoI
z9{J=K`G?{HB#W2$uj=_Szbc=CMTvTr2(PHYbGn$Rp0mXw^;{xq)U!owav-paP2v&-
z-zj#>r-L1(>N(9(rk>@FD)n6ESSz1)e~S7k%^gMM?a}yz44!-+D)d~qmHFaj(qExj
zEYnJH7!~kerMQQNRCbz<%rOO=0#PA(HKKPO5RHN0#lvnpiA*L%`A`z%X4yt4k_%+U
z0+lt0^`ca!4|`&k%!hJ96H7I*43nCuapq<(M%0%W%kaAt#6-&|M#eB|au`d;e=t1A
z7i7`0;bqG*f&TdNyJQPw@%4&g_FvQ~^Q(J|hy=F?&6K^4J(?#$9XT;QHX&`H1SA_s
zDa$W$Cl1LjOWdl`UOz3Qc}RPUkoKy;@<xbZBJK5plRjYF1Hpzs`Lm$&Ine(F(%v7C
z_Wn%Mxs+z`Oe*8$G?SaCoYznVLGOoGq^Oc#q}lv3(%x>GEB2C497Ec3A?>vy?cIVk
zh3f9`zjzOxUSb}GZ$8AI=7;_VP)i30OlKHPf*1e*?J|?0Bpj3Db1{Dld|PD||9?r_
zdz)sjmTt=!qm&K0u4%_$Wds<EjzOgqTsLaipx!38?Hx&ONp7~`0~HYvMR|xi9xA?u
zii+5!h4K(_o1lUy4<D!~A}XSYsEA1YpD)RpmbTE}FFp5s-}%n_JLh~4y?)od0FF`Z
z3O8JQ@y0dpuJ5&C7ubKPczvWk)>q$DA9Is~PQvmWHx*90ahvODJ7HTHo0|hxCL9~E
zV;5wy$xMBu&q`$MruxDDaMBtKJHlgiZ>tq=J(jfTHO2FN*+ha1nE@+&6j3|X@1$%y
z?WFp-y4_A^D2wZBnvZT?6OP;4>)&faDFnLQY&vFda1yq{VmE)?-_oD9;t9KDN7@=3
zw9_r^sf=eO5=)OVP^K_<o3-6)Nm!}=ma}@d*)h*Rg~B0vHS0NvmYAE0Wz%Up<+Zf&
znAMxG4VXN*-AXJ?xG^hnt}~dIHoHR~bKDlek5{M?nz)nk);np1nj)5Vdb8rG&FRE}
zLn+&9*}Soxhvt6?8Kw3){n@nksKWA&DGce(!?sdVp0Dr*oXpadG=8c>1?z?G1SjQq
zYZcNB6ZM`7E2=jW%eSoK@^gZihw4g{qc(^Ds^n`y5W)OcD2Q2@Enf!*F$Z(y>ktKh
zgPg0up#d1EQz)bB>A!;-mUm2!A*~CR8ew3m!mNJVJKKMfK<1-0w|KB<X%I)?$N-k1
zL1Do-%PvoH?v$*Ph}&rcjRC9>@dnv-T1k7d26=Ka3!_<>wb0YzgH&80-0()iH=Zqs
zB8#K2N~9f4<D1<JOsrNgJvUDk#IYh^1=c7WK4k<aNYSo~h(eN=PKFstN4e>Xv}4Z=
z;zX>K-IIT)u9FciL9EL!ouV*@#;)tlxQVQ1pKW;qL9EYPcdEjo=~KeMX}pkDEM{kz
zkt>;#{S7l_(3@E?!{Ma`*d~RBzH7(Z0yrIKC>;3~4;eU<+U5yQcawC$S(1>QID0~w
z=(;H5*+~N%={Y;idtG}#?X#(+M_p|zNewn(b0vSea1QTypXDU7Y5Pq2!RlwqR8N&K
z??6<foy$rw1w#W{nRJ7)kYGiqohp?W<nz%Jz<GEl!x(1)_Gm?KK8!IY55w4&ure8n
zn2@x3kt*2eliSrlwbQ1$%my4PQ(D!!2CP-9Tf4H!ATAJ#wjoixj)f{>AT`mWT73h9
zbbo)JE5+OPVgm|?PMOxlQY6-<k&z&KwAS899Wp^|&s)2LT8$U+HaC%Ax>LK10j7MV
zogDNo>fi~+qUZ@tDQk4ZyYZd?-i7y)G{F@SPp8dmSiWU)&3GT)FY-RXOEPKCzz2(=
z)U4N~)0UQL;6njiCPl<=#p9D=S*T!gC9i+LhlTD+CeTC$4SbZrbUd3eaG8PgCz#M)
zSf_Fy!^f*|6|Sb0Z`?O<Ei;PExzpb11@Q^2t-^J<o|QGF7e0l<W#Q9wZo=*Fw<+l0
zsV-oL-lVh}aAPH-aTBdxFS*B{*2Rl;rq0A?qz3g!&H9`|Xj)DNK2Oh3WDs8z@-Khj
zOAJFkn{^|dHz_Z~SG#emWWraNYNg2-#Mh*iY{PAA0G_+9tF67gSU<lZCCtS)=|7GW
zPTxiA-5sffYsK3Nvx>s%DQ?+YDYf6i9iq**nb6tPyPUxenG>c<=mTc(;2z}U;4sVT
zc)-Y@g+s=vJ7e}>{?6T*??3rcJeq&E<8H1sXY}PWaW9dy&4Rt1)uw*>wo|-JL3{`I
z3zzTG8%3>7$@cZxX*<5rwsh<J9-~&=YflYk3zez3y|36d3kH>t82J7aVbeY7p#UDl
z4;0EbZ`u%EW8y~&jpKwRJf`hxj|8wEKbDeq;8<Rz!v0SJ*o&X?!jMb6gF}C05RZ$?
z_TmYOjV0U+SAHgQ#a{fpcw@Dg5|96K!p5e7w7Vle3jT^tX>+rQcwNf%>iVQ|)$vXZ
z)UlE==YPXXGexEsQ_a9{8L5obXKzlkkS=MMRO2Q`=^6Y!fZyTSNwY+;Xv{cEJSR8r
zj|!^U#GmO7Iw|9(B2@A(()WLCuh5=?_^Y_**Z3P%b2H5;PB|w2&apvKF6~l(k2Um&
zw=~R9@;~r$fPL_v#hRZlV{#+tzJDwDHg_H9h$VYG`5(MmiC6GniuT+NcL#e9Ulik_
zOR1+6{Xe`Oz=as2Av>H@+})8e72gOZ$7|1WQY`5Qms-&_V5Ph43$uTADyFN7@~bkQ
zSLO6iuahbS(Nu=Q!tqmdi3~W!2~kx_Rt@kKW2!0^vSU}THq|T|FU{9VxhaSG>YJ<P
z=pjnYl?uLPn)FuH0Toa+<jF}T?Mb&NHMJo8_@Js)^M!H&FWMWn4HXg>SdO<r`UNMx
z_MkdgEe@zfilg;xs#bq;(|C_dX5-Q;7*vO<IyrRMgw95$Nz3!Z_`?Hgsh-Z4WtOE(
zbp)G7pWanCVTy#=GHnu1WK78oYB_nUM&6R~GwmsErn7^d9Us4}s;OjzYCo%Fqgk|D
zGhz7PRc2W*)KP2@g@;~#Y4Tv7U!@{Pt78IcmEtg7=@i8W)v<ppAY3K$#_@8HvAsHb
zrya|BQY`9tbCOO*9<CWF54?IRB4Wwdvpek_dhAvw=m|!hSnL5>`o?U^bCPz6Ehh!k
z$<jy<Db^A@URT=s>iWoy5;(rkuX8fgr;aa6Ctk;PqW79jwVr`$<8zxzba{NypJ@$l
z5=}YGNTKY^CVPMFv|izZt(=n~ZASUrdGcrj2!jR42b+d`u4%~U9RMHcYj6;s<r|1K
z@_Ys1lE&!Pt)a3#n7?8V7B=m{qVOIp4wdi0l3^V7Ey&+I)Z_5{IdeH>lDq%v#!)Pb
zb~FxQVGheju_D^oGmIvUuFT<>>Q?^C;kaR(FoZ=poV<Svt5@XEwhPTXGoQaj(Hu66
zpd)(b5Z)f`+=q(Y{y8h|KsT9e$-&AY-rX3DZY4D-7IqF{aiomLBIQF^5{*<e<uK4a
zgk;3<x0)5Lm0``@tTlHb&=d}p<&X`P=dkkzRE^-`h`Af>f?pDinENSf?1hjyip!#r
zz%VYqx3z!D-x{n9)>eHUhlb4B;Hqe3mR7nd6bSL_Bi)w<)$XyULxG4HGVjDS3i*#u
zD(u41^0iB`Z7(A~>VLC1BoyeW{_HSrp_zGK<nZMYe6@S`*n`xsVhCT);r4LI7{QPz
zHbOIY<C*T-%8Fa?NXXcahnh51G-7CWhB!Efd&Gac_Z2xl5HUx!)Q}kpgbSev=P6f~
zP%;j5$SC$kx5|nA(NR1|4Ttf=>W7E%=rA73;mL@Z!!JT+#Mq5aaad(Y7Vc|`7A-P*
zs-LDsBltrOf2w}|fLX<Tv#0t6ZSji-wp7F@Yc*>teeaC6R(?huUu)j*dUr7e_*<-*
z-Clo^2&zi9qmeQRaP><g_}3kHEyv_lzMQJq#n|C-ZF70JMwv8Bb&je)wBjCI7>$O?
zd!qgt73?ajQM0?sTPt#EUTsBB*RVP$rxr48a%#ygWW*7j;)aM3;!=I}!#(ubqalNi
z7*$J2H>{S?ollZr9~wdxHR{NSS#}SMXrzDAA2Pb=?#i56!C*esxf^r&TO^ED@?(B@
zM78D=jen7t85S7chr>c;MK_iA)TrYpWkyruikw>8tuIiV;O(8^+eg*OQMnDnYTbSE
zosVseYSU-`RHIHU1eg0*g=_d;cn9vn&78ai-o|lS;1EYtf#1b`4Ije88vcR<kwAYL
zVFdn>Lx#Xt*_H{}a0437VjmMIokn22I!?nA)kY1IYEV6mr__b&3JtGRS7~^)x>3WM
z)QE<6t4B3_R6VAi1=JJj=Nf-jJulFAmG650Y}KM+K!trb`97y{fr8)S`;x{53Vy3^
zkH!TGKH?kIxIn@0_1&*=fr3Ba+oykVfr3Bi`<2E83jVb3IgJYx`~}}j8W$+|%f44M
zE>Q6Q`YSXpkhs6vzd&#eiNmK(W7)kNb^pUT29_D<d=<0DIQIn%l<S4l^?z6Y-)3;Q
zQNS3h__PG9;ixc-G1mBLX$)LSs@E~sz-3A;9%HYlnw}qtM5ccxeuh@doQZ$rI!$ui
z%$lET;I1)TJ}r?;A}aLM7|N!nF|b!t{aOs0f$Ax((MdCFG{&a+Ceb)mcJl<Cc`{jz
z!zfwZTR6;thI>aaM8!Sicc`!mw;8JCHTX#-&K#%VR)Go<*wT%b@r|<54RLvX;}sk>
z#tvP^K3yQ>NGac)`BXZvp{Qdw-`<PF$2f!IKsV{OaQ}Sz@e&RLmyzyTD)wcz_}36n
z>rkcEBdGc@OC>Sew-$4Jn=sdR9_IOCsP^@v#&<Ce@^_)ue?I2><5=K#u+X1C$Ums%
z`1RP~|36Sm2MA9re$SKMfM|bLYdzg~w+f!RF5;=Ecq52{A}9!6rn}Q^G<zV~)(g=G
z@h!X%!3!V2hZ1M2A|eBsnLpqB3Ca7%>l=U#%m_R_Je)V~+@=g}C<)yiH)y$aH%Q}5
zX_>1u@!~Wj)(vTrmUy!*trxT@xUrqsx;rhYE!EvD@?x2Js_@usZpnXeYnxfq_?d5Y
zv}VD!rMJc{C6P*qj7lO_yJRe%#d>3PeYN3*)OGKNAOtEGX~zU~s5A*Iq$ctsBSTI8
zt&v$q#y?JMF14Qj&IiTC%IFsuzm{F;Ynep;S@W8Lyo^Ei`x-w=WA+<6=`kwx3;$gf
zT2kqbp;NL}Modhc{JLmd<i%~78r)Nf%J&847XKRjhnFq|N{dUE4jhbCP)60k5Qc{_
zfSQ8}Mv7`up#Okh2{mrY{4;%AF~wD_U^oj72cx`Bb2p0;2T)zUx_ZI*$}=YF&zO1w
zdT6O<QThZ>O9u#)3d59>tb$U1d|TCd|4#I{lB_&z$4Nv2xv^tnOO~C4#tsTE#|hwA
zd0^*(NJ_YtuI)=CU7>pw$Giq>*gDwO(XzEkS73C^Y-L@ufgGAbVC#Ug(XM-UV{{ws
z9xYuvwr+zBy#IIZl`T6mbX|V=>D=#}?|kPw-}nC>$FIEi#pj6VL*h<<L8tG&dvNO=
z&BI#yn4ZrxCz{hE%^l5YGgmOOnr)c*c+Sk|m@n#CU9)s7j%ijrJ*KCRS*4uSoEXuv
zmfq1^7>(z&Lfl{(TZX%}Om`1>i(4!EM@rc&Caf_nz6qqBA2ss2UNrKfm_4o+Eu4k<
zt(}*3ZjER3<IQ&kNC*ml4Vk54TEEuF>VhsZi=$nmMJ<!nyT*%Jp`aJL`tz2pWwQ!-
z1ueT(JFazQwftz;-r-yIw5^a|kUwjVj_O50tCKbMC*|TcL4k}pp3j<EM$pBz7<ahK
zV7*8`k<OMZ<G9qTH=WikYqyry<SAEHZ#MF_Ud(IRt`RVHWzF<|F<iK7=YrcI+<%3U
zH|(nfeYov?^nG6qYc1~6?6F?U(sRREY;Qj($kWz-FicBmS%?&>7qspFp|?VfAzDuL
zVG7gYAo*xTm;w~!uT^0RQ5}C>1b1q3*ZPecHwqf9c|q5q+mh0mhS|l3xs-J6kj<#s
z*8V=5*SljM!<2o0JF44#S<SKpHMX@^$&!=X!gL9(Wh<zH!qvwr)C`B{Ck)HBq`__q
z(|T$RQ43u<2X2l|3bhGplCve-$aeLa*(^{9WLpYF1qJn7!JbG$nxKY?9+H#iphgG9
zLlmP<ux2sCD&XAuw)Vqwtr4b;w28IYENJPxH3fl9jkBVEdy7R)o~clGh<e!5b%wRW
zC_*!{I1#4HoeL#!K`jIHH?<|_$I&*v_!V>|?*}rM%vD^WYXm8VwUcibrtQ>PN4?Z1
z=$7lGchn4+ipFq>Eun5`wKk|3Q@7N-X{%{7Z)-+g)$$Wyb96Fvt5e;1q5wkAsJ5w&
z82OB<pU~2Oc6LJDG{ZO18K9l;&xl#fX)x*KZ5N{CaE-fM$Q7pR==u<~Q@@}MKO(FY
z8W7ad_JJ^!F}6EIN!laGYZ<re5=s4G+DA9Ap#~A^3mVF`j|DTBYVOCi(taF?5MbZ-
zw_j+HFdd{rtjdkx%NoN0x``11ecNjoW4meEP*W>^?1o}PwpK){Siec34~OVxMpye>
zo8+||=L?&&P7N5}!Y65hc6~5b_;{_zSDitPT4NXPn-;VJHN_a2sN}>xw_pj{QUfI)
z>_h;3==$FH<}KX;8bv9QES8=w6%Bi$Yd3Nl(%=qbROfIo5MnU5L`yyme{ZUBrt62=
zGGLm2W0Vcitptr%R%_RvFO+PE(6yXGCMSov$~$<wEkp%EF<NwZyFzv)AAo1h_TvB~
zz7X@iw!_;Qk|$^)MB{WjqN-HLXf||Lu+-nrV(+B8Sfjfu;^b}ij}^^vZJ2ZAJ&=>m
znwB1>pX91CP9K4sjJyy|LKfQ|ru*opSjbO*SFTlMlI<lUo8emWGa<U4kyJm+(T{>8
z>&(x>wzhe_e!|&v0i<Ul`se9mA^JJ`1#SS)ZP;UB`Z(RdLH-F$F_!YU_?ou93wOJU
zK*%rBFR?D46ck_Bg$wLF#XC=<_}FGe*X3<BRsCi94D&wBwdS@G`l&EI%E`8!euWKx
zh|bG~O+V}8>0d?42e^8NEi+rPb*}4S`Zbo&LX%>V{~+VuNXzC;HAiYih&rMHDw%by
z`PO_2{Z&n#oHn73X~%VSSl9Eat>qB=NHpVyJ=WQp?=$lwMlq+_W15X0UENT<d1y>S
zqzsjE8`MJ4#728UMYvAzSxz>IyV<0F(_Ke4Q@Phr4GYm-<kW?lkl`(=R)lJ99K&Gp
zICr}`QZ#c&19q`waT>H_x7f)S+fjX)1I27YZM87#%2AW1V<KmICXZGc+l0(Lt@+-x
z4Tn@stM0-<!!m4j%(e?wqRUN@ot!P*MtQbH?&6H)WFx8i%mRDI9D%P4oKS6lJ|y=3
z5yx7?3@Ei^!91Fp#wBsxYSs?b(sk(+)vztL_HhFML=OCQ^r^F08!Y8*Bd4Q-(+j*$
zq0h~$^mFRfZ-(ee`aIeY2Yl!jYGj(55Y$=O%rwn(D06}R+w?mO%cqbrYOE_%4$~Lt
zObET<S>%pV{&u4vXl>1!I-B2r=CoMY(RGtiaGJF*h3Hw%dWxR6xjqVt%;~ar=1V!f
zDBTX_&eQYE|H2%3RV)hq9zqSTo!w?p-<j2Okc!CseQs~QOfMo2<@FP`yD&etXDaK<
z^c7}*1r_N6t#?Ar35EU;8Y80jpiqYCs~pL%($|o27VO74=Jyvhel=--PBX%p@#|<_
zEp0?*1ePV}(jO^jLCHU%KMm0z)1UFl=mY(^W9S}m*S~a9&Nq-JD^A#68X4h4u(xDa
zRg%9Jw5r-ob65W+M6a`7BD0>YW^gh0w;_6s{tn%xES)o}g1Xw0wM|#K%-p($`@BKl
zV%L5fUa57ULjMT3jic;;!r=eRRqdbXJN)wz-i4wSl2GInkqy%q=^P{U`_)x+Z&e`u
zD_#P9W(i@+O^V#92I${7qa%X69Q^_M4?zM!`Cl-?f{!|d-r@es91YX|a0LE0y^HEG
zh-|`XDnQdv47PC_g)m;nfXcmM5vI`s<B_b}>9K|4C$HOG2L}6pW&A9LlzqsmdE0qc
zFKcU`*O&>vP~dqHVD|%yzRm*rynv_!#&%St;(%C;X6Sw1qKa4wbTcdu6wwx4(l$?<
zxnx+>i-wR`CK~4z+yz_rs)8$;U~;iS(E1_0h}ckzx?L*fk<_o>zkeSntANys{A*@(
zm{Y8(Joenv6@dqTs?RnL3?{2g;w&bi+8S|jNURo@%-xn$1YV6xP{g<<=AGvrQt!O|
zvulvlELuWhomh{YiWgUJ2~`2v*{Mgf{d2`A3&}y$h)cx=HW!|q4Zv!;lts&Sz|xDo
zqmURDQ6L1%F(8Cz<8nG6;+14{flx(sL6oK2gJ?w1w(WC&t2drS3%1Sks)yJlHiyJU
zaT%-v`Qv8s*nU(VvxFQe`om(2=ng`s9$X&hxJS=$c-y$u6qkzx%fQopiBv|*xEx_|
zrL%NZrM&SSu16W3caLkFHfhlHdLNt~7TeJPieAyjeP4~Pu^LP}8BEv0a4KR;g>Z%p
z-iU8;P_LbTIeExL@~x;pn-m1zhAZ0^OiyArUjgr{WuwvrHr$eQnpClmb=)X!nDh4q
zblExw(-49e?*$HBXKH@kab|(B1L9yv>=%cy!LYb{E*47#bU0y=LQ==dO+Mm(%ZP9i
z`i4;ih{ex&J%7QUvF1nh`W^a+R?6BHdf&Y5IR9pUag^PB%iO;!{a*zsVi@JQ(){7E
zX_u_NF<exakCt7#7%Ul~heTS8Ah*u6cjKC+8nd_V42UtPLx_0_h+{~rMfot@Z-zyV
zJCGKE$g8hTZL+fr2s9)OZoiyRZO6}QTR^}>o}ASl5CCoT{bOV1iR2VIaU3WT<G?zD
z68^z|wbI9SYlZ#H1K1{wyuPQD8`g_*hU!s$6u8QRuK)${RnLD?lVg|`V^rY7CA5@;
zm;ki_{9cT!qp2fP)NqcLrv|2|Df%?6j6F?}j;Cq$8R`2Vt)YvZP2y#2@nfuuMa#7A
zP?<KIrqEgH8knT3V`aK5HSiMoC#Qc9Jx4u%spJ%GeeNnxx3|fA@ndvxw8^_UmGG5m
z+bIggBKWxa&`GbDoPHxV5PgPr2s%Zo_gPX>1D=kdhHIl|Y1hCxN~V$`Iz@XY>673B
zw7rj1vmLmAtq}D*L#ajdJhfoHC6!7>8xBv=5h#0#+G6tjb+L1FGb?x$^l&QqA}x)7
zJ?DLtf-%qLN%D%9s*lKAaKvIsL<NZ07hs}A;&%MrL5rthY7bkwooE`C^5C<@rRvC|
z(3Z;DV)B7fs0TD^G)1Q24`%Oi83eN{4twjR)6~m!i$h<7ueWLKG<>rNGf8;l4k!?X
z!~NK}53^$sb{yXN7{oq|*-7xd0bsm;g+0^Y3zAMFu2*@Tq4U*_m&kjjVeBmB_nf0b
zD&dVykyXEpz7$CKB3^dc9jR{r!_*Lu_&iPiGX2CP+)bZo@-KRX{r-A9;w{t3GJO>L
z@5lZrdcf1|Yx2dPdyG2cO}@+OY5MN7^k6E1%@4ugbrJ8fjb-}OA&AG+rw^Tf^Z^lH
z?_fEPr1o8%1yGw?u*ZWHcXxLS?nQ&U6)jfWic5h&(L&J_mtw`;rO-lfw*sZO6ewP_
zSYP12x%crhlgZ4^Z+Fi*^L?3on{)R6VYgOClQo5HdPC|5zEXHcl4#Pgf4=PUd_uL=
z05!G4RczFp+a!clc&B+xg>wuFujYxXsxI|9hT_LbyLF!hb#cOxgi+o^B^n_Co7yy6
z(jP1a)bPV>o73*~IDFfy)v9JzAm;9US#Q!?BPqL~G*8NXF0jn%-TpM=X5|9S(xSkn
z+-^VP#3Hif^QaB8E}w)INtb!51R(9NIAxlC9`VsD)1y{*H4Oci(1iHDS*K^~<5PUa
zgWG<;H|gfjj8_A0mG%jKAI1!xatW~TGwOF>CQ7@Qn+l7s*(CLkP1cvrxEP$Z^4@Xv
z@2F4|FrS<t!-Ln(9UQQ!pMB^VK2xyW9k))n>t!_>y7*fz3z;^{EQC^?c$|@Wbmmy%
zs7(sdcd}mJ@ZQOG8y{sOS87a8p*3`hiQHxT4)soFUP+1sj!O|RcldP{sIG`XCASkt
zWm<;3?Hjh-O_a(gGE4R1oM$-uhj-aT4hv1)Ri|ExV1cJ_MX2%$fWnCpHLGs#RYg*E
z;6#2Od81}%3{Hk<rnuFF$({~RRgTwbaC^9at>+{8J<7p;#-_lNmO(1cS6|J_kA;HU
zAzNPL#$HVj?8mx6`TM9Om>$uOG<XB<{rMR;VfCc*{MSFX5eEH+*Inr|Id;ETqhFKs
z#R=Zt5Zr-r)<OY}R~omTEi0}Y$Zq;YmnO4UT4ysO?BaYX+ioOqctM+3$YKLLb8NZ4
z!e3lvZFFEODJ1x|(`O_Z`q1bTNpJhU3aLYpHZMRCvt-n!lHAN$2+>JhovF9<Gpwj!
zY4FE>Lk^NhBvp&0OFE7Y(_pwwa&>0Q1J>ceMG%3duGQp|?bP6GzT*7V@B+NZ@8A$6
z18q;%T}|j%IvSeLf~$k1&vNojaaT_Bn>oA-t1609skdIudc-X&*XldQ@fuk~?~#Ed
zXX04m+;uGH{)C{Iiz%)6^t<<@vc+_uf&<9`9qk;?+B>>(%xj9d){hbfE@-7~#-hoG
z*N?&W3(fg1pqfFSmBgIf*-#Bk>fzo*ljFQ`O<#~H<gznTeR}8$EobJ<TMbl99rj;C
zmi%}-$NaSVox^zkzx>}qrsL~6W4p~8Efb}BsKLsM3oLat7L1;nm+(AIJ_OHsu(PEb
zmw7c?nX;x?T*?=#wG6J_tKhFKGxnQKvburS0~$ApS-<XHzv}5X)7%-|@iU6F1NIgw
z4xQ8kloJn=_~TVqK$jDjQm0qW6U@6FNk0>J$8`*+#Ch-FJ2>pA((loN(qT60_48pE
z`-PoIDMMkRoBmdHIB}QJvbE6fm4BlFGYmY${lPFwKOMRr46|L!^U%R;;7+wgR@i5d
zOn~gN&d+BS6Lt0_ar&w(mgzdr`Uq>|3dm4%L4x)MYns%>$`u+L<^Eku09>V320r;1
z6aAh(5xf^#+4V!cD9-2m-qopd_@}eIS?7KB4i#Q?(_FfgVg+3Kvr}|FpbN3+_9Z2|
z!$5I6v9e;?xelxar}w9#b2Rq!sY`FR2k7+2xot~fJD_q_y(KXf!9p}ImQYS56{$Y(
za0_YeWBtD6ekh#8F?v>F;sO9;G>`ww3w;m(!wt!>esIU<V5y3BwlLJJz!YGL2n#EG
zX^AP{sn!hjws74?vU-1u6BJHX`HmWP<d*I{^aO)brXe|d-{vCw^z*jr*hsUPStq;!
z6b*VZIaxnN-q;r#xHkLE>)X6usxH(cVEAX^R%^z_H>BN=8YFBaPC?%iQcR2e$Xfg|
z@Lu~OR&Ua;%nWGYXcCo=Bj_dfa>0DA=g?7KlbX!@>H^yx+FXMPE&Q;6k_3UYVyhxI
z=ZYbhy_Z`_Cndm2QNKeN*i!@(pCsi5dhxA#8ShlXAKuVSu;<uEOG#5hcVPEa+o-7y
zSo;UQd|~cKi*?mN#W3S-0b>>tb43bpPf8TYJeKU=z~RPxWQ@Sp>{~%uSFSJFGHCQl
zEQ-YmJrgu|0~65)=@^jKp>$V)q#G8MLlewza~2E~NRS?1o~?8z+LU6+PghYaUD@tv
zsX&P+))C-)9~8|5Ys~=Gc^5Q~G(}6I7bUNP>L??UPaB>1eKiS@YhPn(jlB>BJ9m!c
znuXo!Y>MlqUy4Exs`h8~=fcW~Whu3}20k>GoV3PPjZK4RMM($>yXd^ULe*)ZuLbf$
z@1t(U8AlSTCTIgF!~}4&SOzrX34s_>nTcw}Z<2ET(4c4Ec3jaU_=8`qZP~uJk+j&C
z*o1TmGcE9-AEbG%(f7qA-Ubg_#i*GihhPkI4pWoR+EC3cj2LAOHl*bdd2E2zDBnpG
z&uA3pO*edGVO5FDbdIFEwgYT%Mq2Cw#pdJ=x#N%Ivi;6-d^g))BsyE}e$ksiq9bly
zydi(M*mxPxH;iF|P)3kk21=L!)IVo`|E9n?9w{S8<Aj%wR`W!QgiMvo@si5L$`VK;
zzIdCT5U8eMT?EOYZew<%{YkUjoxIwO;LB1g?`a`0vk`b#mT`aU{}&K!HII8-_i_bU
zgIBIGmm>+k)W)4fFNbKsy!3QL<uoeIm^Uo$idTBOG;F4uQ-_(Ek3TM=E~<k7UE_rq
zSiPG^enV$$VbwLLi9aGlWkT$g3aphLU3q=lZgj;)a~g6%fz~RhA!*zh2VNBW&lFqR
zYy{%|w%~<TOd{>yNlUGS^P?J7uIvJS{#VAD#5H35gxAmN=f7ZX7Y-5eBk_-W6%C`q
zy}8T$7(908u=gD-l!jJvjy%oPkT)Gd1av|zF*_m7MaFE>Lw)W%zu7rj)o*0wOz~Oz
z@?1zW1hXXY@!T|hbm=HPtW%}K<8fg7G&OKvE{Tjxg|mIwOQ%FMK`BN9)sEG{O$O4m
zk@p@Ubu(2LUDT7$cdX2A2o~z}Z&ovp?w^4}x%&bmRN#9)89MTMTx|VFJw3R)S>ZN=
zYl-rTV8*86unCGHY-wT|v2>y<O12zKv(a;2TFr4uFD=s}VDJf}ZDCh5Tys$_M{x#^
zo|n5g<@aE|V6gHQ(cAJ?P9;f2+xRRTl<t&0k^>$T!oX`G%n{X4ut@RJK~WGIW-uj=
zQ>j(VA#DeyC=vGh?-%2cgl5zSDBw4H$^v^hi?g`IKHEi|ML?a6g?Gi`K-?O{RSoHD
zOstehlo(6p0olcvE-BOK;d*&~Xrf?J_2lr>AD$9g&c3`^F}4VfOUf!~gNfM%N4xU=
zaX%m!i8dYZ$$2_HK2r|y@ryAuZ@CC9C~S8euhb1Aq!UX8Uq}ndD(X7BLU2gc`>>JU
z<sujBX325Oy2^eV(CM;Adjk^kIx@n!a6z;M=H^q|l3r)>WeGU14Ex2c>LGz$2kj!!
zFickTd7?ZpC?k4fFl@=>)$T(M#G(d)vKamRP<IgG(csrm5~h9mD!#=^O;)sZHu+cD
z*^ZWc%%7oKNl`<TAnmtBByCtF1cjw~ZOjyhhFH*DgwFbQcX;7=Z0Hq$n8ZKs7omxz
zW>n?rdM9z0wP!d_9EP4_QZU%)bL4^?Zg<w#!iIJkQePskU=sg%Zw2M1x!0!QZ{tb3
z51$wJ$+Y+d2a5efdrm9bPUR!+V|dBd1G&;t9V|4y((UE9Az6NX_qIJ##w?)88tda)
zQ^S~cHD(4Is_IButT`3Bwp-+wwI2fXq+qLQ|0|vQZ=;lfM8&TO_G?#Q$-F~LL%cPW
z2>ec^OeyZ&&*o9)fcz8LTS-yu%j4v%$ZC71%Xh87Kr{R%3Ra|*L)Nz?Dun$D3CC!i
zR>D6tIj)O}Uw|N17Oo~4{(jSQvH6RX{HU_iaaJOevC+T+cR@wU#>;J>Q9f=Pnar-)
zAuz2n8VxSn1$4*?0qTJNPX0wO)I4znGRW!O<3jN`>8y<jzK}2L=dHb=yCFC*Bdf_$
zV9#l5V{qOPg>8l3zH^Wk4hg&1;<2o|#XZ2ukL>ycB@tCZxXmb8>%nIkpS*M;zxxy5
zjqd7V1(X!Z7-4S0sa#tkTVCl?yuTnC@ZCq^;vHc$TcwZaPs;_zmt*|-L*{a(`VDx~
za&H^m*$x#L*<u!TxVlZfrhXR^r<D{W9ZmLoSYz)CW6nmV?e}67M%24=!G>EwIhewT
z&T_W{rVZxo4pG+JhgaN*7YY^TfXP+LUK}dzU$P`vW7sDi$1b4?Q{+1sbM{D$>?B$f
z)e|Ed+$Plp2&#ENkUE&%t3f3&O_YxX$;9D@qLk>{<6RMTrdO)83&&BN_I8R35f|Xc
zW&%K)@t=_8te4<Db$n@p{&A_iPh6jjr4q^p=q}(txw8`<cdIc<^HiGCFuYn&Z$|&I
zWaDFu7yBUgh^*!W6D&u#((L0~GUc?cRlCSaKmD7XE@J!hQSH$jR}eLzt!2PkQW42W
z+{#GFC@~s#K7sAmw~TykmB~h3J#L;Xp|qirL7+h%*rv?DqL;7!rNF0TUOhEI`fr=M
z$+OyM<F&d26WTVUjq<Zw!(Mv5sP!^B9>T9OD(v2qMl)?Vg_1H=g`a-^9{$~_tcPr>
zAAkej_4%bx^nPnTFFemu!gQUq3Y*GD@&<h?`Ri<FA+O4c0k48aTgfYwFb(_ABE7P~
z-HvWncCb;<4kOJ6f@$6lGTD15Vcy1Uv4*>Mi(_os2Pc@~z>tB%FRFeqM=d&+5k`dY
z&;y-6XxU~%n|pfj_m|3}V?7ea<lThhUK{(B+SdL{bW+|Z@A*s0K9uw}E#MuHv&qM!
zoK>-ASW3`NP-;-101=_m$56G!p_s+%*~5#$Ae106pWp6B-@GARIlSOK?cJWMt%Vac
zq}=#D2;#G?VgGi3>`B-Q9%MD{lh?Opf^M$`8ciq1C@%KxA}?Hx5qFx$+k@#&$#7pv
zZpJTOAdOyxP}Zip(OpRO4D7{SSdQ0p<@*V&#~dBY#?pGeHoZygLkHU2E3C&*pYV68
z1vt~Jx87cLpCFy2<SIbiKazsUg^j*eAUbpS`T7RjQp(dcXW+yx+II_IGPMY?_I0bJ
z{T86TAiUBD6K2Rl#NFwZlyY@%L!EXBc&4pxA~#IDqZAanL(D9WZqF_LYaLtS#Etml
zX<xr-z%ss>=Lw^0z+^99&Q(|p_nQrTuAK88X4Bh5q365n>@~kaGy=U@x*d<N(5QM3
zTdweZe}(j$+>%zjSyQ(<dAZ(<-u92UL^B9Z=Lo`+YXJV^0}~y%e+luHiIS2j=g8-Y
zZm^%KnMG@nLaJ=|gh!-9kj2EkJ29x5mEOPs&&E~Ka#YfSewYiaq*)iqfnwh)+|w-!
zLHLz2{e_vCT@T+}wh#NPv>)Bw9ra2AD*8TRFvnATpY>wlWhho?NqJWhTUeiHz)-o3
z9?fPPT?Otv^^chT+@;5rnMD+7&6h*<a~HQhO^DvHzRuydL19A7_LhtZuHY<&*HHRc
zyW-pq+eSS|?-QzrL0mOWqN50CV^On#Vl>Vj%3#L7@~yV4fIVleAQAc;_zbMgO=jO|
zs3jsRC*=Mvi`G^*hlFoaCWQQ*>0yh#qy{nPQUZ9@I;~lQDjC15VhhhW^5Ud{G4Gu!
zAx1VoXLu%t(1oZdNJR@D0dl%W@>93Lq}anm4WxmR&Yv;WmZIm5;oQO3KYg%6fEg(Z
zXH;z$?ZpkPn>BiKzG3%caMj-V2kBRekyBZjgoL?WweA4P3|tJFU~-#0T%l*HP>z#E
z8UR?*CZ-yM5%NozVNq53_g%DodfZ+Yz@@7)h(kI}Skp^H2bDV*<>&R_&;f=JiOHC_
z6i{}>q6A~K(z%218j@0S+y+QlSBEo@52k2-_A1mdW%%ebZ|;a9z&Q%7{{X{OPehD@
zHKP|(O@BCDEGIcHUoq<zAGaY@5hRlpodx#pWmU!)-XqErUDsA6YsM36I@eT1<+v<B
zU?=&R@wtyqwx&_vc*dDfKZdO$50OuAh<q30&ue1ntw|+eEzZ}aw?#G;)@ht}?xd1Z
z;tlH9Zhg6q>1Oe75KkM<e`Zdb@;1!yaN@O4lgqJ?7c&59jG@oPff8^qR~sQ%iMRNT
z$J`r}a%{+oL;0YE-&V%hE1n}+Zs=RqBIXweJ3a@l)-5+}ETmZ>5Cuf$9|OrE1?2}W
zC1N{;6uM|i4qS_s%Ur)03D$D8U&o}lTagvo*E?ME5dZZhTxN7VVp!gi^FEP<`1*)$
zte473PaSU0rnx-mvYK!kjo}`kf@vZxU=<Eu<2OA${_mqk?BbC}cWLtEK7GqY*A212
zHC$#bSC((O`k;dsOgjeVQw<>}z_gHv?!IDK8zFV867>5Xj{qN(&?NH-G4rC>uj@ct
zBQbrbyD8sBD@|`tfy8pjUu!f>U<oY-i-4=K<Mk(n$ohyJY;I!*uD#>6U2w+ik-l+v
z{mgt_TViVEb*7Ea(ac`{y|h2p_>CI|H&E^`c+Z(y@QlYV>N@(z*Z3PZ0&bo~-6aqI
z2AN4Zj?`1Um!)S3?keti)z@zD)mkqqeN+^ELkEa@CZ1P)E$0x^U+(@9^!c67kXMOb
z;xU!1mC?7}lshRC!J`dmMiN-9h<=U!S5W$b`^_;bH2d6N@h<eTG-``40`tz_S64qq
zT)fBtx`rF{wbXK+<G3M7&zGsf&TCI?^TXa<c&=Tj`6YW>K|{vqAyfz>X~V)%-?KHR
z4KBN@Ilp8@3y!T^!gFx5hw?W<Xf+KvliqMfp3YSI4XWhL3H_LMxB__ZBPw+e?(y~L
z4#rpv4%bXrjn>?52dLOQYatR}#@;3ZxZ`;r5fh}kig)nN#ouF6Ewf?AaE_U{Ddv~f
zuK(`fH?t9JH)y(a0#>~ow={O(Bzj2a+x5WJ_h;U@TJX3rt!H3Tb6k$MsWyKd;+qt#
zCTE0YQYW&M&*KZW;9bCN!QsR;^L@_L>%+eMIT`o#CQk4^^L7XIxCP_Mf}*mf3>7g4
zjcy-f4=0$CsMwT@Wda#6doKK)7@YSpB$U?=r`B^O@EJa-XwUXNC-)=QSg3J&|6SOV
zOz6_Id-B62Z=vp&VhK`zrspBVRvW&5hD4M(-^N}MMNY<6jtK{Y`?KA!<+HSUrESH-
zHpZ^-?qU+9#XlNPypHX8h8l|}p`R88{c8?aOTu~zis<O!tXaiVFT7r`nsob2Rew?y
z3)!|4_X|I>fm{Skxy3%~s!H6!9r=hOC|ShnFP4mPD34EOxBot;zk7m}{G%C&hD@~g
zbI-V8B0DF?@)QdmSpD2zrZ{QYj`z%3%vvI@x*Dgh%WVVBF$Cw1U-~(Smw!qpZ<EC&
zdQkz%!$}MmO%6ZyFfOmWsBlSofv!T+({1N01vP+riCqd`_!7#X?wfJ2&ork~i*@m$
zd%=4DNT)V7%-Ovr{zDB?61n|ng^5XZr@~qP>U{gWOQ(G{0WvGw)GRsrOl1{nXT-?l
zd0l;@Rn(XCp)ZRI`{nZgCK!zQqk@Jg^vPELJjx5404-bdAiTw;h^yDCa*&ncS4b8W
z;RkUL#S#O`SruC4hezTjn7jlZ0QEsu=YL<}_y9;Az62zp1P2Kh2$9o<V3!giC=)$c
z=^#p_{FFuai`Zt!0Dveq03h+i7n|%KN`s8?!JpDGls{J$mL(OIMf?f5P78p*(aAqh
z<e&(zzF8Qh4AXFW8ZQq5E;FP!H?aMk4}1CygfYTTqU<q4g3DMTl;vy`55n(sFu(@Z
zQu*nGZdo6p_vMU~j~e5!NMkUN_erEEj(<jeT+W8{s2>fXt{_Cn=K9BKSRq9DuX-v>
zN}B13Zv@W+MGN@~D=a+B=RYaL|4)uVP%34R9+mtc8kL0bRbmj-N;=4!5=O)a5i3Y-
zB@u$91OO5s@won!|4Adk`b0m;c_{Nhk-<c+q$&TC2>}3jo=^xN0E7xei~fJKlprA`
z)Rg}zPXGYVpLobCKX@oU%!A@V03jZ>T2!#r;(kIUt3tYJ2q6O10*H@2-Ce4Q;G@+a
zZ9z3C5U>*WV}So!Tmu07PXefE{|l4X@KXHWetfh~z)rpY1(_)xnzwz24W|w^9L^_@
zjRg!+r1-aK84P;54h2>)fE+?&ijDy5_6DITp{MxoU=RSn_9PmD^&>1*%ZB*4m(Hb@
z2>xf_<1jL7StuU1d^x}}Y{TA9hk+3D2oZ<SKhFNY5+?va^CZLM`$y2Aj)~&m(iH3t
zp?(4h<UB&vb&M4MmS12gpI&-Db049<DHM+>AD*;$VUcWLcPH1AXg2weU~n44Bl!5M
w7PgL>&;I`;?us74{(3&7f4)He))T^OmOUET8<?=@0rY@XOqgfw!}rDi0KcNoOaK4?

delta 37345
zcmXVWV|X20*K``=#I|iaX>8lJokpk8iEZ0%Y};;}6WeLhG)ceS&-?w@`}e-CJ+s!V
zSu^$txpxNH=!yz#X{~D|!Rqmyk#lN~X&X|PN-VC(*S{l4u_MT_%(!w!9}$Uk0n6R(
zL%pgVFwqG>LG8`I2L|;5AqL>R@p~M3nvbIPkUGU1UNfg*ZauQPW^~muS7cbUWCOm&
zP{?3pP$V2-95b*Q&5a|Od0agz$|zeVRaw(<6XfTiP7(r>_dccUn9+Z$OIAQHIvk>h
z-e>>h2IYFA7XUz^RO%fk^G>D!fyWjAhD)3jY%kZDE?g1Q*iyD{vH)#Q_EPC(p+ZDo
z$G6l>EuZ$n!Tme2S}Diy_50eVaJN?#7Y<uv0+(n;SU8zw(aWC7xh}rGOL4+B!G#c%
z(6O-3@4^f}DRf~<sM72+7DQI)zGTz(^8Wnx;kHt>R``jmssIO%c}!MG@dX0H^-IbZ
zDWa4@c9N7UL2RIv#+LfBDwa`1TUZ--NgTb$yk{XDga}iYdLMp2q=-Jw!N%7|lq^9Y
zo1&b|ArSu_@%g>sA`&2Q_<H5@irE(_7`(~RlN&g>>u}xtYqFt#F9;%Ym}2<P$H(b0
z?-b6ucX%BmQgmA#7S^mCmr~51a*G;d8QfH#aOw`)GYepzf3-I5X8pRo@6-@ayO5e{
zHfVESX%)cc8CcIHXi}`-zJ0UjtcOG0BcNkLht+1bDc(`;r0T8GLE@&?CuEe(Qq%QQ
zWA|4uJC(ii^y&!ZG6n!M-T@0a<1(GjK3&hyodDVSQcGOl33gaMk^^vkCv4o(;e@5r
z?j3fba0awW%xxU9z^ezrFz>ZQt90lzAoLHBd92%Vhg~=HI%8;6Z;I*t=r~oAQ^(Ce
z$tFjU=&C6`fx|6I?f?taoq*2Q@%?a>ww_4Q%-Uj_?EQkM+vm_GPu8pe6lveXxY+Y^
z<cDM-@k_0q$Vp@XxOlJvrI+zl3V1e=^-d!GbihN5WH-YREBvT|7;trLaLO10LHlyY
z6;g(ao_NU6f(>laZ3m!a!*IQDy5e_qY)(ho2=cabN$zhJa)pbf5?==6-{4l`i3tma
zC?Z6zT;g(>&7Vg8<VSW`p<RMDZQjM@VS3_+U2}<(`M1crCv2qfo*DU3<nOD$LO5-1
z7J+(ho>BP}62RGt^}eAThhTWwBoT}c6txFgn+IJoQ(LR26eSpr<m;jtGSHb}p)GE2
zWMZID+Fro7Nbv21BZ>JFghhedF~s`k_<91{q-vf($kZLm;kO5CyrANi2N;X+hK}}o
z@as!OVxzbXf$(^yWI|Y`<mNtV{Sv&@HlZlBa*~y$#W(xE@L_RDu6+}t|AF<>sN^Ir
zB?!|V2r1K0hJ}7-BqX-ERHDXKwUS8|6(t8X#!w!>zSVv0=Gwk~WmGdVfqKvTDu$UV
zi3$8JI>i@APR3=|qu_0AlW$|~?fvVefV3Z?mSX(w{O-=`K2+^+tuL{y$y(Qo(nU9T
z&sCVDGnngR0LM~i2vZ2_X#2Rx?i$fS)bXtd*ra`GO!pu?%pSPQw&M-hGB)~l=NjHv
z?K{-KE1UoTv+&+7Ys-$OiPPx_SUMqKtF!#T&Cp4YDQDIn8)s*O?Zx0qqt5TlH)Vr5
z#v&SZQo&-HXLf|{n=dmemu2lh49_-ckP&y{-VBc*0O3DC(Hp5n`BHJka!}Q3z=x^<
zMQ{tD+ULXQ*<(e#%Ls+dbSD5Hn|6E<=X~>)+?njf0$ctF-ho@JX$blCV`z4vyXJ~8
z+^}bP&$vO)zS}t#gIc#u*%ivLFWKM0>!-nIvwYTjbA_%i^IV|0S6i~n*6oZz!EeE}
zX4zs-HBP1tuo-@B6V3`YUNifMI~HU>UZ`(NITas%uRt*V2`qLk7*;~QCjrYuM|l~S
z1M&Q`t12hy5_>J}0M3dxR$gv<=$g;jJl?Dt^=s%L+F@IuGen!c|4_6oL~`bMNPKsP
z3{<OFL#$b`(TMeO1HyCkx=^qj0Ylub0A-wYY>U~F7nSYof-?>~AW8A4y2-+_G`)}f
z1N+(~`BOnyHQJJp3+vDJqY~JCzFii<oQgKcygXY_-0$4!22ZEo)7{#Rm^$n1s2_AG
ztX`kNomPW!2=9~LXK_DEFGG6^f9{rCix~vp)c+sGzTAq?89+inv_b!`Aik4Rr<gWV
z0b8{kG`6(SgmDd_qv0D8WpZewVE}F6n2M2ub_8S%D9{3KL$T+Ioa+yx+6%*!lMBif
zze#6L-@jYZFlQ~4eynAER+ckPD*D3Qm;I7$n-lK#nZMax75&>6h-!+s#~}p#b!7&&
zX&rh-Hq%+v(=yR%uD;Pl9zN;=|I9wt1j2yp*<fCvnb$fi&b^9Ue3hm(Y}Px^qiQ!R
z?QmRdrT0tp^QKgcr!m)=uQnTal~N!Y=2~l>=&rKOkiZ1qaSKXdzZP6@c+|V3SWUFj
zbA~b-Z08Y|k<m7{;vm~~N2}rNv6jY>=kf$IU;60v1;)3x`0jkyh||%oLyWCw;JbSB
zl72>_X$Ofz_Y(ZmoReF7cxu265&|)RIB4e%)WBA$;N~1X(r5M)1WW<%>I!|3QHIs{
z`;Ojg!Q`D?4B4n+P4H1m4B3I4$IIc3M5A-eoE*>T_m22ewptA*QPmBEVq?caEAk`x
zM2R%lVcLr<7;pIMv@tf^3!c)zF$h@vWVbC@zVU^_F#m6lqEgCuuoUA;du$#rojSk)
zLMa&ByKlI2he)74iD`^JOWOv70y9sSLdLWT@fUif2r`(Aq*ONqiSaS~W3eF}ENosS
zo6DwNGeHCIFn@rf(jdHa=!80evnguFroVx69AEjI^tVjQDcD&(QLGIZBOq&mCZk2S
zCJ_L2?UYy9$B%Ef@Ov^~(|fLto7wD-Ptb}KV|WUn7jBx&EZVFxEyYry*E%`Was_*G
zB{C!XY~)GgaHo%H;l32z%&q#*4EjUAXdkvd6HGJRROTQuXppi;ve;#6;xH#AHh)wF
z%Qqe@^$ytZd5ULL8TkV&knbV0AZf?PK;pWy6Ijgd6N9@(Z-8#@re!mB*2e~e;NNWX
z<(>%4djki3OMp(M|L#9VegX;JZ;<j`xxbNjvaWdijLBc0iZbdWpWy@&3-?Hu1o7xt
z;cA;37C#7ZoBJg`kcN-pfRqI&MNKA){h^*&`7|6VOIsap?zV8h-4BTC({Q(1)&D*}
z5eD?e831ogMJ$=^HURfGJ%EyKnHQ=}5mSL}_2Q&(RKA!nEO~sCFWVIksZR@+F)b}%
zuBtQIP;!bgx=p!a<>d<kH{Hrc<m<m*{v%z<(w3?w6a+*H-2X_|O+}reOh5~~G$C5W
z4?<xAFr`RNASc_><Pb7-n?f=`D#64O=%sU^osDS{d!tN;ZDh^PFhSSJ-Qu?L`j2jI
zDsZ)yJGD$FPc+mOycO+j0SiBViVmzX1kTT}IGSpR_s`@$=D$4jtb2Su-1`He7ow;^
zI;<ul%g+I};!4UM8c1Fd$tl1hSvtEi&aR@aE-UHf^sy*skI)*FiedWID4Ggi_sz-j
zJk^&{dp;qIsnTLQZp_ti6s5~6zR$04_nSsizb9+W&<3;AOU7-dXH%WsoiDAUD>=8l
zCvX<KHw8AkiU|r3dR3vu(1@CTcqfaN6Xt@+r<GeP9JM%o{g)QD;A(-M`rNH}b^>*q
zDD9}o*=x1@x#$CdQ;{`YhT`ABub?5TqiTH1Y088SNJa_&E0*V1NMXQgA0%kuFWR$J
zWH(EvJQL+X)`C2=T<H|LDgGu8Nc$l7D^Cf5-VNJTtdXkC%CFiQ!t21cy17x$acn?u
zS5-GHUOkV?(si8C&QD<TZ09n^7@DofDhEx;7r~Ik#uPJu{C=t{>q^I8_&FiABP94Q
zg?%_$KWR%~Tg|-+V#zK><deuPVsyhT9Y=YZ1SHe!vI4ysa!$&p7xu1X7F1_7{mG%3
zbCe=}sLfDuX$V)t)RcJO%lidJfxk$2<&xl=wX7Axpo8jaA}oOE^>Vf)WN|dg1*vZR
zruO6PApbS-j0Ley-b$GrdREN}OQG*@p<Em!#l6*bnjB>$s49m0a_tqzxv>$8%;KAe
zFp)wNc!nz{AG0}th**_<$wcuFInbJ*0*;33gL*Qq`HD}Dj0hJ36reY-d}tZpN0}a^
znx#cdZDGLKH3sCiTKbVD{vw6ERQDQJLnM4f<Ww^#7md(Vsx|d8Z1wP=nf1N)H2Iz{
zA1z6!l?F6geLv;S78x{xCjfi%U1pK#hOYdWp<ZAXd)4qhDshbdz8F($EACN&Wi(Q3
zDKBNnhqWNJLIoT<u?#;PN_b)=>q9hjf=h142pDhXN&?>cv25>F4~^fGjosOWWFOpM
zRyS`dHg!A$EoHM-cj%=Km6z6p?b~JQ2Q>iQ>!4228bX40>HwO^il&G$=O{7>iOwEj
zBrVTX=(OPM$pxoLH0G^eK5WtqT&`v=$*>w(_DNrNv=8-1Ypi8FHr_hF+ZBzFJ?3Oj
zVkojNPXG~+vYwZ%ciz)XIUOG<ub$?y)tp#68R?ufB<w+7J15qL1_8*WUgH=nYO8AL
z`0=SZ1ebCg`NNN5GvH>bALw%jjy(Z6P9`aoU=K|*p8m{LCzAFVK4A&V05RLYLVdC_
z_&I`_Hhma2z5bMj1HU=?D7ODFJgbqDarCj+G6Q{+%%-d1n-qNYQX|Ws@l#96PcXuv
z(#_Bq+&-d6-f8-@B3$;jxKfBe_*o9I*)0k0ck~Sh`wpIdQGLW*!U1SOKR`9hnnrf$
zGFitw{g>>&D683bj@vHuQ}>KU2_9>685SlFb?z;`9CO=)o=-7?<dX^`3h`Juf<T;J
zzCdD8T2V!c+Pdwu(oYN>m_0&3EB)4#^;ngKmEq&zYmHag;poG<SP!%6it2~&3t`zA
z&-JLnE$^!nTEc-3mVZt~9X{fz-~o#t;jJGwne3)3`!{~kBBX=do9Y3GUUm8;u7c!c
z%^xKfVZN@;n9tbr<+L5wYN{%@$&xOo3_$%wiD2#LgRK3J^Q3<#>fezAyQxDr<@NE}
z`Q(<?oB^qF`G9@y=-ufHnRtdHyLXT`PDTTt6Obs9xUP-#jo*iFA@a*9`ScTkNu`Wu
zK$hI$V4~vNgIB^c$Jr7Gl4r1FeCpAnVE#BIZ~8(3S^Y<7u;~7xWG#o#(j8FuQc0*Y
zvPd+IpO7U#=@;U5u?siDXWW8ukIW@3H2jy*s5vUl<b*FnUIes=9b=JWXTT1ub(YQT
zobfZEBkEY{p%~e1cqCg!8d=%<r(25tFqkNmHjHni*C@VfA`zT0guR|Lj*hIY<S_N*
zs^0>oN~pfBiw+6ZiBaIRuEhXf!WycI<LFi)6jJR8jKuy}W*%TV@QG?t7h~cER|i;A
zElA8L_zEl%>yB{pQ(^9C0i}&J3ac0rR(u^OFqE$B5RZ~b=p{LF3&V(FlYCKdBV+}3
zvxgn25^#6N({f%h0x>1biUXOmhZWlI@(^SF@%q+thF{LxUp5A`TCjm%dEW1oG);y-
zIXZJ#Pv(5Uv`uRUuQ0<x*%U2)Dd0fQF*z&Em9f@i;48u2)ZrVV4U^%KBY7#@A^JhD
zn5{8Ic~Rti%lo=*X=T0O*T(Sn{sNOv!NK{MXA1hig!H04*<iC377H}3TG%)Y0qQf1
z9V6ZHXmex6fXHT2Ggct=(bSJhreZnYJnw;i*F7Lw>5dHF(PAzt+Wmul^1!COkn~g+
zeN6(URji*!bk}krVu$QbR(R%`!5xQNpZE^HO7Cw1tr3H;1A%926u~={s}VTO2vT!i
z5oyX*D@;LI*3jnsI{EpcslSl_wP6-*2{KbS2nYdG2nbaLs1#T!+?026bs$t%hO(&u
z`rZQKW|Nl&sO$S8-Qo!JVC3LLd-ty;t<9~nYuVT&(gT;fP#OVD(O0N<wXx+Td@cpF
z&7*vOm4Z|LiqqUbkLxd_5b36D0YCSEi+&ZYot=!OWy}sI@!HFZdzS(%2}C9Y`7Q_#
za6{NaSWivE62n*U9=uoIihylB!#k=gE%i>mJq~<LAS-5WTo+yh!WP)~y!^{#$}87H
z9OCd6VtUDa*_<AK3V3>)-v-aty;i#BD*gp9785RSy#rV(L^^ES_fXwtaNF)u!=8C#
z)wkaa^&Lu|a^Z^LPxATAWRnSZ_?{zzd-3mO>F}&7i6@2G=q+;1wt*^|c<F2LM<mcf
zrH$h6{_&p0e*iwuDe#(Yc+$@mY0TK)D!<XuRZmc44CB$@(FlLGF~bu`658ck1zscX
z9U^BabT{FTwi;DAa?-tpHkz;0=;hMv_M^dAh4=~;=Ytr^)us-a=Gd_Ue`mb^Li<hr
zMMb-I^spJru=MvGwHUCwKGIgi`Qk77hpQoW27AspwV|3D3GM-f0|3UP{*U|JRsu-t
z+1D(Y%Z|W5KQSr#GBd$qx6qnu12r?DY&3B(WvpST&MY%>=Tf+VIV7X!8c|X05xc89
z)|(5dg|H-$1V+EcGg}&#(h>=&fpgEb`VBj!09{n$DP4VmNleQ;QJp#O+~UNdSf|7*
zmr0?e3Xk3wgvDtYgJi<CF}`YFm*7yKKFdE-(db^C6=Sw4^7N%NBwRF6S1>$rsU~zr
zmqIjT#^pbVtsIjbDgGO;GX8J8>ZURTiWzK{8I~D_X@-EH6`&+TfD@iRx;WnLmfkUF
zl&A-suM)@^l9;3e5ghqWVx81GO4dGok9oI-Co{LAqCsEq#)XDY4-Z#oWLgKFg~0?D
zE!8eH^jfR}f6`|IYtHPI7tz8L%#dynIBr~3mVLtdPSc1~@^(+!Xw@(Js`vwdCe4t@
z!+4~Gd3codGlp+28ICy+E)fotE!g#To#L|7+z7&GOC`EtHlQ&O$3LrQMFrUukko1}
zcX7~ag#?-`=2|X40x>UjIhEl?#}6A>WTieB`icK)xPs%i5q14HMgQK$MYP9P*UD@7
zw!+DE@s}QO@qir6vC~1pIjjo2z121Tdq;d_0EYZkd#wLSG@Rq><@bCS<)bFKfG16S
z!@e?>0ZA5}4v#fbZ2Ogut(Con@4b?&QuSPiU~B>1WcL_O$jM_}vElb%=M2>@C*A!w
z)*@tTLf3+KXLT%3%u%q&Y$)z1l&ADUsIk4#;w<)#!o7}9luq62#Wz)8^IP?5Ltz3q
zpYMr!UcUJVe*LAgQT{C1W#hay_1$*k;XR8^QwaGG;SGQDhK$a44DA5qR>H{`ZdCMV
zC5!GrR`QN0w4JkCD=GvlTyL_0weG0ReWN|b;P=(r+kt(2(I0s~^~{6Bi-$mRBY8LY
zb2cu3i9-N26if*Kx%>`@>v*G<=5#-j#xzZa5NkmZ!ro)LP|YLQt)#{XcS1kG2H4J?
z?51UjK8G*=N~_uZRVS~ApY2#)S!}|~xDjTjS0MXqA#9T=d~muhTSZvdz(jx4T1LyI
z6f?Oc$@aElelfpi{MrirW<R;F`PtV~m`8TI)dd~7Ht#$z823%bDzl_Dzi*Imn36(k
z;u{9?#7Afjt*z+b*9X9493~fVd}0irhBwIE-Xl@*H1p$4r7EK3;!ISrPpNc4dD07g
zNhcniAp`Rb=|6mD31e@q{lm9B%>O1C7&;Z8tVChzP*nzY1auP<HJKE&R){Qi8bu}i
z!NBZBo+H5ccIuaOTJ?j(D{gKg-yPIj3B#D3Y6p41-D3~$qYx+Xudv9M0g_tIj_zJz
zm%qPYg?hxWzrh*vJ+<|)DRGc@Vplz+aETvq%OAnY5xE^kPy$>O^YLy?C&~tySz|tc
zVK#lPBx)_|n>#LQ_0Ih(s2=oDY?L>^GBhnFtYRDn8t>T61(T8Xc7rV^(V?an8xp)w
zd(m01$h~k$*zT(MP~Asab2NE$&t)nw!$s1vN<H#LT=UHHyXcvLa}%T#?DTrT4Ai6+
zQ7&>ldkZ!lCmksw^%XB{xb))>*vCeoYB-`MJ{F;9c7_&Rr;o7KQOPy^=MNbH>&9i<
zU%QTnT2RE<<XW29w3SSuhte)<N_$-}p1aq&35)rzoE~N9^)#evRy2!CKcbEFg+i%q
z+_Pz+R&WEzlGfCU*>~unJT#U+vWgSJVjEk2Ly+F&^<5opYJQ6I@uuPC&6qmTUWmE4
z*9~JRrYk9<=<F{;>kzBx!E~J#-U0smu!1y~Uq$~6@W5m#;*<hR>Xdyd*p!l1Y@nCA
zkqV|5mav3F`$}CIvn~v_k?Q7B*`oQ<_j@sn0<>6eya4v)opW!qeva<r(TTqcqWd*8
zsu)V|Uq0!cZ*UG|9B8s~`8{qsede}rMf(Dv8soV^sN>_Tn=Y*^yeQ!|_JrAs%LLir
z?%?aYiC@Ay&q`uFSn>Nsh0`LaUceI8*kRXw(57^PV3DnDa9Ov|!nN)&*SY~JNgJJZ
z8|#BV)HpfCmB)t&ak$M!KHAbRCi8?aKo!pYb?chG0q<ziFBYV+#LHJGyU2<*N<2>!
zeI*6=Wpt(CrW}L5OZWM0nzB<vkT}aNtlNAZ-I`XSbteD5OwYONy#0+gDliQFAN5K*
zTJYqz`dMY@a{&0FNo4=td3DA<Ebk@coLhCB<k;F)alrAwPuEdQ5p!;5I20Sb4WEYh
zBT011G_!7v#*3}&QqS<C<~at=h*DxGa+)r{N+uB0iBPv{T$4F2j<W6+TJ&)HkrI5J
zDbCRGT<~-R)9#@=Ld+2ig!?iJqbEx587qLhr`Z&Ctb0%&tv54j8y>vaZ4WqS&V~mC
z&=wc@kA-IR5CWaaKgaTdx3D?PRH=rsvX|+_kEn{wuPlbxF4W2b)0B~97a<X!KR!6I
zv{lp`bBo{cWz{P`zZC{^krx_?iZyBCADsBl07nmkK9s85VXvWCj>&J3)jlGp_>KOi
ze5R&4FXWG}EUBa-u!je%Ay~@#wW!PKUf})*A)OwZ!<6q#7Qk6~D0Z}Q+O;<Qy0zPs
zj8O?jBiuT1wfjOkc&X87IG2r`bDnG^d2a)>MYwxrAq0{D2vYgnl{Xj|T%O1Kf_Iv%
zp5Fc*$N?HAcHaPBzJ@)15maZ@@VPe3mfUL0vkposm2hq6T8Yvgu_z%ij4dIzP##!b
zIbP-5Yn%)OZD5}A(OAzR;xzp5?B<wuoW0VA1F(jXnmU=sXPsUW8zI~_EShdhB1M&T
zYJJ__!Hah!-$N8OR;;M1n`VHLJV{I|XCelGO6?bnwHq97Q9lHmG}j@wP#chKJ*6=-
zOc%Puee0&;j{U9TlN;8K#2w(?Egt2WAXaYJnH$EA2W0(9f(VeF9#5Nww5&6U{#}<4
z#&K>pt{gHb-g!UlQ2y&qFpUvbs_t{e2)T;zNAvxymq>6wOY5+ycnxM<pZ+zf;L_jy
z{)uGmet8rv*%ZD)8w)lkOxm5FG9H70QCv$*aZ^G3rrz!?EUH`*=}EKoBEusos|wor
zL=)4NGF-6ki&Fp`IKV@c0L=0Nkc~o55Xs}C`u8o$XpkbXK-n3zhCUJSPujx4oAc;e
zm;a;v+<&xhXE6uD<1yl4Qn3>dvK8Y+Ms@D=G9h*Q<a8UX;C(|Y7$nWcQhW#h+Yyd!
zsJDnEgG2>AY;O2HtgUYw_C$jqbqAP+PeVg-j}!dT4E)76--?}`E~R!5-?K08Cy-0Q
zaBYPh82SI0eT0IF>>#7-Z?=Q_JnD24UR=3OG<?cE90%lg^fwE-xe?mYI>vnW-g%@$
zyKy~4ArAL6qz`j1lUNKa60erJcem@)<Z*0j0A75tn5c#GvWgn7r^UO0n_?&aw?xQH
zKh0(gzV)!vi9F}mDN<c-ILZg?PPXbZeekuB+{>0GS!Q0si$bl>CL&s76ltEzF2EX@
z%eo%30f5@xzeRY3S%^J^qXo+~3!YJ@3k$5BAAUN$L!Srj%k%n8kh%Zm^rqn}czuVJ
z;CSKcFDfF%<&>qYArI{{E@dkf8xH?TxVR9y`;*Y(%t!JmEMj`9>W{eeN)SuG6!<Gf
zS+w@(A6x$XaYq*5u9!8XoQ{2dWEe<J(X#Sj)mrP-q*ca7@pwDDTp*4eIZwY>8%va)
zm?M@bqh6-ohJ|rdRCAk6e~B$Fr?(^603cywC`*a^m$FR>`ubqKx_c-({lS0$F>{hE
zfr8m0d>4KAE0cL^$|W1UV?fGl{9u*@02h_rp2+;2aACw~=y>fq=tr!h&VvG@4-96V
zVOyF4cD(Dg1EX;GrPF!+^7&-{nSUvtbOJUHFCkvw8krRGc91{xp%>I4`}aXdd0AD#
z75*k<Zm}p`Gz{SX5cLsH@8y{SWY-27>0rv>1&u-Tj_6Vsa^YCz*dqidGU%eeN24>s
zU{F=Y*`7BFQZeT2baaDDv|0W9c077gr+0m~w2|8KH;rG)MT`4O%5HBSwBYkka<Ark
z9%ndjg>J_`@8?-vAfC*U%zjU%M19KK<JZq1NW`Izq;2^67_u{JDV@e!6I21Cs}O$}
zh~sYKwCJ9A%hMxS&DCpNy$&#~J1r77q^n~aE7`F`RR4O;=igG$tpQs6byQlPG|l*S
z!KD<gwgez&nx#wfGS=nEllt|UznlM=%5ZX+AYlpshv+q9xfw0PggWY%c}^Zwvn)l|
zmo;0L4Iz7_W{!1QAt{I_g71J(BJ;}vyz=MoGf+i*7{55VPRD5@9y`wstsQOsggE*6
zxsog*<NWrsOU~^SQb)}Fas}fXW5qVzlD9_AqfJeg9Ysoz(t>xa_$;-BFIUS#4tKvd
zZuvU9b_<Qwut2SQd4SW|Z8DLhclU-H|AtuG&QXKD7C(AJN4W9<5R`xbrEWedu875u
za(D{9pOLUcR`5oJHGiNZ+MKgjC-o56K_%6V+zORh$frmsKK5-s+dJ^P5(aqVu0kPf
zC>^QS0H-MbjQ%d2z|_S!{p0(U6FTld(GC2eKY%*_2`VrY?4$}VqACM>*Ku;gtm$b!
zhKwsBDaZ|j7(Hy^OaQnn_wahak*lD%YOy5<7Z5J@0u^n?XUKVl-ZbKB*{u;I4d{|D
zT{w)+DbFky=lduaxmQV9P{6kp+;+bb%+}Z)Yz1Su<&BP;F;sd`Nrww+65~kRdONnw
z)P?x!VuC0xWI0Y;DCFiW2GT4W<4-Qh5O8@DnkYN2V4pDR*?=SM@q}w$Y6pH}466)7
zt{@z2a1<q&VOTSr5Oh9asAXm1*m;<`L+)X4G6s@zivaaeH8{|F^y;6aVrw=>*DiQ<
zh^w_!(HzHXM!aO-oFRY-!d=%|CPYDxUPsy0m~lIm@b!n7I!lE9kvCd%6=s&~Lu_}V
zE=T4)u2V=@K;?B8ci-3|;eMwS=^Rf5S1&p3QKsWG`9dKrk37#**T*_1`u=)9Gs^BB
zS8JviR<+h$imDFb>J6&Zs*&9x-yB1{Nq4w{a5qA!2ihi&Ra`5ESh?*IEOuUjxw#un
zG?wMlOlPVi+-?F?W`)cm<r1~;ofhgWq)LuHR=zvRKq>}FJVa~!;_h{7)k)c>-iatF
z+7LKfK?r0IfLJI1z#KKV;}c&9IXs%R@}rtN<awQbznylGW>rGhIW7fukSQ<%4@I3<
z^Q5v>x$7fWzml-bu#SV0X+DJJLL4KII5e_T34xEuLy%f8dz(hl1?1E7?Ys0!&$(X7
z27(I;P%>pyOVXsIjPFM@<z&Ia8`QQ5{H?S3R@3}2j|`!<E5++G(!}B`Bb71Pd1yf~
z(vC>x=tL3hk2>$(PP`7!o@>E?tSf;aYqD32x~6?Z5&f}QT{b^!n2%}MzmcU5J&hqV
zoLoVert|Bc0dbD(uZ*P!vSc_+k`c)bY(3G7z&-Du9{xYa+pkha4|LZVw~a<WGWHqi
z;=Dfqd0_l_YCBD<SK>f^cc#@|$kVyU*8Z-3+VvN+{Cpj<k2u(|wS`NgNXr{2eS`Id
z=s*ktDn$qfTj_xuTMTO2*)2I;Ukj!MQANkSWG)q9WGE8<eUtwhs{EIDh6`v2h$Z;{
zA0)v{iEl?w0r1kG;@TY*!$eET4G=KKElnq;i17*mH6}QP{NJ98->3J}lQ)h*1i1*-
zKL%ylEKZQJ>-n<nBp=JC<XqhH7<noZwxWq=9Uo`vjb^q6vucaCgfN(niocbitx5v4
z^0IR~c;wo&du|GtF9hhXoTvqq8@4CxU{BMnk7T>YnRDEeL_~P_aT2NnSYOlNV#SoR
zq!@>RE_MPo@R`~y>CISLr%kc-qc;rcv#Zpc1v&t3v3sfxeC2C8e|bfnSVPA^hX@-Y
z1X?`hY#6op-dC#Q$XY-JCiZY~$$1m@=&mwDxE^RXWYo!-?^5egyBW(TENk@fghVG{
z*6+8)xH?X)A-l?M>6ycwK_k<#oOpBiX%s(jb|IG#U?a0BNfJ1)Pk<k|KPvZXDSOBH
zs_!b#M_Gaz#42=lAx=Bjs;kC^aB5|Urp?h6zG`6XTeGyKsYB?C0m;FFkU;W;*gXv(
znFXgGWTt-=+JyM+tt5ImidG-3I1Kn)yTy>kr!t=<Fj6b)iZBjCKbMAAgKbw+E2sjF
zJKGXT#e<2>cy~A7L2WuYWM;|W3!qx5v%k_<ONSx<_})`jL)CzvN>Airm*OMGvSd9&
z0@aL~QaD8#8mV1fq1JNS3}FX7!5c~FOHA?k9gIY;g+1)BB&8fqo8y7*m>!2$-aEX9
zMhgR3@y|}+1x`$Mz5B(;AC7dX)lVQVP8yHXIhP=*r-js0BPGV&J_@@QJ(ev!o1~0>
za|=y9b&)-WY_yOA!0~5j_XzoTt%{LHfx}==M?|V?=j|v(x}`bE?4YHSr46KnH`RiW
ziI&kL8e$$CDdt_R-7)sX#52zT>4(2UJi71*CH~{jQdcb^fQQp9_%D0><^hnR8eL+m
zv6PusB!YskX%x-z4982P;_TU9Hz*g(Ev`}UR#OEzEb+^AfGzL)R5SEf;zu&Zi5=KL
zt3}7@{RLaB3|k$}r&6Lf!9s2ilRHR}3y|brT<2ulox~$dq%wCu2im%rXqaog+~QM~
z-d?f>Wr2Q_h^6yc%3PKr);u8J(8it587nv>ku_Opfeba>Rc=Boxq-->3Oy*C9pu8U
zG6X&BpqR#%r%VFgk(fyy)Nip@{ba_f)0>&^KwSXt67!D?jXgfxvcf}!D$k2`Ol3;I
zfs<{k_En&%6jOA|%V>j)LISy8_f+{=1X7AH(wA#wI*#-G!?ysFvOwhJ*HKwvs{{O_
zMBp>pC81{RUkUQC(GrHPll%-IGVwvlhXqpx3=XLwM!Fu1B0f|aFT!Kmi|B&No*j$5
zuk|^{j^`NN;1^h9bBkvPoikY?)5Q3rC{nUA-gU#GRKeVf*wXj&GlhU3CiF8AD))NK
z3y3fmg&tgz>yl)g4SeU)IzVX~+kWVL?-;h4de^A}q@=&--a!JeJ5bu7f*u4*DSDPl
zsQUi@?T15R?$E;i6&LmYD=rg);y{PxwYSREx)>(OQM?w!vS>0GUK|EQ@r>mo9^yPI
zD;oO9vxrw*meRs~xL36Ur@_3O>2I^0oR1%m_b~f-gpduath{x!K4hVA^5X5+uo6Cd
z$V<MpEi;<gzHS5<mmn@V1;_Z(=MZ!lRGx&oEfRSryFFqVW2W)^Y_Bk|8}RY0bW(5m
zO;B{E)p{_#)Mp|!S(aK-ni{<ZlOx@yX;;9Oq@^d3=EehGywES_gr-oTOwLr0JBbt@
z-~Iur?%lzTDLjuW-U`FJvw=6?XhTfR^x9atw80AFckiGuOjc;}S33$XWo^@D!Iwux
zyT3ztzkh1+2p$h)$!mJEsOtUP=&dP=E@L2CfhPESL|m)c6s?bJrOBWxX;k<V{8BtO
z0v5%I{h33_?r^wa+7=E;X&TrdI{HAX{YOWm_PW>N139w-NeEZ<73RP4eVyB5qyBFm
zs{OwlU;!p-%5^(?N{=uuAzgwx3E~&7Y#geu$eLhp_Y^?hOjwqjg46(S%8f8SFr_UO
z1Gm%W=H)f8|4;A3WB=X<gek8xr{YeBTi0KG%hXGYAqGiU3O{y?gfs6l`^;@lM@F?K
zq>!U{HW(im`sr<@GpnM6&emu`d^-1K?0ebP)XF>ip+vm!p_@J<|F?;?^MXg#HN_NY
z=PX+9B`sa*VT>X6S`4}I@I!SbVDby?pX86I5WECKok6@1{_c~rgD^8hP}p^<I&}oD
zViE_F3Lg%yhLn1lvRgyI7#JfW$4*X}4{;N}i}lehpQBStK98uE$x~%eU3~V41;qvw
zpGP#u-uMV0&%h0b#y`MDY+=q0Jji&YnuZe0#}<a!OQnZrrvv%-s6W#H@gWz9PbG9g
z$6}sEg3#E+#JVADQpBoF(PFDk(}$pA4o6))E~67=Wy2~21zb3)F@oAOyvqsBvIBm<
z&`Y;*j|k+3nZ_<`vxkep$0Y~KZ*i3iXGMKkW)+sw*phf%hHA$sFOD)}RKuR|tfmfd
zZKj06qv%>Gm#Hb-i=JITDHQQY^N3h<3thj3M!@ae-vxeLaiS<PFwNvjvsD-M6;q{D
z>4}3}Bdd8u%g$)y()zm4up+S=kw_M|A;Y0F=&m^)@z)Zi!ca=M;uiPxV@x7K5$PYn
zCR8ZE^`c_R%plpXeKhRBLgQq7-LK=Q8ChwVc^P*<JViNhpXqynAzWqAuokk0&*FUX
z$9a4pOspx2FT>SmLo?ijNo*!k(wn`~0HN-z^3k?Oy*YE$G1B7GJ8?6$Xd85^Q57)q
z@9O0TvL8;9rP0l)E*I1UD`=pyJ|q|QA~}h=hNbO4Mp#3#%?7*XKcAolEwYP8W^>1d
z-QKHNs@)msIwl%{-t4m_+`~*0gNK02Iem+CVKciQT$=$2$hHhmWYQlb`>PBvHfK?7
zXSI54etziG=W6NWs%ROdE=TwwGP&w?6ihB(WKzgG18cgCI1Oii2*)|N&v4(ISy>p`
zT3#vIx0PsBxpBo1fH=(28;Y+r`O=(#F+6<>6xVeZTBF#&ECt%g=%X5vmDvq&p|_CC
zj(N8nzWV6MvV-N)v!v7)<^*N?LydSN?08=MA#P9Ddz9V0=3j(t4wr^=_sG>xdYe|@
zD|2GCZ>YCE`!phClJj$$m_u^QG{7InIQs1Y(=xBReaD#Q|5AQ1{zF>#^xQt#+Jekz
z_Q-*bi8}MZJGIWT3>&*<)K!L(p?m6<@QklTqC}u)_b*F2gn43~$wwX-dt>U*vTr`M
z@z@%#ha%d$VstphM&obv?>I;<l@`lbLDAv7e@GLo8>#(Cw;m(9WNys$Y6Vv{WN!C`
zYtPP=cSh@UUm{u0X2&a%s!Lc4@&@zYO>ZR@rt-&t;0V5{#Ij39fKQ`{vPlEydt@N0
zTXIqS_FeDTp)aw`iIewSmgh0t@ae^bidlc@#w#aDA6Y}(-bX@vMdNSd!}Xu*oE@nJ
zgSLIA<{fOvY7uJV$9A#kFY<jK{&c?`$<mRwdQtb4hy9OekC6mq7Me~-M>Hk%LfuJJ
z7o_%_Jt2`DpKcN3>A7|ueP(ty7uQxGfo3kDKL``$XlDi3NWYjYxlnE_KP~S%mk{F(
z*tx$)%ReEdf!WVBSJ-x$khy-4L)Rjj1b)AKxi=$jA1Y8Y>KmPMf#|RNQsBS;zvSuM
z0)H(93<QMs|1}_Z300ty3YHjJ;Oq^@)ep*AvfWc?LJ$H=GBO^9#1j>J^q_}}%C%#&
zFzI>z#@E<)w7=hNl%-LKgkMWmvJu8Y11oR*ZdYsMpXW_{ULa8JH20@xXaC$+m{P3f
z{@~+7T;ckOteKCqIiY^4mwCd@?mU_3IdY`fr8+A+Yn0ZtZ_5CTE7>WO9n!=psuw<Z
zHGR7J9og#r-X5fnKm0vs(zQTi3L_6)FONEwWkTR)^wrm;g%`y_AG$z?4BGGXn-zBN
z8VEYxBS$hSt*J=XhI&IW+jdIR(w*C;=4>^MBW*dRe7{WnXgh1hQhZIq!1P0%#nO_B
zaZi~=E{!A|Cfx*hrkFtsS$CZmBci=<Jt(1KnmBcdke9u^*e$PNR}a(Hw#P*ykU$`=
z3?RNWY<v~{IZPQGU%f1{w)ii40Sig^7qstIRoQ-JCQ%qTRfBOiukabisTWYG#P&6!
zqG}#PQkZC*HW&F7C%^}^*XXwe-*q+&EJP(eYXzge4&T!GGTmWcC$t0F^o}f2ObnRr
znx1l?$b`o59J%ZC|Id;+f1QxYPkEOlPcfA@1!~2}{WD9<6&1-a7_vo_eO%h1mUm{a
zT3DrnBKt!sl4TESqD19;x1tHS+)_3sg+1naU$(Ov_Cx|<8&OpD55ZvP!`}5I@E7W&
zc5t{+!%4WEsD{3N8cmRBT%?;swxx2w&y-HmUvxqfa39-SXYzR(v(x7Ntehs;{KdAt
zz|U8?yv}mB>RXf+YqDFpzvvOEBMjsm3{m*R$&;NphjFcM`ojsfXMvgFXmssM!3gJN
zOH>Q8N<<^l(%B)wS^}z3)G4yWJ)9iV6FsV(+|`_P1bdu*oJxG08bqnkI4{Slu=+G^
zcU{dYMP6)_jTp+ZHl>iLH3k;J@}b3kK#$Az9;=wXoEl6za>A?YK6}It;26pjB&Uj2
z@fByV{4?oWJB#5=273fd@FV*M&V1{<bVf}LaM_6Iz+9})Q~%t?0VTb2fb|<=iK>@Y
z2W6aB6UU+<PR9#S;t*7yt~SUWY?t!`Ip5$pRt=ZewV7-OgU;#U8F8kaslU)kJ*zi~
zSV`#0j*m{{SGb-rqz|88JVv?ii!$4~vx_L-SU7rmpXoVt+OLmIc%68+z_2Zu){>@Q
zEPrvy`kFJXQ2x*@Pz>`ce*DjElf18B+e(R7v;lIDCGwFY7~-OMA3Zbh$!dqV!(&vC
zQ8BrFH56#Re&*|LuE}cRCwm|dkYMTjJ`#+&UxMZY2Q6z@zPhTl%FVe44ETWEM?=LH
zF*5EW35uMTGijVXDA7$gG_I}r!2<)Mu~AyffwS#4c%%oye2B_#?7M4T8kezP5PCTf
zPyxzUV>aJS{1_fgsel4^fn7d)wXq;y5vbvoe$2*Md5@ih%x!$zpnh!>Jwr{2J-r`?
zO%?ahoXtJKEjJB!K7QcxNyX0X^U++tT3W6~6p?*QjwOb158gQpg|9)((a6@&Pn=!W
zIn`JrAL<&q!Qj^Fx@*y7>5;-LDr)?k(FI~EV`&TQ@G^6`RYbuv<0q~e!iCG^HTOS{
z+W@^|hYongciIvCdC5~kthMu}s6Re@KIl7PdHzOuQARbEp`~GkU0{0){N;24i+E@M
z9IGF?@c5?D(nJHsa-KHXO=hq=4j?l!s7~%``wQdK5KQffO4vWPC2o>L@Z7dp(1h*N
zN>xcs6<YA0iY()<i%9sVB1!&p)!`*jQxeSJQ*O23Q-+lVfj{JkFeJzzc@4y!Fvq`&
zyIR;570IHMSD9m3R$=5_#joeo`pgFL$-=Yrx}8NK3Ac>rCuO6xs&8o|z0$rzDYx7*
zsV*U+buabY3O&yBkj~F6<Mw}|n35;}M7O)!^?NO9Jv=mg)0=EFoh-)KKAh*>z8$?9
zcU~HV+<ol`0Y-%22nsRf5SuxJ+<3WgwziQ+V;7sJjdmFY9{|(Y1%e*l@f~8%&!65`
zUC?2~#v)1@;Ei}%$$ej*qCoU8teCrtt8K?t$EZFxAGBC8hc`FVXvTO(Jo_M1ovZH#
z^_7k=J?ofa$3OayJ4M>#O>mq@x)(2huLrxpQ2+>)fp`ci&<sm}4dmTZ><oWzE2}_>
z%%tcqpfBs~PUvikJi8c$Nla^au*~+svy}2jLtBxg*$Bj5mAH|8hvVRWA~7jHbf_8)
zkyGONC=m-jZC@4fQErfCQAfE2o*puTv=@LPB{+ngnBbQJYlXyk;u8w{QLWBmHhRK=
zYn4PG5Dh0(UDueU9@)^5{5KwGujQN|L4YA%y^^J$x$4=ksh%<+fs1H3b%a>u-;(ll
z{O|ICHPx|}TZq`T2QLnzlYFr%E6?YA)j3^ZB^Wam52e4^8k=*4ILbHmSJhCyM`dOq
zz4Pc0r<9Y+cLju;hVGD%nd0K2SPiVw#wU_BApT^w1)c(4yh&9<z_%?d;ooGMxmJ7+
z)|d8IQp!44dZOcOO}y=wc>{a$b3s*W6$I6~RCP9RZpPzgM2oUyOM<<UF5za8Pwc!6
z_q$%5QD&uLD#tY)-7F!{gLI2p>I_mOa>~1vSVD{OM>O3k)sg4~tV>J@T;v0~RnM~)
zKq9`*IJdUA&?+ZIA$cm&G`SuM(P4;>0iWM9p``at=eR@xA==v0`Wi2fFCT7-&OrrT
zok$kA%X+iD8+OcesA|-^lFGjk($tm7fkG8m2S+H%HWj$3qH1&Wf|>ndUw~r^t9z<W
zX(T1TWP&aRB>-}7!AK*$<e{zgpW%x18ltVC^Q3BdDSW{=IHhz^!V!#7Mq~EoIb8DH
zs2OzU2&I2PJ>!a_Lr9jIbmvbK9v7py&?p+?@#<O2BfDe;&Mr$eEB_NCrk(_}3jfm5
z82^_suu)e6!Z0w<?c%OD71c#&g!l$C7=QoTfk#L((J0swv$Z484HNY*o)wxPQnQG`
z%`Rehkf1*A&hEs%NVAj2e=2wya5}^L=kT<G6@tYg8GL+l;&{^8H#18+)cRz$W4H+C
zxy+dE7y;LIN)wY$J;4%A*}*!Yw;!~`1pgRi!t(Y8yhHQ}U@y#gn51B(zGjQCG9u~m
zv`TE`XvXbV_a@?ag~{)cH2|MD>A>4{fBR97aIV4p!$v){N^uFp;Vp&^FI3<(t&D!m
zNrtUdC`;v(x}7M=IHN}sgClU<z=t@&Adqv(zl~iV1#t-3F$FGPb75kkb!y#r6I-ln
zZhZy~_{jVI6^lNZ1E%c`Ux23l{&>K9Nu$Rzujt!|_w_!FM1|UEjHr1e-n|TgrY!?j
zi(O=K8I01IDPK13AmHW0OGRI+tV#)FOeyj^Vtr3clV2L&dUW~6UDVyXbQF!LCfpj=
zicV-xJ(vt7JQs!Y=|d$f#2HkcwQ)Yq5Ayg6G&rL3(|3g)x1U(bVwp*9Ghelw6o19!
z!%r3%E!6VI$~Ch^hNI~n;1rGkFBmrt?*#a<z^92L_$^k5kL!W{i9y{BZzeHXf8+3A
z9)V6(^7_$4u3r_K1%bTz(Nqhh<#=Sj%jAn{aRSIoWZ5O5T;OWK;u9kSQlK^hJvuxf
zm7Xdq*VskZ@^sA*!2aSUo6B%;Rl6%;-PZcK77M`Ma=Y+TLmsOXC3zDWr13W~Da3$l
zV_+JmgD5T8g^i2gezX>(7F&fUolf&R<DSXd$1_l8)G5}1@B7@{{>{Il%EHAhjJv=a
z`j&S(9Zv?t?EE6l*ag*MU)UP0?I!{(HNw3nJgcK|H?Y0^`~9auSU;56iO~!r7lpV>
zR%PKOaeV)nJcZ8SIpX=fuz7*m(OX6vS_9ceR=EsJh6u&-_XfN<rNCj;ViGQOxa`;X
zlerws0yjY!>Kg#s&2G*J4oT03wTRd}3D^4&1_fdq&HEwl<^a|Oi=<@RpXhf~*#Ei@
zq({{X+&^B3{U0xWYOw-!5qu4`us>ZmQ(gp!<vGj3i?9lcf<2S7f>|<Y9G$wtnZlHp
zI9hZ~tet5Z^1iwF-YVfFMk6sqBT>Lt(m7+pIHf7mB}u_lcNB(17Z)G&u~xQ{-EaS~
zUXtTj3)*De+xD63J>B-0|2^M%`s+U928cGm01MiBx!PEA_xb>S&)=M#^$c_fv~TR|
z6tOyfkk<A=o{l}K<)ZDIZ8r4bQ$jgc=HedF=*|<Lt8yV;X-09WpSLOI7bfKni}&<f
zox-lsS<>$=V-nS!u#N%)&KEr*kF3Yo_}h^=CAQ6+1zT|M4a^xWm>0Q7>-(i)Ea0hX
zL-Gy?<Ctu8%{PEqzGG|4dL*Px&jI;c_s?sQS*=ekkfg&QMsJNI^B2}ML6ZY4`R>>&
z94pp!il8m3JuNA*j9f=baF3If;|-q?=+IpQKG#I4u;=i{bAT$V<qpS=poC$i=h&H`
z3@6nY!L}J+lftI1Yn)?`!TfUZZyFyNCV!uTq(kk&vPz&QTW;<T#fRve%(B9&Ch_6L
zsJ3J5tJyBjBl?D%QB5?8j9i;ckpCA6rNf6hvD`4JFH9rmpp@!!ZCAw5DW!E11y_#7
z`X+Zy^Hvx)hIDAOF*^XQVvf42z$5`nyVp8J21`E8mfArIBr<D3L`G3QIhVijAO~!C
z;`*?Rksa{)SS&ZH`K0Je96&_lhYG`G{Z|OP_(Hi_2Wwrv*_UaaNKE?3BvFp->mv)X
zT;{bgH<XPleFU9-k8<M#1wS2gEeJ&IWqpjjY8xb>NF859{qo>NOtl61@>8iu0|FaD
zfgFuzu2XOTI%D)s^q9qdCnAABx(oI%78LQ(?M~pGg%O%qE?M6iXUhkvs!n4P_{k#c
zu*lH^B4+_z65?^BK2L0BJnEn(2h1h@UYJDxGq)unzK*#=B8-ocy5^rv0U!CcsKDm>
zB)029=q~e3UcS)xZ+iTX{wXSn#$@e<akdPKw8D$D5>+Sc`^#}2b-C@?^h4OBC*KVJ
z9%JD2uLWtI+W~Czle9AY9b&`-tzG*aiGea0XUs5l63$t+giJyw;gph4X!f&v1eM=o
z8?FK*%Hw}&PJZvA<=hri=$@yHWS(D?5K3zZv2NFrO}k#G!5AQ71rs%7^3q4~TxiBE
zXFJ$^+wty@_R~DVrx+K}-b-|fJA=|Q=9mDY3_xPH{FbQCNjR2T_(SYmL#J3n{=+g(
z6^o<zDOZo$t-5>?uRc3M%}@zj=gfzJw*y4(&D1gvU05mFP}H@;SK{q|>gxote&D6K
zQBEW%@r3Ld$G^>dj3!kG*|wZ6AMP@e1KEM%LKE&M(5vhdyYggcsw)EZlBTKCZIul?
zg4CD2n6SM~Y+520hTHx+Rq^QWHD07ZS9fsj`FjR%*cFnb6vG9yf#8jHDAtD0g1)y+
z%baIPr~ZaGt>oLT>c)BOZ}F!Iw@-$tN9(=zm%7}~T{9GYv7U8>vKRJOD_5;;F`j!y
zq?H&prfLv+7pq95Ae8NJ1YZ4Co3{c`MP{C+Zm&qGbv7`tH~XoDXJ<8A%BQhBC)-Rw
zNUBUuLFt>$zNnFSthD$h&ABSG689nxETXxR;$@mq3YrH%AX7VYlMP+t9vyTCtj$6c
zk*=)RwHk|J`0;kw!T7!RRg(I(T<q)MPO9R8YPypl^?d1p#u4Lf3&Sr2=sjv+?mPZe
zYDrFu4FVeCP1zIGyh3#h3PX1BUCUOZd33S%h%W@3tI7GVm?+JtMdSBvEry$lP)%&j
zJO1jKp`_%=g*y{f>WoEi)Po`jl7Zn=Q_EvmPN`m+!9PgGdABE?jzecsS}jfmWp(QP
zvvAEv105B?Jbus#(H_EMu2VBW59XZBUkXP|EKz;xmxTvzApWg&`d53oAK5`LCKZu*
zCylK++1uP&3*8@lF}u8Xvk>_M?R2bfe|V$~G=+|hlrF~%7X?}BPu8zjU<2Uxu&eGp
zJEfA57^Xg7@VVIk#dT(_ETBMH@pbD)JH*qE-VJKlD6d~yLEqFb{POjHHkn<*<p(mF
z;gz3GMej%P2KJ2Ocyj{v4yya_<F9fMFZ&e$oz$2X*%Ai)Q(H=qpl56>57BIk;Vk{p
zqi5$bw{#D?pM@>1%XN9|JN`!YQgan#Z%_vvp93eA;<F4WFw;I?3hu+Isx>l=goPo<
zXe$4w>kZvw`wFA3^2`d*!*KK#p;S^)>2on><$5JCS~R9!Jl|S!)Z`q&wJo}TQEBo2
z0ii%%zu?3h9IdgzX_J4;D?U~HgHSVQ**V>vfto59uY#JXKK7qDB7*+{_0jDFUMd&~
zm)?VP!}W>lTD)24t=3b>4RBj>P)D7ZLQhB^eNit-Uv;9VlOuJMa-`0V#(!FxT|gAW
zzlgdCH6#NhA`@7c>>S6*MJzptGZ?y>4q`dOZCFDeQHF;RPbRw$Vg;j`a&FH-tYJ6=
zm38mM3C)rsc6TJ&T*QUj_D(($*+*&_UZUR^e3J-aj)H{>wf(elL_u6Z+a%fI^SDIO
zA8?ph)ZgQxl7VNF!NS00k$>cl9phNrbO7zm2e4rRo06SP<G46-09{KDpr?pS_e1=f
zi!Df$q;DolxaGnL^e2UeA};G>T}5o~E@I~eMGUn1ir}sOB8FOPBTdaq!@jUTTsw~4
z`#L9JB|}$6#^F9BmCU2}MUK2!C&v&L$#F5gvBbCpr^`{p8FFmE3V%6zE(n565=kCW
zh*u|?=aPvDiU6arDRM71goY2|)pN+Nb&}d6smD+^foqe3Gmh8ahwH^T=Sa1+m~+|@
z3hyL+2Z*<fRGmd*9o~YsdK<8(X;m$a^QFqSNtF+yE!iXKca-T?-(zS9(~mZR8<WwU
z<9JsQw=8Ha;<hmP=zo?XZtvL(wW)~r_e2lDx1YW)3w>Z`5g)!CLDJP8`e+fK41Ky&
z$ajVIkK?l;^6SB5veg%wDB|;>FV;MO14SHa^@qMJ=&$&QPS%9JmLO)>&uCgH;z{Bv
z$!N{F{?NCJ_}(J_PMUs_ETrvMZVUTDKNPahR?4!H$OTejX@6N@@8lEBk*26;d=by>
z_d@z}FQjvEHLj<7<QekREpogScgXQh+%3ob<QFkMO7(jVjZab472`8_R*ui%c{zHq
z=!5zKHoPbR-9~s{Bw(xH9*OEnT#gzE@f(RHKtR~9fq#l6KOPVh&m2K~Qf90mWMmgp
za*O{O>ZP4*5`Q}kA0uIk@-MKe1fyFKkRZK5pj-s@SLMKV3hFmys!LG6D^uNq`a_xO
z5!9cK0z!~~nIioQRN-Y(zoWIbCiHy57y5g`A5GMTeF-J(PpFZ^g4(9U0;M?-IvlRO
z4=?VM`A993#B0sJ0Z>Z^2oy06QP~Lq0Ok?^08mQ<1d|7gEt8jFEq~p9pjc5r{9F}E
z!giy@q(NeWQsAKm(^?asn#=BVyL7*DcejQZ`62!bV}e8ze}F&AI9oJE@xhmSXU@!-
zIWzZu`~LYWfORYjygxo}H{R+8(i&1=>l?b&*Vl9_^dr}ki5munAKJvYB9CND9305l
zum)re<J6D!jlT3^T7T0c$M9ujxLFO`UavoVROejP_{Hz1p2t8ukj4XcDRA6?NV$Q-
z=!jIzy%=xQ>a~Vp(@1}(K?oE(VX7?JaXk`P36*0yO4=ToZ<LH8Qs(a1?Z%|`LZ4b;
zI838FCIw~><w%;I3><U+;E=2&k7<F0?dHx_xAn5O+uqu4HGg~EPP5(H+kf5^sI-1F
zI!UJNv4FN|d2Zk)PXuz+)mH-Ze<wXnUC$<!M_FKcbDUeo1(b@I!9{^W%F=2B)~4ao
zAF4V>aYB9`mjy}=B`;LS^CU+C%hmHrR?kCaT*1{M<}lBVvt<Offbn14pPISEBCcgZ
zmv~aMcD7m#H(=OH!n0I?x#~Zg-@@&Td8Z5wg#xB<S77oPKQ`}v3VHruf~#|EY-uQ>
z#P@ynRxrU9u=E8puRme7QaQ!K39eUe@^J$FBkp|w#<U!t6UhAlP)i30s*B?m*#Q6m
zvI3I<WmA8pSqFSu)w%z^t8uTdl_kYVlqsBqII(4Ck)e=)R}v?(lg1e+gG83DZ4pV=
zXe4n51=_T<l#UlVLg}KzEv3-XL^ik(x&rM>p{2W&*F9bzrF78+asTIB$+m1cq`#M+
z;of`B_kHKv<LK)bAAXdGRx39!-F4GVyVkv?vLk;SIcg-Mm4V7gXJt)g#7y+W;^9op
zO!^aM)WCYmh#TRwfz9r4+8^mQB1hBNM7lE28IGron#!Ioe<IxDj|m#l=;~D~uUZAz
z)VczGXEq+kLb^NbUx7~}*%eC~Mk<!<!s;<2mBv|EUst=TcAY<J9IJetM$DwQo7q&v
z*c^Y08%&GLR99VBDjba)b;ncTo*pArw?%&Lv%Xrxv7}0Nrl~iCkA>^v;bd3cj*c6Q
zNJb?mlRbfbrWsWSf+PFw8NtMcrF)sCjI1`s!|Ak2I+Lf%$m~p+84v-BO{PVovTCVC
zBW*;osaU4BZY<0O7rAJXPUSS2Y5t{QRhoawGzkYaLRpr?OmoK_F|rHdZu00fjixir
zng~jz8BFCM8#E)*m{3fCXwt~k?b#Isp;_eBX(r8Pa*f_mX)co^WA542G7hZ;X!B`-
zPV>lDjMk!3B~uyBY=@5|Ajb3p>S%4dXb~;eX(3$+t8~J+8dVip&4N>D8I#kvF$;em
zW2&eMjy3CsrTbk}Lw=pAsTQ`fIEk5cf@a;$aHbnZT+U<zL-3!fVj&7LjfMwnD`}NZ
zD`+*7d;GpiYrs;*v^;WHF8~oMz+Ok|%V{kIz)cA^Q|ao0H^}8SQ+isH(Ye{oCZo-%
zl$la#Q$eYDvMOE6qzXp_2QF%`bk~0fMy`$}W0_53bTjPIE^4ODI@Qw_%O*R+DI=M2
zQHvl@Punb_ZQ+FBqM)_b3Ze&VZwRLrX|x00Q`?g=5m}j-k=E!{;45YH#KR&YQ)#Gl
zU5Rr`a8k+x+G)2i+a9JRmq$d3vrjO2ofR#XI6^@#+E44n&H*Ohs4NkQ#}I!Hi9|RV
z4I<wFA#Fgvhu{%a7QMqdT~9|~tZ+PT9^aEZnlz6mcl3y8fy*)6tAiqCfQjO(OQTL0
z-6HPKf|kGAOu%`&p*6F|3bC~%(@St-uB_9bksIi!;3j@a87yd(aFQ#W>dGddg5AA6
zaK>rDG5HH5d+5e8GARY-Z`6MX26Nn)jTsq@j$x%qqZ2T3x;LFM5`JN5jb6<(S(3?S
zV)43QEREFpS_su{WPBE&FYgh(KC{!8={9`Z_O|+}jM}bRpT8;5D|R;~dXI(USz~Ff
zMmOPvsF9AOVtM_zOF6^Mbc^8g)<P1Hr`M-a;a&vr8=>8BTJXZOxJZAyg)9&(W*G$E
zL~qvVB;7V%m(mHMqcp10TcNxW3R}bJZiuVW+fWiLtEL-zEmq+u!D7hPa1V}qJH10V
z$vejp!nR8P1p%Z&;8L@yMswR}#^Y8c0FgWC-8!A3_b_>@O2b$_`#zoSpwps|1;=rn
z2YJ6vx6|EBYhEcB7Bznuoo31k=k{zzeqW^zGHt24gwtBs8^%J6Q*NH059{<H`bZ(8
zO53$$j8wQoB)5+;X)*DYF;haS(F$tGuR}c_r%#mA$Ec5~<`t!~9_^WM2J}BwIJbzR
zN}oplLpRfAoXE(8fMEX&-Cs`k(E}(;Nx58HzViO&qR-KT0`7nF@Yh7Rx5L0msmzYN
zhnGyoAbyr|I^9eCOp4#H(L+rBR}`ea6YS>mkxGLi04`VOkLdITdK5DH{Rgh!c&J*V
z$MBH|XHc2bF8Y$-rkcKt(vZ$}r1S1wQPom1TYr_#3+Ts@dCg>zwEHi!1iYfC7Qs=L
z!?9nZuM3s^H`9O0{~TYXZy=lH*%el<PeH=vRhPj_F&9tKH+6cFz6EMk*QA%`^|`Tj
znMU7+N@K~WabgE5gB{9ianX0_dqP*=7rxvwkve}UKz@V{*G$&u(>PN@DbM*&x&1Lc
zE4ck16bQ+!U{><_Q)I72s0*T;!=0L9X%T->7yaBSald~+s?KBh4+(@{6`D)QPkjM1
z-=+LUr{9XwSspQy8FaDf?MAPQekZ!IQ}lmKGslY3kd4KoqW=CK#RmcK2c4c5t%*}K
z?@1I`e@XEtAOlJNM1K|}{(}6GF|AD(y(k))=jm@S7J3Av#e#ZW^bfjUXy%_%>ri7)
z+{mDJc*%b<@5|sMj=?0;Ewcd(IRrqeX3QbwX0px9_XRGt2@T)NV$hIu3g&1|MqTU_
zJ;lAO7WcEVbgEpI?_7qPs<8!OWM_km%h{!~&Xa^fq3EkG$2-PlgOT=vr=lwGG^Q&r
z4@YGW5<+lHLCzQ0JGr8ar}K<L*If*t@+_UbB3FM;FD0AGbKn9SHJ&#?wiHps3xx79
zV35WbDr`O3u?=TF9Z%R06y<DQ#BhvLjFH0$QuT54S?<vlR8(?gPOjpmI?rW{9+P`g
zMjD<o+z*Z|{-WTzxQ6{@P%H)ztq=+>UM}L`4qhShL%KQ9lj(KwD)=9J8Iy%Q9ecIm
zV$6RMVqxvLygOWIR`PlQfpKENsM3jsper1g0pENgV&tub(PECpst;w&m&nF5F}S$T
zYCUQ--lX$J5pWCgP*KxJ`;uk`;KvMKIN57~0<s=m`GnK<9^`?o=zD{vc{JOjG6s=Z
zP0gF@_XKwz-m<H{DcF2?PkZyO!&`T>HoJeg8Lb^R@#f*ixmGmJwX$*Mt=52=_l#b+
z=4GV-D194m7qJlp*|BG8+y)zitdTtC;++;CW|wLC^GA&|+|IPHs(6N*VD#WU7%+G*
zQ&kDYjJUQSu@zwyN225Ftos8i`bP)-f-z?<9pi^C-p>bg4)H-WgC))jnq6Jufa`xn
z(b;eDcSPsI92Nuf2}B@VFe1`jJtMJJmLQS8Gig3yM6#kC;!b$INHa@H>SJtnvd)a@
z+{HKGOgMgL4Ar$LAB{PxQNm<XVJjhVoD*e0M-MTl1X2?QvA7wIs@zlB8B0-B86D(g
z4EV>*)Y09sgkg%L!7VP%aJG!ojJbbjCU`vtDaKo+x@rPhOZEJGf_rtokufo?tSTk7
zWupxxa9b?py;h*Vj%juY<d$SQgOOC_*B4JP!wwhDbc=$V=#Y+f%XpU><6!c{H|TsT
zW1Kp4Nro?BjFOv0yyQ=Mlg>Buo6&+qW1_X}$Xd<f<T2Ms{1$$zFw5;QQk{RscOV^L
za?P|@9hHmUVHE+)RgA2JIZ923JB>Z57}NX-ZgYl7-^uS53dT4!DPz{RH@39oTLgZe
zyg*@$P`1{lt2BN;Jh1o@t<^}U!(B#GtjiF^>;qPsl1532%efU3r>W93z|V*H!#aPE
zF$FpH?B48Or?D7(K(?VbBfNiaMk$&H8eIHw{)A8him5Z(6GhGkg{lJ$qE>y1?-evZ
zU8u9@?z`(6VqGoCj3E=mXMhxy9EeOI$vwcI6*!;6PF0H}1ABd5=ll7L=$_7tx14C9
zkPD`cHeW+Hjhgk4$meN(7`E8CYsa?c#@!l!VGN|ar{YH~$a8>vb*z8K!v3PQ_9bi0
zg8PcK_EkiJaUv4WrenwCjc<J<0u{D~lh7i<dgEx{i$TCtG90&V=Hh1LDAZNgJRv&t
z|2RKU2B-WQ)7*&zZqW*rF>RzS8BE2VRw^X&)JpD^%!ZZ~zM=C4e$w&^d4+@eQ8a+&
z?{)Z_{4JeSei}xtjYofuYWy8oGjTMEG2X@Bv+_RXkMbD0{1iF~Glll!ht@iVj@cs=
zcV&|q<jGNO#E&r}HJaIYRJI0@lmU<P^~k$6U$j8Y*J-AFLhU|b0H4MfH>QB=`i`_2
z&t?qEvOkrViu^O3pA~(FmJBCNk(FhGz0JkH<X?%}{A&k^e^Y-NuC)<==dr@n0d?;}
zB{dV4CFM;hW3ZSvd@UR44kwdFJT1-AXnm;s`+|VuK!RXc<v(BmPaW6zk2*gm3c4<|
zZGkaeQ8nsXxD<V8|1bPkf%+nxIFsrXL`6E92v6(->F@jxou6k69~=H3eys9KXk_G_
zLu1@b8?O@AdGUYVk?euf<%SsTWIKD2hje~fp`v+YcQ?!$RTTxPBpo-59+4fk0bH>w
z4qdS+&O%>b05^}z%Nj)kWCX75QgnI{?y8hS3;AD%T*@R2Km39+83vBWIy7Y}I)V}*
z&|sPwWQ%Z*_{Bz!=a^zwsES)xJR<Fs#gR;e><ECR#i4(g3@3zEGNRHP7<2iqR46mx
zZ_3QV@R|QDLq<&y<qP^#yyBkNm;Y@e=u+m2-#->AViFk>X9bJ}$gaa(+^8LKPd6?&
ztu63!g;J?2K4qbcTCBIlLY4!?Kfg?XEwh2LL|0}jRVZI5C?fhSqm8|jvQ}~6GNoEr
zt_Fgn#ZP}p@T?P=B6eq2O?;kGtJDef<#1(KtTx{($HUoVq#OOZ)%pv2Y064rAz<cH
z)Z$m@+4D(DS*=_p^sq+5Kqr5XXf-n3CIq^+1c3wN2#h9~GCIYbXq`m?wAU*EoywIB
zMK>13P^z*KNivo^W*$WXT3=$2ocL<FXed*zQLca0l}!qUBu7NVnoDVf-@{l<OwA*y
zGcJC1Gvpn)r9EFko4#%JyL_=^VR>}v^etJOUQ(+mn3tT$u_)+ccrBry61*1XBxS48
zg62WlhGLNKhsC|UrUb<=j3q9oM%}I`ZRi4&9ZYpTxET13`i_TV834)bKU}MQVVR+P
z8B>22g8-;w+H#75FWxa?mHT38U)K6@MN{?^<(84kqwE7uBkIEp+YKdQR`*%Alh8_t
zY1yUk8;4U>K8P?yJ*!}fs>zpK-^lc5l`f(0kx5w2PB;jI)uu)yaV$kKNTw38q~VJQ
zKkPwelk(@2nQvP-<?BqD317sF8XXY2V8VYRg|;%^DYW+{GvO1X<n0i*KbPP=DtL#l
z+Qo0W$OFifk)s$Ob_*EPTX9v>mQ8dRDY=3a?;ur{Qp6W&_>Yw?qDe>aR!*c<xE(o~
zlB0?o&B@Ufp<s@dxR>Ur?zH+$^#EP<5FvhoedOLZNcExC>Krxo)7F~cvg*S3cKm<W
z=HBVvm7~4=6w1*->n}J+*M|-sZ0o16{VW-dN2od!vbnq3?e186juP(bvy?8ZX0du)
ztnMqU^kU^TVkP8$9RS_0KTB^IptlUt?V*5uknRZi&(OPa^xl5DtDinFNFNFX9Dc98
zpYC~xKFJhtdYuo^XPHj(d9OpfpJ9J`45R~Ujs{Ni$GxiiVId|>8>BA)SD>Ej8@hn?
zFXregr^yR670P+Ss~*nLg&aK{aP$q`hyCx!{aUd<bz_cxutoq@0Q4CPw8CLOBHy0K
z(N6@@aUlInBKZW8eFW62I!C~EK1jd3i)I1%*Am#-N9BX`+fYCK?>Rrv02zPKAhlP^
z(Q~J1x}YWA3%pJB=V=GZ1XP)XdV|+7NY977Wry7_^wS@6^w%8yUF=<e&^h|oY4Q{V
zwb;1$H7`Cc1{{txT7~9SbFAER@vPTTq1lfJNh>rdYCw}@wIZ?>GZzB@@oE7O=o>l*
zI~m2yUKFQ9Cgdv*&>%2!>=1wNYrJ+a#o7Q*ZX2Xi;JlxwxO;Q#KEpF}JbT32)KX+?
z56{o>6`?iS-84<m^YFqPFWJ{O^t4xs;#F-Gnvh1dAIY0qZhziu5BbHB)$T5#CwA{U
z!*ya|<!Ng7!U5|84tE#ULjkAc;VS#B!Y8bcb@q?aOyPF;vgLRKm_dKk^pP>h8$%wx
zrk}4pXT3Iv*9UpaJ`cAHa4XI_PZc7xAd&+(UMJ)yzlV1W@U97Vr^potsEE+?hs0;K
zhj;h$z5zZ28N`CuQMAH`Lv4`JokcViq{GX~e(uPzaoTo%kh?;mnn9i$>gVo$K6-}D
z)<M1z;QpF3d>ob-;Mac~?&q5Z`Q}h7B5#my1xZJBKcDpX^KF0+wVmO&3HsCohCTfD
z9KS2HM!j1&_GGWK!qU00org~q_H@Xk_R%D-(^jEM%lJbeGr;f7@m&GU!*>txJ)uCE
z7q1`7@h5Y9-yq))KeDgUa{OS02A<ANU6kW~>0T;62jE=dbozhmVav?|s<5ASh6h0i
zs+D;__c{V)eQ*=3JR(+<JF5d_ey`>&6O{ad&>4Pgm=>H<5`#_!wX!q(<xoH`P%HB~
zf<j8YK<vsIZ&~#yLg$MK<zJn{G|%wY2l+xM=!K+Sdks|jRF1zbvv8<Y#L2;Y_(=KM
zB#G}1V`Dqimg9dP+(j$=!k#n<k7r~`@eT5`A%R<S*uy^&p~pWj;Qitpw{gHez`vQ!
zzfE}fcPGPZ9UM@->f^L0zdFNl=iRh*ke>_5`1(@~IQVmp|0W&jU!k_gX+9#|KA<rE
zrqL582Nc*--|ki0`nUoqstxuX`t0^TM)aMh?^ov(7u<gbT2Q6{LmaR0V^klsM6LEH
z(}X}mh@~}Bh{~El#S?1nSEkqGlv$zH^E9>QQTvBUud%Ic?IQ=b)|{vIL1lL6U=R><
za?1Qx`y(_jWUFZ(P!{EsEBlqD1BxFfuka|Va>`olmWP5i_r`XQvJT5vV?o8jvUbK-
z!@iu-{5gN2Ho3grRt>N%%LbI~LSy52=eBbN6~i_jrB&MIcR6LJN7*HeTvnv<W&VP)
zhS9wGVUM!g%8DLk?+ENLK-mNU+XaM2*}tq`IdpCm$2H*iaDn47l7tKE5*e7C=V&?_
zhRIsF5}`S?h^pus`vdl~>XXWK_5u5O`MhBNk$8VPr#t63PY^kmIakQ%T4z8$H#s-U
z=VoV%vm4K#bBBEHc3v-^9nNm~yv2D^t;h4E^PLj@l=D5}sn)AO`P`xIlF!|0r+miL
zTf~zT1=u!&Ru6$aMWu}@EhJXynjxB;{|4D1`Ut7khy1%<rQ21ySEc)iUZOQBRWDe5
z<q&_lMT0biMoB9P3orq`2+twfTmtCH0?-iJs<Me_u-I=TeWHEqPXNuF00{D10KQ9c
zI)u*7IlN8QriC?17d%&PoRVZ;rsaacztj97+AEZy50OreG0;R;%zKH-@jXO+!yNF<
zDyN}+2`Pm9C+RQIbQZcO4I{aHnUb3QMX7(%NyFlfgOecAkekH8ML<;0S-s|Hk~IG*
z_`Z#7LQfKDu0@$I$Zzp4zfobCNp7h8oXXGJReqtc+kj44!1D9rf6u|Ml(Hdm7U8^L
z;XGHs(a0fD1g$)Rt#Eo_nMR$lcf?Cy5{?U<wv$rWohdmOjb@Sbz$_!{!{SuKR!V=_
z$cC_9ISv0C_8NWs5(&!JT_l$zCQcSiEVP)An-L|3XDw})Q^b1g?}TXk$xa4jjzKTI
zz<514eiuxB4-P@&N}mG7`(WA!5RXsM6ndJbvQE?3O>X5g<WU}`>B>2(P`*SnZ1ZTQ
z%}29ri^*$SO0#WiXpXIs=Gu1BJX?P^&9^0Kf$fdtv)x8l*uG7bwijuk-A0S-DlN88
zp)2ifT4JxFDtiqrwXddS_O(=PucsROb>z1nqFQ@|>g*?Jx&33b!rn(K?GMl@`;Ta~
z{YARU{x4eNU|Q=~MC%-WTJKm+0Y?jMaO|L~9SPd#I7XWsy>yM^eRQqk0jfH8PNxRv
zT55E@hnk#sQM2=hv{~IuThzDFR`n@rQJ<l0>Yt%27H$Y#+5QbsO9u#{)Cb{z761TU
zEt3I79Fl%9e+hV8RTcj4Op^C9nQjSbJEgQCZ6QrFNf#Q*0ELpa5DfvFmN2vsUuRyD
zS7zpgnKx~5K}9WYD2rPW7u<@93YbnJks@MSK?QLKQE@>*#RX9jk@%lGGtDGTBKf|_
zdFS49&wkH2_o0{XIRxM|)vj>MHP>ue_xk#sR_sbUe-*Ef)W>@3o9bh3a==Mgp5vy%
zNjGkDJ#8m!D`RuB-^zqz{dVliOg5RRkMvrJjNMc}&=*cx17Sya#N(%}S-o}*Y18Y9
z=X<k>1Q#;>R(KUrJJsi;Y&-3w`nbB=PG=~K>+71=G_MQC?cMcnG@%p%U2ZlVvo|{l
zTVbJ_f9`APOIz`T-LfZb4Gh@nmiAP}vl5A=s|=JW%-&_~wptQas;}juoxALqXP`pi
zB)yvToJ32^O~tb5w4L%=+IY;`nXnC*Jh<CREKRsED{+}Kke4>ILmzY87QxR{s1lmE
zlkqk>X@#01mUeb##Z%kTiDQRSw%4+4OFIwEe-ScD?REOHY3)&k<sFk4(w&EGrKCJx
z;q^P2r7LOtWQPjY3*A{x%JJ4Kq#MTTJsDP1Z#tH*SjXj;1ThEIl_*DT5CK%l*SsKt
z`L9qAGcZ%WP7GoeX3N(}3jPK;SA)d?7^qVyqwDFv6B?FxOpGC|3ziyTV5!24KHIz4
zf097vqcyvDuxM!zr{L58mZ3pm-Wba+Pjc?Otdoe_X#<S`tPt@A*>ze;d!hz;axx2}
zS(vrZ)8d0vTp`?WJmK+Y3!=zk6;_M1H8j52z0$;51=Dl$R6(3B0#;z1!jefNI8KUo
zT|^X;ymT_mNIJ?*U#%T`SrBJqz3iSte|4RVa0y~Ve(5}gSu}RT&WxMLdiKSZ*B`{j
zymgxt7EGNI2F~Y&v|=$k!;D<Xoa}3uHiQ1371JDET7Yd*Xz06kyefbT@M?uqU*RDG
z7gF0i;RSAz4!B4XvJ)4ND-&H;XFNM;U<*BGr+KeykEwkzwe+Z~Z6&F}R&1+8e-|#{
z9q+ZAL^f?-NIzJ8OquG*66R7wMcQSo6q7JCu!BiAAPWgrgxbkci9x;sJpo*f*D{Q8
z7GRH7?97KT#^hlb+Y(kLLlNVWRxeTo8@+P7`X+bUWS7~1LuE><T35fddTnc0HW|c~
zV$m)nir2AFMGU0IdsM4$V1VxLe|4pJ+g_|+VezDCT`WanZ5kN~vPWy}z0@HS#O}Pc
zd#Ke|5pQ!738p)>%NStFSK7$|@9GYoU@VHB(3G-9N4y?y2;g;iBS{ln5%F}|oQCDw
zC)SKN;msoNExaTX_6)qW7)s50Lpp6~nFih-z&<G=ek&fI5X(XZlPmcSf4o!Z-o*qO
zub_eVFqn>KGX^d*aPBx0+6(Jc?!9<l6|Tn(wDS0U12-|F*ql4<y<QOS$NDPVj1RD~
zru4#xutXL<Oy?%tzCN3RPMqulcIZt?y9FPqWHfH2)f*-E7}UCWvCh<)_?Xn79;sQM
zPzX)Q$-pP+8Hx<z(?b3!e|&~v$Y--|q;n?Zh4|_KZkJ5>98;|{8H4zOw31!8gAKrQ
zH*~eNw-@W@m!yQb_%i*+al+}ndZW81m2j<iTVYmFSUbrrdnKjzF5E5Je1!>}O})+;
z=#V*Ks)Rmf1`i%YP7V&Std0eY3|cs3Y}y;M2l99BtNH$uFU2Eye>=X$wdRbzd?pSN
zN!u*gyIF1Or*1pN%M`@daldf+2E9?#>bz`kubsBzTWm|WzHc&W#l7~_K(<hsirYtu
zZL?rd35kJkO%gWUlO77-L3~@GeB0K|;dLgytI#+`Si)n<uJ%X(NAW!=X~&M`RVwU%
zKY+vd0WS=>#5*`de+Ka*aoJ(~m||lIH^Y^m%3N_6j}>pM7E|K!pN-qt+Mjm!<VV4u
z(<yCkHW9B&xn5nbRIWPSss1`vGUog*d1)re^kS+R_!T3Sv3l)oX%^B&4HIhI#3=m+
zzYXBmcxu8dQ7jtM&Jw?uoA<PWYBuo)x`R&2xTy%0{FC%Of7>gxry%|;?)e4&Le<<%
zbBa@riNA4dkd#Zi)Zb$bJ>?Y*GnD*yJRe{m{713o=gXMf2)gfI3chV!$2wxk9#8%o
zFIM6O{D-1Fx5M4T-oqEgnCMdKNk#t`F9&cHMrp_%Clz=1WK6|3g30mPvz!!5`iZ4h
zwDnu*F8ivif1Qfys-pa=jOSH3{j<|a6@q9gLt*~dDY`@koZ^J2DkZD>`HC@B6${zv
zYuB1;291~IYo*+jLw)tlRkQRErDjV7-#$fptLlIXs2cL*q>}ceTa=nw5PoJ*)vCEd
zIgc0ZxNSp)#08e)ZI*t)iLX7VPE-p6YJuWtJ(H@Hf7~?Q<C599^a=*mVpS)HP9E3U
z$TVqro*2I*pqA?Cd|75$%2cPYdGzXCg|j9}nC(+0@p#6R+@O||w`$}q89URS;$}KK
z;Mwu9%c`16MyU3SN;aBByLID+4_;-K1w*Z3gD5=o@=Fs3`}`^uS))!1sMU(Yc%@Sm
zA5^Eae}Hh6%p1qbLB{s#?7em@>q)Vw<IPDr8F{#7q&)EIsfdUrW6$oi_vo=(ouwxj
zb#}1_Xz5$BDbGpTCAORsQ0Gb`J*ikr?08*i>#OS}H%j36KDW-vP@g)!ES-2A+lk(5
zHq}N3s*TTWD$(WfMSr0+uvIkWFe8PsGn?FLf2Z{dA8h5E3~4jUXU~yG8$cK=Kt9+s
z<a13!KJNhdNMC~!_$=Q{tdZv{2p2U*ckBq29mL!f2Qk0tAQprVVqvKKAQlbb<hvk$
zb5M^Z`E%xS$|QIH4UHpM7VT&p#QYqVk6=Z#v1bTP8eN&gY1OU#m%|xDIBO6KayWNC
zf7Y(Zp>02!d1fwu3!*t}9!5v>!a=+y+Ia*O2mG^E+>LHB*`9-yL%h2&8r?x^Qq1oh
z#KK4!k44G{u_zj;Xv(3#dl1Qp;cqo7S}VhvyIE`QN1!PjD$5}oD$il>EvOpCH4*aw
z+6BKh8ZnPj*66b#a|HXMk-!kHJJed`e{T)e25YN6iNztaHn=((nW2@g3I#&^dUyBR
zg6hENlc7Mw44GfWjSBgX4=U`(8u{9<*tVCEANBvJI3yJ4ss8v7ZljrbU*z!FVSK*(
z!03b2uVN5i%;C;($QZ_;C^k$p4&XQ4wUrgO;gOJW6c06Ns%XT}><n>m4)=<8fA1@D
zd>~?uXsIDH6bKhW5zbStETLo^=#UW{j_!~XN24QnkQxr*JJk;l;n5-dFo&N+%p4vM
znGxdvI>lj?Az8SuDO$A1=&62^77gQfIXqMS$75y{_syQ_XSKzDJ+`GHMp>&_Tj_gk
zw6*eM>dad6mY2JWDZt-C&Fs#Se?(AKvK@_-Nr0=L8^%BH#!ERSukz(o#eT*PKhidr
zhijBc!&K*p3PdaJ#Z}R0sJtiYuTjCSvKlqBtGu-$r{>gF^mGlW6LM-k(<Y}D?MFr&
z(J5|-7$GjzS3lfCpFJ8f=!g-ulypOC8Qu945*$H8sG>%l8Zpc6g%OQZfBHj47u{W%
zQ!5zECpr&cHh&9*(Mo>I4G*i<oTBl6C1!>NhL7OnP+8GU<vlg(%n6y%)VLz2)_3a*
z6eoC1XZX$$b#7E{!;so=pM2+ITcg_a*=K6hrb2MJkJY%5?}bZo4?fDtTi_iWrv(mj
zL>2fA9M$k4Jgnj49Eb$Ue+VP+X$~0zUu0V*WWx<;ID>smpmZ96_38`_&sJMBOsWC(
zB%V-Lsds4jE_J<zH>i(jc&i%L@N4Q(4IfoMR8Ilw$LcYSKc)UC(09G>1OAz+MZ<s!
z`)>7pLgNAjzs>g<jSCd~cHcpb3lx0VH==QYf*<nTuW^BbKj1r}e{q3=Kj{0p#sv!g
zr0@3{7by6%zUMS9Q1It{FKAq#;Q#SgXj~w1f3<&};2IK#Po2-QdmZZji%SeFGtl`W
zW{z_13m7QZ3m54BuKvHv;BcdWQC9IO30T8XVHl&V@l(<mcpIr+#%u%olv+5-UQsnQ
zKN5*d|8)Eet(G|*f62|7<c#Sxzs$frqquHLB9}x|=!sF3O-*Cqu%`Nj7&Z;n6I!El
zrq^hcP4oXmW0UOW2|Dv+vKog`vU<31m;(*>PGN|Od&uulVHIvORLe{7lS-U9M#HTF
z6(q2w8!clSWu+V9^8CgNIC+#Ex{Q6gK**6&zB}`&bZkRWV{g8_7l@DXYK{Zlq}$H@
zE9l2-ISlM0-Az>NvuyD%A)q#(N^L|?^<joeVy16BX8E>aw(oMx@x@T>>qCw28l2$o
zLaqM_%=O1H&+lNqKY@^cK+Ey#vBUpAP)i30lY;XFllzKjf7e6n;l{gF@YHqDRwydo
z2%?|}3WAq$ce;&c4<y@qA^IS`g%=`t;RE<k;%rq!WFRy1=bJwvdH;BQ1JJ~rz~jTi
zS?kWdlEDonp}Xw{ZMW_QX`Cr7bCo7uoQA}@Ax+W}Z+4{hf(`{Ywi{b_yDhb)x|>B_
zEHh6P9%0yQe{60wm^H1R`F2-p7Hmg)8{AS7sf5U=Bx1Ek#`0OLx7Hi$Eia^=dp`mp
zP&rS#CZGeQNnj~8kslcuYVvQ5%rY|mQDSqc_2PHlFD_Qbpup6%>`7nCB=S$Mt|`dN
z7-qk(@xwG`zlq~Mqf)={-(jIGmF^lkA!}vCMD6(3Zsj~LZp+m0u1ZwCC$O;m*Wf?A
zav@M!Ub%4KV4{LDCLN4mbQD9VI;dc*sHO!5_xY7j<)+L(Gr$#7TvZE(v*2(r&g(39
z^C)ouldG4PFPK_;My>vgnJ1u+miiW@Pf$w-2x_|O^J)PA0OtXd0Yw~>>x?jecpTMr
zKG*x0)oT5aWZ7P9@L002w5yf;z?PADNwNW1>j#n_tnFY%yCZ4v?#{9^YgxPsjp+m0
zrX;k9odzf=6>Vr5w`OJHfT2x+(2_KLr=_GVNgoMmQrfgNEo}dDXI9#kB}iL;{`Stf
z_uO;OJ?B4<tJmKD;tND{mAFTL(CPc`8{B$#)3BC2re{-4-A&1nruL?!naLSx%{I(z
zEMum0%;)vAu30)3$22RJ9MhA>tU|_W>K@V3mfqf!8;xbOT+Cn@snk`QHg4Vo-u%|`
z{*gjDjR|W^i){d@XGe{!uIG*HC}xlAc?)M@erw03j;*nje!S`400}{V!6CDdPwF=s
zX<g7|W`4ADG_R%7dgpjv%jNWZXMfhRwRBn`ub?G&XvekAw3Z$1+%tTKp0pM63-YJU
z(NR4wXk~nk{c*XtO;8|Zj%U-RmJ)RNT#Vb@Ww2hRpGc+)mT_F_)ssx>mbFXEYVwq8
zD>oZiThC{;bms^dJJV)=@)$1Mxnth#5bnRm$Qt%_f<Dsv0s4NRhI1|M)$Fkz%hEH$
zX>4yhAjs3&b|6HHXi1P1suQ&B|Dm@+4MAE;bs-AT!W#0?vJeHRhQC&XC`h&Zbs5~L
z$z5yLuU{`{bj}O94&4@)&NR$UKFp=0Ylmz`&9=4=*u2&q`xvHw?AuY@?n`TyC8(jb
ztwNTZ+!mrMXf<0w6%?vGR-q<1L_c9zwj~XAC`4<iB}mP5Wfj~UofK*n)F@{Qwvq1a
zGt+6H5XiO^iU_LFGdX)A4rzkw%X&yoo`V|g6bn+6I>4I746A^1>ss3mS6d@Q>uCdP
zu~E?CS!)Ucn;K?+MEB(LnmkjXEkWvHPuCjOb|VkX%=|=%u68cejSFfipue#-K0A)K
z@x`y9Yk5DAxu{xkg>Dd}7}gHHU5I+ArIvcAPtff*N$;pBFy)Qm0$V~|*J7<xQ>JdI
zS<_aNX4ck>tg2-vz~<;==vIfi<3tXGo>Fa79Wk;gRX?GBCGGTtx?!4cq9Z^%;GYpQ
zpV45_t6MKc$>BNfaw%7cZlarm)JFY+*8PaEQfNR>bL)q~RL0n@AjN67Ag^WIrAs9B
zhiEU|!iE||sLyLC*FF}^V5*t_tCjZQNQ40Uw!iICi-hO^9b{E*1z*}24$vV+1oUm2
z!x+7$X+uqaEw>Ab4cS^AsbcL0g+3Cb+ZbJK)i%j$8O|3rXPr4<d^?|{3EKJLSmEQf
zJYRJhHR>F@aNne$WvD5}$V53O_PGU1(B?T%^5ISdz=v+`iEZ4xB|xJnC6dL`lZCut
zPjv1=PD2{pZj9<24hBLD=9Xy5CgJZ5bDZh=VQv|JFwHSa2k8!i#>*?U>(Ay2Hbm%J
zMj?}vL$&e_-tG)ij!=vi9PU-fF6RUARBb;FK;jEA?`u8W%aA-l6G0lMyAV}{TuQT{
zyMm?ueinNV-OC!?R~9F4vu`YKj%&l5EANM#WZJa!5dAn;m2vtg<fP<<a1yduZ-^eG
zpI{+>KUuz3g-Ln~Mmoi{<fnu55F@E>hNB+^N!FR4fo*N`X8nY-=MqRyNA%Cp$Aa{;
z^z+;Rpxdy=LiBOEg@gPPm|`qtaq(5HeV6Wb6@idnpkHKNJ}D?RzYFKtd5U+QM)9%D
zvaU;8=T!BV=rhdw7}uIR3+Sgp^aLl{Hu`0MHXu4L8#eu{lc#?LDIehK8Me%H!PdF1
zhv-*XLNiT@1^xq!dm|~EH`N@OD?-!}4Nys~Y00)^6X>tz<jH6g>X>$1SBG^ytJ+!y
zv5!PEZrEcTE!jRZJ7VNBsy(LJ_|esMm79mgG(^f!A+t`+<xOm~Csc&%1fS((lbD--
zO*-6lWHXg}4b`v^-FZ%3s0k_FqH1}l=EgA$CXaKst0Q?cgEV003l^tAOLmJLe6j77
zm)W0BcdIQHW?eaI+;mLjOi$<0a%0;qb5BdQCuzeW71OG_aKNw(TOG6QoYmdwrpOM?
zmTsdw(;|0r#&WWeRDF7Zy<?8RR|Zahs5BoEd;f@Itzia~TCiXqO-<sGxNaqDyK3pW
zbc$-&7F+wc0RSQg{u=t!8LSN!vbK@Y(ZT6C-lx##W>xyCdi5JYdWJraHpBrRx`jD1
z%^?JJS~fF{(;Z4Ruz!nwn_+nt8Doxhg^D5i0-Xt>H#~>jQOMq9<OHprv!>2}<hQC8
z3p+Xw89Ap}`%;je=d7pbS)1#lpm0@}wIf@|=y~aOD0hKgWd4_`<W;aJ^t%W(ymoe(
zd3{G(&p;|7^Y^&D`7*tXJe1W>*zUsY*q*MeuhLhT{WVmiOSIkrH76AM189th-i<;T
zqOWo!zfNC6#+kPt=a}D@*Z9?cq&dw9XU4Cid9}0=nGsl)peui*oCPKSnEoV4e?))E
zC!-JaXO5wJz+L~sNjcv@o-8||w=gooiC|B`uBaq`C1^#Zo2pm;I!JG_U&1q<tz>X9
z_cuX$gZ>uXr7WG(tAaXP<8zy?e3|OHhWorl-(uH(8(x{~K!yGRa2rQ|*@eOXiL2T_
z(s%ghqr3}6D=4AJDIy)BFVcBN==UqD=$?u|`WL(e`pg2tl$#W}Qw`9+az;l4c{%z6
z^zVWMg7QCMgn1uz3cbtympK}u|K<q%FM1EvV-VSd(^P;;Pz<(l8-);F$AHQMVgaVn
z0^^aa+sU!{;wP)yo%;uW`(^wrgp|F=s#)84S1)O8o7I>Jzfj<L5n%TNi@uH=`n-Us
z1;(~lq~d^Bh-T;m-lB?F40JOr_vg_TUC}yAn`$y7>O_4|ED;T}3hunEdqu$&jWD@b
zCTQ)Do=0q`dEGALvq<VU@7uQ*l$AqjMgBEYI?O3nlplNU>59OA1J!4n`v>C{CUF+y
zP;HgCJSbL*E2_7}6@gddA`~&MiCO2lhtxZ3|I8XBHHqe+SR>XVC*Z}^t64^}r-0Ic
z6zvqHnI^hynfZhvbi|cn9or0V&w2nhSxBRA+i&Ulo>52)i3nhV<tSjnvoSdx5V3Mb
zx<sfVIw8u^?Ll;ZBk0}sx+NTMqj`JhStUel5F3MHz1RfPK>oOyKei9$$1EUGivEz;
zEVk4@r!G_#oZ}un&Eak3ep6g6x>*L^?~9}|TFT`JiEEvu>&i8b?{G6}@vM8?;Pgs^
zuIu~Y`H<*E7bto}A2)w<w2qaC+QEpr5r$I{U@C+&Ztzfle1{`@_4LU@CNgkY{h7=l
z@IYMNI&Y2=yZ8!tWGxw$Ca~d_xYMbMy{zMUaZA-78PIC$98p7vU_2T)ex0e=#mAWi
z(DsW1L9tI9#0JCS7CN6V<k04XL;{%|D~Ei<|CSKpBs34Bh!Tt6^m_J^zh%u1?X}zW
z5v`E6%k<uVS=({`ZQ>}q`S$8RF8yx>DPkBky4(Tc#c3C;zA;=>moJx{I~gn~p$A1$
zj3B{I_ju!)r5ZE0?g)r6s6z;R3W#IKt$F!6-DieGhTD*4fyk??%x|*23<z{3^={ML
zt=f*C)z*N3i98vrEg%5e$Op&9^gGF^cH%ftB*uY%bp|E;gKH&^?b34lm<O<p8(DpK
zAv3J!<qXxK1SxQp2VViI!B-vsT}_T5T8L4B4;Rs55@G_>I`Dfju8bs(Oi}%LTACP`
zqQ=Oxv^@GOh1;K{m1m^yYiJc+?rajTVv8SRZ8TD(H3y5d?lc9@QRl!UT^}vdro_N2
z<ew~m{UCClx)Sjz+WNwEo-N)+@8wU@<&j43#zeQTNZU?PFdD|k^#@OS#boKN=s@H-
z+Aio6sov*FNep<}hw5*PoTHrs=P90ui^vr1nWRsG3()pHUdguq61H5#^Bg4>(2LZJ
z`Q}6-9;rV(MMt3QDQb<%^VdYr(`~HaQP9JGiTKO3IQoM3395;DHcpaPyi$2Y>XIWC
zN+KdaM85zNEf9C%_ikEPf~h@h={BMgEakyxvrE;IN1@H-wT0vZrBD}W6lw~W;16c+
zav21(D-L_hl_lz7y4j&`z}H1uU4m~GU?vWa+zkaHaJU~E_hNPo!j8jRAA{J(Fgpo<
zzPA93cd(}fz8cbL#Puq#GjzV%{t9`|)Q_E`?C$fFOLTjqQ)JaGp)UoxePJ)V?C!)C
z|6^1i3;R5c{v!R@B-~A(X!I|5oc;c0EbJ}P$s+v}_CJLEQ}nQBi?7iad*Mmyh&B2)
z)luobbM#1}8=D`6!E3|bCF_gyse=%IkEu@|Jm~`>zTVDq9#8Bp(vzp4QZ!Mdr+~Jn
z;|hBvairVpi41w8L%#MQe{87!*TY`NMb9MQpx?Y8wYUHaG}2`-IRU}Va%{uz=4pq0
zoPxghX_-QID3nvEP@)wi^BqVM3O!I_^TOhe6Q}v$u8R~XLAt+Uv7n$95IQq|CS3=+
zixBt_`*aa`D>g_scUGS${kRC4`{2h%aQtiduHi?J8@Br;Oo+BbB#>hmo@M;5^<29u
z3M;Q-$VZ~9HUjbI=(*G6^E`8M0c`p$a6a`6b_#j-h2(jU>J^$2D=tE04R^6F9G-SF
z$&=^l`9xwDEc!x`eurc96^_w=llb_3f$(}gv6~MAN@7L&!*ld!GRXe?6fI`^|K-8S
z($^;GaC_`Ly}_JsCKyCh^v$quivF%hf8Xt`^Ui|Sr)hB+THl>4eJ7T1@$@$SPnPZ<
zh~T8RFSHlwduRCP0<u{USLu~TTPnxpq{^|0TIASDTjY2(T_?vKv{R0MaoQutK{_JG
zBXkr7C(;lWJdTkm#{xYpNB-@Vp!t*>9SEfv2a7l~zbxJQJo|K$lLMZg#*lA%S)tcC
ziow*x;F+F%L!og%i0EBfQNpdfQUK<qjCaYuy$p^Z<fQ<PhcVXCKbO5mcVYwQ^IM|r
z=jaD#61yXbvlQkqj2^9j|F<dnA;Jd%R{tOPX?MRb;s<e7r1xFc*ikgr%qu+8OBZk$
z0TO=X4hK8PF*hop>V#MLoa4QZN=J~m*d9s9tUC}biW=v5WPzdxLSTakIbtPJo;v8B
z+Ky8f;nZ_tX;CaME3|SqdmBYY)G(SFM7Y~4x_zSCFZos{x)nx$R(F7*1(1G|Q6*Xu
zfEh5v{}b)Nm1rx9_6E^$v?#7RE4CKJHS+iRmqgDg+8Oq}D0+%wd*a$Udi4oTW?kp$
zodj#O>L{ZXrnsp=^h52i;wU#Ic3v0=1Gba&eRnK|eTkyj)9tTo1)z5o#o!iiO;=4#
zS8dqeE|Kj+f=r!%6So${;nTEtS?#i#M&E-+x@xp8d}{buDvo4o9{mi3men?TAAIyQ
zEsrhZNxiG)tk5vEthOjd!+~~BBVy&dETOBmt7fwF1nb)%3|1=|4ut)&v*L~hk%kS+
zp@X^?h_byS@QHcw4660!f$}xsoCa}c`F;(;!e>mH2=^|3IPQu}i4zwpCBIAoPS+>H
zKK_D2Z$~cB8bpIBCPiG1p9N6zbg!g&WcpsZpS}m0$8Uo^NuQH6k4%4_ijwA$>6hqL
zN%P3`SMbX;k4*m%Phh5bWcod^K+-&d79QbeT8>OF5=$k`BhxFz8cFlWbeGsBX&#v#
z6#FI3Bh$BkiV;ck$n>4!9!c}a^wZ)S@}4p`2!ocCpgLMHp@=0;85mc@8jfltfM(gG
zVTD6|oXW9Y!dK;jy8$BNa!F>4X1T10^;HsAP_47d#RzTn%yzGr*Slw}i>md85;e?q
zvePb996PNpR#wvjcSZI)io4xOXzqPHXgeyWA=kY>4%%#tv)3SLJ(t}Fs$>zX=a;io
zKD|bs;C4UtNPo8=SKSKpKSCaqF)ue!><;q$4^T@72uXpH=MoVB0Mj6o0Yw~>Po6b@
zp};~Zlu|$tP+S$;!m`{n4K*f)#Dt_?Vhu*VO?QXw!rs^m#u)h_{0cRSi68s{{v!2*
z@eD0Ou$7(cX7-))yyr~L%=h14zX4do62sBq;q&rawa$$_;hE~XYV4>Bs^PnV?eN(4
zJ<at^L3$`0!6QM74IXJmLl}Ee;zsI!`VMy@v7iQ)=JG(ZrH5&*t*+c%rP#21%I_qO
zLqgQx+A{qL&$2xsLff-QJrH3;xkxWBt}d1}Qyi%8`oI{{H9rXr@yK=r!=xWtx)pNM
z5&G+p2Z0Fns&82$RM5>Zyvq-`?r_i2pVoJU5i96r7(G)T65*M=?g#~a3_bgQi7jFV
zw$0Fc-}dbI0Yi6TyST-WDipUe$Y3Z91=$SJ80be2a<t<37Q<Mfdgfb;<vuEsJ6A*P
zO%w}P!5A@qLV3oTi0$joC_W}iaJQ1d6-@MF9Fq+BHUSEz7?eN?j+em<M$?$aH7c2(
zY=>d#d@UOd9@fNuB0NJ>iq&?1o3AkFmm&WYISW<hy~(iBk=@+vm~i=Ws7=Z_neq-b
zzOd2JdE)O{8-tQGn5V98&?#gXti^QDAM@aagc-6`I)qOWw=TjH1v%=m0)~EibF%4l
zPkLyc!61D#`Wr_V4Io{5^##LIpE2?Q^2s5O(N@e{D<)g|gpnhpKjP|M{4uV}K!(Mp
z<xdO|Gm9H7X065Kn#@3xx%IO2p2V(G>KC%mY1&Jal%>P%mcu=C(*W{Khe7EuJ#&o0
z1&<#@oq42AJc^yGm^#M7f2*JiL@shU^#@Q(2M8yw0*RB}pjUs-O2a@9#%E3c8LQYQ
zQ1;YH)1a*ost6)@5)_5rx0`9Q?Pe2p(|8d3Aijks!GjOrLx~g7gR?Ln-*3N}Wk0{(
zKLB6?dkkJSoBQaA&xKr}iTRYv1s`&mXNA(DRJjSVJVxRcH42AxnF<%k6y?gTGsmY3
zp&br+kp!720#$$Sh~vrl<aA6~8~x2M)>;#AsR)kAqDhoNw8|tzE3}T@A|8##qbP{6
z;?Esm4E%?DZ6#hSjSLQRn}mrKvBvPxilRUp-ib23bPlt*M%#u4gZ-tbM5u*H!rS>0
zW!Z)ngVwn+s=Q!u(7*W!s64E<p8a=&83V6Bn0288z7H*J*kRDPqAx%Xnq=!@bULt2
zeV1I1)FW*ky+QZ&H&BBu@V)_1O9u$<-p=(TlV754f2Kh(goM~aH9{}8NCg|95-g@(
za56bb1|~D(%o!+4?Wzy{i1tAr``V|ZEo<2a-+cEs_#1pN?lW8xE-uYllbN$G-@cr0
z@8AD^`73}4Y%n}|_;4xnU96z#>)a~FCS!UjmW=6k)iF#>7`BzF+C@%smz!MkI4LWd
zm(nX-e_!|fsu!CqX{N`MF{hlWYEH_K7{%hm_~k3(Wb0=3{7b%RlEABIsY`U^R@tyP
zcMYpd(hcr<6pQ4UvGK7?s>nBDKZL*-)ST_RI=^k0oFQ(z<#gHAiY8BQx|-u~H+|Q&
z=_L&ANt;>CBBiUKgQ0s(+tAXcW|h;6g*C1Ve+8WkXUbgUwmiYBO;3gk@oZpi*l7tf
zHL`Q`g<+=WHD`(;(yCXWGISc=PFn5pk^2!u(4``blMH=L-)Y-4DKgdODd=Vh@v0-X
z2$A7*{BV#6dT>U?Y4ly4c{~*F1IL#T!a8=Hn`7NJV#$4<A&EtD-=s*AJL_CmlExJ(
zw<vO~`znekciH4>-FFlcefe$s{l4<s=Fge;eCC<!nP;AP=JP>r%bNEoLvxBMFVnwc
z#6?y9fXl~{LI05-7@W?+=gjZHg>5R#(a;vYg41G>K6g-WcqJtLGV3f{<Z&{dTj1+w
z;X<8sQaOW0<FiaH;wQjPnU&d%{hoF)1}2P`rQpDd&7!q}1Ve@)Tr2>hPm|@eq?l`Z
zzu1B!vN@~L7E^OFbkTpF!iOfKGmveTPDO8rwn9?m^(f_`y7s1OQ%4|}qiht8CaVnu
z*T%r372-v&2BaYwWp9VG2Y>R{GpNJe)QX7&b979pmUL-0+z!8^v_Pv0R}9g-6;tmN
zN4q5u20<a0WmPStqOM?Y%I#m)iwD`BD9Oee`{-G@m*Rws(kO)7-s@C`>y$PaE>^ch
z;P-}nlh<D|`+l=Z?@2lT^1ebBdJC;N*_j~Fu}D`EnkXA#g2YDlM3KdHfwzv9lqb5`
ze7V~St0sjPX5OE8q~u!&32iN*&X>4s6N2hM>|yYssH!>Zj;G&PyE~>Du-o6#Z)EB;
zDtRzt+-z|E1=&z<o%!qc6<5{<9I@K`e&W%??GuiY)=(&nYBFI0#p;MIJ}fvoS)DtB
zb2Nx6`^AqDyceIUQoJ|0d5`w=H1k-=)uZ9?d5ZGDm6d92-s;=oecR1vlp9pcpEHEx
zdcNslwc@y`k{O(r1n4&n^D!vnTxGrK8n5le?_-K~(_Ic>VKNVmKQNW!%Q>gUy3QY7
zJnf>qOU^>~y@zct94{q=UY_OD3d_S}tBjm`uj2jdVgA<*ANub<d+u?n{?oXn=alQ5
zTKFU-AM>ksr0Yif;@--YT~SSaO>`~2N;~~y<LA4ntCr7RmA&FF@4Ta<zsr2Jy<3cm
zk$%dA4$oAi8jb(*i&~BHt1R_{DQ))#4a8I1S8<VHF>c&wyzYt94z#l3zWdf*xwb2v
zA0BFm4i?rWQ55o1KY0weXm&yJ>D7ki=;`&x2M>wQbU#bcCM3a6+>MYoohS`RlnA1|
z2w`80-R^mVrpdzy-t*>jj0d11%~KZYslsU#Z?KUO_wN_gdx0wg`X*}yIDhhnQQ3Pq
zInSI@3+L&TA8#HpWf-4x^Its5o_sX+&(1-&G3advRfI7c+s}!U%h9X@nL>t!rd0xc
z=XF}GP-dQ@P3dJT$j+ds(z{u7QBY5GaRSsrS$fqRWhG|v(M8&{Jg02f$^ft6qLBU2
z{%!8)+s4q+iZXde3lC3**b4{*r!yu$?PlF8Iu=~V&xz}9vKbGqXzjCuG<hutS9McV
zE}QA{7IP75klgCt;YF(QkC`c9?&I{f2+{ebq0coup%fh@Sd9^}kG;#20LlW5{WWN)
zejhr5Oa&BiOw{XGGtQdfke}<Wg`a0v10Bdy9-$x7vQFPD*`Ti#qri-p&_Wg4D=nX1
zrrDcDoKs@?aovmhvNA5IrrscJ`F0{`Oh|G#w+xO-^r{p5ENym|n|aCBMCOf^;NWTF
zwNsK5of?~+Miae>zdkSYk8asfJ0j4(e1Ckj06slMs(&|KCRCiCw~Q!rlUD%>s&^SX
z{$!XLniozCS#~q{J##OoBTvuf{6`9FV?zw<({<E?H=f8v!M}4d*{RKeCjo;}PPQB0
zwUYR-XxoF7u2Yh3hk7%KJl|y6=z)+@LbAAguY*OTY`U_%yy89se~PtHobHB<V@?Rm
zL^i}3FLdE&7UKc!FJVm>^TkMNKRi#aoWf-ERXNoYqQVmS^QX22+BLQlSsuq=*|=|S
z#XjC^NE`^7ot04i8t-l!`ig6yX)j+`6+e^QvPHu-5Htfw9Dd?@;<qJex%;w2Rp|^K
z8t6-z>=a-V3Vj^>MT!kgb<M6}#Ihx0Z#{B@_^q@iZG?M+5F~hsirDP*ER#bY1hD8p
z4vY1h`LucS((1cJhKu#1TAnMLS*atuL@5R#(E1($+orLk=Ir#?@C5LsP&JJ=^?T}+
zX<kt1z!ofQQ|%kuR=@YKfY-`aPR{$OhX<400qz^`?T>zaQwl$~7lmJ|a&A^k*2c_j
zQ{#{+J1Ks$%!!3Np&BNxhC}GuK)V5-EV+hWS72nO@_N@ur?QF@>vuPoI~Ep3+=&q1
ztrnX&M2D_WjoVIH?K6Gc(wW&B9rGfZTbB2xHQ+ekgs#Rs4~4AL^BDa$kG2};+j{QG
zoqGIwcO2*r3+-fvL$mXJF>&5=%nDllPnD(I-o}v2F@u|CN28Q&v3_W+$PC9RvLLgI
zPpi`n*Vq+bj-*EmA<ZTIhOrQD<iw}dC5X6=5#5FU8xEPMA>T*+H_t&;_*{lP3|6fy
zdZe&B{V?PD0+bAlfzqQOUvzYm4q<g|{bO>0*V(9&TCW?RTap7{8V$`u;~UHi2Saxq
zKx7k=r;-|^Ks;{oFJjPSds5b+;%?Mt-F%Lsls#avVpqkAlP4Nz<PNIn9B0%&&R-C0
z0l_m@g%S102?rmAnivO6TlXc7EbH-L#I~@w37($pO!qo@Wh6+!oBk~o?o7sXkgNK`
z6wqfz=)G|c#b>_$@}@G0Tv^Z4r2~`^S~@B6KZW5QXHycQ<)LVW^#oKZyTz!u=Iz%-
znKIsjyK5_Xnaq~UdM7s=GOvB(Or(1?YUO28|Iw1atTLVXy_smh5C`F75$0#36~c)x
zyqUtN&vHQ0dT<UI78mI8h<oO)1`gTIluhv+yR(ozVvEFnkP>HZV9VAKu|+Yn-!FIM
zsk>mTeukp5&*%%fZFy>9ha0zYVy^zPr>~`5t-oz`CSfeGBOWpWJR{p~CPa%*?6iw;
z<U|0EA_3dE-khP2-f|yQ{7e}TF#_k<HY~nstO!Ezxu!me>AudKg;#4l_Z``e&O@gJ
zZyX6s&1?H_X#s%&inBAN+8V<fi=&y|ch@Yw*_^fNXIe+o@Wwjk6-WkJhrE8RdpGXA
zNAk(OW!^mPqK~<!%px46u1q1G8R*vSrJ|U_`TEh)7b3VI^p5-q9eX19_Z&AXWP=pq
zw8+CU>okiftii=WuhvbC??3GAsK|FS$uwW>W_OwlHtCB#H%Xhw0FkI|^(oSet-(A7
zzp(VKSlYy+d$LBqT3C0CeE3w|l#)@tpY3M<^}}lZp++#(!2V700V(aHkkxf=*=?zy
zxc!9jm&W@yVI}OWW<PSc%P(Q6-_5r~vmsOpCmz@=8HVL_z58IkI?2pzCs<7>g-u3m
zioLs+hTFpMyukPQp7t~sXz3fww76a6It|U}Q<6ua(A7PD0xf!zXHnMPJgN>2t#;s2
z^rkALD)e<_qdhpe*E1!y8*)uvxdW_VPM1yj*rJ+tAR1ck-5Q_c+p5L{@nT&I(+x<q
zs2RJn7pdW^y!JLh0*8{zJ-d}AvVt=U@AU-RA{B1N+Bj@NT{;UruSokDDBhaJhp4r^
z(J9+Rd;BAf?*x<EwR7Bwf1*vDaZPh+_;&D(AyM{{U3~PVtcQGbijUN0+0=x5Vs^FV
zS{s*&jjXnxuL7r<b#|WmwQkR?oLz`*z`y4`AA2P~BR95fDMsC1V@uUXH&|&<BqHvO
z&HfR+1JfByhTGBg<T^d)p%3z!mj`nUc9IL`k!V(%uKahFPP6IKdotWfCB;Y7Y}qfp
zWUUUazh1hPmUKJsBD3u4-SLKQ-2e}S{*R2p^*q%FR89vfvJYf;G2HN*_E)!t2Au_p
z3{6M7$hd;IlE*8r-yM_p<u*L1_!8KAz*T70UZTPgET$T<NcepPzanTL9w`wTQ?S&<
z;0{B-<nP}T(akY=<LIs&3G@dh9KLzW`*=Xyqv4`cRJ3k9H{wFaP<z#V%e$#R;hlCf
ztd@b4C8#^=RZH@A@neDSy2cD;9=93<*XW0+E;r~#IpFlSsTYh-Wq%!kv_3MR`jJON
zFH@0t7_F0cOIEcFqb}ojFDU*=BK)$IWp%3wA?tl*C%Rv-b;xCD#J@Kf_QYP$C2F?o
z#3(u6{?*9P1Q(CO63rfy21sKv?ZPL2I3!MpbMmy-Wh4FOD6EcU-qM4?pX)4pLQVGJ
zLO#nK0v7|b*4Kn^s49kCy^hbWYcEh$Nzq=ul}d)6$a|7xyqW#5EL^2KQ`bDK=33dC
zWief!-nhCCy)7Od*5i8RC@7nj#u^xj>&eB5F4LqeO$(&g*y*MqW7DVt4~d~7R4+`j
z^8x*;QVN!N-lxEBl?&yeZNWkkU|($sBm1f<Voi9!)e+iZ(jbCq)1N7t1*ojy2X?Cw
zumXZ#hZ(`r6Ck9LE0aL_tVGD6MuzMEW6M=YAV%Ot%@x>j=Jekpb9_V*J**7H@8Dhl
zjb$Y-5FpO`B0z|OZDxf1$%iErRh~qAUHCtc3Xl}xB*MRwK;Z<?jZkFLefmfA4_r_y
z2>TO1Nq~_gs_|!t;K@2M7%@?h0CW?MkQxb;DM5sM>f~U@xmzHR5D641MS$SId>s$h
zaemI<P!GUUuL(O&e*uBckcgBi0lf8a;7Pq8*Kr2I-#cdyOxGL3h;I9Y0Y^fFB5RO{
ztZD*Z>bU^d1`RHvZ#x0%CP1nr5E<~QfgiZgC<puFB2Hk=k}xKEKtwAP=(_Olxj8mM
z{(FnM`b6+w>+!S1b93wt3j)cIsL~kyfwP*Bu>Us^<0An>F8v3x5fzW^r$8Wa67abd
z5zKJpCxXX6`hY-UB;c|Q5o~N`0(4x#MELh0xz}_AQ!9252u=d`+#<qittSEQFs9!y
z#qU90Kt&5H`9k=gWlD)KqR?^2B?!bzB7}|n4;F&`?r{2j7g`anF&+}=bSeQ-r2Myo
z<z*|Byg!||)>`Ws*zx-l2qZzWmT@K#(r=T29k*crK0FIKM5v-o8b+)ls6ZfXdJss2
dL`goE2uYNj1UTAx82CVZAVvbDQ1ZK;_#Zl>@t6Pr

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0e68c05b4..17cc7e431 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 # Binary-only ZIP Checksum: https://gradle.org/release-checksums/
-distributionSha256Sum=b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index adff685a0..739907dfd 100755
--- a/gradlew
+++ b/gradlew
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

From a7f5f9a35a12f0ae3c53c2327c8b0ecc0bbbc75c Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Thu, 9 Apr 2026 19:58:50 +0000
Subject: [PATCH 051/177] Feat: TheIntroDBSkip + Bugfix (#2631)

---
 .../cloudstream3/utils/videoskip/SkipAPI.kt   |  5 +-
 .../utils/videoskip/TheIntroDBSkip.kt         | 76 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/TheIntroDBSkip.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt
index df16d77ca..cd6727a24 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt
@@ -17,7 +17,8 @@ enum class SkipType(@StringRes val res: Int) {
     MixedOpening(R.string.skip_type_mixed_op),
     MixedEnding(R.string.skip_type_mixed_ed),
     Credits(R.string.skip_type_creddits),
-    Intro(R.string.skip_type_creddits),
+    Intro(R.string.skip_type_intro),
+    Preview(R.string.skip_type_preview),
 }
 
 data class SkipStamp(
@@ -60,7 +61,7 @@ abstract class SkipAPI {
     }
 
     companion object {
-        private val skipApis: List<SkipAPI> = listOf(AniSkip(), IntroDbSkip())
+        private val skipApis: List<SkipAPI> = listOf(AniSkip(), TheIntroDBSkip(), IntroDbSkip())
         private val cachedStamps = ConcurrentHashMap<Int, List<VideoSkipStamp>>()
 
         /** Get all video timestamps from an episode */
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/TheIntroDBSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/TheIntroDBSkip.kt
new file mode 100644
index 000000000..cc2661cb0
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/TheIntroDBSkip.kt
@@ -0,0 +1,76 @@
+package com.lagradost.cloudstream3.utils.videoskip
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.LoadResponse.Companion.getImdbId
+import com.lagradost.cloudstream3.LoadResponse.Companion.getTMDbId
+import com.lagradost.cloudstream3.LoadResponse.Companion.isMovie
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.app
+
+/** https://theintrodb.org/docs */
+class TheIntroDBSkip : SkipAPI() {
+    override val name = "TheIntroDB"
+    override val supportedTypes = setOf(
+        TvType.TvSeries, TvType.Cartoon, TvType.Anime, TvType.Movie,
+        TvType.AsianDrama
+    )
+
+    val mainUrl = "https://api.theintrodb.org"
+
+    override suspend fun stamps(
+        data: LoadResponse,
+        episode: ResultEpisode,
+        episodeDurationMs: Long
+    ): List<SkipStamp>? {
+        val idSuffix =
+            data.getTMDbId()?.let { tmdbId -> "tmdb_id=$tmdbId" }
+                ?: data.getImdbId()?.let { imdbId -> "imdb_id=$imdbId" }
+                ?: return null
+
+        val url = if (data.isMovie()) {
+            "$mainUrl/v2/media?$idSuffix"
+        } else {
+            val season = episode.season ?: return null
+            "$mainUrl/v2/media?$idSuffix&season=$season&episode=${episode.episode}"
+        }
+        val root = app.get(url).parsed<Root>()
+        return arrayOf(
+            root.intro to SkipType.Intro,
+            root.credits to SkipType.Credits,
+            root.recap to SkipType.Recap,
+            root.preview to SkipType.Preview
+        ).map { (list, type) ->
+            list.map { stamp ->
+                SkipStamp(
+                    type,
+                    stamp.startMs ?: 0L,
+                    stamp.endMs ?: episodeDurationMs
+                )
+            }
+        }.flatten()
+    }
+
+    data class Root(
+        @JsonProperty("tmdb_id")
+        val tmdbId: Long,
+        @JsonProperty("type")
+        val type: String,
+        @JsonProperty("intro")
+        val intro: List<Stamp> = emptyList(),
+        @JsonProperty("recap")
+        val recap: List<Stamp> = emptyList(),
+        @JsonProperty("credits")
+        val credits: List<Stamp> = emptyList(),
+        @JsonProperty("preview")
+        val preview: List<Stamp> = emptyList(),
+    )
+
+    data class Stamp(
+        @JsonProperty("start_ms")
+        val startMs: Long?,
+        @JsonProperty("end_ms")
+        val endMs: Long?,
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e9dd2748f..b7956e9d8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -560,6 +560,7 @@
     <string name="skip_type_mixed_ed">Mixed ending</string>
     <string name="skip_type_mixed_op">Mixed opening</string>
     <string name="skip_type_creddits">Credits</string>
+    <string name="skip_type_preview">Preview</string>
     <string name="skip_type_intro">Intro</string>
     <string name="clear_history">Clear history</string>
     <string name="history">History</string>

From c304e8556e073cd19cf3b89232cbcf12ff4dad14 Mon Sep 17 00:00:00 2001
From: Phisher98 <153359846+phisher98@users.noreply.github.com>
Date: Fri, 10 Apr 2026 01:29:31 +0530
Subject: [PATCH 052/177] Minor Fix IntroDbSkip (#2634)

---
 .../com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt
index ce284f3fe..869515f43 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/IntroDbSkip.kt
@@ -47,7 +47,7 @@ class IntroDbSkip : SkipAPI() {
                 val start = it.startMs ?: return@let null
                 val end = it.endMs ?: return@let null
                 SkipStamp(
-                    type = SkipType.Credits,
+                    type = SkipType.Ending,
                     startMs = start,
                     endMs = end
                 )

From 0f1cb3a7738441ace6bc35004fc756b56ab8ba24 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 9 Apr 2026 13:59:53 -0600
Subject: [PATCH 053/177] Add strictly for coil lib (#2635)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c1048028b..435cda8a7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ androidGradlePlugin = "8.13.2"
 appcompat = "1.7.1"
 biometric = "1.4.0-alpha06"
 buildkonfigGradlePlugin = "0.17.1"
-coil = "3.3.0"
+coil = { strictly = "3.3.0" } # Later versions require jvmTarget 11 or later
 colorpicker = "6b46b49"
 conscryptAndroid = { strictly = "2.5.2" } # 2.5.3 crashes everything
 constraintlayout = "2.2.1"

From b89f36c9bc04d4a07e0c2ff437d256a897be31f9 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 9 Apr 2026 14:01:20 -0600
Subject: [PATCH 054/177] Bump material to 1.14.0-beta01 (#2636)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 435cda8a7..c92a937bd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ juniversalchardet = "2.5.0"
 kotlinGradlePlugin = "2.3.0"
 kotlinxCoroutinesCore = "1.10.2"
 lifecycleKtx = "2.10.0"
-material = "1.14.0-alpha10"
+material = "1.14.0-beta01"
 media3 = "1.9.2"
 navigationKtx = "2.9.7"
 newpipeextractor = "v0.26.0"

From adf2ed6df3f5f3275e0f91da882d3adfc815edb6 Mon Sep 17 00:00:00 2001
From: CranberrySoup <142951702+CranberrySoup@users.noreply.github.com>
Date: Sun, 12 Apr 2026 20:36:31 +0000
Subject: [PATCH 055/177] Fix livestreams (#2627)

---
 .../cloudstream3/ui/player/CS3IPlayer.kt      | 47 ++++++++-
 .../ui/player/FullScreenPlayer.kt             | 17 +++-
 .../cloudstream3/ui/player/live/LiveHelper.kt | 77 +++++++++++++++
 .../ui/player/live/LiveManager.kt             | 97 +++++++++++++++++++
 .../ui/player/live/LivePreviewTimeBar.kt      | 38 ++++++++
 .../main/res/layout/player_custom_layout.xml  | 20 +++-
 .../res/layout/player_custom_layout_tv.xml    | 22 ++++-
 .../main/res/layout/trailer_custom_layout.xml | 19 +++-
 app/src/main/res/values/strings.xml           |  2 +
 9 files changed, 333 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LiveHelper.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LiveManager.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LivePreviewTimeBar.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index 43b281a28..60c87532b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -42,6 +42,7 @@ import androidx.media3.datasource.cronet.CronetDataSource
 import androidx.media3.datasource.okhttp.OkHttpDataSource
 import androidx.media3.exoplayer.DecoderCounters
 import androidx.media3.exoplayer.DecoderReuseEvaluation
+import androidx.media3.exoplayer.DefaultLivePlaybackSpeedControl
 import androidx.media3.exoplayer.DefaultLoadControl
 import androidx.media3.exoplayer.DefaultRenderersFactory
 import androidx.media3.exoplayer.ExoPlayer
@@ -54,6 +55,7 @@ import androidx.media3.exoplayer.drm.DefaultDrmSessionManager
 import androidx.media3.exoplayer.drm.FrameworkMediaDrm
 import androidx.media3.exoplayer.drm.HttpMediaDrmCallback
 import androidx.media3.exoplayer.drm.LocalMediaDrmCallback
+import androidx.media3.exoplayer.hls.playlist.HlsPlaylistTracker
 import androidx.media3.exoplayer.source.ClippingMediaSource
 import androidx.media3.exoplayer.source.ConcatenatingMediaSource
 import androidx.media3.exoplayer.source.ConcatenatingMediaSource2
@@ -83,6 +85,8 @@ import com.lagradost.cloudstream3.mvvm.debugAssert
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.fixSubtitleAlignment
+import com.lagradost.cloudstream3.ui.player.live.LiveHelper
+import com.lagradost.cloudstream3.ui.player.live.PREFERRED_LIVE_OFFSET
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
@@ -272,6 +276,10 @@ class CS3IPlayer : IPlayer {
     }
 
     override fun hasPreview(): Boolean {
+        // No previews on livestreams because the previews get outdated
+        if (exoPlayer?.isCurrentMediaItemDynamic == true) {
+            return false
+        }
         return imageGenerator.hasPreview()
     }
 
@@ -399,7 +407,12 @@ class CS3IPlayer : IPlayer {
                 ?.let { group ->
                     exoPlayer?.trackSelectionParameters
                         ?.buildUpon()
-                        ?.setOverrideForType(TrackSelectionOverride(group.mediaTrackGroup, trackFormatIndex))
+                        ?.setOverrideForType(
+                            TrackSelectionOverride(
+                                group.mediaTrackGroup,
+                                trackFormatIndex
+                            )
+                        )
                         ?.build()
                 }
                 ?.let { newParams ->
@@ -516,10 +529,12 @@ class CS3IPlayer : IPlayer {
                 Log.i(TAG, "setPreferredSubtitles REQUIRES_RELOAD")
                 return true
             }
+
             SubtitleStatus.NOT_FOUND -> {
                 Log.i(TAG, "setPreferredSubtitles NOT_FOUND")
                 return true
             }
+
             SubtitleStatus.IS_ACTIVE -> {
                 Log.i(TAG, "setPreferredSubtitles IS_ACTIVE")
                 exoPlayer?.currentTracks?.groups
@@ -1067,6 +1082,17 @@ class CS3IPlayer : IPlayer {
     ): ExoPlayer {
         val exoPlayerBuilder =
             ExoPlayer.Builder(context)
+                .setMediaSourceFactory(
+                    DefaultMediaSourceFactory(context).setLiveTargetOffsetMs(
+                        PREFERRED_LIVE_OFFSET
+                    )
+                )
+                .setLivePlaybackSpeedControl(
+                    DefaultLivePlaybackSpeedControl.Builder()
+                        .setFallbackMaxPlaybackSpeed(1.03f)
+                        .setFallbackMinPlaybackSpeed(0.97f)
+                        .build()
+                )
                 .setRenderersFactory { eventHandler, videoRendererEventListener, audioRendererEventListener, textRendererOutput, metadataRendererOutput ->
                     val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
                     val current = settingsManager.getInt(
@@ -1398,6 +1424,8 @@ class CS3IPlayer : IPlayer {
                 return
             }
 
+            LiveHelper.registerPlayer(exoPlayer)
+
             exoPlayer?.addListener(object : Player.Listener {
                 override fun onTracksChanged(tracks: Tracks) {
                     safe {
@@ -1506,6 +1534,23 @@ class CS3IPlayer : IPlayer {
                             exoPlayer?.prepare()
                         }
 
+                        // PlaylistStuckException usually happens when the player position is ahead of the live window.
+                        // Seek to the default location in that case
+                        error.cause is HlsPlaylistTracker.PlaylistStuckException -> {
+                            val position = exoPlayer?.currentPosition ?: exoPlayer?.duration ?: 0
+
+                            // Seek to live head
+                            val aheadOfLive = LiveHelper.getLiveManager(exoPlayer)?.getTimeAheadOfLive(position) ?: 0
+
+                            if (aheadOfLive > 100) {
+                                exoPlayer?.seekTo(position - aheadOfLive)
+                            } else {
+                                exoPlayer?.seekToDefaultPosition()
+                            }
+                            exoPlayer?.prepare()
+                        }
+
+
                         else -> {
                             event(ErrorEvent(error))
                         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 4bec57f9c..8699202b9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -631,7 +631,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     override fun subtitlesChanged() {
         val tracks = player.getVideoTracks()
         val isBuiltinSubtitles = tracks.currentTextTracks.all { track ->
-            track.sampleMimeType  == MimeTypes.APPLICATION_MEDIA3_CUES
+            track.sampleMimeType == MimeTypes.APPLICATION_MEDIA3_CUES
         }
         // Subtitle offset is not possible on built-in media3 tracks
         playerBinding?.playerSubtitleOffsetBtt?.isGone =
@@ -738,6 +738,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         activity?.window?.attributes = lp
         activity?.showSystemUI()
     }
+
     private fun resetZoomToDefault() {
         if (zoomMatrix != null) resize(PlayerResize.Fit, false)
     }
@@ -2648,6 +2649,8 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 }
             }
 
+            exoProgress.registerPlayerView(playerView)
+
             exoProgress.setOnTouchListener { _, event ->
                 // this makes the bar not disappear when sliding
                 when (event.action) {
@@ -2720,10 +2723,20 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         val duration = player.getDuration()
         val position = player.getPosition()
 
+        if (playerBinding?.exoProgress?.isAtLiveEdge() == true) {
+            // Hide using a parentView instead?
+            playerBinding?.timeLeft?.alpha = 0f
+            playerBinding?.exoDuration?.alpha = 0f
+            playerBinding?.timeLive?.isVisible = true
+        } else {
+            playerBinding?.timeLeft?.alpha = 1f
+            playerBinding?.exoDuration?.alpha = 1f
+            playerBinding?.timeLive?.isVisible = false
+        }
+
         if (duration != null && duration > 1 && position != null) {
             val remainingTimeSeconds = (duration - position + 500) / 1000
             val formattedTime = "-${DateUtils.formatElapsedTime(remainingTimeSeconds)}"
-
             playerBinding?.timeLeft?.text = formattedTime
         }
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LiveHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LiveHelper.kt
new file mode 100644
index 000000000..52cd4361b
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LiveHelper.kt
@@ -0,0 +1,77 @@
+package com.lagradost.cloudstream3.ui.player.live
+
+import androidx.annotation.OptIn
+import androidx.media3.common.Player
+import androidx.media3.common.Timeline
+import androidx.media3.common.util.UnstableApi
+import com.lagradost.cloudstream3.mvvm.debugWarning
+import java.util.WeakHashMap
+
+object LiveHelper {
+    private val liveManagers = WeakHashMap<Player, Pair<LiveManager, Player.Listener>>()
+
+    @OptIn(UnstableApi::class)
+    fun registerPlayer(player: Player?) {
+        if (player == null) {
+            debugWarning { "LiveHelper registerPlayer called with null player!" }
+            return
+        }
+
+        // Prevent duplicates
+        if (liveManagers.contains(player)) {
+            return
+        }
+
+        val liveManager = LiveManager(player)
+        val listener = object : Player.Listener {
+            override fun onTimelineChanged(timeline: Timeline, reason: Int) {
+                val window = Timeline.Window()
+                timeline.getWindow(player.currentMediaItemIndex, window)
+                if (window.isDynamic) {
+                    liveManager.submitLivestreamChunk(LivestreamChunk(window.durationMs))
+                }
+                super.onTimelineChanged(timeline, reason)
+            }
+
+            override fun onPositionDiscontinuity(
+                oldPosition: Player.PositionInfo,
+                newPosition: Player.PositionInfo,
+                reason: Int
+            ) {
+                super.onPositionDiscontinuity(oldPosition, newPosition, reason)
+                val timeAheadOfLive = liveManager.getTimeAheadOfLive(newPosition.positionMs)
+
+                // Seek back to the optimal live spot
+                if (timeAheadOfLive > 100) {
+                    player.seekTo(newPosition.positionMs - timeAheadOfLive)
+                }
+            }
+        }
+
+        synchronized(liveManagers) {
+            player.addListener(listener)
+            liveManagers[player] = liveManager to listener
+        }
+    }
+
+    fun unregisterPlayer(player: Player?) {
+        if (player == null) {
+            debugWarning { "LiveHelper unregisterPlayer called with null player!" }
+            return
+        }
+
+        // Prevent duplicates
+        if (!liveManagers.contains(player)) {
+            return
+        }
+
+        synchronized(liveManagers) {
+            liveManagers[player]?.let { (_, listener) ->
+                player.removeListener(listener)
+            }
+            liveManagers.remove(player)
+        }
+    }
+
+    fun getLiveManager(player: Player?) = liveManagers[player]?.first
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LiveManager.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LiveManager.kt
new file mode 100644
index 000000000..8d848d46a
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LiveManager.kt
@@ -0,0 +1,97 @@
+package com.lagradost.cloudstream3.ui.player.live
+
+import androidx.media3.common.C
+import androidx.media3.common.Player
+import java.lang.ref.WeakReference
+
+// How much margin from the live point is still considered "live"
+const val LIVE_MARGIN = 6_000L
+
+// How many ms should we be behind the real live point?
+// Too low, and we cannot pre-buffer
+// Too high, and we are no longer live
+const val PREFERRED_LIVE_OFFSET = 5_000L
+
+// An extra offset from the optimal calculated timestamp
+// This is to account for chunk updates not always being the same size
+const val CHUNK_VARIANCE = 3000L
+
+// A livestream chunk from the player, the time we get it and the duration can be used to calculate
+// the expected live timestamp.
+class LivestreamChunk(
+    durationMs: Long, val receiveTimeMs: Long = System.currentTimeMillis()
+) {
+    // We want to be PREFERRED_LIVE_OFFSET ms after the latest update, but we cannot be ahead of the middle point.
+    // If we are ahead of the middle point we will reach the end before the new chunk is expected to be released.
+    val targetPosition = maxOf(0,minOf(
+        durationMs - PREFERRED_LIVE_OFFSET,
+        durationMs / 2 - CHUNK_VARIANCE
+    ))
+
+    fun isPositionLive(position: Long): Boolean {
+        val currentTime = System.currentTimeMillis()
+        val livePosition = targetPosition + (currentTime - receiveTimeMs)
+        val withinLive = position + LIVE_MARGIN > livePosition - PREFERRED_LIVE_OFFSET
+        // println("Position: $position, livePosition: ${livePosition}, Behind live: ${livePosition-position}, within live: $withinLive")
+        return withinLive
+    }
+
+    fun getTimeAheadOfLive(position: Long): Long {
+        val currentTime = System.currentTimeMillis()
+        val livePosition = targetPosition + (currentTime - receiveTimeMs)
+        // println("Ahead of live: ${position-livePosition}")
+        return position - livePosition
+    }
+}
+
+// There are two types of livestreams we need to manage
+// 1. A livestream with no history, a continually sliding window.
+// This livestream has no currentLiveOffset, which means we need to calculate
+// the real live point based on when we receive the latest update and the size of that update.
+// 2. A livestream with history.
+// This livestream has a currentLiveOffset and therefore requires no calculation to get the live point.
+// currentLiveOffset can however be inaccurate, and we need to be able to fall back to manual calculations.
+class LiveManager {
+    private var _currentPlayer: WeakReference<Player>? = null
+    val currentPlayer: Player? get() = _currentPlayer?.get()
+
+    constructor(player: Player?) {
+        _currentPlayer = WeakReference(player)
+    }
+
+    private var lastLivestreamChunk: LivestreamChunk? = null
+
+    fun submitLivestreamChunk(chunk: LivestreamChunk) {
+        lastLivestreamChunk = chunk
+    }
+
+    /** Returns how much a position is ahead of the calculated live window. Returns 0 if not ahead of live window */
+    fun getTimeAheadOfLive(position: Long): Long {
+        val player = currentPlayer ?: return 0
+        if (!player.isCurrentMediaItemDynamic || player.duration == C.TIME_UNSET) return 0
+
+        // If the currentLiveOffset is wrong we fall back to manual calculations
+        val ahead = if (player.currentLiveOffset != C.TIME_UNSET && player.currentLiveOffset < player.duration) {
+            val relativeOffset = player.currentLiveOffset - player.currentPosition + position
+            PREFERRED_LIVE_OFFSET - relativeOffset
+        } else {
+            lastLivestreamChunk?.getTimeAheadOfLive(position) ?: 0
+        }
+
+        // Ensure min of 0
+        return maxOf(0, ahead)
+    }
+
+    /** Check if the stream is currently at the expected live edge, with margins */
+    fun isAtLiveEdge(): Boolean {
+        val player = currentPlayer ?: return false
+        if (!player.isCurrentMediaItemDynamic || player.duration == C.TIME_UNSET) return false
+
+        // If the currentLiveOffset is wrong we fall back to manual calculations
+        return if (player.currentLiveOffset != C.TIME_UNSET && player.currentLiveOffset < player.duration) {
+            player.currentLiveOffset < LIVE_MARGIN + PREFERRED_LIVE_OFFSET
+        } else {
+            lastLivestreamChunk?.isPositionLive(player.currentPosition) == true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LivePreviewTimeBar.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LivePreviewTimeBar.kt
new file mode 100644
index 000000000..3001281fd
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/live/LivePreviewTimeBar.kt
@@ -0,0 +1,38 @@
+package com.lagradost.cloudstream3.ui.player.live
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.annotation.OptIn
+import androidx.media3.common.Player
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.ui.PlayerControlView
+import androidx.media3.ui.PlayerView
+import androidx.media3.ui.R
+import com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
+import java.lang.ref.WeakReference
+
+
+@OptIn(UnstableApi::class)
+class LivePreviewTimeBar(val ctx: Context, attrs: AttributeSet) : PreviewTimeBar(ctx, attrs) {
+
+    private var _currentPlayerView: WeakReference<PlayerView>? = null
+    val currentPlayer: Player? get() = _currentPlayerView?.get()?.player
+
+    fun registerPlayerView(player: PlayerView?) {
+        _currentPlayerView = WeakReference(player)
+        val controller =
+            _currentPlayerView?.get()?.findViewById<PlayerControlView>(R.id.exo_controller)
+
+        controller?.setProgressUpdateListener { position, bufferedPosition ->
+            currentPlayer?.let { player ->
+                if (isAtLiveEdge()) {
+                    setPosition(player.duration)
+                }
+            }
+        }
+    }
+
+    fun isAtLiveEdge(): Boolean {
+        return LiveHelper.getLiveManager(currentPlayer)?.isAtLiveEdge() == true
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml
index 72024a918..407de4a3f 100644
--- a/app/src/main/res/layout/player_custom_layout.xml
+++ b/app/src/main/res/layout/player_custom_layout.xml
@@ -759,7 +759,7 @@
                             android:scaleType="centerCrop" />
                     </FrameLayout>
 
-                    <com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
+                    <com.lagradost.cloudstream3.ui.player.live.LivePreviewTimeBar
                         android:id="@id/exo_progress"
                         android:layout_width="0dp"
                         android:layout_height="30dp"
@@ -793,6 +793,24 @@
                         app:layout_constraintEnd_toEndOf="parent"
                         tools:text="23:20" />
 
+                    <TextView
+                        android:id="@+id/time_live"
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center|center_vertical"
+                        android:layout_marginEnd="20dp"
+                        android:includeFontPadding="false"
+                        android:minWidth="50dp"
+                        android:paddingLeft="4dp"
+                        android:paddingRight="4dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp"
+                        android:textStyle="normal"
+                        android:visibility="gone"
+                        app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        android:text="@string/player_is_live" />
+
                     <TextView
                         android:id="@+id/time_left"
                         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/player_custom_layout_tv.xml b/app/src/main/res/layout/player_custom_layout_tv.xml
index ed06ef2b6..41d45b6bb 100644
--- a/app/src/main/res/layout/player_custom_layout_tv.xml
+++ b/app/src/main/res/layout/player_custom_layout_tv.xml
@@ -917,7 +917,7 @@
                             android:scaleType="centerCrop" />
                     </FrameLayout>
 
-                    <com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
+                    <com.lagradost.cloudstream3.ui.player.live.LivePreviewTimeBar
                         android:id="@id/exo_progress"
                         android:layout_width="0dp"
                         android:layout_height="30dp"
@@ -951,6 +951,25 @@
                         app:layout_constraintEnd_toEndOf="parent"
                         tools:text="23:20" />
 
+                    <TextView
+                        android:id="@+id/time_live"
+                        android:layout_width="wrap_content"
+                        android:layout_height="30dp"
+                        android:layout_gravity="center|center_vertical"
+                        android:text="@string/player_is_live"
+                        android:layout_marginEnd="20dp"
+                        android:includeFontPadding="false"
+                        android:minWidth="50dp"
+                        android:paddingLeft="4dp"
+                        android:paddingRight="4dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp"
+                        android:textStyle="normal"
+                        android:visibility="gone"
+                        app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        />
+
                     <TextView
                         android:id="@+id/time_left"
                         android:layout_width="wrap_content"
@@ -1094,6 +1113,7 @@
         android:layout_height="match_parent">
 
     </FrameLayout>
+
     <com.google.android.material.button.MaterialButton
         android:id="@+id/player_speedup_button"
         style="@style/Widget.MaterialComponents.Button.OutlinedButton"
diff --git a/app/src/main/res/layout/trailer_custom_layout.xml b/app/src/main/res/layout/trailer_custom_layout.xml
index 52b5c7b2c..8b12505c2 100644
--- a/app/src/main/res/layout/trailer_custom_layout.xml
+++ b/app/src/main/res/layout/trailer_custom_layout.xml
@@ -732,7 +732,7 @@
                         android:scaleType="centerCrop" />
                 </FrameLayout>
 
-                <com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
+                <com.lagradost.cloudstream3.ui.player.live.LivePreviewTimeBar
                     android:id="@id/exo_progress"
                     android:layout_width="0dp"
                     android:layout_height="30dp"
@@ -765,6 +765,23 @@
                     app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
                     app:layout_constraintEnd_toEndOf="@id/player_fullscreen"
                     tools:text="23:20" />
+                <TextView
+                    android:id="@+id/time_live"
+                    android:layout_width="wrap_content"
+                    android:layout_height="30dp"
+                    android:layout_gravity="center|center_vertical"
+                    android:text="@string/player_is_live"
+                    android:layout_marginEnd="30dp"
+                    android:includeFontPadding="false"
+                    android:minWidth="50dp"
+                    android:paddingLeft="4dp"
+                    android:paddingRight="4dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp"
+                    android:textStyle="normal"
+                    android:visibility="gone"
+                    app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
+                    app:layout_constraintEnd_toEndOf="@id/player_fullscreen" />
 
                 <TextView
                     android:id="@+id/time_left"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b7956e9d8..d59065a64 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -781,4 +781,6 @@
         <item quantity="one">%d download queued</item>
         <item quantity="other">%d downloads queued</item>
     </plurals>
+    <string name="player_is_live">Live</string>
+
 </resources>

From 14d56de61ea89b422e2335bcb180188da735aac3 Mon Sep 17 00:00:00 2001
From: Phisher98 <153359846+phisher98@users.noreply.github.com>
Date: Mon, 13 Apr 2026 02:10:05 +0530
Subject: [PATCH 056/177] Adding a subtle shadow and minor adjustments to make
 the description stand out more on a white background. (#2648)

---
 app/src/main/res/layout/player_custom_layout_tv.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/player_custom_layout_tv.xml b/app/src/main/res/layout/player_custom_layout_tv.xml
index 41d45b6bb..2c536c825 100644
--- a/app/src/main/res/layout/player_custom_layout_tv.xml
+++ b/app/src/main/res/layout/player_custom_layout_tv.xml
@@ -10,7 +10,7 @@
 
     <FrameLayout
         android:id="@+id/player_metadata_scrim"
-        android:layout_width="640dp"
+        android:layout_width="680dp"
         android:layout_height="match_parent"
         android:background="@drawable/bg_player_metadata_scrim_netflix"
         app:layout_constraintStart_toStartOf="parent"
@@ -49,6 +49,10 @@
                     android:textColor="@android:color/white"
                     android:textSize="30sp"
                     android:textStyle="bold"
+                    android:shadowColor="@android:color/black"
+                    android:shadowDx="2"
+                    android:shadowDy="2"
+                    android:shadowRadius="4"
                     android:maxLines="2"
                     android:ellipsize="end"
                     tools:text="Zootopia 2"/>
@@ -74,8 +78,12 @@
                 android:textColor="#E6FFFFFF"
                 android:textSize="16sp"
                 android:lineSpacingExtra="8dp"
+                android:shadowColor="@android:color/black"
+                android:shadowDx="2"
+                android:shadowDy="2"
+                android:shadowRadius="4"
                 android:maxLines="5"
-                tools:text="Brave rabbit cop Judy Hopps and her friend, the fox Nick Wilde, team up again to crack a new case."/>
+                tools:text="Brave rabbit cop Judy Hopps..."/>
 
         </LinearLayout>
         <ImageView

From bd7db6c20ae93a236d7126d920328130c150f7c5 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 12 Apr 2026 14:46:11 -0600
Subject: [PATCH 057/177] Upgrade media3 to 1.10.0 (#2608)

---
 gradle/libs.versions.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c92a937bd..5a46edf3d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,10 +27,10 @@ kotlinGradlePlugin = "2.3.0"
 kotlinxCoroutinesCore = "1.10.2"
 lifecycleKtx = "2.10.0"
 material = "1.14.0-beta01"
-media3 = "1.9.2"
+media3 = "1.10.0"
 navigationKtx = "2.9.7"
 newpipeextractor = "v0.26.0"
-nextlibMedia3 = "1.9.1-0.11.0"
+nextlibMedia3 = "1.9.3-0.12.0"
 nicehttp = "0.4.17"
 overlappingpanels = "0.1.5"
 paletteKtx = "1.0.0"

From 2eb63dc334b19e5a1463158fd1f79572bfebdcf9 Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Mon, 13 Apr 2026 21:47:12 +0000
Subject: [PATCH 058/177] Change default installer to legacy (#2653)

Switching the default to the more reliable legacy installer until we fix the new installer.
---
 .../com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt  | 3 ++-
 .../main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
index 118d89ac4..9250f6f6f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
@@ -205,8 +205,9 @@ class SettingsUpdates : BasePreferenceFragmentCompat() {
             val prefNames = resources.getStringArray(R.array.apk_installer_pref)
             val prefValues = resources.getIntArray(R.array.apk_installer_values)
 
+            // Use legacy installer as default until we make the new installer completely reliable
             val currentInstaller =
-                settingsManager.getInt(getString(R.string.apk_installer_key), 0)
+                settingsManager.getInt(getString(R.string.apk_installer_key), 1)
 
             activity?.showBottomDialog(
                 prefNames.toList(),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
index 9380285ca..8bcd1b88e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
@@ -308,7 +308,7 @@ object InAppUpdater {
                         }
 
                         val currentInstaller = settingsManager.getInt(
-                            getString(R.string.apk_installer_key), 0
+                            getString(R.string.apk_installer_key), 1
                         )
 
                         when (currentInstaller) {

From 1b0fdb57a8298477cf68a321e19abed02417c8f7 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Mon, 13 Apr 2026 15:50:57 -0600
Subject: [PATCH 059/177] Add permissions to workflows (#2654)

https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#permissions
---
 .github/workflows/build_to_archive.yml | 3 +++
 .github/workflows/generate_dokka.yml   | 3 +++
 .github/workflows/issue_action.yml     | 4 ++++
 .github/workflows/prerelease.yml       | 3 +++
 .github/workflows/pull_request.yml     | 3 +++
 .github/workflows/update_locales.yml   | 3 +++
 6 files changed, 19 insertions(+)

diff --git a/.github/workflows/build_to_archive.yml b/.github/workflows/build_to_archive.yml
index f72dd10c6..b5960d5d9 100644
--- a/.github/workflows/build_to_archive.yml
+++ b/.github/workflows/build_to_archive.yml
@@ -9,6 +9,9 @@ on:
       - '**/wcokey.txt'
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 concurrency:
   group: "Archive-build"
   cancel-in-progress: true
diff --git a/.github/workflows/generate_dokka.yml b/.github/workflows/generate_dokka.yml
index 91f03a434..8ca1f9688 100644
--- a/.github/workflows/generate_dokka.yml
+++ b/.github/workflows/generate_dokka.yml
@@ -6,6 +6,9 @@ on:
     paths-ignore:
       - '*.md'
 
+permissions:
+  contents: read
+
 concurrency:
   group: "dokka"
   cancel-in-progress: true
diff --git a/.github/workflows/issue_action.yml b/.github/workflows/issue_action.yml
index 4286e6b68..a410fcfff 100644
--- a/.github/workflows/issue_action.yml
+++ b/.github/workflows/issue_action.yml
@@ -4,6 +4,10 @@ on:
   issues:
     types: [opened]
 
+permissions:
+  contents: read
+  issues: write
+
 jobs:
   issue-moderator:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 03cb68cbc..d9a20a04b 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -12,6 +12,9 @@ concurrency:
   group: "pre-release"
   cancel-in-progress: true
 
+permissions:
+  contents: write
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index a5a7d56e3..675ce3b2f 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -2,6 +2,9 @@ name: Artifact Build
 
 on: [pull_request]
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/update_locales.yml b/.github/workflows/update_locales.yml
index 5b170d540..0a538d5d4 100644
--- a/.github/workflows/update_locales.yml
+++ b/.github/workflows/update_locales.yml
@@ -11,6 +11,9 @@ concurrency:
   group: "locale"
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   create:
     runs-on: ubuntu-latest

From 788189c80cd2b6bba8184843d382477091dcb638 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Mon, 13 Apr 2026 15:52:57 -0600
Subject: [PATCH 060/177] Bump github-script action (#2642)

---
 .github/workflows/issue_action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/issue_action.yml b/.github/workflows/issue_action.yml
index a410fcfff..e354d657d 100644
--- a/.github/workflows/issue_action.yml
+++ b/.github/workflows/issue_action.yml
@@ -33,7 +33,7 @@ jobs:
 
       - name: Label if possible duplicate
         if: steps.similarity.outputs.similar-issues-found =='true'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           github-token: ${{ steps.generate_token.outputs.token }}
           script: |
@@ -79,7 +79,7 @@ jobs:
 
       - name: Label if mentions provider
         if: steps.provider_check.outputs.name != 'none'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           github-token: ${{ steps.generate_token.outputs.token }}
           script: |

From fb54d02979c39b66b6423cf2c3239743e9b48a85 Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Mon, 13 Apr 2026 22:21:52 +0000
Subject: [PATCH 061/177] Fix SSL issues (#2655)

---
 .../lagradost/cloudstream3/MainActivity.kt    |  7 +++--
 .../cloudstream3/network/RequestsHelper.kt    | 27 ++++++++++++++-----
 .../com/lagradost/cloudstream3/MainAPI.kt     |  7 +++++
 .../lagradost/cloudstream3/MainActivity.kt    | 17 +++++++++---
 4 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 709e92a41..071ce6c89 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -1169,7 +1169,10 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        app.initClient(this)
+        app.initClient(this, ignoreSSL = false)
+        @OptIn(UnsafeSSL::class)
+        insecureApp.initClient(this, ignoreSSL = true)
+
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
 
         setLastError(this)
@@ -2059,4 +2062,4 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             false
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
index ec486d61d..6234297d0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
@@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.network
 
 import android.content.Context
 import androidx.preference.PreferenceManager
+import com.lagradost.cloudstream3.Prerelease
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.mvvm.safe
@@ -15,11 +16,26 @@ import org.conscrypt.Conscrypt
 import java.io.File
 import java.security.Security
 
+// Backwards compatible constructor, mark as deprecated later
 fun Requests.initClient(context: Context) {
     this.baseClient = buildDefaultClient(context)
 }
 
+/** Only use ignoreSSL if you know what you are doing*/
+@Prerelease
+fun Requests.initClient(context: Context, ignoreSSL: Boolean = false) {
+    this.baseClient = buildDefaultClient(context, ignoreSSL)
+}
+
+
+// Backwards compatible constructor, mark as deprecated later
 fun buildDefaultClient(context: Context): OkHttpClient {
+    return buildDefaultClient(context, false)
+}
+
+/** Only use ignoreSSL if you know what you are doing*/
+@Prerelease
+fun buildDefaultClient(context: Context, ignoreSSL: Boolean = false): OkHttpClient {
     safe { Security.insertProviderAt(Conscrypt.newProvider(), 1) }
     
     val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
@@ -27,7 +43,11 @@ fun buildDefaultClient(context: Context): OkHttpClient {
     val baseClient = OkHttpClient.Builder()
         .followRedirects(true)
         .followSslRedirects(true)
-        .ignoreAllSSLErrors()
+        .apply {
+            if (ignoreSSL) {
+                ignoreAllSSLErrors()
+            }
+        }
         .cache(
             // Note that you need to add a ResponseInterceptor to make this 100% active.
             // The server response dictates if and when stuff should be cached.
@@ -52,11 +72,6 @@ fun buildDefaultClient(context: Context): OkHttpClient {
     return baseClient
 }
 
-//val Request.cookies: Map<String, String>
-//    get() {
-//        return this.headers.getCookies("Cookie")
-//    }
-
 private val DEFAULT_HEADERS = mapOf("user-agent" to USER_AGENT)
 
 /**
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index 81eabbe77..aeab8ef9f 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -55,6 +55,13 @@ annotation class Prerelease
 )
 annotation class InternalAPI
 
+@Retention(AnnotationRetention.BINARY) // This is only an IDE hint, and will not be used in the runtime
+@RequiresOptIn(
+    message = "Only use this if you know what you are doing and you need to bypass the SSL certificate checks. Never use this for sensitive network requests such as logins.",
+    level = RequiresOptIn.Level.WARNING
+)
+annotation class UnsafeSSL
+
 /**
  * Defines the constant for the all languages preference, if this is set then it is
  * the equivalent of all languages being set
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainActivity.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainActivity.kt
index 6502cc831..4b163867d 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainActivity.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainActivity.kt
@@ -8,8 +8,7 @@ import com.lagradost.nicehttp.ResponseParser
 import kotlin.reflect.KClass
 
 // Short name for requests client to make it nicer to use
-
-var app = Requests(responseParser = object : ResponseParser {
+private val jacksonResponseParser = object : ResponseParser {
     val mapper: ObjectMapper = jacksonObjectMapper().configure(
         DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,
         false
@@ -30,6 +29,18 @@ var app = Requests(responseParser = object : ResponseParser {
     override fun writeValueAsString(obj: Any): String {
         return mapper.writeValueAsString(obj)
     }
-}).apply {
+}
+
+/** The default networking helper. This helper performs SSL checks.
+ * If you need to make requests to websites with invalid SSL certificates use insecureApp instead. */
+var app = Requests(responseParser = jacksonResponseParser).apply {
+    defaultHeaders = mapOf("user-agent" to USER_AGENT)
+}
+
+/** Same as the default app networking helper, but this instance ignores SSL certificates.
+ * This should NEVER be used for sensitive networking operations such as logins. Only use this when required. */
+@Prerelease
+@UnsafeSSL
+var insecureApp = Requests(responseParser = jacksonResponseParser).apply {
     defaultHeaders = mapOf("user-agent" to USER_AGENT)
 }
\ No newline at end of file

From cfce80e93e181eb2fd7517438e2d77d1a802781f Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Mon, 13 Apr 2026 16:27:27 -0600
Subject: [PATCH 062/177] Bump DGP and KGP libs (#2582)

Final compatibility with AGP 9
---
 gradle/libs.versions.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5a46edf3d..fc9926c93 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ conscryptAndroid = { strictly = "2.5.2" } # 2.5.3 crashes everything
 constraintlayout = "2.2.1"
 coreKtx = "1.18.0"
 desugar_jdk_libs_nio = "2.1.5"
-dokkaGradlePlugin = "2.1.0"
+dokkaGradlePlugin = "2.2.0"
 espressoCore = "3.7.0"
 fragmentKtx = "1.8.9"
 fuzzywuzzy = "1.4.0"
@@ -23,7 +23,7 @@ junit = "4.13.2"
 junitKtx = "1.3.0"
 junitVersion = "1.3.0"
 juniversalchardet = "2.5.0"
-kotlinGradlePlugin = "2.3.0"
+kotlinGradlePlugin = "2.3.20"
 kotlinxCoroutinesCore = "1.10.2"
 lifecycleKtx = "2.10.0"
 material = "1.14.0-beta01"

From 0bb932227622431304c47a50418c92b4a4971bd3 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Tue, 14 Apr 2026 14:47:38 -0600
Subject: [PATCH 063/177] Don't explicitly enable WebContentsDebugging (#2657)

"this is enabled automatically if the app is declared as `android:debuggable="true"` in its manifest; otherwise, the default is false." - which we set on CloudStream Debug but not release flavors.

"Enabling web contents debugging allows the state of any WebView in the app to be inspected and modified by the user via adb. This is a security liability and should not be enabled in production builds of apps unless this is an explicitly intended use of the app."
---
 .../lagradost/cloudstream3/network/WebViewResolver.android.kt   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt b/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt
index a99d0a16a..60a4d0453 100644
--- a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt
+++ b/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt
@@ -123,8 +123,6 @@ actual class WebViewResolver actual constructor(
         val extraRequestList = threadSafeListOf<Request>()
 
         main {
-            // Useful for debugging
-            WebView.setWebContentsDebuggingEnabled(true)
             try {
                 webView = WebView(
                     (getContext() as? Context)

From 8d416fa2fc48ff9a4fca242b3c82243e441a198e Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Tue, 14 Apr 2026 14:48:23 -0600
Subject: [PATCH 064/177] Remove commented android.enableJetifier from
 gradle.properties (#2662)

It is now deprecated anyway. We will never use it now, so we can just fully remove it.
---
 gradle.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 0168ae437..b6d502f9a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,8 +15,6 @@ org.gradle.jvmargs=-Xmx4G -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-# android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 android.nonTransitiveRClass=true

From 7925e714e7a97dadf7a7e70a89a4cc45f6e914ea Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Tue, 14 Apr 2026 15:39:31 -0600
Subject: [PATCH 065/177] Fix editing accounts from MainActivity (#2663)

---
 .../ui/account/AccountSelectActivity.kt          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
index 29c35dea6..ad323c7d1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
@@ -48,10 +48,16 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        // Are we editing and coming from MainActivity?
+        val isEditingFromMainActivity = intent.getBooleanExtra(
+            "isEditingFromMainActivity",
+            false
+        )
+
         // Sometimes we start this activity when we have already logged in
         // For example when using cloudstreamsearch://
         // In those cases we want to just go to the main activity instantly
-        if (hasLoggedIn) {
+        if (hasLoggedIn && !isEditingFromMainActivity) {
             navigateToMainActivity()
             return
         }
@@ -61,12 +67,6 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
         enableEdgeToEdgeCompat()
         setNavigationBarColorCompat(R.attr.primaryBlackBackground)
 
-        // Are we editing and coming from MainActivity?
-        val isEditingFromMainActivity = intent.getBooleanExtra(
-            "isEditingFromMainActivity",
-            false
-        )
-
         val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
         val skipStartup = settingsManager.getBoolean(
             getString(R.string.skip_startup_account_select_key), false
@@ -216,4 +216,4 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
     override fun onAuthenticationError() {
         finish()
     }
-}
\ No newline at end of file
+}

From c31c5764ea649f85365d5cf9c42e19557abc9ef4 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Tue, 14 Apr 2026 16:22:38 -0600
Subject: [PATCH 066/177] Bump nextlibMedia3 (#2658)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fc9926c93..f997e4f6e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -30,7 +30,7 @@ material = "1.14.0-beta01"
 media3 = "1.10.0"
 navigationKtx = "2.9.7"
 newpipeextractor = "v0.26.0"
-nextlibMedia3 = "1.9.3-0.12.0"
+nextlibMedia3 = "1.10.0-0.12.1"
 nicehttp = "0.4.17"
 overlappingpanels = "0.1.5"
 paletteKtx = "1.0.0"

From cd033923642f3d146500de707ed117dc8afce543 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 16 Apr 2026 17:26:52 -0600
Subject: [PATCH 067/177] Remove setup-android action from Dokka action (#2666)

It shouldn't be necessary with setup-gradle.
---
 .github/workflows/generate_dokka.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/generate_dokka.yml b/.github/workflows/generate_dokka.yml
index 8ca1f9688..d67b8a519 100644
--- a/.github/workflows/generate_dokka.yml
+++ b/.github/workflows/generate_dokka.yml
@@ -54,9 +54,6 @@ jobs:
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
-      - name: Set up Android SDK
-        uses: android-actions/setup-android@v4
-
       - name: Generate Dokka
         run: |
           cd $GITHUB_WORKSPACE/src/

From 636d2507f72ce571b37bce8c30766658309074c0 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 16 Apr 2026 17:28:16 -0600
Subject: [PATCH 068/177] Add missing OptIn (#2668)

This an error level opt in introduced in media3 1.10.0.
---
 .../java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index 60c87532b..8a643cc69 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -29,6 +29,7 @@ import androidx.media3.common.TrackGroup
 import androidx.media3.common.TrackSelectionOverride
 import androidx.media3.common.Tracks
 import androidx.media3.common.VideoSize
+import androidx.media3.common.util.ExperimentalApi
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.database.StandaloneDatabaseProvider
 import androidx.media3.datasource.DataSource
@@ -1195,6 +1196,7 @@ class CS3IPlayer : IPlayer {
                             CustomDecoder.subtitleOffset = subtitleOffset
                             val decoder = CustomSubtitleDecoderFactory()
 
+                            @OptIn(ExperimentalApi::class)
                             val currentTextRenderer = TextRenderer(
                                 customTextOutput,
                                 eventHandler.looper,

From 63368379031281d5c228f6a1ed5279b0c27cf794 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 18 Apr 2026 07:40:05 -0600
Subject: [PATCH 069/177] Revert media3 to 1.9.3 (#2693)

---
 .../java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt   | 4 ++--
 gradle/libs.versions.toml                                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index 8a643cc69..887777934 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -29,7 +29,7 @@ import androidx.media3.common.TrackGroup
 import androidx.media3.common.TrackSelectionOverride
 import androidx.media3.common.Tracks
 import androidx.media3.common.VideoSize
-import androidx.media3.common.util.ExperimentalApi
+// import androidx.media3.common.util.ExperimentalApi
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.database.StandaloneDatabaseProvider
 import androidx.media3.datasource.DataSource
@@ -1196,7 +1196,7 @@ class CS3IPlayer : IPlayer {
                             CustomDecoder.subtitleOffset = subtitleOffset
                             val decoder = CustomSubtitleDecoderFactory()
 
-                            @OptIn(ExperimentalApi::class)
+                            // @OptIn(ExperimentalApi::class)
                             val currentTextRenderer = TextRenderer(
                                 customTextOutput,
                                 eventHandler.looper,
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f997e4f6e..a4f921952 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,10 +27,10 @@ kotlinGradlePlugin = "2.3.20"
 kotlinxCoroutinesCore = "1.10.2"
 lifecycleKtx = "2.10.0"
 material = "1.14.0-beta01"
-media3 = "1.10.0"
+media3 = "1.9.3"
 navigationKtx = "2.9.7"
 newpipeextractor = "v0.26.0"
-nextlibMedia3 = "1.10.0-0.12.1"
+nextlibMedia3 = "1.9.3-0.12.0"
 nicehttp = "0.4.17"
 overlappingpanels = "0.1.5"
 paletteKtx = "1.0.0"

From c67ba2b4859d7d1d2077c721cce28f42ddf33e10 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 18 Apr 2026 07:45:55 -0600
Subject: [PATCH 070/177] Add explicit permission checks for notifications in
 downloader (#2667)

---
 .../lagradost/cloudstream3/services/DownloadQueueService.kt | 6 ++++++
 .../cloudstream3/utils/downloader/DownloadManager.kt        | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/services/DownloadQueueService.kt b/app/src/main/java/com/lagradost/cloudstream3/services/DownloadQueueService.kt
index 37b9a1002..028356e76 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/services/DownloadQueueService.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/services/DownloadQueueService.kt
@@ -1,8 +1,10 @@
 package com.lagradost.cloudstream3.services
 
+import android.Manifest
 import android.app.Service
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
 import android.os.Build.VERSION.SDK_INT
 import android.os.IBinder
@@ -104,6 +106,10 @@ class DownloadQueueService : Service() {
 
 
     private fun updateNotification(context: Context, downloads: Int, queued: Int) {
+        if (context.checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS)
+            != PackageManager.PERMISSION_GRANTED
+        ) return
+
         val activeDownloads =
             resources.getQuantityString(R.plurals.downloads_active, downloads).format(downloads)
         val activeQueue =
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
index 11c35e9ec..94962de13 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
@@ -1734,6 +1734,10 @@ object VideoDownloadManager {
         companion object {
             private fun displayNotification(context: Context, id: Int, notification: Notification) {
                 safe {
+                    if (context.checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS)
+                        != PackageManager.PERMISSION_GRANTED
+                    ) return@safe
+
                     NotificationManagerCompat.from(context)
                         .notify(DOWNLOAD_NOTIFICATION_TAG, id, notification)
                 }

From e55794c200e71f10f83c86d6a7189b03679e704a Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 18 Apr 2026 07:52:14 -0600
Subject: [PATCH 071/177] Bump buildkonfig lib (#2643)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a4f921952..c02e79398 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ activityKtx = "1.13.0"
 androidGradlePlugin = "8.13.2"
 appcompat = "1.7.1"
 biometric = "1.4.0-alpha06"
-buildkonfigGradlePlugin = "0.17.1"
+buildkonfigGradlePlugin = "0.18.0"
 coil = { strictly = "3.3.0" } # Later versions require jvmTarget 11 or later
 colorpicker = "6b46b49"
 conscryptAndroid = { strictly = "2.5.2" } # 2.5.3 crashes everything

From f175beb51b727132589d4acbeed0dbad7366e591 Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Sun, 19 Apr 2026 12:05:24 +0000
Subject: [PATCH 072/177] Fix concurrent plugin loading (#2700)

---
 .../cloudstream3/plugins/PluginManager.kt       | 17 +++++++++++++----
 .../cloudstream3/plugins/BasePlugin.kt          |  4 +++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
index feb0ba6d4..0dc65358a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -691,16 +691,25 @@ object PluginManager {
             APIHolder.allProviders.removeIf { provider: MainAPI -> provider.sourcePlugin == plugin.filename }
         }
 
-        extractorApis.removeIf { provider: ExtractorApi -> provider.sourcePlugin == plugin.filename }
+        synchronized(extractorApis) {
+            extractorApis.removeIf { provider: ExtractorApi -> provider.sourcePlugin == plugin.filename }
+        }
 
         synchronized(VideoClickActionHolder.allVideoClickActions) {
             VideoClickActionHolder.allVideoClickActions.removeIf { action: VideoClickAction -> action.sourcePlugin == plugin.filename }
         }
 
-        classLoaders.values.removeIf { v -> v == plugin }
+        synchronized(classLoaders) {
+            classLoaders.values.removeIf { v -> v == plugin }
+        }
 
-        plugins.remove(absolutePath)
-        urlPlugins.values.removeIf { v -> v == plugin }
+        synchronized(plugins) {
+            plugins.remove(absolutePath)
+        }
+
+        synchronized(urlPlugins) {
+            urlPlugins.values.removeIf { v -> v == plugin }
+        }
     }
 
     /**
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/BasePlugin.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/BasePlugin.kt
index c917a55ae..61f87b8ba 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/BasePlugin.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/BasePlugin.kt
@@ -31,7 +31,9 @@ abstract class BasePlugin {
     fun registerExtractorAPI(element: ExtractorApi) {
         Log.i(PLUGIN_TAG, "Adding ${element.name} (${element.mainUrl}) ExtractorApi")
         element.sourcePlugin = this.filename
-        extractorApis.add(element)
+        synchronized(extractorApis) {
+            extractorApis.add(element)
+        }
     }
 
     /**

From c1eef1de1de12e8da1873418b005a90caeb9961a Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 19 Apr 2026 06:41:05 -0600
Subject: [PATCH 073/177] Add new URL for Voe (#2701)

---
 .../kotlin/com/lagradost/cloudstream3/extractors/Voe.kt       | 4 ++++
 .../kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Voe.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Voe.kt
index 860f9b540..67eb49c9a 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Voe.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Voe.kt
@@ -45,6 +45,10 @@ class Voe1 : Voe() {
     override val mainUrl = "https://donaldlineelse.com"
 }
 
+class Voe2 : Voe() {
+    override val mainUrl = "https://charlestoughrace.com"
+}
+
 open class Voe : ExtractorApi() {
     override val name = "Voe"
     override val mainUrl = "https://voe.sx"
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 4f3f05df6..1fd39943c 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -288,6 +288,7 @@ import com.lagradost.cloudstream3.extractors.Vidsonic
 import com.lagradost.cloudstream3.extractors.VkExtractor
 import com.lagradost.cloudstream3.extractors.Voe
 import com.lagradost.cloudstream3.extractors.Voe1
+import com.lagradost.cloudstream3.extractors.Voe2
 import com.lagradost.cloudstream3.extractors.Vtbe
 import com.lagradost.cloudstream3.extractors.Wibufile
 import com.lagradost.cloudstream3.extractors.WishembedPro
@@ -1097,6 +1098,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Vidmolybiz(),
     Voe(),
     Voe1(),
+    Voe2(),
     Tubeless(),
     Moviehab(),
     MoviehabNet(),

From ee6a9af217ee0cad9f5076a121355b375c67b11c Mon Sep 17 00:00:00 2001
From: hrisabhy <87358494+hrisabhy@users.noreply.github.com>
Date: Sun, 19 Apr 2026 18:29:44 +0530
Subject: [PATCH 074/177] Improve subtitle selection UX: Move "No Subtitles"
 option to bottom (#2523)

---
 .../cloudstream3/ui/player/GeneratorPlayer.kt | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index 16b03e4f6..c3d8306e6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -1163,7 +1163,6 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 val subsArrayAdapter =
                     ArrayAdapter<Spanned>(ctx, R.layout.sort_bottom_single_choice)
-                subsArrayAdapter.add(ctx.getString(R.string.no_subtitles).html())
 
                 val subtitlesGrouped =
                     currentSubtitles.groupBy { it.originalName }.map { (key, value) ->
@@ -1173,8 +1172,13 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 val subtitles = subtitlesGrouped.map { it.key.html() }
 
-                val subtitleGroupIndexStart =
-                    subtitlesGrouped.keys.indexOf(currentSelectedSubtitles?.originalName) + 1
+                val realIndex = subtitlesGrouped.keys.indexOf(currentSelectedSubtitles?.originalName)
+                val subtitleGroupIndexStart = if (realIndex == -1) {
+                    // The "No Subtitles" option is outside the subtitlesGrouped list.
+                    subtitlesGrouped.size
+                } else {
+                    realIndex
+                }
                 var subtitleGroupIndex = subtitleGroupIndexStart
 
                 val subtitleOptionIndexStart =
@@ -1183,6 +1187,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 var subtitleOptionIndex = subtitleOptionIndexStart
 
                 subsArrayAdapter.addAll(subtitles)
+                subsArrayAdapter.add(ctx.getString(R.string.no_subtitles).html())
 
                 subtitleList.adapter = subsArrayAdapter
                 subtitleList.choiceMode = AbsListView.CHOICE_MODE_SINGLE
@@ -1201,7 +1206,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                     val subtitleOptions =
                         subtitlesGroupedList
-                            .getOrNull(subtitleGroupIndex - 1)?.value?.map { subtitle ->
+                            .getOrNull(subtitleGroupIndex)?.value?.map { subtitle ->
                                 val nameSuffix = subtitle.nameSuffix.html()
                                 nameSuffix.ifBlank {
                                     when (subtitle.origin) {
@@ -1253,7 +1258,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
 
                 subtitleOptionList.setOnItemClickListener { _, _, which, _ ->
-                    if (which >= (subtitlesGroupedList.getOrNull(subtitleGroupIndex - 1)?.value?.size
+                    if (which >= (subtitlesGroupedList.getOrNull(subtitleGroupIndex)?.value?.size
                             ?: -1)
                     ) {
                         val child = subtitleOptionList.adapter.getView(which, null, subtitleList)
@@ -1340,10 +1345,10 @@ class GeneratorPlayer : FullScreenPlayer() {
                 binding.applyBtt.setOnClickListener {
                     var init = sourceIndex != startSource
                     if (subtitleGroupIndex != subtitleGroupIndexStart || subtitleOptionIndex != subtitleOptionIndexStart) {
-                        init = init or if (subtitleGroupIndex <= 0) {
+                        init = init or if (subtitleGroupIndex >= subtitlesGrouped.size) {
                             noSubtitles()
                         } else {
-                            subtitlesGroupedList.getOrNull(subtitleGroupIndex - 1)?.value?.getOrNull(
+                            subtitlesGroupedList.getOrNull(subtitleGroupIndex)?.value?.getOrNull(
                                 subtitleOptionIndex
                             )?.let {
                                 setSubtitles(it, true)

From 68a1d0856c708c0c6e6faf0314296374152abc77 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 19 Apr 2026 07:09:19 -0600
Subject: [PATCH 075/177] Fix STATE_IDLE issues in player (#2691)

---
 .../cloudstream3/ui/player/CS3IPlayer.kt         | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index 887777934..29a77883b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -961,6 +961,22 @@ class CS3IPlayer : IPlayer {
                 when (event) {
                     CSPlayerEvent.Play -> {
                         event(PlayEvent(source))
+                        // If the player was stopped (e.g. notification dismissed) it lands in
+                        // STATE_IDLE. A bare play() call is a no-op in that state, re-prepare and
+                        // then resume to the current position once we are in STATE_READY again.
+                        if (playbackState == Player.STATE_IDLE) {
+                            val seekPosition = currentPosition
+                            exoPlayer?.addListener(object : Player.Listener {
+                                private var seekApplied = false
+                                override fun onPlaybackStateChanged(playbackState: Int) {
+                                    if (seekApplied || playbackState != Player.STATE_READY) return
+                                    seekApplied = true
+                                    exoPlayer?.seekTo(currentWindow, seekPosition)
+                                    exoPlayer?.removeListener(this)
+                                }
+                            })
+                            prepare()
+                        }
                         play()
                     }
 

From 7926e60fb00d93062acee671a088f37209edb4cb Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Sun, 19 Apr 2026 13:29:37 +0000
Subject: [PATCH 076/177] Add plugin hash validation (#2644)

---
 .../cloudstream3/plugins/PluginManager.kt     | 20 +++--
 .../cloudstream3/plugins/RepositoryManager.kt | 87 ++++++++++++++-----
 .../settings/extensions/PluginsViewModel.kt   |  2 +
 3 files changed, 83 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
index 0dc65358a..eae14a6c0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -13,6 +13,7 @@ import android.os.Build
 import android.os.Environment
 import android.util.Log
 import android.widget.Toast
+import androidx.annotation.WorkerThread
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -45,6 +46,7 @@ import com.lagradost.cloudstream3.plugins.RepositoryManager.ONLINE_PLUGINS_FOLDE
 import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIES
 import com.lagradost.cloudstream3.plugins.RepositoryManager.downloadPluginToFile
 import com.lagradost.cloudstream3.plugins.RepositoryManager.getRepoPlugins
+import com.lagradost.cloudstream3.plugins.RepositoryManager.sha256
 import com.lagradost.cloudstream3.ui.settings.extensions.REPOSITORIES_KEY
 import com.lagradost.cloudstream3.ui.settings.extensions.RepositoryData
 import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings
@@ -78,6 +80,7 @@ data class PluginData(
     @JsonProperty("filePath") val filePath: String,
     @JsonProperty("version") val version: Int,
 ) {
+    @WorkerThread
     fun toSitePlugin(): SitePlugin {
         return SitePlugin(
             this.filePath,
@@ -92,7 +95,9 @@ data class PluginData(
             null,
             null,
             null,
-            File(this.filePath).length()
+            File(this.filePath).length(),
+            // No file hash for local plugins. Local plugins have no use for the hash, and it's expensive to compute.
+            null
         )
     }
 }
@@ -302,6 +307,7 @@ object PluginManager {
                 downloadPlugin(
                     activity,
                     pluginData.onlineData.second.url,
+                    pluginData.onlineData.second.fileHash,
                     pluginData.savedData.internalName,
                     File(pluginData.savedData.filePath),
                     true
@@ -413,6 +419,7 @@ object PluginManager {
             downloadPlugin(
                 activity,
                 pluginData.onlineData.second.url,
+                pluginData.onlineData.second.fileHash,
                 pluginData.savedData.internalName,
                 pluginData.onlineData.first,
                 !pluginData.isDisabled
@@ -739,25 +746,27 @@ object PluginManager {
     suspend fun downloadPlugin(
         activity: Activity,
         pluginUrl: String,
+        pluginHash: String?,
         internalName: String,
         repositoryUrl: String,
         loadPlugin: Boolean
     ): Boolean {
         val file = getPluginPath(activity, internalName, repositoryUrl)
-        return downloadPlugin(activity, pluginUrl, internalName, file, loadPlugin)
+        return downloadPlugin(activity, pluginUrl, pluginHash, internalName, file, loadPlugin)
     }
 
     suspend fun downloadPlugin(
         activity: Activity,
         pluginUrl: String,
+        pluginHash: String?,
         internalName: String,
         file: File,
-        loadPlugin: Boolean
+        loadPlugin: Boolean,
     ): Boolean {
         try {
             Log.d(TAG, "Downloading plugin: $pluginUrl to ${file.absolutePath}")
             // The plugin file needs to be salted with the repository url hash as to allow multiple repositories with the same internal plugin names
-            val newFile = downloadPluginToFile(pluginUrl, file) ?: return false
+            val newFile = downloadPluginToFile(activity, pluginUrl, file, pluginHash) ?: return false
 
             val data = PluginData(
                 internalName,
@@ -845,6 +854,7 @@ object PluginManager {
                 if (downloadPlugin(
                         activity,
                         pluginData.onlineData.second.url,
+                        pluginData.onlineData.second.fileHash,
                         pluginData.savedData.internalName,
                         existingFile,
                         true
@@ -943,4 +953,4 @@ object PluginManager {
             return null
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
index 45ed65611..07d6aaa37 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt
@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.plugins
 
 import android.content.Context
+import androidx.annotation.WorkerThread
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
@@ -18,10 +19,12 @@ import com.lagradost.cloudstream3.ui.settings.extensions.RepositoryData
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import java.io.BufferedInputStream
 import java.io.File
-import java.io.InputStream
-import java.io.OutputStream
+import java.nio.file.AtomicMoveNotSupportedException
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
+import java.security.MessageDigest
+import java.util.concurrent.atomic.AtomicInteger
 
 /**
  * Comes with the app, always available in the app, non removable.
@@ -67,6 +70,7 @@ data class SitePlugin(
     @JsonProperty("iconUrl") val iconUrl: String?,
     // Automatically generated by the gradle plugin
     @JsonProperty("fileSize") val fileSize: Long?,
+    @JsonProperty("fileHash") val fileHash: String?,
 )
 
 
@@ -75,7 +79,26 @@ object RepositoryManager {
     val PREBUILT_REPOSITORIES: Array<RepositoryData> by lazy {
         getKey("PREBUILT_REPOSITORIES") ?: emptyArray()
     }
-    private val GH_REGEX = Regex("^https://raw.githubusercontent.com/([A-Za-z0-9-]+)/([A-Za-z0-9_.-]+)/(.*)$")
+    private val GH_REGEX =
+        Regex("^https://raw.githubusercontent.com/([A-Za-z0-9-]+)/([A-Za-z0-9_.-]+)/(.*)$")
+
+
+    /** Returns a SHA-256 string of the file content.
+     * Example: "sha256-b70462c264cb7f90fc2860a8e58d7544ce747ff347d1d11fa093623901853573" **/
+    @WorkerThread
+    fun sha256(file: File): String {
+        val digest = MessageDigest.getInstance("SHA-256")
+
+        file.inputStream().use { fis ->
+            val buffer = ByteArray(8192)
+            var read = fis.read(buffer)
+            while (read != -1) {
+                digest.update(buffer, 0, read)
+                read = fis.read(buffer)
+            }
+        }
+        return "sha256-" + digest.digest().joinToString("") { "%02x".format(it) }
+    }
 
     /* Convert raw.githubusercontent.com urls to cdn.jsdelivr.net if enabled in settings */
     fun convertRawGitUrl(url: String): String {
@@ -140,21 +163,52 @@ object RepositoryManager {
         }.flatten()
     }
 
+
     suspend fun downloadPluginToFile(
+        context: Context,
         pluginUrl: String,
-        file: File
+        file: File,
+        expectedFileHash: String?
     ): File? {
         return safeAsync {
-            file.mkdirs()
+            val parentDir = file.parentFile ?: return@safeAsync null
+            parentDir.mkdirs()
 
-            // Overwrite if exists
-            if (file.exists()) {
-                file.delete()
-            }
-            file.createNewFile()
+            // Prevent corrupting the plugin file if the operation fails
+            val tempFile = File.createTempFile(file.name, ".tmp", context.cacheDir)
 
             val body = app.get(convertRawGitUrl(pluginUrl)).okhttpResponse.body
-            write(body.byteStream(), file.outputStream())
+
+            body.byteStream().use { body ->
+                tempFile.outputStream().use { fileSteam ->
+                    body.copyTo(fileSteam)
+                }
+            }
+
+            if (expectedFileHash != null) {
+                val downloadHash = sha256(tempFile)
+                if (expectedFileHash != downloadHash) {
+                    tempFile.delete()
+                    throw IllegalStateException("Extension hash mismatch when validating '${file.name}'! Expected: '$expectedFileHash', got: '$downloadHash'.")
+                }
+            }
+
+            // We prefer the operation to be atomic
+            try {
+                Files.move(
+                    tempFile.toPath(),
+                    file.toPath(),
+                    StandardCopyOption.REPLACE_EXISTING,
+                    StandardCopyOption.ATOMIC_MOVE
+                )
+            } catch (_: AtomicMoveNotSupportedException) {
+                Files.move(
+                    tempFile.toPath(),
+                    file.toPath(),
+                    StandardCopyOption.REPLACE_EXISTING
+                )
+            }
+
             file
         }
     }
@@ -202,13 +256,4 @@ object RepositoryManager {
 
         PluginManager.deleteRepositoryData(file.absolutePath)
     }
-
-    private fun write(stream: InputStream, output: OutputStream) {
-        val input = BufferedInputStream(stream)
-        val dataBuffer = ByteArray(512)
-        var readBytes: Int
-        while (input.read(dataBuffer).also { readBytes = it } != -1) {
-            output.write(dataBuffer, 0, readBytes)
-        }
-    }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
index e0fd906b4..dfc61eba5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
@@ -128,6 +128,7 @@ class PluginsViewModel : ViewModel() {
                     PluginManager.downloadPlugin(
                         activity,
                         metadata.url,
+                        metadata.fileHash,
                         metadata.internalName,
                         repo,
                         metadata.status != PROVIDER_STATUS_DOWN
@@ -179,6 +180,7 @@ class PluginsViewModel : ViewModel() {
             PluginManager.downloadPlugin(
                 activity,
                 metadata.url,
+                metadata.fileHash,
                 metadata.internalName,
                 repo,
                 isEnabled

From 7c1554a479a8e0679c235b2bae5d293b4fb7bd46 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 19 Apr 2026 11:00:47 -0600
Subject: [PATCH 077/177] AGP 9! (#2604)

---
 app/build.gradle.kts      | 5 +++--
 build.gradle.kts          | 1 -
 gradle/libs.versions.toml | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0b201d1cb..0ea37a025 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -8,7 +8,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.dokka)
-    alias(libs.plugins.kotlin.android)
 }
 
 val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
@@ -314,8 +313,10 @@ tasks.withType<KotlinJvmCompile> {
 dokka {
     moduleName = "App"
     dokkaSourceSets {
-        main {
+        configureEach {
+            suppress = name != "prereleaseDebug"
             analysisPlatform = KotlinPlatform.JVM
+            displayName = "JVM"
             documentedVisibilities(
                 VisibilityModifier.Public,
                 VisibilityModifier.Protected
diff --git a/build.gradle.kts b/build.gradle.kts
index cca263dd4..e35c1f611 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
     alias(libs.plugins.android.multiplatform.library) apply false
     alias(libs.plugins.buildkonfig) apply false // Universal build config
     alias(libs.plugins.dokka) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.kotlin.multiplatform) apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c02e79398..e304fd57f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 # https://docs.gradle.org/current/userguide/dependency_versions.html#sec:strict-version
 [versions]
 activityKtx = "1.13.0"
-androidGradlePlugin = "8.13.2"
+androidGradlePlugin = "9.1.1"
 appcompat = "1.7.1"
 biometric = "1.4.0-alpha06"
 buildkonfigGradlePlugin = "0.18.0"
@@ -117,7 +117,6 @@ android-lint = { id = "com.android.lint", version.ref = "androidGradlePlugin" }
 android-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "androidGradlePlugin" }
 buildkonfig = { id = "com.codingfeline.buildkonfig", version.ref = "buildkonfigGradlePlugin" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokkaGradlePlugin" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinGradlePlugin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm" , version.ref = "kotlinGradlePlugin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlinGradlePlugin" }
 

From e3e995b2227ffffcbd22d2350c00f3def0fbf4a7 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 19 Apr 2026 11:01:50 -0600
Subject: [PATCH 078/177] Add lint ignore (#2669)

We only care about the source language with this, not translations which would mostly be false positives.
---
 app/lint.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/lint.xml b/app/lint.xml
index 48cdec04a..b2f5e8f2b 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -5,4 +5,9 @@
 
     <!-- We don't care about MissingTranslation since it's handled by weblate. -->
     <issue id="MissingTranslation" severity="ignore" />
+
+    <!-- We only care about the source language here. -->
+    <issue id="StringFormatInvalid">
+        <ignore path="**/res/values-*/**" />
+    </issue>
 </lint>

From 0ed6fd8fef2e119a64193fcdddaadc5eb081a7ca Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 19 Apr 2026 15:39:12 -0600
Subject: [PATCH 079/177] Bump jsoup and zipline libs (#2517)

---
 gradle/libs.versions.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e304fd57f..6aaa0c43f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,7 +18,7 @@ fragmentKtx = "1.8.9"
 fuzzywuzzy = "1.4.0"
 jacksonModuleKotlin = { strictly = "2.13.1" } # Later versions don't support minSdk <26 (Crashes on Android TV's and FireSticks)
 json = "20251224"
-jsoup = "1.21.2"
+jsoup = "1.22.1"
 junit = "4.13.2"
 junitKtx = "1.3.0"
 junitVersion = "1.3.0"
@@ -45,7 +45,7 @@ torrentserver = "7861970"
 tvprovider = "1.1.0"
 video = "1.0.0"
 workRuntimeKtx = "2.11.2"
-zipline = "1.24.0"
+zipline = "1.27.0"
 
 jvmTarget = "1.8"
 jdkToolchain = "17"

From 2264b903963e1928cd440cee468743c8570e0634 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 19 Apr 2026 15:39:22 -0600
Subject: [PATCH 080/177] Bump nicehttp (#2697)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6aaa0c43f..19be8d6ad 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -31,7 +31,7 @@ media3 = "1.9.3"
 navigationKtx = "2.9.7"
 newpipeextractor = "v0.26.0"
 nextlibMedia3 = "1.9.3-0.12.0"
-nicehttp = "0.4.17"
+nicehttp = "0.4.18"
 overlappingpanels = "0.1.5"
 paletteKtx = "1.0.0"
 preferenceKtx = "1.2.1"

From 590a94e3188c38b01a55a25956290c84a5207966 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 19 Apr 2026 15:40:12 -0600
Subject: [PATCH 081/177] Fix typo in credits (#2703)

---
 .../java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt  | 2 +-
 app/src/main/res/values-b+apc/strings.xml                       | 2 +-
 app/src/main/res/values-b+ar/strings.xml                        | 2 +-
 app/src/main/res/values-b+as/strings.xml                        | 2 +-
 app/src/main/res/values-b+bg/strings.xml                        | 2 +-
 app/src/main/res/values-b+cs/strings.xml                        | 2 +-
 app/src/main/res/values-b+de/strings.xml                        | 2 +-
 app/src/main/res/values-b+el/strings.xml                        | 2 +-
 app/src/main/res/values-b+es/strings.xml                        | 2 +-
 app/src/main/res/values-b+fr/strings.xml                        | 2 +-
 app/src/main/res/values-b+hr/strings.xml                        | 2 +-
 app/src/main/res/values-b+hu/strings.xml                        | 2 +-
 app/src/main/res/values-b+in/strings.xml                        | 2 +-
 app/src/main/res/values-b+it/strings.xml                        | 2 +-
 app/src/main/res/values-b+iw/strings.xml                        | 2 +-
 app/src/main/res/values-b+ja/strings.xml                        | 2 +-
 app/src/main/res/values-b+ko/strings.xml                        | 2 +-
 app/src/main/res/values-b+lv/strings.xml                        | 2 +-
 app/src/main/res/values-b+mk/strings.xml                        | 2 +-
 app/src/main/res/values-b+ms/strings.xml                        | 2 +-
 app/src/main/res/values-b+my/strings.xml                        | 2 +-
 app/src/main/res/values-b+nl/strings.xml                        | 2 +-
 app/src/main/res/values-b+no/strings.xml                        | 2 +-
 app/src/main/res/values-b+or/strings.xml                        | 2 +-
 app/src/main/res/values-b+pl/strings.xml                        | 2 +-
 app/src/main/res/values-b+pt+BR/strings.xml                     | 2 +-
 app/src/main/res/values-b+pt/strings.xml                        | 2 +-
 app/src/main/res/values-b+qt/strings.xml                        | 2 +-
 app/src/main/res/values-b+ro/strings.xml                        | 2 +-
 app/src/main/res/values-b+ru/strings.xml                        | 2 +-
 app/src/main/res/values-b+so/strings.xml                        | 2 +-
 app/src/main/res/values-b+sv/strings.xml                        | 2 +-
 app/src/main/res/values-b+ta/strings.xml                        | 2 +-
 app/src/main/res/values-b+tr/strings.xml                        | 2 +-
 app/src/main/res/values-b+uk/strings.xml                        | 2 +-
 app/src/main/res/values-b+ur/strings.xml                        | 2 +-
 app/src/main/res/values-b+vi/strings.xml                        | 2 +-
 app/src/main/res/values-b+zh+TW/strings.xml                     | 2 +-
 app/src/main/res/values-b+zh/strings.xml                        | 2 +-
 app/src/main/res/values-be/strings.xml                          | 2 +-
 app/src/main/res/values/strings.xml                             | 2 +-
 41 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt
index cd6727a24..6c7126049 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt
@@ -16,7 +16,7 @@ enum class SkipType(@StringRes val res: Int) {
     Recap(R.string.skip_type_recap),
     MixedOpening(R.string.skip_type_mixed_op),
     MixedEnding(R.string.skip_type_mixed_ed),
-    Credits(R.string.skip_type_creddits),
+    Credits(R.string.skip_type_credits),
     Intro(R.string.skip_type_intro),
     Preview(R.string.skip_type_preview),
 }
diff --git a/app/src/main/res/values-b+apc/strings.xml b/app/src/main/res/values-b+apc/strings.xml
index 9bc697acf..365a317e3 100644
--- a/app/src/main/res/values-b+apc/strings.xml
+++ b/app/src/main/res/values-b+apc/strings.xml
@@ -562,7 +562,7 @@
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="action_open_play">@string/home_play</string>
     <string name="action_remove_from_watched">شيلو من لايحة المحتوى الحاضرينو</string>
-    <string name="skip_type_creddits">الإعتمادات</string>
+    <string name="skip_type_credits">الإعتمادات</string>
     <string name="quality_profile_help">فيكُن هون تغيرو طريقة ترتيب المصادر. المصدر يللي عنده أولوية أكتر بينحط أعلى بلايحت تنقايت المصدر. إنتو بتنقو الأولوية يإستعمال الأرقام. حطو الرقم الأعلى للمصادر والجودات يللي بتفضلوها.
 \n
 \nمتلًا:
diff --git a/app/src/main/res/values-b+ar/strings.xml b/app/src/main/res/values-b+ar/strings.xml
index 17e809d8d..158748bbf 100644
--- a/app/src/main/res/values-b+ar/strings.xml
+++ b/app/src/main/res/values-b+ar/strings.xml
@@ -454,7 +454,7 @@
     <string name="player_settings_play_in_app">مشغل داخلي</string>
     <string name="app_not_found_error">لم يتم العثور على التطبيق</string>
     <string name="all_languages_preference">جميع اللغات</string>
-    <string name="skip_type_creddits">الإعتمادات</string>
+    <string name="skip_type_credits">الإعتمادات</string>
     <string name="update_notification_downloading">‌تنزيل تحديث التطبيق…</string>
     <string name="update_notification_installing">‏تثبيت تحديث التطبيق…</string>
     <string name="next_episode_time_min_format" formatted="true">%d دقيقة</string>
diff --git a/app/src/main/res/values-b+as/strings.xml b/app/src/main/res/values-b+as/strings.xml
index eb6ad4aa4..f5338a9e5 100644
--- a/app/src/main/res/values-b+as/strings.xml
+++ b/app/src/main/res/values-b+as/strings.xml
@@ -493,7 +493,7 @@
     <string name="skip_type_mixed_ed">মিশ্ৰিত সমাপ্তি</string>
     <string name="skip_type_mixed_op">মিশ্ৰিত উদ্‌ঘাটনী</string>
     <string name="clear_history">ইতিহাস পৰিস্কাৰ কৰক</string>
-    <string name="skip_type_creddits">স্বীকৃতি</string>
+    <string name="skip_type_credits">স্বীকৃতি</string>
     <string name="skip_type_intro">ভূমিকা</string>
     <string name="history">ইতিহাস</string>
     <string name="enable_skip_op_from_database_des">উদ্‌ঘাটনী/সমাপ্তিৰ বাবে এৰি দিয়াৰ পপআপ দেখুৱাওক</string>
diff --git a/app/src/main/res/values-b+bg/strings.xml b/app/src/main/res/values-b+bg/strings.xml
index 096e9f66b..6c8e38722 100644
--- a/app/src/main/res/values-b+bg/strings.xml
+++ b/app/src/main/res/values-b+bg/strings.xml
@@ -451,7 +451,7 @@
     <string name="update_notification_downloading">Изтегля се актуализация на приложението…</string>
     <string name="skip_type_mixed_op">Смесено отваряне</string>
     <string name="skip_type_mixed_ed">Смесено затваряне</string>
-    <string name="skip_type_creddits">Кредити</string>
+    <string name="skip_type_credits">Кредити</string>
     <string name="skip_type_intro">въведение</string>
     <string name="clear_history">Изчистване на историята</string>
     <string name="automatic_plugin_download_summary">Автоматично инсталиране на всички все още неинсталирани добавки от добавени хранилища.</string>
diff --git a/app/src/main/res/values-b+cs/strings.xml b/app/src/main/res/values-b+cs/strings.xml
index 96110d9c1..71ddc8697 100644
--- a/app/src/main/res/values-b+cs/strings.xml
+++ b/app/src/main/res/values-b+cs/strings.xml
@@ -438,7 +438,7 @@
     <string name="clear_history">Vymazat historii</string>
     <string name="all_languages_preference">Všechny jazyky</string>
     <string name="skip_type_mixed_op">Smíšený úvod</string>
-    <string name="skip_type_creddits">Poděkování</string>
+    <string name="skip_type_credits">Poděkování</string>
     <string name="skip_type_intro">Znělka</string>
     <string name="enable_skip_op_from_database_des">Zobrazit vyskakovací okna pro přeskočení úvodu/konce</string>
     <string name="update_notification_downloading">Stahování aktualizace aplikace…</string>
diff --git a/app/src/main/res/values-b+de/strings.xml b/app/src/main/res/values-b+de/strings.xml
index 9a67f9d20..dfcf97ce2 100644
--- a/app/src/main/res/values-b+de/strings.xml
+++ b/app/src/main/res/values-b+de/strings.xml
@@ -13,7 +13,7 @@
     <string name="episode_action_chromecast_mirror">Chromecast-Mirror</string>
     <string name="episode_action_play_in_app">In App wiedergeben</string>
     <string name="skip_type_mixed_op">Gemischte Openings</string>
-    <string name="skip_type_creddits">Abspann</string>
+    <string name="skip_type_credits">Abspann</string>
     <string name="skip_type_intro">Intro</string>
     <string name="clear_history">Verlauf löschen</string>
     <string name="history">Verlauf</string>
diff --git a/app/src/main/res/values-b+el/strings.xml b/app/src/main/res/values-b+el/strings.xml
index 4b671644b..6839d9944 100644
--- a/app/src/main/res/values-b+el/strings.xml
+++ b/app/src/main/res/values-b+el/strings.xml
@@ -389,7 +389,7 @@
     <string name="quality_webrip">Web</string>
     <string name="quality_hdr">HDR</string>
     <string name="skip_type_mixed_op">Ανάμεικτοι τίτλοι αρχής</string>
-    <string name="skip_type_creddits">Εύσημα</string>
+    <string name="skip_type_credits">Εύσημα</string>
     <string name="skip_type_intro">Εισαγωγή</string>
     <string name="go_forward_30">+30</string>
     <string name="status_completed">Ολοκληρώθηκε</string>
diff --git a/app/src/main/res/values-b+es/strings.xml b/app/src/main/res/values-b+es/strings.xml
index 5e59477ce..e692ecc4a 100644
--- a/app/src/main/res/values-b+es/strings.xml
+++ b/app/src/main/res/values-b+es/strings.xml
@@ -66,7 +66,7 @@
     <string name="skip_type_ed">Final</string>
     <string name="skip_type_mixed_op">Apertura mixta</string>
     <string name="skip_type_recap">Resumen</string>
-    <string name="skip_type_creddits">Créditos</string>
+    <string name="skip_type_credits">Créditos</string>
     <string name="skip_type_mixed_ed">Final mixto</string>
     <string name="episode_poster_img_des">Póster del episodio</string>
     <string name="next_episode">Siguiente episodio</string>
diff --git a/app/src/main/res/values-b+fr/strings.xml b/app/src/main/res/values-b+fr/strings.xml
index 1cbee687f..10b8cf9ef 100644
--- a/app/src/main/res/values-b+fr/strings.xml
+++ b/app/src/main/res/values-b+fr/strings.xml
@@ -302,7 +302,7 @@
     <string name="skip_type_format" formatted="true">Ignorer %s</string>
     <string name="skip_type_op">Ouverture</string>
     <string name="skip_type_recap">Récap</string>
-    <string name="skip_type_creddits">Crédits</string>
+    <string name="skip_type_credits">Crédits</string>
     <string name="skip_type_intro">Intro</string>
     <string name="clear_history">Effacer l\'historique</string>
     <string name="yes">Oui</string>
diff --git a/app/src/main/res/values-b+hr/strings.xml b/app/src/main/res/values-b+hr/strings.xml
index 8b3a6fbf3..c629c492f 100644
--- a/app/src/main/res/values-b+hr/strings.xml
+++ b/app/src/main/res/values-b+hr/strings.xml
@@ -436,7 +436,7 @@
     <string name="extension_language">Jezik</string>
     <string name="hls_playlist">HLS playlista</string>
     <string name="automatic_plugin_download">Automatski instaliraj dodatke</string>
-    <string name="skip_type_creddits">Zasluge</string>
+    <string name="skip_type_credits">Zasluge</string>
     <string name="automatic_plugin_download_summary">Automatski instaliraj sve neinstalirane dodatke iz dodanih repozitorija.</string>
     <string name="player_pref">Preferirani video player</string>
     <string name="player_settings_play_in_app">Interni player</string>
diff --git a/app/src/main/res/values-b+hu/strings.xml b/app/src/main/res/values-b+hu/strings.xml
index 8bd2ac7ac..bffc0a86a 100644
--- a/app/src/main/res/values-b+hu/strings.xml
+++ b/app/src/main/res/values-b+hu/strings.xml
@@ -469,7 +469,7 @@
     <string name="repository_url_hint">Repó URL</string>
     <string name="plugin_loaded">Bővítmény betöltve</string>
     <string name="plugin_downloaded">Bővítmény letöltve</string>
-    <string name="skip_type_creddits">Közreműködők</string>
+    <string name="skip_type_credits">Közreműködők</string>
     <string name="sort_alphabetical_z">Betűrendben (Z-től az A-ig)</string>
     <string name="select_library">Könyvtár kiválasztása</string>
     <string name="safe_mode_file">Biztonságos módú fájlba ütköztünk!
diff --git a/app/src/main/res/values-b+in/strings.xml b/app/src/main/res/values-b+in/strings.xml
index d5bf2d4b0..830972586 100644
--- a/app/src/main/res/values-b+in/strings.xml
+++ b/app/src/main/res/values-b+in/strings.xml
@@ -467,7 +467,7 @@
     <string name="skip_type_ed">Sesi Akhir</string>
     <string name="skip_type_recap">Sinopsis</string>
     <string name="skip_type_mixed_ed">Sesi akhir ganda</string>
-    <string name="skip_type_creddits">Sesi Kredit</string>
+    <string name="skip_type_credits">Sesi Kredit</string>
     <string name="skip_type_intro">Sesi Intro</string>
     <string name="clipboard_too_large">Terlalu banyak teks. Tidak dapat menyalin ke papan klip.</string>
     <string name="confirm_exit_dialog">Yakin ingin keluar?</string>
diff --git a/app/src/main/res/values-b+it/strings.xml b/app/src/main/res/values-b+it/strings.xml
index 08a1572d6..c96299c72 100644
--- a/app/src/main/res/values-b+it/strings.xml
+++ b/app/src/main/res/values-b+it/strings.xml
@@ -447,7 +447,7 @@
     <string name="skip_type_recap">Riassunto</string>
     <!--<string name="skip_type_mixed_ed">Mixed ending</string>-->
     <!--<string name="skip_type_mixed_op">Mixed opening</string>-->
-    <string name="skip_type_creddits">Crediti</string>
+    <string name="skip_type_credits">Crediti</string>
     <!--<string name="skip_type_intro">Intro</string>-->
     <string name="clear_history">Cancella cronologia</string>
     <string name="history">Cronologia</string>
diff --git a/app/src/main/res/values-b+iw/strings.xml b/app/src/main/res/values-b+iw/strings.xml
index ef4cb9202..0b0479679 100644
--- a/app/src/main/res/values-b+iw/strings.xml
+++ b/app/src/main/res/values-b+iw/strings.xml
@@ -422,7 +422,7 @@
     <string name="batch_download_nothing_to_download_format" formatted="true">כל %s כבר הורד</string>
     <string name="extension_authors">מחברים</string>
     <string name="extension_language">שפה</string>
-    <string name="skip_type_creddits">קרדיטים</string>
+    <string name="skip_type_credits">קרדיטים</string>
     <string name="sort">מיין</string>
     <string name="select_library">בחר ספרייה</string>
     <string name="empty_library_no_accounts_message">נראה שהספרייה שלכם ריקה :(
diff --git a/app/src/main/res/values-b+ja/strings.xml b/app/src/main/res/values-b+ja/strings.xml
index 0b66ca8b2..b489db37d 100644
--- a/app/src/main/res/values-b+ja/strings.xml
+++ b/app/src/main/res/values-b+ja/strings.xml
@@ -469,7 +469,7 @@
     <string name="plugins_disabled" formatted="true">無効: %d</string>
     <string name="player_pref">優先ビデオプレーヤー</string>
     <string name="skip_type_format" formatted="true">%s をスキップ</string>
-    <string name="skip_type_creddits">クレジット</string>
+    <string name="skip_type_credits">クレジット</string>
     <string name="app_unrestricted_toast">アプリのバッテリー使用はすでに無制限に設定されています</string>
     <string name="sort">並べ替え</string>
     <string name="revert">元に戻す</string>
diff --git a/app/src/main/res/values-b+ko/strings.xml b/app/src/main/res/values-b+ko/strings.xml
index 256fc26e9..efe034258 100644
--- a/app/src/main/res/values-b+ko/strings.xml
+++ b/app/src/main/res/values-b+ko/strings.xml
@@ -443,7 +443,7 @@
     <string name="skip_type_ed">엔딩</string>
     <string name="skip_type_mixed_ed">혼합 엔딩</string>
     <string name="skip_type_mixed_op">혼합 오프닝</string>
-    <string name="skip_type_creddits">크레딧</string>
+    <string name="skip_type_credits">크레딧</string>
     <string name="skip_type_intro">소개</string>
     <string name="clear_history">기록 삭제</string>
     <string name="history">기록</string>
diff --git a/app/src/main/res/values-b+lv/strings.xml b/app/src/main/res/values-b+lv/strings.xml
index 89003317a..101498b83 100644
--- a/app/src/main/res/values-b+lv/strings.xml
+++ b/app/src/main/res/values-b+lv/strings.xml
@@ -436,7 +436,7 @@
     <string name="skip_type_recap">Kopsavilkums</string>
     <string name="skip_type_mixed_ed">Jauktas beigas</string>
     <string name="skip_type_mixed_op">Jauktais sākums</string>
-    <string name="skip_type_creddits">Kredīts</string>
+    <string name="skip_type_credits">Kredīts</string>
     <string name="clear_history">Notīrīt vēsturi</string>
     <string name="history">Vēsture</string>
     <string name="enable_skip_op_from_database_des">Rādīt izlaižamos uznirstošos logus atvēršanai/beigšanai</string>
diff --git a/app/src/main/res/values-b+mk/strings.xml b/app/src/main/res/values-b+mk/strings.xml
index 6998c49db..4af4995ea 100644
--- a/app/src/main/res/values-b+mk/strings.xml
+++ b/app/src/main/res/values-b+mk/strings.xml
@@ -260,7 +260,7 @@
     <string name="sort">Подреди</string>
     <string name="player_settings_play_in_app">Внатрешен плеер</string>
     <string name="resolution">Резолуција</string>
-    <string name="skip_type_creddits">Кредити</string>
+    <string name="skip_type_credits">Кредити</string>
     <string name="search_hint_site" formatted="true">Пребарај %s…</string>
     <string name="plugin_deleted">Приклучокот е избришан</string>
     <string name="extension_status">Статус</string>
diff --git a/app/src/main/res/values-b+ms/strings.xml b/app/src/main/res/values-b+ms/strings.xml
index 83492a5ff..9ec0192cf 100644
--- a/app/src/main/res/values-b+ms/strings.xml
+++ b/app/src/main/res/values-b+ms/strings.xml
@@ -5,7 +5,7 @@
     <string name="history">Sejarah</string>
     <string name="clear_history">Kosongkan sejarah</string>
     <string name="skip_type_intro">Pengenalan</string>
-    <string name="skip_type_creddits">Kredit</string>
+    <string name="skip_type_credits">Kredit</string>
     <string name="skip_type_mixed_op">Pembukaan bercampur</string>
     <string name="skip_type_ed">Penamat</string>
     <string name="skip_type_op">Pembukaan</string>
diff --git a/app/src/main/res/values-b+my/strings.xml b/app/src/main/res/values-b+my/strings.xml
index 4a7a50aa7..0938e4f98 100644
--- a/app/src/main/res/values-b+my/strings.xml
+++ b/app/src/main/res/values-b+my/strings.xml
@@ -336,7 +336,7 @@
     <string name="skip_type_recap">အစမှပြန်စ</string>
     <string name="skip_type_mixed_ed">ရောထားသောအဆုံးပိုင်း</string>
     <string name="skip_type_mixed_op">ရောထားသောအစပိုင်း</string>
-    <string name="skip_type_creddits">ခရက်ဒစ်များ</string>
+    <string name="skip_type_credits">ခရက်ဒစ်များ</string>
     <string name="skip_type_intro">အစ</string>
     <string name="yes">သေချာသည်</string>
     <string name="apk_installer_legacy">သမားရိုးကျ</string>
diff --git a/app/src/main/res/values-b+nl/strings.xml b/app/src/main/res/values-b+nl/strings.xml
index 30b8b2def..3cdea9d8f 100644
--- a/app/src/main/res/values-b+nl/strings.xml
+++ b/app/src/main/res/values-b+nl/strings.xml
@@ -514,7 +514,7 @@
     <string name="safe_mode_title">Veilige mode aan</string>
     <string name="restart">Herstart</string>
     <string name="extension_description">Beschrijving</string>
-    <string name="skip_type_creddits">Waardering</string>
+    <string name="skip_type_credits">Waardering</string>
     <string name="clear_history">Wis geschiedenis</string>
     <string name="subscription_list_name">Ingeschreven</string>
     <string name="delete_repository">Wis repository</string>
diff --git a/app/src/main/res/values-b+no/strings.xml b/app/src/main/res/values-b+no/strings.xml
index 374b033c6..55b5303eb 100644
--- a/app/src/main/res/values-b+no/strings.xml
+++ b/app/src/main/res/values-b+no/strings.xml
@@ -381,7 +381,7 @@
     <string name="subtitle_offset_extra_hint_before_format">Bruk dette hvis undertekster vises %d ms for sent</string>
     <string name="plugin_loaded">Programtillegg innlastet</string>
     <string name="audio_tracks">Lydspor</string>
-    <string name="skip_type_creddits">Rulletekst</string>
+    <string name="skip_type_credits">Rulletekst</string>
     <string name="skip_type_intro">Introduksjon</string>
     <string name="backup_failed">Lagringstilgang mangler. Prøv igjen.</string>
     <string name="show_trailers_settings">Vis trailere</string>
diff --git a/app/src/main/res/values-b+or/strings.xml b/app/src/main/res/values-b+or/strings.xml
index 8c9379f5b..40a2915fd 100644
--- a/app/src/main/res/values-b+or/strings.xml
+++ b/app/src/main/res/values-b+or/strings.xml
@@ -61,7 +61,7 @@
     <string name="all_languages_preference">ସବୁ ଭାଷା</string>
     <string name="skip_type_mixed_ed">ମିଶ୍ରିତ ପ୍ରାନ୍ତ</string>
     <string name="skip_type_mixed_op">ମିଶ୍ରିତ ଆଦ୍ୟ</string>
-    <string name="skip_type_creddits">ଶ୍ରେୟ</string>
+    <string name="skip_type_credits">ଶ୍ରେୟ</string>
     <string name="skip_type_intro">ଉପକ୍ରମ</string>
     <string name="provider_languages_tip">ଏହି ଭାଷାଗୁଡ଼ିକରେ ଵିଡ଼ିଓ ଦେଖନ୍ତୁ</string>
     <string name="extension_version">ସଂସ୍କରଣ</string>
diff --git a/app/src/main/res/values-b+pl/strings.xml b/app/src/main/res/values-b+pl/strings.xml
index c8126f2fe..0536e6807 100644
--- a/app/src/main/res/values-b+pl/strings.xml
+++ b/app/src/main/res/values-b+pl/strings.xml
@@ -452,7 +452,7 @@
     <string name="skip_type_op">Opening</string>
     <string name="skip_type_ed">Ending</string>
     <string name="skip_type_mixed_op">Mixed opening</string>
-    <string name="skip_type_creddits">Napisy końcowe</string>
+    <string name="skip_type_credits">Napisy końcowe</string>
     <string name="skip_type_intro">Intro</string>
     <string name="skip_type_mixed_ed">Mixed ending</string>
     <string name="enable_skip_op_from_database_des">Pokaż wyskakujące okienka pomijania dla niektórych segmentów</string>
diff --git a/app/src/main/res/values-b+pt+BR/strings.xml b/app/src/main/res/values-b+pt+BR/strings.xml
index 58d598708..72ecbf3d9 100644
--- a/app/src/main/res/values-b+pt+BR/strings.xml
+++ b/app/src/main/res/values-b+pt+BR/strings.xml
@@ -510,7 +510,7 @@
     <string name="extension_version">Versão</string>
     <string name="extension_authors">Autores</string>
     <string name="extension_install_first">Instale a extensão primeiro</string>
-    <string name="skip_type_creddits">Créditos</string>
+    <string name="skip_type_credits">Créditos</string>
     <string name="history">Historico</string>
     <string name="clear_history">Limpar historico</string>
     <string name="clipboard_too_large">Tem Muito texto. Não é possível salvar no clipboard.</string>
diff --git a/app/src/main/res/values-b+pt/strings.xml b/app/src/main/res/values-b+pt/strings.xml
index a1abfa338..88eccbeac 100644
--- a/app/src/main/res/values-b+pt/strings.xml
+++ b/app/src/main/res/values-b+pt/strings.xml
@@ -410,7 +410,7 @@
     <string name="yes">Sim</string>
     <string name="update_notification_downloading">Baixando atualização do app…</string>
     <string name="subscription_episode_released">Episódio %d lançado!</string>
-    <string name="skip_type_creddits">Créditos</string>
+    <string name="skip_type_credits">Créditos</string>
     <string name="extension_description">Descrição</string>
     <string name="extension_size">Tamanho</string>
     <string name="stop">Parar</string>
diff --git a/app/src/main/res/values-b+qt/strings.xml b/app/src/main/res/values-b+qt/strings.xml
index d60a4e32c..8a43e97d7 100644
--- a/app/src/main/res/values-b+qt/strings.xml
+++ b/app/src/main/res/values-b+qt/strings.xml
@@ -607,7 +607,7 @@
     <string name="player_settings_select_cast_device">aaaagg aahh oooohh</string>
     <string name="skip_type_ed">uuuuuk</string>
     <string name="skip_type_mixed_op">aaagg aaaahhh</string>
-    <string name="skip_type_creddits">ooooggg</string>
+    <string name="skip_type_credits">ooooggg</string>
     <string name="battery_dialog_message">oh oooogg ooooggguuuugg aaaahhhug ooh aaaaggguuuuuk ooh aaaagggoog uk shows, aaaaggguugg aaagg uuuuggguug ug uug oh aaaahhhooh ah eeeeeekh OK, youl og aaaaaakg uh uuk aagg There, aaaagg uk oog uuuuhhh ooohh uug uuh oooohhh aaagg ug uuuuhhhooohh oooohh note, aagg aaaahhhaak oohh uug uugg CS3 aagg eeeek aahh uuuuhhh uh uugg oogg ooooggg ek uug aaaahhhaak oohh necessary, uugg oh uuhh uuuuhhhuh uuuuuukaaaahh ah oooohhhaagg uuuuuk oogg aaaagggh oooogggoog uh uuh aaaahh ug cancel, uuh uug aaaahh uugg uuuuggg ooogg uh aaaahhh uuuugggg</string>
     <string name="sort_updated_old">uuuuggg (Old og New)</string>
     <string name="sort_alphabetical_z">uuuuggguuuhh (Z ak A)</string>
diff --git a/app/src/main/res/values-b+ro/strings.xml b/app/src/main/res/values-b+ro/strings.xml
index dbd607666..bb49563ec 100644
--- a/app/src/main/res/values-b+ro/strings.xml
+++ b/app/src/main/res/values-b+ro/strings.xml
@@ -522,7 +522,7 @@
     <string name="enable_skip_op_from_database_des">Afișează opțiunea de omitere a ferestrelor pop-up pentru început/sfârșit</string>
     <string name="all_languages_preference">Toate limbile</string>
     <string name="skip_type_mixed_op">Deschidere mixat</string>
-    <string name="skip_type_creddits">Credite</string>
+    <string name="skip_type_credits">Credite</string>
     <string name="extension_language">Limbă</string>
     <string name="plugin_singular">plugin</string>
     <string name="plugin">plugin-uri</string>
diff --git a/app/src/main/res/values-b+ru/strings.xml b/app/src/main/res/values-b+ru/strings.xml
index 9f6b53aa7..1a5db40a1 100644
--- a/app/src/main/res/values-b+ru/strings.xml
+++ b/app/src/main/res/values-b+ru/strings.xml
@@ -303,7 +303,7 @@
     <string name="app_not_found_error">Приложение не найдено</string>
     <string name="all_languages_preference">Все языки</string>
     <string name="skip_type_op">Вступление</string>
-    <string name="skip_type_creddits">Титры</string>
+    <string name="skip_type_credits">Титры</string>
     <string name="action_mark_as_watched">Отметить как просмотренное</string>
     <string name="limit_title_rez">Показывать информацию про видеоплеер</string>
     <string name="watch_quality_pref">Предпочтительное качество видео (WiFi)</string>
diff --git a/app/src/main/res/values-b+so/strings.xml b/app/src/main/res/values-b+so/strings.xml
index 09499af00..9e4e9f9f1 100644
--- a/app/src/main/res/values-b+so/strings.xml
+++ b/app/src/main/res/values-b+so/strings.xml
@@ -471,5 +471,5 @@
     <string name="skip_type_mixed_ed">Dhamaad isku qasan</string>
     <string name="skip_type_op">Bilowga</string>
     <string name="skip_type_mixed_op">Bilow isku qasan</string>
-    <string name="skip_type_creddits">Qoraalka dhamaadka</string>
+    <string name="skip_type_credits">Qoraalka dhamaadka</string>
 </resources>
diff --git a/app/src/main/res/values-b+sv/strings.xml b/app/src/main/res/values-b+sv/strings.xml
index e388b67e1..695050336 100644
--- a/app/src/main/res/values-b+sv/strings.xml
+++ b/app/src/main/res/values-b+sv/strings.xml
@@ -549,7 +549,7 @@
     <string name="setup_extensions_subtext">Ladda ner listan över webbplatser du vill använda</string>
     <string name="single_plugin_disabled" formatted="true">%s (Inaktiverad)</string>
     <string name="extension_description">Beskrivning</string>
-    <string name="skip_type_creddits">Eftertexter</string>
+    <string name="skip_type_credits">Eftertexter</string>
     <string name="skip_type_intro">Introduktion</string>
     <string name="favorites_list_name">Favoriter</string>
     <string name="set_default">Ange standard</string>
diff --git a/app/src/main/res/values-b+ta/strings.xml b/app/src/main/res/values-b+ta/strings.xml
index 626554c18..5cdbeaa37 100644
--- a/app/src/main/res/values-b+ta/strings.xml
+++ b/app/src/main/res/values-b+ta/strings.xml
@@ -537,7 +537,7 @@
     <string name="player_settings_play_in_app">உள் வீரர்</string>
     <string name="skip_type_op">திறப்பு</string>
     <string name="skip_type_mixed_op">கலப்பு திறப்பு</string>
-    <string name="skip_type_creddits">வரவு</string>
+    <string name="skip_type_credits">வரவு</string>
     <string name="history">வரலாறு</string>
     <string name="ok">சரி</string>
     <string name="app_info_intent_error">கிளவுட்ச்ட்ரீமின் பயன்பாட்டுத் தகவலைத் திறக்க முடியவில்லை.</string>
diff --git a/app/src/main/res/values-b+tr/strings.xml b/app/src/main/res/values-b+tr/strings.xml
index e84d5271e..47db0e97e 100644
--- a/app/src/main/res/values-b+tr/strings.xml
+++ b/app/src/main/res/values-b+tr/strings.xml
@@ -477,7 +477,7 @@
     <string name="action_remove_from_watched">İzlenenlerden kaldır</string>
     <string name="skip_type_mixed_ed">Karışık son</string>
     <string name="skip_type_mixed_op">Karışık başlangıç</string>
-    <string name="skip_type_creddits">Katkıda Bulunanlar</string>
+    <string name="skip_type_credits">Katkıda Bulunanlar</string>
     <string name="skip_type_intro">Giriş</string>
     <string name="plugin_downloaded">Eklenti İndirildi</string>
     <string name="pref_category_actions">Eylemler</string>
diff --git a/app/src/main/res/values-b+uk/strings.xml b/app/src/main/res/values-b+uk/strings.xml
index 2eb6e2451..74acb48ae 100644
--- a/app/src/main/res/values-b+uk/strings.xml
+++ b/app/src/main/res/values-b+uk/strings.xml
@@ -435,7 +435,7 @@
     <string name="skip_type_recap">Коротке повторення</string>
     <string name="skip_type_format" formatted="true">Пропустити %s</string>
     <string name="skip_type_mixed_ed">Змішаний ендінґ</string>
-    <string name="skip_type_creddits">Подяки</string>
+    <string name="skip_type_credits">Подяки</string>
     <string name="skip_type_op">Опенінґ</string>
     <string name="skip_type_intro">Вступ</string>
     <string name="clear_history">Очистити історію</string>
diff --git a/app/src/main/res/values-b+ur/strings.xml b/app/src/main/res/values-b+ur/strings.xml
index 5f6d8aa14..acd6e4097 100644
--- a/app/src/main/res/values-b+ur/strings.xml
+++ b/app/src/main/res/values-b+ur/strings.xml
@@ -346,7 +346,7 @@
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="subtitles_raised">اٹھایا</string>
     <string name="subtitle_offset_extra_hint_before_format">اگر سب ٹائٹلز %d ms بہت جلد دکھائے جائیں تو اسے استعمال کریں</string>
-    <string name="skip_type_creddits">کریڈٹس</string>
+    <string name="skip_type_credits">کریڈٹس</string>
     <string name="extras">اضافی</string>
     <string name="actor_main">مرکزی</string>
     <string name="sort">ترتیب</string>
diff --git a/app/src/main/res/values-b+vi/strings.xml b/app/src/main/res/values-b+vi/strings.xml
index a51a3551d..d0d6059aa 100644
--- a/app/src/main/res/values-b+vi/strings.xml
+++ b/app/src/main/res/values-b+vi/strings.xml
@@ -470,7 +470,7 @@
     <string name="skip_type_recap">Điểm lại nội dung</string>
     <string name="skip_type_mixed_ed">Kết thúc hỗn hợp</string>
     <string name="skip_type_mixed_op">Mở đầu hỗn hợp</string>
-    <string name="skip_type_creddits">Danh đề</string>
+    <string name="skip_type_credits">Danh đề</string>
     <string name="skip_type_intro">Giới thiệu</string>
     <string name="clear_history">Xoá lịch sử</string>
     <string name="enable_skip_op_from_database_des">Hiện các popup bỏ qua cho mở đầu/kết thúc</string>
diff --git a/app/src/main/res/values-b+zh+TW/strings.xml b/app/src/main/res/values-b+zh+TW/strings.xml
index 78ba57310..cb58e96f5 100644
--- a/app/src/main/res/values-b+zh+TW/strings.xml
+++ b/app/src/main/res/values-b+zh+TW/strings.xml
@@ -448,7 +448,7 @@
     <string name="skip_type_recap">前情回顧</string>
     <string name="skip_type_mixed_ed">混合片尾</string>
     <string name="skip_type_mixed_op">混合片頭</string>
-    <string name="skip_type_creddits">致謝名單</string>
+    <string name="skip_type_credits">致謝名單</string>
     <string name="skip_type_intro">介紹</string>
     <string name="clear_history">清除歷史紀錄</string>
     <string name="history">歷史紀錄</string>
diff --git a/app/src/main/res/values-b+zh/strings.xml b/app/src/main/res/values-b+zh/strings.xml
index bc7c2ca0e..496afe81c 100644
--- a/app/src/main/res/values-b+zh/strings.xml
+++ b/app/src/main/res/values-b+zh/strings.xml
@@ -449,7 +449,7 @@
     <string name="skip_type_recap">前情回顾</string>
     <string name="skip_type_mixed_ed">混合片尾</string>
     <string name="skip_type_mixed_op">混合片头</string>
-    <string name="skip_type_creddits">致谢名单</string>
+    <string name="skip_type_credits">致谢名单</string>
     <string name="skip_type_intro">介绍</string>
     <string name="clear_history">清除历史记录</string>
     <string name="history">历史记录</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index ee2c24972..374de33d2 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -537,7 +537,7 @@
     <string name="skip_type_recap">Зводка</string>
     <string name="skip_type_mixed_ed">Змешанае заканчэнне</string>
     <string name="skip_type_mixed_op">Змешаны опенінг</string>
-    <string name="skip_type_creddits">Удзельнікі</string>
+    <string name="skip_type_credits">Удзельнікі</string>
     <string name="skip_type_intro">Застаўка</string>
     <string name="clear_history">Ачысціць гісторыю</string>
     <string name="history">Гісторыя</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d59065a64..e41c01fda 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -559,7 +559,7 @@
     <string name="skip_type_recap">Recap</string>
     <string name="skip_type_mixed_ed">Mixed ending</string>
     <string name="skip_type_mixed_op">Mixed opening</string>
-    <string name="skip_type_creddits">Credits</string>
+    <string name="skip_type_credits">Credits</string>
     <string name="skip_type_preview">Preview</string>
     <string name="skip_type_intro">Intro</string>
     <string name="clear_history">Clear history</string>

From f7494f20e17a3731ea298588af62f4fc9e714f77 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 19 Apr 2026 15:42:46 -0600
Subject: [PATCH 082/177] Support resuming fragmented MP4s (#2690)

---
 .../cloudstream3/ui/player/CS3IPlayer.kt        | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index 29a77883b..4323c98fd 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -1430,6 +1430,23 @@ class CS3IPlayer : IPlayer {
             event(PlayerAttachedEvent(exoPlayer))
             exoPlayer?.prepare()
 
+            // For offline fragmented MP4s, FLAG_MERGE_FRAGMENTED_SIDX builds the SIDX seek map
+            // incrementally as data is buffered. The initial seek resolves to the nearest merged
+            // entry (~first fragment, 3 s). On STATE_READY, re-seek to the actual saved position.
+            // This may only be reproducible on large and fairly long fragmented MP4 files with
+            // multiple sidx boxes.
+            if (onlineSource == null && playbackPosition > (exoPlayer?.duration ?: 0L)) {
+                exoPlayer?.addListener(object : Player.Listener {
+                    private var seekApplied = false
+                    override fun onPlaybackStateChanged(playbackState: Int) {
+                        if (seekApplied || playbackState != Player.STATE_READY) return
+                        seekApplied = true
+                        exoPlayer?.seekTo(currentWindow, playbackPosition)
+                        exoPlayer?.removeListener(this)
+                    }
+                })
+            }
+
             exoPlayer?.let { exo ->
                 event(StatusEvent(CSPlayerLoading.IsBuffering, CSPlayerLoading.IsBuffering))
                 isPlaying = exo.isPlaying

From 18ee71664ff6b7592e45e85c8ad6c758d64472f6 Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Mon, 20 Apr 2026 23:24:37 +0000
Subject: [PATCH 083/177] Feat: Offline filler database (#2704)

---
 app/build.gradle.kts                          |   3 +
 .../ui/result/ResultViewModel2.kt             |  18 +-
 .../cloudstream3/utils/FillerEpisodeCheck.kt  | 236 +++++++++++-------
 gradle/libs.versions.toml                     |   2 +
 4 files changed, 160 insertions(+), 99 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0ea37a025..368445097 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -234,6 +234,9 @@ dependencies {
     // FFmpeg Decoding
     implementation(libs.bundles.nextlib)
 
+    // Anime-db for filler
+    implementation(libs.anime.db)
+
     // PlayBack
     implementation(libs.colorpicker) // Subtitle Color Picker
     implementation(libs.newpipeextractor) // For Trailers
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 6eab987fc..cc48f6549 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -113,12 +113,14 @@ import com.lagradost.cloudstream3.utils.newExtractorLink
 import com.lagradost.cloudstream3.utils.txt
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.job
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.util.concurrent.TimeUnit
 
 /** This starts at 1 */
@@ -452,7 +454,7 @@ class ResultViewModel2 : ViewModel() {
     private var currentShowFillers: Boolean = false
     var currentRepo: APIRepository? = null
     private var currentId: Int? = null
-    private var fillers: Map<Int, Boolean> = emptyMap()
+    private var fillers: HashSet<Int> = hashSetOf()
     private var generator: IGenerator? = null
     private var preferDubStatus: DubStatus? = null
     private var preferStartEpisode: Int? = null
@@ -1806,11 +1808,11 @@ class ResultViewModel2 : ViewModel() {
     }
 
 
-    private suspend fun updateFillers(name: String) {
+    private suspend fun updateFillers(data : LoadResponse) {
         fillers =
-            ioWorkSafe {
-                FillerEpisodeCheck.getFillerEpisodes(name)
-            } ?: emptyMap()
+            withContext(Dispatchers.IO) {
+                safe { FillerEpisodeCheck.getFillerEpisodes(data) }
+            } ?: hashSetOf()
     }
 
     fun changeDubStatus(status: DubStatus) {
@@ -2147,8 +2149,8 @@ class ResultViewModel2 : ViewModel() {
     ) {
         _episodes.postValue(Resource.Loading())
 
-        if (updateFillers && loadResponse is AnimeLoadResponse) {
-            updateFillers(loadResponse.name)
+        if (updateFillers) {
+            updateFillers(loadResponse)
         }
 
         val allEpisodes = when (loadResponse) {
@@ -2189,7 +2191,7 @@ class ResultViewModel2 : ViewModel() {
                                     index,
                                     i.score,
                                     i.description,
-                                    fillers.getOrDefault(episode, false),
+                                    fillers.contains(episode),
                                     loadResponse.type,
                                     mainId,
                                     totalIndex,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/FillerEpisodeCheck.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/FillerEpisodeCheck.kt
index 09d4683bc..8456094d1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/FillerEpisodeCheck.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/FillerEpisodeCheck.kt
@@ -1,112 +1,166 @@
 package com.lagradost.cloudstream3.utils
 
-import com.lagradost.cloudstream3.app
+import androidx.annotation.WorkerThread
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.LoadResponse.Companion.getAniListId
+import com.lagradost.cloudstream3.LoadResponse.Companion.getImdbId
+import com.lagradost.cloudstream3.LoadResponse.Companion.getKitsuId
+import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId
+import com.lagradost.cloudstream3.LoadResponse.Companion.getTMDbId
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.ui.result.getId
 import com.lagradost.cloudstream3.utils.Coroutines.main
-import org.jsoup.Jsoup
 import java.lang.Thread.sleep
 import java.util.*
 import kotlin.concurrent.thread
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import java.io.InputStream
+import kotlin.let
 
 object FillerEpisodeCheck {
-    private const val MAIN_URL = "https://www.animefillerlist.com"
-
-    var list: HashMap<String, String>? = null
-    var cache: HashMap<String, HashMap<Int, Boolean>> = hashMapOf()
-
-    private fun fixName(name: String): String {
-        return name.lowercase(Locale.ROOT)/*.replace(" ", "")*/.replace("-", " ")
-            .replace("[^a-zA-Z0-9 ]".toRegex(), "")
-    }
-
-    private suspend fun getFillerList(): Boolean {
-        if (list != null) return true
-        try {
-            val result = app.get("$MAIN_URL/shows").text
-            val documented = Jsoup.parse(result)
-            val localHTMLList = documented.select("div#ShowList > div.Group > ul > li > a")
-            val localList = HashMap<String, String>()
-            for (i in localHTMLList) {
-                val name = i.text()
-
-                if (name.lowercase(Locale.ROOT).contains("manga only")) continue
-
-                val href = i.attr("href")
-                if (name.isNullOrEmpty() || href.isNullOrEmpty()) {
-                    continue
-                }
-
-                val values = "(.*) \\((.*)\\)".toRegex().matchEntire(name)?.groups
-                if (values != null) {
-                    for (index in 1 until values.size) {
-                        val localName = values[index]?.value ?: continue
-                        localList[fixName(localName)] = href
-                    }
-                } else {
-                    localList[fixName(name)] = href
-                }
-            }
-            if (localList.size > 0) {
-                list = localList
-                return true
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-        return false
-    }
-
     fun String?.toClassDir(): String {
         val q = this ?: "null"
         val z = (6..10).random().calc()
         return q + "cache" + z
     }
 
-    suspend fun getFillerEpisodes(query: String): HashMap<Int, Boolean>? {
-        try {
-            cache[query]?.let {
-                return it
-            }
-            if (!getFillerList()) return null
-            val localList = list ?: return null
+    data class Show(
+        @JsonProperty("slug")
+        val slug: String,
+        @JsonProperty("title")
+        val title: String,
+        @JsonProperty("filler")
+        val filler: ArrayList<Int>,
+        @JsonProperty("mixedCanon")
+        val mixedCanon: ArrayList<Int>,
+        @JsonProperty("mangaCanon")
+        val mangaCanon: ArrayList<Int>,
+        @JsonProperty("animeCanon")
+        val animeCanon: ArrayList<Int>,
+    )
 
-            // Strips these from the name
-            val blackList = listOf(
-                "TV Dubbed",
-                "(Dub)",
-                "Subbed",
-                "(TV)",
-                "(Uncensored)",
-                "(Censored)",
-                "(\\d+)" // year
-            )
-            val blackListRegex =
-                Regex(
-                    """ (${
-                        blackList.joinToString(separator = "|").replace("(", "\\(")
-                            .replace(")", "\\)")
-                    })"""
-                )
+    data class MappingRoot(
+        @JsonProperty("type")
+        val type: String?,
+        @JsonProperty("anidb_id")
+        val anidbId: Long?,
+        @JsonProperty("anilist_id")
+        val anilistId: Long?,
+        @JsonProperty("animecountdown_id")
+        val animecountdownId: Long?,
+        @JsonProperty("animenewsnetwork_id")
+        val animenewsnetworkId: Long?,
+        @JsonProperty("anime-planet_id")
+        val animePlanetId: String?,
+        @JsonProperty("anisearch_id")
+        val anisearchId: Long?,
+        @JsonProperty("imdb_id")
+        val imdbId: String?,
+        @JsonProperty("kitsu_id")
+        val kitsuId: Long?,
+        @JsonProperty("livechart_id")
+        val livechartId: Long?,
+        @JsonProperty("mal_id")
+        val malId: Long?,
+        @JsonProperty("simkl_id")
+        val simklId: Long?,
+        @JsonProperty("themoviedb_id")
+        val themoviedbId: Long?,
+        @JsonProperty("tvdb_id")
+        val tvdbId: Long?,
+        @JsonProperty("season")
+        val season: Season?,
+    )
 
-            val realQuery =
-                fixName(query.replace(blackListRegex, "")).replace("shippuuden", "shippuden")
-            if (!localList.containsKey(realQuery)) return null
-            val href = localList[realQuery]?.replace(MAIN_URL, "") ?: return null // JUST IN CASE
-            val result = app.get("$MAIN_URL$href").text
-            val documented = Jsoup.parse(result)
-            val hashMap = HashMap<Int, Boolean>()
-            documented.select("table.EpisodeList > tbody > tr").forEach {
-                val type = it.selectFirst("td.Type > span")?.text() == "Filler"
-                val episodeNumber = it.selectFirst("td.Number")?.text()?.toIntOrNull()
-                if (episodeNumber != null) {
-                    hashMap[episodeNumber] = type
-                }
-            }
-            cache[query] = hashMap
-            return hashMap
-        } catch (e: Exception) {
-            e.printStackTrace()
+    data class Season(
+        @JsonProperty("tvdb")
+        val tvdb: Long?,
+        @JsonProperty("tmdb")
+        val tmdb: Long?,
+    )
+
+    data class CombinedMedia(
+        @JsonProperty("mapping")
+        val mapping: MappingRoot?,
+        @JsonProperty("show")
+        val show: Show
+    )
+
+    data class Database(
+        val mal: HashMap<Long, CombinedMedia> = hashMapOf(),
+        val anilist: HashMap<Long, CombinedMedia> = hashMapOf(),
+        val kitsu: HashMap<Long, CombinedMedia> = hashMapOf(),
+        val tmdb: HashMap<Long, CombinedMedia> = hashMapOf(),
+        val imdb: HashMap<String, CombinedMedia> = hashMapOf(),
+        val name: HashMap<String, CombinedMedia> = hashMapOf(),
+    )
+
+    private var database: Database? = null
+
+    private val strip = Regex("[ :\\-.!]")
+
+    /** Makes names more uniform to make partial matches more still give a result */
+    fun stripName(name: String): String =
+        name.replace(strip, "").lowercase()
+
+
+    @Synchronized
+    @Throws
+    @WorkerThread
+    fun loadJson(): Database {
+        database?.let {
+            return it
+        }
+        
+        /** The entire "database" is stored as a json file we can parse */
+        val stream: InputStream = com.lagradost.AnimeDB.getDatabaseStream()!!
+        val text = stream.reader().readText()
+
+        val allMedia = parseJson<Array<CombinedMedia>>(text)
+        val pending = Database()
+        for (media in allMedia) {
+            val lowercase = stripName(media.show.title)
+            pending.name[lowercase] = media
+            val map = media.mapping ?: continue
+
+            map.imdbId?.let { id -> pending.imdb[id] = media }
+            map.malId?.let { id -> pending.mal[id] = media }
+            map.anilistId?.let { id -> pending.anilist[id] = media }
+            map.kitsuId?.let { id -> pending.kitsu[id] = media }
+            map.season?.tmdb?.let { id -> pending.tmdb[id] = media }
+        }
+        database = pending
+        return pending
+    }
+
+    val loadCache: HashMap<Int, HashSet<Int>?> = hashMapOf()
+
+    @Synchronized
+    @Throws
+    @WorkerThread
+    fun getFillerEpisodes(data: LoadResponse): HashSet<Int>? {
+        /** Only for anime */
+        if (data.type != TvType.Anime) {
             return null
         }
+        /** Try to hit the cache for this entry, to avoid recreating the hashset */
+        loadCache[data.getId()]?.let { cachedResponse ->
+            return cachedResponse
+        }
+        val db = loadJson()
+
+        val media =
+            db.mal[data.getMalId()?.toLongOrNull()]
+                ?: db.anilist[data.getAniListId()?.toLongOrNull()]
+                ?: db.kitsu[data.getKitsuId()?.toLongOrNull()]
+                ?: db.imdb[data.getImdbId()]
+                ?: db.tmdb[data.getTMDbId()?.toLongOrNull()]
+                ?: db.name[stripName(data.name)]
+
+        return media?.show?.filler?.toHashSet().also { response ->
+            loadCache[data.getId()] = response
+        }
     }
 
     private fun Int.calc(): Int {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 19be8d6ad..f0b24c8e7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,6 +3,7 @@
 [versions]
 activityKtx = "1.13.0"
 androidGradlePlugin = "9.1.1"
+animeDb = "1.0.2"
 appcompat = "1.7.1"
 biometric = "1.4.0-alpha06"
 buildkonfigGradlePlugin = "0.18.0"
@@ -55,6 +56,7 @@ targetSdk = "36"
 
 [libraries]
 activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityKtx" }
+anime-db = { module = "com.github.recloudstream:anime-db", version.ref = "animeDb" }
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
 coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }

From d4899536d3391b1228afdc0572310c23b7b296ea Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 22 Apr 2026 02:45:04 +0200
Subject: [PATCH 084/177] refactor(extractors): simplify and combine jwplayer
 extraction (#2398)

---
 .../cloudstream3/extractors/Bigwarp.kt        |  51 ------
 .../cloudstream3/extractors/Fastream.kt       |  52 +++---
 .../cloudstream3/extractors/Filegram.kt       |  52 ++++++
 .../cloudstream3/extractors/Filemoon.kt       |  40 ++---
 .../cloudstream3/extractors/Filesim.kt        |  13 +-
 .../cloudstream3/extractors/GamoVideo.kt      |  29 ++--
 .../cloudstream3/extractors/Hxfile.kt         |  68 ++------
 .../cloudstream3/extractors/JWPlayer.kt       |  73 ++++-----
 .../cloudstream3/extractors/Jeniusplay.kt     |  38 +----
 .../cloudstream3/extractors/LuluStream.kt     |  21 +--
 .../cloudstream3/extractors/Minoplres.kt      |  38 -----
 .../cloudstream3/extractors/MultiQuality.kt   |  63 -------
 .../cloudstream3/extractors/Pelisplus.kt      | 101 ------------
 .../extractors/StreamWishExtractor.kt         |  15 +-
 .../cloudstream3/extractors/StreamoUpload.kt  |  36 ++--
 .../cloudstream3/extractors/Supervideo.kt     |  45 ++---
 .../cloudstream3/extractors/Up4Stream.kt      |  27 ++-
 .../cloudstream3/extractors/VidHidePro.kt     |  23 +--
 .../cloudstream3/extractors/VidNest.kt        |  45 -----
 .../cloudstream3/extractors/Vidmoly.kt        |  49 +-----
 .../cloudstream3/extractors/Vidstream.kt      | 104 ------------
 .../lagradost/cloudstream3/extractors/Vtbe.kt |  33 ++--
 .../extractors/helper/JWPlayerHelper.kt       | 155 ++++++++++++++++++
 .../cloudstream3/utils/ExtractorApi.kt        |   2 -
 24 files changed, 379 insertions(+), 794 deletions(-)
 delete mode 100644 library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Bigwarp.kt
 create mode 100644 library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filegram.kt
 delete mode 100644 library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Minoplres.kt
 delete mode 100644 library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MultiQuality.kt
 delete mode 100644 library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Pelisplus.kt
 delete mode 100644 library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidNest.kt
 delete mode 100644 library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidstream.kt
 create mode 100644 library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/JWPlayerHelper.kt

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Bigwarp.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Bigwarp.kt
deleted file mode 100644
index 50a68c62f..000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Bigwarp.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.newExtractorLink
-
-open class BigwarpIO : ExtractorApi() {
-    override var name = "Bigwarp"
-    override var mainUrl = "https://bigwarp.io"
-    override val requiresReferer = false
-
-    private val sourceRegex = Regex("""file:\s*['"](.*?)['"],label:\s*['"](.*?)['"]""")
-    private val qualityRegex = Regex("""\d+x(\d+) .*""")
-
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val resp = app.get(url).text
-
-        for (sourceMatch in sourceRegex.findAll(resp)) {
-            val label = sourceMatch.groupValues[2]
-
-            callback.invoke(
-                newExtractorLink(
-                    name,
-                    "$name ${label.split(" ", limit = 2).getOrNull(1)}",
-                    sourceMatch.groupValues[1], // streams are usually in mp4 format
-                ) {
-                    this.referer = url
-                    this.quality =
-                        qualityRegex.find(label)?.groupValues?.getOrNull(1)?.toIntOrNull()
-                            ?: Qualities.Unknown.value
-                }
-            )
-        }
-    }
-}
-
-class BgwpCC : BigwarpIO() {
-    override var mainUrl = "https://bgwp.cc"
-}
-
-class BigwarpArt : BigwarpIO() {
-    override var mainUrl = "https://bigwarp.art"
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Fastream.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Fastream.kt
index e8f8c49ac..94ddaf61e 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Fastream.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Fastream.kt
@@ -1,54 +1,44 @@
 package com.lagradost.cloudstream3.extractors
 
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.amap
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
 import com.lagradost.cloudstream3.utils.getAndUnpack
-import org.jsoup.nodes.Document
+import com.lagradost.cloudstream3.utils.getPacked
 
-open class Fastream: ExtractorApi() {
+open class Fastream : ExtractorApi() {
     override var mainUrl = "https://fastream.to"
     override var name = "Fastream"
     override val requiresReferer = false
-    suspend fun getstream(
-        response: Document,
-        sources: ArrayList<ExtractorLink>): Boolean{
-        response.select("script").amap { script ->
-            if (script.data().contains(Regex("eval\\(function\\(p,a,c,k,e,[rd]"))) {
-                val unpacked = getAndUnpack(script.data())
-                //val m3u8regex = Regex("((https:|http:)\\/\\/.*\\.m3u8)")
-                val newm3u8link = unpacked.substringAfter("file:\"").substringBefore("\"")
-                //val m3u8link = m3u8regex.find(unpacked)?.value ?: return@forEach
-                generateM3u8(
-                    name,
-                    newm3u8link,
-                    mainUrl
-                ).forEach { link ->
-                    sources.add(link)
-                }
-            }
-        }
-        return true
-    }
 
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val sources = ArrayList<ExtractorLink>()
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val idregex = Regex("emb.html\\?(.*)=")
-        if (url.contains(Regex("(emb.html.*fastream)"))) {
+        val response = if (url.contains(Regex("(emb.html.*fastream)"))) {
             val id = idregex.find(url)?.destructured?.component1() ?: ""
-            val response = app.post("https://fastream.to/dl", allowRedirects = false,
+            app.post(
+                "$mainUrl/dl", allowRedirects = false,
                 data = mapOf(
                     "op" to "embed",
                     "file_code" to id,
                     "auto" to "1"
                 )
             ).document
-            getstream(response, sources)
+        } else {
+            app.get(url, referer = url).document
+        }
+        response.select("script").amap { script ->
+            if (getPacked(script.data()) != null) {
+                val unPacked = getAndUnpack(script.data())
+                JwPlayerHelper.extractStreamLinks(unPacked, name, mainUrl, callback, subtitleCallback)
+            }
         }
-        val response = app.get(url, referer = url).document
-        getstream(response, sources)
-        return sources
     }
 }
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filegram.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filegram.kt
new file mode 100644
index 000000000..7756f7290
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filegram.kt
@@ -0,0 +1,52 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.USER_AGENT
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.getAndUnpack
+import org.jsoup.nodes.Element
+
+open class Filegram : ExtractorApi() {
+    override val name = "Filegram"
+    override val mainUrl = "https://filegram.to"
+    override val requiresReferer = true
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val header = mapOf(
+            "Accept" to "*/*",
+            "Accept-language" to "en-US,en;q=0.9",
+            "Origin" to mainUrl,
+            "Accept-Encoding" to "gzip, deflate, br, zstd",
+            "Connection" to "keep-alive",
+            "Sec-Fetch-Dest" to "empty",
+            "Sec-Fetch-Mode" to "cors",
+            "Sec-Fetch-Site" to "same-site",
+            "user-agent" to USER_AGENT,
+        )
+
+        val doc = app.get(getEmbedUrl(url), referer = referer).document
+        val unpackedJs = unpackJs(doc).toString()
+
+        JwPlayerHelper.extractStreamLinks(unpackedJs, name, mainUrl, callback, subtitleCallback, headers = header)
+    }
+
+    private fun unpackJs(script: Element): String? {
+        return script.select("script").find { it.data().contains("eval(function(p,a,c,k,e,d)") }
+            ?.data()?.let { getAndUnpack(it) }
+    }
+
+    private fun getEmbedUrl(url: String): String {
+        return if (!url.contains("/embed-")) {
+            val videoId = url.substringAfter("$mainUrl/")
+            "$mainUrl/embed-$videoId"
+        } else url
+    }
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filemoon.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filemoon.kt
index 6c10a92d9..ad4def1de 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filemoon.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filemoon.kt
@@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.extractors
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
 import com.lagradost.cloudstream3.network.WebViewResolver
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
@@ -54,18 +55,16 @@ open class FilemoonV2 : ExtractorApi() {
                 ?.data().orEmpty()
             val unpackedScript = JsUnpacker(fallbackScriptData).unpack()
 
-            val videoUrl = unpackedScript?.let {
-                Regex("""sources:\[\{file:"(.*?)"""").find(it)?.groupValues?.get(1)
-            }
+            val linkFound = JwPlayerHelper.extractStreamLinks(
+                unpackedScript.orEmpty(),
+                name,
+                mainUrl,
+                callback,
+                subtitleCallback,
+                defaultHeaders
+            )
 
-            if (!videoUrl.isNullOrEmpty()) {
-                M3u8Helper.generateM3u8(
-                    name,
-                    videoUrl,
-                    mainUrl,
-                    headers = defaultHeaders
-                ).forEach(callback)
-            } else {
+            if (!linkFound) {
                 Log.d("FilemoonV2", "No iframe and no video URL found in script fallback.")
             }
             return
@@ -81,18 +80,15 @@ open class FilemoonV2 : ExtractorApi() {
 
         val unpackedScript = JsUnpacker(iframeScriptData).unpack()
 
-        val videoUrl = unpackedScript?.let {
-            Regex("""sources:\[\{file:"(.*?)"""").find(it)?.groupValues?.get(1)
-        }
+        val linkFound = JwPlayerHelper.extractStreamLinks(
+            unpackedScript.orEmpty(),
+            name,
+            mainUrl,
+            callback,
+            subtitleCallback
+        )
 
-        if (!videoUrl.isNullOrEmpty()) {
-            M3u8Helper.generateM3u8(
-                name,
-                videoUrl,
-                mainUrl,
-                headers = defaultHeaders
-            ).forEach(callback)
-        } else {
+        if (!linkFound) {
             // Last-resort fallback using WebView interception
             val resolver = WebViewResolver(
                 interceptUrl = Regex("""(m3u8|master\.txt)"""),
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filesim.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filesim.kt
index 8c0cbec32..51e127e3f 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filesim.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filesim.kt
@@ -4,6 +4,7 @@ import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.api.Log
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
 import com.lagradost.cloudstream3.network.WebViewResolver
 
 class Multimoviesshg : Filesim() {
@@ -78,17 +79,9 @@ open class Filesim : ExtractorApi() {
             pageResponse.document.selectFirst("script:containsData(sources:)")?.data()
         }
 
-        val m3u8Url = scriptData?.let {
-            Regex("""file:\s*"(.*?m3u8.*?)"""").find(it)?.groupValues?.getOrNull(1)
-        }
+        val linkFound = JwPlayerHelper.extractStreamLinks(scriptData.orEmpty(), name, mainUrl, callback, subtitleCallback)
 
-        if (!m3u8Url.isNullOrEmpty()) {
-            M3u8Helper.generateM3u8(
-                name,
-                m3u8Url,
-                mainUrl
-            ).forEach(callback)
-        } else {
+        if (!linkFound) {
             // Fallback using WebViewResolver
             val resolver = WebViewResolver(
                 interceptUrl = Regex("""(m3u8|master\.txt)"""),
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GamoVideo.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GamoVideo.kt
index 7e00dbf95..85212e6bb 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GamoVideo.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GamoVideo.kt
@@ -1,7 +1,10 @@
 package com.lagradost.cloudstream3.extractors
 
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
 
 
 open class GamoVideo : ExtractorApi() {
@@ -11,21 +14,13 @@ open class GamoVideo : ExtractorApi() {
 
     override suspend fun getUrl(
         url: String,
-        referer: String?
-    ): List<ExtractorLink>? {
-        return app.get(url, referer = referer).document.select("script")
-            .firstOrNull { it.html().contains("sources:") }!!.html().substringAfter("file: \"")
-            .substringBefore("\",").let {
-            listOf(
-                newExtractorLink(
-                    name,
-                    name,
-                    it,
-                ) {
-                    this.referer = url
-                    this.quality = Qualities.Unknown.value
-                }
-            )
-        }
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        app.get(url, referer = referer).document.select("script")
+            .firstOrNull { JwPlayerHelper.canParseJwScript(it.data()) }!!.let {
+                JwPlayerHelper.extractStreamLinks(it.data(), name, mainUrl, callback, subtitleCallback)
+            }
     }
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Hxfile.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Hxfile.kt
index 8a56783b1..8f8a0c0ce 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Hxfile.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Hxfile.kt
@@ -1,9 +1,9 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
 import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 
 class Neonime7n : Hxfile() {
     override val name = "Neonime7n"
@@ -39,64 +39,22 @@ open class Hxfile : ExtractorApi() {
     override val requiresReferer = false
     open val redirect = true
 
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val sources = mutableListOf<ExtractorLink>()
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val document = app.get(url, allowRedirects = redirect, referer = referer).document
         with(document) {
             this.select("script").map { script ->
-                if (script.data().contains("eval(function(p,a,c,k,e,d)")) {
-                    val data =
-                        getAndUnpack(script.data()).substringAfter("sources:[").substringBefore("]")
-                    tryParseJson<List<ResponseSource>>("[$data]")?.map {
-                        sources.add(
-                            newExtractorLink(
-                                name,
-                                name,
-                                it.file,
-                            ) {
-                                this.referer = mainUrl
-                                this.quality = when {
-                                    url.contains("hxfile.co") -> getQualityFromName(
-                                        Regex("\\d\\.(.*?).mp4").find(
-                                            document.select("title").text()
-                                        )?.groupValues?.get(1).toString()
-                                    )
-                                    else -> getQualityFromName(it.label)
-                                }
-                            }
-                        )
-                    }
-                } else if (script.data().contains("\"sources\":[")) {
-                    val data = script.data().substringAfter("\"sources\":[").substringBefore("]")
-                    tryParseJson<List<ResponseSource>>("[$data]")?.map {
-                        sources.add(
-                            newExtractorLink(
-                                name,
-                                name,
-                                it.file,
-                            ) {
-                                this.referer = mainUrl
-                                this.quality = when {
-                                    it.label?.contains("HD") == true -> Qualities.P720.value
-                                    it.label?.contains("SD") == true -> Qualities.P480.value
-                                    else -> getQualityFromName(it.label)
-                                }
-                            }
-                        )
-                    }
-                }
-                else {
-                    null
+                if (getPacked(script.data()) != null) {
+                    val data = getAndUnpack(script.data())
+                    JwPlayerHelper.extractStreamLinks(data, name, mainUrl, callback, subtitleCallback)
+                } else if (JwPlayerHelper.canParseJwScript(script.data())) {
+                    JwPlayerHelper.extractStreamLinks(script.data(), name, mainUrl, callback, subtitleCallback)
                 }
             }
         }
-        return sources
     }
-
-    private data class ResponseSource(
-        @JsonProperty("file") val file: String,
-        @JsonProperty("type") val type: String?,
-        @JsonProperty("label") val label: String?
-    )
-
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/JWPlayer.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/JWPlayer.kt
index e744fdb39..324640355 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/JWPlayer.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/JWPlayer.kt
@@ -1,13 +1,10 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.getQualityFromName
-import com.lagradost.cloudstream3.utils.newExtractorLink
 
 class Meownime : JWPlayer() {
     override val name = "Meownime"
@@ -34,50 +31,36 @@ class DesuOdvip : JWPlayer() {
     override val mainUrl = "https://desustream.me/odvip/"
 }
 
+class VidNest : JWPlayer() {
+    override var name = "Vidnest"
+    override var mainUrl = "https://vidnest.io"
+}
+
+open class BigwarpIO : JWPlayer() {
+    override var name = "Bigwarp"
+    override var mainUrl = "https://bigwarp.io"
+}
+
+class BgwpCC : BigwarpIO() {
+    override var mainUrl = "https://bgwp.cc"
+}
+
+class BigwarpArt : BigwarpIO() {
+    override var mainUrl = "https://bigwarp.art"
+}
+
 open class JWPlayer : ExtractorApi() {
     override val name = "JWPlayer"
     override val mainUrl = "https://www.jwplayer.com"
     override val requiresReferer = false
 
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val sources = mutableListOf<ExtractorLink>()
-        with(app.get(url).document) {
-            val data = this.select("script").mapNotNull { script ->
-                if (script.data().contains("sources: [")) {
-                    script.data().substringAfter("sources: [")
-                        .substringBefore("],").replace("'", "\"")
-                } else if (script.data().contains("otakudesu('")) {
-                    script.data().substringAfter("otakudesu('")
-                        .substringBefore("');")
-                } else {
-                    null
-                }
-            }
-
-            tryParseJson<List<ResponseSource>>("$data")?.map {
-                sources.add(
-                    newExtractorLink(
-                        name,
-                        name,
-                        it.file,
-                    ) {
-                        this.referer = url
-                        this.quality = getQualityFromName(
-                            Regex("(\\d{3,4}p)").find(it.file)?.groupValues?.get(
-                                1
-                            )
-                        )
-                    }
-                )
-            }
-        }
-        return sources
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val script = app.get(url).document.selectFirst("script:containsData(sources:)") ?: return
+        JwPlayerHelper.extractStreamLinks(script.data(), name, mainUrl, callback, subtitleCallback)
     }
-
-    private data class ResponseSource(
-        @JsonProperty("file") val file: String,
-        @JsonProperty("type") val type: String?,
-        @JsonProperty("label") val label: String?
-    )
-
 }
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jeniusplay.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jeniusplay.kt
index f64863a9f..896228b51 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jeniusplay.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jeniusplay.kt
@@ -3,9 +3,12 @@ package com.lagradost.cloudstream3.extractors
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.newSubtitleFile
-import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.M3u8Helper
+import com.lagradost.cloudstream3.utils.getAndUnpack
+import com.lagradost.cloudstream3.utils.getPacked
 
 open class Jeniusplay : ExtractorApi() {
     override val name = "Jeniusplay"
@@ -34,40 +37,17 @@ open class Jeniusplay : ExtractorApi() {
             url,
         ).forEach(callback)
 
-
         document.select("script").map { script ->
-            if (script.data().contains("eval(function(p,a,c,k,e,d)")) {
-                val subData =
-                    getAndUnpack(script.data()).substringAfter("\"tracks\":[").substringBefore("],")
-                tryParseJson<List<Tracks>>("[$subData]")?.map { subtitle ->
-                    subtitleCallback.invoke(
-                        newSubtitleFile(
-                            getLanguage(subtitle.label ?: ""),
-                            subtitle.file
-                        )
-                    )
-                }
+            if (getPacked(script.data()) != null) {
+                val unpacked = getAndUnpack(script.data())
+                JwPlayerHelper.extractStreamLinks(unpacked, name, mainUrl, callback, subtitleCallback)
             }
         }
     }
 
-    private fun getLanguage(str: String): String {
-        return when {
-            str.contains("indonesia", true) || str
-                .contains("bahasa", true) -> "Indonesian"
-            else -> str
-        }
-    }
-
     data class ResponseSource(
         @JsonProperty("hls") val hls: Boolean,
         @JsonProperty("videoSource") val videoSource: String,
         @JsonProperty("securedLink") val securedLink: String?,
     )
-
-    data class Tracks(
-        @JsonProperty("kind") val kind: String?,
-        @JsonProperty("file") val file: String,
-        @JsonProperty("label") val label: String?,
-    )
 }
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/LuluStream.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/LuluStream.kt
index c7b658606..dec679594 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/LuluStream.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/LuluStream.kt
@@ -1,12 +1,10 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.INFER_TYPE
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.newExtractorLink
 
 
 class Luluvdoo : LuluStream() {
@@ -47,18 +45,7 @@ open class LuluStream : ExtractorApi() {
         ).document
         post.selectFirst("script:containsData(vplayer)")?.data()
             ?.let { script ->
-                Regex("file:\"(.*)\"").find(script)?.groupValues?.get(1)?.let { link ->
-                    callback(
-                        newExtractorLink(
-                            name,
-                            name,
-                            link,
-                        ) {
-                            this.referer = mainUrl
-                            this.quality = Qualities.P1080.value
-                        }
-                    )
-                }
+                JwPlayerHelper.extractStreamLinks(script, name, mainUrl, callback, subtitleCallback)
             }
     }
-}
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Minoplres.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Minoplres.kt
deleted file mode 100644
index 702501a1e..000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Minoplres.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.M3u8Helper
-
-open class Minoplres : ExtractorApi() {
-
-    override val name = "Minoplres" // formerly SpeedoStream
-    override val requiresReferer = true
-    override val mainUrl = "https://minoplres.xyz" // formerly speedostream.bond
-    private val hostUrl = "https://minoplres.xyz"
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val sources = mutableListOf<ExtractorLink>()
-        app.get(url, referer = referer).document.select("script").map { script ->
-            if (script.data().contains("jwplayer(\"vplayer\").setup(")) {
-                val data = script.data().substringAfter("sources: [")
-                    .substringBefore("],").replace("file", "\"file\"").trim()
-                tryParseJson<File>(data)?.let {
-                    M3u8Helper.generateM3u8(
-                        name,
-                        it.file,
-                        "$hostUrl/",
-                    ).forEach { m3uData -> sources.add(m3uData) }
-                }
-            }
-        }
-        return sources
-    }
-
-    private data class File(
-        @JsonProperty("file") val file: String,
-    )
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MultiQuality.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MultiQuality.kt
deleted file mode 100644
index 802d9ea3a..000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MultiQuality.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.ExtractorLinkType
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.getQualityFromName
-import com.lagradost.cloudstream3.utils.newExtractorLink
-import java.net.URI
-
-open class MultiQuality : ExtractorApi() {
-    override var name = "MultiQuality"
-    override var mainUrl = "https://anihdplay.com"
-    private val sourceRegex = Regex("""file:\s*['"](.*?)['"],label:\s*['"](.*?)['"]""")
-    private val m3u8Regex = Regex(""".*?(\d*).m3u8""")
-    private val urlRegex = Regex("""(.*?)([^/]+$)""")
-    override val requiresReferer = false
-
-    override fun getExtractorUrl(id: String): String {
-        return "$mainUrl/loadserver.php?id=$id"
-    }
-
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
-        with(app.get(url)) {
-            sourceRegex.findAll(this.text).forEach { sourceMatch ->
-                val extractedUrl = sourceMatch.groupValues[1]
-                // Trusting this isn't mp4, may fuck up stuff
-                if (URI(extractedUrl).path.endsWith(".m3u8")) {
-                    with(app.get(extractedUrl)) {
-                        m3u8Regex.findAll(this.text).forEach { match ->
-                            extractedLinksList.add(
-                                newExtractorLink(
-                                    source = name,
-                                    name = name,
-                                    url = urlRegex.find(this.url)!!.groupValues[1] + match.groupValues[0],
-                                    type = ExtractorLinkType.M3U8
-                                ) {
-                                    this.referer = url
-                                    this.quality = getQualityFromName(match.groupValues[1])
-                                }
-                            )
-                        }
-
-                    }
-                } else if (extractedUrl.endsWith(".mp4")) {
-                    extractedLinksList.add(
-                        newExtractorLink(
-                            name,
-                            "$name ${sourceMatch.groupValues[2]}",
-                            extractedUrl,
-                        ) {
-                            this.referer = url.replace(" ", "%20")
-                            this.quality = Qualities.Unknown.value
-                        }
-                    )
-                }
-            }
-            return extractedLinksList
-        }
-    }
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Pelisplus.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Pelisplus.kt
deleted file mode 100644
index e2588feb6..000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Pelisplus.kt
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.amap
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.mvvm.safeAsync
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.INFER_TYPE
-import com.lagradost.cloudstream3.utils.extractorApis
-import com.lagradost.cloudstream3.utils.getQualityFromName
-import com.lagradost.cloudstream3.utils.loadExtractor
-import com.lagradost.cloudstream3.utils.newExtractorLink
-import org.jsoup.Jsoup
-
-/**
- * overrideMainUrl is necessary for for other vidstream clones like vidembed.cc
- * If they diverge it'd be better to make them separate.
- * */
-open class Pelisplus(val mainUrl: String) {
-    val name: String = "Vidstream"
-
-    private fun getExtractorUrl(id: String): String {
-        return "$mainUrl/play?id=$id"
-    }
-
-    private fun getDownloadUrl(id: String): String {
-        return "$mainUrl/download?id=$id"
-    }
-
-    private val normalApis = arrayListOf(MultiQuality())
-
-    // https://gogo-stream.com/streaming.php?id=MTE3NDg5
-    suspend fun getUrl(
-        id: String,
-        isCasting: Boolean = false,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ): Boolean {
-        try {
-            normalApis.amap { api ->
-                val url = api.getExtractorUrl(id)
-                api.getSafeUrl(url, subtitleCallback = subtitleCallback, callback = callback)
-            }
-            val extractorUrl = getExtractorUrl(id)
-
-            /** Stolen from GogoanimeProvider.kt extractor */
-            safeAsync {
-                val link = getDownloadUrl(id)
-                println("Generated vidstream download link: $link")
-                val page = app.get(link, referer = extractorUrl)
-
-                val pageDoc = Jsoup.parse(page.text)
-                val qualityRegex = Regex("(\\d+)P")
-
-                //a[download]
-                pageDoc.select(".dowload > a").amap { element ->
-                    val href = element.attr("href")
-                    val qual = if (element.text()
-                            .contains("HDP")
-                    ) "1080" else qualityRegex.find(element.text())?.destructured?.component1()
-                        .toString()
-
-                    if (!loadExtractor(href, link, subtitleCallback, callback)) {
-                        callback.invoke(
-                            newExtractorLink(
-                                this.name,
-                                name = this.name,
-                                href
-                            ) {
-                                this.referer = page.url
-                                this.quality = getQualityFromName(qual)
-                            }
-                        )
-                    }
-                }
-            }
-
-            with(app.get(extractorUrl)) {
-                val document = Jsoup.parse(this.text)
-                val primaryLinks = document.select("ul.list-server-items > li.linkserver")
-                //val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
-
-                // All vidstream links passed to extractors
-                primaryLinks.distinctBy { it.attr("data-video") }.forEach { element ->
-                    val link = element.attr("data-video")
-                    //val name = element.text()
-
-                    // Matches vidstream links with extractors
-                    extractorApis.filter { !it.requiresReferer || !isCasting }.amap { api ->
-                        if (link.startsWith(api.mainUrl)) {
-                            api.getSafeUrl(link, extractorUrl, subtitleCallback, callback)
-                        }
-                    }
-                }
-                return true
-            }
-        } catch (e: Exception) {
-            return false
-        }
-    }
-}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt
index db883d6af..c721db6b9 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt
@@ -4,6 +4,7 @@ import com.lagradost.api.Log
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
@@ -12,7 +13,6 @@ import com.lagradost.cloudstream3.utils.getPacked
 import com.lagradost.cloudstream3.network.WebViewResolver
 
 
-
 class Mwish : StreamWishExtractor() {
     override val name = "Mwish"
     override val mainUrl = "https://mwish.pro"
@@ -180,18 +180,9 @@ open class StreamWishExtractor : ExtractorApi() {
             else -> pageResponse.document.selectFirst("script:containsData(sources:)")?.data()
         }
 
-        val directStreamUrl = playerScriptData?.let {
-            Regex("""file:\s*"(.*?m3u8.*?)"""").find(it)?.groupValues?.getOrNull(1)
-        }
+        val linkFound = JwPlayerHelper.extractStreamLinks(playerScriptData.orEmpty(), name, mainUrl, callback, subtitleCallback, headers)
 
-        if (!directStreamUrl.isNullOrEmpty()) {
-            M3u8Helper.generateM3u8(
-                name,
-                directStreamUrl,
-                mainUrl,
-                headers = headers
-            ).forEach(callback)
-        } else {
+        if (!linkFound) {
             val webViewM3u8Resolver = WebViewResolver(
                 interceptUrl = Regex("""txt|m3u8"""),
                 additionalUrls = listOf(Regex("""txt|m3u8""")),
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamoUpload.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamoUpload.kt
index 7fafe05be..b7f618e95 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamoUpload.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamoUpload.kt
@@ -1,42 +1,30 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getAndUnpack
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.M3u8Helper
+import com.lagradost.cloudstream3.utils.getPacked
 
 open class StreamoUpload : ExtractorApi() {
     override val name = "StreamoUpload"
     override val mainUrl = "https://streamoupload.xyz"
     override val requiresReferer = true
 
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val sources = mutableListOf<ExtractorLink>()
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val response = app.get(url, referer = referer)
-        val scriptElements = response.document.select("script").map { script ->
-            if (script.data().contains("eval(function(p,a,c,k,e,d)")) {
+        response.document.select("script").map { script ->
+            if (getPacked(script.data()) != null) {
                 val data = getAndUnpack(script.data())
-                    .substringAfter("sources:[")
-                    .substringBefore("],")
-                    .replace("file", "\"file\"")
-                    .trim()
-                tryParseJson<File>(data)?.let {
-                    M3u8Helper.generateM3u8(
-                        name,
-                        it.file,
-                        "$mainUrl/",
-                    ).forEach { m3uData -> sources.add(m3uData) }
-                }
+                JwPlayerHelper.extractStreamLinks(data, name, mainUrl, callback, subtitleCallback)
             }
         }
-        return sources
     }
-
-    private data class File(
-        @JsonProperty("file") val file: String,
-    )
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Supervideo.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Supervideo.kt
index e70cae6bd..5e47dd2de 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Supervideo.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Supervideo.kt
@@ -1,42 +1,27 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-
-data class Files(
-    @JsonProperty("file") val id: String,
-    @JsonProperty("label") val label: String? = null,
-)
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.JsUnpacker
 
 open class Supervideo : ExtractorApi() {
     override var name = "Supervideo"
     override var mainUrl = "https://supervideo.cc"
     override val requiresReferer = false
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
-        val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val response = app.get(url).text
         val jstounpack = Regex("eval((.|\\n)*?)</script>").find(response)?.groups?.get(1)?.value
-        val unpacjed = JsUnpacker(jstounpack).unpack()
-        val extractedUrl =
-            unpacjed?.let { Regex("""sources:((.|\n)*?)image""").find(it) }?.groups?.get(1)?.value.toString()
-                .replace("file", """"file"""").replace("label", """"label"""")
-                .substringBeforeLast(",")
-        val parsedlinks = parseJson<List<Files>>(extractedUrl)
-        parsedlinks.forEach { data ->
-            if (data.label.isNullOrBlank()) { // mp4 links (with labels) are slow. Use only m3u8 link.
-                M3u8Helper.generateM3u8(
-                    name,
-                    data.id,
-                    url,
-                    headers = mapOf("referer" to url)
-                ).forEach { link ->
-                    extractedLinksList.add(link)
-                }
-            }
-        }
-        return extractedLinksList
+        val unpacked = JsUnpacker(jstounpack).unpack()
+
+        JwPlayerHelper.extractStreamLinks(unpacked.orEmpty(), name, mainUrl, callback, subtitleCallback)
     }
 }
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Up4Stream.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Up4Stream.kt
index 91150992b..b72213e66 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Up4Stream.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Up4Stream.kt
@@ -1,13 +1,13 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.lagradost.api.Log
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.JsUnpacker
-import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.fixUrl
-import com.lagradost.cloudstream3.utils.newExtractorLink
 import kotlinx.coroutines.delay
 
 class Up4FunTop : Up4Stream() {
@@ -19,12 +19,17 @@ open class Up4Stream : ExtractorApi() {
     override var mainUrl = "https://up4stream.com"
     override val requiresReferer = true
 
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val movieId = url.substringAfterLast("/").substringBefore(".html")
 
         // redirect from "wait 5 seconds" page to actual movie page
         val redirectResponse = app.get(url, cookies = mapOf("id" to movieId))
-        val redirectForm = redirectResponse.document.selectFirst("form[method=POST]") ?: return null
+        val redirectForm = redirectResponse.document.selectFirst("form[method=POST]") ?: return
         val redirectUrl = fixUrl(redirectForm.attr("action"))
         val redirectParams = redirectForm.select("input[type=hidden]").associate { input ->
             input.attr("name") to input.attr("value")
@@ -42,19 +47,7 @@ open class Up4Stream : ExtractorApi() {
         }
 
         JsUnpacker(extractedpack).unpack()?.let { unPacked ->
-            Regex("sources:\\[\\{file:\"(.*?)\"").find(unPacked)?.groupValues?.get(1)?.let { link ->
-                return listOf(
-                    newExtractorLink(
-                        this.name,
-                        this.name,
-                        link,
-                    ) {
-                        this.referer = referer.orEmpty()
-                        this.quality = Qualities.Unknown.value
-                    }
-                )
-            }
+            JwPlayerHelper.extractStreamLinks(unPacked, name, mainUrl, callback, subtitleCallback)
         }
-        return null
     }
 }
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidHidePro.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidHidePro.kt
index 469efc5ec..849b2b6d9 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidHidePro.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidHidePro.kt
@@ -3,8 +3,11 @@ package com.lagradost.cloudstream3.extractors
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.getAndUnpack
+import com.lagradost.cloudstream3.utils.getPacked
 
 class Ryderjet: VidHidePro() {
     override var mainUrl = "https://ryderjet.com"
@@ -74,24 +77,12 @@ open class VidHidePro : ExtractorApi() {
         
         val response = app.get(getEmbedUrl(url), referer = referer)
         val script = if (!getPacked(response.text).isNullOrEmpty()) {
-            var result = getAndUnpack(response.text)
-            if(result.contains("var links")){
-                result = result.substringAfter("var links")
-            }
-            result
+            getAndUnpack(response.text)
         } else {
             response.document.selectFirst("script:containsData(sources:)")?.data()
         } ?: return
 
-        // m3u8 urls could be prefixed by 'file:', 'hls2:' or 'hls4:', so we just match ':'
-        Regex(":\\s*\"(.*?m3u8.*?)\"").findAll(script).forEach { m3u8Match ->
-            generateM3u8(
-                name,
-                fixUrl(m3u8Match.groupValues[1]),
-                referer = "$mainUrl/",
-                headers = headers
-            ).forEach(callback)
-        }
+        JwPlayerHelper.extractStreamLinks(script, name, mainUrl, callback, subtitleCallback, headers)
     }
 
     private fun getEmbedUrl(url: String): String {
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidNest.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidNest.kt
deleted file mode 100644
index f9d45ebb8..000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidNest.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.ExtractorApi
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.M3u8Helper
-import com.lagradost.cloudstream3.utils.newExtractorLink
-
-open class VidNest : ExtractorApi() {
-    override var name = "VidNest"
-    override var mainUrl = "https://vidnest.io"
-    override val requiresReferer = true
-
-    private val sourceRegex = Regex("""sources:[\W\w]*?file:\s*?["'](.*?)["']""")
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink> {
-        val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
-        with(app.get(url, referer = referer)) {
-            sourceRegex.findAll(this.text).forEach { sourceMatch ->
-                val extractedUrl = sourceMatch.groupValues[1]
-                // Trusting this isn't mp4, may fuck up stuff
-                if (extractedUrl.contains(".m3u8")) {
-                    M3u8Helper.generateM3u8(
-                        name,
-                        extractedUrl,
-                        url,
-                        headers = mapOf("referer" to this.url)
-                    ).forEach { link ->
-                        extractedLinksList.add(link)
-                    }
-                } else if (extractedUrl.contains(".mp4")) {
-                    extractedLinksList.add(
-                        newExtractorLink(
-                            source = name,
-                            name = name,
-                            url = extractedUrl,
-                        ) {
-                            this.referer = url.replace(" ", "%20")
-                        }
-                    )
-                }
-            }
-            return extractedLinksList
-        }
-    }
-}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidmoly.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidmoly.kt
index bd259b175..11927c507 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidmoly.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidmoly.kt
@@ -1,13 +1,11 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.newSubtitleFile
-import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import kotlinx.coroutines.delay
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
 
 class Vidmolyme : Vidmoly() {
     override val mainUrl = "https://vidmoly.me"
@@ -26,20 +24,6 @@ open class Vidmoly : ExtractorApi() {
     override val mainUrl = "https://vidmoly.net"
     override val requiresReferer = true
 
-    private fun String.addMarks(str: String): String {
-        return this.replace(Regex("\"?$str\"?"), "\"$str\"")
-    }
-
-    private data class Source(
-        @JsonProperty("file") val file: String? = null,
-    )
-
-    private data class SubSource(
-        @JsonProperty("file") val file: String? = null,
-        @JsonProperty("label") val label: String? = null,
-        @JsonProperty("kind") val kind: String? = null,
-    )
-
     override suspend fun getUrl(
         url: String,
         referer: String?,
@@ -54,34 +38,13 @@ open class Vidmoly : ExtractorApi() {
         val newUrl = if (url.contains("/w/")) 
             url.replaceFirst("/w/", "/embed-") + ".html" 
             else url
+
         val script = app.get(newUrl, headers = headers, referer = referer)
             .document.select("script")
             .firstOrNull { it.data().contains("sources:") }
             ?.data()
+
         // Extracts and parses videoData
-        script?.substringAfter("sources: [")
-            ?.substringBefore("]")
-            ?.addMarks("file")
-            ?.replace("'","\"")
-            ?.let { videoData ->
-                tryParseJson<Source>(videoData)?.file?.let { m3uLink ->
-                    M3u8Helper.generateM3u8(name, m3uLink, "$mainUrl/")
-                        .forEach(callback)
-                }
-            }
-        // Extracts and parses captions
-        script?.substringAfter("tracks: [")
-            ?.substringBefore("]")
-            ?.addMarks("file")?.addMarks("label")?.addMarks("kind")
-            ?.replace("'","\"")
-            ?.let { subData ->
-                tryParseJson<List<SubSource>>("[$subData]")
-                    ?.filter { it.kind == "captions" }
-                    ?.forEach {
-                        subtitleCallback(
-                            newSubtitleFile(it.label.toString(), fixUrl(it.file.toString()))
-                        )
-                    }
-            }
+        JwPlayerHelper.extractStreamLinks(script.orEmpty(), name, mainUrl, callback, subtitleCallback)
     }
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidstream.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidstream.kt
deleted file mode 100644
index ab228ee3c..000000000
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidstream.kt
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.lagradost.cloudstream3.extractors
-
-import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.amap
-import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.runAllAsync
-import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.INFER_TYPE
-import com.lagradost.cloudstream3.utils.extractorApis
-import com.lagradost.cloudstream3.utils.getQualityFromName
-import com.lagradost.cloudstream3.utils.loadExtractor
-import com.lagradost.cloudstream3.utils.newExtractorLink
-import org.jsoup.Jsoup
-
-/**
- * overrideMainUrl is necessary for for other vidstream clones like vidembed.cc
- * If they diverge it'd be better to make them separate.
- * */
-class Vidstream(val mainUrl: String) {
-    val name: String = "Vidstream"
-
-    private fun getExtractorUrl(id: String): String {
-        return "$mainUrl/streaming.php?id=$id"
-    }
-
-    private fun getDownloadUrl(id: String): String {
-        return "$mainUrl/download?id=$id"
-    }
-
-    private val normalApis = arrayListOf(MultiQuality())
-
-    // https://gogo-stream.com/streaming.php?id=MTE3NDg5
-    suspend fun getUrl(
-        id: String,
-        isCasting: Boolean = false,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit,
-    ): Boolean {
-        val extractorUrl = getExtractorUrl(id)
-        runAllAsync(
-            {
-                normalApis.amap { api ->
-                    val url = api.getExtractorUrl(id)
-                    api.getSafeUrl(
-                        url,
-                        callback = callback,
-                        subtitleCallback = subtitleCallback
-                    )
-                }
-            }, {
-                /** Stolen from GogoanimeProvider.kt extractor */
-                val link = getDownloadUrl(id)
-                println("Generated vidstream download link: $link")
-                val page = app.get(link, referer = extractorUrl)
-
-                val pageDoc = Jsoup.parse(page.text)
-                val qualityRegex = Regex("(\\d+)P")
-
-                //a[download]
-                pageDoc.select(".dowload > a").amap { element ->
-                    val href = element.attr("href")
-                    val qual = if (element.text()
-                            .contains("HDP")
-                    ) "1080" else qualityRegex.find(element.text())?.destructured?.component1()
-                        .toString()
-
-                    if (!loadExtractor(href, link, subtitleCallback, callback)) {
-                        callback.invoke(
-                            newExtractorLink(
-                                this.name,
-                                name = this.name,
-                                href,
-                                type = INFER_TYPE
-                            ) {
-                                this.referer = page.url
-                                this.quality = getQualityFromName(qual)
-                            }
-                        )
-                    }
-                }
-            }, {
-                with(app.get(extractorUrl)) {
-                    val document = Jsoup.parse(this.text)
-                    val primaryLinks = document.select("ul.list-server-items > li.linkserver")
-                    //val extractedLinksList: MutableList<ExtractorLink> = mutableListOf()
-
-                    // All vidstream links passed to extractors
-                    primaryLinks.distinctBy { it.attr("data-video") }.forEach { element ->
-                        val link = element.attr("data-video")
-                        //val name = element.text()
-
-                        // Matches vidstream links with extractors
-                        extractorApis.filter { !it.requiresReferer || !isCasting }.amap { api ->
-                            if (link.startsWith(api.mainUrl)) {
-                                api.getSafeUrl(link, extractorUrl, subtitleCallback, callback)
-                            }
-                        }
-                    }
-                }
-            }
-        )
-        return true
-    }
-}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vtbe.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vtbe.kt
index 37b8ecb23..2fdd7082a 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vtbe.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vtbe.kt
@@ -1,15 +1,11 @@
 package com.lagradost.cloudstream3.extractors
 
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.utils.*
-import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import com.lagradost.cloudstream3.utils.JsUnpacker
+import com.lagradost.cloudstream3.extractors.helper.JwPlayerHelper
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.getQualityFromName
-import java.net.URI
+import com.lagradost.cloudstream3.utils.JsUnpacker
 
 
 open class Vtbe : ExtractorApi() {
@@ -17,23 +13,16 @@ open class Vtbe : ExtractorApi() {
     override var mainUrl = "https://vtbe.to"
     override val requiresReferer = true
 
-    override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
         val response = app.get(url,referer=mainUrl).document
-        val extractedpack =response.selectFirst("script:containsData(function(p,a,c,k,e,d))")?.data().toString()
+        val extractedpack = response.selectFirst("script:containsData(function(p,a,c,k,e,d))")?.data().toString()
         JsUnpacker(extractedpack).unpack()?.let { unPacked ->
-            Regex("sources:\\[\\{file:\"(.*?)\"").find(unPacked)?.groupValues?.get(1)?.let { link ->
-                return listOf(
-                    newExtractorLink(
-                        this.name,
-                        this.name,
-                        link,
-                    ) {
-                        this.referer = referer ?: ""
-                        this.quality = Qualities.Unknown.value
-                    }
-                )
-            }
+            JwPlayerHelper.extractStreamLinks(unPacked, name, mainUrl, callback, subtitleCallback)
         }
-        return null
     }
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/JWPlayerHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/JWPlayerHelper.kt
new file mode 100644
index 000000000..43ceb2314
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/JWPlayerHelper.kt
@@ -0,0 +1,155 @@
+package com.lagradost.cloudstream3.extractors.helper
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.Prerelease
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.newSubtitleFile
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.M3u8Helper
+import com.lagradost.cloudstream3.utils.newExtractorLink
+import kotlin.collections.orEmpty
+
+@Prerelease
+object JwPlayerHelper {
+    private val sourceRegex = Regex(""""?sources"?:\s*(\[.*?\])""")
+    private val tracksRegex = Regex(""""?tracks"?:\s*(\[.*?\])""")
+    private val m3u8Regex = Regex("""[:=]\s*\"([^\"\s]+(\.m3u8|master\.txt)[^\"\s]*)""")
+
+    /**
+     * Get stream links the "sources" attribute inside a JWPlayer script, e.g.
+     *
+     * ```js
+     * <script>
+     * jwplayer("vplayer").setup({
+     *     sources: [{file:"https://example.com/master.m3u8"}],
+     *     tracks: [{file: "https://example.com/subtitles.vtt", kind: "captions", label: "en"}],
+     * }
+     *  ```
+     *
+     *  @param script The content of a HTML <script> tag containing the jwplayer code.
+     *  @return whether any extractor or subtitle link was found
+     */
+    suspend fun extractStreamLinks(
+        script: String,
+        sourceName: String,
+        mainUrl: String,
+        callback: (ExtractorLink) -> Unit,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        headers: Map<String, String> = mapOf()
+    ): Boolean {
+        val sourceMatches = sourceRegex.findAll(script).flatMap { sourceMatch ->
+            val match = sourceMatch.groupValues[1]
+                .addMarks("file")
+                .addMarks("label")
+                .addMarks("type")
+            tryParseJson<List<Source>>(match).orEmpty()
+        }.toList()
+
+        var extractedLinks = sourceMatches.flatMap { link ->
+            if (link.file.contains(".m3u8")) {
+                try {
+                    M3u8Helper.generateM3u8(
+                        source = sourceName,
+                        streamUrl = link.file,
+                        referer = mainUrl,
+                        headers = headers
+                    )
+                } catch (e: Exception) {
+                    Log.d("JW_PLAYER_HELPER", "Error generating M3U8 links: ${e.message}")
+                    emptyList()
+                }
+            } else {
+                listOf(
+                    newExtractorLink(
+                        source = sourceName,
+                        name = sourceName,
+                        url = fixUrl(link.file, mainUrl),
+                    ) {
+                        this.referer = url
+                        this.headers = headers
+                    }
+                )
+            }
+        }
+
+        // Fallback to searching for HLS streams, e.g.
+        // var links = {
+        //  "hls3": "https://mmmmmmmmmm.qqqqqqqqqqqq.space/#########/hls3/01/00000/ggggggggg_l/master.txt",
+        //  "hls4": "/stream/zzzzzzzzzzzzzzz/hhhhhhhhhhh/123456789/123456/master.m3u8",
+        //  "hls2": "https://mmmmmmmmmm.qqqqqqqqqqqq.com/hls2/01/00000/ggggggggg_l/master.m3u8?t=##################&s=123456"
+        // };
+        // jwplayer("vplayer").setup({
+        //  sources: [{
+        //    file: links.hls4 || links.hls3 || links.hls2,
+        //    type: "hls"
+        //  }],
+        if (extractedLinks.isEmpty()) {
+            extractedLinks = m3u8Regex.findAll(script).toList().map { match ->
+                val link = match.groupValues[1]
+
+                newExtractorLink(
+                    source = sourceName,
+                    name = sourceName,
+                    url = fixUrl(link, mainUrl)
+                ) {
+                    this.referer = url
+                    this.headers = headers
+                }
+            }
+        }
+
+        val tracksMatches = tracksRegex.findAll(script).flatMap { trackMatch ->
+            val match = trackMatch.groupValues[1]
+                .addMarks("file")
+                .addMarks("label")
+                .addMarks("kind")
+            tryParseJson<List<Track>>(match).orEmpty()
+        }.toList()
+
+        val subtitleFiles =
+            tracksMatches.filter {
+                (it.kind.orEmpty().contains("caption") || it.kind.orEmpty()
+                    .contains("subtitle")) && it.file != null && it.label != null
+            }.map {
+                newSubtitleFile(
+                    lang = it.label!!,
+                    url = fixUrl(it.file!!, mainUrl)
+                )
+            }
+
+        extractedLinks.forEach { callback.invoke(it) }
+        subtitleFiles.forEach { subtitleCallback.invoke(it) }
+
+        return sourceMatches.isNotEmpty() || subtitleFiles.isNotEmpty()
+    }
+
+    fun canParseJwScript(script: String): Boolean {
+        return sourceRegex.containsMatchIn(script)
+    }
+
+    private fun fixUrl(url: String, mainUrl: String): String {
+        return when {
+            url.startsWith("/") -> mainUrl + url
+            url.startsWith("http") -> url
+            else -> "$mainUrl/$url"
+        }
+    }
+
+    private fun String.addMarks(str: String): String {
+        return this.replace(Regex("\"?$str\"?"), "\"$str\"")
+    }
+
+    private data class Source(
+        @JsonProperty("file") val file: String,
+        @JsonProperty("label") val label: String?,
+        @JsonProperty("type") val type: String?,
+    )
+
+    data class Track(
+        @JsonProperty("file") val file: String? = null,
+        @JsonProperty("label") val label: String? = null,
+        @JsonProperty("kind") val kind: String? = null,
+    )
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 1fd39943c..ab80cf2ca 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -135,7 +135,6 @@ import com.lagradost.cloudstream3.extractors.Mediafire
 import com.lagradost.cloudstream3.extractors.Megacloud
 import com.lagradost.cloudstream3.extractors.Meownime
 import com.lagradost.cloudstream3.extractors.MetaGnathTuggers
-import com.lagradost.cloudstream3.extractors.Minoplres
 import com.lagradost.cloudstream3.extractors.MixDrop
 import com.lagradost.cloudstream3.extractors.MixDropAg
 import com.lagradost.cloudstream3.extractors.MixDropBz
@@ -1088,7 +1087,6 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     Vido(),
     Linkbox(),
     Acefile(),
-    Minoplres(), // formerly SpeedoStream
     Embedgram(),
     Mvidoo(),
     Streamplay(),

From 1d750340a0aa1618bfe386e2f16058be860a0e29 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Fri, 24 Apr 2026 16:22:17 -0600
Subject: [PATCH 085/177] Fix some typos in singular (#2721)

---
 .../lagradost/cloudstream3/ui/player/PlayerPipHelper.kt   | 2 +-
 .../lagradost/cloudstream3/ui/result/ResultViewModel2.kt  | 8 ++++----
 app/src/main/res/values-b+apc/strings.xml                 | 8 ++++----
 app/src/main/res/values-b+ar/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+as/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+az/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+bg/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+cs/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+de/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+el/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+es/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+fa/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+fr/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+gl/strings.xml                  | 4 ++--
 app/src/main/res/values-b+hi/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+hr/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+hu/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+in/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+it/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+ja/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+ko/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+lv/strings.xml                  | 6 +++---
 app/src/main/res/values-b+mk/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+ms/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+nl/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+pl/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+pt+BR/strings.xml               | 8 ++++----
 app/src/main/res/values-b+pt/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+qt/strings.xml                  | 4 ++--
 app/src/main/res/values-b+ro/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+ru/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+sk/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+sv/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+ta/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+tr/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+uk/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+ur/strings.xml                  | 6 +++---
 app/src/main/res/values-b+vi/strings.xml                  | 8 ++++----
 app/src/main/res/values-b+zh+TW/strings.xml               | 8 ++++----
 app/src/main/res/values-b+zh/strings.xml                  | 8 ++++----
 app/src/main/res/values-be/strings.xml                    | 8 ++++----
 app/src/main/res/values-ca/strings.xml                    | 6 +++---
 app/src/main/res/values-sq/strings.xml                    | 8 ++++----
 app/src/main/res/values/strings.xml                       | 8 ++++----
 44 files changed, 166 insertions(+), 166 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt
index 343155808..0db06499e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerPipHelper.kt
@@ -128,7 +128,7 @@ object PlayerPipHelper {
             getRemoteAction(
                 activity,
                 R.drawable.baseline_headphones_24,
-                R.string.audio_singluar,
+                R.string.audio_singular,
                 CSPlayerEvent.PlayAsAudio
             )
         )
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index cc48f6549..d5f4d42a6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -295,11 +295,11 @@ fun LoadResponse.toResultData(repo: APIRepository): ResultData {
                 TvType.Live -> R.string.live_singular
                 TvType.Others -> R.string.other_singular
                 TvType.NSFW -> R.string.nsfw_singular
-                TvType.Music -> R.string.music_singlar
+                TvType.Music -> R.string.music_singular
                 TvType.AudioBook -> R.string.audio_book_singular
-                TvType.CustomMedia -> R.string.custom_media_singluar
-                TvType.Audio -> R.string.audio_singluar
-                TvType.Podcast -> R.string.podcast_singluar
+                TvType.CustomMedia -> R.string.custom_media_singular
+                TvType.Audio -> R.string.audio_singular
+                TvType.Podcast -> R.string.podcast_singular
             }
         ),
         yearText = txt(year?.toString()),
diff --git a/app/src/main/res/values-b+apc/strings.xml b/app/src/main/res/values-b+apc/strings.xml
index 365a317e3..3bf88ce13 100644
--- a/app/src/main/res/values-b+apc/strings.xml
+++ b/app/src/main/res/values-b+apc/strings.xml
@@ -603,9 +603,9 @@
     <string name="battery_dialog_title">وقف اپتميزايشن بطارية جهازك</string>
     <string name="app_unrestricted_toast">بطارية الآپ اصلًا محطوطة ع «غير مقيد» \"Unrestricted\"</string>
     <string name="app_info_intent_error">م قدرنا نفتح معلومات الآپ تبع \"كلود ستريم\".</string>
-    <string name="music_singlar">موسيقى</string>
+    <string name="music_singular">موسيقى</string>
     <string name="audio_book_singular">أوديو بوك</string>
-    <string name="custom_media_singluar">الميديا</string>
+    <string name="custom_media_singular">الميديا</string>
     <string name="battery_dialog_message">ت تضمن عدم انقطاع التنزيلات والنوتيفيكايشنات للبرامج التلفزيونية يللي مشتركلها، الآپ \"كلود ستريم\" بده إذن ليمشي ب الباكگراوند. ازا كبست أوكي، رح يفتح شباك إذن زغير، كبوس «سماح».\n\nملاحظة إنو هيدا الإذن ما بيعني إنو \"كلود ستريم 3\" رح تستنزف البطارية. ومش رح يشتغل الآپ بال باكگراوند إلّا عند الضرورة، متل لمّا تتلقا نوتيفيكايشن أو تنزل ڤيديو من الريپو الاصلي.</string>
     <string name="reset_btn">ريسات</string>
     <string name="episode_upcoming_format" formatted="true">رح ينزل ب %s</string>
@@ -660,8 +660,8 @@
     <string name="custom">حدد غير محل</string>
     <string name="torrent_info">هيدا الڤيديو تورينت. هيدا بيعني إنه فيه ينعمله تراك، يعني بينعرف شو عم تحضر.\nإزا م بتعرف شو التورينت، م تستعمله.</string>
     <string name="subs_edge_size">حجم الحفّة</string>
-    <string name="podcast_singluar">پودكاست</string>
-    <string name="audio_singluar">صوت</string>
+    <string name="podcast_singular">پودكاست</string>
+    <string name="audio_singular">صوت</string>
     <string name="unsupported_error">أرور، مش مدعوم</string>
     <string name="encoding_error">أرور بال إنكودينگ</string>
     <string name="player_load_one_subtitle_online">أفّي اللودينگ تلقائيًا</string>
diff --git a/app/src/main/res/values-b+ar/strings.xml b/app/src/main/res/values-b+ar/strings.xml
index 158748bbf..f7186c0ef 100644
--- a/app/src/main/res/values-b+ar/strings.xml
+++ b/app/src/main/res/values-b+ar/strings.xml
@@ -613,8 +613,8 @@
     <string name="audio_book_singular">كتاب صوتي</string>
     <string name="ok">حسناً</string>
     <string name="battery_dialog_message">لضمان عدم انقطاع التنزيلات والإشعارات للعروض التلفزيونية التي اشتركت بها ، يحتاج CloudStream إلى إذن للتشغيل في الخلفية. بالضغط على \"موافق\"، سيظهر لك مربع حوار طلب. يُرجى الضغط على \"السماح\".\n\nيرجى ملاحظة أن هذا الإذن لا يعني أن CS3 سيستنزف بطاريتك. سيعمل في الخلفية فقط عند الضرورة، مثلا عند تلقي الإشعارات أو تنزيل مقاطع الفيديو من الإضافات الرسمية.</string>
-    <string name="music_singlar">موسيقى</string>
-    <string name="custom_media_singluar">الوسائط</string>
+    <string name="music_singular">موسيقى</string>
+    <string name="custom_media_singular">الوسائط</string>
     <string name="reset_btn">اعادة تعيين</string>
     <string name="episode_upcoming_format" formatted="true">قادم خلال %s</string>
     <string name="next_season_episode_format" formatted="true">سيتم إصدار الحلقة %1$d من الموسم %2$d في</string>
@@ -668,8 +668,8 @@
     <string name="custom">مخصص</string>
     <string name="torrent_info">هذا الفيديو موجود على شبكة تورنت، مما يعني ان الاستخدام يمكن تعقبه.\nتأكد من فهم شبكات التورنت قبل الاستكمال.</string>
     <string name="subs_edge_size">حجم الحافة</string>
-    <string name="audio_singluar">صوت</string>
-    <string name="podcast_singluar">بودكاست</string>
+    <string name="audio_singular">صوت</string>
+    <string name="podcast_singular">بودكاست</string>
     <string name="encoding_error">خطأ في التكويد</string>
     <string name="unsupported_error">خطأ في الدعم</string>
     <string name="player_load_one_subtitle_online">تحميل أول ترجمة متاحة</string>
diff --git a/app/src/main/res/values-b+as/strings.xml b/app/src/main/res/values-b+as/strings.xml
index f5338a9e5..16be7e313 100644
--- a/app/src/main/res/values-b+as/strings.xml
+++ b/app/src/main/res/values-b+as/strings.xml
@@ -76,7 +76,7 @@
     <string name="profile_number">প্ৰ\'ফাইল %d</string>
     <string name="enter_pin">পিন সন্নিবিষ্ট কৰক</string>
     <string name="edit_account">একাউণ্ট সম্পাদনা কৰক</string>
-    <string name="custom_media_singluar">মিডিয়া</string>
+    <string name="custom_media_singular">মিডিয়া</string>
     <string name="reset_btn">ৰিচেট কৰক</string>
     <string name="cast_format" formatted="true">Cast: %s</string>
     <string name="type_watching">দেখি আছে</string>
@@ -97,7 +97,7 @@
     <string name="biometric_authentication_title">CloudStream আনলক কৰক</string>
     <string name="biometric_setting">বায়\'মেট্ৰিক্সৰ সৈতে লক কৰক</string>
     <string name="password_pin_authentication_title">পাছৱাৰ্ড/পিন প্ৰমাণীকৰণ</string>
-    <string name="music_singlar">সংগীত</string>
+    <string name="music_singular">সংগীত</string>
     <string name="audio_book_singular">অডিঅ\' বুক</string>
     <string name="next_episode_format" formatted="true">Episode %d will be released in</string>
     <string name="next_season_episode_format" formatted="true">Season %1$d Episode %2$d will be released in</string>
@@ -656,8 +656,8 @@
     <string name="torrent_info">এই ভিডিওটো টৰেন্ট। এই অৰ্থ হৈছে যে আপোনাৰ ভিডিও কাৰ্যকলাপ ট্ৰেক কৰা হ\'ব পাৰে।\nআগবঢ়িবলৈ আগতে টৰেণ্টিং বুজি পোৱা নিশ্চিত কৰক।</string>
     <string name="subs_edge_size">চুকৰ মাপ</string>
     <string name="player_load_one_subtitle_online">প্ৰথম উপলব্ধটো লোড কৰক</string>
-    <string name="audio_singluar">অডিঅ\'</string>
-    <string name="podcast_singluar">প’ডকাষ্ট</string>
+    <string name="audio_singular">অডিঅ\'</string>
+    <string name="podcast_singular">প’ডকাষ্ট</string>
     <string name="encoding_error">এনকোডিং ত্ৰুটি</string>
     <string name="unsupported_error">সমৰ্থিত ত্ৰুটি</string>
     <string name="torrent_not_accepted">গ্ৰহণ কৰা হোৱা নাই টৰেণ্ট</string>
diff --git a/app/src/main/res/values-b+az/strings.xml b/app/src/main/res/values-b+az/strings.xml
index ffbd9d37d..b8a1f9e2e 100644
--- a/app/src/main/res/values-b+az/strings.xml
+++ b/app/src/main/res/values-b+az/strings.xml
@@ -118,7 +118,7 @@
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Sənədli film</string>
     <string name="storage_error">Yükləmə xətası, yaddaş icazələrini yoxlayın</string>
-    <string name="custom_media_singluar">Media</string>
+    <string name="custom_media_singular">Media</string>
     <string name="encoding_error">Kodlama xətası</string>
     <string name="cartoons">Cizgi filmləri</string>
     <string name="anime">Anime-lər</string>
@@ -135,10 +135,10 @@
     <string name="live_singular">Canlı yayım</string>
     <string name="nsfw_singular">+18 məzmun</string>
     <string name="other_singular">Video</string>
-    <string name="music_singlar">Musiqi</string>
+    <string name="music_singular">Musiqi</string>
     <string name="audio_book_singular">Səsli Kitab</string>
-    <string name="audio_singluar">Səs</string>
-    <string name="podcast_singluar">Podkast</string>
+    <string name="audio_singular">Səs</string>
+    <string name="podcast_singular">Podkast</string>
     <string name="source_error">Mənbə xətası</string>
     <string name="remote_error">Server xətası</string>
     <string name="unsupported_error">Dəstəklənməyən xəta</string>
diff --git a/app/src/main/res/values-b+bg/strings.xml b/app/src/main/res/values-b+bg/strings.xml
index 6c8e38722..e59f19462 100644
--- a/app/src/main/res/values-b+bg/strings.xml
+++ b/app/src/main/res/values-b+bg/strings.xml
@@ -645,8 +645,8 @@
     <string name="starting_plugin_update_manually">Започва процесът на актуализация на плъгините!</string>
     <string name="player_load_one_subtitle_online">Зареди първия наличен</string>
     <string name="no_subtitles_loaded">Няма заредени субтитри още</string>
-    <string name="audio_singluar">Звук</string>
-    <string name="podcast_singluar">Подкаст</string>
+    <string name="audio_singular">Звук</string>
+    <string name="podcast_singular">Подкаст</string>
     <string name="auth_locally">Автентикация локално</string>
     <string name="biometric_setting">Заключване с биометрия</string>
     <string name="open_downloaded_repo">Отвори хранилище</string>
@@ -654,7 +654,7 @@
     <string name="device_pin_expired_message">PIN кодът е изтекъл !</string>
     <string name="cs3wiki">CloudStream Уики</string>
     <string name="password_pin_authentication_title">Удостоверяване с парола/PIN</string>
-    <string name="custom_media_singluar">Медия</string>
+    <string name="custom_media_singular">Медия</string>
     <string name="audio_book_singular">Аудиокнига</string>
     <string name="dismiss">Отхвърли</string>
     <string name="biometric_setting_summary">Отключете приложението с отпечатък, Face ID, PIN, шаблон или парола.</string>
@@ -682,7 +682,7 @@
     <string name="device_pin_url_message">Посетете <b>%s</b> на вашия смартфон или компютър и въведете горния код</string>
     <string name="device_pin_counter_text">Кодът изтича след %1$dm %2$ds</string>
     <string name="player_settings_select_cast_device">Изберете устройство за излъчване</string>
-    <string name="music_singlar">Музика</string>
+    <string name="music_singular">Музика</string>
     <string name="favorite">Любим</string>
     <string name="battery_dialog_message">За да гарантираме непрекъснати изтегляния и известия за абонирани телевизионни шоута, CloudStream се нуждае от разрешение да работи в фонов режим. Като натиснете ДОБРЕ, ще видите диалогов прозорец с искане. Моля, натиснете \"Позволи\".\n\nМоля, имайте предвид, че това разрешение не означава, че CS3 ще изтощава батерията ви. То ще работи във фонов режим само когато е необходимо, като например при получаване на известия или изтегляне на видеоклипове от официални разширения.</string>
     <string name="qr_image">Изображение на QR код</string>
diff --git a/app/src/main/res/values-b+cs/strings.xml b/app/src/main/res/values-b+cs/strings.xml
index 71ddc8697..2ee23c1c5 100644
--- a/app/src/main/res/values-b+cs/strings.xml
+++ b/app/src/main/res/values-b+cs/strings.xml
@@ -612,8 +612,8 @@
     <string name="ok">OK</string>
     <string name="app_unrestricted_toast">Využití baterie aplikací je již nastaveno na neomezené</string>
     <string name="app_info_intent_error">Nepodařilo se otevřít informace o aplikaci CloudStream.</string>
-    <string name="music_singlar">Hudba</string>
-    <string name="custom_media_singluar">Média</string>
+    <string name="music_singular">Hudba</string>
+    <string name="custom_media_singular">Média</string>
     <string name="battery_dialog_title">Zakažte optimalizace baterie</string>
     <string name="battery_dialog_message">Aby bylo zajištěno nepřetržité stahování a upozornění na odebírané seriály, potřebuje aplikace CloudStream povolení ke spuštění na pozadí. Po stisknutí tlačítka OK se vám zobrazí dialog se žádostí. Stiskněte prosím „Povolit“.\n\nUpozorňujeme, že toto oprávnění neznamená, že CS3 bude vybíjet baterii. Na pozadí bude pracovat pouze v případě potřeby, například při přijímání oznámení nebo stahování videí z oficiálních rozšíření.</string>
     <string name="audio_book_singular">Audiokniha</string>
@@ -670,8 +670,8 @@
     <string name="custom">Vlastní</string>
     <string name="torrent_info">Toto video je torrent, což znamená, že lze sledovat vaší aktivitu v něm.\nPřed pokračováním se ujistěte, že chápete, co to je torrentování.</string>
     <string name="subs_edge_size">Velikost okraje</string>
-    <string name="audio_singluar">Zvuk</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Zvuk</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="encoding_error">Chyba kódování</string>
     <string name="unsupported_error">Nepodporovaná chyba</string>
     <string name="player_load_one_subtitle_online">Načíst první dostupné</string>
diff --git a/app/src/main/res/values-b+de/strings.xml b/app/src/main/res/values-b+de/strings.xml
index dfcf97ce2..eb939ec5e 100644
--- a/app/src/main/res/values-b+de/strings.xml
+++ b/app/src/main/res/values-b+de/strings.xml
@@ -596,9 +596,9 @@
     <string name="repo_copy_label">Repository Name und URL</string>
     <string name="ok">OK</string>
     <string name="battery_dialog_title">Akku-Optimierung deaktivieren</string>
-    <string name="music_singlar">Musik</string>
+    <string name="music_singular">Musik</string>
     <string name="audio_book_singular">Hörbuch</string>
-    <string name="custom_media_singluar">Medien</string>
+    <string name="custom_media_singular">Medien</string>
     <string name="reset_btn">Zurücksetzen</string>
     <string name="app_unrestricted_toast">Akkuverbrauch der App ist bereits auf unbeschränkt eingestellt</string>
     <string name="app_info_intent_error">CloudStreams App-Info kann nicht geöffnet werden.</string>
@@ -655,7 +655,7 @@
     <string name="dont_show">Nicht anzeigen</string>
     <string name="subs_edge_size">Kantengröße</string>
     <string name="torrent_info">Dieses Video ist ein Torrent, das bedeutet, dass Ihre Videoaktivitäten nachverfolgt werden könen.\nStellen Sie sicher, dass Sie die Grundlagen von Torrents verstehen, bevor Sie fortfahren.</string>
-    <string name="audio_singluar">Ton</string>
+    <string name="audio_singular">Ton</string>
     <string name="sort_episodes_number_desc">Episode (Absteigend)</string>
     <string name="sort_episodes_rating_high_low">Bewertung (Höchste)</string>
     <string name="sort_episodes_rating_low_high">Bewertung (Niedrigste)</string>
@@ -669,7 +669,7 @@
     <string name="update_plugins">Plugins aktualisieren</string>
     <string name="plugins_updated_manually">%d Plugin(s) erfolgreich aktualisiert!</string>
     <string name="update_plugins_manually">Plugins manuell aktualisieren</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="unsupported_error">Nicht unterstützter Fehler</string>
     <string name="encoding_error">Kodierungsfehler</string>
     <string name="sort_button_episode">Ep %s</string>
diff --git a/app/src/main/res/values-b+el/strings.xml b/app/src/main/res/values-b+el/strings.xml
index 6839d9944..4a53c4e58 100644
--- a/app/src/main/res/values-b+el/strings.xml
+++ b/app/src/main/res/values-b+el/strings.xml
@@ -604,9 +604,9 @@
     <string name="biometric_prompt_description">Μετά από μερικές αποτυχημένες προσπάθειες, η άμεση θα κλείσει. Απλά επανεκκινήστε την εφαρμογή για να δοκιμάσετε ξανά.</string>
     <string name="edit_account">Επεξεργασία λογαριασμού</string>
     <string name="skip_startup_account_select_pref">Παράλειψη επιλογής λογαριασμού στην εκκίνηση της εφαρμογής</string>
-    <string name="music_singlar">Μουσική</string>
+    <string name="music_singular">Μουσική</string>
     <string name="audio_book_singular">Ακουστικό Βιβλίο</string>
-    <string name="custom_media_singluar">Μέσα</string>
+    <string name="custom_media_singular">Μέσα</string>
     <string name="reset_btn">Επαναφορά</string>
     <string name="biometric_warning">Τα δεδομένα σας στο CloudStream έχουν κάνει back up. Αν και η πιθανότητα είναι πολύ χαμηλή, όλες οι συσκευές συμπεριφέρονται διαφορετικά. Στη σπάνια περίπτωση, που απαγορευτεί η πρόσβασή σας από την εφαρμογή, διαγράψτε τα δεδομένα εφαρμογής και επαναφέρετέ τα από ένα ήδη υπάρχον backup. Συγνώμη για οποιαδήποτε ταλαιπωρία.</string>
     <string name="pref_category_accounts">Λογαριασμοί</string>
@@ -671,8 +671,8 @@
     <string name="open_local_video">Άνοιγμα τοπικού βίντεο</string>
     <string name="no_plugins_updated_manually">Κανένα πρόσθετο δεν ενημερώθηκε.</string>
     <string name="backup_path_title">Τοποθεσία φακέλου αντιγράφων</string>
-    <string name="audio_singluar">Ήχος</string>
-    <string name="podcast_singluar">Ποντκάστ</string>
+    <string name="audio_singular">Ήχος</string>
+    <string name="podcast_singular">Ποντκάστ</string>
     <string name="encoding_error">Σφάλμα κωδικοποίησης</string>
     <string name="unsupported_error">Σφάλμα που δεν υποστηρίζεται</string>
     <string name="player_load_one_subtitle_online">Φορτώστε το πρώτο διαθέσιμο</string>
diff --git a/app/src/main/res/values-b+es/strings.xml b/app/src/main/res/values-b+es/strings.xml
index e692ecc4a..1801d39a2 100644
--- a/app/src/main/res/values-b+es/strings.xml
+++ b/app/src/main/res/values-b+es/strings.xml
@@ -591,10 +591,10 @@
     <string name="clipboard_permission_error">Error al acceder al portapapeles. Inténtelo de nuevo.</string>
     <string name="ok">De acuerdo</string>
     <string name="battery_dialog_title">Desactivar optimización de batería</string>
-    <string name="music_singlar">Música</string>
+    <string name="music_singular">Música</string>
     <string name="app_unrestricted_toast">El uso de la batería de la aplicación está configurado sin restricciones</string>
     <string name="app_info_intent_error">No se puede abrir la información de la aplicación CloudStream.</string>
-    <string name="custom_media_singluar">Media</string>
+    <string name="custom_media_singular">Media</string>
     <string name="audio_book_singular">Audiolibro</string>
     <string name="battery_dialog_message">Para garantizar las notificaciones y descargas sin interrupciones de programas de TV suscritos, CloudStream necesita permiso para ejecutarse en segundo plano. Al presionar Aceptar, se abrirá la información de la aplicación. Presione «Permitir».\n\nTenga en cuenta que este permiso no significa que CS3 consumirá la batería. Solo funcionará en segundo plano cuando es necesario, como cuando se reciben notificaciones o se descargan vídeos desde extensiones oficiales.</string>
     <string name="reset_btn">Reset</string>
@@ -650,8 +650,8 @@
     <string name="custom">Personalizada</string>
     <string name="torrent_info">Este video está en una red de torrents, lo que significa que se puede rastrear su uso.\nAsegúrese de comprender las redes de torrents antes de continuar.</string>
     <string name="subs_edge_size">Tamaño del borde</string>
-    <string name="podcast_singluar">Podcast</string>
-    <string name="audio_singluar">Audio</string>
+    <string name="podcast_singular">Podcast</string>
+    <string name="audio_singular">Audio</string>
     <string name="encoding_error">Error de codificación</string>
     <string name="unsupported_error">Error no soportado</string>
     <string name="player_load_one_subtitle_online">Cargar primero disponible</string>
diff --git a/app/src/main/res/values-b+fa/strings.xml b/app/src/main/res/values-b+fa/strings.xml
index da6f04d8e..5fa557f08 100644
--- a/app/src/main/res/values-b+fa/strings.xml
+++ b/app/src/main/res/values-b+fa/strings.xml
@@ -263,7 +263,7 @@
     <string name="storage_error">خطای دانلود، دسترسی به حافظه را چک کنید</string>
     <string name="resolution">کیفیت</string>
     <string name="resolution_and_title">کیفیت و عنوان</string>
-    <string name="custom_media_singluar">محتوا</string>
+    <string name="custom_media_singular">محتوا</string>
     <string name="double_tap_to_seek_amount_settings">مقدار جلورفتن پخش‌کننده</string>
     <string name="no_repository_found_error">مخزن پیدا نشد، نشانی را چک کنید و فیلترشکن را امتحان کنید</string>
     <string name="example_lang_name">کد زبان (انگلیسی)</string>
@@ -320,10 +320,10 @@
     <string name="ova_singular">انیمه خانگی</string>
     <string name="live_singular">پخش زنده</string>
     <string name="nsfw_singular">مثبت ۱۸ سال</string>
-    <string name="music_singlar">موسیقی</string>
+    <string name="music_singular">موسیقی</string>
     <string name="audio_book_singular">کتاب صوتی</string>
-    <string name="audio_singluar">صدا</string>
-    <string name="podcast_singluar">پادکست</string>
+    <string name="audio_singular">صدا</string>
+    <string name="podcast_singular">پادکست</string>
     <string name="episode_action_play_in_app">پخش کردن در برنامه</string>
     <string name="episode_action_auto_download">دانلود اتوماتیک</string>
     <string name="no_update_found">هیچ آپدیتی پیدا نشد</string>
diff --git a/app/src/main/res/values-b+fr/strings.xml b/app/src/main/res/values-b+fr/strings.xml
index 10b8cf9ef..34bf1393d 100644
--- a/app/src/main/res/values-b+fr/strings.xml
+++ b/app/src/main/res/values-b+fr/strings.xml
@@ -587,7 +587,7 @@
     <string name="battery_dialog_title">Désactiver l\'optimisation de la batterie</string>
     <string name="app_info_intent_error">Impossible d\'ouvrir les informations de l\'application CloudStream.</string>
     <string name="biometric_authentication_title">Déverrouiller CloudStream</string>
-    <string name="music_singlar">Musique</string>
+    <string name="music_singular">Musique</string>
     <string name="resume_remaining" formatted="true">%s \nrestants</string>
     <string name="clipboard_permission_error">Erreur d\'accès au presse-papiers, veuillez réessayer.</string>
     <string name="ok">OK</string>
@@ -600,7 +600,7 @@
     <string name="battery_dialog_message">Pour garantir des téléchargements ininterrompus et des notifications pour les émissions de télévision auxquelles vous êtes abonné, CloudStream a besoin d\'une autorisation pour fonctionner en arrière-plan. En appuyant sur OK, une boite de dialogue sera affiché. Appuyé sur \'autoriser\'.\n\nVeuillez noter que cette autorisation ne signifie pas que CS3 épuisera votre batterie. Il ne fonctionnera en arrière-plan que lorsque cela sera nécessaire, par exemple lors de la réception de notifications ou du téléchargement de vidéos à partir d\'extensions officielles.</string>
     <string name="app_unrestricted_toast">L\'utilisation de la batterie de l\'application est déjà réglée sur illimitée</string>
     <string name="unfavorite">Supprimer des favoris</string>
-    <string name="custom_media_singluar">Média</string>
+    <string name="custom_media_singular">Média</string>
     <string name="reset_btn">Réinitialiser</string>
     <string name="episode_upcoming_format" formatted="true">À venir dans %s</string>
     <string name="biometric_setting">Verrouillage biométrique</string>
@@ -654,8 +654,8 @@
     <string name="torrent_preferred_media">Activer les torrents dans Paramètres/Sources/Média préféré</string>
     <string name="torrent_not_accepted">Redémarrez l\'application et acceptez la fenêtre contextuelle Stream Torrent pour continuer.</string>
     <string name="player_load_one_subtitle_online">Charger le premier disponible</string>
-    <string name="audio_singluar">Audio</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="sort_button_episode">Ép %s</string>
     <string name="sort_button_rating">Note %s</string>
     <string name="sort_button_date">Date %s</string>
diff --git a/app/src/main/res/values-b+gl/strings.xml b/app/src/main/res/values-b+gl/strings.xml
index 1b8f068e3..ede5fd0dc 100644
--- a/app/src/main/res/values-b+gl/strings.xml
+++ b/app/src/main/res/values-b+gl/strings.xml
@@ -186,7 +186,7 @@
     <string name="delete_message_multiple" formatted="true">Está seguro de querer borrar permanentemente os seguintes elementos?\n\n%s</string>
     <string name="delete_message" formatted="true">Esto borrarase %s permanentemente\nEstás seguro?</string>
     <string name="cartoons_singular">Debuxo animado</string>
-    <string name="custom_media_singluar">Media</string>
+    <string name="custom_media_singular">Media</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="cartoons">Debuxos animados</string>
     <string name="render_error">Erro do renderizador</string>
@@ -204,7 +204,7 @@
     <string name="video_source">Fonte</string>
     <string name="unexpected_error">Erro inesperado do reproductor</string>
     <string name="episode">Capítulo</string>
-    <string name="music_singlar">Música</string>
+    <string name="music_singular">Música</string>
     <string name="episode_short">C</string>
     <string name="resume_time_left" formatted="true">%dm\nrestantes</string>
     <string name="status_ongoing">En curso</string>
diff --git a/app/src/main/res/values-b+hi/strings.xml b/app/src/main/res/values-b+hi/strings.xml
index d3f257679..c9030a00a 100644
--- a/app/src/main/res/values-b+hi/strings.xml
+++ b/app/src/main/res/values-b+hi/strings.xml
@@ -254,7 +254,7 @@
     <string name="episode_sync_settings_des">अपने वर्तमान प्रकरण की प्रगति को स्वचालित रूप से समकालीन बनाएं</string>
     <string name="show_fillers_settings">एनीमे के लिए पूरक प्रकरण दिखाएं</string>
     <string name="backup_success">आंकड़े संगृहीत हो गए</string>
-    <string name="music_singlar">संगीत</string>
+    <string name="music_singular">संगीत</string>
     <string name="torrent_info">यह वीडियो एक टॉरेंट है, इसका मतलब यह है कि आपकी वीडियो गतिविधि पर नजर रखी जा सकती है।\nजारी रखने से पहले सुनिश्चित करें कि आप टोरेंटिंग को समझते है।</string>
     <string name="double_tap_to_pause_settings_des">रोकने के लिए बीच में दो बार टैप करें</string>
     <string name="episode_sync_settings">देखा हुआ प्रोग्रेस अपडेट करें</string>
@@ -309,7 +309,7 @@
     <string name="episode_action_download_subtitle">उपशीर्षक डाउनलोड करें</string>
     <string name="show_title">शीर्षक</string>
     <string name="library">लाइब्रेरी</string>
-    <string name="custom_media_singluar">मीडिया</string>
+    <string name="custom_media_singular">मीडिया</string>
     <string name="pref_filter_search_quality">खोज परिणामों में चयनित वीडियो गुणवत्ता छुपाएं</string>
     <string name="episodes_range">%1$d-%2$d</string>
     <string name="action_open_play">@string/home_play</string>
@@ -326,8 +326,8 @@
     <string name="apk_installer_settings">APK इंस्टॉलर</string>
     <string name="apk_installer_settings_des">कुछ डिवाइस नए पैकेज इंस्टॉलर को सपोर्ट नहीं करते हैं। यदि अपडेट इंस्टॉल नहीं होते हैं, तो पुराने विकल्प को आज़माएं।</string>
     <string name="subs_default_reset_toast">डिफ़ॉल्ट मान पर रीसेट करें</string>
-    <string name="audio_singluar">ऑडियो</string>
-    <string name="podcast_singluar">पॉडकास्ट</string>
+    <string name="audio_singular">ऑडियो</string>
+    <string name="podcast_singular">पॉडकास्ट</string>
     <string name="render_error">रेंडरर त्रुटि</string>
     <string name="encoding_error">एन्कोडिंग त्रुटि</string>
     <string name="unsupported_error">एरर क्योंकि सपोर्टेड नहीं</string>
diff --git a/app/src/main/res/values-b+hr/strings.xml b/app/src/main/res/values-b+hr/strings.xml
index c629c492f..c2c0379f5 100644
--- a/app/src/main/res/values-b+hr/strings.xml
+++ b/app/src/main/res/values-b+hr/strings.xml
@@ -606,12 +606,12 @@
     <string name="ok">U redu</string>
     <string name="battery_dialog_title">Deaktiviraj optimizaciju baterije</string>
     <string name="audio_book_singular">Audio knjiga</string>
-    <string name="custom_media_singluar">Medij</string>
+    <string name="custom_media_singular">Medij</string>
     <string name="app_unrestricted_toast">Korištenje baterije aplikacije već je postavljeno na neograničeno</string>
     <string name="app_info_intent_error">Neuspjelo otvaranje podataka CloudStream aplikacije.</string>
     <string name="favorite">Favorit</string>
     <string name="unfavorite">Ukloni iz favorita</string>
-    <string name="music_singlar">Glazba</string>
+    <string name="music_singular">Glazba</string>
     <string name="reset_btn">Obnovi</string>
     <string name="biometric_setting_summary">Otključaj aplikaciju pomoću otiska prsta, ID-a lica, PIN-a, uzorka i lozinke.</string>
     <string name="episode_upcoming_format" formatted="true">Sljedeća u %s</string>
@@ -675,8 +675,8 @@
     <string name="torrent_info">Ovaj je video Torrent, što znači da se tvoja video aktivnost može pratiti.\nInformiraj se o korištenju Torrenta prije nego što nastaviš.</string>
     <string name="torrent_not_accepted">Ponovno pokrenite aplikaciju i prihvatite skočni prozor Stream Torrent za nastavak.</string>
     <string name="player_load_one_subtitle_online">Učitaj prvi dostupni</string>
-    <string name="audio_singluar">Audio</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="torrent_preferred_media">Aktiviraj torrent u Postavke/Pružatelji usluge/Preferirani mediji</string>
     <string name="sort_episodes_number_asc">Epizoda (Uzlazno)</string>
     <string name="sort_episodes_number_desc">Epizoda (Silazno)</string>
diff --git a/app/src/main/res/values-b+hu/strings.xml b/app/src/main/res/values-b+hu/strings.xml
index bffc0a86a..c50b18133 100644
--- a/app/src/main/res/values-b+hu/strings.xml
+++ b/app/src/main/res/values-b+hu/strings.xml
@@ -612,11 +612,11 @@
     <string name="delete_files">Fájlok törlése</string>
     <string name="delete_message_series_only" formatted="true">Biztosan törölni szeretné az alábbi sorozat összes megjelenését?\n\n%s</string>
     <string name="resume_remaining" formatted="true">%s \nmaradék</string>
-    <string name="music_singlar">Zene</string>
+    <string name="music_singular">Zene</string>
     <string name="audio_book_singular">Hangoskönyv</string>
-    <string name="custom_media_singluar">Média</string>
-    <string name="audio_singluar">Hang</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="custom_media_singular">Média</string>
+    <string name="audio_singular">Hang</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="encoding_error">Kódolási hiba</string>
     <string name="unsupported_error">Hiba nem támogatott</string>
     <string name="delete_format" formatted="true">Törlés (%1$d | %2$s)</string>
diff --git a/app/src/main/res/values-b+in/strings.xml b/app/src/main/res/values-b+in/strings.xml
index 830972586..9c4c7fc11 100644
--- a/app/src/main/res/values-b+in/strings.xml
+++ b/app/src/main/res/values-b+in/strings.xml
@@ -605,9 +605,9 @@
     <string name="battery_dialog_title">Nonaktifkan optimasi baterai</string>
     <string name="app_unrestricted_toast">Pemakaian baterai untuk aplikasi ini sudah diatur menjadi tidak dibatasi</string>
     <string name="app_info_intent_error">Gagal membuka info aplikasi CloudStream.</string>
-    <string name="music_singlar">Musik</string>
+    <string name="music_singular">Musik</string>
     <string name="audio_book_singular">Buku Audio</string>
-    <string name="custom_media_singluar">Media</string>
+    <string name="custom_media_singular">Media</string>
     <string name="battery_dialog_message">Untuk memastikan unduhan dan pemberitahuan tanpa gangguan untuk acara TV berlangganan, CloudStream memerlukan izin untuk berjalan di latar belakang. Dengan menekan OK, Anda akan diperlihatkan dialog permintaan. Silakan tekan ‘Izinkan’.\n\nHarap dicatat, izin ini tidak berarti CS3 akan menguras baterai Anda. Aplikasi ini hanya akan beroperasi di latar belakang jika diperlukan, misalnya saat menerima notifikasi atau mengunduh video dari ekstensi resmi.</string>
     <string name="reset_btn">Mengatur ulang</string>
     <string name="next_season_episode_format" formatted="true">Musim %1$d Episode %2$d akan dirilis pada</string>
@@ -662,8 +662,8 @@
     <string name="confirm_before_exiting_desc">Tampilkan dialog sebelum keluar dari aplikasi</string>
     <string name="dont_show">Jangan Tampilkan</string>
     <string name="show">Tampilkan</string>
-    <string name="audio_singluar">Audio</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="encoding_error">Pengkodean error</string>
     <string name="unsupported_error">Error yang tidak didukung</string>
     <string name="player_load_one_subtitle_online">Muat yang pertama tersedia</string>
diff --git a/app/src/main/res/values-b+it/strings.xml b/app/src/main/res/values-b+it/strings.xml
index c96299c72..55da49687 100644
--- a/app/src/main/res/values-b+it/strings.xml
+++ b/app/src/main/res/values-b+it/strings.xml
@@ -619,10 +619,10 @@
     <string name="ok">OK</string>
     <string name="battery_dialog_title">Disabilita ottimizzazione della batteria</string>
     <string name="app_info_intent_error">Impossibile aprire le informazioni sull\'app CloudStream.</string>
-    <string name="custom_media_singluar">Media</string>
+    <string name="custom_media_singular">Media</string>
     <string name="battery_dialog_message">Per garantire download e notifiche ininterrotti per le serie TV a cui si è abbonati, CloudStream necessita dell\'autorizzazione per funzionare in background. Premendo OK, verrà mostrata una finestra di dialogo di richiesta. Premi \"Consenti\".\n\nNota che questa autorizzazione non significa che CS3 scaricherà la batteria. Funzionerà in background solo quando necessario, ad esempio quando si ricevono notifiche o si scaricano video da estensioni ufficiali.</string>
     <string name="app_unrestricted_toast">L\'utilizzo della batteria dell\'app è già impostato su \"Senza restrizioni\"</string>
-    <string name="music_singlar">Musica</string>
+    <string name="music_singular">Musica</string>
     <string name="audio_book_singular">Audiolibro</string>
     <string name="reset_btn">Reimposta</string>
     <string name="episode_upcoming_format" formatted="true">Prossimamente tra %s</string>
@@ -677,8 +677,8 @@
     <string name="custom">Personalizzato</string>
     <string name="torrent_info">Questo video è un Torrent, il che significa che la tua attività video può essere tracciata.\nAssicurati di aver capito il significato di scaricare tramite Torrent prima di continuare.</string>
     <string name="subs_edge_size">Dimensione bordo</string>
-    <string name="audio_singluar">Audio</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="unsupported_error">Errore non supportato</string>
     <string name="encoding_error">Errore di codifica</string>
     <string name="player_load_one_subtitle_online">Carica il primo disponibile</string>
diff --git a/app/src/main/res/values-b+ja/strings.xml b/app/src/main/res/values-b+ja/strings.xml
index b489db37d..16cfb49c6 100644
--- a/app/src/main/res/values-b+ja/strings.xml
+++ b/app/src/main/res/values-b+ja/strings.xml
@@ -271,7 +271,7 @@
     <string name="example_email">hello@world.com</string>
     <string name="disable">無効化</string>
     <string name="subtitles_outline">概要</string>
-    <string name="music_singlar">音楽</string>
+    <string name="music_singular">音楽</string>
     <string name="double_tap_to_pause_settings_des">中央で２回タップして一時停止</string>
     <string name="episode_action_play_in_format">%s で再生</string>
     <string name="switch_account">アカウントを切り替え</string>
@@ -297,7 +297,7 @@
     <string name="repo_copy_label">リポジトリ名とURL</string>
     <string name="toast_copied">コピーされました！</string>
     <string name="audio_book_singular">オーディオブック</string>
-    <string name="custom_media_singluar">メディア</string>
+    <string name="custom_media_singular">メディア</string>
     <string name="limit_title_rez">プレイヤー情報を表示</string>
     <string name="speed_setting_summary">プレイヤーに速度オプションを追加</string>
     <string name="downloads_delete_select">削除する項目を選択</string>
@@ -651,8 +651,8 @@
     <string name="no_plugins_updated_manually">更新されたプラグインはありません。</string>
     <string name="player_notification_channel_name">プレーヤー通知</string>
     <string name="player_notification_channel_description">バックグラウンドから再生を制御するためのプレーヤー通知</string>
-    <string name="audio_singluar">オーディオ</string>
-    <string name="podcast_singluar">ポッドキャスト</string>
+    <string name="audio_singular">オーディオ</string>
+    <string name="podcast_singular">ポッドキャスト</string>
     <string name="android_tv_interface_off_seek_settings">プレーヤー非表示時 - シーク量</string>
     <string name="encoding_error">エンコーディングエラー</string>
     <string name="unsupported_error">サポートされていないエラー</string>
diff --git a/app/src/main/res/values-b+ko/strings.xml b/app/src/main/res/values-b+ko/strings.xml
index efe034258..9b07d259e 100644
--- a/app/src/main/res/values-b+ko/strings.xml
+++ b/app/src/main/res/values-b+ko/strings.xml
@@ -561,7 +561,7 @@
     <string name="unfavorite">즐겨찾기 해제</string>
     <string name="biometric_authentication_title">잠금 해제</string>
     <string name="biometric_setting">생체 인식으로 잠금</string>
-    <string name="music_singlar">음악</string>
+    <string name="music_singular">음악</string>
     <string name="audio_book_singular">오디오책</string>
     <string name="auto_rotate_video">자동 회전</string>
     <string name="mobile_data">모바일 데이터</string>
@@ -591,7 +591,7 @@
     <string name="lock_profile">프로필 잠금</string>
     <string name="pin_error_incorrect">잘못된 PIN입니다. 다시 시도하세요.</string>
     <string name="edit_account">계정 편집</string>
-    <string name="custom_media_singluar">미디어</string>
+    <string name="custom_media_singular">미디어</string>
     <string name="password_pin_authentication_title">비밀번호/PIN 인증</string>
     <string name="biometric_unsupported">이 장치에서는 생체 인식이 지원되지 않습니다</string>
     <string name="biometric_setting_summary">지문, 얼굴 ID, PIN, 패턴 또는 비밀번호로 앱을 잠급니다.</string>
@@ -643,8 +643,8 @@
     <string name="sort_release_date_old">공개일 (오래된순)</string>
     <string name="hide_player_control_names">플레이어 내 버튼명 숨기기</string>
     <string name="torrent_info">이 동영상은 토렌트이므로 시청 활동이 추적될 수 있습니다.\n계속하기 전에 토렌트에 대해 충분히 이해했는지 확인하세요.</string>
-    <string name="audio_singluar">오디오</string>
-    <string name="podcast_singluar">팟캐스트</string>
+    <string name="audio_singular">오디오</string>
+    <string name="podcast_singular">팟캐스트</string>
     <string name="begin_speaking">시작하기 …</string>
     <string name="encoding_error">인코딩 오류</string>
     <string name="unsupported_error">미지원 오류</string>
diff --git a/app/src/main/res/values-b+lv/strings.xml b/app/src/main/res/values-b+lv/strings.xml
index 101498b83..7d74354ea 100644
--- a/app/src/main/res/values-b+lv/strings.xml
+++ b/app/src/main/res/values-b+lv/strings.xml
@@ -538,14 +538,14 @@
     <string name="favorite">Pievienot iecienītajiem</string>
     <string name="toast_copied">nokopēts!</string>
     <string name="ok">Labi</string>
-    <string name="music_singlar">Mūzika</string>
+    <string name="music_singular">Mūzika</string>
     <string name="reset_btn">Atiestatīt</string>
     <string name="pref_category_security">Drošība</string>
     <string name="pref_category_accounts">Konti</string>
     <string name="test_warning">Brīdinājums</string>
     <string name="show">Rādīt</string>
-    <string name="audio_singluar">Audio</string>
-    <string name="podcast_singluar">Raidieraksts</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Raidieraksts</string>
     <string name="subtitles_from_embedded">Iegultie</string>
     <string name="subtitles_from_online">No interneta</string>
     <string name="name">Nosaukums</string>
diff --git a/app/src/main/res/values-b+mk/strings.xml b/app/src/main/res/values-b+mk/strings.xml
index 4af4995ea..99ee9c2ac 100644
--- a/app/src/main/res/values-b+mk/strings.xml
+++ b/app/src/main/res/values-b+mk/strings.xml
@@ -567,7 +567,7 @@
     <string name="unfavorite">Неомилен</string>
     <string name="favorite">Омилен</string>
     <string name="biometric_setting">Заклучување со биометрика</string>
-    <string name="music_singlar">Музика</string>
+    <string name="music_singular">Музика</string>
     <string name="subscribe_tooltip">Известување за нова епизода</string>
     <string name="result_search_tooltip">Пребарај во други екстензии</string>
     <string name="recommendations_tooltip">Прикажи препораки</string>
@@ -585,7 +585,7 @@
     <string name="biometric_authentication_title">Отклучи CloudStream</string>
     <string name="biometric_unsupported">Биометриската автентикација не е поддржана на овој уред</string>
     <string name="biometric_prompt_description">По неколку неуспешни обиди, известувањето ќе се затвори. Едноставно вклучи ја апликацијата повторно за да се обидеш повторно.</string>
-    <string name="custom_media_singluar">Медиуми</string>
+    <string name="custom_media_singular">Медиуми</string>
     <string name="episode_upcoming_format" formatted="true">Претстои во %s</string>
     <string name="resume_remaining" formatted="true">%s
 \nпреостанати</string>
@@ -633,8 +633,8 @@
     <string name="cs3wiki">CloudStream Wiki</string>
     <string name="delete_message_series_episodes" formatted="true">Дали си сигурен дека сакаш трајно да ги избришеш следните епизоди во %1$s?\n\n%2$s</string>
     <string name="device_pin_counter_text">Кодот истекува за %1$d минута/и и %2$d секунда/и</string>
-    <string name="audio_singluar">Аудио</string>
-    <string name="podcast_singluar">Поткаст</string>
+    <string name="audio_singular">Аудио</string>
+    <string name="podcast_singular">Поткаст</string>
     <string name="encoding_error">Грешка при кодирање на преводот</string>
     <string name="unsupported_error">Неподдржана грешка</string>
     <string name="player_load_one_subtitle_online">Вчитај прво достапно</string>
diff --git a/app/src/main/res/values-b+ms/strings.xml b/app/src/main/res/values-b+ms/strings.xml
index 9ec0192cf..dc1cd3ee6 100644
--- a/app/src/main/res/values-b+ms/strings.xml
+++ b/app/src/main/res/values-b+ms/strings.xml
@@ -285,7 +285,7 @@
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="subtitle_offset_extra_hint_later_format">Gunakan ini sekiranya sari kata yang dipaparkan awal sebanyak %d</string>
     <string name="quality_hdr">HDR</string>
-    <string name="custom_media_singluar">Media</string>
+    <string name="custom_media_singular">Media</string>
     <string name="tv_layout">Susun atur TV</string>
     <string name="tv_series">TV Bersiri</string>
     <string name="plugin_load_fail" formatted="true">Tidak dapat papar %s</string>
@@ -390,7 +390,7 @@
     <string name="stop">Berhenti</string>
     <string name="already_voted">Anda telah mengundi</string>
     <string name="action_remove_from_favorites">Alih keluar dari Kegemaran</string>
-    <string name="music_singlar">Musik</string>
+    <string name="music_singular">Musik</string>
     <string name="downloads_delete_select">Pilih benda untuk dibuang</string>
     <string name="player_size_settings_des">Buang sempadan hitam</string>
     <string name="category_account">Akaun dan Sekuriti</string>
@@ -532,6 +532,6 @@
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Dokumentari</string>
     <string name="live_singular">Siaran Langsung</string>
-    <string name="audio_singluar">Audio</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podcast</string>
 </resources>
diff --git a/app/src/main/res/values-b+nl/strings.xml b/app/src/main/res/values-b+nl/strings.xml
index 3cdea9d8f..e3bbee121 100644
--- a/app/src/main/res/values-b+nl/strings.xml
+++ b/app/src/main/res/values-b+nl/strings.xml
@@ -616,11 +616,11 @@
     <string name="delete_message_series_section" formatted="true">Hiermee worden ook alle afleveringen van de volgende series permanent verwijderd:\n\n%s</string>
     <string name="delete_message_series_only" formatted="true">Weet je zeker dat je alle afleveringen van de volgende series permanent wil verwijderen?\n\n%s</string>
     <string name="resume_remaining" formatted="true">%s\nresterend</string>
-    <string name="music_singlar">Muziek</string>
+    <string name="music_singular">Muziek</string>
     <string name="audio_book_singular">Luisterboek</string>
-    <string name="custom_media_singluar">Media</string>
-    <string name="audio_singluar">Audio</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="custom_media_singular">Media</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="encoding_error">Coderingsfout</string>
     <string name="unsupported_error">Fout: wordt niet ondersteund</string>
     <string name="pref_category_security">Beveiliging</string>
diff --git a/app/src/main/res/values-b+pl/strings.xml b/app/src/main/res/values-b+pl/strings.xml
index 0536e6807..d1b1cf1c5 100644
--- a/app/src/main/res/values-b+pl/strings.xml
+++ b/app/src/main/res/values-b+pl/strings.xml
@@ -599,10 +599,10 @@
     <string name="clipboard_unknown_error">Błąd podczas kopiowania. Skopiuj logcat i skontaktuj się z pomocą techniczną aplikacji.</string>
     <string name="battery_dialog_title">Wyłącz optymalizację baterii</string>
     <string name="app_info_intent_error">Nie można otworzyć informacji o aplikacji CloudStream.</string>
-    <string name="music_singlar">Muzyka</string>
+    <string name="music_singular">Muzyka</string>
     <string name="audio_book_singular">Audiobook</string>
     <string name="ok">OK</string>
-    <string name="custom_media_singluar">Multimedia</string>
+    <string name="custom_media_singular">Multimedia</string>
     <string name="app_unrestricted_toast">Użycie baterii przez aplikację jest już ustawione na nieograniczone</string>
     <string name="battery_dialog_message">Aby zapewnić nieprzerwane pobieranie i powiadomienia o subskrybowanych programach, CloudStream potrzebuje pozwolenia na działanie w tle. Po naciśnięciu OK wyświetli się okno dialogowe. Naciśnij „Zezwól”.\n\nPamiętaj, że to pozwolenie nie oznacza, że CS3 będzie zużywać baterię. Będzie działać w tle tylko wtedy, gdy będzie to konieczne, na przykład podczas odbierania powiadomień lub pobierania filmów z oficjalnych rozszerzeń.</string>
     <string name="reset_btn">Resetuj</string>
@@ -658,8 +658,8 @@
     <string name="custom">Własna</string>
     <string name="torrent_info">Ten film jest torrentem, co oznacza, że Twoja aktywność wideo może być śledzona.\nUpewnij się, że rozumiesz czym są torrenty, zanim przejdziesz dalej.</string>
     <string name="subs_edge_size">Rozmiar krawędzi</string>
-    <string name="podcast_singluar">Podcast</string>
-    <string name="audio_singluar">Audio</string>
+    <string name="podcast_singular">Podcast</string>
+    <string name="audio_singular">Audio</string>
     <string name="unsupported_error">Nieobsługiwany błąd</string>
     <string name="encoding_error">Błąd kodowania</string>
     <string name="player_load_one_subtitle_online">Wczytaj pierwsze dostępne</string>
diff --git a/app/src/main/res/values-b+pt+BR/strings.xml b/app/src/main/res/values-b+pt+BR/strings.xml
index 72ecbf3d9..b856246e8 100644
--- a/app/src/main/res/values-b+pt+BR/strings.xml
+++ b/app/src/main/res/values-b+pt+BR/strings.xml
@@ -612,9 +612,9 @@
     <string name="battery_dialog_title">Desativar otimização de bateria</string>
     <string name="app_unrestricted_toast">O uso da bateria do app já está definido como irrestrito</string>
     <string name="app_info_intent_error">Não foi possível abrir as informações do aplicativo CloudStream.</string>
-    <string name="music_singlar">Música</string>
+    <string name="music_singular">Música</string>
     <string name="audio_book_singular">Áudio-livro</string>
-    <string name="custom_media_singluar">Mídia</string>
+    <string name="custom_media_singular">Mídia</string>
     <string name="reset_btn">Redefinir</string>
     <string name="episode_upcoming_format" formatted="true">Próximo em %s</string>
     <string name="next_season_episode_format" formatted="true">%2$dº episódio da %1$dª temporada estreia em</string>
@@ -663,8 +663,8 @@
     <string name="encoding_error">Erro de codificação</string>
     <string name="unsupported_error">Erro, formato não suportado</string>
     <string name="player_load_one_subtitle_online">Carregar primeiro disponível</string>
-    <string name="audio_singluar">Áudio</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Áudio</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="software_decoding">Decodificação de software</string>
     <string name="software_decoding_desc">A decodificação por software permite que o reprodutor reproduza arquivos de vídeo não suportados pelo seu dispositivo, mas pode causar lentidão ou instabilidade na reprodução em alta resolução.</string>
     <string name="torrent_preferred_media">Habilitar torrent em Configurações/Provedores/Mídia preferida</string>
diff --git a/app/src/main/res/values-b+pt/strings.xml b/app/src/main/res/values-b+pt/strings.xml
index 88eccbeac..f9dd3083b 100644
--- a/app/src/main/res/values-b+pt/strings.xml
+++ b/app/src/main/res/values-b+pt/strings.xml
@@ -597,9 +597,9 @@
     <string name="ok">OK</string>
     <string name="app_unrestricted_toast">A utilização da bateria da aplicação já está definida como sem restrições</string>
     <string name="app_info_intent_error">Não é possível abrir a informação da aplicação CloudStream.</string>
-    <string name="music_singlar">Música</string>
+    <string name="music_singular">Música</string>
     <string name="audio_book_singular">Livro Aúdio</string>
-    <string name="custom_media_singluar">Multimédia</string>
+    <string name="custom_media_singular">Multimédia</string>
     <string name="battery_dialog_title">Desativar a otimização da bateria</string>
     <string name="battery_dialog_message">Para garantir descarregamentos ininterruptos e notificações de programas de TV subscritos, o CloudStream precisa de permissão para ser executado em segundo plano. Ao premir OK, será mostrado um diálogo. Prima \"Permitir\".\n\nTenha em atenção que esta permissão não significa que o CS3 irá esgotar a sua bateria. Este só funcionará em segundo plano quando necessário, como ao receber notificações ou baixar vídeos de extensões oficiais.</string>
     <string name="reset_btn">Reiniciar</string>
@@ -656,8 +656,8 @@
     <string name="torrent_info">Este vídeo é um Torrent, o que significa que sua atividade de vídeo pode ser rastreada.\nCertifique-se de entender o Torrent antes de continuar.</string>
     <string name="custom">Personalizado</string>
     <string name="player_load_one_subtitle_online">Carregar o primeiro disponível</string>
-    <string name="audio_singluar">Áudio</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Áudio</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="encoding_error">Erro de codificação</string>
     <string name="unsupported_error">Erro não suportado</string>
     <string name="torrent_preferred_media">Ativar torrent nas Configurações/Provedores/Mídia preferida</string>
diff --git a/app/src/main/res/values-b+qt/strings.xml b/app/src/main/res/values-b+qt/strings.xml
index 8a43e97d7..bbe145842 100644
--- a/app/src/main/res/values-b+qt/strings.xml
+++ b/app/src/main/res/values-b+qt/strings.xml
@@ -408,7 +408,7 @@
     <string name="help">uugg</string>
     <string name="qualities">oooogggoh</string>
     <string name="biometric_setting">uugg uuhh oooohhhoog</string>
-    <string name="music_singlar">aaahh</string>
+    <string name="music_singular">aaahh</string>
     <string name="biometric_prompt_description">uuugg g uug uuuuhh attempts, aah aaaagg uugg uuuhh aaaagg uuuuhhh aag uug ah uuh uuugg</string>
     <string name="min">oog</string>
     <string name="extension_install_first">aaaaggg uug oooohhhuh uuuuk</string>
@@ -500,7 +500,7 @@
     <string name="toast_copied">copied!</string>
     <string name="battery_dialog_title">aaaahhh ooooggg oooohhhooogg</string>
     <string name="episode_upcoming_format" formatted="true">uuuugggg og %s</string>
-    <string name="custom_media_singluar">uuugg</string>
+    <string name="custom_media_singular">uuugg</string>
     <string name="app_unrestricted_toast">ooh oooohhh uuuhh ak aaaaggg aak ag uuuugggaaaak</string>
     <string name="app_info_intent_error">uuuugg ah uuhh CloudStream uuh uuhh</string>
     <string name="pref_category_security">oooohhhg</string>
diff --git a/app/src/main/res/values-b+ro/strings.xml b/app/src/main/res/values-b+ro/strings.xml
index bb49563ec..5f612c640 100644
--- a/app/src/main/res/values-b+ro/strings.xml
+++ b/app/src/main/res/values-b+ro/strings.xml
@@ -610,9 +610,9 @@
     <string name="app_unrestricted_toast">Utilizarea bateriei pentru aplicație este deja setată ca fiind nelimitată</string>
     <string name="app_info_intent_error">Imposibil de deschis informațiile aplicației CloudStream.</string>
     <string name="favorite">Favorite</string>
-    <string name="music_singlar">Muzică</string>
+    <string name="music_singular">Muzică</string>
     <string name="audio_book_singular">Carte audio</string>
-    <string name="custom_media_singluar">Media</string>
+    <string name="custom_media_singular">Media</string>
     <string name="result_search_tooltip">Caută în alte extensii</string>
     <string name="test_extensions">Testează toate extensiile</string>
     <string name="auto_rotate_video">Rotire automată</string>
@@ -640,8 +640,8 @@
     <string name="delete_message_multiple" formatted="true">Sunteți siguri că doriți să ștergeți definitiv următoarele fișiere?\n\n%s</string>
     <string name="delete_message_series_section" formatted="true">Veți mai și șterge definitiv toate episoadele în seria următoare:\n\n%s</string>
     <string name="delete_message_series_only" formatted="true">Sunteți siguri ca doriți sa ștergeți definitiv toate episoadele în seria următoare?\n\n%s</string>
-    <string name="audio_singluar">Audio</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="encoding_error">Eroare de codificare</string>
     <string name="unsupported_error">Eroare Nesuportată</string>
     <string name="show_rating">Etichetă de clasificare</string>
diff --git a/app/src/main/res/values-b+ru/strings.xml b/app/src/main/res/values-b+ru/strings.xml
index 1a5db40a1..5c271f871 100644
--- a/app/src/main/res/values-b+ru/strings.xml
+++ b/app/src/main/res/values-b+ru/strings.xml
@@ -582,9 +582,9 @@
     <string name="app_unrestricted_toast">Использование батареи приложением уже настроено на неограниченное</string>
     <string name="app_info_intent_error">Не удаётся открыть информацию о приложении CloudStream.</string>
     <string name="biometric_setting">Заблокировать биометрией</string>
-    <string name="music_singlar">Музыка</string>
+    <string name="music_singular">Музыка</string>
     <string name="audio_book_singular">Аудиокнига</string>
-    <string name="custom_media_singluar">Медиа</string>
+    <string name="custom_media_singular">Медиа</string>
     <string name="biometric_setting_summary">Разблокируйте приложение с помощью отпечатка пальца, Face ID, ПИН-кода, шаблона и пароля.</string>
     <string name="resume_remaining" formatted="true">%s
 \nосталось</string>
@@ -644,8 +644,8 @@
     <string name="encoding_error">Ошибка кодировки</string>
     <string name="unsupported_error">Не поддерживается</string>
     <string name="player_load_one_subtitle_online">Скачать первые доступные</string>
-    <string name="audio_singluar">Аудио</string>
-    <string name="podcast_singluar">Подкаст</string>
+    <string name="audio_singular">Аудио</string>
+    <string name="podcast_singular">Подкаст</string>
     <string name="sort_episodes_number_asc">Серия (по возрастанию)</string>
     <string name="subtitles_from_embedded">Встроенный</string>
     <string name="subtitles_from_online">Из сети</string>
diff --git a/app/src/main/res/values-b+sk/strings.xml b/app/src/main/res/values-b+sk/strings.xml
index 462a02ad5..8c1c4695f 100644
--- a/app/src/main/res/values-b+sk/strings.xml
+++ b/app/src/main/res/values-b+sk/strings.xml
@@ -382,8 +382,8 @@
     <string name="actor_background">Pozadie</string>
     <string name="setup_done">Hotovo</string>
     <string name="cartoons_singular">Kreslený</string>
-    <string name="music_singlar">Hudba</string>
-    <string name="custom_media_singluar">Médiá</string>
+    <string name="music_singular">Hudba</string>
+    <string name="custom_media_singular">Médiá</string>
     <string name="pref_category_accounts">Kontá</string>
     <string name="pref_category_security">Bezpečnosť</string>
     <string name="normal">Normálne</string>
@@ -453,8 +453,8 @@
     <string name="next">Ďalšie</string>
     <string name="select_all">Vybrať Všetko</string>
     <string name="deselect_all">Zrušiť výber všetkých</string>
-    <string name="audio_singluar">Zvuk</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Zvuk</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="all">Všetko</string>
     <string name="encoding_error">Chyba kódovania</string>
     <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
diff --git a/app/src/main/res/values-b+sv/strings.xml b/app/src/main/res/values-b+sv/strings.xml
index 695050336..bf352e5e2 100644
--- a/app/src/main/res/values-b+sv/strings.xml
+++ b/app/src/main/res/values-b+sv/strings.xml
@@ -599,11 +599,11 @@
     <string name="battery_dialog_title">Inaktivera batterioptimering</string>
     <string name="app_unrestricted_toast">Appens batterianvändning är redan inställd på obegränsad</string>
     <string name="app_info_intent_error">Det gick inte att öppna CloudStreams appinformation.</string>
-    <string name="music_singlar">Musik</string>
+    <string name="music_singular">Musik</string>
     <string name="reset_btn">Återställ</string>
     <string name="episode_upcoming_format" formatted="true">Kommer ut om %s</string>
     <string name="clipboard_unknown_error">Fel vid kopiering, kopiera logcat och kontakta appsupport.</string>
-    <string name="custom_media_singluar">Media</string>
+    <string name="custom_media_singular">Media</string>
     <string name="episode_action_cast_mirror">Cast mirror</string>
     <string name="next_season_episode_format" formatted="true">Säsong %1$d Avsnitt %2$d kommer att släppas om</string>
     <string name="player_settings_select_cast_device">Välj cast-enhet</string>
@@ -653,8 +653,8 @@
     <string name="backup_path_title">Säkerhetskopieringsmapp</string>
     <string name="confirm_before_exiting_desc">Visa dialogruta innan stängning av appen</string>
     <string name="software_decoding_desc">Mjukvaruavkodning tillåter spelaren att spela upp videofiler som inte stöds av din enhet, men kan orsaka ostadig uppspelning vid hög upplösning.</string>
-    <string name="audio_singluar">Ljud</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Ljud</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="software_decoding">Mjukvaruavkodning</string>
     <string name="torrent_not_accepted">Starta om appen och acceptera popup-fönstret för Stream Torrent för att fortsätta.</string>
     <string name="torrent_preferred_media">Aktivera torrent i Inställningar/Leverantörer/Föredragen media</string>
diff --git a/app/src/main/res/values-b+ta/strings.xml b/app/src/main/res/values-b+ta/strings.xml
index 5cdbeaa37..fda0c36fd 100644
--- a/app/src/main/res/values-b+ta/strings.xml
+++ b/app/src/main/res/values-b+ta/strings.xml
@@ -549,7 +549,7 @@
     <string name="auto_rotate_video_desc">வீடியோ நோக்குநிலையின் அடிப்படையில் திரை நோக்குநிலையின் தானியங்கி மாறுவதை இயக்கவும்</string>
     <string name="auto_rotate_video">ஆட்டோ சுழலும்</string>
     <string name="favorite">பிடித்த</string>
-    <string name="music_singlar">இசை</string>
+    <string name="music_singular">இசை</string>
     <string name="ova">ஓவா</string>
     <string name="show_hd">தரமான சிட்டை</string>
     <string name="update">புதுப்பிப்பு</string>
@@ -575,7 +575,7 @@
     <string name="set_default">இயல்புநிலையை அமைக்கவும்</string>
     <string name="quality_profile_help">ஆதாரங்கள் எவ்வாறு உத்தரவிடப்படுகின்றன என்பதை இங்கே மாற்றலாம். ஒரு வீடியோவுக்கு அதிக முன்னுரிமை இருந்தால், அது மூல தேர்வில் அதிகமாகத் தோன்றும். மூல முன்னுரிமையின் தொகை மற்றும் தரமான முன்னுரிமை ஆகியவை வீடியோ முன்னுரிமை. \n\n சான்று A: 3 \n தகுதி பி: 7 \n 10 இன் ஒருங்கிணைந்த வீடியோ முன்னுரிமை இருக்கும். \n\n குறிப்பு: தொகை 10 அல்லது அதற்கு மேற்பட்டதாக இருந்தால், அந்த இணைப்பு ஏற்றப்படும்போது பிளேயர் தானாகவே ஏற்றுவதைத் தவிர்க்கும்!</string>
     <string name="biometric_warning">உங்கள் கிளவுட்ச்ட்ரீம் தரவு இப்போது காப்புப் பிரதி எடுக்கப்பட்டுள்ளது. இதன் சாத்தியம் மிகக் குறைவு என்றாலும், எல்லா சாதனங்களும் வித்தியாசமாக நடந்து கொள்ளலாம். அரிய விசயத்தில், பயன்பாட்டை அணுகுவதிலிருந்து நீங்கள் பூட்டப்படுகிறீர்கள், பயன்பாட்டு தரவை முழுவதுமாக அழித்து, காப்புப்பிரதியிலிருந்து மீட்டெடுக்கவும். இதிலிருந்து எழும் ஏதேனும் சிரமத்திற்கு நாங்கள் மிகவும் வருந்துகிறோம்.</string>
-    <string name="custom_media_singluar">ஊடகம்</string>
+    <string name="custom_media_singular">ஊடகம்</string>
     <string name="pref_category_accounts">கணக்குகள்</string>
     <string name="test_warning">எச்சரிக்கை</string>
     <string name="downloads_empty">தற்போது பதிவிறக்கங்கள் எதுவும் இல்லை.</string>
@@ -631,8 +631,8 @@
     <string name="delete_message_series_section" formatted="true">பின்வரும் தொடரில் உள்ள அனைத்து அத்தியாயங்களையும் நீங்கள் நிரந்தரமாக நீக்குவீர்கள்:\n\n %s</string>
     <string name="speech_recognition_unavailable">பேச்சு ஏற்பு கிடைக்கவில்லை</string>
     <string name="begin_speaking">பேசத் தொடங்குங்கள்…</string>
-    <string name="audio_singluar">ஆடியோ</string>
-    <string name="podcast_singluar">போட்காச்ட்</string>
+    <string name="audio_singular">ஆடியோ</string>
+    <string name="podcast_singular">போட்காச்ட்</string>
     <string name="encoding_error">குறியீட்டு பிழை</string>
     <string name="unsupported_error">ஆதரிக்கப்படாத பிழை</string>
     <string name="player_load_one_subtitle_online">முதலில் கிடைக்கிறது</string>
diff --git a/app/src/main/res/values-b+tr/strings.xml b/app/src/main/res/values-b+tr/strings.xml
index 47db0e97e..fb0600c1a 100644
--- a/app/src/main/res/values-b+tr/strings.xml
+++ b/app/src/main/res/values-b+tr/strings.xml
@@ -607,9 +607,9 @@
     <string name="ok">Tamam</string>
     <string name="battery_dialog_title">Pil optimizasyonunu devre dışı bırak</string>
     <string name="app_info_intent_error">CloudStream\'in Uygulama bilgileri açılamıyor.</string>
-    <string name="music_singlar">Müzik</string>
+    <string name="music_singular">Müzik</string>
     <string name="audio_book_singular">Sesli Kitap</string>
-    <string name="custom_media_singluar">Medya</string>
+    <string name="custom_media_singular">Medya</string>
     <string name="battery_dialog_message">Abone olunan TV programları için kesintisiz indirme ve bildirimler sağlamak için CloudStream\'in arka planda çalışma iznine ihtiyacı var. Tamam\'a basarak bir istek iletişim kutusu göreceksiniz. Lütfen \'İzin Ver\'e basın.\n\nLütfen unutmayın, bu izin CS3’ün pilinizi tüketeceği anlamına gelmez. Yalnızca gerektiğinde, örneğin bildirim alırken veya resmi uzantılardan video indirirken arka planda çalışır.</string>
     <string name="app_unrestricted_toast">Uygulama pil kullanımı zaten sınırsız olarak ayarlanmış</string>
     <string name="reset_btn">Sıfırla</string>
@@ -668,8 +668,8 @@
     <string name="unsupported_error">Desteklenmeyen hata</string>
     <string name="encoding_error">Kodlama hatası</string>
     <string name="player_load_one_subtitle_online">İlk kullanılabiliri yükle</string>
-    <string name="audio_singluar">Ses</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Ses</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="torrent_preferred_media">Ayarlar/Sağlayıcılar/Tercih edilen medya bölümünden torrenti etkinleştirin</string>
     <string name="torrent_not_accepted">Uygulamayı yeniden başlatın ve devam etmek için Stream Torrent açılır penceresini kabul edin.</string>
     <string name="software_decoding">Yazılımsal çözücü</string>
diff --git a/app/src/main/res/values-b+uk/strings.xml b/app/src/main/res/values-b+uk/strings.xml
index 74acb48ae..2a9352183 100644
--- a/app/src/main/res/values-b+uk/strings.xml
+++ b/app/src/main/res/values-b+uk/strings.xml
@@ -580,8 +580,8 @@
     <string name="app_unrestricted_toast">Споживання батареї застосунком уже змінено на необмежене</string>
     <string name="app_info_intent_error">Не вдається відкрити подробиці про застосунок CloudStream.</string>
     <string name="audio_book_singular">Аудіокнига</string>
-    <string name="music_singlar">Музика</string>
-    <string name="custom_media_singluar">Медіа</string>
+    <string name="music_singular">Музика</string>
+    <string name="custom_media_singular">Медіа</string>
     <string name="reset_btn">Скинути</string>
     <string name="episode_upcoming_format" formatted="true">Наступний через %s</string>
     <string name="next_season_episode_format" formatted="true">Сезон %1$d Епізод %2$d вийде через</string>
@@ -627,8 +627,8 @@
     <string name="custom">Власний</string>
     <string name="torrent_info">Це відео – Торрент, це означає, що ваша відео діяльність може відстежуватися.\nПереконайтеся, що розумієте, що таке Торрент, перед тим як продовжити.</string>
     <string name="subs_edge_size">Розмір обведення</string>
-    <string name="audio_singluar">Аудіо</string>
-    <string name="podcast_singluar">Подкаст</string>
+    <string name="audio_singular">Аудіо</string>
+    <string name="podcast_singular">Подкаст</string>
     <string name="unsupported_error">Непідтримувана помилка</string>
     <string name="encoding_error">Помилка кодування</string>
     <string name="player_load_one_subtitle_online">Завантажити перший доступний</string>
diff --git a/app/src/main/res/values-b+ur/strings.xml b/app/src/main/res/values-b+ur/strings.xml
index acd6e4097..9a72e586f 100644
--- a/app/src/main/res/values-b+ur/strings.xml
+++ b/app/src/main/res/values-b+ur/strings.xml
@@ -591,9 +591,9 @@
     <string name="battery_dialog_title">Battery Optimization کو غیر فعال کریں</string>
     <string name="app_unrestricted_toast">اپپ battery usage پہلے سے ہی unrestricted ہے</string>
     <string name="favorite">پسندیدہ کریں</string>
-    <string name="music_singlar">موسیقی</string>
+    <string name="music_singular">موسیقی</string>
     <string name="audio_book_singular">آڈیو بک</string>
-    <string name="custom_media_singluar">میڈیا</string>
+    <string name="custom_media_singular">میڈیا</string>
     <string name="biometric_authentication_title">انلاک CloudStream</string>
     <string name="biometric_setting">بایومیٹرکس کے ساتھ لاک کریں</string>
     <string name="biometric_unsupported">بایومیٹرک تصدیق اس ڈیوائس پر سپپورٹڈ نہیں ہے</string>
@@ -617,7 +617,7 @@
     <string name="open_local_video">لوکل ویڈیو کھولیں</string>
     <string name="delete_files">فائلز حذف کریں</string>
     <string name="test_warning">انتباہ</string>
-    <string name="audio_singluar">آواز</string>
+    <string name="audio_singular">آواز</string>
     <string name="sort_button_date">تاریخ %s</string>
     <string name="device_pin_url_message">اپنے اسمارٹ فون یا کمپیوٹر پر یہ <b>%s</b> وزٹ کریں اور مندرجہ بالا کوڈ ڈالیں</string>
 </resources>
diff --git a/app/src/main/res/values-b+vi/strings.xml b/app/src/main/res/values-b+vi/strings.xml
index d0d6059aa..c0f4744fd 100644
--- a/app/src/main/res/values-b+vi/strings.xml
+++ b/app/src/main/res/values-b+vi/strings.xml
@@ -601,7 +601,7 @@
     <string name="app_info_intent_error">Không thể mở thông tin ứng dụng CloudStream.</string>
     <string name="unfavorite">Bỏ yêu thích</string>
     <string name="biometric_authentication_title">Mở khóa Cloudstream</string>
-    <string name="music_singlar">Nhạc</string>
+    <string name="music_singular">Nhạc</string>
     <string name="audio_book_singular">Sách nói</string>
     <string name="biometric_setting">Khóa bằng sinh trắc học</string>
     <string name="resume_remaining" formatted="true">%s\ncòn lại</string>
@@ -612,7 +612,7 @@
     <string name="biometric_prompt_description">Sau vài lần thử thất bại, hộp thoại sẽ tự đóng. Chỉ cần khởi động lại ứng dụng để thử lại.</string>
     <string name="test_extensions_summary">Bài kiểm tra này chỉ dành cho các nhà phát triển và không xác nhận hay phủ nhận việc hoạt động của bất kỳ tiện ích mở rộng nào.</string>
     <string name="app_unrestricted_toast">Chế độ tiêu thụ pin của ứng dụng đã được đặt ở mức không giới hạn</string>
-    <string name="custom_media_singluar">Phương tiện</string>
+    <string name="custom_media_singular">Phương tiện</string>
     <string name="repo_copy_label">Tên và URL kho tiện ích</string>
     <string name="reset_btn">Đặt lại</string>
     <string name="battery_dialog_message">Để đảm bảo quá trình tải xuống và thông báo cho các chương trình truyền hình đã đăng ký không bị gián đoạn, CloudStream cần có quyền chạy ở chế độ nền. Bằng cách nhấn OK, một hộp thoại yêu cầu sẽ hiển thị. Vui lòng nhấn \"Cho phép\".\n\nXin lưu ý, quyền này không có nghĩa là CS3 sẽ làm hao pin của bạn. Nó sẽ chỉ hoạt động ở chế độ nền khi cần thiết, chẳng hạn như khi nhận được thông báo hoặc tải xuống video từ các tiện ích mở rộng chính thức.</string>
@@ -672,8 +672,8 @@
     <string name="torrent_not_accepted">Khởi động lại ứng dụng và chấp nhận cửa sổ Stream Torrent để tiếp tục.</string>
     <string name="torrent_preferred_media">Kích hoạt torrent trong Cài đặt/Nguồn phim/Thể loại ưu tiên</string>
     <string name="player_load_one_subtitle_online">Tải phụ đề đầu tiên có sẵn</string>
-    <string name="audio_singluar">Âm thanh</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="audio_singular">Âm thanh</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="unsupported_error">Lỗi không được hỗ trợ</string>
     <string name="sort_episodes_rating_low_high">Xếp hạng (Thấp nhất)</string>
     <string name="sort_episodes_number_asc">Tập (Tăng dần)</string>
diff --git a/app/src/main/res/values-b+zh+TW/strings.xml b/app/src/main/res/values-b+zh+TW/strings.xml
index cb58e96f5..e5879ae37 100644
--- a/app/src/main/res/values-b+zh+TW/strings.xml
+++ b/app/src/main/res/values-b+zh+TW/strings.xml
@@ -594,7 +594,7 @@
     <string name="biometric_setting">使用生物辨識技術鎖定</string>
     <string name="app_unrestricted_toast">應用程式電池使用已設定為無限制</string>
     <string name="biometric_authentication_title">解除鎖定 CloudStream</string>
-    <string name="custom_media_singluar">媒體</string>
+    <string name="custom_media_singular">媒體</string>
     <string name="reset_btn">重置</string>
     <string name="recommendations_tooltip">顯示推薦</string>
     <string name="speed_setting_summary">在播放器中新增速度選項</string>
@@ -604,7 +604,7 @@
     <string name="test_extensions">測試所有擴充功能</string>
     <string name="battery_dialog_title">停用電池優化</string>
     <string name="audio_book_singular">有聲書</string>
-    <string name="music_singlar">音樂</string>
+    <string name="music_singular">音樂</string>
     <string name="next_season_episode_format" formatted="true">第 %1$d 季第 %2$d 集即將發佈於</string>
     <string name="result_search_tooltip">在其他擴充功能中搜尋</string>
     <string name="subscribe_tooltip">新集數通知</string>
@@ -661,10 +661,10 @@
     <string name="no_subtitles_loaded">尚未載入字幕</string>
     <string name="torrent_info">此影片是 Torrent，這意味著你的影片活動可以被追蹤。\n在繼續之前，請確保你瞭解 Torrenting。</string>
     <string name="subs_edge_size">subs_edge_size</string>
-    <string name="audio_singluar">音樂</string>
+    <string name="audio_singular">音樂</string>
     <string name="encoding_error">編碼錯誤</string>
     <string name="unsupported_error">因為不支援造成錯誤</string>
-    <string name="podcast_singluar">播客</string>
+    <string name="podcast_singular">播客</string>
     <string name="software_decoding">軟體解碼</string>
     <string name="torrent_not_accepted">重開程式並「同意」線上播放 Torrent 視窗。</string>
     <string name="player_load_one_subtitle_online">載入第一個可用的</string>
diff --git a/app/src/main/res/values-b+zh/strings.xml b/app/src/main/res/values-b+zh/strings.xml
index 496afe81c..de0cb834a 100644
--- a/app/src/main/res/values-b+zh/strings.xml
+++ b/app/src/main/res/values-b+zh/strings.xml
@@ -604,9 +604,9 @@
     <string name="clipboard_permission_error">访问剪贴板出错，请重试。</string>
     <string name="app_unrestricted_toast">应用程序电池使用量已设置为不受限制</string>
     <string name="audio_book_singular">有声书</string>
-    <string name="custom_media_singluar">媒体</string>
+    <string name="custom_media_singular">媒体</string>
     <string name="battery_dialog_title">禁用电池最佳化</string>
-    <string name="music_singlar">音乐</string>
+    <string name="music_singular">音乐</string>
     <string name="app_info_intent_error">无法打开 CloudStream 的应用程序信息。</string>
     <string name="biometric_setting_summary">使用指纹、面部 ID、PIN 码、图案和密码解锁应用程序。</string>
     <string name="test_extensions_summary">此测试仅适用于开发人员，不会验证或否认任何扩展的工作。</string>
@@ -669,8 +669,8 @@
     <string name="torrent_info">这是个 Torrent 的视频，这意味着您的视频活动可以被追踪。\n请确认您了解 Torrenting 后，再继续。</string>
     <string name="backup_path_title">备份文件夹位置</string>
     <string name="subs_edge_size">边缘大小</string>
-    <string name="audio_singluar">音频</string>
-    <string name="podcast_singluar">播客</string>
+    <string name="audio_singular">音频</string>
+    <string name="podcast_singular">播客</string>
     <string name="encoding_error">编码错误</string>
     <string name="unsupported_error">不受支持的错误</string>
     <string name="player_load_one_subtitle_online">加载第一个可用的字幕</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 374de33d2..1a47a6a63 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -273,11 +273,11 @@
     <string name="live_singular">Прамая трансляцыя</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">Відэа</string>
-    <string name="music_singlar">Музыка</string>
+    <string name="music_singular">Музыка</string>
     <string name="audio_book_singular">Аўдыякніга</string>
-    <string name="custom_media_singluar">Медыя</string>
-    <string name="audio_singluar">Аўдыя</string>
-    <string name="podcast_singluar">Падкаст</string>
+    <string name="custom_media_singular">Медыя</string>
+    <string name="audio_singular">Аўдыя</string>
+    <string name="podcast_singular">Падкаст</string>
     <string name="source_error">Памылка крыніцы</string>
     <string name="remote_error">Памылка аддаленага элемента</string>
     <string name="render_error">Памылка паказу</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 10f61e40e..495eb5e3c 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -136,9 +136,9 @@
     <string name="picture_in_picture_des">Continua la reproducció en una finestra en miniatura per sobre de altres aplicacions</string>
     <string name="player_size_settings">Botó de canvi de mida del reproductor</string>
     <string name="audio_book_singular">Audiollibre</string>
-    <string name="custom_media_singluar">Mitjà</string>
-    <string name="audio_singluar">Àudio</string>
-    <string name="podcast_singluar">Pòdcast</string>
+    <string name="custom_media_singular">Mitjà</string>
+    <string name="audio_singular">Àudio</string>
+    <string name="podcast_singular">Pòdcast</string>
     <string name="source_error">Error a l\'origen</string>
     <string name="remote_error">Error remot</string>
     <string name="render_error">Error de renderitzat</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 977fd597a..51d2379de 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -279,11 +279,11 @@
     <string name="live_singular">Transmetim live</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">Video</string>
-    <string name="music_singlar">Muzikë</string>
+    <string name="music_singular">Muzikë</string>
     <string name="audio_book_singular">Libër audio</string>
-    <string name="custom_media_singluar">Media</string>
-    <string name="audio_singluar">Audio</string>
-    <string name="podcast_singluar">Podkast</string>
+    <string name="custom_media_singular">Media</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podkast</string>
     <string name="source_error">Gabim në burim</string>
     <string name="remote_error">Gabim në distancë</string>
     <string name="render_error">Gabim në renderer</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e41c01fda..b9442082e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -288,11 +288,11 @@
     <string name="live_singular">Livestream</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="other_singular">Video</string>
-    <string name="music_singlar">Music</string>
+    <string name="music_singular">Music</string>
     <string name="audio_book_singular">Audio Book</string>
-    <string name="custom_media_singluar">Media</string>
-    <string name="audio_singluar">Audio</string>
-    <string name="podcast_singluar">Podcast</string>
+    <string name="custom_media_singular">Media</string>
+    <string name="audio_singular">Audio</string>
+    <string name="podcast_singular">Podcast</string>
     <string name="source_error">Source error</string>
     <string name="remote_error">Remote error</string>
     <string name="render_error">Renderer error</string>

From 659f639acd55c99d622d796d7a966913fc130255 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Fri, 24 Apr 2026 16:26:07 -0600
Subject: [PATCH 086/177] Add new TVType for generic Video (#2712)

---
 .../lagradost/cloudstream3/ui/result/ResultViewModel2.kt  | 1 +
 app/src/main/res/values/strings.xml                       | 1 +
 .../kotlin/com/lagradost/cloudstream3/MainAPI.kt          | 8 ++++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index d5f4d42a6..e3ff6c83b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -300,6 +300,7 @@ fun LoadResponse.toResultData(repo: APIRepository): ResultData {
                 TvType.CustomMedia -> R.string.custom_media_singular
                 TvType.Audio -> R.string.audio_singular
                 TvType.Podcast -> R.string.podcast_singular
+                TvType.Video -> R.string.video_singular
             }
         ),
         yearText = txt(year?.toString()),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b9442082e..31cf951cf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -293,6 +293,7 @@
     <string name="custom_media_singular">Media</string>
     <string name="audio_singular">Audio</string>
     <string name="podcast_singular">Podcast</string>
+    <string name="video_singular">Video</string>
     <string name="source_error">Source error</string>
     <string name="remote_error">Remote error</string>
     <string name="render_error">Renderer error</string>
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index aeab8ef9f..c590165a1 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -1064,6 +1064,8 @@ enum class TvType(value: Int?) {
 
     Audio(16),
     Podcast(17),
+    @Prerelease
+    Video(18),
 }
 
 enum class AutoDownloadMode(val value: Int) {
@@ -1079,14 +1081,15 @@ enum class AutoDownloadMode(val value: Int) {
 }
 
 /** Extension function of [TvType] to check if the type is Movie.
- * @return If the type is AnimeMovie, Live, Movie, Torrent returns true otherwise returns false.
+ * @return If the type is AnimeMovie, Live, Movie, Torrent, Video returns true otherwise returns false.
  * */
 fun TvType.isMovieType(): Boolean {
     return when (this) {
         TvType.AnimeMovie,
         TvType.Live,
         TvType.Movie,
-        TvType.Torrent -> true
+        TvType.Torrent,
+        TvType.Video -> true
 
         else -> false
     }
@@ -2162,6 +2165,7 @@ fun TvType.getFolderPrefix(): String {
         TvType.Podcast -> "Podcasts"
         TvType.Torrent -> "Torrents"
         TvType.TvSeries -> "TVSeries"
+        TvType.Video -> "Videos"
     }
 }
 

From 3bdda7d380d951a7ba8f1c1473ba374f9cdfbef5 Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Fri, 24 Apr 2026 22:29:37 +0000
Subject: [PATCH 087/177] Feat: Anime Skip (#2710)

---
 .../syncproviders/AccountManager.kt           |   5 +-
 .../cloudstream3/syncproviders/AuthRepo.kt    |   3 +
 .../ui/settings/SettingsAccount.kt            |   3 +
 .../cloudstream3/utils/videoskip/AnimeSkip.kt | 370 ++++++++++++++++++
 .../cloudstream3/utils/videoskip/SkipAPI.kt   |   2 +-
 app/src/main/res/drawable/animeskip.xml       |  36 ++
 .../res/values/donottranslate-strings.xml     |   1 +
 app/src/main/res/xml/settings_account.xml     |   3 +
 8 files changed, 421 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt
 create mode 100644 app/src/main/res/drawable/animeskip.xml

diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
index 0d95de086..3bc5f2733 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt
@@ -13,6 +13,7 @@ import com.lagradost.cloudstream3.syncproviders.providers.SimklApi
 import com.lagradost.cloudstream3.syncproviders.providers.SubDlApi
 import com.lagradost.cloudstream3.syncproviders.providers.SubSourceApi
 import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.videoskip.AnimeSkipAuth
 import java.util.concurrent.TimeUnit
 
 abstract class AccountManager {
@@ -28,6 +29,7 @@ abstract class AccountManager {
         val addic7ed = Addic7ed()
         val subDlApi = SubDlApi()
         val subSourceApi = SubSourceApi()
+        val animeSkipApi = AnimeSkipAuth()
 
         var cachedAccounts: MutableMap<String, Array<AuthData>>
         var cachedAccountIds: MutableMap<String, Int>
@@ -67,7 +69,8 @@ abstract class AccountManager {
             SyncRepo(localListApi),
             SubtitleRepo(openSubtitlesApi),
             SubtitleRepo(addic7ed),
-            SubtitleRepo(subDlApi)
+            SubtitleRepo(subDlApi),
+            PlainAuthRepo(animeSkipApi)
         )
 
         fun updateAccountIds() {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthRepo.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthRepo.kt
index 4ae629ab9..645a19e3a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthRepo.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthRepo.kt
@@ -9,6 +9,9 @@ import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.NONE_ID
 import com.lagradost.cloudstream3.utils.txt
 
+/** General-purpose repo */
+class PlainAuthRepo(api: AuthAPI) : AuthRepo(api)
+
 /** Safe abstraction for AuthAPI that provides both a catching interface, and automatic token management. */
 abstract class AuthRepo(open val api: AuthAPI) {
     fun isValidRedirectUrl(url: String) = safe { api.isValidRedirectUrl(url) } ?: false
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
index 7c24cd7a9..8d96a6b14 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
@@ -28,6 +28,7 @@ import com.lagradost.cloudstream3.databinding.AddAccountInputBinding
 import com.lagradost.cloudstream3.databinding.DeviceAuthBinding
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.animeSkipApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.kitsuApi
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.openSubtitlesApi
@@ -36,6 +37,7 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.subDlAp
 import com.lagradost.cloudstream3.syncproviders.AuthLoginResponse
 import com.lagradost.cloudstream3.syncproviders.AuthRepo
 import com.lagradost.cloudstream3.syncproviders.AuthUser
+import com.lagradost.cloudstream3.syncproviders.PlainAuthRepo
 import com.lagradost.cloudstream3.syncproviders.SubtitleRepo
 import com.lagradost.cloudstream3.syncproviders.SyncRepo
 import com.lagradost.cloudstream3.ui.BasePreferenceFragmentCompat
@@ -468,6 +470,7 @@ class SettingsAccount : BasePreferenceFragmentCompat(), BiometricCallback {
                 R.string.simkl_key to SyncRepo(simklApi),
                 R.string.opensubtitles_key to SubtitleRepo(openSubtitlesApi),
                 R.string.subdl_key to SubtitleRepo(subDlApi),
+                R.string.animeskip_key to PlainAuthRepo(animeSkipApi),
             )
 
         for ((key, api) in syncApis) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt
new file mode 100644
index 000000000..f9254576b
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/AnimeSkip.kt
@@ -0,0 +1,370 @@
+package com.lagradost.cloudstream3.utils.videoskip
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.AnimeLoadResponse
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.LoadResponse
+import com.lagradost.cloudstream3.TvSeriesLoadResponse
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.animeSkipApi
+import com.lagradost.cloudstream3.syncproviders.AuthAPI
+import com.lagradost.cloudstream3.syncproviders.AuthLoginRequirement
+import com.lagradost.cloudstream3.syncproviders.AuthLoginResponse
+import com.lagradost.cloudstream3.syncproviders.AuthToken
+import com.lagradost.cloudstream3.syncproviders.AuthUser
+import com.lagradost.cloudstream3.syncproviders.PlainAuthRepo
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import java.math.BigInteger
+import java.util.concurrent.ConcurrentHashMap
+import java.security.MessageDigest
+
+class AnimeSkipAuth : AuthAPI() {
+    override val name = "AnimeSkip"
+    override val inAppLoginRequirement: AuthLoginRequirement =
+        AuthLoginRequirement(password = true, username = true)
+    override val idPrefix = "anime-skip"
+    override val hasInApp = true
+    override val createAccountUrl = "https://anime-skip.com/account"
+    val baseClientId = "as1JgiMbW4wKfmTLWXS79iTDQFll76pk"
+    fun md5(input: String): String {
+        val md = MessageDigest.getInstance("MD5")
+        return BigInteger(1, md.digest(input.toByteArray())).toString(16).padStart(32, '0')
+    }
+
+    data class LoginRoot(
+        @JsonProperty("data")
+        val data: LoginData,
+    )
+
+    data class LoginData(
+        @JsonProperty("login")
+        val login: Login,
+    )
+
+    data class Login(
+        @JsonProperty("authToken")
+        val authToken: String,
+        @JsonProperty("refreshToken")
+        val refreshToken: String,
+        @JsonProperty("account")
+        val account: Account,
+    )
+
+    data class ApiRoot(
+        @JsonProperty("data")
+        val data: ApiData,
+    )
+
+    data class ApiData(
+        @JsonProperty("myApiClients")
+        val myApiClients: List<MyApiClient>,
+    )
+
+    data class MyApiClient(
+        @JsonProperty("id")
+        val id: String,
+    )
+
+    data class Account(
+        @JsonProperty("profileUrl")
+        val profileUrl: String,
+        @JsonProperty("username")
+        val username: String,
+        @JsonProperty("email")
+        val email: String,
+    )
+
+    data class Payload(
+        @JsonProperty("profileUrl")
+        val profileUrl: String,
+        @JsonProperty("username")
+        val username: String,
+        @JsonProperty("email")
+        val email: String,
+        @JsonProperty("clientId")
+        val clientId: String,
+    )
+
+    override suspend fun user(token: AuthToken?): AuthUser? {
+        val payload = parseJson<Payload>(token?.payload ?: return null)
+        return AuthUser(
+            name = payload.username,
+            id = payload.email.hashCode(),
+            profilePicture = payload.profileUrl
+        )
+    }
+
+    override suspend fun login(form: AuthLoginResponse): AuthToken? {
+        val hash = md5(form.password ?: return null)
+        val emailOrUserName = form.email ?: form.username ?: return null
+
+        val loginQuery = """
+    {
+      login(usernameEmail: "$emailOrUserName", passwordHash: "$hash") {
+        authToken
+        refreshToken
+        account {
+          profileUrl
+          username
+          email
+        }
+      }
+    }
+"""
+        val loginRoot = app.post(
+            "https://api.anime-skip.com/graphql",
+            json = mapOf("query" to loginQuery),
+            headers = mapOf(
+                "Accept" to "*/*",
+                "content-type" to "application/json",
+                "X-Client-ID" to baseClientId
+            )
+        ).parsed<LoginRoot>()
+
+        val authToken = loginRoot.data.login.authToken
+        val refreshToken = loginRoot.data.login.refreshToken
+        val account = loginRoot.data.login.account
+
+        val clientQuery = """
+            {
+              myApiClients {
+                id
+              }
+            }
+        """.trimIndent()
+
+        val apiRoot = app.post(
+            "https://api.anime-skip.com/graphql",
+            json = mapOf("query" to clientQuery),
+            headers = mapOf(
+                "Accept" to "*/*",
+                "content-type" to "application/json",
+                "Authorization" to "Bearer $authToken",
+                "X-Client-ID" to baseClientId
+            )
+        ).parsed<ApiRoot>()
+
+        val clientId = apiRoot.data.myApiClients.getOrNull(0)?.id
+            ?: throw ErrorLoadingException("No API token found")
+
+        val payload = Payload(
+            profileUrl = account.profileUrl,
+            username = account.username,
+            email = account.email,
+            clientId = clientId,
+        )
+        return AuthToken(
+            accessToken = authToken,
+            refreshToken = refreshToken,
+            payload = payload.toJson()
+        )
+    }
+}
+
+class AnimeSkip : SkipAPI() {
+    override val name: String = "AniSkip"
+    override val supportedTypes: Set<TvType> = setOf(TvType.Anime, TvType.OVA)
+
+    val auth = PlainAuthRepo(animeSkipApi)
+    //val clientId = "ZGfO0sMF3eCwLYf8yMSCJjlynwNGRXWE"
+
+    companion object {
+        const val MIN_LENGTH: Int = 4
+
+        private val strip = Regex("[ :\\-.!]")
+
+        /** Makes names more uniform to make partial matches more still give a result */
+        fun stripName(name: String?): String? =
+            name?.replace(strip, "")?.lowercase()
+
+        private val asciiRegex = Regex("[^a-zA-Z0-9 ]")
+
+        /** Makes names more uniform to make partial matches more still give a result */
+        fun asciiName(name: String?): String? =
+            name?.replace(asciiRegex, "")?.lowercase()
+    }
+
+    data class Root(
+        @JsonProperty("data")
+        val data: Data,
+    )
+
+    data class Data(
+        @JsonProperty("searchShows")
+        val searchShows: List<SearchShow>,
+    )
+
+    data class SearchShow(
+        @JsonProperty("name")
+        val name: String,
+        @JsonProperty("originalName")
+        val originalName: String?,
+        @JsonProperty("seasonCount")
+        val seasonCount: Long,
+        @JsonProperty("episodeCount")
+        val episodeCount: Long,
+        @JsonProperty("baseDuration")
+        val baseDuration: Double,
+        @JsonProperty("episodes")
+        val episodes: List<Episode>,
+    )
+
+    data class Episode(
+        @JsonProperty("number")
+        val number: String?,
+        @JsonProperty("absoluteNumber")
+        val absoluteNumber: String?,
+        @JsonProperty("season")
+        val season: String?,
+        @JsonProperty("timestamps")
+        val timestamps: List<Timestamp>,
+    )
+
+    data class Timestamp(
+        @JsonProperty("at")
+        val at: Double,
+        @JsonProperty("type")
+        val type: Type,
+    )
+
+    data class Type(
+        @JsonProperty("name")
+        val name: String,
+    )
+
+    val cache: ConcurrentHashMap<String, Data> = ConcurrentHashMap()
+
+    override suspend fun stamps(
+        data: LoadResponse,
+        episode: ResultEpisode,
+        episodeDurationMs: Long
+    ): List<SkipStamp>? {
+        val clientId : String = parseJson<AnimeSkipAuth.Payload>(
+            auth.authData()?.token?.payload ?: return null
+        ).clientId
+
+        when (data) {
+            is AnimeLoadResponse, is TvSeriesLoadResponse -> {
+                /** Require episode based anime */
+            }
+
+            else -> return null
+        }
+
+        val query = """{
+  searchShows(search: "${data.name}", limit: 1) {
+    name
+    originalName
+    seasonCount
+    episodeCount
+    episodes {
+      number
+      absoluteNumber
+      season
+      baseDuration
+      timestamps {
+        at
+        type {
+          name
+        }
+      }
+    }
+  }
+}"""
+        val root = cache[data.name] ?: run {
+            app.post(
+                "https://api.anime-skip.com/graphql",
+                json = mapOf("query" to query),
+                headers = mapOf(
+                    "Accept" to "*/*",
+                    "content-type" to "application/json",
+                    "X-Client-ID" to clientId
+                )
+            )
+                .parsed<Root>().data.also { root ->
+                    cache[data.name] = root
+                }
+        }
+        val show = root.searchShows.firstOrNull { show ->
+            /** Match ascii */
+            val ascii1 = asciiName(data.name)
+            val ascii2 = asciiName(show.name)
+            if (ascii1 == ascii2 && (ascii1?.length ?: 0) > MIN_LENGTH) {
+                return@firstOrNull true
+            }
+
+            if (data !is AnimeLoadResponse) {
+                return@firstOrNull false
+            }
+
+            /** Match original name */
+            val strip1 = stripName(show.originalName)
+            val strip2 = stripName(data.japName)
+
+            /** Match english name*/
+            val ascii3 = stripName(data.engName)
+            (strip1 == strip2 && (strip1?.length ?: 0) > MIN_LENGTH) ||
+                    (ascii2 == ascii3 && (ascii2?.length ?: 0) > MIN_LENGTH)
+        } ?: return null
+
+        val showEpisode = when (data) {
+            is AnimeLoadResponse -> {
+                val episodeNumber = episode.episode.toString()
+                /** For anime, match on number */
+                show.episodes.firstOrNull {
+                    it.absoluteNumber == episodeNumber
+                } ?: show.episodes.firstOrNull {
+                    it.number == episodeNumber
+                }
+            }
+
+            is TvSeriesLoadResponse -> {
+                /** For tv-series, match on season + number */
+                val seasonNumber = episode.season?.toString()
+                val episodeNumber = episode.episode.toString()
+                val episodeIndex = episode.totalEpisodeIndex.toString()
+
+                show.episodes.firstOrNull {
+                    it.season == seasonNumber && it.number == episodeNumber
+                } ?: show.episodes.firstOrNull {
+                    it.absoluteNumber == episodeIndex
+                }
+            }
+
+            else -> null
+        } ?: return null
+
+        val result = ArrayList<SkipStamp>()
+        var pending: SkipStamp? = null
+        for (stamp in showEpisode.timestamps) {
+            val startMS = (stamp.at * 1000.0).toLong()
+            pending?.let { pending ->
+                result.add(pending.copy(endMs = startMS))
+            }
+            val type = when (stamp.type.name) {
+                "Intro", "New Intro" -> SkipType.Intro
+                "Credits" -> SkipType.Credits
+                "Preview" -> SkipType.Preview
+                "Recap" -> SkipType.Recap
+                "Mixed Credits" -> SkipType.MixedEnding
+                "Filler", "Transition", "Branding", "Canon", "Title Card" -> null
+                else -> null
+            }
+            if (type == null) {
+                pending = null
+                continue
+            }
+            pending = SkipStamp(type, startMS, 0L)
+        }
+        pending?.let { pending ->
+            result.add(pending.copy(endMs = episodeDurationMs))
+            /** Base duration = fucked */
+        }
+
+        return result
+    }
+}
+
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt
index 6c7126049..60cc3ae1e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/SkipAPI.kt
@@ -61,7 +61,7 @@ abstract class SkipAPI {
     }
 
     companion object {
-        private val skipApis: List<SkipAPI> = listOf(AniSkip(), TheIntroDBSkip(), IntroDbSkip())
+        private val skipApis: List<SkipAPI> = listOf(AniSkip(), TheIntroDBSkip(), IntroDbSkip(), AnimeSkip())
         private val cachedStamps = ConcurrentHashMap<Int, List<VideoSkipStamp>>()
 
         /** Get all video timestamps from an episode */
diff --git a/app/src/main/res/drawable/animeskip.xml b/app/src/main/res/drawable/animeskip.xml
new file mode 100644
index 000000000..8f1bb3105
--- /dev/null
+++ b/app/src/main/res/drawable/animeskip.xml
@@ -0,0 +1,36 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="20dp"
+    android:height="13.8073394495dp"
+    android:tint="?attr/white"
+    android:viewportWidth="436"
+    android:viewportHeight="301">
+    <group android:name="wrapper">
+        <clip-path
+            android:name="clip0"
+            android:pathData="M 0 0.5 L 435.349 0.5 L 435.349 300.5 L 0 300.5 Z"/>
+        <group android:name="group">
+            <path
+                android:name="path"
+                android:pathData="M 125.839 10.155 C 111.48 10.155 99.84 21.796 99.84 36.156 L 99.84 58.903 C 99.536 77.757 84.157 92.948 65.231 92.948 C 46.114 92.948 30.617 108.445 30.617 127.561 C 30.617 146.678 46.114 162.175 65.231 162.175 C 84.157 162.175 99.536 177.365 99.84 196.22 L 99.84 197.356 C 99.536 216.21 84.157 231.401 65.231 231.401 L 34.613 231.401 C 15.497 231.401 0 246.898 0 266.014 C 0 285.131 15.497 300.628 34.613 300.628 L 146.839 300.628 C 156.228 300.628 163.839 293.017 163.839 283.628 L 163.839 10.155 L 125.839 10.155 Z"
+                android:fillColor="#975fe8"
+                android:strokeWidth="1"/>
+            <path
+                android:name="path_1"
+                android:pathData="M 125.839 10.155 C 111.48 10.155 99.84 21.796 99.84 36.156 L 99.84 58.903 C 99.65 70.686 93.572 81.038 84.421 87.146 C 84.35 87.21 84.263 87.275 84.159 87.339 C 70.728 95.697 61.786 110.592 61.786 127.577 C 61.786 144.128 70.278 158.697 83.142 167.163 C 93.002 173.137 99.641 183.896 99.84 196.22 L 99.84 197.356 C 99.536 216.21 84.157 231.401 65.231 231.401 L 64.613 231.401 C 45.497 231.401 30 246.898 30 266.014 C 30 285.131 45.497 300.628 64.613 300.628 L 146.839 300.628 C 156.228 300.628 163.839 293.017 163.839 283.628 L 163.839 10.155 L 125.839 10.155 Z"
+                android:fillColor="#975fe8"
+                android:strokeWidth="1"/>
+            <path
+                android:name="path_2"
+                android:pathData="M 253.526 13.499 C 240.704 6.38 228.101 0.5 216.822 0.5 L 108.821 0.5 C 90.087 0.5 74.9 15.687 74.9 34.421 C 74.9 53.155 90.087 68.342 108.821 68.342 L 177.605 68.342 C 196.339 68.342 211.526 83.529 211.526 102.263 C 211.526 120.997 196.339 136.184 177.605 136.184 L 167.344 136.184 C 148.61 136.184 133.423 151.37 133.423 170.104 C 133.423 188.838 148.61 204.025 167.344 204.025 L 181.618 204.025 C 200.352 204.025 215.539 219.212 215.539 237.946 L 215.92 236.45 L 215.92 241.642 C 215.92 271.114 248.698 288.757 273.298 272.525 L 419.362 176.148 C 440.926 161.919 440.926 130.28 419.362 116.051 L 273.298 19.674 C 267.013 15.527 260.195 13.591 253.526 13.499 Z"
+                android:fillColor="#22baff"
+                android:strokeWidth="1"/>
+            <path
+                android:name="path_3"
+                android:pathData="M 215.575 237.794 L 215.575 280.893 C 215.575 293.634 229.741 301.264 240.379 294.253 L 269.878 274.812 C 271.085 274.187 272.276 273.488 273.449 272.711 L 330.3 235.06 C 331.216 234.453 332.119 233.836 333.009 233.208 L 340.415 228.327 L 340.415 227.499 C 390.819 185.09 390.819 106.611 340.415 64.202 L 340.415 63.782 L 340.135 63.967 C 337.045 61.384 333.766 58.937 330.3 56.641 L 273.449 18.99 C 272.356 18.266 271.247 17.609 270.125 17.017 C 251.954 6.755 232.806 0.5 216.822 0.5 L 158.821 0.5 C 140.087 0.5 124.9 15.687 124.9 34.421 C 124.9 53.155 140.087 68.342 158.821 68.342 L 177.605 68.342 C 196.339 68.342 211.526 83.529 211.526 102.263 C 211.526 115.982 203.381 127.799 191.663 133.142 C 178.94 140.093 170.309 153.597 170.309 169.117 C 170.309 185.971 180.488 200.448 195.033 206.736 C 195.129 206.777 195.208 206.827 195.271 206.886 C 207.205 212.14 215.537 224.07 215.537 237.946 L 215.575 237.794 Z"
+                android:fillColor="#22baff"
+                android:strokeWidth="1"/>
+        </group>
+    </group>
+</vector>
diff --git a/app/src/main/res/values/donottranslate-strings.xml b/app/src/main/res/values/donottranslate-strings.xml
index 0b7aab4cb..6a4c82713 100644
--- a/app/src/main/res/values/donottranslate-strings.xml
+++ b/app/src/main/res/values/donottranslate-strings.xml
@@ -100,6 +100,7 @@
     <string name="kitsu_key">kitsu_key</string>
     <string name="opensubtitles_key">opensubtitles_key</string>
     <string name="subdl_key">subdl_key</string>
+    <string name="animeskip_key">animeskip_key</string>
 
     <string name="pref_category_security_key">pref_category_security_key</string>
     <string name="pref_category_gestures_key">pref_category_gestures_key</string>
diff --git a/app/src/main/res/xml/settings_account.xml b/app/src/main/res/xml/settings_account.xml
index 3b8ce2294..580090318 100644
--- a/app/src/main/res/xml/settings_account.xml
+++ b/app/src/main/res/xml/settings_account.xml
@@ -28,6 +28,9 @@
         <Preference
             android:icon="@drawable/subdl_logo_big"
             android:key="@string/subdl_key" />
+        <Preference
+            android:icon="@drawable/animeskip"
+            android:key="@string/animeskip_key" />
 
         <SwitchPreference
             android:defaultValue="false"

From 6d79b0e5d0b60dec4959cc569aa1299af5a46fc1 Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Fri, 24 Apr 2026 23:17:32 +0000
Subject: [PATCH 088/177] Fix: Remove default headers from downloads, like
 player (#2722)

---
 .../cloudstream3/utils/downloader/DownloadManager.kt     | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
index 94962de13..f1d7ed742 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
@@ -1039,14 +1039,7 @@ object VideoDownloadManager {
                 startByte = stream.startAt,
                 headers = link.headers.appendAndDontOverride(
                     mapOf(
-                        "Accept-Encoding" to "identity",
-                        "accept" to "*/*",
                         "user-agent" to USER_AGENT,
-                        "sec-ch-ua" to "\"Chromium\";v=\"91\", \" Not;A Brand\";v=\"99\"",
-                        "sec-fetch-mode" to "navigate",
-                        "sec-fetch-dest" to "video",
-                        "sec-fetch-user" to "?1",
-                        "sec-ch-ua-mobile" to "?0",
                     )
                 )
             )
@@ -1303,8 +1296,6 @@ object VideoDownloadManager {
             val m3u8 = M3u8Helper.M3u8Stream(
                 link.url, link.quality, link.headers.appendAndDontOverride(
                     mapOf(
-                        "Accept-Encoding" to "identity",
-                        "accept" to "*/*",
                         "user-agent" to USER_AGENT,
                     ) + if (link.referer.isNotBlank()) mapOf("referer" to link.referer) else emptyMap()
                 )

From 71306d4e98a36d7e063c81ff19ae819bfb3c1213 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 25 Apr 2026 16:21:36 -0600
Subject: [PATCH 089/177] [skip ci] Delete empty files (#2723)

---
 .../com/lagradost/cloudstream3/utils/DownloadFileWorkManager.kt   | 0
 .../java/com/lagradost/cloudstream3/utils/VideoDownloadHelper.kt  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/DownloadFileWorkManager.kt
 delete mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadHelper.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/DownloadFileWorkManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/DownloadFileWorkManager.kt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadHelper.kt
deleted file mode 100644
index e69de29bb..000000000

From 53345a804fafcd264f707b5eb55ace518ca3457b Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 25 Apr 2026 16:32:09 -0600
Subject: [PATCH 090/177] Enable abortOnError in lint (#2681)

---
 app/build.gradle.kts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 368445097..2466cc73d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -182,7 +182,6 @@ android {
     }
 
     lint {
-        abortOnError = false
         checkReleaseBuilds = false
     }
 

From 18d9f5c317a7c03ef0e405a367e65dd759fd5e6a Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Tue, 28 Apr 2026 15:20:43 -0600
Subject: [PATCH 091/177] Major rework to player (#2689)

---
 .../ui/player/AbstractPlayerFragment.kt       |  797 +-------
 .../cloudstream3/ui/player/CS3IPlayer.kt      |   32 +-
 .../ui/player/FullScreenPlayer.kt             | 1698 ++---------------
 .../cloudstream3/ui/player/GeneratorPlayer.kt |   91 +-
 .../ui/player/PlayerGestureHelper.kt          | 1220 ++++++++++++
 .../cloudstream3/ui/player/PlayerView.kt      |  851 +++++++++
 .../ui/result/ResultFragmentPhone.kt          |  133 +-
 .../ui/result/ResultTrailerPlayer.kt          |  167 +-
 .../main/res/layout/trailer_custom_layout.xml |    5 +-
 9 files changed, 2529 insertions(+), 2465 deletions(-)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGestureHelper.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
index 1e6d827e6..e5a460b9a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt
@@ -1,64 +1,16 @@
 package com.lagradost.cloudstream3.ui.player
 
-import android.annotation.SuppressLint
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.graphics.drawable.AnimatedImageDrawable
-import android.graphics.drawable.AnimatedVectorDrawable
-import android.media.metrics.PlaybackErrorEvent
-import android.os.Build
 import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
-import android.view.WindowManager
-import android.widget.FrameLayout
 import android.widget.ImageView
-import android.widget.ProgressBar
-import android.widget.Toast
-import androidx.annotation.LayoutRes
 import androidx.annotation.OptIn
 import androidx.annotation.StringRes
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import androidx.media3.common.PlaybackException
 import androidx.media3.common.util.UnstableApi
-import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.session.MediaSession
-import androidx.media3.ui.AspectRatioFrameLayout
-import androidx.media3.ui.DefaultTimeBar
-import androidx.media3.ui.PlayerView
 import androidx.media3.ui.SubtitleView
-import androidx.media3.ui.TimeBar
-import androidx.preference.PreferenceManager
-import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
-import com.github.rubensousa.previewseekbar.PreviewBar
-import com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
-import com.lagradost.cloudstream3.CommonActivity.isInPIPMode
-import com.lagradost.cloudstream3.CommonActivity.keyEventListener
-import com.lagradost.cloudstream3.CommonActivity.playerEventListener
-import com.lagradost.cloudstream3.CommonActivity.screenWidth
-import com.lagradost.cloudstream3.CommonActivity.showToast
-import com.lagradost.cloudstream3.ErrorLoadingException
+import androidx.viewbinding.ViewBinding
 import com.lagradost.cloudstream3.R
-import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.safe
-import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
-import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
-import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
-import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
-import com.lagradost.cloudstream3.utils.AppContextUtils
-import com.lagradost.cloudstream3.utils.AppContextUtils.requestLocalAudioFocus
-import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.UIHelper
-import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
-import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
-import java.net.SocketTimeoutException
+import com.lagradost.cloudstream3.ui.BaseFragment
 
 enum class PlayerResize(@StringRes val nameRes: Int) {
     Fit(R.string.resize_fit),
@@ -79,676 +31,131 @@ const val NEXT_WATCH_EPISODE_PERCENTAGE = 90
 const val UPDATE_SYNC_PROGRESS_PERCENTAGE = 80
 
 @OptIn(UnstableApi::class)
-abstract class AbstractPlayerFragment(
-    var player: IPlayer = CS3IPlayer()
-) : Fragment() {
-    var resizeMode: Int = 0
-    var subView: SubtitleView? = null
-    protected open var hasPipModeSupport = true
+abstract class AbstractPlayerFragment<T : ViewBinding>(
+    bindingCreator: BindingCreator<T>
+) : BaseFragment<T>(bindingCreator), PlayerView.Callbacks {
 
-    var playerPausePlayHolderHolder: FrameLayout? = null
-    var playerPausePlay: ImageView? = null
-    var playerBuffering: ProgressBar? = null
-    var playerView: PlayerView? = null
-    var piphide: FrameLayout? = null
-    var subtitleHolder: FrameLayout? = null
-    var currentPlayerStatus = CSPlayerLoading.IsBuffering
+    // Stored pre-initialization so subclasses can set them before onBindingCreated.
+    private var _player: IPlayer = CS3IPlayer()
 
-    @LayoutRes
-    protected open var layout: Int = R.layout.fragment_player
+    /** The shared [PlayerView] host that owns all player state and view references. */
+    protected var playerHostView: PlayerView? = null
 
-    open fun nextEpisode() {
-        throw NotImplementedError()
-    }
-
-    open fun prevEpisode() {
-        throw NotImplementedError()
-    }
-
-    open fun playerPositionChanged(position: Long, duration: Long) {
-        throw NotImplementedError()
-    }
-
-    open fun playerStatusChanged() {}
-
-    open fun playerDimensionsLoaded(width: Int, height: Int) {
-        throw NotImplementedError()
-    }
-
-    open fun subtitlesChanged() {
-        throw NotImplementedError()
-    }
-
-    open fun embeddedSubtitlesFetched(subtitles: List<SubtitleData>) {
-        throw NotImplementedError()
-    }
-
-    open fun onTracksInfoChanged() {
-        throw NotImplementedError()
-    }
-
-    open fun onTimestamp(timestamp: VideoSkipStamp?) {
-
-    }
-
-    open fun onTimestampSkipped(timestamp: VideoSkipStamp) {
-
-    }
-
-    open fun exitedPipMode() {
-        throw NotImplementedError()
-    }
-
-    private fun keepScreenOn(on: Boolean) {
-        if (on) {
-            activity?.window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-        } else {
-            activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-        }
-    }
-
-    private fun updateIsPlaying(
-        wasPlaying: CSPlayerLoading,
-        isPlaying: CSPlayerLoading
-    ) {
-        val isPlayingRightNow = CSPlayerLoading.IsPlaying == isPlaying
-        val isBuffering = CSPlayerLoading.IsBuffering == isPlaying
-        currentPlayerStatus = isPlaying
-
-        keepScreenOn(isPlayingRightNow || isBuffering)
-
-        if (isBuffering) {
-            playerPausePlayHolderHolder?.isVisible = false
-            playerBuffering?.isVisible = true
-        } else {
-            playerPausePlayHolderHolder?.isVisible = true
-            playerBuffering?.isVisible = false
-
-            if (isPlaying == CSPlayerLoading.IsEnded && isLayout(PHONE)) {
-                playerPausePlay?.setImageResource(R.drawable.ic_baseline_replay_24)
-            } else if (wasPlaying != isPlaying) {
-                playerPausePlay?.setImageResource(if (isPlayingRightNow) R.drawable.play_to_pause else R.drawable.pause_to_play)
-                val drawable = playerPausePlay?.drawable
-
-                var startedAnimation = false
-                if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
-                    if (drawable is AnimatedImageDrawable) {
-                        drawable.start()
-                        startedAnimation = true
-                    }
-                }
-
-                if (drawable is AnimatedVectorDrawable) {
-                    drawable.start()
-                    startedAnimation = true
-                }
-
-                if (drawable is AnimatedVectorDrawableCompat) {
-                    drawable.start()
-                    startedAnimation = true
-                }
-
-                // somehow the phone is wacked
-                if (!startedAnimation) {
-                    playerPausePlay?.setImageResource(if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play)
-                }
-            } else {
-                playerPausePlay?.setImageResource(if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play)
-            }
+    var player: IPlayer
+        get() = playerHostView?.player ?: _player
+        set(value) {
+            _player = value
+            playerHostView?.player = value
         }
 
-        PlayerPipHelper.updatePIPModeActions(
-            activity,
-            isPlaying,
-            hasPipModeSupport,
-            player.getAspectRatio()
-        )
+    val subView: SubtitleView? get() = playerHostView?.subView
+    val playerPausePlay: ImageView? get() = playerHostView?.playerPausePlay
+
+    /** The underlying [androidx.media3.ui.PlayerView] widget (named to avoid conflict with our [PlayerView]). */
+    val playerView: androidx.media3.ui.PlayerView?
+        get() = playerHostView?.exoPlayerView
+
+    var currentPlayerStatus: CSPlayerLoading
+        get() = playerHostView?.currentPlayerStatus ?: CSPlayerLoading.IsBuffering
+        set(value) { playerHostView?.currentPlayerStatus = value }
+
+    protected var mMediaSession: MediaSession?
+        get() = playerHostView?.mMediaSession
+        set(value) { playerHostView?.mMediaSession = value }
+
+    // No-op callbacks (nextEpisode, prevEpisode, etc.) are intentionally left as
+    // open so subclasses can override only what they need.  The ones below throw
+    // to make it obvious when an implementation is missing.
+
+    override fun nextEpisode() {
+        throw NotImplementedError()
+    }
+
+    override fun prevEpisode() {
+        throw NotImplementedError()
+    }
+
+    override fun playerPositionChanged(position: Long, duration: Long) {
+        throw NotImplementedError()
+    }
+
+    override fun playerDimensionsLoaded(width: Int, height: Int) {
+        throw NotImplementedError()
+    }
+
+    override fun subtitlesChanged() {
+        throw NotImplementedError()
+    }
+
+    override fun embeddedSubtitlesFetched(subtitles: List<SubtitleData>) {
+        throw NotImplementedError()
+    }
+
+    override fun onTracksInfoChanged() {
+        throw NotImplementedError()
+    }
+
+    override fun exitedPipMode() {
+        throw NotImplementedError()
+    }
+
+    override fun hasNextMirror(): Boolean {
+        throw NotImplementedError()
+    }
+
+    override fun nextMirror() {
+        throw NotImplementedError()
+    }
+
+    /** Delegates to [PlayerView.playerError] by default; override to customize. */
+    override fun playerError(exception: Throwable) {
+        playerHostView?.playerError(exception)
+    }
+
+    /** Player fragments don't need system-bar padding adjustment by default. */
+    override fun fixLayout(view: View) = Unit
+
+    override fun onBindingCreated(binding: T, savedInstanceState: Bundle?) {
+        val ctx = context ?: return
+        playerHostView = PlayerView(ctx)
+        playerHostView?.player = _player
+        playerHostView?.callbacks = this
+        playerHostView?.bindViews(binding.root)
+        playerHostView?.initialize()
     }
 
-    private var pipReceiver: BroadcastReceiver? = null
     override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean) {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode)
-        try {
-            isInPIPMode = isInPictureInPictureMode
-            if (isInPictureInPictureMode) {
-                // Hide the full-screen UI (controls, etc.) while in picture-in-picture mode.
-                piphide?.isVisible = false
-                pipReceiver = object : BroadcastReceiver() {
-                    override fun onReceive(
-                        context: Context,
-                        intent: Intent,
-                    ) {
-                        if (ACTION_MEDIA_CONTROL != intent.action) {
-                            return
-                        }
-                        player.handleEvent(
-                            CSPlayerEvent.entries[intent.getIntExtra(
-                                EXTRA_CONTROL_TYPE,
-                                0
-                            )], source = PlayerEventSource.UI
-                        )
-                    }
-                }
-
-                val filter = IntentFilter()
-                filter.addAction(ACTION_MEDIA_CONTROL)
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    activity?.registerReceiver(pipReceiver, filter, Context.RECEIVER_EXPORTED)
-                } else {
-                    @SuppressLint("UnspecifiedRegisterReceiverFlag")
-                    activity?.registerReceiver(pipReceiver, filter)
-                }
-
-                val isPlaying = player.getIsPlaying()
-                val isPlayingValue =
-                    if (isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused
-                updateIsPlaying(isPlayingValue, isPlayingValue)
-            } else {
-                // Restore the full-screen UI.
-                piphide?.isVisible = true
-                exitedPipMode()
-                pipReceiver?.let {
-                    // Prevents java.lang.IllegalArgumentException: Receiver not registered
-                    safe {
-                        activity?.unregisterReceiver(it)
-                    }
-                }
-                activity?.hideSystemUI()
-                this.view?.let { UIHelper.hideKeyboard(it) }
-            }
-        } catch (e: Exception) {
-            logError(e)
-        }
-    }
-
-    open fun hasNextMirror(): Boolean {
-        throw NotImplementedError()
-    }
-
-    open fun nextMirror() {
-        throw NotImplementedError()
-    }
-
-    private fun requestAudioFocus() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            activity?.requestLocalAudioFocus(AppContextUtils.getFocusRequest())
-        }
-    }
-
-    open fun playerError(exception: Throwable) {
-        fun showToast(message: String, gotoNext: Boolean = false) {
-            if (gotoNext && hasNextMirror()) {
-                showToast(
-                    message,
-                    Toast.LENGTH_SHORT
-                )
-                nextMirror()
-            } else {
-                showToast(
-                    context?.getString(R.string.no_links_found_toast) + "\n" + message,
-                    Toast.LENGTH_LONG
-                )
-                activity?.popCurrentPage()
-            }
-        }
-
-        val ctx = context ?: return
-        when (exception) {
-            is PlaybackException -> {
-                val msg = exception.message ?: ""
-                val errorName = exception.errorCodeName
-                when (val code = exception.errorCode) {
-                    PlaybackException.ERROR_CODE_IO_FILE_NOT_FOUND,
-                    PlaybackException.ERROR_CODE_IO_NO_PERMISSION,
-                    PlaybackException.ERROR_CODE_IO_READ_POSITION_OUT_OF_RANGE,
-                    PlaybackException.ERROR_CODE_IO_UNSPECIFIED,
-                    PlaybackException.ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED -> {
-                        showToast(
-                            "${ctx.getString(R.string.source_error)}\n$errorName ($code)\n$msg",
-                            gotoNext = true
-                        )
-                    }
-
-                    PlaybackException.ERROR_CODE_REMOTE_ERROR,
-                    PlaybackException.ERROR_CODE_IO_BAD_HTTP_STATUS,
-                    PlaybackException.ERROR_CODE_TIMEOUT,
-                    PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED,
-                    PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_TIMEOUT,
-                    PlaybackException.ERROR_CODE_IO_INVALID_HTTP_CONTENT_TYPE -> {
-                        showToast(
-                            "${ctx.getString(R.string.remote_error)}\n$errorName ($code)\n$msg",
-                            gotoNext = true
-                        )
-                    }
-
-                    PlaybackErrorEvent.ERROR_AUDIO_TRACK_INIT_FAILED,
-                    PlaybackErrorEvent.ERROR_AUDIO_TRACK_OTHER,
-                    PlaybackException.ERROR_CODE_DECODING_FAILED,
-                    PlaybackException.ERROR_CODE_AUDIO_TRACK_WRITE_FAILED,
-                    PlaybackException.ERROR_CODE_DECODER_INIT_FAILED,
-                    PlaybackException.ERROR_CODE_DECODER_QUERY_FAILED -> {
-                        showToast(
-                            "${ctx.getString(R.string.render_error)}\n$errorName ($code)\n$msg",
-                            gotoNext = true
-                        )
-                    }
-
-                    PlaybackException.ERROR_CODE_DECODING_FORMAT_UNSUPPORTED,
-                    PlaybackException.ERROR_CODE_DECODING_FORMAT_EXCEEDS_CAPABILITIES -> {
-                        showToast(
-                            "${ctx.getString(R.string.unsupported_error)}\n$errorName ($code)\n$msg",
-                            gotoNext = true
-                        )
-                    }
-
-                    PlaybackException.ERROR_CODE_PARSING_CONTAINER_MALFORMED,
-                    PlaybackException.ERROR_CODE_PARSING_MANIFEST_MALFORMED -> {
-                        showToast(
-                            "${ctx.getString(R.string.encoding_error)}\n$errorName ($code)\n$msg",
-                            gotoNext = true
-                        )
-                    }
-
-                    else -> {
-                        showToast(
-                            "${ctx.getString(R.string.unexpected_error)}\n$errorName ($code)\n$msg",
-                            gotoNext = false
-                        )
-                    }
-                }
-            }
-
-            is InvalidFileException -> {
-                showToast(
-                    "${ctx.getString(R.string.source_error)}\n${exception.message}",
-                    gotoNext = true
-                )
-            }
-
-            is SocketTimeoutException -> {
-                /**
-                 * Ensures this is run on the UI thread to prevent issues
-                 * caused by SocketTimeoutException in torrents. Running
-                 * on another thread can break player interactions or
-                 * prevent switching to the next source.
-                 */
-                activity?.runOnUiThread {
-                    showToast(
-                        "${ctx.getString(R.string.remote_error)}\n${exception.message}",
-                        gotoNext = true
-                    )
-                }
-            }
-
-            is ErrorLoadingException -> {
-                exception.message?.let {
-                    showToast(
-                        it,
-                        gotoNext = true
-                    )
-                } ?: showToast(
-                    exception.toString(),
-                    gotoNext = true
-                )
-            }
-
-            else -> {
-                exception.message?.let {
-                    showToast(
-                        it,
-                        gotoNext = false
-                    )
-                } ?: showToast(
-                    exception.toString(),
-                    gotoNext = false
-                )
-            }
-        }
-    }
-
-    private fun onSubStyleChanged(style: SaveCaptionStyle) {
-        player.updateSubtitleStyle(style)
-        // Forcefully update the subtitle encoding in case the edge size is changed
-        player.seekTime(-1)
-    }
-
-
-    @SuppressLint("UnsafeOptInUsageError")
-    open fun playerUpdated(player: Any?) {
-        if (player is ExoPlayer) {
-            context?.let { ctx ->
-                mMediaSession?.release()
-                mMediaSession = MediaSession.Builder(ctx, player)
-                    // Ensure unique ID for concurrent players
-                    .setId(System.currentTimeMillis().toString())
-                    .build()
-            }
-
-            // Necessary for multiple combined videos
-            @Suppress("DEPRECATION")
-            playerView?.setShowMultiWindowTimeBar(true)
-            playerView?.player = player
-            playerView?.performClick()
-        }
-    }
-
-    protected var mMediaSession: MediaSession? = null
-
-    // this can be used in the future for players other than exoplayer
-    //private val mMediaSessionCallback: MediaSessionCompat.Callback = object : MediaSessionCompat.Callback() {
-    //    override fun onMediaButtonEvent(mediaButtonEvent: Intent): Boolean {
-    //        val keyEvent = mediaButtonEvent.getParcelableExtra(Intent.EXTRA_KEY_EVENT) as KeyEvent?
-    //        if (keyEvent != null) {
-    //            if (keyEvent.action == KeyEvent.ACTION_DOWN) { // NO DOUBLE SKIP
-    //                val consumed = when (keyEvent.keyCode) {
-    //                    KeyEvent.KEYCODE_MEDIA_PAUSE -> callOnPause()
-    //                    KeyEvent.KEYCODE_MEDIA_PLAY -> callOnPlay()
-    //                    KeyEvent.KEYCODE_MEDIA_STOP -> callOnStop()
-    //                    KeyEvent.KEYCODE_MEDIA_NEXT -> callOnNext()
-    //                    else -> false
-    //                }
-    //                if (consumed) return true
-    //            }
-    //        }
-    //
-    //        return super.onMediaButtonEvent(mediaButtonEvent)
-    //    }
-    //}
-
-    open fun onDownload(event: DownloadEvent) = Unit
-
-    /** This receives the events from the player, if you want to append functionality you do it here,
-     * do note that this only receives events for UI changes,
-     * and returning early WONT stop it from changing in eg the player time or pause status */
-    open fun mainCallback(event: PlayerEvent) {
-        // we don't want to spam DownloadEvent
-        if (event !is DownloadEvent) {
-            Log.i(TAG, "Handle event: $event")
-        }
-        when (event) {
-            is DownloadEvent -> {
-                onDownload(event)
-            }
-
-            is ResizedEvent -> {
-                playerDimensionsLoaded(event.width, event.height)
-            }
-
-            is PlayerAttachedEvent -> {
-                playerUpdated(event.player)
-            }
-
-            is SubtitlesUpdatedEvent -> {
-                subtitlesChanged()
-            }
-
-            is TimestampSkippedEvent -> {
-                onTimestampSkipped(event.timestamp)
-            }
-
-            is TimestampInvokedEvent -> {
-                onTimestamp(event.timestamp)
-            }
-
-            is TracksChangedEvent -> {
-                onTracksInfoChanged()
-            }
-
-            is EmbeddedSubtitlesFetchedEvent -> {
-                embeddedSubtitlesFetched(event.tracks)
-            }
-
-            is ErrorEvent -> {
-                playerError(event.error)
-            }
-
-            is RequestAudioFocusEvent -> {
-                requestAudioFocus()
-            }
-
-            is EpisodeSeekEvent -> {
-                when (event.offset) {
-                    -1 -> prevEpisode()
-                    1 -> nextEpisode()
-                    else -> {}
-                }
-            }
-
-            is StatusEvent -> {
-                updateIsPlaying(wasPlaying = event.wasPlaying, isPlaying = event.isPlaying)
-                playerStatusChanged()
-            }
-
-            is PositionEvent -> {
-                playerPositionChanged(position = event.toMs, duration = event.durationMs)
-            }
-
-            is VideoEndedEvent -> {
-                context?.let { ctx ->
-                    // Only play next episode if autoplay is on (default)
-                    if (PreferenceManager.getDefaultSharedPreferences(ctx)
-                            ?.getBoolean(
-                                ctx.getString(R.string.autoplay_next_key),
-                                true
-                            ) == true
-                    ) {
-                        player.handleEvent(
-                            CSPlayerEvent.NextEpisode,
-                            source = PlayerEventSource.Player
-                        )
-                    }
-                }
-            }
-
-            is PauseEvent -> Unit
-            is PlayEvent -> Unit
-        }
-    }
-
-    @SuppressLint("SetTextI18n", "UnsafeOptInUsageError")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        resizeMode = DataStoreHelper.resizeMode
-        resize(resizeMode, false)
-
-        player.releaseCallbacks()
-        player.initCallbacks(
-            eventHandler = ::mainCallback,
-            requestedListeningPercentages = listOf(
-                SKIP_OP_VIDEO_PERCENTAGE,
-                PRELOAD_NEXT_EPISODE_PERCENTAGE,
-                NEXT_WATCH_EPISODE_PERCENTAGE,
-                UPDATE_SYNC_PROGRESS_PERCENTAGE,
-            ),
-        )
-
-        val player = player
-        if (player is CS3IPlayer) {
-            // preview bar
-            val progressBar: PreviewTimeBar? = playerView?.findViewById(R.id.exo_progress)
-            val previewImageView: ImageView? = playerView?.findViewById(R.id.previewImageView)
-            val previewFrameLayout: FrameLayout? = playerView?.findViewById(R.id.previewFrameLayout)
-            if (progressBar != null && previewImageView != null && previewFrameLayout != null) {
-                var resume = false
-                progressBar.addOnScrubListener(object : PreviewBar.OnScrubListener {
-                    override fun onScrubStart(previewBar: PreviewBar?) {
-                        val hasPreview = player.hasPreview()
-                        progressBar.isPreviewEnabled = hasPreview
-                        resume = player.getIsPlaying()
-                        if (resume) player.handleEvent(
-                            CSPlayerEvent.Pause,
-                            PlayerEventSource.Player
-                        )
-
-                        // No clashing UI
-                        if (hasPreview) {
-                            subView?.isVisible = false
-                        }
-                    }
-
-                    override fun onScrubMove(
-                        previewBar: PreviewBar?,
-                        progress: Int,
-                        fromUser: Boolean
-                    ) {
-                    }
-
-                    override fun onScrubStop(previewBar: PreviewBar?) {
-                        if (resume) player.handleEvent(CSPlayerEvent.Play, PlayerEventSource.Player)
-                        // Delay to prevent the small flicker of subtitle before seeking
-                        subView?.postDelayed({
-                            // If we are not scrubbing then show subtitles again
-                            if (previewBar == null || !previewBar.isPreviewEnabled || !previewBar.isShowingPreview) {
-                                subView?.isVisible = true
-                            }
-                        }, 200)
-                    }
-                })
-                progressBar.attachPreviewView(previewFrameLayout)
-                progressBar.setPreviewLoader { currentPosition, max ->
-                    val bitmap = player.getPreview(currentPosition.toFloat().div(max.toFloat()))
-                    previewImageView.isGone = bitmap == null
-                    previewImageView.setImageBitmap(bitmap)
-                }
-            }
-
-            subView = playerView?.findViewById(androidx.media3.ui.R.id.exo_subtitles)
-            player.initSubtitles(subView, subtitleHolder, CustomDecoder.style)
-            (player.imageGenerator as? PreviewGenerator)?.params = ImageParams.new16by9(screenWidth)
-
-            /*previewImageView?.doOnLayout {
-                (player.imageGenerator as? PreviewGenerator)?.params = ImageParams(
-                    it.measuredWidth,
-                    it.measuredHeight
-                )
-            }*/
-            /** this might seam a bit fucky and that is because it is, the seek event is captured twice, once by the player
-             * and once by the UI even if it should only be registered once by the UI */
-            playerView?.findViewById<DefaultTimeBar>(R.id.exo_progress)
-                ?.addListener(object : TimeBar.OnScrubListener {
-                    override fun onScrubStart(timeBar: TimeBar, position: Long) = Unit
-                    override fun onScrubMove(timeBar: TimeBar, position: Long) = Unit
-                    override fun onScrubStop(timeBar: TimeBar, position: Long, canceled: Boolean) {
-                        if (canceled) return
-                        val playerDuration = player.getDuration() ?: return
-                        val playerPosition = player.getPosition() ?: return
-                        mainCallback(
-                            PositionEvent(
-                                source = PlayerEventSource.UI,
-                                durationMs = playerDuration,
-                                fromMs = playerPosition,
-                                toMs = position
-                            )
-                        )
-                    }
-                })
-
-            SubtitlesFragment.applyStyleEvent += ::onSubStyleChanged
-
-            try {
-                context?.let { ctx ->
-                    val settingsManager = PreferenceManager.getDefaultSharedPreferences(
-                        ctx
-                    )
-
-                    val currentPrefCacheSize =
-                        settingsManager.getInt(getString(R.string.video_buffer_size_key), 0)
-                    val currentPrefDiskSize =
-                        settingsManager.getInt(getString(R.string.video_buffer_disk_key), 0)
-                    val currentPrefBufferSec =
-                        settingsManager.getInt(getString(R.string.video_buffer_length_key), 0)
-
-                    player.cacheSize = currentPrefCacheSize * 1024L * 1024L
-                    player.simpleCacheSize = currentPrefDiskSize * 1024L * 1024L
-                    player.videoBufferMs = currentPrefBufferSec * 1000L
-                }
-            } catch (e: Exception) {
-                logError(e)
-            }
-        }
-
-        /*context?.let { ctx ->
-            player.loadPlayer(
-                ctx,
-                false,
-                ExtractorLink(
-                    "idk",
-                    "bunny",
-                    "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
-                    "",
-                    Qualities.P720.value,
-                    false
-                ),
-            )
-        }*/
+        playerHostView?.onPictureInPictureModeChanged(isInPictureInPictureMode, activity)
     }
 
     override fun onDestroy() {
-        player.release()
-        player.releaseCallbacks()
-        player = CS3IPlayer()
-
-        playerEventListener = null
-        keyEventListener = null
-
-        PlayerPipHelper.updatePIPModeActions(activity, CSPlayerLoading.IsPaused, false, null)
-
-        mMediaSession?.release()
-        mMediaSession = null
-        playerView?.player = null
-        SubtitlesFragment.applyStyleEvent -= ::onSubStyleChanged
-
-        keepScreenOn(false)
+        playerHostView?.release()
         super.onDestroy()
     }
 
-    fun nextResize() {
-        resizeMode = (resizeMode + 1) % PlayerResize.entries.size
-        resize(resizeMode, true)
-    }
-
-    fun resize(resize: Int, showToast: Boolean) {
-        resize(PlayerResize.entries[resize], showToast)
-    }
-
-    @SuppressLint("UnsafeOptInUsageError")
-    open fun resize(resize: PlayerResize, showToast: Boolean) {
-        DataStoreHelper.resizeMode = resize.ordinal
-        val type = when (resize) {
-            PlayerResize.Fill -> AspectRatioFrameLayout.RESIZE_MODE_FILL
-            PlayerResize.Fit -> AspectRatioFrameLayout.RESIZE_MODE_FIT
-            PlayerResize.Zoom -> AspectRatioFrameLayout.RESIZE_MODE_ZOOM
-        }
-        playerView?.resizeMode = type
-
-        if (showToast)
-            showToast(resize.nameRes, Toast.LENGTH_SHORT)
+    override fun onPause() {
+        playerHostView?.releaseKeyEventListener()
+        super.onPause()
     }
 
     override fun onStop() {
-        player.onStop()
+        playerHostView?.onStop()
         super.onStop()
     }
 
     override fun onResume() {
         context?.let { ctx ->
-            player.onResume(ctx)
+            playerHostView?.onResume(ctx)
         }
-
         super.onResume()
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        val root = inflater.inflate(layout, container, false)
-        playerPausePlayHolderHolder = root.findViewById(R.id.player_pause_play_holder_holder)
-        playerPausePlay = root.findViewById(R.id.player_pause_play)
-        playerBuffering = root.findViewById(R.id.player_buffering)
-        playerView = root.findViewById(R.id.player_view)
-        piphide = root.findViewById(R.id.piphide)
-        subtitleHolder = root.findViewById(R.id.subtitle_holder)
-        return root
+    fun nextResize() {
+        playerHostView?.nextResize()
     }
-}
\ No newline at end of file
+
+    open fun resize(resize: PlayerResize, showToast: Boolean) {
+        playerHostView?.resize(resize, showToast)
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index 4323c98fd..1bd9ef87d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -247,23 +247,6 @@ class CS3IPlayer : IPlayer {
         }
     }
 
-    // I know, this is not a perfect solution, however it works for fixing subs
-    private fun reloadSubs() {
-        exoPlayer?.applicationLooper?.let {
-            try {
-                Handler(it).post {
-                    try {
-                        seekTime(1L, source = PlayerEventSource.Player)
-                    } catch (e: Exception) {
-                        logError(e)
-                    }
-                }
-            } catch (e: Exception) {
-                logError(e)
-            }
-        }
-    }
-
     fun String.stripTrackId(): String {
         return this.replace(Regex("""^\d+:"""), "")
     }
@@ -432,9 +415,9 @@ class CS3IPlayer : IPlayer {
      * Gets all supported formats in a list
      * */
     private fun List<Tracks.Group>.getFormats(): List<Pair<Format, Int>> {
-        return this.map {
+        return this.flatMap {
             it.getFormats()
-        }.flatten()
+        }
     }
 
     private fun Tracks.Group.getFormats(): List<Pair<Format, Int>> {
@@ -1110,7 +1093,7 @@ class CS3IPlayer : IPlayer {
                         .setFallbackMinPlaybackSpeed(0.97f)
                         .build()
                 )
-                .setRenderersFactory { eventHandler, videoRendererEventListener, audioRendererEventListener, textRendererOutput, metadataRendererOutput ->
+                .setRenderersFactory { eventHandler, videoRendererEventListener, audioRendererEventListener, _, metadataRendererOutput ->
                     val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
                     val current = settingsManager.getInt(
                         context.getString(R.string.software_decoding_key),
@@ -1144,7 +1127,7 @@ class CS3IPlayer : IPlayer {
                     // Custom TextOutput to apply cue styling and rules to all subtitles
                     val customTextOutput = TextOutput { cue ->
                         // Do not remove filterNotNull as Java typesystem is fucked
-                        val (bitmapCues, textCues) = cue.cues.filterNotNull()
+                        val (bitmapCues, textCues) = cue.cues.toList()
                             .partition { it.bitmap != null }
 
                         val styledBitmapCues = bitmapCues.map { bitmapCue ->
@@ -1351,7 +1334,7 @@ class CS3IPlayer : IPlayer {
         } else {
             try {
                 val source = ConcatenatingMediaSource2.Builder()
-                mediaItemSlices.map { item ->
+                mediaItemSlices.forEach { item ->
                     source.add(
                         // The duration MUST be known for it to work properly, see https://github.com/google/ExoPlayer/issues/4727
                         ClippingMediaSource(
@@ -1365,7 +1348,7 @@ class CS3IPlayer : IPlayer {
                 @Suppress("DEPRECATION")
                 val source =
                     ConcatenatingMediaSource() // FIXME figure out why ConcatenatingMediaSource2 seems to fail with Torrents only
-                mediaItemSlices.map { item ->
+                mediaItemSlices.forEach { item ->
                     source.addMediaSource(
                         // The duration MUST be known for it to work properly, see https://github.com/google/ExoPlayer/issues/4727
                         ClippingMediaSource(
@@ -1837,7 +1820,7 @@ class CS3IPlayer : IPlayer {
                                 defaultSet
                             )
                             ?.mapNotNull { it.toIntOrNull() ?: return@mapNotNull null }
-                    } catch (e: Throwable) {
+                    } catch (_: Throwable) {
                         null
                     } ?: default
 
@@ -2038,4 +2021,3 @@ class CS3IPlayer : IPlayer {
     }
 
 }
-
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 8699202b9..1ca4c7257 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -1,7 +1,6 @@
 package com.lagradost.cloudstream3.ui.player
 
 import android.animation.ObjectAnimator
-import android.animation.ValueAnimator
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Dialog
@@ -11,63 +10,43 @@ import android.content.pm.ActivityInfo
 import android.content.res.ColorStateList
 import android.content.res.Configuration
 import android.graphics.Color
-import android.graphics.Matrix
-import android.media.AudioManager
-import android.media.audiofx.LoudnessEnhancer
 import android.os.Build
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.provider.Settings
 import android.text.Editable
-import android.text.format.DateUtils
 import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.MotionEvent
-import android.view.ScaleGestureDetector
 import android.view.Surface
 import android.view.View
 import android.view.ViewGroup
-import android.view.WindowInsets
 import android.view.WindowManager
-import android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.view.animation.AlphaAnimation
-import android.view.animation.Animation
-import android.view.animation.AnimationUtils
 import android.view.animation.DecelerateInterpolator
 import android.widget.LinearLayout
 import androidx.annotation.OptIn
 import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
 import androidx.core.graphics.blue
 import androidx.core.graphics.green
 import androidx.core.graphics.red
 import androidx.core.view.children
 import androidx.core.view.isGone
-import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import androidx.media3.common.MimeTypes
 import androidx.media3.common.util.UnstableApi
-import androidx.media3.exoplayer.ExoPlayer
-import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.SimpleItemAnimator
 import com.google.android.material.button.MaterialButton
-import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.CommonActivity.keyEventListener
 import com.lagradost.cloudstream3.CommonActivity.playerEventListener
-import com.lagradost.cloudstream3.CommonActivity.screenHeightWithOrientation
-import com.lagradost.cloudstream3.CommonActivity.screenWidthWithOrientation
-import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentPlayerBinding
 import com.lagradost.cloudstream3.databinding.PlayerCustomLayoutBinding
 import com.lagradost.cloudstream3.databinding.SpeedDialogBinding
 import com.lagradost.cloudstream3.databinding.SubtitleOffsetBinding
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer.Companion.subsProvidersIsActive
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
@@ -75,74 +54,38 @@ import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.isUsingMobileData
+import com.lagradost.cloudstream3.utils.AppContextUtils.shouldShowPlayerMetadata
 import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
 import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
 import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
-import com.lagradost.cloudstream3.utils.UIHelper.getNavigationBarHeight
-import com.lagradost.cloudstream3.utils.UIHelper.getStatusBarHeight
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
-import com.lagradost.cloudstream3.utils.UIHelper.showSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
-import com.lagradost.cloudstream3.utils.UserPreferenceDelegate
-import com.lagradost.cloudstream3.utils.Vector2
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.txt
-import kotlin.math.abs
-import kotlin.math.absoluteValue
-import kotlin.math.ceil
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.round
 import kotlin.math.roundToInt
-import com.lagradost.cloudstream3.utils.AppContextUtils.shouldShowPlayerMetadata
 
-
-// You can zoom out more than 100%, but it will zoom back into 100%
-const val MINIMUM_ZOOM = 0.95f
-
-// How sensitive the auto zoom is to center at the min zoom
-const val ZOOM_SNAP_SENSITIVITY = 0.07f
-
-// Maximum zoom to avoid getting lost
-const val MAXIMUM_ZOOM = 4.0f
-
-const val MINIMUM_SEEK_TIME = 7000L         // when swipe seeking
-const val MINIMUM_VERTICAL_SWIPE = 2.0f     // in percentage
-const val MINIMUM_HORIZONTAL_SWIPE = 2.0f   // in percentage
-const val VERTICAL_MULTIPLIER = 2.0f
-const val HORIZONTAL_MULTIPLIER = 2.0f
-const val DOUBLE_TAB_MAXIMUM_HOLD_TIME = 200L
-const val DOUBLE_TAB_MINIMUM_TIME_BETWEEN = 200L    // this also affects the UI show response time
-const val DOUBLE_TAB_PAUSE_PERCENTAGE = 0.15        // in both directions
 private const val SUBTITLE_DELAY_BUNDLE_KEY = "subtitle_delay"
 
 // All the UI Logic for the player
 @OptIn(UnstableApi::class)
-open class FullScreenPlayer : AbstractPlayerFragment() {
-    private var isVerticalOrientation: Boolean = false
+open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
+    BindingCreator.Bind(FragmentPlayerBinding::bind)
+) {
+    override fun pickLayout(): Int = R.layout.fragment_player
     protected open var lockRotation = true
-    protected open var isFullScreenPlayer = true
     protected var playerBinding: PlayerCustomLayoutBinding? = null
-    protected var brightnessOverlay: View? = null
-
-    private var durationMode: Boolean by UserPreferenceDelegate("duration_mode", false)
 
     // state of player UI
     protected var isShowing = false
-    private var uiShowingBeforeGesture = false
     protected var isLocked = false
     protected var timestampShowState = false
     private var metadataVisibilityToken = 0
     protected var hasEpisodes = false
         private set
-    // protected val hasEpisodes
-    //    get() = episodes.isNotEmpty()
-
-    // options for player
 
     /**
      * Default profile 1
@@ -151,23 +94,13 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
      **/
     protected var currentQualityProfile = 1
 
-    //    protected var currentPrefQuality =
-//        Qualities.P2160.value // preferred maximum quality, used for ppl w bad internet or on cell
-    protected var extraBrightnessEnabled = false
-    protected var fastForwardTime = 10000L
     protected var androidTVInterfaceOffSeekTime = 10000L
     protected var androidTVInterfaceOnSeekTime = 30000L
-    protected var swipeHorizontalEnabled = false
-    protected var swipeVerticalEnabled = false
     protected var playBackSpeedEnabled = false
     protected var playerResizeEnabled = false
-    protected var doubleTapEnabled = false
-    protected var doubleTapPauseEnabled = true
     protected var playerRotateEnabled = false
     protected var rotatedManually = false
-    protected var autoPlayerRotateEnabled = false
     private var hideControlsNames = false
-    protected var speedupEnabled = false
     protected var subtitleDelay
         set(value) = try {
             player.setSubtitleOffset(-value)
@@ -181,65 +114,10 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             0L
         }
 
-    // private var useSystemBrightness = false
-    protected var useTrueSystemBrightness = true
-    private val fullscreenNotch = true // TODO SETTING
-
-    private var statusBarHeight: Int? = null
-    private var navigationBarHeight: Int? = null
-
-    private val brightnessIcons = listOf(
-        R.drawable.sun_1,
-        R.drawable.sun_2,
-        R.drawable.sun_3,
-        R.drawable.sun_4,
-        R.drawable.sun_5,
-        R.drawable.sun_6,
-        R.drawable.sun_7,
-        // R.drawable.ic_baseline_brightness_1_24,
-        // R.drawable.ic_baseline_brightness_2_24,
-        // R.drawable.ic_baseline_brightness_3_24,
-        // R.drawable.ic_baseline_brightness_4_24,
-        // R.drawable.ic_baseline_brightness_5_24,
-        // R.drawable.ic_baseline_brightness_6_24,
-        // R.drawable.ic_baseline_brightness_7_24,
-    )
-
-    private val volumeIcons = listOf(
-        R.drawable.ic_baseline_volume_mute_24,
-        R.drawable.ic_baseline_volume_down_24,
-        R.drawable.ic_baseline_volume_up_24,
-    )
-
     private var isShowingEpisodeOverlay: Boolean = false
     private var previousPlayStatus: Boolean = false
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        val root = super.onCreateView(inflater, container, savedInstanceState) ?: return null
-        playerBinding = PlayerCustomLayoutBinding.bind(root.findViewById(R.id.player_holder))
 
-        // Inject the overlay from a separate XML into the PlayerView content frame
-        safe {
-            val pv = root.findViewById<androidx.media3.ui.PlayerView>(R.id.player_view)
-            val packageName = context?.packageName ?: return@safe
-            val contentId = resources.getIdentifier("exo_content_frame", "id", packageName)
-            val contentFrame = pv?.findViewById<ViewGroup>(contentId)
-            if (contentFrame != null) {
-                brightnessOverlay = contentFrame.findViewById<View>(R.id.extra_brightness_overlay)
-                brightnessOverlay = LayoutInflater.from(context).inflate(
-                    R.layout.extra_brightness_overlay,
-                    contentFrame,
-                    false
-                )
-                contentFrame.addView(brightnessOverlay)
-                requestUpdateBrightnessOverlayOnNextLayout()
-            }
-        }
-        return root
-    }
+    override fun fixLayout(view: View) = Unit
 
     /**
      * Wet code but this can not be made into a function as it is a setter.
@@ -342,108 +220,12 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
     }
 
-    @SuppressLint("UnsafeOptInUsageError")
-    override fun playerUpdated(player: Any?) {
-        super.playerUpdated(player)
-    }
-
     override fun onDestroyView() {
-        // Clean up brightness overlay if created
-        safe {
-            // remove overlay if present
-            brightnessOverlay?.let { overlay ->
-                val oParent = overlay.parent as? ViewGroup
-                oParent?.removeView(overlay)
-            }
-        }
-        brightnessOverlay = null
+        playerHostView?.releaseOverlayLayoutListener()
         playerBinding = null
         super.onDestroyView()
     }
 
-    /**
-     * Resize/position the brightness overlay to exactly match the visible video surface.
-     * This copies the video surface size, scale and translation so the overlay won't cover
-     * letterbox/pillarbox areas when zooming or panning.
-     */
-    private fun updateBrightnessOverlayBounds() {
-        val overlay = brightnessOverlay ?: return
-        val pv = playerView ?: return
-        val video = pv.videoSurfaceView ?: return
-
-        // Compute accurate transformed bounding box of the video view after scale+translation
-        val vw = video.width.toFloat()
-        val vh = video.height.toFloat()
-        val sx = video.scaleX
-        val sy = video.scaleY
-        if (vw > 0f && vh > 0f) {
-            // pivot defaults to center if not set
-            val pivotX = if (video.pivotX != 0f) video.pivotX else vw * 0.5f
-            val pivotY = if (video.pivotY != 0f) video.pivotY else vh * 0.5f
-            // Use view position (includes translation) as base; avoid double-counting translation
-            val tx = video.x
-            val ty = video.y
-
-            // transform function for a local point (lx,ly)
-            fun transform(lx: Float, ly: Float): Pair<Float, Float> {
-                val gx = tx + pivotX + (lx - pivotX) * sx
-                val gy = ty + pivotY + (ly - pivotY) * sy
-                return Pair(gx, gy)
-            }
-
-            val p0 = transform(0f, 0f)
-            val p1 = transform(vw, 0f)
-            val p2 = transform(0f, vh)
-            val p3 = transform(vw, vh)
-
-            val minX = min(min(p0.first, p1.first), min(p2.first, p3.first))
-            val maxX = max(max(p0.first, p1.first), max(p2.first, p3.first))
-            val minY = min(min(p0.second, p1.second), min(p2.second, p3.second))
-            val maxY = max(max(p0.second, p1.second), max(p2.second, p3.second))
-
-            val newW = ceil(maxX - minX).toInt().coerceAtLeast(0)
-            val newH = ceil(maxY - minY).toInt().coerceAtLeast(0)
-
-            val lp = overlay.layoutParams
-            if (lp == null) {
-                overlay.layoutParams = ViewGroup.LayoutParams(newW, newH)
-            } else {
-                if (lp.width != newW || lp.height != newH) {
-                    lp.width = newW
-                    lp.height = newH
-                    overlay.layoutParams = lp
-                }
-            }
-
-            overlay.scaleX = 1.0f
-            overlay.scaleY = 1.0f
-            overlay.x = minX
-            overlay.y = minY
-        }
-    }
-
-    /**
-     * Ensure the overlay is updated once the next layout pass completes.
-     * Adds a one-time global layout listener (PiP/resizing/rotation frames).
-     */
-    private fun requestUpdateBrightnessOverlayOnNextLayout() {
-        val pv = playerView ?: return
-        safe {
-            val obs = pv.viewTreeObserver
-            val listener = object : android.view.ViewTreeObserver.OnGlobalLayoutListener {
-                override fun onGlobalLayout() {
-                    safe {
-                        updateBrightnessOverlayBounds()
-                    }
-                    if (obs.isAlive) {
-                        obs.removeOnGlobalLayoutListener(this)
-                    }
-                }
-            }
-            if (obs.isAlive) obs.addOnGlobalLayoutListener(listener)
-        }
-    }
-
     open fun showMirrorsDialogue() {
         throw NotImplementedError()
     }
@@ -468,43 +250,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         return false
     }
 
-    /**
-     * [isValidTouch] should be called on a [View] spanning across the screen for reliable results.
-     *
-     * Android has supported gesture navigation properly since API-30. We get the absolute screen dimens using
-     * [WindowManager.getCurrentWindowMetrics] and remove the stable insets
-     * {[WindowInsets.getInsetsIgnoringVisibility]} to get a safe perimeter.
-     * This approach supports any and all types of necessary system insets.
-     *
-     * @return false if the touch is on the status bar or navigation bar
-     * */
-    private fun View.isValidTouch(rawX: Float, rawY: Float): Boolean {
-        // NOTE: screenWidth is without the navbar width when 3button nav is turned on.
-        if (Build.VERSION.SDK_INT >= 30) {
-            // real = absolute dimen without any default deductions like navbar width
-            val windowMetrics =
-                (context?.getSystemService(Context.WINDOW_SERVICE) as? WindowManager)?.currentWindowMetrics
-            val realScreenHeight =
-                windowMetrics?.let { windowMetrics.bounds.bottom - windowMetrics.bounds.top }
-                    ?: screenHeightWithOrientation
-            val realScreenWidth =
-                windowMetrics?.let { windowMetrics.bounds.right - windowMetrics.bounds.left }
-                    ?: screenWidthWithOrientation
-
-            val insets =
-                rootWindowInsets.getInsetsIgnoringVisibility(WindowInsets.Type.systemBars())
-            val isOutsideHeight = rawY < insets.top || rawY > (realScreenHeight - insets.bottom)
-            val isOutsideWidth = if (windowMetrics == null) {
-                rawX < screenWidthWithOrientation
-            } else rawX < insets.left || rawX > realScreenWidth - insets.right
-
-            return !(isOutsideWidth || isOutsideHeight)
-        } else {
-            val statusHeight = statusBarHeight ?: 0
-            return rawY > statusHeight && rawX < screenWidthWithOrientation
-        }
-    }
-
     override fun exitedPipMode() {
         animateLayoutChanges()
     }
@@ -601,25 +346,10 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             }
 
             if (!isLocked) {
-                playerFfwdHolder.alpha = 1f
-                playerRewHolder.alpha = 1f
-                // player_pause_play_holder?.alpha = 1f
+                playerHostView?.gestureHelper?.animateCenterControls(fadeTo)
                 shadowOverlay.isVisible = true
                 shadowOverlay.startAnimation(fadeAnimation)
-                playerFfwdHolder.startAnimation(fadeAnimation)
-                playerRewHolder.startAnimation(fadeAnimation)
-                playerPausePlay.startAnimation(fadeAnimation)
                 downloadBothHeader.startAnimation(fadeAnimation)
-
-                /*if (isBuffering) {
-                        player_pause_play?.isVisible = false
-                        player_pause_play_holder?.isVisible = false
-                    } else {
-                        player_pause_play?.isVisible = true
-                        player_pause_play_holder?.startAnimation(fadeAnimation)
-                        player_pause_play?.startAnimation(fadeAnimation)
-                    }*/
-                // player_buffering?.startAnimation(fadeAnimation)
             }
 
             bottomPlayerBar.startAnimation(fadeAnimation)
@@ -647,7 +377,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             Configuration.ORIENTATION_PORTRAIT ->
                 ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
 
-            else -> dynamicOrientation()
+            else -> playerHostView?.dynamicOrientation() ?: return
         }
         activity.requestedOrientation = orientation
     }
@@ -661,14 +391,14 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             Configuration.ORIENTATION_PORTRAIT ->
                 ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
 
-            else -> dynamicOrientation()
+            else -> playerHostView?.dynamicOrientation() ?: return
         }
         activity.requestedOrientation = orientation
     }
 
-    open fun lockOrientation(activity: Activity) {
-        @Suppress("DEPRECATION")
+    private fun lockOrientation(activity: Activity) {
         val display = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R)
+            @Suppress("DEPRECATION")
             (activity.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay
         else activity.display!!
         val rotation = display.rotation
@@ -689,7 +419,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                     else
                         ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT
 
-            else -> orientation = dynamicOrientation()
+            else -> orientation = playerHostView?.dynamicOrientation() ?: return
         }
         activity.requestedOrientation = orientation
     }
@@ -701,51 +431,35 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                     lockOrientation(this)
                 } else {
                     if (ignoreDynamicOrientation || rotatedManually) {
-                        // restore when lock is disabled
+                        // Restore when lock is disabled.
                         restoreOrientationWithSensor(this)
                     } else {
-                        this.requestedOrientation = dynamicOrientation()
+                        this.requestedOrientation = playerHostView?.dynamicOrientation() ?: return@apply
                     }
                 }
             }
         }
     }
 
-    protected fun enterFullscreen() {
-        if (isFullScreenPlayer) {
-            activity?.hideSystemUI()
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && fullscreenNotch) {
-                val params = activity?.window?.attributes
-                params?.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
-                activity?.window?.attributes = params
+    private fun setupKeyEventListener() {
+        keyEventListener = { eventNav ->
+            val (event, hasNavigated) = eventNav
+            when {
+                event == null -> false
+                event.action == KeyEvent.ACTION_DOWN &&
+                    (event.keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
+                     event.keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) ->
+                    playerHostView?.handleVolumeKey(event.keyCode) ?: false
+                player.isActive() -> handleKeyEvent(event, hasNavigated)
+                else -> false
             }
         }
-        updateOrientation()
-    }
-
-    protected fun exitFullscreen() {
-        resetZoomToDefault()
-        // if (lockRotation)
-        activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER
-
-        // simply resets brightness and notch settings that might have been overridden
-        val lp = activity?.window?.attributes
-        lp?.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            lp?.layoutInDisplayCutoutMode =
-                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT
-        }
-        activity?.window?.attributes = lp
-        activity?.showSystemUI()
-    }
-
-    private fun resetZoomToDefault() {
-        if (zoomMatrix != null) resize(PlayerResize.Fit, false)
     }
 
     override fun onResume() {
-        enterFullscreen()
-        verifyVolume()
+        playerHostView?.enterFullscreen { updateOrientation() }
+        setupKeyEventListener()
+        playerHostView?.verifyVolume()
         activity?.attachBackPressedCallback("FullScreenPlayer") {
             if (isShowingEpisodeOverlay) {
                 // isShowingEpisodeOverlay pauses, so this makes it easier to unpause
@@ -761,7 +475,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 activity?.popCurrentPage("FullScreenPlayer")
             }
         }
-        requestUpdateBrightnessOverlayOnNextLayout()
+        playerHostView?.requestUpdateBrightnessOverlayOnNextLayout()
         super.onResume()
     }
 
@@ -771,7 +485,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     }
 
     override fun onDestroy() {
-        exitFullscreen()
+        playerHostView?.exitFullscreen()
         super.onDestroy()
     }
 
@@ -816,22 +530,9 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
 
         var currentOffset = subtitleDelay
         binding.apply {
-            var subtitleAdapter: SubtitleOffsetItemAdapter? = null
-
             subtitleOffsetInput.doOnTextChanged { text, _, _, _ ->
                 text?.toString()?.toLongOrNull()?.let { time ->
                     currentOffset = time
-
-                    // Scroll to the first active subtitle
-                    val playerPosition = player.getPosition() ?: 0
-                    val totalPosition = playerPosition - currentOffset
-                    subtitleAdapter?.updateTime(totalPosition)
-
-                    subtitleAdapter?.getLatestActiveItem(totalPosition)
-                        ?.let { subtitlePos ->
-                            subtitleOffsetRecyclerview.scrollToPosition(subtitlePos)
-                        }
-
                     val str = when {
                         time > 0L -> {
                             txt(R.string.subtitle_offset_extra_hint_later_format, time)
@@ -857,7 +558,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             noSubtitlesLoadedNotice.isVisible = subtitles.isEmpty()
 
             val initialSubtitlePosition = (player.getPosition() ?: 0) - currentOffset
-            subtitleAdapter =
+            val subtitleAdapter =
                 SubtitleOffsetItemAdapter(initialSubtitlePosition) { subtitleCue ->
                     val playerPosition = player.getPosition() ?: 0
                     subtitleOffsetInput.text = Editable.Factory.getInstance()
@@ -898,8 +599,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
 
             dialog.setOnDismissListener {
                 selectSubtitlesDialog = null
-                if (isFullScreenPlayer)
-                    activity?.hideSystemUI()
+                activity?.hideSystemUI()
             }
             applyBtt.setOnClickListener {
                 selectSubtitlesDialog = null
@@ -920,7 +620,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
     }
 
-
     @SuppressLint("SetTextI18n")
     fun updateSpeedDialogBinding(binding: SpeedDialogBinding) {
         val speed = player.getPlaybackSpeed()
@@ -964,7 +663,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             updateSpeedDialogBinding(binding)
         }
 
-        binding.speedBar.addOnChangeListener { slider, value, fromUser ->
+        binding.speedBar.addOnChangeListener { _, value, fromUser ->
             if (fromUser) {
                 setPlayBackSpeed(value)
                 updateSpeedDialogBinding(binding)
@@ -972,8 +671,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
 
         val dismiss = DialogInterface.OnDismissListener {
-            if (isFullScreenPlayer)
-                activity?.hideSystemUI()
+            activity?.hideSystemUI()
             if (isPlaying) {
                 player.handleEvent(CSPlayerEvent.Play, PlayerEventSource.UI)
             }
@@ -997,90 +695,10 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         //}
     }
 
-    fun resetRewindText() {
-        playerBinding?.exoRewText?.text =
-            getString(R.string.rew_text_regular_format).format(fastForwardTime / 1000)
-    }
-
-    fun resetFastForwardText() {
-        playerBinding?.exoFfwdText?.text =
-            getString(R.string.ffw_text_regular_format).format(fastForwardTime / 1000)
-    }
-
-    private fun rewind() {
-        try {
-            playerBinding?.apply {
-                playerCenterMenu.isGone = false
-                playerRewHolder.alpha = 1f
-
-                val rotateLeft = AnimationUtils.loadAnimation(context, R.anim.rotate_left)
-                playerRew.startAnimation(rotateLeft)
-
-                val goLeft = AnimationUtils.loadAnimation(context, R.anim.go_left)
-                goLeft.setAnimationListener(object : Animation.AnimationListener {
-                    override fun onAnimationStart(animation: Animation?) {}
-
-                    override fun onAnimationRepeat(animation: Animation?) {}
-
-                    override fun onAnimationEnd(animation: Animation?) {
-                        exoRewText.post {
-                            resetRewindText()
-                            playerCenterMenu.isGone = !isShowing
-                            playerRewHolder.alpha = if (isShowing) 1f else 0f
-                        }
-                    }
-                })
-                exoRewText.startAnimation(goLeft)
-                exoRewText.text =
-                    getString(R.string.rew_text_format).format(fastForwardTime / 1000)
-            }
-            player.seekTime(-fastForwardTime)
-        } catch (e: Exception) {
-            logError(e)
-        }
-    }
-
-    private fun fastForward() {
-        try {
-            playerBinding?.apply {
-                playerCenterMenu.isGone = false
-                playerFfwdHolder.alpha = 1f
-
-                val rotateRight = AnimationUtils.loadAnimation(context, R.anim.rotate_right)
-                playerFfwd.startAnimation(rotateRight)
-
-                val goRight = AnimationUtils.loadAnimation(context, R.anim.go_right)
-                goRight.setAnimationListener(object : Animation.AnimationListener {
-                    override fun onAnimationStart(animation: Animation?) {}
-
-                    override fun onAnimationRepeat(animation: Animation?) {}
-
-                    override fun onAnimationEnd(animation: Animation?) {
-                        exoFfwdText.post {
-                            resetFastForwardText()
-                            playerCenterMenu.isGone = !isShowing
-                            playerFfwdHolder.alpha = if (isShowing) 1f else 0f
-                        }
-                    }
-                })
-                exoFfwdText.startAnimation(goRight)
-                exoFfwdText.text =
-                    getString(R.string.ffw_text_format).format(fastForwardTime / 1000)
-            }
-            player.seekTime(fastForwardTime)
-        } catch (e: Exception) {
-            logError(e)
-        }
-    }
-
     private fun onClickChange() {
         isShowing = !isShowing
-        if (isShowing) {
-            playerBinding?.playerIntroPlay?.isGone = true
-            autoHide()
-        }
-        if (isFullScreenPlayer)
-            activity?.hideSystemUI()
+        if (isShowing) autoHide()
+        activity?.hideSystemUI()
         animateLayoutChanges()
         if (playerBinding?.playerEpisodeOverlay?.isGone == true) playerBinding?.playerPausePlay?.requestFocus()
     }
@@ -1091,6 +709,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
 
         isLocked = !isLocked
+        playerHostView?.isLocked = isLocked
         updateOrientation(true) // set true to ignore auto rotate to stay in current orientation
 
         if (isLocked && isShowing) {
@@ -1102,6 +721,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
 
         val fadeTo = if (isLocked) 0f else 1f
+        playerHostView?.gestureHelper?.animateCenterControls(fadeTo)
         playerBinding?.apply {
             val fadeAnimation = AlphaAnimation(playerVideoTitleHolder.alpha, fadeTo).apply {
                 duration = 100
@@ -1109,11 +729,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             }
 
             updateUIVisibility()
-            // MENUS
-            // centerMenu.startAnimation(fadeAnimation)
-            playerPausePlay.startAnimation(fadeAnimation)
-            playerFfwdHolder.startAnimation(fadeAnimation)
-            playerRewHolder.startAnimation(fadeAnimation)
             downloadBothHeader.startAnimation(fadeAnimation)
 
             if (hasEpisodes)
@@ -1136,7 +751,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         updateLockUI()
     }
 
-    open fun updateUIVisibility() {
+    private fun updateUIVisibility() {
         val isGone = isLocked || !isShowing
         var togglePlayerTitleGone = isGone
         context?.let {
@@ -1158,7 +773,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
             playerEpisodesButtonRoot.isVisible = showPlayerEpisodes
             playerEpisodesButton.isVisible = showPlayerEpisodes
             playerVideoTitleHolder.isGone = togglePlayerTitleGone
-//        player_video_title_rez?.isGone = isGone
+            playerVideoTitleRez.isGone = isGone
             playerEpisodeFiller.isGone = isGone
             playerCenterMenu.isGone = isGone
             playerLock.isGone = !isShowing
@@ -1172,27 +787,27 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     private fun updateLockUI() {
         playerBinding?.apply {
             playerLock.setIconResource(if (isLocked) R.drawable.video_locked else R.drawable.video_unlocked)
-            if (layout == R.layout.fragment_player) {
-                val color = if (isLocked) context?.colorFromAttribute(R.attr.colorPrimary)
-                else Color.WHITE
-                if (color != null) {
-                    playerLock.setTextColor(color)
-                    playerLock.iconTint = ColorStateList.valueOf(color)
-                    playerLock.rippleColor =
-                        ColorStateList.valueOf(Color.argb(50, color.red, color.green, color.blue))
-                }
+            val color = if (isLocked) context?.colorFromAttribute(R.attr.colorPrimary)
+            else Color.WHITE
+            if (color != null) {
+                playerLock.setTextColor(color)
+                playerLock.iconTint = ColorStateList.valueOf(color)
+                playerLock.rippleColor =
+                    ColorStateList.valueOf(Color.argb(50, color.red, color.green, color.blue))
             }
         }
     }
 
-    private var currentTapIndex = 0
     protected fun autoHide() {
         metadataVisibilityToken++
-        currentTapIndex++
-        delayHide()
+        playerHostView?.scheduleAutoHide()
         scheduleMetadataVisibility()
     }
 
+    override fun onAutoHideUI() {
+        if (player.getIsPlaying()) onClickChange()
+    }
+
     protected fun hidePlayerUI() {
         if (isShowing) {
             isShowing = false
@@ -1200,861 +815,70 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
     }
 
+    /** PlayerView.Callbacks touch overrides */
+
+    override fun isUIShowing(): Boolean = isShowing
+
+    override fun onSingleTap() {
+        onClickChange()
+    }
+
+    override fun onTouchDown() {
+        if (isShowingEpisodeOverlay) toggleEpisodesOverlay(show = false)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onSeekPreviewText(text: String?) {
+        playerBinding?.playerTimeText?.apply {
+            isVisible = text != null
+            if (text != null) this.text = text
+        }
+    }
+
+    override fun onHidePlayerUI() {
+        hidePlayerUI()
+    }
+
+    override fun onGestureEnd(hadSwipe: Boolean, wasUiShowing: Boolean) {
+        if (!player.getIsPlaying() && hadSwipe && wasUiShowing && !isShowing) {
+            isShowing = true
+            animateLayoutChanges()
+        }
+        autoHide()
+    }
+
     override fun playerStatusChanged() {
         super.playerStatusChanged()
         scheduleMetadataVisibility()
-        delayHide()
     }
 
-    private fun delayHide() {
-        val index = currentTapIndex
-        playerBinding?.playerHolder?.postDelayed({
-            if (!isCurrentTouchValid && isShowing && index == currentTapIndex && player.getIsPlaying()) {
-                onClickChange()
-            }
-        }, 3000)
-    }
-
-    // this is used because you don't want to hide UI when double tap seeking
-    private var currentDoubleTapIndex = 0
-    private fun toggleShowDelayed() {
-        if (doubleTapEnabled || doubleTapPauseEnabled) {
-            val index = currentDoubleTapIndex
-            playerBinding?.playerHolder?.postDelayed({
-                if (index == currentDoubleTapIndex) {
-                    onClickChange()
-                }
-            }, DOUBLE_TAB_MINIMUM_TIME_BETWEEN)
-        } else {
-            onClickChange()
-        }
-    }
-
-    private var isCurrentTouchValid = false
-    private var currentTouchStart: Vector2? = null
-    private var currentTouchLast: Vector2? = null
-    private var currentTouchAction: TouchAction? = null
-    private var currentLastTouchAction: TouchAction? = null
-    private var currentTouchStartPlayerTime: Long? =
-        null // the time in the player when you first click
-    private var currentTouchStartTime: Long? = null // the system time when you first click
-    private var currentLastTouchEndTime: Long = 0 // the system time when you released your finger
-    private var currentClickCount: Int =
-        0 // amount of times you have double clicked, will reset when other action is taken
-
-    // requested volume and brightness is used to make swiping smoother
-    // to make it not jump between values,
-    // this value is within the range [0,2] where 1+ is loudness
-    private var currentRequestedVolume: Float = 0.0f
-
-    // from [0.0f, 1.0f] where 1.0f is max extra brightness, used only to track extra brightness
-    private var currentExtraBrightness: Float = 0.0f
-
-    // this value is within the range [0,2] where 1+ is extra brightness
-    private var currentRequestedBrightness: Float = 1.0f
-
-    enum class TouchAction {
-        Brightness,
-        Volume,
-        Time,
-    }
-
-    companion object {
-        /**
-         * Gets the translationXY + scale form a matrix with no rotation.
-         *
-         * @return (translationX, translationY, scale)
-         * */
-        fun matrixToTranslationAndScale(matrix: Matrix): Triple<Float, Float, Float> {
-            val points = floatArrayOf(0.0f, 0.0f, 1.0f, 1.0f)
-            matrix.mapPoints(points)
-
-            // A linear matrix will map (0,0) to the translation
-            val translationX = points[0]
-            val translationY = points[1]
-
-            // The unit vectors (1,0) and (0,1) will map to the scale if you remove the translation
-            // As this assumes a uniform scaling, only a single vector is needed
-            val scaleX = points[2] - translationX
-            val scaleY = points[3] - translationY
-
-            // The matrix should have the same scaleX and scaleY
-            if (BuildConfig.DEBUG) {
-                assert((scaleX - scaleY).absoluteValue < 0.1f) {
-                    "$scaleY != $scaleX"
-                }
-            }
-
-            return Triple(translationX, translationY, scaleX)
-        }
-
-        private fun forceLetters(inp: Long, letters: Int = 2): String {
-            val added: Int = letters - inp.toString().length
-            return if (added > 0) {
-                "0".repeat(added) + inp.toString()
-            } else {
-                inp.toString()
-            }
-        }
-
-        private fun convertTimeToString(sec: Long): String {
-            val rsec = sec % 60L
-            val min = ceil((sec - rsec) / 60.0).toInt()
-            val rmin = min % 60L
-            val h = ceil((min - rmin) / 60.0).toLong()
-            // int rh = h;// h % 24;
-            return (if (h > 0) forceLetters(h) + ":" else "") + (if (rmin >= 0 || h >= 0) forceLetters(
-                rmin
-            ) + ":" else "") + forceLetters(
-                rsec
-            )
-        }
-    }
-
-    private fun calculateNewTime(
-        startTime: Long?,
-        touchStart: Vector2?,
-        touchEnd: Vector2?
-    ): Long? {
-        if (touchStart == null || touchEnd == null || startTime == null) return null
-        val diffX =
-            (touchEnd.x - touchStart.x) * HORIZONTAL_MULTIPLIER / screenWidthWithOrientation.toFloat()
-        val duration = player.getDuration() ?: return null
-        return max(
-            min(
-                startTime + ((duration * (diffX * diffX)) * (if (diffX < 0) -1 else 1)).toLong(),
-                duration
-            ), 0
-        )
-    }
-
-    /**
-     * Returns screen brightness in <0.0f, 1.0f> range
-     */
-    private fun getBrightness(): Float? {
-        return if (useTrueSystemBrightness) {
-            try {
-                Settings.System.getInt(
-                    context?.contentResolver,
-                    Settings.System.SCREEN_BRIGHTNESS
-                ) / 255f
-            } catch (e: Exception) {
-                // because true system brightness requires
-                // permission, this is a lazy way to check
-                // as it will throw an error if we do not have it
-                useTrueSystemBrightness = false
-                return getBrightness()
-            }
-        } else {
-            try {
-                activity?.window?.attributes?.screenBrightness
-            } catch (e: Exception) {
-                logError(e)
-                null
-            }
-        }
-    }
-
-    /**
-     * Sets the screen brightness in the range <0.0f, 1.0f>. Values outside this range
-     * will be clamped to the minimum (0.0f) or maximum (1.0f).
-     *
-     * @param brightness desired brightness (values outside the range will be clamped)
-     */
-    private fun setBrightness(brightness: Float) {
-        if (useTrueSystemBrightness) {
-            try {
-                Settings.System.putInt(
-                    context?.contentResolver,
-                    Settings.System.SCREEN_BRIGHTNESS_MODE,
-                    Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL
-                )
-
-                Settings.System.putInt(
-                    context?.contentResolver,
-                    Settings.System.SCREEN_BRIGHTNESS,
-                    min(1, (brightness.coerceIn(0.0f, 1.0f) * 255).toInt())
-                )
-            } catch (e: Exception) {
-                useTrueSystemBrightness = false
-                setBrightness(brightness)
-            }
-        } else {
-            try {
-                val lp = activity?.window?.attributes
-                // use 0.004f instead of 0, because on some devices setting too small value
-                // causes system to override it and in turn system makes the screen apply system brightness level instead
-                // which can be too bright, and it is very hard to fine tune very low brightness, because of it.
-                // Without this clamp, it can jump from almost 0% to 100% brightness when this threshold is crossed.
-                lp?.screenBrightness = brightness.coerceIn(0.004f, 1.0f)
-                // Log.i("Brightness", "clamped brightness: ${lp?.screenBrightness}")
-                activity?.window?.attributes = lp
-            } catch (e: Exception) {
-                logError(e)
-            }
-        }
-    }
-
-    private var isVolumeLocked: Boolean = false
-    private var hasShownVolumeToast: Boolean = false
-
-    private var isBrightnessLocked: Boolean = false
-    private var hasShownBrightnessToast: Boolean = false
-
-    private var progressBarLeftHideRunnable: Runnable? = null
-    private var progressBarRightHideRunnable: Runnable? = null
-
-    // Verifies that the currentRequestedVolume matches the system volume
-    // if not, then it removes changes currentRequestedVolume and removes the loudnessEnhancer
-    // if the real volume is less than 100%
-    //
-    // This is here to make returning to the player less jarring, if we change the volume outside
-    // the app. Note that this will make it a bit wierd when using loudness in PiP, then returning
-    // however that is the cost of correctness.
-    private fun verifyVolume() {
-        (activity?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager)?.let { audioManager ->
-            val currentVolumeStep =
-                audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
-            val maxVolumeStep =
-                audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
-
-            // if we can set the volume directly then do it
-            if (currentVolumeStep < maxVolumeStep || currentRequestedVolume <= 1.0f) {
-                currentRequestedVolume =
-                    currentVolumeStep.toFloat() / maxVolumeStep.toFloat()
-
-                loudnessEnhancer?.release()
-                loudnessEnhancer = null
-            }
-        }
-    }
-
-    val holdhandler = Handler(Looper.getMainLooper())
-    var hasTriggeredSpeedUp = false
-    val holdRunnable = Runnable {
-        if (isShowing) {
-            onClickChange()
-        }
-        player.setPlaybackSpeed(2.0f)
-        showOrHideSpeedUp(true)
-        hasTriggeredSpeedUp = true
-    }
-
-    private fun showOrHideSpeedUp(show: Boolean) {
-        playerBinding?.playerSpeedupButton?.let { button ->
-            button.clearAnimation()
-            button.alpha = if (show) 0f else 1f
-            button.isVisible = show
-            button.animate()
-                .alpha(if (show) 1f else 0f)
-                .setDuration(200L)
-                .start()
-        }
+    // When the hold-speedup gesture fires, hide controls so the video is unobstructed.
+    // The speedup button show/hide and speed change are handled by PlayerView.
+    override fun onHoldSpeedUp(show: Boolean) {
+        if (show && isShowing) onClickChange()
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
 
         // If we rotate the device we need to recalculate the zoom
-        val matrix = zoomMatrix
-        val animation = matrixAnimation
+        val gh = playerHostView?.gestureHelper ?: return
+        val matrix = gh.zoomMatrix
+        val animation = gh.matrixAnimation
         if ((animation == null || !animation.isRunning) && matrix != null) {
-            // Ignore if we have no zoom or mid animation
+            // Ignore if we have no zoom or mid-animation
             playerView?.post {
-                applyZoomMatrix(matrix, true)
-                requestUpdateBrightnessOverlayOnNextLayout()
+                gh.applyZoomMatrix(matrix, true)
+                playerHostView?.requestUpdateBrightnessOverlayOnNextLayout()
             }
         }
     }
 
-    private var scaleGestureDetector: ScaleGestureDetector? = null
-    private var lastPan: Vector2? = null
-
-    /**
-     * Gets the non-null zoom matrix,
-     * this is different from `zoomMatrix ?: Matrix()`
-     * because it allows used to start zooming at different resizeModes.
-     *
-     * The main issue is that RESIZE_MODE_FIT = 100% zoom, but if you are in RESIZE_MODE_ZOOM
-     * 100% will make the zoom snap to less zoomed in then you already are.
-     * */
-    fun currentZoomMatrix(): Matrix {
-        val current = zoomMatrix
-        if (current != null) {
-            // Already assigned
-            return current
-        }
-
-        val playerView = playerView
-        val videoView = playerView?.videoSurfaceView
-
-        if (playerView == null || videoView == null || playerView.resizeMode != AspectRatioFrameLayout.RESIZE_MODE_ZOOM) {
-            // This is a fit or fill resize mode so start at 100% zoom
-            return Matrix()
-        }
-
-        val videoWidth = videoView.width.toFloat()
-        val videoHeight = videoView.height.toFloat()
-        val playerWidth = screenWidthWithOrientation
-        val playerHeight = screenHeightWithOrientation
-
-        // Sanity check
-        if (videoWidth <= 1.0f || videoHeight <= 1.0f || playerWidth <= 1.0f || playerHeight <= 1.0f) {
-            // Something is wrong with the video, return the default 100% zoom
-            return Matrix()
-        }
-
-        val initAspect =
-            (playerHeight * videoWidth) / (playerWidth * videoHeight)
-        val aspect = max(initAspect, 1.0f / initAspect)
-
-        // Return the matrix with the correct zoom, as it is already zoomed in
-        return Matrix().apply { postScale(aspect, aspect) }
-    }
-
-    /** A Matrix encoding the translation and scale of the current zoom */
-    private var zoomMatrix: Matrix? = null
-
-    /** A Matrix encoding the translation and scale of the desired zoom,
-     * aka after you release the zoom */
-    private var desiredMatrix: Matrix? = null
-
-    /** The animation of zooming to the desiredMatrix */
-    private var matrixAnimation: ValueAnimator? = null
-
-    @SuppressLint("UnsafeOptInUsageError")
     override fun resize(resize: PlayerResize, showToast: Boolean) {
-        // Clear all zoom stuff if we resize
-        matrixAnimation?.cancel()
-        matrixAnimation = null
-        zoomMatrix = null
-        desiredMatrix = null
-        playerView?.videoSurfaceView?.apply {
-            scaleX = 1.0f
-            scaleY = 1.0f
-            translationX = 0.0f
-            translationY = 0.0f
-        }
-
         super.resize(resize, showToast)
-        requestUpdateBrightnessOverlayOnNextLayout()
+        playerHostView?.requestUpdateBrightnessOverlayOnNextLayout()
     }
 
-    /**
-     * Applies a new zoom matrix to the screen. Matrix should only contain a scale + translation.
-     *
-     * @param newMatrix The new zoom matrix
-     * @param animation If this zoom is part of an animation,
-     * as then it will not auto zoom after we are done
-     */
-    @OptIn(UnstableApi::class)
-    fun applyZoomMatrix(newMatrix: Matrix, animation: Boolean) {
-        if (!animation) {
-            matrixAnimation?.cancel()
-            matrixAnimation = null
-        }
-        val (translationX, translationY, scale) = matrixToTranslationAndScale(newMatrix)
-
-        playerView?.let { player ->
-            if (player.resizeMode == AspectRatioFrameLayout.RESIZE_MODE_FIT) {
-                player.resizeMode = AspectRatioFrameLayout.RESIZE_MODE_ZOOM
-            }
-
-            val videoView = player.videoSurfaceView ?: return@let
-
-            val videoWidth = videoView.width.toFloat()
-            val videoHeight = videoView.height.toFloat()
-            val playerWidth = screenWidthWithOrientation
-            val playerHeight = screenHeightWithOrientation
-
-            // Sanity check
-            if (videoWidth <= 1.0f || videoHeight <= 1.0f || playerWidth <= 1.0f || playerHeight <= 1.0f || scale <= 0.01f) {
-                return
-            }
-
-            // Calculate the scaled aspect ratio as the view height is not real, check the debugger
-            // and you will see videoView.height > screen.heigh
-            val initAspect =
-                (playerHeight * videoWidth) / (playerWidth * videoHeight)
-            val aspect = min(initAspect, 1.0f / initAspect)
-            val scaledAspect = scale * aspect
-
-            // Calculate clamp, this is very weird because we need to use aspect here as videoHeight > playerHeight
-            val maxTransX = max(0.0f, videoWidth * scaledAspect - playerWidth) * 0.5f
-            val maxTransY = max(0.0f, videoHeight * scaledAspect - playerHeight) * 0.5f
-
-            // Correct the translation to clamp within the viewing area
-            val expectedTranslationX = translationX.coerceIn(-maxTransX, maxTransX)
-            val expectedTranslationY = translationY.coerceIn(-maxTransY, maxTransY)
-
-            // Set the transform to the correct x and y
-            newMatrix.postTranslate(
-                expectedTranslationX - translationX,
-                expectedTranslationY - translationY
-            )
-            zoomMatrix = newMatrix
-
-            if (!animation) {
-                // If we are not in an animation, set up the values for the animation
-                if ((scaledAspect - 1.0f).absoluteValue < ZOOM_SNAP_SENSITIVITY) {
-                    // We are within the correct scaling, so center and fit it
-                    playerBinding?.videoOutline?.isVisible = true
-                    val desired = Matrix()
-                    desired.setScale(1.0f / aspect, 1.0f / aspect)
-                    desiredMatrix = desired
-                } else if (scale < 1.0f) {
-                    // We have zoomed too far, zoom to 100%
-                    playerBinding?.videoOutline?.isVisible = false
-                    desiredMatrix = Matrix()
-                } else {
-                    // Keep the same scaling after zoom
-                    playerBinding?.videoOutline?.isVisible = false
-                    desiredMatrix = null
-                }
-            }
-
-            // Finally set the actual scale + translation
-            videoView.scaleX = scaledAspect
-            videoView.scaleY = scaledAspect
-            videoView.translationX = expectedTranslationX
-            videoView.translationY = expectedTranslationY
-            updateBrightnessOverlayBounds()
-        }
-    }
-
-    fun createScaleGestureDetector(context: Context) {
-        scaleGestureDetector = ScaleGestureDetector(
-            context,
-            object : ScaleGestureDetector.SimpleOnScaleGestureListener() {
-                override fun onScale(detector: ScaleGestureDetector): Boolean {
-                    val matrix = currentZoomMatrix()
-                    val (_, _, scale) = matrixToTranslationAndScale(matrix)
-                    // Clamp scale of the zoom, do it here as it is easier then doing it within applyZoomMatrix
-                    val newScale = (scale * detector.scaleFactor).coerceIn(
-                        MINIMUM_ZOOM,
-                        MAXIMUM_ZOOM
-                    )
-                    // How much we should scale it with to prevent inf scaling
-                    val actualScaleFactor = newScale / scale
-
-                    // Scale around the focus point, this is more natural than just zoom
-                    val pivotX = detector.focusX - screenWidthWithOrientation.toFloat() * 0.5f
-                    val pivotY = detector.focusY - screenHeightWithOrientation.toFloat() * 0.5f
-                    matrix.postScale(
-                        actualScaleFactor,
-                        actualScaleFactor,
-                        pivotX,
-                        pivotY
-                    )
-                    applyZoomMatrix(matrix, false)
-                    return true
-                }
-            })
-    }
-
-    @SuppressLint("SetTextI18n")
-    private fun handleMotionEvent(view: View?, event: MotionEvent?): Boolean {
-        if (event == null || view == null) return false
-        val currentTouch = Vector2(event.x, event.y)
-        val startTouch = currentTouchStart
-
-        playerBinding?.playerIntroPlay?.isGone = true
-
-        // Handle pan with two fingers
-        if ((event.pointerCount == 2 || lastPan != null) && !isLocked && isFullScreenPlayer && !hasTriggeredSpeedUp && currentTouchAction == null) {
-            holdhandler.removeCallbacks(holdRunnable) // remove 2x speed
-
-            // Gesture detectors for zoom & pan
-            if (scaleGestureDetector == null) {
-                createScaleGestureDetector(view.context)
-            }
-
-            isCurrentTouchValid = false // Prevent other touches
-            scaleGestureDetector?.onTouchEvent(event)
-
-            when (event.actionMasked) {
-                MotionEvent.ACTION_POINTER_DOWN -> {
-                    // Hide UI
-                    if (isShowing) {
-                        onClickChange()
-                    }
-                }
-
-                MotionEvent.ACTION_MOVE -> {
-                    val newPan = Vector2(
-                        (event.getX(0) + event.getX(1)) / 2f,
-                        (event.getY(0) + event.getY(1)) / 2f
-                    )
-                    val oldPan = lastPan
-                    if (oldPan != null) {
-                        val matrix = currentZoomMatrix()
-                        // Delta move
-                        matrix.postTranslate(newPan.x - oldPan.x, newPan.y - oldPan.y)
-                        applyZoomMatrix(matrix, false)
-                        updateBrightnessOverlayBounds()
-                    }
-                    lastPan = newPan
-                }
-
-                MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_UP -> {
-                    // Reset touch
-                    lastPan = null
-                    currentTouchStart = null
-                    currentLastTouchAction = null
-                    currentTouchAction = null
-                    currentTouchStartPlayerTime = null
-                    currentTouchLast = null
-                    currentTouchStartTime = null
-
-                    // Reset views
-                    playerBinding?.videoOutline?.isVisible = false
-                    matrixAnimation?.cancel()
-                    matrixAnimation = null
-
-                    // After we have zoomed in, snap to
-                    matrixAnimation = ValueAnimator.ofFloat(0.0f, 1.0f).apply {
-                        startDelay = 0
-                        duration = 200
-
-                        val startMatrix = currentZoomMatrix()
-                        val endMatrix = desiredMatrix ?: return@apply
-
-                        val (startX, startY, startScale) = matrixToTranslationAndScale(startMatrix)
-                        val (endX, endY, endScale) = matrixToTranslationAndScale(endMatrix)
-
-                        addUpdateListener { animation ->
-                            val value = animation.animatedValue as Float // ValueAnimator.ofFloat
-
-                            // Linear interpolation of scale and translation between startMatrix and endMatrix
-                            val valueInv = 1.0f - value
-                            val x = startX * valueInv + endX * value
-                            val y = startY * valueInv + endY * value
-                            val s = startScale * valueInv + endScale * value
-                            val m = Matrix()
-                            m.setScale(s, s)
-                            m.postTranslate(x, y)
-                            applyZoomMatrix(m, true)
-                        }
-                        start()
-                    }
-                }
-            }
-            return true
-        }
-
-        playerBinding?.apply {
-            when (event.action) {
-                MotionEvent.ACTION_DOWN -> {
-                    // validates if the touch is inside of the player area
-                    isCurrentTouchValid = view.isValidTouch(currentTouch.x, currentTouch.y)
-                    if (isCurrentTouchValid && isShowingEpisodeOverlay) {
-                        toggleEpisodesOverlay(show = false)
-                    } else if (isCurrentTouchValid) {
-                        if (speedupEnabled) {
-                            hasTriggeredSpeedUp = false
-                            if (player.getIsPlaying() && !isLocked && isFullScreenPlayer) {
-                                holdhandler.postDelayed(holdRunnable, 500)
-                            }
-                        }
-                        isVolumeLocked = currentRequestedVolume < 1.0f
-                        if (currentRequestedVolume <= 1.0f) {
-                            hasShownVolumeToast = false
-                        }
-
-                        isBrightnessLocked = currentRequestedBrightness < 1.0f
-                        if (currentRequestedBrightness <= 1.0f) {
-                            hasShownBrightnessToast = false
-                        }
-
-                        currentTouchStartTime = System.currentTimeMillis()
-                        currentTouchStart = currentTouch
-                        currentTouchLast = currentTouch
-                        currentTouchStartPlayerTime = player.getPosition()
-
-                        getBrightness()?.let {
-                            currentRequestedBrightness = it + currentExtraBrightness
-                        }
-                        verifyVolume()
-                    }
-                }
-
-                MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> {
-                    holdhandler.removeCallbacks(holdRunnable)
-                    if (hasTriggeredSpeedUp) {
-                        player.setPlaybackSpeed(DataStoreHelper.playBackSpeed)
-                        showOrHideSpeedUp(false)
-                    }
-                    if (isCurrentTouchValid && !isLocked && isFullScreenPlayer) {
-                        // seek time
-                        if (swipeHorizontalEnabled && currentTouchAction == TouchAction.Time) {
-                            val startTime = currentTouchStartPlayerTime
-                            if (startTime != null) {
-                                calculateNewTime(
-                                    startTime,
-                                    startTouch,
-                                    currentTouch
-                                )?.let { seekTo ->
-                                    if (abs(seekTo - startTime) > MINIMUM_SEEK_TIME) {
-                                        player.seekTo(seekTo, PlayerEventSource.UI)
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    // see if click is eligible for seek 10s
-                    val holdTime = currentTouchStartTime?.minus(System.currentTimeMillis())
-                    if (isCurrentTouchValid // is valid
-                        && currentTouchAction == null // no other action like swiping is taking place
-                        && currentLastTouchAction == null // last action was none, this prevents mis input random seek
-                        && holdTime != null
-                        && holdTime < DOUBLE_TAB_MAXIMUM_HOLD_TIME // it is a click not a long hold
-                    ) {
-                        if (!isLocked
-                            && (System.currentTimeMillis() - currentLastTouchEndTime) < DOUBLE_TAB_MINIMUM_TIME_BETWEEN // the time since the last action is short
-                        ) {
-                            currentClickCount++
-
-                            if (currentClickCount >= 1) { // have double clicked
-                                currentDoubleTapIndex++
-                                if (doubleTapPauseEnabled && isFullScreenPlayer) { // you can pause if your tap is in the middle of the screen
-                                    when {
-                                        currentTouch.x < screenWidthWithOrientation / 2 - (DOUBLE_TAB_PAUSE_PERCENTAGE * screenWidthWithOrientation) -> {
-                                            if (doubleTapEnabled)
-                                                rewind()
-                                        }
-
-                                        currentTouch.x > screenWidthWithOrientation / 2 + (DOUBLE_TAB_PAUSE_PERCENTAGE * screenWidthWithOrientation) -> {
-                                            if (doubleTapEnabled)
-                                                fastForward()
-                                        }
-
-                                        else -> {
-                                            player.handleEvent(
-                                                CSPlayerEvent.PlayPauseToggle,
-                                                PlayerEventSource.UI
-                                            )
-                                        }
-                                    }
-                                } else if (doubleTapEnabled && isFullScreenPlayer) {
-                                    if (currentTouch.x < screenWidthWithOrientation / 2) {
-                                        rewind()
-                                    } else {
-                                        fastForward()
-                                    }
-                                }
-                            }
-                        } else {
-                            // is a valid click but not fast enough for seek
-                            currentClickCount = 0
-                            if (!hasTriggeredSpeedUp) {
-                                toggleShowDelayed()
-                            }
-                            // onClickChange()
-                        }
-                    } else {
-                        currentClickCount = 0
-                    }
-
-                    // If we hid the UI for a gesture and playback is paused, show it again
-                    if (!player.getIsPlaying()) {
-                        val didGesture =
-                            currentTouchAction != null || currentLastTouchAction != null
-                        if (didGesture && uiShowingBeforeGesture && !isShowing) {
-                            isShowing = true
-                            animateLayoutChanges()
-                        }
-                    }
-
-                    // call auto hide as it wont hide when you have your finger down
-                    autoHide()
-
-                    // reset variables
-                    isCurrentTouchValid = false
-                    currentTouchStart = null
-                    currentLastTouchAction = currentTouchAction
-                    currentTouchAction = null
-                    currentTouchStartPlayerTime = null
-                    currentTouchLast = null
-                    currentTouchStartTime = null
-                    uiShowingBeforeGesture = false
-
-                    // resets UI
-                    playerTimeText.isVisible = false
-
-                    currentLastTouchEndTime = System.currentTimeMillis()
-                }
-
-                MotionEvent.ACTION_MOVE -> {
-                    // if current touch is valid
-
-                    if (hasTriggeredSpeedUp) {
-                        return true
-                    }
-                    if (startTouch != null && isCurrentTouchValid && !isLocked && isFullScreenPlayer) {
-                        // action is unassigned and can therefore be assigned
-
-                        if (currentTouchAction == null) {
-                            val diffFromStart = startTouch - currentTouch
-                            if (swipeVerticalEnabled) {
-                                if (abs(diffFromStart.y * 100 / screenHeightWithOrientation) > MINIMUM_VERTICAL_SWIPE) {
-                                    // left = Brightness, right = Volume, but the UI is reversed to show the UI better
-                                    uiShowingBeforeGesture = isShowing
-                                    currentTouchAction =
-                                        if (startTouch.x < screenWidthWithOrientation / 2) {
-                                            // hide the UI if you hold brightness to show screen better, better UX
-                                            hidePlayerUI()
-                                            TouchAction.Brightness
-                                        } else {
-                                            // hide the UI if you hold volume to show screen better, better UX
-                                            hidePlayerUI()
-                                            TouchAction.Volume
-                                        }
-                                }
-                            }
-                            if (swipeHorizontalEnabled) {
-                                if (abs(diffFromStart.x * 100 / screenHeightWithOrientation) > MINIMUM_HORIZONTAL_SWIPE) {
-                                    currentTouchAction = TouchAction.Time
-                                }
-                            }
-                        }
-
-                        // display action
-                        val lastTouch = currentTouchLast
-                        if (lastTouch != null) {
-                            val diffFromLast = lastTouch - currentTouch
-                            val verticalAddition =
-                                diffFromLast.y * VERTICAL_MULTIPLIER / screenHeightWithOrientation.toFloat()
-
-                            // update UI
-                            playerTimeText.isVisible = false
-
-                            when (currentTouchAction) {
-                                TouchAction.Time -> {
-                                    holdhandler.removeCallbacks(holdRunnable)
-                                    // this simply updates UI as the seek logic happens on release
-                                    // startTime is rounded to make the UI sync in a nice way
-                                    val startTime =
-                                        currentTouchStartPlayerTime?.div(1000L)?.times(1000L)
-                                    if (startTime != null) {
-                                        calculateNewTime(
-                                            startTime,
-                                            startTouch,
-                                            currentTouch
-                                        )?.let { newMs ->
-                                            val skipMs = newMs - startTime
-                                            playerTimeText.apply {
-                                                text =
-                                                    "${convertTimeToString(newMs / 1000)} [${
-                                                        (if (abs(skipMs) < 1000) "" else (if (skipMs > 0) "+" else "-"))
-                                                    }${convertTimeToString(abs(skipMs / 1000))}]"
-                                                isVisible = true
-                                            }
-                                        }
-                                    }
-                                }
-
-                                TouchAction.Brightness -> {
-                                    holdhandler.removeCallbacks(holdRunnable)
-                                    playerBinding?.playerProgressbarRightHolder?.apply {
-                                        if (!isVisible || alpha < 1f) {
-                                            alpha = 1f
-                                            isVisible = true
-                                        }
-
-                                        progressBarRightHideRunnable?.let { removeCallbacks(it) }
-                                        progressBarRightHideRunnable = Runnable {
-                                            // Fade out the progress bar
-                                            animate().cancel()
-                                            animate()
-                                                .alpha(0f)
-                                                .setDuration(300)
-                                                .withEndAction { isVisible = false }
-                                                .start()
-                                        }
-                                        // Show the progress bar for 1.5 seconds
-                                        postDelayed(progressBarRightHideRunnable, 1500)
-                                    }
-
-                                    val lastRequested = currentRequestedBrightness
-                                    val nextBrightness = if (extraBrightnessEnabled) {
-                                        currentRequestedBrightness + verticalAddition
-                                    } else {
-                                        (currentRequestedBrightness + verticalAddition).coerceIn(
-                                            0.0f,
-                                            1.0f
-                                        )
-                                    }
-                                    // Log.e("Brightness", "Current: $currentRequestedBrightness, Next: $nextBrightness")
-                                    // show toast
-                                    if (extraBrightnessEnabled && nextBrightness > 1.0f && isBrightnessLocked && !hasShownBrightnessToast) {
-                                        showToast(R.string.slide_up_again_to_exceed_100)
-                                        hasShownBrightnessToast = true
-                                    }
-                                    currentRequestedBrightness = nextBrightness
-
-                                    // this is to not spam request it, just in case it fucks over someone
-                                    if (lastRequested != currentRequestedBrightness)
-                                        setBrightness(currentRequestedBrightness)
-
-                                    val level1ProgressBar = playerProgressbarRightLevel1
-
-                                    // max is set high to make it smooth
-                                    level1ProgressBar.max = 100_000
-                                    level1ProgressBar.progress =
-                                        max(
-                                            2_000,
-                                            (min(
-                                                1.0f,
-                                                currentRequestedBrightness
-                                            ) * 100_000f).toInt()
-                                        )
-
-                                    if (extraBrightnessEnabled && !isBrightnessLocked) {
-                                        val level2ProgressBar = playerProgressbarRightLevel2
-
-                                        currentExtraBrightness = if (currentRequestedBrightness > 1.0f) min(2.0f, currentRequestedBrightness) - 1.0f else 0.0f
-                                        level2ProgressBar.max = 100_000
-                                        level2ProgressBar.progress =
-                                            (currentExtraBrightness * 100_000f).toInt().coerceIn(2_000, 100_000)
-                                        level2ProgressBar.isVisible = currentRequestedBrightness > 1.0f
-                                        brightnessOverlay?.let {
-                                            it.alpha = currentExtraBrightness
-                                        }
-                                    }
-
-                                    // Log.i("Brightness", "current: $currentRequestedBrightness, ce: $currentExtraBrightness L1: ${level1ProgressBar.progress}, L2: ${level2ProgressBar.progress}")
-                                    playerProgressbarRightIcon.setImageResource(
-                                        brightnessIcons[min( // clamp the value in case of extra brightness
-                                            brightnessIcons.size - 1,
-                                            max(
-                                                0,
-                                                round(currentRequestedBrightness * (brightnessIcons.size - 1)).toInt()
-                                            )
-                                        )]
-                                    )
-                                }
-
-                                TouchAction.Volume -> {
-                                    holdhandler.removeCallbacks(holdRunnable)
-                                    handleVolumeAdjustment(
-                                        verticalAddition,
-                                        false
-                                    )
-                                }
-
-                                else -> Unit
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        currentTouchLast = currentTouch
-        return true
-    }
-
-    @SuppressLint("GestureBackNavigation")
     private fun handleKeyEvent(event: KeyEvent, hasNavigated: Boolean): Boolean {
         if (hasNavigated) {
             autoHide()
@@ -2107,29 +931,8 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
 
                 KeyEvent.KEYCODE_VOLUME_DOWN,
                 KeyEvent.KEYCODE_VOLUME_UP -> {
-                    if (isLayout(PHONE or EMULATOR) && isFullScreenPlayer) {
-                        /**
-                         * Some TVs do not support volume boosting, and overriding
-                         * the volume buttons can be inconvenient for TV users.
-                         * Since boosting volume is mainly useful on phones and emulators,
-                         * we limit this feature to those devices.
-                         */
-                        verifyVolume()
-                        if (currentRequestedVolume <= 1.0f) {
-                            hasShownVolumeToast = false
-                        }
-                        isVolumeLocked = currentRequestedVolume < 1.0f
-                        handleVolumeAdjustment(
-                            // +- 5%
-                            if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
-                                0.05f
-                            } else {
-                                -0.05f
-                            },
-                            true
-                        )
-                        return true
-                    }
+                    // Handled entirely by PlayerView.handleVolumeKey (checks PHONE/EMULATOR).
+                    if (playerHostView?.handleVolumeKey(keyCode) == true) return true
                 }
             }
         }
@@ -2163,138 +966,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         return false
     }
 
-    private var loudnessEnhancer: LoudnessEnhancer? = null
-
-    private fun handleVolumeAdjustment(
-        delta: Float,
-        fromButton: Boolean,
-    ) {
-        val audioManager =
-            activity?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager ?: return
-        val currentVolumeStep = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
-        val maxVolumeStep = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
-
-        val currentVolume = currentRequestedVolume
-        val isCurrentVolumeLocked = isVolumeLocked
-
-        val nextVolume =
-            (currentVolume + delta).coerceIn(0.0f, if (isCurrentVolumeLocked) 1.0f else 2.0f)
-
-        val nextVolumeStep =
-            (nextVolume * maxVolumeStep.toFloat()).roundToInt().coerceIn(0, maxVolumeStep)
-
-        // show toast
-        if (fromButton) {
-            // for button related request we only show a toast when we exceeded the volume
-            if (currentVolume <= 1.0f && nextVolume > 1.0f && !hasShownVolumeToast) {
-                showToast(R.string.volume_exceeded_100)
-                hasShownVolumeToast = true
-            }
-        } else {
-            val nextRequestedVolume = currentVolume + delta
-
-            // for swipes, we show toast that we need to swipe again
-            if (nextRequestedVolume > 1.0 && isCurrentVolumeLocked && !hasShownVolumeToast) {
-                showToast(R.string.slide_up_again_to_exceed_100)
-                hasShownVolumeToast = true
-            }
-        }
-
-        // set the current volume step
-        if (nextVolumeStep != currentVolumeStep) {
-            audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, nextVolumeStep, 0)
-        }
-
-        var hasBoostError = false
-
-        // Apply loudness enhancer for volumes > 100%, removes it if less
-        if (nextVolume > 1.0f) {
-            val boostFactor = ((nextVolume - 1.0f) * 1000).toInt()
-            val currentEnhancer = loudnessEnhancer
-
-            if (currentEnhancer != null) {
-                currentEnhancer.setTargetGain(boostFactor)
-            } else {
-                val audioSessionId = (playerView?.player as? ExoPlayer)?.audioSessionId
-                if (audioSessionId != null && audioSessionId != AudioManager.ERROR) {
-                    try {
-                        loudnessEnhancer = LoudnessEnhancer(audioSessionId).apply {
-                            setTargetGain(boostFactor)
-                            enabled = true
-                        }
-                    } catch (t: Throwable) {
-                        logError(t)
-                        hasBoostError = true
-                    }
-                }
-            }
-        } else {
-            loudnessEnhancer?.release()
-            loudnessEnhancer = null
-        }
-
-        currentRequestedVolume = nextVolume
-
-        // Update the progress bar
-        playerBinding?.apply {
-            val level1ProgressBar = playerProgressbarLeftLevel1
-            val level2ProgressBar = playerProgressbarLeftLevel2
-
-            // Change color to show that LoudnessEnhancer broke
-            // this is not a real fix, but solves the crash issue
-            if (nextVolume > 1.0f) {
-                level2ProgressBar.progressTintList = ColorStateList.valueOf(
-                    ContextCompat.getColor(
-                        level2ProgressBar.context, if (hasBoostError) {
-                            R.color.colorPrimaryRed
-                        } else {
-                            R.color.colorPrimaryOrange
-                        }
-                    )
-                )
-            }
-
-            level1ProgressBar.max = 100_000
-            level1ProgressBar.progress =
-                (nextVolume * 100_000f).toInt().coerceIn(2_000, 100_000)
-
-            level2ProgressBar.max = 100_000
-            level2ProgressBar.progress =
-                if (nextVolume > 1.0f) ((nextVolume - 1.0) * 100_000f).toInt()
-                    .coerceIn(2_000, 100_000) else 0
-            level2ProgressBar.isVisible = nextVolume > 1.0f
-
-            // Calculate the clamped index for the volume icon based on the requested volume
-            val iconIndex = (nextVolume * (volumeIcons.lastIndex))
-                .roundToInt()
-                .coerceIn(0, volumeIcons.lastIndex)
-
-            // Update icon
-            playerProgressbarLeftIcon.setImageResource(volumeIcons[iconIndex])
-        }
-
-        // alpha fade
-        playerBinding?.playerProgressbarLeftHolder?.apply {
-            if (!isVisible || alpha < 1f) {
-                alpha = 1f
-                isVisible = true
-            }
-
-            progressBarLeftHideRunnable?.let { removeCallbacks(it) }
-            progressBarLeftHideRunnable = Runnable {
-                // Fade out the progress bar
-                animate().cancel()
-                animate()
-                    .alpha(0f)
-                    .setDuration(300)
-                    .withEndAction { isVisible = false }
-                    .start()
-            }
-            // Show the progress bar for 1.5 seconds
-            postDelayed(progressBarLeftHideRunnable, 1500)
-        }
-    }
-
     protected fun uiReset() {
         metadataVisibilityToken++
         playerBinding?.playerMetadataScrim?.let {
@@ -2315,8 +986,8 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         updateLockUI()
         updateUIVisibility()
         animateLayoutChanges()
-        resetFastForwardText()
-        resetRewindText()
+        playerHostView?.gestureHelper?.resetFastForwardText()
+        playerHostView?.gestureHelper?.resetRewindText()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -2325,9 +996,21 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         super.onSaveInstanceState(outState)
     }
 
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onBindingCreated(binding: FragmentPlayerBinding, savedInstanceState: Bundle?) {
+        // Set up playerBinding before super initializes the player
+        // (brightness overlay is now injected by PlayerView.initialize())
+        playerBinding = PlayerCustomLayoutBinding.bind(binding.root.findViewById(R.id.player_holder))
+
+        super.onBindingCreated(binding, savedInstanceState)
+
+        // This player is always full-screen; tell PlayerView so volume-key handling is active.
+        playerHostView?.isFullScreen = true
+
+        // Wire up the snap-hint outline view and schedule brightness overlay bounds update
+        playerHostView?.videoOutline = playerBinding?.videoOutline
+        playerHostView?.requestUpdateBrightnessOverlayOnNextLayout()
+
+        val view = binding.root
         // init variables
         setPlayBackSpeed(DataStoreHelper.playBackSpeed)
         savedInstanceState?.getLong(SUBTITLE_DELAY_BUNDLE_KEY)?.let {
@@ -2410,24 +1093,12 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
 
         // handle tv controls directly based on player state
-        keyEventListener = { eventNav ->
-            // Don't hook player keys if player isn't active
-            if (player.isActive()) {
-                val (event, hasNavigated) = eventNav
-                if (event != null)
-                    handleKeyEvent(event, hasNavigated)
-                else false
-            } else false
-        }
+        setupKeyEventListener()
 
         try {
             context?.let { ctx ->
                 val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
 
-                fastForwardTime =
-                    settingsManager.getInt(ctx.getString(R.string.double_tap_seek_time_key), 10)
-                        .toLong() * 1000L
-
                 androidTVInterfaceOffSeekTime =
                     settingsManager.getInt(
                         ctx.getString(R.string.android_tv_interface_off_seek_key),
@@ -2441,16 +1112,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                     )
                         .toLong() * 1000L
 
-                navigationBarHeight = ctx.getNavigationBarHeight()
-                statusBarHeight = ctx.getStatusBarHeight()
-
-                swipeHorizontalEnabled =
-                    settingsManager.getBoolean(ctx.getString(R.string.swipe_enabled_key), true)
-                swipeVerticalEnabled =
-                    settingsManager.getBoolean(
-                        ctx.getString(R.string.swipe_vertical_enabled_key),
-                        true
-                    )
                 playBackSpeedEnabled = settingsManager.getBoolean(
                     ctx.getString(R.string.playback_speed_enabled_key),
                     false
@@ -2459,42 +1120,16 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                     ctx.getString(R.string.rotate_video_key),
                     false
                 )
-                autoPlayerRotateEnabled = settingsManager.getBoolean(
-                    ctx.getString(R.string.auto_rotate_video_key),
-                    true
-                )
                 playerResizeEnabled =
                     settingsManager.getBoolean(
                         ctx.getString(R.string.player_resize_enabled_key),
                         true
                     )
-                doubleTapEnabled =
-                    settingsManager.getBoolean(
-                        ctx.getString(R.string.double_tap_enabled_key),
-                        false
-                    )
-
-                doubleTapPauseEnabled =
-                    settingsManager.getBoolean(
-                        ctx.getString(R.string.double_tap_pause_enabled_key),
-                        false
-                    )
-
                 hideControlsNames = settingsManager.getBoolean(
                     ctx.getString(R.string.hide_player_control_names_key),
                     false
                 )
 
-                speedupEnabled = settingsManager.getBoolean(
-                    ctx.getString(R.string.speedup_key),
-                    false
-                )
-
-                extraBrightnessEnabled = settingsManager.getBoolean(
-                    ctx.getString(R.string.extra_brightness_key),
-                    false
-                )
-
                 val profiles = QualityDataHelper.getProfiles()
                 val type = if (ctx.isUsingMobileData())
                     QualityDataHelper.QualityProfileType.Data
@@ -2503,13 +1138,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 currentQualityProfile =
                     profiles.firstOrNull { it.types.contains(type) }?.id ?: profiles.firstOrNull()?.id
                             ?: currentQualityProfile
-
-//                currentPrefQuality = settingsManager.getInt(
-//                    ctx.getString(if (ctx.isUsingMobileData()) R.string.quality_pref_mobile_data_key else R.string.quality_pref_key),
-//                    currentPrefQuality
-//                )
-                // useSystemBrightness =
-                //    settingsManager.getBoolean(ctx.getString(R.string.use_system_brightness_key), false)
             }
             playerBinding?.apply {
                 playerSpeedBtt.isVisible = playBackSpeedEnabled
@@ -2559,14 +1187,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 }
             }
 
-            exoDuration.setOnClickListener {
-                setRemainingTimeCounter(true)
-            }
-
-            timeLeft.setOnClickListener {
-                setRemainingTimeCounter(false)
-            }
-
             skipChapterButton.setOnClickListener {
                 player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
             }
@@ -2616,16 +1236,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 showSubtitleOffsetDialog()
             }
 
-            playerRew.setOnClickListener {
-                autoHide()
-                rewind()
-            }
-
-            playerFfwd.setOnClickListener {
-                autoHide()
-                fastForward()
-            }
-
             playerGoBack.setOnClickListener {
                 activity?.popCurrentPage("FullScreenPlayer")
             }
@@ -2638,11 +1248,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 showTracksDialogue()
             }
 
-            // it is !not! a bug that you cant touch the right side, it does not register inputs on navbar or status bar
-            playerHolder.setOnTouchListener { callView, event ->
-                return@setOnTouchListener handleMotionEvent(callView, event)
-            }
-
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 playerControlsScroll.setOnScrollChangeListener { _, _, _, _, _ ->
                     autoHide()
@@ -2651,15 +1256,13 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
 
             exoProgress.registerPlayerView(playerView)
 
+            @SuppressLint("ClickableViewAccessibility")
             exoProgress.setOnTouchListener { _, event ->
                 // this makes the bar not disappear when sliding
                 when (event.action) {
-                    MotionEvent.ACTION_DOWN -> {
-                        currentTapIndex++
-                    }
-
+                    MotionEvent.ACTION_DOWN,
                     MotionEvent.ACTION_MOVE -> {
-                        currentTapIndex++
+                        playerHostView?.cancelAutoHide()
                     }
 
                     MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_BUTTON_RELEASE -> {
@@ -2672,11 +1275,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
                 toggleEpisodesOverlay(show = true)
             }
         }
-        // cs3 is peak media center
-        setRemainingTimeCounter(durationMode || isLayout(TV))
-        playerBinding?.exoPosition?.doOnTextChanged { _, _, _, _ ->
-            updateRemainingTime()
-        }
         // init UI
         try {
             uiReset()
@@ -2685,7 +1283,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         }
     }
 
-    @SuppressLint("SourceLockedOrientationActivity")
     private fun toggleRotate() {
         activity?.let {
             toggleOrientationWithSensor(it)
@@ -2710,59 +1307,14 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
     }
 
     override fun playerDimensionsLoaded(width: Int, height: Int) {
-        // On TV, don't rotate for portrait videos; display with pillarbox (black bars on sides)
-        if (isLayout(TV or EMULATOR)) {
-            isVerticalOrientation = false
-            return
-        }
-        isVerticalOrientation = height > width
+        // PlayerView already set isVerticalOrientation; skip rotation on TV (pillarbox instead).
+        if (isLayout(TV or EMULATOR)) return
+        // Skip zero-size events emitted when the player transitions to STATE_IDLE,
+        // acting on them would reset auto-detected orientation to landscape.
+        if (width <= 0 || height <= 0) return
         updateOrientation()
     }
 
-    private fun updateRemainingTime() {
-        val duration = player.getDuration()
-        val position = player.getPosition()
-
-        if (playerBinding?.exoProgress?.isAtLiveEdge() == true) {
-            // Hide using a parentView instead?
-            playerBinding?.timeLeft?.alpha = 0f
-            playerBinding?.exoDuration?.alpha = 0f
-            playerBinding?.timeLive?.isVisible = true
-        } else {
-            playerBinding?.timeLeft?.alpha = 1f
-            playerBinding?.exoDuration?.alpha = 1f
-            playerBinding?.timeLive?.isVisible = false
-        }
-
-        if (duration != null && duration > 1 && position != null) {
-            val remainingTimeSeconds = (duration - position + 500) / 1000
-            val formattedTime = "-${DateUtils.formatElapsedTime(remainingTimeSeconds)}"
-            playerBinding?.timeLeft?.text = formattedTime
-        }
-    }
-
-    private fun setRemainingTimeCounter(showRemaining: Boolean) {
-        durationMode = showRemaining
-        playerBinding?.exoDuration?.isInvisible = showRemaining
-        playerBinding?.timeLeft?.isVisible = showRemaining
-    }
-
-    private fun dynamicOrientation(): Int {
-        // TV should always remain in landscape mode
-        if (isLayout(TV or EMULATOR)) {
-            return ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
-        }
-        return if (autoPlayerRotateEnabled) {
-            if (isVerticalOrientation) {
-                ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
-            } else {
-                ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
-            }
-        } else {
-            ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE // default orientation
-        }
-    }
-
     private fun toggleEpisodesOverlay(show: Boolean) {
         if (show && !isShowingEpisodeOverlay) {
             previousPlayStatus = player.getIsPlaying()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index c3d8306e6..3576f4874 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -174,7 +174,6 @@ class GeneratorPlayer : FullScreenPlayer() {
 
     private var preferredAutoSelectSubtitles: String? = null // null means do nothing, "" means none
 
-    private var binding: FragmentPlayerBinding? = null
     private var allMeta: List<ResultEpisode>? = null
     private fun startLoading() {
         player.release()
@@ -348,16 +347,13 @@ class GeneratorPlayer : FullScreenPlayer() {
                         }
 
                         // retry several times with a preview in case the preview generator is slow
-                        for (i in 0..10) {
+                        repeat(10) {
                             val preview = this@GeneratorPlayer.player.getPreview(0.5f)
-                            if (preview == null) {
-                                delay(1000L)
-                                continue
+                            if (preview != null) {
+                                callback.onBitmap(preview)
+                                return@repeat
                             }
-                            callback.onBitmap(
-                                preview
-                            )
-                            break
+                            delay(1000L)
                         }
                     }
 
@@ -373,6 +369,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     return mutableMapOf(
                         STOP_ACTION to NotificationCompat.Action(
                             R.drawable.baseline_stop_24,
+                            @SuppressLint("PrivateResource")
                             context.getString(androidx.media3.ui.R.string.exo_controls_stop_description),
                             createBroadcastIntent(STOP_ACTION, context, instanceId)
                         )
@@ -386,7 +383,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 override fun onCustomAction(player: Player, action: String, intent: Intent) {
                     when (action) {
                         STOP_ACTION -> {
-                            exitFullscreen()
+                            playerHostView?.exitFullscreen()
                             this@GeneratorPlayer.player.release()
                             activity?.popCurrentPage()
                         }
@@ -537,7 +534,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 (if (sameEpisode) currentSelectedSubtitles else null) ?: getAutoSelectSubtitle(
                     currentSubs, settings = true, downloads = true
                 ),
-                preview = isFullScreenPlayer
+                preview = true
             )
         }
 
@@ -633,7 +630,6 @@ class GeneratorPlayer : FullScreenPlayer() {
                     imageViewEnd.setImageDrawable(drawableEnd)
                 }
 
-                @SuppressLint("SetTextI18n")
                 override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
                     val view = convertView ?: LayoutInflater.from(context).inflate(layout, null)
 
@@ -649,6 +645,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                         item?.let { fromTagToLanguageName(it.lang) ?: it.lang } ?: ""
                     val providerSuffix =
                         if (isSingleProvider || item == null) "" else " · ${item.source}"
+                    @SuppressLint("SetTextI18n")
                     secondaryTextView?.text = language + providerSuffix
 
                     setHearingImpairedIcon(drawableEnd, position)
@@ -1520,7 +1517,6 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
-
     override fun playerError(exception: Throwable) {
         val currentUrl =
             currentSelectedLink?.let { it.first?.url ?: it.second?.uri?.toString() } ?: "unknown"
@@ -1846,8 +1842,6 @@ class GeneratorPlayer : FullScreenPlayer() {
         return ""
     }
 
-
-    @SuppressLint("SetTextI18n")
     fun setTitle() {
         var playerVideoTitle = getPlayerVideoTitle()
 
@@ -1869,7 +1863,6 @@ class GeneratorPlayer : FullScreenPlayer() {
         playerBinding?.offlinePin?.isVisible = lastUsedGenerator is DownloadFileGenerator
     }
 
-    @SuppressLint("SetTextI18n")
     fun setPlayerDimen(widthHeight: Pair<Int, Int>?) {
         val resolution = widthHeight?.let { "${it.first}x${it.second}" }
         val name = currentSelectedLink?.first?.name ?: currentSelectedLink?.second?.name
@@ -1981,29 +1974,13 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-    ): View? {
-        // this is used instead of layout-television to follow the settings and some TV devices are not classified as TV for some reason
-        layout =
-            if (isLayout(TV or EMULATOR)) R.layout.fragment_player_tv else R.layout.fragment_player
-
-        viewModel = ViewModelProvider(this)[PlayerGeneratorViewModel::class.java]
-        sync = ViewModelProvider(this)[SyncViewModel::class.java]
-
-        viewModel.attachGenerator(lastUsedGenerator)
-        unwrapBundle(savedInstanceState)
-        unwrapBundle(arguments)
-
-        val root = super.onCreateView(inflater, container, savedInstanceState) ?: return null
-        binding = FragmentPlayerBinding.bind(root)
-        return root
-    }
-
-    override fun onDestroyView() {
-        binding = null
-        super.onDestroyView()
-    }
+    /**
+     * This is used instead of layout-television to follow the
+     * settings and some TV devices are not classified as TV
+     * for some reason.
+     */
+    override fun pickLayout(): Int =
+        if (isLayout(TV or EMULATOR)) R.layout.fragment_player_tv else R.layout.fragment_player
 
     var skipAnimator: ValueAnimator? = null
     var skipIndex = 0
@@ -2127,15 +2104,14 @@ class GeneratorPlayer : FullScreenPlayer() {
                 // update overlay season title
                 var lastTopIndex = -1
                 playerEpisodeList.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-                    @SuppressLint("SetTextI18n", "DefaultLocale")
                     override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                         val layoutManager =
                             recyclerView.layoutManager as? LinearLayoutManager ?: return
                         val topIndex = layoutManager.findFirstCompletelyVisibleItemPosition()
                         if (topIndex != RecyclerView.NO_POSITION && topIndex != lastTopIndex) {
+                            @Suppress("AssignedValueIsNeverRead")
                             lastTopIndex = topIndex
                             val topItem = episodes.getOrNull(topIndex)
-
                             topItem?.let {
                                 playerEpisodeOverlayTitle.setText(
                                     ResultViewModel2.seasonToTxt(
@@ -2153,18 +2129,24 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
-    @SuppressLint("SetTextI18n")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun onBindingCreated(binding: FragmentPlayerBinding, savedInstanceState: Bundle?) {
+        viewModel = ViewModelProvider(this)[PlayerGeneratorViewModel::class.java]
+        sync = ViewModelProvider(this)[SyncViewModel::class.java]
+        viewModel.attachGenerator(lastUsedGenerator)
+        unwrapBundle(savedInstanceState)
+        unwrapBundle(arguments)
+
+        super.onBindingCreated(binding, savedInstanceState)
+
         var langFilterList = listOf<String>()
         var filterSubByLang = false
 
         context?.let { ctx ->
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
-            showName        = settingsManager.getBoolean(ctx.getString(R.string.show_name_key), true)
-            showResolution  = settingsManager.getBoolean(ctx.getString(R.string.show_resolution_key), true)
-            showMediaInfo   = settingsManager.getBoolean(ctx.getString(R.string.show_media_info_key), false)
-            limitTitle      = settingsManager.getInt(ctx.getString(R.string.prefer_title_limit_key), 0)
+            showName = settingsManager.getBoolean(ctx.getString(R.string.show_name_key), true)
+            showResolution = settingsManager.getBoolean(ctx.getString(R.string.show_resolution_key), true)
+            showMediaInfo = settingsManager.getBoolean(ctx.getString(R.string.show_media_info_key), false)
+            limitTitle = settingsManager.getInt(ctx.getString(R.string.prefer_title_limit_key), 0)
             updateForcedEncoding(ctx)
             filterSubByLang =
                 settingsManager.getBoolean(getString(R.string.filter_sub_lang_key), false)
@@ -2189,12 +2171,12 @@ class GeneratorPlayer : FullScreenPlayer() {
             viewModel.loadLinks()
         }
 
-        binding?.overlayLoadingSkipButton?.setOnClickListener {
+        binding.overlayLoadingSkipButton.setOnClickListener {
             startPlayer()
         }
 
-        binding?.playerLoadingGoBack?.setOnClickListener {
-            exitFullscreen()
+        binding.playerLoadingGoBack.setOnClickListener {
+            playerHostView?.exitFullscreen()
             player.release()
             activity?.popCurrentPage()
         }
@@ -2237,14 +2219,15 @@ class GeneratorPlayer : FullScreenPlayer() {
         observe(viewModel.currentLinks) {
             currentLinks = it
             val turnVisible = it.isNotEmpty() && lastUsedGenerator?.canSkipLoading == true
-            val wasGone = binding?.overlayLoadingSkipButton?.isGone == true
+            val wasGone = binding.overlayLoadingSkipButton.isGone
 
-            binding?.overlayLoadingSkipButton?.apply {
+            binding.overlayLoadingSkipButton.apply {
                 isVisible = turnVisible
                 val value = viewModel.currentLinks.value
                 if (value.isNullOrEmpty()) {
                     setText(R.string.skip_loading)
                 } else {
+                    @SuppressLint("SetTextI18n")
                     text = "${context.getString(R.string.skip_loading)} (${value.size})"
                 }
             }
@@ -2260,7 +2243,7 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
 
             if (turnVisible && wasGone) {
-                binding?.overlayLoadingSkipButton?.requestFocus()
+                binding.overlayLoadingSkipButton.requestFocus()
             }
         }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGestureHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGestureHelper.kt
new file mode 100644
index 000000000..4d2b9237e
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGestureHelper.kt
@@ -0,0 +1,1220 @@
+package com.lagradost.cloudstream3.ui.player
+
+import android.animation.ValueAnimator
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Matrix
+import android.media.AudioManager
+import android.media.audiofx.LoudnessEnhancer
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import android.provider.Settings
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.ScaleGestureDetector
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowInsets
+import android.view.animation.AlphaAnimation
+import android.view.animation.Animation
+import android.view.animation.AnimationUtils
+import androidx.annotation.OptIn
+import androidx.core.content.ContextCompat
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.ui.AspectRatioFrameLayout
+import androidx.preference.PreferenceManager
+import com.lagradost.cloudstream3.CommonActivity.keyEventListener
+import com.lagradost.cloudstream3.CommonActivity.screenHeightWithOrientation
+import com.lagradost.cloudstream3.CommonActivity.screenWidthWithOrientation
+import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
+import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
+import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.UIHelper.getStatusBarHeight
+import com.lagradost.cloudstream3.utils.Vector2
+import kotlin.math.abs
+import kotlin.math.absoluteValue
+import kotlin.math.ceil
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.round
+import kotlin.math.roundToInt
+
+/**
+ * Handles all gesture, volume, brightness, speed-up, zoom, and hardware-key-event input for a
+ * [PlayerView].  Keeps these separate from the player-view setup and lifecycle
+ * code in [PlayerView] itself.
+ *
+ * Instantiated and owned by [PlayerView]; accessed from host fragments via the delegate
+ * properties [PlayerView] exposes.
+ */
+@OptIn(UnstableApi::class)
+class PlayerGestureHelper(private val playerView: PlayerView) {
+
+    companion object {
+        /** Swipe-seek constants */
+        const val MINIMUM_SEEK_TIME = 7000L
+        const val MINIMUM_VERTICAL_SWIPE = 2.0f // % of screen height
+        const val MINIMUM_HORIZONTAL_SWIPE = 2.0f // % of screen height
+        const val VERTICAL_MULTIPLIER = 2.0f
+        const val HORIZONTAL_MULTIPLIER = 2.0f
+
+        /** Double-tap constants */
+        /** Maximum finger-hold time (ms) for a tap to qualify as a double-tap seek. */
+        const val DOUBLE_TAP_MAXIMUM_HOLD_TIME = 200L
+        /** Time window (ms) between taps to count as a double-tap.
+         *  Also determines how long a single-tap is delayed before firing. */
+        const val DOUBLE_TAP_MINIMUM_TIME_BETWEEN = 200L
+        /** Fraction of view width on each side that counts as "left" / "right" seek zone. */
+        const val DOUBLE_TAP_PAUSE_PERCENTAGE = 0.15
+
+        /** Zoom constants */
+        /** Minimum zoom; allows zooming out past 100% but snaps back. */
+        const val MINIMUM_ZOOM = 0.95f
+        /** Sensitivity for the auto-snap to 100% at the minimum zoom boundary. */
+        const val ZOOM_SNAP_SENSITIVITY = 0.07f
+        /** Maximum zoom to prevent the user from getting lost. */
+        const val MAXIMUM_ZOOM = 4.0f
+
+        /** Extracts translation and uniform scale from a matrix with no rotation. */
+        fun matrixToTranslationAndScale(matrix: Matrix): Triple<Float, Float, Float> {
+            val points = floatArrayOf(0f, 0f, 1f, 1f)
+            matrix.mapPoints(points)
+            val translationX = points[0]
+            val translationY = points[1]
+            val scale = points[2] - translationX
+            return Triple(translationX, translationY, scale)
+        }
+    }
+
+    private val context: Context get() = playerView.context
+
+    /** Set true by the host when the player occupies the full screen.
+     *  Controls whether hardware volume-key overrides are active (phones/emulators only). */
+    var isFullScreen: Boolean = false
+
+    /** Volume state */
+    var currentRequestedVolume: Float = 0.0f
+    var isVolumeLocked: Boolean = false
+    var hasShownVolumeToast: Boolean = false
+    private var loudnessEnhancer: LoudnessEnhancer? = null
+    private var progressBarLeftHideRunnable: Runnable? = null
+
+    /** Brightness state */
+    var currentRequestedBrightness: Float = 1.0f
+    var currentExtraBrightness: Float = 0.0f
+    var isBrightnessLocked: Boolean = false
+    var hasShownBrightnessToast: Boolean = false
+    /** When true, read/write system brightness via [Settings.System.SCREEN_BRIGHTNESS].
+     *  Automatically falls back to window-attribute brightness if the permission is missing. */
+    var useTrueSystemBrightness: Boolean = true
+    /** White overlay inflated into exo_content_frame; alpha encodes extra brightness (0–1). */
+    var brightnessOverlay: View? = null
+    private var progressBarRightHideRunnable: Runnable? = null
+
+    /** Gesture settings (read from prefs in initialize) */
+    var swipeVerticalEnabled: Boolean = true
+    var swipeHorizontalEnabled: Boolean = false
+    var extraBrightnessEnabled: Boolean = false
+    var speedupEnabled: Boolean = false
+
+    /** Hold / speed-up */
+    val holdHandler = Handler(Looper.getMainLooper())
+    var hasTriggeredSpeedUp = false
+    val holdRunnable = Runnable {
+        playerView.player.setPlaybackSpeed(2.0f)
+        showOrHideSpeedUp(true)
+        playerView.callbacks?.onHoldSpeedUp(true)
+        hasTriggeredSpeedUp = true
+    }
+
+    enum class TouchAction { Brightness, Volume, Time }
+
+    /** Mirrors the host's lock state; suppresses gesture interactions when true. */
+    var isLocked: Boolean = false
+
+    /** Touch tracking */
+    var isCurrentTouchValid = false
+        private set
+    private var currentTouchStart: Vector2? = null
+    private var currentTouchLast: Vector2? = null
+    /** Current in-progress swipe action, null when no swipe is active. */
+    var currentTouchAction: TouchAction? = null
+    /** Action from the previous touch sequence; guards against mis-detected double-taps after swipes. */
+    var currentLastTouchAction: TouchAction? = null
+    /** The time in the player when you first click. */
+    private var currentTouchStartPlayerTime: Long? = null
+    /** The system time when you first click. */
+    private var currentTouchStartTime: Long? = null
+    /** Whether the player UI was visible when the current swipe gesture began. */
+    var uiShowingBeforeGesture: Boolean = false
+
+    /** Icons */
+    private val brightnessIcons = listOf(
+        R.drawable.sun_1, R.drawable.sun_2, R.drawable.sun_3,
+        R.drawable.sun_4, R.drawable.sun_5, R.drawable.sun_6, R.drawable.sun_7,
+    )
+    private val volumeIcons = listOf(
+        R.drawable.ic_baseline_volume_mute_24,
+        R.drawable.ic_baseline_volume_down_24,
+        R.drawable.ic_baseline_volume_up_24,
+    )
+
+    /** Double-tap / tap state */
+
+    /** Whether double-tapping left/right seeks backward/forward. */
+    var doubleTapEnabled: Boolean = false
+
+    /** Whether double-tapping the center of the screen pauses (left/right still seeks if [doubleTapEnabled]). */
+    var doubleTapPauseEnabled: Boolean = false
+
+    /** Seek distance (ms) for each double-tap seek. Read from prefs in [initialize]. */
+    var fastForwardTime: Long = 10_000L
+
+    /** Monotonically-incremented token; cancels any pending single-tap runnable when a double-tap arrives. */
+    private var doubleTapToken = 0
+
+    /** Number of consecutive taps in the current double-tap window. */
+    private var tapCount = 0
+
+    /** System time of the most-recent touch end.  Updated by callers at the end of every ACTION_UP. */
+    var lastTouchEndTime: Long = 0L
+
+    /** Zoom state */
+
+    /** Optional view for showing the snap-hint outline during zoom (set by FullScreenPlayer). */
+    var videoOutline: View? = null
+
+    /** Current zoom+pan matrix, or null when no zoom is active. */
+    var zoomMatrix: Matrix? = null
+
+    /** The matrix the zoom will animate to after the user lifts fingers. */
+    var desiredMatrix: Matrix? = null
+
+    /** Running snap-back animation, or null. */
+    var matrixAnimation: ValueAnimator? = null
+
+    private var scaleGestureDetector: ScaleGestureDetector? = null
+
+    /** Midpoint of the two-finger pan, null when no pan is active. */
+    var lastPan: Vector2? = null
+
+    private var overlayLayoutListener: View.OnLayoutChangeListener? = null
+
+    /** Called from [PlayerView.initialize] after views are bound. */
+    fun initialize() {
+        try {
+            val sm = PreferenceManager.getDefaultSharedPreferences(context)
+            swipeVerticalEnabled = sm.getBoolean(context.getString(R.string.swipe_vertical_enabled_key), true)
+            swipeHorizontalEnabled = sm.getBoolean(context.getString(R.string.swipe_enabled_key), true)
+            extraBrightnessEnabled = sm.getBoolean(context.getString(R.string.extra_brightness_key), false)
+            speedupEnabled = sm.getBoolean(context.getString(R.string.speedup_key), false)
+            doubleTapEnabled = sm.getBoolean(context.getString(R.string.double_tap_enabled_key), false)
+            doubleTapPauseEnabled = sm.getBoolean(context.getString(R.string.double_tap_pause_enabled_key), false)
+            fastForwardTime = sm.getInt(context.getString(R.string.double_tap_seek_time_key), 10).toLong() * 1000L
+        } catch (_: Exception) {
+        }
+
+        // Inject the brightness overlay into the ExoPlayer content frame so it sits
+        // directly on top of the video surface.  Alpha is set by handleBrightnessAdjustment.
+        safe {
+            val pkg = context.packageName
+            @SuppressLint("DiscouragedApi")
+            val contentId = context.resources.getIdentifier("exo_content_frame", "id", pkg)
+            val contentFrame = playerView.exoPlayerView?.findViewById<ViewGroup>(contentId)
+            if (contentFrame != null) {
+                brightnessOverlay?.let {
+                    (it.parent as? ViewGroup)?.removeView(it)
+                }
+                brightnessOverlay = LayoutInflater.from(context)
+                    .inflate(R.layout.extra_brightness_overlay, contentFrame, false)
+                contentFrame.addView(brightnessOverlay)
+            }
+        }
+
+        setupTouchGestures()
+    }
+
+    /** Called from [PlayerView.release]. */
+    fun release() {
+        safe {
+            brightnessOverlay?.let {
+                (it.parent as? ViewGroup)?.removeView(it)
+            }
+        }
+        brightnessOverlay = null
+        loudnessEnhancer?.release()
+        loudnessEnhancer = null
+        holdHandler.removeCallbacksAndMessages(null)
+        clearZoomState()
+        releaseOverlayLayoutListener()
+    }
+
+    /** Key-event listener */
+
+    /**
+     * Registers the basic volume-key listener on [keyEventListener].
+     * Called from [PlayerView.initialize] and from the host fragment's onResume.
+     */
+    fun setupKeyEventListener() {
+        keyEventListener = { (event, _) ->
+            if (event != null && event.action == KeyEvent.ACTION_DOWN)
+                handleVolumeKey(event.keyCode)
+            else false
+        }
+    }
+
+    /** Nulls [keyEventListener]. Called from the host fragment's onPause. */
+    fun releaseKeyEventListener() {
+        keyEventListener = null
+    }
+
+    /** Speed-up */
+
+    fun showOrHideSpeedUp(show: Boolean) {
+        playerView.playerSpeedupButton?.let { btn ->
+            btn.clearAnimation()
+            btn.alpha = if (show) 0f else 1f
+            btn.isVisible = show
+            btn.animate()
+                .alpha(if (show) 1f else 0f)
+                .setDuration(200L)
+                .withEndAction { if (!show) btn.isVisible = false }
+                .start()
+        }
+    }
+
+    /** Volume helpers */
+
+    /**
+     * Syncs [currentRequestedVolume] with the current system stream volume.
+     *
+     * This is here to make returning to the player less jarring, if we change the volume outside
+     * the app. Note that this will make it a bit wierd when using loudness in PiP, then returning
+     * however that is the cost of correctness.
+     */
+    fun verifyVolume() {
+        ((context as? Activity)?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager)?.let { am ->
+            val cur = am.getStreamVolume(AudioManager.STREAM_MUSIC)
+            val max = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+            if (cur < max || currentRequestedVolume <= 1.0f) {
+                currentRequestedVolume = cur.toFloat() / max.toFloat()
+                loudnessEnhancer?.release()
+                loudnessEnhancer = null
+            }
+        }
+    }
+
+    /**
+     * Handles a hardware volume key press.
+     * Only active on phones/emulators when [isFullScreen] is true.
+     *
+     * @return true if the key was consumed (suppresses the system volume UI).
+     */
+    fun handleVolumeKey(keyCode: Int): Boolean {
+        /**
+         * Some TVs do not support volume boosting, and overriding
+         * the volume buttons can be inconvenient for TV users.
+         * Since boosting volume is mainly useful on phones and emulators,
+         * we limit this feature to those devices.
+         */
+        if (!isLayout(PHONE or EMULATOR) || !isFullScreen) return false
+        if (keyCode != KeyEvent.KEYCODE_VOLUME_UP && keyCode != KeyEvent.KEYCODE_VOLUME_DOWN) return false
+        verifyVolume()
+        if (currentRequestedVolume <= 1.0f) hasShownVolumeToast = false
+        isVolumeLocked = currentRequestedVolume < 1.0f
+        // +- 5%
+        handleVolumeAdjustment(if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) 0.05f else -0.05f, fromButton = true)
+        return true
+    }
+
+    fun handleVolumeAdjustment(delta: Float, fromButton: Boolean) {
+        val am = (context as? Activity)?.getSystemService(Context.AUDIO_SERVICE) as? AudioManager ?: return
+        val curStep = am.getStreamVolume(AudioManager.STREAM_MUSIC)
+        val maxStep = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+
+        val cur = currentRequestedVolume
+        val locked = isVolumeLocked
+        val next = (cur + delta).coerceIn(0.0f, if (locked) 1.0f else 2.0f)
+        val nextStep = (next * maxStep.toFloat()).roundToInt().coerceIn(0, maxStep)
+
+        // Show toast
+        if (fromButton) {
+            // For button related request we only show a toast when we exceeded the volume.
+            if (cur <= 1.0f && next > 1.0f && !hasShownVolumeToast) {
+                showToast(R.string.volume_exceeded_100)
+                hasShownVolumeToast = true
+            }
+        } else {
+            val raw = cur + delta
+            // For swipes, we show toast that we need to swipe again.
+            if (raw > 1.0 && locked && !hasShownVolumeToast) {
+                showToast(R.string.slide_up_again_to_exceed_100)
+                hasShownVolumeToast = true
+            }
+        }
+
+        // Set the current volume step.
+        if (nextStep != curStep) am.setStreamVolume(AudioManager.STREAM_MUSIC, nextStep, 0)
+
+        var hasBoostError = false
+        // Apply loudness enhancer for volumes > 100%, removes it if less.
+        if (next > 1.0f) {
+            val boost = ((next - 1.0f) * 1000).toInt()
+            val existing = loudnessEnhancer
+            if (existing != null) {
+                existing.setTargetGain(boost)
+            } else {
+                val sessionId = (playerView.exoPlayerView?.player as? ExoPlayer)?.audioSessionId
+                if (sessionId != null && sessionId != AudioManager.ERROR) {
+                    try {
+                        loudnessEnhancer = LoudnessEnhancer(sessionId).apply {
+                            setTargetGain(boost); enabled = true
+                        }
+                    } catch (t: Throwable) { logError(t); hasBoostError = true }
+                }
+            }
+        } else {
+            loudnessEnhancer?.release(); loudnessEnhancer = null
+        }
+
+        currentRequestedVolume = next
+
+        val leftHolder = playerView.playerProgressbarLeftHolder ?: return
+        val level1 = playerView.playerProgressbarLeftLevel1  ?: return
+        val level2 = playerView.playerProgressbarLeftLevel2  ?: return
+        val icon = playerView.playerProgressbarLeftIcon    ?: return
+
+        if (next > 1.0f) {
+            // Change color to show that LoudnessEnhancer broke
+            // this is not a real fix, but solves the crash issue.
+            level2.progressTintList = ColorStateList.valueOf(
+                ContextCompat.getColor(context, if (hasBoostError) R.color.colorPrimaryRed else R.color.colorPrimaryOrange)
+            )
+        }
+        // Max is set high to make it smooth.
+        level1.max = 100_000
+        level1.progress = (next * 100_000f).toInt().coerceIn(2_000, 100_000)
+        level2.max = 100_000
+        level2.progress = if (next > 1.0f) ((next - 1.0) * 100_000f).toInt().coerceIn(2_000, 100_000) else 0
+        level2.isVisible = next > 1.0f
+        // Calculate the clamped index for the volume icon based on the requested volume.
+        val iconIdx = (next * volumeIcons.lastIndex).roundToInt().coerceIn(0, volumeIcons.lastIndex)
+        icon.setImageResource(volumeIcons[iconIdx])
+
+        if (!leftHolder.isVisible || leftHolder.alpha < 1f) {
+            leftHolder.animate().cancel(); leftHolder.alpha = 1f; leftHolder.isVisible = true
+        }
+        progressBarLeftHideRunnable?.let { leftHolder.removeCallbacks(it) }
+        progressBarLeftHideRunnable = Runnable {
+            leftHolder.animate().cancel()
+            leftHolder.animate().alpha(0f).setDuration(300).withEndAction { leftHolder.isVisible = false }.start()
+        }
+        // Show the progress bar for 1.5 seconds.
+        leftHolder.postDelayed(progressBarLeftHideRunnable, 1500)
+    }
+
+    /** Brightness helpers */
+
+    /**
+     * Reads from [Settings.System.SCREEN_BRIGHTNESS], falling back to the window
+     * attribute if the permission is absent.
+     */
+    fun getBrightness(): Float? {
+        return if (useTrueSystemBrightness) {
+            try {
+                Settings.System.getInt(
+                    (context as? Activity)?.contentResolver,
+                    Settings.System.SCREEN_BRIGHTNESS
+                ) / 255f
+            } catch (_: Exception) {
+                // Because true system brightness requires
+                // permission, this is a lazy way to check
+                // as it will throw an error if we do not have it.
+                useTrueSystemBrightness = false
+                getBrightness()
+            }
+        } else {
+            try {
+                (context as? Activity)?.window?.attributes?.screenBrightness?.takeIf { it >= 0f }
+            } catch (e: Exception) {
+                logError(e)
+                null
+            }
+        }
+    }
+
+    /**
+     * Sets [Settings.System.SCREEN_BRIGHTNESS], falling back to the window
+     * attribute if the permission is absent.
+     */
+    fun setBrightness(brightness: Float) {
+        if (useTrueSystemBrightness) {
+            try {
+                Settings.System.putInt(
+                    (context as? Activity)?.contentResolver,
+                    Settings.System.SCREEN_BRIGHTNESS_MODE,
+                    Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL
+                )
+                Settings.System.putInt(
+                    (context as? Activity)?.contentResolver,
+                    Settings.System.SCREEN_BRIGHTNESS,
+                    min(1, (brightness.coerceIn(0.0f, 1.0f) * 255).toInt())
+                )
+            } catch (_: Exception) {
+                useTrueSystemBrightness = false
+                setBrightness(brightness)
+            }
+        } else {
+            try {
+                val lp = (context as? Activity)?.window?.attributes ?: return
+                // Use 0.004f instead of 0: on some devices a value too close to 0 causes the
+                // system to override with its own brightness, making fine-tuning impossible.
+                lp.screenBrightness = brightness.coerceIn(0.004f, 1.0f)
+                (context as? Activity)?.window?.attributes = lp
+            } catch (e: Exception) {
+                logError(e)
+            }
+        }
+    }
+
+    fun handleBrightnessAdjustment(verticalAddition: Float) {
+        val lastBrightness = currentRequestedBrightness
+        val raw = currentRequestedBrightness + verticalAddition
+        val next = raw.coerceIn(0.0f, if (extraBrightnessEnabled && !isBrightnessLocked) 2.0f else 1.0f)
+
+        if (extraBrightnessEnabled && isBrightnessLocked && raw > 1.0f && !hasShownBrightnessToast) {
+            showToast(R.string.slide_up_again_to_exceed_100)
+            hasShownBrightnessToast = true
+        }
+
+        currentRequestedBrightness = next
+        if (lastBrightness != currentRequestedBrightness) setBrightness(currentRequestedBrightness)
+
+        currentExtraBrightness = if (extraBrightnessEnabled && next > 1.0f) min(2.0f, next) - 1.0f else 0.0f
+        brightnessOverlay?.alpha = currentExtraBrightness
+        playerView.callbacks?.onBrightnessExtra(currentExtraBrightness)
+
+        val rightHolder = playerView.playerProgressbarRightHolder ?: return
+        val level1 = playerView.playerProgressbarRightLevel1 ?: return
+        val level2 = playerView.playerProgressbarRightLevel2 ?: return
+        val icon = playerView.playerProgressbarRightIcon   ?: return
+
+        level1.max = 100_000
+        level1.progress = max(2_000, (min(1.0f, next) * 100_000f).toInt())
+
+        if (extraBrightnessEnabled) {
+            level2.max = 100_000
+            level2.progress = (currentExtraBrightness * 100_000f).toInt().coerceIn(2_000, 100_000)
+            level2.isVisible = next > 1.0f
+        }
+
+        icon.setImageResource(
+            // Clamp the value in case of extra brightness.
+            brightnessIcons[min(brightnessIcons.lastIndex, max(0, round(next * brightnessIcons.lastIndex).toInt()))]
+        )
+
+        if (!rightHolder.isVisible || rightHolder.alpha < 1f) {
+            rightHolder.animate().cancel(); rightHolder.alpha = 1f; rightHolder.isVisible = true
+        }
+        progressBarRightHideRunnable?.let { rightHolder.removeCallbacks(it) }
+        progressBarRightHideRunnable = Runnable {
+            rightHolder.animate().cancel()
+            rightHolder.animate().alpha(0f).setDuration(300).withEndAction { rightHolder.isVisible = false }.start()
+        }
+        rightHolder.postDelayed(progressBarRightHideRunnable, 1500)
+    }
+
+    /** Zoom helpers */
+
+    /**
+     * Returns the current zoom matrix, accounting for RESIZE_MODE_ZOOM which already has
+     * an implicit zoom applied.
+     *
+     * This is different from `zoomMatrix ?: Matrix()`
+     * because it allows used to start zooming at different resizeModes.
+     *
+     * The main issue is that RESIZE_MODE_FIT = 100% zoom, but if you are in RESIZE_MODE_ZOOM
+     * 100% will make the zoom snap to less zoomed in then you already are.
+     */
+    fun currentZoomMatrix(): Matrix {
+        val current = zoomMatrix
+        if (current != null) return current
+
+        val exoView = playerView.exoPlayerView
+        val videoView = exoView?.videoSurfaceView
+
+        if (exoView == null || videoView == null ||
+            exoView.resizeMode != AspectRatioFrameLayout.RESIZE_MODE_ZOOM) {
+            return Matrix()
+        }
+
+        val videoWidth = videoView.width.toFloat()
+        val videoHeight = videoView.height.toFloat()
+        val playerWidth = screenWidthWithOrientation.toFloat()
+        val playerHeight = screenHeightWithOrientation.toFloat()
+
+        if (videoWidth <= 1f || videoHeight <= 1f || playerWidth <= 1f || playerHeight <= 1f) {
+            return Matrix()
+        }
+
+        val initAspect = (playerHeight * videoWidth) / (playerWidth * videoHeight)
+        val aspect = max(initAspect, 1f / initAspect)
+        return Matrix().apply { postScale(aspect, aspect) }
+    }
+
+    /**
+     * Applies [newMatrix] (scale + translation only) to the video surface view.
+     *
+     * @param newMatrix The new zoom matrix
+     * @param animation If this zoom is part of an animation, as then it will not auto zoom after we are done.
+     */
+    fun applyZoomMatrix(newMatrix: Matrix, animation: Boolean) {
+        val exoView = playerView.exoPlayerView ?: return
+        if (!animation) {
+            matrixAnimation?.cancel()
+            matrixAnimation = null
+        }
+        val (translationX, translationY, scale) = matrixToTranslationAndScale(newMatrix)
+
+        if (exoView.resizeMode == AspectRatioFrameLayout.RESIZE_MODE_FIT) {
+            exoView.resizeMode = AspectRatioFrameLayout.RESIZE_MODE_ZOOM
+        }
+
+        val videoView = exoView.videoSurfaceView ?: return
+        val videoWidth = videoView.width.toFloat()
+        val videoHeight = videoView.height.toFloat()
+        val playerWidth = screenWidthWithOrientation.toFloat()
+        val playerHeight = screenHeightWithOrientation.toFloat()
+
+        // Sanity check
+        if (videoWidth <= 1f || videoHeight <= 1f || playerWidth <= 1f || playerHeight <= 1f || scale <= 0.01f) return
+
+        // Calculate the scaled aspect ratio as the view height is not real, check the debugger
+        // and you will see videoView.height > screen.height.
+        val initAspect = (playerHeight * videoWidth) / (playerWidth * videoHeight)
+        val aspect = min(initAspect, 1f / initAspect)
+        val scaledAspect = scale * aspect
+
+        // Calculate clamp, this is very weird because we need to use aspect here as videoHeight > playerHeight.
+        val maxTransX = max(0f, videoWidth  * scaledAspect - playerWidth)  * 0.5f
+        val maxTransY = max(0f, videoHeight * scaledAspect - playerHeight) * 0.5f
+
+        // Correct the translation to clamp within the viewing area.
+        val expectedTranslationX = translationX.coerceIn(-maxTransX, maxTransX)
+        val expectedTranslationY = translationY.coerceIn(-maxTransY, maxTransY)
+
+        // Set the transform to the correct x and y.
+        newMatrix.postTranslate(
+            expectedTranslationX - translationX,
+            expectedTranslationY - translationY
+        )
+        zoomMatrix = newMatrix
+
+        if (!animation) {
+            // If we are not in an animation, set up the values for the animation.
+            if ((scaledAspect - 1f).absoluteValue < ZOOM_SNAP_SENSITIVITY) {
+                // We are within the correct scaling, so center and fit it.
+                videoOutline?.isVisible = true
+                val desired = Matrix()
+                desired.setScale(1f / aspect, 1f / aspect)
+                desiredMatrix = desired
+            } else if (scale < 1f) {
+                // We have zoomed too far, zoom to 100%.
+                videoOutline?.isVisible = false
+                desiredMatrix = Matrix()
+            } else {
+                // Keep the same scaling after zoom.
+                videoOutline?.isVisible = false
+                desiredMatrix = null
+            }
+        }
+
+        // Finally set the actual scale + translation.
+        videoView.scaleX = scaledAspect
+        videoView.scaleY = scaledAspect
+        videoView.translationX = expectedTranslationX
+        videoView.translationY = expectedTranslationY
+        updateBrightnessOverlayBounds()
+    }
+
+    /**
+     * Clears all zoom state and resets the video surface view to 1:1 scale.
+     * Does NOT change the ExoPlayer resize mode - call [PlayerView.resize] separately.
+     */
+    fun clearZoomState() {
+        matrixAnimation?.cancel()
+        matrixAnimation = null
+        zoomMatrix = null
+        desiredMatrix = null
+        scaleGestureDetector = null
+        lastPan = null
+        playerView.exoPlayerView?.videoSurfaceView?.apply {
+            scaleX = 1f
+            scaleY = 1f
+            translationX = 0f
+            translationY = 0f
+        }
+    }
+
+    /**
+     * Resets zoom to fit mode if any zoom is currently active.
+     * Calls [PlayerView.resize] to update the ExoPlayer resize mode.
+     */
+    fun resetZoomToDefault() {
+        if (zoomMatrix != null) {
+            clearZoomState()
+            playerView.resize(PlayerResize.Fit, false)
+        }
+    }
+
+    private fun createScaleGestureDetector(ctx: Context) {
+        scaleGestureDetector = ScaleGestureDetector(
+            ctx,
+            object : ScaleGestureDetector.SimpleOnScaleGestureListener() {
+                override fun onScale(detector: ScaleGestureDetector): Boolean {
+                    val matrix = currentZoomMatrix()
+                    val (_, _, scale) = matrixToTranslationAndScale(matrix)
+                    // Clamp scale of the zoom, do it here as it is easier than doing it within applyZoomMatrix.
+                    val newScale = (scale * detector.scaleFactor).coerceIn(MINIMUM_ZOOM, MAXIMUM_ZOOM)
+                    // This is how much we should scale it with to prevent infinite scaling.
+                    val actualScaleFactor = newScale / scale
+                    // Scale around the focus point, this is more natural than just zoom.
+                    val pivotX = detector.focusX - screenWidthWithOrientation.toFloat() * 0.5f
+                    val pivotY = detector.focusY - screenHeightWithOrientation.toFloat() * 0.5f
+                    matrix.postScale(actualScaleFactor, actualScaleFactor, pivotX, pivotY)
+                    applyZoomMatrix(matrix, false)
+                    return true
+                }
+            }
+        )
+    }
+
+    /**
+     * Processes a two-finger zoom/pan gesture event.
+     * Handles scale detection, panning, and the snap-back animation after finger lift.
+     *
+     * @param event              The motion event (should have pointerCount >= 2 or [lastPan] != null).
+     * @param ctx                Context used to create the [ScaleGestureDetector] on first call.
+     * @param onFirstPointerDown Called on [MotionEvent.ACTION_POINTER_DOWN] (e.g. hide player UI).
+     * @param onGestureEnd       Called when the gesture ends (e.g. reset caller touch state).
+     * @return Always true (event consumed).
+     */
+    fun handleZoomPanGesture(
+        event: MotionEvent,
+        ctx: Context,
+        onFirstPointerDown: () -> Unit,
+        onGestureEnd: () -> Unit
+    ): Boolean {
+        if (scaleGestureDetector == null) createScaleGestureDetector(ctx)
+        scaleGestureDetector?.onTouchEvent(event)
+
+        when (event.actionMasked) {
+            MotionEvent.ACTION_POINTER_DOWN -> {
+                onFirstPointerDown()
+            }
+
+            MotionEvent.ACTION_MOVE -> {
+                if (event.pointerCount >= 2) {
+                    val newPan = Vector2(
+                        (event.getX(0) + event.getX(1)) / 2f,
+                        (event.getY(0) + event.getY(1)) / 2f
+                    )
+                    val oldPan = lastPan
+                    if (oldPan != null) {
+                        val matrix = currentZoomMatrix()
+                        matrix.postTranslate(newPan.x - oldPan.x, newPan.y - oldPan.y)
+                        applyZoomMatrix(matrix, false)
+                    }
+                    lastPan = newPan
+                }
+            }
+
+            MotionEvent.ACTION_CANCEL,
+            MotionEvent.ACTION_POINTER_UP,
+            MotionEvent.ACTION_UP -> {
+                lastPan = null
+                videoOutline?.isVisible = false
+                matrixAnimation?.cancel()
+                matrixAnimation = null
+
+                // Snap to desired matrix after zoom gesture ends
+                matrixAnimation = ValueAnimator.ofFloat(0f, 1f).apply {
+                    startDelay = 0
+                    duration = 200
+                    val startMatrix = currentZoomMatrix()
+                    val endMatrix = desiredMatrix ?: return@apply
+                    val (startX, startY, startScale) = matrixToTranslationAndScale(startMatrix)
+                    val (endX, endY, endScale) = matrixToTranslationAndScale(endMatrix)
+                    addUpdateListener { anim ->
+                        val v = anim.animatedValue as Float
+                        val vInv = 1f - v
+                        val m = Matrix()
+                        m.setScale(startScale * vInv + endScale * v, startScale * vInv + endScale * v)
+                        m.postTranslate(startX * vInv + endX * v, startY * vInv + endY * v)
+                        applyZoomMatrix(m, true)
+                    }
+                    start()
+                }
+
+                onGestureEnd()
+            }
+        }
+        return true
+    }
+
+    /**
+     * Resizes and repositions [brightnessOverlay] to exactly match the visible video surface,
+     * accounting for zoom scale and translation.
+     */
+    fun updateBrightnessOverlayBounds() {
+        val overlay = brightnessOverlay ?: return
+        val pv = playerView.exoPlayerView ?: return
+        val video = pv.videoSurfaceView ?: return
+
+        // Compute accurate transformed bounding box of the video view after scale+translation.
+        val vw = video.width.toFloat()
+        val vh = video.height.toFloat()
+        val sx = video.scaleX
+        val sy = video.scaleY
+        if (vw <= 0f || vh <= 0f) return
+
+        // Pivot defaults to center if not set.
+        val pivotX = if (video.pivotX != 0f) video.pivotX else vw * 0.5f
+        val pivotY = if (video.pivotY != 0f) video.pivotY else vh * 0.5f
+        // Use view position (includes translation) as base; avoid double-counting translation.
+        val tx = video.x
+        val ty = video.y
+
+        // Transform function for a local point (lx,ly).
+        fun transform(lx: Float, ly: Float): Pair<Float, Float> {
+            val gx = tx + pivotX + (lx - pivotX) * sx
+            val gy = ty + pivotY + (ly - pivotY) * sy
+            return Pair(gx, gy)
+        }
+
+        val p0 = transform(0f, 0f);  val p1 = transform(vw, 0f)
+        val p2 = transform(0f, vh); val p3 = transform(vw, vh)
+
+        val minX = min(min(p0.first,  p1.first),  min(p2.first,  p3.first))
+        val maxX = max(max(p0.first,  p1.first),  max(p2.first,  p3.first))
+        val minY = min(min(p0.second, p1.second), min(p2.second, p3.second))
+        val maxY = max(max(p0.second, p1.second), max(p2.second, p3.second))
+
+        val newW = ceil(maxX - minX).toInt().coerceAtLeast(0)
+        val newH = ceil(maxY - minY).toInt().coerceAtLeast(0)
+
+        val lp = overlay.layoutParams
+        if (lp == null) {
+            overlay.layoutParams = ViewGroup.LayoutParams(newW, newH)
+        } else if (lp.width != newW || lp.height != newH) {
+            lp.width = newW; lp.height = newH
+            overlay.layoutParams = lp
+        }
+
+        overlay.scaleX = 1f; overlay.scaleY = 1f
+        overlay.x = minX;    overlay.y = minY
+    }
+
+    /**
+     * Attaches a persistent layout-change listener to the ExoPlayer view so
+     * [updateBrightnessOverlayBounds] is called on every layout pass (orientation change,
+     * aspect-ratio change, zoom, PiP transition, etc.).
+     */
+    fun requestUpdateBrightnessOverlayOnNextLayout() {
+        val exoView = playerView.exoPlayerView ?: return
+        overlayLayoutListener?.let { exoView.removeOnLayoutChangeListener(it) }
+        val listener = View.OnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+            safe { updateBrightnessOverlayBounds() }
+        }
+        overlayLayoutListener = listener
+        exoView.addOnLayoutChangeListener(listener)
+    }
+
+    /** Removes the overlay layout listener registered by [requestUpdateBrightnessOverlayOnNextLayout]. */
+    fun releaseOverlayLayoutListener() {
+        overlayLayoutListener?.let { playerView.exoPlayerView?.removeOnLayoutChangeListener(it) }
+        overlayLayoutListener = null
+    }
+
+    /** Rewind / fast-forward animations */
+
+    /** Resets the rewind button label to the standard "–Xs" format. */
+    fun resetRewindText() {
+        playerView.exoRewText?.text = context.getString(R.string.rew_text_regular_format)
+            .format(fastForwardTime / 1000)
+    }
+
+    /** Resets the fast-forward button label to the standard "+Xs" format. */
+    fun resetFastForwardText() {
+        playerView.exoFfwdText?.text = context.getString(R.string.ffw_text_regular_format)
+            .format(fastForwardTime / 1000)
+    }
+
+    /**
+     * Fades playerRewHolder, playerFfwdHolder, and playerPausePlay to [fadeTo] (0f or 1f).
+     * Always resets the holder alphas to 1f first so any stale fillAfter state is cleared.
+     * Called from host fragments' show/hide control animations so both GeneratorPlayer and trailer share
+     * the same fade logic.
+     */
+    fun animateCenterControls(fadeTo: Float) {
+        val from = if (fadeTo > 0.5f) 0f else 1f
+        fun makeAnim() = AlphaAnimation(from, fadeTo).apply { duration = 100; fillAfter = true }
+        // Each view needs its own Animation instance; sharing one causes fillAfter to
+        // not hold reliably across all views once any of them restarts the animation.
+        playerView.playerRewHolder?.let  { it.alpha = 1f; it.startAnimation(makeAnim()) }
+        playerView.playerFfwdHolder?.let { it.alpha = 1f; it.startAnimation(makeAnim()) }
+        playerView.playerPausePlay?.startAnimation(makeAnim())
+    }
+
+    /** Plays the rewind animation and seeks back by [fastForwardTime]. */
+    fun rewind() {
+        try {
+            val rewHolder = playerView.playerRewHolder ?: return
+            val rew = playerView.playerRew
+            val rewText = playerView.exoRewText
+            val wasShowing = playerView.callbacks?.isUIShowing() ?: false
+
+            // Only expose the parent chain when controls are currently hidden.
+            val prevCenterMenuGone = playerView.playerCenterMenu?.isGone ?: false
+            val prevVideoHolderVisible = playerView.playerVideoHolder?.isVisible ?: true
+            if (!wasShowing) {
+                playerView.playerCenterMenu?.isGone = false
+                playerView.playerVideoHolder?.isVisible = true
+            }
+            // Always clear any stale fillAfter alpha so the button is visible during animation.
+            rewHolder.alpha = 1f
+
+            rew?.startAnimation(AnimationUtils.loadAnimation(context, R.anim.rotate_left))
+            val goLeft = AnimationUtils.loadAnimation(context, R.anim.go_left)
+            goLeft.setAnimationListener(object : Animation.AnimationListener {
+                override fun onAnimationStart(animation: Animation?) {}
+                override fun onAnimationRepeat(animation: Animation?) {}
+                override fun onAnimationEnd(animation: Animation?) {
+                    rewText?.post {
+                        resetRewindText()
+                        // Restore parent chain only if we changed it and controls are still hidden.
+                        if (!wasShowing && !(playerView.callbacks?.isUIShowing() ?: false)) {
+                            playerView.playerCenterMenu?.isGone = prevCenterMenuGone
+                            playerView.playerVideoHolder?.isVisible = prevVideoHolderVisible
+                            rewHolder.alpha = 0f
+                        }
+                    }
+                }
+            })
+            rewText?.startAnimation(goLeft)
+            rewText?.text = context.getString(R.string.rew_text_format).format(fastForwardTime / 1000)
+            playerView.player.seekTime(-fastForwardTime)
+        } catch (e: Exception) { logError(e) }
+    }
+
+    /** Plays the fast-forward animation and seeks forward by [fastForwardTime]. */
+    fun fastForward() {
+        try {
+            val ffwdHolder = playerView.playerFfwdHolder ?: return
+            val ffwd = playerView.playerFfwd
+            val ffwdText = playerView.exoFfwdText
+            val wasShowing = playerView.callbacks?.isUIShowing() ?: false
+
+            val prevCenterMenuGone = playerView.playerCenterMenu?.isGone ?: false
+            val prevVideoHolderVisible = playerView.playerVideoHolder?.isVisible ?: true
+            if (!wasShowing) {
+                playerView.playerCenterMenu?.isGone = false
+                playerView.playerVideoHolder?.isVisible = true
+            }
+            // Always clear any stale fillAfter alpha so the button is visible during animation.
+            ffwdHolder.alpha = 1f
+
+            ffwd?.startAnimation(AnimationUtils.loadAnimation(context, R.anim.rotate_right))
+            val goRight = AnimationUtils.loadAnimation(context, R.anim.go_right)
+            goRight.setAnimationListener(object : Animation.AnimationListener {
+                override fun onAnimationStart(animation: Animation?) {}
+                override fun onAnimationRepeat(animation: Animation?) {}
+                override fun onAnimationEnd(animation: Animation?) {
+                    ffwdText?.post {
+                        resetFastForwardText()
+                        if (!wasShowing && !(playerView.callbacks?.isUIShowing() ?: false)) {
+                            playerView.playerCenterMenu?.isGone = prevCenterMenuGone
+                            playerView.playerVideoHolder?.isVisible = prevVideoHolderVisible
+                            ffwdHolder.alpha = 0f
+                        }
+                    }
+                }
+            })
+            ffwdText?.startAnimation(goRight)
+            ffwdText?.text = context.getString(R.string.ffw_text_format).format(fastForwardTime / 1000)
+            playerView.player.seekTime(fastForwardTime)
+        } catch (e: Exception) { logError(e) }
+    }
+
+    /** Double-tap detection */
+
+    /**
+     * Call when a valid tap is detected (short hold, minimal movement, valid touch area).
+     * Routes to double-tap seeking/pausing or schedules a delayed single-tap callback.
+     *
+     * Updates [lastTouchEndTime] when a confirmed tap (single or double) is recorded.
+     *
+     * @param x           X coordinate of the tap in the view's coordinate space.
+     * @param viewWidth   Width of the view (used to compute left/center/right zones).
+     * @param isLocked    Whether player controls are locked (suppresses double-tap seek).
+     * @param onSingleTap Invoked when it is determined to be a single tap; may be deferred.
+     * @return true if a double-tap action was performed.
+     */
+    fun onTapDetected(x: Float, viewWidth: Int, isLocked: Boolean, onSingleTap: () -> Unit): Boolean {
+        val anyDoubleTap = doubleTapEnabled || doubleTapPauseEnabled
+        if (!anyDoubleTap) {
+            onSingleTap()
+            return false
+        }
+
+        val timeSinceLast = System.currentTimeMillis() - lastTouchEndTime
+        return if (!isLocked && timeSinceLast < DOUBLE_TAP_MINIMUM_TIME_BETWEEN) {
+            /** Double-tap */
+            tapCount++
+            doubleTapToken++ // cancel any pending single-tap runnable
+            if (doubleTapPauseEnabled) {
+                when {
+                    x < viewWidth / 2f - (DOUBLE_TAP_PAUSE_PERCENTAGE * viewWidth) -> {
+                        if (doubleTapEnabled) rewind()
+                    }
+                    x > viewWidth / 2f + (DOUBLE_TAP_PAUSE_PERCENTAGE * viewWidth) -> {
+                        if (doubleTapEnabled) fastForward()
+                    }
+                    else -> {
+                        playerView.player.handleEvent(CSPlayerEvent.PlayPauseToggle, PlayerEventSource.UI)
+                    }
+                }
+            } else if (doubleTapEnabled) {
+                if (x < viewWidth / 2f) rewind() else fastForward()
+            }
+            true
+        } else {
+            /** Single tap (first tap, or too slow for double-tap) */
+            tapCount = 0
+            val token = ++doubleTapToken
+            playerView.playerHolder?.postDelayed({
+                if (token == doubleTapToken) {
+                    onSingleTap()
+                }
+            }, DOUBLE_TAP_MINIMUM_TIME_BETWEEN)
+            false
+        }
+    }
+
+    /** Seek time helpers */
+
+    private fun calculateNewTime(startTime: Long?, touchStart: Vector2?, touchEnd: Vector2?): Long? {
+        if (touchStart == null || touchEnd == null || startTime == null) return null
+        val diffX = (touchEnd.x - touchStart.x) * HORIZONTAL_MULTIPLIER / screenWidthWithOrientation.toFloat()
+        val duration = playerView.player.getDuration() ?: return null
+        return max(min(startTime + ((duration * (diffX * diffX)) * (if (diffX < 0) -1 else 1)).toLong(), duration), 0)
+    }
+
+    private fun forceLetters(inp: Long, letters: Int = 2): String {
+        val added = letters - inp.toString().length
+        return if (added > 0) "0".repeat(added) + inp.toString() else inp.toString()
+    }
+
+    private fun convertTimeToString(sec: Long): String {
+        val rsec = sec % 60L
+        val min = ceil((sec - rsec) / 60.0).toInt()
+        val rmin = min % 60L
+        val h = ceil((min - rmin) / 60.0).toLong()
+        // int rh = h;// h % 24;
+        return (if (h > 0) forceLetters(h) + ":" else "") +
+               (if (rmin >= 0 || h >= 0) forceLetters(rmin) + ":" else "") +
+               forceLetters(rsec)
+    }
+
+    /** Touch gestures */
+
+    fun setupTouchGestures() {
+        val holder = playerView.playerHolder ?: return
+        @SuppressLint("ClickableViewAccessibility")
+        holder.setOnTouchListener(::handleGesture)
+    }
+
+    private fun isValidTouch(rawX: Float, rawY: Float): Boolean {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            val holder = playerView.playerHolder ?: return true
+            val insets = holder.rootWindowInsets.getInsetsIgnoringVisibility(WindowInsets.Type.systemBars())
+            val validHeight = rawY > insets.top && rawY < screenHeightWithOrientation - insets.bottom
+            val validWidth = rawX > insets.left && rawX < screenWidthWithOrientation - insets.right
+            return validHeight && validWidth
+        }
+
+        return rawY > (context.getStatusBarHeight() ?: 0) && rawX < screenWidthWithOrientation
+    }
+
+    private fun handleGesture(view: View, event: MotionEvent): Boolean {
+        val currentTouch = Vector2(event.x, event.y)
+        val startTouch = currentTouchStart
+
+        /** Two-finger zoom/pan (fullscreen, unlocked) */
+        if ((event.pointerCount >= 2 || lastPan != null) && isFullScreen && !isLocked
+                && !hasTriggeredSpeedUp && currentTouchAction == null) {
+            holdHandler.removeCallbacks(holdRunnable) // Remove 2x speed.
+            isCurrentTouchValid = false // Prevent other touches
+            return handleZoomPanGesture(
+                event = event,
+                ctx = view.context,
+                onFirstPointerDown = {
+                    uiShowingBeforeGesture = playerView.callbacks?.isUIShowing() ?: false
+                    playerView.callbacks?.onHidePlayerUI()
+                },
+                onGestureEnd = {
+                    currentTouchStart = null
+                    currentLastTouchAction = null
+                    currentTouchAction = null
+                    currentTouchStartPlayerTime = null
+                    currentTouchLast = null
+                    currentTouchStartTime = null
+                }
+            )
+        }
+
+        when (event.actionMasked) {
+            MotionEvent.ACTION_DOWN -> {
+                isCurrentTouchValid = isValidTouch(event.rawX, event.rawY)
+                if (isCurrentTouchValid) {
+                    playerView.callbacks?.onTouchDown()
+                    hasTriggeredSpeedUp = false
+                    if (speedupEnabled && playerView.player.getIsPlaying() && !isLocked) {
+                        holdHandler.postDelayed(holdRunnable, 500)
+                    }
+                    isVolumeLocked = currentRequestedVolume < 1.0f
+                    if (currentRequestedVolume <= 1.0f) hasShownVolumeToast = false
+                    isBrightnessLocked = currentRequestedBrightness < 1.0f
+                    if (currentRequestedBrightness <= 1.0f) hasShownBrightnessToast = false
+                    currentTouchStartTime = System.currentTimeMillis()
+                    currentTouchStart = currentTouch
+                    currentTouchLast = currentTouch
+                    currentTouchStartPlayerTime = playerView.player.getPosition()
+                    getBrightness()?.let { currentRequestedBrightness = it + currentExtraBrightness }
+                    verifyVolume()
+                }
+                return true
+            }
+
+            MotionEvent.ACTION_MOVE -> {
+                if (hasTriggeredSpeedUp) return true
+                if (!isCurrentTouchValid) return true
+
+                if (currentTouchAction == null && startTouch != null) {
+                    val diffFromStart = startTouch - currentTouch
+                    if (swipeVerticalEnabled) {
+                        if (abs(diffFromStart.y * 100 / screenHeightWithOrientation) > MINIMUM_VERTICAL_SWIPE) {
+                            holdHandler.removeCallbacks(holdRunnable)
+                            uiShowingBeforeGesture = playerView.callbacks?.isUIShowing() ?: false
+                            playerView.callbacks?.onHidePlayerUI()
+                            currentTouchAction = if ((startTouch.x) >= view.width / 2f)
+                                TouchAction.Volume else TouchAction.Brightness
+                        }
+                    }
+                    if (swipeHorizontalEnabled && !isLocked) {
+                        if (abs(diffFromStart.x * 100 / screenHeightWithOrientation) > MINIMUM_HORIZONTAL_SWIPE) {
+                            holdHandler.removeCallbacks(holdRunnable)
+                            currentTouchAction = TouchAction.Time
+                        }
+                    }
+                }
+
+                val lastTouch = currentTouchLast
+                if (lastTouch != null) {
+                    val diffFromLast = lastTouch - currentTouch
+                    val verticalAddition = diffFromLast.y * VERTICAL_MULTIPLIER / view.height.toFloat()
+                    when (currentTouchAction) {
+                        TouchAction.Time -> {
+                            // This simply updates UI as the seek logic happens on release
+                            // startTime is rounded to make the UI sync in a nice way.
+                            val startTime = currentTouchStartPlayerTime?.div(1000L)?.times(1000L)
+                            if (startTime != null) {
+                                calculateNewTime(startTime, startTouch, currentTouch)?.let { newMs ->
+                                    val skipMs = newMs - startTime
+                                    playerView.callbacks?.onSeekPreviewText(
+                                        "${convertTimeToString(newMs / 1000)} [${
+                                            if (abs(skipMs) < 1000) "" else if (skipMs > 0) "+" else "-"
+                                        }${convertTimeToString(abs(skipMs / 1000))}]"
+                                    )
+                                }
+                            }
+                        }
+                        TouchAction.Brightness -> if (!isLocked) handleBrightnessAdjustment(verticalAddition)
+                        TouchAction.Volume -> if (!isLocked) handleVolumeAdjustment(verticalAddition, false)
+                        null -> Unit
+                    }
+                    if (currentTouchAction != TouchAction.Time) {
+                        playerView.callbacks?.onSeekPreviewText(null)
+                    }
+                }
+                currentTouchLast = currentTouch
+                return true
+            }
+
+            MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> {
+                holdHandler.removeCallbacks(holdRunnable)
+                if (hasTriggeredSpeedUp) {
+                    playerView.player.setPlaybackSpeed(DataStoreHelper.playBackSpeed)
+                    showOrHideSpeedUp(false)
+                    playerView.callbacks?.onHoldSpeedUp(false)
+                    hasTriggeredSpeedUp = false
+                }
+
+                if (isCurrentTouchValid) {
+                    // Horizontal seek on release
+                    if (swipeHorizontalEnabled && currentTouchAction == TouchAction.Time && !isLocked) {
+                        val startTime = currentTouchStartPlayerTime
+                        if (startTime != null) {
+                            calculateNewTime(startTime, startTouch, currentTouch)?.let { seekTo ->
+                                if (abs(seekTo - startTime) > MINIMUM_SEEK_TIME) {
+                                    playerView.player.seekTo(seekTo, PlayerEventSource.UI)
+                                }
+                            }
+                        }
+                    }
+                    // Tap detection: only fire if the finger was held briefly (not a long-press).
+                    val holdTime = currentTouchStartTime?.let { System.currentTimeMillis() - it }
+                    if (currentTouchAction == null && currentLastTouchAction == null
+                        && !hasTriggeredSpeedUp
+                        && (holdTime == null || holdTime < DOUBLE_TAP_MAXIMUM_HOLD_TIME)) {
+                        onTapDetected(
+                            x = currentTouch.x,
+                            viewWidth = view.width,
+                            isLocked = isLocked,
+                            onSingleTap = { playerView.callbacks?.onSingleTap() }
+                        )
+                    }
+                }
+
+                playerView.callbacks?.onSeekPreviewText(null)
+                val hadSwipe = currentTouchAction != null || currentLastTouchAction != null
+                playerView.callbacks?.onGestureEnd(hadSwipe, uiShowingBeforeGesture)
+
+                // Reset touch
+                lastTouchEndTime = System.currentTimeMillis()
+                isCurrentTouchValid = false
+                currentTouchStart = null
+                currentLastTouchAction = currentTouchAction
+                currentTouchAction = null
+                currentTouchStartPlayerTime = null
+                currentTouchLast = null
+                currentTouchStartTime = null
+                uiShowingBeforeGesture = false
+                return true
+            }
+        }
+        return false
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt
new file mode 100644
index 000000000..d8e7e579d
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt
@@ -0,0 +1,851 @@
+package com.lagradost.cloudstream3.ui.player
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.pm.ActivityInfo
+import android.graphics.drawable.AnimatedImageDrawable
+import android.graphics.drawable.AnimatedVectorDrawable
+import android.media.metrics.PlaybackErrorEvent
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import android.text.format.DateUtils
+import android.util.AttributeSet
+import android.util.Log
+import android.view.View
+import android.view.WindowManager
+import android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.ProgressBar
+import android.widget.RelativeLayout
+import android.widget.TextView
+import android.widget.Toast
+import androidx.annotation.OptIn
+import androidx.core.view.isGone
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import androidx.core.widget.doOnTextChanged
+import androidx.fragment.app.FragmentActivity
+import androidx.media3.common.PlaybackException
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.session.MediaSession
+import androidx.media3.ui.AspectRatioFrameLayout
+import androidx.media3.ui.DefaultTimeBar
+import androidx.media3.ui.SubtitleView
+import androidx.media3.ui.TimeBar
+import androidx.preference.PreferenceManager
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
+import com.github.rubensousa.previewseekbar.PreviewBar
+import com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
+import com.lagradost.cloudstream3.CommonActivity.isInPIPMode
+import com.lagradost.cloudstream3.CommonActivity.playerEventListener
+import com.lagradost.cloudstream3.CommonActivity.screenWidth
+import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.ErrorLoadingException
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.ui.player.live.LivePreviewTimeBar
+import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
+import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
+import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
+import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
+import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
+import com.lagradost.cloudstream3.utils.AppContextUtils
+import com.lagradost.cloudstream3.utils.AppContextUtils.requestLocalAudioFocus
+import com.lagradost.cloudstream3.utils.DataStoreHelper
+import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
+import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
+import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
+import com.lagradost.cloudstream3.utils.UIHelper.showSystemUI
+import com.lagradost.cloudstream3.utils.UserPreferenceDelegate
+import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
+import java.net.SocketTimeoutException
+
+/**
+ * Shared player view - manages ExoPlayer setup, view binding, lifecycle, and event
+ * dispatching.  Gesture/volume/brightness/key-event input is handled by [gestureHelper]
+ * ([PlayerGestureHelper]), which is exposed via delegate properties for easier access.
+ */
+@OptIn(UnstableApi::class)
+class PlayerView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) : FrameLayout(context, attrs) {
+
+    companion object {
+        private const val TAG = "PlayerView"
+    }
+
+    /** All gesture, volume, brightness and key-event logic lives here. */
+    val gestureHelper = PlayerGestureHelper(this)
+
+    /** Delegate properties (forwarded to gestureHelper for external callers to have easier access) */
+    var isFullScreen: Boolean
+        get() = gestureHelper.isFullScreen
+        set(value) { gestureHelper.isFullScreen = value }
+
+    var isLocked: Boolean
+        get() = gestureHelper.isLocked
+        set(value) { gestureHelper.isLocked = value }
+
+    var videoOutline: View?
+        get() = gestureHelper.videoOutline
+        set(value) { gestureHelper.videoOutline = value }
+
+    /** Delegate methods */
+    fun handleVolumeKey(keyCode: Int) = gestureHelper.handleVolumeKey(keyCode)
+    fun verifyVolume() = gestureHelper.verifyVolume()
+    fun setupKeyEventListener() = gestureHelper.setupKeyEventListener()
+    fun releaseKeyEventListener() = gestureHelper.releaseKeyEventListener()
+    fun requestUpdateBrightnessOverlayOnNextLayout() = gestureHelper.requestUpdateBrightnessOverlayOnNextLayout()
+    fun releaseOverlayLayoutListener() = gestureHelper.releaseOverlayLayoutListener()
+
+    /** Callbacks */
+
+    /** Host-fragment-level callbacks invoked by [mainCallback]. */
+    interface Callbacks {
+        fun nextEpisode() {}
+        fun prevEpisode() {}
+        fun playerPositionChanged(position: Long, duration: Long) {}
+        fun playerStatusChanged() {}
+        fun playerDimensionsLoaded(width: Int, height: Int) {}
+        fun subtitlesChanged() {}
+        fun embeddedSubtitlesFetched(subtitles: List<SubtitleData>) {}
+        fun onTracksInfoChanged() {}
+        fun onTimestamp(timestamp: VideoSkipStamp?) {}
+        fun onTimestampSkipped(timestamp: VideoSkipStamp) {}
+        fun exitedPipMode() {}
+        fun hasNextMirror(): Boolean = false
+        fun nextMirror() {}
+        fun onDownload(event: DownloadEvent) {}
+        fun playerError(exception: Throwable) {}
+        /** Called after [PlayerView] finishes its own player-attached setup (MediaSession, ExoPlayer view). */
+        fun playerUpdated(player: Any?) {}
+        /** Called on a short single-tap on empty player area (no swipe, no double-tap). */
+        fun onSingleTap() {}
+        /** Called when the hold-for-speedup gesture starts (show=true) or ends (show=false). */
+        fun onHoldSpeedUp(show: Boolean) {}
+        /** Called during brightness swipe with the current extra-brightness alpha (0–1). */
+        fun onBrightnessExtra(alpha: Float) {}
+
+        /** Touch event callbacks */
+
+        /** Returns whether the player UI (controls overlay) is currently visible. */
+        fun isUIShowing(): Boolean = false
+        /** Called on a valid ACTION_DOWN; use for e.g. dismissing an episode overlay. */
+        fun onTouchDown() {}
+        /** Called with seek-preview text during a horizontal-swipe, or null to clear it. */
+        fun onSeekPreviewText(text: String?) {}
+        /** Called when a swipe gesture begins; hide the player UI if desired. */
+        fun onHidePlayerUI() {}
+        /**
+         * Called at the end of each touch sequence.
+         *  @param hadSwipe   true if a swipe (brightness/volume/time) was in progress.
+         *  @param wasUiShowing true if the UI was visible when the swipe began.
+         */
+        fun onGestureEnd(hadSwipe: Boolean, wasUiShowing: Boolean) {}
+        /**
+         * Called when the auto-hide timer fires: UI is showing, no touch is active.
+         * Implement to hide the player controls.
+         */
+        fun onAutoHideUI() {}
+    }
+
+    var callbacks: Callbacks? = null
+
+    /** Player state */
+
+    var player: IPlayer = CS3IPlayer()
+    var resizeMode: Int = 0
+    var hasPipModeSupport: Boolean = true
+    var currentPlayerStatus: CSPlayerLoading = CSPlayerLoading.IsBuffering
+    var mMediaSession: MediaSession? = null
+    private var pipReceiver: BroadcastReceiver? = null
+
+    /** Auto-hide */
+    private var autoHideToken = 0
+    private val autoHideHandler = Handler(Looper.getMainLooper())
+
+    /** View references (populated by bindViews) */
+
+    var subView: SubtitleView? = null
+    var playerPausePlayHolderHolder: FrameLayout? = null
+    var playerPausePlay: ImageView? = null
+    var playerBuffering: ProgressBar? = null
+    /** The Media3/ExoPlayer [androidx.media3.ui.PlayerView] widget. */
+    var exoPlayerView: androidx.media3.ui.PlayerView? = null
+    var piphide: FrameLayout? = null
+    var subtitleHolder: FrameLayout? = null
+    internal var playerRew: View? = null
+    internal var playerFfwd: View? = null
+    internal var exoRewText: TextView? = null
+    internal var exoFfwdText: TextView? = null
+    internal var playerCenterMenu: View? = null
+    internal var playerRewHolder: View? = null
+    internal var playerFfwdHolder: View? = null
+    internal var playerVideoHolder: View? = null
+    var playerProgressbarLeftHolder: RelativeLayout? = null
+    var playerProgressbarLeftIcon: ImageView? = null
+    var playerProgressbarLeftLevel1: ProgressBar? = null
+    var playerProgressbarLeftLevel2: ProgressBar? = null
+    var playerProgressbarRightHolder: RelativeLayout? = null
+    var playerProgressbarRightIcon: ImageView? = null
+    var playerProgressbarRightLevel1: ProgressBar? = null
+    var playerProgressbarRightLevel2: ProgressBar? = null
+    /** Accessed by [PlayerGestureHelper.showOrHideSpeedUp]. */
+    internal var playerSpeedupButton: View? = null
+    var playerHolder: FrameLayout? = null
+    private var exoDuration: TextView? = null
+    private var timeLeft: TextView? = null
+    private var exoPosition: TextView? = null
+    private var timeLive: View? = null
+    private var exoProgress: LivePreviewTimeBar? = null
+
+    /** Seek delta used by the basic rew/ffwd click listeners. Read from settings in [initialize]. */
+    var seekTime: Long = 10_000L
+
+    /** True when the current video is taller than it is wide. Set by [mainCallback] on [ResizedEvent]. */
+    var isVerticalOrientation: Boolean = false
+
+    /** When true, [dynamicOrientation] returns portrait for portrait videos. Read from settings in [initialize]. */
+    var autoPlayerRotateEnabled: Boolean = false
+
+    var durationMode: Boolean by UserPreferenceDelegate("duration_mode", false)
+
+    // Kept so SubtitlesFragment can unsubscribe the exact same reference.
+    private val subStyleListener: (SaveCaptionStyle) -> Unit = ::onSubStyleChanged
+
+    /** View discovery */
+
+    /**
+     * Discovers player-related views from [root].  IDs absent in compact layouts (e.g. trailer) simply
+     * remain null, all usage is null-safe.
+     */
+    fun bindViews(root: View) {
+        exoDuration = root.findViewById(androidx.media3.ui.R.id.exo_duration)
+        exoFfwdText = root.findViewById(R.id.exo_ffwd_text)
+        exoPlayerView = root.findViewById(R.id.player_view)
+        exoPosition = root.findViewById(R.id.exo_position)
+        exoRewText = root.findViewById(R.id.exo_rew_text)
+        piphide = root.findViewById(R.id.piphide)
+        playerBuffering = root.findViewById(R.id.player_buffering)
+        playerCenterMenu = root.findViewById(R.id.player_center_menu)
+        playerFfwd = root.findViewById(R.id.player_ffwd)
+        playerFfwdHolder = root.findViewById(R.id.player_ffwd_holder)
+        playerHolder = root.findViewById(R.id.player_holder)
+        playerPausePlay = root.findViewById(R.id.player_pause_play)
+        playerPausePlayHolderHolder = root.findViewById(R.id.player_pause_play_holder_holder)
+        playerProgressbarLeftHolder = root.findViewById(R.id.player_progressbar_left_holder)
+        playerProgressbarLeftIcon = root.findViewById(R.id.player_progressbar_left_icon)
+        playerProgressbarLeftLevel1 = root.findViewById(R.id.player_progressbar_left_level1)
+        playerProgressbarLeftLevel2 = root.findViewById(R.id.player_progressbar_left_level2)
+        playerProgressbarRightHolder = root.findViewById(R.id.player_progressbar_right_holder)
+        playerProgressbarRightIcon = root.findViewById(R.id.player_progressbar_right_icon)
+        playerProgressbarRightLevel1 = root.findViewById(R.id.player_progressbar_right_level1)
+        playerProgressbarRightLevel2 = root.findViewById(R.id.player_progressbar_right_level2)
+        playerRew = root.findViewById(R.id.player_rew)
+        playerRewHolder = root.findViewById(R.id.player_rew_holder)
+        playerSpeedupButton = root.findViewById(R.id.player_speedup_button)
+        playerVideoHolder = root.findViewById(R.id.player_video_holder)
+        subtitleHolder = root.findViewById(R.id.subtitle_holder)
+        timeLeft = root.findViewById(R.id.time_left)
+        timeLive = root.findViewById(R.id.time_live)
+    }
+
+    /**
+     * Called once after [bindViews].  Sets up the preview seek-bar, subtitle style listener,
+     * player callbacks and basic controls; then delegates gesture/input setup to [gestureHelper].
+     */
+    fun initialize() {
+        resizeMode = DataStoreHelper.resizeMode
+        resize(resizeMode, false)
+
+        player.releaseCallbacks()
+        player.initCallbacks(
+            eventHandler = ::mainCallback,
+            requestedListeningPercentages = listOf(
+                SKIP_OP_VIDEO_PERCENTAGE,
+                PRELOAD_NEXT_EPISODE_PERCENTAGE,
+                NEXT_WATCH_EPISODE_PERCENTAGE,
+                UPDATE_SYNC_PROGRESS_PERCENTAGE,
+            ),
+        )
+
+        if (player is CS3IPlayer) {
+            // Preview bar
+            val progressBar: PreviewTimeBar? = exoPlayerView?.findViewById(R.id.exo_progress)
+            exoProgress = progressBar as? LivePreviewTimeBar
+            val previewImageView: ImageView? = exoPlayerView?.findViewById(R.id.previewImageView)
+            val previewFrameLayout: FrameLayout? =
+                exoPlayerView?.findViewById(R.id.previewFrameLayout)
+
+            if (progressBar != null && previewImageView != null && previewFrameLayout != null) {
+                var resume = false
+                progressBar.addOnScrubListener(object : PreviewBar.OnScrubListener {
+                    override fun onScrubStart(previewBar: PreviewBar?) {
+                        val cs3 = player as? CS3IPlayer ?: return
+                        val hasPreview = cs3.hasPreview()
+                        progressBar.isPreviewEnabled = hasPreview
+                        resume = cs3.getIsPlaying()
+                        if (resume) cs3.handleEvent(CSPlayerEvent.Pause, PlayerEventSource.Player)
+                        // No clashing UI
+                        if (hasPreview) subView?.isVisible = false
+                    }
+
+                    override fun onScrubMove(previewBar: PreviewBar?, progress: Int, fromUser: Boolean) {}
+
+                    override fun onScrubStop(previewBar: PreviewBar?) {
+                        val cs3 = player as? CS3IPlayer ?: return
+                        if (resume) cs3.handleEvent(CSPlayerEvent.Play, PlayerEventSource.Player)
+                        // Delay to prevent the small flicker of subtitle before seeking.
+                        subView?.postDelayed({
+                            // If we are not scrubbing then show subtitles again.
+                            if (previewBar == null || !previewBar.isPreviewEnabled || !previewBar.isShowingPreview) {
+                                subView?.isVisible = true
+                            }
+                        }, 200)
+                    }
+                })
+                progressBar.attachPreviewView(previewFrameLayout)
+                progressBar.setPreviewLoader { currentPosition, max ->
+                    val cs3 = player as? CS3IPlayer ?: return@setPreviewLoader
+                    val bitmap = cs3.getPreview(currentPosition.toFloat().div(max.toFloat()))
+                    previewImageView.isGone = bitmap == null
+                    previewImageView.setImageBitmap(bitmap)
+                }
+            }
+
+            subView = exoPlayerView?.findViewById(androidx.media3.ui.R.id.exo_subtitles)
+            (player as? CS3IPlayer)?.initSubtitles(subView, subtitleHolder, CustomDecoder.style)
+            (player as? CS3IPlayer)?.let {
+                (it.imageGenerator as? PreviewGenerator)?.params =
+                    ImageParams.new16by9(screenWidth)
+            }
+
+            /**
+             * This might seam a bit fucky and that is because it is, the seek event is captured twice, once by the player
+             * and once by the UI even if it should only be registered once by the UI.
+             */
+            exoPlayerView?.findViewById<DefaultTimeBar>(R.id.exo_progress)
+                ?.addListener(object : TimeBar.OnScrubListener {
+                    override fun onScrubStart(timeBar: TimeBar, position: Long) = Unit
+                    override fun onScrubMove(timeBar: TimeBar, position: Long) = Unit
+                    override fun onScrubStop(timeBar: TimeBar, position: Long, canceled: Boolean) {
+                        if (canceled) return
+                        val playerDuration = player.getDuration() ?: return
+                        val playerPosition = player.getPosition() ?: return
+                        mainCallback(
+                            PositionEvent(
+                                source = PlayerEventSource.UI,
+                                durationMs = playerDuration,
+                                fromMs = playerPosition,
+                                toMs = position
+                            )
+                        )
+                    }
+                })
+
+            // Read seek time and rotation settings.
+            try {
+                val sm = PreferenceManager.getDefaultSharedPreferences(context)
+                seekTime = sm.getInt(context.getString(R.string.double_tap_seek_time_key), 10)
+                    .toLong() * 1000L
+                autoPlayerRotateEnabled = sm.getBoolean(
+                    context.getString(R.string.auto_rotate_video_key), true
+                )
+            } catch (_: Exception) {
+            }
+
+            val seekSecs = (seekTime / 1000).toInt()
+            exoRewText?.text = context.getString(R.string.rew_text_regular_format).format(seekSecs)
+            exoFfwdText?.text = context.getString(R.string.ffw_text_regular_format).format(seekSecs)
+
+            playerPausePlay?.setOnClickListener {
+                if (currentPlayerStatus == CSPlayerLoading.IsEnded) {
+                    player.handleEvent(CSPlayerEvent.Restart, PlayerEventSource.UI)
+                } else {
+                    player.handleEvent(CSPlayerEvent.PlayPauseToggle, PlayerEventSource.UI)
+                }
+            }
+            playerRew?.setOnClickListener  {
+                scheduleAutoHide()
+                gestureHelper.rewind()
+            }
+            playerFfwd?.setOnClickListener {
+                scheduleAutoHide()
+                gestureHelper.fastForward()
+            }
+
+            SubtitlesFragment.applyStyleEvent += subStyleListener
+
+            try {
+                val ctx = context
+                val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
+                val cs3 = player as? CS3IPlayer ?: return
+                cs3.cacheSize =
+                    settingsManager.getInt(context.getString(R.string.video_buffer_size_key), 0) * 1024L * 1024L
+                cs3.simpleCacheSize =
+                    settingsManager.getInt(context.getString(R.string.video_buffer_disk_key), 0) * 1024L * 1024L
+                cs3.videoBufferMs =
+                    settingsManager.getInt(context.getString(R.string.video_buffer_length_key), 0) * 1000L
+            } catch (e: Exception) {
+                logError(e)
+            }
+
+            // Duration toggle click listeners
+            exoDuration?.setOnClickListener { setRemainingTimeCounter(true) }
+            timeLeft?.setOnClickListener { setRemainingTimeCounter(false) }
+            // Keep remaining-time text in sync with playback position
+            exoPosition?.doOnTextChanged { _, _, _, _ -> updateRemainingTime() }
+
+            // Delegate gesture/input setup (settings, brightness overlay, touch gestures, key listener)
+            gestureHelper.initialize()
+            setupKeyEventListener()
+
+            // Apply duration-mode display (remaining time vs elapsed); TV always shows remaining
+            setRemainingTimeCounter(durationMode || isLayout(TV))
+        }
+    }
+
+    /** Lifecycle delegation */
+
+    var fullscreenNotch: Boolean = true // TODO SETTING
+
+    fun enterFullscreen(updateOrientation: () -> Unit = {}) {
+        val activity = context as? Activity
+        if (isFullScreen) {
+            activity?.hideSystemUI()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && fullscreenNotch) {
+                val params = activity?.window?.attributes
+                params?.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+                activity?.window?.attributes = params
+            }
+        }
+        updateOrientation()
+    }
+
+    fun exitFullscreen() {
+        val activity = context as? Activity
+        gestureHelper.resetZoomToDefault()
+        activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER
+        // Simply resets brightness and notch settings that might have been overridden.
+        val lp = activity?.window?.attributes
+        lp?.screenBrightness = WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            lp?.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT
+        }
+        activity?.window?.attributes = lp
+        activity?.showSystemUI()
+    }
+
+    fun onStop() {
+        player.onStop()
+    }
+
+    fun onResume(ctx: Context) {
+        player.onResume(ctx)
+    }
+
+    /** Releases all player resources. */
+    fun release() {
+        player.release()
+        player.releaseCallbacks()
+        player = CS3IPlayer()
+
+        playerEventListener = null
+        // keyEventListener is deregistered in onPause so that the incoming player's
+        // onResume can register its own listener without racing against release().
+
+        PlayerPipHelper.updatePIPModeActions(
+            context as? Activity,
+            CSPlayerLoading.IsPaused,
+            false,
+            null
+        )
+
+        mMediaSession?.release()
+        mMediaSession = null
+        exoPlayerView?.player = null
+
+        SubtitlesFragment.applyStyleEvent -= subStyleListener
+
+        gestureHelper.release()
+        autoHideHandler.removeCallbacksAndMessages(null)
+
+        keepScreenOn(false)
+    }
+
+    fun onPictureInPictureModeChanged(
+        isInPictureInPictureMode: Boolean,
+        activity: Activity?
+    ) {
+        try {
+            isInPIPMode = isInPictureInPictureMode
+            if (isInPictureInPictureMode) {
+                // Hide the full-screen UI (controls, etc.) while in picture-in-picture mode.
+                piphide?.isVisible = false
+                pipReceiver = object : BroadcastReceiver() {
+                    override fun onReceive(context: Context, intent: Intent) {
+                        if (ACTION_MEDIA_CONTROL != intent.action) return
+                        player.handleEvent(
+                            CSPlayerEvent.entries[intent.getIntExtra(EXTRA_CONTROL_TYPE, 0)],
+                            source = PlayerEventSource.UI
+                        )
+                    }
+                }
+                val filter = IntentFilter().apply { addAction(ACTION_MEDIA_CONTROL) }
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    activity?.registerReceiver(pipReceiver, filter, Context.RECEIVER_EXPORTED)
+                } else {
+                    @SuppressLint("UnspecifiedRegisterReceiverFlag")
+                    activity?.registerReceiver(pipReceiver, filter)
+                }
+                val isPlaying = player.getIsPlaying()
+                val status = if (isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused
+                updateIsPlaying(status, status)
+            } else {
+                // Restore the full-screen UI.
+                piphide?.isVisible = true
+                callbacks?.exitedPipMode()
+                pipReceiver?.let {
+                    // Prevents java.lang.IllegalArgumentException: Receiver not registered
+                    safe { activity?.unregisterReceiver(it) }
+                }
+                activity?.hideSystemUI()
+                hideKeyboard(this)
+            }
+        } catch (e: Exception) {
+            logError(e)
+        }
+    }
+
+    /** Player UI helpers */
+
+    private fun keepScreenOn(on: Boolean) {
+        val window = (context as? Activity)?.window ?: return
+        if (on) window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        else window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+    }
+
+    fun updateIsPlaying(wasPlaying: CSPlayerLoading, isPlaying: CSPlayerLoading) {
+        val isPlayingRightNow = CSPlayerLoading.IsPlaying == isPlaying
+        val isBuffering = CSPlayerLoading.IsBuffering == isPlaying
+        currentPlayerStatus = isPlaying
+
+        keepScreenOn(isPlayingRightNow || isBuffering)
+
+        if (isBuffering) {
+            playerPausePlayHolderHolder?.isVisible = false
+            playerBuffering?.isVisible = true
+        } else {
+            playerPausePlayHolderHolder?.isVisible = true
+            playerBuffering?.isVisible = false
+
+            if (isPlaying == CSPlayerLoading.IsEnded && isLayout(PHONE)) {
+                playerPausePlay?.setImageResource(R.drawable.ic_baseline_replay_24)
+            } else if (wasPlaying != isPlaying) {
+                playerPausePlay?.setImageResource(
+                    if (isPlayingRightNow) R.drawable.play_to_pause else R.drawable.pause_to_play
+                )
+                val drawable = playerPausePlay?.drawable
+                var startedAnimation = false
+                if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
+                    if (drawable is AnimatedImageDrawable) { drawable.start(); startedAnimation = true }
+                }
+                if (drawable is AnimatedVectorDrawable) { drawable.start(); startedAnimation = true }
+                if (drawable is AnimatedVectorDrawableCompat) { drawable.start(); startedAnimation = true }
+                // Somehow the phone is wacked
+                if (!startedAnimation) {
+                    playerPausePlay?.setImageResource(
+                        if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play
+                    )
+                }
+            } else {
+                playerPausePlay?.setImageResource(
+                    if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play
+                )
+            }
+        }
+
+        PlayerPipHelper.updatePIPModeActions(
+            context as? Activity,
+            isPlaying,
+            hasPipModeSupport,
+            player.getAspectRatio()
+        )
+    }
+
+    private fun requestAudioFocus() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            (context as? Activity)?.requestLocalAudioFocus(AppContextUtils.getFocusRequest())
+        }
+    }
+
+    private fun playerUpdated(player: Any?) {
+        if (player is ExoPlayer) {
+            mMediaSession?.release()
+            mMediaSession = MediaSession.Builder(context, player)
+                // Ensure unique ID for concurrent players.
+                .setId(System.currentTimeMillis().toString())
+                .build()
+
+            // Necessary for multiple combined videos.
+            @Suppress("DEPRECATION")
+            exoPlayerView?.setShowMultiWindowTimeBar(true)
+            exoPlayerView?.player = player
+            exoPlayerView?.performClick()
+        }
+        callbacks?.playerUpdated(player)
+    }
+
+    private fun onSubStyleChanged(style: SaveCaptionStyle) {
+        player.updateSubtitleStyle(style)
+        // Forcefully update the subtitle encoding in case the edge size is changed.
+        player.seekTime(-1)
+    }
+
+    /** Error handling */
+
+    fun playerError(exception: Throwable) {
+        fun showErrorToast(message: String, gotoNext: Boolean = false) {
+            if (gotoNext && callbacks?.hasNextMirror() == true) {
+                showToast(message, Toast.LENGTH_SHORT)
+                callbacks?.nextMirror()
+            } else {
+                showToast(
+                    context.getString(R.string.no_links_found_toast) + "\n" + message,
+                    Toast.LENGTH_LONG
+                )
+                (context as? FragmentActivity)?.popCurrentPage()
+            }
+        }
+
+        when (exception) {
+            is PlaybackException -> {
+                val msg = exception.message ?: ""
+                val errorName = exception.errorCodeName
+                when (val code = exception.errorCode) {
+                    PlaybackException.ERROR_CODE_IO_FILE_NOT_FOUND,
+                    PlaybackException.ERROR_CODE_IO_NO_PERMISSION,
+                    PlaybackException.ERROR_CODE_IO_READ_POSITION_OUT_OF_RANGE,
+                    PlaybackException.ERROR_CODE_IO_UNSPECIFIED,
+                    PlaybackException.ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED ->
+                        showErrorToast("${context.getString(R.string.source_error)}\n$errorName ($code)\n$msg", gotoNext = true)
+
+                    PlaybackException.ERROR_CODE_REMOTE_ERROR,
+                    PlaybackException.ERROR_CODE_IO_BAD_HTTP_STATUS,
+                    PlaybackException.ERROR_CODE_TIMEOUT,
+                    PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED,
+                    PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_TIMEOUT,
+                    PlaybackException.ERROR_CODE_IO_INVALID_HTTP_CONTENT_TYPE ->
+                        showErrorToast("${context.getString(R.string.remote_error)}\n$errorName ($code)\n$msg", gotoNext = true)
+
+                    PlaybackErrorEvent.ERROR_AUDIO_TRACK_INIT_FAILED,
+                    PlaybackErrorEvent.ERROR_AUDIO_TRACK_OTHER,
+                    PlaybackException.ERROR_CODE_DECODING_FAILED,
+                    PlaybackException.ERROR_CODE_AUDIO_TRACK_WRITE_FAILED,
+                    PlaybackException.ERROR_CODE_DECODER_INIT_FAILED,
+                    PlaybackException.ERROR_CODE_DECODER_QUERY_FAILED ->
+                        showErrorToast("${context.getString(R.string.render_error)}\n$errorName ($code)\n$msg", gotoNext = true)
+
+                    PlaybackException.ERROR_CODE_DECODING_FORMAT_UNSUPPORTED,
+                    PlaybackException.ERROR_CODE_DECODING_FORMAT_EXCEEDS_CAPABILITIES ->
+                        showErrorToast("${context.getString(R.string.unsupported_error)}\n$errorName ($code)\n$msg", gotoNext = true)
+
+                    PlaybackException.ERROR_CODE_PARSING_CONTAINER_MALFORMED,
+                    PlaybackException.ERROR_CODE_PARSING_MANIFEST_MALFORMED ->
+                        showErrorToast("${context.getString(R.string.encoding_error)}\n$errorName ($code)\n$msg", gotoNext = true)
+
+                    else ->
+                        showErrorToast("${context.getString(R.string.unexpected_error)}\n$errorName ($code)\n$msg", gotoNext = false)
+                }
+            }
+
+            is InvalidFileException ->
+                showErrorToast("${context.getString(R.string.source_error)}\n${exception.message}", gotoNext = true)
+
+            is SocketTimeoutException -> {
+                /**
+                 * Ensures this is run on the UI thread to prevent issues
+                 * caused by SocketTimeoutException in torrents. Running
+                 * on another thread can break player interactions or
+                 * prevent switching to the next source.
+                 */
+                (context as? Activity)?.runOnUiThread {
+                    showErrorToast("${context.getString(R.string.remote_error)}\n${exception.message}", gotoNext = true)
+                }
+            }
+
+            is ErrorLoadingException ->
+                exception.message?.let { showErrorToast(it, gotoNext = true) }
+                    ?: showErrorToast(exception.toString(), gotoNext = true)
+
+            else ->
+                exception.message?.let { showErrorToast(it, gotoNext = false) }
+                    ?: showErrorToast(exception.toString(), gotoNext = false)
+        }
+    }
+
+    /** Resize */
+
+    fun nextResize() {
+        resizeMode = (resizeMode + 1) % PlayerResize.entries.size
+        resize(resizeMode, true)
+    }
+
+    fun resize(resize: Int, showToast: Boolean) {
+        // Clear all zoom state before applying the new resize mode
+        gestureHelper.clearZoomState()
+        resize(PlayerResize.entries[resize], showToast)
+    }
+
+    fun resize(resize: PlayerResize, showToast: Boolean) {
+        DataStoreHelper.resizeMode = resize.ordinal
+        val type = when (resize) {
+            PlayerResize.Fill -> AspectRatioFrameLayout.RESIZE_MODE_FILL
+            PlayerResize.Fit -> AspectRatioFrameLayout.RESIZE_MODE_FIT
+            PlayerResize.Zoom -> AspectRatioFrameLayout.RESIZE_MODE_ZOOM
+        }
+        exoPlayerView?.resizeMode = type
+        if (showToast) showToast(resize.nameRes, Toast.LENGTH_SHORT)
+    }
+
+    /** Orientation */
+
+    /**
+     * Returns the desired [ActivityInfo] orientation constant based on [isVerticalOrientation]
+     * and [autoPlayerRotateEnabled].  TV/emulator always returns sensor-landscape.
+     * Host fragments call this from [Callbacks.playerDimensionsLoaded] to apply rotation.
+     */
+    fun dynamicOrientation(): Int {
+        if (isLayout(TV or EMULATOR)) return ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+        return if (autoPlayerRotateEnabled && isVerticalOrientation)
+            ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
+        else
+            ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+    }
+
+    /** Event dispatch */
+
+    /**
+     * This receives the events from the player, if you want to append functionality
+     * you do it here, do note that this only receives events for UI changes,
+     * and returning early WON'T stop it from changing in e.g. the player time
+     * or pause status.
+     */
+    fun mainCallback(event: PlayerEvent) {
+        // We don't want to spam DownloadEvent.
+        if (event !is DownloadEvent) Log.i(TAG, "Handle event: $event")
+        when (event) {
+            is DownloadEvent -> callbacks?.onDownload(event)
+            is ResizedEvent -> {
+                // Skip 0x0 dimensions that the player emits when going to STATE_IDLE
+                // to avoid incorrectly resetting the auto-detected orientation.
+                if (event.width > 0 && event.height > 0) {
+                    // TV never rotates; otherwise track whether the video is portrait.
+                    isVerticalOrientation = !isLayout(TV or EMULATOR) && event.height > event.width
+                }
+                callbacks?.playerDimensionsLoaded(event.width, event.height)
+            }
+            is PlayerAttachedEvent -> playerUpdated(event.player)
+            is SubtitlesUpdatedEvent -> callbacks?.subtitlesChanged()
+            is TimestampSkippedEvent -> callbacks?.onTimestampSkipped(event.timestamp)
+            is TimestampInvokedEvent -> callbacks?.onTimestamp(event.timestamp)
+            is TracksChangedEvent -> callbacks?.onTracksInfoChanged()
+            is EmbeddedSubtitlesFetchedEvent -> callbacks?.embeddedSubtitlesFetched(event.tracks)
+            is ErrorEvent -> {
+                val cb = callbacks
+                if (cb != null) cb.playerError(event.error)
+                else playerError(event.error)
+            }
+            is RequestAudioFocusEvent -> requestAudioFocus()
+            is EpisodeSeekEvent -> when (event.offset) {
+                -1 -> callbacks?.prevEpisode()
+                1 -> callbacks?.nextEpisode()
+            }
+            is StatusEvent -> {
+                updateIsPlaying(wasPlaying = event.wasPlaying, isPlaying = event.isPlaying)
+                scheduleAutoHide()
+                callbacks?.playerStatusChanged()
+            }
+            is PositionEvent -> callbacks?.playerPositionChanged(
+                position = event.toMs,
+                duration = event.durationMs
+            )
+            is VideoEndedEvent -> {
+                // Only play next episode if autoplay is on (default).
+                val ctx = context
+                if (PreferenceManager.getDefaultSharedPreferences(ctx)
+                        ?.getBoolean(ctx.getString(R.string.autoplay_next_key), true) == true
+                ) {
+                    player.handleEvent(CSPlayerEvent.NextEpisode, source = PlayerEventSource.Player)
+                }
+            }
+            is PauseEvent -> Unit
+            is PlayEvent -> Unit
+        }
+    }
+
+    /** Duration display */
+
+    fun setRemainingTimeCounter(showRemaining: Boolean) {
+        durationMode = showRemaining
+        exoDuration?.isInvisible = showRemaining
+        timeLeft?.isVisible = showRemaining
+        if (showRemaining) updateRemainingTime()
+    }
+
+    fun updateRemainingTime() {
+        val duration = player.getDuration()
+        val position = player.getPosition()
+
+        if (exoProgress?.isAtLiveEdge() == true) {
+            timeLeft?.alpha = 0f
+            exoDuration?.alpha = 0f
+            timeLive?.isVisible = true
+        } else {
+            timeLeft?.alpha = 1f
+            exoDuration?.alpha = 1f
+            timeLive?.isVisible = false
+        }
+
+        if (duration != null && duration > 1 && position != null) {
+            val remainingTimeSeconds = (duration - position + 500) / 1000
+            @SuppressLint("SetTextI18n")
+            timeLeft?.text = "-${DateUtils.formatElapsedTime(remainingTimeSeconds)}"
+        }
+    }
+
+    /** Auto-hide */
+
+    /**
+     * Schedules a delayed auto-hide of the player UI after [delayMs] ms.
+     * Any previously pending hide is canceled first.
+     * The hide fires only when no touch is active and [Callbacks.isUIShowing] is true;
+     * the actual hide action is delegated to [Callbacks.onAutoHideUI].
+     */
+    fun scheduleAutoHide(delayMs: Long = 3000L) {
+        val token = ++autoHideToken
+        autoHideHandler.removeCallbacksAndMessages(null)
+        autoHideHandler.postDelayed({
+            if (token != autoHideToken) return@postDelayed
+            if (gestureHelper.isCurrentTouchValid) return@postDelayed
+            if (callbacks?.isUIShowing() != true) return@postDelayed
+            callbacks?.onAutoHideUI()
+        }, delayMs)
+    }
+
+    /** Cancels any pending auto-hide scheduled by [scheduleAutoHide]. */
+    fun cancelAutoHide() {
+        autoHideToken++
+        autoHideHandler.removeCallbacksAndMessages(null)
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
index c9da385f6..d96d78324 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
@@ -4,12 +4,10 @@ import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.Intent
 import android.content.res.ColorStateList
-import android.content.res.Configuration
 import android.graphics.Rect
 import android.os.Build
 import android.os.Bundle
 import android.text.Editable
-import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AlphaAnimation
@@ -45,6 +43,7 @@ import com.lagradost.cloudstream3.databinding.FragmentResultBinding
 import com.lagradost.cloudstream3.databinding.FragmentResultSwipeBinding
 import com.lagradost.cloudstream3.databinding.ResultRecommendationsBinding
 import com.lagradost.cloudstream3.databinding.ResultSyncBinding
+import com.lagradost.cloudstream3.databinding.TrailerCustomLayoutBinding
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
@@ -52,12 +51,15 @@ import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.services.SubscriptionWorkManager
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING_SHARE
+import com.lagradost.cloudstream3.ui.BaseFragment
 import com.lagradost.cloudstream3.ui.WatchType
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
 import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK
 import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup
+import com.lagradost.cloudstream3.ui.player.CS3IPlayer
 import com.lagradost.cloudstream3.ui.player.CSPlayerEvent
-import com.lagradost.cloudstream3.ui.player.FullScreenPlayer
+import com.lagradost.cloudstream3.ui.player.IPlayer
+import com.lagradost.cloudstream3.ui.player.PlayerView
 import com.lagradost.cloudstream3.ui.player.source_priority.QualityProfileDialog
 import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
 import com.lagradost.cloudstream3.ui.result.ResultFragment.bindLogo
@@ -99,7 +101,9 @@ import com.lagradost.cloudstream3.utils.txt
 import java.net.URLEncoder
 import kotlin.math.roundToInt
 
-open class ResultFragmentPhone : FullScreenPlayer() {
+open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
+    BindingCreator.Inflate(FragmentResultSwipeBinding::inflate)
+), PlayerView.Callbacks {
     private val gestureRegionsListener =
         object : PanelsChildGestureRegionObserver.GestureRegionsListener {
             override fun onGestureRegionsUpdate(gestureRegions: List<Rect>) {
@@ -110,31 +114,36 @@ open class ResultFragmentPhone : FullScreenPlayer() {
     protected lateinit var viewModel: ResultViewModel2
     protected lateinit var syncModel: SyncViewModel
 
-    protected var binding: FragmentResultSwipeBinding? = null
     protected var resultBinding: FragmentResultBinding? = null
     protected var recommendationBinding: ResultRecommendationsBinding? = null
     protected var syncBinding: ResultSyncBinding? = null
 
-    override var layout = R.layout.fragment_result_swipe
+    var player: IPlayer = CS3IPlayer()
+    protected open var hasPipModeSupport: Boolean = false
+    protected open var isFullScreenPlayer: Boolean = true
+    protected open var lockRotation: Boolean = true
+    protected var playerBinding: TrailerCustomLayoutBinding? = null
+    protected var isShowing: Boolean = false
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        viewModel = ViewModelProvider(this)[ResultViewModel2::class.java]
-        syncModel = ViewModelProvider(this)[SyncViewModel::class.java]
-        updateUIEvent += ::updateUI
+    protected var playerHostView: PlayerView? = null
 
-        val root = super.onCreateView(inflater, container, savedInstanceState) ?: return null
-        FragmentResultSwipeBinding.bind(root).let { bind ->
-            resultBinding = bind.fragmentResult
-            recommendationBinding = bind.resultRecommendations
-            syncBinding = bind.resultSync
-            binding = bind
-        }
+    open fun updateUIVisibility() {}
 
-        return root
+    protected fun uiReset() {
+        isShowing = false
+        updateUIVisibility()
+    }
+
+    open fun showMirrorsDialogue() {}
+    open fun showTracksDialogue() {}
+    open fun openOnlineSubPicker(
+        context: android.content.Context,
+        loadResponse: LoadResponse?,
+        dismissCallback: () -> Unit
+    ) {}
+
+    override fun fixLayout(view: View) {
+        fixSystemBarsPadding(view)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -158,7 +167,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
 
     override fun playerError(exception: Throwable) {
         if (player.getIsPlaying()) { // because we don't want random toasts in player
-            super.playerError(exception)
+            playerHostView?.playerError(exception)
         } else {
             nextMirror()
         }
@@ -258,7 +267,8 @@ open class ResultFragmentPhone : FullScreenPlayer() {
         }
 
         updateUIEvent -= ::updateUI
-        binding = null
+        playerHostView?.release()
+        playerBinding = null
         resultBinding?.resultScroll?.setOnClickListener(null)
         resultBinding = null
         syncBinding = null
@@ -282,7 +292,6 @@ open class ResultFragmentPhone : FullScreenPlayer() {
 
     var selectSeason: String? = null
     var selectEpisodeRange: String? = null
-    var selectSort: EpisodeSortType? = null
 
     private fun setUrl(url: String?) {
         if (url == null) {
@@ -325,6 +334,10 @@ open class ResultFragmentPhone : FullScreenPlayer() {
     override fun onResume() {
         afterPluginsLoadedEvent += ::reloadViewModel
         activity?.setNavigationBarColorCompat(R.attr.primaryBlackBackground)
+        context?.let { ctx ->
+            playerHostView?.onResume(ctx)
+            playerHostView?.setupKeyEventListener()
+        }
         super.onResume()
         PanelsChildGestureRegionObserver.Provider.get()
             .addGestureRegionsUpdateListener(gestureRegionsListener)
@@ -332,30 +345,44 @@ open class ResultFragmentPhone : FullScreenPlayer() {
 
     override fun onStop() {
         afterPluginsLoadedEvent -= ::reloadViewModel
+        playerHostView?.onStop()
         super.onStop()
     }
 
+    @Suppress("UNUSED_PARAMETER")
     private fun updateUI(id: Int?) {
         syncModel.updateUserData()
         viewModel.reloadEpisodes()
     }
 
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        view?.let { fixSystemBarsPadding(it) }
-    }
+    override fun onBindingCreated(binding: FragmentResultSwipeBinding, savedInstanceState: Bundle?) {
+        // Set up sub-binding references
+        viewModel = ViewModelProvider(this)[ResultViewModel2::class.java]
+        syncModel = ViewModelProvider(this)[SyncViewModel::class.java]
+        updateUIEvent += ::updateUI
 
-    @SuppressLint("SetTextI18n")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+        resultBinding = binding.fragmentResult
+        recommendationBinding = binding.resultRecommendations
+        syncBinding = binding.resultSync
+
+        // Set up trailer player
+        val ctx = context ?: return
+        playerHostView = PlayerView(ctx)
+        playerHostView?.player = player
+        playerHostView?.hasPipModeSupport = hasPipModeSupport
+        playerHostView?.callbacks = this
+        playerHostView?.bindViews(binding.root)
+        playerBinding = binding.root.findViewById<View?>(R.id.player_holder)?.let {
+            TrailerCustomLayoutBinding.bind(it)
+        }
+        playerHostView?.initialize()
 
         // ===== setup =====
-        fixSystemBarsPadding(view)
         val storedData = getStoredData() ?: return
         activity?.window?.decorView?.clearFocus()
         activity?.loadCache()
         context?.updateHasTrailers()
-        hideKeyboard()
+        hideKeyboard(binding.root)
         if (storedData.restart || !viewModel.hasLoaded())
             viewModel.load(
                 activity,
@@ -373,7 +400,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
         // This may not be 100% reliable, and may delay for small period
         // before resultCastItems will be scrollable again, but this does work
         // most of the time.
-        binding?.resultOverlappingPanels?.registerEndPanelStateListeners(
+        binding.resultOverlappingPanels.registerEndPanelStateListeners(
             object : OverlappingPanelsLayout.PanelStateListener {
                 override fun onPanelStateChange(panelState: PanelState) {
                     PanelsChildGestureRegionObserver.Provider.get().apply {
@@ -385,8 +412,8 @@ open class ResultFragmentPhone : FullScreenPlayer() {
 
         // ===== ===== =====
 
-        binding?.resultSearch?.isGone = storedData.name.isBlank()
-        binding?.resultSearch?.setOnClickListener {
+        binding.resultSearch.isGone = storedData.name.isBlank()
+        binding.resultSearch.setOnClickListener {
             QuickSearchFragment.pushSearch(activity, storedData.name)
         }
 
@@ -415,7 +442,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                     focused: View?
                 ): Boolean {
                     // Make the cast always focus the first visible item when focused
-                    // from somewhere else. Otherwise it jumps to the last item.
+                    // from somewhere else. Otherwise, it jumps to the last item.
                     return if (parent.focusedChild == null) {
                         scrollToPosition(this.findFirstCompletelyVisibleItemPosition())
                         true
@@ -468,9 +495,9 @@ open class ResultFragmentPhone : FullScreenPlayer() {
             resultScroll.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
                 val dy = scrollY - oldScrollY
                 if (dy > 0) { //check for scroll down
-                    binding?.resultBookmarkFab?.shrink()
+                    binding.resultBookmarkFab.shrink()
                 } else if (dy < -5) {
-                    binding?.resultBookmarkFab?.extend()
+                    binding.resultBookmarkFab.extend()
                 }
                 if (!isFullScreenPlayer && player.getIsPlaying()) {
                     if (scrollY > (resultBinding?.fragmentTrailer?.playerBackground?.height
@@ -482,7 +509,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
             })
         }
 
-        binding?.apply {
+        binding.apply {
             resultOverlappingPanels.setStartPanelLockState(OverlappingPanelsLayout.LockState.CLOSE)
             resultOverlappingPanels.setEndPanelLockState(OverlappingPanelsLayout.LockState.CLOSE)
             resultBack.setOnClickListener {
@@ -675,7 +702,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
         }
 
         observeNullable(viewModel.subscribeStatus) { isSubscribed ->
-            binding?.resultSubscribe?.isVisible = isSubscribed != null
+            binding.resultSubscribe.isVisible = isSubscribed != null
             if (isSubscribed == null) return@observeNullable
 
             val drawable = if (isSubscribed) {
@@ -684,11 +711,11 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                 R.drawable.baseline_notifications_none_24
             }
 
-            binding?.resultSubscribe?.setImageResource(drawable)
+            binding.resultSubscribe.setImageResource(drawable)
         }
 
         observeNullable(viewModel.favoriteStatus) { isFavorite ->
-            binding?.resultFavorite?.isVisible = isFavorite != null
+            binding.resultFavorite.isVisible = isFavorite != null
             if (isFavorite == null) return@observeNullable
 
             val drawable = if (isFavorite) {
@@ -697,7 +724,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                 R.drawable.ic_baseline_favorite_border_24
             }
 
-            binding?.resultFavorite?.setImageResource(drawable)
+            binding.resultFavorite.setImageResource(drawable)
         }
 
         observeNullable(viewModel.episodes) { episodes ->
@@ -932,7 +959,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                         syncModel.addFromUrl(d.url)
                     }
 
-                    binding?.apply {
+                    binding.apply {
                         resultSearch.isGone = d.title.isBlank()
                         resultSearch.setOnClickListener {
                             QuickSearchFragment.pushSearch(activity, d.title)
@@ -967,10 +994,11 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                 }
 
                 (data as? Resource.Failure)?.let { data ->
+                    @SuppressLint("SetTextI18n")
                     resultErrorText.text = storedData.url.plus("\n") + data.errorString
                 }
 
-                binding?.resultBookmarkFab?.isVisible = data is Resource.Success
+                binding.resultBookmarkFab.isVisible = data is Resource.Success
                 resultFinishLoading.isVisible = data is Resource.Success
 
                 resultLoading.isVisible = data is Resource.Loading
@@ -1018,7 +1046,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
         }
 
         observe(viewModel.trailers) { trailers ->
-            setTrailers(trailers.flatMap { it.mirros }) // I dont care about subtitles yet!
+            setTrailers(trailers.flatMap { it.mirros }) // I don't care about subtitles yet!
         }
 
         observe(syncModel.synced) { list ->
@@ -1027,8 +1055,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
 
             val newList = list.filter { it.isSynced && it.hasAccount }
 
-            binding?.resultMiniSync?.isVisible = newList.isNotEmpty()
-            //(binding?.resultMiniSync?.adapter as? ImageAdapter)?.submitList(newList.mapNotNull { it.icon })
+            binding.resultMiniSync.isVisible = newList.isNotEmpty()
         }
 
 
@@ -1123,7 +1150,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                     }
                 }
             }
-            binding?.resultOverlappingPanels?.setStartPanelLockState(if (closed) OverlappingPanelsLayout.LockState.CLOSE else OverlappingPanelsLayout.LockState.UNLOCKED)
+            binding.resultOverlappingPanels.setStartPanelLockState(if (closed) OverlappingPanelsLayout.LockState.CLOSE else OverlappingPanelsLayout.LockState.UNLOCKED)
         }
         observe(viewModel.recommendations) { recommendations ->
             setRecommendations(recommendations, null)
@@ -1184,7 +1211,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
         }
 
         observe(viewModel.watchStatus) { watchType ->
-            binding?.resultBookmarkFab?.apply {
+            binding.resultBookmarkFab.apply {
                 setText(watchType.stringRes)
                 if (watchType == WatchType.NONE) {
                     context?.colorFromAttribute(R.attr.white)
@@ -1239,6 +1266,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
                         viewModel.skipLoading()
                     }
                     isVisible = true
+                    @SuppressLint("SetTextI18n")
                     text = "${context.getString(R.string.skip_loading)} (${load.linksLoaded})"
                 }
             }
@@ -1359,6 +1387,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
     }
 
     override fun onPause() {
+        playerHostView?.releaseKeyEventListener()
         super.onPause()
         PanelsChildGestureRegionObserver.Provider.get()
             .addGestureRegionsUpdateListener(gestureRegionsListener)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
index 969fa6d95..c2054825c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
@@ -5,41 +5,62 @@ import android.content.Context
 import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
-import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import androidx.core.view.ViewCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import androidx.core.view.ViewCompat
 import com.lagradost.cloudstream3.CommonActivity.screenHeight
 import com.lagradost.cloudstream3.CommonActivity.screenWidth
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.databinding.FragmentResultSwipeBinding
 import com.lagradost.cloudstream3.ui.player.CSPlayerEvent
+import com.lagradost.cloudstream3.ui.player.CSPlayerLoading
 import com.lagradost.cloudstream3.ui.player.PlayerEventSource
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
 import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback
 import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
-open class ResultTrailerPlayer : ResultFragmentPhone() {
+class ResultTrailerPlayer : ResultFragmentPhone() {
 
     override var lockRotation = false
     override var isFullScreenPlayer = false
     override var hasPipModeSupport = false
 
     companion object {
-        const val TAG = "RESULT_TRAILER"
+        const val TAG = "ResultTrailerPlayer"
     }
 
     private var playerWidthHeight: Pair<Int, Int>? = null
+    private var introVisible = true
+
+    // Single-tap on empty player area: toggle controls.
+    override fun onSingleTap() {
+        if (!introVisible) {
+            if (isShowing) uiReset() else showControls()
+        }
+    }
+
+    private fun showControls() {
+        if (introVisible) return
+        isShowing = true
+        updateUIVisibility()
+        playerHostView?.scheduleAutoHide()
+    }
+
+    override fun isUIShowing(): Boolean = isShowing
+
+    override fun onAutoHideUI() {
+        if (player.getIsPlaying()) uiReset()
+    }
+
+    override fun onHidePlayerUI() = uiReset()
 
     override fun nextEpisode() {}
-
     override fun prevEpisode() {}
-
-    override fun playerPositionChanged(position: Long, duration : Long) {}
-
+    override fun playerPositionChanged(position: Long, duration: Long) {}
     override fun nextMirror() {}
 
     override fun onConfigurationChanged(newConfig: Configuration) {
@@ -49,33 +70,28 @@ open class ResultTrailerPlayer : ResultFragmentPhone() {
     }
 
     private fun fixPlayerSize() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            binding?.apply {
-                if (isFullScreenPlayer) {
-                    // Remove listener
+        binding?.apply {
+            if (isFullScreenPlayer) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                     ViewCompat.setOnApplyWindowInsetsListener(root, null)
-                    root.overlay.clear() // Clear the cutout overlay
-                    root.setPadding(0, 0, 0, 0) // Reset padding for full screen
-                } else {
-                    // Reapply padding when not in full screen
-                    fixSystemBarsPadding(root)
+                    root.overlay.clear()
+                }
+                root.setPadding(0, 0, 0, 0)
+            } else {
+                fixSystemBarsPadding(root)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                     ViewCompat.requestApplyInsets(root)
                 }
             }
         }
 
         playerWidthHeight?.let { (w, h) ->
-            if(w <= 0 || h <= 0) return@let
+            if (w <= 0 || h <= 0) return@let
 
             val orientation = context?.resources?.configuration?.orientation ?: return
 
-            val sw = if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
-                screenWidth
-            } else {
-                screenHeight
-            }
+            val sw = if (orientation == Configuration.ORIENTATION_LANDSCAPE) screenWidth else screenHeight
 
-            //result_trailer_loading?.isVisible = false
             resultBinding?.resultSmallscreenHolder?.isVisible = !isFullScreenPlayer
             binding?.resultFullscreenHolder?.isVisible = isFullScreenPlayer
 
@@ -83,35 +99,30 @@ open class ResultTrailerPlayer : ResultFragmentPhone() {
 
             resultBinding?.fragmentTrailer?.playerBackground?.apply {
                 isVisible = true
-                layoutParams =
-                    FrameLayout.LayoutParams(
-                        FrameLayout.LayoutParams.MATCH_PARENT,
-                        if (isFullScreenPlayer) FrameLayout.LayoutParams.MATCH_PARENT else to
-                    )
+                layoutParams = FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.MATCH_PARENT,
+                    if (isFullScreenPlayer) FrameLayout.LayoutParams.MATCH_PARENT else to
+                )
             }
 
             playerBinding?.playerIntroPlay?.apply {
-                layoutParams =
-                    FrameLayout.LayoutParams(
-                        FrameLayout.LayoutParams.MATCH_PARENT,
-                        resultBinding?.resultTopHolder?.measuredHeight
-                            ?: FrameLayout.LayoutParams.MATCH_PARENT
-                    )
+                layoutParams = FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.MATCH_PARENT,
+                    resultBinding?.resultTopHolder?.measuredHeight ?: FrameLayout.LayoutParams.MATCH_PARENT
+                )
             }
 
             if (playerBinding?.playerIntroPlay?.isGone == true) {
                 resultBinding?.resultTopHolder?.apply {
-
                     val anim = ValueAnimator.ofInt(
                         measuredHeight,
                         if (isFullScreenPlayer) ViewGroup.LayoutParams.MATCH_PARENT else to
                     )
-                    anim.addUpdateListener { valueAnimator ->
-                        val `val` = valueAnimator.animatedValue as Int
-                        val layoutParams: ViewGroup.LayoutParams =
-                            layoutParams
-                        layoutParams.height = `val`
-                        setLayoutParams(layoutParams)
+                    anim.addUpdateListener { va ->
+                        val v = va.animatedValue as Int
+                        val lp: ViewGroup.LayoutParams = layoutParams
+                        lp.height = v
+                        layoutParams = lp
                     }
                     anim.duration = 200
                     anim.start()
@@ -120,9 +131,14 @@ open class ResultTrailerPlayer : ResultFragmentPhone() {
         }
     }
 
-    override fun playerDimensionsLoaded(width: Int, height : Int) {
+    override fun playerDimensionsLoaded(width: Int, height: Int) {
         playerWidthHeight = width to height
         fixPlayerSize()
+        // Apply autorotation when fullscreen (lockRotation = true).
+        // PlayerView already set isVerticalOrientation before this callback fires.
+        if (lockRotation) {
+            activity?.requestedOrientation = playerHostView?.dynamicOrientation() ?: return
+        }
     }
 
     override fun showMirrorsDialogue() {}
@@ -132,33 +148,39 @@ open class ResultTrailerPlayer : ResultFragmentPhone() {
         context: Context,
         loadResponse: LoadResponse?,
         dismissCallback: () -> Unit
-    ) {
-    }
+    ) {}
 
     override fun subtitlesChanged() {}
-
     override fun embeddedSubtitlesFetched(subtitles: List<SubtitleData>) {}
     override fun onTracksInfoChanged() {}
-
     override fun exitedPipMode() {}
+
+    override fun onSeekPreviewText(text: String?) {
+        playerBinding?.playerTimeText?.apply {
+            isVisible = text != null
+            if (text != null) this.text = text
+        }
+    }
+
     private fun updateFullscreen(fullscreen: Boolean) {
         isFullScreenPlayer = fullscreen
         lockRotation = fullscreen
+        playerHostView?.isFullScreen = fullscreen
 
-        playerBinding?.playerFullscreen?.setImageResource(if (fullscreen) R.drawable.baseline_fullscreen_exit_24 else R.drawable.baseline_fullscreen_24)
+        playerBinding?.playerFullscreen?.setImageResource(
+            if (fullscreen) R.drawable.baseline_fullscreen_exit_24 else R.drawable.baseline_fullscreen_24
+        )
         if (fullscreen) {
-            enterFullscreen()
+            playerHostView?.enterFullscreen()
             binding?.apply {
                 resultTopBar.isVisible = false
                 resultFullscreenHolder.isVisible = true
                 resultMainHolder.isVisible = false
             }
-
             resultBinding?.fragmentTrailer?.playerBackground?.let { view ->
                 (view.parent as ViewGroup?)?.removeView(view)
                 binding?.resultFullscreenHolder?.addView(view)
             }
-
         } else {
             binding?.apply {
                 resultTopBar.isVisible = true
@@ -169,36 +191,55 @@ open class ResultTrailerPlayer : ResultFragmentPhone() {
                     resultBinding?.resultSmallscreenHolder?.addView(view)
                 }
             }
-            exitFullscreen()
+            playerHostView?.exitFullscreen()
         }
         fixPlayerSize()
         uiReset()
 
         if (isFullScreenPlayer) {
-            activity?.attachBackPressedCallback("ResultTrailerPlayer") {
-                updateFullscreen(false)
-            }
-        } else activity?.detachBackPressedCallback("ResultTrailerPlayer")
+            activity?.attachBackPressedCallback("ResultTrailerPlayer") { updateFullscreen(false) }
+        } else {
+            activity?.detachBackPressedCallback("ResultTrailerPlayer")
+        }
     }
 
     override fun updateUIVisibility() {
         super.updateUIVisibility()
-        playerBinding?.playerGoBackHolder?.isVisible = false
+        playerBinding?.apply {
+            playerGoBackHolder.isVisible = false
+            val controlsVisible = isShowing && !introVisible
+            playerTopHolder.isVisible = controlsVisible
+            playerVideoHolder.isVisible = controlsVisible
+            shadowOverlay.isVisible = controlsVisible
+            playerPausePlayHolderHolder.isVisible =
+                controlsVisible && playerHostView?.currentPlayerStatus != CSPlayerLoading.IsBuffering
+        }
+        // Fade center controls in/out; also resets stale fillAfter alpha from seek animations.
+        playerHostView?.gestureHelper?.animateCenterControls(if (isShowing && !introVisible) 1f else 0f)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        playerBinding?.playerFullscreen?.setOnClickListener {
-            updateFullscreen(!isFullScreenPlayer)
+    override fun playerStatusChanged() {
+        if (introVisible) {
+            playerBinding?.playerPausePlayHolderHolder?.isVisible = false
         }
+    }
+
+    override fun onBindingCreated(binding: FragmentResultSwipeBinding, savedInstanceState: Bundle?) {
+        super.onBindingCreated(binding, savedInstanceState)
+
+        playerHostView?.videoOutline = playerBinding?.videoOutline
+        playerHostView?.requestUpdateBrightnessOverlayOnNextLayout()
+
+        playerBinding?.playerFullscreen?.setOnClickListener { updateFullscreen(!isFullScreenPlayer) }
         updateFullscreen(isFullScreenPlayer)
         uiReset()
 
         playerBinding?.playerIntroPlay?.setOnClickListener {
             playerBinding?.playerIntroPlay?.isGone = true
+            introVisible = false
             player.handleEvent(CSPlayerEvent.Play, PlayerEventSource.UI)
-            updateUIVisibility()
             fixPlayerSize()
+            showControls()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/trailer_custom_layout.xml b/app/src/main/res/layout/trailer_custom_layout.xml
index 8b12505c2..76231a2d3 100644
--- a/app/src/main/res/layout/trailer_custom_layout.xml
+++ b/app/src/main/res/layout/trailer_custom_layout.xml
@@ -12,6 +12,7 @@
         android:layout_width="640dp"
         android:layout_height="match_parent"
         android:background="@drawable/bg_player_metadata_scrim_netflix"
+        android:visibility="gone"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent">
@@ -1129,6 +1130,4 @@
 
         </androidx.recyclerview.widget.RecyclerView>
     </LinearLayout>
-
-
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>

From 2755385fa663280d54c5a3ea145de1507f693362 Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Tue, 28 Apr 2026 21:21:32 +0000
Subject: [PATCH 092/177] Feat: Ask for path before download from UI (#2699)

---
 .../ui/result/ResultFragmentPhone.kt          | 114 +++++++++++++-----
 .../ui/settings/SettingsGeneral.kt            |  16 ++-
 .../ui/settings/SettingsUpdates.kt            |   2 +
 .../ui/settings/utils/DirectoryPicker.kt      |   5 +-
 4 files changed, 102 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
index d96d78324..38b24b265 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
@@ -5,6 +5,7 @@ import android.app.Dialog
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.graphics.Rect
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.text.Editable
@@ -23,6 +24,7 @@ import androidx.core.view.isVisible
 import androidx.core.widget.NestedScrollView
 import androidx.core.widget.doOnTextChanged
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
 import com.discord.panels.OverlappingPanelsLayout
 import com.discord.panels.PanelState
 import com.discord.panels.PanelsChildGestureRegionObserver
@@ -45,6 +47,7 @@ import com.lagradost.cloudstream3.databinding.ResultRecommendationsBinding
 import com.lagradost.cloudstream3.databinding.ResultSyncBinding
 import com.lagradost.cloudstream3.databinding.TrailerCustomLayoutBinding
 import com.lagradost.cloudstream3.mvvm.Resource
+import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.mvvm.observeNullable
@@ -68,6 +71,8 @@ import com.lagradost.cloudstream3.ui.result.ResultFragment.updateUIEvent
 import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchHelper
 import com.lagradost.cloudstream3.ui.setRecycledViewPool
+import com.lagradost.cloudstream3.ui.settings.SettingsGeneral.Companion.pickDownloadPath
+import com.lagradost.cloudstream3.ui.settings.utils.getChooseFolderLauncher
 import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
 import com.lagradost.cloudstream3.utils.AppContextUtils.isCastApiAvailable
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadCache
@@ -92,6 +97,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.populateChips
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
 import com.lagradost.cloudstream3.utils.UIHelper.setListViewHeightBasedOnItems
 import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
+import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getBasePath
 import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
 import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager
 import com.lagradost.cloudstream3.utils.getImageFromDrawable
@@ -99,6 +105,7 @@ import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.setTextHtml
 import com.lagradost.cloudstream3.utils.txt
 import java.net.URLEncoder
+import java.util.concurrent.ConcurrentLinkedDeque
 import kotlin.math.roundToInt
 
 open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
@@ -111,6 +118,72 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
             }
         }
 
+    /** Queue of pending actions that is deferred to after a custom path is set */
+    private val pendingPathActions = ConcurrentLinkedDeque<Pair<Int, ResultEpisode>>()
+
+    /**
+     * Appends all actions to a queue, and asks for a user to enter the download folder if not already set up.
+     *
+     * Then processes the queue in the given order, only after the user has selected a folder.
+     * This is to defer the download to after a file path is set, due to perms.
+     * */
+    private fun requirePathForActions(list: Collection<Pair<Int, ResultEpisode>>) {
+        pendingPathActions.addAll(list)
+        val (_, path) = context?.getBasePath() ?: return
+        if (path == null) {
+            /** If we have not set any download path, then ask the user for it before we download it */
+            try {
+                /** Give the user some info of what we are doing and why, even if it may be missed */
+                showToast(R.string.download_path_pref)
+                pathPicker.launch(Uri.EMPTY)
+            } catch (t: Throwable) {
+                logError(t)
+                /** Something went wrong, TV Device?
+                 * Use the fallback behavior of just downloading it even if no path is selected,
+                 * and hope it works */
+                processPendingActions()
+            }
+        } else {
+            /**
+             * Otherwise dispatch everything, as we already have a valid download path
+             * Even if this is "wrong", we do not care as the user has entered something
+             * */
+            processPendingActions()
+        }
+    }
+
+    /** Clear all the items in the queue and dispatch them to the viewmodel in order */
+    private fun processPendingActions() = viewModel.viewModelScope.launchSafe {
+        while (!pendingPathActions.isEmpty()) {
+            try {
+                val (action, data) = pendingPathActions.pop()
+                viewModel.handleAction(
+                    EpisodeClickEvent(
+                        action,
+                        data
+                    )
+                )
+            } catch (_: NoSuchElementException) {
+                /** In case of a race */
+            }
+        }
+    }
+
+    private val pathPicker = getChooseFolderLauncher { uri, path ->
+        if (uri == null) {
+            /** No path selected, clear the list without acting on it, canceling */
+            if (!pendingPathActions.isEmpty()) {
+                /** Only show on non-empty, just in case */
+                showToast(R.string.download_canceled)
+                pendingPathActions.clear()
+            }
+        } else {
+            /** Select the folder, and dispatch everything */
+            pickDownloadPath(uri, path)
+            processPendingActions()
+        }
+    }
+
     protected lateinit var viewModel: ResultViewModel2
     protected lateinit var syncModel: SyncViewModel
 
@@ -460,7 +533,13 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
                 EpisodeAdapter(
                     api?.hasDownloadSupport == true,
                     { episodeClick ->
-                        viewModel.handleAction(episodeClick)
+                        when (episodeClick.action) {
+                            ACTION_DOWNLOAD_EPISODE, ACTION_DOWNLOAD_MIRROR -> {
+                                requirePathForActions(listOf(episodeClick.action to episodeClick.data))
+                            }
+
+                            else -> viewModel.handleAction(episodeClick)
+                        }
                     },
                     { downloadClickEvent ->
                         DownloadButtonSetup.handleDownloadClick(downloadClickEvent)
@@ -780,30 +859,12 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
                             .setTitle(R.string.download_all)
                             .setMessage(rangeMessage)
                             .setPositiveButton(R.string.yes) { _, _ ->
-                                ioSafe {
-                                    episodes.value.forEach { episode ->
-                                        viewModel.handleAction(
-                                            EpisodeClickEvent(
-                                                ACTION_DOWNLOAD_EPISODE,
-                                                episode
-                                            )
-                                        )
-                                            // Join to make the episodes ordered
-                                            .join()
-                                    }
-                                }
+                                requirePathForActions(episodes.value.map { ACTION_DOWNLOAD_EPISODE to it })
                             }
-                            .setNegativeButton(R.string.cancel) { _, _ ->
-
-                            }.show()
-
+                            .setNegativeButton(R.string.cancel) { _, _ -> }.show()
                     }
-
                 }
-
-
             }
-
         }
 
         observeNullable(viewModel.movie) { data ->
@@ -852,18 +913,11 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
 
                         when (click.action) {
                             DOWNLOAD_ACTION_DOWNLOAD -> {
-                                viewModel.handleAction(
-                                    EpisodeClickEvent(ACTION_DOWNLOAD_EPISODE, ep)
-                                )
+                                requirePathForActions(listOf(ACTION_DOWNLOAD_EPISODE to ep))
                             }
 
                             DOWNLOAD_ACTION_LONG_CLICK -> {
-                                viewModel.handleAction(
-                                    EpisodeClickEvent(
-                                        ACTION_DOWNLOAD_MIRROR,
-                                        ep
-                                    )
-                                )
+                                requirePathForActions(listOf(ACTION_DOWNLOAD_MIRROR to ep))
                             }
 
                             else -> DownloadButtonSetup.handleDownloadClick(click)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index b13987f28..dbf2ff1dc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -8,6 +8,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.edit
 import androidx.core.os.ConfigurationCompat
+import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.cloudstream3.APIHolder.allProviders
@@ -155,16 +156,23 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
         val lang: String,
     )
 
-    private val pathPicker = getChooseFolderLauncher { uri, path ->
-        val context = context ?: CloudStreamApp.context ?: return@getChooseFolderLauncher
-        (path ?: uri.toString()).let {
+    companion object {
+        fun Fragment.pickDownloadPath(uri: Uri?, path: String?) {
+            if (uri == null) return
+
+            val context = context ?: CloudStreamApp.context ?: return
+            val visual = path ?: uri.toString()
             PreferenceManager.getDefaultSharedPreferences(context).edit {
                 putString(getString(R.string.download_path_key), uri.toString())
-                putString(getString(R.string.download_path_key_visual), it)
+                putString(context.getString(R.string.download_path_key_visual), visual)
             }
         }
     }
 
+    private val pathPicker = getChooseFolderLauncher { uri, path ->
+        pickDownloadPath(uri, path)
+    }
+
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         hideKeyboard()
         setPreferencesFromResource(R.xml.settings_general, rootKey)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
index 9250f6f6f..c04215594 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
@@ -58,6 +58,8 @@ class SettingsUpdates : BasePreferenceFragmentCompat() {
     }
 
     private val pathPicker = getChooseFolderLauncher { uri, path ->
+        if(uri == null) return@getChooseFolderLauncher
+
         val context = context ?: CloudStreamApp.context ?: return@getChooseFolderLauncher
         (path ?: uri.toString()).let {
             PreferenceManager.getDefaultSharedPreferences(context).edit {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/utils/DirectoryPicker.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/utils/DirectoryPicker.kt
index 08a79b4b4..dfc931174 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/utils/DirectoryPicker.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/utils/DirectoryPicker.kt
@@ -10,7 +10,10 @@ import com.lagradost.safefile.SafeFile
 fun Fragment.getChooseFolderLauncher(dirSelected: (uri: Uri?, path: String?) -> Unit) =
     registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { uri ->
         // It lies, it can be null if file manager quits.
-        if (uri == null) return@registerForActivityResult
+        if(uri == null) {
+            dirSelected(null, null)
+            return@registerForActivityResult
+        }
         val context = context ?: CloudStreamApp.context ?: return@registerForActivityResult
         // RW perms for the path
         val flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or

From 9257d310904859348637d2aed0f04dc6847294c3 Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Tue, 28 Apr 2026 21:21:45 +0000
Subject: [PATCH 093/177] Fix: Cancel popup dialog if dismissed (#2726)

---
 .../java/com/lagradost/cloudstream3/MainActivity.kt    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 071ce6c89..4a2a103c5 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -189,6 +189,8 @@ import kotlin.math.abs
 import kotlin.math.absoluteValue
 import kotlin.system.exitProcess
 import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
 
 class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCallback {
     companion object {
@@ -440,6 +442,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
 
 
     var lastPopup: SearchResponse? = null
+    var lastPopupJob: Job? = null
     fun loadPopup(result: SearchResponse, load: Boolean = true) {
         lastPopup = result
         val syncName = syncViewModel.syncName(result.apiName)
@@ -455,7 +458,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             syncViewModel.clear()
         }
 
-        if (load) {
+        lastPopupJob?.cancel()
+        lastPopupJob = if (load) {
             viewModel.load(
                 this, result.url, result.apiName, false, if (getApiDubstatusSettings()
                         .contains(DubStatus.Dubbed)
@@ -849,6 +853,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
 
     private fun hidePreviewPopupDialog() {
         bottomPreviewPopup.dismissSafe(this)
+        lastPopupJob?.cancel()
+        lastPopupJob = null
         bottomPreviewPopup = null
         bottomPreviewBinding = null
     }
@@ -2037,7 +2043,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             updateLocale()
             runDefault()
         }
-        
+
         // Start the download queue
         DownloadQueueManager.init(this)
     }

From 4610d6aae7afef59ff2a7a9fc555567c0aa67359 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Tue, 28 Apr 2026 15:22:30 -0600
Subject: [PATCH 094/177] =?UTF-8?q?Revert=20"Improve=20subtitle=20selectio?=
 =?UTF-8?q?n=20UX:=20Move=20"No=20Subtitles"=20option=20to=20bottom=20(?=
 =?UTF-8?q?=E2=80=A6"=20(#2720)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ee6a9af217ee0cad9f5076a121355b375c67b11c.
---
 .../cloudstream3/ui/player/GeneratorPlayer.kt | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index 3576f4874..d8796177d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -1160,6 +1160,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 val subsArrayAdapter =
                     ArrayAdapter<Spanned>(ctx, R.layout.sort_bottom_single_choice)
+                subsArrayAdapter.add(ctx.getString(R.string.no_subtitles).html())
 
                 val subtitlesGrouped =
                     currentSubtitles.groupBy { it.originalName }.map { (key, value) ->
@@ -1169,13 +1170,8 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 val subtitles = subtitlesGrouped.map { it.key.html() }
 
-                val realIndex = subtitlesGrouped.keys.indexOf(currentSelectedSubtitles?.originalName)
-                val subtitleGroupIndexStart = if (realIndex == -1) {
-                    // The "No Subtitles" option is outside the subtitlesGrouped list.
-                    subtitlesGrouped.size
-                } else {
-                    realIndex
-                }
+                val subtitleGroupIndexStart =
+                    subtitlesGrouped.keys.indexOf(currentSelectedSubtitles?.originalName) + 1
                 var subtitleGroupIndex = subtitleGroupIndexStart
 
                 val subtitleOptionIndexStart =
@@ -1184,7 +1180,6 @@ class GeneratorPlayer : FullScreenPlayer() {
                 var subtitleOptionIndex = subtitleOptionIndexStart
 
                 subsArrayAdapter.addAll(subtitles)
-                subsArrayAdapter.add(ctx.getString(R.string.no_subtitles).html())
 
                 subtitleList.adapter = subsArrayAdapter
                 subtitleList.choiceMode = AbsListView.CHOICE_MODE_SINGLE
@@ -1203,7 +1198,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                     val subtitleOptions =
                         subtitlesGroupedList
-                            .getOrNull(subtitleGroupIndex)?.value?.map { subtitle ->
+                            .getOrNull(subtitleGroupIndex - 1)?.value?.map { subtitle ->
                                 val nameSuffix = subtitle.nameSuffix.html()
                                 nameSuffix.ifBlank {
                                     when (subtitle.origin) {
@@ -1255,7 +1250,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
 
                 subtitleOptionList.setOnItemClickListener { _, _, which, _ ->
-                    if (which >= (subtitlesGroupedList.getOrNull(subtitleGroupIndex)?.value?.size
+                    if (which >= (subtitlesGroupedList.getOrNull(subtitleGroupIndex - 1)?.value?.size
                             ?: -1)
                     ) {
                         val child = subtitleOptionList.adapter.getView(which, null, subtitleList)
@@ -1342,10 +1337,10 @@ class GeneratorPlayer : FullScreenPlayer() {
                 binding.applyBtt.setOnClickListener {
                     var init = sourceIndex != startSource
                     if (subtitleGroupIndex != subtitleGroupIndexStart || subtitleOptionIndex != subtitleOptionIndexStart) {
-                        init = init or if (subtitleGroupIndex >= subtitlesGrouped.size) {
+                        init = init or if (subtitleGroupIndex <= 0) {
                             noSubtitles()
                         } else {
-                            subtitlesGroupedList.getOrNull(subtitleGroupIndex)?.value?.getOrNull(
+                            subtitlesGroupedList.getOrNull(subtitleGroupIndex - 1)?.value?.getOrNull(
                                 subtitleOptionIndex
                             )?.let {
                                 setSubtitles(it, true)

From d30d71f39eb15b94d1eec490def624923fbd64a9 Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Tue, 28 Apr 2026 21:35:37 +0000
Subject: [PATCH 095/177] Fix(TV): Metadata hide episode selector #2715 (#2730)

---
 .../com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 1ca4c7257..2a46bad31 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -165,6 +165,7 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
                 || selectTrackDialog?.isShowing == true
                 || selectSpeedDialog?.isShowing == true
                 || selectSubtitlesDialog?.isShowing == true
+                || isShowingEpisodeOverlay
 
     private fun scheduleMetadataVisibility() {
         val metadataScrim = playerBinding?.playerMetadataScrim ?: return

From 58f45c7bda7e592a3547bf2c1ce0ab632d88170b Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Wed, 29 Apr 2026 16:46:12 -0600
Subject: [PATCH 096/177] Remove unnecessary ?: 0 (#2734)

---
 .../com/lagradost/cloudstream3/ui/player/PlayerGestureHelper.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGestureHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGestureHelper.kt
index 4d2b9237e..1c7086d12 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGestureHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGestureHelper.kt
@@ -1055,7 +1055,7 @@ class PlayerGestureHelper(private val playerView: PlayerView) {
             return validHeight && validWidth
         }
 
-        return rawY > (context.getStatusBarHeight() ?: 0) && rawX < screenWidthWithOrientation
+        return rawY > context.getStatusBarHeight() && rawX < screenWidthWithOrientation
     }
 
     private fun handleGesture(view: View, event: MotionEvent): Boolean {

From 8523a4bd9060b2f3c42732b8b7fb71c52306646b Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 30 Apr 2026 09:22:32 -0600
Subject: [PATCH 097/177] Fix `DownloadedPlayerActivity` not loading new files
 when activity is already running (#2738)

---
 .../ui/player/DownloadedPlayerActivity.kt     | 72 ++++++++++++-------
 1 file changed, 45 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
index a3a9b7125..7a42cea93 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
@@ -14,7 +14,9 @@ import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPres
 import com.lagradost.cloudstream3.utils.UIHelper.enableEdgeToEdgeCompat
 
 class DownloadedPlayerActivity : AppCompatActivity() {
-    private val dTAG = "DownloadedPlayerAct"
+    companion object {
+        const val TAG = "DownloadedPlayerActivity"
+    }
 
     override fun dispatchKeyEvent(event: KeyEvent): Boolean =
         CommonActivity.dispatchKeyEvent(this, event) ?: super.dispatchKeyEvent(event)
@@ -27,53 +29,69 @@ class DownloadedPlayerActivity : AppCompatActivity() {
         CommonActivity.onUserLeaveHint(this)
     }
 
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        // Ignore same intent so the player doesnt totally
+        // reload if you are playing the same thing.
+        if (isSameIntent(intent)) return
+        setIntent(intent)
+        Log.i(TAG, "onNewIntent")
+        handleIntent(intent)
+    }
+
+    private fun isSameIntent(newIntent: Intent): Boolean {
+        val old = intent ?: return false
+        // Compare URIs first
+        val oldUri = old.data ?: old.clipData?.getItemAt(0)?.uri
+        val newUri = newIntent.data ?: newIntent.clipData?.getItemAt(0)?.uri
+        if (oldUri != null && oldUri == newUri) return true
+        // Fall back to comparing EXTRA_TEXT links
+        val oldText = safe { old.getStringExtra(Intent.EXTRA_TEXT) }
+        val newText = safe { newIntent.getStringExtra(Intent.EXTRA_TEXT) }
+        return oldText != null && oldText == newText
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         CommonActivity.loadThemes(this)
         CommonActivity.init(this)
         enableEdgeToEdgeCompat()
         setContentView(R.layout.empty_layout)
-        Log.i(dTAG, "onCreate")
+        Log.i(TAG, "onCreate")
 
+        handleIntent(intent)
+        attachBackPressedCallback("DownloadedPlayerActivity") { finish() }
+    }
+
+    private fun handleIntent(intent: Intent) {
         val data = intent.data
-
         if (OfflinePlaybackHelper.playIntent(activity = this, intent = intent)) {
             return
         }
 
-        if (intent?.action == Intent.ACTION_SEND || intent?.action == Intent.ACTION_OPEN_DOCUMENT || intent?.action == Intent.ACTION_VIEW) {
-            val extraText = safe { // I dont trust android
-                intent.getStringExtra(Intent.EXTRA_TEXT)
-            }
+        if (
+            intent.action == Intent.ACTION_SEND ||
+            intent.action == Intent.ACTION_OPEN_DOCUMENT ||
+            intent.action == Intent.ACTION_VIEW
+        ) {
+            val extraText = safe { intent.getStringExtra(Intent.EXTRA_TEXT) }
             val cd = intent.clipData
             val item = if (cd != null && cd.itemCount > 0) cd.getItemAt(0) else null
             val url = item?.text?.toString()
-
-            // idk what I am doing, just hope any of these work
-            if (item?.uri != null)
-                playUri(this, item.uri)
-            else if (url != null)
-                playLink(this, url)
-            else if (data != null)
-                playUri(this, data)
-            else if (extraText != null)
-                playLink(this, extraText)
-            else {
-                finish()
-                return
+            when {
+                item?.uri != null -> playUri(this, item.uri)
+                url != null -> playLink(this, url)
+                data != null -> playUri(this, data)
+                extraText != null -> playLink(this, extraText)
+                else -> { finish(); return }
             }
         } else if (data?.scheme == "content") {
             playUri(this, data)
-        } else {
-            finish()
-            return
-        }
-
-        attachBackPressedCallback("DownloadedPlayerActivity") { finish() }
+        } else finish()
     }
 
     override fun onResume() {
         super.onResume()
         CommonActivity.setActivityInstance(this)
     }
-}
\ No newline at end of file
+}

From 4cc76ee6c5446b5fed5d15f581b753aaf33ee02e Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Thu, 30 Apr 2026 15:23:08 +0000
Subject: [PATCH 098/177] Fix(TV): Color on "Skip Chapter" button (#2731)

---
 .../cloudstream3/ui/player/GeneratorPlayer.kt |  13 ++-
 .../cloudstream3/ui/player/PlayerView.kt      |   8 +-
 .../res/layout/player_custom_layout_tv.xml    | 104 +++++++++---------
 3 files changed, 65 insertions(+), 60 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index d8796177d..311230235 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -1996,6 +1996,12 @@ class GeneratorPlayer : FullScreenPlayer() {
             skipAnimator?.cancel()
             isVisible = true
 
+            /** Focus instantly to make the focus color appear instantly */
+            if (show && !isShowing) {
+                // Automatically request focus if the menu is not opened
+                playerBinding?.skipChapterButton?.requestFocus()
+            }
+
             // just in case
             val lay = layoutParams
             lay.width = from
@@ -2004,12 +2010,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 from, to
             ).apply {
                 addListener(onEnd = {
-                    if (show) {
-                        if (!isShowing) {
-                            // Automatically request focus if the menu is not opened
-                            playerBinding?.skipChapterButton?.requestFocus()
-                        }
-                    } else {
+                    if (!show) {
                         playerBinding?.skipChapterButton?.isVisible = false
                         if (!isShowing) {
                             // Automatically return focus to play pause
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt
index d8e7e579d..d410cd129 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt
@@ -287,7 +287,13 @@ class PlayerView @JvmOverloads constructor(
             val previewFrameLayout: FrameLayout? =
                 exoPlayerView?.findViewById(R.id.previewFrameLayout)
 
-            if (progressBar != null && previewImageView != null && previewFrameLayout != null) {
+            /** Hide the previewFrameLayout on TV to make the skip op button not float,
+             * as previewFrameLayout is normally invisible */
+            if(isLayout(TV)) {
+                previewFrameLayout?.isVisible = false
+            }
+
+            if (progressBar != null && previewImageView != null && previewFrameLayout != null && !isLayout(TV)) {
                 var resume = false
                 progressBar.addOnScrubListener(object : PreviewBar.OnScrubListener {
                     override fun onScrubStart(previewBar: PreviewBar?) {
diff --git a/app/src/main/res/layout/player_custom_layout_tv.xml b/app/src/main/res/layout/player_custom_layout_tv.xml
index 2c536c825..3a3076943 100644
--- a/app/src/main/res/layout/player_custom_layout_tv.xml
+++ b/app/src/main/res/layout/player_custom_layout_tv.xml
@@ -13,16 +13,16 @@
         android:layout_width="680dp"
         android:layout_height="match_parent"
         android:background="@drawable/bg_player_metadata_scrim_netflix"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent">
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:id="@+id/player_metadata_overlay"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
             android:layout_gravity="center_vertical"
+            android:orientation="vertical"
             android:paddingStart="64dp"
             android:paddingEnd="32dp"
             android:paddingBottom="32dp">
@@ -39,23 +39,23 @@
                     android:adjustViewBounds="true"
                     android:scaleType="fitStart"
                     android:visibility="gone"
-                    tools:visibility="visible"/>
+                    tools:visibility="visible" />
 
                 <TextView
                     android:id="@+id/player_movie_title"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:textColor="@android:color/white"
-                    android:textSize="30sp"
-                    android:textStyle="bold"
+                    android:ellipsize="end"
+                    android:maxLines="2"
                     android:shadowColor="@android:color/black"
                     android:shadowDx="2"
                     android:shadowDy="2"
                     android:shadowRadius="4"
-                    android:maxLines="2"
-                    android:ellipsize="end"
-                    tools:text="Zootopia 2"/>
+                    android:textColor="@android:color/white"
+                    android:textSize="30sp"
+                    android:textStyle="bold"
+                    tools:text="Zootopia 2" />
             </FrameLayout>
 
             <!-- GENRES / YEAR / RATING -->
@@ -64,10 +64,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
+                android:maxLines="2"
                 android:textColor="#B3FFFFFF"
                 android:textSize="14sp"
-                android:maxLines="2"
-                tools:text="Animation • Action • Adventure • 2025 • ⭐ 7.6"/>
+                tools:text="Animation • Action • Adventure • 2025 • ⭐ 7.6" />
 
             <!-- SYNOPSIS -->
             <TextView
@@ -75,23 +75,24 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
-                android:textColor="#E6FFFFFF"
-                android:textSize="16sp"
                 android:lineSpacingExtra="8dp"
+                android:maxLines="5"
                 android:shadowColor="@android:color/black"
                 android:shadowDx="2"
                 android:shadowDy="2"
                 android:shadowRadius="4"
-                android:maxLines="5"
-                tools:text="Brave rabbit cop Judy Hopps..."/>
+                android:textColor="#E6FFFFFF"
+                android:textSize="16sp"
+                tools:text="Brave rabbit cop Judy Hopps..." />
 
         </LinearLayout>
+
         <ImageView
             android:id="@+id/video_outline"
-            android:visibility="gone"
-            android:src="@drawable/video_outline"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            android:src="@drawable/video_outline"
+            android:visibility="gone" />
     </FrameLayout>
 
     <FrameLayout
@@ -172,6 +173,7 @@
 
                 <ProgressBar
                     android:id="@+id/player_progressbar_left_level1"
+                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
                     android:layout_width="5dp"
                     android:layout_height="150dp"
                     android:layout_centerInParent="true"
@@ -183,11 +185,11 @@
                     android:progressDrawable="@drawable/progress_drawable_vertical"
                     android:progressTint="@color/white"
                     android:progressTintMode="src_in"
-                    tools:progress="30"
-                    style="@android:style/Widget.Material.ProgressBar.Horizontal" />
+                    tools:progress="30" />
 
                 <ProgressBar
                     android:id="@+id/player_progressbar_left_level2"
+                    style="@android:style/Widget.Material.ProgressBar.Horizontal"
                     android:layout_width="5dp"
                     android:layout_height="150dp"
                     android:layout_centerInParent="true"
@@ -199,8 +201,7 @@
                     android:progressDrawable="@drawable/progress_drawable_vertical"
                     android:progressTint="@color/colorPrimaryOrange"
                     android:progressTintMode="src_in"
-                    tools:progress="0"
-                    style="@android:style/Widget.Material.ProgressBar.Horizontal" />
+                    tools:progress="0" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -322,23 +323,18 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/skip_chapter_button"
-                style="@style/NiceButton"
+                style="@style/VideoButtonTV"
                 android:layout_width="150dp"
                 android:layout_height="40dp"
                 android:layout_marginEnd="100dp"
-                android:backgroundTint="@color/skipOpTransparent"
                 android:maxLines="1"
                 android:nextFocusLeft="@id/player_pause_play"
                 android:nextFocusUp="@id/player_restart"
                 android:nextFocusDown="@id/player_pause_play"
-                android:padding="10dp"
-                android:textColor="@color/white"
+                android:textSize="15sp"
                 android:visibility="gone"
-                app:cornerRadius="@dimen/rounded_button_radius"
                 app:layout_constraintBottom_toTopOf="@+id/bottom_player_bar"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:strokeColor="@color/white"
-                app:strokeWidth="1dp"
                 tools:text="Skip Opening"
                 tools:visibility="visible" />
 
@@ -360,28 +356,30 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="end">
+
                         <TextView
-                            android:maxLines="2"
                             android:id="@+id/player_video_title"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="end"
                             android:gravity="end"
                             android:maxWidth="600dp"
+                            android:maxLines="2"
                             android:textAlignment="viewEnd"
                             android:textColor="@color/white"
                             android:textSize="16sp"
                             android:textStyle="bold"
                             tools:text="Hello world" />
+
                         <ImageView
                             android:id="@+id/offline_pin"
                             android:layout_width="18dp"
                             android:layout_height="18dp"
+                            android:layout_gravity="start"
                             android:layout_marginStart="2dp"
                             android:src="@drawable/ic_offline_pin_24"
                             android:visibility="gone"
-                            tools:visibility="visible"
-                            android:layout_gravity="start"/>
+                            tools:visibility="visible" />
                     </LinearLayout>
 
                     <TextView
@@ -400,9 +398,9 @@
                         android:id="@+id/player_video_info"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="end"
                         android:layout_marginStart="6dp"
                         android:layout_marginBottom="2.5dp"
-                        android:layout_gravity="end"
                         android:textColor="#B3FFFFFF"
                         android:textSize="16sp"
                         android:visibility="gone"
@@ -581,6 +579,7 @@
                             tools:visibility="visible" />
 
                     </LinearLayout>
+
                     <LinearLayout
                         android:id="@+id/player_episodes_button_root"
                         android:layout_width="60dp"
@@ -964,19 +963,18 @@
                         android:layout_width="wrap_content"
                         android:layout_height="30dp"
                         android:layout_gravity="center|center_vertical"
-                        android:text="@string/player_is_live"
                         android:layout_marginEnd="20dp"
                         android:includeFontPadding="false"
                         android:minWidth="50dp"
                         android:paddingLeft="4dp"
                         android:paddingRight="4dp"
+                        android:text="@string/player_is_live"
                         android:textColor="@android:color/white"
                         android:textSize="14sp"
                         android:textStyle="normal"
                         android:visibility="gone"
                         app:layout_constraintBaseline_toBaselineOf="@id/exo_position"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        />
+                        app:layout_constraintEnd_toEndOf="parent" />
 
                     <TextView
                         android:id="@+id/time_left"
@@ -1129,11 +1127,11 @@
         android:layout_height="45dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="70dp"
-        app:iconGravity="top"
         android:clickable="false"
         android:textAllCaps="false"
         android:visibility="gone"
         app:icon="@drawable/speedup"
+        app:iconGravity="top"
         app:iconTint="@color/textColor"
         app:rippleColor="?attr/colorPrimary"
         tools:visibility="visible" />
@@ -1141,34 +1139,34 @@
 
     <LinearLayout
         android:id="@+id/player_episode_overlay"
-        android:visibility="gone"
-        android:padding="5dp"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="end"
         android:background="?attr/primaryBlackBackground"
         android:orientation="vertical"
-        android:layout_gravity="end"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent">
+        android:padding="5dp"
+        android:visibility="gone">
 
         <TextView
             android:id="@+id/player_episode_overlay_title"
-            android:padding="10dp"
             style="@style/WatchHeaderText"
-            android:textSize="15sp"
-            android:layout_marginEnd="0dp"
-            android:text="@string/episodes"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="0dp"
+            android:padding="10dp"
+            android:text="@string/episodes"
+            android:textSize="15sp" />
 
         <androidx.recyclerview.widget.RecyclerView
-            android:requiresFadingEdge="vertical"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             android:id="@+id/player_episode_list"
-            tools:listitem="@layout/player_episodes"
-            android:nextFocusLeft="@id/player_episodes_button"
             android:layout_width="400dp"
             android:layout_height="match_parent"
             android:clipToPadding="false"
-            android:descendantFocusability="afterDescendants">
+            android:descendantFocusability="afterDescendants"
+            android:nextFocusLeft="@id/player_episodes_button"
+            android:requiresFadingEdge="vertical"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/player_episodes">
 
         </androidx.recyclerview.widget.RecyclerView>
     </LinearLayout>

From 2400e6ab454835d758f55d5941d7d0e9391399ab Mon Sep 17 00:00:00 2001
From: Osten <11805592+LagradOst@users.noreply.github.com>
Date: Thu, 30 Apr 2026 17:23:49 +0200
Subject: [PATCH 099/177] fixed observe, aka #2567 (#2736)

---
 .../lagradost/cloudstream3/mvvm/Lifecycle.kt  | 62 +++++++++++++++++--
 .../cloudstream3/ui/home/HomeFragment.kt      |  1 -
 .../ui/home/HomeParentItemAdapterPreview.kt   | 10 ++-
 .../ui/settings/testing/TestFragment.kt       |  2 +-
 4 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/mvvm/Lifecycle.kt b/app/src/main/java/com/lagradost/cloudstream3/mvvm/Lifecycle.kt
index 3df5197cd..482ec05fc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/mvvm/Lifecycle.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/mvvm/Lifecycle.kt
@@ -1,16 +1,68 @@
 package com.lagradost.cloudstream3.mvvm
 
+import android.view.View
+import androidx.activity.ComponentActivity
+import androidx.core.view.doOnAttach
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.viewbinding.ViewBinding
+import com.lagradost.cloudstream3.ui.BaseFragment
 
 /** NOTE: Only one observer at a time per value */
-fun <T> LifecycleOwner.observe(liveData: LiveData<T>, action: (t: T) -> Unit) {
-    liveData.removeObservers(this)
-    liveData.observe(this) { it?.let { t -> action(t) } }
+fun <T> ComponentActivity.observe(liveData: LiveData<T>, action: (T) -> Unit) {
+    observeNullable(liveData) { t -> t?.run(action) }
 }
 
 /** NOTE: Only one observer at a time per value */
-fun <T> LifecycleOwner.observeNullable(liveData: LiveData<T>, action: (t: T) -> Unit) {
+fun <T> ComponentActivity.observeNullable(liveData: LiveData<T>, action: (T?) -> Unit) {
     liveData.removeObservers(this)
-    liveData.observe(this) { action(it) }
+    liveData.observe(this, action)
 }
+
+/** NOTE: Only one observer at a time per value */
+fun <T, V : ViewBinding> BaseFragment<V>.observe(liveData: LiveData<T>, action: (T) -> Unit) {
+    observeNullable(liveData) { t -> t?.run(action) }
+}
+
+/**
+ * Attaches an observable to the root binding, instead of the fragment. This is more efficient as
+ * it will not call observe if the view is in the background.
+ *
+ * NOTE: Only one observer at a time per value
+ * */
+fun <T, V : ViewBinding> BaseFragment<V>.observeNullable(
+    liveData: LiveData<T>, action: (T?) -> Unit
+) {
+    val root = this.binding?.root
+    if (root == null) {
+        liveData.removeObservers(this)
+        liveData.observe(this, action)
+    } else {
+        root.doOnAttach { view ->
+            // On attach should make findViewTreeLifecycleOwner non-null, but use "this" just in case
+            val owner: LifecycleOwner = view.findViewTreeLifecycleOwner() ?: this@observeNullable
+            liveData.removeObservers(owner)
+            liveData.observe(owner, action)
+        }
+    }
+}
+
+/** NOTE: Only one observer at a time per value */
+fun <T> View.observe(liveData: LiveData<T>, action: (T) -> Unit) {
+    observeNullable(liveData) { t -> t?.run(action) }
+}
+
+/** NOTE: Only one observer at a time per value */
+fun <T> View.observeNullable(liveData: LiveData<T>, action: (T?) -> Unit) {
+    doOnAttach { view ->
+        // On attach should make findViewTreeLifecycleOwner non-null
+        val owner: LifecycleOwner? = view.findViewTreeLifecycleOwner()
+        if(owner == null) {
+            debugException { "Expected non-null findViewTreeLifecycleOwner" }
+            return@doOnAttach
+        }
+        liveData.removeObservers(owner)
+        liveData.observe(owner, action)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 375b2313f..b68ef5962 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -651,7 +651,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(
             }
 
             homeMasterAdapter = HomeParentItemAdapterPreview(
-                fragment = this@HomeFragment,
                 homeViewModel, accountViewModel
             )
             homeMasterRecycler.setRecycledViewPool(ParentItemAdapter.sharedPool)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
index a292c2da2..959806e56 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
@@ -63,7 +63,6 @@ import androidx.core.graphics.toColorInt
 import com.lagradost.cloudstream3.ui.setRecycledViewPool
 
 class HomeParentItemAdapterPreview(
-    val fragment: LifecycleOwner,
     private val viewModel: HomeViewModel,
     private val accountViewModel: AccountViewModel
 ) : ParentItemAdapter(
@@ -105,7 +104,7 @@ class HomeParentItemAdapterPreview(
             )
         }
 
-        return HeaderViewHolder(binding, viewModel, accountViewModel, fragment)
+        return HeaderViewHolder(binding, viewModel, accountViewModel)
     }
 
     override fun onBindHeader(holder: ViewHolderState<Bundle>) {
@@ -132,7 +131,6 @@ class HomeParentItemAdapterPreview(
         val binding: ViewBinding,
         val viewModel: HomeViewModel,
         accountViewModel: AccountViewModel,
-        fragment: LifecycleOwner,
     ) :
         ViewHolderState<Bundle>(binding) {
 
@@ -544,7 +542,7 @@ class HomeParentItemAdapterPreview(
             headProfilePicCard?.isGone = isLayout(TV or EMULATOR)
             alternateHeadProfilePicCard?.isGone = isLayout(TV or EMULATOR)
 
-            fragment.observe(viewModel.currentAccount) { currentAccount ->
+            (headProfilePic ?: alternateHeadProfilePic)?.observe(viewModel.currentAccount) { currentAccount ->
                 headProfilePic?.loadImage(currentAccount?.image)
                 alternateHeadProfilePic?.loadImage(currentAccount?.image)
             }
@@ -775,7 +773,7 @@ class HomeParentItemAdapterPreview(
         fun onViewAttachedToWindow() {
             previewViewpager.registerOnPageChangeCallback(previewCallback)
 
-            binding.root.findViewTreeLifecycleOwner()?.apply {
+            previewViewpager.apply {
                 observe(viewModel.preview) {
                     updatePreview(it)
                 }
@@ -800,7 +798,7 @@ class HomeParentItemAdapterPreview(
                     }
                     toggleListHolder?.isGone = visible.isEmpty()
                 }
-            } ?: debugException { "Expected findViewTreeLifecycleOwner" }
+            }
         }
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
index 37677c1d8..4ec005a09 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
@@ -40,7 +40,7 @@ class TestFragment : BaseFragment<FragmentTestingBinding>(
                 providerTest.setProgress(passed, failed, total)
             }
 
-            observeNullable(testViewModel.providerResults) {
+            observe(testViewModel.providerResults) {
                 safe {
                     val newItems = it.sortedBy { api -> api.first.name }
                     (providerTestRecyclerView.adapter as? TestResultAdapter)?.submitList(

From 104ab2679050d4f0f407dd37653d758709a0b944 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Fri, 1 May 2026 10:53:30 -0600
Subject: [PATCH 100/177] Use ioWorkSafe for updateFillers for simplification
 (#2743)

---
 .../lagradost/cloudstream3/ui/result/ResultViewModel2.kt | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index e3ff6c83b..cf563df8e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -113,14 +113,12 @@ import com.lagradost.cloudstream3.utils.newExtractorLink
 import com.lagradost.cloudstream3.utils.txt
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.job
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.util.concurrent.TimeUnit
 
 /** This starts at 1 */
@@ -1810,10 +1808,9 @@ class ResultViewModel2 : ViewModel() {
 
 
     private suspend fun updateFillers(data : LoadResponse) {
-        fillers =
-            withContext(Dispatchers.IO) {
-                safe { FillerEpisodeCheck.getFillerEpisodes(data) }
-            } ?: hashSetOf()
+        fillers = ioWorkSafe {
+            FillerEpisodeCheck.getFillerEpisodes(data)
+        } ?: hashSetOf()
     }
 
     fun changeDubStatus(status: DubStatus) {

From e64136db8a3a3b755331318ffac53dca58fedf19 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 2 May 2026 12:15:34 -0600
Subject: [PATCH 101/177] Use runOnMainThread for simplicity (#2749)

---
 .../cloudstream3/network/WebViewResolver.android.kt         | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt b/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt
index 60a4d0453..975572d05 100644
--- a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt
+++ b/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt
@@ -3,8 +3,6 @@ package com.lagradost.cloudstream3.network
 import android.annotation.SuppressLint
 import android.content.Context
 import android.net.http.SslError
-import android.os.Handler
-import android.os.Looper
 import android.webkit.*
 import com.lagradost.api.Log
 import com.lagradost.api.getContext
@@ -14,6 +12,7 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.Coroutines.mainWork
+import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
 import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.nicehttp.requestCreator
 import kotlinx.coroutines.delay
@@ -150,8 +149,7 @@ actual class WebViewResolver actual constructor(
                         Log.i(TAG, "Loading WebView URL: $webViewUrl")
 
                         if (script != null) {
-                            val handler = Handler(Looper.getMainLooper())
-                            handler.post {
+                            runOnMainThread {
                                 view.evaluateJavascript(script)
                                 { scriptCallback?.invoke(it) }
                             }

From e36e9e8d24712b9dc32dc8cc77b599602806e783 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 3 May 2026 10:06:09 -0600
Subject: [PATCH 102/177] Use `Looper.getMainLooper().isCurrentThread` for
 simplicity (#2753)

---
 .../cloudstream3/ui/download/button/PieFetchButton.kt         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt
index a414dedf5..f6f8a5ff8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt
@@ -304,8 +304,8 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) :
     override fun setStatus(status: DownloadStatusTell?) {
         currentStatus = status
 
-        // Runs on the main thread, but also instant if it already is
-        if (Looper.myLooper() == Looper.getMainLooper()) {
+        // Runs on the main thread, but also instant if it already is.
+        if (Looper.getMainLooper().isCurrentThread) {
             try {
                 setStatusInternal(status)
             } catch (t: Throwable) {

From c82fec086230b1d37c917d5a183b5aa4e2cfe82e Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Sun, 3 May 2026 20:46:09 +0000
Subject: [PATCH 103/177] Refactor: Move all key logic into the player, and
 added toggleEpisodesOverlay keybind (#2745)

---
 .../lagradost/cloudstream3/CommonActivity.kt  |  82 ------
 .../ui/player/FullScreenPlayer.kt             | 277 +++++++++---------
 .../cloudstream3/ui/player/IPlayer.kt         |  21 --
 .../cloudstream3/ui/player/PlayerView.kt      |   2 -
 4 files changed, 146 insertions(+), 236 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index dddcd4892..ed0aaf9b7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -41,7 +41,6 @@ import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.ui.home.HomeChildItemAdapter
 import com.lagradost.cloudstream3.ui.home.ParentItemAdapter
-import com.lagradost.cloudstream3.ui.player.PlayerEventType
 import com.lagradost.cloudstream3.ui.player.PlayerPipHelper.isPIPPossible
 import com.lagradost.cloudstream3.ui.player.Torrent
 import com.lagradost.cloudstream3.ui.result.ActorAdaptor
@@ -117,7 +116,6 @@ object CommonActivity {
     val onColorSelectedEvent = Event<Pair<Int, Int>>()
     val onDialogDismissedEvent = Event<Int>()
 
-    var playerEventListener: ((PlayerEventType) -> Unit)? = null
     var keyEventListener: ((Pair<KeyEvent?, Boolean>) -> Boolean)? = null
     var appliedTheme: Int = 0
     var appliedColor: Int = 0
@@ -534,87 +532,7 @@ object CommonActivity {
 
 
     fun onKeyDown(act: Activity?, keyCode: Int, event: KeyEvent?): Boolean? {
-
-        // 149 keycode_numpad 5
-        val playerEvent = when (keyCode) {
-            KeyEvent.KEYCODE_FORWARD, KeyEvent.KEYCODE_D, KeyEvent.KEYCODE_MEDIA_SKIP_FORWARD, KeyEvent.KEYCODE_MEDIA_FAST_FORWARD -> {
-                PlayerEventType.SeekForward
-            }
-
-            KeyEvent.KEYCODE_A, KeyEvent.KEYCODE_MEDIA_SKIP_BACKWARD, KeyEvent.KEYCODE_MEDIA_REWIND -> {
-                PlayerEventType.SeekBack
-            }
-
-            KeyEvent.KEYCODE_MEDIA_NEXT, KeyEvent.KEYCODE_BUTTON_R1, KeyEvent.KEYCODE_N, KeyEvent.KEYCODE_NUMPAD_2, KeyEvent.KEYCODE_CHANNEL_UP -> {
-                PlayerEventType.NextEpisode
-            }
-
-            KeyEvent.KEYCODE_MEDIA_PREVIOUS, KeyEvent.KEYCODE_BUTTON_L1, KeyEvent.KEYCODE_B, KeyEvent.KEYCODE_NUMPAD_1, KeyEvent.KEYCODE_CHANNEL_DOWN -> {
-                PlayerEventType.PrevEpisode
-            }
-
-            KeyEvent.KEYCODE_MEDIA_PAUSE -> {
-                PlayerEventType.Pause
-            }
-
-            KeyEvent.KEYCODE_MEDIA_PLAY, KeyEvent.KEYCODE_BUTTON_START -> {
-                PlayerEventType.Play
-            }
-
-            KeyEvent.KEYCODE_L, KeyEvent.KEYCODE_NUMPAD_7, KeyEvent.KEYCODE_7 -> {
-                PlayerEventType.Lock
-            }
-
-            KeyEvent.KEYCODE_H, KeyEvent.KEYCODE_MENU -> {
-                PlayerEventType.ToggleHide
-            }
-
-            KeyEvent.KEYCODE_M, KeyEvent.KEYCODE_VOLUME_MUTE -> {
-                PlayerEventType.ToggleMute
-            }
-
-            KeyEvent.KEYCODE_S, KeyEvent.KEYCODE_NUMPAD_9, KeyEvent.KEYCODE_9 -> {
-                PlayerEventType.ShowMirrors
-            }
-            // OpenSubtitles shortcut
-            KeyEvent.KEYCODE_O, KeyEvent.KEYCODE_NUMPAD_8, KeyEvent.KEYCODE_8 -> {
-                PlayerEventType.SearchSubtitlesOnline
-            }
-
-            KeyEvent.KEYCODE_E, KeyEvent.KEYCODE_NUMPAD_3, KeyEvent.KEYCODE_3 -> {
-                PlayerEventType.ShowSpeed
-            }
-
-            KeyEvent.KEYCODE_R, KeyEvent.KEYCODE_NUMPAD_0, KeyEvent.KEYCODE_0 -> {
-                PlayerEventType.Resize
-            }
-
-            KeyEvent.KEYCODE_C, KeyEvent.KEYCODE_NUMPAD_4, KeyEvent.KEYCODE_4 -> {
-                PlayerEventType.SkipOp
-            }
-
-            KeyEvent.KEYCODE_V, KeyEvent.KEYCODE_NUMPAD_5, KeyEvent.KEYCODE_5 -> {
-                PlayerEventType.SkipCurrentChapter
-            }
-
-            KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_P, KeyEvent.KEYCODE_SPACE, KeyEvent.KEYCODE_NUMPAD_ENTER, KeyEvent.KEYCODE_ENTER -> { // space is not captured due to navigation
-                PlayerEventType.PlayPauseToggle
-            }
-
-            else -> return null
-        }
-        val listener = playerEventListener
-        if (listener != null) {
-            listener.invoke(playerEvent)
-            return true
-        }
         return null
-
-        //when (keyCode) {
-        //    KeyEvent.KEYCODE_DPAD_CENTER -> {
-        //        println("DPAD PRESSED")
-        //    }
-        //}
     }
 
     /** overrides focus and custom key events */
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 2a46bad31..9e13a00a6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -39,7 +39,6 @@ import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.SimpleItemAnimator
 import com.google.android.material.button.MaterialButton
 import com.lagradost.cloudstream3.CommonActivity.keyEventListener
-import com.lagradost.cloudstream3.CommonActivity.playerEventListener
 import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.FragmentPlayerBinding
@@ -435,7 +434,8 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
                         // Restore when lock is disabled.
                         restoreOrientationWithSensor(this)
                     } else {
-                        this.requestedOrientation = playerHostView?.dynamicOrientation() ?: return@apply
+                        this.requestedOrientation =
+                            playerHostView?.dynamicOrientation() ?: return@apply
                     }
                 }
             }
@@ -443,14 +443,14 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
     }
 
     private fun setupKeyEventListener() {
-        keyEventListener = { eventNav ->
-            val (event, hasNavigated) = eventNav
+        keyEventListener = { (event, hasNavigated) ->
             when {
                 event == null -> false
                 event.action == KeyEvent.ACTION_DOWN &&
-                    (event.keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
-                     event.keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) ->
+                        (event.keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
+                                event.keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) ->
                     playerHostView?.handleVolumeKey(event.keyCode) ?: false
+
                 player.isActive() -> handleKeyEvent(event, hasNavigated)
                 else -> false
             }
@@ -880,6 +880,138 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
         playerHostView?.requestUpdateBrightnessOverlayOnNextLayout()
     }
 
+    private fun handleKeyDownEvent(keyCode: Int): Boolean? {
+        // adb shell input keyevent [INT]
+        when (keyCode) {
+            KeyEvent.KEYCODE_FORWARD, KeyEvent.KEYCODE_D, KeyEvent.KEYCODE_MEDIA_SKIP_FORWARD, KeyEvent.KEYCODE_MEDIA_FAST_FORWARD -> {
+                player.handleEvent(CSPlayerEvent.SeekForward)
+            }
+
+            KeyEvent.KEYCODE_A, KeyEvent.KEYCODE_MEDIA_SKIP_BACKWARD, KeyEvent.KEYCODE_MEDIA_REWIND -> {
+                player.handleEvent(CSPlayerEvent.SeekBack)
+            }
+
+            KeyEvent.KEYCODE_MEDIA_NEXT, KeyEvent.KEYCODE_BUTTON_R1, KeyEvent.KEYCODE_N, KeyEvent.KEYCODE_NUMPAD_2, KeyEvent.KEYCODE_CHANNEL_UP -> {
+                player.handleEvent(CSPlayerEvent.NextEpisode)
+            }
+
+            KeyEvent.KEYCODE_MEDIA_PREVIOUS, KeyEvent.KEYCODE_BUTTON_L1, KeyEvent.KEYCODE_B, KeyEvent.KEYCODE_NUMPAD_1, KeyEvent.KEYCODE_CHANNEL_DOWN -> {
+                player.handleEvent(CSPlayerEvent.PrevEpisode)
+            }
+
+            KeyEvent.KEYCODE_MEDIA_PAUSE -> {
+                player.handleEvent(CSPlayerEvent.Pause)
+            }
+
+            KeyEvent.KEYCODE_MEDIA_PLAY, KeyEvent.KEYCODE_BUTTON_START -> {
+                player.handleEvent(CSPlayerEvent.Play)
+            }
+
+            KeyEvent.KEYCODE_L, KeyEvent.KEYCODE_NUMPAD_7, KeyEvent.KEYCODE_7 -> {
+                toggleLock()
+            }
+
+            KeyEvent.KEYCODE_H -> {
+                onClickChange()
+            }
+
+            KeyEvent.KEYCODE_M, KeyEvent.KEYCODE_VOLUME_MUTE -> {
+                player.handleEvent(CSPlayerEvent.ToggleMute)
+            }
+
+            KeyEvent.KEYCODE_S, KeyEvent.KEYCODE_NUMPAD_9, KeyEvent.KEYCODE_9 -> {
+                showMirrorsDialogue()
+            }
+            // OpenSubtitles shortcut
+            KeyEvent.KEYCODE_O, KeyEvent.KEYCODE_NUMPAD_8, KeyEvent.KEYCODE_8 -> {
+                val context = context
+                if (subsProvidersIsActive && context != null) {
+                    openOnlineSubPicker(context, null) {}
+                }
+            }
+
+            KeyEvent.KEYCODE_E, KeyEvent.KEYCODE_NUMPAD_3, KeyEvent.KEYCODE_3 -> {
+                showSpeedDialog()
+            }
+
+            KeyEvent.KEYCODE_R, KeyEvent.KEYCODE_NUMPAD_0, KeyEvent.KEYCODE_0 -> {
+                nextResize()
+            }
+
+            KeyEvent.KEYCODE_C, KeyEvent.KEYCODE_NUMPAD_4, KeyEvent.KEYCODE_4 -> {
+                skipOp()
+            }
+
+            KeyEvent.KEYCODE_V, KeyEvent.KEYCODE_NUMPAD_5, KeyEvent.KEYCODE_5 -> {
+                player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
+            }
+
+            KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_P, KeyEvent.KEYCODE_SPACE, KeyEvent.KEYCODE_NUMPAD_ENTER, KeyEvent.KEYCODE_ENTER -> { // space is not captured due to navigation
+                player.handleEvent(CSPlayerEvent.PlayPauseToggle)
+            }
+
+            KeyEvent.KEYCODE_DPAD_CENTER -> {
+                if (isShowing) {
+                    return null
+                }
+                // If UI is not shown make click instantly skip to next chapter even if locked
+                if (timestampShowState) {
+                    player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
+                } else if (!isLocked) {
+                    player.handleEvent(CSPlayerEvent.PlayPauseToggle)
+                }
+                onClickChange()
+            }
+
+            KeyEvent.KEYCODE_DPAD_DOWN,
+            KeyEvent.KEYCODE_DPAD_UP -> {
+                if (isShowing || isShowingEpisodeOverlay) {
+                    return null
+                }
+                onClickChange()
+            }
+
+            KeyEvent.KEYCODE_DPAD_LEFT -> {
+                if (!isShowing && !isLocked && !isShowingEpisodeOverlay) {
+                    player.seekTime(-androidTVInterfaceOffSeekTime)
+                    return true
+                } else if (playerBinding?.playerPausePlay?.isFocused == true) {
+                    player.seekTime(-androidTVInterfaceOnSeekTime)
+                    return true
+                } else {
+                    return null
+                }
+            }
+
+            KeyEvent.KEYCODE_DPAD_RIGHT -> {
+                if (!isShowing && !isLocked && !isShowingEpisodeOverlay) {
+                    player.seekTime(androidTVInterfaceOffSeekTime)
+                } else if (playerBinding?.playerPausePlay?.isFocused == true) {
+                    player.seekTime(androidTVInterfaceOnSeekTime)
+                } else {
+                    return null
+                }
+            }
+
+            KeyEvent.KEYCODE_VOLUME_DOWN,
+            KeyEvent.KEYCODE_VOLUME_UP -> {
+                // Handled entirely by PlayerView.handleVolumeKey (checks PHONE/EMULATOR).
+                if (playerHostView?.handleVolumeKey(keyCode) != true) {
+                    return null
+                }
+            }
+
+            KeyEvent.KEYCODE_MENU,
+            KeyEvent.KEYCODE_SETTINGS -> {
+                if (isLocked || !isThereEpisodes()) {
+                    return null
+                }
+                toggleEpisodesOverlay(true)
+            }
+        }
+        return true
+    }
+
     private fun handleKeyEvent(event: KeyEvent, hasNavigated: Boolean): Boolean {
         if (hasNavigated) {
             autoHide()
@@ -888,53 +1020,9 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
         val keyCode = event.keyCode
 
         if (event.action == KeyEvent.ACTION_DOWN) {
-            when (keyCode) {
-                KeyEvent.KEYCODE_DPAD_CENTER -> {
-                    if (!isShowing) {
-                        // If UI is not shown make click instantly skip to next chapter even if locked
-                        if (timestampShowState) {
-                            player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
-                        } else if (!isLocked) {
-                            player.handleEvent(CSPlayerEvent.PlayPauseToggle)
-                        }
-                        onClickChange()
-                        return true
-                    }
-                }
-
-                KeyEvent.KEYCODE_DPAD_DOWN,
-                KeyEvent.KEYCODE_DPAD_UP -> {
-                    if (!isShowing && !isShowingEpisodeOverlay) {
-                        onClickChange()
-                        return true
-                    }
-                }
-
-                KeyEvent.KEYCODE_DPAD_LEFT -> {
-                    if (!isShowing && !isLocked && !isShowingEpisodeOverlay) {
-                        player.seekTime(-androidTVInterfaceOffSeekTime)
-                        return true
-                    } else if (playerBinding?.playerPausePlay?.isFocused == true) {
-                        player.seekTime(-androidTVInterfaceOnSeekTime)
-                        return true
-                    }
-                }
-
-                KeyEvent.KEYCODE_DPAD_RIGHT -> {
-                    if (!isShowing && !isLocked && !isShowingEpisodeOverlay) {
-                        player.seekTime(androidTVInterfaceOffSeekTime)
-                        return true
-                    } else if (playerBinding?.playerPausePlay?.isFocused == true) {
-                        player.seekTime(androidTVInterfaceOnSeekTime)
-                        return true
-                    }
-                }
-
-                KeyEvent.KEYCODE_VOLUME_DOWN,
-                KeyEvent.KEYCODE_VOLUME_UP -> {
-                    // Handled entirely by PlayerView.handleVolumeKey (checks PHONE/EMULATOR).
-                    if (playerHostView?.handleVolumeKey(keyCode) == true) return true
-                }
+            val value = handleKeyDownEvent(keyCode)
+            if (value != null) {
+                return value
             }
         }
 
@@ -1000,7 +1088,8 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
     override fun onBindingCreated(binding: FragmentPlayerBinding, savedInstanceState: Bundle?) {
         // Set up playerBinding before super initializes the player
         // (brightness overlay is now injected by PlayerView.initialize())
-        playerBinding = PlayerCustomLayoutBinding.bind(binding.root.findViewById(R.id.player_holder))
+        playerBinding =
+            PlayerCustomLayoutBinding.bind(binding.root.findViewById(R.id.player_holder))
 
         super.onBindingCreated(binding, savedInstanceState)
 
@@ -1018,81 +1107,6 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
             subtitleDelay = it
         }
 
-        // handle tv controls
-        playerEventListener = { eventType ->
-            when (eventType) {
-                PlayerEventType.Lock -> {
-                    toggleLock()
-                }
-
-                PlayerEventType.NextEpisode -> {
-                    player.handleEvent(CSPlayerEvent.NextEpisode)
-                }
-
-                PlayerEventType.Pause -> {
-                    player.handleEvent(CSPlayerEvent.Pause)
-                }
-
-                PlayerEventType.PlayPauseToggle -> {
-                    player.handleEvent(CSPlayerEvent.PlayPauseToggle)
-                }
-
-                PlayerEventType.Play -> {
-                    player.handleEvent(CSPlayerEvent.Play)
-                }
-
-                PlayerEventType.SkipCurrentChapter -> {
-                    player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
-                }
-
-                PlayerEventType.Resize -> {
-                    nextResize()
-                }
-
-                PlayerEventType.PrevEpisode -> {
-                    player.handleEvent(CSPlayerEvent.PrevEpisode)
-                }
-
-                PlayerEventType.SeekForward -> {
-                    player.handleEvent(CSPlayerEvent.SeekForward)
-                }
-
-                PlayerEventType.ShowSpeed -> {
-                    showSpeedDialog()
-                }
-
-                PlayerEventType.SeekBack -> {
-                    player.handleEvent(CSPlayerEvent.SeekBack)
-                }
-
-                PlayerEventType.Restart -> {
-                    player.handleEvent(CSPlayerEvent.Restart)
-                }
-
-                PlayerEventType.ToggleMute -> {
-                    player.handleEvent(CSPlayerEvent.ToggleMute)
-                }
-
-                PlayerEventType.ToggleHide -> {
-                    onClickChange()
-                }
-
-                PlayerEventType.ShowMirrors -> {
-                    showMirrorsDialogue()
-                }
-
-                PlayerEventType.SearchSubtitlesOnline -> {
-                    if (subsProvidersIsActive) {
-                        openOnlineSubPicker(view.context, null) {}
-                    }
-                }
-
-                PlayerEventType.SkipOp -> {
-                    skipOp()
-                }
-            }
-        }
-
         // handle tv controls directly based on player state
         setupKeyEventListener()
 
@@ -1137,8 +1151,9 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
                 else QualityDataHelper.QualityProfileType.WiFi
 
                 currentQualityProfile =
-                    profiles.firstOrNull { it.types.contains(type) }?.id ?: profiles.firstOrNull()?.id
-                            ?: currentQualityProfile
+                    profiles.firstOrNull { it.types.contains(type) }?.id
+                        ?: profiles.firstOrNull()?.id
+                                ?: currentQualityProfile
             }
             playerBinding?.apply {
                 playerSpeedBtt.isVisible = playBackSpeedEnabled
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
index 43ec756ed..7bc5f46a0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
@@ -7,27 +7,6 @@ import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
 
-enum class PlayerEventType(val value: Int) {
-    Pause(0),
-    Play(1),
-    SeekForward(2),
-    SeekBack(3),
-
-    SkipCurrentChapter(4),
-    NextEpisode(5),
-    PrevEpisode(6),
-    PlayPauseToggle(7),
-    ToggleMute(8),
-    Lock(9),
-    ToggleHide(10),
-    ShowSpeed(11),
-    ShowMirrors(12),
-    Resize(13),
-    SearchSubtitlesOnline(14),
-    SkipOp(15),
-    Restart(16),
-}
-
 enum class CSPlayerEvent(val value: Int) {
     Pause(0),
     Play(1),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt
index d410cd129..e9822a25a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt
@@ -44,7 +44,6 @@ import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.github.rubensousa.previewseekbar.PreviewBar
 import com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
 import com.lagradost.cloudstream3.CommonActivity.isInPIPMode
-import com.lagradost.cloudstream3.CommonActivity.playerEventListener
 import com.lagradost.cloudstream3.CommonActivity.screenWidth
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.ErrorLoadingException
@@ -466,7 +465,6 @@ class PlayerView @JvmOverloads constructor(
         player.releaseCallbacks()
         player = CS3IPlayer()
 
-        playerEventListener = null
         // keyEventListener is deregistered in onPause so that the incoming player's
         // onResume can register its own listener without racing against release().
 

From 7476d24db38153ce95650389815a916366333fce Mon Sep 17 00:00:00 2001
From: Osten <11805592+LagradOst@users.noreply.github.com>
Date: Mon, 4 May 2026 14:40:13 +0200
Subject: [PATCH 104/177] Added exhaustive keyCode check, fixed #2757

---
 .../com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 9e13a00a6..801f7e155 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -1008,6 +1008,7 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
                 }
                 toggleEpisodesOverlay(true)
             }
+            else -> return null // Avoid capturing all input
         }
         return true
     }

From 4e24aa5db1b1de07fb695f4282cba9f14025910c Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Mon, 4 May 2026 10:43:01 -0600
Subject: [PATCH 105/177] Minor fixes to player (#2756)

---
 .../cloudstream3/ui/player/FullScreenPlayer.kt | 16 +++-------------
 .../cloudstream3/ui/player/PlayerView.kt       |  3 ++-
 .../ui/result/ResultTrailerPlayer.kt           | 18 +++++++++++++++---
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 801f7e155..4141aef51 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -763,12 +763,11 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
             }
         }
         playerBinding?.apply {
-
             playerLockHolder.isGone = isGone
             playerVideoBar.isGone = isGone
 
-            playerPausePlay.isGone = isGone
-            // player_buffering?.isGone = isGone
+            playerPausePlayHolderHolder.isGone =
+                isGone || currentPlayerStatus == CSPlayerLoading.IsBuffering
             playerTopHolder.isGone = isGone
             val showPlayerEpisodes = !isGone && isThereEpisodes()
             playerEpisodesButtonRoot.isVisible = showPlayerEpisodes
@@ -778,9 +777,9 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
             playerEpisodeFiller.isGone = isGone
             playerCenterMenu.isGone = isGone
             playerLock.isGone = !isShowing
-            // player_media_route_button?.isClickable = !isGone
             playerGoBackHolder.isGone = isGone
             playerSourcesBtt.isGone = isGone
+            shadowOverlay.isGone = isGone
             playerSkipEpisode.isClickable = !isGone
         }
     }
@@ -1195,15 +1194,6 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
                 }
             }
 
-            playerPausePlay.setOnClickListener {
-                autoHide()
-                if (currentPlayerStatus == CSPlayerLoading.IsEnded && isLayout(PHONE)) {
-                    player.handleEvent(CSPlayerEvent.Restart)
-                } else {
-                    player.handleEvent(CSPlayerEvent.PlayPauseToggle)
-                }
-            }
-
             skipChapterButton.setOnClickListener {
                 player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
             }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt
index e9822a25a..d421fa93b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt
@@ -374,7 +374,8 @@ class PlayerView @JvmOverloads constructor(
             exoFfwdText?.text = context.getString(R.string.ffw_text_regular_format).format(seekSecs)
 
             playerPausePlay?.setOnClickListener {
-                if (currentPlayerStatus == CSPlayerLoading.IsEnded) {
+                scheduleAutoHide()
+                if (currentPlayerStatus == CSPlayerLoading.IsEnded && isLayout(PHONE)) {
                     player.handleEvent(CSPlayerEvent.Restart, PlayerEventSource.UI)
                 } else {
                     player.handleEvent(CSPlayerEvent.PlayPauseToggle, PlayerEventSource.UI)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
index c2054825c..3b1471e6a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
@@ -38,9 +38,8 @@ class ResultTrailerPlayer : ResultFragmentPhone() {
 
     // Single-tap on empty player area: toggle controls.
     override fun onSingleTap() {
-        if (!introVisible) {
-            if (isShowing) uiReset() else showControls()
-        }
+        if (introVisible) return
+        if (isShowing) uiReset() else showControls()
     }
 
     private fun showControls() {
@@ -58,6 +57,19 @@ class ResultTrailerPlayer : ResultFragmentPhone() {
 
     override fun onHidePlayerUI() = uiReset()
 
+    // When the hold-speedup gesture fires, hide controls so the video is unobstructed.
+    // The speedup button show/hide and speed change are handled by PlayerView.
+    override fun onHoldSpeedUp(show: Boolean) {
+        if (show && isShowing) uiReset()
+    }
+
+    override fun onGestureEnd(hadSwipe: Boolean, wasUiShowing: Boolean) {
+        if (!player.getIsPlaying() && hadSwipe && wasUiShowing && !isShowing) {
+            isShowing = true
+            showControls()
+        } else playerHostView?.scheduleAutoHide()
+    }
+
     override fun nextEpisode() {}
     override fun prevEpisode() {}
     override fun playerPositionChanged(position: Long, duration: Long) {}

From 948a2c1725db1284f0d4b8abd6c7a48469f9db3d Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Mon, 4 May 2026 13:57:27 -0600
Subject: [PATCH 106/177] Always go to next source in player and add thread
 safety (#2733)

---
 app/build.gradle.kts                          |  1 +
 .../ui/download/button/BaseFetchButton.kt     |  6 +--
 .../cloudstream3/ui/player/CS3IPlayer.kt      | 17 +++---
 .../cloudstream3/ui/player/IPlayer.kt         |  9 ++--
 .../cloudstream3/ui/player/PlayerView.kt      | 52 +++++++------------
 .../settings/extensions/ExtensionsFragment.kt | 13 +++--
 gradle/libs.versions.toml                     |  2 +
 library/build.gradle.kts                      |  1 +
 .../cloudstream3/utils/Coroutines.android.kt  |  7 ++-
 .../cloudstream3/utils/Coroutines.kt          | 29 +++++++----
 .../cloudstream3/utils/Coroutines.jvm.kt      |  8 ++-
 11 files changed, 75 insertions(+), 70 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2466cc73d..32f000509 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -213,6 +213,7 @@ dependencies {
     // Android Core & Lifecycle
     implementation(libs.core.ktx)
     implementation(libs.activity.ktx)
+    implementation(libs.annotation)
     implementation(libs.appcompat)
     implementation(libs.fragment.ktx)
     implementation(libs.bundles.lifecycle)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt
index 82c4dcc3b..382a770cd 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt
@@ -76,10 +76,10 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
         currentMetaData.id = id
 
         if (!doSetProgress) return
+        val appContext = context.applicationContext
 
         ioSafe {
-            val savedData = VideoDownloadManager.getDownloadFileInfo(context, id)
-
+            val savedData = VideoDownloadManager.getDownloadFileInfo(appContext, id)
             mainWork {
                 if (savedData != null) {
                     val downloadedBytes = savedData.fileLength
@@ -216,4 +216,4 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) :
      * Get a clean slate again, might be useful in recyclerview?
      * */
     abstract fun resetView()
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index 1bd9ef87d..aa44b9235 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -12,6 +12,7 @@ import android.os.Looper
 import android.util.Log
 import android.util.Rational
 import android.widget.FrameLayout
+import androidx.annotation.AnyThread
 import androidx.annotation.MainThread
 import androidx.annotation.OptIn
 import androidx.appcompat.app.AlertDialog
@@ -206,16 +207,14 @@ class CS3IPlayer : IPlayer {
     private var requestedListeningPercentages: List<Int>? = null
 
     private var eventHandler: ((PlayerEvent) -> Unit)? = null
-    private val mainHandler = Handler(Looper.getMainLooper())
 
+    @AnyThread
     fun event(event: PlayerEvent) {
-        // Ensure that all work is done on the main looper, aka main thread
-        if (Looper.myLooper() == mainHandler.looper) {
+        // Ensure that all work is done on the main thread.
+        if (Looper.getMainLooper().isCurrentThread) {
+            eventHandler?.invoke(event)
+        } else runOnMainThread {
             eventHandler?.invoke(event)
-        } else {
-            mainHandler.post {
-                eventHandler?.invoke(event)
-            }
         }
     }
 
@@ -235,8 +234,9 @@ class CS3IPlayer : IPlayer {
         }
     }
 
+    @AnyThread
     override fun initCallbacks(
-        eventHandler: ((PlayerEvent) -> Unit),
+        @MainThread eventHandler: ((PlayerEvent) -> Unit),
         requestedListeningPercentages: List<Int>?,
     ) {
         this.requestedListeningPercentages = requestedListeningPercentages
@@ -1770,7 +1770,6 @@ class CS3IPlayer : IPlayer {
         return exoPlayer != null
     }
 
-
     @MainThread
     private fun loadTorrent(context: Context, link: ExtractorLink) {
         ioSafe {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
index 7bc5f46a0..034237266 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt
@@ -3,6 +3,8 @@ package com.lagradost.cloudstream3.ui.player
 import android.content.Context
 import android.graphics.Bitmap
 import android.util.Rational
+import androidx.annotation.AnyThread
+import androidx.annotation.MainThread
 import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
@@ -199,8 +201,6 @@ data class CurrentTracks(
     val allTextTracks: List<TextTrack>,
 )
 
-class InvalidFileException(msg: String) : Exception(msg)
-
 //http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4
 const val ACTION_MEDIA_CONTROL = "media_control"
 const val EXTRA_CONTROL_TYPE = "control_type"
@@ -222,8 +222,9 @@ interface IPlayer {
     fun getSubtitleOffset(): Long // in ms
     fun setSubtitleOffset(offset: Long) // in ms
 
+    @AnyThread
     fun initCallbacks(
-        eventHandler: ((PlayerEvent) -> Unit),
+        @MainThread eventHandler: ((PlayerEvent) -> Unit),
         /** this is used to request when the player should report back view percentage */
         requestedListeningPercentages: List<Int>? = null,
     )
@@ -290,4 +291,4 @@ interface IPlayer {
 
     /** Get the current subtitle cues, for use with syncing */
     fun getSubtitleCues(): List<SubtitleCue>
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt
index d421fa93b..0e6f1a367 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt
@@ -25,6 +25,7 @@ import android.widget.ProgressBar
 import android.widget.RelativeLayout
 import android.widget.TextView
 import android.widget.Toast
+import androidx.annotation.MainThread
 import androidx.annotation.OptIn
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
@@ -619,9 +620,10 @@ class PlayerView @JvmOverloads constructor(
 
     /** Error handling */
 
+    @MainThread
     fun playerError(exception: Throwable) {
-        fun showErrorToast(message: String, gotoNext: Boolean = false) {
-            if (gotoNext && callbacks?.hasNextMirror() == true) {
+        fun showErrorToast(message: String) {
+            if (callbacks?.hasNextMirror() == true) {
                 showToast(message, Toast.LENGTH_SHORT)
                 callbacks?.nextMirror()
             } else {
@@ -643,7 +645,7 @@ class PlayerView @JvmOverloads constructor(
                     PlaybackException.ERROR_CODE_IO_READ_POSITION_OUT_OF_RANGE,
                     PlaybackException.ERROR_CODE_IO_UNSPECIFIED,
                     PlaybackException.ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED ->
-                        showErrorToast("${context.getString(R.string.source_error)}\n$errorName ($code)\n$msg", gotoNext = true)
+                        showErrorToast("${context.getString(R.string.source_error)}\n$errorName ($code)\n$msg")
 
                     PlaybackException.ERROR_CODE_REMOTE_ERROR,
                     PlaybackException.ERROR_CODE_IO_BAD_HTTP_STATUS,
@@ -651,7 +653,7 @@ class PlayerView @JvmOverloads constructor(
                     PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_FAILED,
                     PlaybackException.ERROR_CODE_IO_NETWORK_CONNECTION_TIMEOUT,
                     PlaybackException.ERROR_CODE_IO_INVALID_HTTP_CONTENT_TYPE ->
-                        showErrorToast("${context.getString(R.string.remote_error)}\n$errorName ($code)\n$msg", gotoNext = true)
+                        showErrorToast("${context.getString(R.string.remote_error)}\n$errorName ($code)\n$msg")
 
                     PlaybackErrorEvent.ERROR_AUDIO_TRACK_INIT_FAILED,
                     PlaybackErrorEvent.ERROR_AUDIO_TRACK_OTHER,
@@ -659,43 +661,31 @@ class PlayerView @JvmOverloads constructor(
                     PlaybackException.ERROR_CODE_AUDIO_TRACK_WRITE_FAILED,
                     PlaybackException.ERROR_CODE_DECODER_INIT_FAILED,
                     PlaybackException.ERROR_CODE_DECODER_QUERY_FAILED ->
-                        showErrorToast("${context.getString(R.string.render_error)}\n$errorName ($code)\n$msg", gotoNext = true)
+                        showErrorToast("${context.getString(R.string.render_error)}\n$errorName ($code)\n$msg")
 
                     PlaybackException.ERROR_CODE_DECODING_FORMAT_UNSUPPORTED,
                     PlaybackException.ERROR_CODE_DECODING_FORMAT_EXCEEDS_CAPABILITIES ->
-                        showErrorToast("${context.getString(R.string.unsupported_error)}\n$errorName ($code)\n$msg", gotoNext = true)
+                        showErrorToast("${context.getString(R.string.unsupported_error)}\n$errorName ($code)\n$msg")
 
                     PlaybackException.ERROR_CODE_PARSING_CONTAINER_MALFORMED,
                     PlaybackException.ERROR_CODE_PARSING_MANIFEST_MALFORMED ->
-                        showErrorToast("${context.getString(R.string.encoding_error)}\n$errorName ($code)\n$msg", gotoNext = true)
+                        showErrorToast("${context.getString(R.string.encoding_error)}\n$errorName ($code)\n$msg")
 
                     else ->
-                        showErrorToast("${context.getString(R.string.unexpected_error)}\n$errorName ($code)\n$msg", gotoNext = false)
+                        showErrorToast("${context.getString(R.string.unexpected_error)}\n$errorName ($code)\n$msg")
                 }
             }
 
-            is InvalidFileException ->
-                showErrorToast("${context.getString(R.string.source_error)}\n${exception.message}", gotoNext = true)
-
-            is SocketTimeoutException -> {
-                /**
-                 * Ensures this is run on the UI thread to prevent issues
-                 * caused by SocketTimeoutException in torrents. Running
-                 * on another thread can break player interactions or
-                 * prevent switching to the next source.
-                 */
-                (context as? Activity)?.runOnUiThread {
-                    showErrorToast("${context.getString(R.string.remote_error)}\n${exception.message}", gotoNext = true)
-                }
-            }
+            is SocketTimeoutException ->
+                showErrorToast("${context.getString(R.string.remote_error)}\n${exception.message}")
 
             is ErrorLoadingException ->
-                exception.message?.let { showErrorToast(it, gotoNext = true) }
-                    ?: showErrorToast(exception.toString(), gotoNext = true)
+                exception.message?.let { showErrorToast(it) }
+                    ?: showErrorToast(exception.toString())
 
             else ->
-                exception.message?.let { showErrorToast(it, gotoNext = false) }
-                    ?: showErrorToast(exception.toString(), gotoNext = false)
+                exception.message?.let { showErrorToast(it) }
+                    ?: showErrorToast(exception.toString())
         }
     }
 
@@ -734,8 +724,7 @@ class PlayerView @JvmOverloads constructor(
         if (isLayout(TV or EMULATOR)) return ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
         return if (autoPlayerRotateEnabled && isVerticalOrientation)
             ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
-        else
-            ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+        else ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
     }
 
     /** Event dispatch */
@@ -746,6 +735,7 @@ class PlayerView @JvmOverloads constructor(
      * and returning early WON'T stop it from changing in e.g. the player time
      * or pause status.
      */
+    @MainThread
     fun mainCallback(event: PlayerEvent) {
         // We don't want to spam DownloadEvent.
         if (event !is DownloadEvent) Log.i(TAG, "Handle event: $event")
@@ -766,11 +756,7 @@ class PlayerView @JvmOverloads constructor(
             is TimestampInvokedEvent -> callbacks?.onTimestamp(event.timestamp)
             is TracksChangedEvent -> callbacks?.onTracksInfoChanged()
             is EmbeddedSubtitlesFetchedEvent -> callbacks?.embeddedSubtitlesFetched(event.tracks)
-            is ErrorEvent -> {
-                val cb = callbacks
-                if (cb != null) cb.playerError(event.error)
-                else playerError(event.error)
-            }
+            is ErrorEvent -> callbacks?.playerError(event.error) ?: playerError(event.error)
             is RequestAudioFocusEvent -> requestAudioFocus()
             is EpisodeSeekEvent -> when (event.offset) {
                 -1 -> callbacks?.prevEpisode()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
index bc85cc478..af0d3dfe7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
@@ -119,13 +119,14 @@ class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
             }, { repo ->
                 // Prompt user before deleting repo
                 main {
-                    val builder = AlertDialog.Builder(context ?: binding.root.context)
+                    val uiContext = context ?: binding.root.context
+                    val builder = AlertDialog.Builder(uiContext)
                     val dialogClickListener =
                         DialogInterface.OnClickListener { _, which ->
                             when (which) {
                                 DialogInterface.BUTTON_POSITIVE -> {
                                     ioSafe {
-                                        RepositoryManager.removeRepository(binding.root.context, repo)
+                                        RepositoryManager.removeRepository(uiContext.applicationContext, repo)
                                         extensionViewModel.loadStats()
                                         extensionViewModel.loadRepositories()
                                     }
@@ -136,9 +137,7 @@ class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
                         }
 
                     builder.setTitle(R.string.delete_repository)
-                        .setMessage(
-                            context?.getString(R.string.delete_repository_plugins)
-                        )
+                        .setMessage(uiContext.getString(R.string.delete_repository_plugins))
                         .setPositiveButton(R.string.delete, dialogClickListener)
                         .setNegativeButton(R.string.cancel, dialogClickListener)
                         .show().setDefaultFocus()
@@ -210,9 +209,9 @@ class ExtensionsFragment : BaseFragment<FragmentExtensionsBinding>(
 
             binding.applyBtt.setOnClickListener secondListener@{
                 val name = binding.repoNameInput.text?.toString()
+                val urlInput = binding.repoUrlInput.text?.toString()
                 ioSafe {
-                    val url = binding.repoUrlInput.text?.toString()
-                        ?.let { it1 -> RepositoryManager.parseRepoUrl(it1) }
+                    val url = urlInput?.let { it1 -> RepositoryManager.parseRepoUrl(it1) }
                     if (url.isNullOrBlank()) {
                         main {
                             showToast(R.string.error_invalid_data, Toast.LENGTH_SHORT)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f0b24c8e7..dc65cc4ee 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,6 +4,7 @@
 activityKtx = "1.13.0"
 androidGradlePlugin = "9.1.1"
 animeDb = "1.0.2"
+annotation = "1.10.0"
 appcompat = "1.7.1"
 biometric = "1.4.0-alpha06"
 buildkonfigGradlePlugin = "0.18.0"
@@ -57,6 +58,7 @@ targetSdk = "36"
 [libraries]
 activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityKtx" }
 anime-db = { module = "com.github.recloudstream:anime-db", version.ref = "animeDb" }
+annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
 coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index 14ef644f0..073e49e64 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -53,6 +53,7 @@ kotlin {
         }
 
         commonMain.dependencies {
+            implementation(libs.annotation) // Annotations
             implementation(libs.nicehttp) // HTTP Lib
             implementation(libs.jackson.module.kotlin) // JSON Parser
             implementation(libs.kotlinx.coroutines.core)
diff --git a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.android.kt b/library/src/androidMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.android.kt
index 48a709eb4..048e7fc02 100644
--- a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.android.kt
+++ b/library/src/androidMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.android.kt
@@ -2,10 +2,13 @@ package com.lagradost.cloudstream3.utils
 
 import android.os.Handler
 import android.os.Looper
+import androidx.annotation.AnyThread
+import androidx.annotation.MainThread
 
-actual fun runOnMainThreadNative(work: () -> Unit) {
+@AnyThread
+actual fun runOnMainThreadNative(@MainThread work: () -> Unit) {
     val mainHandler = Handler(Looper.getMainLooper())
     mainHandler.post {
         work()
     }
-}
\ No newline at end of file
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt
index f87ddc6ab..c525a1f36 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt
@@ -1,28 +1,34 @@
 package com.lagradost.cloudstream3.utils
 
+import androidx.annotation.AnyThread
+import androidx.annotation.MainThread
+import androidx.annotation.WorkerThread
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.mvvm.logError
 import kotlinx.coroutines.*
 import java.util.Collections.synchronizedList
 
-expect fun runOnMainThreadNative(work: (() -> Unit))
+@AnyThread
+expect fun runOnMainThreadNative(@MainThread work: (() -> Unit))
 object Coroutines {
-    fun <T> T.main(work: suspend ((T) -> Unit)): Job {
+    @AnyThread
+    fun <T> T.main(@MainThread work: suspend ((T) -> Unit)): Job {
         val value = this
         return CoroutineScope(Dispatchers.Main).launchSafe {
             work(value)
         }
     }
 
-    fun <T> T.ioSafe(work: suspend (CoroutineScope.(T) -> Unit)): Job {
+    @AnyThread
+    fun <T> T.ioSafe(@WorkerThread work: suspend (CoroutineScope.(T) -> Unit)): Job {
         val value = this
-
         return CoroutineScope(Dispatchers.IO).launchSafe {
             work(value)
         }
     }
 
-    suspend fun <T, V> V.ioWorkSafe(work: suspend (CoroutineScope.(V) -> T)): T? {
+    @AnyThread
+    suspend fun <T, V> V.ioWorkSafe(@WorkerThread work: suspend (CoroutineScope.(V) -> T)): T? {
         val value = this
         return withContext(Dispatchers.IO) {
             try {
@@ -34,21 +40,24 @@ object Coroutines {
         }
     }
 
-    suspend fun <T, V> V.ioWork(work: suspend (CoroutineScope.(V) -> T)): T {
+    @AnyThread
+    suspend fun <T, V> V.ioWork(@WorkerThread work: suspend (CoroutineScope.(V) -> T)): T {
         val value = this
         return withContext(Dispatchers.IO) {
             work(value)
         }
     }
 
-    suspend fun <T, V> V.mainWork(work: suspend (CoroutineScope.(V) -> T)): T {
+    @AnyThread
+    suspend fun <T, V> V.mainWork(@MainThread work: suspend (CoroutineScope.(V) -> T)): T {
         val value = this
         return withContext(Dispatchers.Main) {
             work(value)
         }
     }
 
-    fun runOnMainThread(work: (() -> Unit)) {
+    @AnyThread
+    fun runOnMainThread(@MainThread work: (() -> Unit)) {
         runOnMainThreadNative(work)
     }
 
@@ -56,8 +65,8 @@ object Coroutines {
      * Safe to add and remove how you want
      * If you want to iterate over the list then you need to do:
      * synchronized(allProviders) { code here }
-     **/
+     */
     fun <T> threadSafeListOf(vararg items: T): MutableList<T> {
         return synchronizedList(items.toMutableList())
     }
-}
\ No newline at end of file
+}
diff --git a/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.jvm.kt b/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.jvm.kt
index 0a9667cbc..8fc9a8b0f 100644
--- a/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.jvm.kt
+++ b/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.jvm.kt
@@ -1,5 +1,9 @@
 package com.lagradost.cloudstream3.utils
 
-actual fun runOnMainThreadNative(work: () -> Unit) {
+import androidx.annotation.AnyThread
+import androidx.annotation.MainThread
+
+@AnyThread
+actual fun runOnMainThreadNative(@MainThread work: () -> Unit) {
     work.invoke()
-}
\ No newline at end of file
+}

From a45f1d9ab1edc165941d01996cda92954f99852e Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Wed, 6 May 2026 00:29:47 +0000
Subject: [PATCH 107/177] Refactor: Player, Generator and ViewModel (#2764)

---
 app/build.gradle.kts                          |   1 +
 .../lagradost/cloudstream3/MainActivity.kt    |  17 +-
 .../actions/temp/PlayMirrorAction.kt          |   6 +-
 .../cloudstream3/ui/ControllerActivity.kt     |   1 +
 .../ui/download/DownloadButtonSetup.kt        |   3 +-
 .../ui/download/DownloadFragment.kt           |   5 +-
 .../ui/player/DownloadFileGenerator.kt        |   9 +-
 .../ui/player/ExtractorLinkGenerator.kt       |   2 +-
 .../cloudstream3/ui/player/GeneratorPlayer.kt | 295 +++++++--------
 .../cloudstream3/ui/player/IGenerator.kt      |  71 +---
 .../cloudstream3/ui/player/LinkGenerator.kt   |   9 +-
 .../ui/player/OfflinePlaybackHelper.kt        |  12 +-
 .../ui/player/PlayerGeneratorViewModel.kt     | 342 ++++++++++++------
 .../ui/player/RepoLinkGenerator.kt            |  43 +--
 .../ui/result/ResultFragmentTv.kt             |  10 +-
 .../ui/result/ResultViewModel2.kt             | 100 +++--
 .../utils/downloader/DownloadManager.kt       |   2 +
 gradle/libs.versions.toml                     |   2 +
 18 files changed, 540 insertions(+), 390 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 32f000509..ae5301929 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -218,6 +218,7 @@ dependencies {
     implementation(libs.fragment.ktx)
     implementation(libs.bundles.lifecycle)
     implementation(libs.bundles.navigation)
+    implementation(libs.kotlinx.collections.immutable)
 
     // Design & UI
     implementation(libs.preference.ktx)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 4a2a103c5..8a98bd297 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -362,7 +362,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                                 LinkGenerator(
                                     listOf(BasicLink(url, name)),
                                     extract = true,
-                                )
+                                    id = url.hashCode()
+                                ), 0
                             )
                         )
                     } else if (safeURI(str)?.scheme == APP_STRING_RESUME_WATCHING) {
@@ -559,9 +560,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             navView.isVisible = isNavVisible && !isLandscape()
             navHostFragment.apply {
                 val marginPx = resources.getDimensionPixelSize(R.dimen.nav_rail_view_width)
-                layoutParams = (navHostFragment.layoutParams as ViewGroup.MarginLayoutParams).apply {
-                    marginStart = if (isNavVisible && isLandscape() && isLayout(TV or EMULATOR)) marginPx else 0
-                }
+                layoutParams =
+                    (navHostFragment.layoutParams as ViewGroup.MarginLayoutParams).apply {
+                        marginStart =
+                            if (isNavVisible && isLandscape() && isLayout(TV or EMULATOR)) marginPx else 0
+                    }
             }
 
             /**
@@ -570,7 +573,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
              * highlight the wrong one in UI.
              */
             when (destination.id) {
-                in listOf(R.id.navigation_downloads, R.id.navigation_download_child, R.id.navigation_download_queue) -> {
+                in listOf(
+                    R.id.navigation_downloads,
+                    R.id.navigation_download_child,
+                    R.id.navigation_download_queue
+                ) -> {
                     navRailView.menu.findItem(R.id.navigation_downloads).isChecked = true
                     navView.menu.findItem(R.id.navigation_downloads).isChecked = true
                 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/PlayMirrorAction.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/PlayMirrorAction.kt
index d69619b45..56512377b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/PlayMirrorAction.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/PlayMirrorAction.kt
@@ -35,9 +35,11 @@ class PlayMirrorAction : VideoClickAction() {
     ) {
         //Implemented a generator to handle the single
         val activity = context as? Activity ?: return
+        val link = index?.let { result.links[it] }
         val generatorMirror = object : VideoGenerator<ResultEpisode>(listOf(video)) {
             override val hasCache: Boolean = false
             override val canSkipLoading: Boolean = false
+            override fun getId(index: Int): Int = video.id
 
             override suspend fun generateLinks(
                 clearCache: Boolean,
@@ -47,7 +49,7 @@ class PlayMirrorAction : VideoClickAction() {
                 offset: Int,
                 isCasting: Boolean
             ): Boolean {
-                index?.let { callback(result.links[it] to null) }
+                index?.let { callback(link to null) }
                 result.subs.forEach { subtitle -> subtitleCallback(subtitle) }
                 return true
             }
@@ -56,7 +58,7 @@ class PlayMirrorAction : VideoClickAction() {
         activity.navigate(
             R.id.global_to_navigation_player,
             GeneratorPlayer.newInstance(
-                generatorMirror, result.syncData
+                generatorMirror, 0, result.syncData
             )
         )
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
index ed273a3ce..f91d40f28 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
@@ -334,6 +334,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi
                                 }, subtitleCallback = {
                                     currentSubs.add(it)
                                 },
+                                offset = 0,
                                 isCasting = true
                             )
                         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt
index 884eebd62..dae70ebd7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt
@@ -162,7 +162,8 @@ object DownloadButtonSetup {
                     }
                     act.navigate(
                         R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
-                            DownloadFileGenerator(items).apply { goto(items.indexOfFirst { it.id == click.data.id }) }
+                            DownloadFileGenerator(items),
+                            items.indexOfFirst { it.id == click.data.id }
                         )
                     )
                 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
index be9f768a8..abc432ef9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
@@ -148,7 +148,7 @@ class DownloadFragment : BaseFragment<FragmentDownloadsBinding>(
             val size = cards.currentDownloads.size + cards.queue.size
             val context = binding.root.context
             val baseText = context.getString(R.string.download_queue)
-            binding.downloadQueueText.text =  if (size > 0) {
+            binding.downloadQueueText.text = if (size > 0) {
                 "$baseText (${cards.currentDownloads.size}/$size)"
             } else {
                 baseText
@@ -349,7 +349,8 @@ class DownloadFragment : BaseFragment<FragmentDownloadsBinding>(
                             listOf(BasicLink(url)),
                             extract = true,
                             refererUrl = referer,
-                        )
+                            id = url.hashCode()
+                        ), 0
                     )
                 )
                 dialog.dismissSafe(activity)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadFileGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadFileGenerator.kt
index eb1bcd00d..35f8dcfd8 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadFileGenerator.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadFileGenerator.kt
@@ -14,12 +14,13 @@ import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getFol
 import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getDownloadFileInfo
 
 class DownloadFileGenerator(
-    episodes: List<ExtractorUri>,
-    currentIndex: Int = 0
-) : VideoGenerator<ExtractorUri>(episodes, currentIndex) {
+    episodes: List<ExtractorUri>
+) : VideoGenerator<ExtractorUri>(episodes) {
     override val hasCache = false
     override val canSkipLoading = false
 
+    override fun getId(index: Int): Int? = this.videos.getOrNull(index)?.id
+
     override suspend fun generateLinks(
         clearCache: Boolean,
         sourceTypes: Set<ExtractorLinkType>,
@@ -28,7 +29,7 @@ class DownloadFileGenerator(
         offset: Int,
         isCasting: Boolean
     ): Boolean {
-        val meta = getCurrent(offset) ?: return false
+        val meta = videos.getOrNull(offset) ?: return false
 
         if (meta.uri == Uri.EMPTY) {
             // We do this here so that we only load it when
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt
index a52a3c646..85db33fc0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt
@@ -6,7 +6,7 @@ import com.lagradost.cloudstream3.utils.ExtractorLinkType
 class ExtractorLinkGenerator(
     private val links: List<ExtractorLink>,
     private val subtitles: List<SubtitleData>,
-) : NoVideoGenerator() {
+) : NoVideoGenerator(null) {
     override suspend fun generateLinks(
         clearCache: Boolean,
         sourceTypes: Set<ExtractorLinkType>,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index 311230235..9ee85a941 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -131,6 +131,9 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import java.io.Serializable
 import java.util.Calendar
+import java.util.UUID
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicBoolean
 
 @OptIn(UnstableApi::class)
 class GeneratorPlayer : FullScreenPlayer() {
@@ -139,11 +142,14 @@ class GeneratorPlayer : FullScreenPlayer() {
         const val CHANNEL_ID = 7340
         const val STOP_ACTION = "stopcs3"
 
-        private var lastUsedGenerator: IGenerator? = null
-        fun newInstance(generator: IGenerator, syncData: HashMap<String, String>? = null): Bundle {
+        private val generators = ConcurrentHashMap<String, VideoGenerator<*>>()
+        fun newInstance(generator: VideoGenerator<*>, index : Int, syncData: HashMap<String, String>? = null): Bundle {
             Log.i(TAG, "newInstance = $syncData")
-            lastUsedGenerator = generator
+            val uuid = UUID.randomUUID().toString()
+            generators[uuid] = generator
             return Bundle().apply {
+                putString("uuid", uuid)
+                putInt("index", index)
                 if (syncData != null) putSerializable("syncData", syncData)
             }
         }
@@ -162,25 +168,21 @@ class GeneratorPlayer : FullScreenPlayer() {
 
     private lateinit var viewModel: PlayerGeneratorViewModel //by activityViewModels()
     private lateinit var sync: SyncViewModel
-    private var currentLinks: Set<Pair<ExtractorLink?, ExtractorUri?>> = setOf()
-    private var currentSubs: Set<SubtitleData> = setOf()
 
     private var currentSelectedLink: Pair<ExtractorLink?, ExtractorUri?>? = null
     private var currentSelectedSubtitles: SubtitleData? = null
-    private var currentMeta: Any? = null
-    private var nextMeta: Any? = null
-    private var isActive: Boolean = false
+    private val currentMeta: Any? get() = viewModel.state.generatorState?.meta
+    private val nextMeta: Any? get() = viewModel.state.generatorState?.nextMeta
+
+    private var isPlayerActive: AtomicBoolean = AtomicBoolean(false)
     private var isNextEpisode: Boolean = false // this is used to reset the watch time
 
     private var preferredAutoSelectSubtitles: String? = null // null means do nothing, "" means none
-
-    private var allMeta: List<ResultEpisode>? = null
-    private fun startLoading() {
-        player.release()
-        currentSelectedSubtitles = null
-        isActive = false
-        binding?.overlayLoadingSkipButton?.isVisible = false
-        binding?.playerLoadingOverlay?.isVisible = true
+    private val allMeta: List<ResultEpisode>? get() = viewModel.state.generatorState?.allMeta?.filterIsInstance<ResultEpisode>()?.map { episode ->
+        // Refresh all the episodes watch duration
+        getViewPos(episode.id)?.let { data ->
+            episode.copy(position = data.position, duration = data.duration)
+        } ?: episode
     }
 
     private fun setSubtitles(subtitle: SubtitleData?, userInitiated: Boolean): Boolean {
@@ -213,7 +215,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         playerBinding?.playerTracksBtt?.isVisible =
             tracks.allVideoTracks.size > 1 || tracks.allAudioTracks.size > 1
         // Only set the preferred language if it is available.
-        // Otherwise it may give some users audio track init failed!
+        // Otherwise, it may give some users audio track init failed!
         if (tracks.allAudioTracks.any { it.language == preferredAudioTrackLanguage }) {
             player.setPreferredAudioTrack(preferredAudioTrackLanguage)
         }
@@ -232,7 +234,7 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
     private fun getPos(): Long {
-        val durPos = getViewPos(viewModel.getId()) ?: return 0L
+        val durPos = getViewPos(viewModel.state.generatorState?.id) ?: return 0L
         if (durPos.duration == 0L) return 0L
         if (durPos.position * 100L / durPos.duration > 95L) {
             return 0L
@@ -383,9 +385,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 override fun onCustomAction(player: Player, action: String, intent: Intent) {
                     when (action) {
                         STOP_ACTION -> {
-                            playerHostView?.exitFullscreen()
-                            this@GeneratorPlayer.player.release()
-                            activity?.popCurrentPage()
+                            exitPlayer()
                         }
                     }
                 }
@@ -485,9 +485,9 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
-    private fun loadLink(link: Pair<ExtractorLink?, ExtractorUri?>?, sameEpisode: Boolean) {
+    private fun loadLink(link: VideoLink?, sameEpisode: Boolean) {
         if (link == null) return
-
+        isPlayerActive.set(true)
         // manage UI
         binding?.playerLoadingOverlay?.isVisible = false
         val isTorrent =
@@ -503,16 +503,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         uiReset()
         currentSelectedLink = link
-        currentMeta = viewModel.getMeta()
-        nextMeta = viewModel.getNextMeta()
-        allMeta = viewModel.getAllMeta()?.filterIsInstance<ResultEpisode>()?.map { episode ->
-            // Refresh all the episodes watch duration
-            getViewPos(episode.id)?.let { data ->
-                episode.copy(position = data.position, duration = data.duration)
-            } ?: episode
-        }
         //  setEpisodes(viewModel.getAllMeta() ?: emptyList())
-        isActive = true
         setPlayerDimen(null)
         setTitle()
         if (!sameEpisode)
@@ -522,6 +513,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         // load player
         context?.let { ctx ->
             val (url, uri) = link
+            val subtitles = viewModel.state.subtitles
             player.loadPlayer(
                 ctx,
                 sameEpisode,
@@ -530,9 +522,9 @@ class GeneratorPlayer : FullScreenPlayer() {
                 startPosition = if (sameEpisode) null else {
                     if (isNextEpisode) 0L else getPos()
                 },
-                currentSubs,
+                subtitles,
                 (if (sameEpisode) currentSelectedSubtitles else null) ?: getAutoSelectSubtitle(
-                    currentSubs, settings = true, downloads = true
+                    subtitles, settings = true, downloads = true
                 ),
                 preview = true
             )
@@ -545,13 +537,6 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
-    private fun sortLinks(qualityProfile: Int): List<Pair<ExtractorLink?, ExtractorUri?>> {
-        return currentLinks.sortedBy {
-            // negative because we want to sort highest quality first
-            -getLinkPriority(qualityProfile, it.first)
-        }
-    }
-
     data class TempMetaData(
         var episode: Int? = null,
         var season: Int? = null,
@@ -877,20 +862,18 @@ class GeneratorPlayer : FullScreenPlayer() {
         vararg subtitleData: SubtitleData
     ) {
         if (subtitleData.isEmpty()) return
-        val selectedSubtitle = subtitleData.first()
         val ctx = context ?: return
-
-        val subs = currentSubs + subtitleData
+        val selectedSubtitle = subtitleData.first()
+        viewModel.addSubtitles(subtitleData.toSet())
 
         // this is used instead of observe(viewModel._currentSubs), because observe is too slow
-        player.setActiveSubtitles(subs)
+        player.setActiveSubtitles(viewModel.state.subtitles)
 
         // Save current time as to not reset player to 00:00
         player.saveData()
         player.reloadPlayer(ctx)
 
         setSubtitles(selectedSubtitle, false)
-        viewModel.addSubtitles(subtitleData.toSet())
 
         selectSourceDialog?.dismissSafe()
         selectSourceDialog = null
@@ -989,7 +972,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     }
 
                     // checks for both a race condition and if any of the subs generated is new
-                    if (this.isActive && !currentSubs.containsAll(subtitles) && !hasSelectASubtitle) {
+                    if (this.isActive && !viewModel.state.subtitles.containsAll(subtitles) && !hasSelectASubtitle) {
                         hasSelectASubtitle = true
                         runOnMainThread {
                             addAndSelectSubtitles(*subtitles.toTypedArray())
@@ -1012,7 +995,7 @@ class GeneratorPlayer : FullScreenPlayer() {
             context?.let { ctx ->
                 val isPlaying = player.getIsPlaying()
                 player.handleEvent(CSPlayerEvent.Pause, PlayerEventSource.UI)
-                val currentSubtitles = sortSubs(currentSubs)
+                val currentSubtitles = sortSubs(viewModel.state.subtitles)
 
                 val sourceDialog = Dialog(ctx, R.style.DialogFullscreenPlayer)
                 val binding =
@@ -1054,7 +1037,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
 
                 if (subsProvidersIsActive) {
-                    val currentLoadResponse = viewModel.getLoadResponse()
+                    val currentLoadResponse = viewModel.state.generatorState?.response
 
                     val loadFromOpenSubsFooter: TextView = layoutInflater.inflate(
                         R.layout.sort_bottom_footer_add_choice, null
@@ -1112,7 +1095,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 var sortedUrls = emptyList<Pair<ExtractorLink?, ExtractorUri?>>()
 
                 fun refreshLinks(qualityProfile: Int) {
-                    sortedUrls = sortLinks(qualityProfile)
+                    sortedUrls = viewModel.state.sortLinks(qualityProfile)
                     if (sortedUrls.isEmpty()) {
                         sourceDialog.findViewById<LinearLayout>(R.id.sort_sources_holder)?.isGone =
                             true
@@ -1277,16 +1260,28 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 binding.profilesClickSettings.setOnClickListener {
                     val activity = activity ?: return@setOnClickListener
-                    QualityProfileDialog(
+                    val dialog = QualityProfileDialog(
                         activity,
                         R.style.DialogFullscreenPlayer,
-                        currentLinks.mapNotNull { it.first?.let { extractorLink -> LinkSource(extractorLink) } },
+                        viewModel.state.links.mapNotNull {
+                            it.first?.let { extractorLink ->
+                                LinkSource(
+                                    extractorLink
+                                )
+                            }
+                        },
                         currentQualityProfile
                     ) { profile ->
                         currentQualityProfile = profile.id
                         setProfileName(profile.id)
-                        refreshLinks(profile.id)
-                    }.show()
+                    }
+
+                    dialog.setOnDismissListener {
+                        viewModel.state.clearSortedLinksCache()
+                        refreshLinks(currentQualityProfile)
+                    }
+
+                    dialog.show()
                 }
 
                 binding.subtitlesEncodingFormat.apply {
@@ -1430,11 +1425,12 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
 
                 var audioIndexStart = currentAudioTracks.indexOfFirst { track ->
-                    track.id == tracks.currentAudioTrack?.id && 
-                    track.formatIndex == tracks.currentAudioTrack?.formatIndex
+                    track.id == tracks.currentAudioTrack?.id &&
+                            track.formatIndex == tracks.currentAudioTrack?.formatIndex
                 }.coerceAtLeast(0)
 
-                val audioArrayAdapter = ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
+                val audioArrayAdapter =
+                    ArrayAdapter<String>(ctx, R.layout.sort_bottom_single_choice)
 
                 audioArrayAdapter.addAll(
                     currentAudioTracks.mapIndexed { _, track ->
@@ -1442,7 +1438,9 @@ class GeneratorPlayer : FullScreenPlayer() {
                         val language = (
                                 track.language?.trim()?.let { raw ->
                                     fromTagToLanguageName(raw)
-                                        ?: fromTagToLanguageName(raw.replace('_','-').substringBefore('-').lowercase())
+                                        ?: fromTagToLanguageName(
+                                            raw.replace('_', '-').substringBefore('-').lowercase()
+                                        )
                                         ?: raw
                                 }
                                     ?: track.label
@@ -1464,7 +1462,8 @@ class GeneratorPlayer : FullScreenPlayer() {
                         }
 
                         listOfNotNull(
-                            language.takeIf { it.isNotBlank() }?.replaceFirstChar { it.uppercaseChar() },
+                            language.takeIf { it.isNotBlank() }
+                                ?.replaceFirstChar { it.uppercaseChar() },
                             channels.takeIf { it.isNotBlank() },
                             codec.takeIf { it.isNotBlank() }?.uppercase()
                         ).joinToString(" • ")
@@ -1492,7 +1491,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 binding.applyBtt.setOnClickListener {
                     val currentTrack = currentAudioTracks.getOrNull(audioIndexStart)
                     player.setPreferredAudioTrack(
-                        currentTrack?.language, 
+                        currentTrack?.language,
                         currentTrack?.id,
                         currentTrack?.formatIndex,
                     )
@@ -1541,13 +1540,20 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
     private fun startPlayer() {
-        if (isActive) return // we don't want double load when you skip loading
+        // We don't want double load when you skip loading
+        if(isPlayerActive.get()) {
+            return
+        }
 
-        val links = sortLinks(currentQualityProfile)
+        val links = viewModel.state.sortLinks(currentQualityProfile)
         if (links.isEmpty()) {
             noLinksFound()
             return
         }
+        // Atomic operation to prevent double loading
+        if (!isPlayerActive.compareAndSet(false, true)) {
+            return
+        }
         loadLink(links.first(), false)
         showPlayerMetadata()
     }
@@ -1560,7 +1566,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         val metaView = overlay.findViewById<TextView>(R.id.player_movie_meta)
         val descView = overlay.findViewById<TextView>(R.id.player_movie_overview)
 
-        val load = viewModel.getLoadResponse() ?: return
+        val load = viewModel.state.generatorState?.response ?: return
         val episode = currentMeta as? ResultEpisode
         titleView.text = load.name
 
@@ -1602,7 +1608,7 @@ class GeneratorPlayer : FullScreenPlayer() {
     override fun nextEpisode() {
         if (viewModel.hasNextEpisode() == true) {
             isNextEpisode = true
-            player.release()
+            releasePlayer()
             viewModel.loadLinksNext()
         }
     }
@@ -1610,18 +1616,18 @@ class GeneratorPlayer : FullScreenPlayer() {
     override fun prevEpisode() {
         if (viewModel.hasPrevEpisode() == true) {
             isNextEpisode = true
-            player.release()
+            releasePlayer()
             viewModel.loadLinksPrev()
         }
     }
 
     override fun hasNextMirror(): Boolean {
-        val links = sortLinks(currentQualityProfile)
+        val links = viewModel.state.sortLinks(currentQualityProfile)
         return links.isNotEmpty() && links.indexOf(currentSelectedLink) + 1 < links.size
     }
 
     override fun nextMirror() {
-        val links = sortLinks(currentQualityProfile)
+        val links = viewModel.state.sortLinks(currentQualityProfile)
         if (links.isEmpty()) {
             noLinksFound()
             return
@@ -1668,7 +1674,7 @@ class GeneratorPlayer : FullScreenPlayer() {
         val percentage = position * 100L / duration
 
         DataStoreHelper.setViewPosAndResume(
-            viewModel.getId(),
+            viewModel.state.generatorState?.id,
             position,
             duration,
             currentMeta,
@@ -1720,14 +1726,18 @@ class GeneratorPlayer : FullScreenPlayer() {
     ): SubtitleData? {
         val langCode = preferredAutoSelectSubtitles ?: return null
         if (downloads) {
-            return sortSubs(subtitles).firstOrNull { it.origin == SubtitleOrigin.DOWNLOADED_FILE && it.matchesLanguageCode(langCode) }
+            return sortSubs(subtitles).firstOrNull {
+                it.origin == SubtitleOrigin.DOWNLOADED_FILE && it.matchesLanguageCode(
+                    langCode
+                )
+            }
         }
 
         if (!settings) return null
 
         return sortSubs(subtitles).firstOrNull { it.matchesLanguageCode(langCode) }
     }
-    
+
     private fun autoSelectFromSettings(): Boolean {
         // auto select subtitle based on settings
         val langCode = preferredAutoSelectSubtitles
@@ -1744,7 +1754,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
             } else if (!langCode.isNullOrEmpty()) {
                 getAutoSelectSubtitle(
-                    currentSubs, settings = true, downloads = false
+                    viewModel.state.subtitles, settings = true, downloads = false
                 )?.let { sub ->
                     if (setSubtitles(sub, false)) {
                         player.saveData()
@@ -1758,20 +1768,20 @@ class GeneratorPlayer : FullScreenPlayer() {
         return false
     }
 
-    private fun autoSelectFromDownloads(): Boolean {
-        if (player.getCurrentPreferredSubtitle() == null) {
-            getAutoSelectSubtitle(currentSubs, settings = false, downloads = true)?.let { sub ->
-                context?.let { ctx ->
-                    if (setSubtitles(sub, false)) {
-                        player.saveData()
-                        player.reloadPlayer(ctx)
-                        player.handleEvent(CSPlayerEvent.Play)
-                        return true
-                    }
-                }
-            }
+    private fun autoSelectFromDownloads() {
+        if (player.getCurrentPreferredSubtitle() != null) {
+            return
         }
-        return false
+        val sub =
+            getAutoSelectSubtitle(viewModel.state.subtitles, settings = false, downloads = true)
+                ?: return
+        val ctx = context ?: return
+        if (!setSubtitles(sub, false)) {
+            return
+        }
+        player.saveData()
+        player.reloadPlayer(ctx)
+        player.handleEvent(CSPlayerEvent.Play)
     }
 
     private fun autoSelectSubtitles() {
@@ -1855,7 +1865,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         playerBinding?.playerEpisodeFillerHolder?.isVisible = isFiller ?: false
         playerBinding?.playerVideoTitle?.text = playerVideoTitle
-        playerBinding?.offlinePin?.isVisible = lastUsedGenerator is DownloadFileGenerator
+        playerBinding?.offlinePin?.isVisible = viewModel.generator is DownloadFileGenerator
     }
 
     fun setPlayerDimen(widthHeight: Pair<Int, Int>?) {
@@ -2049,8 +2059,9 @@ class GeneratorPlayer : FullScreenPlayer() {
     }
 
     override fun isThereEpisodes(): Boolean {
-        val meta = allMeta
-        return !meta.isNullOrEmpty() && meta.size > 1
+        // Checks if there is a second episode of type ResultEpisode
+        // => There exists more than 1 episode, and they are all ResultEpisode
+        return viewModel.state.generatorState?.allMeta?.getOrNull(1) as? ResultEpisode != null
     }
 
     override fun showEpisodesOverlay() {
@@ -2062,7 +2073,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     { episodeClick ->
                         if (episodeClick.action == ACTION_CLICK_DEFAULT) {
                             isNextEpisode = false
-                            player.release()
+                            releasePlayer()
                             playerEpisodeOverlay.isGone = true
                             episodeClick.position?.let { viewModel.loadThisEpisode(it) }
                         }
@@ -2081,7 +2092,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 (playerEpisodeList.adapter as? EpisodeAdapter)?.submitList(episodes)
 
                 // Scroll to current episode
-                viewModel.getCurrentIndex()?.let { index ->
+                viewModel.state.generatorState?.index?.let { index ->
                     playerEpisodeList.scrollToPosition(index)
                     // Ensure focus on tv
                     if (isLayout(TV)) {
@@ -2125,32 +2136,51 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
     }
 
+    @MainThread
+    fun releasePlayer() {
+        player.release()
+        currentSelectedSubtitles = null
+        isPlayerActive.set(false)
+        binding?.overlayLoadingSkipButton?.isVisible = false
+        binding?.playerLoadingOverlay?.isVisible = true
+        uiReset()
+    }
+
+    fun exitPlayer() {
+        playerHostView?.exitFullscreen()
+        player.release()
+        activity?.popCurrentPage()
+    }
+
     override fun onBindingCreated(binding: FragmentPlayerBinding, savedInstanceState: Bundle?) {
         viewModel = ViewModelProvider(this)[PlayerGeneratorViewModel::class.java]
         sync = ViewModelProvider(this)[SyncViewModel::class.java]
-        viewModel.attachGenerator(lastUsedGenerator)
+
+        val uuid = savedInstanceState?.getString("uuid") ?: arguments?.getString("uuid")
+        val index = savedInstanceState?.getInt("index") ?: arguments?.getInt("index")
+
+        viewModel.attachGenerator(generators[uuid], index)
+
         unwrapBundle(savedInstanceState)
         unwrapBundle(arguments)
 
         super.onBindingCreated(binding, savedInstanceState)
-
-        var langFilterList = listOf<String>()
-        var filterSubByLang = false
-
         context?.let { ctx ->
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
             showName = settingsManager.getBoolean(ctx.getString(R.string.show_name_key), true)
-            showResolution = settingsManager.getBoolean(ctx.getString(R.string.show_resolution_key), true)
-            showMediaInfo = settingsManager.getBoolean(ctx.getString(R.string.show_media_info_key), false)
+            showResolution =
+                settingsManager.getBoolean(ctx.getString(R.string.show_resolution_key), true)
+            showMediaInfo =
+                settingsManager.getBoolean(ctx.getString(R.string.show_media_info_key), false)
             limitTitle = settingsManager.getInt(ctx.getString(R.string.prefer_title_limit_key), 0)
             updateForcedEncoding(ctx)
-            filterSubByLang =
+            viewModel.filterSubByLang =
                 settingsManager.getBoolean(getString(R.string.filter_sub_lang_key), false)
-            if (filterSubByLang) {
+            if (viewModel.filterSubByLang) {
                 val langFromPrefMedia = settingsManager.getStringSet(
                     this.getString(R.string.provider_lang_key), mutableSetOf("en")
                 )
-                langFilterList = langFromPrefMedia?.mapNotNull {
+                viewModel.langFilterList = langFromPrefMedia?.mapNotNull {
                     fromTagToEnglishLanguageName(it)?.lowercase() ?: return@mapNotNull null
                 } ?: listOf()
             }
@@ -2168,13 +2198,14 @@ class GeneratorPlayer : FullScreenPlayer() {
         }
 
         binding.overlayLoadingSkipButton.setOnClickListener {
-            startPlayer()
+            // Mark as "success" early
+            viewModel.modifyState {
+                copy(loading = Resource.Success(true))
+            }
         }
 
         binding.playerLoadingGoBack.setOnClickListener {
-            playerHostView?.exitFullscreen()
-            player.release()
-            activity?.popCurrentPage()
+            exitPlayer()
         }
 
         playerBinding?.downloadHeader?.setOnClickListener {
@@ -2191,10 +2222,21 @@ class GeneratorPlayer : FullScreenPlayer() {
             player.addTimeStamps(stamps)
         }
 
-        observe(viewModel.loadingLinks) {
-            when (it) {
+        observe(viewModel.currentSubtitles) { subtitles ->
+            player.setActiveSubtitles(subtitles)
+
+            // If the file is downloaded then do not select auto select the subtitles
+            // Downloaded subtitles cannot be selected immediately after loading since
+            // player.getCurrentPreferredSubtitle() cannot fetch data from non-loaded subtitles
+            // Resulting in unselecting the downloaded subtitle
+            if (subtitles.lastOrNull()?.origin != SubtitleOrigin.DOWNLOADED_FILE) {
+                autoSelectSubtitles()
+            }
+        }
+        observe(viewModel.loadingLinks) { loading ->
+            when (loading) {
                 is Resource.Loading -> {
-                    startLoading()
+                    releasePlayer()
                 }
 
                 is Resource.Success -> {
@@ -2206,30 +2248,28 @@ class GeneratorPlayer : FullScreenPlayer() {
                 }
 
                 is Resource.Failure -> {
-                    showToast(it.errorString, Toast.LENGTH_LONG)
+                    showToast(loading.errorString, Toast.LENGTH_LONG)
                     startPlayer()
                 }
             }
         }
 
-        observe(viewModel.currentLinks) {
-            currentLinks = it
-            val turnVisible = it.isNotEmpty() && lastUsedGenerator?.canSkipLoading == true
+        observe(viewModel.currentLinks) { links ->
+            val turnVisible = links.isNotEmpty() && viewModel.generator?.canSkipLoading == true
             val wasGone = binding.overlayLoadingSkipButton.isGone
 
             binding.overlayLoadingSkipButton.apply {
                 isVisible = turnVisible
-                val value = viewModel.currentLinks.value
-                if (value.isNullOrEmpty()) {
+                if (links.isEmpty()) {
                     setText(R.string.skip_loading)
                 } else {
                     @SuppressLint("SetTextI18n")
-                    text = "${context.getString(R.string.skip_loading)} (${value.size})"
+                    text = "${context.getString(R.string.skip_loading)} (${links.size})"
                 }
             }
 
             safe {
-                if (currentLinks.any { link ->
+                if (viewModel.state.links.any { link ->
                         getLinkPriority(currentQualityProfile, link.first) >=
                                 QualityDataHelper.AUTO_SKIP_PRIORITY
                     }
@@ -2242,34 +2282,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                 binding.overlayLoadingSkipButton.requestFocus()
             }
         }
-
-        observe(viewModel.currentSubs) { set ->
-            val setOfSub = mutableSetOf<SubtitleData>()
-            if (langFilterList.isNotEmpty() && filterSubByLang) {
-                Log.i("subfilter", "Filtering subtitle")
-                langFilterList.forEach { lang ->
-                    Log.i("subfilter", "Lang: $lang")
-                    setOfSub += set.filter {
-                        it.originalName.contains(lang, ignoreCase = true) ||
-                                it.origin != SubtitleOrigin.URL
-                    }
-                }
-                currentSubs = setOfSub
-            } else {
-                currentSubs = set
-            }
-            player.setActiveSubtitles(set)
-
-            // If the file is downloaded then do not select auto select the subtitles
-            // Downloaded subtitles cannot be selected immediately after loading since
-            // player.getCurrentPreferredSubtitle() cannot fetch data from non-loaded subtitles
-            // Resulting in unselecting the downloaded subtitle
-            if (set.lastOrNull()?.origin != SubtitleOrigin.DOWNLOADED_FILE) {
-                autoSelectSubtitles()
-            }
-        }
     }
-
 }
 
 @Suppress("DEPRECATION")
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IGenerator.kt
index 0a34feee3..3ab46ce21 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IGenerator.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IGenerator.kt
@@ -1,10 +1,7 @@
 package com.lagradost.cloudstream3.ui.player
 
-import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
-import kotlin.math.max
-import kotlin.math.min
 
 val LOADTYPE_INAPP = setOf(
     ExtractorLinkType.VIDEO,
@@ -28,71 +25,27 @@ val LOADTYPE_CHROMECAST = setOf(
 val LOADTYPE_ALL = ExtractorLinkType.entries.toSet()
 
 
-abstract class NoVideoGenerator : VideoGenerator<Nothing>(emptyList(), 0) {
+abstract class NoVideoGenerator(val id : Int?) : VideoGenerator<Nothing>(emptyList()) {
     override val hasCache = false
     override val canSkipLoading = false
+    override fun getId(index: Int): Int? = id
 }
 
-abstract class VideoGenerator<T : Any>(val videos: List<T>, var videoIndex: Int = 0) :
-    IGenerator {
+abstract class VideoGenerator<T : Any>(val videos: List<T>) {
+    abstract val hasCache: Boolean
+    abstract val canSkipLoading: Boolean
+    abstract fun getId(index : Int) : Int?
 
-    override fun hasNext(): Boolean = videoIndex < videos.lastIndex
-    override fun hasPrev(): Boolean = videoIndex > 0
-    override fun getAll(): List<T>? = videos
-    override fun getCurrent(offset: Int): T? = videos.getOrNull(videoIndex + offset)
-    override fun next() {
-        if (hasNext()) {
-            videoIndex += 1
-        }
-    }
+    fun hasNext(videoIndex : Int): Boolean = videoIndex < videos.lastIndex
+    fun hasPrev(videoIndex : Int): Boolean = videoIndex > 0
 
-    override fun prev() {
-        if (hasPrev()) {
-            videoIndex -= 1
-        }
-    }
-
-    override fun goto(index: Int) {
-        videoIndex = min(videos.lastIndex, max(0, index))
-    }
-
-    override fun getCurrentId(): Int? {
-        return when (val current = getCurrent()) {
-            is ResultEpisode -> {
-                current.id
-            }
-
-            is ExtractorUri -> {
-                current.id
-            }
-
-            else -> null
-        }
-    }
-}
-
-// TODO deprecate/remove IGenerator in favor of a more ergonomic and correct implementation
-interface IGenerator {
-    val hasCache: Boolean
-    val canSkipLoading: Boolean
-
-    fun hasNext(): Boolean
-    fun hasPrev(): Boolean
-    fun next()
-    fun prev()
-    fun goto(index: Int)
-
-    fun getCurrentId(): Int?                    // this is used to save data or read data about this id
-    fun getCurrent(offset: Int = 0): Any?      // this is used to get metadata about the current playing, can return null
-    fun getAll(): List<Any>?                   // this us used to get the metadata about all entries, not needed
-
-    /* not safe, must use try catch */
-    suspend fun generateLinks(
+    @Throws
+    abstract suspend fun generateLinks(
         clearCache: Boolean,
         sourceTypes: Set<ExtractorLinkType>,
         callback: (Pair<ExtractorLink?, ExtractorUri?>) -> Unit,
         subtitleCallback: (SubtitleData) -> Unit,
-        offset: Int = 0,
-        isCasting: Boolean = false
+        offset: Int,
+        isCasting: Boolean
     ): Boolean
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt
index 71513af2c..db06e26e9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt
@@ -40,7 +40,8 @@ class LinkGenerator(
     private val links: List<BasicLink>,
     private val extract: Boolean = true,
     private val refererUrl: String? = null,
-) : NoVideoGenerator() {
+    id: Int?
+) : NoVideoGenerator(id) {
     override suspend fun generateLinks(
         clearCache: Boolean,
         sourceTypes: Set<ExtractorLinkType>,
@@ -78,10 +79,8 @@ class LinkGenerator(
 class MinimalLinkGenerator(
     private val links: List<CloudStreamPackage.MinimalVideoLink>,
     private val subs: List<CloudStreamPackage.MinimalSubtitleLink>,
-    private val id: Int? = null
-) : NoVideoGenerator() {
-    override fun getCurrentId(): Int? = id
-
+    id: Int?
+) : NoVideoGenerator(id) {
     override suspend fun generateLinks(
         clearCache: Boolean,
         sourceTypes: Set<ExtractorLinkType>,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/OfflinePlaybackHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/OfflinePlaybackHelper.kt
index eb9f5c249..ac25347b6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/OfflinePlaybackHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/OfflinePlaybackHelper.kt
@@ -1,7 +1,6 @@
 package com.lagradost.cloudstream3.ui.player
 
 import android.app.Activity
-import android.content.ContentUris
 import android.content.Intent
 import android.net.Uri
 import androidx.core.content.ContextCompat.getString
@@ -19,8 +18,8 @@ object OfflinePlaybackHelper {
                 LinkGenerator(
                     listOf(
                         BasicLink(url)
-                    )
-                )
+                    ), id = url.hashCode()
+                ), 0
             )
         )
     }
@@ -52,7 +51,7 @@ object OfflinePlaybackHelper {
                     links,
                     subs,
                     if (id != -1) id else null,
-                )
+                ), 0
             )
         )
         return true
@@ -73,11 +72,10 @@ object OfflinePlaybackHelper {
                             name = name ?: getString(activity, R.string.downloaded_file),
                             // well not the same as a normal id, but we take it as users may want to
                             // play downloaded files and save the location
-                            id = kotlin.runCatching { ContentUris.parseId(uri) }.getOrNull()
-                                ?.hashCode()
+                            id = uri.lastPathSegment?.toLongOrNull()?.hashCode() ?: uri.lastPathSegment?.hashCode()
                         )
                     )
-                )
+                ), 0
             )
         )
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
index 96468490a..049ed06d6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
@@ -9,29 +9,137 @@ import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.mvvm.safeApiCall
+import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper.getLinkPriority
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.videoskip.SkipAPI
 import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
+import kotlinx.collections.immutable.PersistentList
+import kotlinx.collections.immutable.PersistentSet
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentSetOf
+import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toPersistentSet
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import org.jetbrains.annotations.Contract
+import java.util.concurrent.ConcurrentHashMap
+
+typealias VideoLink = Pair<ExtractorLink?, ExtractorUri?>
+
+data class GeneratorState(
+    val meta: Any?,
+    val nextMeta: Any?,
+    val allMeta: List<*>?,
+    val response: LoadResponse?,
+    val index: Int,
+    val id: Int?,
+)
+
+/** Immutable state of all current links relevant to displaying the video */
+// @MustUseReturnValues
+// @Immutable
+data class VideoState(
+    val subtitles: PersistentSet<SubtitleData> = persistentSetOf(),
+    val links: PersistentSet<VideoLink> = persistentSetOf(),
+    val stamps: PersistentList<VideoSkipStamp> = persistentListOf(),
+    val loading: Resource<Boolean?> = Resource.Loading(),
+    val generatorState: GeneratorState? = null,
+) {
+    /**
+     * This acts as a local cache for sorted links that are not copied over by the copy constructor.
+     *
+     * sortedBy is not exactly expensive, but each hasNextMirror does it again, so this alleviates unnecessary recomputation
+     * */
+    private val sortedLinks: ConcurrentHashMap<Int, List<VideoLink>> = ConcurrentHashMap()
+
+    fun clearSortedLinksCache() = sortedLinks.clear()
+
+    // Modifying sortedLinks is not considered a "visible" side effect, and rerunning it does not change the result
+    // It is by all standards, idempotent and by extension also pure as it has no "visible" side effect
+    /** Returns .links in the sorted order according to the qualityProfile.
+     * Use .links if order is not needed */
+    @Contract(pure = true)
+    fun sortLinks(qualityProfile: Int): List<VideoLink> {
+        return sortedLinks[qualityProfile] ?: links.sortedBy { link ->
+            // negative because we want to sort highest quality first
+            -getLinkPriority(qualityProfile, link.first)
+        }.also { value -> sortedLinks[qualityProfile] = value }
+    }
+
+    @Contract(pure = true)
+    fun add(item: SubtitleData): VideoState = copy(subtitles = subtitles.add(item))
+
+    @Contract(pure = true)
+    fun add(item: VideoLink): VideoState = copy(links = links.add(item))
+
+    @Contract(pure = true)
+    fun add(item: VideoSkipStamp): VideoState = copy(stamps = stamps.add(item))
+
+    @JvmName("addSubtitleData")
+    @Contract(pure = true)
+    fun add(items: Collection<SubtitleData>): VideoState = copy(subtitles = subtitles.addAll(items))
+
+    @JvmName("addVideoLink")
+    @Contract(pure = true)
+    fun add(items: Collection<VideoLink>): VideoState = copy(links = links.addAll(items))
+
+    @JvmName("addVideoSkipStamp")
+    @Contract(pure = true)
+    fun add(items: Collection<VideoSkipStamp>): VideoState = copy(stamps = stamps.addAll(items))
+
+    @Contract(pure = true)
+    fun set(item: SubtitleData): VideoState = copy(subtitles = persistentSetOf(item))
+
+    @Contract(pure = true)
+    fun set(item: VideoLink): VideoState = copy(links = persistentSetOf(item))
+
+    @Contract(pure = true)
+    fun set(item: VideoSkipStamp): VideoState = copy(stamps = persistentListOf(item))
+
+    @JvmName("setSubtitleData")
+    @Contract(pure = true)
+    fun set(items: Collection<SubtitleData>): VideoState = copy(subtitles = items.toPersistentSet())
+
+    @JvmName("setVideoLink")
+    @Contract(pure = true)
+    fun set(items: Collection<VideoLink>): VideoState = copy(links = items.toPersistentSet())
+
+    @JvmName("setVideoSkipStamp")
+    @Contract(pure = true)
+    fun set(items: Collection<VideoSkipStamp>): VideoState = copy(stamps = items.toPersistentList())
+}
 
 class PlayerGeneratorViewModel : ViewModel() {
     companion object {
         const val TAG = "PlayViewGen"
     }
 
-    private var generator: IGenerator? = null
+    @Volatile
+    var generator: VideoGenerator<*>? = null
+
+    @Volatile
+    private var episodeIndex: Int = 0
+
+    /**
+     * The state of the video player, only modify it by modifyState to make sure observe is called,
+     * and avoid concurrency issues.
+     *
+     * This value can be used without Synchronized or locking when reading, as all fields are immutable.
+     * */
+    @Volatile
+    var state = VideoState()
+        private set
 
     private val _currentLinks = MutableLiveData<Set<Pair<ExtractorLink?, ExtractorUri?>>>(setOf())
     val currentLinks: LiveData<Set<Pair<ExtractorLink?, ExtractorUri?>>> = _currentLinks
 
-    private val _currentSubs = MutableLiveData<Set<SubtitleData>>(setOf())
-    val currentSubs: LiveData<Set<SubtitleData>> = _currentSubs
+    private val _currentSubtitles = MutableLiveData<Set<SubtitleData>>(setOf())
+    val currentSubtitles: LiveData<Set<SubtitleData>> = _currentSubtitles
 
     private val _loadingLinks = MutableLiveData<Resource<Boolean?>>()
     val loadingLinks: LiveData<Resource<Boolean?>> = _loadingLinks
@@ -39,6 +147,35 @@ class PlayerGeneratorViewModel : ViewModel() {
     private val _currentStamps = MutableLiveData<List<VideoSkipStamp>>(emptyList())
     val currentStamps: LiveData<List<VideoSkipStamp>> = _currentStamps
 
+    /**
+     * Modifies the `state` variable safely, and with the correct observe behavior.
+     *
+     * Synchronized to avoid concurrency issues, and make this operation atomic.
+     * Otherwise, one update may be lost if they are done in parallel.
+     * */
+    @Synchronized
+    fun modifyState(op: VideoState.() -> VideoState) {
+        val oldState = state
+        state = op.invoke(oldState)
+
+        /**
+         * Only post the changed values, this makes sure we do not invoke the "observe"
+         *
+         * We do this by "Referential equality" https://kotlinlang.org/docs/equality.html#referential-equality
+         * to avoid comparing the entire set or list as "Persistent" classes will hold the same reference if they are unchanged.
+         * */
+        if (state.links !== oldState.links)
+            _currentLinks.postValue(state.links)
+        if (state.stamps !== oldState.stamps)
+            _currentStamps.postValue(state.stamps)
+        if (state.subtitles !== oldState.subtitles)
+            _currentSubtitles.postValue(state.subtitles)
+
+        /** Normal equality here as it is not a collection */
+        if (state.loading != oldState.loading)
+            _loadingLinks.postValue(state.loading)
+    }
+
     private val _currentSubtitleYear = MutableLiveData<Int?>(null)
     val currentSubtitleYear: LiveData<Int?> = _currentSubtitleYear
 
@@ -53,41 +190,32 @@ class PlayerGeneratorViewModel : ViewModel() {
         _currentSubtitleYear.postValue(year)
     }
 
-    fun getId(): Int? {
-        return generator?.getCurrentId()
-    }
-
-    fun loadLinks(episode: Int) {
-        generator?.goto(episode)
-        loadLinks()
-    }
-
     fun loadLinksPrev() {
         Log.i(TAG, "loadLinksPrev")
-        if (generator?.hasPrev() == true) {
-            generator?.prev()
+        if (generator?.hasPrev(episodeIndex) == true) {
+            episodeIndex += 1
             loadLinks()
         }
     }
 
     fun loadLinksNext() {
         Log.i(TAG, "loadLinksNext")
-        if (generator?.hasNext() == true) {
-            generator?.next()
+        if (generator?.hasNext(episodeIndex) == true) {
+            episodeIndex += 1
             loadLinks()
         }
     }
 
     fun hasNextEpisode(): Boolean? {
-        return generator?.hasNext()
+        return generator?.hasNext(episodeIndex)
     }
 
     fun hasPrevEpisode(): Boolean? {
-        return generator?.hasPrev()
+        return generator?.hasPrev(episodeIndex)
     }
 
     fun preLoadNextLinks() {
-        val id = getId()
+        val id = generator?.getId(episodeIndex)
         // Do not preload if already loading
         if (id == currentLoadingEpisodeId) return
 
@@ -97,14 +225,15 @@ class PlayerGeneratorViewModel : ViewModel() {
 
         currentJob = viewModelScope.launch {
             try {
-                if (generator?.hasCache == true && generator?.hasNext() == true) {
+                if (generator?.hasCache == true && generator?.hasNext(episodeIndex) == true) {
                     safeApiCall {
                         generator?.generateLinks(
                             sourceTypes = LOADTYPE_INAPP,
                             clearCache = false,
+                            isCasting = false,
                             callback = {},
                             subtitleCallback = {},
-                            offset = 1
+                            offset = episodeIndex + 1
                         )
                     }
                 }
@@ -118,129 +247,132 @@ class PlayerGeneratorViewModel : ViewModel() {
         }
     }
 
-    fun getLoadResponse(): LoadResponse? {
-        return safe { (generator as? RepoLinkGenerator?)?.page }
-    }
-
-    fun getMeta(): Any? {
-        return safe { generator?.getCurrent() }
-    }
-
-    fun getAllMeta(): List<Any>? {
-        return safe { generator?.getAll() }
-    }
-
-    fun getNextMeta(): Any? {
-        return safe {
-            if (generator?.hasNext() == false) return@safe null
-            generator?.getCurrent(offset = 1)
-        }
-    }
-
-    fun loadThisEpisode(index:Int) {
-        generator?.goto(index)
+    fun loadThisEpisode(index: Int) {
+        episodeIndex = index
         loadLinks()
     }
 
-    fun getCurrentIndex():Int?{
-        val repoGen = generator as? RepoLinkGenerator ?: return null
-        return repoGen.videoIndex
-    }
-
-    fun attachGenerator(newGenerator: IGenerator?) {
+    fun attachGenerator(newGenerator: VideoGenerator<*>?, index: Int?) {
         if (generator == null) {
             generator = newGenerator
+            if (index != null) {
+                episodeIndex = index
+            }
         }
     }
 
-    private var extraSubtitles : MutableSet<SubtitleData> = mutableSetOf()
-
     /**
      * If duplicate nothing will happen
      * */
-    fun addSubtitles(file: Set<SubtitleData>) = synchronized(extraSubtitles) {
-        extraSubtitles += file
-        val current = _currentSubs.value ?: emptySet()
-        val next = extraSubtitles + current
-
-        // if it is of a different size then we have added distinct items
-        if (next.size != current.size) {
-            // Posting will refresh subtitles which will in turn
-            // make the subs to english if previously unselected
-            _currentSubs.postValue(next)
-        }
+    fun addSubtitles(file: Set<SubtitleData>) {
+        val validFile = file.filter(::isValidSubtitle)
+        if (validFile.isNotEmpty())
+            modifyState {
+                add(validFile)
+            }
     }
 
     private var currentJob: Job? = null
     private var currentStampJob: Job? = null
 
     fun loadStamps(duration: Long) {
-        //currentStampJob?.cancel()
         currentStampJob = ioSafe {
-            val meta = generator?.getCurrent()
-            val page = (generator as? RepoLinkGenerator?)?.page
-            if (page != null && meta is ResultEpisode) {
-                _currentStamps.postValue(listOf())
-                _currentStamps.postValue(
-                    SkipAPI.videoStamps(
-                        page,
-                        meta,
-                        duration,
-                        hasNextEpisode() ?: false
-                    )
-                )
+            val genState = state.generatorState ?: return@ioSafe
+            val meta = genState.meta
+            val page = genState.response
+            val id = genState.id
+            if (page == null || meta !is ResultEpisode) {
+                return@ioSafe
             }
+            val stamps = SkipAPI.videoStamps(
+                page,
+                meta,
+                duration,
+                hasNextEpisode() ?: false
+            )
+
+            /** Avoid adding stamps to the wrong video */
+            modifyState {
+                if (id != this.generatorState?.id) {
+                    this
+                } else {
+                    set(stamps)
+                }
+            }
+        }
+    }
+
+    var langFilterList = listOf<String>()
+    var filterSubByLang = false
+
+    fun isValidSubtitle(subtitle: SubtitleData): Boolean {
+        if (langFilterList.isEmpty() || !filterSubByLang) {
+            return true
+        }
+
+        /** Only filter out subtitles fetched online */
+        if (subtitle.origin != SubtitleOrigin.URL) {
+            return true
+        }
+
+        return langFilterList.any { lang ->
+            subtitle.originalName.contains(lang, ignoreCase = true)
         }
     }
 
     fun loadLinks(sourceTypes: Set<ExtractorLinkType> = LOADTYPE_INAPP) {
         Log.i(TAG, "loadLinks")
         currentJob?.cancel()
+        val index = episodeIndex
 
         currentJob = viewModelScope.launchSafe {
-            // if we load links then we clear the prev loaded links
-            synchronized(extraSubtitles) {
-                extraSubtitles.clear()
+            // Clear old data and reset the state
+            modifyState {
+                VideoState(
+                    generatorState = generator?.let { gen ->
+                        GeneratorState(
+                            meta = gen.videos.getOrNull(index),
+                            nextMeta = gen.videos.getOrNull(index + 1),
+                            id = gen.getId(index),
+                            response = (gen as? RepoLinkGenerator)?.page,
+                            index = index,
+                            allMeta = gen.videos
+                        )
+                    }
+                )
             }
-            val currentLinks = mutableSetOf<Pair<ExtractorLink?, ExtractorUri?>>()
-            val currentSubs = mutableSetOf<SubtitleData>()
 
-            // clear old data
-            _currentSubs.postValue(emptySet())
-            _currentLinks.postValue(emptySet())
-
-            // load more data
-            _loadingLinks.postValue(Resource.Loading())
+            // Load more data
             val loadingState = safeApiCall {
                 generator?.generateLinks(
                     sourceTypes = sourceTypes,
                     clearCache = forceClearCache,
-                    callback = {
-                        synchronized(currentLinks) {
-                            currentLinks.add(it)
-                            // Clone to prevent ConcurrentModificationException
-                            safe {
-                                // Extra safe since .toSet() iterates.
-                                _currentLinks.postValue(currentLinks.toSet())
-                            }
+                    callback = { link ->
+                        modifyState {
+                            add(link)
                         }
                     },
-                    subtitleCallback = {
-                        synchronized(extraSubtitles) {
-                            currentSubs.add(it)
-                            safe {
-                                _currentSubs.postValue(currentSubs + extraSubtitles)
+                    isCasting = false,
+                    offset = index,
+                    subtitleCallback = { link ->
+                        if (isValidSubtitle(link))
+                            modifyState {
+                                add(link)
                             }
-                        }
                     })
             }
 
-            _loadingLinks.postValue(loadingState)
-            _currentLinks.postValue(currentLinks)
-            synchronized(extraSubtitles) {
-                _currentSubs.postValue(currentSubs + extraSubtitles)
+            if (!isActive) {
+                return@launchSafe
+            }
+
+            /** Only mark as success if we have not skipped loading */
+            modifyState {
+                when (loading) {
+                    is Resource.Loading -> copy(loading = loadingState)
+                    else -> this
+                }
             }
         }
-
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt
index 0dddf58a1..0668a194b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt
@@ -9,8 +9,8 @@ import com.lagradost.cloudstream3.ui.result.ResultEpisode
 import com.lagradost.cloudstream3.utils.AppContextUtils.html
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
-import kotlin.math.max
-import kotlin.math.min
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicInteger
 
 data class Cache(
     val linkCache: MutableSet<ExtractorLink>,
@@ -23,9 +23,8 @@ data class Cache(
 
 class RepoLinkGenerator(
     episodes: List<ResultEpisode>,
-    currentIndex: Int = 0,
     val page: LoadResponse? = null,
-) : VideoGenerator<ResultEpisode>(episodes, currentIndex) {
+) : VideoGenerator<ResultEpisode>(episodes) {
     companion object {
         const val TAG = "RepoLink"
         val cache: HashMap<Pair<String, Int>, Cache> =
@@ -34,6 +33,7 @@ class RepoLinkGenerator(
 
     override val hasCache = true
     override val canSkipLoading = true
+    override fun getId(index: Int): Int? = videos.getOrNull(index)?.id
 
     // this is a simple array that is used to instantly load links if they are already loaded
     //var linkCache = Array<Set<ExtractorLink>>(size = episodes.size, init = { setOf() })
@@ -48,7 +48,7 @@ class RepoLinkGenerator(
         offset: Int,
         isCasting: Boolean,
     ): Boolean {
-        val current = getCurrent(offset) ?: return false
+        val current = videos.getOrNull(offset) ?: return false
 
         val currentCache = synchronized(cache) {
             cache[current.apiName to current.id] ?: Cache(
@@ -61,10 +61,12 @@ class RepoLinkGenerator(
             }
         }
 
-        // these act as a general filter to prevent duplication of links or names
-        val currentLinksUrls = mutableSetOf<String>()       // makes all urls unique
-        val currentSubsUrls = mutableSetOf<String>()    // makes all subs urls unique
-        val lastCountedSuffix = mutableMapOf<String, UInt>()
+        // These act as a general filter to prevent duplication of links or names
+        // Avoid any possible ConcurrentModificationException
+        val currentLinksUrls = ConcurrentHashMap.newKeySet<String>()
+        val currentSubsUrls = ConcurrentHashMap.newKeySet<String>()
+        // Use atomics as otherwise we get race conditions when incrementing, while rare it did actually happen!
+        val lastCountedSuffix = ConcurrentHashMap<String, AtomicInteger>()
 
         synchronized(currentCache) {
             val outdatedCache =
@@ -75,7 +77,10 @@ class RepoLinkGenerator(
                 currentCache.subtitleCache.clear()
                 currentCache.saturated = false
             } else if (currentCache.linkCache.isNotEmpty()) {
-                Log.d(TAG, "Resumed previous loading from ${unixTime - currentCache.lastCachedTimestamp}s ago")
+                Log.d(
+                    TAG,
+                    "Resumed previous loading from ${unixTime - currentCache.lastCachedTimestamp}s ago"
+                )
             }
 
             // call all callbacks
@@ -88,8 +93,7 @@ class RepoLinkGenerator(
 
             currentCache.subtitleCache.forEach { sub ->
                 currentSubsUrls.add(sub.url)
-                val suffixCount = lastCountedSuffix.getOrDefault(sub.originalName, 0u) + 1u
-                lastCountedSuffix[sub.originalName] = suffixCount
+                lastCountedSuffix.getOrPut(sub.originalName) { AtomicInteger(0) }.incrementAndGet()
                 subtitleCallback(sub)
             }
 
@@ -108,17 +112,15 @@ class RepoLinkGenerator(
             subtitleCallback = { file ->
                 Log.d(TAG, "Loaded SubtitleFile: $file")
                 val correctFile = PlayerSubtitleHelper.getSubtitleData(file)
-                if (correctFile.url.isBlank() || currentSubsUrls.contains(correctFile.url)) {
+                if (correctFile.url.isBlank() || !currentSubsUrls.add(correctFile.url)) {
                     return@loadLinks
                 }
-                currentSubsUrls.add(correctFile.url)
 
                 // this part makes sure that all names are unique for UX
-
-                val nameDecoded = correctFile.originalName.html().toString().trim() // `%3Ch1%3Esub%20name…` → `<h1>sub name…` → `sub name…`
-
-                val suffixCount = lastCountedSuffix.getOrDefault(nameDecoded, 0u) +1u
-                lastCountedSuffix[nameDecoded] = suffixCount
+                val nameDecoded = correctFile.originalName.html().toString()
+                    .trim() // `%3Ch1%3Esub%20name…` → `<h1>sub name…` → `sub name…`
+                val suffixCount =
+                    lastCountedSuffix.getOrPut(nameDecoded) { AtomicInteger(0) }.incrementAndGet()
 
                 val updatedFile =
                     correctFile.copy(originalName = nameDecoded, nameSuffix = "$suffixCount")
@@ -132,10 +134,9 @@ class RepoLinkGenerator(
             },
             callback = { link ->
                 Log.d(TAG, "Loaded ExtractorLink: $link")
-                if (link.url.isBlank() || currentLinksUrls.contains(link.url)) {
+                if (link.url.isBlank() || !currentLinksUrls.add(link.url)) {
                     return@loadLinks
                 }
-                currentLinksUrls.add(link.url)
 
                 synchronized(currentCache) {
                     if (currentCache.linkCache.add(link)) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
index 70ca11743..cfbacc5d1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
@@ -559,7 +559,7 @@ class ResultFragmentTv : BaseFragment<FragmentResultTvBinding>(
                             ExtractorLinkGenerator(
                                 extractedTrailerLinks,
                                 emptyList()
-                            )
+                            ), 0
                         )
                     )
                 }
@@ -925,8 +925,12 @@ class ResultFragmentTv : BaseFragment<FragmentResultTvBinding>(
                         resultTvComingSoon.isVisible = d.comingSoon
 
                         populateChips(resultTag, d.tags)
-                        val prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(root.context)
-                        val showCast = prefs.getBoolean(root.context.getString(R.string.show_cast_in_details_key), true)
+                        val prefs =
+                            androidx.preference.PreferenceManager.getDefaultSharedPreferences(root.context)
+                        val showCast = prefs.getBoolean(
+                            root.context.getString(R.string.show_cast_in_details_key),
+                            true
+                        )
 
                         resultCastItems.isGone = !showCast || d.actors.isNullOrEmpty()
                         (resultCastItems.adapter as? ActorAdaptor)?.submitList(if (showCast) d.actors else emptyList())
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index cf563df8e..7dfe3cf59 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -1,7 +1,8 @@
 package com.lagradost.cloudstream3.ui.result
 
 import android.app.Activity
-import android.content.*
+import android.content.Context
+import android.content.DialogInterface
 import android.util.Log
 import android.widget.Toast
 import androidx.annotation.MainThread
@@ -10,24 +11,50 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.actions.AlwaysAskAction
-import com.lagradost.cloudstream3.actions.VideoClickActionHolder
+import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.APIHolder.apis
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.APIHolder.unixTime
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
+import com.lagradost.cloudstream3.ActorData
+import com.lagradost.cloudstream3.AnimeLoadResponse
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.context
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
 import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.getCastSession
 import com.lagradost.cloudstream3.CommonActivity.showToast
+import com.lagradost.cloudstream3.DubStatus
+import com.lagradost.cloudstream3.EpisodeResponse
+import com.lagradost.cloudstream3.IDownloadableMinimum
+import com.lagradost.cloudstream3.LiveStreamLoadResponse
+import com.lagradost.cloudstream3.LoadResponse
 import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
 import com.lagradost.cloudstream3.LoadResponse.Companion.getAniListId
 import com.lagradost.cloudstream3.LoadResponse.Companion.getKitsuId
 import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId
 import com.lagradost.cloudstream3.LoadResponse.Companion.isMovie
 import com.lagradost.cloudstream3.LoadResponse.Companion.readIdFromString
+import com.lagradost.cloudstream3.MainActivity
+import com.lagradost.cloudstream3.MovieLoadResponse
+import com.lagradost.cloudstream3.ProviderType
+import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.Score
+import com.lagradost.cloudstream3.SearchResponse
+import com.lagradost.cloudstream3.SeasonData
+import com.lagradost.cloudstream3.ShowStatus
+import com.lagradost.cloudstream3.SimklSyncServices
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.TorrentLoadResponse
+import com.lagradost.cloudstream3.TrackerType
+import com.lagradost.cloudstream3.TrailerData
+import com.lagradost.cloudstream3.TvSeriesLoadResponse
+import com.lagradost.cloudstream3.TvType
+import com.lagradost.cloudstream3.VPNStatus
+import com.lagradost.cloudstream3.actions.AlwaysAskAction
+import com.lagradost.cloudstream3.actions.VideoClickActionHolder
+import com.lagradost.cloudstream3.amap
+import com.lagradost.cloudstream3.isEpisodeBased
+import com.lagradost.cloudstream3.isLiveStream
 import com.lagradost.cloudstream3.metaproviders.SyncRedirector
 import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.debugAssert
@@ -44,9 +71,7 @@ import com.lagradost.cloudstream3.syncproviders.SyncAPI
 import com.lagradost.cloudstream3.syncproviders.providers.Kitsu
 import com.lagradost.cloudstream3.ui.APIRepository
 import com.lagradost.cloudstream3.ui.WatchType
-import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
 import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
-import com.lagradost.cloudstream3.ui.player.IGenerator
 import com.lagradost.cloudstream3.ui.player.LOADTYPE_ALL
 import com.lagradost.cloudstream3.ui.player.LOADTYPE_CHROMECAST
 import com.lagradost.cloudstream3.ui.player.LOADTYPE_INAPP
@@ -105,8 +130,8 @@ import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UiText
 import com.lagradost.cloudstream3.utils.VIDEO_WATCH_STATE
 import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.sanitizeFilename
-import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.getDownloadEpisodeMetadata
 import com.lagradost.cloudstream3.utils.downloader.DownloadObjects
+import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
 import com.lagradost.cloudstream3.utils.downloader.DownloadUtils.downloadSubtitle
 import com.lagradost.cloudstream3.utils.loadExtractor
 import com.lagradost.cloudstream3.utils.newExtractorLink
@@ -423,7 +448,7 @@ fun SelectPopup.getOptions(context: Context): List<String> {
 }
 
 data class ExtractedTrailerData(
-    var mirros: List<Pair<ExtractorLink,String>>,//Pair of extracted trailer link and original trailer link
+    var mirros: List<Pair<ExtractorLink, String>>,//Pair of extracted trailer link and original trailer link
     var subtitles: List<SubtitleFile> = emptyList(),
 )
 
@@ -454,7 +479,7 @@ class ResultViewModel2 : ViewModel() {
     var currentRepo: APIRepository? = null
     private var currentId: Int? = null
     private var fillers: HashSet<Int> = hashSetOf()
-    private var generator: IGenerator? = null
+    private var generator: RepoLinkGenerator? = null
     private var preferDubStatus: DubStatus? = null
     private var preferStartEpisode: Int? = null
     private var preferStartSeason: Int? = null
@@ -1267,9 +1292,10 @@ class ResultViewModel2 : ViewModel() {
                     subs += sub
                     updatePage()
                 },
-                isCasting = isCasting
+                isCasting = isCasting,
+                offset = 0
             )
-        } catch (e: CancellationException) {
+        } catch (_: CancellationException) {
             // Do nothing
         } catch (e: Exception) {
             logError(e)
@@ -1518,26 +1544,24 @@ class ResultViewModel2 : ViewModel() {
 
             ACTION_PLAY_EPISODE_IN_PLAYER -> {
                 val list = HashMap<String, String>(currentResponse?.syncData ?: emptyMap())
+                val generator = generator ?: return
+
+                // I know kinda shit to iterate all, but it is 100% sure to work
+                val index = generator.videos.indexOfFirst { value -> value.id == click.data.id }
 
-                generator?.also {
-                    it.getAll() // I know kinda shit to iterate all, but it is 100% sure to work
-                        ?.indexOfFirst { value -> value is ResultEpisode && value.id == click.data.id }
-                        ?.let { index ->
-                            if (index >= 0)
-                                it.goto(index)
-                        }
-                }
                 if (currentResponse?.type == TvType.CustomMedia) {
-                    generator?.generateLinks(
+                    generator.generateLinks(
+                        offset = index,
                         clearCache = true,
-                        LOADTYPE_ALL,
+                        isCasting = false,
+                        sourceTypes = LOADTYPE_ALL,
                         callback = {},
                         subtitleCallback = {})
                 } else {
                     activity?.navigate(
                         R.id.global_to_navigation_player,
                         GeneratorPlayer.newInstance(
-                            generator ?: return, list
+                            generator, index,list
                         )
                     )
                 }
@@ -1807,7 +1831,7 @@ class ResultViewModel2 : ViewModel() {
     }
 
 
-    private suspend fun updateFillers(data : LoadResponse) {
+    private suspend fun updateFillers(data: LoadResponse) {
         fillers = ioWorkSafe {
             FillerEpisodeCheck.getFillerEpisodes(data)
         } ?: hashSetOf()
@@ -2429,26 +2453,34 @@ class ResultViewModel2 : ViewModel() {
             loadResponse.trailers.windowed(limit, limit, true).takeWhile { list ->
                 list.amap { trailerData ->
                     try {
-                        val links = arrayListOf<Pair<ExtractorLink,String>>()
+                        val links = arrayListOf<Pair<ExtractorLink, String>>()
                         val subs = arrayListOf<SubtitleFile>()
                         if (!loadExtractor(
                                 trailerData.extractorUrl,
                                 trailerData.referer,
                                 { subs.add(it) },
-                                { links.add(Pair(it,trailerData.extractorUrl))}) && trailerData.raw
+                                {
+                                    links.add(
+                                        Pair(
+                                            it,
+                                            trailerData.extractorUrl
+                                        )
+                                    )
+                                }) && trailerData.raw
                         ) {
                             arrayListOf(
                                 Pair(
                                     newExtractorLink(
-                                    "",
-                                    "Trailer",
-                                    trailerData.extractorUrl,
-                                    type = INFER_TYPE
-                                ) {
-                                    this.referer = trailerData.referer ?: ""
-                                    this.quality = Qualities.Unknown.value
-                                    this.headers = trailerData.headers
-                                },trailerData.extractorUrl)
+                                        "",
+                                        "Trailer",
+                                        trailerData.extractorUrl,
+                                        type = INFER_TYPE
+                                    ) {
+                                        this.referer = trailerData.referer ?: ""
+                                        this.quality = Qualities.Unknown.value
+                                        this.headers = trailerData.headers
+                                    }, trailerData.extractorUrl
+                                )
                             ) to arrayListOf()
                         } else {
                             links to subs
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
index f1d7ed742..12fcc0c33 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
@@ -2000,6 +2000,8 @@ object VideoDownloadManager {
 
             linkLoadingJob = ioSafe {
                 generator.generateLinks(
+                    offset = 0,
+                    isCasting = false,
                     clearCache = false,
                     sourceTypes = LOADTYPE_INAPP_DOWNLOAD,
                     callback = {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dc65cc4ee..a97145c3f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,6 +26,7 @@ junitKtx = "1.3.0"
 junitVersion = "1.3.0"
 juniversalchardet = "2.5.0"
 kotlinGradlePlugin = "2.3.20"
+kotlinxCollectionsImmutable = "0.4.0"
 kotlinxCoroutinesCore = "1.10.2"
 lifecycleKtx = "2.10.0"
 material = "1.14.0-beta01"
@@ -80,6 +81,7 @@ jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 junit = { module = "junit:junit", version.ref = "junit" }
 junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "junitKtx" }
 juniversalchardet = { module = "com.github.albfernandez:juniversalchardet", version.ref = "juniversalchardet" }
+kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinxCollectionsImmutable" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
 lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleKtx" }
 lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleKtx" }

From bfc926814c53a8c422937f843bf7df680faa037f Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Wed, 6 May 2026 18:13:13 +0000
Subject: [PATCH 108/177] Fixobserveorder (#2766)

---
 .../cloudstream3/ui/player/GeneratorPlayer.kt |  63 +++++++---
 .../ui/player/PlayerGeneratorViewModel.kt     | 113 +++++++++++-------
 2 files changed, 113 insertions(+), 63 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index 9ee85a941..2dfd5ef4d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -143,7 +143,11 @@ class GeneratorPlayer : FullScreenPlayer() {
         const val STOP_ACTION = "stopcs3"
 
         private val generators = ConcurrentHashMap<String, VideoGenerator<*>>()
-        fun newInstance(generator: VideoGenerator<*>, index : Int, syncData: HashMap<String, String>? = null): Bundle {
+        fun newInstance(
+            generator: VideoGenerator<*>,
+            index: Int,
+            syncData: HashMap<String, String>? = null
+        ): Bundle {
             Log.i(TAG, "newInstance = $syncData")
             val uuid = UUID.randomUUID().toString()
             generators[uuid] = generator
@@ -178,12 +182,14 @@ class GeneratorPlayer : FullScreenPlayer() {
     private var isNextEpisode: Boolean = false // this is used to reset the watch time
 
     private var preferredAutoSelectSubtitles: String? = null // null means do nothing, "" means none
-    private val allMeta: List<ResultEpisode>? get() = viewModel.state.generatorState?.allMeta?.filterIsInstance<ResultEpisode>()?.map { episode ->
-        // Refresh all the episodes watch duration
-        getViewPos(episode.id)?.let { data ->
-            episode.copy(position = data.position, duration = data.duration)
-        } ?: episode
-    }
+    private val allMeta: List<ResultEpisode>?
+        get() = viewModel.state.generatorState?.allMeta?.filterIsInstance<ResultEpisode>()
+            ?.map { episode ->
+                // Refresh all the episodes watch duration
+                getViewPos(episode.id)?.let { data ->
+                    episode.copy(position = data.position, duration = data.duration)
+                } ?: episode
+            }
 
     private fun setSubtitles(subtitle: SubtitleData?, userInitiated: Boolean): Boolean {
         // If subtitle is changed and user initiated -> Save the language
@@ -1541,7 +1547,7 @@ class GeneratorPlayer : FullScreenPlayer() {
 
     private fun startPlayer() {
         // We don't want double load when you skip loading
-        if(isPlayerActive.get()) {
+        if (isPlayerActive.get()) {
             return
         }
 
@@ -2140,6 +2146,7 @@ class GeneratorPlayer : FullScreenPlayer() {
     fun releasePlayer() {
         player.release()
         currentSelectedSubtitles = null
+        currentSelectedLink = null
         isPlayerActive.set(false)
         binding?.overlayLoadingSkipButton?.isVisible = false
         binding?.playerLoadingOverlay?.isVisible = true
@@ -2152,19 +2159,31 @@ class GeneratorPlayer : FullScreenPlayer() {
         activity?.popCurrentPage()
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putInt("index", viewModel.episodeIndex)
+        super.onSaveInstanceState(outState)
+    }
+
     override fun onBindingCreated(binding: FragmentPlayerBinding, savedInstanceState: Bundle?) {
         viewModel = ViewModelProvider(this)[PlayerGeneratorViewModel::class.java]
         sync = ViewModelProvider(this)[SyncViewModel::class.java]
 
         val uuid = savedInstanceState?.getString("uuid") ?: arguments?.getString("uuid")
         val index = savedInstanceState?.getInt("index") ?: arguments?.getInt("index")
-
-        viewModel.attachGenerator(generators[uuid], index)
+        val generator = generators[uuid]
 
         unwrapBundle(savedInstanceState)
         unwrapBundle(arguments)
 
         super.onBindingCreated(binding, savedInstanceState)
+
+        // Avoid showing no links found
+        if (generator == null || index == null) {
+            exitPlayer()
+            return
+        }
+        viewModel.attachGenerator(generator, index)
+
         context?.let { ctx ->
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
             showName = settingsManager.getBoolean(ctx.getString(R.string.show_name_key), true)
@@ -2193,14 +2212,18 @@ class GeneratorPlayer : FullScreenPlayer() {
 
         preferredAutoSelectSubtitles = getAutoSelectLanguageTagIETF()
 
-        if (currentSelectedLink == null) {
+        val selectedLink = currentSelectedLink
+        if (selectedLink == null) {
             viewModel.loadLinks()
+        } else {
+            // Recreated view, so we need to recreate the
+            loadLink(selectedLink, true)
         }
 
         binding.overlayLoadingSkipButton.setOnClickListener {
             // Mark as "success" early
             viewModel.modifyState {
-                copy(loading = Resource.Success(true))
+                copy(loading = Resource.Success(Unit))
             }
         }
 
@@ -2218,11 +2241,13 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
         }
 
-        observe(viewModel.currentStamps) { stamps ->
+        observe(viewModel.currentStamps) { (stamps, instance) ->
+            if (instance != viewModel.state.instance) return@observe // Outdated observe
             player.addTimeStamps(stamps)
         }
 
-        observe(viewModel.currentSubtitles) { subtitles ->
+        observe(viewModel.currentSubtitles) { (subtitles, instance) ->
+            if (instance != viewModel.state.instance) return@observe // Outdated observe
             player.setActiveSubtitles(subtitles)
 
             // If the file is downloaded then do not select auto select the subtitles
@@ -2233,7 +2258,9 @@ class GeneratorPlayer : FullScreenPlayer() {
                 autoSelectSubtitles()
             }
         }
-        observe(viewModel.loadingLinks) { loading ->
+        observe(viewModel.loadingLinks) { (loading, instance) ->
+            if (instance != viewModel.state.instance) return@observe // Outdated observe
+
             when (loading) {
                 is Resource.Loading -> {
                     releasePlayer()
@@ -2254,7 +2281,9 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
         }
 
-        observe(viewModel.currentLinks) { links ->
+        observe(viewModel.currentLinks) { (links, instance) ->
+            if (instance != viewModel.state.instance) return@observe // Outdated observe
+
             val turnVisible = links.isNotEmpty() && viewModel.generator?.canSkipLoading == true
             val wasGone = binding.overlayLoadingSkipButton.isGone
 
@@ -2269,7 +2298,7 @@ class GeneratorPlayer : FullScreenPlayer() {
             }
 
             safe {
-                if (viewModel.state.links.any { link ->
+                if (!isPlayerActive.get() && viewModel.state.links.any { link ->
                         getLinkPriority(currentQualityProfile, link.first) >=
                                 QualityDataHelper.AUTO_SKIP_PRIORITY
                     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
index 049ed06d6..e3c390d50 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
@@ -47,8 +47,9 @@ data class VideoState(
     val subtitles: PersistentSet<SubtitleData> = persistentSetOf(),
     val links: PersistentSet<VideoLink> = persistentSetOf(),
     val stamps: PersistentList<VideoSkipStamp> = persistentListOf(),
-    val loading: Resource<Boolean?> = Resource.Loading(),
+    val loading: Resource<Unit> = Resource.Loading(),
     val generatorState: GeneratorState? = null,
+    val instance: Int,
 ) {
     /**
      * This acts as a local cache for sorted links that are not copied over by the copy constructor.
@@ -114,6 +115,11 @@ data class VideoState(
     fun set(items: Collection<VideoSkipStamp>): VideoState = copy(stamps = items.toPersistentList())
 }
 
+data class VideoLive<T>(
+    val value: T,
+    val instance: Int,
+)
+
 class PlayerGeneratorViewModel : ViewModel() {
     companion object {
         const val TAG = "PlayViewGen"
@@ -123,7 +129,7 @@ class PlayerGeneratorViewModel : ViewModel() {
     var generator: VideoGenerator<*>? = null
 
     @Volatile
-    private var episodeIndex: Int = 0
+    var episodeIndex: Int = 0
 
     /**
      * The state of the video player, only modify it by modifyState to make sure observe is called,
@@ -132,20 +138,21 @@ class PlayerGeneratorViewModel : ViewModel() {
      * This value can be used without Synchronized or locking when reading, as all fields are immutable.
      * */
     @Volatile
-    var state = VideoState()
+    var state = VideoState(instance = 0)
         private set
 
-    private val _currentLinks = MutableLiveData<Set<Pair<ExtractorLink?, ExtractorUri?>>>(setOf())
-    val currentLinks: LiveData<Set<Pair<ExtractorLink?, ExtractorUri?>>> = _currentLinks
+    private val _currentLinks =
+        MutableLiveData<VideoLive<Set<Pair<ExtractorLink?, ExtractorUri?>>>>(null)
+    val currentLinks: LiveData<VideoLive<Set<Pair<ExtractorLink?, ExtractorUri?>>>> = _currentLinks
 
-    private val _currentSubtitles = MutableLiveData<Set<SubtitleData>>(setOf())
-    val currentSubtitles: LiveData<Set<SubtitleData>> = _currentSubtitles
+    private val _currentSubtitles = MutableLiveData<VideoLive<Set<SubtitleData>>>(null)
+    val currentSubtitles: LiveData<VideoLive<Set<SubtitleData>>> = _currentSubtitles
 
-    private val _loadingLinks = MutableLiveData<Resource<Boolean?>>()
-    val loadingLinks: LiveData<Resource<Boolean?>> = _loadingLinks
+    private val _loadingLinks = MutableLiveData<VideoLive<Resource<Unit>>>()
+    val loadingLinks: LiveData<VideoLive<Resource<Unit>>> = _loadingLinks
 
-    private val _currentStamps = MutableLiveData<List<VideoSkipStamp>>(emptyList())
-    val currentStamps: LiveData<List<VideoSkipStamp>> = _currentStamps
+    private val _currentStamps = MutableLiveData<VideoLive<List<VideoSkipStamp>>>(null)
+    val currentStamps: LiveData<VideoLive<List<VideoSkipStamp>>> = _currentStamps
 
     /**
      * Modifies the `state` variable safely, and with the correct observe behavior.
@@ -158,6 +165,15 @@ class PlayerGeneratorViewModel : ViewModel() {
         val oldState = state
         state = op.invoke(oldState)
 
+        /** New instance, always push state */
+        if (state.instance != oldState.instance) {
+            _currentSubtitles.postValue(VideoLive(state.subtitles, state.instance))
+            _currentStamps.postValue(VideoLive(state.stamps, state.instance))
+            _currentLinks.postValue(VideoLive(state.links, state.instance))
+            _loadingLinks.postValue(VideoLive(state.loading, state.instance))
+            return
+        }
+
         /**
          * Only post the changed values, this makes sure we do not invoke the "observe"
          *
@@ -165,15 +181,15 @@ class PlayerGeneratorViewModel : ViewModel() {
          * to avoid comparing the entire set or list as "Persistent" classes will hold the same reference if they are unchanged.
          * */
         if (state.links !== oldState.links)
-            _currentLinks.postValue(state.links)
+            _currentLinks.postValue(VideoLive(state.links, state.instance))
         if (state.stamps !== oldState.stamps)
-            _currentStamps.postValue(state.stamps)
+            _currentStamps.postValue(VideoLive(state.stamps, state.instance))
         if (state.subtitles !== oldState.subtitles)
-            _currentSubtitles.postValue(state.subtitles)
+            _currentSubtitles.postValue(VideoLive(state.subtitles, state.instance))
 
         /** Normal equality here as it is not a collection */
         if (state.loading != oldState.loading)
-            _loadingLinks.postValue(state.loading)
+            _loadingLinks.postValue(VideoLive(state.loading, state.instance))
     }
 
     private val _currentSubtitleYear = MutableLiveData<Int?>(null)
@@ -252,13 +268,10 @@ class PlayerGeneratorViewModel : ViewModel() {
         loadLinks()
     }
 
-    fun attachGenerator(newGenerator: VideoGenerator<*>?, index: Int?) {
-        if (generator == null) {
-            generator = newGenerator
-            if (index != null) {
-                episodeIndex = index
-            }
-        }
+    fun attachGenerator(newGenerator: VideoGenerator<*>, index: Int) {
+        Log.i(TAG, "attachGenerator with generator=$newGenerator and index=$index")
+        generator = newGenerator
+        episodeIndex = index
     }
 
     /**
@@ -321,45 +334,49 @@ class PlayerGeneratorViewModel : ViewModel() {
     }
 
     fun loadLinks(sourceTypes: Set<ExtractorLinkType> = LOADTYPE_INAPP) {
-        Log.i(TAG, "loadLinks")
+        Log.i(TAG, "loadLinks with generator=$generator and index=$episodeIndex")
         currentJob?.cancel()
         val index = episodeIndex
 
-        currentJob = viewModelScope.launchSafe {
-            // Clear old data and reset the state
-            modifyState {
-                VideoState(
-                    generatorState = generator?.let { gen ->
-                        GeneratorState(
-                            meta = gen.videos.getOrNull(index),
-                            nextMeta = gen.videos.getOrNull(index + 1),
-                            id = gen.getId(index),
-                            response = (gen as? RepoLinkGenerator)?.page,
-                            index = index,
-                            allMeta = gen.videos
-                        )
-                    }
-                )
-            }
+        // Clear old data and reset the state
+        modifyState {
+            VideoState(
+                loading = Resource.Loading(),
+                generatorState = generator?.let { gen ->
+                    GeneratorState(
+                        meta = gen.videos.getOrNull(index),
+                        nextMeta = gen.videos.getOrNull(index + 1),
+                        id = gen.getId(index),
+                        response = (gen as? RepoLinkGenerator)?.page,
+                        index = index,
+                        allMeta = gen.videos
+                    )
+                },
+                instance = instance + 1
+            )
+        }
 
+        currentJob = viewModelScope.launchSafe {
             // Load more data
             val loadingState = safeApiCall {
                 generator?.generateLinks(
                     sourceTypes = sourceTypes,
                     clearCache = forceClearCache,
                     callback = { link ->
-                        modifyState {
-                            add(link)
-                        }
+                        if (isActive)
+                            modifyState {
+                                add(link)
+                            }
                     },
                     isCasting = false,
                     offset = index,
                     subtitleCallback = { link ->
-                        if (isValidSubtitle(link))
+                        if (isActive && isValidSubtitle(link))
                             modifyState {
                                 add(link)
                             }
                     })
+                Unit
             }
 
             if (!isActive) {
@@ -368,9 +385,13 @@ class PlayerGeneratorViewModel : ViewModel() {
 
             /** Only mark as success if we have not skipped loading */
             modifyState {
-                when (loading) {
-                    is Resource.Loading -> copy(loading = loadingState)
-                    else -> this
+                if (!isActive) {
+                    this
+                } else {
+                    when (loading) {
+                        is Resource.Loading -> copy(loading = loadingState)
+                        else -> this
+                    }
                 }
             }
         }

From 0d16a636e22a9baa24bc8b50dc80417e0e319b38 Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Wed, 6 May 2026 18:13:29 +0000
Subject: [PATCH 109/177] Fix: playerVideoTitleRez visibility (#2767)

---
 .../com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 4141aef51..26706699b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -773,7 +773,7 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
             playerEpisodesButtonRoot.isVisible = showPlayerEpisodes
             playerEpisodesButton.isVisible = showPlayerEpisodes
             playerVideoTitleHolder.isGone = togglePlayerTitleGone
-            playerVideoTitleRez.isGone = isGone
+            playerVideoTitleRez.isGone = isGone || playerVideoTitleRez.text.isBlank()
             playerEpisodeFiller.isGone = isGone
             playerCenterMenu.isGone = isGone
             playerLock.isGone = !isShowing

From aa6e702b5932d796bb85d8d6d539ebf3d3c72211 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Mon, 11 May 2026 13:12:28 +0200
Subject: [PATCH 110/177] Translated using Weblate (Portuguese (Brazil))
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Chinese (Traditional Han script))

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (729 of 729 strings)

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Belarusian)

Currently translated at 99.5% (726 of 729 strings)

Translated using Weblate (Croatian)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (French)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Albanian)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Arabic)

Currently translated at 99.5% (726 of 729 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Arabic (Levantine))

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Albanian)

Currently translated at 77.2% (563 of 729 strings)

Translated using Weblate (Italian)

Currently translated at 99.8% (728 of 729 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Korean)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (729 of 729 strings)

Update translation files

Updated by "Remove blank strings" hook in Weblate.

Translated using Weblate (Czech)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Norwegian Nynorsk)

Currently translated at 25.2% (183 of 726 strings)

Translated using Weblate (Norwegian Nynorsk)

Currently translated at 25.2% (183 of 726 strings)

Translated using Weblate (Norwegian Nynorsk)

Currently translated at 25.2% (183 of 726 strings)

Translated using Weblate (Norwegian Nynorsk)

Currently translated at 25.2% (183 of 726 strings)

Translated using Weblate (Norwegian Nynorsk)

Currently translated at 25.2% (183 of 726 strings)

Translated using Weblate (Norwegian Nynorsk)

Currently translated at 25.2% (183 of 726 strings)

Translated using Weblate (Norwegian Nynorsk)

Currently translated at 25.2% (183 of 726 strings)

Translated using Weblate (Norwegian Nynorsk)

Currently translated at 25.2% (183 of 726 strings)

Translated using Weblate (Esperanto)

Currently translated at 23.6% (172 of 726 strings)

Translated using Weblate (Esperanto)

Currently translated at 23.6% (172 of 726 strings)

Translated using Weblate (Esperanto)

Currently translated at 23.6% (172 of 726 strings)

Translated using Weblate (Esperanto)

Currently translated at 23.6% (172 of 726 strings)

Translated using Weblate (Esperanto)

Currently translated at 23.6% (172 of 726 strings)

Translated using Weblate (Esperanto)

Currently translated at 23.6% (172 of 726 strings)

Translated using Weblate (Esperanto)

Currently translated at 23.6% (172 of 726 strings)

Translated using Weblate (Esperanto)

Currently translated at 23.6% (172 of 726 strings)

Translated using Weblate (Assamese)

Currently translated at 86.9% (631 of 726 strings)

Translated using Weblate (Assamese)

Currently translated at 86.9% (631 of 726 strings)

Translated using Weblate (Assamese)

Currently translated at 86.9% (631 of 726 strings)

Translated using Weblate (Arabic (Najdi))

Currently translated at 45.0% (327 of 726 strings)

Translated using Weblate (Arabic (Najdi))

Currently translated at 45.0% (327 of 726 strings)

Translated using Weblate (Arabic (Najdi))

Currently translated at 45.0% (327 of 726 strings)

Translated using Weblate (Arabic (Najdi))

Currently translated at 45.0% (327 of 726 strings)

Translated using Weblate (Arabic (Najdi))

Currently translated at 45.0% (327 of 726 strings)

Translated using Weblate (Spanish)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Spanish)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Spanish)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Spanish)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Spanish)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Chinese (Traditional Han script))

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Chinese (Traditional Han script))

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Chinese (Traditional Han script))

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Bulgarian)

Currently translated at 99.0% (719 of 726 strings)

Translated using Weblate (Bulgarian)

Currently translated at 99.0% (719 of 726 strings)

Translated using Weblate (Bulgarian)

Currently translated at 99.0% (719 of 726 strings)

Translated using Weblate (Bulgarian)

Currently translated at 99.0% (719 of 726 strings)

Translated using Weblate (Bulgarian)

Currently translated at 99.0% (719 of 726 strings)

Translated using Weblate (Bulgarian)

Currently translated at 99.0% (719 of 726 strings)

Translated using Weblate (Persian)

Currently translated at 46.5% (338 of 726 strings)

Translated using Weblate (Persian)

Currently translated at 46.5% (338 of 726 strings)

Translated using Weblate (Persian)

Currently translated at 46.5% (338 of 726 strings)

Translated using Weblate (Persian)

Currently translated at 46.5% (338 of 726 strings)

Translated using Weblate (Persian)

Currently translated at 46.5% (338 of 726 strings)

Translated using Weblate (Persian)

Currently translated at 46.5% (338 of 726 strings)

Translated using Weblate (Persian)

Currently translated at 46.5% (338 of 726 strings)

Translated using Weblate (Persian)

Currently translated at 46.5% (338 of 726 strings)

Translated using Weblate (Galician)

Currently translated at 38.9% (283 of 726 strings)

Translated using Weblate (Galician)

Currently translated at 38.9% (283 of 726 strings)

Translated using Weblate (Galician)

Currently translated at 38.9% (283 of 726 strings)

Translated using Weblate (Galician)

Currently translated at 38.9% (283 of 726 strings)

Translated using Weblate (Galician)

Currently translated at 38.9% (283 of 726 strings)

Translated using Weblate (Galician)

Currently translated at 38.9% (283 of 726 strings)

Translated using Weblate (Catalan)

Currently translated at 45.0% (327 of 726 strings)

Translated using Weblate (Dutch)

Currently translated at 88.9% (646 of 726 strings)

Translated using Weblate (Dutch)

Currently translated at 88.9% (646 of 726 strings)

Translated using Weblate (Dutch)

Currently translated at 88.9% (646 of 726 strings)

Translated using Weblate (Dutch)

Currently translated at 88.9% (646 of 726 strings)

Translated using Weblate (Dutch)

Currently translated at 88.9% (646 of 726 strings)

Translated using Weblate (Dutch)

Currently translated at 88.9% (646 of 726 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Portuguese)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Portuguese)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Portuguese)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Portuguese)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Portuguese)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Portuguese)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Portuguese)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Amharic)

Currently translated at 14.4% (105 of 726 strings)

Translated using Weblate (Amharic)

Currently translated at 14.4% (105 of 726 strings)

Translated using Weblate (Amharic)

Currently translated at 14.4% (105 of 726 strings)

Translated using Weblate (Amharic)

Currently translated at 14.4% (105 of 726 strings)

Translated using Weblate (Amharic)

Currently translated at 14.4% (105 of 726 strings)

Translated using Weblate (Amharic)

Currently translated at 14.4% (105 of 726 strings)

Translated using Weblate (Amharic)

Currently translated at 14.4% (105 of 726 strings)

Translated using Weblate (Albanian)

Currently translated at 73.1% (531 of 726 strings)

Translated using Weblate (Albanian)

Currently translated at 73.1% (531 of 726 strings)

Translated using Weblate (Korean)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Korean)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Korean)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Korean)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Kannada)

Currently translated at 17.4% (127 of 726 strings)

Translated using Weblate (Kannada)

Currently translated at 17.4% (127 of 726 strings)

Translated using Weblate (Kannada)

Currently translated at 17.4% (127 of 726 strings)

Translated using Weblate (Kannada)

Currently translated at 17.4% (127 of 726 strings)

Translated using Weblate (Kannada)

Currently translated at 17.4% (127 of 726 strings)

Translated using Weblate (Kannada)

Currently translated at 17.4% (127 of 726 strings)

Translated using Weblate (Kannada)

Currently translated at 17.4% (127 of 726 strings)

Translated using Weblate (Nepali)

Currently translated at 17.0% (124 of 726 strings)

Translated using Weblate (Nepali)

Currently translated at 17.0% (124 of 726 strings)

Translated using Weblate (Nepali)

Currently translated at 17.0% (124 of 726 strings)

Translated using Weblate (Nepali)

Currently translated at 17.0% (124 of 726 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Japanese)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Japanese)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Japanese)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Japanese)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Azerbaijani)

Currently translated at 19.8% (144 of 726 strings)

Translated using Weblate (Azerbaijani)

Currently translated at 19.8% (144 of 726 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 65.7% (477 of 726 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 65.7% (477 of 726 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 65.7% (477 of 726 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 65.7% (477 of 726 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 65.7% (477 of 726 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 65.7% (477 of 726 strings)

Translated using Weblate (Romanian)

Currently translated at 84.8% (616 of 726 strings)

Translated using Weblate (Romanian)

Currently translated at 84.8% (616 of 726 strings)

Translated using Weblate (Romanian)

Currently translated at 84.8% (616 of 726 strings)

Translated using Weblate (Romanian)

Currently translated at 84.8% (616 of 726 strings)

Translated using Weblate (Romanian)

Currently translated at 84.8% (616 of 726 strings)

Translated using Weblate (Romanian)

Currently translated at 84.8% (616 of 726 strings)

Translated using Weblate (Odia)

Currently translated at 21.4% (156 of 726 strings)

Translated using Weblate (Odia)

Currently translated at 21.4% (156 of 726 strings)

Translated using Weblate (Odia)

Currently translated at 21.4% (156 of 726 strings)

Translated using Weblate (Odia)

Currently translated at 21.4% (156 of 726 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Russian)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Russian)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Russian)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Russian)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Russian)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Russian)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Russian)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Russian)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Russian)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Croatian)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Croatian)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Croatian)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Maltese)

Currently translated at 16.6% (121 of 726 strings)

Translated using Weblate (Maltese)

Currently translated at 16.6% (121 of 726 strings)

Translated using Weblate (Maltese)

Currently translated at 16.6% (121 of 726 strings)

Translated using Weblate (Greek)

Currently translated at 90.4% (657 of 726 strings)

Translated using Weblate (Greek)

Currently translated at 90.4% (657 of 726 strings)

Translated using Weblate (Greek)

Currently translated at 90.4% (657 of 726 strings)

Translated using Weblate (Greek)

Currently translated at 90.4% (657 of 726 strings)

Translated using Weblate (Greek)

Currently translated at 90.4% (657 of 726 strings)

Translated using Weblate (Greek)

Currently translated at 90.4% (657 of 726 strings)

Translated using Weblate (Hebrew)

Currently translated at 72.5% (527 of 726 strings)

Translated using Weblate (Hebrew)

Currently translated at 72.5% (527 of 726 strings)

Translated using Weblate (Hebrew)

Currently translated at 72.5% (527 of 726 strings)

Translated using Weblate (Hebrew)

Currently translated at 72.5% (527 of 726 strings)

Translated using Weblate (Hebrew)

Currently translated at 72.5% (527 of 726 strings)

Translated using Weblate (Hebrew)

Currently translated at 72.5% (527 of 726 strings)

Translated using Weblate (Hebrew)

Currently translated at 72.5% (527 of 726 strings)

Translated using Weblate (Hebrew)

Currently translated at 72.5% (527 of 726 strings)

Translated using Weblate (Hungarian)

Currently translated at 81.9% (595 of 726 strings)

Translated using Weblate (Hungarian)

Currently translated at 81.9% (595 of 726 strings)

Translated using Weblate (Hungarian)

Currently translated at 81.9% (595 of 726 strings)

Translated using Weblate (Hungarian)

Currently translated at 81.9% (595 of 726 strings)

Translated using Weblate (Hungarian)

Currently translated at 81.9% (595 of 726 strings)

Translated using Weblate (Hungarian)

Currently translated at 81.9% (595 of 726 strings)

Translated using Weblate (Hungarian)

Currently translated at 81.9% (595 of 726 strings)

Translated using Weblate (Slovak)

Currently translated at 62.5% (454 of 726 strings)

Translated using Weblate (Slovak)

Currently translated at 62.5% (454 of 726 strings)

Translated using Weblate (Slovak)

Currently translated at 62.5% (454 of 726 strings)

Translated using Weblate (Slovak)

Currently translated at 62.5% (454 of 726 strings)

Translated using Weblate (Slovak)

Currently translated at 62.5% (454 of 726 strings)

Translated using Weblate (Slovak)

Currently translated at 62.5% (454 of 726 strings)

Translated using Weblate (Slovak)

Currently translated at 62.5% (454 of 726 strings)

Translated using Weblate (Afrikaans)

Currently translated at 16.2% (118 of 726 strings)

Translated using Weblate (Afrikaans)

Currently translated at 16.2% (118 of 726 strings)

Translated using Weblate (Afrikaans)

Currently translated at 16.2% (118 of 726 strings)

Translated using Weblate (Afrikaans)

Currently translated at 16.2% (118 of 726 strings)

Translated using Weblate (Afrikaans)

Currently translated at 16.2% (118 of 726 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Bengali)

Currently translated at 48.2% (350 of 726 strings)

Translated using Weblate (Bengali)

Currently translated at 48.2% (350 of 726 strings)

Translated using Weblate (Bengali)

Currently translated at 48.2% (350 of 726 strings)

Translated using Weblate (Bengali)

Currently translated at 48.2% (350 of 726 strings)

Translated using Weblate (Bengali)

Currently translated at 48.2% (350 of 726 strings)

Translated using Weblate (Bengali)

Currently translated at 48.2% (350 of 726 strings)

Translated using Weblate (Bengali)

Currently translated at 48.2% (350 of 726 strings)

Translated using Weblate (Bengali)

Currently translated at 48.2% (350 of 726 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Indonesian)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Macedonian)

Currently translated at 96.4% (700 of 726 strings)

Translated using Weblate (Macedonian)

Currently translated at 96.4% (700 of 726 strings)

Translated using Weblate (Malay)

Currently translated at 65.8% (478 of 726 strings)

Translated using Weblate (Malay)

Currently translated at 65.8% (478 of 726 strings)

Translated using Weblate (Malay)

Currently translated at 65.8% (478 of 726 strings)

Translated using Weblate (Malay)

Currently translated at 65.8% (478 of 726 strings)

Translated using Weblate (Malay)

Currently translated at 65.8% (478 of 726 strings)

Translated using Weblate (Malay)

Currently translated at 65.8% (478 of 726 strings)

Translated using Weblate (Malay)

Currently translated at 65.8% (478 of 726 strings)

Translated using Weblate (Lithuanian)

Currently translated at 29.7% (216 of 726 strings)

Translated using Weblate (Lithuanian)

Currently translated at 29.7% (216 of 726 strings)

Translated using Weblate (Lithuanian)

Currently translated at 29.7% (216 of 726 strings)

Translated using Weblate (Lithuanian)

Currently translated at 29.7% (216 of 726 strings)

Translated using Weblate (Lithuanian)

Currently translated at 29.7% (216 of 726 strings)

Translated using Weblate (Arabic (Egyptian))

Currently translated at 0.0% (0 of 726 strings)

Translated using Weblate (Filipino)

Currently translated at 21.2% (154 of 726 strings)

Translated using Weblate (Filipino)

Currently translated at 21.2% (154 of 726 strings)

Translated using Weblate (Filipino)

Currently translated at 21.2% (154 of 726 strings)

Translated using Weblate (Filipino)

Currently translated at 21.2% (154 of 726 strings)

Translated using Weblate (Hindi)

Currently translated at 56.6% (411 of 726 strings)

Translated using Weblate (Hindi)

Currently translated at 56.6% (411 of 726 strings)

Translated using Weblate (Hindi)

Currently translated at 56.6% (411 of 726 strings)

Translated using Weblate (Hindi)

Currently translated at 56.6% (411 of 726 strings)

Translated using Weblate (Hindi)

Currently translated at 56.6% (411 of 726 strings)

Translated using Weblate (Hindi)

Currently translated at 56.6% (411 of 726 strings)

Translated using Weblate (Hindi)

Currently translated at 56.6% (411 of 726 strings)

Translated using Weblate (Hindi)

Currently translated at 56.6% (411 of 726 strings)

Translated using Weblate (Hindi)

Currently translated at 56.6% (411 of 726 strings)

Translated using Weblate (Tigrinya)

Currently translated at 0.4% (3 of 726 strings)

Translated using Weblate (Tigrinya)

Currently translated at 0.4% (3 of 726 strings)

Translated using Weblate (Tigrinya)

Currently translated at 0.4% (3 of 726 strings)

Translated using Weblate (Tigrinya)

Currently translated at 0.4% (3 of 726 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Tamil)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Tamil)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Kurdish (Central))

Currently translated at 11.2% (82 of 726 strings)

Translated using Weblate (Tagalog)

Currently translated at 32.5% (236 of 726 strings)

Translated using Weblate (Tagalog)

Currently translated at 32.5% (236 of 726 strings)

Translated using Weblate (Tagalog)

Currently translated at 32.5% (236 of 726 strings)

Translated using Weblate (Tagalog)

Currently translated at 32.5% (236 of 726 strings)

Translated using Weblate (Tagalog)

Currently translated at 32.5% (236 of 726 strings)

Translated using Weblate (Tagalog)

Currently translated at 32.5% (236 of 726 strings)

Translated using Weblate (Tagalog)

Currently translated at 32.5% (236 of 726 strings)

Translated using Weblate (Burmese)

Currently translated at 69.1% (502 of 726 strings)

Translated using Weblate (Burmese)

Currently translated at 69.1% (502 of 726 strings)

Translated using Weblate (Burmese)

Currently translated at 69.1% (502 of 726 strings)

Translated using Weblate (Burmese)

Currently translated at 69.1% (502 of 726 strings)

Translated using Weblate (Burmese)

Currently translated at 69.1% (502 of 726 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Urdu)

Currently translated at 81.8% (594 of 726 strings)

Translated using Weblate (Urdu)

Currently translated at 81.8% (594 of 726 strings)

Translated using Weblate (Urdu)

Currently translated at 81.8% (594 of 726 strings)

Translated using Weblate (Urdu)

Currently translated at 81.8% (594 of 726 strings)

Translated using Weblate (Urdu)

Currently translated at 81.8% (594 of 726 strings)

Translated using Weblate (Urdu)

Currently translated at 81.8% (594 of 726 strings)

Translated using Weblate (German)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (German)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (German)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (German)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (German)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (German)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (German)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (German)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (German)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (German)

Currently translated at 99.8% (725 of 726 strings)

Translated using Weblate (Arabic (Levantine))

Currently translated at 96.9% (704 of 726 strings)

Translated using Weblate (Arabic (Levantine))

Currently translated at 96.9% (704 of 726 strings)

Translated using Weblate (Latvian)

Currently translated at 80.8% (587 of 726 strings)

Translated using Weblate (Latvian)

Currently translated at 80.8% (587 of 726 strings)

Translated using Weblate (Latvian)

Currently translated at 80.8% (587 of 726 strings)

Translated using Weblate (Latvian)

Currently translated at 80.8% (587 of 726 strings)

Translated using Weblate (Latvian)

Currently translated at 80.8% (587 of 726 strings)

Translated using Weblate (Somali)

Currently translated at 60.4% (439 of 726 strings)

Translated using Weblate (Somali)

Currently translated at 60.4% (439 of 726 strings)

Translated using Weblate (Somali)

Currently translated at 60.4% (439 of 726 strings)

Translated using Weblate (Somali)

Currently translated at 60.4% (439 of 726 strings)

Translated using Weblate (Somali)

Currently translated at 60.4% (439 of 726 strings)

Translated using Weblate (Somali)

Currently translated at 60.4% (439 of 726 strings)

Translated using Weblate (Somali)

Currently translated at 60.4% (439 of 726 strings)

Translated using Weblate (Malayalam)

Currently translated at 31.2% (227 of 726 strings)

Translated using Weblate (Malayalam)

Currently translated at 31.2% (227 of 726 strings)

Translated using Weblate (Malayalam)

Currently translated at 31.2% (227 of 726 strings)

Translated using Weblate (Malayalam)

Currently translated at 31.2% (227 of 726 strings)

Translated using Weblate (Malayalam)

Currently translated at 31.2% (227 of 726 strings)

Translated using Weblate (Malayalam)

Currently translated at 31.2% (227 of 726 strings)

Translated using Weblate (Malayalam)

Currently translated at 31.2% (227 of 726 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (qt (generated) (qt))

Currently translated at 85.3% (620 of 726 strings)

Translated using Weblate (qt (generated) (qt))

Currently translated at 85.3% (620 of 726 strings)

Translated using Weblate (qt (generated) (qt))

Currently translated at 85.3% (620 of 726 strings)

Translated using Weblate (qt (generated) (qt))

Currently translated at 85.3% (620 of 726 strings)

Translated using Weblate (qt (generated) (qt))

Currently translated at 85.3% (620 of 726 strings)

Translated using Weblate (qt (generated) (qt))

Currently translated at 85.3% (620 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Translated using Weblate (French)

Currently translated at 100.0% (726 of 726 strings)

Co-authored-by: 007 <juri.malaj@gmail.com>
Co-authored-by: Aayush Shah <shahaayush999@gmail.com>
Co-authored-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Co-authored-by: Ahmed Abd El-Fattah <a.aelfattah5@gmail.com>
Co-authored-by: Aitor Salaberria <amento@ni.eus>
Co-authored-by: Akhlak Ur Rahman <akhlak.pro.red@gmail.com>
Co-authored-by: Alex Georgiou <alexandrosgeorgiou35@gmail.com>
Co-authored-by: Alexander Svärd <genc.demiri@hotmail.com>
Co-authored-by: Alexandru <negrualexandru52@gmail.com>
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Anarchydr <patrikpik879@gmail.com>
Co-authored-by: Andre Costa <andrecaeu@gmail.com>
Co-authored-by: Anonymous <noreply@weblate.org>
Co-authored-by: Apostol Penkov <apostol.penkov@gmail.com>
Co-authored-by: Argo Carpathians <chrisarabagas@gmail.com>
Co-authored-by: Azgar <azgaresncf@gmail.com>
Co-authored-by: Balmunk <reilria77@gmail.com>
Co-authored-by: Bananenbrot <keram2810@outlook.de>
Co-authored-by: Beabfekad Zikie <beabfekadz@gmail.com>
Co-authored-by: Bhupesh Yadav <thebhupeshyadav@gmail.com>
Co-authored-by: Bitpaint <bitpaintclub@gmail.com>
Co-authored-by: BluTiger <beqirstafa@gmail.com>
Co-authored-by: ButterflyOfFire <boffire@users.noreply.hosted.weblate.org>
Co-authored-by: Bálint László <blaszlobors@gmail.com>
Co-authored-by: Carlos Luiz <ecarlos-luiz@hotmail.com>
Co-authored-by: Chaya Endot <cheyenne.xyn@gmail.com>
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Co-authored-by: Clxff H3r4ld0 <123844876+clxf12@users.noreply.github.com>
Co-authored-by: Dan <jonweblin2205@protonmail.com>
Co-authored-by: DarkOrbFX <darkorbfx@gmail.com>
Co-authored-by: Davide Marcoli <davide.marcoli13@gmail.com>
Co-authored-by: Deleted User <Skrripy@users.noreply.hosted.weblate.org>
Co-authored-by: Deleted User <inavleb@users.noreply.hosted.weblate.org>
Co-authored-by: Deleted User <jsdelvani@users.noreply.hosted.weblate.org>
Co-authored-by: Deleted User <noreply+48943@weblate.org>
Co-authored-by: Deleted User <noreply+53776@weblate.org>
Co-authored-by: Deleted User <noreply+68493@weblate.org>
Co-authored-by: Doctorredits_here <182783629+doctorreditshere@users.noreply.github.com>
Co-authored-by: Emmanuel HEMERIT <emmanuel@hemer.it>
Co-authored-by: Eryk Michalak <gnu.ewm@protonmail.com>
Co-authored-by: FastAct <alex.rijckaert@gmail.com>
Co-authored-by: Felicity <kjev666+weblate@protonmail.com>
Co-authored-by: Fjuro <fjuro@users.noreply.hosted.weblate.org>
Co-authored-by: Francisco Serrador <fserrador@gmail.com>
Co-authored-by: Gabriel <bloxgabriel18@gmail.com>
Co-authored-by: Gabriel Cnudde <gabriel.cnudde59@gmail.com>
Co-authored-by: Giuseppe Terrana <terranagiuseppe03@gmail.com>
Co-authored-by: Gnkalk <github.fngyb@slmail.me>
Co-authored-by: H Tamás <hovanszki@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Imprevisible <imprevisible@duck.com>
Co-authored-by: Itsmechinmoy <167056923+itsmechinmoy@users.noreply.github.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: JL Pilgram <twich_89@hotmail.it>
Co-authored-by: Jean-Michel <arsene_lupin_57@hotmail.fr>
Co-authored-by: Jen Xie <aulaul825879@gmail.com>
Co-authored-by: Joana Trashlieva <j.trashlieva@gmail.com>
Co-authored-by: John Titor <utkin2007@gmail.com>
Co-authored-by: Joshua Joseph <joshuasaju2@gmail.com>
Co-authored-by: Julia Sugawara <jm.sugawara@gmail.com>
Co-authored-by: Kardi Demha <kardi.demha@gmail.com>
Co-authored-by: Konstantinos Tranoudis <kontranpro@gmail.com>
Co-authored-by: Kraptor123 <kraptor121@gmail.com>
Co-authored-by: LagradOst <46196380+Blatzar@users.noreply.github.com>
Co-authored-by: Leon de Klerk <deklerkleon5@gmail.com>
Co-authored-by: Levi Klippel <leviklippel@gmail.com>
Co-authored-by: LiJu09 <lisojuraj@gmail.com>
Co-authored-by: LucasMZ <git@lucasmz.dev>
Co-authored-by: Ludovic Pagès <nanucq@proton.me>
Co-authored-by: Luna712 <142361265+Luna712@users.noreply.github.com>
Co-authored-by: Man <thebroker2308@gmail.com>
Co-authored-by: Marian Turba <puki247@gmail.com>
Co-authored-by: Massimo Pissarello <mapi68@gmail.com>
Co-authored-by: Matthaiks <kitynska@gmail.com>
Co-authored-by: Michael John Scerri <michaeljscerri@gmail.com>
Co-authored-by: Mika <akimivanov43@gmail.com>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Muhammad Fahad Khan <itxmfahadkhan@gmail.com>
Co-authored-by: Muhammet <zumruduanka0013@gmail.com>
Co-authored-by: Murat Han <murathancw@gmail.com>
Co-authored-by: Márkó <gost1336@gmail.com>
Co-authored-by: Naga <yz2000.pro@gmail.com>
Co-authored-by: Nataniel Dika Kurniawan <hikawaart2@gmail.com>
Co-authored-by: Nguyễn Tiến Đạt <dn16092000@gmail.com>
Co-authored-by: Nicoara Alex <alex.nicoara@yahoo.com>
Co-authored-by: Nicola Bortoletto <nicola.bortoletto@live.com>
Co-authored-by: PaneradFisk <andre.bergvall@icloud.com>
Co-authored-by: PiterDev <piterzdev@gmail.com>
Co-authored-by: Pixelcode <pixelcode@dismail.de>
Co-authored-by: Pizza Party <paol.m@proton.me>
Co-authored-by: Posemartonis <weblate.drainage895@passmail.net>
Co-authored-by: Qareen Skoll <qareen101@protonmail.com>
Co-authored-by: Radoslav Lelchev <rlelchev@abv.bg>
Co-authored-by: Radoslav Vasilev Vasilev <fifata@gmail.com>
Co-authored-by: Ranforingus <ranforingus@hotmail.com>
Co-authored-by: Red Star Over Earth <rs0vere@outlook.com>
Co-authored-by: Rex_sa <rex.sa@pm.me>
Co-authored-by: Roi Gabay <roigby@gmail.com>
Co-authored-by: SBS1313 <simonsaade005@gmail.com>
Co-authored-by: Sam Cooper <samcooper838@gmail.com>
Co-authored-by: Samuel Gadiel <samuelgadiel@gmail.com>
Co-authored-by: Sandyran <sandyran@protonmail.com>
Co-authored-by: Sasha Glazko <lenify@users.noreply.hosted.weblate.org>
Co-authored-by: Sdarfeesh <Sdarfeesh@protonmail.com>
Co-authored-by: SehrGuterCode <philemonpfeiffer@gmail.com>
Co-authored-by: Shafici Isxariifshe <mega12xhaphiee@gmail.com>
Co-authored-by: ShareASmile <ShareASmile@users.noreply.hosted.weblate.org>
Co-authored-by: Sintayew Gashaw <sintayewgashaw4@gmail.com>
Co-authored-by: SleepyOwl <artem726artem@gmail.com>
Co-authored-by: Sufyan Zahoor Jutt <sufyanpahore@gmail.com>
Co-authored-by: Synertry <jonny.somrak@gmail.com>
Co-authored-by: T1z3n <info@njbraun.de>
Co-authored-by: TZVS <akyasan@tuta.io>
Co-authored-by: The Initiator <eithansten@gmail.com>
Co-authored-by: Tiago Lucas <tiago.slucas@gmail.com>
Co-authored-by: Tomas Andersson <jotakswe@users.noreply.hosted.weblate.org>
Co-authored-by: TubaApollo <86665265+TubaApollo@users.noreply.github.com>
Co-authored-by: Vrwi <jurgisbums@gmail.com>
Co-authored-by: Walter H. <walter75@gmail.com>
Co-authored-by: Wei-Cheng Yeh (IID) <iid@ccns.ncku.edu.tw>
Co-authored-by: almost gamer <almost.gamer01+language@gmail.com>
Co-authored-by: arcopnt <arcopnt@posteo.com>
Co-authored-by: bittin1ddc447d824349b2 <bittin@reimu.nl>
Co-authored-by: dabao1955 <dabao1955@163.com>
Co-authored-by: edgolron <edgolron@tutanota.com>
Co-authored-by: eightyy8 <oliver.kha@pm.me>
Co-authored-by: enly sure <enlysure@gmail.com>
Co-authored-by: esfzzddfse <esfzzddfse@proton.me>
Co-authored-by: george kitsoukakis <norhorn@gmail.com>
Co-authored-by: helpless_helper <dis.hd.eif.y.bk.ao.up@gmail.com>
Co-authored-by: hou1234 <gjqmgjsl3@gmail.com>
Co-authored-by: htet <htetoh2006@outlook.com>
Co-authored-by: hugoalh <hugoalh@users.noreply.hosted.weblate.org>
Co-authored-by: jinu147 <nesqea20@gmail.com>
Co-authored-by: kaajjo <claymanoff@gmail.com>
Co-authored-by: kerklangsi <arifilah.01@gmail.com>
Co-authored-by: khalidbelk <khalid.belkassmi-el-hafi@epitech.eu>
Co-authored-by: l <thisuserooo@gmail.com>
Co-authored-by: liva <livinja@proton.me>
Co-authored-by: mojtaba piri <Mpcuteangel@gmail.com>
Co-authored-by: ngocanhtve <ngocanh.tve@gmail.com>
Co-authored-by: opakholis <opakholis@users.noreply.hosted.weblate.org>
Co-authored-by: programutox <programutox@disroot.org>
Co-authored-by: stojkovskistefan <stefanstojkovski@gmail.com>
Co-authored-by: therry47 <soulietherry@gmail.com>
Co-authored-by: tuan041 <tuananh163025ttt@gmail.com>
Co-authored-by: william piti <loolyowo@gmail.com>
Co-authored-by: Ícaro Rodrigo Ferreira Da Fonseca Bezerra <icaro.bezerra@sptech.school>
Co-authored-by: Ömer Faruk Sancak <keyiflerolsun@gmail.com>
Co-authored-by: ΣΤΑΥΡΟΣ ΔΑΛΙΑΚΟΠΟΥΛΟΣ <stavros.daliakopoulos@gmail.com>
Co-authored-by: Влад Николаев <vladnic1990@gmail.com>
Co-authored-by: Сергей (MrSabin) <sabin.21011986@gmail.com>
Co-authored-by: தமிழ்நேரம் <tamilneram247@gmail.com>
Co-authored-by: 大王叫我来巡山 <hamburger2048@users.noreply.hosted.weblate.org>
Co-authored-by: 电棍老板 <qwertyuiop9296@outlook.com>
Co-authored-by: 구병우 <dodamby@ajou.ac.kr>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/af/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/am/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/apc/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ars/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/arz/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/as/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/az/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/be/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bg/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/bn/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ca/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ckb/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/cs/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/el/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/eo/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/es/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fa/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fil/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/fr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/gl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/he/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/hu/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/id/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/it/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ja/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/kn/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ko/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/lt/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/lv/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/mk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ml/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ms/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/mt/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/my/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ne/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nn/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/or/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pt/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/qt/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ro/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/so/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sq/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/sv/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ta/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ti/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/tr/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/uk/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ur/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/vi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/zh_Hant/
Translation: Cloudstream/App
---
 app/src/main/res/values-arz/strings.xml     |   2 +-
 app/src/main/res/values-b+af/strings.xml    |   3 +-
 app/src/main/res/values-b+am/strings.xml    |   3 +-
 app/src/main/res/values-b+apc/strings.xml   | 102 +++---
 app/src/main/res/values-b+ar/strings.xml    |  58 +---
 app/src/main/res/values-b+ars/strings.xml   |  23 +-
 app/src/main/res/values-b+as/strings.xml    |  58 +---
 app/src/main/res/values-b+bg/strings.xml    |  39 +--
 app/src/main/res/values-b+bn/strings.xml    |  14 +-
 app/src/main/res/values-b+cs/strings.xml    |  61 +---
 app/src/main/res/values-b+de/strings.xml    |  58 +---
 app/src/main/res/values-b+el/strings.xml    |  42 +--
 app/src/main/res/values-b+eo/strings.xml    |   5 +-
 app/src/main/res/values-b+es/strings.xml    |  65 ++--
 app/src/main/res/values-b+fa/strings.xml    |  14 +-
 app/src/main/res/values-b+fr/strings.xml    |  88 ++---
 app/src/main/res/values-b+gl/strings.xml    |   5 +-
 app/src/main/res/values-b+hi/strings.xml    |  18 +-
 app/src/main/res/values-b+hr/strings.xml    |  66 ++--
 app/src/main/res/values-b+hu/strings.xml    |  39 +--
 app/src/main/res/values-b+in/strings.xml    |  48 +--
 app/src/main/res/values-b+it/strings.xml    |  63 ++--
 app/src/main/res/values-b+iw/strings.xml    |  35 +-
 app/src/main/res/values-b+ja/strings.xml    |   8 +-
 app/src/main/res/values-b+kn/strings.xml    |   3 +-
 app/src/main/res/values-b+ko/strings.xml    |  81 ++---
 app/src/main/res/values-b+lt/strings.xml    |  12 +-
 app/src/main/res/values-b+lv/strings.xml    |  14 +-
 app/src/main/res/values-b+mk/strings.xml    |  11 +-
 app/src/main/res/values-b+ml/strings.xml    |  13 +-
 app/src/main/res/values-b+ms/strings.xml    |   5 +-
 app/src/main/res/values-b+mt/strings.xml    |   5 +-
 app/src/main/res/values-b+my/strings.xml    |  31 +-
 app/src/main/res/values-b+ne/strings.xml    |   3 +-
 app/src/main/res/values-b+nl/strings.xml    |  41 +--
 app/src/main/res/values-b+nn/strings.xml    |   9 +-
 app/src/main/res/values-b+no/strings.xml    |  27 +-
 app/src/main/res/values-b+or/strings.xml    |   3 +-
 app/src/main/res/values-b+pl/strings.xml    |  85 ++---
 app/src/main/res/values-b+pt+BR/strings.xml |  40 +--
 app/src/main/res/values-b+pt/strings.xml    |  56 +---
 app/src/main/res/values-b+qt/strings.xml    |  56 +---
 app/src/main/res/values-b+ro/strings.xml    |  42 +--
 app/src/main/res/values-b+ru/strings.xml    |  30 +-
 app/src/main/res/values-b+sk/strings.xml    |  15 +-
 app/src/main/res/values-b+so/strings.xml    |  15 +-
 app/src/main/res/values-b+sv/strings.xml    |  67 ++--
 app/src/main/res/values-b+ta/strings.xml    |   8 +-
 app/src/main/res/values-b+tl/strings.xml    |   8 +-
 app/src/main/res/values-b+tr/strings.xml    |  55 +--
 app/src/main/res/values-b+uk/strings.xml    | 353 ++++++++++----------
 app/src/main/res/values-b+ur/strings.xml    |  40 +--
 app/src/main/res/values-b+vi/strings.xml    | 147 ++++----
 app/src/main/res/values-b+zh+TW/strings.xml |  45 +--
 app/src/main/res/values-b+zh/strings.xml    |  61 +---
 app/src/main/res/values-be/strings.xml      |  31 +-
 app/src/main/res/values-sq/strings.xml      | 251 +++++++++++++-
 57 files changed, 1070 insertions(+), 1510 deletions(-)

diff --git a/app/src/main/res/values-arz/strings.xml b/app/src/main/res/values-arz/strings.xml
index 55344e519..4a4cb755f 100644
--- a/app/src/main/res/values-arz/strings.xml
+++ b/app/src/main/res/values-arz/strings.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
\ No newline at end of file
+    </resources>
diff --git a/app/src/main/res/values-b+af/strings.xml b/app/src/main/res/values-b+af/strings.xml
index 81d7a96ae..b81848db6 100644
--- a/app/src/main/res/values-b+af/strings.xml
+++ b/app/src/main/res/values-b+af/strings.xml
@@ -24,8 +24,7 @@
     <string name="subs_edge_type">Rand tipe</string>
     <string name="download_done">Klaar Afgelaai</string>
     <string name="continue_watching">Kyk verder</string>
-    <string name="new_update_format" formatted="true">Nuwe opdatering gevind!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Nuwe opdatering gevind! \n%1$s -&gt; %2$s</string>
     <string name="subs_download_languages">Laai Tale af</string>
     <string name="search_provider_text_providers">Soek deur verskaffers te gebruik</string>
     <string name="go_back_img_des">Gaan terug</string>
diff --git a/app/src/main/res/values-b+am/strings.xml b/app/src/main/res/values-b+am/strings.xml
index 7fd3274b9..56b71f5a0 100644
--- a/app/src/main/res/values-b+am/strings.xml
+++ b/app/src/main/res/values-b+am/strings.xml
@@ -8,8 +8,7 @@
     <string name="next_episode_time_hour_format" formatted="true">%1$dሰዓት %2$dደቂቃ</string>
     <string name="search_poster_img_des">ፖስተር</string>
     <string name="title_downloads">የወረዱ</string>
-    <string name="new_update_format" formatted="true">አዲስ ማሻሻያ ተገኝቷል!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">አዲስ ማሻሻያ ተገኝቷል! \n%1$s -&gt; %2$s</string>
     <string name="go_back_img_des">ተመለስ</string>
     <string name="episode_more_options_des">ተጨማሪ አማራጮች</string>
     <string name="type_watching">በማየት ላይ</string>
diff --git a/app/src/main/res/values-b+apc/strings.xml b/app/src/main/res/values-b+apc/strings.xml
index 3bf88ce13..5d3d7c9be 100644
--- a/app/src/main/res/values-b+apc/strings.xml
+++ b/app/src/main/res/values-b+apc/strings.xml
@@ -29,8 +29,7 @@
     <string name="show_log_cat">فرجي الـLogcat 🐈</string>
     <string name="go_forward_30">+30</string>
     <string name="continue_watching">كفي حضر</string>
-    <string name="new_update_format" formatted="true">في أپدايت جديدة!
-\n%1$s ← %2$s</string>
+    <string name="new_update_format" formatted="true">في أپدايت جديدة! \n%1$s ← %2$s</string>
     <string name="subs_download_languages">نزل الترجمات مع الڤيديو</string>
     <string name="search_provider_text_providers">عوزو المصادر لَ تنبّشو</string>
     <string name="go_back_img_des">رجاع</string>
@@ -96,8 +95,7 @@
     <string name="subs_text_color">لون الكتيبة</string>
     <string name="type_completed">مخلص</string>
     <string name="use_system_brightness_settings_des">عوز قوة ضوّ الشاشة تبع السيستام بدل من تغميئ الڤيديو</string>
-    <string name="restore_failed_format" formatted="true">فشل ترجيع النسخة الإحتياطية من ملف
-\n%s</string>
+    <string name="restore_failed_format" formatted="true">فشل ترجيع النسخة الإحتياطية من ملف \n%s</string>
     <string name="play_trailer_button">مشّي المقطع الدعائي</string>
     <string name="play_livestream_button">مشّي البث المباشر</string>
     <string name="no_episodes_found">م لقينا ولا حلقة</string>
@@ -166,8 +164,7 @@
     <string name="no_subtitles">طفي الترجمة</string>
     <string name="synopsis">القصة</string>
     <string name="used_storage">مستعمل</string>
-    <string name="resume_time_left" formatted="true">%dد
-\nباقي</string>
+    <string name="resume_time_left" formatted="true">%dد \nباقي</string>
     <string name="status_ongoing">عم ينعرض حاليًا</string>
     <string name="queued">بلايحة النَطر</string>
     <string name="status">حالة</string>
@@ -194,7 +191,7 @@
     <string name="render_error">في مشكلة بجهاز العرض (Renderer error)</string>
     <string name="show_title">العِنوان</string>
     <string name="jsdelivr_proxy">پروكسي \"گِت هَب\"</string>
-    <string name="limit_title_rez">جودة مشغل الڤيديو</string>
+    <string name="limit_title_rez">فرجي معلومات مشغل الڤيديو</string>
     <string name="show_sub">ملصق الترجمة</string>
     <string name="ova_singular">أوڤا</string>
     <string name="episode_action_download_mirror">نَزِل من مصادر وجودات مختلفة</string>
@@ -361,11 +358,7 @@
     <string name="home_next_random_img_des">العشوائي يللي بعده</string>
     <string name="subtitles_shadow">خيال</string>
     <string name="subscription_in_progress_notification">عم نجدِد المثلثلات يللي مشتركينلها</string>
-    <string name="duplicate_message_multiple" formatted="true">مبين إنو فيه عنصر متل هيدا موجود بال مكتبة عندكن:
-\n
-\n%s
-\n
-\nبدكن تزيدو هيدا العنصر بأيّ حال، أو تستبدلوه مع العنصر الموجود، أو تلغو الإجراء؟</string>
+    <string name="duplicate_message_multiple" formatted="true">مبين إنو فيه عنصر متل هيدا موجود بال مكتبة عندكن: \n \n%s \n \nبدكن تزيدو هيدا العنصر بأيّ حال، أو تستبدلوه مع العنصر الموجود، أو تلغو الإجراء؟</string>
     <string name="batch_download_finish_format" formatted="true">نزلت %1$d %2$s</string>
     <string name="error_invalid_id">معرف مش صالح</string>
     <string name="skip_type_format" formatted="true">أفّي %s</string>
@@ -373,9 +366,7 @@
     <string name="enter_pin_with_name" formatted="true">حطو الأرقام السرية لـ\"%s\"</string>
     <string name="apk_installer_legacy">الطريقة القديمة</string>
     <string name="subtitles_raised">معلى</string>
-    <string name="blank_repo_message">\"كلود ستريم\" م بتجي مع مصادر ڤيديوات. لازم تنزلو المصادر من ريپويات.
-\n
-\nفيه معلومات على الـ\"ديسكورد\" تبعنا، أو فيكن تنبشو ع معلومات على الإنترنت.</string>
+    <string name="blank_repo_message">\"كلود ستريم\" م بتجي مع مصادر ڤيديوات. لازم تنزلو المصادر من ريپويات. \n \nفيه معلومات على الـ\"ديسكورد\" تبعنا، أو فيكن تنبشو ع معلومات على الإنترنت.</string>
     <string name="add_sync">زبد تتبع</string>
     <string name="mobile_data">3G/4G…</string>
     <string name="player_loaded_subtitles" formatted="true">نفَتح %s</string>
@@ -388,8 +379,7 @@
     <string name="uppercase_all_subtitles">دايمًا كتوب ب أحرف كاپيتال، A بدل a</string>
     <string name="player_pref">مشغل الڤيديو المفضل</string>
     <string name="quality_4k">4K</string>
-    <string name="batch_download_start_format" formatted="true">بَلَش تنزيل %1$d %2$s
-\n…</string>
+    <string name="batch_download_start_format" formatted="true">بَلَش تنزيل %1$d %2$s \n…</string>
     <string name="extension_description">الوصف</string>
     <string name="view_public_repositories_button">شوف الريپويات تبع مجتمع \"كلاود ستريم\"</string>
     <string name="safe_mode_title">إنت هلّق بال وضع الآمن</string>
@@ -419,9 +409,7 @@
     <string name="skip_setup">أفّى الإعداد</string>
     <string name="authenticated_user" formatted="true">فتت ع أكونت \"%s\" تبعك</string>
     <string name="subtitles_outline">حدود خطية</string>
-    <string name="unable_to_inflate">في مشكلة بطعمير الـUI. هيدي مشكبة كبيرة. پليز بَلِغ عنّا
-\n(UI was unable to be created correctly)
-\n%s</string>
+    <string name="unable_to_inflate">في مشكلة بطعمير الـUI. هيدي مشكبة كبيرة. پليز بَلِغ عنّا \n(UI was unable to be created correctly) \n%s</string>
     <string name="edit">عَدِل</string>
     <string name="sort_updated_new">تجَدَد (من الجديد للقديم)</string>
     <string name="quality_tc">TC</string>
@@ -477,8 +465,7 @@
     <string name="quality_sd">SD</string>
     <string name="extensions">الإضافات</string>
     <string name="subtitles_remove_bloat">شيل الإعلانات من الترجمة</string>
-    <string name="empty_library_no_accounts_message">رفّكن فاضي ☹
-\nفوتو على أكونت فيها رفّ الڤيديوات يللي حضرينها أو زيدو ڤيديوات بال رفّ المحلي.</string>
+    <string name="empty_library_no_accounts_message">رفّكن فاضي ☹ \nفوتو على أكونت فيها رفّ الڤيديوات يللي حضرينها أو زيدو ڤيديوات بال رفّ المحلي.</string>
     <string name="repository_name_hint">اسم الريپو (مش ضروري)</string>
     <string name="qualities">الجودات</string>
     <string name="error_invalid_data">بيانات مش صالحة</string>
@@ -505,8 +492,7 @@
     <string name="sort_rating_asc">رايتينگ (من الواطي للعالي)</string>
     <string name="player_load_subtitles">فتاح من ملف</string>
     <string name="disable">طفي</string>
-    <string name="safe_mode_file">لقينا ملف الوضع الآمن!
-\nمش رح نعوز إضافيات وقت ما ينفَتَح الآپ حتّى ينشال الملف.</string>
+    <string name="safe_mode_file">لقينا ملف الوضع الآمن! \nمش رح نعوز إضافيات وقت ما ينفَتَح الآپ حتّى ينشال الملف.</string>
     <string name="subtitle_offset_extra_hint_none_format">مش مغير وقت الترجمة</string>
     <string name="error">مشكلة</string>
     <string name="home_source">مصدر</string>
@@ -531,7 +517,7 @@
     <string name="plugin">إضافات</string>
     <string name="plugin_load_fail" formatted="true">م قدرنا نفتح %s</string>
     <string name="extension_rating" formatted="true">رايتينگ: %s</string>
-    <string name="download_all_plugins_from_repo">تحزير: \"كلاود ستريم 3\" مش مسؤولة عن الإضافات المش رسمية، و م بتدعمن أبدًا!</string>
+    <string name="download_all_plugins_from_repo">تحزير: \"كلاود ستريم\" مش مسؤولة عن الإضافات المش رسمية، و م بتدعمن أبدًا!</string>
     <string name="extension_status">الحالة</string>
     <string name="delete_repository">محي الريپو</string>
     <string name="category_player">مشغل الڤيديو</string>
@@ -540,10 +526,7 @@
     <string name="already_voted">إنتو أصلًا مصوتين</string>
     <string name="quality_cam">كاميرا</string>
     <string name="no_plugins_found_error">م لقينا ولا إضافة بال ريپو</string>
-    <string name="duplicate_message_single" formatted="true">مبين إنو في عنصر متل هيدا موجود بالمكتبة عندكن:
-\n\"%s\"
-\n
-\nبدكن تزيدو هيدا العنصر بأيّ حال، أو تستبدلوّ مع العنصر الموجود، أو تلغو الإجراء؟</string>
+    <string name="duplicate_message_single" formatted="true">مبين إنو في عنصر متل هيدا موجود بالمكتبة عندكن: \n\"%s\" \n \nبدكن تزيدو هيدا العنصر بأيّ حال، أو تستبدلوّ مع العنصر الموجود، أو تلغو الإجراء؟</string>
     <string name="error_invalid_url">رايط مش صالح</string>
     <string name="subtitle_offset_hint">1000 مللي ثانية</string>
     <string name="extension_version">إصدار</string>
@@ -560,16 +543,10 @@
     <string name="subtitles_filter_lang">فَلتِر حسب اللغة المفضلة</string>
     <string name="confirm_exit_dialog">أكيد بدكون تطلعو؟</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="action_remove_from_watched">شيلو من لايحة المحتوى الحاضرينو</string>
     <string name="skip_type_credits">الإعتمادات</string>
-    <string name="quality_profile_help">فيكُن هون تغيرو طريقة ترتيب المصادر. المصدر يللي عنده أولوية أكتر بينحط أعلى بلايحت تنقايت المصدر. إنتو بتنقو الأولوية يإستعمال الأرقام. حطو الرقم الأعلى للمصادر والجودات يللي بتفضلوها.
-\n
-\nمتلًا:
-\nإزا المصدر \"أ\" بتفضلوه، بتعطوه كتير نقات (متلًا 8).
-\nإزا الجودة 480 ما بتحبوها، بتعطوها نقات قليلة (متلًا 1).
-\n
-\nعلامت المصدر وال جودة تبعه بينجمعو مع بعض (8 + 1 = 9). يللي علامته 10 أو أعلى، بينحط تلقائيًا، من دون ما ينعمل لود لكل المصادر!</string>
+    <string name="quality_profile_help">فيكُن هون تغيرو طريقة ترتيب المصادر. المصدر يللي عنده أولوية أكتر بينحط أعلى بلايحت تنقايت المصدر. إنتو بتنقو الأولوية يإستعمال الأرقام. حطو الرقم الأعلى للمصادر والجودات يللي بتفضلوها. \n \nمتلًا: \nإزا المصدر \"أ\" بتفضلوه، بتعطوه كتير نقات (متلًا 8). \nإزا الجودة 480 ما بتحبوها، بتعطوها نقات قليلة (متلًا 1). \n \nعلامت المصدر وال جودة تبعه بينجمعو مع بعض (8 + 1 = 9). يللي علامته 10 أو أعلى، بينحط تلقائيًا، من دون ما ينعمل لود لكل المصادر!</string>
     <string name="enter_current_pin">حطو الأرقام السرية الحالية</string>
     <string name="audio_tracks">صوت</string>
     <string name="rotate_video_desc">حط كبسة لبرم إتجاه الشاشة</string>
@@ -589,16 +566,14 @@
     <string name="password_pin_authentication_title">رمز/كلمة مرور للمصادقة</string>
     <string name="biometric_setting_summary">فتاح التطبيق باستعمال البصمة، آي دي الوج، پِن، النمط، أو الپاسورد.</string>
     <string name="biometric_prompt_description">بعد كذا محاولة فاشلة، هيدا الشباك رح يسكر. بكل بساطة، سكر الآپ ورجاع فتحه حتى تجرب بعد مرة.</string>
-    <string name="resume_remaining" formatted="true">%s
-\nباقي</string>
+    <string name="resume_remaining" formatted="true">%s \nباقي</string>
     <string name="biometric_unsupported">المصادقة البيومترية مش مدعومة ع هالجهاز</string>
     <string name="unfavorite">شيله من المفضل</string>
     <string name="repo_copy_label">اسم وعنوان الريپو</string>
     <string name="toast_copied">نتسخ!</string>
     <string name="clipboard_permission_error">فيه ارور بال وصول ل الكليپ-بورد. پليز جرب مرة أخرى.</string>
     <string name="clipboard_unknown_error">فيه ارور بال نسخ. پليز نسوخ الـLogcat 🐈 وبعته ل المسؤولين عن دعم الآپ.</string>
-    <string name="biometric_warning">هلّق نعمل نسخة احتياطية للداتا تبع \"كلود ستريم\". إذا مابق ينفتح ويمشي الآپ، فيك تعمل كلير للداتا تبعه وترَجع الداتا من النسخة الاحتياطية اللي هلّق عملنالك ياها.
-\nالاحتمال انو مابق ينفتح الآپ احتمالية زغيرة كتير، بس كل جهاز بيتصرف بشكل مختلف، ونحنا منعتذر إذا سببنا أي إزعاج.</string>
+    <string name="biometric_warning">هلّق نعمل نسخة احتياطية للداتا تبع \"كلود ستريم\". إذا مابق ينفتح ويمشي الآپ، فيك تعمل كلير للداتا تبعه وترَجع الداتا من النسخة الاحتياطية اللي هلّق عملنالك ياها. \nالاحتمال انو مابق ينفتح الآپ احتمالية زغيرة كتير، بس كل جهاز بيتصرف بشكل مختلف، ونحنا منعتذر إذا سببنا أي إزعاج.</string>
     <string name="ok">أوكي</string>
     <string name="battery_dialog_title">وقف اپتميزايشن بطارية جهازك</string>
     <string name="app_unrestricted_toast">بطارية الآپ اصلًا محطوطة ع «غير مقيد» \"Unrestricted\"</string>
@@ -634,21 +609,13 @@
     <string name="downloads_delete_select">نقي الإشيا اللي بدك تمحيها</string>
     <string name="offline_file">موجود لينحضر بلا إنترنت</string>
     <string name="delete_files">محي الفايلات</string>
-    <string name="delete_message_multiple" formatted="true">متأكد إنو بدك تمحي هيدي الإشيا ل الأبد؟
-\n
-\n%s</string>
-    <string name="delete_message_series_section" formatted="true">رح كمان تمحي ل الأبد كل الحلقات اللي ب هيدا المسلسل؟
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">متأكد إنو بدك تمحي هيدي الإشيا ل الأبد؟ \n \n%s</string>
+    <string name="delete_message_series_section" formatted="true">رح كمان تمحي ل الأبد كل الحلقات اللي ب هيدا المسلسل؟ \n \n%s</string>
     <string name="select_all">نقي كل شي</string>
     <string name="deselect_all">شيل التنقاية</string>
     <string name="delete_format" formatted="true">محي (%1$d | %2$s)</string>
-    <string name="delete_message_series_episodes" formatted="true">متأكد إنو بدك تمحي هيدي الحلقات من %1$s؟
-\n
-\n%2$s</string>
-    <string name="delete_message_series_only" formatted="true">متأكد إنو بدك تمحي كل الحلقات اللي بهيدا المسلسل؟
-\n
-\n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">متأكد إنو بدك تمحي هيدي الحلقات من %1$s؟ \n \n%2$s</string>
+    <string name="delete_message_series_only" formatted="true">متأكد إنو بدك تمحي كل الحلقات اللي بهيدا المسلسل؟ \n \n%s</string>
     <string name="preview_seekbar">صورة زغيرة مع التقريب وال تبعيد</string>
     <string name="preview_seekbar_desc">بت حط صورة زغير من الڤيديو إنت و عم بت قرب أو ترجع بال ڤيديو</string>
     <string name="no_subtitles_loaded">بعد مش معمول لود لولا ترجمة</string>
@@ -739,4 +706,33 @@
     <string name="top_left">فوق، عال شمال</string>
     <string name="top_center">فوق، بال نُص</string>
     <string name="top_right">فوق، عال يمين</string>
+    <string name="download_queue">ليستة التنزيلات</string>
+    <string name="queue_empty_message">مافي شي عم يتنزّل هلّق.</string>
+    <string name="extra_brightness_settings">قوة ضو إضافية</string>
+    <string name="extra_brightness_settings_des">بت حط فلتر للبرايتنس لمّا تعلي قوة الضو ل أكتر من 100%</string>
+    <string name="extra_brightness_key">extra_brightness_enabled</string>
+    <string name="search_suggestions">اقتراحات التنبيش</string>
+    <string name="search_suggestions_des">بت فرجي اقتراحات إنتا و عم بت نَبّش</string>
+    <string name="clear_suggestions">مساح الاقتراحات</string>
+    <string name="show_player_metadata_overlay">فرجي ميتا-ديتا فوق الڤيديو</string>
+    <string name="show_cast_in_details">فرجي ليستة الممثلين</string>
+    <string name="video_singular">ڤيديو</string>
+    <string name="video_info">معلومات الڤيديو</string>
+    <string name="source_priority">أولوية المصدر</string>
+    <string name="source_priority_help">حدد ترتيب المصادر بال مشغل</string>
+    <string name="source_name">اسم المصدر</string>
+    <string name="download_all">نزلن كلن</string>
+    <string name="cancel_all">لغين كلن</string>
+    <string name="download_episode_range">بدك تنزل الحلقة %s؟</string>
+    <string name="cancel_queue_message">بدك تلغي كل شي عم يتنَزَّل؟</string>
+    <plurals name="downloads_active">
+        <item quantity="one">م شي عم يتنزل</item>
+        <item quantity="other">شي واحد عم يتنزل</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">مافي شي بعد بده يبلش يتنزل</item>
+        <item quantity="other">فيه شي واحد بعد بده يبلش يتنزل</item>
+    </plurals>
+    <string name="player_is_live">لايڤ</string>
+    <string name="skip_type_preview">پريڤيو</string>
 </resources>
diff --git a/app/src/main/res/values-b+ar/strings.xml b/app/src/main/res/values-b+ar/strings.xml
index f7186c0ef..57b2bb628 100644
--- a/app/src/main/res/values-b+ar/strings.xml
+++ b/app/src/main/res/values-b+ar/strings.xml
@@ -12,8 +12,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">سرعة (%.2fx)</string>
     <string name="rated_format" formatted="true">تقييم: %.1f</string>
-    <string name="new_update_format" formatted="true">يوجد تحديث جديد!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">يوجد تحديث جديد! \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d دقيقة</string>
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">تشغيل بواسطة CloudStream</string>
@@ -176,10 +175,8 @@
     <string name="resume">إستئناف</string>
     <string name="go_back_30">-٣٠</string>
     <string name="go_forward_30">+٣٠</string>
-    <string name="delete_message">سوف يتم الحذف نهائيا %s
-\nهل أنت متأكد?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nمتبقية</string>
+    <string name="delete_message">سوف يتم الحذف نهائيا %s \nهل أنت متأكد?</string>
+    <string name="resume_time_left" formatted="true">%dm \nمتبقية</string>
     <string name="status_ongoing">جاري التنفيذ</string>
     <string name="status_completed">اكتمل</string>
     <string name="status">الحالة</string>
@@ -401,9 +398,7 @@
     <string name="plugins_downloaded" formatted="true">تم تحميل: %d</string>
     <string name="plugins_disabled" formatted="true">مُعطل %d</string>
     <string name="plugins_not_downloaded" formatted="true">غير مُحمل: %d</string>
-    <string name="blank_repo_message">لا يحتوي CloudStream على مواقع مثبتة افتراضيًا. تحتاج إلى تثبيت المواقع من المستودعات.
-\n
-\nانضم إلى ديسكورد أو ابحث عبر الإنترنت.</string>
+    <string name="blank_repo_message">لا يحتوي CloudStream على مواقع مثبتة افتراضيًا. تحتاج إلى تثبيت المواقع من المستودعات. \n \nانضم إلى ديسكورد أو ابحث عبر الإنترنت.</string>
     <string name="view_public_repositories_button">عرض مستودعات المجتمع</string>
     <string name="view_public_repositories_button_short">قائمة عامة</string>
     <string name="uppercase_all_subtitles">جميع الترجمات حروف كبيرة</string>
@@ -493,15 +488,13 @@
     <string name="sort_rating_desc">التقييم (من الأعلى إلى الأدنى)</string>
     <string name="sort_rating_asc">التقييم (من الأدنى إلى الأعلى)</string>
     <string name="sort_alphabetical_z">الترتيب الأبجدي (من ي إلى أ)</string>
-    <string name="empty_library_no_accounts_message">مكتبتك فارغة :(
-\nقم بتسجيل الدخول على حساب مكتبة أو أضف عروضا إلى مكتبتك المحلية.</string>
+    <string name="empty_library_no_accounts_message">مكتبتك فارغة :( \nقم بتسجيل الدخول على حساب مكتبة أو أضف عروضا إلى مكتبتك المحلية.</string>
     <string name="sort_updated_old">محدث (من القديم إلى الجديد)</string>
     <string name="sort_by">فرز حسب</string>
     <string name="sort">افرز</string>
     <string name="open_with">فتح بواسطة</string>
     <string name="library">المكتبة</string>
-    <string name="safe_mode_file">تم العثور على ملف الوضع الآمن!
-\nلا يتم تحميل أي ملحقات عند بدء التشغيل حتى تتم إزالة الملف.</string>
+    <string name="safe_mode_file">تم العثور على ملف الوضع الآمن! \nلا يتم تحميل أي ملحقات عند بدء التشغيل حتى تتم إزالة الملف.</string>
     <string name="android_tv_interface_off_seek_settings_summary">مدة التقديم عنما يكون المشغل مخفيا</string>
     <string name="android_tv_interface_off_seek_settings">مدة التقديم - المشغل مخفي</string>
     <string name="pref_category_android_tv">تلفزيون أندرويد</string>
@@ -533,13 +526,7 @@
     <string name="edit">تعديل</string>
     <string name="profiles">الملفات التعريفية</string>
     <string name="help">مساعدة</string>
-    <string name="quality_profile_help">‎‎هنا يمكنك تغيير طريقة ترتيب المصادر. إذا كان للفيديو أولوية أعلى ، فسيظهر في الأعلى في اختيار المصدر. يمثل مجموع أولوية المصدر وأولوية الجودة أولوية الفيديو.
-\n
-\nالمصدر أ: 3
-\nالجودة ب: 7
-\nسيكون لها أولوية فيديو مجمعة تبلغ 10.
-\n
-\nملاحظة: إذا كان المجموع 10 أو أكثر ، فسيتخطى المشغل التحميل تلقائيًا عند تحميل هذا الرابط!</string>
+    <string name="quality_profile_help">‎‎هنا يمكنك تغيير طريقة ترتيب المصادر. إذا كان للفيديو أولوية أعلى ، فسيظهر في الأعلى في اختيار المصدر. يمثل مجموع أولوية المصدر وأولوية الجودة أولوية الفيديو. \n \nالمصدر أ: 3 \nالجودة ب: 7 \nسيكون لها أولوية فيديو مجمعة تبلغ 10. \n \nملاحظة: إذا كان المجموع 10 أو أكثر ، فسيتخطى المشغل التحميل تلقائيًا عند تحميل هذا الرابط!</string>
     <string name="qualities">النوعيات</string>
     <string name="profile_background_des">خلفية الملف الشخصي</string>
     <string name="unable_to_inflate">تعذر إنشاء واجهة المستخدم بشكل صحيح ، وهذا خطأ كبير ويجب الإبلاغ عنه على الفور %s</string>
@@ -552,11 +539,7 @@
     <string name="favorite_removed">تمت إزالة %s من المفضلة</string>
     <string name="favorites_list_name">المفضلة</string>
     <string name="favorite_added">تمت إضافة %s إلى المفضلة</string>
-    <string name="duplicate_message_multiple" formatted="true">احتمال وجود تكرارات في مكتبتك.
-\n
-\n%s
-\n
-\nهل تريد الاضافة على اي حال مستبدلاً النسخة الموجودة بالفعل, أم تفضل إلغاء العملية؟</string>
+    <string name="duplicate_message_multiple" formatted="true">احتمال وجود تكرارات في مكتبتك. \n \n%s \n \nهل تريد الاضافة على اي حال مستبدلاً النسخة الموجودة بالفعل, أم تفضل إلغاء العملية؟</string>
     <string name="duplicate_title">احتمال أن يكون موجود بالفعل</string>
     <string name="lock_profile">قفل الحساب</string>
     <string name="action_add_to_favorites">اضافة الى المفضلة</string>
@@ -569,9 +552,7 @@
     <string name="action_subscribe">إشترك</string>
     <string name="action_remove_from_favorites">إزالة من المفضلة</string>
     <string name="select_an_account">اختار حساب</string>
-    <string name="duplicate_message_single">يبدو أن هناك عنصرًا مكررًا موجود بالفعل في مكتبتك: \'%s\'.
-\n
-\nهل ترغب في إضافة هذا العنصر على أية حال، أو استبدال العنصر الموجود، أو إلغاء الإجراء؟</string>
+    <string name="duplicate_message_single">يبدو أن هناك عنصرًا مكررًا موجود بالفعل في مكتبتك: \'%s\'. \n \nهل ترغب في إضافة هذا العنصر على أية حال، أو استبدال العنصر الموجود، أو إلغاء الإجراء؟</string>
     <string name="enter_pin">ادخال ال PIN</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">أدخل ال PIN الحالي</string>
@@ -599,8 +580,7 @@
     <string name="password_pin_authentication_title">مصادقة كلمة المرور/رقم التعريف الشخصي</string>
     <string name="biometric_prompt_description">بعد عدة محاولات فاشلة، سيتم إغلاق المطالبة. ما عليك سوى إعادة تشغيل التطبيق للمحاولة مرة أخرى.</string>
     <string name="biometric_warning">لقد تم الآن نسخ بيانات CloudStream احتياطيًا. على الرغم من أن احتمال حدوث ذلك منخفض جدًا، إلا أن جميع الأجهزة يمكن أن تتصرف بشكل مختلف. في الحالات النادرة، التي يتم فيها منعك من الوصول إلى التطبيق، قم بمسح بيانات التطبيق بالكامل واستعادتها من نسخة احتياطية. نحن نأسف جدًا لأي إزعاج ناتج عن هذا.</string>
-    <string name="resume_remaining" formatted="true">%s
-\nمتبقي</string>
+    <string name="resume_remaining" formatted="true">%s \nمتبقي</string>
     <string name="favorite">المفضلة</string>
     <string name="unfavorite">إزالة من المفضلة</string>
     <string name="repo_copy_label">اسم و عنوان المخزن</string>
@@ -642,21 +622,13 @@
     <string name="downloads_delete_select">الرجاء تحديد العناصر للحذف</string>
     <string name="select_all">تحديد الكل</string>
     <string name="delete_files">حذف الملفات</string>
-    <string name="delete_message_series_episodes" formatted="true">هل أنت متأكد أنك تريد حذف الحلقات التالية نهائيًا في %1$s ؟
-\n
-\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">ستقوم أيضًا بحذف جميع الحلقات في السلسلة التالية نهائيًا:
-\n
-\n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">هل أنت متأكد أنك تريد حذف الحلقات التالية نهائيًا في %1$s ؟ \n \n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">ستقوم أيضًا بحذف جميع الحلقات في السلسلة التالية نهائيًا: \n \n%s</string>
     <string name="delete_format" formatted="true">حذف (%1$d | %2$s)</string>
     <string name="offline_file">متاح للمشاهدة في وضع عدم الاتصال</string>
     <string name="deselect_all">إلغاء تحديد الكل</string>
-    <string name="delete_message_multiple" formatted="true">هل أنت متأكد أنك تريد حذف العناصر التالية نهائيًا ؟
-\n
-\n%s</string>
-    <string name="delete_message_series_only" formatted="true">هل أنت متأكد أنك تريد حذف جميع الحلقات في السلسلة التالية نهائيًا ؟
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">هل أنت متأكد أنك تريد حذف العناصر التالية نهائيًا ؟ \n \n%s</string>
+    <string name="delete_message_series_only" formatted="true">هل أنت متأكد أنك تريد حذف جميع الحلقات في السلسلة التالية نهائيًا ؟ \n \n%s</string>
     <string name="preview_seekbar">معاينة شريط البحث</string>
     <string name="preview_seekbar_desc">تمكين معاينة الصورة المصغرة على شريط البحث</string>
     <string name="no_subtitles_loaded">لم يتم تحميل أي ترجمات بعد</string>
@@ -749,7 +721,7 @@
     <string name="search_suggestions">اقتراحات البحث</string>
     <string name="search_suggestions_des">عرض اقتراحات البحث أثناء الكتابة</string>
     <string name="clear_suggestions">مسح الاقتراحات</string>
-    <string name="show_cast_in_details">عرض لوحة البث</string>
+    <string name="show_cast_in_details">عرض لوحة فريق التمثيل</string>
     <string name="install_prerelease">تثبيت الإصدار التجريبي</string>
     <string name="prerelease_already_installed">تم تثبيت الإصدار التجريبي بالفعل.</string>
     <string name="prerelease_install_failed">فشل تثبيت الإصدار التجريبي.</string>
diff --git a/app/src/main/res/values-b+ars/strings.xml b/app/src/main/res/values-b+ars/strings.xml
index 3104e6a9a..cd3830a01 100644
--- a/app/src/main/res/values-b+ars/strings.xml
+++ b/app/src/main/res/values-b+ars/strings.xml
@@ -35,8 +35,7 @@
     <string name="download_paused">توقف التنزيل</string>
     <string name="type_plan_to_watch">خطط للمشاهدة</string>
     <string name="type_re_watching">إعادة المشاهدة</string>
-    <string name="new_update_format" formatted="true">!تم العثور على تحديث جديد
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">!تم العثور على تحديث جديد \n%1$s -&gt; %2$s</string>
     <string name="rated_format" formatted="true">%.1f:قدر</string>
     <string name="duration_format" formatted="true">%dاقل</string>
     <string name="app_name">كلاودستريم</string>
@@ -157,23 +156,15 @@
     <string name="sort_updated_new">تم التحديث (من الجديد إلى القديم)</string>
     <string name="sort_updated_old">تم التحديث (القديم إلى الجديد)</string>
     <string name="sort_alphabetical_a">أبجديًا (من الألف إلى الياء)</string>
-    <string name="empty_library_no_accounts_message">مكتبتك فارغة :(
-\nقم بتسجيل الدخول إلى حساب المكتبة أو قم بإضافة العروض إلى مكتبتك المحلية.</string>
-    <string name="safe_mode_file">!تم العثور على ملف الوضع الآمن
-\n.عدم تحميل أي ملحقات عند بدء التشغيل حتى تتم إزالة الملف</string>
+    <string name="empty_library_no_accounts_message">مكتبتك فارغة :( \nقم بتسجيل الدخول إلى حساب المكتبة أو قم بإضافة العروض إلى مكتبتك المحلية.</string>
+    <string name="safe_mode_file">!تم العثور على ملف الوضع الآمن \n.عدم تحميل أي ملحقات عند بدء التشغيل حتى تتم إزالة الملف</string>
     <string name="revert">ارجع</string>
     <string name="subscription_in_progress_notification">تحديث العروض المشتركة</string>
     <string name="set_default">الوضع العادي</string>
     <string name="edit">حرر</string>
     <string name="profiles">ملفات تعريفية</string>
     <string name="help">مساعدة</string>
-    <string name="quality_profile_help">.هنا يمكنك تغيير كيفية ترتيب المصادر. إذا كان للفيديو أولوية أعلى، فسيظهر في مكان أعلى في تحديد المصدر. مجموع أولوية المصدر وأولوية الجودة هو أولوية الفيديو
-\n
-\nالمصدر أ: 3
-\nالجودة ب: 7
-\nستكون أولوية الفيديو المدمجة .10
-\n
-\n!ملاحظة: إذا كان المجموع 10 أو أكثر، فسيقوم اللاعب تلقائيًا بتخطي التحميل عند تحميل هذا الرابط</string>
+    <string name="quality_profile_help">.هنا يمكنك تغيير كيفية ترتيب المصادر. إذا كان للفيديو أولوية أعلى، فسيظهر في مكان أعلى في تحديد المصدر. مجموع أولوية المصدر وأولوية الجودة هو أولوية الفيديو \n \nالمصدر أ: 3 \nالجودة ب: 7 \nستكون أولوية الفيديو المدمجة .10 \n \n!ملاحظة: إذا كان المجموع 10 أو أكثر، فسيقوم اللاعب تلقائيًا بتخطي التحميل عند تحميل هذا الرابط</string>
     <string name="already_voted">لقد صوت بالفعل</string>
     <string name="sort_alphabetical_z">أبجديًا (ياء إلى ألف)</string>
     <string name="sort_by">ترتيب حسب</string>
@@ -227,8 +218,7 @@
     <string name="sort_apply">قدم</string>
     <string name="torrent_plot">وصف</string>
     <string name="picture_in_picture_des">يستمر التشغيل في مشغل مصغر فوق التطبيقات الأخرى</string>
-    <string name="delete_message" formatted="true">نهائيا %sسيؤدي هذا الى حذف
-\nهل أنت متأكد؟</string>
+    <string name="delete_message" formatted="true">نهائيا %sسيؤدي هذا الى حذف \nهل أنت متأكد؟</string>
     <string name="subs_font">الخط</string>
     <string name="subs_font_size">حجم الخط</string>
     <string name="action_remove_watching">زيل</string>
@@ -255,8 +245,7 @@
     <string name="show_log_cat">🐈عرض لوجكات</string>
     <string name="test_log">سجل</string>
     <string name="picture_in_picture">صور في صور</string>
-    <string name="resume_time_left" formatted="true">%d
-\nباقي</string>
+    <string name="resume_time_left" formatted="true">%d \nباقي</string>
     <string name="video_source">مصدر</string>
     <string name="android_tv_interface_off_seek_settings">اللاعب مخفي - ابحث عن المبلغ</string>
     <string name="backup_frequency">تكرار النسخ الاحتياطي</string>
diff --git a/app/src/main/res/values-b+as/strings.xml b/app/src/main/res/values-b+as/strings.xml
index 16be7e313..60a9ffabd 100644
--- a/app/src/main/res/values-b+as/strings.xml
+++ b/app/src/main/res/values-b+as/strings.xml
@@ -175,7 +175,7 @@
     <string name="vpn_torrent">এই প্ৰদানকাৰী এটা ট\'ৰেণ্ট, VPNৰ পৰামৰ্শ দিয়া হৈছে</string>
     <string name="subs_import_text" formatted="true">%s ত ফণ্টসমূহ ৰাখি সন্নিবিষ্ট কৰক</string>
     <string name="action_open_watching">অধিক তথ্য</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="provider_info_meta">সাইটে মেটাডাটা প্ৰদান কৰা নাই, যদি সাইটত নাথাকে তেন্তে ভিডিঅ\' মুকলি নহ\'ব পাৰে।</string>
     <string name="normal_no_plot">কোনো কাহিনী পোৱা নগ\'ল</string>
     <string name="torrent_no_plot">কোনো বিৱৰণ পোৱা নগ\'ল</string>
@@ -252,12 +252,9 @@
     <string name="resume">পুনৰ আৰম্ভ কৰক</string>
     <string name="go_back_30">-৩০</string>
     <string name="go_forward_30">+৩০</string>
-    <string name="delete_message" formatted="true">এইটো স্থায়ীভাৱে %s ডিলিট কৰিব।
-\nআপুনি নিশ্চিত নেকি?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nবাকী</string>
-    <string name="resume_remaining" formatted="true">%s
-\nবাকী</string>
+    <string name="delete_message" formatted="true">এইটো স্থায়ীভাৱে %s ডিলিট কৰিব। \nআপুনি নিশ্চিত নেকি?</string>
+    <string name="resume_time_left" formatted="true">%dm \nবাকী</string>
+    <string name="resume_remaining" formatted="true">%s \nবাকী</string>
     <string name="status_ongoing">চলমান</string>
     <string name="status_completed">সম্পূৰ্ণ</string>
     <string name="status">স্থিতি</string>
@@ -456,9 +453,7 @@
     <string name="plugins_updated" formatted="true">%d প্লাগইন আপডেট কৰা হ\'ল</string>
     <string name="plugins_disabled" formatted="true">নিষ্ক্ৰিয় কৰা: %d</string>
     <string name="plugins_not_downloaded" formatted="true">ডাউনলোড কৰা নহয়: %d</string>
-    <string name="blank_repo_message">CloudStreamত কোনো চাইট ডিফল্টভাৱে ইনষ্টল হোৱা নাই। আপুনিয়ে ৰিপ\'জিট\'ৰিবোৰৰ পৰা চাইটসমূহ ইনষ্টল কৰিব লাগিব।
-\n
-\nআমাৰ Discordত যোগদান কৰক বা অনলাইন বিচাৰক।</string>
+    <string name="blank_repo_message">CloudStreamত কোনো চাইট ডিফল্টভাৱে ইনষ্টল হোৱা নাই। আপুনিয়ে ৰিপ\'জিট\'ৰিবোৰৰ পৰা চাইটসমূহ ইনষ্টল কৰিব লাগিব। \n \nআমাৰ Discordত যোগদান কৰক বা অনলাইন বিচাৰক।</string>
     <string name="view_public_repositories_button">সম্প্ৰদায়ৰ ৰিপ\'জিট\'ৰিসমূহ চাওক</string>
     <string name="uppercase_all_subtitles">সকলো চাবটাইটল মুকলি আখৰত</string>
     <string name="download_all_plugins_from_repo">সতর্কতা: CloudStream 3 কোৱা নাই যে তৃতীয় পক্ষৰ বৃদ্ধিসমূহ ব্যৱহাৰ কৰিবলৈ আপুনি সম্পূৰ্ণ দায়িত্ব ল\'ব আৰু কোনো সহায় নাপাব!</string>
@@ -523,11 +518,9 @@
     <string name="sort_alphabetical_a">বৰ্ণানুক্ৰমিক (A ৰ পৰা Z)</string>
     <string name="select_library">পুথিভঁৰালী বাছক</string>
     <string name="open_with">ইয়াৰ সহায়ত খুলক</string>
-    <string name="empty_library_no_accounts_message">আপোনাৰ পুথিভঁৰালী খালি আছে :(
-\nএখন পুথিভঁৰালী একাউণ্টত লগ ইন কৰক বা স্থানীয় পুথিভঁৰালীত শ্ব\'সমূহ যোগ কৰক।</string>
+    <string name="empty_library_no_accounts_message">আপোনাৰ পুথিভঁৰালী খালি আছে :( \nএখন পুথিভঁৰালী একাউণ্টত লগ ইন কৰক বা স্থানীয় পুথিভঁৰালীত শ্ব\'সমূহ যোগ কৰক।</string>
     <string name="empty_library_logged_in_message">এই তালিকা খালি। অন্য এটি তালিকালৈ সলনি কৰি চাওক।</string>
-    <string name="safe_mode_file">নিরাপদ ম\'ড ফাইল পোৱা গৈছে!
-\nফাইল আঁতৰোৱা নোহোৱালৈকে কোনো এক্সটেনশ্যন আৰম্ভ নকৰা হৈছে।</string>
+    <string name="safe_mode_file">নিরাপদ ম\'ড ফাইল পোৱা গৈছে! \nফাইল আঁতৰোৱা নোহোৱালৈকে কোনো এক্সটেনশ্যন আৰম্ভ নকৰা হৈছে।</string>
     <string name="revert">ঘূৰাই দিয়া</string>
     <string name="subscription_in_progress_notification">সদস্যতা গ্ৰহণ কৰা শ্ব\'সমূহ আপডেট কৰিছে</string>
     <string name="subscription_new">%s-ত সদস্যতা গ্ৰহণ কৰা হৈছে</string>
@@ -539,13 +532,7 @@
     <string name="edit">সম্পাদনা কৰক</string>
     <string name="profiles">প্ৰ\'ফাইলসমূহ</string>
     <string name="help">সহায়</string>
-    <string name="quality_profile_help">ইয়াত আপুনি উৎসসমূহ কেনেকৈ ক্ৰম অনুযায়ী চিহ্নিত কৰিব সেই বিষয়ে সলনি কৰিব পাৰে। যদি এখন ভিডিঅ\'ৰ উচ্চ অগ্ৰাধিকাৰ থাকে তেন্তে সেইটো উৎস নিৰ্বাচনৰ সময়ত ওপৰত দেখা যাব। উৎস অগ্ৰাধিকাৰ আৰু গুণ অগ্ৰাধিকাৰৰ মুঠ যোগফল হৈছে ভিডিঅ\'ৰ অগ্ৰাধিকাৰ।
-\n
-\nউৎস A: 3
-\nগুণ B: 7
-\nসৰহযোগে ভিডিঅ\'ৰ অগ্ৰাধিকাৰ হ\'ব 10।
-\n
-\nদ্ৰষ্টব্য: যদি যোগফল 10 বা তাৰ ওপৰত থাকে তেন্তে প্লেয়াৰটো নিজেই লিংক ল\'ড কৰাৰ সময়ত ল\'ডিং এড়াই যাব!</string>
+    <string name="quality_profile_help">ইয়াত আপুনি উৎসসমূহ কেনেকৈ ক্ৰম অনুযায়ী চিহ্নিত কৰিব সেই বিষয়ে সলনি কৰিব পাৰে। যদি এখন ভিডিঅ\'ৰ উচ্চ অগ্ৰাধিকাৰ থাকে তেন্তে সেইটো উৎস নিৰ্বাচনৰ সময়ত ওপৰত দেখা যাব। উৎস অগ্ৰাধিকাৰ আৰু গুণ অগ্ৰাধিকাৰৰ মুঠ যোগফল হৈছে ভিডিঅ\'ৰ অগ্ৰাধিকাৰ। \n \nউৎস A: 3 \nগুণ B: 7 \nসৰহযোগে ভিডিঅ\'ৰ অগ্ৰাধিকাৰ হ\'ব 10। \n \nদ্ৰষ্টব্য: যদি যোগফল 10 বা তাৰ ওপৰত থাকে তেন্তে প্লেয়াৰটো নিজেই লিংক ল\'ড কৰাৰ সময়ত ল\'ডিং এড়াই যাব!</string>
     <string name="profile_background_des">প্ৰ\'ফাইলৰ পটভূমি</string>
     <string name="unable_to_inflate">UI সঠিকভাৱে সৃষ্টি কৰিব পৰা নগ\'ল, ই এটা গুৰুত্বপূৰ্ণ সমস্যা আৰু তাক অবিলম্বে জনোৱা উচিত %s</string>
     <string name="already_voted">আপুনি ইতিমধ্যে ভোট দিছে</string>
@@ -556,14 +543,8 @@
     <string name="action_remove_from_favorites">প্ৰিয় তালিকাৰ পৰা আঁতৰ কৰক</string>
     <string name="duplicate_title">সম্ভাৱ্য নকল বস্ত্ত পোৱা গৈছে</string>
     <string name="duplicate_replace_all">সকলো প্ৰতিস্থাপন কৰক</string>
-    <string name="duplicate_message_single" formatted="true">আপোনাৰ পুথিভঁৰালীতে সম্ভাৱ্য নকল বস্তু পোৱা গৈছে: \'%s.\'
-\n
-\nআপুনি এই বস্তু যিকোনো হ\'লে যোগ কৰিব বিচাৰেনে, বিদ্যমান বস্তু প্ৰতিস্থাপন কৰিব, বা কাৰ্য বাতিল কৰিব বিচাৰেনে?</string>
-    <string name="duplicate_message_multiple" formatted="true">আপোনাৰ পুথিভঁৰালীতে সম্ভাৱ্য নকল বস্তুসমূহ পোৱা গৈছে:
-\n
-\n%s
-\n
-\nআপুনি এই বস্তু যিকোনো হ\'লে যোগ কৰিব বিচাৰেনে, বিদ্যমানবোৰ প্ৰতিস্থাপন কৰিব, বা কাৰ্য বাতিল কৰিব বিচাৰেনে?</string>
+    <string name="duplicate_message_single" formatted="true">আপোনাৰ পুথিভঁৰালীতে সম্ভাৱ্য নকল বস্তু পোৱা গৈছে: \'%s.\' \n \nআপুনি এই বস্তু যিকোনো হ\'লে যোগ কৰিব বিচাৰেনে, বিদ্যমান বস্তু প্ৰতিস্থাপন কৰিব, বা কাৰ্য বাতিল কৰিব বিচাৰেনে?</string>
+    <string name="duplicate_message_multiple" formatted="true">আপোনাৰ পুথিভঁৰালীতে সম্ভাৱ্য নকল বস্তুসমূহ পোৱা গৈছে: \n \n%s \n \nআপুনি এই বস্তু যিকোনো হ\'লে যোগ কৰিব বিচাৰেনে, বিদ্যমানবোৰ প্ৰতিস্থাপন কৰিব, বা কাৰ্য বাতিল কৰিব বিচাৰেনে?</string>
     <string name="enter_pin_with_name" formatted="true">%s ৰ বাবে পিন সন্নিবিষ্ট কৰক</string>
     <string name="enter_current_pin">বৰ্তমান পিন সন্নিবিষ্ট কৰক</string>
     <string name="lock_profile">প্ৰফাইল লক কৰক</string>
@@ -588,8 +569,7 @@
     <string name="download">ডাউনলোড</string>
     <string name="updates_settings_des">এপ্‌ আৰম্ভণিৰ পিছত নতুন আপডেটৰ সন্ধান কৰক।</string>
     <string name="anim">একেই ডেভেলপাৰৰ দ্বাৰা এনিম এপ্‌</string>
-    <string name="new_update_format" formatted="true">নতুন আপডেট পোৱা গ’ল!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">নতুন আপডেট পোৱা গ’ল! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">ফিলাৰ</string>
     <string name="play_with_app_name">CloudStreamৰে প্লে কৰক</string>
     <string name="title_search">সন্ধান</string>
@@ -609,18 +589,10 @@
     <string name="sort_apply">প্ৰয়োগ কৰক</string>
     <string name="delete_files">ফাইলসমূহ ডিলিট কৰক</string>
     <string name="delete_format" formatted="true">ডিলিট (%1$d | %2$s)</string>
-    <string name="delete_message_multiple" formatted="true">আপুনি স্থায়ীভাৱে তলত দিয়া আইটেমসমূহ ডিলিট কৰিবলৈ নিশ্চিত নেকি?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">%1$s ত তলত দিয়া এপিচ’ডসমূহ স্থায়ীভাৱে ডিলিট কৰিব নেকি?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">আপুনি দিয়া ছিৰিজৰ সকলো এপিচ’ড স্থায়ীভাৱে ডিলিট কৰিব:
-\n
-\n%s</string>
-    <string name="delete_message_series_only" formatted="true">আপুনি দিয়া ছিৰিজৰ সকলো এপিচ’ড স্থায়ীভাৱে ডিলিট কৰিবলৈ নিশ্চিত নেকি?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">আপুনি স্থায়ীভাৱে তলত দিয়া আইটেমসমূহ ডিলিট কৰিবলৈ নিশ্চিত নেকি? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">%1$s ত তলত দিয়া এপিচ’ডসমূহ স্থায়ীভাৱে ডিলিট কৰিব নেকি? \n \n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">আপুনি দিয়া ছিৰিজৰ সকলো এপিচ’ড স্থায়ীভাৱে ডিলিট কৰিব: \n \n%s</string>
+    <string name="delete_message_series_only" formatted="true">আপুনি দিয়া ছিৰিজৰ সকলো এপিচ’ড স্থায়ীভাৱে ডিলিট কৰিবলৈ নিশ্চিত নেকি? \n \n%s</string>
     <string name="sort_release_date_old">মুক্তিৰ তাৰিখ (পুৰণাৰ পৰা নতুন)</string>
     <string name="test_warning">সতৰ্কবাৰ্তা</string>
     <string name="auth_locally">স্থানীয়ভাৱে প্ৰমাণীকৰণ কৰক</string>
diff --git a/app/src/main/res/values-b+bg/strings.xml b/app/src/main/res/values-b+bg/strings.xml
index e59f19462..4852270c6 100644
--- a/app/src/main/res/values-b+bg/strings.xml
+++ b/app/src/main/res/values-b+bg/strings.xml
@@ -16,8 +16,7 @@
     <string name="preview_background_img_des">Визуализация на фона</string>
     <string formatted="true" name="player_speed_text_format">Скорост (%.2fx)</string>
     <string formatted="true" name="rated_format">Оценка: %.1f</string>
-    <string formatted="true" name="new_update_format">Намерена е нова актуализация!
-\n%1$s -&gt; %2$s</string>
+    <string formatted="true" name="new_update_format">Намерена е нова актуализация! \n%1$s -&gt; %2$s</string>
     <string formatted="true" name="filler">Шаблон</string>
     <string formatted="true" name="duration_format">%d мин</string>
     <string name="app_name">CloudStream</string>
@@ -102,7 +101,7 @@
     <string name="continue_watching">Продължете да гледате</string>
     <string name="action_remove_watching">Премахване</string>
     <string name="action_open_watching">Повече информация</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Може да е необходим VPN, за да работи правилно този доставчик</string>
     <string name="vpn_torrent">Този доставчик е торент, препоръчва се VPN</string>
     <string name="provider_info_meta">Метаданните не се предоставят от сайта, зареждането на видео ще бъде неуспешно, ако не съществува на сайта.</string>
@@ -183,10 +182,8 @@
     <string name="resume">Продължи</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">30</string>
-    <string formatted="true" name="delete_message">Това ще изтрие за постоянно %s
-\nСигурни ли сте?</string>
-    <string formatted="true" name="resume_time_left">%dm
-\nостава</string>
+    <string formatted="true" name="delete_message">Това ще изтрие за постоянно %s \nСигурни ли сте?</string>
+    <string formatted="true" name="resume_time_left">%dm \nостава</string>
     <string name="status_ongoing">Продължава</string>
     <string name="status_completed">Завършен</string>
     <string name="status">Статус</string>
@@ -405,9 +402,7 @@
     <string formatted="true" name="plugins_disabled">Деактивирано: %d</string>
     <string formatted="true" name="plugins_not_downloaded">Не е изтеглено: %d</string>
     <string formatted="true" name="plugins_updated">Актуализирани %d плъгини</string>
-    <string name="blank_repo_message">CloudStream няма инсталирани сайтове по подразбиране. Трябва да инсталирате сайтовете от хранилища.
-\n
-\nПрисъединете се към нашия Дискорд или потърсете онлайн.</string>
+    <string name="blank_repo_message">CloudStream няма инсталирани сайтове по подразбиране. Трябва да инсталирате сайтовете от хранилища. \n \nПрисъединете се към нашия Дискорд или потърсете онлайн.</string>
     <string name="view_public_repositories_button">Вижте хранилищата на общността</string>
     <string name="view_public_repositories_button_short">Публичен списък</string>
     <string name="uppercase_all_subtitles">Всички субтитри с главни букви</string>
@@ -519,12 +514,10 @@
     <string name="profile_number">Профил %d</string>
     <string name="sort_alphabetical_a">По азбучен ред (A до Z)</string>
     <string name="open_with">Отваряне с</string>
-    <string name="empty_library_no_accounts_message">Вашата библиотека е празна :(
-\nВпишете се в акаунт с библиотеки или добавете сериали в локалната Ви библиотека.</string>
+    <string name="empty_library_no_accounts_message">Вашата библиотека е празна :( \nВпишете се в акаунт с библиотеки или добавете сериали в локалната Ви библиотека.</string>
     <string name="use">Използване</string>
     <string name="subscription_episode_released">Епизод %d е публикуван!</string>
-    <string name="safe_mode_file">Намерен е файл за безопасен режим!
-\nНяма да се зареждат никакви разширения при стартиране, докато файлът не бъде премахнат.</string>
+    <string name="safe_mode_file">Намерен е файл за безопасен режим! \nНяма да се зареждат никакви разширения при стартиране, докато файлът не бъде премахнат.</string>
     <string name="already_voted">Вече сте гласували</string>
     <string name="set_default">Задаване по подразбиране</string>
     <string name="pin_error_length">ПИН трябва да е 4 символа</string>
@@ -551,23 +544,11 @@
     <string name="android_tv_interface_off_seek_settings">Скрит играч - сума за търсене</string>
     <string name="android_tv_interface_off_seek_settings_summary">Сумата за търсене, използвана, когато играчът е скрит</string>
     <string name="sort_updated_new">Актуализирано (от ново към старо)</string>
-    <string name="quality_profile_help">Тук можете да промените начина на подреждане на източниците. Ако даден видеоклип има по-висок приоритет, той ще се показва по-високо в избора на източник. Сборът от приоритета на източника и приоритета на качеството е приоритетът на видеото.
-\n
-\nИзточник A: 3
-\nКачество B: 7
-\nЩе има комбиниран видео приоритет от 10.
-\n
-\nЗАБЕЛЕЖКА: Ако сумата е 10 или повече, играчът автоматично ще пропусне зареждането, когато тази връзка се зареди!</string>
+    <string name="quality_profile_help">Тук можете да промените начина на подреждане на източниците. Ако даден видеоклип има по-висок приоритет, той ще се показва по-високо в избора на източник. Сборът от приоритета на източника и приоритета на качеството е приоритетът на видеото. \n \nИзточник A: 3 \nКачество B: 7 \nЩе има комбиниран видео приоритет от 10. \n \nЗАБЕЛЕЖКА: Ако сумата е 10 или повече, играчът автоматично ще пропусне зареждането, когато тази връзка се зареди!</string>
     <string name="duplicate_replace">Замени</string>
     <string name="duplicate_replace_all">Замени Всички</string>
-    <string name="duplicate_message_single" formatted="true">Изглежда, че потенциално дублиран елемент вече съществува във вашата библиотека: „%s“.
-\n
-\nИскате ли все пак да добавите този елемент, да замените съществуващия или да отмените действието?</string>
-    <string name="duplicate_message_multiple" formatted="true">Във вашата библиотека са намерени потенциални дублиращи се елементи:
-\n
-\n%s
-\n
-\nИскате ли все пак да добавите този елемент, да замените съществуващите или да отмените действието?</string>
+    <string name="duplicate_message_single" formatted="true">Изглежда, че потенциално дублиран елемент вече съществува във вашата библиотека: „%s“. \n \nИскате ли все пак да добавите този елемент, да замените съществуващия или да отмените действието?</string>
+    <string name="duplicate_message_multiple" formatted="true">Във вашата библиотека са намерени потенциални дублиращи се елементи: \n \n%s \n \nИскате ли все пак да добавите този елемент, да замените съществуващите или да отмените действието?</string>
     <string name="lock_profile">Заключи Профил</string>
     <string name="enter_current_pin">Вкарай Сегашен ПИН</string>
     <string name="manage_accounts">Управлявай Профили</string>
diff --git a/app/src/main/res/values-b+bn/strings.xml b/app/src/main/res/values-b+bn/strings.xml
index 87aa8e7eb..c49019a0a 100644
--- a/app/src/main/res/values-b+bn/strings.xml
+++ b/app/src/main/res/values-b+bn/strings.xml
@@ -15,8 +15,7 @@
     <string name="preview_background_img_des">ব্যাকগ্রাউন্ড দেখান</string>
     <string name="player_speed_text_format" formatted="true">গতি (%.2f গুণ)</string>
     <string name="rated_format" formatted="true">মূল্যায়নঃ %.1f</string>
-    <string name="new_update_format" formatted="true">নতুন আপডেট এসেছে!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">নতুন আপডেট এসেছে! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">ফিলার</string>
     <string name="duration_format" formatted="true">%d মিনিট</string>
     <string name="app_name">ক্লাউডস্ট্রিম</string>
@@ -139,7 +138,7 @@
     <string name="updates_settings">অ্যাপ এর হালনাগাদ দেখান</string>
     <string name="swipe_to_seek_settings">খুঁজতে সোয়াইপ করুন</string>
     <string name="search_poster_img_des">পোস্টার</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="double_tap_to_seek_settings">আগাতে ডবল ট্যাপ করুন</string>
     <string name="eigengraumode_settings">প্লেব্যাক এর গতি</string>
     <string name="update_started">আপডেট শুরু হয়েছে</string>
@@ -159,8 +158,7 @@
     <string name="movies">সিনেমা</string>
     <string name="discord">ডিসকর্ডে যোগ দিন</string>
     <string name="torrent">টরেন্টস</string>
-    <string name="delete_message" formatted="true">এটি স্থায়ীভাবে মুছে ফেলা হবে %s
-\nআপনি কি নিশ্চিত?</string>
+    <string name="delete_message" formatted="true">এটি স্থায়ীভাবে মুছে ফেলা হবে %s \nআপনি কি নিশ্চিত?</string>
     <string name="pause">থামুন</string>
     <string name="go_back_30">-৩০</string>
     <string name="github">গিটহাব</string>
@@ -184,8 +182,7 @@
     <string name="used_storage">ব্যবহৃত</string>
     <string name="library">লাইব্রেরী</string>
     <string name="lightnovel">আমাদের তৈরি ছোট উপন্যাস পড়ার অ্যাপ্লিকেশন</string>
-    <string name="resume_time_left" formatted="true">%d মি
-\nবাকি</string>
+    <string name="resume_time_left" formatted="true">%d মি \nবাকি</string>
     <string name="others">অন্যান্য</string>
     <string name="status_ongoing">চলমান</string>
     <string name="asian_drama">এশিয়ান নাটক</string>
@@ -308,8 +305,7 @@
     <string name="example_password">password123</string>
     <string name="episode_upcoming_format" formatted="true">আসছে %s সময়ের মধ্যে</string>
     <string name="cancel">বাতিল করুন</string>
-    <string name="resume_remaining" formatted="true">%s
-\nঅবশিষ্ট</string>
+    <string name="resume_remaining" formatted="true">%s \nঅবশিষ্ট</string>
     <string name="live_singular">লাইভ স্ট্রিম</string>
     <string name="source_error">সোর্স সমস্যা</string>
     <string name="remote_error">রিমোট সমস্যা</string>
diff --git a/app/src/main/res/values-b+cs/strings.xml b/app/src/main/res/values-b+cs/strings.xml
index 2ee23c1c5..7dd18817e 100644
--- a/app/src/main/res/values-b+cs/strings.xml
+++ b/app/src/main/res/values-b+cs/strings.xml
@@ -16,8 +16,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Rychlost (%.2fx)</string>
     <string name="rated_format" formatted="true">Hodnocení: %.1f</string>
-    <string name="new_update_format" formatted="true">Nalezena nová aktualizace!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Nalezena nová aktualizace! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Výplň</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_name">CloudStream</string>
@@ -100,7 +99,7 @@
     <string name="continue_watching">Pokračovat ve sledování</string>
     <string name="action_remove_watching">Odebrat</string>
     <string name="action_open_watching">Další informace</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Aby tento poskytovatel fungoval správně, budete možná potřebovat VPN</string>
     <string name="vpn_torrent">Tento poskytovatel je torrent, je doporučená VPN</string>
     <string name="provider_info_meta">Web neposkytnul žádná metadata, načítání videa selže, pokud na webu neexistuje.</string>
@@ -172,10 +171,8 @@
     <string name="resume">Pokračovat</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Toto nevratně smaže %s
-\nJste si jisti?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nzbývá</string>
+    <string name="delete_message" formatted="true">Toto nevratně smaže %s \nJste si jisti?</string>
+    <string name="resume_time_left" formatted="true">%dm \nzbývá</string>
     <string name="status_ongoing">Probíhající</string>
     <string name="status_completed">Dokončena</string>
     <string name="status">Stav</string>
@@ -416,9 +413,7 @@
     <string name="plugin_downloaded">Doplněk stažen</string>
     <string name="is_adult">18+</string>
     <string name="batch_download_start_format" formatted="true">Spuštěno stahování %1$d %2$s…</string>
-    <string name="blank_repo_message">CloudStream nemá ve výchozím nastavení nainstalované žádné zdroje. Je třeba je nainstalovat z repozitářů.
-\n
-\nPřipojte se na náš Discord nebo hledejte na internetu.</string>
+    <string name="blank_repo_message">CloudStream nemá ve výchozím nastavení nainstalované žádné zdroje. Je třeba je nainstalovat z repozitářů. \n \nPřipojte se na náš Discord nebo hledejte na internetu.</string>
     <string name="plugins_disabled" formatted="true">Zakázáno: %d</string>
     <string name="plugins_updated" formatted="true">Aktualizováno %d doplňků</string>
     <string name="safe_mode_crash_info">Zobrazit informace o pádu</string>
@@ -446,8 +441,7 @@
     <string name="update_notification_failed">Nepodařilo se nainstalovat novou verzi aplikace</string>
     <string name="apk_installer_legacy">Původní</string>
     <string name="delayed_update_notice">Aplikace bude po ukončení aktualizována</string>
-    <string name="empty_library_no_accounts_message">Vaše knihovna je prázdná :(
-\nPřihlaste se k účtu v knihovně nebo přidejte pořady do místní knihovny.</string>
+    <string name="empty_library_no_accounts_message">Vaše knihovna je prázdná :( \nPřihlaste se k účtu v knihovně nebo přidejte pořady do místní knihovny.</string>
     <string name="select_library">Vybrat knihovnu</string>
     <string name="sort_rating_desc">Hodnocení (od nejvyššího)</string>
     <string name="sort_rating_asc">Hodnocení (od nejnižšího)</string>
@@ -455,8 +449,7 @@
     <string name="sort_by">Seřadit podle</string>
     <string name="sort">Řazení</string>
     <string name="empty_library_logged_in_message">Tento seznam je prázdný. Zkuste přepnout na jiný.</string>
-    <string name="safe_mode_file">Nalezen soubor bezpečného režimu!
-\nDo odebrání souboru nebudeme načítat žádná rozšíření.</string>
+    <string name="safe_mode_file">Nalezen soubor bezpečného režimu! \nDo odebrání souboru nebudeme načítat žádná rozšíření.</string>
     <string name="sort_updated_new">Aktualizováno (od nejnovějšího)</string>
     <string name="sort_updated_old">Aktualizováno (od nejstaršího)</string>
     <string name="sort_alphabetical_a">Abecedně (od A do Z)</string>
@@ -537,13 +530,7 @@
     <string name="help">Nápověda</string>
     <string name="qualities">Kvality</string>
     <string name="profile_background_des">Pozadí profilu</string>
-    <string name="quality_profile_help">Zde můžete změnit pořadí zdrojů. Pokud má video vyšší prioritu, objeví se ve výběru zdrojů výše. Součet priority zdroje a priority kvality je priorita videa.
-\n
-\nZdroj A: 3
-\nKvalita B: 7
-\nBudou mít celkovou prioritu videa 10.
-\n
-\nPOZNÁMKA: Pokud je součet 10 nebo vyšší, přehrávač automaticky přeskočí načítání při načtení daného odkazu!</string>
+    <string name="quality_profile_help">Zde můžete změnit pořadí zdrojů. Pokud má video vyšší prioritu, objeví se ve výběru zdrojů výše. Součet priority zdroje a priority kvality je priorita videa. \n \nZdroj A: 3 \nKvalita B: 7 \nBudou mít celkovou prioritu videa 10. \n \nPOZNÁMKA: Pokud je součet 10 nebo vyšší, přehrávač automaticky přeskočí načítání při načtení daného odkazu!</string>
     <string name="unable_to_inflate">Nepodařilo se správně vytvořit rozhraní. Toto je VÁŽNÁ CHYBA, kterou je potřeba ihned nahlásit %s</string>
     <string name="disable">Vypnout</string>
     <string name="automatic_plugin_download_mode_title">Výběr režimu pro filtrování stahování doplňků</string>
@@ -553,11 +540,7 @@
     <string name="favorite_removed">%s odebráno z oblíbených</string>
     <string name="favorites_list_name">Oblíbené</string>
     <string name="favorite_added">%s přidáno do oblíbených</string>
-    <string name="duplicate_message_multiple" formatted="true">Ve vaší knihovně byl nalezen potenciální duplikát:
-\n
-\n%s
-\n
-\nChcete přesto přidat tuto položku, nahradit existující nebo zrušit akci?</string>
+    <string name="duplicate_message_multiple" formatted="true">Ve vaší knihovně byl nalezen potenciální duplikát: \n \n%s \n \nChcete přesto přidat tuto položku, nahradit existující nebo zrušit akci?</string>
     <string name="backup_frequency">Frekvence záloh</string>
     <string name="duplicate_title">Nalezena potenciální duplicita</string>
     <string name="lock_profile">Zamknout profil</string>
@@ -571,9 +554,7 @@
     <string name="action_subscribe">Odebírat</string>
     <string name="action_remove_from_favorites">Odebrat z oblíbených</string>
     <string name="select_an_account">Vyberte účet</string>
-    <string name="duplicate_message_single">Vypadá to, že ve vaší knihovně již existuje potenciální duplikát: „%s“.
-\n
-\nChcete přesto přidat tuto položku, nahradit existující nebo zrušit akci?</string>
+    <string name="duplicate_message_single">Vypadá to, že ve vaší knihovně již existuje potenciální duplikát: „%s“. \n \nChcete přesto přidat tuto položku, nahradit existující nebo zrušit akci?</string>
     <string name="enter_pin">Zadejte PIN</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">Zadejte současný PIN</string>
@@ -602,8 +583,7 @@
     <string name="biometric_prompt_description">Po několika nezdařilých pokusech se okno zavře. Pro opětovný pokus restartujte aplikaci.</string>
     <string name="biometric_warning">Vaše data z aplikace CloudStream byla nyní zálohována. Ačkoli je tato možnost velmi malá, různá zařízení se mohou chovat různě. Ve výjimečném případě, že se vám přístup k aplikaci zablokuje, data aplikace zcela vymažte a obnovte je ze zálohy. Velmi se omlouváme za případné nepříjemnosti z toho plynoucí.</string>
     <string name="unfavorite">Odebrat z oblíbených</string>
-    <string name="resume_remaining" formatted="true">%s
-\nzbývá</string>
+    <string name="resume_remaining" formatted="true">%s \nzbývá</string>
     <string name="favorite">Přidat do oblíbených</string>
     <string name="repo_copy_label">Název a adresa repozitáře</string>
     <string name="clipboard_unknown_error">Chyba při kopírování, zkopírujte prosím protokol a kontaktujte podporu aplikace.</string>
@@ -644,20 +624,12 @@
     <string name="downloads_delete_select">Zvolte položky k odstranění</string>
     <string name="offline_file">Dostupné pro sledování offline</string>
     <string name="select_all">Vybrat vše</string>
-    <string name="delete_message_multiple" formatted="true">Opravdu chcete trvale odstranit následující položky?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">Opravdu chcete trvale odstranit následující epizody v %1$s?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_only" formatted="true">Opravdu chcete trvale odstranit všechny epizody v následujících sériích?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Opravdu chcete trvale odstranit následující položky? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Opravdu chcete trvale odstranit následující epizody v %1$s? \n \n%2$s</string>
+    <string name="delete_message_series_only" formatted="true">Opravdu chcete trvale odstranit všechny epizody v následujících sériích? \n \n%s</string>
     <string name="deselect_all">Zrušit výběr všeho</string>
     <string name="delete_files">Odstranit soubory</string>
-    <string name="delete_message_series_section" formatted="true">Také trvale odstraníte všechny epizody v následujících sériích:
-\n
-\n%s</string>
+    <string name="delete_message_series_section" formatted="true">Také trvale odstraníte všechny epizody v následujících sériích: \n \n%s</string>
     <string name="delete_format" formatted="true">Odstranit (%1$d | %2$s)</string>
     <string name="preview_seekbar">Náhled v liště přehrávače</string>
     <string name="preview_seekbar_desc">Povolit náhled miniatur na liště přehrávače</string>
@@ -779,4 +751,7 @@
     <string name="source_priority">Priorita zdrojů</string>
     <string name="source_priority_help">Rozhodněte, jak mají být řazeny zdroje videí v přehrávači</string>
     <string name="show_player_metadata_overlay">Zobrazit překrytí metadat v přehrávači</string>
+    <string name="video_singular">Video</string>
+    <string name="skip_type_preview">Náhled</string>
+    <string name="player_is_live">Živě</string>
 </resources>
diff --git a/app/src/main/res/values-b+de/strings.xml b/app/src/main/res/values-b+de/strings.xml
index eb939ec5e..f50f2c10a 100644
--- a/app/src/main/res/values-b+de/strings.xml
+++ b/app/src/main/res/values-b+de/strings.xml
@@ -27,8 +27,7 @@
     <string name="preview_background_img_des">Hintergrundbildvorschau</string>
     <string name="player_speed_text_format" formatted="true">Geschwindigkeit (%.2fx)</string>
     <string name="rated_format" formatted="true">Bewertung: %.1f</string>
-    <string name="new_update_format" formatted="true">Neues Update gefunden!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Neues Update gefunden! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Füller</string>
     <string name="duration_format" formatted="true">%d Min</string>
     <string name="app_name">CloudStream</string>
@@ -112,7 +111,7 @@
     <string name="continue_watching">Weiterschauen</string>
     <string name="action_remove_watching">Entfernen</string>
     <string name="action_open_watching">Mehr Infos</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Damit dieser Anbieter korrekt funktioniert, ist möglicherweise ein VPN erforderlich</string>
     <string name="vpn_torrent">Dieser Anbieter bietet Torrents an, ein VPN wird deswegen dringend empfohlen</string>
     <string name="provider_info_meta">Metadaten werden nicht von der Website bereitgestellt, das Laden des Videos schlägt fehl, wenn sie nicht auf der Website vorhanden sind.</string>
@@ -188,10 +187,8 @@
     <string name="resume">Fortsetzen</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Dadurch wird %s permanent gelöscht
-\nBist du dir sicher?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nverbleibend</string>
+    <string name="delete_message" formatted="true">Dadurch wird %s permanent gelöscht \nBist du dir sicher?</string>
+    <string name="resume_time_left" formatted="true">%dm \nverbleibend</string>
     <string name="status_ongoing">Laufend</string>
     <string name="status_completed">Abgeschlossen</string>
     <string name="status">Status</string>
@@ -401,9 +398,7 @@
     <string name="plugins_downloaded" formatted="true">Heruntergeladen: %d</string>
     <string name="plugins_disabled" formatted="true">Deaktiviert: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Nicht heruntergeladen: %d</string>
-    <string name="blank_repo_message">CloudStream hat standardmäßig keine Websites installiert. Websites müssen aus Repositories installiert werden.
-\n
-\nTrete unserem Discord Server bei oder suche online.</string>
+    <string name="blank_repo_message">CloudStream hat standardmäßig keine Websites installiert. Websites müssen aus Repositories installiert werden. \n \nTrete unserem Discord Server bei oder suche online.</string>
     <string name="view_public_repositories_button">Community-Repositories anzeigen</string>
     <string name="view_public_repositories_button_short">Öffentliche Liste</string>
     <string name="uppercase_all_subtitles">Alle Untertitel in Großbuchstaben</string>
@@ -484,11 +479,9 @@
     <string name="sort_alphabetical_z">Alphabetisch (Z zu A)</string>
     <string name="select_library">Bibliothek auswählen</string>
     <string name="open_with">Öffnen mit</string>
-    <string name="empty_library_no_accounts_message">Deine Bibliothek ist leer :(
-\nMelde dich mit einem Bibliothekskonto an oder füge Titel zu deiner lokalen Bibliothek hinzu.</string>
+    <string name="empty_library_no_accounts_message">Deine Bibliothek ist leer :( \nMelde dich mit einem Bibliothekskonto an oder füge Titel zu deiner lokalen Bibliothek hinzu.</string>
     <string name="empty_library_logged_in_message">Diese Liste ist leer. Versuch zu einer anderen Liste zu wechseln.</string>
-    <string name="safe_mode_file">Datei für den abgesicherten Modus gefunden!
-\nBeim Start werden keine Erweiterungen geladen, bis die Datei entfernt wird.</string>
+    <string name="safe_mode_file">Datei für den abgesicherten Modus gefunden! \nBeim Start werden keine Erweiterungen geladen, bis die Datei entfernt wird.</string>
     <string name="android_tv_interface_off_seek_settings">Player ausgeblendet - Betrag zum vor- und zurückspulen</string>
     <string name="android_tv_interface_on_seek_settings_summary">Der Betrag, welcher verwendet wird, wenn der Player eingeblendet ist</string>
     <string name="android_tv_interface_off_seek_settings_summary">Der Betrag, welcher verwendet wird, wenn der Player ausgeblendet ist</string>
@@ -522,13 +515,7 @@
     <string name="help">Hilfe</string>
     <string name="qualities">Qualitäten</string>
     <string name="profile_background_des">Profil-Hintergrund</string>
-    <string name="quality_profile_help">Hier kannst du verändern, wie die Quellen geordnet werden. Wenn ein Video eine höhere Priorität hat, wird es höher in der Quellenauswahl erscheinen. Die Summe der Quellenpriorität und der Qualitätspriorität ist die Videopriorität.
-\n
-\nQuelle A: 3
-\nQualität B: 7
-\nWerden eine kombinierte Videopriorität von 10 haben.
-\n
-\nHINWEIS: Wenn die Summe 10 oder mehr beträgt, überspringt der Player automatisch das Laden, wenn der Link geladen wird!</string>
+    <string name="quality_profile_help">Hier kannst du verändern, wie die Quellen geordnet werden. Wenn ein Video eine höhere Priorität hat, wird es höher in der Quellenauswahl erscheinen. Die Summe der Quellenpriorität und der Qualitätspriorität ist die Videopriorität. \n \nQuelle A: 3 \nQualität B: 7 \nWerden eine kombinierte Videopriorität von 10 haben. \n \nHINWEIS: Wenn die Summe 10 oder mehr beträgt, überspringt der Player automatisch das Laden, wenn der Link geladen wird!</string>
     <string name="automatic_plugin_download_mode_title">Filtermodus für Plugin-Downloads auswählen</string>
     <string name="already_voted">Es wurde bereits abgestimmt</string>
     <string name="no_plugins_found_error">Keine Plugins im Repository gefunden</string>
@@ -560,14 +547,8 @@
     <string name="skip_startup_account_select_pref">Kontoauswahl beim Starten überspringen</string>
     <string name="manage_accounts">Konten verwalten</string>
     <string name="edit_account">Konto bearbeiten</string>
-    <string name="duplicate_message_multiple" formatted="true">Es wurden potentielle Duplikate in deiner Bibliothek gefunden:
-\n
-\n%s
-\n
-\nMöchtest du dieses Element dennoch hinzufügen, das existierende ersetzen oder diese Aktion abbrechen?</string>
-    <string name="duplicate_message_single" formatted="true">Deine Bibliothek enthält möglicherweise schon ein Duplikat dieses Elements: \'%s\'
-\n
-\nMöchtest du dieses Element dennoch hinzufügen, das existierende ersetzen oder diese Aktion abbrechen?</string>
+    <string name="duplicate_message_multiple" formatted="true">Es wurden potentielle Duplikate in deiner Bibliothek gefunden: \n \n%s \n \nMöchtest du dieses Element dennoch hinzufügen, das existierende ersetzen oder diese Aktion abbrechen?</string>
+    <string name="duplicate_message_single" formatted="true">Deine Bibliothek enthält möglicherweise schon ein Duplikat dieses Elements: \'%s\' \n \nMöchtest du dieses Element dennoch hinzufügen, das existierende ersetzen oder diese Aktion abbrechen?</string>
     <string name="links_reloaded_toast">Links wurden neu geladen</string>
     <string name="rotate_video">Drehen</string>
     <string name="rotate_video_desc">Zeige einen Umschalter für Bildschirmorientierung an</string>
@@ -587,8 +568,7 @@
     <string name="unfavorite">kein Favorit</string>
     <string name="biometric_prompt_description">Dieser Bildschirm wurde nach einigen Fehlversuchen geschlossen. Starte die App neu.</string>
     <string name="biometric_warning">Ihre CloudStream-Daten wurden gesichert. Obwohl die Wahrscheinlichkeit dieses seltenen Falles sehr gering ist, verhalten sich alle Geräte unterschiedlich. Falls Sie im schlimmsten Fall den Zugriff zur App verlieren, löschen Sie die App-Daten vollständig und stellen Sie die Sicherung wieder her. Jegliche Unannehmlichkeiten, die Ihnen dadurch entstehen, bedauern wir sehr.</string>
-    <string name="resume_remaining" formatted="true">%s
-\nausstehend</string>
+    <string name="resume_remaining" formatted="true">%s \nausstehend</string>
     <string name="favorite">Favorit</string>
     <string name="toast_copied">Kopiert!</string>
     <string name="clipboard_unknown_error">Beim kopieren ist ein Fehler aufgetreten, bitte kopieren sie logical und wenden sich an den Support.</string>
@@ -630,18 +610,10 @@
     <string name="play_from_beginning_img_des">Vom Beginn an spielen</string>
     <string name="downloads_delete_select">Elemente zum Löschen auswählen</string>
     <string name="offline_file">Zum Offline-Ansehen verfügbar</string>
-    <string name="delete_message_multiple" formatted="true">Bist du dir sicher, dass du die folgenden Elemente permanent löschen willst?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">Bist du dir sicher, dass du die folgenden Episoden in %1$s permanent löschen willst?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">Du wirst ebenfalls alle Episoden der folgenden Serien permanent löschen:
-\n
-\n%s</string>
-    <string name="delete_message_series_only" formatted="true">Bist du dir sicher, dass du alle Episoden der folgenden Serien permanent löschen willst?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Bist du dir sicher, dass du die folgenden Elemente permanent löschen willst? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Bist du dir sicher, dass du die folgenden Episoden in %1$s permanent löschen willst? \n \n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Du wirst ebenfalls alle Episoden der folgenden Serien permanent löschen: \n \n%s</string>
+    <string name="delete_message_series_only" formatted="true">Bist du dir sicher, dass du alle Episoden der folgenden Serien permanent löschen willst? \n \n%s</string>
     <string name="sort_release_date_new">Veröffentlichungsdatum (von neu nach alt)</string>
     <string name="sort_release_date_old">Veröffentlichungsdatum (von alt nach neu)</string>
     <string name="preview_seekbar">Suchleisten Vorschau</string>
diff --git a/app/src/main/res/values-b+el/strings.xml b/app/src/main/res/values-b+el/strings.xml
index 4a53c4e58..4fdcbaf11 100644
--- a/app/src/main/res/values-b+el/strings.xml
+++ b/app/src/main/res/values-b+el/strings.xml
@@ -110,8 +110,7 @@
     <string name="benene_des">Μπανάνα δόθηκε</string>
     <string name="player_speed_text_format" formatted="true">Ταχύτητα (%.2fx)</string>
     <string name="rated_format" formatted="true">Βαθμολογία: %.1f</string>
-    <string name="new_update_format" formatted="true">Νέα διαθέσιμη ενημέρωση!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Νέα διαθέσιμη ενημέρωση! \n%1$s -&gt; %2$s</string>
     <string name="double_tap_to_pause_settings_des">Πατήστε δύο φορές στη μέση για παύση</string>
     <string name="use_system_brightness_settings">Χρήση φωτεινότητας συστήματος</string>
     <string name="use_system_brightness_settings_des">Χρήση φωτεινότητας συστήματος στο ενσωματωμένο πρόγραμμα αναπαραγωγής, αντί εφαρμογής προεπιλεγμένου σκούρου επικαλύμματος</string>
@@ -149,10 +148,8 @@
     <string name="cancel">Ακύρωση</string>
     <string name="pause">Παύση</string>
     <string name="resume">Συνέχιση</string>
-    <string name="delete_message" formatted="true">Αυτό θα διαγράψει μόνιμα το %s
-\nΕίστε σίγουροι πως θέλετε να προχωρήσετε;</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nαπομένουν</string>
+    <string name="delete_message" formatted="true">Αυτό θα διαγράψει μόνιμα το %s \nΕίστε σίγουροι πως θέλετε να προχωρήσετε;</string>
+    <string name="resume_time_left" formatted="true">%dm \nαπομένουν</string>
     <string name="status_ongoing">Σε εξέλιξη</string>
     <string name="status">Κατάσταση</string>
     <string name="year">Έτος</string>
@@ -323,9 +320,7 @@
     <string name="plugins_disabled" formatted="true">Απενεργοποιήθηκε: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Δεν κατέβηκε: %d</string>
     <string name="plugins_updated" formatted="true">Ενημερώθηκαν %d πρόσθετα</string>
-    <string name="blank_repo_message">Το CloudStream δεν έχει προεγκατεστημένους ιστότοπους. Πρέπει να εγκαταστήσετε ιστότοπους μέσω ορισμένων αποθετηρίων.
-\n
-\nΒρείτε μας στο Discord ή ψάξτε στο διαδίκτυο.</string>
+    <string name="blank_repo_message">Το CloudStream δεν έχει προεγκατεστημένους ιστότοπους. Πρέπει να εγκαταστήσετε ιστότοπους μέσω ορισμένων αποθετηρίων. \n \nΒρείτε μας στο Discord ή ψάξτε στο διαδίκτυο.</string>
     <string name="view_public_repositories_button">Προβολή αποθετηρίων κοινότητας</string>
     <string name="view_public_repositories_button_short">Δημόσια λίστα</string>
     <string name="uppercase_all_subtitles">Κεφαλοποίηση υποτίτλων</string>
@@ -370,7 +365,7 @@
     <string name="sort_close">Κλείσιμο</string>
     <string name="sort_clear">Εκκαθάριση</string>
     <string name="subs_subtitle_languages">Γλώσσα υποτίτλων</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="provider_info_meta">Δεν έχουν παρασχεθεί μεταδεδομένα από τον ιστότοπο, η φόρτωση του βίντεο θα αποτύχει αν δεν υπάρχει στον ιστότοπο.</string>
     <string name="double_tap_to_pause_settings">Διπλό πάτημα για παύση</string>
     <string name="double_tap_to_seek_amount_settings">Μέγεθος αναζήτησης στο πρόγραμμα αναπαραγωγής (σε δευτερόλεπτα)</string>
@@ -487,23 +482,15 @@
     <string name="action_remove_from_watched">Αφαίρεση από παρακολουθημένα</string>
     <string name="browser">Περιηγητής</string>
     <string name="open_with">Άνοιγμα με</string>
-    <string name="empty_library_no_accounts_message">Η βιβλιοθήκη σας είναι άδεια :(
-\nΣυνδεθείτε με έναν λογαριασμό βιβλιοθήκης ή προσθέστε σειρές στην τοπική βιβλιοθήκη σας.</string>
-    <string name="safe_mode_file">Βρέθηκε αρχείο Ασφαλούς Λειτουργίας!
-\nΔεν πρόκειται να φορτωθούν extensions κατά το ξεκίνημα μέχρι να διαγραφεί το αρχείο.</string>
+    <string name="empty_library_no_accounts_message">Η βιβλιοθήκη σας είναι άδεια :( \nΣυνδεθείτε με έναν λογαριασμό βιβλιοθήκης ή προσθέστε σειρές στην τοπική βιβλιοθήκη σας.</string>
+    <string name="safe_mode_file">Βρέθηκε αρχείο Ασφαλούς Λειτουργίας! \nΔεν πρόκειται να φορτωθούν extensions κατά το ξεκίνημα μέχρι να διαγραφεί το αρχείο.</string>
     <string name="test_log">Αρχείο Καταγραφής</string>
     <string name="test_failed">Απέτυχε</string>
     <string name="test_passed">Πέτυχε</string>
     <string name="start">Εκκίνηση</string>
     <string name="no_plugins_found_error">Δε βρέθηκαν επεκτάσεις στο αποθετήριο</string>
     <string name="no_repository_found_error">Δε βρέθηκε αποθετήριο, ελέγξτε την URL και δοκιμάστε VPN</string>
-    <string name="quality_profile_help">Από εδώ μπορείτε να αλλάξετε τον τρόπο σειράς των πηγών. Εάν ένα βίντεο έχει υψηλότερη προτεραιότητα, θα εμφανίζεται ψηλότερα στην επιλογή πηγής. Το άθροισμα της προτεραιότητας πηγής και της ποιότητας, είναι η προτεραιότητα του βίντεο.
-\n
-\nΠηγή Α: 3
-\nΠοιότητα Β: 7
-\nΘα έχει συνδυασμένη προτεραιότητα βίντεο 10.
-\n
-\nΣΗΜΕΙΩΣΗ: Εάν το άθροισμα είναι 10 ή περισσότερο, η συσκευή αναπαραγωγής θα παραλείψει αυτόματα τη φόρτωση όταν φορτωθεί αυτός ο σύνδεσμος!</string>
+    <string name="quality_profile_help">Από εδώ μπορείτε να αλλάξετε τον τρόπο σειράς των πηγών. Εάν ένα βίντεο έχει υψηλότερη προτεραιότητα, θα εμφανίζεται ψηλότερα στην επιλογή πηγής. Το άθροισμα της προτεραιότητας πηγής και της ποιότητας, είναι η προτεραιότητα του βίντεο. \n \nΠηγή Α: 3 \nΠοιότητα Β: 7 \nΘα έχει συνδυασμένη προτεραιότητα βίντεο 10. \n \nΣΗΜΕΙΩΣΗ: Εάν το άθροισμα είναι 10 ή περισσότερο, η συσκευή αναπαραγωγής θα παραλείψει αυτόματα τη φόρτωση όταν φορτωθεί αυτός ο σύνδεσμος!</string>
     <string name="category_provider_test">Δοκιμή παρόχου</string>
     <string name="watch_quality_pref_data">Προτιμώμενη ποιότητας παρακολούθησης (Δεδομένα τηλεφώνου)</string>
     <string name="jsdelivr_proxy">Διακομιστής μεσολάβησης GitHub</string>
@@ -549,9 +536,7 @@
     <string name="ok">Εντάξει</string>
     <string name="battery_dialog_title">Απενεργοποιήση της εξοικονόμησης της μπαταρίας</string>
     <string name="already_voted">Έχετε ήδη ψηφίσει</string>
-    <string name="duplicate_message_single" formatted="true">Φαίνεται πως ένα πιθανό αντίγραφο βρίσκεται στη βιβλιοθήκη σας: \'%s.\'
-\n
-\nΘα επιθυμούσατε να το προσθέσετε, να το αντικαταστήσετε, ή να ακυρώσετε την ενέργεια;</string>
+    <string name="duplicate_message_single" formatted="true">Φαίνεται πως ένα πιθανό αντίγραφο βρίσκεται στη βιβλιοθήκη σας: \'%s.\' \n \nΘα επιθυμούσατε να το προσθέσετε, να το αντικαταστήσετε, ή να ακυρώσετε την ενέργεια;</string>
     <string name="enter_current_pin">Εισαγωγή Τρέχον Κωδικού</string>
     <string name="lock_profile">Κλείδωμα Προφίλ</string>
     <string name="biometric_authentication_title">Ξεκλείδωμα Cloudstream</string>
@@ -578,11 +563,7 @@
     <string name="duplicate_title">Πιθανό αντίγραφο βρέθηκε</string>
     <string name="duplicate_add">Προσθήκη</string>
     <string name="duplicate_replace">Αντικατάσταση</string>
-    <string name="duplicate_message_multiple" formatted="true">Πιθανά διπλά αρχεία βρέθηκαν στην βιβλιοθήκη:
-\n
-\n%s
-\n
-\nΘα επιθυμούσατε να προσθέσετε αυτό το αρχείο ούτως η άλλως, να αντικαταστήσετε τα ήδη υπάρχοντα, ή να ακυρώσετε την ενέργεια?</string>
+    <string name="duplicate_message_multiple" formatted="true">Πιθανά διπλά αρχεία βρέθηκαν στην βιβλιοθήκη: \n \n%s \n \nΘα επιθυμούσατε να προσθέσετε αυτό το αρχείο ούτως η άλλως, να αντικαταστήσετε τα ήδη υπάρχοντα, ή να ακυρώσετε την ενέργεια?</string>
     <string name="enter_pin_with_name" formatted="true">Εισαγωγή Κωδικού για %s</string>
     <string name="pin">Κωδικός</string>
     <string name="pin_error_incorrect">Εσφαλμένος Κωδικός. Προσπαθήστε ξανά.</string>
@@ -595,8 +576,7 @@
     <string name="jsdelivr_proxy_summary">Παράκαμψη απαγόρευσης από raw github URLs χρησιμοποιώντας jsDelivr. Μπορεί να καθυστερήσει τις ενημερώσεις για μερικές μέρες.</string>
     <string name="rotate_video_desc">Εμφάνιση κουμπιού για περιστροφή οθόνης</string>
     <string name="favorite">Αγαπημένο</string>
-    <string name="resume_remaining" formatted="true">%s
-\nαπομένουν</string>
+    <string name="resume_remaining" formatted="true">%s \nαπομένουν</string>
     <string name="biometric_unsupported">Βιομετρική αυθεντικοποίηση δεν υποστηρίζεται από τη συσκευή</string>
     <string name="episode_action_cast_mirror">Καστ ταινίας</string>
     <string name="battery_dialog_message">Για να εξασφαλιστούν αδιάκοπες λήψεις και ειδοποιήσεις για αναγραφόμενες τηλεοπτικές εκπομπές, το CloudStream χρειάζεται άδεια για να τρέξει στο παρασκήνιο. Πατώντας OK, θα εμφανιστεί ένας διάλογος αιτήματος. Παρακαλώ πατήστε \\\"Επιτρέπω\\\".\n\nΠαρακαλώ σημειώστε, αυτή η άδεια δεν σημαίνει ότι το CS3 θα αποστραγγίσει την μπαταρία σας. Θα λειτουργεί στο παρασκήνιο μόνο όταν είναι απαραίτητο, όπως κατά τη λήψη ειδοποιήσεων ή τη λήψη βίντεο από επίσημες επεκτάσεις.</string>
diff --git a/app/src/main/res/values-b+eo/strings.xml b/app/src/main/res/values-b+eo/strings.xml
index ccd18eae3..b490a2aed 100644
--- a/app/src/main/res/values-b+eo/strings.xml
+++ b/app/src/main/res/values-b+eo/strings.xml
@@ -83,8 +83,7 @@
     <string name="next_episode_time_day_format" formatted="true">%1$dt %2$dh %3$dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
-    <string name="new_update_format" formatted="true">Nova ĝisdatigo trovita!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Nova ĝisdatigo trovita! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Speciala epizodo</string>
     <string name="app_name">CloudStream</string>
     <string name="download_started">Elŝuto Komencite</string>
@@ -159,7 +158,7 @@
     <string name="search_provider_text_types">Serĉi uzante tipojn</string>
     <string name="subs_subtitle_languages">Subteksta Lingvo</string>
     <string name="action_open_watching">Pli da informoj</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="torrent_plot">Priskribo</string>
     <string name="torrent_no_plot">Neniu Priskribo Trovita</string>
     <string name="player_size_settings_des">Forigi nigrajn borderaĵojn</string>
diff --git a/app/src/main/res/values-b+es/strings.xml b/app/src/main/res/values-b+es/strings.xml
index 1801d39a2..7198808b6 100644
--- a/app/src/main/res/values-b+es/strings.xml
+++ b/app/src/main/res/values-b+es/strings.xml
@@ -7,8 +7,8 @@
     <string name="batch_download_finish_format" formatted="true">Descargado %1$d %2$s</string>
     <string name="delete_repository">Borrar repositorio</string>
     <string name="next_episode_format" formatted="true">El episodio %d se lanzará en</string>
-    <string name="next_episode_time_hour_format" formatted="true">%1$d h %2$d m</string>
-    <string name="next_episode_time_min_format" formatted="true">%d m</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$d h %2$d m</string>
+    <string name="next_episode_time_min_format" formatted="true">%d m</string>
     <string name="result_poster_img_des">Póster</string>
     <string name="extensions">Extensiones</string>
     <string name="downloaded_file">Archivo descargado</string>
@@ -80,8 +80,7 @@
     <string name="episode_action_reload_links">Recargar enlaces</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="delete_message" formatted="true">Esto eliminará %s permanentemente
-\nEstá seguro?</string>
+    <string name="delete_message" formatted="true">Esto eliminará %s permanentemente \nEstá seguro?</string>
     <string name="confirm_exit_dialog">¿Seguro que quieres salir?</string>
     <string name="popup_resume_download">Continuar Descarga</string>
     <string name="example_lang_name">Código de idioma (es_ES)</string>
@@ -104,7 +103,7 @@
     <string name="player_speed_text_format" formatted="true">Velocidad (%.2f×)</string>
     <string name="skip_loading">Omitir carga</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep. %2$d</string>
-    <string name="next_episode_time_day_format" formatted="true">%1$d d %2$d h %3$d m</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$d d %2$d h %3$d m</string>
     <string name="cast_format" formatted="true">Reparto: %s</string>
     <string name="filler" formatted="true">Relleno</string>
     <string name="duration_format" formatted="true">%d min</string>
@@ -184,7 +183,7 @@
     <string name="continue_watching">Continuar Viendo</string>
     <string name="action_remove_watching">Eliminar</string>
     <string name="action_open_watching">Más info</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Tal vez se requiera una VPN para que este proveedor funcione correctamente</string>
     <string name="vpn_torrent">Este proveedor es un torrent, se recomienda una VPN</string>
     <string name="provider_info_meta">El sitio no proporciona los metadatos, la carga del video fallará si no existe en el sitio.</string>
@@ -249,8 +248,7 @@
     <string name="resume">Continuar</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nfaltante</string>
+    <string name="resume_time_left" formatted="true">%dm \nfaltante</string>
     <string name="status_ongoing">En curso</string>
     <string name="status_completed">Completado</string>
     <string name="status">Estado</string>
@@ -482,10 +480,8 @@
     <string name="sort_alphabetical_z">Alfabéticamente (Z a A)</string>
     <string name="select_library">Seleccionar biblioteca</string>
     <string name="open_with">Abrir con</string>
-    <string name="empty_library_no_accounts_message">Tu biblioteca está vacía :(
-\nInicia sesión en una cuenta de biblioteca o añade series desde tu biblioteca local.</string>
-    <string name="safe_mode_file">¡Se encontró un archivo en modo seguro!
-\nNo cargar ninguna extensión al inicio hasta que se elimine el archivo.</string>
+    <string name="empty_library_no_accounts_message">Tu biblioteca está vacía :( \nInicia sesión en una cuenta de biblioteca o añade series desde tu biblioteca local.</string>
+    <string name="safe_mode_file">¡Se encontró un archivo en modo seguro! \nNo cargar ninguna extensión al inicio hasta que se elimine el archivo.</string>
     <string name="android_tv_interface_on_seek_settings">Reproductor visible - buscar cantidad</string>
     <string name="android_tv_interface_off_seek_settings">Reproductor oculto - buscar cantidad</string>
     <string name="pref_category_android_tv">Android TV</string>
@@ -510,13 +506,7 @@
     <string name="pref_category_bypass">ISP Bypasses</string>
     <string name="watch_quality_pref_data">Calidad de visualización preferida (Datos móviles)</string>
     <string name="help">Ayuda</string>
-    <string name="quality_profile_help">Aquí puedes cambiar el orden de las fuentes. Si un vídeo tiene una prioridad más alta, aparecerá más arriba en la selección de las fuentes. La suma de la prioridad de la fuente y la prioridad de la calidad es la prioridad del vídeo.
-\n
-\nFuente A: 3
-\nCalidad B: 7
-\nTendrá una prioridad en el vídeo combinada de 10.
-\n
-\nNOTA: ¡Si la suma es 10 o más el reproductor saltará automáticamente la carga cuando se cargue ese enlace!</string>
+    <string name="quality_profile_help">Aquí puedes cambiar el orden de las fuentes. Si un vídeo tiene una prioridad más alta, aparecerá más arriba en la selección de las fuentes. La suma de la prioridad de la fuente y la prioridad de la calidad es la prioridad del vídeo. \n \nFuente A: 3 \nCalidad B: 7 \nTendrá una prioridad en el vídeo combinada de 10. \n \nNOTA: ¡Si la suma es 10 o más el reproductor saltará automáticamente la carga cuando se cargue ese enlace!</string>
     <string name="profile_number">Perfil %d</string>
     <string name="wifi">Wifi</string>
     <string name="edit">Editar</string>
@@ -536,11 +526,7 @@
     <string name="favorite_removed">%s eliminado de favoritos</string>
     <string name="favorites_list_name">Favoritos</string>
     <string name="favorite_added">%s añadido a favoritos</string>
-    <string name="duplicate_message_multiple" formatted="true">Se han encontrado posibles elementos duplicados en su biblioteca:
-\n
-\n%s
-\n
-\n¿Desea añadir este elemento de todos modos, sustituir los existentes o cancelar la acción?</string>
+    <string name="duplicate_message_multiple" formatted="true">Se han encontrado posibles elementos duplicados en su biblioteca: \n \n%s \n \n¿Desea añadir este elemento de todos modos, sustituir los existentes o cancelar la acción?</string>
     <string name="duplicate_title">Posible duplicado encontrado</string>
     <string name="lock_profile">Bloquear perfil</string>
     <string name="action_add_to_favorites">Añadido a favoritos</string>
@@ -583,8 +569,7 @@
     <string name="biometric_warning">Ahora se ha realizado una copia de seguridad de sus datos de CloudStream. Aunque la posibilidad de que esto ocurra es muy baja, todos los dispositivos pueden comportarse de forma diferente. En el raro caso de que no puedas acceder a la aplicación, borra completamente los datos de la aplicación y restaura desde una copia de seguridad. Sentimos mucho las molestias que esto pueda ocasionarte.</string>
     <string name="favorite">Favorito</string>
     <string name="unfavorite">Eliminar de favoritos</string>
-    <string name="resume_remaining" formatted="true">%s
-\nrestante</string>
+    <string name="resume_remaining" formatted="true">%s \nrestante</string>
     <string name="repo_copy_label">Nombre y URL del repositorio</string>
     <string name="toast_copied">¡Copiado!</string>
     <string name="clipboard_unknown_error">Error al copiar. Por favor, copie el logcat y comuníquese con el soporte de la aplicación.</string>
@@ -609,7 +594,7 @@
     <string name="qr_image">Imagen del código QR</string>
     <string name="dismiss">Descartar</string>
     <string name="open_downloaded_repo">Abrir repositorio</string>
-    <string name="device_pin_url_message">Visita <b> %s </b> en tu smartphone o ordenador e introduce el código anterior</string>
+    <string name="device_pin_url_message">Visita <b>%s</b> en tu smartphone o equipo e introduce el código anterior</string>
     <string name="device_pin_expired_message">¡El código PIN ya ha caducado!</string>
     <string name="device_pin_counter_text">El código caduca en %1$d mín y %2$d s</string>
     <string name="device_pin_error_message">No puedo obtener el código PIN del dispositivo; intente con la autenticación local</string>
@@ -621,24 +606,16 @@
     <string name="hide_player_control_names">Ocultar los nombres de los controles del reproductor</string>
     <string name="sort_release_date_old">Fecha de lanzamiento (antigua a nueva)</string>
     <string name="sort_release_date_new">Fecha de lanzamiento (de nueva a antigua)</string>
-    <string name="delete_message_series_only" formatted="true">¿Estás seguro de que quieres borrar permanentemente todos los episodios de la serie?
-\n
-\n%s</string>
+    <string name="delete_message_series_only" formatted="true">¿Estás seguro de que quieres borrar permanentemente todos los episodios de la serie? \n \n%s</string>
     <string name="downloads_delete_select">Seleccionar elementos para eliminar</string>
     <string name="offline_file">Disponible para visualizar sin conexión</string>
     <string name="select_all">Seleccionar todo</string>
     <string name="deselect_all">Deseleccionar todo</string>
     <string name="delete_files">Borrar archivos</string>
     <string name="delete_format" formatted="true">Borrar (%1$d | %2$s)</string>
-    <string name="delete_message_multiple" formatted="true">¿Seguro que quieres borrar de forma permanente los siguientes elementos?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">¿Estás seguro de que deseas eliminar permanentemente los siguientes episodios en %1$s?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">También borrará permanentemente todos los episodios de las siguientes series:
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">¿Seguro que quieres borrar de forma permanente los siguientes elementos? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">¿Estás seguro de que deseas eliminar permanentemente los siguientes episodios en %1$s? \n \n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">También borrará permanentemente todos los episodios de las siguientes series: \n \n%s</string>
     <string name="preview_seekbar_desc">Activar la previsualización para las miniaturas en la barra de búsqueda</string>
     <string name="preview_seekbar">Previsualización de Seekbar</string>
     <string name="no_subtitles_loaded">Aún no hay subtítulos cargados</string>
@@ -695,9 +672,9 @@
     <string name="overscan_settings">Sobreexploración</string>
     <string name="poster_size_settings_des">Cambios en el tamaño de los pósteres</string>
     <string name="poster_size_settings">Tamaño del póster</string>
-    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d h %2$d m %3$d s</string>
-    <string name="download_time_left_min_sec_format" formatted="true">%1$d m %2$d s</string>
-    <string name="download_time_left_sec_format" formatted="true">%1$d s</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d h %2$d m %3$d s</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$d m %2$d s</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$d s</string>
     <string name="show_rating">Etiqueta de valoración</string>
     <string name="speedup_summary">Mantenga presionado para duplicar la velocidad</string>
     <string name="no_account">Sin cuenta</string>
@@ -756,4 +733,8 @@
         <item quantity="many">%d descargas encoladas</item>
         <item quantity="other">%d descargas encoladas</item>
     </plurals>
+    <string name="show_player_metadata_overlay">Mostrar superposición de metadatos del jugador</string>
+    <string name="video_singular">Vídeo</string>
+    <string name="skip_type_preview">Vista previa</string>
+    <string name="player_is_live">En Vivo</string>
 </resources>
diff --git a/app/src/main/res/values-b+fa/strings.xml b/app/src/main/res/values-b+fa/strings.xml
index 5fa557f08..c74c805dd 100644
--- a/app/src/main/res/values-b+fa/strings.xml
+++ b/app/src/main/res/values-b+fa/strings.xml
@@ -113,8 +113,7 @@
     <string name="type_watching">در حال تماشا</string>
     <string name="title_downloads">بارگیری‌ها</string>
     <string name="player_speed_text_format" formatted="true">سرعت (%.2f برابر)</string>
-    <string name="new_update_format" formatted="true">بروزرسانی جدید پیدا شد!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">بروزرسانی جدید پیدا شد! \n%1$s -&gt; %2$s</string>
     <string name="play_movie_button">پخش فیلم</string>
     <string name="browser">مرورگر</string>
     <string name="play_episode">پخش قسمت</string>
@@ -130,8 +129,7 @@
     <string name="subs_hold_to_reset_to_default">برای بازنشانی به پیشفرض نگه‌دارید</string>
     <string name="library">کتابخانه</string>
     <string name="status_ongoing">در ادامه</string>
-    <string name="delete_message" formatted="true">این فرآیند بطور کامل %s را حذف می‌کند
-\nآیا از این کار اطمینان دارید؟</string>
+    <string name="delete_message" formatted="true">این فرآیند بطور کامل %s را حذف می‌کند \nآیا از این کار اطمینان دارید؟</string>
     <string name="repo_copy_label">نام مخزن و نشانی</string>
     <string name="toast_copied">کپی شد!</string>
     <string name="settings_info">درباره</string>
@@ -180,13 +178,11 @@
     <string name="delete_file">حذف پرونده</string>
     <string name="show_trailers_settings">نمایش تریلر ها</string>
     <string name="episodes">قسمت‌ها</string>
-    <string name="resume_time_left" formatted="true">%dد
-\nباقی‌مانده</string>
+    <string name="resume_time_left" formatted="true">%dد \nباقی‌مانده</string>
     <string name="github">گیتهاب</string>
     <string name="pref_filter_search_quality">پنهان کردن ویدیو مشخص شده از نتایج جستجو</string>
     <string name="cancel">لغو</string>
-    <string name="resume_remaining" formatted="true">%s
-\nباقی‌مانده</string>
+    <string name="resume_remaining" formatted="true">%s \nباقی‌مانده</string>
     <string name="action_default">پیش‌فرض</string>
     <string name="cartoons_singular">کارتون</string>
     <string name="torrent_singular">تورنت</string>
@@ -218,7 +214,7 @@
     <string name="status_completed">تمام‌شده</string>
     <string name="no_subtitles">بدون زیرنویس</string>
     <string name="test_passed">متوقف‌شده</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="open_local_video">باز کردن ویدیو محلی</string>
     <string name="provider_info_meta">متاداده توسط سایت ارائه نشده، اگه در سایت وجود نداشته باشد بارگیری به مشکل می‌خورد .</string>
     <string name="type_on_hold">در انتظار</string>
diff --git a/app/src/main/res/values-b+fr/strings.xml b/app/src/main/res/values-b+fr/strings.xml
index 34bf1393d..0fae7dfd1 100644
--- a/app/src/main/res/values-b+fr/strings.xml
+++ b/app/src/main/res/values-b+fr/strings.xml
@@ -79,8 +79,7 @@
     <string name="cancel">Annuler</string>
     <string name="pause">Pause</string>
     <string name="resume">Reprendre</string>
-    <string name="delete_message">Cela va supprimer définitivement %s
-\nÊtes-vous sûr ?</string>
+    <string name="delete_message">Cela va supprimer définitivement %s \nÊtes-vous sûr ?</string>
     <string name="status_ongoing">En cours</string>
     <string name="status_completed">Terminé</string>
     <string name="status">Statut</string>
@@ -122,8 +121,7 @@
     <string name="update">Mettre à jour</string>
     <string name="dns_pref_summary">Utile pour contourner les bloquages des FAI</string>
     <string name="download_path_pref">Emplacement de téléchargement</string>
-    <string name="new_update_format" formatted="true">Nouvelle mise à jour trouvée !
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Nouvelle mise à jour trouvée ! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Épisode spécial</string>
     <string name="watch_quality_pref">Qualité de visionnage préférée (WiFi)</string>
     <string name="video_buffer_size_settings">Taille de la mémoire cache</string>
@@ -137,7 +135,7 @@
     <string name="display_subbed_dubbed_settings">Afficher les animés en Anglais (Dub) / sous-titrés</string>
     <string name="phone_layout">Disposition en mode téléphone</string>
     <string name="app_dub_sub_episode_text_format">%1$s Ep %2$d</string>
-    <string name="rated_format" formatted="true">Note : %.1f</string>
+    <string name="rated_format" formatted="true">Note : %.1f</string>
     <string name="resize_zoom">Zoom</string>
     <string name="resize_fit">Adapter à l\'écran</string>
     <string name="app_layout">Disposition de l\'application</string>
@@ -145,7 +143,7 @@
     <string name="provider_lang_settings">Langues des extensions</string>
     <string name="preferred_media_settings">Médias préférées</string>
     <string name="automatic">Auto</string>
-    <string name="cast_format">Distribution : %s</string>
+    <string name="cast_format">Distribution : %s</string>
     <string name="duration_format">%d min</string>
     <string name="search_hint_site">Rechercher sur %s…</string>
     <string name="type_re_watching">À re-regarder</string>
@@ -235,7 +233,7 @@
     <string name="continue_watching">Continuer à regarder</string>
     <string name="action_remove_watching">Retirer</string>
     <string name="action_open_watching">Plus d\'informations</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Un VPN peut être nécessaire pour que ce fournisseur fonctionne correctement</string>
     <string name="vpn_torrent">Ce fournisseur est un torrent, un VPN est recommandé</string>
     <string name="provider_info_meta">Les métadonnées ne sont pas fournies par le site, le chargement de la vidéo échouera si elles n\'existent pas sur le site.</string>
@@ -291,8 +289,8 @@
     <string name="lightnovel">Application Light Novel par les mêmes devs</string>
     <string name="anim">Anime app by the same devs</string>
     <string name="discord">Rejoignez le Discord</string>
-    <string name="next_episode_time_hour_format" formatted="true">%1$d h %2$d min</string>
-    <string name="next_episode_time_min_format" formatted="true">%d min</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$d h %2$d min</string>
+    <string name="next_episode_time_min_format" formatted="true">%d min</string>
     <string name="play_with_app_name">Lire avec CloudStream</string>
     <string name="play_livestream_button">Lire en direct</string>
     <string name="skip_type_ed">Fin</string>
@@ -306,9 +304,9 @@
     <string name="skip_type_intro">Intro</string>
     <string name="clear_history">Effacer l\'historique</string>
     <string name="yes">Oui</string>
-    <string name="next_episode_time_day_format" formatted="true">%1$d j %2$d h %3$d min</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$d j %2$d h %3$d min</string>
     <string name="stream">Stream</string>
-    <string name="confirm_exit_dialog">Êtes-vous sûr·e de vouloir quitter ?</string>
+    <string name="confirm_exit_dialog">Êtes-vous sûr·e de vouloir quitter ?</string>
     <string name="no">Non</string>
     <string name="update_notification_downloading">Téléchargement de la mise à jour…</string>
     <string name="next_episode_format" formatted="true">L\'épisode %d sera publié dans</string>
@@ -321,8 +319,7 @@
     <string name="example_site_name">Nouveau Nom du site</string>
     <string name="error_invalid_id">ID invalide</string>
     <string name="automatic_plugin_download_summary">Installer automatiquement les plugins qui sont dans les repository mais qui n\'ont pas encore été installés.</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nrestant</string>
+    <string name="resume_time_left" formatted="true">%dm \nrestant</string>
     <string name="livestreams">En direct</string>
     <string name="others">Autres</string>
     <string name="live_singular">En direct</string>
@@ -363,7 +360,7 @@
     <string name="nsfw">NSFW</string>
     <string name="example_ip">127.0.0.1</string>
     <string name="sync_score_format" formatted="true">%d / 10</string>
-    <string name="sync_total_episodes_none">/??</string>
+    <string name="sync_total_episodes_none">/ ??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="quality_sd">SD</string>
     <string name="quality_uhd">UHD</string>
@@ -375,7 +372,7 @@
     <string name="quality_4k">4K</string>
     <string name="quality_webrip">Web</string>
     <string name="go_back_30">-30</string>
-    <string name="anime_singular">@string/anime</string>
+    <string name="anime_singular">\@string/anime</string>
     <string name="ova_singular">OAV</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="login_format" formatted="true">%1$s %2$s</string>
@@ -409,14 +406,14 @@
     <string name="batch_download_finish_format" formatted="true">Téléchargé %1$d %2$s</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Tous les %s déjà téléchargés</string>
     <string name="setup_extensions_subtext">Télécharger la liste de sites que vous voulez utiliser</string>
-    <string name="plugins_downloaded" formatted="true">Téléchargé : %d</string>
+    <string name="plugins_downloaded" formatted="true">Téléchargé : %d</string>
     <string name="video_tracks">Pistes vidéo</string>
     <string name="apply_on_restart">Redémarrez l\'application pour voir les changements.</string>
     <string name="safe_mode_description">Toutes les extensions ont été désactivé à cause d\'un crash pour vous aider à trouver l\'extension causant le problème.</string>
     <string name="safe_mode_title">Mode sans échec activé</string>
     <string name="extension_size">Taille</string>
     <string name="extension_version">Version</string>
-    <string name="extension_rating" formatted="true">Note : %s</string>
+    <string name="extension_rating" formatted="true">Note : %s</string>
     <string name="extension_description">Description</string>
     <string name="extension_status">Status</string>
     <string name="extension_install_first">Installer l\'extension d\'abord</string>
@@ -432,10 +429,10 @@
     <string name="repository_name_hint">Nom de dépôt (optionnel)</string>
     <string name="plugin_singular">plugin</string>
     <string name="delete_repository">Supprimer le repository</string>
-    <string name="plugins_disabled" formatted="true">Désactivé : %d</string>
-    <string name="plugins_not_downloaded" formatted="true">Non téléchargé : %d</string>
+    <string name="plugins_disabled" formatted="true">Désactivé : %d</string>
+    <string name="plugins_not_downloaded" formatted="true">Non téléchargé : %d</string>
     <string name="plugins_updated" formatted="true">%d plugins mis-à-jour</string>
-    <string name="download_all_plugins_from_repo">Avertissement : CloudStream 3 décline toute responsabilité concernant l’utilisation d’extensions tierces et ne fournit aucun support pour celles-ci !</string>
+    <string name="download_all_plugins_from_repo">Avertissement : CloudStream 3 décline toute responsabilité concernant l’utilisation d’extensions tierces et ne fournit aucun support pour celles-ci !</string>
     <string name="single_plugin_disabled" formatted="true">%s (Désactivé)</string>
     <string name="tracks">Pistes</string>
     <string name="audio_tracks">Pistes audio</string>
@@ -448,9 +445,7 @@
     <string name="apk_installer_package_installer">Installateur de paquet</string>
     <string name="plugin">plugins</string>
     <string name="delete_repository_plugins">Cela supprimera également tous les plugins du repository</string>
-    <string name="blank_repo_message">CloudStream n\'a aucun site installé par défaut. Vous devez installer les sites à partir de dépôts.
-\n
-\nRejoignez notre Discord ou cherchez en ligne.</string>
+    <string name="blank_repo_message">CloudStream n\'a aucun site installé par défaut. Vous devez installer les sites à partir de dépôts. \n \nRejoignez notre Discord ou cherchez en ligne.</string>
     <string name="extension_language">Langage</string>
     <string name="enable_skip_op_from_database_des">Afficher les popups skip pour les intro / fins</string>
     <string name="apk_installer_legacy">Ancienne méthode d\'installation</string>
@@ -479,8 +474,7 @@
     <string name="sort_rating_asc">Note (basse à haute)</string>
     <string name="sort_rating_desc">Note (haut à bas)</string>
     <string name="sort_alphabetical_a">Alphabétique (A à Z)</string>
-    <string name="empty_library_no_accounts_message">Votre bibliothèque est vide :(
-\nConnectez-vous à un compte de bibliothèque ou ajoutez des séries à votre bibliothèque locale.</string>
+    <string name="empty_library_no_accounts_message">Votre bibliothèque est vide :( \nConnectez-vous à un compte de bibliothèque ou ajoutez des séries à votre bibliothèque locale.</string>
     <string name="empty_library_logged_in_message">Cette liste est vide. Essayez d\'en changer.</string>
     <string name="pref_category_android_tv">Android TV</string>
     <string name="sort_by">Trier par</string>
@@ -489,8 +483,7 @@
     <string name="open_with">Ouvrir avec</string>
     <string name="sort_updated_new">Mis à jour (Nouveau vers ancien)</string>
     <string name="sort_updated_old">Mis à jour (ancien vers nouveau)</string>
-    <string name="safe_mode_file">Fichier du mode sans échec trouvé !
-\nAucune extension ne sera chargée au démarrage avant que le fichier ne soit enlevé.</string>
+    <string name="safe_mode_file">Fichier du mode sans échec trouvé ! \nAucune extension ne sera chargée au démarrage avant que le fichier ne soit enlevé.</string>
     <string name="stop">Arrêter</string>
     <string name="revert">Annuler</string>
     <string name="test_log">Enregistrer</string>
@@ -515,13 +508,7 @@
     <string name="jsdelivr_enabled">Impossible d\'atteindre GitHub. Activation du proxy jsDelivr…</string>
     <string name="already_voted">Vous avez déjà voté</string>
     <string name="disable">Désactivé</string>
-    <string name="quality_profile_help">Ici, vous pouvez modifier la façon dont les sources sont ordonnées. Si une vidéo a une priorité plus élevée, elle apparaîtra plus haut dans la sélection de la source. La somme de la priorité source et de la priorité qualité est la priorité vidéo.
-\n
-\nSource A : 3
-\nQualité B : 7
-\nLa priorité vidéo combinée sera de 10.
-\n
-\nREMARQUE : Si la somme est de 10 ou plus, le joueur sautera automatiquement le chargement lorsque ce lien est chargé !</string>
+    <string name="quality_profile_help">Ici, vous pouvez modifier la façon dont les sources sont ordonnées. Si une vidéo a une priorité plus élevée, elle apparaîtra plus haut dans la sélection de la source. La somme de la priorité source et de la priorité qualité est la priorité vidéo. \n \nSource A : 3 \nQualité B : 7 \nLa priorité vidéo combinée sera de 10. \n \nREMARQUE : Si la somme est de 10 ou plus, le joueur sautera automatiquement le chargement lorsque ce lien est chargé !</string>
     <string name="no_plugins_found_error">Aucun plugin trouvé dans ce dossier</string>
     <string name="no_repository_found_error">Dépôt introuvable, vérifiez l\'URL et essayez avec un VPN</string>
     <string name="mobile_data">Données mobiles</string>
@@ -554,20 +541,14 @@
     <string name="pin">PIN</string>
     <string name="favorites_list_name">Favoris</string>
     <string name="logged_account" formatted="true">Connecté en tant que %s</string>
-    <string name="duplicate_message_multiple" formatted="true">Des doublons potentiels ont été trouvés dans votre bibliothèque :
-\n
-\n%s
-\n
-\nSouhaitez-vous ajouter cet élément, remplacer les éléments existants ou annuler l\'action ?</string>
+    <string name="duplicate_message_multiple" formatted="true">Des doublons potentiels ont été trouvés dans votre bibliothèque : \n \n%s \n \nSouhaitez-vous ajouter cet élément, remplacer les éléments existants ou annuler l\'action ?</string>
     <string name="enter_pin_with_name" formatted="true">Saisir le code PIN pour %s</string>
     <string name="duplicate_title">Doublon potentiel trouvé</string>
     <string name="lock_profile">Verrouiller le profil</string>
     <string name="skip_startup_account_select_pref">Ignorer la sélection de compte au démarrage</string>
     <string name="action_unsubscribe">Se désabonner</string>
     <string name="action_subscribe">S\'abonner</string>
-    <string name="duplicate_message_single" formatted="true">Il semble qu\'un élément potentiellement dupliqué existe déjà dans votre bibliothèque : \'%s.
-\n
-\nSouhaitez-vous ajouter cet élément, remplacer l\'élément existant ou annuler l\'action ?</string>
+    <string name="duplicate_message_single" formatted="true">Il semble qu\'un élément potentiellement dupliqué existe déjà dans votre bibliothèque : \'%s. \n \nSouhaitez-vous ajouter cet élément, remplacer l\'élément existant ou annuler l\'action ?</string>
     <string name="enter_current_pin">Saisir le code PIN actuel</string>
     <string name="rotate_video">Pivoter</string>
     <string name="links_reloaded_toast">Les liens ont été rechargés</string>
@@ -580,7 +561,7 @@
     <string name="test_extensions">Testez toutes les extensions</string>
     <string name="recommendations_tooltip">Afficher les recommandations</string>
     <string name="test_extensions_summary">Ce test est destiné uniquement aux développeurs et ne vérifie ni n\'empêche le fonctionnement d\'aucune extension.</string>
-    <string name="toast_copied">Copié !</string>
+    <string name="toast_copied">Copié !</string>
     <string name="repo_copy_label">Nom du dépôt et adresse internet</string>
     <string name="favorite">Favori</string>
     <string name="biometric_warning">Vos données CloudStream viennent d\'être sauvegardées. Bien que cette éventualité soit très faible, tous les appareils peuvent se comporter différemment. Dans le rare cas où l\'accès à l\'application est bloqué, effacez complètement les données de l\'application et restaurez à partir d\'une sauvegarde. Nous sommes sincèrement désolés pour les désagréments occasionnés par cette situation.</string>
@@ -619,10 +600,10 @@
     <string name="open_downloaded_repo">Ouvrir le dépôt</string>
     <string name="device_pin_counter_text">Code expire dans %1$dm %2$ds</string>
     <string name="cs3wiki">Wiki de CloudStream</string>
-    <string name="device_pin_expired_message">Le code PIN est maintenant expiré !</string>
+    <string name="device_pin_expired_message">Le code PIN est maintenant expiré !</string>
     <string name="qr_image">Image du code QR</string>
     <string name="delete_plugin">Supprimer l\'extension</string>
-    <string name="delete_message_multiple" formatted="true">Êtes-vous sûr de vouloir supprimer définitivement les éléments suivants ? \n \n%s</string>
+    <string name="delete_message_multiple" formatted="true">Êtes-vous sûr de vouloir supprimer définitivement les éléments suivants ? \n \n%s</string>
     <string name="auth_locally">Authentification locale</string>
     <string name="sort_release_date_old">Date de sortie (du plus ancien au plus récent)</string>
     <string name="sort_release_date_new">Date de sortie (du plus récent au plus ancien)</string>
@@ -638,9 +619,9 @@
     <string name="pref_category_accounts">Comptes</string>
     <string name="torrent_info">Cette vidéo est un torrent, ce qui signifie que votre activité vidéo peut être suivie.\nAssurez-vous de comprendre le fonctionnement des torrents avant de continuer.</string>
     <string name="dismiss">Ignorer</string>
-    <string name="delete_message_series_section" formatted="true">Vous allez également supprimer définitivement tous les épisodes des séries suivantes :\n\n%s</string>
-    <string name="delete_message_series_only" formatted="true">Êtes-vous sûr de vouloir supprimer définitivement tous les épisodes des séries suivantes ?\n\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">Êtes-vous sûr de vouloir supprimer définitivement les épisodes suivants dans %1$s ?\n\n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Vous allez également supprimer définitivement tous les épisodes des séries suivantes :\n\n%s</string>
+    <string name="delete_message_series_only" formatted="true">Êtes-vous sûr de vouloir supprimer définitivement tous les épisodes des séries suivantes ?\n\n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Êtes-vous sûr de vouloir supprimer définitivement les épisodes suivants dans %1$s ?\n\n%2$s</string>
     <string name="episode_action_cast_mirror">Recopier l’écran</string>
     <string name="no_subtitles_loaded">Aucun sous-titre n’a encore été chargé</string>
     <string name="backup_path_title">Emplacement du dossier de sauvegarde</string>
@@ -660,7 +641,7 @@
     <string name="sort_button_rating">Note %s</string>
     <string name="sort_button_date">Date %s</string>
     <string name="update_plugins">Mettre à jour les plugins</string>
-    <string name="plugins_updated_manually">%d plugin(s) mis à jour avec succès !</string>
+    <string name="plugins_updated_manually">%d plugin(s) mis à jour avec succès !</string>
     <string name="no_plugins_updated_manually">Aucun plugin n\'a été mis à jour.</string>
     <string name="sort_episodes_rating_high_low">Note (Plus Haute)</string>
     <string name="update_plugins_manually">Mettre à jour les plugins manuellement</string>
@@ -671,7 +652,7 @@
     <string name="player_notification_channel_description">La notification du lecteur pour contrôler la lecture en arrière-plan</string>
     <string name="sort_episodes_date_newest">Date (Plus Récent)</string>
     <string name="sort_episodes_rating_low_high">Note (Plus Basse)</string>
-    <string name="starting_plugin_update_manually">Démarrage du processus de mise à jour du plugin !</string>
+    <string name="starting_plugin_update_manually">Démarrage du processus de mise à jour du plugin !</string>
     <string name="subtitles_from_embedded">Intégré</string>
     <string name="subtitles_from_online">En ligne</string>
     <string name="speech_recognition_unavailable">La reconnaissance vocale n\'est pas disponible</string>
@@ -741,8 +722,8 @@
     <string name="source_priority_help">Déterminez comment les sources vidéo seront triées dans le lecteur</string>
     <string name="download_all">Télécharger tout</string>
     <string name="cancel_all">Tout annuler</string>
-    <string name="download_episode_range">Voulez-vous télécharger l\'épisode %s ?</string>
-    <string name="cancel_queue_message">Vous voulez annuler tous les téléchargements en file d\'attente ?</string>
+    <string name="download_episode_range">Voulez-vous télécharger l\'épisode %s ?</string>
+    <string name="cancel_queue_message">Vous voulez annuler tous les téléchargements en file d\'attente ?</string>
     <plurals name="downloads_active">
         <item quantity="one">%d téléchargement actif</item>
         <item quantity="many">%d téléchargements actifs</item>
@@ -754,4 +735,7 @@
         <item quantity="other">%d téléchargements en attente</item>
     </plurals>
     <string name="show_player_metadata_overlay">Afficher les métadata de l\'overlay du lecteur vidéo</string>
+    <string name="video_singular">Vidéo</string>
+    <string name="skip_type_preview">Prévisualisation</string>
+    <string name="player_is_live">Direct</string>
 </resources>
diff --git a/app/src/main/res/values-b+gl/strings.xml b/app/src/main/res/values-b+gl/strings.xml
index ede5fd0dc..4870538a0 100644
--- a/app/src/main/res/values-b+gl/strings.xml
+++ b/app/src/main/res/values-b+gl/strings.xml
@@ -13,8 +13,7 @@
     <string name="episode_poster_img_des">Póster do Episodio</string>
     <string name="go_back_img_des">Regresar</string>
     <string name="home_change_provider_img_des">Cambiar provedor</string>
-    <string name="new_update_format" formatted="true">Nova actualización atopada!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Nova actualización atopada! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Recheo</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="title_settings">Configuración</string>
@@ -89,7 +88,7 @@
     <string name="subs_import_text" formatted="true">Importar fontes colocandoas en %s</string>
     <string name="action_remove_watching">Borrar</string>
     <string name="action_open_watching">Máis Info</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Unha VPN pode ser necesaria para o correcto funcionamento deste provedor</string>
     <string name="vpn_torrent">Este proveedor é un torrent, recomendase o uso dunha VPN</string>
     <string name="provider_info_meta">Os metadatos non son proporcionados polo sitio, a carga do video fallará se non existe no sitio</string>
diff --git a/app/src/main/res/values-b+hi/strings.xml b/app/src/main/res/values-b+hi/strings.xml
index c9030a00a..f15051e74 100644
--- a/app/src/main/res/values-b+hi/strings.xml
+++ b/app/src/main/res/values-b+hi/strings.xml
@@ -2,8 +2,7 @@
 <resources>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">स्पीड (%.2fx)</string>
-    <string name="new_update_format" formatted="true">नया अपडेट आया है!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">नया अपडेट आया है! \n%1$s -&gt; %2$s</string>
     <string name="title_home">होम</string>
     <string name="title_search">खोजें</string>
     <string name="title_downloads">डाउनलोडस</string>
@@ -87,8 +86,7 @@
     <string name="cancel">रद्द करें</string>
     <string name="pause">रोकें</string>
     <string name="resume">फिर से चलाएं</string>
-    <string name="delete_message">इससे %s स्थायी रूप से हट जाएगा
-\nक्या आपका निर्णय निश्चित है ?</string>
+    <string name="delete_message">इससे %s स्थायी रूप से हट जाएगा \nक्या आपका निर्णय निश्चित है ?</string>
     <string name="status_ongoing">अभी चालू है</string>
     <string name="status_completed">मुकम्मल हुया</string>
     <string name="status">स्थिति</string>
@@ -153,11 +151,7 @@
     <string name="duration_format" formatted="true">%d मिनट</string>
     <string name="app_name">क्लाउडस्ट्रीम</string>
     <string name="play_with_app_name">क्लाउडस्ट्रीम के साथ चलाएं</string>
-    <string name="duplicate_message_multiple" formatted="true">आपकी लाइब्रेरी में संभावित डुप्लिकेट आइटम पाए गए हैं:
-\n
-\n%s
-\n
-\nक्या आप किसी भी तरह इस आइटम को जोड़ना चाहेंगे, मौजूदा आइटम को बदलना चाहेंगे, या कार्रवाई रद्द करना चाहेंगे?</string>
+    <string name="duplicate_message_multiple" formatted="true">आपकी लाइब्रेरी में संभावित डुप्लिकेट आइटम पाए गए हैं: \n \n%s \n \nक्या आप किसी भी तरह इस आइटम को जोड़ना चाहेंगे, मौजूदा आइटम को बदलना चाहेंगे, या कार्रवाई रद्द करना चाहेंगे?</string>
     <string name="enter_pin_with_name" formatted="true">%s के लिए पिन दर्ज करें</string>
     <string name="duplicate_title">संभावित डुप्लिकेट मिला</string>
     <string name="update_started">अपडेट शुरू हुआ</string>
@@ -177,9 +171,7 @@
     <string name="select_an_account">अकाउंट चुनिये</string>
     <string name="skip_loading">लोडिंग स्किप करे</string>
     <string name="loading">लोडिंग…</string>
-    <string name="duplicate_message_single" formatted="true">ऐसा प्रतीत होता है कि संभावित रूप से डुप्लिकेट आइटम आपकी लाइब्रेरी में पहले से मौजूद है: \'%s.\'
-\n
-\nक्या आप किसी भी तरह इस आइटम को जोड़ना चाहेंगे, मौजूदा आइटम को बदलना चाहेंगे, या कार्रवाई रद्द करना चाहेंगे?</string>
+    <string name="duplicate_message_single" formatted="true">ऐसा प्रतीत होता है कि संभावित रूप से डुप्लिकेट आइटम आपकी लाइब्रेरी में पहले से मौजूद है: \'%s.\' \n \nक्या आप किसी भी तरह इस आइटम को जोड़ना चाहेंगे, मौजूदा आइटम को बदलना चाहेंगे, या कार्रवाई रद्द करना चाहेंगे?</string>
     <string name="enter_pin">पिन दर्ज करें</string>
     <string name="pin">पिन</string>
     <string name="links_reloaded_toast">लिंक पुन्ह खुली</string>
@@ -312,7 +304,7 @@
     <string name="custom_media_singular">मीडिया</string>
     <string name="pref_filter_search_quality">खोज परिणामों में चयनित वीडियो गुणवत्ता छुपाएं</string>
     <string name="episodes_range">%1$d-%2$d</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="double_tap_to_seek_amount_settings">प्लेयर में आगे पीछे जाने का समय (सेकंड्स)</string>
     <string name="automatic_plugin_download_summary">जोड़े गए रिपॉजिटरीज से अभी तक इंस्टॉल नहीं किए गए सभी प्लगइन्स को स्वचालित रूप से इंस्टॉल करें।</string>
     <string name="speech_recognition_unavailable">वाक् पहचान उपलब्ध नहीं है</string>
diff --git a/app/src/main/res/values-b+hr/strings.xml b/app/src/main/res/values-b+hr/strings.xml
index c2c0379f5..c5c95be82 100644
--- a/app/src/main/res/values-b+hr/strings.xml
+++ b/app/src/main/res/values-b+hr/strings.xml
@@ -19,8 +19,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Brzina (%.2f×)</string>
     <string name="rated_format" formatted="true">Ocjena: %.1f</string>
-    <string name="new_update_format" formatted="true">Pronađeno je novo ažuriranje!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Pronađeno je novo ažuriranje! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Umetak</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_name">CloudStream</string>
@@ -106,7 +105,7 @@
     <string name="continue_watching">Nastavi gledati</string>
     <string name="action_remove_watching">Ukloni</string>
     <string name="action_open_watching">Više informacija</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Za ispravan rad ovog pružatelja usluga je možda potreban VPN</string>
     <string name="vpn_torrent">Ovaj pružatelj usluga je torrent, preporučuje se VPN</string>
     <string name="provider_info_meta">Stranica ne sadrži metapodatke. Učitavanje videa neće uspjeti ako ne postoje na stranici.</string>
@@ -186,10 +185,8 @@
     <string name="resume">Nastavi</string>
     <string name="go_back_30">−30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Ovo će trajno izbrisati %s
-\nJeste li sigurni?</string>
-    <string name="resume_time_left" formatted="true">%dmin
-\npreostalo</string>
+    <string name="delete_message" formatted="true">Ovo će trajno izbrisati %s \nJeste li sigurni?</string>
+    <string name="resume_time_left" formatted="true">%dmin \npreostalo</string>
     <string name="status_ongoing">U tijeku</string>
     <string name="status_completed">Završeno</string>
     <string name="status">Status</string>
@@ -411,9 +408,7 @@
     <string name="plugins_downloaded" formatted="true">Preuzeto: %d</string>
     <string name="plugins_disabled" formatted="true">Onemogućeno: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Nepreuzeto: %d</string>
-    <string name="blank_repo_message">CloudStream standardno nema instalirane web stranice. Stranice morate instalirati iz repozitorija.
-\n
-\nPridružite se našem Discordu ili tražite online.</string>
+    <string name="blank_repo_message">CloudStream standardno nema instalirane web stranice. Stranice morate instalirati iz repozitorija. \n \nPridružite se našem Discordu ili tražite online.</string>
     <string name="view_public_repositories_button">Prikaži repozitorije zajednice</string>
     <string name="view_public_repositories_button_short">Javni popis</string>
     <string name="uppercase_all_subtitles">Koristi velika slova za sve titlove</string>
@@ -498,11 +493,9 @@
     <string name="sort_alphabetical_z">Abecedno (Ž do A)</string>
     <string name="select_library">Odaberite biblioteku</string>
     <string name="open_with">Otvori sa</string>
-    <string name="empty_library_no_accounts_message">Vaša je biblioteka prazna :(
-\nPrijavite se na račun biblioteke ili dodajte filmove / serije u svoju lokalnu biblioteku.</string>
+    <string name="empty_library_no_accounts_message">Vaša je biblioteka prazna :( \nPrijavite se na račun biblioteke ili dodajte filmove / serije u svoju lokalnu biblioteku.</string>
     <string name="empty_library_logged_in_message">Ova je lista prazna. Pokušajte se prebaciti na jednu drugu listu.</string>
-    <string name="safe_mode_file">Pronađena je datoteka sigurnog načina rada!
-\nProširenja se ne učitavaju tijekom pokretanja dok se datoteka ne ukloni.</string>
+    <string name="safe_mode_file">Pronađena je datoteka sigurnog načina rada! \nProširenja se ne učitavaju tijekom pokretanja dok se datoteka ne ukloni.</string>
     <string name="android_tv_interface_on_seek_settings">Prikazan player – Količina pomicanja</string>
     <string name="android_tv_interface_on_seek_settings_summary">Količina pomicanja koja se koristi kada je player vidljiv</string>
     <string name="android_tv_interface_off_seek_settings">Player skriven – Količina pomicanja</string>
@@ -541,23 +534,13 @@
     <string name="disable">Onemogući</string>
     <string name="no_plugins_found_error">U repozitoriju nisu pronađeni dodaci</string>
     <string name="no_repository_found_error">Repozitorij nije pronađen. Provjeri URL i pokušaj VPN</string>
-    <string name="quality_profile_help">Ovdje možete promijeniti način na koji su izvori poredani. Ako video ima viši prioritet, pojavit će se više u odabiru izvora. Zbroj prioriteta izvora i prioriteta kvalitete je prioritet videa.
-\n
-\nIzvor A: 3
-\nKvaliteta B: 7
-\nImat će kombinirani prioritet videa od 10.
-\n
-\nNAPOMENA: Ako je zbroj 10 ili više, video player će automatski preskočiti učitavanje kada se ta poveznica učita!</string>
+    <string name="quality_profile_help">Ovdje možete promijeniti način na koji su izvori poredani. Ako video ima viši prioritet, pojavit će se više u odabiru izvora. Zbroj prioriteta izvora i prioriteta kvalitete je prioritet videa. \n \nIzvor A: 3 \nKvaliteta B: 7 \nImat će kombinirani prioritet videa od 10. \n \nNAPOMENA: Ako je zbroj 10 ili više, video player će automatski preskočiti učitavanje kada se ta poveznica učita!</string>
     <string name="already_voted">Već si glasao/la</string>
     <string name="backup_frequency">Učestalost spremanja sigurnosne kopije</string>
     <string name="favorite_removed">%s uklonjeno iz favorita</string>
     <string name="favorites_list_name">Favoriti</string>
     <string name="favorite_added">%s dodano u favorite</string>
-    <string name="duplicate_message_multiple" formatted="true">Potencijalni duplikati pronađeni su u vašoj biblioteci:
-\n
-\n%s
-\n
-\nŽelite li ipak dodati ovu stavku koja zamjenjuje postojeće ili poništiti radnju?</string>
+    <string name="duplicate_message_multiple" formatted="true">Potencijalni duplikati pronađeni su u vašoj biblioteci: \n \n%s \n \nŽelite li ipak dodati ovu stavku koja zamjenjuje postojeće ili poništiti radnju?</string>
     <string name="duplicate_title">Pronađen potencijalni duplikat</string>
     <string name="lock_profile">Zaključaj profil</string>
     <string name="action_add_to_favorites">Dodaj u favorite</string>
@@ -570,9 +553,7 @@
     <string name="action_subscribe">Pretplata</string>
     <string name="action_remove_from_favorites">Ukloni iz favorita</string>
     <string name="select_an_account">Odaberite račun</string>
-    <string name="duplicate_message_single" formatted="true">Čini se da potencijalno duplicirana stavka već postoji u vašoj biblioteci: \'%s.\'
-\n
-\nŽelite li ipak dodati ovu stavku koja zamjenjuje postojeću ili poništiti radnju?</string>
+    <string name="duplicate_message_single" formatted="true">Čini se da potencijalno duplicirana stavka već postoji u vašoj biblioteci: \'%s.\' \n \nŽelite li ipak dodati ovu stavku koja zamjenjuje postojeću ili poništiti radnju?</string>
     <string name="enter_pin">Unesite PIN</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">Unesite trenutni PIN</string>
@@ -596,8 +577,7 @@
     <string name="repo_copy_label">Ime repozitorija i URL</string>
     <string name="toast_copied">kopirano!</string>
     <string name="biometric_setting">Zaključaj s biometrijskim podatcima</string>
-    <string name="resume_remaining" formatted="true">%s
-\npreostalo</string>
+    <string name="resume_remaining" formatted="true">%s \npreostalo</string>
     <string name="clipboard_permission_error">Pogreška pri pristupanju međuspremnika. Pokušaj ponovo.</string>
     <string name="biometric_authentication_title">Otključaj CloudStream</string>
     <string name="password_pin_authentication_title">Lozinka/PIN autentifikacija</string>
@@ -616,7 +596,7 @@
     <string name="biometric_setting_summary">Otključaj aplikaciju pomoću otiska prsta, ID-a lica, PIN-a, uzorka i lozinke.</string>
     <string name="episode_upcoming_format" formatted="true">Sljedeća u %s</string>
     <string name="clipboard_unknown_error">Pogreška pri kopiranju. Kopirajte zapisnik i kontaktirajte podršku aplikacije.</string>
-    <string name="battery_dialog_message">Da biste osigurali neprekinuta preuzimanja i obavijesti za pretplaćene TV emisije, CloudStream treba dopuštenje za rad u pozadini. Pritiskom na \"U redu\" prikazat će vam se dijaloški okvir s zahtjevom. Molimo vas da pritisnete \"Dopusti\".  \n\nNapominjemo da ovo dopuštenje ne znači da će CS3 trošiti vašu bateriju. Aplikacija će raditi u pozadini samo kada je to potrebno, primjerice prilikom primanja obavijesti ili preuzimanja videozapisa iz službenih proširenja.</string>
+    <string name="battery_dialog_message">Da biste osigurali neprekinuta preuzimanja i obavijesti za pretplaćene TV emisije, CloudStream treba dopuštenje za rad u pozadini. Pritiskom na \"U redu\" prikazat će vam se dijaloški okvir s zahtjevom. Molimo vas da pritisnete \"Dopusti\". \n\nNapominjemo da ovo dopuštenje ne znači da će CS3 trošiti vašu bateriju. Aplikacija će raditi u pozadini samo kada je to potrebno, primjerice prilikom primanja obavijesti ili preuzimanja videozapisa iz službenih proširenja.</string>
     <string name="biometric_warning">Vaši CloudStream podaci su sada spremljeni u sigurnosnu kopiju. Iako je vjerojatnost mala, neki se uređaji mogu ponašati drugačije. Ako izgubite pristup aplikaciji, potpuno izbrišite podatke aplikacije i obnovite ih pomoću sigurnosne kopije. Ispričavamo se zbog mogućih neugodnosti.</string>
     <string name="next_season_episode_format" formatted="true">Sezona %1$d epizoda %2$d izlazi za</string>
     <string name="episode_action_cast_mirror">Cast duplikat</string>
@@ -642,22 +622,14 @@
     <string name="delete_plugin">Izbriši dodatak</string>
     <string name="offline_file">Dostupno za gledanje offline</string>
     <string name="select_all">Označi sve</string>
-    <string name="delete_message_multiple" formatted="true">Stvarno želite trajno izbrisati sljedeće stavke?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">Stvarno želite trajno izbrisati sljedeće epizode u %1$s?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">Trajno ćete izbrisati i sve epizode u sljedećim serijama:
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Stvarno želite trajno izbrisati sljedeće stavke? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Stvarno želite trajno izbrisati sljedeće epizode u %1$s? \n \n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Trajno ćete izbrisati i sve epizode u sljedećim serijama: \n \n%s</string>
     <string name="downloads_delete_select">Odaberi stavke za brisanje</string>
     <string name="deselect_all">Odznači sve</string>
     <string name="delete_format" formatted="true">Izbriši (%1$d | %2$s)</string>
     <string name="delete_files">Izbriši datoteke</string>
-    <string name="delete_message_series_only" formatted="true">Stvarno želite trajno izbrisati sve epizode u sljedećoj seriji?
-\n
-\n%s</string>
+    <string name="delete_message_series_only" formatted="true">Stvarno želite trajno izbrisati sve epizode u sljedećoj seriji? \n \n%s</string>
     <string name="no_subtitles_loaded">Još nije učitan nijedan titl</string>
     <string name="preview_seekbar">Pretpregled trake za traženje</string>
     <string name="preview_seekbar_desc">Omogući minijaturu pregleda na traci za pretraživanje</string>
@@ -749,7 +721,7 @@
     <string name="top_center">Gore u sredini</string>
     <string name="top_right">Gore desno</string>
     <string name="extra_brightness_settings">Dodatna svjetlina</string>
-    <string name="extra_brightness_settings_des">Uključi filtar svjetline kada se prekorači 100 % svjetline ekrana</string>
+    <string name="extra_brightness_settings_des">Uključi filtar svjetline kada se prekorači 100 % svjetline ekrana</string>
     <string name="extra_brightness_key">dodatna_svjetlina_uključena</string>
     <string name="search_suggestions">Prijedlozi za pretraživanje</string>
     <string name="search_suggestions_des">Prikaži prijedloge za pretraživanje tijekom tipkanja</string>
@@ -775,4 +747,8 @@
     <string name="download_episode_range">Želiš li preuzeti epizodu %s?</string>
     <string name="cancel_queue_message">Želiš li otkazati sva preuzimanja u redu čekanja?</string>
     <string name="show_cast_in_details">Prikaži ploču glumačke postave</string>
+    <string name="video_singular">Video</string>
+    <string name="skip_type_preview">Pregled</string>
+    <string name="player_is_live">Uživo</string>
+    <string name="show_player_metadata_overlay">Prikaži sloj metapodataka playera</string>
 </resources>
diff --git a/app/src/main/res/values-b+hu/strings.xml b/app/src/main/res/values-b+hu/strings.xml
index c50b18133..f35067fbb 100644
--- a/app/src/main/res/values-b+hu/strings.xml
+++ b/app/src/main/res/values-b+hu/strings.xml
@@ -10,8 +10,7 @@
     <string name="home_change_provider_img_des">Szolgáltató Váltás</string>
     <string name="player_speed_text_format" formatted="true">Sebesség (%.2fx)</string>
     <string name="rated_format" formatted="true">Értékelés: %.1f</string>
-    <string name="new_update_format" formatted="true">Új frissítés található!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Új frissítés található! \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d perc</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$sEp%2$d</string>
     <string name="app_name">CloudStream</string>
@@ -109,7 +108,7 @@
     <string name="subs_import_text" formatted="true">Betűtípusok importálása %s</string>
     <string name="action_remove_watching">Eltávolítás</string>
     <string name="action_open_watching">Több információ</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">VPN szükséges lehet ehhez a szolgáltató megfelelő működéséhez</string>
     <string name="vpn_torrent">Ez a szolgáltató torrent, VPN ajánlott</string>
     <string name="torrent_plot">Leírás</string>
@@ -149,8 +148,7 @@
     <string name="episode_short">Ep</string>
     <string name="no_episodes_found">Nem található epizód</string>
     <string name="delete_file">Fájl törlése</string>
-    <string name="resume_time_left" formatted="true">%dp
-\nhátra</string>
+    <string name="resume_time_left" formatted="true">%dp \nhátra</string>
     <string name="duration">Időtartam</string>
     <string name="free_storage">Elérhető</string>
     <string name="used_storage">Használatban</string>
@@ -206,8 +204,7 @@
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="no_season">Nincs évad</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Ezzel véglegesen törli a %s
-\nBiztosan törli?</string>
+    <string name="delete_message" formatted="true">Ezzel véglegesen törli a %s \nBiztosan törli?</string>
     <string name="status_ongoing">Folyamatban levő</string>
     <string name="year">Év</string>
     <string name="site">Webhely</string>
@@ -323,8 +320,7 @@
     <string name="extension_types">Támogatott</string>
     <string name="update_notification_downloading">Alkalmazásfrissítés letöltése…</string>
     <string name="sort_updated_new">Frissítve (újabbtól a régebbihez)</string>
-    <string name="empty_library_no_accounts_message">Úgy tűnik, a könyvtárad üres :(
-\nJelentkezz be egy könyvtár fiókba, vagy adj hozzá műsorokat a helyi könyvtárodhoz.</string>
+    <string name="empty_library_no_accounts_message">Úgy tűnik, a könyvtárad üres :( \nJelentkezz be egy könyvtár fiókba, vagy adj hozzá műsorokat a helyi könyvtárodhoz.</string>
     <string name="empty_library_logged_in_message">Úgy tűnik, ez a lista üres, próbálj meg egy másikra váltani.</string>
     <string name="max">Max</string>
     <string name="quality_4k">4K</string>
@@ -416,9 +412,7 @@
     <string name="subtitles_remove_captions">Zárt feliratok eltávolítása a feliratokból</string>
     <string name="is_adult">18+</string>
     <string name="delete_repository_plugins">Ez az összes tároló bővítményt is törli</string>
-    <string name="blank_repo_message">A CloudStream alapértelmezés szerint nem telepített webhelyeket. A webhelyeket a tárolókból kell telepítenie.
-\n
-\nCsatlakozz a Discord-unkhoz vagy keress online.</string>
+    <string name="blank_repo_message">A CloudStream alapértelmezés szerint nem telepített webhelyeket. A webhelyeket a tárolókból kell telepítenie. \n \nCsatlakozz a Discord-unkhoz vagy keress online.</string>
     <string name="extension_version">Verzió</string>
     <string name="action_mark_as_watched">Megjelölés megtekintettként</string>
     <string name="action_remove_from_watched">Eltávolítás a megnézettek közül</string>
@@ -472,8 +466,7 @@
     <string name="skip_type_credits">Közreműködők</string>
     <string name="sort_alphabetical_z">Betűrendben (Z-től az A-ig)</string>
     <string name="select_library">Könyvtár kiválasztása</string>
-    <string name="safe_mode_file">Biztonságos módú fájlba ütköztünk!
-\nNem töltődik be semmilyen kiegészítő indításkor, amíg a fájl nem kerül törlésre.</string>
+    <string name="safe_mode_file">Biztonságos módú fájlba ütköztünk! \nNem töltődik be semmilyen kiegészítő indításkor, amíg a fájl nem kerül törlésre.</string>
     <string name="normal">Normál</string>
     <string name="player_loaded_subtitles" formatted="true">%s betöltve</string>
     <string name="skip_setup">Beállítás kihagyása</string>
@@ -536,18 +529,8 @@
     <string name="profiles">Profilok</string>
     <string name="action_remove_from_favorites">Eltávolítás kedvencekből</string>
     <string name="enter_current_pin">Adja meg a jelenlegi PIN-t</string>
-    <string name="quality_profile_help">Itt beállíthatja hogyan rendezze el a forrásokat. Ha egy videónak nagyobb a prioritása, előbb fog megjelenni a listában. A forrás prioritás és a minőség prioritás együttes értéke adja ki a videó prioritást.
-\n
-\nForrás A: 3
-\nMinőség B: 7
-\nEzek összértéke egy 10-es videó prioritást eredményez.
-\n
-\nFIGYELEM: Ha az összeg több mint 10, a lejátszó nem tölt be mást ha már a link betöltésre került!</string>
-    <string name="duplicate_message_multiple" formatted="true">Potenciálisan dupla elemek a könyvtárjában:
-\n
-\n%s
-\n
-\nSzeretné hozzáadni ezt az elemet mindenképpen, ezzel felülírva a jelenlegit, vagy visszavonja a műveletet?</string>
+    <string name="quality_profile_help">Itt beállíthatja hogyan rendezze el a forrásokat. Ha egy videónak nagyobb a prioritása, előbb fog megjelenni a listában. A forrás prioritás és a minőség prioritás együttes értéke adja ki a videó prioritást. \n \nForrás A: 3 \nMinőség B: 7 \nEzek összértéke egy 10-es videó prioritást eredményez. \n \nFIGYELEM: Ha az összeg több mint 10, a lejátszó nem tölt be mást ha már a link betöltésre került!</string>
+    <string name="duplicate_message_multiple" formatted="true">Potenciálisan dupla elemek a könyvtárjában: \n \n%s \n \nSzeretné hozzáadni ezt az elemet mindenképpen, ezzel felülírva a jelenlegit, vagy visszavonja a műveletet?</string>
     <string name="skip_startup_account_select_pref">Fiók választás kihagyása belépéskor</string>
     <string name="use_default_account">Használjon alapértelmezett fiókot</string>
     <string name="rotate_video">Elforgatás</string>
@@ -556,9 +539,7 @@
     <string name="favorite_added">%s hozzáadva a kedvencekhez</string>
     <string name="favorite_removed">%s eltávolítva a kedvencekből</string>
     <string name="action_add_to_favorites">Hozzáadás a kedvencekhez</string>
-    <string name="duplicate_message_single" formatted="true">Úgy tűnik egy potenciálisan dupla elem már létezik a könyvtárjában: \'%s.\'
-\n
-\nMindenképpen hozzá akarja adni ezt az elemet, ezzel felülírva a régit, vagy visszavonja a műveletet?</string>
+    <string name="duplicate_message_single" formatted="true">Úgy tűnik egy potenciálisan dupla elem már létezik a könyvtárjában: \'%s.\' \n \nMindenképpen hozzá akarja adni ezt az elemet, ezzel felülírva a régit, vagy visszavonja a műveletet?</string>
     <string name="enter_pin">Adja meg a PIN-t</string>
     <string name="lock_profile">Profil Zárolása</string>
     <string name="select_an_account">Válasszon egy fiókot</string>
diff --git a/app/src/main/res/values-b+in/strings.xml b/app/src/main/res/values-b+in/strings.xml
index 9c4c7fc11..bfb9691bf 100644
--- a/app/src/main/res/values-b+in/strings.xml
+++ b/app/src/main/res/values-b+in/strings.xml
@@ -97,7 +97,7 @@
     <string name="continue_watching">Lanjutkan Menonton</string>
     <string name="action_remove_watching">Hapus</string>
     <string name="action_open_watching">Lebih banyak info</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">VPN mungkin diperlukan agar penyedia ini bisa bekerja dengan baik</string>
     <string name="vpn_torrent">Penyedia ini adalah torrent, VPN direkomendasikan</string>
     <string name="provider_info_meta">Metadata tidak disediakan oleh situs, pemuatan video akan gagal jika tidak ada di situs.</string>
@@ -169,10 +169,8 @@
     <string name="resume">Lanjutkan</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Ini akan secara permanen menghapus %s
-\nApakah anda yakin?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\ntersisa</string>
+    <string name="delete_message" formatted="true">Ini akan secara permanen menghapus %s \nApakah anda yakin?</string>
+    <string name="resume_time_left" formatted="true">%dm \ntersisa</string>
     <string name="status_ongoing">Masih Berlanjut</string>
     <string name="status_completed">Tamat</string>
     <string name="status">Status</string>
@@ -390,9 +388,7 @@
     <string name="plugins_updated" formatted="true">%d plugin diperbarui</string>
     <string name="view_public_repositories_button">Lihat repositori komunitas</string>
     <string name="view_public_repositories_button_short">Daftar publik</string>
-    <string name="blank_repo_message">CloudStream tidak memiliki situs yang terinstal secara default. Anda perlu menginstal situs-situs dari repositori.
-\n
-\nBergabunglah dengan Discord kami atau cari secara online.</string>
+    <string name="blank_repo_message">CloudStream tidak memiliki situs yang terinstal secara default. Anda perlu menginstal situs-situs dari repositori. \n \nBergabunglah dengan Discord kami atau cari secara online.</string>
     <string name="repository_url_hint">URL Repositori atau Kode Pendek</string>
     <string name="create_account">Buat Akun</string>
     <string name="error">Error</string>
@@ -487,8 +483,7 @@
     <string name="action_remove_from_watched">Hapus dari tontonan</string>
     <string name="browser">Peramban</string>
     <string name="select_library">Pilih pustaka</string>
-    <string name="empty_library_no_accounts_message">Yahh daftar pustaka kamu kosong :(
-\nMasuk ke akun pustaka atau tambah perlihatkan ke lokal pustaka kamu.</string>
+    <string name="empty_library_no_accounts_message">Yahh daftar pustaka kamu kosong :( \nMasuk ke akun pustaka atau tambah perlihatkan ke lokal pustaka kamu.</string>
     <string name="library">Pustaka</string>
     <string name="sort_by">Urutkan berdasarkan</string>
     <string name="sort">Urutkan</string>
@@ -500,8 +495,7 @@
     <string name="sort_alphabetical_z">Abjad (Z ke A)</string>
     <string name="open_with">Buka dengan</string>
     <string name="empty_library_logged_in_message">Yahh daftar ini kosong. Coba ganti ke yang lain.</string>
-    <string name="safe_mode_file">Mode aman file ditemukan!
-\nTidak memuat ekstensi pada startup sampai berkas dihapus.</string>
+    <string name="safe_mode_file">Mode aman file ditemukan! \nTidak memuat ekstensi pada startup sampai berkas dihapus.</string>
     <string name="android_tv_interface_off_seek_settings">Sembunyikan Pemutaran - Geser</string>
     <string name="android_tv_interface_on_seek_settings">Pemutar terlihat - Geser</string>
     <string name="android_tv_interface_on_seek_settings_summary">Geser untuk menghilangkan</string>
@@ -527,13 +521,7 @@
     <string name="watch_quality_pref_data">Kualitas nonton yang diinginkan (Data Seluler)</string>
     <string name="mobile_data">Data seluler</string>
     <string name="help">Bantuan</string>
-    <string name="quality_profile_help">Di sini anda dapat mengubah sumber yang diurutkan. Jika video memiliki prioritas lebih tinggi, video tersebut akan muncul lebih tinggi dalam pemilihan sumber. Jumlah prioritas sumber dan prioritas kualitas adalah prioritas video.
-\n
-\nSumber A: 3
-\nKualitas B: 7
-\nAkan memiliki prioritas video yang digabung 10.
-\n
-\nCATATAN: Jika jumlahnya 10 atau lebih, pemain akan melewatkan pemuatan secara otomatis saat tautan dimuat!</string>
+    <string name="quality_profile_help">Di sini anda dapat mengubah sumber yang diurutkan. Jika video memiliki prioritas lebih tinggi, video tersebut akan muncul lebih tinggi dalam pemilihan sumber. Jumlah prioritas sumber dan prioritas kualitas adalah prioritas video. \n \nSumber A: 3 \nKualitas B: 7 \nAkan memiliki prioritas video yang digabung 10. \n \nCATATAN: Jika jumlahnya 10 atau lebih, pemain akan melewatkan pemuatan secara otomatis saat tautan dimuat!</string>
     <string name="profile_number">Profil %d</string>
     <string name="wifi">Wifi</string>
     <string name="set_default">Pengaturan default</string>
@@ -593,8 +581,7 @@
     <string name="biometric_prompt_description">Setelah beberapa kali gagal, perintah akan ditutup. Cukup mulai ulang aplikasi untuk mencoba lagi.</string>
     <string name="unfavorite">Batalkan favorit</string>
     <string name="biometric_authentication_title">Buka kunci CloudStream</string>
-    <string name="resume_remaining" formatted="true">%s
-\ntersisa</string>
+    <string name="resume_remaining" formatted="true">%s \ntersisa</string>
     <string name="favorite">Favorit</string>
     <string name="biometric_setting">Kunci dengan Biometrik</string>
     <string name="repo_copy_label">Nama dan URL repositori</string>
@@ -638,18 +625,10 @@
     <string name="select_all">Pilih Semua</string>
     <string name="deselect_all">Batal Pilih Semua</string>
     <string name="delete_files">Hapus File</string>
-    <string name="delete_message_multiple" formatted="true">Apakah Anda yakin ingin menghapus item berikut secara permanen?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">Apakah Anda yakin ingin menghapus episode berikut di %1$s secara permanen?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">Anda juga akan menghapus semua episode dalam seri berikut secara permanen:
-\n
-\n%s</string>
-    <string name="delete_message_series_only" formatted="true">Apakah Anda yakin ingin menghapus semua episode dalam seri berikut secara permanen?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Apakah Anda yakin ingin menghapus item berikut secara permanen? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Apakah Anda yakin ingin menghapus episode berikut di %1$s secara permanen? \n \n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Anda juga akan menghapus semua episode dalam seri berikut secara permanen: \n \n%s</string>
+    <string name="delete_message_series_only" formatted="true">Apakah Anda yakin ingin menghapus semua episode dalam seri berikut secara permanen? \n \n%s</string>
     <string name="delete_format" formatted="true">Hapus (%1$d | %2$s)</string>
     <string name="delete_plugin">Hapus plugin</string>
     <string name="device_pin_error_message">Tidak bisa mendapatkan kode PIN perangkat, coba autentikasi lokal</string>
@@ -765,4 +744,7 @@
     <string name="download_episode_range">Apakah kamu ingin mengunduh episode %s?</string>
     <string name="cancel_queue_message">Apakah kamu ingin membatalkan semua unduhan dalam antrean?</string>
     <string name="show_player_metadata_overlay">Tampilkan overlay metadata pemutar</string>
+    <string name="player_is_live">Live</string>
+    <string name="video_singular">Video</string>
+    <string name="skip_type_preview">Pratinjau</string>
 </resources>
diff --git a/app/src/main/res/values-b+it/strings.xml b/app/src/main/res/values-b+it/strings.xml
index 55da49687..3a988b476 100644
--- a/app/src/main/res/values-b+it/strings.xml
+++ b/app/src/main/res/values-b+it/strings.xml
@@ -6,7 +6,7 @@
     <string name="next_episode_format" formatted="true">L\'episodio %d uscirà in</string>
     <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
     <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
-    <string name="next_episode_time_min_format" formatted="true">%d min</string>
+    <string name="next_episode_time_min_format" formatted="true">%d min</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
     <string name="search_poster_img_des">Poster</string>
@@ -19,8 +19,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Velocità (%.2fx)</string>
     <string name="rated_format" formatted="true">Valutato: %.1f</string>
-    <string name="new_update_format" formatted="true">Nuovo aggiornamento trovato!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Nuovo aggiornamento trovato! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
     <!-- <string name="app_name">CloudStream</string> -->
@@ -105,7 +104,7 @@
     <string name="continue_watching">Continua a guardare</string>
     <string name="action_remove_watching">Rimuovi</string>
     <string name="action_open_watching">Più info</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Potrebbe essere necessaria una VPN per far funzionare correttamente questo provider</string>
     <string name="vpn_torrent">Questo provider è un torrent, si raccomanda una VPN</string>
     <string name="provider_info_meta">I metadati non sono forniti dal sito, il caricamento del video fallirà se non esiste sul sito.</string>
@@ -186,10 +185,8 @@
     <string name="resume">Riprendi</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Stai per eliminare permanentemente %s
-\nSei sicuro?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nrimanenti</string>
+    <string name="delete_message" formatted="true">Stai per eliminare permanentemente %s \nSei sicuro?</string>
+    <string name="resume_time_left" formatted="true">%dm \nrimanenti</string>
     <string name="status_ongoing">In corso</string>
     <string name="status_completed">Completato</string>
     <string name="status">Stato</string>
@@ -412,9 +409,7 @@
     <string name="plugins_disabled" formatted="true">Disabilitato: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Non scaricato: %d</string>
     <string name="plugins_updated" formatted="true">Aggiornati %d plugin</string>
-    <string name="blank_repo_message">CloudStream non ha siti installati per impostazione predefinita. È necessario installare i siti dai repository.
-\n
-\nUnisciti al nostro Discord o cerca online.</string>
+    <string name="blank_repo_message">CloudStream non ha siti installati per impostazione predefinita. È necessario installare i siti dai repository. \n \nUnisciti al nostro Discord o cerca online.</string>
     <string name="view_public_repositories_button">Visualizza i repository della comunità</string>
     <string name="view_public_repositories_button_short">Lista pubblica</string>
     <string name="uppercase_all_subtitles">Tutti i sottotitoli in maiuscolo</string>
@@ -502,15 +497,13 @@
     <string name="sort_updated_old">Aggiornato (Da vecchio a nuovo)</string>
     <string name="sort_alphabetical_a">Alfabetico (A - Z)</string>
     <string name="sort_alphabetical_z">Alfabetico (Z - A)</string>
-    <string name="empty_library_no_accounts_message">La tua libreria è vuota :(
-\nAccedi a un account di libreria o aggiungi degli show alla tua libreria locale.</string>
+    <string name="empty_library_no_accounts_message">La tua libreria è vuota :( \nAccedi a un account di libreria o aggiungi degli show alla tua libreria locale.</string>
     <string name="select_library">Seleziona libreria</string>
     <string name="open_with">Apri con</string>
     <string name="library">Libreria</string>
     <string name="sort">Ordina</string>
     <string name="empty_library_logged_in_message">Questo elenco è vuoto. Prova a passare a un altro.</string>
-    <string name="safe_mode_file">File \"safe mode\" trovato!
-\nAll\'avvio non sarà caricata alcuna estensione finchè il file non verrà rimosso.</string>
+    <string name="safe_mode_file">File \"safe mode\" trovato! \nAll\'avvio non sarà caricata alcuna estensione finchè il file non verrà rimosso.</string>
     <string name="android_tv_interface_off_seek_settings_summary">Intervallo di ricerca utilizzato quando il lettore è nascosto</string>
     <string name="pref_category_android_tv">TV Android</string>
     <string name="android_tv_interface_on_seek_settings_summary">Intervallo di ricerca utilizzato quando il lettore è visibile</string>
@@ -534,13 +527,7 @@
     <string name="subscription_in_progress_notification">Aggiornando shows a cui sei iscritto</string>
     <string name="subscription_episode_released">L\'episodio %d è stato rilasciato!</string>
     <string name="watch_quality_pref_data">Qualità di visualizzazione preferita (Dati mobili)</string>
-    <string name="quality_profile_help">Qui puoi cambiare l\'ordine delle fonti. Se un video ha una priorità maggiore, apparirà più in alto nella selezione delle fonti. La somma tra la priorità della fonte e la priorità della qualità è la priorità video.
-\n
-\nFonte A: 3
-\nQualità B: 7
-\nAvranno una priorità video combinata di 10.
-\n
-\nNOTA: se la somma è pari o superiore a 10, il lettore salterà automaticamente il caricamento quando viene caricato quel link!</string>
+    <string name="quality_profile_help">Qui puoi cambiare l\'ordine delle fonti. Se un video ha una priorità maggiore, apparirà più in alto nella selezione delle fonti. La somma tra la priorità della fonte e la priorità della qualità è la priorità video. \n \nFonte A: 3 \nQualità B: 7 \nAvranno una priorità video combinata di 10. \n \nNOTA: se la somma è pari o superiore a 10, il lettore salterà automaticamente il caricamento quando viene caricato quel link!</string>
     <string name="profile_number">Profilo %d</string>
     <string name="wifi">Wi-Fi</string>
     <string name="set_default">Imposta predefinito</string>
@@ -560,11 +547,7 @@
     <string name="favorite_removed">%s rimosso dai preferiti</string>
     <string name="favorites_list_name">Preferiti</string>
     <string name="favorite_added">%s aggiunto ai preferiti</string>
-    <string name="duplicate_message_multiple" formatted="true">Dei possibili duplicati sono stati trovati nella tua libreria:
-\n
-\n%s
-\n
-\nVorresti aggiungere l\'oggetto alla libreria comunque, rimpiazzare l\'esistente, o cancellare l\'azione?</string>
+    <string name="duplicate_message_multiple" formatted="true">Dei possibili duplicati sono stati trovati nella tua libreria: \n \n%s \n \nVorresti aggiungere l\'oggetto alla libreria comunque, rimpiazzare l\'esistente, o cancellare l\'azione?</string>
     <string name="backup_frequency">Frequenza di backup</string>
     <string name="duplicate_title">Trovato Possibile Duplicato</string>
     <string name="action_add_to_favorites">Aggiungi ai preferiti</string>
@@ -577,9 +560,7 @@
     <string name="action_subscribe">Iscriviti</string>
     <string name="action_remove_from_favorites">Rimuovi dai preferiti</string>
     <string name="select_an_account">Seleziona un account</string>
-    <string name="duplicate_message_single">Sembra che nella tua libreria esista già un elemento potenzialmente duplicato: \'%s.\'
-\n
-\nDesideri aggiungere comunque questo elemento, sostituire quello esistente o annullare l\'azione?</string>
+    <string name="duplicate_message_single">Sembra che nella tua libreria esista già un elemento potenzialmente duplicato: \'%s.\' \n \nDesideri aggiungere comunque questo elemento, sostituire quello esistente o annullare l\'azione?</string>
     <string name="enter_pin">Inserisci PIN</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">Inserisci PIN corrente</string>
@@ -609,8 +590,7 @@
     <string name="biometric_prompt_description">Dopo alcuni tentativi falliti, il prompt si chiuderà. Riavvia semplicemente l\'app per riprovare.</string>
     <string name="biometric_warning">È stato eseguito il backup dei tuoi dati CloudStream. Sebbene questa possibilità sia molto bassa, tutti i dispositivi possono comportarsi in modo diverso. Nel raro caso in cui ti venga bloccato l\'accesso all\'app, cancella completamente i dati dell\'app e ripristina da un backup. Siamo molto spiacenti per qualsiasi inconveniente derivanti da questo.</string>
     <string name="unfavorite">Non preferito</string>
-    <string name="resume_remaining" formatted="true">%s
-\nresiduo</string>
+    <string name="resume_remaining" formatted="true">%s \nresiduo</string>
     <string name="favorite">Preferito</string>
     <string name="repo_copy_label">Nome e URL del repository</string>
     <string name="toast_copied">copiato!</string>
@@ -652,20 +632,12 @@
     <string name="select_all">Seleziona tutto</string>
     <string name="deselect_all">Deseleziona tutto</string>
     <string name="delete_format" formatted="true">Elimina (%1$d | %2$s)</string>
-    <string name="delete_message_series_episodes" formatted="true">Sei sicuro di voler eliminare definitivamente i seguenti episodi in %1$s?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">Eliminerai definitivamente anche tutti gli episodi delle seguenti serie:
-\n
-\n%s</string>
-    <string name="delete_message_series_only" formatted="true">Sei sicuro di voler eliminare definitivamente tutti gli episodi delle seguenti serie?
-\n
-\n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Sei sicuro di voler eliminare definitivamente i seguenti episodi in %1$s? \n \n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">Eliminerai definitivamente anche tutti gli episodi delle seguenti serie: \n \n%s</string>
+    <string name="delete_message_series_only" formatted="true">Sei sicuro di voler eliminare definitivamente tutti gli episodi delle seguenti serie? \n \n%s</string>
     <string name="sort_release_date_old">Data di rilascio (dal più vecchio)</string>
     <string name="delete_files">Elimina file</string>
-    <string name="delete_message_multiple" formatted="true">Sei sicuro di voler eliminare definitivamente i seguenti elementi?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Sei sicuro di voler eliminare definitivamente i seguenti elementi? \n \n%s</string>
     <string name="preview_seekbar">Anteprima barra di avanzamento</string>
     <string name="preview_seekbar_desc">Abilita miniatura di anteprima sulla barra di avanzamento</string>
     <string name="no_subtitles_loaded">Nessun sottotitolo caricato</string>
@@ -784,4 +756,7 @@
     <string name="source_priority">Priorità sorgente</string>
     <string name="source_priority_help">Decidi come le sorgenti video devono essere ordinate nel lettore</string>
     <string name="show_player_metadata_overlay">Mostra sovrapposizione metadati lettore</string>
+    <string name="video_singular">Video</string>
+    <string name="skip_type_preview">Anteprima</string>
+    <string name="player_is_live">Live</string>
 </resources>
diff --git a/app/src/main/res/values-b+iw/strings.xml b/app/src/main/res/values-b+iw/strings.xml
index 0b0479679..ebe258291 100644
--- a/app/src/main/res/values-b+iw/strings.xml
+++ b/app/src/main/res/values-b+iw/strings.xml
@@ -6,8 +6,7 @@
     <string name="home_change_provider_img_des">לשנות ספק</string>
     <string name="player_speed_text_format" formatted="true">מהירות (%.2fx)</string>
     <string name="rated_format" formatted="true">דירוג: %.1f</string>
-    <string name="new_update_format" formatted="true">נמצא עדכון חדש!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">נמצא עדכון חדש! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">סינון</string>
     <string name="duration_format" formatted="true">%d דקות</string>
     <string name="app_name">קלאודסטרים</string>
@@ -113,7 +112,7 @@
     <string name="chromecast_subtitles_settings">כתוביות כרומקאסט</string>
     <string name="picture_in_picture_des">ממשיך ניגון בנגן מינימלי מעל ישומים אחרים</string>
     <string name="player_subtitles_settings">כתוביות</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="history">היסטוריה</string>
     <string name="apk_installer_legacy">מורשת</string>
     <string name="no">לא</string>
@@ -146,10 +145,8 @@
     <string name="resume">המשך</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="resume_time_left" formatted="true">%dדקות
-\nנותרו</string>
-    <string name="delete_message" formatted="true">‬פעולה זאת תמחק לצמיתות את %s
-\nהאם אתם בטוחים?</string>
+    <string name="resume_time_left" formatted="true">%dדקות \nנותרו</string>
+    <string name="delete_message" formatted="true">‬פעולה זאת תמחק לצמיתות את %s \nהאם אתם בטוחים?</string>
     <string name="status_ongoing">מתמשך</string>
     <string name="duration">משך זמן</string>
     <string name="rating">דירוג</string>
@@ -160,8 +157,8 @@
     <string name="used_storage">משומש</string>
     <string name="tv_series">סדרת טלוויזיה</string>
     <string name="cartoons">סדרות/סרטים מצוירים</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="ova_singular">\@string/ova</string>
     <string name="asian_drama_singular">דרמה אסייתית</string>
     <string name="episode_action_chromecast_episode">כרומקאסט את הפרק</string>
     <string name="episode_action_chromecast_mirror">כרומקאסט את המראה</string>
@@ -425,10 +422,8 @@
     <string name="skip_type_credits">קרדיטים</string>
     <string name="sort">מיין</string>
     <string name="select_library">בחר ספרייה</string>
-    <string name="empty_library_no_accounts_message">נראה שהספרייה שלכם ריקה :(
-\nהתחברו לחשבון ספריה או הוסיפו סדרות לספרייה המקומית שלכם.</string>
-    <string name="safe_mode_file">קובץ מצב בטוח נמצא!
-\nלא טוען שום תוספות בהפעלה עד להסרת הקובץ.</string>
+    <string name="empty_library_no_accounts_message">נראה שהספרייה שלכם ריקה :( \nהתחברו לחשבון ספריה או הוסיפו סדרות לספרייה המקומית שלכם.</string>
+    <string name="safe_mode_file">קובץ מצב בטוח נמצא! \nלא טוען שום תוספות בהפעלה עד להסרת הקובץ.</string>
     <string name="update_notification_failed">לא ניתן להתקין את הגרסה החדשה של האפליקציה</string>
     <string name="batch_download">הורדת אצווה</string>
     <string name="plugin_singular">תוסף</string>
@@ -444,11 +439,7 @@
     <string name="plugins_downloaded" formatted="true">הורד: %d</string>
     <string name="plugins_disabled" formatted="true">מוגבל: %d</string>
     <string name="plugins_not_downloaded" formatted="true">לא מורד: %d</string>
-    <string name="blank_repo_message">לקלאודסטרים אין אתרים מותקנים כברירת מחדל. עליכם להתקין את האתרים ממאגרים.
-\n
-\nבגלל הסרת DMCA על ידי Sky UK LImited 🤮 אנחנו לא יכולים לקשר את אתר המאגרים באפליקציה.
-\n
-\nתצטרפו לדיסקורד שלנו או תחפשו באינטרנט.</string>
+    <string name="blank_repo_message">לקלאודסטרים אין אתרים מותקנים כברירת מחדל. עליכם להתקין את האתרים ממאגרים. \n \nבגלל הסרת DMCA על ידי Sky UK LImited 🤮 אנחנו לא יכולים לקשר את אתר המאגרים באפליקציה. \n \nתצטרפו לדיסקורד שלנו או תחפשו באינטרנט.</string>
     <string name="view_public_repositories_button">הצג מאגרים קהילתיים</string>
     <string name="view_public_repositories_button_short">רשימה ציבורית</string>
     <string name="uppercase_all_subtitles">לשים את הכתוביות באותיות רישיות</string>
@@ -530,13 +521,7 @@
     <string name="set_default">קביעה כברירת מחדל</string>
     <string name="test_passed">עבר</string>
     <string name="pref_category_bypass">מעקף ספק אינטרנט</string>
-    <string name="quality_profile_help">כאן ניתן לשנות את סדר המקורות. אם לוידיאו יש עדיפות גבוהה יותר, הוא יופיע גבוה יותר בבחירת המקור. סכום עדיפות המקור ועדיפות האיכות היא עדיפות הוידיאו.
-\n
-\nמקור א: 3
-\nאיכות ב: 7
-\nיגרמו לעדיפות הסרטון להיות 10.
-\n
-\nשימו לב: אם הסכום הוא 10 או יותר, הנגן ידלג על טעינת הסרטון כאשר הלינק נטען!</string>
+    <string name="quality_profile_help">כאן ניתן לשנות את סדר המקורות. אם לוידיאו יש עדיפות גבוהה יותר, הוא יופיע גבוה יותר בבחירת המקור. סכום עדיפות המקור ועדיפות האיכות היא עדיפות הוידיאו. \n \nמקור א: 3 \nאיכות ב: 7 \nיגרמו לעדיפות הסרטון להיות 10. \n \nשימו לב: אם הסכום הוא 10 או יותר, הנגן ידלג על טעינת הסרטון כאשר הלינק נטען!</string>
     <string name="next_season_episode_format" formatted="true">עונה %1$d פרק %2$d תשודר ב:</string>
     <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d שעות %2$d דקות %3$d שניות</string>
     <string name="download_time_left_min_sec_format" formatted="true">%1$d דקות %2$d שניות</string>
diff --git a/app/src/main/res/values-b+ja/strings.xml b/app/src/main/res/values-b+ja/strings.xml
index 16cfb49c6..66e72df2c 100644
--- a/app/src/main/res/values-b+ja/strings.xml
+++ b/app/src/main/res/values-b+ja/strings.xml
@@ -62,8 +62,7 @@
     <string name="loading">ローディング…</string>
     <string name="result_open_in_browser">ブラウザで開く</string>
     <string name="season_short">シーズン</string>
-    <string name="resume_time_left" formatted="true">残り
-\n%d分</string>
+    <string name="resume_time_left" formatted="true">残り \n%d分</string>
     <string name="play_episode">再生エピソード</string>
     <string name="downloaded">ダウンロード済</string>
     <string name="pref_category_backup">バックアップ</string>
@@ -82,8 +81,7 @@
     <string name="home_next_random_img_des">次のランダム</string>
     <string name="go_back_img_des">戻り</string>
     <string name="rated_format" formatted="true">評価: %.1f</string>
-    <string name="new_update_format" formatted="true">新しいアップデートを発見!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">新しいアップデートを発見! \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d分</string>
     <string name="search_hint_site" formatted="true">%sを検索…</string>
     <string name="pick_source">ソース</string>
@@ -451,7 +449,7 @@
     <string name="extras">エクストラ</string>
     <string name="skip_type_op">オープニング</string>
     <string name="subscription_new">%s を購読しました</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="subs_import_text" formatted="true">フォントを %s に配置してインポート</string>
     <string name="show_fillers_settings">アニメのフィラーエピソードを表示</string>
     <string name="automatic_plugin_updates">自動プラグインアップデート</string>
diff --git a/app/src/main/res/values-b+kn/strings.xml b/app/src/main/res/values-b+kn/strings.xml
index 22a45b906..ba6da787c 100644
--- a/app/src/main/res/values-b+kn/strings.xml
+++ b/app/src/main/res/values-b+kn/strings.xml
@@ -83,8 +83,7 @@
     <string name="result_share">ಶೇರ್</string>
     <string name="popup_delete_file">ಫೈಲ್ ಅಳಿಸಿ</string>
     <string name="home_more_info">ಹೆಚ್ಚಿನ ಮಾಹಿತಿ</string>
-    <string name="new_update_format" formatted="true">ಹೊಸ ಅಪ್ಡೇಟ್ ಬಂದಿದೆ
-\n%1$s-%2$s</string>
+    <string name="new_update_format" formatted="true">ಹೊಸ ಅಪ್ಡೇಟ್ ಬಂದಿದೆ \n%1$s-%2$s</string>
     <string name="loading">ಲೋಡಿಂಗ್…</string>
     <string name="subs_download_languages">ಡೌನ್‌ಲೋಡ್ ಭಾಷೆಗಳನ್ನು ಮಾಡಿ</string>
     <string name="play_livestream_button">ಲೈವ್‌ಸ್ಟ್ರೀಮ್ ಪ್ಲೇ ಮಾಡಿ</string>
diff --git a/app/src/main/res/values-b+ko/strings.xml b/app/src/main/res/values-b+ko/strings.xml
index 9b07d259e..2c3223c73 100644
--- a/app/src/main/res/values-b+ko/strings.xml
+++ b/app/src/main/res/values-b+ko/strings.xml
@@ -11,8 +11,7 @@
     <string name="preview_background_img_des">배경 미리보기</string>
     <string name="player_speed_text_format" formatted="true">속도 (%.2fx)</string>
     <string name="rated_format" formatted="true">평점: %.1f</string>
-    <string name="new_update_format" formatted="true">새로운 업데이트!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">새로운 업데이트! \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d분</string>
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">CloudStream으로 재생</string>
@@ -28,7 +27,7 @@
     <string name="result_share">공유</string>
     <string name="result_open_in_browser">브라우저로 열기</string>
     <string name="browser">브라우저</string>
-    <string name="skip_loading">로딩 건너뛰기</string>
+    <string name="skip_loading">로딩 스킵</string>
     <string name="loading">로딩중…</string>
     <string name="type_watching">시청</string>
     <string name="type_on_hold">보류</string>
@@ -124,7 +123,7 @@
     <string name="use_system_brightness_settings_des">어두운 오버레이 대신 앱 플레이어의 시스템 밝기를 사용합니다</string>
     <string name="episode_sync_settings">시청 진행 상황 업데이트</string>
     <string name="episode_sync_settings_des">현재 에피소드 진행 상황을 자동으로 동기화합니다</string>
-    <string name="restore_settings">백업에서 데이터 복원</string>
+    <string name="restore_settings">데이터 복원</string>
     <string name="backup_settings">데이터 백업</string>
     <string name="restore_failed_format" formatted="true">파일에서 데이터를 복원하지 못했습니다 %s</string>
     <string name="backup_success">저장된 데이터</string>
@@ -161,10 +160,8 @@
     <string name="year">년</string>
     <string name="rating">평점</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">%s가 영구 삭제됩니다
-\n정말 삭제하시겠습니까?</string>
-    <string name="resume_time_left" formatted="true">%d분
-\n남음</string>
+    <string name="delete_message" formatted="true">%s이(가) 영구적으로 삭제됩니다 \n정말 삭제하시겠습니까?</string>
+    <string name="resume_time_left" formatted="true">%d분 \n남음</string>
     <string name="site">사이트</string>
     <string name="duration">시간</string>
     <string name="synopsis">개요</string>
@@ -184,7 +181,7 @@
     <string name="episode_action_play_in_format">%s로 재생</string>
     <string name="episode_action_auto_download">자동 다운로드</string>
     <string name="episode_action_download_mirror">다운로드 소스 목록</string>
-    <string name="episode_action_reload_links">링크 새로고침</string>
+    <string name="episode_action_reload_links">링크 초기화</string>
     <string name="episode_action_download_subtitle">자막 다운로드</string>
     <string name="show_hd">화질 라벨</string>
     <string name="show_dub">더빙 라벨</string>
@@ -195,7 +192,7 @@
     <string name="video_aspect_ratio_resize">크기 조정</string>
     <string name="video_source">소스</string>
     <string name="video_skip_op">오프닝 스킵</string>
-    <string name="skip_update">이 업데이트 건너뛰기</string>
+    <string name="skip_update">다음에 업데이트</string>
     <string name="watch_quality_pref">선호하는 화질 (WiFi)</string>
     <string name="watch_quality_pref_data">선호하는 화질 (모바일 데이터)</string>
     <string name="limit_title_rez">플레이어 내 표시 정보</string>
@@ -297,11 +294,7 @@
     <string name="delete_repository">저장소 삭제</string>
     <string name="setup_extensions_subtext">사용하려는 사이트 목록 다운로드</string>
     <string name="plugins_downloaded" formatted="true">다운로드됨: %d</string>
-    <string name="blank_repo_message">CloudStream에는 기본적으로 설치된 사이트가 없습니다. 저장소에서 사이트를 설치해야 합니다.
-\n
-\nSky UK Limited의 무분별한 DMCA 게시 중단으로 인해 앱에서 저장소 사이트를 연결 할 수 없습니다.
-\n
-\nDiscord에 가입하거나 온라인으로 검색해 보세요.</string>
+    <string name="blank_repo_message">CloudStream에는 기본적으로 설치된 사이트가 없습니다. 저장소에서 사이트를 설치해야 합니다. \n \nDiscord에 가입하거나 온라인으로 검색해 보세요.</string>
     <string name="view_public_repositories_button">커뮤니티 저장소 보기</string>
     <string name="view_public_repositories_button_short">공개 목록</string>
     <string name="uppercase_all_subtitles">자막 대문자화 표시</string>
@@ -322,7 +315,7 @@
     <string name="safe_mode_crash_info">충돌 정보 보기</string>
     <string name="extension_language">언어</string>
     <string name="subscription_episode_released">에피소드 %d 공개!</string>
-    <string name="picture_in_picture">PIP 모드</string>
+    <string name="picture_in_picture">Picture-in-picture 모드</string>
     <string name="player_size_settings">플레이어 크기 조정 버튼</string>
     <string name="picture_in_picture_des">미니플레이어를 통해 다른 앱 상단에서 계속 재생합니다</string>
     <string name="player_size_settings_des">레터박스 제거</string>
@@ -331,7 +324,7 @@
     <string name="restore_success">백업 파일을 성공적으로 로드하였습니다</string>
     <string name="settings_info">정보</string>
     <string name="advanced_search">고급 검색</string>
-    <string name="redo_setup_process">설정 프로세스 다시 실행</string>
+    <string name="redo_setup_process">설정 프로세스 재실행</string>
     <string name="apk_installer_settings">APK 인스톨러</string>
     <string name="github">Github</string>
     <string name="source_error">소스 오류</string>
@@ -438,16 +431,16 @@
     <string name="extension_install_first">먼저 확장 프로그램을 설치하세요</string>
     <string name="app_not_found_error">앱을 찾을 수 없음</string>
     <string name="all_languages_preference">모든 언어</string>
-    <string name="skip_type_format" formatted="true">건너뛰기 %s</string>
+    <string name="skip_type_format" formatted="true">%s 스킵</string>
     <string name="skip_type_op">오프닝</string>
     <string name="skip_type_ed">엔딩</string>
     <string name="skip_type_mixed_ed">혼합 엔딩</string>
     <string name="skip_type_mixed_op">혼합 오프닝</string>
     <string name="skip_type_credits">크레딧</string>
-    <string name="skip_type_intro">소개</string>
+    <string name="skip_type_intro">인트로</string>
     <string name="clear_history">기록 삭제</string>
     <string name="history">기록</string>
-    <string name="enable_skip_op_from_database_des">오프닝/엔딩 시 건너뛰기 팝업 표시</string>
+    <string name="enable_skip_op_from_database_des">오프닝/엔딩 시 스킵 팝업 표시</string>
     <string name="clipboard_too_large">텍스트가 너무 많습니다. 클립보드에 저장할 수 없습니다.</string>
     <string name="action_remove_from_watched">시청에서 삭제</string>
     <string name="confirm_exit_dialog">정말 종료하시겠습니까?</string>
@@ -466,10 +459,8 @@
     <string name="sort_alphabetical_a">알파벳순 (A에서 Z)</string>
     <string name="sort_alphabetical_z">알파벳순 (Z에서 A)</string>
     <string name="open_with">다음으로 열기</string>
-    <string name="empty_library_no_accounts_message">라이브러리가 비어 있습니다 :(
-\n라이브러리 계정으로 로그인하거나 로컬 라이브러리에 프로그램을 추가하세요.</string>
-    <string name="safe_mode_file">안전 모드 파일을 찾았습니다!
-\n파일이 제거될 때까지 시작 시 확장 프로그램을 로드하지 않습니다.</string>
+    <string name="empty_library_no_accounts_message">라이브러리가 비어 있습니다 :( \n라이브러리 계정으로 로그인하거나 로컬 라이브러리에 프로그램을 추가하세요.</string>
+    <string name="safe_mode_file">안전 모드 파일을 찾았습니다! \n파일이 제거될 때까지 시작 시 확장 프로그램을 로드하지 않습니다.</string>
     <string name="hls_playlist">HLS 재생목록</string>
     <string name="player_settings_play_in_app">내부 플레이어</string>
     <string name="player_pref">선호하는 동영상 플레이어</string>
@@ -482,10 +473,10 @@
     <string name="benene_count_text">개발자에게 %d 바나나 줌</string>
     <string name="benene_count_text_none">바나나를 주지 않음</string>
     <string name="action_open_watching">상세 정보</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="normal_no_plot">플롯을 찾을 수 없음</string>
     <string name="torrent_no_plot">설명을 찾을 수 없음</string>
-    <string name="show_log_cat">Logcat 🐈 표시</string>
+    <string name="show_log_cat">로그캣 🐈 보기</string>
     <string name="show_fillers_settings">애니메이션용 필러 에피소드 표시</string>
     <string name="test_passed">통과</string>
     <string name="resume">계속</string>
@@ -517,11 +508,11 @@
     <string name="pref_category_security">보안</string>
     <string name="pref_category_accounts">계정</string>
     <string name="no_plugins_found_error">리포지토리에서 플러그인을 찾을 수 없습니다</string>
-    <string name="toast_copied">복사됨!</string>
+    <string name="toast_copied">복사 완료!</string>
     <string name="repo_copy_label">레포지토리 이름 및 URL</string>
     <string name="test_extensions_summary">본 테스트는 개발자만을 대상으로 하며, 확장자의 작업을 확인하거나 거부하지 않습니다.</string>
     <string name="cs3wiki">CloudStream 위키</string>
-    <string name="links_reloaded_toast">링크 새로고침 완료</string>
+    <string name="links_reloaded_toast">링크 초기화 완료</string>
     <string name="backup_frequency">백업 빈도</string>
     <string name="favorites_list_name">즐겨찾기</string>
     <string name="qr_image">QR 이미지</string>
@@ -572,17 +563,11 @@
     <string name="set_default">기본값 설정</string>
     <string name="action_subscribe">구독</string>
     <string name="use">사용</string>
-    <string name="duplicate_message_single" formatted="true">당신의 라이브러리에 이미 잠재적으로 중복된 항목이 존재합니다: \'%s\'.
-\n
-\n이 항목을 그래도 추가하시겠습니까, 기존 항목을 교체하시겠습니까, 아니면 작업을 취소하시겠습니까?</string>
+    <string name="duplicate_message_single" formatted="true">당신의 라이브러리에 이미 잠재적으로 중복된 항목이 존재합니다: \'%s\'. \n \n이 항목을 그래도 추가하시겠습니까, 기존 항목을 교체하시겠습니까, 아니면 작업을 취소하시겠습니까?</string>
     <string name="duplicate_replace_all">전부 대체</string>
     <string name="duplicate_add">추가</string>
     <string name="favorite_removed">즐겨찾기에서 %s 제거</string>
-    <string name="duplicate_message_multiple" formatted="true">당신의 라이브러리에 잠재적으로 중복된 항목이 발견되었습니다:
-\n
-\n%s
-\n
-\n이 항목을 그래도 추가하시겠습니까, 기존 항목을 교체하시겠습니까, 아니면 작업을 취소하시겠습니까?</string>
+    <string name="duplicate_message_multiple" formatted="true">당신의 라이브러리에 잠재적으로 중복된 항목이 발견되었습니다: \n \n%s \n \n이 항목을 그래도 추가하시겠습니까, 기존 항목을 교체하시겠습니까, 아니면 작업을 취소하시겠습니까?</string>
     <string name="select_an_account">계정 선택</string>
     <string name="use_default_account">기본 계정 사용</string>
     <string name="rotate_video">회전</string>
@@ -599,7 +584,7 @@
     <string name="reset_btn">재설정</string>
     <string name="automatic_plugin_download_mode_title">플러그인 다운로드를 필터링할 모드 선택</string>
     <string name="biometric_warning">CloudStream 데이터 백업이 완료되었습니다. 드문 경우지만, 기기에 따라 앱 접속이 안 되는 오류가 발생할 수 있습니다. 만약 앱이 열리지 않는다면, 앱 데이터를 완전히 삭제(초기화)한 후 이 백업 파일로 복구해 주시기 바랍니다. 이용에 불편을 드려 대단히 죄송합니다.</string>
-    <string name="device_pin_url_message">스마트폰이나 컴퓨터에서 <b>%s</b>를 방문하여 위의 코드를 입력하세요</string>
+    <string name="device_pin_url_message">스마트폰이나 컴퓨터에서 <b>%s</b> 위의 코드를 입력하세요</string>
     <string name="battery_dialog_message">구독 중인 TV 쇼의 알림을 받고 다운로드를 끊김 없이 완료하려면, CloudStream의 백그라운드 실행 권한이 필요합니다. \'확인\'을 누른 후 나타나는 요청 창에서 \'허용\'을 선택해 주세요.\n\n참고로, 이 권한을 허용한다고 해서 배터리가 계속 소모되는 것은 아닙니다. 알림을 받거나 공식 확장 프로그램에서 영상을 다운로드할 때처럼 꼭 필요한 상황에서만 백그라운드 작업을 수행합니다.</string>
     <string name="quality_profile_help">여기서 소스의 순서를 변경할 수 있습니다. 비디오의 우선 순위가 높은 경우에는 소스 선택 화면에 더 높게 나타납니다. 소스 우선 순위와 품질 우선 순위의 합이 비디오 우선 순위입니다. \n \n참고 A: 3 \n품질 B: 7 \n총 비디오 우선 순위는 10입니다. \n \n참고: 합이 10 이상이면 해당 링크가 로드되면 플레이어는 자동으로 로드를 건너뜁니다!</string>
     <string name="next_season_episode_format" formatted="true">시즌 %1$d 에피소드 %2$d 공개 예정</string>
@@ -608,8 +593,7 @@
     <string name="recommendations_tooltip">추천목록 보기</string>
     <string name="speed_setting_summary">플레이어에 속도 옵션을 추가합니다</string>
     <string name="episode_upcoming_format" formatted="true">%s 후 공개 예정</string>
-    <string name="resume_remaining" formatted="true">%s
-\n남음</string>
+    <string name="resume_remaining" formatted="true">%s \n남음</string>
     <string name="duplicate_title">잠재적 중복 발견</string>
     <string name="enter_pin_with_name" formatted="true">%s의 PIN 입력</string>
     <string name="action_remove_from_favorites">즐겨찾기에서 제거</string>
@@ -627,18 +611,10 @@
     <string name="open_local_video">로컬 비디오 열기</string>
     <string name="delete_files">파일 삭제</string>
     <string name="delete_format" formatted="true">삭제 (%1$d | %2$s)</string>
-    <string name="delete_message_multiple" formatted="true">다음 항목을 영구적으로 삭제 하시겠습니까??
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">다음 에피소드를 영구적으로 삭제 하시겠습니까? %1$s?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">또한 다음 시리즈의 모든 에피소드를 영구적으로 삭제합니다:
-\n
-\n%s</string>
-    <string name="delete_message_series_only" formatted="true">다음 시리즈의 모든 에피소드를 영구적으로 삭제 하시겠습니까??
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">다음 항목을 영구적으로 삭제 하시겠습니까? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">다음 에피소드를 영구적으로 삭제 하시겠습니까? %1$s? \n \n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">또한 다음 시리즈의 모든 에피소드를 영구적으로 삭제합니다: \n \n%s</string>
+    <string name="delete_message_series_only" formatted="true">다음 시리즈의 모든 에피소드를 영구적으로 삭제 하시겠습니까? \n \n%s</string>
     <string name="sort_release_date_new">공개일 (최신순)</string>
     <string name="sort_release_date_old">공개일 (오래된순)</string>
     <string name="hide_player_control_names">플레이어 내 버튼명 숨기기</string>
@@ -754,4 +730,7 @@
     <string name="action_reload">새로고침</string>
     <string name="extra_brightness_key">최대 밝기 확장 활성화</string>
     <string name="show_player_metadata_overlay">플레이어에 메타데이터 오버레이 표시</string>
+    <string name="video_singular">비디오</string>
+    <string name="skip_type_preview">프리뷰</string>
+    <string name="player_is_live">라이브</string>
 </resources>
diff --git a/app/src/main/res/values-b+lt/strings.xml b/app/src/main/res/values-b+lt/strings.xml
index cb2d816f3..db7e994f0 100644
--- a/app/src/main/res/values-b+lt/strings.xml
+++ b/app/src/main/res/values-b+lt/strings.xml
@@ -31,8 +31,7 @@
     <string name="go_forward_30">+30</string>
     <string name="download_done">Atsiuntimas baigtas</string>
     <string name="continue_watching">Tęsti žiūrėjimą</string>
-    <string name="new_update_format" formatted="true">Rastas atnaujinimas!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Rastas atnaujinimas! \n%1$s -&gt; %2$s</string>
     <string name="subs_download_languages">Atsisiųsti kalbas</string>
     <string name="search_provider_text_providers">Ieškoti naudojant tiekėjus</string>
     <string name="go_back_img_des">Grįžti atgal</string>
@@ -88,8 +87,7 @@
     <string name="popup_resume_download">Pratęsti siuntimą</string>
     <string name="asian_drama">Azijietiškos dramos</string>
     <string name="episode">Serija</string>
-    <string name="empty_library_no_accounts_message">Jūsų biblioteka tuščia :(
-\nPrisijunkite prie bibliotekos paskyros arba pridėkite laidas prie vietinės bibliotekos.</string>
+    <string name="empty_library_no_accounts_message">Jūsų biblioteka tuščia :( \nPrisijunkite prie bibliotekos paskyros arba pridėkite laidas prie vietinės bibliotekos.</string>
     <string name="autoplay_next_settings_des">Pradėti sekančia seriją, kai dabartinė baigsis</string>
     <string name="subs_text_color">Teksto spalva</string>
     <string name="type_completed">Užbaigta</string>
@@ -181,11 +179,7 @@
     <string name="example_ip">127.0.0.1</string>
     <string name="batch_download_finish_format" formatted="true">Atsiųsta %1$d %2$s</string>
     <string name="skip_type_format" formatted="true">Praleisti %s</string>
-    <string name="blank_repo_message">Pagal numatytuosius nustatymus „CloudStream“ neturi įdiegtų svetainių. Turite įdiegti svetaines iš saugyklų.
-\n
-\nDėl beprotiško DMCA reikalavimų, kurios atliko Sky UK Limited 🤮, negalime susieti saugyklos svetainės programoje.
-\n
-\nPrisijunkite prie mūsų Discord arba ieškokite internete.</string>
+    <string name="blank_repo_message">Pagal numatytuosius nustatymus „CloudStream“ neturi įdiegtų svetainių. Turite įdiegti svetaines iš saugyklų. \n \nDėl beprotiško DMCA reikalavimų, kurios atliko Sky UK Limited 🤮, negalime susieti saugyklos svetainės programoje. \n \nPrisijunkite prie mūsų Discord arba ieškokite internete.</string>
     <string name="mobile_data">Mobilūs duomenys</string>
     <string name="example_username">šaunusPrisijungimoVardas</string>
     <string name="extension_authors">Autoriai</string>
diff --git a/app/src/main/res/values-b+lv/strings.xml b/app/src/main/res/values-b+lv/strings.xml
index 7d74354ea..c7e64c157 100644
--- a/app/src/main/res/values-b+lv/strings.xml
+++ b/app/src/main/res/values-b+lv/strings.xml
@@ -12,8 +12,7 @@
     <string name="preview_background_img_des">Apskatīt background</string>
     <string name="player_speed_text_format" formatted="true">Ātrums (%.2fx)</string>
     <string name="rated_format" formatted="true">Lidzīgi: %.1f</string>
-    <string name="new_update_format" formatted="true">Jauns atjauninājums atrasts!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Jauns atjauninājums atrasts! \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d galvenais</string>
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">Atskaņo ar cloudstream</string>
@@ -105,7 +104,7 @@
     <string name="continue_watching">Turpini skatīties</string>
     <string name="action_remove_watching">Noņemt</string>
     <string name="action_open_watching">Vairāk informācijas</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">VPNs varētu būt vajadzīgs lai šis devējs strādātu pareizi</string>
     <string name="vpn_torrent">Šis devējs ir Torrents vpn ir rekomendēts</string>
     <string name="provider_info_meta">Dati nav doti no saites, video lādēšanas neizdosies ja neiksestē saitē.</string>
@@ -193,10 +192,8 @@
     <string name="resume">Atsākt</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Šis pilnibā dzesīs %s
-\nEsat parliecināts?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\natlikušas</string>
+    <string name="delete_message" formatted="true">Šis pilnibā dzesīs %s \nEsat parliecināts?</string>
+    <string name="resume_time_left" formatted="true">%dm \natlikušas</string>
     <string name="status_completed">Pabeigts</string>
     <string name="status">Statuss</string>
     <string name="year">Gads</string>
@@ -458,8 +455,7 @@
     <string name="sort_alphabetical_z">Alfabētiskā secībā (Z līdz A)</string>
     <string name="select_library">Atlasiet Bibliotēka</string>
     <string name="open_with">Atvērt ar</string>
-    <string name="empty_library_no_accounts_message">Šķiet, ka jūsu bibliotēka ir tukša :(
-\nPiesakieties bibliotēkas kontā vai pievienojiet pārraides savai vietējai bibliotēkai.</string>
+    <string name="empty_library_no_accounts_message">Šķiet, ka jūsu bibliotēka ir tukša :( \nPiesakieties bibliotēkas kontā vai pievienojiet pārraides savai vietējai bibliotēkai.</string>
     <string name="revert">Atgriest</string>
     <string name="subscription_deleted">Anulēts %s abonements</string>
     <string name="subscription_episode_released">%d sērija izlaista!</string>
diff --git a/app/src/main/res/values-b+mk/strings.xml b/app/src/main/res/values-b+mk/strings.xml
index 99ee9c2ac..1ed2bd1f0 100644
--- a/app/src/main/res/values-b+mk/strings.xml
+++ b/app/src/main/res/values-b+mk/strings.xml
@@ -126,8 +126,7 @@
     <string name="cancel">Откажи</string>
     <string name="pause">Паузирај</string>
     <string name="resume">Продолжи</string>
-    <string name="delete_message">Ова трајно ќе го избрише %s
-\nДали си сигурен?</string>
+    <string name="delete_message">Ова трајно ќе го избрише %s \nДали си сигурен?</string>
     <string name="status_ongoing">Во тек</string>
     <string name="status_completed">Изгледанo</string>
     <string name="status">Статус</string>
@@ -340,7 +339,7 @@
     <string name="enable_nsfw_on_providers">Овозможи NSFW на поддржаните екстензии</string>
     <string name="jsdelivr_enabled">Не успеа да стигне до GitHub. Вклучувам jsDelivr прокси…</string>
     <string name="subtitles_filter_lang">Филтрирај по претпочитан медиумски јазик</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="movies_singular">Филм</string>
     <string name="added_sync_format" formatted="true">Додаден %s</string>
     <string name="plugin">приклучоци</string>
@@ -417,8 +416,7 @@
     <string name="batch_download_start_format" formatted="true">Почна да презема %1$d %2$s…</string>
     <string name="automatic_plugin_updates">Автоматски ажурирања на приклучоци</string>
     <string name="go_back_30">-30</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nпреостанува</string>
+    <string name="resume_time_left" formatted="true">%dm \nпреостанува</string>
     <string name="video_buffer_disk_settings">Видео кеш на дискот</string>
     <string name="network_adress_example">https://example.com/example.mp4</string>
     <string name="setup_done">Готово</string>
@@ -587,8 +585,7 @@
     <string name="biometric_prompt_description">По неколку неуспешни обиди, известувањето ќе се затвори. Едноставно вклучи ја апликацијата повторно за да се обидеш повторно.</string>
     <string name="custom_media_singular">Медиуми</string>
     <string name="episode_upcoming_format" formatted="true">Претстои во %s</string>
-    <string name="resume_remaining" formatted="true">%s
-\nпреостанати</string>
+    <string name="resume_remaining" formatted="true">%s \nпреостанати</string>
     <string name="battery_dialog_message">За да се обезбедат непрекинати преземања и известувања за претплатените ТВ серии, CloudStream треба дозвола за работа во позадина. Со притискање на „ОК“, ќе ви биде прикажан дијалог за барање дозвола. Ве молиме, притиснете „Дозволи“.\n\nИмајте предвид дека оваа дозвола не значи дека CS3 ќе ја троши вашата батерија. Ќе работи во позадина само кога е потребно, како на пример при примање известувања или преземање видеа од официјални екстензии.</string>
     <string name="clipboard_permission_error">Грешка при пристапот до таблата со исечоци, обиди се повторно.</string>
     <string name="clipboard_unknown_error">Грешка при копирање, молам копирај го логот и контактирај ја поддршката на апликацијата.</string>
diff --git a/app/src/main/res/values-b+ml/strings.xml b/app/src/main/res/values-b+ml/strings.xml
index d1c9409a3..c2b25c5ee 100644
--- a/app/src/main/res/values-b+ml/strings.xml
+++ b/app/src/main/res/values-b+ml/strings.xml
@@ -3,8 +3,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">വേഗം (%.2fx)</string>
     <string name="rated_format" formatted="true">റേറ്റിംഗ്: %.1f</string>
-    <string name="new_update_format" formatted="true">പുതിയ അപ്ഡേറ്റ്!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">പുതിയ അപ്ഡേറ്റ്! \n%1$s -&gt; %2$s</string>
     <string name="app_name">ക്ലൗഡ് സ്ട്രീം</string>
     <string name="title_home">ഹോം</string>
     <string name="title_search">തിരയുക</string>
@@ -115,8 +114,7 @@
     <string name="cancel">റദ്ദാക്കുക</string>
     <string name="pause">നിർത്തുക</string>
     <string name="resume">തുടരുക</string>
-    <string name="delete_message">സ്ഥിരമായി %sനെ ഡിലീറ്റ് ചെയ്യുക
-\nഉറപ്പാണോ?</string>
+    <string name="delete_message">സ്ഥിരമായി %sനെ ഡിലീറ്റ് ചെയ്യുക \nഉറപ്പാണോ?</string>
     <string name="status_ongoing">തുടരുന്നു</string>
     <string name="status_completed">പൂർത്തിയായി</string>
     <string name="status">അവസ്ഥ</string>
@@ -192,9 +190,7 @@
     <string name="subs_import_text" formatted="true">%s ൽ ഫോൻ്റ്‌സ് വെച്ചു കൊണ്ട് ഇംപോർട്ട് ചെയ്യുക</string>
     <string name="safe_mode_description">പ്രശ്‌നമുണ്ടാക്കുന്ന ഒന്ന് കണ്ടെത്താൻ നിങ്ങളെ സഹായിക്കുന്നതിന് ഒരു ക്രാഷ് കാരണം എല്ലാ വിപുലീകരണങ്ങളും ഓഫാക്കി.</string>
     <string name="view_public_repositories_button_short">പൊതു പട്ടിക</string>
-    <string name="blank_repo_message">CloudStream-ന് സ്ഥിരസ്ഥിതിയായി സൈറ്റുകളൊന്നും ഇൻസ്റ്റാൾ ചെയ്തിട്ടില്ല. നിങ്ങൾ റിപ്പോസിറ്ററികളിൽ നിന്ന് സൈറ്റുകൾ ഇൻസ്റ്റാൾ ചെയ്യേണ്ടതുണ്ട്.
-\n
-\nഞങ്ങളുടെ ഡിസ്കോർഡിൽ ചേരുക അല്ലെങ്കിൽ ഓൺലൈനിൽ തിരയുക.</string>
+    <string name="blank_repo_message">CloudStream-ന് സ്ഥിരസ്ഥിതിയായി സൈറ്റുകളൊന്നും ഇൻസ്റ്റാൾ ചെയ്തിട്ടില്ല. നിങ്ങൾ റിപ്പോസിറ്ററികളിൽ നിന്ന് സൈറ്റുകൾ ഇൻസ്റ്റാൾ ചെയ്യേണ്ടതുണ്ട്. \n \nഞങ്ങളുടെ ഡിസ്കോർഡിൽ ചേരുക അല്ലെങ്കിൽ ഓൺലൈനിൽ തിരയുക.</string>
     <string name="sort_copy">പകർത്തുക</string>
     <string name="uppercase_all_subtitles">എല്ലാ സബ്‌ടൈറ്റിലുകളും വലിയക്ഷരമാക്കുക</string>
     <string name="render_error">റെൻഡറർ പിശക്</string>
@@ -261,8 +257,7 @@
     <string name="empty_library_logged_in_message">ഈ ലിസ്റ്റ് ശൂന്യമാണ്. മറ്റൊന്നിലേക്ക് മാറാൻ ശ്രമിക്കുക.</string>
     <string name="clear_history">ചരിത്രം മായ്ക്കുക</string>
     <string name="show_log_cat">ലോഗ്കാറ്റ് കാണിക്കുക 🐈</string>
-    <string name="empty_library_no_accounts_message">നിങ്ങളുടെ ലൈബ്രറി ശൂന്യമാണ് :(
-\nഒരു ലൈബ്രറി അക്കൗണ്ടിൽ ലോഗിൻ ചെയ്യുക അല്ലെങ്കിൽ നിങ്ങളുടെ പ്രാദേശിക ലൈബ്രറിയിലേക്ക് ഷോകൾ ചേർക്കുക.</string>
+    <string name="empty_library_no_accounts_message">നിങ്ങളുടെ ലൈബ്രറി ശൂന്യമാണ് :( \nഒരു ലൈബ്രറി അക്കൗണ്ടിൽ ലോഗിൻ ചെയ്യുക അല്ലെങ്കിൽ നിങ്ങളുടെ പ്രാദേശിക ലൈബ്രറിയിലേക്ക് ഷോകൾ ചേർക്കുക.</string>
     <string name="other_singular">വീഡിയോ</string>
     <string name="repo_copy_label">റിപ്പോസിറ്ററി നാമവും URL ഉം</string>
     <string name="toast_copied">പകർത്തി!</string>
diff --git a/app/src/main/res/values-b+ms/strings.xml b/app/src/main/res/values-b+ms/strings.xml
index dc1cd3ee6..59c4fbb42 100644
--- a/app/src/main/res/values-b+ms/strings.xml
+++ b/app/src/main/res/values-b+ms/strings.xml
@@ -56,8 +56,7 @@
     <string name="sort_close">Tutup</string>
     <string name="preview_background_img_des">Pratonton</string>
     <string name="rated_format" formatted="true">Resensi:%.1f</string>
-    <string name="new_update_format" formatted="true">Kemas kini baru dijumpai!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Kemas kini baru dijumpai! \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="play_from_beginning_img_des">Main dari mula</string>
     <string name="next_season_episode_format" formatted="true">Musim %1$d Episod %2$d akan dikeluarkan di</string>
@@ -492,7 +491,7 @@
     <string name="speech_recognition_unavailable">Pengecaman pertuturan tidak tersedia</string>
     <string name="begin_speaking">Mula Bercakap…</string>
     <string name="torrent_info">Video ini adalah torrent, ini bermakna aktiviti video anda dapat dikesan.\nPastikan anda memahami torrenting sebelum meneruskan.</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="double_tap_to_seek_amount_settings">Pemain Mencari Amaun (Seconds)</string>
     <string name="automatic_plugin_download_summary">Secara automatik memasang semua plugin yang belum dipasang dari repositori yang ditambah.</string>
     <string name="updates_settings">Tunjukkan kemas kini aplikasi</string>
diff --git a/app/src/main/res/values-b+mt/strings.xml b/app/src/main/res/values-b+mt/strings.xml
index ea859ee29..4e247cc4f 100644
--- a/app/src/main/res/values-b+mt/strings.xml
+++ b/app/src/main/res/values-b+mt/strings.xml
@@ -18,8 +18,7 @@
     <string name="home_change_provider_img_des">Ibdel Il-fornitur</string>
     <string name="player_speed_text_format" formatted="true">veloċità (%.2fx)</string>
     <string name="rated_format" formatted="true">Klassifikazzjoni: %.1f</string>
-    <string name="new_update_format" formatted="true">Aġġornament ġdid misjub!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Aġġornament ġdid misjub! \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">Ara bil-CloudStream</string>
@@ -92,7 +91,7 @@
     <string name="continue_watching">Kompli Ara</string>
     <string name="action_remove_watching">Neħħi</string>
     <string name="action_open_watching">Iktar informazzjoni</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Jista\' jkun hemm bżonn ta\' VPN biex dan il-fornitur jaħdem b\'mod korrett</string>
     <string name="provider_info_meta">Il-metadata mhix ipprovduta mis-sit, it-tagħbija tal-vidjo se tfalli jekk ma teżistix fuq is-sit.</string>
     <string name="torrent_plot">Deskrizzjoni</string>
diff --git a/app/src/main/res/values-b+my/strings.xml b/app/src/main/res/values-b+my/strings.xml
index 0938e4f98..9f7535dbd 100644
--- a/app/src/main/res/values-b+my/strings.xml
+++ b/app/src/main/res/values-b+my/strings.xml
@@ -11,8 +11,7 @@
     <string name="go_back_img_des">နောက်သို့</string>
     <string name="preview_background_img_des">နောက်ခံပုံရိပ်ကို အကြိုကြည့်ရန်</string>
     <string name="rated_format" formatted="true">အဆင့်: %.1f</string>
-    <string name="new_update_format" formatted="true">အပ်ဒိတ်အသစ်!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">အပ်ဒိတ်အသစ်! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">စစ်ထုတ်မှု</string>
     <string name="duration_format" formatted="true">%d မိနစ်</string>
     <string name="app_name">CloudStream</string>
@@ -57,7 +56,7 @@
     <string name="continue_watching">ဆက်လက်ကြည့်ရှုမည်</string>
     <string name="action_remove_watching">ဖယ်ရှားရန်</string>
     <string name="action_open_watching">ပိုမို၍</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_torrent">ဒီဟာကတောရပ်တစ်ခုပါ ဗီပီအန်တစ်ခုသုံးဖို့အကြံပြုပါတယ်</string>
     <string name="torrent_plot">ဖော်ပြချက်</string>
     <string name="normal_no_plot">ဇာတ်လမ်းသွား မတွေ့ပါ</string>
@@ -111,10 +110,8 @@
     <string name="episode">အပိုင်း</string>
     <string name="episodes">အပိုင်းများ</string>
     <string name="episodes_range">%1$d-%2$d</string>
-    <string name="delete_message" formatted="true">ဒါကအပြီးဖျက်ခြင်းဖြစ်ပါသည် %s
-\nသင်သေချာပါသလား။</string>
-    <string name="resume_time_left" formatted="true">%dမိနစ်
-\nကျန်ရိှသည်</string>
+    <string name="delete_message" formatted="true">ဒါကအပြီးဖျက်ခြင်းဖြစ်ပါသည် %s \nသင်သေချာပါသလား။</string>
+    <string name="resume_time_left" formatted="true">%dမိနစ် \nကျန်ရိှသည်</string>
     <string name="status_ongoing">ထုတ်လွှင့်နေဆဲ</string>
     <string name="status_completed">ထုတ်လွှင့်မှုပြီးဆုံး</string>
     <string name="status">အခြေအနေ</string>
@@ -342,11 +339,7 @@
     <string name="apk_installer_legacy">သမားရိုးကျ</string>
     <string name="apk_installer_package_installer">ထည့်သွင်းသူ</string>
     <string name="delayed_update_notice">ထွက်ချိန်တွင် အက်ပ်ကို အပ်ဒိတ်လုပ်ပါမည်</string>
-    <string name="blank_repo_message">CloudStream တွင် မူရင်းအတိုင်း ထည့်သွင်းထားသည့်ဆိုက်များ မရှိပါ။ ရီပိုစစ်ထရီများ မှ ဆိုဒ် များကို ထည့်သွင်းရန်လိုအပ်သည်။
-\n
-\nSky UK Limited မှ ဦးနှောက်မဲ့ DMCA ကို ဖယ်ရှားလိုက်ခြင်းကြောင့် 🤮 ကျွန်ုပ်တို့သည် ရီပိုစစ်ထရီဆိုဒ်ကို အက်ပ်တွင် ချိတ်ဆက်၍မရပါ။
-\n
-\nကျွန်ုပ်တို့၏ Discord တွင်ပါဝင်ပါ သို့မဟုတ် အွန်လိုင်းတွင်ရှာဖွေပါ။</string>
+    <string name="blank_repo_message">CloudStream တွင် မူရင်းအတိုင်း ထည့်သွင်းထားသည့်ဆိုက်များ မရှိပါ။ ရီပိုစစ်ထရီများ မှ ဆိုဒ် များကို ထည့်သွင်းရန်လိုအပ်သည်။ \n \nSky UK Limited မှ ဦးနှောက်မဲ့ DMCA ကို ဖယ်ရှားလိုက်ခြင်းကြောင့် 🤮 ကျွန်ုပ်တို့သည် ရီပိုစစ်ထရီဆိုဒ်ကို အက်ပ်တွင် ချိတ်ဆက်၍မရပါ။ \n \nကျွန်ုပ်တို့၏ Discord တွင်ပါဝင်ပါ သို့မဟုတ် အွန်လိုင်းတွင်ရှာဖွေပါ။</string>
     <string name="view_public_repositories_button">အခြားသူများ၏ရီပိုစစ်ထရီများကိုရှာဖွေမည်</string>
     <string name="tracks">အသံများ</string>
     <string name="audio_tracks">အသံဖိုင်များ</string>
@@ -422,8 +415,7 @@
     <string name="update_notification_downloading">အက်ပ်အပ်ဒိတ်အားဒေါင်းလုဒ်လုပ်နေသည်…</string>
     <string name="update_notification_installing">အက်ပ်အပ်ဒိတ်အားသွင်းနေသည်…</string>
     <string name="sort_updated_new">အပ်ဒိတ်ဖြစ်မှု (အသစ် မှ အဟောင်း)</string>
-    <string name="empty_library_no_accounts_message">သင့်လိုက်ဘရီသည် ဗလာဖြစ်နေသည် :(
-\nအကောင့်ဝင်ပါ သို့မဟုတ် သင့်ဖုန်းလိုက်ဘရီတွင် ကြည့်စရာများထည့်ပါ။</string>
+    <string name="empty_library_no_accounts_message">သင့်လိုက်ဘရီသည် ဗလာဖြစ်နေသည် :( \nအကောင့်ဝင်ပါ သို့မဟုတ် သင့်ဖုန်းလိုက်ဘရီတွင် ကြည့်စရာများထည့်ပါ။</string>
     <string name="use">သုံးရန်</string>
     <string name="edit">တည်းဖြတ်ရန်</string>
     <string name="qualities">အရည်အသွေးများ</string>
@@ -516,8 +508,7 @@
     <string name="subscription_new">စာရင်းသွင်းပြီး %s</string>
     <string name="subscription_deleted">စာရင်းသွင်းမှုပယ်ဖျက်ပြီး %s</string>
     <string name="empty_library_logged_in_message">ဤစာရင်းသည် ဗလာဖြစ်နေသည်။ အခြားတစ်ခုသို့ ပြောင်းကြည့်ပါ။</string>
-    <string name="safe_mode_file">Safe mode ဖိုင်ကို တွေ့ရှိခဲ့သည်။
-\nဖိုင်ကိုမဖယ်ရှားမချင်း စတင်ဖွင့်စတွင် မည်သည့် extension များကိုမျှ မတင်ပါ။</string>
+    <string name="safe_mode_file">Safe mode ဖိုင်ကို တွေ့ရှိခဲ့သည်။ \nဖိုင်ကိုမဖယ်ရှားမချင်း စတင်ဖွင့်စတွင် မည်သည့် extension များကိုမျှ မတင်ပါ။</string>
     <string name="subscription_episode_released">အပိုင်းသစ် %d ထွက်ပြီ</string>
     <string name="profile_number">ပရိုဖိုင် %d</string>
     <string name="wifi">ဝိုင်ဖိုင်</string>
@@ -525,13 +516,7 @@
     <string name="set_default">ပုံသေထားရန်</string>
     <string name="profiles">ပရိုဖိုင်များ</string>
     <string name="help">အကူအညီ</string>
-    <string name="quality_profile_help">ဤနေရာတွင် သင်သည် အရင်းအမြစ်များကို မည်ကဲ့သို့ အစီအစဥ်ချမည်ကို ပြောင်းလဲနိုင်သည်။ ဗီဒီယိုတစ်ခုတွင် ပိုမိုဦးစားပေးပါက ရင်းမြစ်ရွေးချယ်မှုတွင် ပိုမိုမြင့်မားလာမည်ဖြစ်သည်။ အရင်းအမြစ် ဦးစားပေးနှင့် အရည်အသွေး ဦးစားပေး၏ ပေါင်းစုသည် ဗီဒီယို ဦးစားပေးဖြစ်သည်။
-\n
-\nအရင်းအမြစ် A: 3
-\nအရည်အသွေး B: 7
-\nပေါင်းစပ်ဗီဒီယို ဦးစားပေး 10 ခု ရှိပါမည်။
-\n
-\nမှတ်ချက်- ပေါင်းလဒ်သည် 10 သို့မဟုတ် ထို့ထက်ပိုပါက ထိုလင့်ခ်ကို တင်သည့်အခါ ဗီဒီယိုဖွင့်စက်သည် အလိုအလျောက် ဒေါင်းလုဒ်ကို ကျော်သွားမည်ဖြစ်သည်</string>
+    <string name="quality_profile_help">ဤနေရာတွင် သင်သည် အရင်းအမြစ်များကို မည်ကဲ့သို့ အစီအစဥ်ချမည်ကို ပြောင်းလဲနိုင်သည်။ ဗီဒီယိုတစ်ခုတွင် ပိုမိုဦးစားပေးပါက ရင်းမြစ်ရွေးချယ်မှုတွင် ပိုမိုမြင့်မားလာမည်ဖြစ်သည်။ အရင်းအမြစ် ဦးစားပေးနှင့် အရည်အသွေး ဦးစားပေး၏ ပေါင်းစုသည် ဗီဒီယို ဦးစားပေးဖြစ်သည်။ \n \nအရင်းအမြစ် A: 3 \nအရည်အသွေး B: 7 \nပေါင်းစပ်ဗီဒီယို ဦးစားပေး 10 ခု ရှိပါမည်။ \n \nမှတ်ချက်- ပေါင်းလဒ်သည် 10 သို့မဟုတ် ထို့ထက်ပိုပါက ထိုလင့်ခ်ကို တင်သည့်အခါ ဗီဒီယိုဖွင့်စက်သည် အလိုအလျောက် ဒေါင်းလုဒ်ကို ကျော်သွားမည်ဖြစ်သည်</string>
     <string name="profile_background_des">ပရိုဖိုင်နောက်ခံ</string>
     <string name="unable_to_inflate">UI ကို မှန်ကန်စွာ ဖန်တီး၍မရပါ၊ ၎င်းသည် အဓိက ချို့ယွင်းချက်တစ်ခုဖြစ်ပြီး ချက်ချင်းသတင်းပို့သင့်သည်။ %s</string>
     <string name="already_voted">သင်နဂိုတည်းကသတ်မှတ်ပြီး</string>
diff --git a/app/src/main/res/values-b+ne/strings.xml b/app/src/main/res/values-b+ne/strings.xml
index 8a432a505..49e5a9350 100644
--- a/app/src/main/res/values-b+ne/strings.xml
+++ b/app/src/main/res/values-b+ne/strings.xml
@@ -15,8 +15,7 @@
     <string name="home_main_poster_img_des">मुख्य पोस्टर</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Ep %2$d</string>
     <string name="cast_format" formatted="true">अभिनेता:%s</string>
-    <string name="new_update_format" formatted="true">नयाँ अपडेट भेटियो!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">नयाँ अपडेट भेटियो! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">फिलर</string>
     <string name="duration_format" formatted="true">%d मिनेट</string>
     <string name="app_name">क्लाउडस्ट्रीम</string>
diff --git a/app/src/main/res/values-b+nl/strings.xml b/app/src/main/res/values-b+nl/strings.xml
index e3bbee121..7500034a5 100644
--- a/app/src/main/res/values-b+nl/strings.xml
+++ b/app/src/main/res/values-b+nl/strings.xml
@@ -19,8 +19,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Snelheid (%.2fx)</string>
     <string name="rated_format" formatted="true">Beoordeeld: %.1fAls</string>
-    <string name="new_update_format" formatted="true">Nieuwe update gevonden!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Nieuwe update gevonden! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_name">CloudStream</string>
@@ -106,7 +105,7 @@
     <string name="continue_watching">Doorgaan met kijken</string>
     <string name="action_remove_watching">Verwijder</string>
     <string name="action_open_watching">Meer Info</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Een VPN kan nodig zijn om deze provider correct te laten werken</string>
     <string name="vpn_torrent">Deze provider is een torrent, een VPN wordt aanbevolen</string>
     <string name="provider_info_meta">Metadata wordt niet geleverd door de site, het laden van video\'s zal mislukken als deze niet op de site bestaat.</string>
@@ -182,10 +181,8 @@
     <string name="resume">Hervatten</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Dit wordt zeker permanent verwijderd %s
-\nWeet u het zeker?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nremaining</string>
+    <string name="delete_message" formatted="true">Dit wordt zeker permanent verwijderd %s \nWeet u het zeker?</string>
+    <string name="resume_time_left" formatted="true">%dm \nremaining</string>
     <string name="status_ongoing">Voortdurende</string>
     <string name="status_completed">Voltooid</string>
     <string name="status">Status</string>
@@ -484,8 +481,7 @@
     <string name="action_remove_from_watched">Verwijderen uit bekeken</string>
     <string name="delayed_update_notice">App wordt bijgewerkt bij afsluiten</string>
     <string name="sort">Gesorteerd</string>
-    <string name="empty_library_no_accounts_message">Je bibliotheek is leeg :(
-\nLog in op een bibliotheekaccount of voeg voorstellingen toe aan uw lokale bibliotheek.</string>
+    <string name="empty_library_no_accounts_message">Je bibliotheek is leeg :( \nLog in op een bibliotheekaccount of voeg voorstellingen toe aan uw lokale bibliotheek.</string>
     <string name="plugins_disabled" formatted="true">Uitgeschakeld: %d</string>
     <string name="stop">Stop</string>
     <string name="plugins_not_downloaded" formatted="true">Niet gedownload: %d</string>
@@ -507,8 +503,7 @@
     <string name="single_plugin_disabled" formatted="true">%s ( Uitgeschakeld)</string>
     <string name="apply_on_restart">Herstart de app om veranderingen te zien.</string>
     <string name="plugins_downloaded" formatted="true">Gedownload: %d</string>
-    <string name="safe_mode_file">Veilige mode bestand gevonden!
-\nGeen extensies laden bij het opstarten totdat het bestand is verwijderd.</string>
+    <string name="safe_mode_file">Veilige mode bestand gevonden! \nGeen extensies laden bij het opstarten totdat het bestand is verwijderd.</string>
     <string name="no">Nee</string>
     <string name="sort_rating_asc">Beoordeling ( Hoog naar Laag)</string>
     <string name="safe_mode_title">Veilige mode aan</string>
@@ -520,11 +515,7 @@
     <string name="delete_repository">Wis repository</string>
     <string name="subscription_deleted">Uitgeschreven bij %s</string>
     <string name="revert">Terugkeren</string>
-    <string name="blank_repo_message">CloudStream heeft standaard geen sites geïnstalleerd. U moet de sites uit repositories installeren.
-\n
-\nVanwege een hersenloze DMCA verwijdering door Sky UK Limited 🤮 kunnen we de repository site niet linken in de app.
-\n
-\nWord lid van onze Discord of zoek online.</string>
+    <string name="blank_repo_message">CloudStream heeft standaard geen sites geïnstalleerd. U moet de sites uit repositories installeren. \n \nVanwege een hersenloze DMCA verwijdering door Sky UK Limited 🤮 kunnen we de repository site niet linken in de app. \n \nWord lid van onze Discord of zoek online.</string>
     <string name="audio_tracks">Audiosporen</string>
     <string name="sort_by">Gesorteerd op</string>
     <string name="wifi">Wifi</string>
@@ -536,13 +527,7 @@
     <string name="qualities">Kwaliteiten</string>
     <string name="profile_background_des">Profiel achtergrond</string>
     <string name="use">Gebruik</string>
-    <string name="quality_profile_help">Hier kan je de volgorde van de bronnen veranderen. Als een video een hogere prioriteit heeft zal het hoger in de bronnenlijst staan. De som van de prioriteit van de bron en de prioriteit van de kwaliteit is de prioriteit van de video.
-\n
-\nBron A: 3
-\nKwaliteit B: 7
-\nHeeft een totale prioriteit van de video van 10.
-\n
-\nNOTITIE: Als de som 10 of hoger is zal de speler automatisch het laden overslaan wanneer die link is geladen!</string>
+    <string name="quality_profile_help">Hier kan je de volgorde van de bronnen veranderen. Als een video een hogere prioriteit heeft zal het hoger in de bronnenlijst staan. De som van de prioriteit van de bron en de prioriteit van de kwaliteit is de prioriteit van de video. \n \nBron A: 3 \nKwaliteit B: 7 \nHeeft een totale prioriteit van de video van 10. \n \nNOTITIE: Als de som 10 of hoger is zal de speler automatisch het laden overslaan wanneer die link is geladen!</string>
     <string name="profile_number">Profiel %d</string>
     <string name="no_repository_found_error">Repository niet gevonden, controleer de URL en probeer een VPN</string>
     <string name="no_plugins_found_error">Geen plug-ins gevonden in de repository</string>
@@ -554,11 +539,7 @@
     <string name="favorites_list_name">Favorieten</string>
     <string name="favorite_added">%s toegevoegd aan favorieten</string>
     <string name="logged_account" formatted="true">Aangemeld als %s</string>
-    <string name="duplicate_message_multiple" formatted="true">Er zijn mogelijk dubbele items gevonden in uw bibliotheek:
-\n
-\n%s
-\n
-\nWilt u dit item toch toevoegen, de bestaande vervangen of de actie annuleren?</string>
+    <string name="duplicate_message_multiple" formatted="true">Er zijn mogelijk dubbele items gevonden in uw bibliotheek: \n \n%s \n \nWilt u dit item toch toevoegen, de bestaande vervangen of de actie annuleren?</string>
     <string name="enter_pin_with_name" formatted="true">Voer PIN in voor %s</string>
     <string name="backup_frequency">Backupfrequentie</string>
     <string name="duplicate_title">Mogelijk Duplicaat Gevonden</string>
@@ -577,9 +558,7 @@
     <string name="action_subscribe">Abonneer</string>
     <string name="action_remove_from_favorites">Verwijder uit favorieten</string>
     <string name="select_an_account">Selecteer een Account</string>
-    <string name="duplicate_message_single" formatted="true">Het lijkt erop dat er al een mogelijk duplicaat bestaat in uw bibliotheek: \'%s.\'
-\n
-\nWilt u dit item toch toevoegen, het bestaande item vervangen of de actie annuleren?</string>
+    <string name="duplicate_message_single" formatted="true">Het lijkt erop dat er al een mogelijk duplicaat bestaat in uw bibliotheek: \'%s.\' \n \nWilt u dit item toch toevoegen, het bestaande item vervangen of de actie annuleren?</string>
     <string name="enter_pin">PIN invoeren</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">Huidige PIN invoeren</string>
diff --git a/app/src/main/res/values-b+nn/strings.xml b/app/src/main/res/values-b+nn/strings.xml
index 245bf6618..014e2b0a9 100644
--- a/app/src/main/res/values-b+nn/strings.xml
+++ b/app/src/main/res/values-b+nn/strings.xml
@@ -15,8 +15,7 @@
     <string name="filler" formatted="true">Fyllstoff</string>
     <string name="preview_background_img_des">Forhandsvis bakgrunnsbilete</string>
     <string name="rated_format" formatted="true">Vurdert: %.1f</string>
-    <string name="new_update_format" formatted="true">Ny oppdatering tilgjengeleg!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Ny oppdatering tilgjengeleg! \n%1$s -&gt; %2$s</string>
     <string name="duration_format" formatted="true">%d minutt</string>
     <string name="result_poster_img_des">Miniatyrbilete</string>
     <string name="next_episode_format" formatted="true">Episode %d vil bli sleppt om</string>
@@ -115,10 +114,8 @@
     <string name="resume">Gjenoppta</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Dette vil slette %s permanent.
-\nEr du sikker på dette?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\ngjenstår</string>
+    <string name="delete_message" formatted="true">Dette vil slette %s permanent. \nEr du sikker på dette?</string>
+    <string name="resume_time_left" formatted="true">%dm \ngjenstår</string>
     <string name="status_ongoing">Pågåande</string>
     <string name="status_completed">Fullført</string>
     <string name="year">År</string>
diff --git a/app/src/main/res/values-b+no/strings.xml b/app/src/main/res/values-b+no/strings.xml
index 55b5303eb..1511d8670 100644
--- a/app/src/main/res/values-b+no/strings.xml
+++ b/app/src/main/res/values-b+no/strings.xml
@@ -12,8 +12,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Avspillingshastighet (%.2fx)</string>
     <string name="rated_format" formatted="true">Vurdert: %.1f</string>
-    <string name="new_update_format" formatted="true">Ny oppdatering funnet!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Ny oppdatering funnet! \n%1$s -&gt; %2$s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Hjem</string>
     <string name="title_search">Søk</string>
@@ -135,8 +134,7 @@
     <string name="cancel">Avbryt</string>
     <string name="pause">Stopp</string>
     <string name="resume">Gjenoppta</string>
-    <string name="delete_message">Dette vil slette %s
-\nEr du sikker?</string>
+    <string name="delete_message">Dette vil slette %s \nEr du sikker?</string>
     <string name="status_ongoing">Pågående</string>
     <string name="status_completed">Fullført</string>
     <string name="status">Posisjon</string>
@@ -353,8 +351,7 @@
     <string name="episodes_range">%1$d-%2$d</string>
     <string name="view_public_repositories_button_short">Offentlig liste</string>
     <string name="plugin">programtillegg</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nigjen</string>
+    <string name="resume_time_left" formatted="true">%dm \nigjen</string>
     <string name="limit_title_rez">Videooppløsning</string>
     <string name="subtitle_offset">Synkroniser undertekster</string>
     <string name="subtitle_offset_title">Undertekstforsinkelse</string>
@@ -373,11 +370,7 @@
     <string name="error_invalid_url">Ugyldig nettadresse</string>
     <string name="batch_download">Knippe-nedlasting</string>
     <string name="delete_repository">Slett pakkebrønn</string>
-    <string name="blank_repo_message">CloudStream har ingen sider installert som forvalg. Du må installere sidene fra pakkebrønner.
-\n
-\nSom følge av en hjernedød DMCA-forespørsel fra Sky UK Limited 🤮 kan vi ikke lenke til pakkebrønnssiden i programmet.
-\n
-\nTa del i vår Discord, eller søk på nett.</string>
+    <string name="blank_repo_message">CloudStream har ingen sider installert som forvalg. Du må installere sidene fra pakkebrønner. \n \nSom følge av en hjernedød DMCA-forespørsel fra Sky UK Limited 🤮 kan vi ikke lenke til pakkebrønnssiden i programmet. \n \nTa del i vår Discord, eller søk på nett.</string>
     <string name="subtitle_offset_extra_hint_before_format">Bruk dette hvis undertekster vises %d ms for sent</string>
     <string name="plugin_loaded">Programtillegg innlastet</string>
     <string name="audio_tracks">Lydspor</string>
@@ -397,7 +390,7 @@
     <string name="poster_ui_settings">Slå av/på grensesnittselementer på plakat</string>
     <string name="skip_update">Hopp over denne oppdateringen</string>
     <string name="video_ram_description">Kan forårsake krasj hvis satt for høyt på enheter med lite minne, for eksempel en Android TV.</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="backup_settings">Sikkerhetskopier data</string>
     <string name="backup_success">Data lagret</string>
     <string name="authenticated_user_fail" formatted="true">Kunne ikke logge inn på %s</string>
@@ -406,11 +399,11 @@
     <string name="nsfw">Sensurerbart</string>
     <string name="quality_webrip">Vev</string>
     <string name="network_adress_example">Lenke til strøm</string>
-    <string name="anime_singular">@string/anime</string>
+    <string name="anime_singular">\@string/anime</string>
     <string name="pref_filter_search_quality">Skjul valgt videokvalitet i søkeresultater</string>
     <string name="restore_success">Lastet inn sikkerhetkopifil</string>
     <string name="category_updates">Oppdateringer og sikkerhetskopier</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="ova_singular">\@string/ova</string>
     <string name="confirm_exit_dialog">Avslutt?</string>
     <string name="nsfw_singular">Sensurerbart</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Alle %s er allerede nedlastet</string>
@@ -512,10 +505,8 @@
     <string name="pref_category_bypass">ISP-omgåelser</string>
     <string name="empty_library_logged_in_message">Denne listen er tom. Prøv å bytte til en annen.</string>
     <string name="sort">Sorter</string>
-    <string name="safe_mode_file">Fant fil for trygt modus.
-\nLaster ikke inn noen utvidelser ved oppstart til filen er fjernet.</string>
-    <string name="empty_library_no_accounts_message">Biblioteket ditt er tomt :(
-\nLogg inn på en bibliotekkonto eller legg til programmer i ditt lokale bibliotek.</string>
+    <string name="safe_mode_file">Fant fil for trygt modus. \nLaster ikke inn noen utvidelser ved oppstart til filen er fjernet.</string>
+    <string name="empty_library_no_accounts_message">Biblioteket ditt er tomt :( \nLogg inn på en bibliotekkonto eller legg til programmer i ditt lokale bibliotek.</string>
     <string name="edit">Rediger</string>
     <string name="profiles">Profiler</string>
     <string name="favorites_list_name">Favoritter</string>
diff --git a/app/src/main/res/values-b+or/strings.xml b/app/src/main/res/values-b+or/strings.xml
index 40a2915fd..ce7f74290 100644
--- a/app/src/main/res/values-b+or/strings.xml
+++ b/app/src/main/res/values-b+or/strings.xml
@@ -84,8 +84,7 @@
     <string name="pref_category_backup">ବ୍ୟାକଅପ୍</string>
     <string name="pref_category_android_tv">ଆଣ୍ଡ୍ରଏଡ୍ ଟିଵି</string>
     <string name="pref_category_gestures">ଅଙ୍ଗଭଙ୍ଗୀ</string>
-    <string name="new_update_format" formatted="true">ନୂଆ ଅଦ୍ୟତନ ମିଳିଲା!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">ନୂଆ ଅଦ୍ୟତନ ମିଳିଲା! \n%1$s -&gt; %2$s</string>
     <string name="duration">ଅଵଧି</string>
     <string name="app_storage">ଆପ୍</string>
     <string name="restore_success">ବ୍ୟାକଅପ୍ ଫାଇଲ୍ ଧାରଣ ହେଲା</string>
diff --git a/app/src/main/res/values-b+pl/strings.xml b/app/src/main/res/values-b+pl/strings.xml
index d1b1cf1c5..f50677ae8 100644
--- a/app/src/main/res/values-b+pl/strings.xml
+++ b/app/src/main/res/values-b+pl/strings.xml
@@ -2,8 +2,7 @@
 <resources>
     <string name="player_speed_text_format" formatted="true">Prędkość (%.2fx)</string>
     <string name="rated_format" formatted="true">Ocena: %.1f</string>
-    <string name="new_update_format" formatted="true">Znaleziono nową aktualizację!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Znaleziono nową aktualizację! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="app_dub_sub_episode_text_format">%1$s Odc. %2$d</string>
@@ -177,10 +176,8 @@
     <string name="resume">Odtwórz</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Spowoduje to trwałe usunięcie %s
-\nCzy jesteś pewien?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\npozostało</string>
+    <string name="delete_message" formatted="true">Spowoduje to trwałe usunięcie %s \nCzy jesteś pewien?</string>
+    <string name="resume_time_left" formatted="true">%dm \npozostało</string>
     <string name="status_ongoing">Bieżący</string>
     <string name="status_completed">Zakończone</string>
     <string name="status">Status</string>
@@ -246,7 +243,7 @@
     <string name="update">Aktualizacja</string>
     <string name="watch_quality_pref">Domyślna jakość (WiFi)</string>
     <string name="limit_title">Maksymalna liczba znaków w tytule odtwarzacza</string>
-    <string name="limit_title_rez">Pokaż informacje o odtwarzaczu</string>
+    <string name="limit_title_rez">Pokaż informacje o odtwarzaczu</string>
     <string name="video_buffer_size_settings">Rozmiar bufora wideo</string>
     <string name="video_buffer_length_settings">Długość bufora wideo</string>
     <string name="video_buffer_disk_settings">Pamięć podręczna wideo na dysku</string>
@@ -385,9 +382,7 @@
     <string name="plugins_disabled" formatted="true">Wyłączono: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Nie pobrano: %d</string>
     <string name="plugins_updated">Zaaktualizowano %d rozszerzeń</string>
-    <string name="blank_repo_message">CloudStream nie ma domyślnie zainstalowanych żadnych witryn. Musisz zainstalować witryny z repozytoriów.
-\n
-\nDołącz do naszego Discorda lub poszukaj online.</string>
+    <string name="blank_repo_message">CloudStream nie ma domyślnie zainstalowanych żadnych witryn. Musisz zainstalować witryny z repozytoriów. \n \nDołącz do naszego Discorda lub poszukaj online.</string>
     <string name="view_public_repositories_button">Zobacz repozytoria społeczności</string>
     <string name="view_public_repositories_button_short">Publiczna lista</string>
     <string name="uppercase_all_subtitles">Wszystkie napisy wielką literą</string>
@@ -438,7 +433,7 @@
     <string name="apk_installer_settings">Instalator APK</string>
     <string name="apk_installer_settings_des">Niektóre urządzenia nie obsługują nowego instalatora pakietów. Wypróbuj tryb legacy, jeśli aktualizacje nie zostaną zainstalowane.</string>
     <string name="example_password">hasło123</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="ova_singular">\@string/ova</string>
     <string name="example_site_name">NowaNazwaWitryny</string>
     <string name="example_username">Nazwa użytkownika</string>
     <string name="example_ip">127.0.0.1</string>
@@ -446,9 +441,9 @@
     <string name="example_site_url">https://example.com</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="apk_installer_package_installer">Instalator pakietów</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="example_email">witaj@poczta.pl</string>
-    <string name="anime_singular">@string/anime</string>
+    <string name="anime_singular">\@string/anime</string>
     <string name="skip_type_op">Opening</string>
     <string name="skip_type_ed">Ending</string>
     <string name="skip_type_mixed_op">Mixed opening</string>
@@ -487,11 +482,9 @@
     <string name="sort_alphabetical_z">Alfabetycznie (od Z do A)</string>
     <string name="select_library">Wybierz bibliotekę</string>
     <string name="library">Biblioteka</string>
-    <string name="empty_library_no_accounts_message">Twoja biblioteka jest pusta :(
-\nZaloguj się na swoje konto lub dodaj programy do swojej lokalnej biblioteki.</string>
+    <string name="empty_library_no_accounts_message">Twoja biblioteka jest pusta :( \nZaloguj się na swoje konto lub dodaj programy do swojej lokalnej biblioteki.</string>
     <string name="empty_library_logged_in_message">Ta lista jest pusta. Spróbuj przełączyć się na inną.</string>
-    <string name="safe_mode_file">Znaleziono plik trybu bezpiecznego.
-\nRozszerzenia nie zostaną wczytane, dopóki plik nie zostanie usunięty.</string>
+    <string name="safe_mode_file">Znaleziono plik trybu bezpiecznego. \nRozszerzenia nie zostaną wczytane, dopóki plik nie zostanie usunięty.</string>
     <string name="android_tv_interface_on_seek_settings_summary">Używana ilość przewijania, gdy widoczny jest odtwarzacz</string>
     <string name="android_tv_interface_off_seek_settings">Ukryty odtwarzacz - ilość przewijania</string>
     <string name="pref_category_android_tv">Android TV</string>
@@ -515,13 +508,7 @@
     <string name="jsdelivr_proxy_summary">Obchodzi blokadę surowych adresów URL GitHuba za pomocą jsDelivr. Może powodować opóźnienie aktualizacji o kilka dni.</string>
     <string name="jsdelivr_enabled">Nie udało się połączyć z GitHubem. Włączono serwer pośredniczący jsDelivr…</string>
     <string name="watch_quality_pref_data">Domyślna jakość (dane mobilne)</string>
-    <string name="quality_profile_help">W tym miejscu można zmienić kolejność źródeł. Jeśli wideo ma wyższy priorytet, pojawi się wyżej w wyborze źródła. Priorytet wideo jest sumą priorytetu źródła i priorytetu jakości.
-\n
-\nŹródło A: 3
-\nJakość B: 7
-\nŁączny priorytet wideo będzie wynosił 10.
-\n
-\nUWAGA: Jeśli suma wynosi 10 lub więcej, odtwarzacz automatycznie pominie ładowanie po załadowaniu tego łącza!</string>
+    <string name="quality_profile_help">W tym miejscu można zmienić kolejność źródeł. Jeśli wideo ma wyższy priorytet, pojawi się wyżej w wyborze źródła. Priorytet wideo jest sumą priorytetu źródła i priorytetu jakości. \n \nŹródło A: 3 \nJakość B: 7 \nŁączny priorytet wideo będzie wynosił 10. \n \nUWAGA: Jeśli suma wynosi 10 lub więcej, odtwarzacz automatycznie pominie ładowanie po załadowaniu tego łącza!</string>
     <string name="profile_number">Profil %d</string>
     <string name="wifi">Wi-Fi</string>
     <string name="mobile_data">Dane mobilne</string>
@@ -541,11 +528,7 @@
     <string name="favorite_removed">Usunięto %s z ulubionych</string>
     <string name="favorites_list_name">Ulubione</string>
     <string name="favorite_added">Dodano %s do ulubionych</string>
-    <string name="duplicate_message_multiple" formatted="true">W swojej bibliotece znaleziono potencjalne duplikaty:
-\n
-\n%s
-\n
-\nCzy chcesz dodać ten element, zastąpić istniejące, czy anulować operację?</string>
+    <string name="duplicate_message_multiple" formatted="true">W swojej bibliotece znaleziono potencjalne duplikaty: \n \n%s \n \nCzy chcesz dodać ten element, zastąpić istniejące, czy anulować operację?</string>
     <string name="enter_pin_with_name" formatted="true">Wprowadź PIN dla %s</string>
     <string name="backup_frequency">Częstotliwość tworzenia kopii zapasowych</string>
     <string name="duplicate_title">Znaleziono potencjalny duplikat</string>
@@ -562,9 +545,7 @@
     <string name="action_subscribe">Zasubskrybuj</string>
     <string name="action_remove_from_favorites">Usuń z ulubionych</string>
     <string name="select_an_account">Wybierz konto</string>
-    <string name="duplicate_message_single" formatted="true">Wygląda się, że potencjalny duplikat już znajduje się w bibliotece: \'%s\'. \'
-\n
-\nCzy chciałbyś dodać ten element, zastąpić istniejący, czy anulować akcję?</string>
+    <string name="duplicate_message_single" formatted="true">Wygląda się, że potencjalny duplikat już znajduje się w bibliotece: \'%s\'. \' \n \nCzy chciałbyś dodać ten element, zastąpić istniejący, czy anulować akcję?</string>
     <string name="enter_pin">Wprowadź PIN</string>
     <string name="pin">PIN</string>
     <string name="links_reloaded_toast">Linki załadowane ponownie</string>
@@ -590,8 +571,7 @@
     <string name="biometric_setting_summary">Odblokuj aplikację za pomocą odcisku palca, identyfikatora twarzy, kodu PIN, wzoru i hasła.</string>
     <string name="biometric_warning">Kopia zapasowa Twoich danych CloudStream została teraz utworzona. Chociaż prawdopodobieństwo tego jest bardzo niskie, wszystkie urządzenia mogą zachowywać się inaczej. W rzadkich przypadkach, gdy dostęp do aplikacji zostanie zablokowany, należy całkowicie wyczyścić dane aplikacji i przywrócić je z kopii zapasowej. Bardzo nam przykro z powodu wszelkich niedogodności z tym związanych.</string>
     <string name="unfavorite">Usuń z ulubionych</string>
-    <string name="resume_remaining" formatted="true">%s
-\npozostało</string>
+    <string name="resume_remaining" formatted="true">%s \npozostało</string>
     <string name="favorite">Dodaj do ulubionych</string>
     <string name="repo_copy_label">Nazwa repozytorium i adres URL</string>
     <string name="clipboard_permission_error">Błąd dostępu do schowka. Spróbuj ponownie.</string>
@@ -633,19 +613,11 @@
     <string name="select_all">Zaznacz wszystkie</string>
     <string name="downloads_delete_select">Zaznacz elementy do usunięcia</string>
     <string name="deselect_all">Odznacz wszystkie</string>
-    <string name="delete_message_multiple" formatted="true">Czy na pewno chcesz na stałe usunąć następujące elementy?
-\n
-\n%s</string>
-    <string name="delete_message_series_section" formatted="true">Usuniesz na stale wszystkie odcinki następującego serialu:
-\n
-\n%s</string>
-    <string name="delete_message_series_only" formatted="true">Czy na pewno chcesz na stałe usunąć wszystkie odcinki następującego serialu?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Czy na pewno chcesz na stałe usunąć następujące elementy? \n \n%s</string>
+    <string name="delete_message_series_section" formatted="true">Usuniesz na stale wszystkie odcinki następującego serialu: \n \n%s</string>
+    <string name="delete_message_series_only" formatted="true">Czy na pewno chcesz na stałe usunąć wszystkie odcinki następującego serialu? \n \n%s</string>
     <string name="delete_files">Usuń pliki</string>
-    <string name="delete_message_series_episodes" formatted="true">Czy na pewno chcesz na stałe usunąć następujące odcinki %1$s?
-\n
-\n%2$s</string>
+    <string name="delete_message_series_episodes" formatted="true">Czy na pewno chcesz na stałe usunąć następujące odcinki %1$s? \n \n%2$s</string>
     <string name="delete_format" formatted="true">Usuń (%1$d | %2$s)</string>
     <string name="preview_seekbar">Podgląd paska przewijania</string>
     <string name="preview_seekbar_desc">Włącz podgląd miniatury na pasku wyszukiwania</string>
@@ -721,7 +693,7 @@
     <string name="reload_provider">Przeładuj dostawcę</string>
     <string name="episode_action_play_mirror">Odtwarzaj inne źródło</string>"
     <string name="name">Nazwa</string>
-    <string name="resolution_and_name">Rozdzielczość i nazwa</string>
+    <string name="resolution_and_name">Rozdzielczość i nazwa</string>
     <string name="bottom_left">Dolne lewe</string>
     <string name="subs_subtitle_alignment">Wyrównanie napisów</string>
     <string name="bottom_center">Dolne środkowe</string>
@@ -742,16 +714,16 @@
     <string name="clear_suggestions">Wyczyść sugestie</string>
     <string name="show_cast_in_details">Pokaż panel obsady</string>
     <string name="source_name">Nazwa źródła</string>
-    <string name="video_info">Informacje o multimediach</string>
+    <string name="video_info">Informacje o multimediach</string>
     <string name="extra_brightness_settings">Dodatkowa jasność</string>
     <string name="extra_brightness_settings_des">Włącz filtr jasności, gdy jasność wyświetlacza przekroczy 100%</string>
     <string name="extra_brightness_key">Włączono dodatkową jasność</string>
     <string name="download_queue">Kolejka pobierania</string>
-    <string name="queue_empty_message">Obecnie nie ma żadnych plików do pobrania w kolejce.</string>
+    <string name="queue_empty_message">Obecnie nie ma żadnych plików do pobrania w kolejce.</string>
     <string name="download_all">Pobierz wszystkie</string>
     <string name="cancel_all">Anuluj wszystkie</string>
     <string name="download_episode_range">Czy chcesz pobrać odcinek %s?</string>
-    <string name="cancel_queue_message">Czy chcesz anulować wszystkie pliki do pobrania z kolejki?</string>
+    <string name="cancel_queue_message">Czy chcesz anulować wszystkie pliki do pobrania z kolejki?</string>
     <plurals name="downloads_active">
         <item quantity="one">%d aktywne pobieranie</item>
         <item quantity="few">%d aktywne pobierania</item>
@@ -759,12 +731,15 @@
         <item quantity="other">%d aktywnych pobierań</item>
     </plurals>
     <plurals name="downloads_queued">
-        <item quantity="one">%d pobieranie w kolejce</item>
-        <item quantity="few">%d pobierania w kolejce</item>
-        <item quantity="many">%d pobierań w kolejce</item>
-        <item quantity="other">%d pobierań w kolejce</item>
+        <item quantity="one">%d pobieranie w kolejce</item>
+        <item quantity="few">%d pobierania w kolejce</item>
+        <item quantity="many">%d pobierań w kolejce</item>
+        <item quantity="other">%d pobierań w kolejce</item>
     </plurals>
     <string name="source_priority">Priorytet źródła</string>
-    <string name="source_priority_help">Zdecyduj, jak mają być sortowane źródła wideo w odtwarzaczu</string>
+    <string name="source_priority_help">Zdecyduj, jak mają być sortowane źródła wideo w odtwarzaczu</string>
     <string name="show_player_metadata_overlay">Pokaż nakładkę metadanych odtwarzacza</string>
+    <string name="video_singular">Wideo</string>
+    <string name="skip_type_preview">Zapowiedź</string>
+    <string name="player_is_live">Na żywo</string>
 </resources>
diff --git a/app/src/main/res/values-b+pt+BR/strings.xml b/app/src/main/res/values-b+pt+BR/strings.xml
index b856246e8..3afaf15f4 100644
--- a/app/src/main/res/values-b+pt+BR/strings.xml
+++ b/app/src/main/res/values-b+pt+BR/strings.xml
@@ -104,7 +104,7 @@
     <string name="continue_watching">Continuar assistindo</string>
     <string name="action_remove_watching">Remover</string>
     <string name="action_open_watching">Mais detalhes</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Uma VPN pode ser necessária para esse fornecedor funcionar corretamente</string>
     <string name="vpn_torrent">Esse fornecedor é um torrent, uma VPN é recomendada</string>
     <string name="provider_info_meta">Metadados não são oferecidas pelo site, o carregamento do video pode falhar se ele não existir no site.</string>
@@ -180,8 +180,7 @@
     <string name="resume">Continuar</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Isso apagará %s permanentemente
-\nVocê tem certeza?</string>
+    <string name="delete_message" formatted="true">Isso apagará %s permanentemente \nVocê tem certeza?</string>
     <string name="resume_time_left" formatted="true">%dm\nrestantes</string>
     <string name="status_ongoing">Em andamento</string>
     <string name="status_completed">Concluído</string>
@@ -396,9 +395,7 @@
     <string name="plugins_downloaded" formatted="true">Transferido: %d</string>
     <string name="plugins_disabled" formatted="true">Desativado: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Não transferido: %d</string>
-    <string name="blank_repo_message">CloudStream não tem fontes instaladas por padrão. Você precisa instalar um site de repositórios.
-\n
-\nEntre no nosso Discord ou pesquise online.</string>
+    <string name="blank_repo_message">CloudStream não tem fontes instaladas por padrão. Você precisa instalar um site de repositórios. \n \nEntre no nosso Discord ou pesquise online.</string>
     <string name="view_public_repositories_button">Ver repositórios da comunidade</string>
     <string name="view_public_repositories_button_short">Lista pública</string>
     <string name="uppercase_all_subtitles">Todas as legendas em maiúsculas</string>
@@ -441,8 +438,7 @@
     <string name="open_with">Abrir com</string>
     <string name="select_library">Selecionar Biblioteca</string>
     <string name="test_passed">Passou nos testes</string>
-    <string name="empty_library_no_accounts_message">Sua biblioteca está vazia :0
-\nEntre numa conta de biblioteca ou adicione Midias para sua biblioteca local.</string>
+    <string name="empty_library_no_accounts_message">Sua biblioteca está vazia :0 \nEntre numa conta de biblioteca ou adicione Midias para sua biblioteca local.</string>
     <string name="watch_quality_pref_data">Qualidade preferida de reprodução (Dados Móveis)</string>
     <string name="apk_installer_legacy">Legado</string>
     <string name="library">Biblioteca</string>
@@ -460,15 +456,8 @@
     <string name="sort_alphabetical_z">Alfabética(Z =&gt; A)</string>
     <string name="qualities">Qualidade</string>
     <string name="profile_background_des">Perfil de plano de fundo</string>
-    <string name="quality_profile_help">Aqui você pode alterar como as fontes são ordenadas. Se um vídeo tiver uma prioridade mais alta, aparecerá mais alto na seleção da fonte. A soma da prioridade da fonte e da prioridade da qualidade é a prioridade do vídeo.
-\n
-\nFonte A: 3
-\nQualidade B: 7
-\nTerá uma prioridade de vídeo combinada de 10.
-\n
-\nNOTA: Se a soma for 10 ou mais, o Player pulará automaticamente o carregamento quando o link for carregado!</string>
-    <string name="safe_mode_file">Arquivo de modo de segurança encontrado!
-\nNão carregar nenhuma extensão na inicialização até que o arquivo seja removido.</string>
+    <string name="quality_profile_help">Aqui você pode alterar como as fontes são ordenadas. Se um vídeo tiver uma prioridade mais alta, aparecerá mais alto na seleção da fonte. A soma da prioridade da fonte e da prioridade da qualidade é a prioridade do vídeo. \n \nFonte A: 3 \nQualidade B: 7 \nTerá uma prioridade de vídeo combinada de 10. \n \nNOTA: Se a soma for 10 ou mais, o Player pulará automaticamente o carregamento quando o link for carregado!</string>
+    <string name="safe_mode_file">Arquivo de modo de segurança encontrado! \nNão carregar nenhuma extensão na inicialização até que o arquivo seja removido.</string>
     <string name="subscription_new">Inscrito em %s</string>
     <string name="subscription_episode_released">Episódio %d lançado!</string>
     <string name="set_default">Selecionar padrão</string>
@@ -553,11 +542,7 @@
     <string name="duplicate_title">Duplicata em potencial encontrada</string>
     <string name="duplicate_add">Adicionar</string>
     <string name="duplicate_replace">Substituir</string>
-    <string name="duplicate_message_multiple" formatted="true">Possíveis itens duplicados foram encontrados em sua biblioteca:
-\n
-\n %s
-\n
-\nGostaria de adicionar este item mesmo assim, substituir os existentes ou cancelar a ação?</string>
+    <string name="duplicate_message_multiple" formatted="true">Possíveis itens duplicados foram encontrados em sua biblioteca: \n \n %s \n \nGostaria de adicionar este item mesmo assim, substituir os existentes ou cancelar a ação?</string>
     <string name="enter_pin">Insira o PIN</string>
     <string name="enter_pin_with_name" formatted="true">Insira o PIN para %s</string>
     <string name="enter_current_pin">Insira o PIN atual</string>
@@ -576,9 +561,7 @@
     <string name="links_reloaded_toast">Links recarregados</string>
     <string name="backup_frequency">Frequência de backup</string>
     <string name="duplicate_replace_all">Substitua tudo</string>
-    <string name="duplicate_message_single" formatted="true">Parece que já existe um item potencialmente duplicado na sua biblioteca: \'%s.\'
-\n
-\nGostaria de adicionar este item mesmo assim, substituir o existente ou cancelar a ação?</string>
+    <string name="duplicate_message_single" formatted="true">Parece que já existe um item potencialmente duplicado na sua biblioteca: \'%s.\' \n \nGostaria de adicionar este item mesmo assim, substituir o existente ou cancelar a ação?</string>
     <string name="action_subscribe">Inscrever-se</string>
     <string name="action_unsubscribe">Cancelar inscrição</string>
     <string name="use_default_account">Usar conta padrão</string>
@@ -599,8 +582,7 @@
     <string name="biometric_unsupported">A autenticação biométrica não é compatível com este dispositivo</string>
     <string name="biometric_setting_summary">Desbloquear o aplicativo com impressão digital, ID facial, PIN, padrão e senha.</string>
     <string name="biometric_prompt_description">Após algumas tentativas fracassadas, o prompt será fechado. Basta reiniciar o aplicativo para tentar novamente.</string>
-    <string name="resume_remaining" formatted="true">%s
-\nrestante(s)</string>
+    <string name="resume_remaining" formatted="true">%s \nrestante(s)</string>
     <string name="favorite">Favorito</string>
     <string name="unfavorite">Não favorito</string>
     <string name="toast_copied">copiado!</string>
@@ -766,4 +748,8 @@
         <item quantity="many">%d downloads na sequência</item>
         <item quantity="other">%d downloads na sequência</item>
     </plurals>
+    <string name="show_player_metadata_overlay">Exibir sobreposição de metadados do player</string>
+    <string name="video_singular">Vídeo</string>
+    <string name="skip_type_preview">Visualização</string>
+    <string name="player_is_live">Ao vivo</string>
 </resources>
diff --git a/app/src/main/res/values-b+pt/strings.xml b/app/src/main/res/values-b+pt/strings.xml
index f9dd3083b..6dad27011 100644
--- a/app/src/main/res/values-b+pt/strings.xml
+++ b/app/src/main/res/values-b+pt/strings.xml
@@ -18,8 +18,7 @@
     <string name="preview_background_img_des">Visualizar plano de fundo</string>
     <string name="player_speed_text_format" formatted="true">Velocidade (%.2fx)</string>
     <string name="rated_format" formatted="true">Classificado: %.1f</string>
-    <string name="new_update_format" formatted="true">Nova atualização encontrada!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Nova atualização encontrada! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Preenchimento</string>
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">Assistir com o CloudStream</string>
@@ -176,10 +175,8 @@
     <string name="cancel">Cancelar</string>
     <string name="pause">Pôr em Pausa</string>
     <string name="resume">Retomar</string>
-    <string name="delete_message" formatted="true">Isto apagará %s permanentemente
-\nTem a certeza?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nem falta</string>
+    <string name="delete_message" formatted="true">Isto apagará %s permanentemente \nTem a certeza?</string>
+    <string name="resume_time_left" formatted="true">%dm \nem falta</string>
     <string name="status_ongoing">Em Curso</string>
     <string name="status_completed">Concluído</string>
     <string name="status">Estado</string>
@@ -364,9 +361,7 @@
     <string name="plugins_downloaded" formatted="true">Transferido: %d</string>
     <string name="plugins_disabled" formatted="true">Desativado: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Não transferido: %d</string>
-    <string name="blank_repo_message">O CloudStream não tem sites instalados por padrão. É necessário instalar os sites a partir de repositórios.
-\n
-\nJunte-se ao nosso Discord ou pesquise online.</string>
+    <string name="blank_repo_message">O CloudStream não tem sites instalados por padrão. É necessário instalar os sites a partir de repositórios. \n \nJunte-se ao nosso Discord ou pesquise online.</string>
     <string name="view_public_repositories_button">Ver repositórios da comunidade</string>
     <string name="view_public_repositories_button_short">Lista pública</string>
     <string name="uppercase_all_subtitles">Todas as legendas em maiúsculas</string>
@@ -474,10 +469,8 @@
     <string name="subscription_in_progress_notification">Atualizando shows inscritos</string>
     <string name="sort_alphabetical_a">Alfabético (A a Z)</string>
     <string name="sort_rating_asc">Avaliações (Crescente)</string>
-    <string name="empty_library_no_accounts_message">A sua biblioteca está vazia :(
-\nEntre numa conta da biblioteca ou adicione espectáculos à sua biblioteca local.</string>
-    <string name="safe_mode_file">Arquivo de modo de segurança encontrado!
-\nNenhuma extensão será carregada na inicialização do app até que o arquivo seja removido.</string>
+    <string name="empty_library_no_accounts_message">A sua biblioteca está vazia :( \nEntre numa conta da biblioteca ou adicione espectáculos à sua biblioteca local.</string>
+    <string name="safe_mode_file">Arquivo de modo de segurança encontrado! \nNenhuma extensão será carregada na inicialização do app até que o arquivo seja removido.</string>
     <string name="pref_category_bypass">Contorno do provedor de serviço de internet (ISP)</string>
     <string name="pref_category_links">Links</string>
     <string name="pref_category_player_features">Recursos do Player</string>
@@ -522,13 +515,7 @@
     <string name="help">Ajuda</string>
     <string name="qualities">Qualidades</string>
     <string name="profile_background_des">Perfil de fundo</string>
-    <string name="quality_profile_help">Aqui pode alterar a forma como as fontes são ordenadas. Se um vídeo tiver uma prioridade mais elevada, aparecerá mais alto na seleção da fonte. A soma da prioridade da fonte com a prioridade da qualidade é a prioridade do vídeo.
-\n
-\nFonte A: 3
-\nQualidade B: 7
-\nTerá uma prioridade de vídeo combinada de 10.
-\n
-\nNOTA: Se a soma for 10 ou mais, o leitor saltará automaticamente o carregamento quando essa ligação for carregada!</string>
+    <string name="quality_profile_help">Aqui pode alterar a forma como as fontes são ordenadas. Se um vídeo tiver uma prioridade mais elevada, aparecerá mais alto na seleção da fonte. A soma da prioridade da fonte com a prioridade da qualidade é a prioridade do vídeo. \n \nFonte A: 3 \nQualidade B: 7 \nTerá uma prioridade de vídeo combinada de 10. \n \nNOTA: Se a soma for 10 ou mais, o leitor saltará automaticamente o carregamento quando essa ligação for carregada!</string>
     <string name="automatic_plugin_download_mode_title">Selecionar o modo para filtrar a transferência de plug-ins</string>
     <string name="unable_to_inflate">Não foi possível criar corretamente a interface do utilizador, trata-se de um GRANDE BUG e deve ser comunicado imediatamente %s</string>
     <string name="disable">Desativar</string>
@@ -560,14 +547,8 @@
     <string name="select_an_account">Selecione uma conta</string>
     <string name="manage_accounts">Gerenciar contas</string>
     <string name="use_default_account">Usar conta padrão</string>
-    <string name="duplicate_message_multiple" formatted="true">Potenciais itens duplicados foram encontrados na sua biblioteca:
-\n
-\n%s
-\n
-\nDeseja adicionar esse item mesmo assim, subtituir os existentes, ou cancelar a ação?</string>
-    <string name="duplicate_message_single" formatted="true">Parece que já existe um item potencialmente duplicado na sua biblioteca: \'%s.\'
-\n
-\nDeseja adicionar esse item mesmo assim, subtituir o existente, ou cancelar a ação?</string>
+    <string name="duplicate_message_multiple" formatted="true">Potenciais itens duplicados foram encontrados na sua biblioteca: \n \n%s \n \nDeseja adicionar esse item mesmo assim, subtituir os existentes, ou cancelar a ação?</string>
+    <string name="duplicate_message_single" formatted="true">Parece que já existe um item potencialmente duplicado na sua biblioteca: \'%s.\' \n \nDeseja adicionar esse item mesmo assim, subtituir o existente, ou cancelar a ação?</string>
     <string name="recommendations_tooltip">Mostrar recomendações</string>
     <string name="speed_setting_summary">Adiciona uma opção de velocidade no leitor</string>
     <string name="test_extensions">Testar todas as extensões</string>
@@ -584,8 +565,7 @@
     <string name="unfavorite">Desfavorito</string>
     <string name="biometric_setting">Bloqueio com biometria</string>
     <string name="toast_copied">copiado!</string>
-    <string name="resume_remaining" formatted="true">%s
-\nrestante</string>
+    <string name="resume_remaining" formatted="true">%s \nrestante</string>
     <string name="clipboard_permission_error">Erro ao aceder à área de transferência, tente novamente.</string>
     <string name="clipboard_unknown_error">Erro ao copiar, copie o logcat e contacte o suporte da aplicação.</string>
     <string name="biometric_authentication_title">Desbloquear o CloudStream</string>
@@ -611,9 +591,7 @@
     <string name="preview_seekbar">Pré-visualização na barra de progresso</string>
     <string name="preview_seekbar_desc">Ativar a miniatura de pré-visualização na barra de progresso</string>
     <string name="auth_locally">Autenticação Local</string>
-    <string name="delete_message_series_section" formatted="true">Irá também eliminar permanentemente todos os episódios da seguinte série:
-\n
-\n%s</string>
+    <string name="delete_message_series_section" formatted="true">Irá também eliminar permanentemente todos os episódios da seguinte série: \n \n%s</string>
     <string name="delete_format" formatted="true">Eliminar (%1$d | %2$s)</string>
     <string name="device_pin_url_message">Visite <b>%s</b> no seu smartphone ou computador e introduza o código acima</string>
     <string name="play_from_beginning_img_des">Recomeçar</string>
@@ -626,15 +604,9 @@
     <string name="episode_upcoming_format" formatted="true">Próximo em %s</string>
     <string name="delete_files">Eliminar Ficheiros</string>
     <string name="test_warning">Aviso</string>
-    <string name="delete_message_multiple" formatted="true">Tem a certeza que pretende eliminar permanentemente os seguintes items?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">Tem a certeza que pretende eliminar permanentemente os seguintes episódios em %1$s?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_only" formatted="true">Tem a certeza que pretende eliminar permanentemente todos os episódios da seguinte série?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Tem a certeza que pretende eliminar permanentemente os seguintes items? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Tem a certeza que pretende eliminar permanentemente os seguintes episódios em %1$s? \n \n%2$s</string>
+    <string name="delete_message_series_only" formatted="true">Tem a certeza que pretende eliminar permanentemente todos os episódios da seguinte série? \n \n%s</string>
     <string name="pref_category_security">Segurança</string>
     <string name="pref_category_accounts">Contas</string>
     <string name="qr_image">QR Code</string>
diff --git a/app/src/main/res/values-b+qt/strings.xml b/app/src/main/res/values-b+qt/strings.xml
index bbe145842..68f728e61 100644
--- a/app/src/main/res/values-b+qt/strings.xml
+++ b/app/src/main/res/values-b+qt/strings.xml
@@ -185,8 +185,7 @@
     <string name="phone_layout">u ooah uo ahauao huhuu hauu h</string>
     <string name="primary_color_settings">a ou oh ouhuouhoaaha</string>
     <string name="show_fillers_settings">aaooohhouhhha hauauuu</string>
-    <string name="new_update_format">aaaaaaa uuuuuu
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format">aaaaaaa uuuuuu \n%1$s -&gt; %2$s</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s aaou %2$d</string>
     <string name="cast_format" formatted="true">oouaaahh %s</string>
     <string name="next_episode_format" formatted="true">aaaaaaugh ouh %d uuoogahaaah ooua-h-ha</string>
@@ -228,8 +227,7 @@
     <string name="livestreams">aaaaaaaaaaahhhgh-aooohoooo</string>
     <string name="pref_category_extensions">aau aooooghaao</string>
     <string name="provider_info_meta">aagh aaaaaaaaaaaa oooh, aaough, ooga oguuu aaaaaaaaaaa ooooooohghh a-a-aaauo</string>
-    <string name="resume_time_left" formatted="true">%dmmmmmm..
-\naaaaooughugh</string>
+    <string name="resume_time_left" formatted="true">%dmmmmmm.. \naaaaooughugh</string>
     <string name="asian_drama">aooohuohaaaa ooooagh</string>
     <string name="subtitle_offset">oooooogh-aaaaaogh</string>
     <string name="trailer">guuuaaaahhhhhhhaaa</string>
@@ -237,7 +235,7 @@
     <string name="nsfw">AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOOOGGAGHAGHAAA</string>
     <string name="clear_history">aoaaaaaoooghhh</string>
     <string name="sort_save">oooooh uuaagh</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="chromecast_subtitles_settings">oouuhhh ahhooo-ahah</string>
     <string name="restore_success">uuuugg aaaahh oogg</string>
     <string name="device_pin_counter_text">aagg uuuuggg og %1$dm %2$ds</string>
@@ -278,9 +276,7 @@
     <string name="home_random">aaaagg</string>
     <string name="quality_cam_rip">uug</string>
     <string name="delete_plugin">oooogg oooogg</string>
-    <string name="blank_repo_message">oooohhhoogg uuh uh uuuhh aaaaggguh og ooooggg uug aagg ek aaaaggg oog aaahh aagg uuuugggooohh
-\n
-\nJoin uuh uuuuggg ag uuuuhh eeeeek</string>
+    <string name="blank_repo_message">oooohhhoogg uuh uh uuuhh aaaaggguh og ooooggg uug aagg ek aaaaggg oog aaahh aagg uuuugggooohh \n \nJoin uuh uuuuggg ag uuuuhh eeeeek</string>
     <string name="audio_tracks">uuugg aaaagg</string>
     <string name="safe_mode_title">oogg uugg uh</string>
     <string name="skip_type_intro">aaagg</string>
@@ -313,13 +309,7 @@
     <string name="profile_number">ooooggg %d</string>
     <string name="edit">aahh</string>
     <string name="profiles">oooogggk</string>
-    <string name="quality_profile_help">eeek aag uug uuuuhh ooh aak uuuuggg ooh uuuuhhh ug g eeeek oog h uuuuhh oooogggh ag aahh oooohh aaaagg uh oog uuuugg uuuugggog uug oog uh uuh aaaagg uuuuuukg uug aah uuuuuuk uuuuuukg ak ooh uuuhh aaaagggk
-\n
-\nSource A: 3
-\nQuality B: 7
-\nWill uuhh k uuuuhhhk ooogg uuuuhhhh uk 10
-\n
-\nNOTE: ah uug oog ug 10 og oogg uug aaaahh uuhh uuuugggaaaahh oogg aaaahhh oogg uuhh aahh uh loaded!</string>
+    <string name="quality_profile_help">eeek aag uug uuuuhh ooh aak uuuuggg ooh uuuuhhh ug g eeeek oog h uuuuhh oooogggh ag aahh oooohh aaaagg uh oog uuuugg uuuugggog uug oog uh uuh aaaagg uuuuuukg uug aah uuuuuuk uuuuuukg ak ooh uuuhh aaaagggk \n \nSource A: 3 \nQuality B: 7 \nWill uuhh k uuuuhhhk ooogg uuuuhhhh uk 10 \n \nNOTE: ah uug oog ug 10 og oogg uug aaaahh uuhh uuuugggaaaahh oogg aaaahhh oogg uuhh aahh uh loaded!</string>
     <string name="favorites_list_name">uuuuhhhug</string>
     <string name="favorite_removed">%s aaaaggg uuhh aaaagggug</string>
     <string name="duplicate_add">oog</string>
@@ -488,10 +478,7 @@
     <string name="already_voted">uuh uuhh uuuuggg uuuhh</string>
     <string name="favorite_added">%s ooogg oh oooohhhog</string>
     <string name="duplicate_replace_all">aaaahhh uuh</string>
-    <string name="duplicate_message_single" formatted="true">oh ooooggg oogg k uuuuuukaahh uuuugggag uuhh ooooggg oooogg ah oogg library: \'%s\'
-\n
-\n
-\nWould uug uugg uh aak oogg oohh anyway, oooohhh uuh oooohhhg one, oh aaaagg eek action?</string>
+    <string name="duplicate_message_single" formatted="true">oh ooooggg oogg k uuuuuukaahh uuuugggag uuhh ooooggg oooogg ah oogg library: \'%s\' \n \n \nWould uug uugg uh aak oogg oohh anyway, oooohhh uuh oooohhhg one, oh aaaagg eek action?</string>
     <string name="enter_pin">ooogg uuh</string>
     <string name="speed_setting_summary">uuhh g ooogg oooogg oh aah uuuugg</string>
     <string name="test_extensions_summary">uugg oogg ak aaagg ooh oooohhhuug aagg uug aahh uug oooohhhg ak oooohh uuuuuuk oh uuh aaaagggag</string>
@@ -523,8 +510,7 @@
     <string name="automatic_plugin_download_mode_title">uuuugg oogg oh eeeeek eeeeeek uuuugggg</string>
     <string name="redo_setup_process">aagg uuugg uuuuggg</string>
     <string name="go_forward_30">+30</string>
-    <string name="resume_remaining" formatted="true">%s
-\nremaining</string>
+    <string name="resume_remaining" formatted="true">%s \nremaining</string>
     <string name="edit_account">aagg uuuuhhh</string>
     <string name="biometric_setting_summary">uuuuhh aag aah oogg Fingerprint, eeek ID, PIN, aaaaggg uuh aaaagggh</string>
     <string name="downloads_delete_select">eeeeek uuuhh oh aaaagg</string>
@@ -544,21 +530,13 @@
     <string name="episode_sync_settings">aaaagg aaahh aaaahhhg</string>
     <string name="backup_failed_error_format">uuuhh oooohhh uh %s</string>
     <string name="kitsu_settings">oohh uuuuggg uuhh uuugg</string>
-    <string name="delete_message_series_section" formatted="true">uuh oohh oogg aaaahhhuugg uuuugg oog aaaagggh ak uuh uuuuhhhog series:
-\n
-\n%s</string>
+    <string name="delete_message_series_section" formatted="true">uuh oohh oogg aaaahhhuugg uuuugg oog aaaagggh ak uuh uuuuhhhog series: \n \n%s</string>
     <string name="apk_installer_settings">aak aaaagggah</string>
     <string name="delete_files">oooohh uuuhh</string>
     <string name="delete_format" formatted="true">oooogg (%1$d | %2$s)</string>
-    <string name="delete_message_multiple" formatted="true">uuh uug oohh uuk aagg oh uuuuggguugg aaaahh uuh aaaagggah items?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">uug ooh aagg ooh uuuk ag aaaahhhuuhh oooohh ooh oooohhhug oooohhhh ah %1$s?
-\n
-\n%2$s</string>
-    <string name="delete_message_series_only" formatted="true">ooh aag oogg uuh aagg ug eeeeeekoohh aaaahh aah uuuugggg uk aag oooohhhek series?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">uuh uug oohh uuk aagg oh uuuuggguugg aaaahh uuh aaaagggah items? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">uug ooh aagg ooh uuuk ag aaaahhhuuhh oooohh ooh oooohhhug oooohhhh ah %1$s? \n \n%2$s</string>
+    <string name="delete_message_series_only" formatted="true">ooh aag oogg uuh aagg ug eeeeeekoohh aaaahh aah uuuugggg uk aag oooohhhek series? \n \n%s</string>
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="show_hd">aaaahhh uuuhh</string>
     <string name="video_disk_description">eeeeek oooohhhg ah uuk uuh aahh ug aaaaggg aaak ooh oooohhh space, aahh ug oooohhh ek</string>
@@ -612,10 +590,8 @@
     <string name="sort_updated_old">uuuuggg (Old og New)</string>
     <string name="sort_alphabetical_z">uuuuggguuuhh (Z ak A)</string>
     <string name="select_library">uuuugg uuuuggg</string>
-    <string name="empty_library_no_accounts_message">uuhh eeeeeek ek uuugg :(
-\nLog oh ag h aaaaggg uuuuggg ah uuk ooogg ag uugg uuugg oooohhh</string>
-    <string name="safe_mode_file">oohh aagg uugg found!
-\nNot aaaaggg aak uuuugggaag ah uuuuhhh aaaak oogg ah eeeeeek</string>
+    <string name="empty_library_no_accounts_message">uuhh eeeeeek ek uuugg :( \nLog oh ag h aaaaggg uuuuggg ah uuk ooogg ag uugg uuugg oooohhh</string>
+    <string name="safe_mode_file">oohh aagg uugg found! \nNot aaaaggg aak uuuugggaag ah uuuuhhh aaaak oogg ah eeeeeek</string>
     <string name="subscription_deleted">uuuuggguuugg oohh %s</string>
     <string name="subscription_episode_released">ooooggg %d released!</string>
     <string name="wifi">uugg</string>
@@ -623,11 +599,7 @@
     <string name="set_default">ooh ooooggg</string>
     <string name="profile_background_des">oooohhh uuuuhhhoog</string>
     <string name="unable_to_inflate">uh ooh oooogg ag ek oooohhh correctly, uuhh uh g ooogg aah uug aaaagg uh uuuugggk uuuuhhhaahh %s</string>
-    <string name="duplicate_message_multiple" formatted="true">uuuuggguk uuuuhhhoh uuugg aahh aaak uuugg ag oohh library:
-\n
-\n%s
-\n
-\nWould aag aagg og uuk uugg oogg anyway, aaaahhh ooh uuuugggh ones, ek uuuuhh aah action?</string>
+    <string name="duplicate_message_multiple" formatted="true">uuuuggguk uuuuhhhoh uuugg aahh aaak uuugg ag oohh library: \n \n%s \n \nWould aag aagg og uuk uugg oogg anyway, aaaahhh ooh uuuugggh ones, ek uuuuhh aah action?</string>
     <string name="pin_error_incorrect">oooohhhag uug oooohh uuh eeeek</string>
     <string name="rotate_video_desc">aaaaggg h oooogg aaaaak uug uuuugg aaaaaakaagg</string>
     <string name="auto_rotate_video_desc">uuuuhh uuuuhhhuh oooogggag ag aaaahh uuuuggguugg aaagg ek aaagg aaaagggaagg</string>
diff --git a/app/src/main/res/values-b+ro/strings.xml b/app/src/main/res/values-b+ro/strings.xml
index 5f612c640..6becf1559 100644
--- a/app/src/main/res/values-b+ro/strings.xml
+++ b/app/src/main/res/values-b+ro/strings.xml
@@ -19,8 +19,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Viteză (%.2fx)</string>
     <string name="rated_format" formatted="true">Evaluare: %.1f</string>
-    <string name="new_update_format" formatted="true">Actualizare nouă găsită!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Actualizare nouă găsită! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Filler</string>
     <string name="duration_format" formatted="true">%d min</string>
     <!-- <string name="app_name">CloudStream</string> -->
@@ -103,7 +102,7 @@
     <string name="continue_watching">Continuați să urmăriți</string>
     <string name="action_remove_watching">Eliminați</string>
     <string name="action_open_watching">Mai multe informații</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Există probabilitatea necesitații unui VPN pentru ca acest furnizor să funcționeze corespunzător</string>
     <string name="vpn_torrent">Acest furnizor este un torrent, se recomandă un VPN</string>
     <string name="provider_info_meta">Metadatele nu sunt furnizate de către site, există posibilitatea ca încărcarea videoclipului să eșueze.</string>
@@ -177,10 +176,8 @@
     <string name="resume">Continuă</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Sunteți pe cale să ștergeți definitiv %s
-\nSunteți sigur?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nrămas</string>
+    <string name="delete_message" formatted="true">Sunteți pe cale să ștergeți definitiv %s \nSunteți sigur?</string>
+    <string name="resume_time_left" formatted="true">%dm \nrămas</string>
     <string name="status_ongoing">În curs de desfășurare</string>
     <string name="status_completed">Finalizat</string>
     <string name="status">Status</string>
@@ -430,8 +427,7 @@
     <string name="pref_category_ui_features">Funcții</string>
     <string name="extension_authors">Autori</string>
     <string name="add_repository">Adaugă depozit</string>
-    <string name="empty_library_no_accounts_message">Biblioteca ta este goală :(
-\nConectați-vă într-un cont de bibliotecă sau adăugați emisiuni la biblioteca locală.</string>
+    <string name="empty_library_no_accounts_message">Biblioteca ta este goală :( \nConectați-vă într-un cont de bibliotecă sau adăugați emisiuni la biblioteca locală.</string>
     <string name="subtitles_remove_captions">Eliminați subtitrările închise din subtitrări</string>
     <string name="setup_extensions_subtext">Descărcați lista de site-uri pe care doriți să le utilizați</string>
     <string name="sort_rating_desc">Evaluare (Ridicat la Scăzut)</string>
@@ -471,13 +467,10 @@
     <string name="error_invalid_url">URL invalid</string>
     <string name="safe_mode_description">Toate extensiile au fost dezactivate din cauza unei defecțiuni pentru a vă ajuta să o găsiți pe cea care cauzează probleme.</string>
     <string name="update_notification_downloading">Se descarcă actualizarea aplicației…</string>
-    <string name="blank_repo_message">CloudStream nu are niciun site instalat din start. Trebuie să instalați site-urile din depozite.
-\n
-\nAlăturați-vă Discord-ului nostru sau căutați online.</string>
+    <string name="blank_repo_message">CloudStream nu are niciun site instalat din start. Trebuie să instalați site-urile din depozite. \n \nAlăturați-vă Discord-ului nostru sau căutați online.</string>
     <string name="batch_download_start_format" formatted="true">A început să descarce %1$d %2$s…</string>
     <string name="safe_mode_title">Mod sigur pornit</string>
-    <string name="safe_mode_file">Fișier Mod Sigur găsit!
-\nNu încarcă nicio extensie la pornire până când fișierul nu este eliminat.</string>
+    <string name="safe_mode_file">Fișier Mod Sigur găsit! \nNu încarcă nicio extensie la pornire până când fișierul nu este eliminat.</string>
     <string name="action_remove_from_watched">Scoateți de la urmărit</string>
     <string name="sort_updated_old">Actualizat (Vechi la Nou)</string>
     <string name="apply_on_restart">Reporniți aplicația pentru a vedea schimbările.</string>
@@ -531,13 +524,7 @@
     <string name="pref_category_app_updates">Actualizări al aplicației</string>
     <string name="pref_category_subtitles">Subtitrări</string>
     <string name="disable">Dezactivați</string>
-    <string name="quality_profile_help">Aici puteți schimba modul în care sunt ordonate sursele. Dacă un videoclip are o prioritate mai mare, acesta va apărea mai sus în selecția surselor. Suma dintre prioritatea sursei și prioritatea calității reprezintă prioritatea video.
-\n
-\nSursa A: 3
-\nCalitate B: 7
-\nVa avea o prioritate video combinată de 10.
-\n
-\nNOTĂ: Dacă suma este 10 sau mai mare, playerul va sări automat peste încărcare atunci când este încărcat link-ul respectiv!</string>
+    <string name="quality_profile_help">Aici puteți schimba modul în care sunt ordonate sursele. Dacă un videoclip are o prioritate mai mare, acesta va apărea mai sus în selecția surselor. Suma dintre prioritatea sursei și prioritatea calității reprezintă prioritatea video. \n \nSursa A: 3 \nCalitate B: 7 \nVa avea o prioritate video combinată de 10. \n \nNOTĂ: Dacă suma este 10 sau mai mare, playerul va sări automat peste încărcare atunci când este încărcat link-ul respectiv!</string>
     <string name="no_plugins_found_error">Nu s-a găsit plugin-uri în depozit</string>
     <string name="no_repository_found_error">Nu s-a găsit depozitul, verificați URL-ul și încercați cu un VPN</string>
     <string name="edit">Editați</string>
@@ -553,18 +540,12 @@
     <string name="unable_to_inflate">UI nu a putut fi creată corect, acesta este un BUG MAJOR și trebuie raportat imediat %s</string>
     <string name="automatic_plugin_download_mode_title">Selectați modul de filtrare a descărcării plugin-urilor</string>
     <string name="already_voted">Ați votat deja</string>
-    <string name="duplicate_message_multiple" formatted="true">Elemente potențial duplicate au fost găsite în biblioteca ta:
-\n
-\n%s
-\n
-\nÎn ciuda acestui fapt, ai dori să adaugi acest alement, să le înlocuiești pe cele existente, sau să anulezi acțiunea?</string>
+    <string name="duplicate_message_multiple" formatted="true">Elemente potențial duplicate au fost găsite în biblioteca ta: \n \n%s \n \nÎn ciuda acestui fapt, ai dori să adaugi acest alement, să le înlocuiești pe cele existente, sau să anulezi acțiunea?</string>
     <string name="favorite_added">%s a fost adăugat la favoriți/te</string>
     <string name="favorite_removed">%s a fost eliminat din favoriți/te</string>
     <string name="action_add_to_favorites">Adaugă la favoriți/te</string>
     <string name="action_remove_from_favorites">Elimină din favoriți/te</string>
-    <string name="duplicate_message_single" formatted="true">Se pare că un element potențial duplicat deja există în biblioteca ta: \'%s.\'
-\n
-\nÎn ciuda aceasta, ai dori să adaugi acest element, să îl înlocuiești pe cel existent, sau să anulezi acțiunea?</string>
+    <string name="duplicate_message_single" formatted="true">Se pare că un element potențial duplicat deja există în biblioteca ta: \'%s.\' \n \nÎn ciuda aceasta, ai dori să adaugi acest element, să îl înlocuiești pe cel existent, sau să anulezi acțiunea?</string>
     <string name="enter_pin_with_name" formatted="true">Introduce PIN-ul pentru %s</string>
     <string name="enter_current_pin">Introduce PIN-ul actual</string>
     <string name="enter_pin">Introduce PIN-ul</string>
@@ -619,8 +600,7 @@
     <string name="reset_btn">Resetați</string>
     <string name="auto_rotate_video_desc">Activați comutarea automată a orientării ecranului pe baza orientării video</string>
     <string name="biometric_setting">Blocare cu biometrie</string>
-    <string name="resume_remaining" formatted="true">%s
-\nrămase</string>
+    <string name="resume_remaining" formatted="true">%s \nrămase</string>
     <string name="episode_upcoming_format" formatted="true">Următorul în %s</string>
     <string name="cs3wiki">CloudStream Wiki</string>
     <string name="next_season_episode_format" formatted="true">Sezonul %1$d Episod %2$d va fi lansat în</string>
diff --git a/app/src/main/res/values-b+ru/strings.xml b/app/src/main/res/values-b+ru/strings.xml
index 5c271f871..ef08b36a4 100644
--- a/app/src/main/res/values-b+ru/strings.xml
+++ b/app/src/main/res/values-b+ru/strings.xml
@@ -34,8 +34,7 @@
     <string name="preview_background_img_des">Предпросмотр фона</string>
     <string name="player_speed_text_format" formatted="true">Скорость (%.2fx)</string>
     <string name="rated_format" formatted="true">Оценили: %.1f</string>
-    <string name="new_update_format" formatted="true">Новое обновление найдено!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Новое обновление найдено! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Заполнитель</string>
     <string name="app_name">CloudStream</string>
     <string name="action_remove_from_bookmarks">Убрать</string>
@@ -172,10 +171,8 @@
     <string name="resume">Продолжить</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">Это будет удалено безвозвратно%s
-\nВы уверены?</string>
-    <string name="resume_time_left" formatted="true">%d мин.
-\nосталось</string>
+    <string name="delete_message" formatted="true">Это будет удалено безвозвратно%s \nВы уверены?</string>
+    <string name="resume_time_left" formatted="true">%d мин. \nосталось</string>
     <string name="status_completed">Завершено</string>
     <string name="year">Год</string>
     <string name="rating">Рейтинг</string>
@@ -351,7 +348,7 @@
     <string name="extensions">Дополнения</string>
     <string name="repository_url_hint">URL или код репозитория</string>
     <string name="plugin_loaded">Дополнение загружено</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="double_tap_to_seek_settings">Перемотка двойным нажатием</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
@@ -411,9 +408,7 @@
     <string name="trailer">Трейлер</string>
     <string name="single_plugin_disabled" formatted="true">%s (отключено)</string>
     <string name="next">Далее</string>
-    <string name="blank_repo_message">В CloudStream по умолчанию не установлены сайты. Вам необходимо установить сайты из репозиториев.
-\n
-\nПрисоединяйтесь к нашему Discord-серверу или найдите в интернете.</string>
+    <string name="blank_repo_message">В CloudStream по умолчанию не установлены сайты. Вам необходимо установить сайты из репозиториев. \n \nПрисоединяйтесь к нашему Discord-серверу или найдите в интернете.</string>
     <string name="error_invalid_data">Недопустимые данные</string>
     <string name="resolution_and_title">Разрешение и название</string>
     <string name="previous">Предыдущий</string>
@@ -526,13 +521,7 @@
     <string name="already_voted">Вы уже проголосовали</string>
     <string name="no_plugins_found_error">Никаких дополнений не обнаружено в источнике</string>
     <string name="set_default">Поставить обычный</string>
-    <string name="quality_profile_help">Здесь вы можете изменить порядок расположения источников. Если видео имеет более высокий приоритет, оно будет отображаться выше в списке источников. Сумма приоритета источника и приоритета качества составляет приоритет видео.
-\n
-\nИсточник А: 3
-\nКачество Б: 7
-\nБудет иметь общий приоритет видео 10.
-\n
-\nПРИМЕЧАНИЕ. Если сумма равна 10 или более, плеер автоматически пропустит загрузку при загрузке этой ссылки!</string>
+    <string name="quality_profile_help">Здесь вы можете изменить порядок расположения источников. Если видео имеет более высокий приоритет, оно будет отображаться выше в списке источников. Сумма приоритета источника и приоритета качества составляет приоритет видео. \n \nИсточник А: 3 \nКачество Б: 7 \nБудет иметь общий приоритет видео 10. \n \nПРИМЕЧАНИЕ. Если сумма равна 10 или более, плеер автоматически пропустит загрузку при загрузке этой ссылки!</string>
     <string name="links_reloaded_toast">Ссылки перезагружены</string>
     <string name="select_an_account">Выберите учётную запись</string>
     <string name="favorite_removed">%s убрано из любимых</string>
@@ -586,8 +575,7 @@
     <string name="audio_book_singular">Аудиокнига</string>
     <string name="custom_media_singular">Медиа</string>
     <string name="biometric_setting_summary">Разблокируйте приложение с помощью отпечатка пальца, Face ID, ПИН-кода, шаблона и пароля.</string>
-    <string name="resume_remaining" formatted="true">%s
-\nосталось</string>
+    <string name="resume_remaining" formatted="true">%s \nосталось</string>
     <string name="battery_dialog_title">Отключить оптимизацию батареи</string>
     <string name="password_pin_authentication_title">Аутентификация по паролю/ПИН-коду</string>
     <string name="biometric_unsupported">Биометрическая аутентификация на этом устройстве не поддерживается</string>
@@ -617,9 +605,7 @@
     <string name="delete_message_series_only" formatted="true">Вы уверены, что хотите навсегда удалить все серии в данном сериале? \n \n%s</string>
     <string name="downloads_delete_select">Выберите элементы для удаления</string>
     <string name="delete_format" formatted="true">Удалить (%1$d | %2$s)</string>
-    <string name="delete_message_multiple" formatted="true">Вы уверены, что хотите навсегда удалить данный объект?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Вы уверены, что хотите навсегда удалить данный объект? \n \n%s</string>
     <string name="device_pin_error_message">Невозможно получить ПИН-код устройства, попробуйте локальную аутентификацию</string>
     <string name="device_pin_url_message">Откройте <b>%s</b> на вашем смартфоне или компьютере и введите данный код</string>
     <string name="cs3wiki">CloudStream Вики</string>
diff --git a/app/src/main/res/values-b+sk/strings.xml b/app/src/main/res/values-b+sk/strings.xml
index 8c1c4695f..68a2e2a7e 100644
--- a/app/src/main/res/values-b+sk/strings.xml
+++ b/app/src/main/res/values-b+sk/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="new_update_format" formatted="true">Našla sa nová aktualizácia!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Našla sa nová aktualizácia! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Výplň</string>
     <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
     <string name="next_episode_format" formatted="true">Epizóda %d bude vydaná za</string>
@@ -96,7 +95,7 @@
     <string name="vpn_torrent">Tento poskytovateľ je torrent, odporúča sa VPN</string>
     <string name="subs_import_text" formatted="true">Importovať písma ich umiestnením do %s</string>
     <string name="action_open_watching">Viac informácií</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="continue_watching">Pokračovať v sledovaní</string>
     <string name="vpn_might_be_needed">Na správne fungovanie tohto poskytovateľa môže byť potrebná VPN</string>
     <string name="provider_info_meta">Stránka neposkytla žiadne metadáta, načítanie videa zlyhá, ak na stránke neexistuje.</string>
@@ -332,10 +331,8 @@
     <string name="login_format" formatted="true">%1$s %2$s</string>
     <string name="legal_notice">Vylúčenie zodpovednosti</string>
     <string name="nsfw">NSFW</string>
-    <string name="delete_message" formatted="true">Týmto sa natrvalo vymaže %s
-\nSte si istý?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nzostáva</string>
+    <string name="delete_message" formatted="true">Týmto sa natrvalo vymaže %s \nSte si istý?</string>
+    <string name="resume_time_left" formatted="true">%dm \nzostáva</string>
     <string name="status_ongoing">Prebieha</string>
     <string name="status_completed">Dokončené</string>
     <string name="emulator_layout">Rozloženie emulátora</string>
@@ -361,9 +358,7 @@
     <string name="delete_repository">Zmazať repozitár</string>
     <string name="repository_url_hint">URL adresa repozitára</string>
     <string name="view_public_repositories_button_short">Verejný zoznam</string>
-    <string name="blank_repo_message">CloudStream nemá nainštalované žiadne stránky v predvolenom nastavení. Musíte nainštalovať stránky z repozitára.
-\n
-\nPripojte sa k nášmu Discord alebo vyhľadajte online.</string>
+    <string name="blank_repo_message">CloudStream nemá nainštalované žiadne stránky v predvolenom nastavení. Musíte nainštalovať stránky z repozitára. \n \nPripojte sa k nášmu Discord alebo vyhľadajte online.</string>
     <string name="update_notification_failed">Nepodarilo sa nainštalovať novú verziu aplikácie</string>
     <string name="download_all_plugins_from_repo">Upozornenie: CloudStream 3 nenesie žiadnu zodpovednosť za používanie rozšírenia tretích strán a neposkytuje žiadnu podporu pre nich!</string>
     <string name="add_repository">Pridať repozitár</string>
diff --git a/app/src/main/res/values-b+so/strings.xml b/app/src/main/res/values-b+so/strings.xml
index 9e4e9f9f1..0eb787311 100644
--- a/app/src/main/res/values-b+so/strings.xml
+++ b/app/src/main/res/values-b+so/strings.xml
@@ -27,8 +27,7 @@
     <string name="duration_format" formatted="true">%d dqq</string>
     <string name="title_home">Kadinka</string>
     <string name="rated_format" formatted="true">Qiimaysan: %.1f</string>
-    <string name="new_update_format" formatted="true">App cusub baa soo baxay!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">App cusub baa soo baxay! \n%1$s -&gt; %2$s</string>
     <string name="title_downloads">Soo dejinta</string>
     <string name="title_search">Raadi</string>
     <string name="episode_more_options_des">Dookhyo kale</string>
@@ -183,11 +182,9 @@
     <string name="delete_file">Tirtir faylka</string>
     <string name="resume">Sii wado</string>
     <string name="go_back_30">-30</string>
-    <string name="delete_message" formatted="true">Dhamaantii waa la saari doona %s
-\nSow ma hubtid?</string>
+    <string name="delete_message" formatted="true">Dhamaantii waa la saari doona %s \nSow ma hubtid?</string>
     <string name="source_error">Fashil ka yimi xigashada</string>
-    <string name="resume_time_left" formatted="true">%ddq
-\nAyaa hadhsan</string>
+    <string name="resume_time_left" formatted="true">%ddq \nAyaa hadhsan</string>
     <string name="status_completed">Dhamaystirmay</string>
     <string name="year">Sannadka</string>
     <string name="rating">Qiimaynta</string>
@@ -427,11 +424,7 @@
     <string name="plugins_disabled" formatted="true">Xayiran: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Aan dejinayn: %d</string>
     <string name="plugins_updated" formatted="true">Waxa la cusbooneysiiyey %d sidkane</string>
-    <string name="blank_repo_message">Ugu horreyn cloudstream ma laha wax websaydyo uu filimaanta kasoo xigto, waxay noqonaysaa inaad adigu rakibato reboositarradooda...
-\n
-\nSababtuna waa in mar dhexdaas ah na dacweeyeen shirkadda Sky UK Limited🤮, markaa si aan mar dambe taasi u dhicin anagu kuma rakibi karno...
-\n
-\nDiscord naga soo qabo ama internetka ka baadh.</string>
+    <string name="blank_repo_message">Ugu horreyn cloudstream ma laha wax websaydyo uu filimaanta kasoo xigto, waxay noqonaysaa inaad adigu rakibato reboositarradooda... \n \nSababtuna waa in mar dhexdaas ah na dacweeyeen shirkadda Sky UK Limited🤮, markaa si aan mar dambe taasi u dhicin anagu kuma rakibi karno... \n \nDiscord naga soo qabo ama internetka ka baadh.</string>
     <string name="download_all_plugins_from_repo">Soo deji dhamaan sidkanayaasha reboositarkan?</string>
     <string name="result_poster_img_des">Boodhka</string>
     <string name="episode_poster_img_des">Boodhka xalqadda</string>
diff --git a/app/src/main/res/values-b+sv/strings.xml b/app/src/main/res/values-b+sv/strings.xml
index bf352e5e2..2d7ed3716 100644
--- a/app/src/main/res/values-b+sv/strings.xml
+++ b/app/src/main/res/values-b+sv/strings.xml
@@ -2,8 +2,7 @@
 <resources>
     <string name="rated_format">Betygsatt: %.1f</string>
     <string name="player_speed_text_format">Hastighet (%.2fx)</string>
-    <string name="new_update_format">Ny uppdatering hittad!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format">Ny uppdatering hittad! \n%1$s -&gt; %2$s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Hem</string>
     <string name="title_search">Sök</string>
@@ -32,7 +31,7 @@
     <string name="pick_subtitle">Undertexter</string>
     <string name="reload_error">Försök ansluta igen…</string>
     <string name="go_back">Gå tillbaka</string>
-    <string name="episode_poster_img_des">@string/result_poster_img_des</string>
+    <string name="episode_poster_img_des">\@string/result_poster_img_des</string>
     <string name="play_episode">Spela avsnitt</string>
     <string name="download">Ladda ner</string>
     <string name="download_storage_text">Intern lagring</string>
@@ -42,7 +41,7 @@
     <string name="popup_play_file">Spela upp fil</string>
     <string name="home_more_info">Mer information</string>
     <string name="home_expanded_hide">Göm</string>
-    <string name="home_main_poster_img_des">@string/result_poster_img_des</string>
+    <string name="home_main_poster_img_des">\@string/result_poster_img_des</string>
     <string name="home_play">Spela upp</string>
     <string name="home_info">Info</string>
     <string name="home_next_random_img_des">Nästa slumpvis</string>
@@ -117,8 +116,7 @@
     <string name="delete_file">Ta bort nerladdad fil</string>
     <string name="delete">Ta bort</string>
     <string name="cancel">Avbryt</string>
-    <string name="delete_message">%s kommer att raderas permanent
-\nÄr du helt säker?</string>
+    <string name="delete_message">%s kommer att raderas permanent \nÄr du helt säker?</string>
     <string name="status_ongoing">Pågående</string>
     <string name="status_completed">Färdig</string>
     <string name="status">Status</string>
@@ -225,14 +223,13 @@
     <string name="next_episode_format" formatted="true">Episod %d kommer att släppas om</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="show_trailers_settings">Visa trailers</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="ova">OVA</string>
     <string name="episodes_range">%1$d-%2$d</string>
     <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="go_back_30">-30</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nåterstår</string>
+    <string name="resume_time_left" formatted="true">%dm \nåterstår</string>
     <string name="nsfw">NSFW</string>
     <string name="ova_singular">OVA</string>
     <string name="torrent_singular">Torrent</string>
@@ -484,16 +481,12 @@
     <string name="view_public_repositories_button">Visa community databaser</string>
     <string name="skip_type_mixed_op">Blandad inledning</string>
     <string name="skip_type_format" formatted="true">Skippa %s</string>
-    <string name="blank_repo_message">CloudStream har inga webbplatser installerade som standard. Du måste installera webbplatser från arkiv.
-\n
-\nGå med i vår Discord eller sök online.</string>
+    <string name="blank_repo_message">CloudStream har inga webbplatser installerade som standard. Du måste installera webbplatser från arkiv. \n \nGå med i vår Discord eller sök online.</string>
     <string name="select_library">Välj bibliotek</string>
-    <string name="empty_library_no_accounts_message">Ditt bibliotek är tomt :(
-\nLogga in på ett bibliotekskonto eller lägg till program i ditt lokala bibliotek.</string>
+    <string name="empty_library_no_accounts_message">Ditt bibliotek är tomt :( \nLogga in på ett bibliotekskonto eller lägg till program i ditt lokala bibliotek.</string>
     <string name="enable_skip_op_from_database_des">Visa hoppa över popups för introduktion/eftertexter</string>
     <string name="action_remove_from_watched">Ta bort från sett</string>
-    <string name="safe_mode_file">Fil i säkertläge hittades!
-\nLaddar inte några tillägg vid start tills filen har tagits bort.</string>
+    <string name="safe_mode_file">Fil i säkertläge hittades! \nLaddar inte några tillägg vid start tills filen har tagits bort.</string>
     <string name="subscription_in_progress_notification">Uppdaterar prenumererade program</string>
     <string name="subscription_list_name">Prenumererad</string>
     <string name="action_subscribe">Prenumerera</string>
@@ -558,21 +551,9 @@
     <string name="use_default_account">Använd standard konto</string>
     <string name="pin">PIN-kod</string>
     <string name="android_tv_interface_off_seek_settings_summary">Sök mängden som används när spelaren är dold</string>
-    <string name="duplicate_message_multiple" formatted="true">Det verkar som om ett potentiellt duplicerat objekt redan finns i ditt bibliotek:
-\n
-\n\'%s.\'
-\n
-\nVill du lägga till det här objektet ändå, ersätta det befintliga eller avbryta åtgärden?</string>
-    <string name="duplicate_message_single" formatted="true">Det verkar som om ett potentiellt duplicerat objekt redan finns i ditt bibliotek: \'%s.\'
-\n
-\nVill du lägga till det här objektet ändå, ersätta det befintliga eller avbryta åtgärden?</string>
-    <string name="quality_profile_help">Här kan du ändra hur källorna ska sorteras, om en video har högre prioritet visas den högre upp i källvalet. Summan av källprioriteten och kvalitetsprioriteten är videoprioriteten.
-\n
-\nKälla A: 3
-\nKvalitet B: 7
-\nKommer att ha en kombinerad videoprioritet på 10.
-\n
-\nOBS: Om summan är 10 eller mer kommer spelaren automatiskt att hoppa över laddningen när den länken laddas!</string>
+    <string name="duplicate_message_multiple" formatted="true">Det verkar som om ett potentiellt duplicerat objekt redan finns i ditt bibliotek: \n \n\'%s.\' \n \nVill du lägga till det här objektet ändå, ersätta det befintliga eller avbryta åtgärden?</string>
+    <string name="duplicate_message_single" formatted="true">Det verkar som om ett potentiellt duplicerat objekt redan finns i ditt bibliotek: \'%s.\' \n \nVill du lägga till det här objektet ändå, ersätta det befintliga eller avbryta åtgärden?</string>
+    <string name="quality_profile_help">Här kan du ändra hur källorna ska sorteras, om en video har högre prioritet visas den högre upp i källvalet. Summan av källprioriteten och kvalitetsprioriteten är videoprioriteten. \n \nKälla A: 3 \nKvalitet B: 7 \nKommer att ha en kombinerad videoprioritet på 10. \n \nOBS: Om summan är 10 eller mer kommer spelaren automatiskt att hoppa över laddningen när den länken laddas!</string>
     <string name="subscribe_tooltip">Avisering om nytt avsnitt</string>
     <string name="result_search_tooltip">Sök i andra tillägg</string>
     <string name="recommendations_tooltip">Visa rekommendationer</string>
@@ -587,8 +568,7 @@
     <string name="biometric_prompt_description">Efter några misslyckade försök stängs prompten. Starta bara om appen för att försöka igen.</string>
     <string name="favorite">Favorit</string>
     <string name="unfavorite">Ta bort från favoriter</string>
-    <string name="resume_remaining" formatted="true">%s
-\nkvarstår</string>
+    <string name="resume_remaining" formatted="true">%s \nkvarstår</string>
     <string name="toast_copied">kopierad!</string>
     <string name="repo_copy_label">Lagringsnamn och URL</string>
     <string name="battery_dialog_message">För att säkerställa oavbrutna nedladdningar och aviseringar för prenumererade tv-program behöver CloudStream tillstånd att köras i bakgrunden. Genom att trycka på OK kommer du få en förfrågningsdialogruta. Tryck då på \'Tillåt\'.\n\nObservera att denna behörighet inte betyder att CS3 kommer att tömma ditt batteri. Den fungerar bara i bakgrunden när det behövs, till exempel när du tar emot aviseringar eller laddar ner videor från officiella tillägg.</string>
@@ -617,9 +597,7 @@
     <string name="auth_locally">Autentisera lokalt</string>
     <string name="qr_image">QR-kodbild</string>
     <string name="device_pin_expired_message">PIN-koden har upphört att gälla!</string>
-    <string name="delete_message_series_episodes" formatted="true">Är du säker på att du vill radera följande avsnitt permanent i %1$s?
-\n
-\n%2$s</string>
+    <string name="delete_message_series_episodes" formatted="true">Är du säker på att du vill radera följande avsnitt permanent i %1$s? \n \n%2$s</string>
     <string name="preview_seekbar_desc">Aktivera förhandsgranskningsminiatyr i sökfältet</string>
     <string name="preview_seekbar">Förhandsgranskning av sökfältet</string>
     <string name="play_from_beginning_img_des">Spela från början</string>
@@ -633,15 +611,9 @@
     <string name="deselect_all">Avmarkera alla</string>
     <string name="delete_files">Radera Filer</string>
     <string name="delete_format" formatted="true">Radera (%1$d | %2$s)</string>
-    <string name="delete_message_multiple" formatted="true">Är du säker på att du vill ta bort följande objekt permanent?
-\n
-\n%s</string>
-    <string name="delete_message_series_section" formatted="true">Du kommer också permanent att radera alla avsnitt i följande serie:
-\n
-\n%s</string>
-    <string name="delete_message_series_only" formatted="true">Är du säker på att du permanent vill radera alla avsnitt i följande serie?
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">Är du säker på att du vill ta bort följande objekt permanent? \n \n%s</string>
+    <string name="delete_message_series_section" formatted="true">Du kommer också permanent att radera alla avsnitt i följande serie: \n \n%s</string>
+    <string name="delete_message_series_only" formatted="true">Är du säker på att du permanent vill radera alla avsnitt i följande serie? \n \n%s</string>
     <string name="delete_plugin">Ta bort insticksprogram</string>
     <string name="hide_player_control_names">Dölj namnen på spelarens kontroller</string>
     <string name="device_pin_url_message">Besök <b>%s</b> på din smartphone eller dator och ange koden ovan</string>
@@ -660,7 +632,7 @@
     <string name="torrent_preferred_media">Aktivera torrent i Inställningar/Leverantörer/Föredragen media</string>
     <string name="encoding_error">Avkodningsfel</string>
     <string name="player_load_one_subtitle_online">Ladda in första möjliga</string>
-    <string name="dont_show">Dölj</string>
+    <string name="dont_show">Visa inte</string>
     <string name="subs_edge_size">Kantstorlek</string>
     <string name="custom">Egen</string>
     <string name="unsupported_error">Stöds ej</string>
@@ -760,4 +732,7 @@
     <string name="all_subtitles_italic">Gör alla undertexter kursivstila</string>
     <string name="background_radius">Bakgrundsradie</string>
     <string name="show_player_metadata_overlay">Visa spelarens metadata överlägg</string>
+    <string name="video_singular">Video</string>
+    <string name="skip_type_preview">Förhandsvisning</string>
+    <string name="player_is_live">Live</string>
 </resources>
diff --git a/app/src/main/res/values-b+ta/strings.xml b/app/src/main/res/values-b+ta/strings.xml
index fda0c36fd..3bf464623 100644
--- a/app/src/main/res/values-b+ta/strings.xml
+++ b/app/src/main/res/values-b+ta/strings.xml
@@ -182,7 +182,7 @@
     <string name="no">இல்லை</string>
     <string name="discord">முரண்பாட்டில் சேரவும்</string>
     <string name="asian_drama">ஆசிய நாடகங்கள்</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="rating">செயல்வரம்பு</string>
     <string name="search">தேடல்</string>
     <string name="show_trailers_settings">டிரெய்லர்களைக் காட்டு</string>
@@ -358,8 +358,7 @@
     <string name="emulator_layout">முன்மாதிரி தளவமைப்பு</string>
     <string name="downloaded_file">பதிவிறக்கம் செய்யப்பட்ட கோப்பு</string>
     <string name="resolution">பகுத்தல்</string>
-    <string name="empty_library_no_accounts_message">உங்கள் நூலகம் காலியாக உள்ளது :(
-\n நூலகக் கணக்கில் உள்நுழைக அல்லது உங்கள் உள்ளக நூலகத்தில் காட்சிகளைச் சேர்க்கவும்.</string>
+    <string name="empty_library_no_accounts_message">உங்கள் நூலகம் காலியாக உள்ளது :( \n நூலகக் கணக்கில் உள்நுழைக அல்லது உங்கள் உள்ளக நூலகத்தில் காட்சிகளைச் சேர்க்கவும்.</string>
     <string name="action_unsubscribe">குழுவிலகவும்</string>
     <string name="profiles">சுயவிவரங்கள்</string>
     <string name="pin_error_length">முள் 4 எழுத்துகளாக இருக்க வேண்டும்</string>
@@ -566,8 +565,7 @@
     <string name="sort_rating_asc">மதிப்பீடு (குறைந்த முதல் உயர் வரை)</string>
     <string name="sort_updated_new">புதுப்பிக்கப்பட்டது (பழையது புதியது)</string>
     <string name="empty_library_logged_in_message">இந்த பட்டியல் காலியாக உள்ளது. இன்னொரு இடத்திற்கு மாற முயற்சிக்கவும்.</string>
-    <string name="safe_mode_file">பாதுகாப்பான பயன்முறை கோப்பு கிடைத்தது!
-\n கோப்பு அகற்றப்படும் வரை தொடக்கத்தில் எந்த நீட்டிப்புகளையும் ஏற்றவில்லை.</string>
+    <string name="safe_mode_file">பாதுகாப்பான பயன்முறை கோப்பு கிடைத்தது! \n கோப்பு அகற்றப்படும் வரை தொடக்கத்தில் எந்த நீட்டிப்புகளையும் ஏற்றவில்லை.</string>
     <string name="subscription_in_progress_notification">சந்தா காட்சிகளைப் புதுப்பித்தல்</string>
     <string name="subscription_list_name">சந்தா</string>
     <string name="subscription_episode_released">எபிசோட் %d வெளியானது!</string>
diff --git a/app/src/main/res/values-b+tl/strings.xml b/app/src/main/res/values-b+tl/strings.xml
index 4050ddbd7..5a34b8994 100644
--- a/app/src/main/res/values-b+tl/strings.xml
+++ b/app/src/main/res/values-b+tl/strings.xml
@@ -5,7 +5,7 @@
     <string name="app_dub_sub_episode_text_format">%1$s Ep %2$d</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
@@ -15,8 +15,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Bilis (%.2fx)</string>
     <string name="rated_format" formatted="true">Rated: %.1f</string>
-    <string name="new_update_format" formatted="true">Bagong update!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Bagong update! \n%1$s -&gt; %2$s</string>
     <string name="app_name">CloudStream</string>
     <string name="title_home">Home</string>
     <string name="title_search">Maghanap</string>
@@ -138,8 +137,7 @@
     <string name="cancel">Kanselahin</string>
     <string name="pause">I-pause</string>
     <string name="resume">I-resume</string>
-    <string name="delete_message">This will permanently delete %s
-\nAre you sure?</string>
+    <string name="delete_message">This will permanently delete %s \nAre you sure?</string>
     <string name="status_ongoing">Patuloy</string>
     <string name="status_completed">Tapos na</string>
     <string name="status">Katayuan</string>
diff --git a/app/src/main/res/values-b+tr/strings.xml b/app/src/main/res/values-b+tr/strings.xml
index fb0600c1a..893325b7a 100644
--- a/app/src/main/res/values-b+tr/strings.xml
+++ b/app/src/main/res/values-b+tr/strings.xml
@@ -19,8 +19,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Hız (%.2fx)</string>
     <string name="rated_format" formatted="true">Puan: %.1f</string>
-    <string name="new_update_format" formatted="true">Yeni güncelleme bulundu!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Yeni güncelleme bulundu! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Dolgu</string>
     <string name="duration_format" formatted="true">%d dakika</string>
     <string name="app_name">CloudStream</string>
@@ -106,7 +105,7 @@
     <string name="continue_watching">İzlemeye Devam Et</string>
     <string name="action_remove_watching">Kaldır</string>
     <string name="action_open_watching">Daha Fazla Bilgi</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Bu sağlayıcının düzgün çalışması için bir VPN gerekebilir</string>
     <string name="vpn_torrent">Bu sağlayıcı torrent kullanıyor, bir VPN önerilir</string>
     <string name="provider_info_meta">Metadata site tarafından sağlanmamış, veri site\'de bulunmuyorsa video yüklenmesi başarısız olacak.</string>
@@ -187,8 +186,7 @@
     <string name="resume">Sürdür</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">%s tamamen silinecek
-\nEmin misiniz?</string>
+    <string name="delete_message" formatted="true">%s tamamen silinecek \nEmin misiniz?</string>
     <string name="resume_time_left" formatted="true">%dd \nkaldı</string>
     <string name="status_ongoing">Devam ediyor</string>
     <string name="status_completed">Tamamlandı</string>
@@ -220,8 +218,8 @@
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Dizi</string>
     <string name="cartoons_singular">Çizgi film</string>
-    <string name="anime_singular">@string/anime</string>
-    <string name="ova_singular">@string/ova</string>
+    <string name="anime_singular">\@string/anime</string>
+    <string name="ova_singular">\@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Belgesel</string>
     <string name="asian_drama_singular">Asya dizisi</string>
@@ -485,10 +483,8 @@
     <string name="clipboard_too_large">Çok fazla metin. Panoya kaydedilemiyor.</string>
     <string name="library">Kütüphane</string>
     <string name="browser">Tarayıcı</string>
-    <string name="empty_library_no_accounts_message">Kütüphaneniz boş :(
-\nBir kütüphane hesabında oturum açın veya yerel kütüphanenize programlar ekleyin.</string>
-    <string name="safe_mode_file">Güvenli mod dosyası bulundu!
-\nDosya kaldırılana kadar başlangıçta herhangi bir uzantı yüklenmiyor.</string>
+    <string name="empty_library_no_accounts_message">Kütüphaneniz boş :( \nBir kütüphane hesabında oturum açın veya yerel kütüphanenize programlar ekleyin.</string>
+    <string name="safe_mode_file">Güvenli mod dosyası bulundu! \nDosya kaldırılana kadar başlangıçta herhangi bir uzantı yüklenmiyor.</string>
     <string name="sort_by">Şuna Göre Sırala</string>
     <string name="sort">Sırala</string>
     <string name="sort_updated_new">Güncellenme (Yeniden Eskiye)</string>
@@ -531,13 +527,7 @@
     <string name="mobile_data">Mobil veri</string>
     <string name="set_default">Varsayılanı ayarla</string>
     <string name="edit">Düzenle</string>
-    <string name="quality_profile_help">Burada kaynakların nasıl sıralandığını değiştirebilirsiniz. Bir video daha yüksek bir önceliğe sahipse, kaynak seçiminde daha yüksek görünecektir. Kaynak önceliği ve kalite önceliğinin toplamı video önceliğidir.
-\n
-\nKaynak A: 3
-\nKalite B: 7
-\nBirleştirilmiş video önceliği 10 olacaktır.
-\n
-\nNOT: Toplam 10 veya daha fazlaysa, bu bağlantı yüklendiğinde oynatıcı otomatik olarak yüklemeyi atlayacaktır!</string>
+    <string name="quality_profile_help">Burada kaynakların nasıl sıralandığını değiştirebilirsiniz. Bir video daha yüksek bir önceliğe sahipse, kaynak seçiminde daha yüksek görünecektir. Kaynak önceliği ve kalite önceliğinin toplamı video önceliğidir. \n \nKaynak A: 3 \nKalite B: 7 \nBirleştirilmiş video önceliği 10 olacaktır. \n \nNOT: Toplam 10 veya daha fazlaysa, bu bağlantı yüklendiğinde oynatıcı otomatik olarak yüklemeyi atlayacaktır!</string>
     <string name="qualities">Kaliteler</string>
     <string name="profile_background_des">Profil arkaplanı</string>
     <string name="unable_to_inflate">UI was unable to be created correctly, this is a MAJOR BUG and should be reported immediately %s</string>
@@ -546,11 +536,7 @@
     <string name="favorites_list_name">Favoriler</string>
     <string name="favorite_added">%s favorilere eklendi</string>
     <string name="logged_account" formatted="true">%s olarak giriş yapıldı</string>
-    <string name="duplicate_message_multiple" formatted="true">Kütüphanenizde potensiyel kopya ürünler bulundu:
-\n
-\n%s
-\n
-\nYine de ekleyerek var olanları değiştirmek mi istersiniz, yoksa iptal etmek mi?</string>
+    <string name="duplicate_message_multiple" formatted="true">Kütüphanenizde potensiyel kopya ürünler bulundu: \n \n%s \n \nYine de ekleyerek var olanları değiştirmek mi istersiniz, yoksa iptal etmek mi?</string>
     <string name="enter_pin_with_name" formatted="true">%s için PIN girin</string>
     <string name="backup_frequency">Yedekleme sıklığı</string>
     <string name="duplicate_title">Potensiyel Kopya Bulundu</string>
@@ -573,9 +559,7 @@
     <string name="no_repository_found_error">Depo bulunamadı, bağlantı adresini kontrol edin veya VPN ile deneyin</string>
     <string name="already_voted">Zaten oyladınız</string>
     <string name="no_plugins_found_error">Depoda eklenti bulunamadı</string>
-    <string name="duplicate_message_single" formatted="true">Görünüşe göre potansiyel bir kopya kütüphanenizde zaten bulunuyor: \'%s\'
-\n
-\nYine de ekleyerek var olanı değiştirmek mi istersiniz, yoksa iptal etmek mi?</string>
+    <string name="duplicate_message_single" formatted="true">Görünüşe göre potansiyel bir kopya kütüphanenizde zaten bulunuyor: \'%s\' \n \nYine de ekleyerek var olanı değiştirmek mi istersiniz, yoksa iptal etmek mi?</string>
     <string name="enter_pin">PIN girin</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">Geçerli PIN\'i Giriniz</string>
@@ -637,20 +621,12 @@
     <string name="hide_player_control_names">Oynatıcı kontrolünün adlarını gizle</string>
     <string name="play_from_beginning_img_des">Baştan Oynat</string>
     <string name="select_all">Tümünü Seç</string>
-    <string name="delete_message_multiple" formatted="true">Aşağıdaki öğeleri kalıcı olarak silmek istediğinizden emin misiniz?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">%1$s içindeki aşağıdaki bölümleri kalıcı olarak silmek istediğinizden emin misiniz?
-\n
-\n%2$s</string>
+    <string name="delete_message_multiple" formatted="true">Aşağıdaki öğeleri kalıcı olarak silmek istediğinizden emin misiniz? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">%1$s içindeki aşağıdaki bölümleri kalıcı olarak silmek istediğinizden emin misiniz? \n \n%2$s</string>
     <string name="delete_files">Dosyaları Silin</string>
     <string name="delete_format" formatted="true">Sil (%1$d | %2$s)</string>
-    <string name="delete_message_series_only" formatted="true">Aşağıdaki dizideki tüm bölümleri kalıcı olarak silmek istediğinizden emin misiniz?
-\n
-\n%s</string>
-    <string name="delete_message_series_section" formatted="true">Ayrıca aşağıdaki dizideki tüm bölümleri kalıcı olarak sileceksiniz:
-\n
-\n%s</string>
+    <string name="delete_message_series_only" formatted="true">Aşağıdaki dizideki tüm bölümleri kalıcı olarak silmek istediğinizden emin misiniz? \n \n%s</string>
+    <string name="delete_message_series_section" formatted="true">Ayrıca aşağıdaki dizideki tüm bölümleri kalıcı olarak sileceksiniz: \n \n%s</string>
     <string name="downloads_delete_select">Silinecek Öğeleri Seçin</string>
     <string name="deselect_all">Tüm Seçimi Kaldır</string>
     <string name="offline_file">Çevrimdışı izlemek için kullanılabilir</string>
@@ -770,4 +746,7 @@
     <string name="source_priority">Öncelikli kaynak</string>
     <string name="source_priority_help">Oynatıcıda video kaynaklarının nasıl sıralanacağını belirleyin</string>
     <string name="show_player_metadata_overlay">Meta Verileri Katmanını Göster</string>
+    <string name="player_is_live">Canlı</string>
+    <string name="skip_type_preview">Ön Gösterim</string>
+    <string name="video_singular">Video</string>
 </resources>
diff --git a/app/src/main/res/values-b+uk/strings.xml b/app/src/main/res/values-b+uk/strings.xml
index 2a9352183..dc8f36682 100644
--- a/app/src/main/res/values-b+uk/strings.xml
+++ b/app/src/main/res/values-b+uk/strings.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="search_poster_img_des">Плакат</string>
-    <string name="episode_poster_img_des">Постер Епізоду</string>
-    <string name="download_canceled">Завантаження Скасовано</string>
-    <string name="home_change_provider_img_des">Змінити Постачальника</string>
+    <string name="episode_poster_img_des">Постер епізоду</string>
+    <string name="download_canceled">Завантаження скасовано</string>
+    <string name="home_change_provider_img_des">Змінити постачальника</string>
     <string name="go_back_img_des">Назад</string>
     <string name="rated_format" formatted="true">Рейтинг: %.1f</string>
     <string name="cast_format" formatted="true">У ролях: %s</string>
-    <string name="next_episode_format" formatted="true">Епізод %d вийде через</string>
+    <string name="next_episode_format" formatted="true">%d епізод вийде через</string>
     <string name="result_poster_img_des">Плакат</string>
     <string name="app_dub_sub_episode_text_format" formatted="true">%1$s Еп %2$d</string>
-    <string name="next_episode_time_day_format" formatted="true">%1$dд %2$dгод %3$dхв</string>
-    <string name="next_episode_time_hour_format" formatted="true">%1$dгод %2$dхв</string>
-    <string name="next_episode_time_min_format" formatted="true">%dхв</string>
-    <string name="home_main_poster_img_des">Головний Постер</string>
-    <string name="home_next_random_img_des">Наступний Випадковий</string>
-    <string name="preview_background_img_des">Попередній Перегляд Заднього Фону</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$d дн %2$d год %3$d хв</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$d год %2$d хв</string>
+    <string name="next_episode_time_min_format" formatted="true">%d хв</string>
+    <string name="home_main_poster_img_des">Головний постер</string>
+    <string name="home_next_random_img_des">Наступне випадкове</string>
+    <string name="preview_background_img_des">Попередній перегляд тла</string>
     <string name="player_speed_text_format" formatted="true">Швидкість (%.2fx)</string>
     <string name="new_update_format" formatted="true">Знайдено нове оновлення!\n%1$s –&gt; %2$s</string>
     <string name="title_search">Пошук</string>
@@ -24,29 +24,29 @@
     <string name="title_settings">Налаштування</string>
     <string name="search_hint">Пошук…</string>
     <string name="search_hint_site" formatted="true">Пошук на %s…</string>
-    <string name="no_data">Немає Даних</string>
-    <string name="episode_more_options_des">Більше Опцій</string>
+    <string name="no_data">Немає даних</string>
+    <string name="episode_more_options_des">Більше налаштувань</string>
     <string name="next_episode">Наступний епізод</string>
     <string name="result_tags">Жанри</string>
-    <string name="result_open_in_browser">Відкрити в Браузері</string>
-    <string name="skip_loading">Пропустити Завантаження</string>
+    <string name="result_open_in_browser">Відкрити в браузері</string>
+    <string name="skip_loading">Пропустити завантаження</string>
     <string name="loading">Завантаження…</string>
     <string name="type_completed">Завершено</string>
-    <string name="type_plan_to_watch">Планую Дивитися</string>
-    <string name="type_dropped">Скинуто</string>
-    <string name="play_movie_button">Відтворити Фільм</string>
-    <string name="play_trailer_button">Відтворити Трейлер</string>
-    <string name="play_torrent_button">Транслювати Торрент</string>
+    <string name="type_plan_to_watch">Заплановано</string>
+    <string name="type_dropped">Покинуто</string>
+    <string name="play_movie_button">Відтворити фільм</string>
+    <string name="play_trailer_button">Відтворити трейлер</string>
+    <string name="play_torrent_button">Транслювати торрент</string>
     <string name="reload_error">Повторити з’єднання…</string>
     <string name="go_back">Назад</string>
-    <string name="play_episode">Відтворити Епізод</string>
+    <string name="play_episode">Відтворити епізод</string>
     <string name="downloaded">Завантажено</string>
     <string name="downloading">Завантаження</string>
-    <string name="download_done">Завантаження Завершено</string>
+    <string name="download_done">Завантаження завершено</string>
     <string name="app_dubbed_text">Дуб.</string>
     <string name="app_subbed_text">Суб.</string>
-    <string name="popup_delete_file">Видалити Файл</string>
-    <string name="popup_resume_download">Відновити Завантаження</string>
+    <string name="popup_delete_file">Видалити файл</string>
+    <string name="popup_resume_download">Відновити завантаження</string>
     <string name="home_expanded_hide">Приховати</string>
     <string name="home_play">Переглянути</string>
     <string name="home_info">Подробиці</string>
@@ -57,26 +57,26 @@
     <string name="sort_copy">Скопіювати</string>
     <string name="sort_close">Закрити</string>
     <string name="sort_save">Зберегти</string>
-    <string name="player_speed">Швидкість Плеєра</string>
-    <string name="subs_window_color">Колір Вікна</string>
-    <string name="subs_edge_type">Тип Межі</string>
+    <string name="player_speed">Швидкість програвача</string>
+    <string name="subs_window_color">Колір вікна</string>
+    <string name="subs_edge_type">Тип межі</string>
     <string name="subs_font">Шрифт</string>
-    <string name="subs_font_size">Розмір Шрифту</string>
+    <string name="subs_font_size">Розмір шрифту</string>
     <string name="search_provider_text_providers">Пошук за постачальниками</string>
     <string name="search_provider_text_types">Пошук за типами</string>
-    <string name="benene_count_text_none">Жодного Benenes не надано</string>
-    <string name="subs_auto_select_language">Авто-Вибір Мови</string>
-    <string name="subs_download_languages">Завантажити Мови</string>
-    <string name="subs_subtitle_languages">Мова Субтитрів</string>
-    <string name="subs_hold_to_reset_to_default">Утримуйте, щоби скинути до типових налаштувань</string>
+    <string name="benene_count_text_none">Жодного банана не надано</string>
+    <string name="subs_auto_select_language">Автовибір мови</string>
+    <string name="subs_download_languages">Завантажити мови</string>
+    <string name="subs_subtitle_languages">Мова субтитрів</string>
+    <string name="subs_hold_to_reset_to_default">Утримуйте, щоби скинути до типових</string>
     <string name="subs_import_text" formatted="true">Імпортуйте шрифти, помістивши їх до %s</string>
-    <string name="continue_watching">Продовжити Перегляд</string>
+    <string name="continue_watching">Продовжити перегляд</string>
     <string name="action_remove_watching">Вилучити</string>
     <string name="action_open_watching">Докладніше</string>
     <string name="vpn_torrent">Цей постачальник є торентом, рекомендується використовувати VPN</string>
     <string name="torrent_plot">Опис</string>
-    <string name="normal_no_plot">Сюжет Не Знайдено</string>
-    <string name="torrent_no_plot">Опис Не Знайдено</string>
+    <string name="normal_no_plot">Сюжет не знайдено</string>
+    <string name="torrent_no_plot">Опис не знайдено</string>
     <string name="show_log_cat">Показати Logcat 🐈</string>
     <string name="picture_in_picture_des">Продовжувати відтворення в мініатюрному програвачі поверх інших застосунків</string>
     <string name="player_size_settings_des">Прибрати чорні смуги</string>
@@ -92,35 +92,35 @@
     <string name="filler" formatted="true">Філлер</string>
     <string name="play_with_app_name">Відтворити в CloudStream</string>
     <string name="stream">Мережева трансляція</string>
-    <string name="type_watching">Переглядання</string>
+    <string name="type_watching">Переглядаю</string>
     <string name="result_share">Поділитися</string>
     <string name="type_on_hold">Відкладено</string>
-    <string name="type_re_watching">Переглядаю Повторно</string>
+    <string name="type_re_watching">Передивляюся</string>
     <string name="download">Завантажити</string>
-    <string name="play_livestream_button">Відтворити Трансляцію</string>
+    <string name="play_livestream_button">Відтворити трансляцію</string>
     <string name="pick_source">Джерела</string>
     <string name="pick_subtitle">Субтитри</string>
-    <string name="download_storage_text">Внутрішнє Сховище</string>
-    <string name="download_paused">Завантаження Призупинено</string>
-    <string name="download_started">Завантаження Розпочато</string>
-    <string name="download_failed">Завантаження не Вдалося</string>
-    <string name="update_started">Оновлення Розпочато</string>
-    <string name="error_loading_links_toast">Помилка Завантаження Посилань</string>
-    <string name="popup_pause_download">Призупинити Завантаження</string>
-    <string name="popup_play_file">Переглянути Файл</string>
+    <string name="download_storage_text">Внутрішнє сховище</string>
+    <string name="download_paused">Завантаження призупинено</string>
+    <string name="download_started">Завантаження розпочато</string>
+    <string name="download_failed">Не вдалося завантажити</string>
+    <string name="update_started">Оновлення розпочато</string>
+    <string name="error_loading_links_toast">Помилка завантаження посилань</string>
+    <string name="popup_pause_download">Призупинити завантаження</string>
+    <string name="popup_play_file">Переглянути файл</string>
     <string name="home_more_info">Докладніше</string>
-    <string name="filter_bookmarks">Фільтрувати Закладки</string>
+    <string name="filter_bookmarks">Фільтрувати закладки</string>
     <string name="sort_clear">Очистити</string>
-    <string name="subtitles_settings">Налаштування Субтитрів</string>
-    <string name="subs_background_color">Колір Тла</string>
-    <string name="subs_subtitle_elevation">Висота Субтитрів</string>
-    <string name="subs_text_color">Колір Тексту</string>
-    <string name="subs_outline_color">Колір Обведення</string>
+    <string name="subtitles_settings">Налаштування субтитрів</string>
+    <string name="subs_background_color">Колір тла</string>
+    <string name="subs_subtitle_elevation">Висота субтитрів</string>
+    <string name="subs_text_color">Колір тексту</string>
+    <string name="subs_outline_color">Колір обведення</string>
     <string name="autoplay_next_settings">Автовідтворення наступного епізоду</string>
     <string name="swipe_to_seek_settings_des">Проведіть збоку в бік, щоби керувати часом відтворення у відео</string>
-    <string name="benene_count_text">%d Benenes надано розробникам</string>
+    <string name="benene_count_text">Дано %d бананів розробникам</string>
     <string name="player_size_settings">Кнопка зміни розміру програвача</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Для коректної роботи цього постачальника може знадобитися VPN</string>
     <string name="provider_info_meta">Метадані не надаються сайтом, завантаження відео не відбудеться, якщо їх немає на сайті.</string>
     <string name="picture_in_picture">Картинка в картинці</string>
@@ -138,12 +138,12 @@
     <string name="backup_success">Дані збережено</string>
     <string name="backup_failed_error_format">Помилка резервного копіювання %s</string>
     <string name="search">Пошук</string>
-    <string name="category_account">Облікові Записи та Безпека</string>
-    <string name="category_updates">Оновлення та Резервне Копіювання</string>
+    <string name="category_account">Облікові записи та безпека</string>
+    <string name="category_updates">Оновлення та резервне копіювання</string>
     <string name="settings_info">Подробиці</string>
-    <string name="advanced_search">Розширений Пошук</string>
+    <string name="advanced_search">Розширений пошук</string>
     <string name="advanced_search_des">Показувати результати пошуку, розділені за постачальниками</string>
-    <string name="show_fillers_settings">Показувати наповнювачі для аніме</string>
+    <string name="show_fillers_settings">Показувати філлери для аніме</string>
     <string name="show_trailers_settings">Показувати трейлери</string>
     <string name="pref_filter_search_quality">Приховати вибрану якість відео у результатах пошуку</string>
     <string name="automatic_plugin_download">Автозавантаження розширень</string>
@@ -153,25 +153,25 @@
     <string name="github">Github</string>
     <string name="lightnovel">Застосунок для ранобе від тих самих розробників</string>
     <string name="anim">Застосунок для аніме від тих самих розробників</string>
-    <string name="benene">Дати benene розробникам</string>
-    <string name="app_language">Мова Застосунку</string>
+    <string name="benene">Дати бананів розробникам</string>
+    <string name="app_language">Мова застосунку</string>
     <string name="no_chromecast_support_toast">Цей постачальник не має підтримування Chromecast</string>
-    <string name="no_links_found_toast">Посилань Не Знайдено</string>
-    <string name="play_episode_toast">Переглянути Епізод</string>
+    <string name="no_links_found_toast">Посилань не знайдено</string>
+    <string name="play_episode_toast">Переглянути епізод</string>
     <string name="subs_default_reset_toast">Скинути до типових значень</string>
-    <string name="no_season">Немає Сезону</string>
+    <string name="no_season">Немає сезону</string>
     <string name="episodes">Епізоди</string>
     <string name="episode_format" formatted="true">%1$d %2$s</string>
     <string name="season_short">С</string>
     <string name="episode_short">Е</string>
-    <string name="delete_file">Видалити Файл</string>
+    <string name="delete_file">Видалити файл</string>
     <string name="delete">Видалити</string>
     <string name="cancel">Скасувати</string>
     <string name="resume">Відновити</string>
     <string name="go_back_30">-30</string>
     <string name="delete_message" formatted="true">Це назавжди видалить %s\nВи впевнені?</string>
-    <string name="resume_time_left" formatted="true">%dхв\nзалишилося</string>
-    <string name="status_ongoing">Триває</string>
+    <string name="resume_time_left" formatted="true">%d хв\nзалишилося</string>
+    <string name="status_ongoing">Виходить</string>
     <string name="status_completed">Завершено</string>
     <string name="rating">Рейтинг</string>
     <string name="duration">Тривалість</string>
@@ -184,16 +184,16 @@
     <string name="tv_series">Телесеріали</string>
     <string name="cartoons">Мультфільми</string>
     <string name="anime">Аніме</string>
-    <string name="ova">OVA</string>
-    <string name="asian_drama">Азіатські Драми</string>
-    <string name="livestreams">Прямі Трансляції</string>
+    <string name="ova">ОВА</string>
+    <string name="asian_drama">Азіатські драми</string>
+    <string name="livestreams">Прямі трансляції</string>
     <string name="others">Інші</string>
     <string name="tv_series_singular">Серіал</string>
     <string name="cartoons_singular">Мультфільм</string>
     <string name="anime_singular">Аніме</string>
-    <string name="documentaries_singular">Документальний Фільм</string>
-    <string name="asian_drama_singular">Азіатська Драма</string>
-    <string name="live_singular">Пряма Трансляція</string>
+    <string name="documentaries_singular">Документалка</string>
+    <string name="asian_drama_singular">Азіатська драма</string>
+    <string name="live_singular">Пряма трансляція</string>
     <string name="other_singular">Відео</string>
     <string name="source_error">Помилка джерела</string>
     <string name="remote_error">Віддалена помилка</string>
@@ -203,15 +203,15 @@
     <string name="episode_action_play_in_format">Переглянути в %s</string>
     <string name="episode_action_auto_download">Автозавантаження</string>
     <string name="episode_action_download_mirror">Завантажити дзеркало</string>
-    <string name="check_for_update">Перевірити Наявність Оновлень</string>
+    <string name="check_for_update">Перевірити наявність оновлень</string>
     <string name="video_lock">Забл./Розбл.</string>
     <string name="video_skip_op">Пропустити ОП</string>
     <string name="dont_show_again">Не показувати знову</string>
     <string name="update">Оновити</string>
-    <string name="watch_quality_pref">Бажана якість перегляду (WiFi)</string>
+    <string name="watch_quality_pref">Бажана якість перегляду (Wi-Fi)</string>
     <string name="show_title">Заголовок</string>
     <string name="poster_ui_settings">Перемкнути елементи інтерфейсу на плакаті</string>
-    <string name="no_update_found">Оновлення Не Знайдено</string>
+    <string name="no_update_found">Оновлення не знайдено</string>
     <string name="double_tap_to_seek_settings_des">Натисніть двічі праворуч або ліворуч, щоби перемотати вперед або назад</string>
     <string name="use_system_brightness_settings_des">Використовувати системну яскравість у програвачі замість темного накладання</string>
     <string name="restore_success">Завантажено файл резервної копії</string>
@@ -222,10 +222,10 @@
     <string name="automatic_plugin_updates">Автооновлення розширень</string>
     <string name="automatic_plugin_download_summary">Автоматично встановлювати всі розширення, які ще не встановлено, з доданих сховищ.</string>
     <string name="updates_settings_des">Автоматично перевіряти нові оновлення після запуску застосунку.</string>
-    <string name="copy_link_toast">Покликання скопійовано до буфера обміну</string>
-    <string name="apk_installer_settings_des">Деякі пристрої не підтримують новий інсталятор пакетів. Спробуйте старий варіант, якщо оновлення не встановлюються.</string>
+    <string name="copy_link_toast">Посилання скопійовано до буфера обміну</string>
+    <string name="apk_installer_settings_des">Деякі пристрої не підтримують новий встановлювач пакетів. Спробуйте старий варіант, якщо оновлення не встановлюються.</string>
     <string name="discord">Приєднуйтеся до Discord</string>
-    <string name="benene_des">Дано benene</string>
+    <string name="benene_des">Дано банани</string>
     <string name="year">Рік</string>
     <string name="go_forward_30">+30</string>
     <string name="season_format">%1$s %2$d%3$s</string>
@@ -240,21 +240,21 @@
     <string name="synopsis">Стислий зміст</string>
     <string name="movies">Фільми</string>
     <string name="episode_action_reload_links">Перезавантажити посилання</string>
-    <string name="documentaries">Документальні Фільми</string>
+    <string name="documentaries">Документалки</string>
     <string name="nsfw">NSFW</string>
     <string name="movies_singular">Фільм</string>
-    <string name="ova_singular">OVA</string>
+    <string name="ova_singular">ОВА</string>
     <string name="torrent_singular">Торент</string>
     <string name="show_hd">Мітка якості</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="unexpected_error">Несподівана помилка програвача</string>
     <string name="storage_error">Помилка завантаження, перевірте дозвіл на зберігання</string>
-    <string name="episode_action_chromecast_episode">Chromecast епізод</string>
+    <string name="episode_action_chromecast_episode">Епізод через Chromecast</string>
     <string name="show_sub">Мітка субтитрів</string>
     <string name="video_source">Джерело</string>
     <string name="episode_action_download_subtitle">Завантажити субтитри</string>
     <string name="show_dub">Мітка дубляжу</string>
-    <string name="skip_update">Пропустити це Оновлення</string>
+    <string name="skip_update">Пропустити це оновлення</string>
     <string name="all">Усе</string>
     <string name="resize_fit">На весь екран</string>
     <string name="resize_fill">Розтягнути</string>
@@ -275,9 +275,9 @@
     <string name="app_layout">Макет застосунку</string>
     <string name="preferred_media_settings">Бажані медіа</string>
     <string name="automatic">Автоматично</string>
-    <string name="tv_layout">Телевізійна Обгортка</string>
-    <string name="phone_layout">Телефона обгортка</string>
-    <string name="emulator_layout">Емуляторна обгортка</string>
+    <string name="tv_layout">Макет телевізора</string>
+    <string name="phone_layout">Макет телефона</string>
+    <string name="emulator_layout">Макет емулятора</string>
     <string name="primary_color_settings">Основний колір</string>
     <string name="app_theme_settings">Тема застосунку</string>
     <string name="bottom_title_settings">Розташування назви плаката</string>
@@ -296,7 +296,7 @@
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
     <string name="authenticated_user" formatted="true">%s автентифіковано</string>
-    <string name="authenticated_user_fail" formatted="true">Не вдалося увійти в %s</string>
+    <string name="authenticated_user_fail" formatted="true">Не вдалося ввійти в %s</string>
     <string name="none">Нічого</string>
     <string name="normal">Звичайний</string>
     <string name="min">Мін.</string>
@@ -319,9 +319,9 @@
     <string name="quality_hdr">HDR</string>
     <string name="quality_sdr">SDR</string>
     <string name="quality_webrip">Web</string>
-    <string name="poster_image">Зображення Плаката</string>
+    <string name="poster_image">Зображення плаката</string>
     <string name="category_player">Програвач</string>
-    <string name="resolution_and_title">Роздільна здатність та заголовок</string>
+    <string name="resolution_and_title">Роздільність та заголовок</string>
     <string name="error_invalid_id">Недійсний ID</string>
     <string name="error_invalid_url">Недійсна URL-адреса</string>
     <string name="pref_category_backup">Резервне копіювання</string>
@@ -341,15 +341,15 @@
     <string name="dns_pref">DNS через HTTPS</string>
     <string name="download_path_pref">Шлях завантаження</string>
     <string name="add_site_summary">Додайте двійника наявного сайту, з іншою URL-адресою</string>
-    <string name="display_subbed_dubbed_settings">Показувати Дубльоване/З Субтитрами Аніме</string>
+    <string name="display_subbed_dubbed_settings">Показувати аніме з дубляжем / із субтитрами</string>
     <string name="legal_notice">Застереження</string>
     <string name="pref_category_extensions">Розширення</string>
     <string name="pref_category_actions">Дії</string>
     <string name="example_ip">127.0.0.1</string>
     <string name="pref_category_player_layout">Макет</string>
     <string name="subtitles_encoding">Кодування субтитрів</string>
-    <string name="enable_nsfw_on_providers">Увімкнути NSFW вміст на підтримуваних Розширеннях</string>
-    <string name="category_ui">Обгортка</string>
+    <string name="enable_nsfw_on_providers">Увімкнути NSFW у підтримуваних розширеннях</string>
+    <string name="category_ui">Макет</string>
     <string name="category_providers">Постачальники</string>
     <string name="example_site_url">https://example.com</string>
     <string name="login_format" formatted="true">%1$s %2$s</string>
@@ -375,7 +375,7 @@
     <string name="subtitles_filter_lang">Фільтрувати за бажаною мовою медіа</string>
     <string name="quality_4k">4K</string>
     <string name="title">Заголовок</string>
-    <string name="resolution">Роздільна здатність</string>
+    <string name="resolution">Роздільність</string>
     <string name="error">Помилка</string>
     <string name="trailer">Трейлер</string>
     <string name="extras">Додатково</string>
@@ -388,7 +388,7 @@
     <string name="quality_ts">TS</string>
     <string name="quality_tc">TC</string>
     <string name="subtitles_remove_bloat">Вилучати роздуття субтитрів</string>
-    <string name="referer">Referer (необов’язково)</string>
+    <string name="referer">Джерело переходу (необов’язково)</string>
     <string name="next">Далі</string>
     <string name="provider_languages_tip">Переглядайте відео на цих мовах</string>
     <string name="skip_setup">Пропустити налаштування</string>
@@ -396,7 +396,7 @@
     <string name="setup_done">Готово</string>
     <string name="extensions">Розширення</string>
     <string name="add_repository">Додати репозиторій</string>
-    <string name="repository_name_hint">Назва репозиторію (Опціонально)</string>
+    <string name="repository_name_hint">Назва репозиторію (необов’язково)</string>
     <string name="repository_url_hint">URL-адреса репозиторію або короткий код</string>
     <string name="plugin_loaded">Розширення завантажено</string>
     <string name="plugin_downloaded">Розширення завантажено</string>
@@ -432,7 +432,7 @@
     <string name="hls_playlist">Список відтворення HLS</string>
     <string name="player_settings_play_in_app">Вбудований програвач</string>
     <string name="skip_type_ed">Ендінґ</string>
-    <string name="skip_type_recap">Коротке повторення</string>
+    <string name="skip_type_recap">Підсумок</string>
     <string name="skip_type_format" formatted="true">Пропустити %s</string>
     <string name="skip_type_mixed_ed">Змішаний ендінґ</string>
     <string name="skip_type_credits">Подяки</string>
@@ -449,10 +449,10 @@
     <string name="update_notification_installing">Установлення оновлення застосунку…</string>
     <string name="update_notification_failed">Не вдалося встановити нову версію застосунку</string>
     <string name="apk_installer_legacy">Застарілий</string>
-    <string name="apk_installer_package_installer">Встановлювач Пакунків</string>
+    <string name="apk_installer_package_installer">Встановлювач пакунків</string>
     <string name="delayed_update_notice">Застосунок буде оновлено після виходу</string>
     <string name="delete_repository_plugins">Це також призведе до видалення всіх розширень сховища</string>
-    <string name="all_languages_preference">Усі Мови</string>
+    <string name="all_languages_preference">Усі мови</string>
     <string name="previous">Назад</string>
     <string name="app_layout_subtext">Змініть вигляд застосунку відповідно до вашого пристрою</string>
     <string name="plugin_deleted">Розширення видалено</string>
@@ -467,26 +467,26 @@
     <string name="app_not_found_error">Застосунок не знайдено</string>
     <string name="skip_type_mixed_op">Змішаний опенінґ</string>
     <string name="action_remove_from_watched">Вилучити з переглянутого</string>
-    <string name="sort_updated_old">Оновленням (від Старого до Нового)</string>
-    <string name="sort_updated_new">Оновленням (від Нового до Старого)</string>
+    <string name="sort_updated_old">Оновленням (від старого до нового)</string>
+    <string name="sort_updated_new">Оновленням (від нового до старого)</string>
     <string name="library">Бібліотека</string>
     <string name="sort">Сортувати</string>
-    <string name="sort_rating_desc">Рейтингом (від Високого до Низького)</string>
+    <string name="sort_rating_desc">Рейтингом (від високого до низького)</string>
     <string name="sort_by">Сортувати за</string>
     <string name="sort_alphabetical_a">Алфавітом (від А до Я)</string>
-    <string name="sort_rating_asc">Рейтингом (від Низького до Високого)</string>
+    <string name="sort_rating_asc">Рейтингом (від низького до високого)</string>
     <string name="empty_library_no_accounts_message">Ваша бібліотека порожня :(\nУвійдіть в обліковий запис бібліотеки або додайте щось до вашої локальної бібліотеки.</string>
     <string name="sort_alphabetical_z">Алфавітом (від Я до А)</string>
-    <string name="select_library">Оберіть Бібліотеку</string>
+    <string name="select_library">Оберіть бібліотеку</string>
     <string name="open_with">Відкрити з</string>
     <string name="browser">Браузер</string>
     <string name="empty_library_logged_in_message">Цей список порожній. Спробуйте перейти до іншого.</string>
     <string name="safe_mode_file">Файл безпечного режиму знайдено!\nРозширення не завантажуватимуться під час запуску, доки файл не буде видалено.</string>
     <string name="pref_category_android_tv">Android TV</string>
-    <string name="android_tv_interface_off_seek_settings">Прогрвач Приховано – Крок Перемотування</string>
-    <string name="android_tv_interface_on_seek_settings">Програвач Показано – Крок Перемотування</string>
+    <string name="android_tv_interface_off_seek_settings">Прогрвач приховано: крок перемотування</string>
+    <string name="android_tv_interface_on_seek_settings">Програвач показано: крок перемотування</string>
     <string name="android_tv_interface_on_seek_settings_summary">Крок перемотування, який використовується, коли програвач видимий</string>
-    <string name="android_tv_interface_off_seek_settings_summary">Крок перемотування, який використовується, коли плеєр прихований</string>
+    <string name="android_tv_interface_off_seek_settings_summary">Крок перемотування, який використовується, коли програвач прихований</string>
     <string name="test_failed">Провалено</string>
     <string name="test_passed">Пройдено</string>
     <string name="restart">Перезапустити</string>
@@ -500,10 +500,10 @@
     <string name="subscription_deleted">Ви відписалися від %s</string>
     <string name="subscription_episode_released">Епізод %d випущено!</string>
     <string name="revert">Повернути</string>
-    <string name="jsdelivr_proxy">GitHub Проксі</string>
+    <string name="jsdelivr_proxy">Проксі GitHub</string>
     <string name="jsdelivr_enabled">Не вдалось отримати доступ до GitHub. Увімкнення проксі-сервера jsDelivr…</string>
     <string name="pref_category_bypass">Обходи ISP</string>
-    <string name="jsdelivr_proxy_summary">Обхід блокування чистих gitHub URLs за допомогою jsDelivr. Можлива затримка оновлень на кілька днів.</string>
+    <string name="jsdelivr_proxy_summary">Обхід блокування прямих посилань GitHub за допомогою jsDelivr. Може спричинити затримку оновлень на кілька днів.</string>
     <string name="watch_quality_pref_data">Бажана якість перегляду (мобільні дані)</string>
     <string name="set_default">Встановити типові</string>
     <string name="profiles">Профілі</string>
@@ -527,7 +527,7 @@
     <string name="favorites_list_name">Вподобані</string>
     <string name="favorite_added">%s додано до вподобаних</string>
     <string name="duplicate_message_multiple" formatted="true">У вашій бібліотеці виявлено можливі дублікати:\n\n%s\n\nУсе одно хочете додати цей елемент, замінити наявні чи скасувати дію?</string>
-    <string name="duplicate_title">Знайдено Можливий Дублікат</string>
+    <string name="duplicate_title">Знайдено можливий дублікат</string>
     <string name="lock_profile">Заблокувати профіль</string>
     <string name="action_add_to_favorites">Додати до обраного</string>
     <string name="duplicate_replace_all">Замінити все</string>
@@ -538,32 +538,32 @@
     <string name="duplicate_add">Додати</string>
     <string name="action_subscribe">Підписатися</string>
     <string name="action_remove_from_favorites">Вилучити з обраного</string>
-    <string name="select_an_account">Оберіть Обліковий Запис</string>
+    <string name="select_an_account">Оберіть обліковий запис</string>
     <string name="duplicate_message_single">Схоже, що у вашій бібліотеці вже є можливий дублікат: \'%s.\'\n\nУсе одно хочете додати цей елемент, замінити наявний чи скасувати дію?</string>
     <string name="enter_pin">Уведіть PIN-код</string>
     <string name="pin">PIN-код</string>
     <string name="enter_current_pin">Уведіть поточний PIN-код</string>
     <string name="logged_account" formatted="true">Увійшли як %s</string>
     <string name="enter_pin_with_name" formatted="true">Уведіть PIN-код для %s</string>
-    <string name="use_default_account">Використовувати Типовий Обліковий Запис</string>
+    <string name="use_default_account">Використовувати типовий обліковий запис</string>
     <string name="skip_startup_account_select_pref">Пропускати вибір облікового запису під час запуску</string>
-    <string name="manage_accounts">Керувати Обліковими Записами</string>
+    <string name="manage_accounts">Керувати обліковими записами</string>
     <string name="edit_account">Редагувати обліковий запис</string>
     <string name="rotate_video_desc">Показувати кнопку перемикання орієнтації екрана</string>
     <string name="rotate_video">Обернути</string>
-    <string name="links_reloaded_toast">Посилання Перезавантажені</string>
+    <string name="links_reloaded_toast">Посилання перезавантажені</string>
     <string name="auto_rotate_video">Автообертання</string>
     <string name="auto_rotate_video_desc">Увімкнути автоматичну зміну орієнтації екрана відповідно до відео</string>
     <string name="speed_setting_summary">Додати налаштування швидкості до програвача</string>
-    <string name="test_extensions">Перевірити всі Розширення</string>
+    <string name="test_extensions">Перевірити всі розширення</string>
     <string name="result_search_tooltip">Пошук в інших розширеннях</string>
     <string name="recommendations_tooltip">Показати рекомендації</string>
-    <string name="test_extensions_summary">Ця Перевірка лише для розробників і не підтверджує або заперечує роботу жодного розширення.</string>
+    <string name="test_extensions_summary">Ця перевірка лише для розробників і не підтверджує або заперечує роботу жодного розширення.</string>
     <string name="subscribe_tooltip">Сповіщення про новий епізод</string>
-    <string name="password_pin_authentication_title">Автентифікація за Паролем/PIN-кодом</string>
+    <string name="password_pin_authentication_title">Автентифікація за паролем / PIN-кодом</string>
     <string name="biometric_authentication_title">Розблокуйте CloudStream</string>
-    <string name="biometric_setting">Біометричне Блокування</string>
-    <string name="biometric_setting_summary">Розблоковуйте застосунок за допомогою відбитка пальця, Face ID, PIN-коду, Графічного Ключа або Пароля.</string>
+    <string name="biometric_setting">Біометричне блокування</string>
+    <string name="biometric_setting_summary">Розблоковуйте застосунок за допомогою відбитка пальця, Face ID, PIN-коду, графічного ключа або пароля.</string>
     <string name="biometric_warning">Щойно було виконано резервне копіювання даних CloudStream. Хоча ймовірність цього вкрай мала, усі пристрої можуть поводитися по-різному. У рідкісних випадках, якщо ви втратите доступ до застосунку, повністю очистіть дані застосунку та відновіть їх із резервної копії. Просимо вибачення за будь-які незручності, що можуть виникнути.</string>
     <string name="biometric_unsupported">Біометрична автентифікація не підтримується на цьому пристрої</string>
     <string name="biometric_prompt_description">Після кількох невдалих спроб вікно запиту зникне. Перезапустіть застосунок, щоби спробувати ще раз.</string>
@@ -572,11 +572,11 @@
     <string name="favorite">Додати до вподобаного</string>
     <string name="toast_copied">скопійовано!</string>
     <string name="repo_copy_label">Назва репозиторію та URL</string>
-    <string name="clipboard_unknown_error">Помилка копіювання, Будь-ласка скопіюйте logcat та зверніться до служби підтримки застосунку.</string>
-    <string name="clipboard_permission_error">Помилка доступу до буфера обміну, Будь-ласка спробуйте ще раз.</string>
-    <string name="ok">OK</string>
+    <string name="clipboard_unknown_error">Помилка копіювання, скопіюйте logcat та зверніться до служби підтримки застосунку.</string>
+    <string name="clipboard_permission_error">Помилка доступу до буфера обміну, спробуйте ще раз.</string>
+    <string name="ok">Гаразд</string>
     <string name="battery_dialog_title">Вимкнути оптимізацію батареї</string>
-    <string name="battery_dialog_message">Щоби забезпечити безперервне завантаження та сповіщення про підписані телепередачі, CloudStream потребує дозволу на роботу у фоновому режимі. Натиснувши OK, ви побачите діалогове вікно запиту. Натисніть \'Дозволити\'.\n\nЗверніть увагу, що цей дозвіл не означає, що CS3 розряджатиме ваш акумулятор. Він працюватиме у фоновому режимі лише за необхідності, наприклад, під час отримання сповіщень або завантаження відео з офіційних розширень.</string>
+    <string name="battery_dialog_message">Щоби забезпечити безперервне завантаження та сповіщення про підписані телепередачі, CloudStream потребує дозволу на роботу у фоновому режимі. Натиснувши «Гаразд», ви побачите діалогове вікно запиту. Натисніть «Дозволити».\n\nЗверніть увагу, що цей дозвіл не означає, що CS3 розряджатиме ваш акумулятор. Він працюватиме у фоновому режимі лише за необхідності, наприклад, під час отримання сповіщень або завантаження відео з офіційних розширень.</string>
     <string name="app_unrestricted_toast">Споживання батареї застосунком уже змінено на необмежене</string>
     <string name="app_info_intent_error">Не вдається відкрити подробиці про застосунок CloudStream.</string>
     <string name="audio_book_singular">Аудіокнига</string>
@@ -584,7 +584,7 @@
     <string name="custom_media_singular">Медіа</string>
     <string name="reset_btn">Скинути</string>
     <string name="episode_upcoming_format" formatted="true">Наступний через %s</string>
-    <string name="next_season_episode_format" formatted="true">Сезон %1$d Епізод %2$d вийде через</string>
+    <string name="next_season_episode_format" formatted="true">%1$d сезон %2$d епізод вийде через</string>
     <string name="player_settings_select_cast_device">Оберіть пристрій для трансляції</string>
     <string name="episode_action_cast_mirror">Трансляція через дзеркало</string>
     <string name="cs3wiki">CloudStream Wiki</string>
@@ -592,60 +592,60 @@
     <string name="pref_category_accounts">Облікові записи</string>
     <string name="qr_image">Зображення QR-коду</string>
     <string name="open_downloaded_repo">Відкрити сховище</string>
-    <string name="device_pin_url_message">Відвідайте <b>%s</b> на своєму смартфоні або комп\'ютері та введіть вищевказаний код</string>
-    <string name="device_pin_error_message">Не вдається отримати PIN-код пристрою, спробуйте локальну аутентифікацію</string>
-    <string name="device_pin_expired_message">PIN-код зараз закінчився !</string>
-    <string name="device_pin_counter_text">Термін дії коду закінчується через %1$dхв %2$dс</string>
-    <string name="auth_locally">Локальна Аутентифікація</string>
+    <string name="device_pin_url_message">Відвідайте <b>%s</b> на своєму смартфоні або комп’ютері та введіть вищевказаний код</string>
+    <string name="device_pin_error_message">Не вдається отримати PIN-код пристрою, спробуйте локальну автентифікацію</string>
+    <string name="device_pin_expired_message">Термін дії PIN-коду закінчився!</string>
+    <string name="device_pin_counter_text">Термін дії коду закінчується через %1$d хв %2$d с</string>
+    <string name="auth_locally">Локальна автентифікація</string>
     <string name="dismiss">Відхилити</string>
-    <string name="play_from_beginning_img_des">Відтворити з Початку</string>
+    <string name="play_from_beginning_img_des">Відтворити з початку</string>
     <string name="test_warning">Попередження</string>
     <string name="delete_plugin">Видалити розширення</string>
     <string name="downloads_empty">Наразі завантажень немає.</string>
     <string name="hide_player_control_names">Приховати назви елементів керування в програвачі</string>
     <string name="open_local_video">Відкрити локальне відео</string>
-    <string name="sort_release_date_new">Датою випуску (від Нових до Старих)</string>
-    <string name="sort_release_date_old">Датою випуску (від Старих до Нових)</string>
-    <string name="downloads_delete_select">Оберіть Елементи для Видалення</string>
-    <string name="select_all">Обрати Все</string>
-    <string name="deselect_all">Зняти Вибір Всіх</string>
+    <string name="sort_release_date_new">Датою випуску (від нових до старих)</string>
+    <string name="sort_release_date_old">Датою випуску (від старих до нових)</string>
+    <string name="downloads_delete_select">Оберіть елементи для видалення</string>
+    <string name="select_all">Обрати все</string>
+    <string name="deselect_all">Зняти виділення</string>
     <string name="delete_format" formatted="true">Видалити (%1$d | %2$s)</string>
     <string name="delete_message_series_episodes" formatted="true">Ви впевнені, що хочете назавжди видалити такі епізоди в %1$s?\n\n%2$s</string>
     <string name="delete_message_series_section" formatted="true">Ви також назавжди видалите всі епізоди в такому серіалі:\n\n%s</string>
-    <string name="offline_file">Доступно для перегляду в оффлайн режимі</string>
-    <string name="delete_files">Видалити Файли</string>
+    <string name="offline_file">Доступно для перегляду поза мережею</string>
+    <string name="delete_files">Видалити файли</string>
     <string name="delete_message_multiple" formatted="true">Ви впевнені, що хочете назавжди видалити такі елементи?\n\n%s</string>
     <string name="delete_message_series_only" formatted="true">Ви впевнені, що хочете назавжди видалити всі епізоди в такому серіалі?\n\n%s</string>
     <string name="preview_seekbar">Попередній перегляд на шкалі перегляду</string>
     <string name="preview_seekbar_desc">Увімкнути мініатюру попереднього перегляду на шкалі перегляду</string>
     <string name="no_subtitles_loaded">Субтитри ще не завантажено</string>
     <string name="confirm_before_exiting_title">Підтвердіть перед виходом</string>
-    <string name="show">Відобразити</string>
+    <string name="show">Показати</string>
     <string name="confirm_before_exiting_desc">Показувати діалог перед виходом із застосунку</string>
-    <string name="dont_show">Не відображати</string>
+    <string name="dont_show">Не показувати</string>
     <string name="backup_path_title">Розташування теки для резервних копій</string>
     <string name="custom">Власний</string>
-    <string name="torrent_info">Це відео – Торрент, це означає, що ваша відео діяльність може відстежуватися.\nПереконайтеся, що розумієте, що таке Торрент, перед тим як продовжити.</string>
+    <string name="torrent_info">Це відео – торрент, це означає, що ваша відеоактивність може відстежуватися.\nПереконайтеся, що розумієте, що таке торрент, перед тим як продовжити.</string>
     <string name="subs_edge_size">Розмір обведення</string>
     <string name="audio_singular">Аудіо</string>
     <string name="podcast_singular">Подкаст</string>
     <string name="unsupported_error">Непідтримувана помилка</string>
     <string name="encoding_error">Помилка кодування</string>
     <string name="player_load_one_subtitle_online">Завантажити перший доступний</string>
-    <string name="torrent_preferred_media">Увімкніть торент в Налаштування/Постачальники/Бажані медіа</string>
-    <string name="torrent_not_accepted">Перезапустіть застосунок та прийміть спливне вікно Stream Torrent, щоби продовжити.</string>
+    <string name="torrent_preferred_media">Увімкніть торент в Налаштування - &gt; Постачальники - &gt; Бажані медіа</string>
+    <string name="torrent_not_accepted">Перезапустіть застосунок та прийміть спливне вікно «Транслювати торрент», щоби продовжити.</string>
     <string name="software_decoding">Програмне декодування</string>
     <string name="software_decoding_desc">Програмне декодування дозволяє плеєру відтворювати відеофайли, які не підтримуються вашим пристроєм, але може спричинити затримки або нестабільне відтворення у високій роздільній здатності.</string>
-    <string name="sort_episodes_date_newest">Датою виходу (Найновіша)</string>
-    <string name="sort_episodes_number_asc">Епізодом (За Зростанням)</string>
-    <string name="sort_episodes_rating_low_high">Рейтингом (Найнижчий)</string>
+    <string name="sort_episodes_date_newest">Датою виходу (найновіша)</string>
+    <string name="sort_episodes_number_asc">Епізодом (за зростанням)</string>
+    <string name="sort_episodes_rating_low_high">Рейтингом (найнижчий)</string>
     <string name="sort_button_rating">Рейтинг %s</string>
-    <string name="sort_episodes_number_desc">Епізодом (за Спаданням)</string>
-    <string name="sort_episodes_rating_high_low">Рейтингом (Найвищий)</string>
-    <string name="sort_episodes_date_oldest">Датою виходу (Найстаріша)</string>
+    <string name="sort_episodes_number_desc">Епізодом (за спаданням)</string>
+    <string name="sort_episodes_rating_high_low">Рейтингом (найвищий)</string>
+    <string name="sort_episodes_date_oldest">Датою виходу (найстаріша)</string>
     <string name="sort_button_episode">Еп. %s</string>
     <string name="sort_button_date">Дата %s</string>
-    <string name="update_plugins">Оновити Розширення</string>
+    <string name="update_plugins">Оновити розширення</string>
     <string name="plugins_updated_manually">Успішно оновлено %d розширення(-ь)!</string>
     <string name="update_plugins_manually">Оновити розширення вручну</string>
     <string name="starting_plugin_update_manually">Починається оновлення розширень!</string>
@@ -653,10 +653,10 @@
     <string name="player_notification_channel_description">Сповіщення програвача для керування відтворенням у фоновому режимі</string>
     <string name="player_notification_channel_name">Сповіщення програвача</string>
     <string name="speech_recognition_unavailable">Розпізнавання мовлення недоступне</string>
-    <string name="begin_speaking">Почніть Говорити…</string>
+    <string name="begin_speaking">Почніть говорити…</string>
     <string name="subtitles_from_embedded">Вбудовані</string>
     <string name="subtitles_from_online">Мережеві</string>
-    <string name="background_radius">Радіус Тла</string>
+    <string name="background_radius">Радіус тла</string>
     <string name="all_subtitles_bold">Зробити всі субтитри потовщеним</string>
     <string name="all_subtitles_italic">Зробити всі субтитри курсивом</string>
     <string name="volume_exceeded_100">Гучність перевищила 100%</string>
@@ -664,8 +664,8 @@
     <string name="concurrent_connections">Одночасних з’єднань</string>
     <string name="overscan_settings_des">Змінює межі екрана</string>
     <string name="overscan_settings">Обрізання зображення</string>
-    <string name="go_to_downloads">Перейти до Завантажень</string>
-    <string name="no_internet_connection">Немає підключення до Інтернету.\n\nБудь ласка, підключіться до Інтернету та спробуйте ще раз або перегляньте завантажені відео офлайн.</string>
+    <string name="go_to_downloads">Перейти до завантажень</string>
+    <string name="no_internet_connection">Немає з’єднання з мережею. \n\nПерепід’єднайтеся до мережі та спробуйте ще раз або перегляньте завантажені відео локально.</string>
     <string name="download_parallel_settings_des">Скільки різних елементів можна завантажити паралельно</string>
     <string name="parallel_downloads">Паралельних завантажень</string>
     <string name="concurrent_connections_settings_des">Скільки одночасних з’єднань може використовувати кожне завантаження</string>
@@ -674,46 +674,46 @@
     <string name="player_settings_always_ask">Завжди запитувати</string>
     <string name="speedup_title">Змінювати швидкість при утриманні</string>
     <string name="speedup_summary">Утримуйте, щоб отримати 2-кратну швидкість</string>
-    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dгод %2$dхв %3$dс</string>
-    <string name="download_time_left_min_sec_format" formatted="true">%1$dхв %2$dс</string>
-    <string name="download_time_left_sec_format" formatted="true">%1$dс</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$d год %2$d хв %3$d с</string>
+    <string name="download_time_left_min_sec_format" formatted="true">%1$d хв %2$d с</string>
+    <string name="download_time_left_sec_format" formatted="true">%1$d с</string>
     <string name="show_rating">Мітка рейтингу</string>
     <string name="no_account">Немає облікового запису</string>
-    <string name="edit_profile_image_title">Редагувати Зображення Профілю</string>
-    <string name="edit_profile_image_hint">Введіть URL-адресу Зображення Профілю</string>
-    <string name="edit_profile_image_error_empty">URL-адресу Не Знайдено</string>
-    <string name="edit_profile_image_error_invalid">Недійсна URL-адреса або Зображення</string>
-    <string name="edit_profile_image_success">Зображення Успішно Оновлено</string>
+    <string name="edit_profile_image_title">Редагувати зображення профілю</string>
+    <string name="edit_profile_image_hint">Введіть URL-адресу зображення профілю</string>
+    <string name="edit_profile_image_error_empty">URL-адресу не знайдено</string>
+    <string name="edit_profile_image_error_invalid">Недійсна URL-адреса або зображення</string>
+    <string name="edit_profile_image_success">Зображення успішно оновлено</string>
     <string name="action_mark_watched_up_to_this_episode">Позначити як переглянуте до цього епізоду</string>
     <string name="action_remove_mark_watched_up_to_this_episode">Вилучити переглянуті до цього епізоду</string>
     <string name="action_reload">Перезавантажено</string>
-    <string name="reload_provider">Перезавантажити Постачальника Послуг</string>
+    <string name="reload_provider">Перезавантажити постачальника</string>
     <string name="episode_action_play_mirror">Переглянути в дзеркалі</string>"
     <string name="name">Назва</string>
-    <string name="resolution_and_name">Роздільна здатність та назва</string>
-    <string name="subs_subtitle_alignment">Вирівнювання Субтитрів</string>
+    <string name="resolution_and_name">Роздільність та назва</string>
+    <string name="subs_subtitle_alignment">Вирівнювання субтитрів</string>
     <string name="bottom_left">Внизу ліворуч</string>
     <string name="bottom_center">Внизу по центру</string>
     <string name="bottom_right">Внизу праворуч</string>
-    <string name="middle_left">Середній лівий</string>
-    <string name="middle_center">Середній центр</string>
-    <string name="middle_right">Середній правий</string>
+    <string name="middle_left">Посередині зліва</string>
+    <string name="middle_center">Посередині в центрі</string>
+    <string name="middle_right">Посередині справа</string>
     <string name="top_left">Угорі ліворуч</string>
-    <string name="top_center">Верхній центр</string>
+    <string name="top_center">Угорі в центрі</string>
     <string name="top_right">Угорі праворуч</string>
-    <string name="play_full_series_button">Відтворити Повні Серії</string>
-    <string name="install_prerelease">Встановити перед-релізну версію</string>
-    <string name="prerelease_already_installed">Перед-релізна версія вже встановлена.</string>
-    <string name="prerelease_install_failed">Не вдалося встановити перед-релізну версію.</string>
-    <string name="show_episode_text">Текст Епізоду</string>
-    <string name="search_suggestions">Пропозиції Пошуку</string>
+    <string name="play_full_series_button">Відтворити весь серіал</string>
+    <string name="install_prerelease">Встановити передрелізну версію</string>
+    <string name="prerelease_already_installed">Передрелізна версія вже встановлена.</string>
+    <string name="prerelease_install_failed">Не вдалося встановити передрелізну версію.</string>
+    <string name="show_episode_text">Текст епізоду</string>
+    <string name="search_suggestions">Пропозиції пошуку</string>
     <string name="search_suggestions_des">Показувати підказки пошуку під час введення тексту</string>
-    <string name="clear_suggestions">Очистити Пропозиції</string>
+    <string name="clear_suggestions">Очистити пропозиції</string>
     <string name="extra_brightness_settings">Додаткова яскравість</string>
     <string name="extra_brightness_settings_des">Увімкнути фільтр яскравості при перевищенні 100% яскравості дисплея</string>
     <string name="extra_brightness_key">extra_brightness_enabled</string>
     <string name="show_cast_in_details">Показати панель трансляції</string>
-    <string name="video_info">Інформація Про Медіа</string>
+    <string name="video_info">Інформація про медіа</string>
     <string name="source_name">Назва джерела</string>
     <string name="download_queue">Черга завантаження</string>
     <string name="queue_empty_message">Наразі немає завантажень у черзі.</string>
@@ -735,5 +735,8 @@
     </plurals>
     <string name="source_priority">Пріоритетне джерело</string>
     <string name="source_priority_help">Виберіть спосіб сортування джерел відео у програвачі</string>
-    <string name="show_player_metadata_overlay">Показувати Накладання Метаданих Програвача</string>
+    <string name="show_player_metadata_overlay">Показувати накладання метаданих програвача</string>
+    <string name="video_singular">Відео</string>
+    <string name="skip_type_preview">Передперегляд</string>
+    <string name="player_is_live">Наживо</string>
 </resources>
diff --git a/app/src/main/res/values-b+ur/strings.xml b/app/src/main/res/values-b+ur/strings.xml
index 9a72e586f..94728e2f8 100644
--- a/app/src/main/res/values-b+ur/strings.xml
+++ b/app/src/main/res/values-b+ur/strings.xml
@@ -10,8 +10,7 @@
     <string name="home_change_provider_img_des">ذریعہ تبدیل کریں</string>
     <string name="preview_background_img_des">پس منظر کا دیکھنا</string>
     <string name="rated_format" formatted="true">درجہ بندی: %.1f</string>
-    <string name="new_update_format" formatted="true">نیا update آگیا ہے!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">نیا update آگیا ہے! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">بھرنے والا</string>
     <string name="duration_format" formatted="true">%d منٹ</string>
     <string name="next_episode_time_day_format" formatted="true">%1$d دن %2$d گھنٹے %3$d منٹ</string>
@@ -189,10 +188,8 @@
     <string name="resume">از سر نو شروع کریں</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">یہ مستقل طور پر حذف ہوجائے گا %s
-\nتمھيں يقين ہے?</string>
-    <string name="resume_time_left" formatted="true">%dm
-\nباقی</string>
+    <string name="delete_message" formatted="true">یہ مستقل طور پر حذف ہوجائے گا %s \nتمھيں يقين ہے?</string>
+    <string name="resume_time_left" formatted="true">%dm \nباقی</string>
     <string name="status_ongoing">احوال</string>
     <string name="status_completed">مکمل</string>
     <string name="status">حالت</string>
@@ -441,8 +438,7 @@
     <string name="android_tv_interface_on_seek_settings">پلیئردکھایا گیا - Seek Amount</string>
     <string name="android_tv_interface_on_seek_settings_summary">پلیئر کے نظر آنے پر استعمال کی جانے والی Seek Amount</string>
     <string name="android_tv_interface_off_seek_settings_summary">پلیئر کے چھپنے پر استعمال ہونے والی seek amount</string>
-    <string name="safe_mode_file">سیف موڈ فائل مل گئی!
-\nفائل کو ہٹانے تک اسٹارٹ اپ پر کوئی ایکسٹینشن لوڈ نہیں کرنا۔</string>
+    <string name="safe_mode_file">سیف موڈ فائل مل گئی! \nفائل کو ہٹانے تک اسٹارٹ اپ پر کوئی ایکسٹینشن لوڈ نہیں کرنا۔</string>
     <string name="start">شروع کریں</string>
     <string name="test_failed">ناکام</string>
     <string name="test_passed">کامیاب ہو گیا</string>
@@ -454,8 +450,7 @@
     <string name="pref_category_bypass">آئی ایس پی بائی پاسز</string>
     <string name="subscription_new">%s کو سبسکرائب کیا</string>
     <string name="jsdelivr_proxy_summary">Bypass blocking of raw github URLs using jsDelivr. اپ ڈیٹس میں کچھ دنوں کی تاخیر ہو سکتی ہے</string>
-    <string name="empty_library_no_accounts_message">آپ کی لائبریری خالی ہے:(
-\nلائبریری اکاؤنٹ میں لاگ ان کریں یا اپنی مقامی لائبریری میں شوز شامل کریں۔</string>
+    <string name="empty_library_no_accounts_message">آپ کی لائبریری خالی ہے:( \nلائبریری اکاؤنٹ میں لاگ ان کریں یا اپنی مقامی لائبریری میں شوز شامل کریں۔</string>
     <string name="error_invalid_url">غلط URL</string>
     <string name="browser">براؤزر</string>
     <string name="quality_webrip">ویب</string>
@@ -504,9 +499,7 @@
     <string name="subtitles_remove_captions">سب ٹائٹلز سے بند کیپشنز کو ہٹا دیں</string>
     <string name="app_layout_subtext">اپنے آلے کے مطابق ایپ کی شکل تبدیل کریں</string>
     <string name="next">اگلے</string>
-    <string name="blank_repo_message">CloudStream میں بذریعہ ڈیفالٹ کوئی سائٹ انسٹال نہیں ہے۔ آپ کو ریپوزٹری سے سائٹس انسٹال کرنے کی ضرورت ہے۔
-\n
-\nہمارے Discord میں شامل ہوں یا آن لائن تلاش کریں۔</string>
+    <string name="blank_repo_message">CloudStream میں بذریعہ ڈیفالٹ کوئی سائٹ انسٹال نہیں ہے۔ آپ کو ریپوزٹری سے سائٹس انسٹال کرنے کی ضرورت ہے۔ \n \nہمارے Discord میں شامل ہوں یا آن لائن تلاش کریں۔</string>
     <string name="safe_mode_description">تمام ایکسٹینشنز کریش کی وجہ سے آف کر دی گئیں تاکہ آپ کو پریشانی کا باعث تلاش کرنے میں مدد مل سکے۔</string>
     <string name="extension_install_first">پہلے ایکسٹینشن انسٹال کریں</string>
     <string name="clipboard_too_large">بہت زیادہ متن۔ کلپ بورڈ میں محفوظ کرنے سے قاصر۔</string>
@@ -528,13 +521,7 @@
     <string name="already_voted">آپ نے پہلے ہی ووٹ دیا ہے</string>
     <string name="no_plugins_found_error">مخزن میں کوئی پلگ انز نہیں ملا</string>
     <string name="set_default">ترجیحی تعین کریں</string>
-    <string name="quality_profile_help">یہاں آپ تبدیلی کرسکتے ہیں کہ سورسز کو کس طرح کی ترتیب دی جائے۔ اگر ایک ویڈیو کی زیادہ پرائیورٹی ہوتی ہے تو یہ سورس کی انتخاب میں زیادہ اوپر آئے گی۔ سورس کی پرائیورٹی اور کوالٹی کی پرائیورٹی کا مجموعہ ویڈیو کی پرائیورٹی ہوتی ہے۔
-\n
-\nسورس A: 3
-\nکوالٹی B: 7
-\nاس کا مجموعی ویڈیو پرائیورٹی 10 ہوتی ہے۔
-\n
-\nنوٹ: اگر مجموعہ 10 یا اس سے زیادہ ہو تو پلیر وہ لنک لوڈ کرنے کو خود بخود چھوڑ دے گا!</string>
+    <string name="quality_profile_help">یہاں آپ تبدیلی کرسکتے ہیں کہ سورسز کو کس طرح کی ترتیب دی جائے۔ اگر ایک ویڈیو کی زیادہ پرائیورٹی ہوتی ہے تو یہ سورس کی انتخاب میں زیادہ اوپر آئے گی۔ سورس کی پرائیورٹی اور کوالٹی کی پرائیورٹی کا مجموعہ ویڈیو کی پرائیورٹی ہوتی ہے۔ \n \nسورس A: 3 \nکوالٹی B: 7 \nاس کا مجموعی ویڈیو پرائیورٹی 10 ہوتی ہے۔ \n \nنوٹ: اگر مجموعہ 10 یا اس سے زیادہ ہو تو پلیر وہ لنک لوڈ کرنے کو خود بخود چھوڑ دے گا!</string>
     <string name="favorites_list_name">پسندیدہ</string>
     <string name="favorite_added">%s کو پسندیدہ میں شامل کیا گیا</string>
     <string name="favorite_removed">%s کو پسندیدہ سے ختم کیا گیا</string>
@@ -561,14 +548,8 @@
     <string name="duplicate_add">جمع کریں</string>
     <string name="duplicate_replace_all">سب کو بدل دیں</string>
     <string name="duplicate_replace">بدل دیں</string>
-    <string name="duplicate_message_multiple" formatted="true">آپ کی لائبریری میں ممکنہ ڈپلیکیٹ آئٹمز مل گئے ہیں:
-\n
-\n%s
-\n
-\nکیا آپ بہرحال اس آئٹم کو شامل کرنا چاہیں گے، موجودہ کو تبدیل کرنا چاہیں گے، یا کارروائی کو منسوخ کریں گے؟</string>
-    <string name="duplicate_message_single" formatted="true">ایسا معلوم ہوتا ہے کہ آپ کی لائبریری میں ممکنہ طور پر ڈپلیکیٹ آئٹم پہلے سے موجود ہے: \'%s۔\'
-\n
-\nکیا آپ بہرحال اس آئٹم کو شامل کرنا چاہیں گے، موجودہ کو تبدیل کرنا چاہیں گے، یا کارروائی کو منسوخ کریں گے؟</string>
+    <string name="duplicate_message_multiple" formatted="true">آپ کی لائبریری میں ممکنہ ڈپلیکیٹ آئٹمز مل گئے ہیں: \n \n%s \n \nکیا آپ بہرحال اس آئٹم کو شامل کرنا چاہیں گے، موجودہ کو تبدیل کرنا چاہیں گے، یا کارروائی کو منسوخ کریں گے؟</string>
+    <string name="duplicate_message_single" formatted="true">ایسا معلوم ہوتا ہے کہ آپ کی لائبریری میں ممکنہ طور پر ڈپلیکیٹ آئٹم پہلے سے موجود ہے: \'%s۔\' \n \nکیا آپ بہرحال اس آئٹم کو شامل کرنا چاہیں گے، موجودہ کو تبدیل کرنا چاہیں گے، یا کارروائی کو منسوخ کریں گے؟</string>
     <string name="lock_profile">پروفائل لاک کریں</string>
     <string name="skip_startup_account_select_pref">آغاز پر اکاؤنٹ کا انتخاب چھوڑ دیں</string>
     <string name="auto_rotate_video_desc">ویڈیو واقفیت کی بنیاد پر اسکرین کی سمت بندی کی خودکار سوئچنگ کو فعال کریں</string>
@@ -576,8 +557,7 @@
     <string name="toast_copied">کاپی کر لیا!</string>
     <string name="repo_copy_label">ذخیرہ کا نام اور URL</string>
     <string name="episode_upcoming_format" formatted="true">%s میں آنے والا ہے</string>
-    <string name="resume_remaining" formatted="true">%s
-\nباقی</string>
+    <string name="resume_remaining" formatted="true">%s \nباقی</string>
     <string name="clipboard_permission_error">کلپ بورڈ تک رسائی میں خرابی، براہ کرم دوبارہ کوشش کریں۔</string>
     <string name="clipboard_unknown_error">کاپی کرنے میں خرابی، براہ کرم logcat کاپی کریں اور ایپ سپورٹ سے رابطہ کریں۔</string>
     <string name="battery_dialog_message">سبسکرائب شدہ ٹی وی شوز کے لیے بلاتعطل ڈاؤن لوڈز اور اطلاعات کو یقینی بنانے کے لیے، CloudStream کو پس منظر میں چلنے کی اجازت درکار ہے۔ OK دبانے سے، آپ کو App info پر بھیج دیا جائے گا۔ وہاں اسکرول کریں 𝘼𝙥𝙥 𝙗𝙖𝙩𝙩𝙚𝙧𝙮 𝙪𝙨𝙖𝙜𝙚 اور battery usage کو 𝙐𝙣𝙧𝙚𝙨𝙩𝙧𝙞𝙘𝙩𝙚𝙙 کردیں، اس اجازت کا مطلب یہ نہیں ہے کہ CS3 آپ کی بیٹری ختم کردے گا۔ یہ صرف ضرورت پڑنے پر پس منظر میں کام کرے گا، جیسے کہ جب اطلاعات موصول ہوں یا آفیشل ایکسٹینشنز سے ویڈیوز ڈاؤن لوڈ کریں۔ اگر آپ منسوخ کرنے کا انتخاب کرتے ہیں، تو آپ اس ترتیب کو بعد میں 𝙂𝙚𝙣𝙚𝙧𝙖𝙡 𝙎𝙚𝙩𝙩𝙞𝙣𝙜𝙨 میں ایڈجسٹ کر سکتے ہیں۔</string>
diff --git a/app/src/main/res/values-b+vi/strings.xml b/app/src/main/res/values-b+vi/strings.xml
index c0f4744fd..e1e9a7a8c 100644
--- a/app/src/main/res/values-b+vi/strings.xml
+++ b/app/src/main/res/values-b+vi/strings.xml
@@ -14,22 +14,21 @@
     <string name="episode_poster_img_des">Poster tập phim</string>
     <string name="home_main_poster_img_des">Poster chính</string>
     <string name="home_next_random_img_des">Tập tiếp theo ngẫu nhiên</string>
-    <string name="go_back_img_des">Quay lại</string>
+    <string name="go_back_img_des">Thoát</string>
     <string name="home_change_provider_img_des">Thay đổi Nguồn phim</string>
     <string name="preview_background_img_des">Xem trước hình nền</string>
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">Tốc độ (%.2fx)</string>
     <string name="rated_format" formatted="true">Đánh giá: %.1f</string>
-    <string name="new_update_format" formatted="true">Đã tìm thấy bản cập nhật mới!
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">Đã tìm thấy bản cập nhật mới! \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">Bộ lọc</string>
     <string name="duration_format" formatted="true">%d phút</string>
     <string name="app_name">CloudStream</string>
     <string name="play_with_app_name">Phát bằng CloudStream</string>
-    <string name="title_home">Trang Chủ</string>
-    <string name="title_search">Tìm Kiếm</string>
+    <string name="title_home">Trang chủ</string>
+    <string name="title_search">Tìm kiếm</string>
     <string name="title_downloads">Tải xuống</string>
-    <string name="title_settings">Cài Đặt</string>
+    <string name="title_settings">Cài đặt</string>
     <string name="search_hint">Tìm kiếm…</string>
     <string name="search_hint_site" formatted="true">Tìm kiếm %s…</string>
     <string name="no_data">Không có dữ liệu</string>
@@ -47,9 +46,9 @@
     <string name="type_plan_to_watch">Xem sau</string>
     <string name="type_re_watching">Xem lại</string>
     <string name="play_movie_button">Phát</string>
-    <string name="play_livestream_button">Phát Livestream</string>
+    <string name="play_livestream_button">Phát Trực tiếp</string>
     <string name="play_torrent_button">Phát Torrent</string>
-    <string name="pick_source">Nguồn phim</string>
+    <string name="pick_source">Nguồn</string>
     <string name="pick_subtitle">Phụ đề</string>
     <string name="reload_error">Thử kết nối lại…</string>
     <string name="go_back">Quay lại</string>
@@ -58,7 +57,7 @@
     <string name="download">Tải xuống</string>
     <string name="downloaded">Đã tải xuống</string>
     <string name="downloading">Đang tải xuống</string>
-    <string name="download_paused">Đã tạm dừng tải xuống</string>
+    <string name="download_paused">Tải xuống đã tạm dừng</string>
     <string name="download_started">Tải xuống đã bắt đầu</string>
     <string name="download_failed">Tải xuống thất bại</string>
     <string name="download_canceled">Tải xuống đã hủy</string>
@@ -88,7 +87,7 @@
     <string name="player_speed">Tốc độ phát</string>
     <string name="subtitles_settings">Cài đặt phụ đề</string>
     <string name="subs_text_color">Màu chữ</string>
-    <string name="subs_outline_color">Màu viền chữ</string>
+    <string name="subs_outline_color">Màu viền</string>
     <string name="subs_background_color">Màu nền</string>
     <string name="subs_window_color">Màu cửa sổ</string>
     <string name="subs_edge_type">Kiểu viền</string>
@@ -102,12 +101,12 @@
     <string name="subs_auto_select_language">Tự động chọn ngôn ngữ</string>
     <string name="subs_download_languages">Ngôn ngữ tải xuống</string>
     <string name="subs_subtitle_languages">Ngôn ngữ phụ đề</string>
-    <string name="subs_hold_to_reset_to_default">Nhấn giữ để đặt lại về mặc định</string>
+    <string name="subs_hold_to_reset_to_default">Nhấn giữ để đặt lại mặc định</string>
     <string name="subs_import_text" formatted="true">Thêm phông chữ tại %s</string>
     <string name="continue_watching">Tiếp tục xem</string>
     <string name="action_remove_watching">Xóa</string>
     <string name="action_open_watching">Thông tin thêm</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Có thể cần dùng VPN để nguồn này hoạt động đúng</string>
     <string name="vpn_torrent">Nguồn này là một torrent, khuyến nghị dùng VPN</string>
     <string name="torrent_plot">Thông tin phim</string>
@@ -129,10 +128,10 @@
     <string name="swipe_to_change_settings_des">Vuốt lên hoặc xuống cạnh trái hoặc phải để điều chỉnh độ sáng hoặc âm lượng</string>
     <string name="autoplay_next_settings">Tự động phát tập tiếp theo</string>
     <string name="autoplay_next_settings_des">Phát tập tiếp theo sau khi hết tập hiện tại</string>
-    <string name="double_tap_to_seek_settings">Nhấn 2 lần để tua</string>
-    <string name="double_tap_to_pause_settings">Nhấn 2 lần để tạm dừng</string>
+    <string name="double_tap_to_seek_settings">Nhấn hai lần để tua</string>
+    <string name="double_tap_to_pause_settings">Nhấn hai lần để tạm dừng</string>
     <string name="double_tap_to_seek_amount_settings">Thời lượng tua (Giây)</string>
-    <string name="double_tap_to_seek_settings_des">Nhấn 2 lần vào cạnh trái hoặc phải để tua về trước hoặc sau</string>
+    <string name="double_tap_to_seek_settings_des">Nhấn hai lần vào cạnh trái hoặc phải để tua về trước hoặc sau</string>
     <string name="double_tap_to_pause_settings_des">Nhấn vào giữa hai lần để tạm dừng</string>
     <string name="use_system_brightness_settings">Sử dụng độ sáng hệ thống</string>
     <string name="use_system_brightness_settings_des">Dùng độ sáng hệ thống thay cho lớp phủ tối trong trình phát ứng dụng</string>
@@ -186,8 +185,7 @@
     <string name="resume">Tiếp tục</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message">%s sẽ bị xoá vĩnh viễn
-\nBạn có chắc chắn muốn xóa?</string>
+    <string name="delete_message">%s sẽ bị xoá vĩnh viễn \nBạn có chắc chắn không?</string>
     <string name="resume_time_left" formatted="true">%d phút\ncòn lại</string>
     <string name="status_ongoing">Đang chiếu</string>
     <string name="status_completed">Hoàn thành</string>
@@ -230,14 +228,14 @@
     <string name="source_error">Lỗi nguồn phim</string>
     <string name="remote_error">Lỗi nguồn từ xa</string>
     <string name="render_error">Lỗi kết xuất</string>
-    <string name="unexpected_error">Đã có lỗi xảy ra. Vui lòng thử lại sau</string>
+    <string name="unexpected_error">Lỗi trình phát bất ngờ</string>
     <string name="storage_error">Lỗi tải xuống. Hãy kiểm tra quyền truy cập bộ nhớ</string>
-    <string name="episode_action_chromecast_episode">Phát tập phim bằng Chromecast</string>
-    <string name="episode_action_chromecast_mirror">Phản chiếu màn hình bằng Chromecast</string>
+    <string name="episode_action_chromecast_episode">Truyền tập phim</string>
+    <string name="episode_action_chromecast_mirror">Truyền nguồn thay thế</string>
     <string name="episode_action_play_in_app">Phát bằng ứng dụng</string>
     <string name="episode_action_play_in_format">Phát bằng %s</string>
     <string name="episode_action_auto_download">Tự động tải xuống</string>
-    <string name="episode_action_download_mirror">Nguồn tải dự phòng</string>
+    <string name="episode_action_download_mirror">Tải xuống nguồn thay thế</string>
     <string name="episode_action_reload_links">Tải lại các liên kết</string>
     <string name="episode_action_download_subtitle">Tải xuống phụ đề</string>
     <string name="show_hd">Nhãn chất lượng phim</string>
@@ -250,7 +248,7 @@
     <string name="video_lock">Khóa</string>
     <string name="video_aspect_ratio_resize">Thu phóng</string>
     <string name="video_source">Nguồn</string>
-    <string name="video_skip_op">Bỏ qua giới thiệu</string>
+    <string name="video_skip_op">Bỏ qua Giới thiệu</string>
     <string name="dont_show_again">Không hiện lại</string>
     <string name="skip_update">Bỏ qua bản cập nhật này</string>
     <string name="update">Cập nhật</string>
@@ -295,7 +293,7 @@
     <string name="bottom_title_settings_des">Đặt tên phim dưới poster</string>
     <!-- account stuff -->
     <string name="example_password">Mật khẩu</string>
-    <string name="example_username">Tài khoản</string>
+    <string name="example_username">Tên người dùng</string>
     <string name="example_email">Email</string>
     <string name="example_ip">127.0.0.1</string>
     <string name="example_site_name">Tên trang mới</string>
@@ -315,10 +313,10 @@
     <string name="sync_score_format" formatted="true">%d / 10</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="authenticated_user" formatted="true">Đã xác thực %s</string>
-    <string name="authenticated_user_fail" formatted="true">Không thể xác thực %s</string>
+    <string name="authenticated_user" formatted="true">%s đã xác thực</string>
+    <string name="authenticated_user_fail" formatted="true">Không thể đăng nhập tại %s</string>
     <!-- ============ -->
-    <string name="none">Mặc định</string>
+    <string name="none">Không có</string>
     <string name="normal">Bình thường</string>
     <string name="all">Tất cả</string>
     <string name="max">Tối đa</string>
@@ -339,7 +337,7 @@
 	https://en.wikipedia.org/w/index.php?title=Pangram&oldid=225849300
 	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
     -->
-    <string name="subtitles_example_text">Bạch kim rất quý nên sẽ dùng để lắp vô xương</string>
+    <string name="subtitles_example_text">Phụ đề của bạn sẽ trông tương tự như thế này</string>
     <string name="recommended">Được đề xuất</string>
     <string name="player_loaded_subtitles" formatted="true">Đã tải %s</string>
     <string name="player_load_subtitles">Chọn từ tệp</string>
@@ -347,7 +345,7 @@
     <string name="downloaded_file">Tệp đã tải xuống</string>
     <string name="actor_main">Vai chính</string>
     <string name="actor_supporting">Vai phụ</string>
-    <string name="actor_background">Lý lịch</string>
+    <string name="actor_background">Diễn viên quần chúng</string>
     <string name="home_source">Nguồn</string>
     <string name="home_random">Ngẫu nhiên</string>
     <string name="coming_soon">Sắp có…</string>
@@ -391,9 +389,9 @@
     <string name="preferred_media_subtext">Bạn muốn xem gì</string>
     <string name="setup_done">Hoàn tất</string>
     <string name="extensions">Tiện ích mở rộng</string>
-    <string name="add_repository">Thêm kho tiện ích</string>
-    <string name="repository_name_hint">Tên kho tiện ích (Tùy chọn)</string>
-    <string name="repository_url_hint">URL kho tiện ích hoặc Mã ngắn</string>
+    <string name="add_repository">Thêm kho nguồn phim</string>
+    <string name="repository_name_hint">Tên kho nguồn phim (Tùy chọn)</string>
+    <string name="repository_url_hint">URL kho nguồn phim hoặc Mã ngắn</string>
     <string name="plugin_loaded">Tiện ích mở rộng đã tải</string>
     <string name="plugin_deleted">Tiện ích mở rộng đã xoá</string>
     <string name="plugin_load_fail" formatted="true">Không tải được %s</string>
@@ -404,23 +402,21 @@
     <string name="batch_download">Tải xuống hàng loạt</string>
     <string name="plugin_singular">tiện ích mở rộng</string>
     <string name="plugin">tiện ích mở rộng</string>
-    <string name="delete_repository_plugins">Việc này sẽ xóa tất cả tiện ích mở rộng trong kho tiện ích</string>
-    <string name="delete_repository">Xoá kho tiện ích</string>
+    <string name="delete_repository_plugins">Việc này sẽ xóa tất cả tiện ích mở rộng trong kho nguồn phim</string>
+    <string name="delete_repository">Xoá kho nguồn phim</string>
     <string name="setup_extensions_subtext">Tải xuống danh sách các trang web bạn muốn sử dụng</string>
     <string name="plugins_downloaded" formatted="true">Đã tải xuống: %d</string>
     <string name="plugins_disabled" formatted="true">Đã vô hiệu: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Chưa tải xuống: %d</string>
-    <string name="blank_repo_message">CloudStream không có sẵn trang web nào. Bạn cần cài đặt các trang web từ kho lưu trữ.
-\n
-\nHãy tham gia Discord của chúng tôi hoặc tìm kiếm trực tuyến.</string>
-    <string name="view_public_repositories_button">Xem kho lưu trữ của cộng đồng</string>
+    <string name="blank_repo_message">CloudStream không có sẵn trang web nào. Bạn cần cài đặt các trang web từ kho lưu trữ. \n \nHãy tham gia Discord của chúng tôi hoặc tìm kiếm trực tuyến.</string>
+    <string name="view_public_repositories_button">Xem các kho nguồn phim của cộng đồng</string>
     <string name="view_public_repositories_button_short">Danh sách công khai</string>
     <string name="uppercase_all_subtitles">In hoa toàn bộ phụ đề</string>
     <string name="download_all_plugins_from_repo">Cảnh báo: CloudStream không chịu trách nhiệm về các tiện ích mở rộng bên thứ ba và không cung cấp bất kỳ sự hỗ trợ nào!</string>
-    <string name="single_plugin_disabled" formatted="true">%s (Đã vô hiệu hoá)</string>
-    <string name="tracks">Âm thanh &amp; Độ phân giải</string>
+    <string name="single_plugin_disabled" formatted="true">%s (Đã vô hiệu)</string>
+    <string name="tracks">Âm thanh &amp; video</string>
     <string name="audio_tracks">Âm thanh</string>
-    <string name="video_tracks">Độ phân giải video</string>
+    <string name="video_tracks">Video</string>
     <string name="apply_on_restart">Khởi động lại ứng dụng để thấy câc thay đổi.</string>
     <string name="safe_mode_title">Chế độ an toàn được bật</string>
     <string name="safe_mode_description">Tất cả tiện ích mở rộng đã được tắt do ứng dụng bị ngừng bất thường để giúp bạn tìm ra vấn đề gây lỗi.</string>
@@ -430,11 +426,11 @@
     <string name="automatic_plugin_download">Tự động tải xuống tiện ích mở rộng</string>
     <string name="redo_setup_process">Làm lại tiến trình thiết lập</string>
     <string name="apk_installer_settings">Trình cài đặt APK</string>
-    <string name="apk_installer_settings_des">Một số thiết bị không hỗ trợ trình cài đặt gói mới. Hãy thử chọn chế độ tương thích cũ nếu các bản cập nhật không cài đặt.</string>
+    <string name="apk_installer_settings_des">Một số thiết bị không hỗ trợ trình cài đặt gói mới. Hãy thử chọn chế độ tương thích cũ nếu các bản cập nhật không thể cài đặt.</string>
     <string name="season_format">%1$s %2$d%3$s</string>
     <string name="play_trailer_button">Phát Trailer</string>
-    <string name="automatic_plugin_download_summary">Tự động cài đặt tất cả tiện ích mở rộng chưa được cài đặt từ những kho tiện ích đã thêm.</string>
-    <string name="update_started">Bắt đầu cập nhật</string>
+    <string name="automatic_plugin_download_summary">Tự động cài đặt tất cả tiện ích mở rộng chưa được cài đặt từ những kho nguồn phim đã thêm.</string>
+    <string name="update_started">Cập nhật đã bắt đầu</string>
     <string name="pref_category_links">Liên kết</string>
     <string name="hls_playlist">Danh sách HLS</string>
     <string name="player_pref">Trình phát ưu tiên</string>
@@ -488,8 +484,7 @@
     <string name="apk_installer_legacy">Chế độ tương thích cũ</string>
     <string name="sort_updated_new">Đã cập nhật (Mới đến Cũ)</string>
     <string name="sort_updated_old">Đã cập nhật (Cũ đến Mới)</string>
-    <string name="empty_library_no_accounts_message">Thư viện của bạn đang trống :(
-\nĐăng nhập vào tài khoản thư viện hoặc thêm phim vào thư viện cục bộ.</string>
+    <string name="empty_library_no_accounts_message">Thư viện của bạn đang trống :( \nĐăng nhập vào tài khoản thư viện hoặc thêm phim vào thư viện cục bộ.</string>
     <string name="open_with">Mở bằng</string>
     <string name="provider_info_meta">Siêu dữ liệu không được cung cấp bởi trang web, video sẽ không tải được nếu nó không tồn tại trên trang web.</string>
     <string name="apk_installer_package_installer">Trình cài đặt gói</string>
@@ -517,8 +512,7 @@
     <string name="stop">Dừng</string>
     <string name="pref_category_bypass">Bỏ chặn nhà mạng</string>
     <string name="subscription_deleted">Đã bỏ đăng ký %s</string>
-    <string name="safe_mode_file">Tìm thấy tệp Safe mode!
-\nKhông tải bất cứ tiện ích mở rộng nào khi khởi động cho đến khi loại bỏ tệp.</string>
+    <string name="safe_mode_file">Tìm thấy tệp Safe mode! \nKhông tải bất cứ tiện ích mở rộng nào khi khởi động cho đến khi loại bỏ tệp.</string>
     <string name="revert">Hoàn tác</string>
     <string name="subscription_in_progress_notification">Đang cập nhật các phim đã đăng kí</string>
     <string name="jsdelivr_proxy_summary">Bỏ chặn các URL gốc của GitHub bằng jsDelivr. Có thể làm cập nhật bị trễ vài ngày.</string>
@@ -535,28 +529,18 @@
     <string name="profiles">Hồ sơ</string>
     <string name="help">Trợ giúp</string>
     <string name="profile_background_des">Nền hồ sơ</string>
-    <string name="quality_profile_help">Tại đây bạn có thể thay đổi cách sắp xếp các nguồn. Nếu video có mức độ ưu tiên cao hơn thì video đó sẽ xuất hiện cao hơn trong lựa chọn nguồn. Tổng ưu tiên nguồn và ưu tiên chất lượng là ưu tiên video.
-\n
-\nNguồn A: 3
-\nChất lượng B: 7
-\nSẽ có mức độ ưu tiên video kết hợp là 10.
-\n
-\nLƯU Ý: Nếu tổng là 10 hoặc nhiều hơn, trình phát sẽ tự động bỏ tải khi liên kết đó được tải!</string>
+    <string name="quality_profile_help">Tại đây bạn có thể thay đổi cách sắp xếp các nguồn. Nếu video có mức độ ưu tiên cao hơn thì video đó sẽ xuất hiện cao hơn trong lựa chọn nguồn. Tổng ưu tiên nguồn và ưu tiên chất lượng là ưu tiên video. \n \nNguồn A: 3 \nChất lượng B: 7 \nSẽ có mức độ ưu tiên video kết hợp là 10. \n \nLƯU Ý: Nếu tổng là 10 hoặc nhiều hơn, trình phát sẽ tự động bỏ tải khi liên kết đó được tải!</string>
     <string name="qualities">Chất lượng</string>
     <string name="already_voted">Bạn đã bình chọn</string>
-    <string name="disable">Vô hiệu hoá</string>
-    <string name="no_repository_found_error">Không tìm thấy kho tiện ích, hãy kiểm tra URL và thử lại với VPN</string>
+    <string name="disable">Tắt</string>
+    <string name="no_repository_found_error">Không tìm thấy kho nguồn phim, hãy kiểm tra URL và thử lại với VPN</string>
     <string name="no_plugins_found_error">Không tìm thấy tiện ích mở rộng</string>
     <string name="unable_to_inflate">Không thể khởi tạo UI, đây là một LỖI LỚN và cần được báo cáo ngay lập tức tới %s</string>
     <string name="automatic_plugin_download_mode_title">Chọn chế độ lọc tiện ích mở rộng tải xuống</string>
     <string name="favorite_removed">%s đã xóa khỏi mục yêu thích</string>
     <string name="favorites_list_name">Yêu thích</string>
     <string name="favorite_added">%s đã thêm vào mục yêu thích</string>
-    <string name="duplicate_message_multiple" formatted="true">Các mục có thể trùng lặp đã được tìm thấy trong thư viện của bạn:
-\n
-\n%s
-\n
-\nBạn vẫn muốn thêm mục này, thay thế những mục hiện có hay hủy hành động?</string>
+    <string name="duplicate_message_multiple" formatted="true">Các mục có thể trùng lặp đã được tìm thấy trong thư viện của bạn: \n \n%s \n \nBạn vẫn muốn thêm mục này, thay thế những mục hiện có hay hủy hành động?</string>
     <string name="backup_frequency">Tần suất sao lưu</string>
     <string name="duplicate_title">Đã tìm thấy bản sao tiềm năng</string>
     <string name="lock_profile">Khóa hồ sơ</string>
@@ -569,10 +553,8 @@
     <string name="duplicate_add">Thêm vào</string>
     <string name="action_subscribe">Đăng ký</string>
     <string name="action_remove_from_favorites">Xóa khỏi mục yêu thích</string>
-    <string name="select_an_account">Ai đang xem</string>
-    <string name="duplicate_message_single">Có vẻ như một mục có khả năng trùng lặp đã tồn tại trong thư viện của bạn: \'%s.\'
-\n
-\nBạn vẫn muốn thêm mục này, thay thế mục hiện có hay hủy hành động?</string>
+    <string name="select_an_account">Chọn một Hồ sơ</string>
+    <string name="duplicate_message_single">Có vẻ như một mục có khả năng trùng lặp đã tồn tại trong thư viện của bạn: \'%s.\' \n \nBạn vẫn muốn thêm mục này, thay thế mục hiện có hay hủy hành động?</string>
     <string name="enter_pin">Nhập mã PIN</string>
     <string name="pin">PIN</string>
     <string name="enter_current_pin">Nhập mã PIN hiện tại</string>
@@ -583,7 +565,7 @@
     <string name="manage_accounts">Quản lý hồ sơ</string>
     <string name="edit_account">Chỉnh sửa hồ sơ</string>
     <string name="links_reloaded_toast">Tải lại liên kết</string>
-    <string name="result_search_tooltip">Tìm kiếm tiện ích mở rộng khác</string>
+    <string name="result_search_tooltip">Tìm kiếm trong tiện ích mở rộng khác</string>
     <string name="recommendations_tooltip">Hiển thị đề xuất</string>
     <string name="test_extensions">Kiểm tra tất cả Tiện ích mở rộng</string>
     <string name="rotate_video">Xoay</string>
@@ -613,17 +595,17 @@
     <string name="test_extensions_summary">Bài kiểm tra này chỉ dành cho các nhà phát triển và không xác nhận hay phủ nhận việc hoạt động của bất kỳ tiện ích mở rộng nào.</string>
     <string name="app_unrestricted_toast">Chế độ tiêu thụ pin của ứng dụng đã được đặt ở mức không giới hạn</string>
     <string name="custom_media_singular">Phương tiện</string>
-    <string name="repo_copy_label">Tên và URL kho tiện ích</string>
+    <string name="repo_copy_label">Tên và URL kho nguồn phim</string>
     <string name="reset_btn">Đặt lại</string>
     <string name="battery_dialog_message">Để đảm bảo quá trình tải xuống và thông báo cho các chương trình truyền hình đã đăng ký không bị gián đoạn, CloudStream cần có quyền chạy ở chế độ nền. Bằng cách nhấn OK, một hộp thoại yêu cầu sẽ hiển thị. Vui lòng nhấn \"Cho phép\".\n\nXin lưu ý, quyền này không có nghĩa là CS3 sẽ làm hao pin của bạn. Nó sẽ chỉ hoạt động ở chế độ nền khi cần thiết, chẳng hạn như khi nhận được thông báo hoặc tải xuống video từ các tiện ích mở rộng chính thức.</string>
     <string name="next_season_episode_format" formatted="true">Mùa %1$d Tập %2$d sẽ được phát hành vào</string>
-    <string name="episode_upcoming_format" formatted="true">Sắp tới sau %s</string>
+    <string name="episode_upcoming_format" formatted="true">Sắp ra mắt sau %s</string>
     <string name="player_settings_select_cast_device">Chọn thiết bị truyền</string>
     <string name="pref_category_security">Bảo mật</string>
     <string name="pref_category_accounts">Tài khoản</string>
     <string name="qr_image">Mã QR</string>
     <string name="dismiss">Bỏ qua</string>
-    <string name="open_downloaded_repo">Mở kho tiện ích</string>
+    <string name="open_downloaded_repo">Mở kho nguồn phim</string>
     <string name="cs3wiki">CloudStream Wiki</string>
     <string name="device_pin_url_message">Truy cập <b>%s</b> trên điện thoại hoặc máy tính và nhập mã bên trên</string>
     <string name="device_pin_expired_message">Mã PIN đã hết hạn!</string>
@@ -631,7 +613,7 @@
     <string name="device_pin_error_message">Không lấy được mã PIN, vui lòng thử xác thực cục bộ</string>
     <string name="downloads_empty">Không có tải xuống nào.</string>
     <string name="auth_locally">Xác thực cục bộ</string>
-    <string name="episode_action_cast_mirror">Phản chiếu màn hình</string>
+    <string name="episode_action_cast_mirror">Truyền nguồn thay thế</string>
     <string name="play_from_beginning_img_des">Phát từ đầu</string>
     <string name="open_local_video">Mở video có sẵn</string>
     <string name="test_warning">Cảnh báo</string>
@@ -642,16 +624,10 @@
     <string name="deselect_all">Bỏ chọn tất cả</string>
     <string name="delete_files">Xoá các tệp</string>
     <string name="delete_format" formatted="true">Xoá (%1$d | %2$s)</string>
-    <string name="delete_message_multiple" formatted="true">Bạn có chắc chắn muốn xóa vĩnh viễn các mục sau không?
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">Bạn có chắc chắn muốn xóa vĩnh viễn các tập trong %1$s?
-\n
-\n%2$s</string>
+    <string name="delete_message_multiple" formatted="true">Bạn có chắc chắn muốn xóa vĩnh viễn các mục sau không? \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">Bạn có chắc chắn muốn xóa vĩnh viễn các tập trong %1$s? \n \n%2$s</string>
     <string name="delete_message_series_section" formatted="true">Bạn cũng sẽ xóa vĩnh viễn tất cả các tập trong loạt phim: \n \n%s</string>
-    <string name="delete_message_series_only" formatted="true">Bạn có chắc chắn muốn xóa vĩnh viễn tất cả các tập trong loạt phim này không?
-\n
-\n%s</string>
+    <string name="delete_message_series_only" formatted="true">Bạn có chắc chắn muốn xóa vĩnh viễn tất cả các tập trong loạt phim này không? \n \n%s</string>
     <string name="delete_plugin">Xóa tiện ích mở rộng</string>
     <string name="sort_release_date_old">Ngày phát hành (Cũ đến mới)</string>
     <string name="hide_player_control_names">Ẩn tên các nút điều khiển trình phát</string>
@@ -669,7 +645,7 @@
     <string name="encoding_error">Lỗi mã hóa</string>
     <string name="software_decoding_desc">Giải mã phần mềm cho phép phát các tệp video không được thiết bị của bạn hỗ trợ, nhưng có thể gây ra phản hồi chậm hoặc phát lại không ổn định ở độ phân giải cao.</string>
     <string name="software_decoding">Bộ giải mã ứng dụng</string>
-    <string name="torrent_not_accepted">Khởi động lại ứng dụng và chấp nhận cửa sổ Stream Torrent để tiếp tục.</string>
+    <string name="torrent_not_accepted">Khởi động lại ứng dụng và chấp nhận cửa sổ bật lên của Stream Torrent để tiếp tục.</string>
     <string name="torrent_preferred_media">Kích hoạt torrent trong Cài đặt/Nguồn phim/Thể loại ưu tiên</string>
     <string name="player_load_one_subtitle_online">Tải phụ đề đầu tiên có sẵn</string>
     <string name="audio_singular">Âm thanh</string>
@@ -709,7 +685,7 @@
     <string name="go_to_downloads">Đến mục Tải xuống</string>
     <string name="no_internet_connection">Không có kết nối Internet. \n\nVui lòng kết nối Internet rồi thử lại, hoặc xem các nội dung đã tải xuống khi đang ngoại tuyến.</string>
     <string name="overscan_settings_des">Thay đổi khung hiển thị màn hình</string>
-    <string name="overscan_settings">Vượt khung</string>
+    <string name="overscan_settings">Quét chồng lấn</string>
     <string name="poster_size_settings_des">Thay đổi kích thước poster</string>
     <string name="poster_size_settings">Kích thước poster</string>
     <string name="speedup_title">Tăng tốc độ phát khi nhấn giữ</string>
@@ -724,12 +700,12 @@
     <string name="edit_profile_image_error_invalid">URL hoặc ảnh không hợp lệ</string>
     <string name="edit_profile_image_success">Đã cập nhật ảnh thành công</string>
     <string name="action_mark_watched_up_to_this_episode">Đánh dấu là đã xem đến tập này</string>
-    <string name="action_remove_mark_watched_up_to_this_episode">Xóa những tập đã xem đến tập này</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Xóa đã xem đến tập này</string>
     <string name="action_reload">Đã tải lại</string>
     <string name="reload_provider">Tải lại nguồn phim</string>
     <string name="name">Tên</string>
     <string name="resolution_and_name">Độ phân giải và tên</string>
-    <string name="episode_action_play_mirror">Phản chiếu màn hình</string>"
+    <string name="episode_action_play_mirror">Phát nguồn thay thế</string>"
     <string name="subs_subtitle_alignment">Căn chỉnh phụ đề</string>
     <string name="bottom_left">Dưới trái</string>
     <string name="bottom_center">Dưới giữa</string>
@@ -749,7 +725,7 @@
     <string name="prerelease_install_failed">Cài đặt bản phát hành trước thất bại.</string>
     <string name="show_episode_text">Tập</string>
     <string name="extra_brightness_settings_des">Bật bộ lọc độ sáng khi độ sáng màn hình vượt quá 100%</string>
-    <string name="show_cast_in_details">Hiển thị bảng diễn viên</string>
+    <string name="show_cast_in_details">Hiển thị bảng dàn diễn viên</string>
     <string name="video_info">Thông tin video</string>
     <string name="extra_brightness_settings">Độ sáng bổ sung</string>
     <string name="source_name">Tên nguồn</string>
@@ -769,4 +745,7 @@
     </plurals>
     <string name="extra_brightness_key">Đã bật độ sáng bổ sung</string>
     <string name="show_player_metadata_overlay">Hiển thị lớp phủ siêu dữ liệu trình phát</string>
+    <string name="player_is_live">Trực tiếp</string>
+    <string name="video_singular">Video</string>
+    <string name="skip_type_preview">Xem trước</string>
 </resources>
diff --git a/app/src/main/res/values-b+zh+TW/strings.xml b/app/src/main/res/values-b+zh+TW/strings.xml
index e5879ae37..759856bdb 100644
--- a/app/src/main/res/values-b+zh+TW/strings.xml
+++ b/app/src/main/res/values-b+zh+TW/strings.xml
@@ -19,8 +19,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">速度（%.2fx）</string>
     <string name="rated_format" formatted="true">評分：%.1f</string>
-    <string name="new_update_format" formatted="true">發現新版本！
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">發現新版本！ \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">填充</string>
     <string name="duration_format" formatted="true">%d 分鐘</string>
     <string name="app_name">CloudStream</string>
@@ -106,7 +105,7 @@
     <string name="continue_watching">繼續觀看</string>
     <string name="action_remove_watching">移除</string>
     <string name="action_open_watching">更多資訊</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">此片源可能需要 VPN 才能正常使用</string>
     <string name="vpn_torrent">此片源是種子，建議使用 VPN</string>
     <string name="provider_info_meta">站點不提供元數據，如果站點上不存在元數據，影片載入將失敗。</string>
@@ -187,10 +186,8 @@
     <string name="resume">繼續</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">這將永遠刪除 %s
-\n你確定嗎?</string>
-    <string name="resume_time_left" formatted="true">剩下
-\n%d 分鐘</string>
+    <string name="delete_message" formatted="true">這將永遠刪除 %s \n你確定嗎?</string>
+    <string name="resume_time_left" formatted="true">剩下 \n%d 分鐘</string>
     <string name="status_ongoing">連載中</string>
     <string name="status_completed">已完結</string>
     <string name="status">狀態</string>
@@ -413,9 +410,7 @@
     <string name="plugins_disabled" formatted="true">已停用：%d</string>
     <string name="plugins_not_downloaded" formatted="true">未下載：%d</string>
     <string name="plugins_updated" formatted="true">已更新 %d 外掛程式</string>
-    <string name="blank_repo_message">CloudStream 預設沒有安裝網站。你需要從儲存庫安裝網站。
-\n
-\n加入我們的 Discord 或在網路上搜尋。</string>
+    <string name="blank_repo_message">CloudStream 預設沒有安裝網站。你需要從儲存庫安裝網站。 \n \n加入我們的 Discord 或在網路上搜尋。</string>
     <string name="view_public_repositories_button">查看</string>
     <string name="view_public_repositories_button_short">公開清單</string>
     <string name="uppercase_all_subtitles">字幕全大寫</string>
@@ -503,8 +498,7 @@
     <string name="sort_alphabetical_a">按字母順序（A 到 Z）</string>
     <string name="sort_alphabetical_z">按字母順序（Z 到 A）</string>
     <string name="select_library">選擇媒體庫</string>
-    <string name="safe_mode_file">找到安全模式檔案！
-\n在刪除此檔案之前，將不會在啟動時載入任何擴充功能。</string>
+    <string name="safe_mode_file">找到安全模式檔案！ \n在刪除此檔案之前，將不會在啟動時載入任何擴充功能。</string>
     <string name="test_log">日誌</string>
     <string name="test_failed">失敗</string>
     <string name="test_passed">通過</string>
@@ -522,8 +516,7 @@
     <string name="revert">還原</string>
     <string name="jsdelivr_enabled">無法存取 GitHub。 正在開啟 jsDelivr proxy…</string>
     <string name="jsdelivr_proxy_summary">使用 jsDelivr 繞過直接使用 GitHub 網址時的存取封鎖。 可能導致更新延遲數天。</string>
-    <string name="empty_library_no_accounts_message">您的媒體庫是空的 :(
-\n登入媒體庫帳號或將節目新增到您本機的媒體庫。</string>
+    <string name="empty_library_no_accounts_message">您的媒體庫是空的 :( \n登入媒體庫帳號或將節目新增到您本機的媒體庫。</string>
     <string name="empty_library_logged_in_message">您的媒體庫是空的。可嘗試以不同的帳號登入。</string>
     <string name="subscription_in_progress_notification">正在更新訂閱節目</string>
     <string name="backup_frequency">備份頻率</string>
@@ -531,11 +524,7 @@
     <string name="favorites_list_name">我的最愛</string>
     <string name="favorite_added">%s 已加入我的最愛</string>
     <string name="logged_account" formatted="true">以 %s 的身分登入</string>
-    <string name="duplicate_message_multiple" formatted="true">您的媒體庫中似乎有多個重覆的項目：
-\n
-\n%s
-\n
-\n您要強制加入、取代已有項目、還是取消操作？</string>
+    <string name="duplicate_message_multiple" formatted="true">您的媒體庫中似乎有多個重覆的項目： \n \n%s \n \n您要強制加入、取代已有項目、還是取消操作？</string>
     <string name="enter_pin_with_name" formatted="true">輸入 %s 的 PIN 碼</string>
     <string name="mobile_data">行動數據</string>
     <string name="duplicate_title">找到可能重覆的項目</string>
@@ -567,19 +556,11 @@
     <string name="no_repository_found_error">找不到資源庫，請檢查網址與 VPN 設定</string>
     <string name="already_voted">您已完成投票</string>
     <string name="no_plugins_found_error">在資源庫中找不到外掛程式</string>
-    <string name="duplicate_message_single" formatted="true">您的媒體庫中似乎有重覆的項目：「%s」。
-\n
-\n您要強制加入、取代已有項目、還是取消操作？</string>
+    <string name="duplicate_message_single" formatted="true">您的媒體庫中似乎有重覆的項目：「%s」。 \n \n您要強制加入、取代已有項目、還是取消操作？</string>
     <string name="set_default">設回預設</string>
     <string name="enter_pin">輸入 PIN 碼</string>
     <string name="pin">PIN 碼</string>
-    <string name="quality_profile_help">您可在此調整來源的排序方式。具有愈小的優先值的影片，在來源選擇中顯示得愈前面。來源優先值與品質優先值的加總就是影片優先值。
-\n例如：
-\n來源 A：3
-\n品質 B： 7
-\n則該來源的影片優先值為 10。
-\n
-\n注意：如果加總達到 10 或更高，則載入該連結時播放器將自動跳過載入！</string>
+    <string name="quality_profile_help">您可在此調整來源的排序方式。具有愈小的優先值的影片，在來源選擇中顯示得愈前面。來源優先值與品質優先值的加總就是影片優先值。 \n例如： \n來源 A：3 \n品質 B： 7 \n則該來源的影片優先值為 10。 \n \n注意：如果加總達到 10 或更高，則載入該連結時播放器將自動跳過載入！</string>
     <string name="enter_current_pin">輸入目前的 PIN 碼</string>
     <string name="rotate_video_desc">顯示切換畫面方向的按鈕</string>
     <string name="automatic_plugin_download_mode_title">選擇篩選外掛程式下載的模式</string>
@@ -599,8 +580,7 @@
     <string name="recommendations_tooltip">顯示推薦</string>
     <string name="speed_setting_summary">在播放器中新增速度選項</string>
     <string name="episode_upcoming_format" formatted="true">即將在 %s 推出</string>
-    <string name="resume_remaining" formatted="true">%s
-\n剩餘</string>
+    <string name="resume_remaining" formatted="true">%s \n剩餘</string>
     <string name="test_extensions">測試所有擴充功能</string>
     <string name="battery_dialog_title">停用電池優化</string>
     <string name="audio_book_singular">有聲書</string>
@@ -764,4 +744,7 @@
     <string name="software_decoding_desc">軟體解碼使程式可以播放裝置不支援的影片，但可能導致播放高解析的影片時的延遲或不穩定。</string>
     <string name="volume_exceeded_100">音量已超過 100%</string>
     <string name="show_player_metadata_overlay">顯示播放器元資料遮罩層</string>
+    <string name="video_singular">影片</string>
+    <string name="skip_type_preview">預覽</string>
+    <string name="player_is_live">播放中</string>
 </resources>
diff --git a/app/src/main/res/values-b+zh/strings.xml b/app/src/main/res/values-b+zh/strings.xml
index de0cb834a..24256e964 100644
--- a/app/src/main/res/values-b+zh/strings.xml
+++ b/app/src/main/res/values-b+zh/strings.xml
@@ -19,8 +19,7 @@
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
     <string name="player_speed_text_format" formatted="true">速度（%.2fx）</string>
     <string name="rated_format" formatted="true">评分：%.1f</string>
-    <string name="new_update_format" formatted="true">发现新版本！
-\n%1$s -&gt; %2$s</string>
+    <string name="new_update_format" formatted="true">发现新版本！ \n%1$s -&gt; %2$s</string>
     <string name="filler" formatted="true">填充</string>
     <string name="duration_format" formatted="true">%d 分钟</string>
     <string name="app_name">CloudStream</string>
@@ -106,7 +105,7 @@
     <string name="continue_watching">继续观看</string>
     <string name="action_remove_watching">移除</string>
     <string name="action_open_watching">更多信息</string>
-    <string name="action_open_play">@string/home_play</string>
+    <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">此片源可能需要 VPN 才能正常使用</string>
     <string name="vpn_torrent">此片源为种子文件，建议使用 VPN</string>
     <string name="provider_info_meta">站点不提供元数据，如果站点上不存在元数据，视频加载将失败。</string>
@@ -188,10 +187,8 @@
     <string name="resume">继续</string>
     <string name="go_back_30">-30</string>
     <string name="go_forward_30">+30</string>
-    <string name="delete_message" formatted="true">这将永久删除 %s
-\n您确定吗?</string>
-    <string name="resume_time_left" formatted="true">%d 分钟
-\n剩余</string>
+    <string name="delete_message" formatted="true">这将永久删除 %s \n您确定吗?</string>
+    <string name="resume_time_left" formatted="true">%d 分钟 \n剩余</string>
     <string name="status_ongoing">连载中</string>
     <string name="status_completed">已完结</string>
     <string name="status">状态</string>
@@ -414,9 +411,7 @@
     <string name="plugins_disabled" formatted="true">已禁用：%d</string>
     <string name="plugins_not_downloaded" formatted="true">未下载：%d</string>
     <string name="plugins_updated" formatted="true">已更新 %d 插件</string>
-    <string name="blank_repo_message">CloudStream 默认不安装片源。您需要从仓库中安装片源。
-\n
-\n加入我们的 Discord 或在网上搜索。</string>
+    <string name="blank_repo_message">CloudStream 默认不安装片源。您需要从仓库中安装片源。 \n \n加入我们的 Discord 或在网上搜索。</string>
     <string name="view_public_repositories_button">查看社区仓库</string>
     <string name="view_public_repositories_button_short">公开列表</string>
     <string name="uppercase_all_subtitles">字幕全大写</string>
@@ -486,8 +481,7 @@
     <string name="delayed_update_notice">应用退出后将会更新</string>
     <string name="plugin_downloaded">插件已下载</string>
     <string name="action_remove_from_watched">从已观看中移除</string>
-    <string name="safe_mode_file">发现安全模式文件！
-\n启动时不加载任何扩展，直到文件被删除。</string>
+    <string name="safe_mode_file">发现安全模式文件！ \n启动时不加载任何扩展，直到文件被删除。</string>
     <string name="browser">浏览器</string>
     <string name="library">库</string>
     <string name="sort_by">排序方式</string>
@@ -500,8 +494,7 @@
     <string name="sort_alphabetical_z">字母排序（从 Z 到 A）</string>
     <string name="select_library">选择库</string>
     <string name="open_with">打开方式</string>
-    <string name="empty_library_no_accounts_message">您的库是空的 :(
-\n登录库账户或添加节目到您的本地库。</string>
+    <string name="empty_library_no_accounts_message">您的库是空的 :( \n登录库账户或添加节目到您的本地库。</string>
     <string name="empty_library_logged_in_message">此列表是空的，请尝试切换到另一个。</string>
     <string name="android_tv_interface_on_seek_settings">播放器显示 - 快进快退秒数</string>
     <string name="android_tv_interface_on_seek_settings_summary">播放器可见时使用的快进快退秒数</string>
@@ -534,13 +527,7 @@
     <string name="profiles">配置文件</string>
     <string name="help">帮助</string>
     <string name="mobile_data">移动流量</string>
-    <string name="quality_profile_help">在这里，您可以更改源的排序方式。如果视频具有更高的优先级，它将在源选择中显示得更高。源优先级和质量优先级的总和就是视频优先级。
-\n
-\n来源 A：3
-\n质量 B： 7
-\n组合视频优先级为 10。
-\n
-\n注意：如果总和为 10 或更多，则加载该链接时播放器将自动跳过加载！</string>
+    <string name="quality_profile_help">在这里，您可以更改源的排序方式。如果视频具有更高的优先级，它将在源选择中显示得更高。源优先级和质量优先级的总和就是视频优先级。 \n \n来源 A：3 \n质量 B： 7 \n组合视频优先级为 10。 \n \n注意：如果总和为 10 或更多，则加载该链接时播放器将自动跳过加载！</string>
     <string name="qualities">质量</string>
     <string name="profile_background_des">个人资料背景</string>
     <string name="pin">PIN</string>
@@ -570,14 +557,8 @@
     <string name="already_voted">您已投票</string>
     <string name="favorite_added">%s已添加到收藏夹</string>
     <string name="favorite_removed">%s已从收藏夹中删除</string>
-    <string name="duplicate_message_single" formatted="true">您的资料库中似乎已经存在一个可能相同的项目：\'%s.\'
-\n
-\n您想添加该项目、替换现有项目还是取消操作？</string>
-    <string name="duplicate_message_multiple" formatted="true">在您的资料库中发现了潜在的重复项目：
-\n
-\n%s
-\n
-\n您想添加此项目、替换现有项目还是取消操作？</string>
+    <string name="duplicate_message_single" formatted="true">您的资料库中似乎已经存在一个可能相同的项目：\'%s.\' \n \n您想添加该项目、替换现有项目还是取消操作？</string>
+    <string name="duplicate_message_multiple" formatted="true">在您的资料库中发现了潜在的重复项目： \n \n%s \n \n您想添加此项目、替换现有项目还是取消操作？</string>
     <string name="enter_pin">确认PIN</string>
     <string name="enter_pin_with_name" formatted="true">输入来自 %s 的 PIN 码</string>
     <string name="lock_profile">锁定个人资料</string>
@@ -597,8 +578,7 @@
     <string name="biometric_authentication_title">解锁 CloudStream</string>
     <string name="biometric_setting">使用生物识别技术锁定</string>
     <string name="password_pin_authentication_title">密码或 PIN 验证</string>
-    <string name="resume_remaining" formatted="true">%s
-\n剩余</string>
+    <string name="resume_remaining" formatted="true">%s \n剩余</string>
     <string name="test_extensions">测试所有扩展</string>
     <string name="toast_copied">已复制！</string>
     <string name="clipboard_permission_error">访问剪贴板出错，请重试。</string>
@@ -644,18 +624,10 @@
     <string name="deselect_all">全不选</string>
     <string name="delete_files">删除文件</string>
     <string name="delete_format" formatted="true">删除 (%1$d | %2$s)</string>
-    <string name="delete_message_multiple" formatted="true">您确定要永久删除以下项目吗？
-\n
-\n%s</string>
-    <string name="delete_message_series_episodes" formatted="true">您确定要永久删除 %1$s中的下述剧集吗？
-\n
-\n%2$s</string>
-    <string name="delete_message_series_section" formatted="true">您还将永久删除下述系列中的所有剧集：
-\n
-\n%s</string>
-    <string name="delete_message_series_only" formatted="true">您确定要永久删除下述系列的所有剧集吗？
-\n
-\n%s</string>
+    <string name="delete_message_multiple" formatted="true">您确定要永久删除以下项目吗？ \n \n%s</string>
+    <string name="delete_message_series_episodes" formatted="true">您确定要永久删除 %1$s中的下述剧集吗？ \n \n%2$s</string>
+    <string name="delete_message_series_section" formatted="true">您还将永久删除下述系列中的所有剧集： \n \n%s</string>
+    <string name="delete_message_series_only" formatted="true">您确定要永久删除下述系列的所有剧集吗？ \n \n%s</string>
     <string name="sort_release_date_new">发布日期（从新至旧）</string>
     <string name="device_pin_error_message">无法获取设备 PIN 码，尝试本地身份验证</string>
     <string name="device_pin_expired_message">PIN 码现已过期！</string>
@@ -772,4 +744,7 @@
     <string name="source_priority_help">确定在播放器中如何排列视频源的顺序</string>
     <string name="extra_brightness_key">已启用额外亮度</string>
     <string name="show_player_metadata_overlay">显示播放器元数据遮罩层</string>
+    <string name="video_singular">视频</string>
+    <string name="skip_type_preview">预览</string>
+    <string name="player_is_live">播放中</string>
 </resources>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 1a47a6a63..3d9200faf 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -34,7 +34,7 @@
     <string name="search_hint_site" formatted="true">Шукаць па %s…</string>
     <string name="speech_recognition_unavailable">Распазнаванне маўлення недаступна</string>
     <string name="begin_speaking">Пачніце размаўляць…</string>
-    <string name="no_data">Няма даных</string>
+    <string name="no_data">Няма дадзеных</string>
     <string name="episode_more_options_des">Больш параметраў</string>
     <string name="next_episode">Наступная серыя</string>
     <string name="result_tags">Жанры</string>
@@ -128,7 +128,7 @@
     <string name="action_open_play">\@string/home_play</string>
     <string name="vpn_might_be_needed">Для карэктнай працы гэтага пастаўшчыка можа спатрэбіцца VPN</string>
     <string name="vpn_torrent">Гэты пастаўшчык — Torrent, рэкамендуецца VPN</string>
-    <string name="provider_info_meta">Вэб-сайт не пастаўляе метаданых, загрузіць відэа не ўдасца, калі на сайце яго няма.</string>
+    <string name="provider_info_meta">Вэб-сайт не пастаўляе метададзеных, загрузіць відэа не ўдасца, калі на сайце яго няма.</string>
     <string name="torrent_plot">Апісанне</string>
     <string name="normal_no_plot">Сюжэту не знойдзена</string>
     <string name="torrent_no_plot">Апісання не знойдзена</string>
@@ -159,12 +159,12 @@
     <string name="use_system_brightness_settings_des">Выкарыстоўваць сістэмную яркасць у прайгравальніку замест цёмнага накладання</string>
     <string name="episode_sync_settings">Абнаўляць працэс прагляду</string>
     <string name="episode_sync_settings_des">Аўтаматычна сінхранізаваць прагрэс бягучай серыі</string>
-    <string name="restore_settings">Аднавіць даныя з рэзервовай копіі</string>
-    <string name="backup_settings">Рэзервовае капіраванне даных</string>
+    <string name="restore_settings">Аднавіць дадзеныя з рэзервовай копіі</string>
+    <string name="backup_settings">Рэзервовае капіраванне дадзеных</string>
     <string name="backup_frequency">Частата рэзервовага капіравання</string>
     <string name="restore_success">Загружаны файл рэзервовай копіі</string>
-    <string name="restore_failed_format" formatted="true">Не ўдалося аднавіць даныя з файла %s</string>
-    <string name="backup_success">Даныя захаваны</string>
+    <string name="restore_failed_format" formatted="true">Не ўдалося аднавіць дадзеныя з файла %s</string>
+    <string name="backup_success">Дадзеныя захаваны</string>
     <string name="backup_failed">Няма дазволу да сховішча. Паспрабуйце ізноў.</string>
     <string name="backup_failed_error_format">Памылка пры рэзервовым капіраванні %s</string>
     <string name="search">Пошук</string>
@@ -247,7 +247,7 @@
     <string name="synopsis">Сціслы агляд</string>
     <string name="queued">у чарзе</string>
     <string name="no_subtitles">Субцітраў няма</string>
-    <string name="action_default">Прадвызначанае</string>
+    <string name="action_default">Прадвызначаны</string>
     <string name="free_storage">Свабодна</string>
     <string name="used_storage">Ужыта</string>
     <string name="app_storage">Праграма</string>
@@ -315,7 +315,7 @@
     <string name="skip_update">Прапусціць гэта абнаўленне</string>
     <string name="update">Абнавіць</string>
     <string name="watch_quality_pref">Прыярытэтная якасць прагляду (WiFi)</string>
-    <string name="watch_quality_pref_data">Прыярытэтная якасць прагляду (Мабільная перадача даных)</string>
+    <string name="watch_quality_pref_data">Прыярытэтная якасць прагляду (Мабільная перадача дадзеных)</string>
     <string name="limit_title">Максімальная колькасць сімвалаў у загалоўку праглядальніка</string>
     <string name="limit_title_rez">Паказваць інфармацыю ў прайгравальніку</string>
     <string name="video_buffer_size_settings">Памер буфера відэа</string>
@@ -458,7 +458,7 @@
     <string name="resolution">Раздзяляльнасць</string>
     <string name="video_info">Звесткі пра медыя</string>
     <string name="error_invalid_id">Памылковы ID</string>
-    <string name="error_invalid_data">Памылковыя даныя</string>
+    <string name="error_invalid_data">Памылковыя дадзеныя</string>
     <string name="error_invalid_url">Памылковы URL-адрэс</string>
     <string name="error">Памылка</string>
     <string name="subtitles_remove_captions">Прыбраць схаваныя цітры з субцітраў</string>
@@ -480,7 +480,7 @@
     <string name="repository_name_hint">Назва рэпазіторыя (неабавязкова)</string>
     <string name="repository_url_hint">URL-адрас рэпазіторыя або кароткі код</string>
     <string name="plugin_loaded">Убудова загружана</string>
-    <string name="plugin_downloaded">Убудава спампавана</string>
+    <string name="plugin_downloaded">Убудова спампавана</string>
     <string name="plugin_deleted">Убудова выдалена</string>
     <string name="plugin_load_fail" formatted="true">Не ўдалося загрузіць %s</string>
     <string name="is_adult">18+</string>
@@ -499,7 +499,7 @@
     <string name="plugins_downloaded" formatted="true">Спампавана: %d</string>
     <string name="plugins_disabled" formatted="true">Выключана: %d</string>
     <string name="plugins_not_downloaded" formatted="true">Не спампавана: %d</string>
-    <string name="plugins_updated" formatted="true">Абноўлена %d плагіна(ў)</string>
+    <string name="plugins_updated" formatted="true">Абноўлена %d убудоў</string>
     <string name="blank_repo_message">Прадвызначана на CloudStream няма ўсталяваных вэб-сайтаў. Вам трэба ўсталяваць вэб-сайты з рэпазіторыяў. \n \nДалучыцеся да нашага сервера Discord або пашукайце ў сетцы.</string>
     <string name="view_public_repositories_button">Праглядзець рэпазіторыі ад супольнасці</string>
     <string name="view_public_repositories_button_short">Публічны спіс</string>
@@ -595,7 +595,7 @@
     <string name="action_unsubscribe">Адпісацца</string>
     <string name="profile_number">Профіль %d</string>
     <string name="wifi">Wi-Fi</string>
-    <string name="mobile_data">Мабільная перадача даных</string>
+    <string name="mobile_data">Мабільная перадача дадзеных</string>
     <string name="set_default">Выбраць як прадвызначаны</string>
     <string name="use">Выкарыстоўваць</string>
     <string name="edit">Рэдагаваць</string>
@@ -643,7 +643,7 @@
     <string name="biometric_unsupported">Праверка сапраўднасці біяметрыяй не падтрымліваецца на гэтай прыладзе</string>
     <string name="biometric_setting_summary">Разблакіруйце праграму адбіткам пальца, Face ID, PIN-кодам, узорам разблакіроўкі або паролем.</string>
     <string name="biometric_prompt_description">Праз некалькі няўдалых спроб акно з запытам закрыецца. Проста перазапусціце праграму, каб паўтарыць спробу.</string>
-    <string name="biometric_warning">Вашы даныя CloudStream былі зарэзерваваныя. Нягледзячы на тое, што магчымасць вельмі маленькая, усе прылады могуць паводзіць сябе па-рознаму. У рэдкасным выпадку, калі вы страціце доступ да праграмы, поўнасцю ачысціце даныя і аднавіце іх праз рэзервовую копію. Выбачайце за любую нязручнасць, якая можа з гэтага атрымацца.</string>
+    <string name="biometric_warning">Вашы дадзеныя CloudStream былібылі толькі што зарэзерваваныя. Нягледзячы на тое, што магчымасць вельмі маленькая, усе прылады могуць паводзіць сябе па-рознаму. У рэдкасным выпадку, калі вы страціце доступ да праграмы, поўнасцю ачысціце даныя і аднавіце іх праз рэзервовую копію. Выбачайце за любую нязручнасць, якая можа з гэтага атрымацца.</string>
     <string name="reset_btn">Скінуць</string>
     <string name="cs3wiki">CloudStream-Вікі</string>
     <string name="device_pin_url_message">Наведайце <b>%s</b> на вашым смартфоне або камп\'ютары і ўвядзіце код вышэй</string>
@@ -735,5 +735,8 @@
         <item quantity="many">%d спампоўванняў у чарзе</item>
         <item quantity="other">%d спампоўванняў у чарзе</item>
     </plurals>
-    <string name="show_player_metadata_overlay">Паказваць накладанне з метаданымі ў прайгравальніку</string>
+    <string name="show_player_metadata_overlay">Паказваць накладанне з метададзенымі ў прайгравальніку</string>
+    <string name="video_singular">Відэа</string>
+    <string name="skip_type_preview">Перадпрагляд</string>
+    <string name="player_is_live">Ужывую</string>
 </resources>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 51d2379de..a13f87bfa 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -75,7 +75,7 @@
     <string name="offline_file">E disponueshme për shikim offline</string>
     <string name="select_all">Zgjidh të gjitha</string>
     <string name="deselect_all">Çzgjidh të gjitha</string>
-    <string name="update_started">Update-i filloi</string>
+    <string name="update_started">Përditësimi filloi</string>
     <string name="stream">Transmetim në rrjet</string>
     <string name="open_local_video">Hap video lokale</string>
     <string name="error_loading_links_toast">Gabim gjatë ngarkimit të lidhjeve</string>
@@ -83,7 +83,7 @@
     <string name="download_storage_text">Memorie e brendshme</string>
     <string name="app_dubbed_text">Dublim</string>
     <string name="app_subbed_text">Titra</string>
-    <string name="popup_delete_file">Fshi Skedarin</string>
+    <string name="popup_delete_file">Fshi skedarin</string>
     <string name="popup_play_file">Luaj skedarin</string>
     <string name="popup_resume_download">Rifillo shkarkimin</string>
     <string name="popup_pause_download">Ndalo shkarkimin</string>
@@ -224,8 +224,8 @@
     <string name="episode_short">E</string>
     <string name="no_episodes_found">Nuk u gjet asnjë episod</string>
     <string name="delete">Fshij</string>
-    <string name="delete_file">Fshij skedarin</string>
-    <string name="delete_files">Fshij skedarët</string>
+    <string name="delete_file">Fshi skedarin</string>
+    <string name="delete_files">Fshi skedarët</string>
     <string name="delete_format" formatted="true">Fshij (%1$d | %2$s)</string>
     <string name="cancel">Anulo</string>
     <string name="pause">Ndalo</string>
@@ -309,7 +309,7 @@
     <string name="show_episode_text">Teksti i episodit</string>
     <string name="poster_ui_settings">Zgjidh elementët e ndërfaqes mbi poster</string>
     <string name="no_update_found">Nuk u gjet asnjë përditësim</string>
-    <string name="check_for_update">Kontrollo për përditësim</string>
+    <string name="check_for_update">Kontrollo për përditësime</string>
     <string name="video_lock">Çelës</string>
     <string name="video_aspect_ratio_resize">Ndrysho madhësinë</string>
     <string name="video_source">Burimi</string>
@@ -494,4 +494,245 @@
     <string name="batch_download_nothing_to_download_format" formatted="true">Të gjitha %s janë shkarkuar tashmë</string>
     <string name="no_plugins_found_error">Asnjë shtesë nuk u gjet në repository</string>
     <string name="no_repository_found_error">Repository nuk u gjet, verifiko URL-në ose provoje me VPN</string>
+    <string name="safe_mode_description">Të gjitha shtesat u ndaluan për shkak të një gabimi për të ndihmuar në gjetjen e shkaktarit.</string>
+    <string name="view_public_repositories_button_short">Lista publike</string>
+    <string name="blank_repo_message">CloudStream nuk vjen me faqe të instaluara. Duhet ti shtosh faqet nga repository-t.\n\nNa u bashko në Discord ose kërko në internet.</string>
+    <string name="extension_authors">Autorët</string>
+    <string name="plugin_singular">shtesë</string>
+    <string name="uppercase_all_subtitles">Titrat vetëm me shkronja të mëdha</string>
+    <string name="player_pref">Luajtësi i preferuar i videove</string>
+    <string name="extension_description">Përshkrimi</string>
+    <string name="view_public_repositories_button">Shiko repository-t e komunitetit</string>
+    <string name="safe_mode_title">Modaliteti i sigurt është aktive</string>
+    <string name="plugins_not_downloaded" formatted="true">Të pa shkarkuara: %d</string>
+    <string name="extension_install_first">Instalo shtesën para</string>
+    <string name="apply_on_restart">Rifillo aplikacionin për të parë ndryshimet.</string>
+    <string name="plugins_disabled" formatted="true">Çaktivizuar: %d</string>
+    <string name="stop">Pauzë</string>
+    <string name="tracks">Gjurmë</string>
+    <string name="batch_download">Shkarkimi në grup përfundoi</string>
+    <string name="delete_repository_plugins">Kjo do të heqë të gjitha shtesat</string>
+    <string name="extension_language">Gjuha</string>
+    <string name="restart">Rifillo</string>
+    <string name="delete_plugin">Fshi shtesën</string>
+    <string name="extension_size">Madhësia</string>
+    <string name="safe_mode_crash_info">Shiko të dhënat e gabimit</string>
+    <string name="extension_types">Të suportuara</string>
+    <string name="plugins_downloaded" formatted="true">Shkarkuar: %d</string>
+    <string name="video_tracks">Gjurmë video-je</string>
+    <string name="plugins_updated" formatted="true">U përditësuan %d shtesa</string>
+    <string name="hls_playlist">Lista e HLS</string>
+    <string name="plugin">shtesa</string>
+    <string name="extension_rating" formatted="true">Vlerësimi: %s</string>
+    <string name="download_all_plugins_from_repo">Paralajmërim: CloudStream nuk mban asnjë përgjegjësi për përdorimin e shtesave të palëve të treta dhe nuk ofron asnjë mbështetje për to!</string>
+    <string name="extension_status">Statusi</string>
+    <string name="delete_repository">Fshi repository-n</string>
+    <string name="extension_version">Versioni</string>
+    <string name="single_plugin_disabled" formatted="true">%s (Çaktivizuar)</string>
+    <string name="setup_extensions_subtext">Shkarko listën e faqeve që dëshiron të përdorësh</string>
+    <string name="audio_tracks">Gjurmë audio-je</string>
+    <string name="video_singular">Video</string>
+    <string name="player_settings_play_in_app">Luajtësi i integruar</string>
+    <string name="player_settings_always_ask">Pyet gjithmonë</string>
+    <string name="player_settings_select_cast_device">Zgjidh pajisjen për transmetim</string>
+    <string name="app_not_found_error">Aplikacioni nuk u gjet</string>
+    <string name="all_languages_preference">Të gjitha gjuhët</string>
+    <string name="skip_type_format" formatted="true">Kalo %s</string>
+    <string name="skip_type_op">Hapjen</string>
+    <string name="skip_type_ed">Mbylljen</string>
+    <string name="skip_type_recap">Përmbledhjen</string>
+    <string name="skip_type_mixed_ed">Mbylljen e përzier</string>
+    <string name="skip_type_mixed_op">Hapjen e përzier</string>
+    <string name="skip_type_credits">Kreditet</string>
+    <string name="skip_type_preview">Parashikimin</string>
+    <string name="skip_type_intro">Intron</string>
+    <string name="clear_history">Pastro historikun</string>
+    <string name="history">Historia</string>
+    <string name="enable_skip_op_from_database_des">Shfaq butonat për kapërcimin e hyrjes/mbylljes</string>
+    <string name="clipboard_too_large">Teksti është shumë i gjatë. Nuk mund të ruhet në Clipboard.</string>
+    <string name="clipboard_permission_error">Gabim gjatë aksesimit të Clipboard-it. Ju lutem provoni përsëri.</string>
+    <string name="clipboard_unknown_error">Kopjimi dështoi. Kopjo logcat-in dhe kontakto support-in e aplikacionit.</string>
+    <string name="action_mark_as_watched">Shënoje si e përfunduar</string>
+    <string name="action_remove_from_watched">Hiqe nga të shikuarat</string>
+    <string name="confirm_exit_dialog">Jeni i sigurt që dëshironi të dilni?</string>
+    <string name="yes">Po</string>
+    <string name="no">Jo</string>
+    <string name="ok">Në rregull</string>
+    <string name="dismiss">Largo</string>
+    <string name="open_downloaded_repo">Hap repository-n</string>
+    <string name="battery_dialog_title">Çaktivizo kursimin e baterisë</string>
+    <string name="battery_dialog_message">Për të siguruar shkarkime të pandërprera dhe njoftime për serialet e abonuar, CloudStream ka nevojë për leje për të funksionuar në sfond. Duke shtypur OK, do t’ju shfaqet një dialog kërkese. Ju lutem shtypni “Lejo”.\n\nJu lutemi vini re: kjo leje nuk do të thotë që CS3 do të harxhojë baterinë tuaj. Do të funksionojë në sfond vetëm kur është e nevojshme, si p.sh. kur merr njoftime ose shkarkon video nga shtesat zyrtare.</string>
+    <string name="app_unrestricted_toast">Përdorimi i baterisë është i vendosur si i pakufizuar</string>
+    <string name="app_info_intent_error">Informacioni i aplikacionit CloudStream nuk mund të hapet.</string>
+    <string name="update_notification_downloading">Po shkarkohet përditësimi i aplikacionit…</string>
+    <string name="update_notification_installing">Po instalohet përditësimi i aplikacionit…</string>
+    <string name="update_notification_failed">Instalimi i versionit të ri dështoi</string>
+    <string name="apk_installer_legacy">Version i vjetër</string>
+    <string name="apk_installer_package_installer">Instaluesi i paketës</string>
+    <string name="delayed_update_notice">Aplikacioni do të përditësohet sapo të mbyllet</string>
+    <string name="sort_by">Rendit nga</string>
+    <string name="sort">Rendit</string>
+    <string name="sort_rating_desc">Vlerësimi (nga më i larti te më i ulëti)</string>
+    <string name="sort_rating_asc">Vlerësimi (nga më i ulëti te më i larti)</string>
+    <string name="sort_updated_new">Përditësuar (nga më i riu te më i vjetri)</string>
+    <string name="sort_updated_old">Përditësuar (nga më i vjetri te më i riu)</string>
+    <string name="sort_alphabetical_a">Alfabetike (A–Z)</string>
+    <string name="sort_alphabetical_z">Alfabetike (Z–A)</string>
+    <string name="sort_episodes_number_asc">Episodet (rritëse)</string>
+    <string name="sort_episodes_number_desc">Episodet (zbritëse)</string>
+    <string name="sort_episodes_rating_high_low">Vlerësimi (më i larti)</string>
+    <string name="sort_episodes_rating_low_high">Vlerësimi (më i ulëti)</string>
+    <string name="sort_episodes_date_newest">Data e publikimit (më e fundit)</string>
+    <string name="sort_episodes_date_oldest">Data e publikimit (më e hershmja)</string>
+    <string name="sort_button_episode">Ep %s</string>
+    <string name="sort_button_rating">Vlerësimi %s</string>
+    <string name="sort_button_date">Data %s</string>
+    <string name="open_with">Hape me</string>
+    <string name="empty_library_logged_in_message">Kjo listë është bosh. Provo një tjetër.</string>
+    <string name="safe_mode_file">U gjet skedari i modalitetit të sigurt!\nNuk do të ngarkohen asnjë shtesë gjatë nisjes derisa skedari të hiqet.</string>
+    <string name="revert">Riktheje në gjendjen e mëparshme</string>
+    <string name="subscription_in_progress_notification">Duke përditësuar serialet që ndiqni</string>
+    <string name="subscription_list_name">I abonuar</string>
+    <string name="subscription_new">I abonuar në %s</string>
+    <string name="subscription_deleted">U çabonove nga %s</string>
+    <string name="subscription_episode_released">Episodi %d u publikua!</string>
+    <string name="action_subscribe">Abonohu</string>
+    <string name="action_unsubscribe">Çabonohu</string>
+    <string name="profile_number">Profili %d</string>
+    <string name="wifi">Wi-Fi</string>
+    <string name="mobile_data">Mobile data</string>
+    <string name="set_default">Vendose si parazgjedhje</string>
+    <string name="use">Përdor</string>
+    <string name="edit">Ndrysho</string>
+    <string name="source_priority">Prioriteti i burimit</string>
+    <string name="source_priority_help">Vendos si duhet të renditen burimet e videos në luajtës</string>
+    <string name="profiles">Profilet</string>
+    <string name="help">Ndihmë</string>
+    <string name="quality_profile_help">Këtu mund të ndryshoni si renditen burimet. Nëse një video ka prioritet më të lartë, do të shfaqet më lart në përzgjedhjen e burimeve. Shuma e prioritetit të burimit dhe prioritetit të cilësisë është prioriteti i videos.\n\nBurimi A: 3\nCilësia B: 7\nDo të ketë një prioritet të kombinuar video-je prej 10.\n\nSHËNIM: Nëse shuma është 10 ose më shumë, luajtësi do të kapërcejë automatikisht ngarkimin kur të hapet ai link!</string>
+    <string name="qualities">Cilësitë</string>
+    <string name="profile_background_des">Sfondi i profilit</string>
+    <string name="unable_to_inflate">UI nuk mundi të krijohej siç duhet, ky është një PROBLEM SERIOZ dhe duhet raportuar menjëherë %s</string>
+    <string name="already_voted">Ju keni votuar</string>
+    <string name="favorites_list_name">Të preferuarat</string>
+    <string name="favorite_added">%s u shtua te të preferuarat</string>
+    <string name="favorite_removed">%s u hoq nga të preferuarat</string>
+    <string name="action_add_to_favorites">Shto te të preferuarat</string>
+    <string name="action_remove_from_favorites">Hiqe nga të preferuarat</string>
+    <string name="duplicate_title">U gjet dublikatë e mundshme</string>
+    <string name="duplicate_add">Shto</string>
+    <string name="duplicate_replace">Zëvendëso</string>
+    <string name="duplicate_replace_all">Zëvendëso të gjitha</string>
+    <string name="duplicate_message_single" formatted="true">Duket se një artikull i mundshëm i dyfishuar tashmë ekziston në bibliotekën tuaj: ‘%s’.\n\nDëshironi ta shtoni gjithsesi, ta zëvendësoni atë ekzistuesin, apo ta anuloni veprimin?</string>
+    <string name="duplicate_message_multiple" formatted="true">Janë gjetur artikuj të mundshëm të dyfishtë në bibliotekën tuaj:\n\n%s\n\nDëshironi ta shtoni gjithsesi, të zëvendësoni ato ekzistuesit, apo të anuloni veprimin?</string>
+    <string name="enter_pin">Fut PIN-in</string>
+    <string name="enter_pin_with_name" formatted="true">Fut PIN-in për %s</string>
+    <string name="enter_current_pin">Fut PIN-in aktual</string>
+    <string name="lock_profile">Kyç profilin</string>
+    <string name="pin">PIN</string>
+    <string name="pin_error_incorrect">PIN-i i gabuar. Ju lutem provoni përsëri.</string>
+    <string name="pin_error_length">PIN-i duhet të ketë 4 karaktere</string>
+    <string name="select_an_account">Zgjidh një Llogari</string>
+    <string name="no_account">Asnjë llogari</string>
+    <string name="manage_accounts">Menaxho Llogaritë</string>
+    <string name="edit_account">Ndrysho llogarinë</string>
+    <string name="logged_account" formatted="true">I identifikuar si %s</string>
+    <string name="skip_startup_account_select_pref">Kapërce përzgjedhjen e llogarisë gjatë nisjes</string>
+    <string name="use_default_account">Përdor llogarinë e paracaktuar</string>
+    <string name="rotate_video">Rrotullo</string>
+    <string name="rotate_video_desc">Shfaq një buton për ndryshimin e orientimit të ekranit</string>
+    <string name="auto_rotate_video_desc">Aktivizo rrotullimin automatik të ekranit sipas orientimit të videos</string>
+    <string name="auto_rotate_video">Rrotullim automatik</string>
+    <string name="favorite">I preferuar</string>
+    <string name="unfavorite">Hiq nga të preferuarat</string>
+    <string name="biometric_authentication_title">Hap CloudStream-in</string>
+    <string name="biometric_setting">Kyç me biometrikë</string>
+    <string name="password_pin_authentication_title">Verifikim me fjalëkalim/PIN</string>
+    <string name="biometric_unsupported">Biometrikat nuk janë të disponueshme në këtë pajisje</string>
+    <string name="biometric_setting_summary">Hap aplikacionin me gjurmë gishti, Face ID, PIN, Pattern ose fjalëkalim.</string>
+    <string name="biometric_prompt_description">Pas disa përpjekjesh të dështuara, rifillo aplikacionin për ta provuar përsëri.</string>
+    <string name="biometric_warning">Të dhënat tuaja të CloudStream janë kopjuar tani. Edhe pse mundësia është shumë e ulët, disa pajisje mund të sillen ndryshe. Në raste të rralla, nëse bllokoheni nga hyrja në aplikacion, fshini plotësisht të dhënat e aplikacionit dhe rikthejini ato nga kopja rezervë. Na vjen shumë keq për çdo shqetësim që mund të shkaktohet nga kjo.</string>
+    <string name="reset_btn">Rivendos</string>
+    <string name="cs3wiki">CloudStream Wiki</string>
+    <string name="device_pin_url_message">Vizitoni <b>%s</b> në telefonin ose kompjuterin tuaj dhe futni kodin e mësipërm</string>
+    <string name="device_pin_error_message">Nuk u mor kodi PIN i pajisjes, provo verifikim lokal</string>
+    <string name="device_pin_expired_message">PIN-i ka skaduar!</string>
+    <string name="device_pin_counter_text">Kodi skadon pas %1$dm %2$ds</string>
+    <string name="sort_release_date_new">Data e publikimit (nga më e reja te më e vjetra)</string>
+    <string name="sort_release_date_old">Data e publikimit (nga më e vjetra te më e reja)</string>
+    <string name="hide_player_control_names">Fshih emrat e kontrolleve të luajtësit</string>
+    <string name="preview_seekbar">Shiriti i kërkimit</string>
+    <string name="preview_seekbar_desc">Aktivizo miniaturën e pamjes paraprake në shiritin kërkues</string>
+    <string name="no_subtitles_loaded">Nuk ka titra të ngarkuara ende</string>
+    <string name="backup_path_title">Vendndodhja e dosjes së kopjes rezervë</string>
+    <string name="custom">I personalizuar</string>
+    <string name="confirm_before_exiting_title">Konfirmo para daljes</string>
+    <string name="confirm_before_exiting_desc">Shfaq dialogun para daljes nga aplikacioni</string>
+    <string name="show">Shfaqe</string>
+    <string name="dont_show">Mos e shfaq</string>
+    <string name="subs_edge_size">Madhësia e konturit</string>
+    <string name="torrent_preferred_media">Aktivizo torrent-in në Cilësimet/Ofruesit/Media e preferuar</string>
+    <string name="torrent_not_accepted">Rifillo aplikacionin dhe prano dritaren “Stream Torrent” për të vazhduar.</string>
+    <string name="software_decoding">Dekodim me softuer</string>
+    <string name="software_decoding_desc">Dekodimi me softuer i lejon player-it të luajë video që nuk mbështeten nga pajisja juaj, por mund të shkaktojë vonesa ose paqëndrueshmëri në rezolucione të larta.</string>
+    <string name="volume_exceeded_100">Volumi është mbi 100%</string>
+    <string name="slide_up_again_to_exceed_100">Rrëshqit lart përsëri për të kaluar mbi 100%</string>
+    <string name="update_plugins">Përditëso shtesat</string>
+    <string name="update_plugins_manually">Përditëso shtesat manualisht</string>
+    <string name="starting_plugin_update_manually">Filloi procesi i përditësimit të shtesave!</string>
+    <string name="plugins_updated_manually">%d Shtes(at) u përditësuan me sukses!</string>
+    <string name="no_plugins_updated_manually">Nuk u përditësua asnjë shtesë.</string>
+    <string name="player_notification_channel_name">Njoftimet e luajtësit</string>
+    <string name="player_notification_channel_description">Njoftimi për kontrollin e luajtjes nga sfondi</string>
+    <string name="subtitles_from_embedded">I integruar</string>
+    <string name="subtitles_from_online">Online</string>
+    <string name="all_subtitles_bold">Bëji të gjitha titrat me shkronja të trasha</string>
+    <string name="all_subtitles_italic">Bëji të gjitha titrat me shkronja të pjerrëta</string>
+    <string name="background_radius">Rrezja e sfondit</string>
+    <string name="download_parallel_settings_des">Sa elementë të ndryshëm mund të shkarkohen njëkohësisht</string>
+    <string name="parallel_downloads">Shkarkimet paralele</string>
+    <string name="concurrent_connections">Lidhje paralele</string>
+    <string name="concurrent_connections_settings_des">Numri i lidhjeve paralele për çdo shkarkim</string>
+    <string name="go_to_downloads">Shko tek Shkarkimet</string>
+    <string name="no_internet_connection">Nuk ka lidhje interneti.\n\nJu lutemi lidhuni me internetin dhe provojeni përsëri, ose shikoni shkarkimet tuaja offline.</string>
+    <string name="overscan_settings_des">Ndryshon kufijtë e ekranit</string>
+    <string name="overscan_settings">Tejskenim</string>
+    <string name="poster_size_settings_des">Ndryshon madhësinë e posterave</string>
+    <string name="poster_size_settings">Madhësia e posterit</string>
+    <string name="speedup_title">Ndërrimi i shpejtësisë me shtypje të gjatë</string>
+    <string name="speedup_summary">Mbaj shtypur për shpejtësi 2x</string>
+    <string name="edit_profile_image_title">Ndrysho foton e profilit</string>
+    <string name="edit_profile_image_hint">Fut URL-n e fotos së profilit</string>
+    <string name="edit_profile_image_error_empty">Nuk u gjet asnjë URL</string>
+    <string name="edit_profile_image_error_invalid">URL ose imazh i pavlefshëm</string>
+    <string name="edit_profile_image_success">Imazhi u përditësua me sukses</string>
+    <string name="action_mark_watched_up_to_this_episode">Shëno si të parë deri në këtë episod</string>
+    <string name="action_remove_mark_watched_up_to_this_episode">Hiq të parët deri në këtë episod</string>
+    <string name="action_reload">U ringarkuan</string>
+    <string name="reload_provider">Ringarko ofruesin</string>
+    <string name="name">Emri</string>
+    <string name="source_name">Emri i burimit</string>
+    <string name="resolution_and_name">Rezolucioni dhe emri</string>
+    <string name="download_all">Shkarko të gjitha</string>
+    <string name="cancel_all">Anulo të gjitha</string>
+    <string name="download_episode_range">Dëshiron të shkarkosh episodin %s?</string>
+    <string name="cancel_queue_message">Dëshiron të anulosh të gjitha shkarkimet në radhë?</string>
+    <string name="subs_subtitle_alignment">Pozicionimi i titrave</string>
+    <string name="bottom_left">Poshtë majtas</string>
+    <string name="bottom_center">Poshtë në mes</string>
+    <string name="bottom_right">Poshtë djathtas</string>
+    <string name="middle_left">Në mes majtas</string>
+    <string name="middle_center">Në mes në qendër</string>
+    <string name="middle_right">Në mes djathtas</string>
+    <string name="top_left">Lart majtas</string>
+    <string name="top_center">Lart në mes</string>
+    <string name="top_right">Lart djathtas</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d shkarkim aktiv</item>
+        <item quantity="other">%d shkarkime aktive</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d shkarkim në radhë</item>
+        <item quantity="other">%d shkarkime në radhë</item>
+    </plurals>
+    <string name="player_is_live">Live</string>
 </resources>

From 3d1852ba04f0fd9a580ed9ee8d886d621f7e258b Mon Sep 17 00:00:00 2001
From: "recloudstream[bot]"
 <111277985+recloudstream[bot]@users.noreply.github.com>
Date: Mon, 11 May 2026 13:02:22 +0000
Subject: [PATCH 111/177] chore(locales): fix locale issues

---
 app/src/main/res/values-b+apc/strings.xml   | 2 +-
 app/src/main/res/values-b+as/strings.xml    | 2 +-
 app/src/main/res/values-b+bg/strings.xml    | 2 +-
 app/src/main/res/values-b+bn/strings.xml    | 2 +-
 app/src/main/res/values-b+cs/strings.xml    | 2 +-
 app/src/main/res/values-b+de/strings.xml    | 2 +-
 app/src/main/res/values-b+el/strings.xml    | 2 +-
 app/src/main/res/values-b+eo/strings.xml    | 2 +-
 app/src/main/res/values-b+es/strings.xml    | 2 +-
 app/src/main/res/values-b+fa/strings.xml    | 2 +-
 app/src/main/res/values-b+fr/strings.xml    | 4 ++--
 app/src/main/res/values-b+gl/strings.xml    | 2 +-
 app/src/main/res/values-b+hi/strings.xml    | 2 +-
 app/src/main/res/values-b+hr/strings.xml    | 2 +-
 app/src/main/res/values-b+hu/strings.xml    | 2 +-
 app/src/main/res/values-b+in/strings.xml    | 2 +-
 app/src/main/res/values-b+it/strings.xml    | 2 +-
 app/src/main/res/values-b+iw/strings.xml    | 6 +++---
 app/src/main/res/values-b+ja/strings.xml    | 2 +-
 app/src/main/res/values-b+ko/strings.xml    | 2 +-
 app/src/main/res/values-b+lv/strings.xml    | 2 +-
 app/src/main/res/values-b+mk/strings.xml    | 2 +-
 app/src/main/res/values-b+ms/strings.xml    | 2 +-
 app/src/main/res/values-b+mt/strings.xml    | 2 +-
 app/src/main/res/values-b+my/strings.xml    | 2 +-
 app/src/main/res/values-b+nl/strings.xml    | 2 +-
 app/src/main/res/values-b+no/strings.xml    | 6 +++---
 app/src/main/res/values-b+pl/strings.xml    | 6 +++---
 app/src/main/res/values-b+pt+BR/strings.xml | 2 +-
 app/src/main/res/values-b+qt/strings.xml    | 2 +-
 app/src/main/res/values-b+ro/strings.xml    | 2 +-
 app/src/main/res/values-b+ru/strings.xml    | 2 +-
 app/src/main/res/values-b+sk/strings.xml    | 2 +-
 app/src/main/res/values-b+sv/strings.xml    | 6 +++---
 app/src/main/res/values-b+ta/strings.xml    | 2 +-
 app/src/main/res/values-b+tl/strings.xml    | 2 +-
 app/src/main/res/values-b+tr/strings.xml    | 6 +++---
 app/src/main/res/values-b+uk/strings.xml    | 2 +-
 app/src/main/res/values-b+vi/strings.xml    | 2 +-
 app/src/main/res/values-b+zh+TW/strings.xml | 2 +-
 app/src/main/res/values-b+zh/strings.xml    | 2 +-
 41 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/app/src/main/res/values-b+apc/strings.xml b/app/src/main/res/values-b+apc/strings.xml
index 5d3d7c9be..10ba0a88c 100644
--- a/app/src/main/res/values-b+apc/strings.xml
+++ b/app/src/main/res/values-b+apc/strings.xml
@@ -543,7 +543,7 @@
     <string name="subtitles_filter_lang">فَلتِر حسب اللغة المفضلة</string>
     <string name="confirm_exit_dialog">أكيد بدكون تطلعو؟</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="action_remove_from_watched">شيلو من لايحة المحتوى الحاضرينو</string>
     <string name="skip_type_credits">الإعتمادات</string>
     <string name="quality_profile_help">فيكُن هون تغيرو طريقة ترتيب المصادر. المصدر يللي عنده أولوية أكتر بينحط أعلى بلايحت تنقايت المصدر. إنتو بتنقو الأولوية يإستعمال الأرقام. حطو الرقم الأعلى للمصادر والجودات يللي بتفضلوها. \n \nمتلًا: \nإزا المصدر \"أ\" بتفضلوه، بتعطوه كتير نقات (متلًا 8). \nإزا الجودة 480 ما بتحبوها، بتعطوها نقات قليلة (متلًا 1). \n \nعلامت المصدر وال جودة تبعه بينجمعو مع بعض (8 + 1 = 9). يللي علامته 10 أو أعلى، بينحط تلقائيًا، من دون ما ينعمل لود لكل المصادر!</string>
diff --git a/app/src/main/res/values-b+as/strings.xml b/app/src/main/res/values-b+as/strings.xml
index 60a9ffabd..b7efb3341 100644
--- a/app/src/main/res/values-b+as/strings.xml
+++ b/app/src/main/res/values-b+as/strings.xml
@@ -175,7 +175,7 @@
     <string name="vpn_torrent">এই প্ৰদানকাৰী এটা ট\'ৰেণ্ট, VPNৰ পৰামৰ্শ দিয়া হৈছে</string>
     <string name="subs_import_text" formatted="true">%s ত ফণ্টসমূহ ৰাখি সন্নিবিষ্ট কৰক</string>
     <string name="action_open_watching">অধিক তথ্য</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="provider_info_meta">সাইটে মেটাডাটা প্ৰদান কৰা নাই, যদি সাইটত নাথাকে তেন্তে ভিডিঅ\' মুকলি নহ\'ব পাৰে।</string>
     <string name="normal_no_plot">কোনো কাহিনী পোৱা নগ\'ল</string>
     <string name="torrent_no_plot">কোনো বিৱৰণ পোৱা নগ\'ল</string>
diff --git a/app/src/main/res/values-b+bg/strings.xml b/app/src/main/res/values-b+bg/strings.xml
index 4852270c6..4fb7757fd 100644
--- a/app/src/main/res/values-b+bg/strings.xml
+++ b/app/src/main/res/values-b+bg/strings.xml
@@ -101,7 +101,7 @@
     <string name="continue_watching">Продължете да гледате</string>
     <string name="action_remove_watching">Премахване</string>
     <string name="action_open_watching">Повече информация</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Може да е необходим VPN, за да работи правилно този доставчик</string>
     <string name="vpn_torrent">Този доставчик е торент, препоръчва се VPN</string>
     <string name="provider_info_meta">Метаданните не се предоставят от сайта, зареждането на видео ще бъде неуспешно, ако не съществува на сайта.</string>
diff --git a/app/src/main/res/values-b+bn/strings.xml b/app/src/main/res/values-b+bn/strings.xml
index c49019a0a..adc1b3f19 100644
--- a/app/src/main/res/values-b+bn/strings.xml
+++ b/app/src/main/res/values-b+bn/strings.xml
@@ -138,7 +138,7 @@
     <string name="updates_settings">অ্যাপ এর হালনাগাদ দেখান</string>
     <string name="swipe_to_seek_settings">খুঁজতে সোয়াইপ করুন</string>
     <string name="search_poster_img_des">পোস্টার</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="double_tap_to_seek_settings">আগাতে ডবল ট্যাপ করুন</string>
     <string name="eigengraumode_settings">প্লেব্যাক এর গতি</string>
     <string name="update_started">আপডেট শুরু হয়েছে</string>
diff --git a/app/src/main/res/values-b+cs/strings.xml b/app/src/main/res/values-b+cs/strings.xml
index 7dd18817e..983a03db7 100644
--- a/app/src/main/res/values-b+cs/strings.xml
+++ b/app/src/main/res/values-b+cs/strings.xml
@@ -99,7 +99,7 @@
     <string name="continue_watching">Pokračovat ve sledování</string>
     <string name="action_remove_watching">Odebrat</string>
     <string name="action_open_watching">Další informace</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Aby tento poskytovatel fungoval správně, budete možná potřebovat VPN</string>
     <string name="vpn_torrent">Tento poskytovatel je torrent, je doporučená VPN</string>
     <string name="provider_info_meta">Web neposkytnul žádná metadata, načítání videa selže, pokud na webu neexistuje.</string>
diff --git a/app/src/main/res/values-b+de/strings.xml b/app/src/main/res/values-b+de/strings.xml
index f50f2c10a..6ccb9bc69 100644
--- a/app/src/main/res/values-b+de/strings.xml
+++ b/app/src/main/res/values-b+de/strings.xml
@@ -111,7 +111,7 @@
     <string name="continue_watching">Weiterschauen</string>
     <string name="action_remove_watching">Entfernen</string>
     <string name="action_open_watching">Mehr Infos</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Damit dieser Anbieter korrekt funktioniert, ist möglicherweise ein VPN erforderlich</string>
     <string name="vpn_torrent">Dieser Anbieter bietet Torrents an, ein VPN wird deswegen dringend empfohlen</string>
     <string name="provider_info_meta">Metadaten werden nicht von der Website bereitgestellt, das Laden des Videos schlägt fehl, wenn sie nicht auf der Website vorhanden sind.</string>
diff --git a/app/src/main/res/values-b+el/strings.xml b/app/src/main/res/values-b+el/strings.xml
index 4fdcbaf11..a38ee2682 100644
--- a/app/src/main/res/values-b+el/strings.xml
+++ b/app/src/main/res/values-b+el/strings.xml
@@ -365,7 +365,7 @@
     <string name="sort_close">Κλείσιμο</string>
     <string name="sort_clear">Εκκαθάριση</string>
     <string name="subs_subtitle_languages">Γλώσσα υποτίτλων</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="provider_info_meta">Δεν έχουν παρασχεθεί μεταδεδομένα από τον ιστότοπο, η φόρτωση του βίντεο θα αποτύχει αν δεν υπάρχει στον ιστότοπο.</string>
     <string name="double_tap_to_pause_settings">Διπλό πάτημα για παύση</string>
     <string name="double_tap_to_seek_amount_settings">Μέγεθος αναζήτησης στο πρόγραμμα αναπαραγωγής (σε δευτερόλεπτα)</string>
diff --git a/app/src/main/res/values-b+eo/strings.xml b/app/src/main/res/values-b+eo/strings.xml
index b490a2aed..5dea7b24d 100644
--- a/app/src/main/res/values-b+eo/strings.xml
+++ b/app/src/main/res/values-b+eo/strings.xml
@@ -158,7 +158,7 @@
     <string name="search_provider_text_types">Serĉi uzante tipojn</string>
     <string name="subs_subtitle_languages">Subteksta Lingvo</string>
     <string name="action_open_watching">Pli da informoj</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="torrent_plot">Priskribo</string>
     <string name="torrent_no_plot">Neniu Priskribo Trovita</string>
     <string name="player_size_settings_des">Forigi nigrajn borderaĵojn</string>
diff --git a/app/src/main/res/values-b+es/strings.xml b/app/src/main/res/values-b+es/strings.xml
index 7198808b6..167de546d 100644
--- a/app/src/main/res/values-b+es/strings.xml
+++ b/app/src/main/res/values-b+es/strings.xml
@@ -183,7 +183,7 @@
     <string name="continue_watching">Continuar Viendo</string>
     <string name="action_remove_watching">Eliminar</string>
     <string name="action_open_watching">Más info</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Tal vez se requiera una VPN para que este proveedor funcione correctamente</string>
     <string name="vpn_torrent">Este proveedor es un torrent, se recomienda una VPN</string>
     <string name="provider_info_meta">El sitio no proporciona los metadatos, la carga del video fallará si no existe en el sitio.</string>
diff --git a/app/src/main/res/values-b+fa/strings.xml b/app/src/main/res/values-b+fa/strings.xml
index c74c805dd..1018e9a82 100644
--- a/app/src/main/res/values-b+fa/strings.xml
+++ b/app/src/main/res/values-b+fa/strings.xml
@@ -214,7 +214,7 @@
     <string name="status_completed">تمام‌شده</string>
     <string name="no_subtitles">بدون زیرنویس</string>
     <string name="test_passed">متوقف‌شده</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="open_local_video">باز کردن ویدیو محلی</string>
     <string name="provider_info_meta">متاداده توسط سایت ارائه نشده، اگه در سایت وجود نداشته باشد بارگیری به مشکل می‌خورد .</string>
     <string name="type_on_hold">در انتظار</string>
diff --git a/app/src/main/res/values-b+fr/strings.xml b/app/src/main/res/values-b+fr/strings.xml
index 0fae7dfd1..bf401b20a 100644
--- a/app/src/main/res/values-b+fr/strings.xml
+++ b/app/src/main/res/values-b+fr/strings.xml
@@ -233,7 +233,7 @@
     <string name="continue_watching">Continuer à regarder</string>
     <string name="action_remove_watching">Retirer</string>
     <string name="action_open_watching">Plus d\'informations</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Un VPN peut être nécessaire pour que ce fournisseur fonctionne correctement</string>
     <string name="vpn_torrent">Ce fournisseur est un torrent, un VPN est recommandé</string>
     <string name="provider_info_meta">Les métadonnées ne sont pas fournies par le site, le chargement de la vidéo échouera si elles n\'existent pas sur le site.</string>
@@ -372,7 +372,7 @@
     <string name="quality_4k">4K</string>
     <string name="quality_webrip">Web</string>
     <string name="go_back_30">-30</string>
-    <string name="anime_singular">\@string/anime</string>
+    <string name="anime_singular">@string/anime</string>
     <string name="ova_singular">OAV</string>
     <string name="nsfw_singular">NSFW</string>
     <string name="login_format" formatted="true">%1$s %2$s</string>
diff --git a/app/src/main/res/values-b+gl/strings.xml b/app/src/main/res/values-b+gl/strings.xml
index 4870538a0..e3775b091 100644
--- a/app/src/main/res/values-b+gl/strings.xml
+++ b/app/src/main/res/values-b+gl/strings.xml
@@ -88,7 +88,7 @@
     <string name="subs_import_text" formatted="true">Importar fontes colocandoas en %s</string>
     <string name="action_remove_watching">Borrar</string>
     <string name="action_open_watching">Máis Info</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Unha VPN pode ser necesaria para o correcto funcionamento deste provedor</string>
     <string name="vpn_torrent">Este proveedor é un torrent, recomendase o uso dunha VPN</string>
     <string name="provider_info_meta">Os metadatos non son proporcionados polo sitio, a carga do video fallará se non existe no sitio</string>
diff --git a/app/src/main/res/values-b+hi/strings.xml b/app/src/main/res/values-b+hi/strings.xml
index f15051e74..4e013ab36 100644
--- a/app/src/main/res/values-b+hi/strings.xml
+++ b/app/src/main/res/values-b+hi/strings.xml
@@ -304,7 +304,7 @@
     <string name="custom_media_singular">मीडिया</string>
     <string name="pref_filter_search_quality">खोज परिणामों में चयनित वीडियो गुणवत्ता छुपाएं</string>
     <string name="episodes_range">%1$d-%2$d</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="double_tap_to_seek_amount_settings">प्लेयर में आगे पीछे जाने का समय (सेकंड्स)</string>
     <string name="automatic_plugin_download_summary">जोड़े गए रिपॉजिटरीज से अभी तक इंस्टॉल नहीं किए गए सभी प्लगइन्स को स्वचालित रूप से इंस्टॉल करें।</string>
     <string name="speech_recognition_unavailable">वाक् पहचान उपलब्ध नहीं है</string>
diff --git a/app/src/main/res/values-b+hr/strings.xml b/app/src/main/res/values-b+hr/strings.xml
index c5c95be82..7927a15c4 100644
--- a/app/src/main/res/values-b+hr/strings.xml
+++ b/app/src/main/res/values-b+hr/strings.xml
@@ -105,7 +105,7 @@
     <string name="continue_watching">Nastavi gledati</string>
     <string name="action_remove_watching">Ukloni</string>
     <string name="action_open_watching">Više informacija</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Za ispravan rad ovog pružatelja usluga je možda potreban VPN</string>
     <string name="vpn_torrent">Ovaj pružatelj usluga je torrent, preporučuje se VPN</string>
     <string name="provider_info_meta">Stranica ne sadrži metapodatke. Učitavanje videa neće uspjeti ako ne postoje na stranici.</string>
diff --git a/app/src/main/res/values-b+hu/strings.xml b/app/src/main/res/values-b+hu/strings.xml
index f35067fbb..b753eadb2 100644
--- a/app/src/main/res/values-b+hu/strings.xml
+++ b/app/src/main/res/values-b+hu/strings.xml
@@ -108,7 +108,7 @@
     <string name="subs_import_text" formatted="true">Betűtípusok importálása %s</string>
     <string name="action_remove_watching">Eltávolítás</string>
     <string name="action_open_watching">Több információ</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">VPN szükséges lehet ehhez a szolgáltató megfelelő működéséhez</string>
     <string name="vpn_torrent">Ez a szolgáltató torrent, VPN ajánlott</string>
     <string name="torrent_plot">Leírás</string>
diff --git a/app/src/main/res/values-b+in/strings.xml b/app/src/main/res/values-b+in/strings.xml
index bfb9691bf..7d6475f31 100644
--- a/app/src/main/res/values-b+in/strings.xml
+++ b/app/src/main/res/values-b+in/strings.xml
@@ -97,7 +97,7 @@
     <string name="continue_watching">Lanjutkan Menonton</string>
     <string name="action_remove_watching">Hapus</string>
     <string name="action_open_watching">Lebih banyak info</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">VPN mungkin diperlukan agar penyedia ini bisa bekerja dengan baik</string>
     <string name="vpn_torrent">Penyedia ini adalah torrent, VPN direkomendasikan</string>
     <string name="provider_info_meta">Metadata tidak disediakan oleh situs, pemuatan video akan gagal jika tidak ada di situs.</string>
diff --git a/app/src/main/res/values-b+it/strings.xml b/app/src/main/res/values-b+it/strings.xml
index 3a988b476..c47a84842 100644
--- a/app/src/main/res/values-b+it/strings.xml
+++ b/app/src/main/res/values-b+it/strings.xml
@@ -104,7 +104,7 @@
     <string name="continue_watching">Continua a guardare</string>
     <string name="action_remove_watching">Rimuovi</string>
     <string name="action_open_watching">Più info</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Potrebbe essere necessaria una VPN per far funzionare correttamente questo provider</string>
     <string name="vpn_torrent">Questo provider è un torrent, si raccomanda una VPN</string>
     <string name="provider_info_meta">I metadati non sono forniti dal sito, il caricamento del video fallirà se non esiste sul sito.</string>
diff --git a/app/src/main/res/values-b+iw/strings.xml b/app/src/main/res/values-b+iw/strings.xml
index ebe258291..3b2d0153a 100644
--- a/app/src/main/res/values-b+iw/strings.xml
+++ b/app/src/main/res/values-b+iw/strings.xml
@@ -112,7 +112,7 @@
     <string name="chromecast_subtitles_settings">כתוביות כרומקאסט</string>
     <string name="picture_in_picture_des">ממשיך ניגון בנגן מינימלי מעל ישומים אחרים</string>
     <string name="player_subtitles_settings">כתוביות</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="history">היסטוריה</string>
     <string name="apk_installer_legacy">מורשת</string>
     <string name="no">לא</string>
@@ -157,8 +157,8 @@
     <string name="used_storage">משומש</string>
     <string name="tv_series">סדרת טלוויזיה</string>
     <string name="cartoons">סדרות/סרטים מצוירים</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">@string/anime</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="asian_drama_singular">דרמה אסייתית</string>
     <string name="episode_action_chromecast_episode">כרומקאסט את הפרק</string>
     <string name="episode_action_chromecast_mirror">כרומקאסט את המראה</string>
diff --git a/app/src/main/res/values-b+ja/strings.xml b/app/src/main/res/values-b+ja/strings.xml
index 66e72df2c..3de9a971a 100644
--- a/app/src/main/res/values-b+ja/strings.xml
+++ b/app/src/main/res/values-b+ja/strings.xml
@@ -449,7 +449,7 @@
     <string name="extras">エクストラ</string>
     <string name="skip_type_op">オープニング</string>
     <string name="subscription_new">%s を購読しました</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="subs_import_text" formatted="true">フォントを %s に配置してインポート</string>
     <string name="show_fillers_settings">アニメのフィラーエピソードを表示</string>
     <string name="automatic_plugin_updates">自動プラグインアップデート</string>
diff --git a/app/src/main/res/values-b+ko/strings.xml b/app/src/main/res/values-b+ko/strings.xml
index 2c3223c73..14d327372 100644
--- a/app/src/main/res/values-b+ko/strings.xml
+++ b/app/src/main/res/values-b+ko/strings.xml
@@ -473,7 +473,7 @@
     <string name="benene_count_text">개발자에게 %d 바나나 줌</string>
     <string name="benene_count_text_none">바나나를 주지 않음</string>
     <string name="action_open_watching">상세 정보</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="normal_no_plot">플롯을 찾을 수 없음</string>
     <string name="torrent_no_plot">설명을 찾을 수 없음</string>
     <string name="show_log_cat">로그캣 🐈 보기</string>
diff --git a/app/src/main/res/values-b+lv/strings.xml b/app/src/main/res/values-b+lv/strings.xml
index c7e64c157..9ab29cd43 100644
--- a/app/src/main/res/values-b+lv/strings.xml
+++ b/app/src/main/res/values-b+lv/strings.xml
@@ -104,7 +104,7 @@
     <string name="continue_watching">Turpini skatīties</string>
     <string name="action_remove_watching">Noņemt</string>
     <string name="action_open_watching">Vairāk informācijas</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">VPNs varētu būt vajadzīgs lai šis devējs strādātu pareizi</string>
     <string name="vpn_torrent">Šis devējs ir Torrents vpn ir rekomendēts</string>
     <string name="provider_info_meta">Dati nav doti no saites, video lādēšanas neizdosies ja neiksestē saitē.</string>
diff --git a/app/src/main/res/values-b+mk/strings.xml b/app/src/main/res/values-b+mk/strings.xml
index 1ed2bd1f0..ea467833e 100644
--- a/app/src/main/res/values-b+mk/strings.xml
+++ b/app/src/main/res/values-b+mk/strings.xml
@@ -339,7 +339,7 @@
     <string name="enable_nsfw_on_providers">Овозможи NSFW на поддржаните екстензии</string>
     <string name="jsdelivr_enabled">Не успеа да стигне до GitHub. Вклучувам jsDelivr прокси…</string>
     <string name="subtitles_filter_lang">Филтрирај по претпочитан медиумски јазик</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="movies_singular">Филм</string>
     <string name="added_sync_format" formatted="true">Додаден %s</string>
     <string name="plugin">приклучоци</string>
diff --git a/app/src/main/res/values-b+ms/strings.xml b/app/src/main/res/values-b+ms/strings.xml
index 59c4fbb42..ab0d0a54f 100644
--- a/app/src/main/res/values-b+ms/strings.xml
+++ b/app/src/main/res/values-b+ms/strings.xml
@@ -491,7 +491,7 @@
     <string name="speech_recognition_unavailable">Pengecaman pertuturan tidak tersedia</string>
     <string name="begin_speaking">Mula Bercakap…</string>
     <string name="torrent_info">Video ini adalah torrent, ini bermakna aktiviti video anda dapat dikesan.\nPastikan anda memahami torrenting sebelum meneruskan.</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="double_tap_to_seek_amount_settings">Pemain Mencari Amaun (Seconds)</string>
     <string name="automatic_plugin_download_summary">Secara automatik memasang semua plugin yang belum dipasang dari repositori yang ditambah.</string>
     <string name="updates_settings">Tunjukkan kemas kini aplikasi</string>
diff --git a/app/src/main/res/values-b+mt/strings.xml b/app/src/main/res/values-b+mt/strings.xml
index 4e247cc4f..8f8bf6cd7 100644
--- a/app/src/main/res/values-b+mt/strings.xml
+++ b/app/src/main/res/values-b+mt/strings.xml
@@ -91,7 +91,7 @@
     <string name="continue_watching">Kompli Ara</string>
     <string name="action_remove_watching">Neħħi</string>
     <string name="action_open_watching">Iktar informazzjoni</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Jista\' jkun hemm bżonn ta\' VPN biex dan il-fornitur jaħdem b\'mod korrett</string>
     <string name="provider_info_meta">Il-metadata mhix ipprovduta mis-sit, it-tagħbija tal-vidjo se tfalli jekk ma teżistix fuq is-sit.</string>
     <string name="torrent_plot">Deskrizzjoni</string>
diff --git a/app/src/main/res/values-b+my/strings.xml b/app/src/main/res/values-b+my/strings.xml
index 9f7535dbd..d360d095d 100644
--- a/app/src/main/res/values-b+my/strings.xml
+++ b/app/src/main/res/values-b+my/strings.xml
@@ -56,7 +56,7 @@
     <string name="continue_watching">ဆက်လက်ကြည့်ရှုမည်</string>
     <string name="action_remove_watching">ဖယ်ရှားရန်</string>
     <string name="action_open_watching">ပိုမို၍</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_torrent">ဒီဟာကတောရပ်တစ်ခုပါ ဗီပီအန်တစ်ခုသုံးဖို့အကြံပြုပါတယ်</string>
     <string name="torrent_plot">ဖော်ပြချက်</string>
     <string name="normal_no_plot">ဇာတ်လမ်းသွား မတွေ့ပါ</string>
diff --git a/app/src/main/res/values-b+nl/strings.xml b/app/src/main/res/values-b+nl/strings.xml
index 7500034a5..ace3aa0d4 100644
--- a/app/src/main/res/values-b+nl/strings.xml
+++ b/app/src/main/res/values-b+nl/strings.xml
@@ -105,7 +105,7 @@
     <string name="continue_watching">Doorgaan met kijken</string>
     <string name="action_remove_watching">Verwijder</string>
     <string name="action_open_watching">Meer Info</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Een VPN kan nodig zijn om deze provider correct te laten werken</string>
     <string name="vpn_torrent">Deze provider is een torrent, een VPN wordt aanbevolen</string>
     <string name="provider_info_meta">Metadata wordt niet geleverd door de site, het laden van video\'s zal mislukken als deze niet op de site bestaat.</string>
diff --git a/app/src/main/res/values-b+no/strings.xml b/app/src/main/res/values-b+no/strings.xml
index 1511d8670..7d309a2f8 100644
--- a/app/src/main/res/values-b+no/strings.xml
+++ b/app/src/main/res/values-b+no/strings.xml
@@ -390,7 +390,7 @@
     <string name="poster_ui_settings">Slå av/på grensesnittselementer på plakat</string>
     <string name="skip_update">Hopp over denne oppdateringen</string>
     <string name="video_ram_description">Kan forårsake krasj hvis satt for høyt på enheter med lite minne, for eksempel en Android TV.</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="backup_settings">Sikkerhetskopier data</string>
     <string name="backup_success">Data lagret</string>
     <string name="authenticated_user_fail" formatted="true">Kunne ikke logge inn på %s</string>
@@ -399,11 +399,11 @@
     <string name="nsfw">Sensurerbart</string>
     <string name="quality_webrip">Vev</string>
     <string name="network_adress_example">Lenke til strøm</string>
-    <string name="anime_singular">\@string/anime</string>
+    <string name="anime_singular">@string/anime</string>
     <string name="pref_filter_search_quality">Skjul valgt videokvalitet i søkeresultater</string>
     <string name="restore_success">Lastet inn sikkerhetkopifil</string>
     <string name="category_updates">Oppdateringer og sikkerhetskopier</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="confirm_exit_dialog">Avslutt?</string>
     <string name="nsfw_singular">Sensurerbart</string>
     <string name="batch_download_nothing_to_download_format" formatted="true">Alle %s er allerede nedlastet</string>
diff --git a/app/src/main/res/values-b+pl/strings.xml b/app/src/main/res/values-b+pl/strings.xml
index f50677ae8..35367a1b2 100644
--- a/app/src/main/res/values-b+pl/strings.xml
+++ b/app/src/main/res/values-b+pl/strings.xml
@@ -433,7 +433,7 @@
     <string name="apk_installer_settings">Instalator APK</string>
     <string name="apk_installer_settings_des">Niektóre urządzenia nie obsługują nowego instalatora pakietów. Wypróbuj tryb legacy, jeśli aktualizacje nie zostaną zainstalowane.</string>
     <string name="example_password">hasło123</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="example_site_name">NowaNazwaWitryny</string>
     <string name="example_username">Nazwa użytkownika</string>
     <string name="example_ip">127.0.0.1</string>
@@ -441,9 +441,9 @@
     <string name="example_site_url">https://example.com</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="apk_installer_package_installer">Instalator pakietów</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="example_email">witaj@poczta.pl</string>
-    <string name="anime_singular">\@string/anime</string>
+    <string name="anime_singular">@string/anime</string>
     <string name="skip_type_op">Opening</string>
     <string name="skip_type_ed">Ending</string>
     <string name="skip_type_mixed_op">Mixed opening</string>
diff --git a/app/src/main/res/values-b+pt+BR/strings.xml b/app/src/main/res/values-b+pt+BR/strings.xml
index 3afaf15f4..00e3a6229 100644
--- a/app/src/main/res/values-b+pt+BR/strings.xml
+++ b/app/src/main/res/values-b+pt+BR/strings.xml
@@ -104,7 +104,7 @@
     <string name="continue_watching">Continuar assistindo</string>
     <string name="action_remove_watching">Remover</string>
     <string name="action_open_watching">Mais detalhes</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Uma VPN pode ser necessária para esse fornecedor funcionar corretamente</string>
     <string name="vpn_torrent">Esse fornecedor é um torrent, uma VPN é recomendada</string>
     <string name="provider_info_meta">Metadados não são oferecidas pelo site, o carregamento do video pode falhar se ele não existir no site.</string>
diff --git a/app/src/main/res/values-b+qt/strings.xml b/app/src/main/res/values-b+qt/strings.xml
index 68f728e61..6bbb0ddba 100644
--- a/app/src/main/res/values-b+qt/strings.xml
+++ b/app/src/main/res/values-b+qt/strings.xml
@@ -235,7 +235,7 @@
     <string name="nsfw">AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOOOGGAGHAGHAAA</string>
     <string name="clear_history">aoaaaaaoooghhh</string>
     <string name="sort_save">oooooh uuaagh</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="chromecast_subtitles_settings">oouuhhh ahhooo-ahah</string>
     <string name="restore_success">uuuugg aaaahh oogg</string>
     <string name="device_pin_counter_text">aagg uuuuggg og %1$dm %2$ds</string>
diff --git a/app/src/main/res/values-b+ro/strings.xml b/app/src/main/res/values-b+ro/strings.xml
index 6becf1559..b1852640c 100644
--- a/app/src/main/res/values-b+ro/strings.xml
+++ b/app/src/main/res/values-b+ro/strings.xml
@@ -102,7 +102,7 @@
     <string name="continue_watching">Continuați să urmăriți</string>
     <string name="action_remove_watching">Eliminați</string>
     <string name="action_open_watching">Mai multe informații</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Există probabilitatea necesitații unui VPN pentru ca acest furnizor să funcționeze corespunzător</string>
     <string name="vpn_torrent">Acest furnizor este un torrent, se recomandă un VPN</string>
     <string name="provider_info_meta">Metadatele nu sunt furnizate de către site, există posibilitatea ca încărcarea videoclipului să eșueze.</string>
diff --git a/app/src/main/res/values-b+ru/strings.xml b/app/src/main/res/values-b+ru/strings.xml
index ef08b36a4..3f6a5d89d 100644
--- a/app/src/main/res/values-b+ru/strings.xml
+++ b/app/src/main/res/values-b+ru/strings.xml
@@ -348,7 +348,7 @@
     <string name="extensions">Дополнения</string>
     <string name="repository_url_hint">URL или код репозитория</string>
     <string name="plugin_loaded">Дополнение загружено</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="double_tap_to_seek_settings">Перемотка двойным нажатием</string>
     <string name="sync_total_episodes_none">/??</string>
     <string name="sync_total_episodes_some" formatted="true">/%d</string>
diff --git a/app/src/main/res/values-b+sk/strings.xml b/app/src/main/res/values-b+sk/strings.xml
index 68a2e2a7e..f48b27143 100644
--- a/app/src/main/res/values-b+sk/strings.xml
+++ b/app/src/main/res/values-b+sk/strings.xml
@@ -95,7 +95,7 @@
     <string name="vpn_torrent">Tento poskytovateľ je torrent, odporúča sa VPN</string>
     <string name="subs_import_text" formatted="true">Importovať písma ich umiestnením do %s</string>
     <string name="action_open_watching">Viac informácií</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="continue_watching">Pokračovať v sledovaní</string>
     <string name="vpn_might_be_needed">Na správne fungovanie tohto poskytovateľa môže byť potrebná VPN</string>
     <string name="provider_info_meta">Stránka neposkytla žiadne metadáta, načítanie videa zlyhá, ak na stránke neexistuje.</string>
diff --git a/app/src/main/res/values-b+sv/strings.xml b/app/src/main/res/values-b+sv/strings.xml
index 2d7ed3716..52d4e1d05 100644
--- a/app/src/main/res/values-b+sv/strings.xml
+++ b/app/src/main/res/values-b+sv/strings.xml
@@ -31,7 +31,7 @@
     <string name="pick_subtitle">Undertexter</string>
     <string name="reload_error">Försök ansluta igen…</string>
     <string name="go_back">Gå tillbaka</string>
-    <string name="episode_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="episode_poster_img_des">@string/result_poster_img_des</string>
     <string name="play_episode">Spela avsnitt</string>
     <string name="download">Ladda ner</string>
     <string name="download_storage_text">Intern lagring</string>
@@ -41,7 +41,7 @@
     <string name="popup_play_file">Spela upp fil</string>
     <string name="home_more_info">Mer information</string>
     <string name="home_expanded_hide">Göm</string>
-    <string name="home_main_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="home_main_poster_img_des">@string/result_poster_img_des</string>
     <string name="home_play">Spela upp</string>
     <string name="home_info">Info</string>
     <string name="home_next_random_img_des">Nästa slumpvis</string>
@@ -223,7 +223,7 @@
     <string name="next_episode_format" formatted="true">Episod %d kommer att släppas om</string>
     <string name="duration_format" formatted="true">%d min</string>
     <string name="show_trailers_settings">Visa trailers</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="ova">OVA</string>
     <string name="episodes_range">%1$d-%2$d</string>
     <string name="episode_format" formatted="true">%1$d %2$s</string>
diff --git a/app/src/main/res/values-b+ta/strings.xml b/app/src/main/res/values-b+ta/strings.xml
index 3bf464623..4cde39d8f 100644
--- a/app/src/main/res/values-b+ta/strings.xml
+++ b/app/src/main/res/values-b+ta/strings.xml
@@ -182,7 +182,7 @@
     <string name="no">இல்லை</string>
     <string name="discord">முரண்பாட்டில் சேரவும்</string>
     <string name="asian_drama">ஆசிய நாடகங்கள்</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="rating">செயல்வரம்பு</string>
     <string name="search">தேடல்</string>
     <string name="show_trailers_settings">டிரெய்லர்களைக் காட்டு</string>
diff --git a/app/src/main/res/values-b+tl/strings.xml b/app/src/main/res/values-b+tl/strings.xml
index 5a34b8994..4ed229ca7 100644
--- a/app/src/main/res/values-b+tl/strings.xml
+++ b/app/src/main/res/values-b+tl/strings.xml
@@ -5,7 +5,7 @@
     <string name="app_dub_sub_episode_text_format">%1$s Ep %2$d</string>
     <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
     <string name="result_poster_img_des">Poster</string>
-    <string name="search_poster_img_des">\@string/result_poster_img_des</string>
+    <string name="search_poster_img_des">@string/result_poster_img_des</string>
     <string name="episode_poster_img_des">Episode Poster</string>
     <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_next_random_img_des">Next Random</string>
diff --git a/app/src/main/res/values-b+tr/strings.xml b/app/src/main/res/values-b+tr/strings.xml
index 893325b7a..d711505a8 100644
--- a/app/src/main/res/values-b+tr/strings.xml
+++ b/app/src/main/res/values-b+tr/strings.xml
@@ -105,7 +105,7 @@
     <string name="continue_watching">İzlemeye Devam Et</string>
     <string name="action_remove_watching">Kaldır</string>
     <string name="action_open_watching">Daha Fazla Bilgi</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Bu sağlayıcının düzgün çalışması için bir VPN gerekebilir</string>
     <string name="vpn_torrent">Bu sağlayıcı torrent kullanıyor, bir VPN önerilir</string>
     <string name="provider_info_meta">Metadata site tarafından sağlanmamış, veri site\'de bulunmuyorsa video yüklenmesi başarısız olacak.</string>
@@ -218,8 +218,8 @@
     <string name="movies_singular">Film</string>
     <string name="tv_series_singular">Dizi</string>
     <string name="cartoons_singular">Çizgi film</string>
-    <string name="anime_singular">\@string/anime</string>
-    <string name="ova_singular">\@string/ova</string>
+    <string name="anime_singular">@string/anime</string>
+    <string name="ova_singular">@string/ova</string>
     <string name="torrent_singular">Torrent</string>
     <string name="documentaries_singular">Belgesel</string>
     <string name="asian_drama_singular">Asya dizisi</string>
diff --git a/app/src/main/res/values-b+uk/strings.xml b/app/src/main/res/values-b+uk/strings.xml
index dc8f36682..ba46736ac 100644
--- a/app/src/main/res/values-b+uk/strings.xml
+++ b/app/src/main/res/values-b+uk/strings.xml
@@ -120,7 +120,7 @@
     <string name="swipe_to_seek_settings_des">Проведіть збоку в бік, щоби керувати часом відтворення у відео</string>
     <string name="benene_count_text">Дано %d бананів розробникам</string>
     <string name="player_size_settings">Кнопка зміни розміру програвача</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Для коректної роботи цього постачальника може знадобитися VPN</string>
     <string name="provider_info_meta">Метадані не надаються сайтом, завантаження відео не відбудеться, якщо їх немає на сайті.</string>
     <string name="picture_in_picture">Картинка в картинці</string>
diff --git a/app/src/main/res/values-b+vi/strings.xml b/app/src/main/res/values-b+vi/strings.xml
index e1e9a7a8c..842b97080 100644
--- a/app/src/main/res/values-b+vi/strings.xml
+++ b/app/src/main/res/values-b+vi/strings.xml
@@ -106,7 +106,7 @@
     <string name="continue_watching">Tiếp tục xem</string>
     <string name="action_remove_watching">Xóa</string>
     <string name="action_open_watching">Thông tin thêm</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">Có thể cần dùng VPN để nguồn này hoạt động đúng</string>
     <string name="vpn_torrent">Nguồn này là một torrent, khuyến nghị dùng VPN</string>
     <string name="torrent_plot">Thông tin phim</string>
diff --git a/app/src/main/res/values-b+zh+TW/strings.xml b/app/src/main/res/values-b+zh+TW/strings.xml
index 759856bdb..cfd8adf05 100644
--- a/app/src/main/res/values-b+zh+TW/strings.xml
+++ b/app/src/main/res/values-b+zh+TW/strings.xml
@@ -105,7 +105,7 @@
     <string name="continue_watching">繼續觀看</string>
     <string name="action_remove_watching">移除</string>
     <string name="action_open_watching">更多資訊</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">此片源可能需要 VPN 才能正常使用</string>
     <string name="vpn_torrent">此片源是種子，建議使用 VPN</string>
     <string name="provider_info_meta">站點不提供元數據，如果站點上不存在元數據，影片載入將失敗。</string>
diff --git a/app/src/main/res/values-b+zh/strings.xml b/app/src/main/res/values-b+zh/strings.xml
index 24256e964..56ec8f43e 100644
--- a/app/src/main/res/values-b+zh/strings.xml
+++ b/app/src/main/res/values-b+zh/strings.xml
@@ -105,7 +105,7 @@
     <string name="continue_watching">继续观看</string>
     <string name="action_remove_watching">移除</string>
     <string name="action_open_watching">更多信息</string>
-    <string name="action_open_play">\@string/home_play</string>
+    <string name="action_open_play">@string/home_play</string>
     <string name="vpn_might_be_needed">此片源可能需要 VPN 才能正常使用</string>
     <string name="vpn_torrent">此片源为种子文件，建议使用 VPN</string>
     <string name="provider_info_meta">站点不提供元数据，如果站点上不存在元数据，视频加载将失败。</string>

From 6eb833130d0964dff5e469aef99f4fe469da8420 Mon Sep 17 00:00:00 2001
From: fire-light43 <282604282+fire-light43@users.noreply.github.com>
Date: Mon, 11 May 2026 15:59:00 +0000
Subject: [PATCH 112/177] Fix rare bug in the download queue

---
 .../cloudstream3/services/DownloadQueueService.kt     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/services/DownloadQueueService.kt b/app/src/main/java/com/lagradost/cloudstream3/services/DownloadQueueService.kt
index 028356e76..e07747a86 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/services/DownloadQueueService.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/services/DownloadQueueService.kt
@@ -36,6 +36,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.flow.updateAndGet
@@ -186,6 +187,16 @@ class DownloadQueueService : Service() {
             debugAssert({ timeTaken == null }, { "Downloader startup should not time out" })
 
             totalDownloadFlow
+                .debounce { (instances, queue) ->
+                    // Filter away incorrect transient queue states.
+                    // For example when we pop the queue and add a download instance there exists a transient state where
+                    // there is no queue and no download instances (leading to an early exit)
+                    if (instances.isEmpty() && queue.isEmpty()) {
+                        500.milliseconds
+                    } else {
+                        0.milliseconds
+                    }
+                }
                 .takeWhile { (instances, queue) ->
                     // Stop if destroyed
                     isRunning

From 7425d283cdf6f85ec279f65f57545ed35be44c48 Mon Sep 17 00:00:00 2001
From: Asheesh Sahu <100184494+asheeshsahu7300@users.noreply.github.com>
Date: Tue, 12 May 2026 21:00:17 +0530
Subject: [PATCH 113/177] fix: external player visibility on Android 11+
 (#2785)

---
 app/src/main/AndroidManifest.xml | 41 ++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b2c7091b0..ee4c978f2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,6 +22,47 @@
         android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission" />
 
+    <queries>
+        <!-- 
+            QUERY_ALL_PACKAGES does not work on some devices running Android 11+ (like Google TV 14), 
+            so we must explicitly specify the packages and intent patterns we query to ensure visibility.
+        -->
+        <!-- For external video players -->
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:mimeType="video/*" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:mimeType="application/x-mpegURL" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:mimeType="application/vnd.apple.mpegurl" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="magnet" />
+        </intent>
+
+        <!-- Common players supported in actions/temp -->
+        <package android:name="org.videolan.vlc" />
+        <package android:name="org.videolan.vlc.debug" />
+        <package android:name="is.xyz.mpv" />
+        <package android:name="is.xyz.mpv.ytdl" />
+        <package android:name="app.marlboroadvance.mpvex" />
+        <package android:name="live.mehiz.mpvkt" />
+        <package android:name="live.mehiz.mpvkt.preview" />
+        <package android:name="com.brouken.player" />
+        <package android:name="dev.anilbeesetti.nextplayer" />
+        <package android:name="com.instantbits.cast.webvideo" />
+        <package android:name="com.gianlu.aria2android" />
+        
+        <!-- Torrent clients -->
+        <package android:name="org.proninyaroslav.libretorrent" />
+        <package android:name="com.biglybt.android.client" />
+    </queries>
+
     <!-- Fixes android tv fuckery -->
     <uses-feature
         android:name="android.hardware.touchscreen"

From 03eb6ccd45fe84baf0cf31cd3a2c42fea13ad70a Mon Sep 17 00:00:00 2001
From: Asheesh Sahu <100184494+asheeshsahu7300@users.noreply.github.com>
Date: Tue, 12 May 2026 21:28:48 +0530
Subject: [PATCH 114/177] fix: implement memory-based throttle to prevent OOM
 during downloads (#2786)

---
 .../utils/downloader/DownloadManager.kt       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
index 12fcc0c33..d209d544b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
@@ -1161,10 +1161,23 @@ object VideoDownloadManager {
                     // this will take up the first available job and resolve
                     while (true) {
                         if (!isActive) return@launch
+
+                        var isTooFarAhead = false
                         fileMutex.withLock {
                             if (metadata.type == DownloadType.IsStopped
                                 || metadata.type == DownloadType.IsFailed
                             ) return@launch
+
+                            // Limit RAM usage by throttling if too much data is downloaded but not yet written to disk
+                            // 50MB limit
+                            if (metadata.bytesDownloaded - metadata.bytesWritten > 50_000_000) {
+                                isTooFarAhead = true
+                            }
+                        }
+
+                        if (isTooFarAhead) {
+                            delay(500)
+                            continue
                         }
 
                         // mutex just in case, we never want this to fail due to multithreading
@@ -1333,10 +1346,23 @@ object VideoDownloadManager {
                 launch(Dispatchers.IO) {
                     while (true) {
                         if (!isActive) return@launch
+
+                        var isTooFarAhead = false
                         fileMutex.withLock {
                             if (metadata.type == DownloadType.IsStopped
                                 || metadata.type == DownloadType.IsFailed
                             ) return@launch
+
+                            // Limit RAM usage by throttling if too much data is downloaded but not yet written to disk
+                            // 50MB limit
+                            if (metadata.bytesDownloaded - metadata.bytesWritten > 50_000_000) {
+                                isTooFarAhead = true
+                            }
+                        }
+
+                        if (isTooFarAhead) {
+                            delay(500)
+                            continue
                         }
 
                         // mutex just in case, we never want this to fail due to multithreading

From 9a53e267acd106c72121b121d398bc435254df8d Mon Sep 17 00:00:00 2001
From: Alvin <89844706+IstarVin@users.noreply.github.com>
Date: Mon, 18 May 2026 07:29:59 +0800
Subject: [PATCH 115/177] fix: only return subtitle if not null (#2794)

---
 .../com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index 2dfd5ef4d..17bef3ec0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -1732,11 +1732,11 @@ class GeneratorPlayer : FullScreenPlayer() {
     ): SubtitleData? {
         val langCode = preferredAutoSelectSubtitles ?: return null
         if (downloads) {
-            return sortSubs(subtitles).firstOrNull {
+            sortSubs(subtitles).firstOrNull {
                 it.origin == SubtitleOrigin.DOWNLOADED_FILE && it.matchesLanguageCode(
                     langCode
                 )
-            }
+            }?.let { return it }
         }
 
         if (!settings) return null

From ab857376378e5607696bffdb97c6f0f948e86fb5 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Mon, 18 May 2026 16:35:44 -0600
Subject: [PATCH 116/177] [skip ci] TraktProvider: use text rather than
 toString for app.get (#2804)

toString is just an alias to text at the moment, but isn't really clear, and isn't really what it is meant for.
---
 .../com/lagradost/cloudstream3/metaproviders/TraktProvider.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
index 63f6d564c..8f921d75c 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
@@ -289,7 +289,7 @@ open class TraktProvider : MainAPI() {
                 "trakt-api-version" to "2",
                 "trakt-api-key" to traktClientId,
             )
-        ).toString()
+        ).text
     }
 
     private fun isUpcoming(dateString: String?): Boolean {
@@ -455,4 +455,4 @@ open class TraktProvider : MainAPI() {
         @JsonProperty("is_bollywood") val isBollywood: Boolean = false,
         @JsonProperty("is_cartoon") val isCartoon: Boolean = false,
     )
-}
\ No newline at end of file
+}

From 89cc63673b7d5596b6a708e26bdf8dbb3d5531fa Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Mon, 18 May 2026 17:00:10 -0600
Subject: [PATCH 117/177] Remove okhttp3.HttpUrl version of loadImage (#2790)

It is currently unused and at some point we will want to move coil to use ktor and fully phase out the dependency on okhttp so we don't an unnecessary extra dependency on it.
---
 .../com/lagradost/cloudstream3/utils/ImageModuleCoil.kt    | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ImageModuleCoil.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ImageModuleCoil.kt
index 9d5c75289..62cf1b996 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ImageModuleCoil.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ImageModuleCoil.kt
@@ -27,7 +27,6 @@ import coil3.util.DebugLogger
 import com.lagradost.cloudstream3.BuildConfig
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.network.buildDefaultClient
-import okhttp3.HttpUrl
 import okio.Path.Companion.toOkioPath
 import java.io.File
 import java.nio.ByteBuffer
@@ -138,12 +137,6 @@ object ImageLoader {
         builder: ImageRequest.Builder.() -> Unit = {}
     ) = loadImageInternal(imageData = imageData, headers = headers, builder = builder)
 
-    fun ImageView.loadImage(
-        imageData: HttpUrl?,
-        headers: Map<String, String>? = null,
-        builder: ImageRequest.Builder.() -> Unit = {}
-    ) = loadImageInternal(imageData = imageData, headers = headers, builder = builder)
-
     fun ImageView.loadImage(
         imageData: File?,
         builder: ImageRequest.Builder.() -> Unit = {}

From a24dc2600e2da74002586b27c24a880e1cebc036 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Mon, 18 May 2026 17:06:07 -0600
Subject: [PATCH 118/177] JsHunter/JsUnpacker: use Kotlin-native regex (#2803)

---
 .../lagradost/cloudstream3/utils/JsHunter.kt  |  28 ++--
 .../cloudstream3/utils/JsUnpacker.kt          | 140 +++++-------------
 2 files changed, 48 insertions(+), 120 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsHunter.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsHunter.kt
index 1ec442d7b..8aabeb1f1 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsHunter.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsHunter.kt
@@ -1,11 +1,9 @@
 package com.lagradost.cloudstream3.utils
 
 import com.lagradost.cloudstream3.mvvm.logError
-import java.util.regex.Matcher
-import java.util.regex.Pattern
 import kotlin.math.pow
 
-//author: https://github.com/daarkdemon
+// author: https://github.com/daarkdemon
 class JsHunter(private val hunterJS: String) {
 
     /**
@@ -14,9 +12,8 @@ class JsHunter(private val hunterJS: String) {
      * @return true if it's H.U.N.T.E.R coded.
      */
     fun detect(): Boolean {
-        val p = Pattern.compile("eval\\(function\\(h,u,n,t,e,r\\)")
-        val searchResults = p.matcher(hunterJS)
-        return searchResults.find()
+        val regex = Regex("eval\\(function\\(h,u,n,t,e,r\\)")
+        return regex.containsMatchIn(hunterJS)
     }
 
     /**
@@ -24,20 +21,15 @@ class JsHunter(private val hunterJS: String) {
      *
      * @return the javascript unhunt or null.
      */
-
     fun dehunt(): String? {
         try {
-            val p: Pattern =
-                Pattern.compile(
-                    """\}\("([^"]+)",[^,]+,\s*"([^"]+)",\s*(\d+),\s*(\d+)""",
-                    Pattern.DOTALL
-                )
-            val searchResults: Matcher = p.matcher(hunterJS)
-            if (searchResults.find() && searchResults.groupCount() == 4) {
-                val h = searchResults.group(1)!!
-                val n = searchResults.group(2)!!
-                val t = searchResults.group(3)!!.toInt()
-                val e = searchResults.group(4)!!.toInt()
+            val regex = Regex("""\}\("([^"]+)",[^,]+,\s*"([^"]+)",\s*(\d+),\s*(\d+)""", RegexOption.DOT_MATCHES_ALL)
+            val match = regex.find(hunterJS)
+            if (match != null && match.groupValues.size == 5) {
+                val h = match.groupValues[1]
+                val n = match.groupValues[2]
+                val t = match.groupValues[3].toInt()
+                val e = match.groupValues[4].toInt()
                 return hunter(h, n, t, e)
             }
         } catch (e: Exception) {
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsUnpacker.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsUnpacker.kt
index 7ed2e9be2..2dbbfddb0 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsUnpacker.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsUnpacker.kt
@@ -1,7 +1,6 @@
 package com.lagradost.cloudstream3.utils
 
 import com.lagradost.cloudstream3.mvvm.logError
-import java.util.regex.Pattern
 import kotlin.math.pow
 
 // https://github.com/cylonu87/JsUnpacker
@@ -15,9 +14,7 @@ class JsUnpacker(packedJS: String?) {
      */
     fun detect(): Boolean {
         val js = packedJS!!.replace(" ", "")
-        val p = Pattern.compile("eval\\(function\\(p,a,c,k,e,[rd]")
-        val m = p.matcher(js)
-        return m.find()
+        return Regex("eval\\(function\\(p,a,c,k,e,[rd]").containsMatchIn(js)
     }
 
     /**
@@ -28,41 +25,42 @@ class JsUnpacker(packedJS: String?) {
     fun unpack(): String? {
         val js = packedJS ?: return null
         try {
-            var p =
-                Pattern.compile("""\}\s*\('(.*)',\s*(.*?),\s*(\d+),\s*'(.*?)'\.split\('\|'\)""", Pattern.DOTALL)
-            var m = p.matcher(js)
-            if (m.find() && m.groupCount() == 4) {
-                val payload = m.group(1)?.replace("\\'", "'") ?: ""
-                val radixStr = m.group(2)
-                val countStr = m.group(3)
-                val symtab = (m.group(4)?.split("\\|".toRegex()) ?: emptyList()).toTypedArray()
+            val match = Regex(
+                """\}\s*\('(.*)',\s*(.*?),\s*(\d+),\s*'(.*?)'\.split\('\|'\)""",
+                RegexOption.DOT_MATCHES_ALL
+            ).find(js)
+            if (match != null && match.groupValues.size == 5) {
+                val payload = match.groupValues[1].replace("\\'", "'")
+                val radixStr = match.groupValues[2]
+                val countStr = match.groupValues[3]
+                val symtab = match.groupValues[4].split("|").toTypedArray()
                 var radix = 36
                 var count = 0
                 try {
-                    radix = radixStr?.toIntOrNull() ?: radix
+                    radix = radixStr.toIntOrNull() ?: radix
                 } catch (_: Exception) {
                 }
                 try {
-                    count = countStr?.toIntOrNull() ?: 0
+                    count = countStr.toIntOrNull() ?: 0
                 } catch (_: Exception) {
                 }
                 if (symtab.size != count) {
                     throw Exception("Unknown p.a.c.k.e.r. encoding")
                 }
                 val unbase = Unbase(radix)
-                p = Pattern.compile("""\b[a-zA-Z0-9_]+\b""")
-                m = p.matcher(payload)
+                val wordRegex = Regex("""\b[a-zA-Z0-9_]+\b""")
                 val decoded = StringBuilder(payload)
                 var replaceOffset = 0
-                while (m.find()) {
-                    val word = m.group(0)
-                    val x = if (word == null) 0 else unbase.unbase(word)
-                    var value: String? = null
-                    if (x < symtab.size && x >= 0) {
-                        value = symtab[x]
-                    }
-                    if (!value.isNullOrEmpty() && !word.isNullOrEmpty()) {
-                        decoded.replace(m.start() + replaceOffset, m.end() + replaceOffset, value)
+                wordRegex.findAll(payload).forEach { wordMatch ->
+                    val word = wordMatch.value
+                    val x = unbase.unbase(word)
+                    val value = if (x in symtab.indices) symtab[x] else null
+                    if (!value.isNullOrEmpty()) {
+                        decoded.replace(
+                            wordMatch.range.first + replaceOffset,
+                            wordMatch.range.last + 1 + replaceOffset,
+                            value
+                        )
                         replaceOffset += value.length - word.length
                     }
                 }
@@ -80,6 +78,7 @@ class JsUnpacker(packedJS: String?) {
             " !\"#$%&\\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
         private var alphabet: String? = null
         private var dictionary: HashMap<String, Int>? = null
+
         fun unbase(str: String): Int {
             var ret = 0
             if (alphabet == null) {
@@ -96,18 +95,10 @@ class JsUnpacker(packedJS: String?) {
         init {
             if (radix > 36) {
                 when {
-                    radix < 62 -> {
-                        alphabet = ALPHABET_62.substring(0, radix)
-                    }
-                    radix in 63..94 -> {
-                        alphabet = ALPHABET_95.substring(0, radix)
-                    }
-                    radix == 62 -> {
-                        alphabet = ALPHABET_62
-                    }
-                    radix == 95 -> {
-                        alphabet = ALPHABET_95
-                    }
+                    radix < 62 -> alphabet = ALPHABET_62.substring(0, radix)
+                    radix in 63..94 -> alphabet = ALPHABET_95.substring(0, radix)
+                    radix == 62 -> alphabet = ALPHABET_62
+                    radix == 95 -> alphabet = ALPHABET_95
                 }
                 dictionary = HashMap(95)
                 for (i in 0 until alphabet!!.length) {
@@ -124,74 +115,20 @@ class JsUnpacker(packedJS: String?) {
         this.packedJS = packedJS
     }
 
-
     companion object {
-        val c =
-            listOf(
-                0x63,
-                0x6f,
-                0x6d,
-                0x2e,
-                0x67,
-                0x6f,
-                0x6f,
-                0x67,
-                0x6c,
-                0x65,
-                0x2e,
-                0x61,
-                0x6e,
-                0x64,
-                0x72,
-                0x6f,
-                0x69,
-                0x64,
-                0x2e,
-                0x67,
-                0x6d,
-                0x73,
-                0x2e,
-                0x61,
-                0x64,
-                0x73,
-                0x2e,
-                0x4d,
-                0x6f,
-                0x62,
-                0x69,
-                0x6c,
-                0x65,
-                0x41,
-                0x64,
-                0x73
-            )
-        val z =
-            listOf(
-                0x63,
-                0x6f,
-                0x6d,
-                0x2e,
-                0x66,
-                0x61,
-                0x63,
-                0x65,
-                0x62,
-                0x6f,
-                0x6f,
-                0x6b,
-                0x2e,
-                0x61,
-                0x64,
-                0x73,
-                0x2e,
-                0x41,
-                0x64
-            )
+        val c = listOf(
+            0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x61, 0x6e, 0x64,
+            0x72, 0x6f, 0x69, 0x64, 0x2e, 0x67, 0x6d, 0x73, 0x2e, 0x61, 0x64, 0x73, 0x2e, 0x4d,
+            0x6f, 0x62, 0x69, 0x6c, 0x65, 0x41, 0x64, 0x73
+        )
+        val z = listOf(
+            0x63, 0x6f, 0x6d, 0x2e, 0x66, 0x61, 0x63, 0x65, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x61,
+            0x64, 0x73, 0x2e, 0x41, 0x64
+        )
 
         fun String.load(): String? {
             return try {
                 var load = this
-
                 for (q in c.indices) {
                     if (c[q % 4] > 270) {
                         load += c[q % 3]
@@ -199,7 +136,6 @@ class JsUnpacker(packedJS: String?) {
                         load += c[q].toChar()
                     }
                 }
-
                 Class.forName(load.substring(load.length - c.size, load.length)).name
             } catch (_: Exception) {
                 try {
@@ -207,7 +143,7 @@ class JsUnpacker(packedJS: String?) {
                     for (w in z.indices) {
                         f += z[w].toChar()
                     }
-                    return Class.forName(f.substring(0b001, f.length)).name
+                    Class.forName(f.substring(0b001, f.length)).name
                 } catch (_: Exception) {
                     null
                 }

From 7e406cb5eb351ee3fbdc040e0a9eeb4ed543d282 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Mon, 18 May 2026 17:13:57 -0600
Subject: [PATCH 119/177] CryptoJS: replace array copies with Kotlin stdlib
 equivalents (#2799)

* Remove use of java.util.Arrays

* Remove unused import

* Replace more
---
 .../extractors/helper/CryptoJSHelper.kt       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/CryptoJSHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/CryptoJSHelper.kt
index af59b6f7d..6ad0524e8 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/CryptoJSHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/CryptoJSHelper.kt
@@ -2,13 +2,11 @@ package com.lagradost.cloudstream3.extractors.helper
 
 import com.lagradost.cloudstream3.base64DecodeArray
 import com.lagradost.cloudstream3.base64Encode
-import java.util.Arrays
 import java.security.MessageDigest
 import java.security.SecureRandom
 import javax.crypto.Cipher
 import javax.crypto.spec.SecretKeySpec
 import javax.crypto.spec.IvParameterSpec
-import java.nio.charset.StandardCharsets
 import kotlin.math.min
 
 /**
@@ -48,9 +46,9 @@ object CryptoJS {
         // Create CryptoJS-like encrypted!
         val sBytes     = APPEND.toByteArray()
         val b          = ByteArray(sBytes.size + saltBytes.size + cipherText.size)
-        System.arraycopy(sBytes, 0, b, 0, sBytes.size)
-        System.arraycopy(saltBytes, 0, b, sBytes.size, saltBytes.size)
-        System.arraycopy(cipherText, 0, b, sBytes.size + saltBytes.size, cipherText.size)
+        sBytes.copyInto(destination = b, destinationOffset = 0)
+        saltBytes.copyInto(destination = b, destinationOffset = sBytes.size)
+        cipherText.copyInto(destination = b, destinationOffset = sBytes.size + saltBytes.size)
 
         return base64Encode(b)
     }
@@ -63,8 +61,8 @@ object CryptoJS {
      */
     fun decrypt(password: String, cipherText: String): String {
         val ctBytes         = base64DecodeArray(cipherText)
-        val saltBytes       = Arrays.copyOfRange(ctBytes, 8, 16)
-        val cipherTextBytes = Arrays.copyOfRange(ctBytes, 16, ctBytes.size)
+        val saltBytes       = ctBytes.copyOfRange(8, 16)
+        val cipherTextBytes = ctBytes.copyOfRange(16, ctBytes.size)
 
         val key = ByteArray(KEY_SIZE / 8)
         val iv  = ByteArray(IV_SIZE / 8)
@@ -107,16 +105,18 @@ object CryptoJS {
                 hash.reset()
             }
 
-            System.arraycopy(
-                block!!, 0, derivedBytes, numberOfDerivedWords * 4,
-                min(block.size, (targetKeySize - numberOfDerivedWords) * 4)
+            block!!.copyInto(
+                destination = derivedBytes,
+                destinationOffset = numberOfDerivedWords * 4,
+                startIndex = 0,
+                endIndex = min(block.size, (targetKeySize - numberOfDerivedWords) * 4)
             )
 
             numberOfDerivedWords += block.size / 4
         }
 
-        System.arraycopy(derivedBytes, 0, resultKey, 0, keySize * 4)
-        System.arraycopy(derivedBytes, keySize * 4, resultIv, 0, ivSize * 4)
+        derivedBytes.copyInto(destination = resultKey, destinationOffset = 0, startIndex = 0, endIndex = keySize * 4)
+        derivedBytes.copyInto(destination = resultIv, destinationOffset = 0, startIndex = keySize * 4, endIndex = (keySize * 4) + (ivSize * 4))
 
         return derivedBytes // key + iv
     }
@@ -126,4 +126,4 @@ object CryptoJS {
             SecureRandom().nextBytes(this)
         }
     }
-}
\ No newline at end of file
+}

From 9bc5027ea71aa7d7b1bd645f77e21e57eaca8af0 Mon Sep 17 00:00:00 2001
From: fire-light43 <282604282+fire-light43@users.noreply.github.com>
Date: Tue, 19 May 2026 01:19:16 +0200
Subject: [PATCH 120/177] shared buffer to decrease alloc (#2787)

---
 .../cloudstream3/utils/downloader/DownloadManager.kt | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
index d209d544b..7cb190667 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
@@ -804,6 +804,7 @@ object VideoDownloadManager {
         private suspend fun resolve(
             startByte: Long,
             endByte: Long?,
+            buffer: ByteArray,
             callback: (suspend CoroutineScope.(LazyStreamDownloadResponse) -> Unit)
         ): Long = withContext(Dispatchers.IO) {
             var currentByte: Long = startByte
@@ -822,7 +823,6 @@ object VideoDownloadManager {
             )
             val requestStream = request.body.byteStream()
 
-            val buffer = ByteArray(bufferSize)
             var read: Int
 
             try {
@@ -853,6 +853,7 @@ object VideoDownloadManager {
         suspend fun resolveSafe(
             index: Int,
             retries: Int = 3,
+            buffer: ByteArray,
             callback: (suspend CoroutineScope.(LazyStreamDownloadResponse) -> Unit)
         ): Boolean {
             var start = chuckStartByte.getOrNull(index) ?: return false
@@ -861,7 +862,7 @@ object VideoDownloadManager {
             for (i in 0 until retries) {
                 try {
                     // in case
-                    start = resolve(start, end, callback)
+                    start = resolve(start, end, buffer, callback)
                     // no end defined, so we don't care exactly where it ended
                     if (end == null) return true
                     // we have download more or exactly what we needed
@@ -1158,7 +1159,10 @@ object VideoDownloadManager {
                             }
                         }
 
-                    // this will take up the first available job and resolve
+                    // Reuse a download buffer to decrease unnecessary alloc
+                    val buffer = ByteArray(items.bufferSize)
+
+                    // This will take up the first available job and resolve
                     while (true) {
                         if (!isActive) return@launch
 
@@ -1188,7 +1192,7 @@ object VideoDownloadManager {
 
                         // in case something has gone wrong set to failed if the fail is not caused by
                         // user cancellation
-                        if (!items.resolveSafe(index, callback = callback)) {
+                        if (!items.resolveSafe(index, buffer = buffer, callback = callback)) {
                             fileMutex.withLock {
                                 if (metadata.type != DownloadType.IsStopped) {
                                     metadata.type = DownloadType.IsFailed

From 862e2590d2dcf63d0a3f9603db7dc74b8d4dd777 Mon Sep 17 00:00:00 2001
From: Abodabodd <122629521+Abodabodd@users.noreply.github.com>
Date: Tue, 19 May 2026 19:45:58 +0300
Subject: [PATCH 121/177] Update StreamWishExtractor.kt (#2770)

---
 .../cloudstream3/extractors/StreamWishExtractor.kt        | 8 +++++++-
 .../com/lagradost/cloudstream3/utils/ExtractorApi.kt      | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt
index c721db6b9..58aa25c8c 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamWishExtractor.kt
@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.lagradost.api.Log
+import com.lagradost.cloudstream3.Prerelease
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.app
@@ -12,7 +13,6 @@ import com.lagradost.cloudstream3.utils.getAndUnpack
 import com.lagradost.cloudstream3.utils.getPacked
 import com.lagradost.cloudstream3.network.WebViewResolver
 
-
 class Mwish : StreamWishExtractor() {
     override val name = "Mwish"
     override val mainUrl = "https://mwish.pro"
@@ -28,6 +28,12 @@ class Ewish : StreamWishExtractor() {
     override val mainUrl = "https://embedwish.com"
 }
 
+@Prerelease
+class Hgcloudto : StreamWishExtractor() {
+    override val name = "Hgcloud"
+    override val mainUrl = "https://Hgcloud.to"
+}
+
 class WishembedPro : StreamWishExtractor() {
     override val name = "Wishembed"
     override val mainUrl = "https://wishembed.pro"
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index ab80cf2ca..45e2ba71e 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -106,6 +106,7 @@ import com.lagradost.cloudstream3.extractors.HDPlayerSystem
 import com.lagradost.cloudstream3.extractors.HDStreamAble
 import com.lagradost.cloudstream3.extractors.Habetar
 import com.lagradost.cloudstream3.extractors.Haxloppd
+import com.lagradost.cloudstream3.extractors.Hgcloudto
 import com.lagradost.cloudstream3.extractors.HglinkTo
 import com.lagradost.cloudstream3.extractors.HgplayCDN
 import com.lagradost.cloudstream3.extractors.Hotlinger
@@ -1194,6 +1195,7 @@ val extractorApis: MutableList<ExtractorApi> = arrayListOf(
     MetaGnathTuggers(),
     Geodailymotion(),
     Mwish(),
+    Hgcloudto(),
     Dwish(),
     Ewish(),
     Kswplayer(),

From a6000fbe04a1b2063b3fef37827844c5d9decc2f Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 21 May 2026 15:09:13 -0600
Subject: [PATCH 122/177] [skip ci] AppDebug: use kotlin.concurrent.Volatile
 (#2818)

By default this uses kotlin.jvm.Volatile, which we should be using kotlin.concurrent.Volatile instead.
---
 .../kotlin/com/lagradost/cloudstream3/utils/AppDebug.kt          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppDebug.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppDebug.kt
index e07f32c0a..180aee11a 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppDebug.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppDebug.kt
@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.utils
 
 import com.lagradost.cloudstream3.InternalAPI
+import kotlin.concurrent.Volatile
 
 @InternalAPI
 object AppDebug {

From 0f41ca2641017e02a7ce911f068f03d974d1d92f Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 21 May 2026 15:17:03 -0600
Subject: [PATCH 123/177] [skip ci] Don't pass locale to titlecase in
 String.capitalize (#2810)

That is the default anyway.
---
 .../commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index c590165a1..6bb11ee34 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -27,7 +27,9 @@ import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody.Companion.toRequestBody
 import java.net.URI
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import java.util.EnumSet
+import java.util.Locale
 import kotlin.io.encoding.Base64
 import kotlin.io.encoding.ExperimentalEncodingApi
 import kotlin.math.absoluteValue
@@ -97,7 +99,7 @@ object APIHolder {
 
     /** String extension function to Capitalize first char of string.*/
     fun String.capitalize(): String {
-        return this.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }
+        return this.replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
     }
 
     var apis: List<MainAPI> = threadSafeListOf()

From 638d749945acd8edde4138a2f32bf964a44da75e Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 21 May 2026 15:29:33 -0600
Subject: [PATCH 124/177] [skip ci] Remove usage of junit within the app itself
 (#2820)

When I was testing compose, I realized that this causes issues where junit was wiring up instrumentation within the app, which overrode and conflicted with compose resource context. We don't need it as a dependency for just TestingUtils, so this refsctors it to just use AssertionError directly.
---
 app/build.gradle.kts                          |  4 +--
 .../cloudstream3/utils/TestingUtils.kt        | 28 +++++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ae5301929..1b1aefab2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -206,9 +206,9 @@ dependencies {
     testImplementation(libs.junit)
     testImplementation(libs.json)
     androidTestImplementation(libs.core)
-    implementation(libs.junit.ktx)
-    androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.espresso.core)
+    androidTestImplementation(libs.ext.junit)
+    androidTestImplementation(libs.junit.ktx)
 
     // Android Core & Lifecycle
     implementation(libs.core.ktx)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt
index 91c8a2fc1..8c50afee7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt
@@ -3,10 +3,10 @@ package com.lagradost.cloudstream3.utils
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.mvvm.logError
 import kotlinx.coroutines.*
-import org.junit.Assert
 import kotlin.random.Random
 
 object TestingUtils {
+
     open class TestResult(val success: Boolean) {
         companion object {
             val Pass = TestResult(true)
@@ -48,6 +48,10 @@ object TestingUtils {
             messageLog.add(Message(LogLevel.Error, message))
         }
     }
+    
+    private fun fail(message: String): Nothing = throw AssertionError(message)
+    private fun assertTrue(message: String, condition: Boolean) { if (!condition) fail(message) }
+    private fun assertNotNull(message: String, value: Any?) { if (value == null) fail(message) }
 
     class TestResultList(val results: List<SearchResponse>) : TestResult(true)
     class TestResultLoad(val extractorData: String, val shouldLoadLinks: Boolean) : TestResult(true)
@@ -87,7 +91,7 @@ object TestingUtils {
             } catch (e: Throwable) {
                 when (e) {
                     is NotImplementedError -> {
-                        Assert.fail("Provider marked as hasMainPage, while in reality is has not been implemented")
+                        fail("Provider marked as hasMainPage, while in reality is has not been implemented")
                     }
 
                     is CancellationException -> {
@@ -115,7 +119,7 @@ object TestingUtils {
                 api.search(query, 1)?.items?.takeIf { it.isNotEmpty() }
             } catch (e: Throwable) {
                 if (e is NotImplementedError) {
-                    Assert.fail("Provider has not implemented search()")
+                    fail("Provider has not implemented search()")
                 } else if (e is CancellationException) {
                     throw e
                 }
@@ -125,7 +129,7 @@ object TestingUtils {
         }
 
         return if (searchResults.isNullOrEmpty()) {
-            Assert.fail("Api ${api.name} did not return any search responses")
+            fail("Api ${api.name} did not return any search responses")
             TestResult.Fail // Should not be reached
         } else {
             TestResultList(searchResults)
@@ -216,7 +220,7 @@ object TestingUtils {
 //            return TestResult(validResults)
         } catch (e: Throwable) {
             if (e is NotImplementedError) {
-                Assert.fail("Provider has not implemented load()")
+                fail("Provider has not implemented load()")
             }
             throw e
         }
@@ -228,14 +232,14 @@ object TestingUtils {
         url: String?,
         logger: Logger
     ): TestResult {
-        Assert.assertNotNull("Api ${api.name} has invalid url on episode", url)
+        assertNotNull("Api ${api.name} has invalid url on episode", url)
         if (url == null) return TestResult.Fail // Should never trigger
 
         var linksLoaded = 0
         try {
             val success = api.loadLinks(url, false, {}) { link ->
                 logger.log("Video loaded: ${link.name}")
-                Assert.assertTrue(
+                assertTrue(
                     "Api ${api.name} returns link with invalid url ${link.url}",
                     link.url.length > 4
                 )
@@ -245,12 +249,12 @@ object TestingUtils {
                 logger.log("Links loaded: $linksLoaded")
                 return TestResult(linksLoaded > 0)
             } else {
-                Assert.fail("Api ${api.name} returns false on loadLinks() with $linksLoaded links loaded")
+                fail("Api ${api.name} returns false on loadLinks() with $linksLoaded links loaded")
             }
         } catch (e: Throwable) {
             when (e) {
                 is NotImplementedError -> {
-                    Assert.fail("Provider has not implemented loadLinks()")
+                    fail("Provider has not implemented loadLinks()")
                 }
 
                 else -> {
@@ -276,7 +280,7 @@ object TestingUtils {
 
                     // Test Homepage
                     val homepage = testHomepage(api, logger)
-                    Assert.assertTrue("Homepage failed to load", homepage.success)
+                    assertTrue("Homepage failed to load", homepage.success)
                     val homePageList = (homepage as? TestResultList)?.results ?: emptyList()
 
                     // Test Search Results
@@ -287,7 +291,7 @@ object TestingUtils {
                                 listOf("over", "iron", "guy")).take(3)
 
                     val searchResults = testSearch(api, searchQueries, logger)
-                    Assert.assertTrue("Failed to get search results", searchResults.success)
+                    assertTrue("Failed to get search results", searchResults.success)
                     searchResults as TestResultList
 
                     // Test Load and LoadLinks
@@ -321,4 +325,4 @@ object TestingUtils {
             }
         }
     }
-}
\ No newline at end of file
+}

From 419b902eadc2cdd0aa66e0e177891e450993fd1b Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 21 May 2026 15:45:04 -0600
Subject: [PATCH 125/177] [skip ci] Use this::class rather than javaClass in
 MainAPI (#2809)

---
 .../src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index 6bb11ee34..0200fda4a 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -474,7 +474,7 @@ abstract class MainAPI {
     }
 
     fun init() {
-        overrideData?.get(this.javaClass.simpleName)?.let { data ->
+        overrideData?.get(this::class.simpleName)?.let { data ->
             overrideWithNewData(data)
         }
     }

From 72386cb98cdb96a9aa15eeb1aef7a7c8853d5620 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 21 May 2026 16:01:46 -0600
Subject: [PATCH 126/177] [skip ci] HlsPlaylistParser: don't use
 java.lang.StringBuilder directly (#2811)

Just using StringBuilder will allow it to use kotlin.text.StringBuilder from Kotlin instead, which it already does in some places, making using java.lang.StringBuilder in here very inconsistent with other parts of the same class.
---
 .../com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
index 01e5bb862..bea75aa58 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
@@ -234,7 +234,7 @@ object HlsPlaylistParser {
             if (codecArray.isEmpty()) {
                 return null
             }
-            val builder = java.lang.StringBuilder()
+            val builder = StringBuilder()
             for (codec in codecArray) {
                 if (trackType == MimeTypes.getTrackTypeOfCodec(codec)) {
                     if (builder.isNotEmpty()) {
@@ -263,7 +263,7 @@ object HlsPlaylistParser {
             if (codecArray.isEmpty()) {
                 return null
             }
-            val builder = java.lang.StringBuilder()
+            val builder = StringBuilder()
             for (codec in codecArray) {
                 if (trackType != MimeTypes.getTrackTypeOfCodec(codec)) {
                     if (builder.isNotEmpty()) {
@@ -425,7 +425,7 @@ object HlsPlaylistParser {
          * @param limit The limit (exclusive) of the path in `uri`.
          */
         private fun removeDotSegments(
-            uri: java.lang.StringBuilder,
+            uri: StringBuilder,
             offset: Int,
             limit: Int
         ): String {

From f894b8f7ecdd9f78f338681087cd4aca73296bfe Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Fri, 22 May 2026 16:53:46 -0600
Subject: [PATCH 127/177] SubtitleHelper: replace usage of java.lang.Character
 (#2817)

---
 .../cloudstream3/utils/SubtitleHelper.kt      | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt
index 8d5479cc0..7becf4d19 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt
@@ -315,10 +315,23 @@ object SubtitleHelper {
         val flagOffset = 0x1F1E6  // regional indicator "[A]"
         val offset = flagOffset - asciiOffset
 
-        val firstChar: Int = Character.codePointAt(countryLetters, 0) + offset
-        val secondChar: Int = Character.codePointAt(countryLetters, 1) + offset
+        /**
+         * Unicode surrogate pairs encode code points above U+FFFF (outside the Basic Multilingual Plane).
+         * The code point is offset by 0x10000, then split into two 10-bit halves:
+         * high surrogate: upper 10 bits, biased into the range 0xD800-0xDBFF
+         * low surrogate: lower 10 bits (masked with 0x3FF), biased into the range 0xDC00-0xDFFF
+         */
+        fun toSurrogatePair(codePoint: Int): String {
+            val high = ((codePoint - 0x10000) shr 10) + 0xD800
+            val low  = ((codePoint - 0x10000) and 0x3FF) + 0xDC00
+            return "${high.toChar()}${low.toChar()}"
+        }
 
-        return String(Character.toChars(firstChar)) + String(Character.toChars(secondChar))
+        val upperLetters = countryLetters.uppercase()
+        val first  = upperLetters[0].code + offset
+        val second = upperLetters[1].code + offset
+
+        return toSurrogatePair(first) + toSurrogatePair(second)
     }
 
     // when (langTag = country) or (langTag contains country)

From 4ab97e4605d1fceca47438aa893d6539ac57b1b0 Mon Sep 17 00:00:00 2001
From: Osten <11805592+LagradOst@users.noreply.github.com>
Date: Sat, 23 May 2026 18:02:53 +0200
Subject: [PATCH 128/177] Delete issue workflow to prevent security issues

---
 .github/workflows/issue_action.yml | 98 ------------------------------
 1 file changed, 98 deletions(-)
 delete mode 100644 .github/workflows/issue_action.yml

diff --git a/.github/workflows/issue_action.yml b/.github/workflows/issue_action.yml
deleted file mode 100644
index e354d657d..000000000
--- a/.github/workflows/issue_action.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-name: Issue automatic actions
-
-on:
-  issues:
-    types: [opened]
-
-permissions:
-  contents: read
-  issues: write
-
-jobs:
-  issue-moderator:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Generate access token
-        id: generate_token
-        uses: tibdex/github-app-token@v2
-        with:
-          app_id: ${{ secrets.GH_APP_ID }}
-          private_key: ${{ secrets.GH_APP_KEY }}
-
-      - name: Similarity analysis
-        id: similarity
-        uses: actions-cool/issues-similarity-analysis@v1
-        with:
-          token: ${{ steps.generate_token.outputs.token }}
-          filter-threshold: 0.60
-          title-excludes: ''
-          comment-title: |
-            ### Your issue looks similar to these issues:
-            Please close if duplicate.
-          comment-body: '${index}. ${similarity} #${number}'
-
-      - name: Label if possible duplicate
-        if: steps.similarity.outputs.similar-issues-found =='true'
-        uses: actions/github-script@v9
-        with:
-          github-token: ${{ steps.generate_token.outputs.token }}
-          script: |
-            github.rest.issues.addLabels({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              labels: ["possible duplicate"]
-            })
-
-      - uses: actions/checkout@v6
-
-      - name: Automatically close issues that dont follow the issue template
-        uses: lucasbento/auto-close-issues@v1.0.2
-        with:
-          github-token: ${{ steps.generate_token.outputs.token }}
-          issue-close-message: |
-            @${issue.user.login}: hello! :wave:
-            This issue is being automatically closed because it does not follow the issue template." 
-          closed-issues-label: "invalid"
-
-      - name: Check if issue mentions a provider
-        id: provider_check
-        env:
-          GH_TEXT: "${{ github.event.issue.title }} ${{ github.event.issue.body }}"
-        run: |
-          wget --output-document check_issue.py "https://raw.githubusercontent.com/recloudstream/.github/master/.github/check_issue.py"
-          pip3 install httpx
-          RES="$(python3 ./check_issue.py)"
-          echo "name=${RES}" >> $GITHUB_OUTPUT
-
-      - name: Comment if issue mentions a provider
-        if: steps.provider_check.outputs.name != 'none'
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: 'create-comment'
-          token: ${{ steps.generate_token.outputs.token }}
-          body: |
-            Hello ${{ github.event.issue.user.login }}. 
-            Please do not report any provider bugs here. This repository does not contain any providers. Please find the appropriate repository and report your issue there or join the [discord](https://discord.gg/5Hus6fM).
-            
-            Found provider name: `${{ steps.provider_check.outputs.name }}`
-
-      - name: Label if mentions provider
-        if: steps.provider_check.outputs.name != 'none'
-        uses: actions/github-script@v9
-        with:
-          github-token: ${{ steps.generate_token.outputs.token }}
-          script: |
-            github.rest.issues.addLabels({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              labels: ["possible provider issue"]
-            })
-
-      - name: Add eyes reaction to all issues
-        uses: actions-cool/emoji-helper@v1.0.0
-        with:
-          type: 'issue'
-          token: ${{ steps.generate_token.outputs.token }}
-          emoji: 'eyes'

From ac0a0d294199862037f8f61218280ee25cfcbfd7 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 23 May 2026 14:10:21 -0600
Subject: [PATCH 129/177] [skip ci] Replace Integer.parseInt with Kotlin-native
 equivalent (#2827)

---
 .../cloudstream3/extractors/OdnoklassnikiExtractor.kt         | 2 +-
 .../kotlin/com/lagradost/cloudstream3/extractors/Vidsonic.kt  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OdnoklassnikiExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OdnoklassnikiExtractor.kt
index 8af77c1df..69c3b7759 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OdnoklassnikiExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/OdnoklassnikiExtractor.kt
@@ -32,7 +32,7 @@ open class Odnoklassniki : ExtractorApi() {
         val embedUrl = url.replace("/video/","/videoembed/")
         val videoReq  = app.get(embedUrl, headers=headers).text.replace("\\&quot;", "\"").replace("\\\\", "\\")
             .replace(Regex("\\\\u([0-9A-Fa-f]{4})")) { matchResult ->
-                Integer.parseInt(matchResult.groupValues[1], 16).toChar().toString()
+                matchResult.groupValues[1].toInt(16).toChar().toString()
             }
         val videosStr = Regex(""""videos":(\[[^]]*])""").find(videoReq)?.groupValues?.get(1) ?: throw ErrorLoadingException("Video not found")
         val videos    = AppUtils.tryParseJson<List<OkRuVideo>>(videosStr) ?: throw ErrorLoadingException("Video not found")
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidsonic.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidsonic.kt
index 5c871b54b..49560d456 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidsonic.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidsonic.kt
@@ -38,13 +38,13 @@ class Vidsonic() : ExtractorApi() {
             .substringBefore(";")
             .replace("'", "")
 
-        // (improved) Java implementation of the JavaScript code from above
+        // (improved) Kotlin implementation of the JavaScript code from above
         val streamUrl = encodedStreamUrl
             .replace("|", "")
             // always two base16 digits together build one ASCII char
             .chunked(2)
             .map {
-                Integer.parseInt(it, 16).toChar()
+                it.toInt(16).toChar()
             }
             .joinToString("")
             .reversed()

From dd016341c051dc0928ec4b62ebef6b733d32b8b6 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 23 May 2026 14:11:46 -0600
Subject: [PATCH 130/177] [skip ci] Replace ArrayList in extractor (#2826)

---
 .../kotlin/com/lagradost/cloudstream3/extractors/Userload.kt  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userload.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userload.kt
index 582be8afb..fad6e8571 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userload.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userload.kt
@@ -6,8 +6,6 @@ import com.lagradost.cloudstream3.utils.*
 import org.mozilla.javascript.Context
 import org.mozilla.javascript.EvaluatorException
 import org.mozilla.javascript.Scriptable
-import java.util.*
-
 
 open class Userload : ExtractorApi() {
     override var name = "Userload"
@@ -16,7 +14,7 @@ open class Userload : ExtractorApi() {
 
     private fun splitInput(input: String): List<String> {
         var counter = 0
-        val array = ArrayList<String>()
+        val array = mutableListOf<String>()
         var buffer = ""
         for (c in input) {
             when (c) {

From 85cc10c2e0fe566b818f2b914a98d03be117f1b6 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 23 May 2026 14:20:50 -0600
Subject: [PATCH 131/177] [skip ci] Replace usage of String.format in library
 (#2819)

---
 .../com/lagradost/cloudstream3/extractors/Cda.kt   |  3 +--
 .../lagradost/cloudstream3/extractors/Gofile.kt    | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt
index fc155bdd9..e37c498f9 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt
@@ -14,7 +14,6 @@ open class Cda : ExtractorApi() {
     override var name = "Cda"
     override val requiresReferer = false
 
-
     override suspend fun getUrl(url: String, referer: String?): List<ExtractorLink>? {
         val mediaId = url
             .split("/").last()
@@ -68,7 +67,7 @@ open class Cda : ExtractorApi() {
         a = URLDecoder.decode(a, "UTF-8")
         a = a.map { char ->
             if (char.code in 33..126) {
-                return@map String.format("%c", 33 + (char.code + 14) % 94)
+                return@map (33 + (char.code + 14) % 94).toChar().toString()
             } else {
                 return@map char
             }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt
index ced827eec..2b42e42c7 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt
@@ -8,6 +8,7 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.newExtractorLink
+import kotlin.math.round
 
 open class Gofile : ExtractorApi() {
     override val name = "Gofile"
@@ -67,10 +68,19 @@ open class Gofile : ExtractorApi() {
             ?: Qualities.Unknown.value
     }
 
+    private fun roundTo2Decimals(value: Double): String {
+        val rounded = round(value * 100) / 100.0
+        val intPart = rounded.toLong()
+        val decPart = round((rounded - intPart) * 100).toLong()
+        return "$intPart.${decPart.toString().padStart(2, '0')}"
+    }
+
     private fun formatBytes(bytes: Long): String {
+        val mb = 1024L * 1024
+        val gb = mb * 1024
         return when {
-            bytes < 1024L * 1024 * 1024 -> "%.2f MB".format(bytes.toDouble() / (1024 * 1024))
-            else -> "%.2f GB".format(bytes.toDouble() / (1024 * 1024 * 1024))
+            bytes < gb -> "${roundTo2Decimals(bytes.toDouble() / mb)} MB"
+            else -> "${roundTo2Decimals(bytes.toDouble() / gb)} GB"
         }
     }
 

From c1b49d0dcb7f2006760fc24a16339c320533e7d4 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 23 May 2026 14:34:13 -0600
Subject: [PATCH 132/177] [skip ci] Replace charset string conversions with
 Kotlin native equivalents (#2807)

---
 .../kotlin/com/lagradost/cloudstream3/MainAPI.kt      | 11 +++++++++--
 .../com/lagradost/cloudstream3/extractors/ByseSX.kt   |  3 +--
 .../lagradost/cloudstream3/extractors/Rabbitstream.kt |  3 +--
 .../cloudstream3/extractors/RapidVidExtractor.kt      |  4 ++--
 .../cloudstream3/extractors/VidMoxyExtractor.kt       |  4 ++--
 .../com/lagradost/cloudstream3/extractors/Videa.kt    |  8 ++++----
 .../lagradost/cloudstream3/utils/HlsPlaylistParser.kt |  2 +-
 7 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index 0200fda4a..fae2bf5e7 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -688,9 +688,16 @@ abstract class MainAPI {
     }
 }
 
-/** Might need a different implementation for desktop*/
 fun base64Decode(string: String): String {
-    return String(base64DecodeArray(string), Charsets.ISO_8859_1)
+    // ISO-8859-1 decoding: each byte maps directly to its Unicode code point (0-255),
+    // so we mask each byte to unsigned and convert to the corresponding Char manually.
+    // decodeToString() can't be used here as it assumes UTF-8.
+    val bytes = base64DecodeArray(string)
+    return buildString(bytes.size) {
+        for (b in bytes) {
+            append((b.toInt() and 0xFF).toChar())
+        }
+    }
 }
 
 @OptIn(ExperimentalEncodingApi::class)
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt
index 38d35da2e..cc7293b80 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt
@@ -9,7 +9,6 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 import java.net.URI
-import java.nio.charset.StandardCharsets
 import javax.crypto.Cipher
 import javax.crypto.spec.GCMParameterSpec
 import javax.crypto.spec.SecretKeySpec
@@ -94,7 +93,7 @@ open class ByseSX : ExtractorApi() {
         cipher.init(Cipher.DECRYPT_MODE, secretKey, spec)
 
         val plainBytes = cipher.doFinal(cipherBytes)
-        var jsonStr = String(plainBytes, StandardCharsets.UTF_8)
+        var jsonStr = plainBytes.decodeToString()
 
         if (jsonStr.startsWith("\uFEFF")) jsonStr = jsonStr.substring(1)
 
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt
index 98598dd28..3f7408eb3 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt
@@ -12,7 +12,6 @@ import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
-import java.nio.charset.StandardCharsets
 import java.security.MessageDigest
 import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
@@ -171,7 +170,7 @@ open class Rabbitstream : ExtractorApi() {
             IvParameterSpec(decryptionKey.copyOfRange(32, decryptionKey.size))
         )
         val decryptedData = aesCBC?.doFinal(encrypted) ?: throw ErrorLoadingException("Cipher not found")
-        return String(decryptedData, StandardCharsets.UTF_8)
+        return decryptedData.decodeToString()
     }
 
     data class Tracks(
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/RapidVidExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/RapidVidExtractor.kt
index 9654e5f38..822a5eed7 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/RapidVidExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/RapidVidExtractor.kt
@@ -35,14 +35,14 @@ open class RapidVid : ExtractorApi() {
 
         if (extractedValue != null) {
             val bytes = extractedValue.split("\\x").filter { it.isNotEmpty() }.map { it.toInt(16).toByte() }.toByteArray()
-            decoded   = String(bytes, Charsets.UTF_8)
+            decoded   = bytes.decodeToString()
         } else {
             val evalJWSsetup = Regex("""\};\s*(eval\(function[\s\S]*?)var played = \d+;""").find(videoReq)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
             val JWSsetup      = getAndUnpack(getAndUnpack(evalJWSsetup)).replace("\\\\", "\\")
             extractedValue  = Regex("""file":"(.*)","label""").find(JWSsetup)?.groupValues?.get(1)?.replace("\\\\x", "")
 
             val bytes = extractedValue?.chunked(2)?.map { it.toInt(16).toByte() }?.toByteArray()
-            decoded   = bytes?.toString(Charsets.UTF_8) ?: throw ErrorLoadingException("File not found")
+            decoded   = bytes?.decodeToString() ?: throw ErrorLoadingException("File not found")
         }
 
         callback.invoke(
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidMoxyExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidMoxyExtractor.kt
index 36acf7f7a..a23f6b683 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidMoxyExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidMoxyExtractor.kt
@@ -35,14 +35,14 @@ open class VidMoxy : ExtractorApi() {
 
         if (extractedValue != null) {
             val bytes = extractedValue.split("\\x").filter { it.isNotEmpty() }.map { it.toInt(16).toByte() }.toByteArray()
-            decoded   = String(bytes, Charsets.UTF_8)
+            decoded   = bytes.decodeToString()
         } else {
             val evaljwSetup = Regex("""\};\s*(eval\(function[\s\S]*?)var played = \d+;""").find(videoReq)?.groupValues?.get(1) ?: throw ErrorLoadingException("File not found")
             val jwSetup     = getAndUnpack(getAndUnpack(evaljwSetup)).replace("\\\\", "\\")
             extractedValue  = Regex("""file":"(.*)","label""").find(jwSetup)?.groupValues?.get(1)?.replace("\\\\x", "")
 
             val bytes = extractedValue?.chunked(2)?.map { it.toInt(16).toByte() }?.toByteArray()
-            decoded   = bytes?.toString(Charsets.UTF_8) ?: throw ErrorLoadingException("File not found")
+            decoded   = bytes?.decodeToString() ?: throw ErrorLoadingException("File not found")
         }
 
         callback.invoke(
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Videa.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Videa.kt
index 47840a08a..59d7a7f2e 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Videa.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Videa.kt
@@ -47,7 +47,7 @@ class Videa : ExtractorApi() {
                     rawBytes[4] == 0x6C.toByte()     // 'l'
 
             val videaXml = if (isXml) {
-                String(rawBytes, Charsets.UTF_8)
+                rawBytes.decodeToString()
             } else {
                 // Handle encrypted XML response
                 val xsHeader = response.headers["X-Videa-Xs"] ?: return
@@ -179,7 +179,7 @@ class Videa : ExtractorApi() {
         }
 
         val actualEncryptedBytes = if (isBase64) {
-            val base64String = String(encryptedBytes, Charsets.UTF_8)
+            val base64String = encryptedBytes.decodeToString()
                 .replace("\r", "")
                 .replace("\n", "")
                 .replace(" ", "")
@@ -189,7 +189,7 @@ class Videa : ExtractorApi() {
             encryptedBytes
         }
 
-        val keyBytes = key.toByteArray(Charsets.UTF_8)
+        val keyBytes = key.encodeToByteArray()
 
         // RC4 key-scheduling algorithm (KSA)
         val s = IntArray(256) { it }
@@ -211,6 +211,6 @@ class Videa : ExtractorApi() {
             result[k] = ((actualEncryptedBytes[k].toInt() and 0xFF) xor keyStreamByte).toByte()
         }
 
-        return String(result, Charsets.UTF_8)
+        return result.decodeToString()
     }
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
index bea75aa58..898550b24 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
@@ -1187,7 +1187,7 @@ object HlsPlaylistParser {
             return SchemeData(
                 uuid = C.WIDEVINE_UUID,
                 mimeType = "hls",
-                data = line.toByteArray(charset = Charsets.UTF_8)
+                data = line.encodeToByteArray()
             )
         } else if (KEYFORMAT_PLAYREADY == keyFormat && "1" == keyFormatVersions) {
             val uriString = parseStringAttr(line, REGEX_URI, variableDefinitions)

From c6c70d5751ce02a662a1207da5354f4e01d32cfe Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 23 May 2026 16:43:32 -0600
Subject: [PATCH 133/177] [skip ci] Remove an unused import (#2830)

---
 .../kotlin/com/lagradost/cloudstream3/extractors/Streamhub.kt    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamhub.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamhub.kt
index 611711e39..2cb9a5e5d 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamhub.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamhub.kt
@@ -8,7 +8,6 @@ import com.lagradost.cloudstream3.utils.INFER_TYPE
 import com.lagradost.cloudstream3.utils.JsUnpacker
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import java.net.URI
 
 open class Streamhub : ExtractorApi() {
     override var mainUrl = "https://streamhub.to"

From 0b642bb47f0d942fc7512d287e5bc17b62f2f9b5 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 23 May 2026 16:44:31 -0600
Subject: [PATCH 134/177] [skip ci] Use StringUtils.decodeUri in a couple
 places (#2831)

Gives us just one place to update the API when we get there
---
 .../kotlin/com/lagradost/cloudstream3/extractors/Cda.kt       | 4 ++--
 .../kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt
index e37c498f9..4b7f8a1cd 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt
@@ -6,8 +6,8 @@ import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
+import com.lagradost.cloudstream3.utils.StringUtils.decodeUri
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import java.net.URLDecoder
 
 open class Cda : ExtractorApi() {
     override var mainUrl = "https://ebd.cda.pl"
@@ -64,7 +64,7 @@ open class Cda : ExtractorApi() {
             .replace("_QWE", "")
             .replace("_Q5", "")
             .replace("_IKSDE", "")
-        a = URLDecoder.decode(a, "UTF-8")
+        a = a.decodeUri()
         a = a.map { char ->
             if (char.code in 33..126) {
                 return@map (33 + (char.code + 14) % 94).toChar().toString()
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt
index 206b0f29f..6d9862d3a 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt
@@ -2,9 +2,9 @@ package com.lagradost.cloudstream3.utils
 
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.base64Decode
+import com.lagradost.cloudstream3.utils.StringUtils.decodeUri
 import com.lagradost.nicehttp.NiceResponse
 import java.net.URI
-import java.net.URLDecoder
 
 // Code heavily based on unshortenit.py form kodiondemand /addon
 
@@ -189,7 +189,7 @@ object ShortLink {
     }
 
     fun unshortenDavisonbarker(uri: String): String {
-        return URLDecoder.decode(uri.substringAfter("dest="), "UTF-8")
+        return uri.substringAfter("dest=").decodeUri()
     }
 
     suspend fun unshortenIsecure(uri: String): String {

From 0afb23eb2e351016ca381c11e76c8a81b67576cc Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 24 May 2026 16:16:53 -0600
Subject: [PATCH 135/177] Bump material to 1.14.0 stable (#2752)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a97145c3f..f0dedf709 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -29,7 +29,7 @@ kotlinGradlePlugin = "2.3.20"
 kotlinxCollectionsImmutable = "0.4.0"
 kotlinxCoroutinesCore = "1.10.2"
 lifecycleKtx = "2.10.0"
-material = "1.14.0-beta01"
+material = "1.14.0"
 media3 = "1.9.3"
 navigationKtx = "2.9.7"
 newpipeextractor = "v0.26.0"

From 00e943ebc485329aeb00df8908f797dc01fe69c3 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 24 May 2026 16:31:27 -0600
Subject: [PATCH 136/177] Replace synchronized usage in library with
 kotlinx-atomicfu (#2808)

---
 .../lagradost/cloudstream3/MainActivity.kt    | 20 +++----
 .../cloudstream3/actions/VideoClickAction.kt  |  4 +-
 .../lagradost/cloudstream3/plugins/Plugin.kt  |  7 +--
 .../cloudstream3/plugins/PluginManager.kt     | 33 ++++++-----
 .../cloudstream3/syncproviders/AuthAPI.kt     |  1 -
 .../syncproviders/SubtitleRepo.kt             | 30 ++++++----
 .../cloudstream3/ui/APIRepository.kt          | 20 ++++---
 .../cloudstream3/ui/home/HomeViewModel.kt     |  2 +-
 .../ui/library/LibraryFragment.kt             | 15 +++--
 .../ui/result/ResultViewModel2.kt             | 13 ++--
 .../cloudstream3/ui/search/SearchViewModel.kt |  4 +-
 .../ui/settings/SettingsGeneral.kt            |  2 +-
 .../ui/settings/SettingsProviders.kt          |  8 +--
 .../ui/settings/testing/TestViewModel.kt      | 14 ++---
 .../ui/setup/SetupFragmentExtensions.kt       |  2 +-
 .../ui/setup/SetupFragmentProviderLanguage.kt |  6 +-
 .../cloudstream3/utils/AppContextUtils.kt     | 24 +-------
 .../lagradost/cloudstream3/utils/SyncUtil.kt  |  6 +-
 gradle/libs.versions.toml                     |  2 +
 library/build.gradle.kts                      |  1 +
 .../network/WebViewResolver.android.kt        |  4 +-
 .../com/lagradost/cloudstream3/MainAPI.kt     | 30 ++++------
 .../metaproviders/CrossTmdbProvider.kt        |  6 +-
 .../cloudstream3/plugins/BasePlugin.kt        |  9 +--
 .../cloudstream3/utils/AtomicList.kt          | 59 +++++++++++++++++++
 .../cloudstream3/utils/Coroutines.kt          | 17 ++++--
 .../cloudstream3/utils/ExtractorApi.kt        |  3 +-
 27 files changed, 191 insertions(+), 151 deletions(-)
 create mode 100644 library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AtomicList.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 8a98bd297..90583011d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -408,13 +408,10 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                                 return true
                             }
 
-                            synchronized(apis) {
-                                for (api in apis) {
-                                    if (str.startsWith(api.mainUrl)) {
-                                        loadResult(str, api.name, "")
-                                        return true
-                                    }
-                                }
+                            val matchedApi = apis.filter { str.startsWith(it.mainUrl) }.firstOrNull()
+                            if (matchedApi != null) {
+                                loadResult(str, matchedApi.name, "")
+                                return true
                             }
                         }
                     }
@@ -809,12 +806,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         }
     }
 
-
     private val pluginsLock = Mutex()
     private fun onAllPluginsLoaded(success: Boolean = false) {
         ioSafe {
             pluginsLock.withLock {
-                synchronized(allProviders) {
+                allProviders.withLock {
                     // Load cloned sites after plugins have been loaded since clones depend on plugins.
                     try {
                         getKey<Array<SettingsGeneral.CustomSite>>(USER_PROVIDER_API)?.let { list ->
@@ -1657,9 +1653,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         ioSafe {
             initAll()
             // No duplicates (which can happen by registerMainAPI)
-            apis = synchronized(allProviders) {
-                allProviders.distinctBy { it }
-            }
+            apis = allProviders.distinctBy { it }
         }
 
         //  val navView: BottomNavigationView = findViewById(R.id.nav_view)
@@ -1967,7 +1961,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
 
         if (BuildConfig.DEBUG) {
             var providersAndroidManifestString = "Current androidmanifest should be:\n"
-            synchronized(allProviders) {
+            allProviders.withLock {
                 for (api in allProviders) {
                     providersAndroidManifestString += "<data android:scheme=\"https\" android:host=\"${
                         api.mainUrl.removePrefix(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt
index 4843b7617..3ed858ef3 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt
@@ -32,8 +32,8 @@ import com.lagradost.cloudstream3.actions.temp.fcast.FcastAction
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
 import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.Coroutines.atomicListOf
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.UiText
 import kotlinx.coroutines.Dispatchers
@@ -43,7 +43,7 @@ import java.util.concurrent.FutureTask
 import kotlin.reflect.jvm.jvmName
 
 object VideoClickActionHolder {
-    val allVideoClickActions = threadSafeListOf(
+    val allVideoClickActions = atomicListOf(
         // Default
         PlayInBrowserAction(),
         CopyClipboardAction(),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt
index efa028d14..e1496db06 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt
@@ -7,7 +7,6 @@ import com.lagradost.cloudstream3.actions.VideoClickAction
 import com.lagradost.cloudstream3.actions.VideoClickActionHolder
 import kotlin.Throws
 
-
 abstract class Plugin : BasePlugin() {
     /**
      * Called when your Plugin is loaded
@@ -26,9 +25,7 @@ abstract class Plugin : BasePlugin() {
     fun registerVideoClickAction(element: VideoClickAction) {
         Log.i(PLUGIN_TAG, "Adding ${element.name} VideoClickAction")
         element.sourcePlugin = this.filename
-        synchronized(VideoClickActionHolder.allVideoClickActions) {
-            VideoClickActionHolder.allVideoClickActions.add(element)
-        }
+        VideoClickActionHolder.allVideoClickActions.add(element)
     }
 
     /**
@@ -40,4 +37,4 @@ abstract class Plugin : BasePlugin() {
      * This will add a button in the settings allowing you to add custom settings
      */
     var openSettings: ((context: Context) -> Unit)? = null
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
index eae14a6c0..aff1a2f33 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -651,9 +651,15 @@ object PluginManager {
                     context.resources.configuration
                 )
             }
-            plugins[filePath] = pluginInstance
-            classLoaders[loader] = pluginInstance
-            urlPlugins[data.url ?: filePath] = pluginInstance
+            synchronized(plugins) {
+                plugins[filePath] = pluginInstance
+            }
+            synchronized(classLoaders) {
+                classLoaders[loader] = pluginInstance
+            }
+            synchronized(urlPlugins) {
+                urlPlugins[data.url ?: filePath] = pluginInstance
+            }
             if (pluginInstance is Plugin) {
                 pluginInstance.load(context)
             } else {
@@ -689,21 +695,20 @@ object PluginManager {
         }
 
         // remove all registered apis
-        synchronized(APIHolder.apis) {
-            APIHolder.apis.filter { api -> api.sourcePlugin == plugin.filename }.forEach {
-                removePluginMapping(it)
-            }
-        }
-        synchronized(APIHolder.allProviders) {
-            APIHolder.allProviders.removeIf { provider: MainAPI -> provider.sourcePlugin == plugin.filename }
+        APIHolder.apis.filter { api -> api.sourcePlugin == plugin.filename }.forEach {
+            removePluginMapping(it)
         }
 
-        synchronized(extractorApis) {
-            extractorApis.removeIf { provider: ExtractorApi -> provider.sourcePlugin == plugin.filename }
+        APIHolder.allProviders.withLock {
+            APIHolder.allProviders.removeAll { provider -> provider.sourcePlugin == plugin.filename }
         }
 
-        synchronized(VideoClickActionHolder.allVideoClickActions) {
-            VideoClickActionHolder.allVideoClickActions.removeIf { action: VideoClickAction -> action.sourcePlugin == plugin.filename }
+        extractorApis.withLock {
+            extractorApis.removeAll { provider -> provider.sourcePlugin == plugin.filename }
+        }
+
+        VideoClickActionHolder.allVideoClickActions.withLock {
+            VideoClickActionHolder.allVideoClickActions.removeAll { action -> action.sourcePlugin == plugin.filename }
         }
 
         synchronized(classLoaders) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt
index 83a7a0984..9a1a441f1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt
@@ -36,7 +36,6 @@ import com.lagradost.cloudstream3.syncproviders.providers.SubSourceApi
 import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.utils.AppContextUtils.splitQuery
-import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.UiText
 import com.lagradost.cloudstream3.utils.txt
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SubtitleRepo.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SubtitleRepo.kt
index 7a93f96f6..0b8c3e5ae 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SubtitleRepo.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SubtitleRepo.kt
@@ -6,7 +6,7 @@ import com.lagradost.cloudstream3.ErrorLoadingException
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleEntity
 import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleSearch
 import com.lagradost.cloudstream3.subtitles.SubtitleResource
-import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
+import com.lagradost.cloudstream3.utils.Coroutines.atomicListOf
 
 /** Stateless safe abstraction of SubtitleAPI */
 class SubtitleRepo(override val api: SubtitleAPI) : AuthRepo(api) {
@@ -24,26 +24,30 @@ class SubtitleRepo(override val api: SubtitleAPI) : AuthRepo(api) {
         )
 
         // maybe make this a generic struct? right now there is a lot of boilerplate
-        private val searchCache = threadSafeListOf<SavedSearchResponse>()
+        private val searchCache = atomicListOf<SavedSearchResponse>()
         private var searchCacheIndex: Int = 0
-        private val resourceCache = threadSafeListOf<SavedResourceResponse>()
+        private val resourceCache = atomicListOf<SavedResourceResponse>()
         private var resourceCacheIndex: Int = 0
         const val CACHE_SIZE = 20
     }
 
     @WorkerThread
     suspend fun resource(data: SubtitleEntity): Result<SubtitleResource> = runCatching {
-        synchronized(resourceCache) {
+        val cached = resourceCache.withLock {
+            var found: SubtitleResource? = null
             for (item in resourceCache) {
                 // 20 min save
                 if (item.query == data && (unixTime - item.unixTime) < 60 * 20) {
-                    return@runCatching item.response
+                    found = item.response
+                    break
                 }
             }
+            found
         }
+        if (cached != null) return@runCatching cached
 
         val returnValue = api.resource(freshAuth(), data)
-        synchronized(resourceCache) {
+        resourceCache.withLock {
             val add = SavedResourceResponse(unixTime, returnValue, data)
             if (resourceCache.size > CACHE_SIZE) {
                 resourceCache[resourceCacheIndex] = add // rolling cache
@@ -58,22 +62,25 @@ class SubtitleRepo(override val api: SubtitleAPI) : AuthRepo(api) {
     @WorkerThread
     suspend fun search(query: SubtitleSearch): Result<List<SubtitleEntity>> {
         return runCatching {
-            synchronized(searchCache) {
+            val cached = searchCache.withLock {
+                var found: List<SubtitleEntity>? = null
                 for (item in searchCache) {
                     // 120 min save
                     if (item.query == query && (unixTime - item.unixTime) < 60 * 120) {
-                        return@runCatching item.response
+                        found = item.response
+                        break
                     }
                 }
+                found
             }
 
-            val returnValue =
-                api.search(freshAuth(), query) ?: emptyList()
+            if (cached != null) return@runCatching cached
+            val returnValue = api.search(freshAuth(), query) ?: emptyList()
 
             // only cache valid return values
             if (returnValue.isNotEmpty()) {
                 val add = SavedSearchResponse(unixTime, returnValue, query)
-                synchronized(searchCache) {
+                searchCache.withLock {
                     if (searchCache.size > CACHE_SIZE) {
                         searchCache[searchCacheIndex] = add // rolling cache
                         searchCacheIndex = (searchCacheIndex + 1) % CACHE_SIZE
@@ -86,4 +93,3 @@ class SubtitleRepo(override val api: SubtitleAPI) : AuthRepo(api) {
         }
     }
 }
-
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
index 93a79689e..8ec082520 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt
@@ -17,7 +17,7 @@ import com.lagradost.cloudstream3.mvvm.Resource
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safeApiCall
 import com.lagradost.cloudstream3.newSearchResponseList
-import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
+import com.lagradost.cloudstream3.utils.Coroutines.atomicListOf
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.async
@@ -55,7 +55,7 @@ class APIRepository(val api: MainAPI) {
             val hash: Pair<String, String>
         )
 
-        private val cache = threadSafeListOf<SavedLoadResponse>()
+        private val cache = atomicListOf<SavedLoadResponse>()
         private var cacheIndex: Int = 0
         const val CACHE_SIZE = 20
 
@@ -66,9 +66,7 @@ class APIRepository(val api: MainAPI) {
 
     private fun afterPluginsLoaded(forceReload: Boolean) {
         if (forceReload) {
-            synchronized(cache) {
-                cache.clear()
-            }
+            cache.clear()
         }
     }
 
@@ -91,21 +89,25 @@ class APIRepository(val api: MainAPI) {
                 val fixedUrl = api.fixUrl(url)
                 val lookingForHash = Pair(api.name, fixedUrl)
 
-                synchronized(cache) {
+                val cached = cache.withLock {
+                    var found: LoadResponse? = null
                     for (item in cache) {
                         // 10 min save
                         if (item.hash == lookingForHash && (unixTime - item.unixTime) < 60 * 10) {
-                            return@withTimeout item.response
+                            found = item.response
+                            break
                         }
                     }
+                    found
                 }
 
+                if (cached != null) return@withTimeout cached
                 api.load(fixedUrl)?.also { response ->
                     // Remove all blank tags as early as possible
                     response.tags = response.tags?.filter { it.isNotBlank() }
                     val add = SavedLoadResponse(unixTime, response, lookingForHash)
 
-                    synchronized(cache) {
+                    cache.withLock {
                         if (cache.size > CACHE_SIZE) {
                             cache[cacheIndex] = add // rolling cache
                             cacheIndex = (cacheIndex + 1) % CACHE_SIZE
@@ -215,4 +217,4 @@ class APIRepository(val api: MainAPI) {
             return false
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
index e0609c0e5..8d48f5a68 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt
@@ -133,7 +133,7 @@ class HomeViewModel : ViewModel() {
     private var currentShuffledList: List<SearchResponse> = listOf()
 
     private fun autoloadRepo(): APIRepository {
-        return APIRepository(synchronized(apis) { apis.first { it.hasMainPage } })
+        return APIRepository(apis.withLock { apis.first { it.hasMainPage } })
     }
 
     private val _availableWatchStatusTypes =
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
index 6e28c128d..c5f8fa3d9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
@@ -210,14 +210,13 @@ class LibraryFragment : BaseFragment<FragmentLibraryBinding>(
             syncId: SyncIdName,
             apiName: String? = null,
         ) {
-            val availableProviders = synchronized(allProviders) {
-                allProviders.filter {
-                    it.supportedSyncNames.contains(syncId)
-                }.map { it.name } +
-                        // Add the api if it exists
-                        (APIHolder.getApiFromNameNull(apiName)?.let { listOf(it.name) }
-                            ?: emptyList())
-            }
+            val availableProviders = allProviders.filter {
+                it.supportedSyncNames.contains(syncId)
+            }.map { it.name } +
+                // Add the api if it exists
+                (APIHolder.getApiFromNameNull(apiName)?.let { listOf(it.name) }
+                    ?: emptyList())
+
             val baseOptions = listOf(
                 LibraryOpenerType.Default,
                 LibraryOpenerType.None,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index 7dfe3cf59..b48adbf4d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -1685,14 +1685,13 @@ class ResultViewModel2 : ViewModel() {
                 }
 
                 val realRecommendations = ArrayList<SearchResponse>()
-                val apiNames = synchronized(apis) {
-                    apis.filter {
-                        it.name.contains("gogoanime", true) ||
-                                it.name.contains("9anime", true)
-                    }.map {
-                        it.name
-                    }
+                val apiNames = apis.filter {
+                    it.name.contains("gogoanime", true) ||
+                        it.name.contains("9anime", true)
+                }.map {
+                    it.name
                 }
+
                 meta.recommendations?.forEach { rec ->
                     apiNames.forEach { name ->
                         realRecommendations.add(rec.copy(apiName = name))
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt
index 27db8d1ae..f60588e35 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt
@@ -49,7 +49,7 @@ class SearchViewModel : ViewModel() {
 
     private var suggestionJob: Job? = null
 
-    private var repos = synchronized(apis) { apis.map { APIRepository(it) } }
+    private var repos = apis.withLock { apis.map { APIRepository(it) } }
 
     fun clearSearch() {
         _searchResponse.postValue(Resource.Success(ExpandableSearchList(emptyList(), 0, false)))
@@ -68,7 +68,7 @@ class SearchViewModel : ViewModel() {
     private var onGoingSearch: Job? = null
 
     fun reloadRepos() {
-        repos = synchronized(apis) { apis.map { APIRepository(it) } }
+        repos = apis.withLock { apis.map { APIRepository(it) } }
     }
 
     fun searchAndCancel(
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index dbf2ff1dc..57f5aa870 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -219,7 +219,7 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
         }
 
         fun showAdd() {
-            val providers = synchronized(allProviders) { allProviders.distinctBy { it.javaClass }.sortedBy { it.name } }
+            val providers = allProviders.distinctBy { it::class }.sortedBy { it.name }
             activity?.showDialog(
                 providers.map { "${it.name} (${it.mainUrl})" },
                 -1,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
index 076f17a0a..c8478a840 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
@@ -111,10 +111,10 @@ class SettingsProviders : BasePreferenceFragmentCompat() {
 
         getPref(R.string.provider_lang_key)?.setOnPreferenceClickListener {
             activity?.getApiProviderLangSettings()?.let { currentLangTags ->
-                val languagesTagName = synchronized(APIHolder.apis) {
-                    listOf( Pair(AllLanguagesName, getString(R.string.all_languages_preference)) ) +
-                    APIHolder.apis.map { Pair(it.lang, getNameNextToFlagEmoji(it.lang) ?: it.lang) }
-                        .toSet().sortedBy { it.second.substringAfter("\u00a0").lowercase() } // name ignoring flag emoji
+                val languagesTagName = APIHolder.apis.withLock {
+                    listOf(Pair(AllLanguagesName, getString(R.string.all_languages_preference))) +
+                        APIHolder.apis.map { Pair(it.lang, getNameNextToFlagEmoji(it.lang) ?: it.lang) }
+                            .toSet().sortedBy { it.second.substringAfter("\u00a0").lowercase() }
                 }
 
                 val currentIndexList = currentLangTags.map { langTag ->
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt
index 818f1fd79..22500d931 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.lagradost.cloudstream3.APIHolder
 import com.lagradost.cloudstream3.MainAPI
-import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
+import com.lagradost.cloudstream3.utils.Coroutines.atomicListOf
 import com.lagradost.cloudstream3.utils.TestingUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -40,7 +40,7 @@ class TestViewModel : ViewModel() {
         get() = scope != null
 
     private var filter = ProviderFilter.All
-    private val providers = threadSafeListOf<Pair<MainAPI, TestingUtils.TestResultProvider>>()
+    private val providers = atomicListOf<Pair<MainAPI, TestingUtils.TestResultProvider>>()
     private var passed = 0
     private var failed = 0
     private var total = 0
@@ -51,9 +51,9 @@ class TestViewModel : ViewModel() {
     }
 
     private fun postProviders() {
-        synchronized(providers) {
+        providers.withLock {
             val filtered = when (filter) {
-                ProviderFilter.All -> providers
+                ProviderFilter.All -> providers.toList()
                 ProviderFilter.Passed -> providers.filter { it.second.success }
                 ProviderFilter.Failed -> providers.filter { !it.second.success }
             }
@@ -68,7 +68,7 @@ class TestViewModel : ViewModel() {
     }
 
     private fun addProvider(api: MainAPI, results: TestingUtils.TestResultProvider) {
-        synchronized(providers) {
+        providers.withLock {
             val index = providers.indexOfFirst { it.first == api }
             if (index == -1) {
                 providers.add(api to results)
@@ -81,14 +81,14 @@ class TestViewModel : ViewModel() {
     }
 
     fun init() {
-        total = synchronized(APIHolder.allProviders) { APIHolder.allProviders.size }
+        total = APIHolder.allProviders.withLock { APIHolder.allProviders.size }
         updateProgress()
     }
 
     fun startTest() {
         scope = CoroutineScope(Dispatchers.Default)
 
-        val apis = synchronized(APIHolder.allProviders) { APIHolder.allProviders.toTypedArray() }
+        val apis = APIHolder.allProviders.withLock { APIHolder.allProviders.toTypedArray() }
         total = apis.size
         failed = 0
         passed = 0
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
index 501ee0eef..8c2e8e344 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
@@ -84,7 +84,7 @@ class SetupFragmentExtensions : BaseFragment<FragmentSetupExtensionsBinding>(
                     if (isSetup)
                         if (
                         // If any available languages
-                            synchronized(apis) { apis.distinctBy { it.lang }.size > 1 }
+                            apis.distinctBy { it.lang }.size > 1
                         ) {
                             findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_provider_languages)
                         } else {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
index 3c4a09ade..c18be8a2f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
@@ -36,10 +36,10 @@ class SetupFragmentProviderLanguage : BaseFragment<FragmentSetupProviderLanguage
 
             val currentLangTags = ctx.getApiProviderLangSettings()
 
-            val languagesTagName = synchronized(APIHolder.apis) {
-                listOf( Pair(AllLanguagesName, getString(R.string.all_languages_preference)) ) +
+            val languagesTagName = APIHolder.apis.withLock {
+                listOf(Pair(AllLanguagesName, getString(R.string.all_languages_preference))) +
                 APIHolder.apis.map { Pair(it.lang, getNameNextToFlagEmoji(it.lang) ?: it.lang) }
-                    .toSet().sortedBy { it.second.substringAfter("\u00a0").lowercase() } // name ignoring flag emoji
+                    .toSet().sortedBy { it.second.substringAfter("\u00a0").lowercase() } // name ignoring flag emoji
             }
 
             val currentIndexList = currentLangTags.map { langTag ->
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt
index 1377ccd08..7278fcdd7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt
@@ -369,28 +369,10 @@ object AppContextUtils {
     }
 
     fun Context.getApiSettings(): HashSet<String> {
-        //val settingsManager = PreferenceManager.getDefaultSharedPreferences(this)
-
         val hashSet = HashSet<String>()
         val activeLangs = getApiProviderLangSettings()
         val hasUniversal = activeLangs.contains(AllLanguagesName)
-        hashSet.addAll(synchronized(apis) { apis.filter { hasUniversal || activeLangs.contains(it.lang) } }
-            .map { it.name })
-
-        /*val set = settingsManager.getStringSet(
-            this.getString(R.string.search_providers_list_key),
-            hashSet
-        )?.toHashSet() ?: hashSet
-
-        val list = HashSet<String>()
-        for (name in set) {
-            val api = getApiFromNameNull(name) ?: continue
-            if (activeLangs.contains(api.lang)) {
-                list.add(name)
-            }
-        }*/
-        //if (list.isEmpty()) return hashSet
-        //return list
+        hashSet.addAll(apis.filter { hasUniversal || activeLangs.contains(it.lang) }.map { it.name })
         return hashSet
     }
 
@@ -481,9 +463,7 @@ object AppContextUtils {
         } ?: default
         val langs = this.getApiProviderLangSettings()
         val hasUniversal = langs.contains(AllLanguagesName)
-        val allApis = synchronized(apis) {
-            apis.filter { api -> (hasUniversal || langs.contains(api.lang)) && (api.hasMainPage || !hasHomePageIsRequired) }
-        }
+        val allApis = apis.filter { api -> (hasUniversal || langs.contains(api.lang)) && (api.hasMainPage || !hasHomePageIsRequired) }
         return if (currentPrefMedia.isEmpty()) {
             allApis
         } else {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
index 351e77c8d..539d5e1a4 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
@@ -96,10 +96,8 @@ object SyncUtil {
                 .mapNotNull { it.url }.toMutableList()
 
         if (type == "anilist") { // TODO MAKE BETTER
-            synchronized(apis) {
-                apis.filter { it.name.contains("Aniflix", ignoreCase = true) }.forEach {
-                    current.add("${it.mainUrl}/anime/$id")
-                }
+            apis.filter { it.name.contains("Aniflix", ignoreCase = true) }.forEach {
+                current.add("${it.mainUrl}/anime/$id")
             }
         }
         return current
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f0dedf709..2a8775761 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,6 +26,7 @@ junitKtx = "1.3.0"
 junitVersion = "1.3.0"
 juniversalchardet = "2.5.0"
 kotlinGradlePlugin = "2.3.20"
+kotlinxAtomicfu = "0.32.1"
 kotlinxCollectionsImmutable = "0.4.0"
 kotlinxCoroutinesCore = "1.10.2"
 lifecycleKtx = "2.10.0"
@@ -81,6 +82,7 @@ jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 junit = { module = "junit:junit", version.ref = "junit" }
 junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "junitKtx" }
 juniversalchardet = { module = "com.github.albfernandez:juniversalchardet", version.ref = "juniversalchardet" }
+kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "kotlinxAtomicfu" }
 kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinxCollectionsImmutable" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
 lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleKtx" }
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index 073e49e64..b5f525e83 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -56,6 +56,7 @@ kotlin {
             implementation(libs.annotation) // Annotations
             implementation(libs.nicehttp) // HTTP Lib
             implementation(libs.jackson.module.kotlin) // JSON Parser
+            implementation(libs.kotlinx.atomicfu)
             implementation(libs.kotlinx.coroutines.core)
             implementation(libs.fuzzywuzzy) // Match Extractors
             implementation(libs.jsoup) // HTML Parser
diff --git a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt b/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt
index 975572d05..bc443b3f8 100644
--- a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt
+++ b/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt
@@ -10,10 +10,10 @@ import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.debugException
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.mvvm.safe
+import com.lagradost.cloudstream3.utils.Coroutines.atomicListOf
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.Coroutines.mainWork
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
-import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.nicehttp.requestCreator
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
@@ -119,7 +119,7 @@ actual class WebViewResolver actual constructor(
         }
 
         var fixedRequest: Request? = null
-        val extraRequestList = threadSafeListOf<Request>()
+        val extraRequestList = atomicListOf<Request>()
 
         main {
             try {
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index fae2bf5e7..f0ddd54c9 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -17,8 +17,8 @@ import com.lagradost.cloudstream3.syncproviders.SyncIdName
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
+import com.lagradost.cloudstream3.utils.Coroutines.atomicListOf
 import com.lagradost.cloudstream3.utils.Coroutines.mainWork
-import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromCodeToLangTagIETF
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromLanguageToTagIETF
 import com.lagradost.nicehttp.RequestBodyTypes
@@ -85,11 +85,10 @@ object APIHolder {
     val unixTimeMS: Long
         get() = System.currentTimeMillis()
 
-    // ConcurrentModificationException is possible!!!
-    val allProviders = threadSafeListOf<MainAPI>()
+    val allProviders = atomicListOf<MainAPI>()
 
     fun initAll() {
-        synchronized(allProviders) {
+        allProviders.withLock {
             for (api in allProviders) {
                 api.init()
             }
@@ -102,25 +101,25 @@ object APIHolder {
         return this.replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
     }
 
-    var apis: List<MainAPI> = threadSafeListOf()
+    var apis: AtomicList<MainAPI> = atomicListOf()
     var apiMap: Map<String, Int>? = null
 
     fun addPluginMapping(plugin: MainAPI) {
-        synchronized(apis) {
+        apis.withLock {
             apis = apis + plugin
         }
         initMap(true)
     }
 
     fun removePluginMapping(plugin: MainAPI) {
-        synchronized(apis) {
+        apis.withLock {
             apis = apis.filter { it != plugin }
         }
         initMap(true)
     }
 
     private fun initMap(forcedUpdate: Boolean = false) {
-        synchronized(apis) {
+        apis.withLock {
             if (apiMap == null || forcedUpdate)
                 apiMap = apis.mapIndexed { index, api -> api.name to index }.toMap()
         }
@@ -128,24 +127,21 @@ object APIHolder {
 
     fun getApiFromNameNull(apiName: String?): MainAPI? {
         if (apiName == null) return null
-        synchronized(allProviders) {
+        return allProviders.withLock {
             initMap()
-            synchronized(apis) {
-                return apiMap?.get(apiName)?.let { apis.getOrNull(it) }
+            apis.withLock {
+                apiMap?.get(apiName)?.let { apis.getOrNull(it) }
                 // Leave the ?. null check, it can crash regardless
-                    ?: allProviders.firstOrNull { it.name == apiName }
+                ?: allProviders.firstOrNull { it.name == apiName }
             }
         }
     }
 
     fun getApiFromUrlNull(url: String?): MainAPI? {
         if (url == null) return null
-        synchronized(allProviders) {
-            allProviders.forEach { api ->
-                if (url.startsWith(api.mainUrl)) return api
-            }
+        return allProviders.withLock {
+            allProviders.firstOrNull { url.startsWith(it.mainUrl) }
         }
-        return null
     }
 
     /**
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
index 6fde6efe3..7076e407f 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/CrossTmdbProvider.kt
@@ -30,11 +30,9 @@ class CrossTmdbProvider : TmdbProvider() {
     }
 
     private val validApis
-        get() =
-            synchronized(apis) { apis.filter { it.lang == this.lang && it::class.java != this::class.java } }
+        get() = apis.filter { it.lang == this.lang && it::class != this::class }
     //.distinctBy { it.uniqueId }
 
-
     data class CrossMetaData(
         @JsonProperty("isSuccess") val isSuccess: Boolean,
         @JsonProperty("movies") val movies: List<Pair<String, String>>? = null,
@@ -121,4 +119,4 @@ class CrossTmdbProvider : TmdbProvider() {
 
         return base
     }
-}
\ No newline at end of file
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/BasePlugin.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/BasePlugin.kt
index 61f87b8ba..f4fce2ef3 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/BasePlugin.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/plugins/BasePlugin.kt
@@ -17,10 +17,7 @@ abstract class BasePlugin {
     fun registerMainAPI(element: MainAPI) {
         Log.i(PLUGIN_TAG, "Adding ${element.name} (${element.mainUrl}) MainAPI")
         element.sourcePlugin = this.filename
-        // Race condition causing which would case duplicates if not for distinctBy
-        synchronized(APIHolder.allProviders) {
-            APIHolder.allProviders.add(element)
-        }
+        APIHolder.allProviders.add(element)
         APIHolder.addPluginMapping(element)
     }
 
@@ -31,9 +28,7 @@ abstract class BasePlugin {
     fun registerExtractorAPI(element: ExtractorApi) {
         Log.i(PLUGIN_TAG, "Adding ${element.name} (${element.mainUrl}) ExtractorApi")
         element.sourcePlugin = this.filename
-        synchronized(extractorApis) {
-            extractorApis.add(element)
-        }
+        extractorApis.add(element)
     }
 
     /**
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AtomicList.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AtomicList.kt
new file mode 100644
index 000000000..0be02ac6f
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AtomicList.kt
@@ -0,0 +1,59 @@
+package com.lagradost.cloudstream3.utils
+
+import kotlinx.atomicfu.locks.SynchronizedObject
+import kotlinx.atomicfu.locks.synchronized
+
+/**
+ * A thread-safe list backed by [SynchronizedObject].
+ *
+ * For iteration, wrap block in [withLock] to hold the lock for the duration:
+ *   list.withLock { list.forEach { ... } }
+ */
+open class AtomicList<T>(
+    private val delegate: List<T> = emptyList(),
+) : List<T>, SynchronizedObject() {
+
+    fun <R> withLock(block: () -> R): R = synchronized(this) { block() }
+
+    fun filter(predicate: (T) -> Boolean): AtomicList<T> = synchronized(this) { AtomicList(delegate.filter(predicate)) }
+    fun distinctBy(selector: (T) -> Any?): AtomicList<T> = synchronized(this) { AtomicList(delegate.distinctBy(selector)) }
+
+    override val size: Int get() = synchronized(this) { delegate.size }
+    override fun isEmpty(): Boolean = synchronized(this) { delegate.isEmpty() }
+    override fun contains(element: T): Boolean = synchronized(this) { delegate.contains(element) }
+    override fun containsAll(elements: Collection<T>): Boolean = synchronized(this) { delegate.containsAll(elements) }
+    override fun get(index: Int): T = synchronized(this) { delegate[index] }
+    override fun indexOf(element: T): Int = synchronized(this) { delegate.indexOf(element) }
+    override fun lastIndexOf(element: T): Int = synchronized(this) { delegate.lastIndexOf(element) }
+
+    // Iterators intentionally NOT synchronized, callers must use withLock { } for safe iteration.
+    override fun iterator(): Iterator<T> = delegate.iterator()
+    override fun listIterator(): ListIterator<T> = delegate.listIterator()
+    override fun listIterator(index: Int): ListIterator<T> = delegate.listIterator(index)
+    override fun subList(fromIndex: Int, toIndex: Int): List<T> = delegate.subList(fromIndex, toIndex)
+
+    operator fun plus(element: T): AtomicList<T> = synchronized(this) { AtomicList(delegate + element) }
+    operator fun plus(elements: Collection<T>): AtomicList<T> = synchronized(this) { AtomicList(delegate + elements) }
+}
+
+class AtomicMutableList<T>(
+    private val mutableDelegate: MutableList<T> = mutableListOf(),
+) : AtomicList<T>(mutableDelegate), MutableList<T> {
+
+    override fun add(element: T): Boolean = synchronized(this) { mutableDelegate.add(element) }
+    override fun add(index: Int, element: T) = synchronized(this) { mutableDelegate.add(index, element) }
+    override fun addAll(elements: Collection<T>): Boolean = synchronized(this) { mutableDelegate.addAll(elements) }
+    override fun addAll(index: Int, elements: Collection<T>): Boolean = synchronized(this) { mutableDelegate.addAll(index, elements) }
+    override fun remove(element: T): Boolean = synchronized(this) { mutableDelegate.remove(element) }
+    override fun removeAt(index: Int): T = synchronized(this) { mutableDelegate.removeAt(index) }
+    override fun removeAll(elements: Collection<T>): Boolean = synchronized(this) { mutableDelegate.removeAll(elements) }
+    override fun retainAll(elements: Collection<T>): Boolean = synchronized(this) { mutableDelegate.retainAll(elements) }
+    override fun set(index: Int, element: T): T = synchronized(this) { mutableDelegate.set(index, element) }
+    override fun clear() = synchronized(this) { mutableDelegate.clear() }
+
+    // Iterators intentionally NOT synchronized, callers must use withLock { } for safe iteration.
+    override fun iterator(): MutableIterator<T> = mutableDelegate.iterator()
+    override fun listIterator(): MutableListIterator<T> = mutableDelegate.listIterator()
+    override fun listIterator(index: Int): MutableListIterator<T> = mutableDelegate.listIterator(index)
+    override fun subList(fromIndex: Int, toIndex: Int): MutableList<T> = mutableDelegate.subList(fromIndex, toIndex)
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt
index c525a1f36..d15ea129c 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt
@@ -3,10 +3,10 @@ package com.lagradost.cloudstream3.utils
 import androidx.annotation.AnyThread
 import androidx.annotation.MainThread
 import androidx.annotation.WorkerThread
+import com.lagradost.cloudstream3.Prerelease
 import com.lagradost.cloudstream3.mvvm.launchSafe
 import com.lagradost.cloudstream3.mvvm.logError
 import kotlinx.coroutines.*
-import java.util.Collections.synchronizedList
 
 @AnyThread
 expect fun runOnMainThreadNative(@MainThread work: (() -> Unit))
@@ -64,9 +64,18 @@ object Coroutines {
     /**
      * Safe to add and remove how you want
      * If you want to iterate over the list then you need to do:
-     * synchronized(allProviders) { code here }
+     * list.withLock { code here }
      */
-    fun <T> threadSafeListOf(vararg items: T): MutableList<T> {
-        return synchronizedList(items.toMutableList())
+    @Prerelease
+    fun <T> atomicListOf(vararg items: T): AtomicMutableList<T> {
+        return AtomicMutableList(items.toMutableList())
     }
+
+    // Deprecate after next stable
+    /*@Deprecated(
+        message = "Use atomicListOf() instead.",
+        replaceWith = ReplaceWith("atomicListOf(*items)"),
+        level = DeprecationLevel.WARNING,
+    )*/
+    fun <T> threadSafeListOf(vararg items: T): MutableList<T> = atomicListOf(*items)
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 45e2ba71e..b40dd90cf 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -308,6 +308,7 @@ import com.lagradost.cloudstream3.extractors.Zplayer
 import com.lagradost.cloudstream3.extractors.ZplayerV2
 import com.lagradost.cloudstream3.extractors.Ztreamhub
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.utils.Coroutines.atomicListOf
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.ensureActive
@@ -904,7 +905,7 @@ suspend fun loadExtractor(
     return false
 }
 
-val extractorApis: MutableList<ExtractorApi> = arrayListOf(
+val extractorApis: AtomicMutableList<ExtractorApi> = atomicListOf(
     //AllProvider(),
     Mp4Upload(),
     StreamTape(),

From 70ed1c753d8be67cd6a4c252b8ec09963aed07f8 Mon Sep 17 00:00:00 2001
From: IndusAryan <125901294+IndusAryan@users.noreply.github.com>
Date: Mon, 25 May 2026 04:29:43 +0530
Subject: [PATCH 137/177] (fix): implement hardware check for image loading
 (#2765)

---
 .../cloudstream3/utils/ImageModuleCoil.kt     | 74 ++++++++++++-------
 1 file changed, 46 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ImageModuleCoil.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ImageModuleCoil.kt
index 62cf1b996..96193fe45 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/ImageModuleCoil.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ImageModuleCoil.kt
@@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.utils
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.net.Uri
+import android.os.Build
 import android.os.Build.VERSION.SDK_INT
 import android.util.Log
 import android.widget.ImageView
@@ -11,6 +12,7 @@ import coil3.EventListener
 import coil3.ImageLoader
 import coil3.PlatformContext
 import coil3.SingletonImageLoader
+import coil3.decode.BitmapFactoryDecoder
 import coil3.disk.DiskCache
 import coil3.dispose
 import coil3.load
@@ -22,6 +24,7 @@ import coil3.request.CachePolicy
 import coil3.request.ErrorResult
 import coil3.request.ImageRequest
 import coil3.request.allowHardware
+import coil3.request.bitmapConfig
 import coil3.request.crossfade
 import coil3.util.DebugLogger
 import com.lagradost.cloudstream3.BuildConfig
@@ -32,71 +35,75 @@ import java.io.File
 import java.nio.ByteBuffer
 
 object ImageLoader {
-
     private const val TAG = "CoilImgLoader"
-
-    internal fun buildImageLoader(context: PlatformContext): ImageLoader = ImageLoader.Builder(context)
+    internal fun buildImageLoader(context: PlatformContext): ImageLoader {
+        val isBrokenHardware = hasPotentialBrokenHardware()
+        return ImageLoader.Builder(context)
             .crossfade(200)
-            .allowHardware(SDK_INT >= 28) // SDK_INT >= 28, cant use hardware bitmaps for Palette Builder
+            .allowHardware(SDK_INT >= 28 && !isBrokenHardware)
             .diskCachePolicy(CachePolicy.ENABLED)
             .networkCachePolicy(CachePolicy.ENABLED)
             .memoryCache {
-                MemoryCache.Builder().maxSizePercent(context, 0.1) // Use 10 % of the app's available memory for caching
+                MemoryCache.Builder().maxSizePercent(context, 0.1)//10 % of heap for mem-cache
+                    .strongReferencesEnabled(false)
                     .build()
             }
             .diskCache {
                 DiskCache.Builder()
                     .directory(context.cacheDir.resolve("cs3_image_cache").toOkioPath())
                     .maxSizeBytes(512L * 1024 * 1024) // 512 MB
-                    .maxSizePercent(0.04) // Use 4 % of the device's storage space for disk caching
+                    .maxSizePercent(0.04) // max 4% of storage for disk caching
                     .build()
             }
             /** Pass interceptors with care, unnecessary passing tokens to servers
             or image hosting services causes unauthorized exceptions **/
-            .components { add(OkHttpNetworkFetcherFactory(callFactory = { buildDefaultClient(context) })) }
-            .also {
-                it.setupCoilLogger()
-                Log.d(TAG, "buildImageLoader: Setting COIL Image Loader.")
+            .components {
+                add(OkHttpNetworkFetcherFactory(callFactory = { buildDefaultClient(context) }))
+                if (isBrokenHardware) {
+                    add(BitmapFactoryDecoder.Factory())
+                } // sw decoder
+            }
+            .apply {
+                if (isBrokenHardware) { // coil will auto choose optimal config on modern device
+                    bitmapConfig(Bitmap.Config.ARGB_8888)
+                }
+                setupCoilLogger()
             }
             .build()
+    }
 
-    /** Use DebugLogger on debug builds which won't slow down release builds & use EventListener for
+    /** DebugLogger on debug builds which won't slow down release builds & use EventListener for
     Errors on release builds. **/
     internal fun ImageLoader.Builder.setupCoilLogger() {
         if (BuildConfig.DEBUG) {
             logger(DebugLogger())
-            Log.d(TAG, "setupCoilLogger: Activated DEBUG_LOGGER FOR COIL")
         } else {
             eventListener(object : EventListener() {
                 override fun onError(request: ImageRequest, result: ErrorResult) {
                     super.onError(request, result)
-                    Log.e(TAG, "Error loading image: ${result.throwable}")
+                    Log.e(TAG, "Image load error: ${result.throwable.message ?: result.throwable}")
+                    Log.e(TAG, "  URL: ${request.data}")
+                    Log.e(TAG, "  allowHardware: ${request.allowHardware}")
+                    Log.e(TAG, "  hardware: ${Build.HARDWARE}, board: ${Build.BOARD}")
                 }
             })
-            Log.d(TAG, "setupCoilLogger: Activated EVENT_LISTENER FOR COIL")
         }
     }
 
-    /** we use coil's built in loader with our global synchronized instance, this way we achieve
-    latest and complete functionality as well as stability **/
+    /** coil's built in loader attached w/ global synchronized instance **/
     private fun ImageView.loadImageInternal(
         imageData: Any?,
         headers: Map<String, String>? = null,
         builder: ImageRequest.Builder.() -> Unit = {} // for placeholder, error & transformations
     ) {
-        // clear image to avoid loading & flickering issue at fast scrolling (e.g, an image recycler)
+        // clear image to avoid loading & flickering issue at fast scrolling (~recycler view/lazy column)
         this.dispose()
-
-        if(imageData == null) return // Just in case
-
+        if (imageData == null) return
         // setImageResource is better than coil3 on resources due to attr
-        if(imageData is Int) {
-            this.setImageResource(imageData)
-            return
+        if (imageData is Int) {
+            this.setImageResource(imageData); return
         }
-
-        // Use Coil's built-in load method but with our custom module & a decent USER-AGENT always
-        // which can be overridden by extensions.
+        // headers can be overridden by extensions.
         this.load(imageData, SingletonImageLoader.get(context)) {
             this.httpHeaders(NetworkHeaders.Builder().also { headerBuilder ->
                 headerBuilder["User-Agent"] = USER_AGENT
@@ -104,11 +111,22 @@ object ImageLoader {
                     headerBuilder[key] = value
                 }
             }.build())
-
             builder() // if passed
         }
     }
 
+    private fun hasPotentialBrokenHardware(): Boolean {
+        val hardware = Build.HARDWARE?.lowercase() ?: ""
+        val board = Build.BOARD?.lowercase() ?: ""
+        val model = Build.MODEL?.lowercase() ?: ""
+        val manufacturer = Build.MANUFACTURER?.lowercase() ?: ""
+        val allwinnerPatterns = listOf("sun50iw9", "h713", "allwinner", "sunxi")
+        val problematicModels =
+            listOf("hy320", "hy300", "a10plus", "magcubic", "sinoy", "android tv box")
+        return allwinnerPatterns.any { it in hardware || it in board || it in manufacturer } ||
+                problematicModels.any { it in model }
+    }
+
     /** TYPE_SAFE_LOADERS **/
     fun ImageView.loadImage(
         imageData: UiImage?,
@@ -166,4 +184,4 @@ object ImageLoader {
         imageData: ByteBuffer?,
         builder: ImageRequest.Builder.() -> Unit = {}
     ) = loadImageInternal(imageData = imageData, builder = builder)
-}
\ No newline at end of file
+}

From b353cf2017dc323cffa1003c7f907f16261c9159 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Tue, 26 May 2026 11:00:36 -0600
Subject: [PATCH 138/177] Remove back-compat constructor for
 AnimeSearchResponse (#2815)

This is in preparation to remove the use of EnumSet for `dubStatus`. Those that use the builder, use `addDubStatus` which means we can easily do this without breaking bytecode compatibility, but first we need to remove the back-compat constructor, as once we do that it wouldn't work anymore anyway.
---
 .../com/lagradost/cloudstream3/MainAPI.kt     | 38 +------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index f0ddd54c9..faff17077 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -1502,43 +1502,7 @@ constructor(
     override var quality: SearchQuality? = null,
     override var posterHeaders: Map<String, String>? = null,
     override var score: Score? = null,
-) : SearchResponse {
-    @Suppress("DEPRECATION_ERROR")
-    @Deprecated(
-        "Use newAnimeSearchResponse",
-        level = DeprecationLevel.ERROR
-    )
-    constructor(
-        name: String,
-        url: String,
-        apiName: String,
-        type: TvType? = null,
-
-        posterUrl: String? = null,
-        year: Int? = null,
-        dubStatus: EnumSet<DubStatus>? = null,
-
-        otherName: String? = null,
-        episodes: MutableMap<DubStatus, Int> = mutableMapOf(),
-
-        id: Int? = null,
-        quality: SearchQuality? = null,
-        posterHeaders: Map<String, String>? = null,
-    ) : this(
-        name,
-        url,
-        apiName,
-        type,
-        posterUrl,
-        year,
-        dubStatus,
-        otherName,
-        episodes,
-        id,
-        quality,
-        posterHeaders, null
-    )
-}
+) : SearchResponse
 
 fun AnimeSearchResponse.addDubStatus(status: DubStatus, episodes: Int? = null) {
     this.dubStatus = dubStatus?.also { it.add(status) } ?: EnumSet.of(status)

From c8bc999d22024e5644f036ed498c49d4d33feebc Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Tue, 26 May 2026 19:00:51 +0200
Subject: [PATCH 139/177] Translated using Weblate (Norwegian Nynorsk)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 26.4% (193 of 729 strings)

Translated using Weblate (Malay)

Currently translated at 65.8% (480 of 729 strings)

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Translated using Weblate (Russian)

Currently translated at 100.0% (729 of 729 strings)

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Translated using Weblate (Dutch)

Currently translated at 90.8% (662 of 729 strings)

Translated using Weblate (Arabic (Saudi Arabia))

Currently translated at 100.0% (4 of 4 strings)

Translated using Weblate (Arabic)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (4 of 4 strings)

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (729 of 729 strings)

Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Translated using Weblate (Vietnamese)

Currently translated at 100.0% (729 of 729 strings)

Co-authored-by: Andrei Stepanov <adem4ik@gmail.com>
Co-authored-by: Dark <darkbeamer.official@gmail.com>
Co-authored-by: Douglas de Santana Ramos <ramos.ti@live.com>
Co-authored-by: Gabriel <bloxgabriel18@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Johannes Bø <johannes.bo@gmail.com>
Co-authored-by: Maarten De Jong <maarten.de.jong2003@gmail.com>
Co-authored-by: Man <thebroker2308@gmail.com>
Co-authored-by: Saleh ALHarbi <alfraidigamerofficial@gmail.com>
Co-authored-by: ssantos <ssantos@web.de>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ar/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ms/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nl/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/nn/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pt/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/ru/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/vi/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/fastlane/ar_SA/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/fastlane/pt/
Translation: Cloudstream/App
Translation: Cloudstream/Fastlane
---
 app/src/main/res/values-b+ar/strings.xml      |  3 +++
 app/src/main/res/values-b+ms/strings.xml      |  6 +++---
 app/src/main/res/values-b+nl/strings.xml      | 16 +++++++++++++++
 app/src/main/res/values-b+nn/strings.xml      | 10 ++++++++++
 app/src/main/res/values-b+pt+BR/strings.xml   |  6 +++---
 app/src/main/res/values-b+pt/strings.xml      | 20 +++++++++++--------
 app/src/main/res/values-b+ru/strings.xml      |  4 ++++
 app/src/main/res/values-b+vi/strings.xml      | 18 ++++++++---------
 .../android/ar-SA/short_description.txt       |  2 +-
 .../metadata/android/pt/short_description.txt |  2 +-
 10 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/app/src/main/res/values-b+ar/strings.xml b/app/src/main/res/values-b+ar/strings.xml
index 57b2bb628..f543136dc 100644
--- a/app/src/main/res/values-b+ar/strings.xml
+++ b/app/src/main/res/values-b+ar/strings.xml
@@ -753,4 +753,7 @@
         <item quantity="other">%d تنزيل قيد الانتظار</item>
     </plurals>
     <string name="show_player_metadata_overlay">عرض واجهة منبثقة للبيانات الوصفية للمشغِّل</string>
+    <string name="video_singular">مقطع</string>
+    <string name="skip_type_preview">استعراض</string>
+    <string name="player_is_live">البث قائم</string>
 </resources>
diff --git a/app/src/main/res/values-b+ms/strings.xml b/app/src/main/res/values-b+ms/strings.xml
index ab0d0a54f..a15759939 100644
--- a/app/src/main/res/values-b+ms/strings.xml
+++ b/app/src/main/res/values-b+ms/strings.xml
@@ -25,8 +25,8 @@
     <string name="next_episode_format" formatted="true">Episod %d akan disiarkan dalam</string>
     <string name="cast_format" formatted="true">Pelakon:%s</string>
     <string name="safe_mode_title">Mod Selamat Hidup</string>
-    <string name="next_episode_time_day_format" formatted="true">%1$dd %2$dh %3$dm</string>
-    <string name="next_episode_time_hour_format" formatted="true">%1$dh %2$dm</string>
+    <string name="next_episode_time_day_format" formatted="true">%1$dh %2$dj %3$dm</string>
+    <string name="next_episode_time_hour_format" formatted="true">%1$dj %2$dm</string>
     <string name="next_episode_time_min_format" formatted="true">%dm</string>
     <string name="episode_poster_img_des">Poster Episod</string>
     <string name="home_main_poster_img_des">Poster Utama</string>
@@ -485,7 +485,7 @@
     <string name="category_updates">Kemaskini dan sandaran</string>
     <string name="double_tap_to_seek_settings">Ketik dua kali untuk mencari</string>
     <string name="use_system_brightness_settings_des">Gunakan kecerahan sistem dalam pemain apl dan bukannya tindanan gelap</string>
-    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dh %2$dm %3$ds</string>
+    <string name="download_time_left_hour_min_sec_format" formatted="true">%1$dj %2$dm %3$ds</string>
     <string name="download_time_left_min_sec_format" formatted="true">%1$dm %2$ds</string>
     <string name="download_time_left_sec_format" formatted="true">%1$ds</string>
     <string name="speech_recognition_unavailable">Pengecaman pertuturan tidak tersedia</string>
diff --git a/app/src/main/res/values-b+nl/strings.xml b/app/src/main/res/values-b+nl/strings.xml
index ace3aa0d4..3164e6b4e 100644
--- a/app/src/main/res/values-b+nl/strings.xml
+++ b/app/src/main/res/values-b+nl/strings.xml
@@ -661,4 +661,20 @@
     <string name="clipboard_permission_error">Fout bij toegang tot het Klembord, Probeer het opnieuw.</string>
     <string name="clipboard_unknown_error">Fout bij het kopiëren. Kopieer alsjeblieft de logcat en neem contact op met de app-ondersteuning.</string>
     <string name="dismiss">Afwijzen</string>
+    <string name="video_singular">Video</string>
+    <string name="skip_type_preview">Voorbeeld</string>
+    <string name="source_priority">Bron Prioriteit</string>
+    <string name="source_priority_help">Bepaal hoe de videobronnen worden gesorteerd in de speler</string>
+    <string name="biometric_authentication_title">Ontgrendel CloudStream</string>
+    <string name="biometric_setting">Versleutel met Biometrie</string>
+    <string name="reset_btn">Reset</string>
+    <string name="sort_release_date_new">verschijningsdatum (Nieuw naar Oud)</string>
+    <string name="sort_release_date_old">verschijningsdatum (Oud naar Nieuw)</string>
+    <string name="hide_player_control_names">Verberg de namen van de besturingselementen van de speler</string>
+    <string name="no_subtitles_loaded">Ondertiteling nog niet geladen</string>
+    <string name="backup_path_title">Back-up folder locatie</string>
+    <string name="custom">Aangepast</string>
+    <string name="confirm_before_exiting_title">Bevestig voor afsluiten</string>
+    <string name="confirm_before_exiting_desc">Toon dialoogvenster voordat de app wordt afgesloten</string>
+    <string name="subs_edge_size">Randgrote</string>
 </resources>
diff --git a/app/src/main/res/values-b+nn/strings.xml b/app/src/main/res/values-b+nn/strings.xml
index 014e2b0a9..b29e142b0 100644
--- a/app/src/main/res/values-b+nn/strings.xml
+++ b/app/src/main/res/values-b+nn/strings.xml
@@ -188,4 +188,14 @@
     <string name="picture_in_picture">Bilde i bilde</string>
     <string name="continue_watching">Fortsett å sjå</string>
     <string name="reload_error">Prøv tilkopling på nytt…</string>
+    <string name="next_season_episode_format" formatted="true">Sesong %1$d Episode %2$d blir sleppt om</string>
+    <string name="play_from_beginning_img_des">Spel av frå start</string>
+    <string name="download_queue">Nedlastingskø</string>
+    <string name="speech_recognition_unavailable">Semmegjenkjenning er ikkje tilgjengeleg</string>
+    <string name="begin_speaking">Snakk no…</string>
+    <string name="browser">Nettlesar</string>
+    <string name="type_dropped">Fjerna</string>
+    <string name="play_torrent_button">Strøm Torrent</string>
+    <string name="play_full_series_button">Spel heile serien</string>
+    <string name="torrent_info">Denne filmen er ein Torrent, som betyr at bruken din kan bli spora\nSett deg inn i bruk av Torrent-resursar før du fortsetter.</string>
 </resources>
diff --git a/app/src/main/res/values-b+pt+BR/strings.xml b/app/src/main/res/values-b+pt+BR/strings.xml
index 00e3a6229..455478b5a 100644
--- a/app/src/main/res/values-b+pt+BR/strings.xml
+++ b/app/src/main/res/values-b+pt+BR/strings.xml
@@ -616,7 +616,7 @@
     <string name="play_from_beginning_img_des">Reproduzir do começo</string>
     <string name="test_warning">Reprovou alguns testes</string>
     <string name="delete_plugin">Excluir plugin</string>
-    <string name="downloads_empty">Você não baixou nada :/</string>
+    <string name="downloads_empty">Atualmente não há downloads disponíveis.</string>
     <string name="hide_player_control_names">Ocultar os nomes dos controles do player</string>
     <string name="open_local_video">Abrir arquivo de vídeo</string>
     <string name="sort_release_date_new">Data de lançamento (do novo ao antigo)</string>
@@ -736,7 +736,7 @@
     <string name="source_name">Nome da fonte</string>
     <string name="download_all">Baixar tudo</string>
     <string name="cancel_all">Cancelar tudo</string>
-    <string name="download_episode_range">Você deseja baixar o episódio%s</string>
+    <string name="download_episode_range">Você deseja baixar o episódio%s?</string>
     <string name="cancel_queue_message">Você gostaria de cancelar todos os downloads da fila?</string>
     <plurals name="downloads_active">
         <item quantity="one">%ddownload ativo</item>
@@ -748,7 +748,7 @@
         <item quantity="many">%d downloads na sequência</item>
         <item quantity="other">%d downloads na sequência</item>
     </plurals>
-    <string name="show_player_metadata_overlay">Exibir sobreposição de metadados do player</string>
+    <string name="show_player_metadata_overlay">Mostrar sobreposição de metadados do reprodutor</string>
     <string name="video_singular">Vídeo</string>
     <string name="skip_type_preview">Visualização</string>
     <string name="player_is_live">Ao vivo</string>
diff --git a/app/src/main/res/values-b+pt/strings.xml b/app/src/main/res/values-b+pt/strings.xml
index 6dad27011..960a91d0d 100644
--- a/app/src/main/res/values-b+pt/strings.xml
+++ b/app/src/main/res/values-b+pt/strings.xml
@@ -61,7 +61,7 @@
     <string name="stream">Transmitir</string>
     <string name="error_loading_links_toast">Erro a Carregar Links</string>
     <string name="download_storage_text">Armazenamento Interno</string>
-    <string name="app_dubbed_text">Dob</string>
+    <string name="app_dubbed_text">Dub</string>
     <string name="app_subbed_text">Leg</string>
     <string name="popup_delete_file">Eliminar Ficheiro</string>
     <string name="popup_play_file">Reproduzir Ficheiro</string>
@@ -100,7 +100,7 @@
     <string name="subs_import_text" formatted="true">Importar fontes colocando em %s</string>
     <string name="continue_watching">Continuar a Assistir</string>
     <string name="action_remove_watching">Remover</string>
-    <string name="action_open_watching">Mais info</string>
+    <string name="action_open_watching">Mais informações</string>
     <string name="vpn_might_be_needed">Uma VPN pode ser necessária para que este fornecedor funcione corretamente</string>
     <string name="vpn_torrent">Este fornecedor é um torrent, uma VPN é recomendada</string>
     <string name="provider_info_meta">Metadados não são oferecidos pelo site, o carregamento do vídeo irá falhar se ele não existir no site.</string>
@@ -142,7 +142,7 @@
     <string name="search">Procurar</string>
     <string name="category_account">Contas e segurança</string>
     <string name="category_updates">Atualizações e cópias de segurança</string>
-    <string name="settings_info">Info</string>
+    <string name="settings_info">Informações</string>
     <string name="advanced_search">Procura Avançada</string>
     <string name="advanced_search_des">Mostra resultados separados por fornecedor</string>
     <string name="show_fillers_settings">Mostrar episódios de enchimento para anime</string>
@@ -318,9 +318,9 @@
     <string name="player_load_subtitles">Carregar de arquivo</string>
     <string name="player_load_subtitles_online">Carregar da Internet</string>
     <string name="downloaded_file">Arquivo baixado</string>
-    <string name="actor_main">Protagonista</string>
-    <string name="actor_supporting">Coadjuvante</string>
-    <string name="actor_background">Figurante</string>
+    <string name="actor_main">Principal</string>
+    <string name="actor_supporting">Suporte</string>
+    <string name="actor_background">Plano de fundo</string>
     <string name="home_random">Aleatório</string>
     <string name="coming_soon">Em breve…</string>
     <string name="poster_image">Imagem de Poster</string>
@@ -523,7 +523,7 @@
     <string name="no_repository_found_error">Repositório não encontrado, verifique o URL e tente a VPN</string>
     <string name="already_voted">Você já votou</string>
     <string name="action_unsubscribe">Cancelar Inscrição</string>
-    <string name="action_subscribe">Subscrever</string>
+    <string name="action_subscribe">Inscrever-se</string>
     <string name="favorites_list_name">Favoritos</string>
     <string name="links_reloaded_toast">A recarregar links</string>
     <string name="backup_frequency">Frequência de Backup</string>
@@ -686,7 +686,7 @@
     <string name="edit_profile_image_success">Imagem Atualizada com Sucesso</string>
     <string name="action_mark_watched_up_to_this_episode">Marcar como assistido o episódio</string>
     <string name="action_remove_mark_watched_up_to_this_episode">Removar marcação de assistido até esse episódio</string>
-    <string name="action_reload">Recarregado</string>
+    <string name="action_reload">Recarregar</string>
     <string name="reload_provider">Provedor de Recarregamento</string>
     <string name="episode_action_play_mirror">Reproduzir do servidor alternativo</string>"
     <string name="name">Nome</string>
@@ -733,4 +733,8 @@
         <item quantity="many">%d downloads na fila</item>
         <item quantity="other">%d downloads na fila</item>
     </plurals>
+    <string name="show_player_metadata_overlay">Mostrar sobreposição de metadados do player</string>
+    <string name="video_singular">Vídeo</string>
+    <string name="skip_type_preview">Pré-visualização</string>
+    <string name="player_is_live">Ao Vivo</string>
 </resources>
diff --git a/app/src/main/res/values-b+ru/strings.xml b/app/src/main/res/values-b+ru/strings.xml
index 3f6a5d89d..38e576baa 100644
--- a/app/src/main/res/values-b+ru/strings.xml
+++ b/app/src/main/res/values-b+ru/strings.xml
@@ -735,4 +735,8 @@
     <string name="cancel_all">Отменить всё</string>
     <string name="download_episode_range">Вы хотите загрузить эпизод %s?</string>
     <string name="cancel_queue_message">Вы хотите отменить всё запланированные загрузки?</string>
+    <string name="show_player_metadata_overlay">Показывать наложения метаданных проигрывателя</string>
+    <string name="video_singular">Видео</string>
+    <string name="skip_type_preview">Предпросмотр</string>
+    <string name="player_is_live">Прямой эфир</string>
 </resources>
diff --git a/app/src/main/res/values-b+vi/strings.xml b/app/src/main/res/values-b+vi/strings.xml
index 842b97080..952bafee7 100644
--- a/app/src/main/res/values-b+vi/strings.xml
+++ b/app/src/main/res/values-b+vi/strings.xml
@@ -166,7 +166,7 @@
     <string name="app_language">Ngôn ngữ ứng dụng</string>
     <string name="no_chromecast_support_toast">Nguồn phim này chưa hỗ trợ Chromecast</string>
     <string name="no_links_found_toast">Không tìm thấy liên kết</string>
-    <string name="copy_link_toast">Đã sao chép liên kết vào bộ nhớ tạm</string>
+    <string name="copy_link_toast">Đã sao chép liên kết vào bảng nhớ tạm</string>
     <string name="play_episode_toast">Phát Tập phim</string>
     <string name="subs_default_reset_toast">Đặt lại giá trị mặc định</string>
     <string name="season">Mùa</string>
@@ -254,7 +254,7 @@
     <string name="update">Cập nhật</string>
     <string name="watch_quality_pref">Chất lượng xem ưu tiên (WiFi)</string>
     <string name="limit_title">Số ký tự tối đa tiêu đề trình phát</string>
-    <string name="limit_title_rez">Hiện thông tin trình phát</string>
+    <string name="limit_title_rez">Hiển thị thông tin trình phát</string>
     <string name="video_buffer_size_settings">Kích thước bộ nhớ đệm video</string>
     <string name="video_buffer_length_settings">Thời lượng bộ nhớ đệm</string>
     <string name="video_buffer_disk_settings">Bộ nhớ đệm video trên thiết bị</string>
@@ -417,7 +417,7 @@
     <string name="tracks">Âm thanh &amp; video</string>
     <string name="audio_tracks">Âm thanh</string>
     <string name="video_tracks">Video</string>
-    <string name="apply_on_restart">Khởi động lại ứng dụng để thấy câc thay đổi.</string>
+    <string name="apply_on_restart">Khởi động lại ứng dụng để thấy các thay đổi.</string>
     <string name="safe_mode_title">Chế độ an toàn được bật</string>
     <string name="safe_mode_description">Tất cả tiện ích mở rộng đã được tắt do ứng dụng bị ngừng bất thường để giúp bạn tìm ra vấn đề gây lỗi.</string>
     <string name="safe_mode_crash_info">Xem thông tin sự cố</string>
@@ -469,8 +469,8 @@
     <string name="skip_type_credits">Danh đề</string>
     <string name="skip_type_intro">Giới thiệu</string>
     <string name="clear_history">Xoá lịch sử</string>
-    <string name="enable_skip_op_from_database_des">Hiện các popup bỏ qua cho mở đầu/kết thúc</string>
-    <string name="clipboard_too_large">Văn bản quá dài. Không thể lưu vào bộ nhớ tạm.</string>
+    <string name="enable_skip_op_from_database_des">Hiển thị cửa sổ bật lên của bỏ qua giới thiệu cho mở đầu/kết thúc</string>
+    <string name="clipboard_too_large">Văn bản quá dài. Không thể lưu vào bảng nhớ tạm.</string>
     <string name="action_remove_from_watched">Xoá khỏi đã xem</string>
     <string name="confirm_exit_dialog">Bạn có chắc muốn thoát?</string>
     <string name="yes">Có</string>
@@ -575,7 +575,7 @@
     <string name="auto_rotate_video_desc">Bật tự động xoay màn hình theo hướng của video</string>
     <string name="auto_rotate_video">Tự động xoay</string>
     <string name="toast_copied">đã sao chép!</string>
-    <string name="clipboard_permission_error">Lỗi truy cập Bộ nhớ tạm, Vui lòng thử lại.</string>
+    <string name="clipboard_permission_error">Lỗi truy cập Bảng nhớ tạm, Vui lòng thử lại.</string>
     <string name="clipboard_unknown_error">Lỗi sao chép, Vui lòng sao chép logcat và liên hệ hỗ trợ ứng dụng.</string>
     <string name="favorite">Yêu thích</string>
     <string name="ok">OK</string>
@@ -635,7 +635,7 @@
     <string name="preview_seekbar">Xem trước trên thanh tua</string>
     <string name="no_subtitles_loaded">Chưa tải phụ đề nào</string>
     <string name="confirm_before_exiting_title">Xác nhận trước khi thoát</string>
-    <string name="confirm_before_exiting_desc">Hiện hộp thoại xác nhận trước khi thoát ứng dụng</string>
+    <string name="confirm_before_exiting_desc">Hiển thị hộp thoại xác nhận trước khi thoát ứng dụng</string>
     <string name="dont_show">Không hiển thị</string>
     <string name="show">Hiển thị</string>
     <string name="backup_path_title">Vị trí thư mục sao lưu</string>
@@ -644,7 +644,7 @@
     <string name="torrent_info">Video này là Torrent, điều này có nghĩa là hoạt động video của bạn có thể được theo dõi.\nHãy đảm bảo rằng bạn hiểu về Torrent trước khi tiếp tục.</string>
     <string name="encoding_error">Lỗi mã hóa</string>
     <string name="software_decoding_desc">Giải mã phần mềm cho phép phát các tệp video không được thiết bị của bạn hỗ trợ, nhưng có thể gây ra phản hồi chậm hoặc phát lại không ổn định ở độ phân giải cao.</string>
-    <string name="software_decoding">Bộ giải mã ứng dụng</string>
+    <string name="software_decoding">Giải mã phần mềm</string>
     <string name="torrent_not_accepted">Khởi động lại ứng dụng và chấp nhận cửa sổ bật lên của Stream Torrent để tiếp tục.</string>
     <string name="torrent_preferred_media">Kích hoạt torrent trong Cài đặt/Nguồn phim/Thể loại ưu tiên</string>
     <string name="player_load_one_subtitle_online">Tải phụ đề đầu tiên có sẵn</string>
@@ -731,7 +731,7 @@
     <string name="source_name">Tên nguồn</string>
     <string name="download_queue">Hàng đợi tải xuống</string>
     <string name="queue_empty_message">Không có tải xuống đang chờ nào.</string>
-    <string name="source_priority_help">Quyết định cách sắp xếp các nguồn video trong trình phát.</string>
+    <string name="source_priority_help">Quyết định cách sắp xếp các nguồn video trong trình phát</string>
     <string name="source_priority">Ưu tiên nguồn</string>
     <string name="download_all">Tải xuống tất cả</string>
     <string name="cancel_all">Hủy tất cả</string>
diff --git a/fastlane/metadata/android/ar-SA/short_description.txt b/fastlane/metadata/android/ar-SA/short_description.txt
index 7ccd9743b..e56a2e8be 100644
--- a/fastlane/metadata/android/ar-SA/short_description.txt
+++ b/fastlane/metadata/android/ar-SA/short_description.txt
@@ -1 +1 @@
-بث وتحميل الأفلام, الأنمي, والمسلسلات التلفزيونية.
+بث وتحميل الأفلام, المسلسلات التلفزيونية والأنمي.
diff --git a/fastlane/metadata/android/pt/short_description.txt b/fastlane/metadata/android/pt/short_description.txt
index d0392f34b..08ad5a778 100644
--- a/fastlane/metadata/android/pt/short_description.txt
+++ b/fastlane/metadata/android/pt/short_description.txt
@@ -1 +1 @@
-Transmita e transfira filmes, séries de TV e anime.
+Transmita e descarga filmes, séries de TV e anime.

From 007c0ff9bc7cb158f9e4b2b710024fd744067069 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Tue, 26 May 2026 11:22:06 -0600
Subject: [PATCH 140/177] Fix some bugs in DownloadedPlayerActivity (#2758)

* Fix some bugs in DownloadedPlayerActivity

* Remove savedInstanceState check and use better long comment format
---
 .../ui/player/DownloadedPlayerActivity.kt     | 22 +++++++++++++++----
 .../ui/player/OfflinePlaybackHelper.kt        | 19 +++++++++++++---
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
index 7a42cea93..a086cc16f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
@@ -58,9 +58,23 @@ class DownloadedPlayerActivity : AppCompatActivity() {
         enableEdgeToEdgeCompat()
         setContentView(R.layout.empty_layout)
         Log.i(TAG, "onCreate")
-
         handleIntent(intent)
-        attachBackPressedCallback("DownloadedPlayerActivity") { finish() }
+
+        /**
+         * Use moveTaskToBack instead of finish() so there is always exactly one task
+         * entry in recents, always reflecting the current file.
+         *
+         * finish() destroys the Activity but may leave the task in recents. Each new file
+         * open can create a new task entry, so recents accumulates stale entries for old
+         * files. The user then taps a stale entry and gets the wrong file.
+         *
+         * moveTaskToBack keeps the Activity alive in the background. There is only ever
+         * one task entry in recents. New files opened from the file manager arrive via
+         * onNewIntent on the live instance, updating the player immediately. The single
+         * recents entry always reflects the current state, ensuring we load the
+         * correct file.
+         */
+        attachBackPressedCallback("DownloadedPlayerActivity") { moveTaskToBack(true) }
     }
 
     private fun handleIntent(intent: Intent) {
@@ -83,11 +97,11 @@ class DownloadedPlayerActivity : AppCompatActivity() {
                 url != null -> playLink(this, url)
                 data != null -> playUri(this, data)
                 extraText != null -> playLink(this, extraText)
-                else -> { finish(); return }
+                else -> finishAndRemoveTask()
             }
         } else if (data?.scheme == "content") {
             playUri(this, data)
-        } else finish()
+        } else finishAndRemoveTask()
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/OfflinePlaybackHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/OfflinePlaybackHelper.kt
index ac25347b6..dcf976612 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/OfflinePlaybackHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/OfflinePlaybackHelper.kt
@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import android.net.Uri
 import androidx.core.content.ContextCompat.getString
+import androidx.navigation.NavOptions
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.actions.temp.CloudStreamPackage
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
@@ -12,6 +13,15 @@ import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.safefile.SafeFile
 
 object OfflinePlaybackHelper {
+    /**
+     * Pop any existing player off the nav back stack before pushing the new one,
+     * keeping the stack flat (at most one player at a time). This prevents an
+     * OOM when many files are opened in sequence via DownloadedPlayerActivity.
+     */
+    private val replacePlayerNavOptions = NavOptions.Builder()
+        .setPopUpTo(R.id.navigation_player, inclusive = true, saveState = false)
+        .build()
+
     fun playLink(activity: Activity, url: String) {
         activity.navigate(
             R.id.global_to_navigation_player, GeneratorPlayer.newInstance(
@@ -20,7 +30,8 @@ object OfflinePlaybackHelper {
                         BasicLink(url)
                     ), id = url.hashCode()
                 ), 0
-            )
+            ),
+            replacePlayerNavOptions
         )
     }
 
@@ -52,7 +63,8 @@ object OfflinePlaybackHelper {
                     subs,
                     if (id != -1) id else null,
                 ), 0
-            )
+            ),
+            replacePlayerNavOptions
         )
         return true
     }
@@ -76,7 +88,8 @@ object OfflinePlaybackHelper {
                         )
                     )
                 ), 0
-            )
+            ),
+            replacePlayerNavOptions
         )
     }
 }
\ No newline at end of file

From d24f8bca0fd6c3796dfcd16e561d54205430ca6b Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Wed, 27 May 2026 14:57:09 -0600
Subject: [PATCH 141/177] Don't use any external library for Levenshtein ratio
 matching (#2802)

---
 app/build.gradle.kts                          |   4 +-
 .../cloudstream3/syncproviders/AuthAPI.kt     |   1 -
 .../cloudstream3/syncproviders/SyncAPI.kt     |   6 +-
 .../settings/extensions/PluginsViewModel.kt   |   4 +-
 gradle/libs.versions.toml                     |   2 -
 library/build.gradle.kts                      |   4 +-
 .../cloudstream3/utils/ExtractorApi.kt        |   3 +-
 .../cloudstream3/utils/Levenshtein.kt         | 515 ++++++++++++++++++
 .../cloudstream3/utils/SubtitleHelper.kt      |   5 +-
 9 files changed, 529 insertions(+), 15 deletions(-)
 create mode 100644 library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Levenshtein.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1b1aefab2..e6c970157 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -255,13 +255,15 @@ dependencies {
     // Extensions & Other Libs
     implementation(libs.jsoup) // HTML Parser
     implementation(libs.rhino) // Run JavaScript
-    implementation(libs.fuzzywuzzy) // Library/Ext Searching with Levenshtein Distance
     implementation(libs.safefile) // To Prevent the URI File Fu*kery
     coreLibraryDesugaring(libs.desugar.jdk.libs.nio) // NIO Flavor Needed for NewPipeExtractor
     implementation(libs.conscrypt.android) // To Fix SSL Fu*kery on Android 9
     implementation(libs.jackson.module.kotlin) // JSON Parser
     implementation(libs.zipline)
 
+    // Deprecated; will be removed once extensions have time to migrate from using it
+    implementation("me.xdrop:fuzzywuzzy:1.4.0")
+
     // Torrent Support
     implementation(libs.torrentserver)
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt
index 9a1a441f1..184a9fbcc 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AuthAPI.kt
@@ -39,7 +39,6 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.splitQuery
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.UiText
 import com.lagradost.cloudstream3.utils.txt
-import me.xdrop.fuzzywuzzy.FuzzySearch
 import java.net.URL
 import java.security.SecureRandom
 import java.util.Date
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
index e5f9aca84..f30a64748 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt
@@ -10,8 +10,8 @@ import com.lagradost.cloudstream3.ShowStatus
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
+import com.lagradost.cloudstream3.utils.Levenshtein
 import com.lagradost.cloudstream3.utils.UiText
-import me.xdrop.fuzzywuzzy.FuzzySearch
 import java.util.Date
 
 /**
@@ -138,7 +138,7 @@ abstract class SyncAPI : AuthAPI() {
                 ListSorting.Query ->
                     if (query != null) {
                         items.sortedBy {
-                            -FuzzySearch.partialRatio(
+                            -Levenshtein.partialRatio(
                                 query.lowercase(), it.name.lowercase()
                             )
                         }
@@ -191,4 +191,4 @@ abstract class SyncAPI : AuthAPI() {
         override var score: Score? = null,
         val tags: List<String>? = null
     ) : SearchResponse
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
index dfc61eba5..0cbef9cf2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt
@@ -23,7 +23,7 @@ import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
-import me.xdrop.fuzzywuzzy.FuzzySearch
+import com.lagradost.cloudstream3.utils.Levenshtein
 import java.io.File
 
 // String => repository url
@@ -246,7 +246,7 @@ class PluginsViewModel : ViewModel() {
             this.sortedBy { it.plugin.second.name }
         } else {
             this.sortedBy {
-                -FuzzySearch.partialRatio(
+                -Levenshtein.partialRatio(
                     it.plugin.second.name.lowercase(),
                     query.lowercase()
                 )
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2a8775761..96fbee050 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,7 +17,6 @@ desugar_jdk_libs_nio = "2.1.5"
 dokkaGradlePlugin = "2.2.0"
 espressoCore = "3.7.0"
 fragmentKtx = "1.8.9"
-fuzzywuzzy = "1.4.0"
 jacksonModuleKotlin = { strictly = "2.13.1" } # Later versions don't support minSdk <26 (Crashes on Android TV's and FireSticks)
 json = "20251224"
 jsoup = "1.22.1"
@@ -75,7 +74,6 @@ desugar_jdk_libs_nio = { module = "com.android.tools:desugar_jdk_libs_nio", vers
 espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
 ext-junit = { module = "androidx.test.ext:junit", version.ref = "junitVersion" }
 fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragmentKtx" }
-fuzzywuzzy = { module = "me.xdrop:fuzzywuzzy", version.ref = "fuzzywuzzy" }
 jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jacksonModuleKotlin" }
 json = { module = "org.json:json", version.ref = "json" }
 jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index b5f525e83..228bf4994 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -58,11 +58,13 @@ kotlin {
             implementation(libs.jackson.module.kotlin) // JSON Parser
             implementation(libs.kotlinx.atomicfu)
             implementation(libs.kotlinx.coroutines.core)
-            implementation(libs.fuzzywuzzy) // Match Extractors
             implementation(libs.jsoup) // HTML Parser
             implementation(libs.rhino) // Run JavaScript
             implementation(libs.newpipeextractor)
             implementation(libs.tmdb.java) // TMDB API v3 Wrapper Made with RetroFit
+
+            // Deprecated; will be removed once extensions have time to migrate from using it
+            implementation("me.xdrop:fuzzywuzzy:1.4.0")
         }
     }
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index b40dd90cf..66055d7de 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -312,7 +312,6 @@ import com.lagradost.cloudstream3.utils.Coroutines.atomicListOf
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.ensureActive
-import me.xdrop.fuzzywuzzy.FuzzySearch
 import org.jsoup.Jsoup
 import java.net.URI
 import java.util.UUID
@@ -884,7 +883,7 @@ suspend fun loadExtractor(
     // this is to match mirror domains - like example.com, example.net
     for (index in extractorApis.lastIndex downTo 0) {
         val extractor = extractorApis[index]
-        if (FuzzySearch.partialRatio(
+        if (Levenshtein.partialRatio(
                 extractor.mainUrl,
                 currentUrl
             ) > 80
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Levenshtein.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Levenshtein.kt
new file mode 100644
index 000000000..2f3957630
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Levenshtein.kt
@@ -0,0 +1,515 @@
+/**
+ * MIT License
+ *
+ * Copyright (c) 2026 Konstantin Tskhovrebov
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.lagradost.cloudstream3.utils
+
+import com.lagradost.cloudstream3.Prerelease
+import kotlin.math.round
+
+// Taken from https://github.com/terrakok/FuzzyKot/blob/f794d43/fuzzykot/src/commonMain/kotlin/com/github/terrakok/fuzzykot/Levenshtein.kt
+@Prerelease
+object Levenshtein {
+    fun ratio(s1: String, s2: String, processor: (String) -> String = { it }): Int {
+        val p1 = processor(s1)
+        val p2 = processor(s2)
+        return round(100 * basicRatio(p1, p2)).toInt()
+    }
+
+    fun partialRatio(s1: String, s2: String, processor: (String) -> String = { it }): Int {
+        val p1 = processor(s1)
+        val p2 = processor(s2)
+
+        val shorter: String
+        val longer: String
+
+        if (p1.length < p2.length) {
+            shorter = p1
+            longer = p2
+        } else {
+            shorter = p2
+            longer = p1
+        }
+
+        if (shorter.isEmpty()) return if (longer.isEmpty()) 100 else 0
+
+        val matchingBlocks = getMatchingBlocks(shorter.length, longer.length, getEditOps(shorter, longer))
+        val scores = mutableListOf<Double>()
+
+        for (mb in matchingBlocks) {
+            val dist = mb.dpos - mb.spos
+            val longStart = if (dist > 0) dist else 0
+            var longEnd = longStart + shorter.length
+            if (longEnd > longer.length) longEnd = longer.length
+
+            val longSubstr = longer.substring(longStart, longEnd)
+            val ratio = basicRatio(shorter, longSubstr)
+
+            if (ratio > .995) return 100
+            scores.add(ratio)
+        }
+
+        return round(100 * (scores.maxOrNull() ?: 0.0)).toInt()
+    }
+
+    private fun basicRatio(s1: String, s2: String): Double {
+        val lensum = s1.length + s2.length
+        if (lensum == 0) return 1.0
+        val editDistance = levEditDistance(s1, s2, 1)
+        return (lensum - editDistance) / lensum.toDouble()
+    }
+}
+
+private enum class EditType {
+    DELETE,
+    EQUAL,
+    INSERT,
+    REPLACE,
+    KEEP
+}
+
+private data class EditOp(
+    var type: EditType? = null,
+    var spos: Int = 0,
+    var dpos: Int = 0
+) {
+    override fun toString(): String = "${type?.name ?: "null"}($spos,$dpos)"
+}
+
+private data class MatchingBlock(
+    val spos: Int = 0,
+    val dpos: Int = 0,
+    val length: Int = 0
+) {
+    override fun toString(): String = "($spos,$dpos,$length)"
+}
+
+private fun getEditOps(s1: String, s2: String): Array<EditOp> {
+    var len1Copy = s1.length
+    var len2Copy = s2.length
+
+    var len1o = 0
+    var i = 0
+
+    val matrix: IntArray
+
+    val c1 = s1
+    val c2 = s2
+
+    var p1 = 0
+    var p2 = 0
+
+    while (len1Copy > 0 && len2Copy > 0 && c1[p1] == c2[p2]) {
+        len1Copy--
+        len2Copy--
+        p1++
+        p2++
+        len1o++
+    }
+
+    val len2o = len1o
+
+    while (len1Copy > 0 && len2Copy > 0 && c1[p1 + len1Copy - 1] == c2[p2 + len2Copy - 1]) {
+        len1Copy--
+        len2Copy--
+    }
+
+    len1Copy++
+    len2Copy++
+
+    matrix = IntArray(len2Copy * len1Copy)
+
+    while (i < len2Copy) {
+        matrix[i] = i
+        i++
+    }
+    i = 1
+    while (i < len1Copy) {
+        matrix[len2Copy * i] = i
+        i++
+    }
+
+    i = 1
+    while (i < len1Copy) {
+        var ptrPrev = (i - 1) * len2Copy
+        var ptrC = i * len2Copy
+        val ptrEnd = ptrC + len2Copy - 1
+
+        val char1 = c1[p1 + i - 1]
+        var ptrChar2 = p2
+
+        var x = i
+        ptrC++
+
+        while (ptrC <= ptrEnd) {
+            var c3 = matrix[ptrPrev++] + if (char1 != c2[ptrChar2++]) 1 else 0
+            x++
+            if (x > c3) x = c3
+            c3 = matrix[ptrPrev] + 1
+            if (x > c3) x = c3
+            matrix[ptrC++] = x
+        }
+        i++
+    }
+
+    return editOpsFromCostMatrix(len1Copy, c1, p1, len1o, len2Copy, c2, p2, len2o, matrix)
+}
+
+private fun editOpsFromCostMatrix(
+    len1: Int, c1: String, p1: Int, o1: Int,
+    len2: Int, c2: String, p2: Int, o2: Int,
+    matrix: IntArray
+): Array<EditOp> {
+    var i: Int = len1 - 1
+    var j: Int = len2 - 1
+    var pos: Int = matrix[len1 * len2 - 1]
+    var ptr: Int = len1 * len2 - 1
+    val ops: Array<EditOp?> = arrayOfNulls(pos)
+    var dir = 0
+
+    while (i > 0 || j > 0) {
+        if (dir < 0 && j != 0 && matrix[ptr] == matrix[ptr - 1] + 1) {
+            val eop = EditOp()
+            pos--
+            ops[pos] = eop
+            eop.type = EditType.INSERT
+            eop.spos = i + o1
+            eop.dpos = --j + o2
+            ptr--
+            continue
+        }
+
+        if (dir > 0 && i != 0 && matrix[ptr] == matrix[ptr - len2] + 1) {
+            val eop = EditOp()
+            pos--
+            ops[pos] = eop
+            eop.type = EditType.DELETE
+            eop.spos = --i + o1
+            eop.dpos = j + o2
+            ptr -= len2
+            continue
+        }
+
+        if (i != 0 && j != 0 && matrix[ptr] == matrix[ptr - len2 - 1] && c1[p1 + i - 1] == c2[p2 + j - 1]) {
+            i--
+            j--
+            ptr -= len2 + 1
+            dir = 0
+            continue
+        }
+
+        if (i != 0 && j != 0 && matrix[ptr] == matrix[ptr - len2 - 1] + 1) {
+            pos--
+            val eop = EditOp()
+            ops[pos] = eop
+            eop.type = EditType.REPLACE
+            eop.spos = --i + o1
+            eop.dpos = --j + o2
+            ptr -= len2 + 1
+            dir = 0
+            continue
+        }
+
+        if (dir == 0 && j != 0 && matrix[ptr] == matrix[ptr - 1] + 1) {
+            pos--
+            val eop = EditOp()
+            ops[pos] = eop
+            eop.type = EditType.INSERT
+            eop.spos = i + o1
+            eop.dpos = --j + o2
+            ptr--
+            dir = -1
+            continue
+        }
+
+        if (dir == 0 && i != 0 && matrix[ptr] == matrix[ptr - len2] + 1) {
+            pos--
+            val eop = EditOp()
+            ops[pos] = eop
+            eop.type = EditType.DELETE
+            eop.spos = --i + o1
+            eop.dpos = j + o2
+            ptr -= len2
+            dir = 1
+            continue
+        }
+    }
+
+    return ops.requireNoNulls()
+}
+
+private fun getMatchingBlocks(len1: Int, len2: Int, ops: Array<EditOp>): Array<MatchingBlock> {
+    val n = ops.size
+    var numberOfMatchingBlocks = 0
+    var i: Int
+    var spos: Int
+    var dpos: Int
+    var o = 0
+
+    dpos = 0
+    spos = dpos
+
+    i = n
+    while (i != 0) {
+        while (ops[o].type === EditType.KEEP && --i != 0) {
+            o++
+        }
+        if (i == 0) break
+        if (spos < ops[o].spos || dpos < ops[o].dpos) {
+            numberOfMatchingBlocks++
+            spos = ops[o].spos
+            dpos = ops[o].dpos
+        }
+        val type = ops[o].type!!
+        when (type) {
+            EditType.REPLACE -> do {
+                spos++
+                dpos++
+                i--
+                o++
+            } while (i != 0 && ops[o].type === type && spos == ops[o].spos && dpos == ops[o].dpos)
+
+            EditType.DELETE -> do {
+                spos++
+                i--
+                o++
+            } while (i != 0 && ops[o].type === type && spos == ops[o].spos && dpos == ops[o].dpos)
+
+            EditType.INSERT -> do {
+                dpos++
+                i--
+                o++
+            } while (i != 0 && ops[o].type === type && spos == ops[o].spos && dpos == ops[o].dpos)
+
+            else -> {}
+        }
+    }
+
+    if (spos < len1 || dpos < len2) numberOfMatchingBlocks++
+
+    val matchingBlocks = arrayOfNulls<MatchingBlock>(numberOfMatchingBlocks + 1)
+    o = 0
+    dpos = 0
+    spos = dpos
+    var mbIndex = 0
+
+    i = n
+    while (i != 0) {
+        while (ops[o].type === EditType.KEEP && --i != 0) o++
+        if (i == 0) break
+        if (spos < ops[o].spos || dpos < ops[o].dpos) {
+            val mb = MatchingBlock(
+                spos = spos,
+                dpos = dpos,
+                length = ops[o].spos - spos
+            )
+            spos = ops[o].spos
+            dpos = ops[o].dpos
+            matchingBlocks[mbIndex++] = mb
+        }
+        val type = ops[o].type!!
+        when (type) {
+            EditType.REPLACE -> do {
+                spos++
+                dpos++
+                i--
+                o++
+            } while (i != 0 && ops[o].type === type && spos == ops[o].spos && dpos == ops[o].dpos)
+
+            EditType.DELETE -> do {
+                spos++
+                i--
+                o++
+            } while (i != 0 && ops[o].type === type && spos == ops[o].spos && dpos == ops[o].dpos)
+
+            EditType.INSERT -> do {
+                dpos++
+                i--
+                o++
+            } while (i != 0 && ops[o].type === type && spos == ops[o].spos && dpos == ops[o].dpos)
+
+            else -> {}
+        }
+    }
+
+    if (spos < len1 || dpos < len2) {
+        val mb = MatchingBlock(
+            spos = spos,
+            dpos = dpos,
+            length = len1 - spos
+        )
+        matchingBlocks[mbIndex++] = mb
+    }
+
+    val finalBlock = MatchingBlock(
+        spos = len1,
+        dpos = len2,
+        length = 0
+    )
+    matchingBlocks[mbIndex] = finalBlock
+
+    return matchingBlocks.filterNotNull().toTypedArray()
+}
+
+private fun levEditDistance(s1: String, s2: String, xcost: Int): Int {
+    var i: Int
+    val half: Int
+
+    var c1 = s1
+    var c2 = s2
+
+    var str1 = 0
+    var str2 = 0
+
+    var len1 = s1.length
+    var len2 = s2.length
+
+    while (len1 > 0 && len2 > 0 && c1[str1] == c2[str2]) {
+        len1--
+        len2--
+        str1++
+        str2++
+    }
+
+    while (len1 > 0 && len2 > 0 && c1[str1 + len1 - 1] == c2[str2 + len2 - 1]) {
+        len1--
+        len2--
+    }
+
+    if (len1 == 0) return len2
+    if (len2 == 0) return len1
+
+    if (len1 > len2) {
+        val nx = len1
+        val temp = str1
+        len1 = len2
+        len2 = nx
+        str1 = str2
+        str2 = temp
+        val t = c2
+        c2 = c1
+        c1 = t
+    }
+
+    if (len1 == 1) {
+        return if (xcost != 0) {
+            len2 + 1 - 2 * memchr(c2, str2, c1[str1], len2)
+        } else {
+            len2 - memchr(c2, str2, c1[str1], len2)
+        }
+    }
+
+    len1++
+    len2++
+    half = len1 shr 1
+
+    val row = IntArray(len2)
+    var end = len2 - 1
+
+    i = 0
+    while (i < len2 - if (xcost != 0) 0 else half) {
+        row[i] = i
+        i++
+    }
+
+    if (xcost != 0) {
+        i = 1
+        while (i < len1) {
+            var p = 1
+            val ch1 = c1[str1 + i - 1]
+            var c2p = str2
+            var D = i
+            var x = i
+            while (p <= end) {
+                if (ch1 == c2[c2p++]) {
+                    x = --D
+                } else {
+                    x++
+                }
+                D = row[p]
+                D++
+                if (x > D) x = D
+                row[p++] = x
+            }
+            i++
+        }
+    } else {
+        row[0] = len1 - half - 1
+        i = 1
+        while (i < len1) {
+            var p: Int
+            val ch1 = c1[str1 + i - 1]
+            var c2p: Int
+            var D: Int
+            var x: Int
+
+            if (i >= len1 - half) {
+                val offset = i - (len1 - half)
+                c2p = str2 + offset
+                p = offset
+                val c3 = row[p++] + if (ch1 != c2[c2p++]) 1 else 0
+                x = row[p]
+                x++
+                D = x
+                if (x > c3) x = c3
+                row[p++] = x
+            } else {
+                p = 1
+                c2p = str2
+                x = i
+                D = x
+            }
+            if (i <= half + 1) end = len2 + i - half - 2
+            while (p <= end) {
+                val c3 = --D + if (ch1 != c2[c2p++]) 1 else 0
+                x++
+                if (x > c3) x = c3
+                D = row[p]
+                D++
+                if (x > D) x = D
+                row[p++] = x
+            }
+            if (i <= half) {
+                val c3 = --D + if (ch1 != c2[c2p]) 1 else 0
+                x++
+                if (x > c3) x = c3
+                row[p] = x
+            }
+            i++
+        }
+    }
+
+    return row[end]
+}
+
+private fun memchr(haystack: String, offset: Int, needle: Char, num: Int): Int {
+    var numCopy = num
+    if (numCopy != 0) {
+        var p = 0
+        do {
+            if (haystack[offset + p] == needle) return 1
+            p++
+        } while (--numCopy != 0)
+    }
+    return 0
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt
index 7becf4d19..a6362efd0 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt
@@ -1,6 +1,5 @@
 package com.lagradost.cloudstream3.utils
 
-import me.xdrop.fuzzywuzzy.FuzzySearch
 import java.util.Locale
 
 // If you find a way to use SettingsGeneral getCurrentLocale()
@@ -112,8 +111,8 @@ object SubtitleHelper {
 
             for (lang in languages) {
                 val score = maxOf(
-                    FuzzySearch.ratio(lowLangName, lang.languageName.lowercase()),
-                    FuzzySearch.ratio(
+                    Levenshtein.ratio(lowLangName, lang.languageName.lowercase()),
+                    Levenshtein.ratio(
                         lowLangName, lang.nativeName.lowercase()
                     )
                 )

From 647c27494497364a548aaea3465433ac040c86c8 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Wed, 27 May 2026 15:05:18 -0600
Subject: [PATCH 142/177] [skip ci] Move versionCode and versionName to version
 catalog

---
 app/build.gradle.kts      | 4 ++--
 gradle/libs.versions.toml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e6c970157..a21e520a7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -103,8 +103,8 @@ android {
         applicationId = "com.lagradost.cloudstream3"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
-        versionCode = 68
-        versionName = "4.7.0"
+        versionCode = libs.versions.versionCode.get().toInt()
+        versionName = libs.versions.versionName.get()
 
         manifestPlaceholders["target_sdk_version"] = libs.versions.targetSdk.get()
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 96fbee050..c806df9a9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -56,6 +56,9 @@ minSdk = "23"
 compileSdk = "36"
 targetSdk = "36"
 
+versionCode = "68"
+versionName = "4.7.0"
+
 [libraries]
 activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityKtx" }
 anime-db = { module = "com.github.recloudstream:anime-db", version.ref = "animeDb" }

From c1b6fc2eeb3c5e53ad1c9b06068d98ffd90c1ec8 Mon Sep 17 00:00:00 2001
From: PiterDev <71133634+PiterWeb@users.noreply.github.com>
Date: Thu, 28 May 2026 12:46:49 +0200
Subject: [PATCH 143/177] Fix Updated/ReleaseDate/Rating sorting for Kitsu
 SyncProvider (#2780)

---
 .../syncproviders/providers/KitsuApi.kt       | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/KitsuApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/KitsuApi.kt
index 29c3c0c17..e15a77c64 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/KitsuApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/KitsuApi.kt
@@ -27,9 +27,8 @@ import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
 import java.text.SimpleDateFormat
-import java.time.Instant
 import java.time.LocalDate
-import java.time.format.DateTimeFormatter
+import java.time.ZoneId
 import java.util.Date
 import java.util.Locale
 
@@ -202,7 +201,7 @@ class KitsuApi: SyncAPI() {
             id = id,
             totalEpisodes = anime.episodeCount,
             title = anime.canonicalTitle ?: anime.titles?.enJp ?: anime.titles?.jaJp.orEmpty(),
-            publicScore =  Score.from(anime.ratingTwenty.toString(), 20),
+            publicScore =  Score.from(anime.ratingTwenty, 20),
             duration = anime.episodeLength,
             synopsis = anime.synopsis,
             airStatus = when(anime.status) {
@@ -250,7 +249,7 @@ class KitsuApi: SyncAPI() {
         }
 
         return SyncStatus(
-            score = Score.from(anime.ratingTwenty.toString(), 20),
+            score = Score.from(anime.ratingTwenty, 20),
             status = SyncWatchType.fromInternalId(kitsuStatusAsString.indexOf(anime.status)),
             isFavorite = null,
             watchedEpisodes = anime.progress,
@@ -454,8 +453,8 @@ class KitsuApi: SyncAPI() {
 
     private suspend fun getKitsuAnimeList(token: AuthToken, userId: Int): Array<KitsuNode> {
 
-        val animeSelectedFields = arrayOf("titles","canonicalTitle","posterImage","synopsis","startDate","episodeCount")
-        val libraryEntriesSelectedFields = arrayOf("progress","rating","updatedAt", "status")
+        val animeSelectedFields = arrayOf("titles","canonicalTitle","posterImage","synopsis","startDate","endDate","episodeCount")
+        val libraryEntriesSelectedFields = arrayOf("progress","ratingTwenty","updatedAt", "status")
         val limit = 500
         var url = "$apiUrl/library-entries?filter[userId]=$userId&filter[kind]=anime&include=anime&page[limit]=$limit&page[offset]=0&fields[anime]=${animeSelectedFields.joinToString(",")}&fields[libraryEntries]=${libraryEntriesSelectedFields.joinToString(",")}"
 
@@ -526,7 +525,7 @@ class KitsuApi: SyncAPI() {
                 this.id,
                 this.attributes.progress,
                 numEpisodes,
-                Score.from(this.attributes.ratingTwenty.toString(), 20),
+                Score.from(this.attributes.ratingTwenty, 20),
                 parseDateLong(this.attributes.updatedAt),
                 "Kitsu",
                 TvType.Anime,
@@ -535,12 +534,9 @@ class KitsuApi: SyncAPI() {
                 null,
                 plot = synopsis,
                 releaseDate = if (startDate == null) null else try {
-                    Date.from(
-                        Instant.from(
-                            DateTimeFormatter.ofPattern(if (startDate.length == 4) "yyyy" else if (startDate.length == 7) "yyyy-MM" else "yyyy-MM-dd")
-                                .parse(startDate)
-                        )
-                    )
+                    Date.from(LocalDate.parse(startDate).atStartOfDay()
+                        .atZone(ZoneId.systemDefault())
+                        .toInstant())
                 } catch (_: RuntimeException) {
                     null
                 }
@@ -583,7 +579,7 @@ class KitsuApi: SyncAPI() {
         @JsonProperty("avatar") val avatar: KitsuUserAvatar?,
         /* User list anime attributes */
         @JsonProperty("progress") val progress: Int?,
-        @JsonProperty("ratingTwenty") val ratingTwenty: Float?,
+        @JsonProperty("ratingTwenty") val ratingTwenty: Int?,
         @JsonProperty("updatedAt") val updatedAt: String?,
         @JsonProperty("status") val status: String?,
     )
@@ -632,7 +628,7 @@ class KitsuApi: SyncAPI() {
         const val KITSU_CACHED_LIST: String = "kitsu_cached_list"
         private fun parseDateLong(string: String?): Long? {
             return try {
-                SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.getDefault()).parse(
+                SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.getDefault()).parse(
                     string ?: return null
                 )?.time?.div(1000)
             } catch (e: Exception) {

From 028a794ea5708786e81025781f2cf51c336a81f9 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 28 May 2026 15:16:31 -0600
Subject: [PATCH 144/177] Add support for using kotlinx-serialization rather
 than Jackson (#2791)

---
 app/build.gradle.kts                          |   5 +
 .../cloudstream3/SerializationClassTester.kt  | 127 ++++++++++++++
 .../utils/serializers/SerializerTest.kt       | 157 ++++++++++++++++++
 .../cloudstream3/plugins/PluginManager.kt     |   2 +-
 .../syncproviders/providers/SimklApi.kt       |   9 +-
 .../cloudstream3/ui/ControllerActivity.kt     |   8 +-
 .../ui/result/ResultViewModel2.kt             |   5 +-
 .../cloudstream3/utils/BackupUtils.kt         |  14 +-
 .../lagradost/cloudstream3/utils/DataStore.kt |  36 ++--
 .../lagradost/cloudstream3/utils/SyncUtil.kt  |   6 +-
 .../utils/serializers/UriSerializer.kt        |  40 +++++
 build.gradle.kts                              |   1 +
 gradle/libs.versions.toml                     |   8 +
 library/build.gradle.kts                      |   2 +
 .../com/lagradost/cloudstream3/MainAPI.kt     |   8 +
 .../lagradost/cloudstream3/MainActivity.kt    |  26 ++-
 .../extractors/HDMomPlayerExtractor.kt        |  11 +-
 .../extractors/VideoSeyredExtractor.kt        |   9 +-
 .../lagradost/cloudstream3/utils/AppUtils.kt  |  66 +++++++-
 .../utils/serializers/NonEmptySerializer.kt   |  47 ++++++
 .../utils/serializers/WriteOnlySerializer.kt  |  38 +++++
 21 files changed, 549 insertions(+), 76 deletions(-)
 create mode 100644 app/src/androidTest/java/com/lagradost/cloudstream3/SerializationClassTester.kt
 create mode 100644 app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/SerializerTest.kt
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/utils/serializers/UriSerializer.kt
 create mode 100644 library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/NonEmptySerializer.kt
 create mode 100644 library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/WriteOnlySerializer.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a21e520a7..05b25237a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -8,6 +8,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.dokka)
+    alias(libs.plugins.kotlin.serialization)
 }
 
 val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
@@ -206,9 +207,12 @@ dependencies {
     testImplementation(libs.junit)
     testImplementation(libs.json)
     androidTestImplementation(libs.core)
+    androidTestImplementation(libs.classgraph)
     androidTestImplementation(libs.espresso.core)
     androidTestImplementation(libs.ext.junit)
+    androidTestImplementation(libs.instancio.core)
     androidTestImplementation(libs.junit.ktx)
+    androidTestImplementation(libs.kotlin.test)
 
     // Android Core & Lifecycle
     implementation(libs.core.ktx)
@@ -219,6 +223,7 @@ dependencies {
     implementation(libs.bundles.lifecycle)
     implementation(libs.bundles.navigation)
     implementation(libs.kotlinx.collections.immutable)
+    implementation(libs.kotlinx.serialization.json) // JSON Parser
 
     // Design & UI
     implementation(libs.preference.ktx)
diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/SerializationClassTester.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/SerializationClassTester.kt
new file mode 100644
index 000000000..0b19535cb
--- /dev/null
+++ b/app/src/androidTest/java/com/lagradost/cloudstream3/SerializationClassTester.kt
@@ -0,0 +1,127 @@
+package com.lagradost.cloudstream3
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import io.github.classgraph.ClassGraph
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.InternalSerializationApi
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.serializer
+import kotlinx.serialization.serializerOrNull
+import org.instancio.Instancio
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.reflect.KClass
+import kotlin.reflect.jvm.jvmName
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+@RunWith(AndroidJUnit4::class)
+class SerializationClassTester {
+    // Same as app, or using app reference
+    val jacksonMapper = mapper
+    val kotlinxMapper = json
+
+    @Test
+    fun isIdenticalSerialization() {
+        val serializableClasses = findSerializableClasses("com.lagradost")
+        println("Number of serializable classes: ${serializableClasses.size}")
+
+        serializableClasses.forEach { kClass ->
+            val instance = Instancio.create(kClass.java)
+
+            val jacksonJson = jacksonMapper.writeValueAsString(instance)
+            val kotlinxJson = serializeWithKotlinx(kClass, instance)
+
+            assertEquals(
+                jacksonJson,
+                kotlinxJson,
+                """
+                    Serialization mismatch for:
+                    ${kClass.qualifiedName}
+
+                    Jackson:
+                    $jacksonJson
+
+                    Kotlinx:
+                    $kotlinxJson
+                    
+                    """.trimIndent()
+            )
+            println("Identical serialization for: ${kClass.jvmName}")
+        }
+    }
+
+    @OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class)
+    @Test
+    fun isIdenticalDeserialization() {
+        val serializableClasses = findSerializableClasses("com.lagradost")
+        println("Number of serializable classes: ${serializableClasses.size}")
+
+        serializableClasses.forEach { kClass ->
+            val instance = Instancio.create(kClass.java)
+            // Convert to JSON to get example JSON object
+            // We prefer jackson here because the app may have many jackson JSON strings in local storage
+            val originalJson = jacksonMapper.writeValueAsString(instance)
+
+            // Create an object from the JSON using kotlinx
+            val serializer =
+                kClass.serializerOrNull() ?: kotlinxMapper.serializersModule.getContextual(kClass)
+            assertNotNull(serializer, "The class: ${kClass.jvmName} must be serializable!")
+            val kotlinxDecoded = kotlinxMapper.decodeFromString(serializer, originalJson)
+
+            // Create an object from the JSON using jackson
+            val mapperDecoded = jacksonMapper.readValue(originalJson, kClass.java)
+
+
+            // Deep inspect both object using the mapper toJson function.
+            // This deep equality check can be performed using other methods, but this just works.
+            val jacksonJson = mapperDecoded.toJson()
+            val kotlinxJson = kotlinxDecoded.toJson()
+
+            assertEquals(
+                jacksonJson,
+                kotlinxJson,
+                """
+                    Serialization mismatch for:
+                    ${kClass.qualifiedName}
+
+                    Jackson:
+                    $jacksonJson
+
+                    Kotlinx:
+                    $kotlinxJson
+                    
+                    """.trimIndent()
+            )
+            println("Identical deserialization for: ${kClass.jvmName}")
+        }
+    }
+
+    private fun findSerializableClasses(packageName: String): List<KClass<*>> {
+        val context = InstrumentationRegistry
+            .getInstrumentation()
+            .targetContext
+
+        return ClassGraph()
+            .enableClassInfo()
+            .enableAnnotationInfo()
+            .overrideClassLoaders(context.classLoader)
+            .acceptPackages(packageName)
+            .scan()
+            .getClassesWithAnnotation(Serializable::class.java.name)
+            .mapNotNull { runCatching { Class.forName(it.name, false, context.classLoader).kotlin }.getOrNull() }
+    }
+
+    @OptIn(InternalSerializationApi::class)
+    @Suppress("UNCHECKED_CAST")
+    private fun serializeWithKotlinx(
+        kClass: KClass<*>,
+        value: Any
+    ): String {
+        val serializer = kClass.serializer() as KSerializer<Any>
+        return kotlinxMapper.encodeToString(serializer, value)
+    }
+}
diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/SerializerTest.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/SerializerTest.kt
new file mode 100644
index 000000000..15ad532f8
--- /dev/null
+++ b/app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/SerializerTest.kt
@@ -0,0 +1,157 @@
+package com.lagradost.cloudstream3.utils.serializers
+
+import android.net.Uri
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.KeepGeneratedSerializer
+import kotlinx.serialization.Serializable
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+@OptIn(ExperimentalSerializationApi::class)
+@KeepGeneratedSerializer
+@Serializable(with = NonEmptyData.Serializer::class)
+data class NonEmptyData(
+    val title: String = "",
+    val tags: List<String> = emptyList(),
+    val meta: Map<String, String> = emptyMap(),
+    val name: String = "hello",
+) {
+    object Serializer : NonEmptySerializer<NonEmptyData>(NonEmptyData.generatedSerializer())
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+@KeepGeneratedSerializer
+@Serializable(with = WriteOnlyData.Serializer::class)
+data class WriteOnlyData(
+    val fieldA: String = "",
+    val fieldB: String = "",
+) {
+    object Serializer : WriteOnlySerializer<WriteOnlyData>(
+        WriteOnlyData.generatedSerializer(),
+        setOf("fieldB"),
+    )
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+@KeepGeneratedSerializer
+@Serializable(with = MultiWriteOnly.Serializer::class)
+data class MultiWriteOnly(
+    val fieldA: String = "",
+    val fieldB: String = "",
+    val fieldC: String = "",
+) {
+    object Serializer : WriteOnlySerializer<MultiWriteOnly>(
+        MultiWriteOnly.generatedSerializer(),
+        setOf("fieldB", "fieldC"),
+    )
+}
+
+@Serializable
+data class UriData(
+    @Serializable(with = UriSerializer::class)
+    val uri: Uri = Uri.EMPTY,
+)
+
+class SerializerTest {
+
+    @Test
+    fun nonEmptySerializerOmitsEmptyStrings() {
+        val data = NonEmptyData(title = "", name = "hello")
+        val result = data.toJson()
+        assertFalse(result.contains("title"))
+        assertTrue(result.contains("name"))
+    }
+
+    @Test
+    fun nonEmptySerializerOmitsEmptyLists() {
+        val data = NonEmptyData(tags = emptyList(), name = "hello")
+        val result = data.toJson()
+        assertFalse(result.contains("tags"))
+    }
+
+    @Test
+    fun nonEmptySerializerOmitsEmptyMaps() {
+        val data = NonEmptyData(meta = emptyMap(), name = "hello")
+        val result = data.toJson()
+        assertFalse(result.contains("meta"))
+    }
+
+    @Test
+    fun nonEmptySerializerKeepsNonEmptyFields() {
+        val data = NonEmptyData(title = "hello", tags = listOf("a"), meta = mapOf("k" to "v"))
+        val result = data.toJson()
+        assertTrue(result.contains("title"))
+        assertTrue(result.contains("tags"))
+        assertTrue(result.contains("meta"))
+    }
+
+    @Test
+    fun nonEmptySerializerDoesNotAffectDeserialization() {
+        val input = """{"title":"hello","tags":["a"],"meta":{"k":"v"},"name":"world"}"""
+        val result = parseJson<NonEmptyData>(input)
+        assertEquals("hello", result.title)
+        assertEquals(listOf("a"), result.tags)
+        assertEquals(mapOf("k" to "v"), result.meta)
+        assertEquals("world", result.name)
+    }
+
+    @Test
+    fun writeOnlySerializerOmitsFieldOnSerialize() {
+        val data = WriteOnlyData(fieldA = "hello", fieldB = "secret")
+        val result = data.toJson()
+        assertTrue(result.contains("fieldA"))
+        assertFalse(result.contains("fieldB"))
+    }
+
+    @Test
+    fun writeOnlySerializerDeserializesNormally() {
+        val input = """{"fieldA":"hello","fieldB":"secret"}"""
+        val result = parseJson<WriteOnlyData>(input)
+        assertEquals("hello", result.fieldA)
+        assertEquals("secret", result.fieldB)
+    }
+
+    @Test
+    fun writeOnlySerializerDeserializesMissingAsDefault() {
+        val input = """{"fieldA":"hello"}"""
+        val result = parseJson<WriteOnlyData>(input)
+        assertEquals("hello", result.fieldA)
+        assertEquals("", result.fieldB)
+    }
+
+    @Test
+    fun writeOnlySerializerHandlesMultipleKeys() {
+        val data = MultiWriteOnly(fieldA = "hello", fieldB = "secret1", fieldC = "secret2")
+        val result = data.toJson()
+        assertTrue(result.contains("fieldA"))
+        assertFalse(result.contains("fieldB"))
+        assertFalse(result.contains("fieldC"))
+    }
+
+    @Test
+    fun uriSerializerSerializesUriToString() {
+        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
+        val result = data.toJson()
+        assertTrue(result.contains("https://example.com/path?query=1"))
+    }
+
+    @Test
+    fun uriSerializerDeserializesStringToUri() {
+        val input = """{"uri":"https://example.com/path?query=1"}"""
+        val result = parseJson<UriData>(input)
+        assertEquals(Uri.parse("https://example.com/path?query=1"), result.uri)
+    }
+
+    @Test
+    fun uriSerializerRoundtripsCorrectly() {
+        val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
+        val encoded = data.toJson()
+        val decoded = parseJson<UriData>(encoded)
+        assertEquals(data.uri, decoded.uri)
+    }
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
index aff1a2f33..debd3f0eb 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt
@@ -610,7 +610,7 @@ object PluginManager {
                     return false
                 }
                 InputStreamReader(stream).use { reader ->
-                    manifest = parseJson(reader, BasePlugin.Manifest::class.java)
+                    manifest = parseJson<BasePlugin.Manifest>(reader.readText())
                 }
             }
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
index c4095e2d8..84a498bb0 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
@@ -16,7 +16,6 @@ import com.lagradost.cloudstream3.Score
 import com.lagradost.cloudstream3.SimklSyncServices
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.app
-import com.lagradost.cloudstream3.mapper
 import com.lagradost.cloudstream3.mvvm.debugPrint
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING
@@ -30,6 +29,7 @@ import com.lagradost.cloudstream3.syncproviders.SyncIdName
 import com.lagradost.cloudstream3.ui.SyncWatchType
 import com.lagradost.cloudstream3.ui.library.ListSorting
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.DataStoreHelper.toYear
 import com.lagradost.cloudstream3.utils.txt
 import java.math.BigInteger
@@ -117,13 +117,8 @@ class SimklApi : SyncAPI() {
          * Gets cached object, if object is not fresh returns null and removes it from cache
          */
         inline fun <reified T : Any> getKey(path: String): T? {
-            // Required for generic otherwise "LinkedHashMap cannot be cast to MediaObject"
-            val type = mapper.typeFactory.constructParametricType(
-                SimklCacheWrapper::class.java,
-                T::class.java
-            )
             val cache = getKey<String>(SIMKL_CACHE_KEY, path)?.let {
-                mapper.readValue<SimklCacheWrapper<T>>(it, type)
+                tryParseJson<SimklCacheWrapper<T>>(it)
             }
 
             return if (cache?.isFresh() == true) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
index f91d40f28..2aadfb13c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt
@@ -12,9 +12,6 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.ListView
 import androidx.appcompat.app.AlertDialog
-import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.databind.json.JsonMapper
-import com.fasterxml.jackson.module.kotlin.kotlinModule
 import com.google.android.gms.cast.MediaLoadOptions
 import com.google.android.gms.cast.MediaQueueItem
 import com.google.android.gms.cast.MediaSeekOptions
@@ -105,9 +102,6 @@ data class MetadataHolder(
 
 class SelectSourceController(val view: ImageView, val activity: ControllerActivity) :
     UIController() {
-    private val mapper: JsonMapper = JsonMapper.builder().addModule(kotlinModule())
-        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build()
-
     init {
         view.setImageResource(R.drawable.ic_baseline_playlist_play_24)
         view.setOnClickListener {
@@ -449,4 +443,4 @@ class ControllerActivity : ExpandedControllerActivity() {
             SkipNextEpisodeController(skipOpButton)
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
index b48adbf4d..c519e0de2 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
@@ -83,6 +83,7 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull
 import com.lagradost.cloudstream3.utils.AppContextUtils.isConnectedToChromecast
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
 import com.lagradost.cloudstream3.utils.AppContextUtils.sortSubs
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.CastHelper.startCast
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.ioWork
@@ -1324,7 +1325,7 @@ class ResultViewModel2 : ViewModel() {
         episodeIds: Array<String>,
         watchState: VideoWatchState
     ) {
-        val watchStateString = DataStore.mapper.writeValueAsString(watchState)
+        val watchStateString = watchState.toJson()
         episodeIds.forEach {
             if (getVideoWatchState(it.toInt()) != watchState) {
                 editor.setKeyRaw(
@@ -2705,4 +2706,4 @@ class ResultViewModel2 : ViewModel() {
                 }
             }
         }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
index 88cb7481c..62426197e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt
@@ -10,7 +10,6 @@ import androidx.core.net.toUri
 import androidx.fragment.app.FragmentActivity
 import androidx.preference.PreferenceManager
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.fasterxml.jackson.module.kotlin.readValue
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getActivity
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
@@ -21,11 +20,12 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager
 import com.lagradost.cloudstream3.syncproviders.providers.AniListApi.Companion.ANILIST_CACHED_LIST
 import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_CACHED_LIST
 import com.lagradost.cloudstream3.syncproviders.providers.KitsuApi.Companion.KITSU_CACHED_LIST
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStore.getDefaultSharedPrefs
 import com.lagradost.cloudstream3.utils.DataStore.getSharedPrefs
-import com.lagradost.cloudstream3.utils.DataStore.mapper
 import com.lagradost.cloudstream3.utils.UIHelper.checkWrite
 import com.lagradost.cloudstream3.utils.UIHelper.requestRW
 import com.lagradost.cloudstream3.utils.downloader.VideoDownloadManager.setupStream
@@ -133,9 +133,7 @@ object BackupUtils {
     )
 
     @Suppress("UNCHECKED_CAST")
-    private fun getBackup(context: Context?): BackupFile? {
-        if (context == null) return null
-
+    private fun getBackup(context: Context): BackupFile {
         val allData = context.getSharedPrefs().all.filter { it.key.isTransferable() }
         val allSettings = context.getDefaultSharedPrefs().all.filter { it.key.isTransferable() }
 
@@ -214,7 +212,7 @@ object BackupUtils {
 
             fileStream = stream.openNew()
             printStream = PrintWriter(fileStream)
-            printStream.print(mapper.writeValueAsString(backupFile))
+            printStream.print(backupFile.toJson())
 
             showToast(
                 R.string.backup_success,
@@ -259,8 +257,8 @@ object BackupUtils {
                             val input = activity.contentResolver.openInputStream(uri)
                                 ?: return@ioSafe
 
-                            val restoredValue =
-                                mapper.readValue<BackupFile>(input)
+                            val text = input.bufferedReader().readText()
+                            val restoredValue = parseJson<BackupFile>(text)
 
                             restore(
                                 activity,
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
index 0a1db85fa..02ee69791 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt
@@ -2,17 +2,16 @@ package com.lagradost.cloudstream3.utils
 
 import android.content.Context
 import android.content.SharedPreferences
+import androidx.core.content.edit
 import androidx.preference.PreferenceManager
-import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.databind.json.JsonMapper
-import com.fasterxml.jackson.module.kotlin.kotlinModule
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKeyClass
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKeyClass
 import com.lagradost.cloudstream3.mvvm.logError
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.toJsonLiteral
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty
-import androidx.core.content.edit
 
 /** Used to display metadata about downloads and resume watching */
 const val DOWNLOAD_HEADER_CACHE = "download_header_cache"
@@ -88,8 +87,18 @@ data class Editor(
 }
 
 object DataStore {
-    val mapper: JsonMapper = JsonMapper.builder().addModule(kotlinModule())
-        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build()
+    // Extensions shouldn't have really been using this version of it, but it seems
+    // some have. Since there has always been a very easy alternative, we won't
+    // need to deprecate it that long, and should be able to fully remove it
+    // once extensions at least use the other version.
+    @Deprecated(
+        "Please do not use the mapper version from DataStore. Preferably use methods from AppUtils " +
+            "to parse JSON. However, you can use the stable-API version of the mapper at " +
+            "com.lagradost.cloudstream3.mapper to access the mapper directly if necessary.",
+        level = DeprecationLevel.ERROR,
+        replaceWith = ReplaceWith("com.lagradost.cloudstream3.mapper"),
+    )
+    val mapper = com.lagradost.cloudstream3.mapper
 
     private fun getPreferences(context: Context): SharedPreferences {
         return context.getSharedPreferences(PREFERENCES_NAME, Context.MODE_PRIVATE)
@@ -99,7 +108,6 @@ object DataStore {
         return getPreferences(this)
     }
 
-
     fun getFolderName(folder: String, path: String): String {
         return "${folder}/${path}"
     }
@@ -165,17 +173,17 @@ object DataStore {
     fun <T> Context.setKey(path: String, value: T) {
         try {
             getSharedPrefs().edit {
-                putString(path, mapper.writeValueAsString(value))
+                putString(path, value?.toJsonLiteral())
             }
         } catch (e: Exception) {
             logError(e)
         }
     }
 
-    fun <T> Context.getKey(path: String, valueType: Class<T>): T? {
+    fun <T : Any> Context.getKey(path: String, valueType: Class<T>): T? {
         try {
             val json: String = getSharedPrefs().getString(path, null) ?: return null
-            return json.toKotlinObject(valueType)
+            return parseJson(json, valueType.kotlin)
         } catch (e: Exception) {
             return null
         }
@@ -186,11 +194,11 @@ object DataStore {
     }
 
     inline fun <reified T : Any> String.toKotlinObject(): T {
-        return mapper.readValue(this, T::class.java)
+        return parseJson(this)
     }
 
-    fun <T> String.toKotlinObject(valueType: Class<T>): T {
-        return mapper.readValue(this, valueType)
+    fun <T : Any> String.toKotlinObject(valueType: Class<T>): T {
+        return parseJson(this, valueType.kotlin)
     }
 
     // GET KEY GIVEN PATH AND DEFAULT VALUE, NULL IF ERROR
@@ -214,4 +222,4 @@ object DataStore {
     inline fun <reified T : Any> Context.getKey(folder: String, path: String, defVal: T?): T? {
         return getKey(getFolderName(folder, path), defVal) ?: defVal
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
index 539d5e1a4..6e74fa00a 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt
@@ -8,7 +8,7 @@ import com.lagradost.cloudstream3.APIHolder.apis
 //import com.lagradost.cloudstream3.animeproviders.AniflixProvider
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import java.util.concurrent.TimeUnit
 
 object SyncUtil {
@@ -71,7 +71,7 @@ object SyncUtil {
             val url =
                 "https://raw.githubusercontent.com/MALSync/MAL-Sync-Backup/master/data/pages/$site/$slug.json"
             val response = app.get(url, cacheTime = 1, cacheUnit = TimeUnit.DAYS).text
-            val mapped = parseJson<MalSyncPage?>(response)
+            val mapped = tryParseJson<MalSyncPage?>(response)
 
             val overrideMal = mapped?.malId ?: mapped?.mal?.id ?: mapped?.anilist?.malId
             val overrideAnilist = mapped?.aniId ?: mapped?.anilist?.id
@@ -167,4 +167,4 @@ object SyncUtil {
         @JsonProperty("updatedAt") val updatedAt: String?,
         @JsonProperty("deletedAt") val deletedAt: String?
     )
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/serializers/UriSerializer.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/serializers/UriSerializer.kt
new file mode 100644
index 000000000..7c73a6889
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/serializers/UriSerializer.kt
@@ -0,0 +1,40 @@
+package com.lagradost.cloudstream3.utils.serializers
+
+import android.net.Uri
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+/**
+ * Custom KSerializer for Android's [Uri] type.
+ *
+ * Uri is an Android platform type and cannot be annotated with @Serializable directly.
+ * Registering it in a SerializersModule globally would require a custom module passed to
+ * every Json instance, which adds hidden coupling. This serializer is also used sparingly
+ * across the codebase, so the overhead of a global registration isn't justified.
+ * Instead, we keep it explicit so that each usage site opts in intentionally and the
+ * serialization behavior remains visible.
+ *
+ * Usage:
+ *
+ *   @Serializable
+ *   data class MyData(
+ *       @Serializable(with = UriSerializer::class)
+ *       val uri: Uri,
+ *   )
+ */
+object UriSerializer : KSerializer<Uri> {
+    override val descriptor: SerialDescriptor = 
+        PrimitiveSerialDescriptor("Uri", PrimitiveKind.STRING)
+
+    override fun serialize(encoder: Encoder, value: Uri) {
+        encoder.encodeString(value.toString())
+    }
+
+    override fun deserialize(decoder: Decoder): Uri {
+        return Uri.parse(decoder.decodeString())
+    }
+}
diff --git a/build.gradle.kts b/build.gradle.kts
index e35c1f611..609a94b3a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.dokka) apply false
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.kotlin.multiplatform) apply false
+    alias(libs.plugins.kotlin.serialization) apply false
 }
 
 allprojects {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c806df9a9..32e417e62 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,6 +8,7 @@ annotation = "1.10.0"
 appcompat = "1.7.1"
 biometric = "1.4.0-alpha06"
 buildkonfigGradlePlugin = "0.18.0"
+classgraph = "4.8.184"
 coil = { strictly = "3.3.0" } # Later versions require jvmTarget 11 or later
 colorpicker = "6b46b49"
 conscryptAndroid = { strictly = "2.5.2" } # 2.5.3 crashes everything
@@ -17,6 +18,7 @@ desugar_jdk_libs_nio = "2.1.5"
 dokkaGradlePlugin = "2.2.0"
 espressoCore = "3.7.0"
 fragmentKtx = "1.8.9"
+instancioCore = "5.5.1"
 jacksonModuleKotlin = { strictly = "2.13.1" } # Later versions don't support minSdk <26 (Crashes on Android TV's and FireSticks)
 json = "20251224"
 jsoup = "1.22.1"
@@ -28,6 +30,7 @@ kotlinGradlePlugin = "2.3.20"
 kotlinxAtomicfu = "0.32.1"
 kotlinxCollectionsImmutable = "0.4.0"
 kotlinxCoroutinesCore = "1.10.2"
+kotlinxSerializationJson = "1.11.0"
 lifecycleKtx = "2.10.0"
 material = "1.14.0"
 media3 = "1.9.3"
@@ -65,6 +68,7 @@ anime-db = { module = "com.github.recloudstream:anime-db", version.ref = "animeD
 annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
+classgraph = { group = "io.github.classgraph", name = "classgraph", version.ref = "classgraph" }
 coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
 coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
 colorpicker = { module = "com.github.recloudstream:color-picker-android", version.ref = "colorpicker" }
@@ -77,15 +81,18 @@ desugar_jdk_libs_nio = { module = "com.android.tools:desugar_jdk_libs_nio", vers
 espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
 ext-junit = { module = "androidx.test.ext:junit", version.ref = "junitVersion" }
 fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragmentKtx" }
+instancio-core = { group = "org.instancio", name = "instancio-core", version.ref = "instancioCore" }
 jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jacksonModuleKotlin" }
 json = { module = "org.json:json", version.ref = "json" }
 jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 junit = { module = "junit:junit", version.ref = "junit" }
 junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "junitKtx" }
 juniversalchardet = { module = "com.github.albfernandez:juniversalchardet", version.ref = "juniversalchardet" }
+kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlinGradlePlugin" }
 kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "kotlinxAtomicfu" }
 kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinxCollectionsImmutable" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleKtx" }
 lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleKtx" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
@@ -128,6 +135,7 @@ buildkonfig = { id = "com.codingfeline.buildkonfig", version.ref = "buildkonfigG
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokkaGradlePlugin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm" , version.ref = "kotlinGradlePlugin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlinGradlePlugin" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinGradlePlugin" }
 
 [bundles]
 coil = ["coil", "coil-network-okhttp"]
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index 228bf4994..0abd6f3de 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -12,6 +12,7 @@ plugins {
     alias(libs.plugins.android.multiplatform.library)
     alias(libs.plugins.buildkonfig)
     alias(libs.plugins.dokka)
+    alias(libs.plugins.kotlin.serialization)
 }
 
 val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
@@ -58,6 +59,7 @@ kotlin {
             implementation(libs.jackson.module.kotlin) // JSON Parser
             implementation(libs.kotlinx.atomicfu)
             implementation(libs.kotlinx.coroutines.core)
+            implementation(libs.kotlinx.serialization.json) // JSON Parser
             implementation(libs.jsoup) // HTML Parser
             implementation(libs.rhino) // Run JavaScript
             implementation(libs.newpipeextractor)
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index faff17077..5de3d3e38 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -30,6 +30,7 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.EnumSet
 import java.util.Locale
+import kotlinx.serialization.json.Json
 import kotlin.io.encoding.Base64
 import kotlin.io.encoding.ExperimentalEncodingApi
 import kotlin.math.absoluteValue
@@ -76,6 +77,13 @@ const val USER_AGENT =
 class ErrorLoadingException(message: String? = null) : Exception(message)
 
 //val baseHeader = mapOf("User-Agent" to USER_AGENT)
+
+@Prerelease
+val json = Json {
+    encodeDefaults = true
+    ignoreUnknownKeys = true
+}
+
 val mapper = JsonMapper.builder().addModule(kotlinModule())
     .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build()!!
 
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainActivity.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainActivity.kt
index 4b163867d..127b075da 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainActivity.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainActivity.kt
@@ -1,39 +1,33 @@
 package com.lagradost.cloudstream3
 
-import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import com.lagradost.nicehttp.Requests
 import com.lagradost.nicehttp.ResponseParser
 import kotlin.reflect.KClass
 
 // Short name for requests client to make it nicer to use
-private val jacksonResponseParser = object : ResponseParser {
-    val mapper: ObjectMapper = jacksonObjectMapper().configure(
-        DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,
-        false
-    )
-
+private val jsonResponseParser = object : ResponseParser {
     override fun <T : Any> parse(text: String, kClass: KClass<T>): T {
-        return mapper.readValue(text, kClass.java)
+        return parseJson(text, kClass)
     }
 
     override fun <T : Any> parseSafe(text: String, kClass: KClass<T>): T? {
         return try {
-            mapper.readValue(text, kClass.java)
-        } catch (e: Exception) {
+            parse(text, kClass)
+        } catch (_: Exception) {
             null
         }
     }
 
     override fun writeValueAsString(obj: Any): String {
-        return mapper.writeValueAsString(obj)
+        return obj.toJson()
     }
 }
 
 /** The default networking helper. This helper performs SSL checks.
  * If you need to make requests to websites with invalid SSL certificates use insecureApp instead. */
-var app = Requests(responseParser = jacksonResponseParser).apply {
+var app = Requests(responseParser = jsonResponseParser).apply {
     defaultHeaders = mapOf("user-agent" to USER_AGENT)
 }
 
@@ -41,6 +35,6 @@ var app = Requests(responseParser = jacksonResponseParser).apply {
  * This should NEVER be used for sensitive networking operations such as logins. Only use this when required. */
 @Prerelease
 @UnsafeSSL
-var insecureApp = Requests(responseParser = jacksonResponseParser).apply {
+var insecureApp = Requests(responseParser = jsonResponseParser).apply {
     defaultHeaders = mapOf("user-agent" to USER_AGENT)
-}
\ No newline at end of file
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt
index ea6fba73b..b80534db2 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt
@@ -2,13 +2,12 @@
 
 package com.lagradost.cloudstream3.extractors
 
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.*
-import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.extractors.helper.AesHelper
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.fasterxml.jackson.module.kotlin.readValue
+import com.lagradost.cloudstream3.utils.*
+import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 
 open class HDMomPlayer : ExtractorApi() {
     override val name            = "HDMomPlayer"
@@ -32,7 +31,7 @@ open class HDMomPlayer : ExtractorApi() {
 
             val trackStr = Regex("""tracks:\[([^\]]+)""").find(iSource)?.groupValues?.get(1)
             if (trackStr != null) {
-                val tracks:List<Track> = jacksonObjectMapper().readValue("[${trackStr}]")
+                val tracks:List<Track> = parseJson<List<Track>>("[${trackStr}]")
 
                 for (track in tracks) {
                     if (track.file == null || track.label == null) continue
@@ -68,4 +67,4 @@ open class HDMomPlayer : ExtractorApi() {
         @JsonProperty("language") val language: String?,
         @JsonProperty("default")  val default: String?
     )
-}
\ No newline at end of file
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt
index 583d92322..bc94ae0cc 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoSeyredExtractor.kt
@@ -2,12 +2,11 @@
 
 package com.lagradost.cloudstream3.extractors
 
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.lagradost.api.Log
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.utils.*
-import com.fasterxml.jackson.annotation.JsonProperty
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.fasterxml.jackson.module.kotlin.readValue
+import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 
 open class VideoSeyred : ExtractorApi() {
     override val name            = "VideoSeyred"
@@ -20,7 +19,7 @@ open class VideoSeyred : ExtractorApi() {
         val videoUrl = "${mainUrl}/playlist/${videoId}.json"
 
         val responseRaw                          = app.get(videoUrl)
-        val responseList:List<VideoSeyredSource> = jacksonObjectMapper().readValue(responseRaw.text) ?: throw ErrorLoadingException("VideoSeyred")
+        val responseList: List<VideoSeyredSource> = tryParseJson<List<VideoSeyredSource>>(responseRaw.text) ?: throw ErrorLoadingException("VideoSeyred")
         val response                              = responseList[0]
 
         for (track in response.tracks) {
@@ -68,4 +67,4 @@ open class VideoSeyred : ExtractorApi() {
         @JsonProperty("label")    val label: String?    = null,
         @JsonProperty("default")  val default: String?  = null
     )
-}
\ No newline at end of file
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
index 6832ab8d2..96dda5b25 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -1,21 +1,37 @@
 package com.lagradost.cloudstream3.utils
 
 import com.fasterxml.jackson.module.kotlin.readValue
+import com.lagradost.cloudstream3.InternalAPI
+import com.lagradost.cloudstream3.json
 import com.lagradost.cloudstream3.mapper
-import java.io.Reader
+import com.lagradost.cloudstream3.mvvm.logError
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.InternalSerializationApi
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.serializerOrNull
+import kotlin.reflect.KClass
 
+@OptIn(ExperimentalSerializationApi::class, InternalSerializationApi::class)
 object AppUtils {
-    /** Any object as json string */
+    /** Any object as a JSON string */
     fun Any.toJson(): String {
         if (this is String) return this
-        return mapper.writeValueAsString(this)
+        return toJsonLiteral()
     }
 
-    inline fun <reified T> parseJson(value: String): T {
-        return mapper.readValue(value)
+    inline fun <reified T : Any> parseJson(value: String): T {
+        return parseJson(value, T::class)
     }
 
-    inline fun <reified T> parseJson(reader: Reader, valueType: Class<T>): T {
+    @Deprecated(
+        "This overload was only ever used for BasePlugin.Manifest which has since been migrated. " +
+            "No other code should be using this. Use reader.readText() and call parseJson(String) instead.",
+        level = DeprecationLevel.ERROR,
+        replaceWith = ReplaceWith("parseJson<T>(reader.readText())")
+    )
+    inline fun <reified T> parseJson(reader: java.io.Reader, valueType: Class<T>): T {
+        // Reader-based parsing has no kotlinx equivalent, fall back to Jackson
         return mapper.readValue(reader, valueType)
     }
 
@@ -26,4 +42,40 @@ object AppUtils {
             null
         }
     }
-}
\ No newline at end of file
+
+    /** Sometimes we want to encode as JSON even if it is already a String. */
+    @InternalAPI
+    fun Any.toJsonLiteral(): String {
+        // @Serializable generates a serializer at compile time; contextual serializers are
+        // registered manually in serializersModule, we need both to support all cases
+        val serializer = this::class.serializerOrNull() ?: json.serializersModule.getContextual(this::class)
+        return if (serializer != null) {
+            try {
+                @Suppress("UNCHECKED_CAST")
+                json.encodeToString(serializer as KSerializer<Any>, this)
+            } catch (e: SerializationException) {
+                logError(e)
+                mapper.writeValueAsString(this)
+            }
+        } else {
+            mapper.writeValueAsString(this)
+        }
+    }
+
+    @InternalAPI
+    fun <T : Any> parseJson(value: String, kClass: KClass<T>): T {
+        // @Serializable generates a serializer at compile time; contextual serializers are
+        // registered manually in serializersModule, we need both to support all cases
+        val serializer = kClass.serializerOrNull() ?: json.serializersModule.getContextual(kClass)
+        return if (serializer != null) {
+            try {
+                json.decodeFromString(serializer, value)
+            } catch (e: SerializationException) {
+                logError(e)
+                mapper.readValue(value, kClass.java)
+            }
+        } else {
+            mapper.readValue(value, kClass.java)
+        }
+    }
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/NonEmptySerializer.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/NonEmptySerializer.kt
new file mode 100644
index 000000000..82de9f7f7
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/NonEmptySerializer.kt
@@ -0,0 +1,47 @@
+package com.lagradost.cloudstream3.utils.serializers
+
+import com.lagradost.cloudstream3.Prerelease
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonNull
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.JsonTransformingSerializer
+
+/**
+ * Replicates Jackson's @JsonInclude(JsonInclude.Include.NON_EMPTY) behaviour.
+ * Strips null, empty strings, empty arrays, and empty objects from the serialized
+ * output. Requires the enclosing Json instance to have encodeDefaults = true,
+ * which is already in our default global Json instance.
+ *
+ * Usage:
+ *
+ *   @OptIn(ExperimentalSerializationApi::class)
+ *   @KeepGeneratedSerializer
+ *   @Serializable(with = MyData.Serializer::class)
+ *   data class MyData(
+ *       val tags: List<String> = emptyList(),
+ *       val title: String = "",
+ *       val meta: Map<String, String> = emptyMap(),
+ *   ) {
+ *       object Serializer : NonEmptySerializer<MyData>(MyData.generatedSerializer())
+ *   }
+ */
+@Prerelease
+abstract class NonEmptySerializer<T : Any>(tSerializer: KSerializer<T>) :
+    JsonTransformingSerializer<T>(tSerializer) {
+
+    override fun transformSerialize(element: JsonElement): JsonElement {
+        if (element !is JsonObject) return element
+
+        return JsonObject(element.filterValues { value ->
+            when (value) {
+                is JsonPrimitive -> value.content.isNotEmpty()
+                is JsonArray -> value.isNotEmpty()
+                is JsonObject -> value.isNotEmpty()
+                JsonNull -> false
+            }
+        })
+    }
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/WriteOnlySerializer.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/WriteOnlySerializer.kt
new file mode 100644
index 000000000..c7f412eaa
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/serializers/WriteOnlySerializer.kt
@@ -0,0 +1,38 @@
+package com.lagradost.cloudstream3.utils.serializers
+
+import com.lagradost.cloudstream3.Prerelease
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonTransformingSerializer
+
+/**
+ * Replicates Jackson's @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) behaviour.
+ * Properties in [keysToIgnore] are deserialized normally but omitted from serialized output.
+ *
+ * Usage:
+ *
+ *   @OptIn(ExperimentalSerializationApi::class)
+ *   @KeepGeneratedSerializer
+ *   @Serializable(with = MyData.Serializer::class)
+ *   data class MyData(
+ *       val fieldA: String = "",
+ *       val fieldB: String = "",
+ *   ) {
+ *       object Serializer : WriteOnlySerializer<MyData>(
+ *           MyData.generatedSerializer(),
+ *           setOf("fieldB"),
+ *       )
+ *   }
+ */
+@Prerelease
+abstract class WriteOnlySerializer<T : Any>(
+    tSerializer: KSerializer<T>,
+    private val keysToIgnore: Set<String>,
+) : JsonTransformingSerializer<T>(tSerializer) {
+
+    override fun transformSerialize(element: JsonElement): JsonElement {
+        if (element !is JsonObject) return element
+        return JsonObject(element.filterKeys { it !in keysToIgnore })
+    }
+}

From a124450ddcb496a20292d3e76cea42eec567c36e Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Fri, 29 May 2026 04:58:08 -0600
Subject: [PATCH 145/177] Migrate Java date utils in library to
 kotlinx-datetime (#2798)

---
 .github/workflows/pull_request.yml            |   2 +-
 gradle/libs.versions.toml                     |   2 +
 library/build.gradle.kts                      |   5 +
 .../com/lagradost/cloudstream3/MainAPI.kt     |  84 ++++++--
 .../cloudstream3/extractors/Vicloud.kt        |   3 +-
 .../cloudstream3/metaproviders/MyDramaList.kt |  16 +-
 .../metaproviders/TraktProvider.kt            |  14 +-
 .../lagradost/cloudstream3/EpisodeDateTest.kt | 196 ++++++++++++++++++
 8 files changed, 281 insertions(+), 41 deletions(-)
 create mode 100644 library/src/commonTest/kotlin/com/lagradost/cloudstream3/EpisodeDateTest.kt

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 675ce3b2f..8f5c62866 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -27,7 +27,7 @@ jobs:
         cache-read-only: false
 
     - name: Run Gradle
-      run: ./gradlew assemblePrereleaseDebug lint
+      run: ./gradlew assemblePrereleaseDebug lint check
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v7
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 32e417e62..7b63a5ddc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -30,6 +30,7 @@ kotlinGradlePlugin = "2.3.20"
 kotlinxAtomicfu = "0.32.1"
 kotlinxCollectionsImmutable = "0.4.0"
 kotlinxCoroutinesCore = "1.10.2"
+kotlinxDatetime = "0.8.0"
 kotlinxSerializationJson = "1.11.0"
 lifecycleKtx = "2.10.0"
 material = "1.14.0"
@@ -92,6 +93,7 @@ kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.re
 kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "kotlinxAtomicfu" }
 kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinxCollectionsImmutable" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
+kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleKtx" }
 lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleKtx" }
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index 0abd6f3de..ead73eec2 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -59,6 +59,7 @@ kotlin {
             implementation(libs.jackson.module.kotlin) // JSON Parser
             implementation(libs.kotlinx.atomicfu)
             implementation(libs.kotlinx.coroutines.core)
+            implementation(libs.kotlinx.datetime)
             implementation(libs.kotlinx.serialization.json) // JSON Parser
             implementation(libs.jsoup) // HTML Parser
             implementation(libs.rhino) // Run JavaScript
@@ -68,6 +69,10 @@ kotlin {
             // Deprecated; will be removed once extensions have time to migrate from using it
             implementation("me.xdrop:fuzzywuzzy:1.4.0")
         }
+
+        commonTest.dependencies {
+            implementation(libs.kotlin.test)
+        }
     }
 }
 
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index 5de3d3e38..5d4deba24 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -25,16 +25,25 @@ import com.lagradost.nicehttp.RequestBodyTypes
 import okhttp3.Interceptor
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody.Companion.toRequestBody
+import kotlinx.datetime.LocalDate
+import kotlinx.datetime.LocalTime
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.atStartOfDayIn
+import kotlinx.datetime.format.DateTimeComponents
+import kotlinx.datetime.format.FormatStringsInDatetimeFormats
+import kotlinx.datetime.format.byUnicodePattern
+import kotlinx.datetime.format.char
+import kotlinx.datetime.format.parse
+import kotlinx.datetime.toInstant
 import java.net.URI
-import java.text.SimpleDateFormat
-import java.util.Date
 import java.util.EnumSet
-import java.util.Locale
 import kotlinx.serialization.json.Json
 import kotlin.io.encoding.Base64
 import kotlin.io.encoding.ExperimentalEncodingApi
 import kotlin.math.absoluteValue
 import kotlin.math.roundToInt
+import kotlin.time.Clock
+import kotlin.time.Instant
 
 /**
  * API available only on prerelease builds.
@@ -88,10 +97,10 @@ val mapper = JsonMapper.builder().addModule(kotlinModule())
     .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build()!!
 
 object APIHolder {
-    val unixTime: Long
-        get() = System.currentTimeMillis() / 1000L
     val unixTimeMS: Long
-        get() = System.currentTimeMillis()
+        get() = Clock.System.now().toEpochMilliseconds()
+    val unixTime: Long
+        get() = unixTimeMS / 1000L
 
     val allProviders = atomicListOf<MainAPI>()
 
@@ -2512,15 +2521,45 @@ constructor(
         get() = score?.toInt(100)
 }
 
+@OptIn(FormatStringsInDatetimeFormats::class)
 fun Episode.addDate(date: String?, format: String = "yyyy-MM-dd") {
-    try {
-        this.date = SimpleDateFormat(format, Locale.getDefault()).parse(date ?: return)?.time
-    } catch (e: Exception) {
-        logError(e)
-    }
+    if (date == null) return
+    this.date = runCatching {
+        // First try standard ISO 8601 (e.g. "2026-01-01T12:30:00.000Z", "2026-05-17T14:35+02:00")
+        runCatching { Instant.parse(date).toEpochMilliseconds() }
+            .getOrElse {
+                val fmt = DateTimeComponents.Format { byUnicodePattern(format) }
+                val components = DateTimeComponents.parse(date, fmt)
+                /**
+                 * Try multiple conversions in order of precision for non-ISO-8601 formats,
+                 * since the date string may or may not include time and/or timezone offset:
+                 * 1. If the custom format produced a UTC offset (e.g. "2026-05-17 14:35+02:00"), use it directly
+                 * 2. If it has time but no offset (e.g. "2026-05-17 14:35"), fall back to device timezone
+                 * 3. If it's date-only (e.g. "2026-05-17"), use start of day in device timezone
+                 */
+                runCatching { components.toInstantUsingOffset().toEpochMilliseconds() }
+                    .recoverCatching { components.toLocalDateTime().toInstant(TimeZone.currentSystemDefault()).toEpochMilliseconds() }
+                    .getOrElse { components.toLocalDate().atStartOfDayIn(TimeZone.currentSystemDefault()).toEpochMilliseconds() }
+            }
+    }.onFailure { logError(it) }.getOrNull()
 }
 
-fun Episode.addDate(date: Date?) {
+@Prerelease
+fun Episode.addDate(date: LocalDate?) {
+    this.date = date?.atStartOfDayIn(TimeZone.currentSystemDefault())?.toEpochMilliseconds()
+}
+
+@Prerelease
+fun Episode.addDate(date: Instant?) {
+    this.date = date?.toEpochMilliseconds()
+}
+
+// Deprecate after next stable
+/* @Deprecated(
+    message = "Use addDate with LocalDate, Instant, or String instead.",
+    level = DeprecationLevel.WARNING,
+) */
+fun Episode.addDate(date: java.util.Date?) {
     this.date = date?.time
 }
 
@@ -2657,6 +2696,27 @@ fun fetchUrls(text: String?): List<String> {
     return linkRegex.findAll(text).map { it.value.trim().removeSurrounding("\"") }.toList()
 }
 
+@Prerelease
+fun isUpcoming(dateString: String?): Boolean {
+    return runCatching {
+        val fmt = DateTimeComponents.Format {
+            year(); char('-'); monthNumber(); char('-'); day()
+        }
+        val components = DateTimeComponents.parse(dateString ?: return false, fmt)
+        /**
+         * Try multiple conversions in order of precision, since the date string format
+         * may or may not include time and/or timezone offset information:
+         * 1. If the string has a UTC offset (e.g. "2026-05-17T14:35+02:00"), use it directly
+         * 2. If it has time but no offset (e.g. "2026-05-17T14:35"), fall back to device timezone
+         * 3. If it's date-only (e.g. "2026-05-17"), use start of day in device timezone
+         */
+        val instant = runCatching { components.toInstantUsingOffset() }
+            .recoverCatching { components.toLocalDateTime().toInstant(TimeZone.currentSystemDefault()) }
+            .getOrElse { components.toLocalDate().atStartOfDayIn(TimeZone.currentSystemDefault()) }
+        Clock.System.now() < instant
+    }.onFailure { logError(it) }.getOrElse { false }
+}
+
 @Deprecated(
     "toRatingInt() is deprecated. Use new score API instead.",
     level = DeprecationLevel.ERROR
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vicloud.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vicloud.kt
index 974549fcb..6b82ee454 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vicloud.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vicloud.kt
@@ -1,6 +1,7 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.ExtractorApi
@@ -21,7 +22,7 @@ open class Vicloud : ExtractorApi() {
     ) {
         val id = Regex("\"apiQuery\":\"(.*?)\"").find(app.get(url).text)?.groupValues?.getOrNull(1)
         app.get(
-            "$mainUrl/api/?$id=&_=${System.currentTimeMillis()}",
+            "$mainUrl/api/?$id=&_=$unixTimeMS",
             headers = mapOf(
                 "X-Requested-With" to "XMLHttpRequest"
             ),
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/MyDramaList.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/MyDramaList.kt
index cf3e28a8d..e7e1175f0 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/MyDramaList.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/MyDramaList.kt
@@ -18,6 +18,7 @@ import com.lagradost.cloudstream3.ShowStatus
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.addDate
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.isUpcoming
 import com.lagradost.cloudstream3.mainPageOf
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.newEpisode
@@ -30,8 +31,6 @@ import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
 import okhttp3.Interceptor
 import okhttp3.Response
-import java.text.SimpleDateFormat
-import java.util.Locale
 
 //Reference: https://mydramalist.github.io/MDL-API/
 abstract class MyDramaListAPI : MainAPI() {
@@ -192,17 +191,6 @@ abstract class MyDramaListAPI : MainAPI() {
         return this
     }
 
-    private fun isUpcoming(dateString: String?): Boolean {
-        return try {
-            val format = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
-            val dateTime = dateString?.let { format.parse(it)?.time } ?: return false
-            unixTimeMS < dateTime
-        } catch (t: Throwable) {
-            logError(t)
-            false
-        }
-    }
-
     private fun getStatus(status: String?): ShowStatus? {
         return when (status) {
             "Airing" -> ShowStatus.Ongoing
@@ -451,4 +439,4 @@ abstract class MyDramaListAPI : MainAPI() {
         @JsonProperty("date") val date: String? = null,
         @JsonProperty("airedDate") val airedDate: String? = null,
     )
-}
\ No newline at end of file
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
index 8f921d75c..0e5aeb339 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
@@ -22,6 +22,7 @@ import com.lagradost.cloudstream3.ShowStatus
 import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.addDate
 import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.isUpcoming
 import com.lagradost.cloudstream3.mainPageOf
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.newEpisode
@@ -33,8 +34,6 @@ import com.lagradost.cloudstream3.newTvSeriesLoadResponse
 import com.lagradost.cloudstream3.newTvSeriesSearchResponse
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import java.text.SimpleDateFormat
-import java.util.Locale
 
 open class TraktProvider : MainAPI() {
     override var name = "Trakt"
@@ -292,17 +291,6 @@ open class TraktProvider : MainAPI() {
         ).text
     }
 
-    private fun isUpcoming(dateString: String?): Boolean {
-        return try {
-            val format = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
-            val dateTime = dateString?.let { format.parse(it)?.time } ?: return false
-            unixTimeMS < dateTime
-        } catch (t: Throwable) {
-            logError(t)
-            false
-        }
-    }
-
     private fun getStatus(t: String?): ShowStatus {
         return when (t) {
             "returning series" -> ShowStatus.Ongoing
diff --git a/library/src/commonTest/kotlin/com/lagradost/cloudstream3/EpisodeDateTest.kt b/library/src/commonTest/kotlin/com/lagradost/cloudstream3/EpisodeDateTest.kt
new file mode 100644
index 000000000..4dc56978e
--- /dev/null
+++ b/library/src/commonTest/kotlin/com/lagradost/cloudstream3/EpisodeDateTest.kt
@@ -0,0 +1,196 @@
+package com.lagradost.cloudstream3
+
+import kotlinx.datetime.LocalDate
+import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.atStartOfDayIn
+import kotlinx.datetime.toInstant
+import kotlin.time.Instant
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+class EpisodeDateTest {
+
+    private val api = object : MainAPI() {
+        override var name = "Test"
+        override var mainUrl = "https://test.com"
+    }
+
+    private fun episode() = api.newEpisode("")
+
+    @Test
+    fun addDateDefaultFormatParsesIsoDate() {
+        val ep = episode()
+        ep.addDate("2026-05-17")
+        val expected = LocalDate(2026, 5, 17)
+            .atStartOfDayIn(TimeZone.currentSystemDefault())
+            .toEpochMilliseconds()
+        assertEquals(expected, ep.date)
+    }
+
+    @Test
+    fun addDateNullDoesNotSetDate() {
+        val ep = episode()
+        ep.addDate(null as String?)
+        assertNull(ep.date)
+    }
+
+    @Test
+    fun addDateInvalidStringLeavesDateNull() {
+        val ep = episode()
+        ep.addDate("not-a-date")
+        assertNull(ep.date)
+    }
+
+    @Test
+    fun addDateCustomFormatParsesSlashDate() {
+        val ep = episode()
+        ep.addDate("17/05/2026", "dd/MM/yyyy")
+        val expected = LocalDate(2026, 5, 17)
+            .atStartOfDayIn(TimeZone.currentSystemDefault())
+            .toEpochMilliseconds()
+        assertEquals(expected, ep.date)
+    }
+
+    @Test
+    fun addDateIsoDateTimeWithOffsetUsesExactInstant() {
+        val ep = episode()
+        ep.addDate("2026-05-17T10:30:00.000+05:00", "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+        val expected = Instant.parse("2026-05-17T10:30:00.000+05:00").toEpochMilliseconds()
+        assertEquals(expected, ep.date)
+    }
+
+    @Test
+    fun addDateUtcDateTimeUsesExactInstant() {
+        val ep = episode()
+        ep.addDate("2026-05-17T10:30:00.000Z", "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+        val expected = Instant.parse("2026-05-17T10:30:00.000Z").toEpochMilliseconds()
+        assertEquals(expected, ep.date)
+    }
+
+    @Test
+    fun addDateDateTimeNoOffsetUsesSystemTimezone() {
+        val ep = episode()
+        ep.addDate("2026-05-17T10:30:00", "yyyy-MM-dd'T'HH:mm:ss")
+        val expected = LocalDateTime(2026, 5, 17, 10, 30, 0)
+            .toInstant(TimeZone.currentSystemDefault())
+            .toEpochMilliseconds()
+        assertEquals(expected, ep.date)
+    }
+
+    @Test
+    fun addDateLocalDateSetsCorrectEpochMillis() {
+        val ep = episode()
+        ep.addDate(LocalDate(2026, 5, 17))
+        val expected = LocalDate(2026, 5, 17)
+            .atStartOfDayIn(TimeZone.currentSystemDefault())
+            .toEpochMilliseconds()
+        assertEquals(expected, ep.date)
+    }
+
+    @Test
+    fun addDateNullLocalDateLeavesDateNull() {
+        val ep = episode()
+        ep.addDate(null as LocalDate?)
+        assertNull(ep.date)
+    }
+
+    @Test
+    fun addDateInstantSetsCorrectEpochMillis() {
+        val ep = episode()
+        val instant = Instant.parse("2026-05-17T10:30:00Z")
+        ep.addDate(instant)
+        assertEquals(instant.toEpochMilliseconds(), ep.date)
+    }
+
+    @Test
+    fun addDateNullInstantLeavesDateNull() {
+        val ep = episode()
+        ep.addDate(null as Instant?)
+        assertNull(ep.date)
+    }
+
+    @Test
+    fun addDateIsoWithMillisAndZUsesExactInstant() {
+        val ep = episode()
+        ep.addDate("2026-01-01T12:30:00.000Z")
+        assertEquals(1767270600000L, ep.date)
+    }
+
+    @Test
+    fun addDateIsoWithZNoMillisUsesExactInstant() {
+        val ep = episode()
+        ep.addDate("2026-01-01T12:30:00Z")
+        assertEquals(1767270600000L, ep.date)
+    }
+
+    @Test
+    fun addDateIsoWithPositiveOffsetUsesExactInstant() {
+        val ep = episode()
+        ep.addDate("2026-05-17T14:35:00+02:00")
+        // 14:35 +02:00 = 12:35 UTC = 2026-05-17T12:35:00Z
+        assertEquals(1779021300000L, ep.date)
+    }
+
+    @Test
+    fun addDateIsoWithNegativeOffsetUsesExactInstant() {
+        val ep = episode()
+        ep.addDate("2026-05-17T09:35:00-05:00")
+        // 09:35 -05:00 = 14:35 UTC = 2026-05-17T14:35:00Z
+        assertEquals(1779028500000L, ep.date)
+    }
+
+    @Test
+    fun addDateCustomFormatWithOffsetUsesExactInstant() {
+        val ep = episode()
+        ep.addDate("17/05/2026 14:35+02:00", "dd/MM/yyyy HH:mmXXX")
+        // 14:35 +02:00 = 12:35 UTC = 2026-05-17T12:35:00Z
+        assertEquals(1779021300000L, ep.date)
+    }
+
+    @Test
+    fun addDateCustomFormatDateTimeNoOffsetUsesSystemTimezone() {
+        val ep = episode()
+        ep.addDate("17/05/2026 14:35", "dd/MM/yyyy HH:mm")
+        val expected = LocalDateTime(2026, 5, 17, 14, 35, 0)
+            .toInstant(TimeZone.currentSystemDefault())
+            .toEpochMilliseconds()
+        assertEquals(expected, ep.date)
+    }
+
+    @Test
+    fun addDateCustomFormatDateOnlyUsesStartOfDay() {
+        val ep = episode()
+        ep.addDate("17/05/2026", "dd/MM/yyyy")
+        val expected = LocalDate(2026, 5, 17)
+            .atStartOfDayIn(TimeZone.currentSystemDefault())
+            .toEpochMilliseconds()
+        assertEquals(expected, ep.date)
+    }
+}
+
+class IsUpcomingTest {
+
+    @Test
+    fun isUpcomingFutureDate() {
+        assertTrue(isUpcoming("2099-01-01"))
+    }
+
+    @Test
+    fun isUpcomingPastDate() {
+        assertFalse(isUpcoming("2000-01-01"))
+    }
+
+    @Test
+    fun isUpcomingNullReturnsFalse() {
+        assertFalse(isUpcoming(null))
+    }
+
+    @Test
+    fun isUpcomingInvalidStringReturnsFalse() {
+        assertFalse(isUpcoming("not-a-date"))
+    }
+}

From 041d21a486685eb3fda44461932d6615512eb22e Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Fri, 29 May 2026 11:30:55 -0600
Subject: [PATCH 146/177] Emergency patch (#2851)

---
 .../java/com/lagradost/cloudstream3/utils/InAppUpdater.kt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
index 8bcd1b88e..1973d4d6c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
@@ -93,9 +93,9 @@ object InAppUpdater {
     private suspend fun Activity.getReleaseUpdate(): Update {
         val url = "https://api.github.com/repos/$GITHUB_USER_NAME/$GITHUB_REPO/releases"
         val headers = mapOf("Accept" to "application/vnd.github.v3+json")
-        val response = parseJson<List<GithubRelease>>(
+        val response = parseJson<Array<GithubRelease>>(
             app.get(url, headers = headers).text
-        )
+        ).toList()
 
         val versionRegex = Regex("""(.*?((\d+)\.(\d+)\.(\d+))\.apk)""")
         val versionRegexLocal = Regex("""(.*?((\d+)\.(\d+)\.(\d+)).*)""")
@@ -150,9 +150,9 @@ object InAppUpdater {
             "https://api.github.com/repos/$GITHUB_USER_NAME/$GITHUB_REPO/git/ref/tags/pre-release"
         val releaseUrl = "https://api.github.com/repos/$GITHUB_USER_NAME/$GITHUB_REPO/releases"
         val headers = mapOf("Accept" to "application/vnd.github.v3+json")
-        val response = parseJson<List<GithubRelease>>(
+        val response = parseJson<Array<GithubRelease>>(
             app.get(releaseUrl, headers = headers).text
-        )
+        ).toList()
 
         val found = response.lastOrNull { rel ->
             rel.prerelease || rel.tagName == "pre-release"

From 0728dd06a1d0f1629c8e6ebab739c0e364d0b25c Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 30 May 2026 19:09:43 -0600
Subject: [PATCH 147/177] [skip ci] Replace using Char constructor in a couple
 extractors (#2856)

---
 .../com/lagradost/cloudstream3/extractors/Gdriveplayer.kt     | 4 ++--
 .../kotlin/com/lagradost/cloudstream3/extractors/Userload.kt  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt
index 61c22e929..5fc55aac6 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt
@@ -82,7 +82,7 @@ open class Gdriveplayer : ExtractorApi() {
         val password = Regex("null,['|\"](\\w+)['|\"]").first(eval)
             ?.split(Regex("\\D+"))
             ?.joinToString("") {
-                Char(it.toInt()).toString()
+                it.toInt().toChar().toString()
             }.let { Regex("var pass = \"(\\S+?)\"").first(it ?: return)?.toByteArray() }
             ?: throw ErrorLoadingException("can't find password")
         val decryptedData = cryptoAESHandler(data, password, false, "AES/CBC/NoPadding")?.let { getAndUnpack(it) }?.replace("\\", "")
@@ -125,4 +125,4 @@ open class Gdriveplayer : ExtractorApi() {
         @JsonProperty("label") val label: String
     )
 
-}
\ No newline at end of file
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userload.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userload.kt
index fad6e8571..08dcb634e 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userload.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userload.kt
@@ -69,7 +69,7 @@ open class Userload : ExtractorApi() {
         }
         var txtresult = ""
         subchar.forEach{
-            txtresult = txtresult.plus(Char(it.toInt(8)))
+            txtresult = txtresult.plus(it.toInt(8).toChar())
         }
         val val1 = Regex(""""morocco="((.|\\n)*?)"&mycountry="""").find(txtresult)?.groups?.get(1)?.value.toString().drop(1).dropLast(1)
         val val2 = txtresult.substringAfter("""&mycountry="+""").substringBefore(")")

From 8e7569df5351a4cb4e4cf3ddfc3551d42af997ab Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 30 May 2026 19:47:46 -0600
Subject: [PATCH 148/177] Fix T::class in parseJson causing type erasure in
 some cases (#2852)

---
 .../cloudstream3/utils/InAppUpdater.kt        |  4 +--
 .../lagradost/cloudstream3/utils/AppUtils.kt  | 28 +++++++++++++++----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
index 1973d4d6c..b01f6e07e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt
@@ -103,9 +103,7 @@ object InAppUpdater {
             !rel.prerelease
         }.sortedWith(compareBy { release ->
             release.assets.firstOrNull { it.contentType == "application/vnd.android.package-archive" }?.name?.let { it1 ->
-                versionRegex.find(
-                    it1
-                )?.groupValues?.let {
+                versionRegex.find(it1)?.groupValues?.let {
                     it[3].toInt() * 100_000_000 + it[4].toInt() * 10_000 + it[5].toInt()
                 }
             }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
index 96dda5b25..5cc91b6d6 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.utils
 
+import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.lagradost.cloudstream3.InternalAPI
 import com.lagradost.cloudstream3.json
@@ -9,6 +10,7 @@ import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.InternalSerializationApi
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerializationException
+import kotlinx.serialization.serializer
 import kotlinx.serialization.serializerOrNull
 import kotlin.reflect.KClass
 
@@ -21,7 +23,10 @@ object AppUtils {
     }
 
     inline fun <reified T : Any> parseJson(value: String): T {
-        return parseJson(value, T::class)
+        // serializer<T>() preserves full generic type info (e.g. List<DataClass>)
+        // and must be resolved here while T is still reified, same for TypeReference
+        val serializer = try { serializer<T>() } catch (_: Exception) { null }
+        return parseJson(value, T::class, serializer, object : TypeReference<T>() {})
     }
 
     @Deprecated(
@@ -63,17 +68,28 @@ object AppUtils {
     }
 
     @InternalAPI
-    fun <T : Any> parseJson(value: String, kClass: KClass<T>): T {
+    fun <T : Any> parseJson(
+        value: String,
+        kClass: KClass<T>,
+        serializer: KSerializer<T>? = null,
+        typeReference: TypeReference<T>? = null,
+    ): T {
         // @Serializable generates a serializer at compile time; contextual serializers are
         // registered manually in serializersModule, we need both to support all cases
-        val serializer = kClass.serializerOrNull() ?: json.serializersModule.getContextual(kClass)
-        return if (serializer != null) {
+        val s =
+            serializer ?: kClass.serializerOrNull() ?: json.serializersModule.getContextual(kClass)
+
+        // Prefer Kotlin Serialization over Jackson
+        if (s != null) {
             try {
-                json.decodeFromString(serializer, value)
+                return json.decodeFromString(s, value)
             } catch (e: SerializationException) {
                 logError(e)
-                mapper.readValue(value, kClass.java)
             }
+        }
+
+        return if (typeReference != null) {
+            mapper.readValue(value, typeReference)
         } else {
             mapper.readValue(value, kClass.java)
         }

From b7f5826a19e20ec9709880bcc8893b03118ab215 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sat, 30 May 2026 19:48:06 -0600
Subject: [PATCH 149/177] Add expect/actual for YoutubeExtractor (#2844)

NewPipeExtractor won't work in non-JVM platforms.
---
 library/build.gradle.kts                      |  11 +-
 .../extractors/YoutubeExtractor.android.kt    | 105 +++++++++++++++
 .../extractors/YoutubeExtractor.kt            | 122 ++----------------
 .../extractors/YoutubeExtractor.jvm.kt        | 105 +++++++++++++++
 4 files changed, 232 insertions(+), 111 deletions(-)
 create mode 100644 library/src/androidMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.android.kt
 create mode 100644 library/src/jvmMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.jvm.kt

diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index ead73eec2..92a9330e8 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -63,7 +63,6 @@ kotlin {
             implementation(libs.kotlinx.serialization.json) // JSON Parser
             implementation(libs.jsoup) // HTML Parser
             implementation(libs.rhino) // Run JavaScript
-            implementation(libs.newpipeextractor)
             implementation(libs.tmdb.java) // TMDB API v3 Wrapper Made with RetroFit
 
             // Deprecated; will be removed once extensions have time to migrate from using it
@@ -73,6 +72,16 @@ kotlin {
         commonTest.dependencies {
             implementation(libs.kotlin.test)
         }
+
+        // We will eventually add a new jvmCommonMain source set
+        // for things shared between Android and JVM.
+        androidMain.dependencies {
+            implementation(libs.newpipeextractor)
+        }
+
+        jvmMain.dependencies {
+            implementation(libs.newpipeextractor)
+        }
     }
 }
 
diff --git a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.android.kt b/library/src/androidMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.android.kt
new file mode 100644
index 000000000..345aa7185
--- /dev/null
+++ b/library/src/androidMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.android.kt
@@ -0,0 +1,105 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.newAudioFile
+import com.lagradost.cloudstream3.newSubtitleFile
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.newExtractorLink
+import org.schabi.newpipe.extractor.stream.StreamInfo
+import org.schabi.newpipe.extractor.stream.StreamType
+
+actual open class YoutubeExtractor actual constructor() : ExtractorApi() {
+
+    actual override val mainUrl = "https://www.youtube.com"
+    actual override val name = "YouTube"
+    actual override val requiresReferer = false
+
+    actual override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+    ) {
+        val videoId = extractYouTubeId(url)
+        val watchUrl = "$mainUrl/watch?v=$videoId"
+
+        val info = StreamInfo.getInfo(watchUrl)
+        val isLive = info.streamType == StreamType.LIVE_STREAM
+            || info.streamType == StreamType.AUDIO_LIVE_STREAM
+            || info.streamType == StreamType.POST_LIVE_STREAM
+            || info.streamType == StreamType.POST_LIVE_AUDIO_STREAM
+
+        if (isLive && info.hlsUrl != null) {
+            callback(
+                newExtractorLink(
+                    source = name,
+                    name = "YouTube Live",
+                    url = info.hlsUrl
+                ) {
+                    type = ExtractorLinkType.M3U8
+                }
+            )
+        } else {
+            processVideo(info, subtitleCallback, callback)
+        }
+    }
+
+    private suspend fun processVideo(
+        info: StreamInfo,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+    ): Boolean {
+        val videoStreams = info.videoOnlyStreams.orEmpty()
+        if (videoStreams.isEmpty()) return false
+
+        val audioStreams = info.audioStreams.orEmpty()
+        videoStreams.forEach { video ->
+            callback(
+                newExtractorLink(
+                    source = name,
+                    name = "YouTube ${normalizeCodec(video.codec)}",
+                    url = video.content
+                ) {
+                    quality = video.height
+                    audioTracks = audioStreams.map { newAudioFile(it.content) }
+                }
+            )
+        }
+
+        info.subtitles.forEach { subtitle ->
+            subtitleCallback(
+                newSubtitleFile(
+                    lang = subtitle.displayLanguageName
+                        ?: subtitle.languageTag
+                        ?: "Unknown",
+                    url = subtitle.content
+                )
+            )
+        }
+
+        return true
+    }
+
+    private fun extractYouTubeId(url: String): String {
+        val regex = Regex(
+            "(?:youtu\\.be/|youtube(?:-nocookie)?\\.com/(?:.*v=|v/|u/\\w/|embed/|shorts/|live/))([\\w-]{11})"
+        )
+
+        return regex.find(url)?.groupValues?.get(1)
+            ?: throw IllegalArgumentException("Invalid YouTube URL: $url")
+    }
+
+    private fun normalizeCodec(codec: String?): String {
+        if (codec.isNullOrBlank()) return ""
+        val c = codec.lowercase()
+        return when {
+            c.startsWith("av01") -> "AV1"
+            c.startsWith("vp9") -> "VP9"
+            c.startsWith("avc1") || c.startsWith("h264") -> "H264"
+            c.startsWith("hev1") || c.startsWith("hvc1") || c.startsWith("hevc") -> "H265"
+            else -> codec.substringBefore('.').uppercase()
+        }
+    }
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
index dd8511eae..fb310401a 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt
@@ -1,14 +1,20 @@
 package com.lagradost.cloudstream3.extractors
 
 import com.lagradost.cloudstream3.SubtitleFile
-import com.lagradost.cloudstream3.newAudioFile
-import com.lagradost.cloudstream3.newSubtitleFile
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
-import com.lagradost.cloudstream3.utils.newExtractorLink
-import com.lagradost.cloudstream3.utils.ExtractorLinkType
-import org.schabi.newpipe.extractor.stream.StreamInfo
-import org.schabi.newpipe.extractor.stream.StreamType
+
+expect open class YoutubeExtractor() : ExtractorApi {
+    override val mainUrl: String
+    override val name: String
+    override val requiresReferer: Boolean
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+    )
+}
 
 class YoutubeShortLinkExtractor : YoutubeExtractor() {
     override val mainUrl = "https://youtu.be"
@@ -21,107 +27,3 @@ class YoutubeMobileExtractor : YoutubeExtractor() {
 class YoutubeNoCookieExtractor : YoutubeExtractor() {
     override val mainUrl = "https://www.youtube-nocookie.com"
 }
-
-open class YoutubeExtractor : ExtractorApi() {
-
-    override val mainUrl = "https://www.youtube.com"
-    override val name = "YouTube"
-    override val requiresReferer = false
-
-    override suspend fun getUrl(
-        url: String,
-        referer: String?,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ) {
-        val videoId = extractYouTubeId(url)
-        val watchUrl = "$mainUrl/watch?v=$videoId"
-
-        val info = StreamInfo.getInfo(watchUrl)
-
-        val isLive =
-            info.streamType == StreamType.LIVE_STREAM
-                    || info.streamType == StreamType.AUDIO_LIVE_STREAM
-                    || info.streamType == StreamType.POST_LIVE_STREAM
-                    || info.streamType == StreamType.POST_LIVE_AUDIO_STREAM
-
-        if (isLive && info.hlsUrl != null) {
-            callback(
-                newExtractorLink(
-                    source = name,
-                    name = "YouTube Live",
-                    url = info.hlsUrl
-                ) {
-                    type = ExtractorLinkType.M3U8
-                }
-            )
-        } else {
-            processVideo(info, subtitleCallback, callback)
-        }
-    }
-
-    private suspend fun processVideo(
-        info: StreamInfo,
-        subtitleCallback: (SubtitleFile) -> Unit,
-        callback: (ExtractorLink) -> Unit
-    ): Boolean {
-
-        val videoStreams = info.videoOnlyStreams.orEmpty()
-
-        if (videoStreams.isEmpty()) return false
-
-        val audioStreams = info.audioStreams.orEmpty()
-
-        videoStreams.forEach { video ->
-
-            callback(
-                newExtractorLink(
-                    source = name,
-                    name = "YouTube ${normalizeCodec(video.codec)}",
-                    url = video.content
-                ) {
-                    quality = video.height
-                    audioTracks = audioStreams.map { newAudioFile(it.content) }
-                }
-            )
-        }
-
-
-        info.subtitles.forEach { subtitle ->
-            subtitleCallback(
-                newSubtitleFile(
-                    lang = subtitle.displayLanguageName
-                        ?: subtitle.languageTag
-                        ?: "Unknown",
-                    url = subtitle.content
-                )
-            )
-        }
-
-        return true
-    }
-
-    // ---------------- HELPERS ----------------
-
-    private fun extractYouTubeId(url: String): String {
-        val regex = Regex(
-            "(?:youtu\\.be/|youtube(?:-nocookie)?\\.com/(?:.*v=|v/|u/\\w/|embed/|shorts/|live/))([\\w-]{11})"
-        )
-        return regex.find(url)?.groupValues?.get(1)
-            ?: throw IllegalArgumentException("Invalid YouTube URL: $url")
-    }
-
-    private fun normalizeCodec(codec: String?): String {
-        if (codec.isNullOrBlank()) return ""
-
-        val c = codec.lowercase()
-
-        return when {
-            c.startsWith("av01") -> "AV1"
-            c.startsWith("vp9") -> "VP9"
-            c.startsWith("avc1") || c.startsWith("h264") -> "H264"
-            c.startsWith("hev1") || c.startsWith("hvc1") || c.startsWith("hevc") -> "H265"
-            else -> codec.substringBefore('.').uppercase()
-        }
-    }
-}
\ No newline at end of file
diff --git a/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.jvm.kt b/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.jvm.kt
new file mode 100644
index 000000000..345aa7185
--- /dev/null
+++ b/library/src/jvmMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.jvm.kt
@@ -0,0 +1,105 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.newAudioFile
+import com.lagradost.cloudstream3.newSubtitleFile
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.newExtractorLink
+import org.schabi.newpipe.extractor.stream.StreamInfo
+import org.schabi.newpipe.extractor.stream.StreamType
+
+actual open class YoutubeExtractor actual constructor() : ExtractorApi() {
+
+    actual override val mainUrl = "https://www.youtube.com"
+    actual override val name = "YouTube"
+    actual override val requiresReferer = false
+
+    actual override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+    ) {
+        val videoId = extractYouTubeId(url)
+        val watchUrl = "$mainUrl/watch?v=$videoId"
+
+        val info = StreamInfo.getInfo(watchUrl)
+        val isLive = info.streamType == StreamType.LIVE_STREAM
+            || info.streamType == StreamType.AUDIO_LIVE_STREAM
+            || info.streamType == StreamType.POST_LIVE_STREAM
+            || info.streamType == StreamType.POST_LIVE_AUDIO_STREAM
+
+        if (isLive && info.hlsUrl != null) {
+            callback(
+                newExtractorLink(
+                    source = name,
+                    name = "YouTube Live",
+                    url = info.hlsUrl
+                ) {
+                    type = ExtractorLinkType.M3U8
+                }
+            )
+        } else {
+            processVideo(info, subtitleCallback, callback)
+        }
+    }
+
+    private suspend fun processVideo(
+        info: StreamInfo,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit,
+    ): Boolean {
+        val videoStreams = info.videoOnlyStreams.orEmpty()
+        if (videoStreams.isEmpty()) return false
+
+        val audioStreams = info.audioStreams.orEmpty()
+        videoStreams.forEach { video ->
+            callback(
+                newExtractorLink(
+                    source = name,
+                    name = "YouTube ${normalizeCodec(video.codec)}",
+                    url = video.content
+                ) {
+                    quality = video.height
+                    audioTracks = audioStreams.map { newAudioFile(it.content) }
+                }
+            )
+        }
+
+        info.subtitles.forEach { subtitle ->
+            subtitleCallback(
+                newSubtitleFile(
+                    lang = subtitle.displayLanguageName
+                        ?: subtitle.languageTag
+                        ?: "Unknown",
+                    url = subtitle.content
+                )
+            )
+        }
+
+        return true
+    }
+
+    private fun extractYouTubeId(url: String): String {
+        val regex = Regex(
+            "(?:youtu\\.be/|youtube(?:-nocookie)?\\.com/(?:.*v=|v/|u/\\w/|embed/|shorts/|live/))([\\w-]{11})"
+        )
+
+        return regex.find(url)?.groupValues?.get(1)
+            ?: throw IllegalArgumentException("Invalid YouTube URL: $url")
+    }
+
+    private fun normalizeCodec(codec: String?): String {
+        if (codec.isNullOrBlank()) return ""
+        val c = codec.lowercase()
+        return when {
+            c.startsWith("av01") -> "AV1"
+            c.startsWith("vp9") -> "VP9"
+            c.startsWith("avc1") || c.startsWith("h264") -> "H264"
+            c.startsWith("hev1") || c.startsWith("hvc1") || c.startsWith("hevc") -> "H265"
+            else -> codec.substringBefore('.').uppercase()
+        }
+    }
+}

From 8e1b41ea61fef8417a455fe06126ad2ab9d4c81a Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 31 May 2026 16:49:23 -0600
Subject: [PATCH 150/177] Fix one instance of String(byteArray) I previously
 missed (#2859)

---
 .../com/lagradost/cloudstream3/extractors/Mvidoo.kt      | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Mvidoo.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Mvidoo.kt
index 76f14d33b..84b818723 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Mvidoo.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Mvidoo.kt
@@ -14,11 +14,10 @@ open class Mvidoo : ExtractorApi() {
 
     private fun String.decodeHex(): String {
         require(length % 2 == 0) { "Must have an even length" }
-        return String(
-            chunked(2)
-                .map { it.toInt(16).toByte() }
-                .toByteArray()
-        )
+        return chunked(2)
+            .map { it.toInt(16).toByte() }
+            .toByteArray()
+            .decodeToString()
     }
 
     override suspend fun getUrl(

From e1aacce93d942b12d726a423f3a1f1ea7d89f6c3 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 31 May 2026 16:53:37 -0600
Subject: [PATCH 151/177] ExtractorAPI: support Kotlin Uuid (#2855)

---
 app/build.gradle.kts                          |  1 +
 .../cloudstream3/ui/player/CS3IPlayer.kt      | 15 ++--
 .../cloudstream3/utils/ExtractorApi.kt        | 79 ++++++++++++++++---
 .../cloudstream3/utils/HlsPlaylistParser.kt   |  4 +-
 4 files changed, 78 insertions(+), 21 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 05b25237a..6c784f3ef 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -317,6 +317,7 @@ tasks.withType<KotlinJvmCompile> {
         optIn.addAll(
             "com.lagradost.cloudstream3.InternalAPI",
             "com.lagradost.cloudstream3.Prerelease",
+            "kotlin.uuid.ExperimentalUuidApi",
         )
     }
 }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
index aa44b9235..d7e10c814 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt
@@ -96,7 +96,7 @@ import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle
 import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.applyStyle
 import com.lagradost.cloudstream3.utils.AppContextUtils.isUsingMobileData
 import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus
-import com.lagradost.cloudstream3.utils.CLEARKEY_UUID
+import com.lagradost.cloudstream3.utils.CLEARKEY_DRM_UUID
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
 import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
@@ -104,9 +104,9 @@ import com.lagradost.cloudstream3.utils.DrmExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.ExtractorLinkPlayList
 import com.lagradost.cloudstream3.utils.ExtractorLinkType
-import com.lagradost.cloudstream3.utils.PLAYREADY_UUID
+import com.lagradost.cloudstream3.utils.PLAYREADY_DRM_UUID
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToLanguageName
-import com.lagradost.cloudstream3.utils.WIDEVINE_UUID
+import com.lagradost.cloudstream3.utils.WIDEVINE_DRM_UUID
 import com.lagradost.cloudstream3.utils.videoskip.VideoSkipStamp
 import kotlinx.coroutines.delay
 import okhttp3.Interceptor
@@ -118,6 +118,7 @@ import java.util.concurrent.Executors
 import javax.net.ssl.HttpsURLConnection
 import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLSession
+import kotlin.uuid.toJavaUuid
 
 const val TAG = "CS3ExoPlayer"
 const val PREFERRED_AUDIO_LANGUAGE_KEY = "preferred_audio_language"
@@ -1278,7 +1279,7 @@ class CS3IPlayer : IPlayer {
 
             item.drm?.let { drm ->
                 when (drm.uuid) {
-                    CLEARKEY_UUID -> {
+                    CLEARKEY_DRM_UUID.toJavaUuid() -> {
                         // Use headers from DrmMetadata for media requests
                         val client = dataSourceFactory
                             ?: throw IllegalArgumentException("Must supply onlineSource")
@@ -1299,8 +1300,8 @@ class CS3IPlayer : IPlayer {
                             .createMediaSource(item.mediaItem)
                     }
 
-                    WIDEVINE_UUID,
-                    PLAYREADY_UUID -> {
+                    WIDEVINE_DRM_UUID.toJavaUuid(),
+                    PLAYREADY_DRM_UUID.toJavaUuid() -> {
                         // Use headers from DrmMetadata for media requests
                         val client = dataSourceFactory
                             ?: throw IllegalArgumentException("Must supply onlineSource")
@@ -1914,7 +1915,7 @@ class CS3IPlayer : IPlayer {
                             drm = DrmMetadata(
                                 kid = link.kid,
                                 key = link.key,
-                                uuid = link.uuid,
+                                uuid = link.uuid.toJavaUuid(),
                                 kty = link.kty,
                                 licenseUrl = link.licenseUrl,
                                 keyRequestParameters = link.keyRequestParameters,
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 66055d7de..f42128b10 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -1,8 +1,11 @@
+@file:OptIn(ExperimentalUuidApi::class)
+
 package com.lagradost.cloudstream3.utils
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.lagradost.cloudstream3.AudioFile
 import com.lagradost.cloudstream3.IDownloadableMinimum
+import com.lagradost.cloudstream3.Prerelease
 import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.USER_AGENT
 import com.lagradost.cloudstream3.app
@@ -314,8 +317,11 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.ensureActive
 import org.jsoup.Jsoup
 import java.net.URI
-import java.util.UUID
 import kotlin.coroutines.cancellation.CancellationException
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
+import kotlin.uuid.toJavaUuid
+import kotlin.uuid.toKotlinUuid
 
 /**
  * For use in the ConcatenatingMediaSource.
@@ -431,29 +437,43 @@ private fun inferTypeFromUrl(url: String): ExtractorLinkType {
 val INFER_TYPE: ExtractorLinkType? = null
 
 /**
- * UUID for the ClearKey DRM scheme.
+ * [Uuid] for the ClearKey DRM scheme.
  *
  *
  * ClearKey is supported on Android devices running Android 5.0 (API Level 21) and up.
  */
-val CLEARKEY_UUID = UUID(-0x1d8e62a7567a4c37L, 0x781AB030AF78D30EL)
+@Prerelease
+val CLEARKEY_DRM_UUID = Uuid.fromLongs(-0x1d8e62a7567a4c37L, 0x781AB030AF78D30EL)
 
 /**
- * UUID for the Widevine DRM scheme.
+ * [Uuid] for the Widevine DRM scheme.
  *
  *
  * Widevine is supported on Android devices running Android 4.3 (API Level 18) and up.
  */
-val WIDEVINE_UUID = UUID(-0x121074568629b532L, -0x5c37d8232ae2de13L)
+@Prerelease
+val WIDEVINE_DRM_UUID = Uuid.fromLongs(-0x121074568629b532L, -0x5c37d8232ae2de13L)
 
 /**
- * UUID for the PlayReady DRM scheme.
+ * [Uuid] for the PlayReady DRM scheme.
  *
  *
  * PlayReady is supported on all AndroidTV devices. Note that most other Android devices do not
  * provide PlayReady support.
  */
-val PLAYREADY_UUID = UUID(-0x65fb0f8667bfbd7aL, -0x546d19a41f77a06bL)
+@Prerelease
+val PLAYREADY_DRM_UUID = Uuid.fromLongs(-0x65fb0f8667bfbd7aL, -0x546d19a41f77a06bL)
+
+// Deprecate after next stable
+
+// @Deprecated("Use CLEARKEY_DRM_UUID", ReplaceWith("CLEARKEY_DRM_UUID"), level = DeprecationLevel.WARNING)
+val CLEARKEY_UUID = CLEARKEY_DRM_UUID.toJavaUuid()
+
+// @Deprecated("Use WIDEVINE_DRM_UUID", ReplaceWith("WIDEVINE_DRM_UUID"), level = DeprecationLevel.WARNING)
+val WIDEVINE_UUID = WIDEVINE_DRM_UUID.toJavaUuid()
+
+// @Deprecated("Use PLAYREADY_DRM_UUID", ReplaceWith("PLAYREADY_DRM_UUID"), level = DeprecationLevel.WARNING)
+val PLAYREADY_UUID = PLAYREADY_DRM_UUID.toJavaUuid()
 
 suspend fun newExtractorLink(
     source: String,
@@ -476,15 +496,42 @@ suspend fun newExtractorLink(
     return builder
 }
 
+// Deprecate after next stable
+/* @Deprecated(
+    message = "Use Kotlin Uuid (kotlin.uuid.Uuid) instead of Java UUID.",
+    level = DeprecationLevel.WARNING,
+) */
 suspend fun newDrmExtractorLink(
     source: String,
     name: String,
     url: String,
     type: ExtractorLinkType? = null,
-    uuid: UUID,
+    uuid: java.util.UUID,
     initializer: suspend DrmExtractorLink.() -> Unit = { }
 ): DrmExtractorLink {
+    @Suppress("DEPRECATION_ERROR")
+    val builder =
+        DrmExtractorLink(
+            source = source,
+            name = name,
+            url = url,
+            uuid = uuid.toKotlinUuid(),
+            type = type ?: INFER_TYPE
+        )
 
+    builder.initializer()
+    return builder
+}
+
+@Prerelease
+suspend fun newDrmExtractorLink(
+    source: String,
+    name: String,
+    url: String,
+    type: ExtractorLinkType? = null,
+    uuid: Uuid,
+    initializer: suspend DrmExtractorLink.() -> Unit = {},
+): DrmExtractorLink {
     @Suppress("DEPRECATION_ERROR")
     val builder =
         DrmExtractorLink(
@@ -510,7 +557,7 @@ suspend fun newDrmExtractorLink(
  * @property type the type of the media, use [INFER_TYPE] if you want to auto infer the type from the url
  * @property kid  Base64 value of The KID element (Key Id) contains the identifier of the key associated with a license.
  * @property key Base64 value of Key to be used to decrypt the media file.
- * @property uuid Drm UUID [WIDEVINE_UUID], [PLAYREADY_UUID], [CLEARKEY_UUID] (by default) .. etc
+ * @property uuid Drm [Uuid] [WIDEVINE_DRM_UUID], [PLAYREADY_DRM_UUID], [CLEARKEY_DRM_UUID] (by default) .. etc
  * @property kty Key type "oct" (octet sequence) by default
  * @property keyRequestParameters Parameters that will used to request the key.
  * @see newDrmExtractorLink
@@ -528,7 +575,7 @@ open class DrmExtractorLink private constructor(
     override var type: ExtractorLinkType,
     open var kid: String? = null,
     open var key: String? = null,
-    open var uuid: UUID,
+    open var uuid: Uuid,
     open var kty: String? = null,
     open var keyRequestParameters: HashMap<String, String>,
     open var licenseUrl: String? = null,
@@ -550,7 +597,7 @@ open class DrmExtractorLink private constructor(
         extractorData: String? = null,
         kid: String? = null,
         key: String? = null,
-        uuid: UUID = CLEARKEY_UUID,
+        uuid: Uuid = CLEARKEY_DRM_UUID,
         kty: String? = "oct",
         keyRequestParameters: HashMap<String, String> = hashMapOf(),
         licenseUrl: String? = null,
@@ -585,7 +632,7 @@ open class DrmExtractorLink private constructor(
         extractorData: String? = null,
         kid: String? = null,
         key: String? = null,
-        uuid: UUID = CLEARKEY_UUID,
+        uuid: Uuid = CLEARKEY_DRM_UUID,
         kty: String? = "oct",
         keyRequestParameters: HashMap<String, String> = hashMapOf(),
         licenseUrl: String? = null,
@@ -605,6 +652,14 @@ open class DrmExtractorLink private constructor(
         kty = kty,
         licenseUrl = licenseUrl,
     )
+
+    @Deprecated(message = "Use Kotlin Uuid", level = DeprecationLevel.HIDDEN)
+    fun setUuid(uuid: java.util.UUID) {
+        this.uuid = uuid.toKotlinUuid()
+    }
+
+    @Deprecated(message = "Use Kotlin Uuid", level = DeprecationLevel.HIDDEN)
+    fun getUuid(): java.util.UUID = this.uuid.toJavaUuid()
 }
 
 /** Class holds extracted media info to be passed to the player.
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
index 898550b24..f6da18390 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
@@ -1179,7 +1179,7 @@ object HlsPlaylistParser {
         if (KEYFORMAT_WIDEVINE_PSSH_BINARY == keyFormat) {
             val uriString = parseStringAttr(line, REGEX_URI, variableDefinitions)
             return SchemeData(
-                uuid = WIDEVINE_UUID,
+                uuid = C.WIDEVINE_UUID,
                 mimeType = MimeTypes.VIDEO_MP4,
                 data = Base64.Default.decode(uriString.substring(uriString.indexOf(',')))
             )
@@ -2078,4 +2078,4 @@ object HlsPlaylistParser {
             sessionKeyDrmInitData = sessionKeyDrmInitData
         )
     }
-}
\ No newline at end of file
+}

From 5de7f207f2807eb7b44532eed843a9bb43684f1a Mon Sep 17 00:00:00 2001
From: KingLucius <a.aelfattah5@gmail.com>
Date: Sun, 31 May 2026 18:53:47 -0400
Subject: [PATCH 152/177] feat(MetaProviders): Fix Trakt (#2858)

---
 library/build.gradle.kts                                     | 5 +++++
 .../lagradost/cloudstream3/metaproviders/TraktProvider.kt    | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index 92a9330e8..1652970a6 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -103,6 +103,11 @@ buildkonfig {
             "MDL_API_KEY",
             (System.getenv("MDL_API_KEY") ?: localProperties["mdl.key"]).toString()
         )
+
+        buildConfigField(
+            FieldSpec.Type.STRING,
+            "TRAKT_CLIENT_ID", (System.getenv("TRAKT_CLIENT_ID") ?: localProperties["trakt.id"]).toString()
+        )
     }
 }
 
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
index 0e5aeb339..af037e589 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
@@ -2,6 +2,7 @@ package com.lagradost.cloudstream3.metaproviders
 
 import com.fasterxml.jackson.annotation.JsonAlias
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.lagradost.api.BuildConfig
 import com.lagradost.cloudstream3.APIHolder.unixTimeMS
 import com.lagradost.cloudstream3.Actor
 import com.lagradost.cloudstream3.ActorData
@@ -45,10 +46,10 @@ open class TraktProvider : MainAPI() {
         TvType.Anime,
     )
 
-    private val traktClientId =
-        "d9f434f48b55683a279ffe88ddc68351cc04c9dc9372bd95af5de780b794e770"
     private val traktApiUrl = "https://api.trakt.tv"
 
+    val traktClientId: String = BuildConfig.TRAKT_CLIENT_ID
+
     override val mainPage = mainPageOf(
         "$traktApiUrl/movies/trending" to "Trending Movies", //Most watched movies right now
         "$traktApiUrl/movies/popular" to "Popular Movies", //The most popular movies for all time

From 0e16f429af8b831d07475f853c56e50b227de90c Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Mon, 1 Jun 2026 01:04:36 +0200
Subject: [PATCH 153/177] Update TRAKT_CLIENT_ID (#2860)

---
 .github/workflows/prerelease.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index d9a20a04b..b5b17ba6a 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -62,6 +62,7 @@ jobs:
         SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
         SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
         SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
+        TRAKT_CLIENT_ID: ${{ secrets.TRAKT_CLIENT_ID }}
         MDL_API_KEY: ${{ secrets.MDL_API_KEY }}
 
     - name: Create pre-release

From 4836e2b3713d40714f50a8fd4f3258bee30511ed Mon Sep 17 00:00:00 2001
From: fgmitesh <miteshpatidar420@gmail.com>
Date: Mon, 1 Jun 2026 04:37:22 +0530
Subject: [PATCH 154/177] fix: treat KEYCODE_ENTER as select for TV remotes (LG
 Magic Remote) (#2853)

* Improve key event handling in FullScreenPlayer

Refactor key event handling for play/pause and chapter skipping.

* Handle KEYCODE_ENTER for SearchView focus
---
 .../com/lagradost/cloudstream3/CommonActivity.kt     |  6 ++++--
 .../cloudstream3/ui/player/FullScreenPlayer.kt       | 12 +++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
index ed0aaf9b7..4ce09bd44 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt
@@ -579,8 +579,10 @@ object CommonActivity {
 
             // TODO: Figure out why removing the check for SearchAutoComplete seems
             // to break focus on TV as it shouldn't need to be used.
+            // Also handle KEYCODE_ENTER here because some remotes (e.g. LG Magic Remote)
+            // send KEYCODE_ENTER instead of KEYCODE_DPAD_CENTER when clicking the OK button.
             @SuppressLint("RestrictedApi")
-            if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER &&
+            if ((keyCode == KeyEvent.KEYCODE_DPAD_CENTER || keyCode == KeyEvent.KEYCODE_ENTER) &&
                 (act.currentFocus is SearchView || act.currentFocus is SearchView.SearchAutoComplete)
             ) {
                 showInputMethod(act.currentFocus?.findFocus())
@@ -601,4 +603,4 @@ object CommonActivity {
         }
         return null
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 26706699b..4ba933e13 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -945,12 +945,18 @@ open class FullScreenPlayer : AbstractPlayerFragment<FragmentPlayerBinding>(
                 player.handleEvent(CSPlayerEvent.SkipCurrentChapter)
             }
 
-            KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_P, KeyEvent.KEYCODE_SPACE, KeyEvent.KEYCODE_NUMPAD_ENTER, KeyEvent.KEYCODE_ENTER -> { // space is not captured due to navigation
+            KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_P, KeyEvent.KEYCODE_SPACE, KeyEvent.KEYCODE_NUMPAD_ENTER -> { // space is not captured due to navigation
                 player.handleEvent(CSPlayerEvent.PlayPauseToggle)
             }
 
-            KeyEvent.KEYCODE_DPAD_CENTER -> {
-                if (isShowing) {
+            // KEYCODE_DPAD_CENTER and KEYCODE_ENTER both act as a "select/confirm" button.
+            // Some remotes (e.g. LG Magic Remote) send KEYCODE_ENTER instead of KEYCODE_DPAD_CENTER.
+            // When the player UI or a dialog is visible, we let the event pass through (return null)
+            // so the focused button/item can handle the click normally, rather than always toggling
+            // play/pause. Only when the UI is hidden do we treat it as a play/pause toggle.
+            KeyEvent.KEYCODE_DPAD_CENTER,
+            KeyEvent.KEYCODE_ENTER -> {
+                if (isShowing || isDialogOpen()) {
                     return null
                 }
                 // If UI is not shown make click instantly skip to next chapter even if locked

From 8e0c664b1ebe5dd4996ba9d68a26466dda31a761 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 31 May 2026 17:10:03 -0600
Subject: [PATCH 155/177] Add TRAKT_CLIENT_ID to Archive build as well (#2861)

---
 .github/workflows/build_to_archive.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_to_archive.yml b/.github/workflows/build_to_archive.yml
index b5960d5d9..30bedcc1b 100644
--- a/.github/workflows/build_to_archive.yml
+++ b/.github/workflows/build_to_archive.yml
@@ -71,6 +71,7 @@ jobs:
         SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
         SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
         SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
+        TRAKT_CLIENT_ID: ${{ secrets.TRAKT_CLIENT_ID }}
         MDL_API_KEY: ${{ secrets.MDL_API_KEY }}
 
     - uses: actions/checkout@v6

From 62662cb06460ae521f0bd51a587cab24943d6f0b Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Sun, 31 May 2026 17:24:31 -0600
Subject: [PATCH 156/177] Bump a few libs (#2840)

---
 gradle/libs.versions.toml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7b63a5ddc..b93c4474c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,8 +6,8 @@ androidGradlePlugin = "9.1.1"
 animeDb = "1.0.2"
 annotation = "1.10.0"
 appcompat = "1.7.1"
-biometric = "1.4.0-alpha06"
-buildkonfigGradlePlugin = "0.18.0"
+biometric = "1.4.0-alpha07"
+buildkonfigGradlePlugin = "0.21.2"
 classgraph = "4.8.184"
 coil = { strictly = "3.3.0" } # Later versions require jvmTarget 11 or later
 colorpicker = "6b46b49"
@@ -18,25 +18,25 @@ desugar_jdk_libs_nio = "2.1.5"
 dokkaGradlePlugin = "2.2.0"
 espressoCore = "3.7.0"
 fragmentKtx = "1.8.9"
-instancioCore = "5.5.1"
+instancioCore = "5.6.0"
 jacksonModuleKotlin = { strictly = "2.13.1" } # Later versions don't support minSdk <26 (Crashes on Android TV's and FireSticks)
-json = "20251224"
+json = "20260522"
 jsoup = "1.22.1"
 junit = "4.13.2"
 junitKtx = "1.3.0"
 junitVersion = "1.3.0"
 juniversalchardet = "2.5.0"
 kotlinGradlePlugin = "2.3.20"
-kotlinxAtomicfu = "0.32.1"
+kotlinxAtomicfu = "0.33.0"
 kotlinxCollectionsImmutable = "0.4.0"
-kotlinxCoroutinesCore = "1.10.2"
+kotlinxCoroutinesCore = "1.11.0"
 kotlinxDatetime = "0.8.0"
 kotlinxSerializationJson = "1.11.0"
 lifecycleKtx = "2.10.0"
 material = "1.14.0"
 media3 = "1.9.3"
-navigationKtx = "2.9.7"
-newpipeextractor = "v0.26.0"
+navigationKtx = "2.9.8"
+newpipeextractor = "v0.26.2"
 nextlibMedia3 = "1.9.3-0.12.0"
 nicehttp = "0.4.18"
 overlappingpanels = "0.1.5"

From 11f77fbe114aedef5259765afc60de3eb7a5f002 Mon Sep 17 00:00:00 2001
From: Osten <11805592+LagradOst@users.noreply.github.com>
Date: Mon, 1 Jun 2026 18:11:54 +0200
Subject: [PATCH 157/177] Fixed parseJson inline problem

---
 .../kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
index 5cc91b6d6..7551f7652 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -67,6 +67,12 @@ object AppUtils {
         }
     }
 
+    @InternalAPI
+    fun <T : Any> parseJson(
+        value: String,
+        kClass: KClass<T>
+    ): T = parseJson(value, kClass, null, null)
+
     @InternalAPI
     fun <T : Any> parseJson(
         value: String,

From 3844c896f16fcfbf3bd691d16c513bca8c5ed19a Mon Sep 17 00:00:00 2001
From: Osten <11805592+LagradOst@users.noreply.github.com>
Date: Tue, 2 Jun 2026 14:14:38 +0200
Subject: [PATCH 158/177] Fixed Json again

---
 .../lagradost/cloudstream3/utils/AppUtils.kt  | 114 +++++++++---------
 1 file changed, 54 insertions(+), 60 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
index 7551f7652..3d9cc8944 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -1,6 +1,5 @@
 package com.lagradost.cloudstream3.utils
 
-import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.lagradost.cloudstream3.InternalAPI
 import com.lagradost.cloudstream3.json
@@ -22,16 +21,64 @@ object AppUtils {
         return toJsonLiteral()
     }
 
+    /** Sometimes we want to encode as JSON even if it is already a String. */
+    @InternalAPI
+    fun Any.toJsonLiteral(): String {
+        // @Serializable generates a serializer at compile time; contextual serializers are
+        // registered manually in serializersModule, we need both to support all cases
+        val serializer =
+            this::class.serializerOrNull() ?: json.serializersModule.getContextual(this::class)
+        return if (serializer != null) {
+            try {
+                @Suppress("UNCHECKED_CAST")
+                json.encodeToString(serializer as KSerializer<Any>, this)
+            } catch (e: SerializationException) {
+                logError(e)
+                mapper.writeValueAsString(this)
+            }
+        } else {
+            mapper.writeValueAsString(this)
+        }
+    }
+
+    @InternalAPI
+    fun <T : Any> parseJson(value: String, kClass: KClass<T>): T {
+        val serializer = kClass.serializerOrNull() ?: json.serializersModule.getContextual(kClass)
+        if (serializer != null) {
+            try {
+                return json.decodeFromString(serializer, value)
+            } catch (e: SerializationException) {
+                logError(e)
+            }
+        }
+
+        return mapper.readValue(value, kClass.java)
+    }
+
+    // This is inlined code and can easily cause breakage in extensions!
+    // Watch out when editing this to make sure stable also supports all inlined code!
     inline fun <reified T : Any> parseJson(value: String): T {
-        // serializer<T>() preserves full generic type info (e.g. List<DataClass>)
-        // and must be resolved here while T is still reified, same for TypeReference
-        val serializer = try { serializer<T>() } catch (_: Exception) { null }
-        return parseJson(value, T::class, serializer, object : TypeReference<T>() {})
+        // @Serializable generates a serializer at compile time; contextual serializers are
+        // registered manually in serializersModule, we need both to support all cases
+        val serializer = runCatching { serializer<T>() }.runCatching {
+            json.serializersModule.getContextual(T::class)
+        }.getOrNull()
+
+        // Prefer Kotlin Serialization over Jackson
+        if (serializer != null) {
+            try {
+                return json.decodeFromString(serializer, value)
+            } catch (e: SerializationException) {
+                logError(e)
+            }
+        }
+
+        return mapper.readValue(value)
     }
 
     @Deprecated(
         "This overload was only ever used for BasePlugin.Manifest which has since been migrated. " +
-            "No other code should be using this. Use reader.readText() and call parseJson(String) instead.",
+                "No other code should be using this. Use reader.readText() and call parseJson(String) instead.",
         level = DeprecationLevel.ERROR,
         replaceWith = ReplaceWith("parseJson<T>(reader.readText())")
     )
@@ -47,57 +94,4 @@ object AppUtils {
             null
         }
     }
-
-    /** Sometimes we want to encode as JSON even if it is already a String. */
-    @InternalAPI
-    fun Any.toJsonLiteral(): String {
-        // @Serializable generates a serializer at compile time; contextual serializers are
-        // registered manually in serializersModule, we need both to support all cases
-        val serializer = this::class.serializerOrNull() ?: json.serializersModule.getContextual(this::class)
-        return if (serializer != null) {
-            try {
-                @Suppress("UNCHECKED_CAST")
-                json.encodeToString(serializer as KSerializer<Any>, this)
-            } catch (e: SerializationException) {
-                logError(e)
-                mapper.writeValueAsString(this)
-            }
-        } else {
-            mapper.writeValueAsString(this)
-        }
-    }
-
-    @InternalAPI
-    fun <T : Any> parseJson(
-        value: String,
-        kClass: KClass<T>
-    ): T = parseJson(value, kClass, null, null)
-
-    @InternalAPI
-    fun <T : Any> parseJson(
-        value: String,
-        kClass: KClass<T>,
-        serializer: KSerializer<T>? = null,
-        typeReference: TypeReference<T>? = null,
-    ): T {
-        // @Serializable generates a serializer at compile time; contextual serializers are
-        // registered manually in serializersModule, we need both to support all cases
-        val s =
-            serializer ?: kClass.serializerOrNull() ?: json.serializersModule.getContextual(kClass)
-
-        // Prefer Kotlin Serialization over Jackson
-        if (s != null) {
-            try {
-                return json.decodeFromString(s, value)
-            } catch (e: SerializationException) {
-                logError(e)
-            }
-        }
-
-        return if (typeReference != null) {
-            mapper.readValue(value, typeReference)
-        } else {
-            mapper.readValue(value, kClass.java)
-        }
-    }
-}
+}
\ No newline at end of file

From a4a4c31f8d4ccf41505d318023bbb462004436bb Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Wed, 3 Jun 2026 08:09:30 -0600
Subject: [PATCH 159/177] Replace toByteArray() in some places in library
 (#2866)

---
 .../lagradost/cloudstream3/extractors/CloudMailRuExtractor.kt   | 2 +-
 .../lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt   | 2 +-
 .../kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/CloudMailRuExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/CloudMailRuExtractor.kt
index 3c79baf3a..7f6d98049 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/CloudMailRuExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/CloudMailRuExtractor.kt
@@ -27,7 +27,7 @@ open class CloudMailRu : ExtractorApi() {
             "Origin" to mainUrl,
             "User-Agent" to USER_AGENT,
         )
-        val vidId      = url.substringAfter("public/").toByteArray()
+        val vidId      = url.substringAfter("public/").encodeToByteArray()
         val vidIdEnc   = base64Encode(vidId)
         val videoReq   = app.get(url, headers=headers).text
         val regex      = Regex(pattern = "videowl_view\":\\{\"count\":\"1\",\"url\":\"([^\"]*)\"\\}", options = setOf(RegexOption.IGNORE_CASE))
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt
index b80534db2..1ccd3e4d5 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HDMomPlayerExtractor.kt
@@ -23,7 +23,7 @@ open class HDMomPlayer : ExtractorApi() {
         if (bePlayer != null) {
             val bePlayerPass = bePlayer.get(1)
             val bePlayerData = bePlayer.get(2)
-            val encrypted    = AesHelper.cryptoAESHandler(bePlayerData, bePlayerPass.toByteArray(), false)?.replace("\\", "") ?: throw ErrorLoadingException("failed to decrypt")
+            val encrypted    = AesHelper.cryptoAESHandler(bePlayerData, bePlayerPass.encodeToByteArray(), false)?.replace("\\", "") ?: throw ErrorLoadingException("failed to decrypt")
 
             m3uLink = Regex("""video_location\":\"([^\"]+)""").find(encrypted)?.groupValues?.get(1)
         } else {
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
index 23226418b..b203fd338 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
@@ -328,7 +328,7 @@ object M3u8Helper2 {
                 encryptionUri = "${getParentLink(playlistStream.streamUrl)}/$encryptionUri"
             }
 
-            encryptionIv = match[3].toByteArray()
+            encryptionIv = match[3].encodeToByteArray()
             val encryptionKeyResponse =
                 app.get(encryptionUri, headers = playlistStream.headers, verify = false)
             val body = encryptionKeyResponse.body

From 70053ebbae1b0e5a6c7b79063209582d79fbc339 Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Sat, 6 Jun 2026 21:48:37 +0200
Subject: [PATCH 160/177] [skip ci] Fix serialization testing (#2896)

---
 .../cloudstream3/SerializationClassTester.kt  | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/SerializationClassTester.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/SerializationClassTester.kt
index 0b19535cb..d1a11e003 100644
--- a/app/src/androidTest/java/com/lagradost/cloudstream3/SerializationClassTester.kt
+++ b/app/src/androidTest/java/com/lagradost/cloudstream3/SerializationClassTester.kt
@@ -3,7 +3,7 @@ package com.lagradost.cloudstream3
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import io.github.classgraph.ClassGraph
+import dalvik.system.DexFile
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.InternalSerializationApi
 import kotlinx.serialization.KSerializer
@@ -100,19 +100,27 @@ class SerializationClassTester {
         }
     }
 
+    // DEX files are the best solution to read all our classes dynamically.
+    // ClassGraph() can be used instead, but it only gives results on the JVM, not Android.
+    @Suppress("DEPRECATION")
     private fun findSerializableClasses(packageName: String): List<KClass<*>> {
         val context = InstrumentationRegistry
             .getInstrumentation()
             .targetContext
 
-        return ClassGraph()
-            .enableClassInfo()
-            .enableAnnotationInfo()
-            .overrideClassLoaders(context.classLoader)
-            .acceptPackages(packageName)
-            .scan()
-            .getClassesWithAnnotation(Serializable::class.java.name)
-            .mapNotNull { runCatching { Class.forName(it.name, false, context.classLoader).kotlin }.getOrNull() }
+        val dexFile = DexFile(context.packageCodePath)
+
+        return dexFile.entries()
+            .toList()
+            .filter { it.startsWith(packageName) }
+            .mapNotNull {
+                runCatching { Class.forName(it).kotlin }.getOrNull()
+            }.filter { kClass ->
+                // Not possible to use .hasAnnotation() on newer Android versions.
+                kClass.java.annotations.any {
+                    it is Serializable
+                }
+            }
     }
 
     @OptIn(InternalSerializationApi::class)

From d78b991d663d75709ed8f52abdb64c8afa570ee8 Mon Sep 17 00:00:00 2001
From: KingLucius <escuro.anjo@gmail.com>
Date: Mon, 8 Jun 2026 00:59:42 +0300
Subject: [PATCH 161/177] Trakt meta provider logo support (#2894)

---
 .../com/lagradost/cloudstream3/metaproviders/TraktProvider.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
index af037e589..59dcd2711 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt
@@ -25,7 +25,6 @@ import com.lagradost.cloudstream3.addDate
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.isUpcoming
 import com.lagradost.cloudstream3.mainPageOf
-import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.newEpisode
 import com.lagradost.cloudstream3.newHomePageResponse
 import com.lagradost.cloudstream3.newMovieLoadResponse
@@ -114,6 +113,7 @@ open class TraktProvider : MainAPI() {
 
         val posterUrl = fixPath(mediaDetails?.images?.poster?.firstOrNull())
         val backDropUrl = fixPath(mediaDetails?.images?.fanart?.firstOrNull())
+        val logoUrl = fixPath(mediaDetails?.images?.logo?.firstOrNull())
 
         val resActor =
             getApi("$traktApiUrl/$moviesOrShows/${mediaDetails?.ids?.trakt}/people?extended=full,images")
@@ -183,6 +183,7 @@ open class TraktProvider : MainAPI() {
                 this.comingSoon = isUpcoming(mediaDetails.released)
                 //posterHeaders
                 this.backgroundPosterUrl = backDropUrl
+                this.logoUrl = logoUrl
                 this.contentRating = mediaDetails.certification
                 addTrailer(mediaDetails.trailer)
                 addImdbId(mediaDetails.ids?.imdb)
@@ -273,6 +274,7 @@ open class TraktProvider : MainAPI() {
                 //posterHeaders
                 this.nextAiring = nextAir
                 this.backgroundPosterUrl = backDropUrl
+                this.logoUrl = logoUrl
                 this.contentRating = mediaDetails.certification
                 addTrailer(mediaDetails.trailer)
                 addImdbId(mediaDetails.ids?.imdb)

From 79cc3fb501566804fa43abe85e691478c89dd167 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Mon, 8 Jun 2026 14:22:34 -0600
Subject: [PATCH 162/177] Fix kotlinx serialization in parseJson (#2902)

It doing runCatching on the Result itself, that results in the serializer always returning null. Just do what we do everywhere else here also, getContextual doesn't throw anything.
---
 .../kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
index 3d9cc8944..6233fd820 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -60,9 +60,8 @@ object AppUtils {
     inline fun <reified T : Any> parseJson(value: String): T {
         // @Serializable generates a serializer at compile time; contextual serializers are
         // registered manually in serializersModule, we need both to support all cases
-        val serializer = runCatching { serializer<T>() }.runCatching {
-            json.serializersModule.getContextual(T::class)
-        }.getOrNull()
+        val serializer = runCatching { serializer<T>() }.getOrNull()
+            ?: json.serializersModule.getContextual(T::class)
 
         // Prefer Kotlin Serialization over Jackson
         if (serializer != null) {
@@ -94,4 +93,4 @@ object AppUtils {
             null
         }
     }
-}
\ No newline at end of file
+}

From fd579fcc18b053be93b7883d893af14cc2d40879 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Mon, 8 Jun 2026 22:22:50 +0200
Subject: [PATCH 163/177] Translated using Weblate (German)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (German)

Currently translated at 100.0% (729 of 729 strings)

Translated using Weblate (Macedonian)

Currently translated at 100.0% (729 of 729 strings)

Co-authored-by: Deleted User <pandoroo@users.noreply.hosted.weblate.org>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: WertZuz <97708601+wertzuz@users.noreply.github.com>
Co-authored-by: stojkovskistefan <stefanstojkovski@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/de/
Translate-URL: https://hosted.weblate.org/projects/cloudstream/app/mk/
Translation: Cloudstream/App
---
 app/src/main/res/values-b+de/strings.xml | 12 +++++---
 app/src/main/res/values-b+mk/strings.xml | 37 ++++++++++++++++++++++--
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-b+de/strings.xml b/app/src/main/res/values-b+de/strings.xml
index 6ccb9bc69..e674fafd6 100644
--- a/app/src/main/res/values-b+de/strings.xml
+++ b/app/src/main/res/values-b+de/strings.xml
@@ -252,7 +252,7 @@
     <string name="update">Update</string>
     <string name="watch_quality_pref">Bevorzugte Videoqualität (WLAN)</string>
     <string name="limit_title">Videoplayertitel max. Zeichen</string>
-    <string name="limit_title_rez">Playerinformationen anzeigen</string>
+    <string name="limit_title_rez">Zeige Playerinformationen</string>
     <string name="video_buffer_size_settings">Videopuffergröße</string>
     <string name="video_buffer_length_settings">Videopufferlänge</string>
     <string name="video_buffer_disk_settings">Video-Cache in Speicher</string>
@@ -587,7 +587,7 @@
     <string name="pref_category_security">Sicherheit</string>
     <string name="pref_category_accounts">Konten</string>
     <string name="open_downloaded_repo">Repository öffnen</string>
-    <string name="device_pin_url_message">Besuche<b>%s</b> auf dem Smartphone oder Computer und gebe den obenstehenden Code ein</string>
+    <string name="device_pin_url_message">Besuche <b>%s</b> auf dem Smartphone oder Computer und gebe den obenstehenden Code ein</string>
     <string name="device_pin_error_message">PIN-Code vom Gerät nicht abrufbar, versuche lokale Authentifizierung</string>
     <string name="downloads_empty">Zur Zeit sind keine Downloads verfügbar.</string>
     <string name="open_local_video">Lokales Video öffnen</string>
@@ -712,8 +712,8 @@
     <string name="extra_brightness_settings">Zusätzliche Helligkeit</string>
     <string name="extra_brightness_settings_des">Aktiviere Helligkeitsfilter, wenn 100% Bildschirmhelligkeit überschritten ist</string>
     <string name="extra_brightness_key">Erhöhte Helligkeit aktiviert</string>
-    <string name="show_cast_in_details">Cast-Panel zeigen</string>
-    <string name="video_info">Medieninfo</string>
+    <string name="show_cast_in_details">Zeige Cast-Panel</string>
+    <string name="video_info">Mediainfo</string>
     <string name="source_name">Quellname</string>
     <string name="download_all">Alle herunterladen</string>
     <string name="download_episode_range">Möchtest du Episode %s herunter laden?</string>
@@ -731,4 +731,8 @@
     <string name="queue_empty_message">Es befinden sich keine Downloads in der Warteschlange.</string>
     <string name="source_priority">Quellpriorität</string>
     <string name="source_priority_help">Entscheide, wie Videoquellen im Player sortiert werden sollen</string>
+    <string name="show_player_metadata_overlay">Zeige Player-Metadaten</string>
+    <string name="video_singular">Video</string>
+    <string name="skip_type_preview">Vorschau</string>
+    <string name="player_is_live">Live</string>
 </resources>
diff --git a/app/src/main/res/values-b+mk/strings.xml b/app/src/main/res/values-b+mk/strings.xml
index ea467833e..4e37afdea 100644
--- a/app/src/main/res/values-b+mk/strings.xml
+++ b/app/src/main/res/values-b+mk/strings.xml
@@ -244,7 +244,7 @@
     <string name="quality_tc">TC</string>
     <string name="subscription_new">Претплатен на %s</string>
     <string name="pref_category_subtitles">Преводи</string>
-    <string name="download_all_plugins_from_repo">Предупредување: CloudStream 3 не презема никаква одговорност за користење на екстензии од трети страни и не обезбедува никаква поддршка за нив!</string>
+    <string name="download_all_plugins_from_repo">Предупредување: CloudStream не презема никаква одговорност за користење на екстензии од трети страни и не обезбедува никаква поддршка за нив!</string>
     <string name="backup_failed">Недостасуваат дозволи за складирање. Обиди се повторно.</string>
     <string name="sort_save">Зачувај</string>
     <string name="player_load_subtitles">Вчитај од датотека</string>
@@ -445,7 +445,7 @@
     <string name="backup_failed_error_format">Грешка при правење резервна копија на %s</string>
     <string name="pref_filter_search_quality">Сокриј го избраниот квалитет на видеото во резултатите од пребарувањето</string>
     <string name="apk_installer_settings_des">Некои уреди не го поддржуваат новиот инсталатор на пакети. Испробај ја легаси(старата) опција, ако ажурирањата не се инсталираат.</string>
-    <string name="limit_title_rez">Резолуција на видео плеер</string>
+    <string name="limit_title_rez">Прикажи информации за плеерот</string>
     <string name="video_buffer_size_settings">Големина на видео баферот</string>
     <string name="pref_category_player_layout">Распоред</string>
     <string name="pref_category_defaults">Стандардно</string>
@@ -705,4 +705,37 @@
     <string name="top_center">Горе во центар</string>
     <string name="top_right">Горе на десно</string>
     <string name="play_full_series_button">Пушти ја целата серија</string>
+    <string name="download_queue">Редица за преземање</string>
+    <string name="queue_empty_message">Моментално нема преземања во редицата.</string>
+    <string name="extra_brightness_settings">Дополнителна осветленост</string>
+    <string name="extra_brightness_settings_des">Овозможи филтер за осветленост кога ќе се надмине 100% осветленост на екранот</string>
+    <string name="extra_brightness_key">овозможена_дополнителна_осветленост</string>
+    <string name="search_suggestions">Предлози за пребарување</string>
+    <string name="search_suggestions_des">Прикажувај предлози за пребарување додека пишуваш</string>
+    <string name="clear_suggestions">Исчисти предлози</string>
+    <string name="show_player_metadata_overlay">Прикажи преклоп со метаподатоци на плеерот</string>
+    <string name="show_cast_in_details">Прикажи панел за емитување</string>
+    <string name="install_prerelease">Инсталирај предиздавачка верзија</string>
+    <string name="prerelease_already_installed">Предиздавачката верзија е веќе инсталирана.</string>
+    <string name="prerelease_install_failed">Неуспешна инсталација на предиздавачката верзија.</string>
+    <string name="video_singular">Видео</string>
+    <string name="show_episode_text">Текст на епизода</string>
+    <string name="video_info">Информации за медиумот</string>
+    <string name="skip_type_preview">Преглед</string>
+    <string name="source_priority">Приоритет на извор</string>
+    <string name="source_priority_help">Одреди како ќе се подредуваат видео изворите во плеерот</string>
+    <string name="source_name">Име на изворот</string>
+    <string name="download_all">Преземи сѐ</string>
+    <string name="cancel_all">Откажи сѐ</string>
+    <string name="download_episode_range">Дали сакате да ја преземете епизодата %s?</string>
+    <string name="cancel_queue_message">Дали сакате да ги откажете сите преземања во редицата?</string>
+    <plurals name="downloads_active">
+        <item quantity="one">%d активно преземање</item>
+        <item quantity="other">%d активни преземања</item>
+    </plurals>
+    <plurals name="downloads_queued">
+        <item quantity="one">%d преземање во редицата</item>
+        <item quantity="other">%d преземања во редицата</item>
+    </plurals>
+    <string name="player_is_live">Во живо</string>
 </resources>

From f7cbf25b30b35d8d5a8b411cbe5de7a56fb8dbf0 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Tue, 9 Jun 2026 15:03:48 -0600
Subject: [PATCH 164/177] Replace EnumSet for dubStatus (#2845)

---
 .../commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index 5d4deba24..fc2fac005 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -36,7 +36,6 @@ import kotlinx.datetime.format.char
 import kotlinx.datetime.format.parse
 import kotlinx.datetime.toInstant
 import java.net.URI
-import java.util.EnumSet
 import kotlinx.serialization.json.Json
 import kotlin.io.encoding.Base64
 import kotlin.io.encoding.ExperimentalEncodingApi
@@ -1510,7 +1509,7 @@ constructor(
 
     override var posterUrl: String? = null,
     var year: Int? = null,
-    var dubStatus: EnumSet<DubStatus>? = null,
+    var dubStatus: MutableSet<DubStatus>? = null,
 
     var otherName: String? = null,
     var episodes: MutableMap<DubStatus, Int> = mutableMapOf(),
@@ -1522,7 +1521,7 @@ constructor(
 ) : SearchResponse
 
 fun AnimeSearchResponse.addDubStatus(status: DubStatus, episodes: Int? = null) {
-    this.dubStatus = dubStatus?.also { it.add(status) } ?: EnumSet.of(status)
+    this.dubStatus = dubStatus?.also { it.add(status) } ?: mutableSetOf(status)
     if (this.type?.isMovieType() != true)
         if (episodes != null && episodes > 0)
             this.episodes[status] = episodes

From 2181243dd14506a52921c5090c52ace690842a6e Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Wed, 10 Jun 2026 18:08:58 -0600
Subject: [PATCH 165/177] Bump NewPipeExtractor to fix trailers and other
 YouTube videos (#2906)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b93c4474c..8456da66e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -36,7 +36,7 @@ lifecycleKtx = "2.10.0"
 material = "1.14.0"
 media3 = "1.9.3"
 navigationKtx = "2.9.8"
-newpipeextractor = "v0.26.2"
+newpipeextractor = "v0.26.3"
 nextlibMedia3 = "1.9.3-0.12.0"
 nicehttp = "0.4.18"
 overlappingpanels = "0.1.5"

From 8012c580690fe9b2c67e7178ea29f780ccb02147 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Wed, 10 Jun 2026 18:24:50 -0600
Subject: [PATCH 166/177] Set explicitNulls = false for kotlinx serialization
 (#2897)

This is more inline with Jackson's behavior otherwise for nullable types with non default values, and they don't exist, gives a Missingfield exception whereas it worked on Jackson. We may need coerceInputValues = true also but I am unsure of that right now.
---
 .../src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index fc2fac005..fe3e03ef2 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -89,6 +89,7 @@ class ErrorLoadingException(message: String? = null) : Exception(message)
 @Prerelease
 val json = Json {
     encodeDefaults = true
+    explicitNulls = false
     ignoreUnknownKeys = true
 }
 

From 18a857723b003891b70b8291f2f2e4f22ec7c9b4 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Wed, 10 Jun 2026 18:26:49 -0600
Subject: [PATCH 167/177] Replace java.net.uri in library (#2839)

---
 gradle/libs.versions.toml                     |   2 +
 library/build.gradle.kts                      |   1 +
 .../network/WebViewResolver.android.kt        |   5 +-
 .../com/lagradost/cloudstream3/MainAPI.kt     |  37 ++--
 .../cloudstream3/extractors/ByseSX.kt         |   7 +-
 .../lagradost/cloudstream3/extractors/Cda.kt  |   4 +-
 .../cloudstream3/extractors/CineMMRedirect.kt |   6 +-
 .../cloudstream3/extractors/Dailymotion.kt    |  11 +-
 .../cloudstream3/extractors/DoodExtractor.kt  |   6 +-
 .../cloudstream3/extractors/GDMirrorbot.kt    |   4 +-
 .../cloudstream3/extractors/HubCloud.kt       |   6 +-
 .../extractors/InternetArchive.kt             |   4 +-
 .../cloudstream3/extractors/Streamplay.kt     |   8 +-
 .../cloudstream3/extractors/VidStack.kt       |   4 +-
 .../extractors/helper/GogoHelper.kt           |   6 +-
 .../extractors/helper/NineAnimeHelper.kt      |  10 +-
 .../cloudstream3/utils/ExtractorApi.kt        |   7 +-
 .../cloudstream3/utils/HlsPlaylistParser.kt   | 198 +++++++++---------
 .../cloudstream3/utils/M3u8Helper.kt          |  12 +-
 .../cloudstream3/utils/StringUtils.kt         |  32 ++-
 .../cloudstream3/utils/UnshortenUrl.kt        | 110 +++++-----
 21 files changed, 247 insertions(+), 233 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8456da66e..f28bc41ab 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -32,6 +32,7 @@ kotlinxCollectionsImmutable = "0.4.0"
 kotlinxCoroutinesCore = "1.11.0"
 kotlinxDatetime = "0.8.0"
 kotlinxSerializationJson = "1.11.0"
+ktor = "3.5.0"
 lifecycleKtx = "2.10.0"
 material = "1.14.0"
 media3 = "1.9.3"
@@ -95,6 +96,7 @@ kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collec
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
+ktor-http = { module = "io.ktor:ktor-http", version.ref = "ktor" }
 lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleKtx" }
 lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleKtx" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index 1652970a6..a1f30fede 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -61,6 +61,7 @@ kotlin {
             implementation(libs.kotlinx.coroutines.core)
             implementation(libs.kotlinx.datetime)
             implementation(libs.kotlinx.serialization.json) // JSON Parser
+            implementation(libs.ktor.http)
             implementation(libs.jsoup) // HTML Parser
             implementation(libs.rhino) // Run JavaScript
             implementation(libs.tmdb.java) // TMDB API v3 Wrapper Made with RetroFit
diff --git a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt b/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt
index bc443b3f8..2f9c9b628 100644
--- a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt
+++ b/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt
@@ -15,12 +15,13 @@ import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.Coroutines.mainWork
 import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread
 import com.lagradost.nicehttp.requestCreator
+import io.ktor.http.Url
+import io.ktor.http.decodeURLPart
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
-import java.net.URI
 
 /**
  * When used as Interceptor additionalUrls cannot be returned, use WebViewResolver(...).resolveUsingWebView(...)
@@ -211,7 +212,7 @@ actual class WebViewResolver actual constructor(
                          * */
                         return@runBlocking try {
                             when {
-                                blacklistedFiles.any { URI(webViewUrl).path.contains(it) } || webViewUrl.endsWith(
+                                blacklistedFiles.any { Url(webViewUrl).encodedPath.decodeURLPart().contains(it) } || webViewUrl.endsWith(
                                     "/favicon.ico"
                                 ) -> WebResourceResponse(
                                     "image/png",
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index fe3e03ef2..4a9e0b10a 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -22,6 +22,10 @@ import com.lagradost.cloudstream3.utils.Coroutines.mainWork
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromCodeToLangTagIETF
 import com.lagradost.cloudstream3.utils.SubtitleHelper.fromLanguageToTagIETF
 import com.lagradost.nicehttp.RequestBodyTypes
+import io.ktor.http.Url
+import io.ktor.http.URLBuilder
+import io.ktor.http.encodedPath
+import io.ktor.http.takeFrom
 import okhttp3.Interceptor
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -35,7 +39,6 @@ import kotlinx.datetime.format.byUnicodePattern
 import kotlinx.datetime.format.char
 import kotlinx.datetime.format.parse
 import kotlinx.datetime.toInstant
-import java.net.URI
 import kotlinx.serialization.json.Json
 import kotlin.io.encoding.Base64
 import kotlin.io.encoding.ExperimentalEncodingApi
@@ -176,9 +179,9 @@ object APIHolder {
     // To get the key
     suspend fun getCaptchaToken(url: String, key: String, referer: String? = null): String? {
         try {
-            val uri = URI.create(url)
+            val _url = Url(url)
             val domain = base64Encode(
-                (uri.scheme + "://" + uri.host + ":443").encodeToByteArray(),
+                (_url.protocol.name + "://" + _url.host + ":443").encodeToByteArray(),
             ).replace("\n", "").replace("=", ".")
 
             val vToken =
@@ -1330,23 +1333,23 @@ fun getQualityFromString(string: String?): SearchQuality? {
  * ```
  */
 fun MainAPI.updateUrl(url: String): String {
-    try {
-        val original = URI(url)
-        val updated = URI(mainUrl)
+    return try {
+        val original = Url(url)
+        val updated = Url(mainUrl)
 
-        // URI(String scheme, String userInfo, String host, int port, String path, String query, String fragment)
-        return URI(
-            updated.scheme,
-            original.userInfo,
-            updated.host,
-            updated.port,
-            original.path,
-            original.query,
-            original.fragment
-        ).toString()
+        URLBuilder().apply {
+            takeFrom(updated)
+            user = original.user
+            password = original.password
+            encodedPath = original.encodedPath
+            fragment = original.fragment
+
+            parameters.clear()
+            parameters.appendAll(original.parameters)
+        }.buildString()
     } catch (t: Throwable) {
         logError(t)
-        return url
+        url
     }
 }
 
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt
index cc7293b80..b29d29f5d 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByseSX.kt
@@ -8,7 +8,8 @@ import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
-import java.net.URI
+import io.ktor.http.Url
+import io.ktor.http.decodeURLPart
 import javax.crypto.Cipher
 import javax.crypto.spec.GCMParameterSpec
 import javax.crypto.spec.SecretKeySpec
@@ -45,11 +46,11 @@ open class ByseSX : ExtractorApi() {
     }
 
     private fun getBaseUrl(url: String): String {
-        return URI(url).let { "${it.scheme}://${it.host}" }
+        return Url(url).let { "${it.protocol.name}://${it.host}" }
     }
 
     private fun getCodeFromUrl(url: String): String {
-        val path = URI(url).path ?: ""
+        val path = Url(url).encodedPath.decodeURLPart()
         return path.trimEnd('/').substringAfterLast('/')
     }
 
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt
index 4b7f8a1cd..5c9f58efc 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt
@@ -6,7 +6,7 @@ import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.StringUtils.decodeUri
+import com.lagradost.cloudstream3.utils.StringUtils.decodeUrl
 import com.lagradost.cloudstream3.utils.newExtractorLink
 
 open class Cda : ExtractorApi() {
@@ -64,7 +64,7 @@ open class Cda : ExtractorApi() {
             .replace("_QWE", "")
             .replace("_Q5", "")
             .replace("_IKSDE", "")
-        a = a.decodeUri()
+        a = a.decodeUrl()
         a = a.map { char ->
             if (char.code in 33..126) {
                 return@map (33 + (char.code + 14) % 94).toChar().toString()
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/CineMMRedirect.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/CineMMRedirect.kt
index 62c450073..a85aff8d4 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/CineMMRedirect.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/CineMMRedirect.kt
@@ -4,7 +4,7 @@ import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.loadExtractor
-import okhttp3.HttpUrl.Companion.toHttpUrl
+import io.ktor.http.Url
 
 // deobfuscated from https://hglink.to/main.js?v=1.1.3 using https://deobfuscate.io/
 private val mirrors = arrayOf(
@@ -90,7 +90,7 @@ abstract class CineMMRedirect : ExtractorApi() {
         subtitleCallback: (SubtitleFile) -> Unit,
         callback: (ExtractorLink) -> Unit
     ) {
-        val videoId = url.toHttpUrl().encodedPath
+        val videoId = Url(url).encodedPath
         val mirror = mirrors.random()
 
         // re-use existing extractors by calling the ExtractorApi
@@ -98,4 +98,4 @@ abstract class CineMMRedirect : ExtractorApi() {
         val mirrorUrlWithVideoId = "https://$mirror$videoId"
         loadExtractor(mirrorUrlWithVideoId, referer, subtitleCallback, callback)
     }
-}
\ No newline at end of file
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt
index db6db39d5..4732cafcf 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt
@@ -7,9 +7,8 @@ import com.lagradost.cloudstream3.newSubtitleFile
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8
-import java.net.URI
-
-
+import io.ktor.http.Url
+import io.ktor.http.decodeURLPart
 
 class Geodailymotion : Dailymotion() {
     override val name = "GeoDailymotion"
@@ -57,7 +56,6 @@ open class Dailymotion : ExtractorApi() {
         }
     }
 
-
     private fun getEmbedUrl(url: String): String? {
         if (url.contains("/embed/") || url.contains("/video/")) return url
         if (url.contains("geo.dailymotion.com")) {
@@ -67,9 +65,8 @@ open class Dailymotion : ExtractorApi() {
         return null
     }
 
-
     private fun getVideoId(url: String): String? {
-        val path = URI(url).path
+        val path = Url(url).encodedPath.decodeURLPart()
         val id = path.substringAfter("/video/")
         return if (id.matches(videoIdRegex)) id else null
     }
@@ -82,7 +79,6 @@ open class Dailymotion : ExtractorApi() {
         return generateM3u8(name, streamLink, "").forEach(callback)
     }
 
-
     data class MetaData(
         val qualities: Map<String, List<Quality>>?,
         val subtitles: SubtitlesWrapper?
@@ -102,5 +98,4 @@ open class Dailymotion : ExtractorApi() {
         val label: String,
         val urls: List<String>
     )
-
 }
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
index 12bc5a0c5..bce017276 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt
@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import java.net.URI
+import io.ktor.http.Url
 
 class Doodspro : DoodLaExtractor() {
     override var mainUrl = "https://doods.pro"
@@ -138,8 +138,6 @@ open class DoodLaExtractor : ExtractorApi() {
     }
 
     private fun getBaseUrl(url: String): String {
-        return URI(url).let {
-            "${it.scheme}://${it.host}"
-        }
+        return Url(url).let { "${it.protocol.name}://${it.host}" }
     }
 }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GDMirrorbot.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GDMirrorbot.kt
index e0fefe8aa..ba297067e 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GDMirrorbot.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GDMirrorbot.kt
@@ -8,7 +8,7 @@ import com.lagradost.cloudstream3.base64Decode
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.loadExtractor
-import java.net.URI
+import io.ktor.http.Url
 
 class Techinmind: GDMirrorbot() {
     override var name = "Techinmind Cloud AIO"
@@ -103,7 +103,7 @@ open class GDMirrorbot : ExtractorApi() {
     }
 
     private fun getBaseUrl(url: String): String {
-        return URI(url).let { "${it.scheme}://${it.host}" }
+        return Url(url).let { "${it.protocol.name}://${it.host}" }
     }
 }
 
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HubCloud.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HubCloud.kt
index 4f83bad25..a974df15c 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HubCloud.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/HubCloud.kt
@@ -9,7 +9,7 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.loadExtractor
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import java.net.URI
+import io.ktor.http.Url
 
 class HubCloud : ExtractorApi() {
     override val name = "Hub-Cloud"
@@ -24,7 +24,7 @@ class HubCloud : ExtractorApi() {
     ) {
         val tag = "HubCloud"
         val realUrl = url.takeIf {
-            try { URI(it).toURL(); true } catch (e: Exception) { Log.e(tag, "Invalid URL: ${e.message}"); false }
+            try { Url(it); true } catch (e: Exception) { Log.e(tag, "Invalid URL: ${e.message}"); false }
         } ?: return
 
         val baseUrl=getBaseUrl(realUrl)
@@ -161,7 +161,7 @@ class HubCloud : ExtractorApi() {
 
     private fun getBaseUrl(url: String): String {
         return try {
-            URI(url).let { "${it.scheme}://${it.host}" }
+            Url(url).let { "${it.protocol.name}://${it.host}" }
         } catch (_: Exception) {
             ""
         }
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/InternetArchive.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/InternetArchive.kt
index 40d817e99..1ac6c789c 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/InternetArchive.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/InternetArchive.kt
@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.newSubtitleFile
 import com.lagradost.cloudstream3.utils.ExtractorApi
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
-import com.lagradost.cloudstream3.utils.StringUtils.decodeUri
+import com.lagradost.cloudstream3.utils.StringUtils.decodeUrl
 import com.lagradost.cloudstream3.utils.newExtractorLink
 import org.jsoup.nodes.Document
 
@@ -96,7 +96,7 @@ open class InternetArchive : ExtractorApi() {
             if (mediaUrl.isNotEmpty()) {
                 val name = if (mediaUrl.count() > 1) {
                     val fileExtension = mediaUrl.substringAfterLast(".")
-                    val fileNameCleaned = fileName.decodeUri().substringBeforeLast('.')
+                    val fileNameCleaned = fileName.decodeUrl().substringBeforeLast('.')
                     "$fileNameCleaned ($fileExtension)"
                 } else this.name
                 callback(
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamplay.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamplay.kt
index 98481970b..9886300aa 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamplay.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamplay.kt
@@ -7,7 +7,7 @@ import com.lagradost.cloudstream3.SubtitleFile
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
-import java.net.URI
+import io.ktor.http.Url
 
 open class Streamplay : ExtractorApi() {
     override val name = "Streamplay"
@@ -22,9 +22,7 @@ open class Streamplay : ExtractorApi() {
     ) {
         val request = app.get(url, referer = referer)
         val redirectUrl = request.url
-        val mainServer = URI(redirectUrl).let {
-            "${it.scheme}://${it.host}"
-        }
+        val mainServer = Url(redirectUrl).let { "${it.protocol.name}://${it.host}" }
         val key = redirectUrl.substringAfter("embed-").substringBefore(".html")
         val token =
             request.document.select("script").find { it.data().contains("sitekey:") }?.data()
@@ -79,4 +77,4 @@ open class Streamplay : ExtractorApi() {
         @JsonProperty("label") val label: String? = null,
     )
 
-}
\ No newline at end of file
+}
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidStack.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidStack.kt
index 846fd851d..63ceb1f3d 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidStack.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VidStack.kt
@@ -10,7 +10,7 @@ import com.lagradost.cloudstream3.utils.ExtractorLinkType
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.fixUrl
 import com.lagradost.cloudstream3.utils.newExtractorLink
-import java.net.URI
+import io.ktor.http.Url
 import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
@@ -84,7 +84,7 @@ open class VidStack : ExtractorApi() {
 
     private fun getBaseUrl(url: String): String {
         return try {
-            URI(url).let { "${it.scheme}://${it.host}" }
+            Url(url).let { "${it.protocol.name}://${it.host}" }
         } catch (e: Exception) {
             Log.e("Vidstack", "getBaseUrl fallback: ${e.message}")
             mainUrl
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt
index a16d41943..31618a32b 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt
@@ -12,8 +12,8 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.M3u8Helper
 import com.lagradost.cloudstream3.utils.getQualityFromName
 import com.lagradost.cloudstream3.utils.newExtractorLink
+import io.ktor.http.Url
 import org.jsoup.nodes.Document
-import java.net.URI
 import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
@@ -88,8 +88,8 @@ object GogoHelper {
         val foundKey = secretKey ?: getKey(base64Decode(id) + foundIv) ?: return@safeApiCall
         val foundDecryptKey = secretDecryptKey ?: foundKey
 
-        val uri = URI(iframeUrl)
-        val mainUrl = "https://" + uri.host
+        val url = Url(iframeUrl)
+        val mainUrl = "https://${url.host}"
 
         val encryptedId = cryptoHandler(id, foundIv, foundKey)
         val encryptRequestData = if (isUsingAdaptiveData) {
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/NineAnimeHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/NineAnimeHelper.kt
index 2563d40e1..c3b50c7a5 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/NineAnimeHelper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/NineAnimeHelper.kt
@@ -1,7 +1,7 @@
 package com.lagradost.cloudstream3.extractors.helper
 
-import com.lagradost.cloudstream3.utils.StringUtils.decodeUri
-import com.lagradost.cloudstream3.utils.StringUtils.encodeUri
+import com.lagradost.cloudstream3.utils.StringUtils.decodeUrl
+import com.lagradost.cloudstream3.utils.StringUtils.encodeUrl
 
 // Taken from https://github.com/saikou-app/saikou/blob/b35364c8c2a00364178a472fccf1ab72f09815b4/app/src/main/java/ani/saikou/parsers/anime/NineAnime.kt
 // GNU General Public License v3.0 https://github.com/saikou-app/saikou/blob/main/LICENSE.md
@@ -108,8 +108,6 @@ object NineAnimeHelper {
         }
     }
 
-    fun encode(input: String): String =
-        input.encodeUri().replace("+", "%20")
-
-    private fun decode(input: String): String = input.decodeUri()
+    fun encode(input: String): String = input.encodeUrl()
+    private fun decode(input: String): String = input.decodeUrl()
 }
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index f42128b10..8a71714cf 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -312,11 +312,12 @@ import com.lagradost.cloudstream3.extractors.ZplayerV2
 import com.lagradost.cloudstream3.extractors.Ztreamhub
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.Coroutines.atomicListOf
+import io.ktor.http.Url
+import io.ktor.http.decodeURLPart
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.ensureActive
 import org.jsoup.Jsoup
-import java.net.URI
 import kotlin.coroutines.cancellation.CancellationException
 import kotlin.uuid.ExperimentalUuidApi
 import kotlin.uuid.Uuid
@@ -420,7 +421,7 @@ enum class ExtractorLinkType {
 
 private fun inferTypeFromUrl(url: String): ExtractorLinkType {
     val path = try {
-        URI(url).path
+        Url(url).encodedPath.decodeURLPart()
     } catch (_: Throwable) {
         // don't log magnet links as errors
         null
@@ -819,7 +820,7 @@ constructor(
 
 /**
  * Removes https:// and www.
- * To match urls regardless of schema, perhaps Uri() can be used?
+ * To match urls regardless of schema, perhaps Url() can be used?
  */
 val schemaStripRegex = Regex("""^(https:|)//(www\.|)""")
 
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
index f6da18390..37d5f6285 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
@@ -19,8 +19,8 @@
  */
 package com.lagradost.cloudstream3.utils
 
+import io.ktor.http.Url
 import java.io.IOException
-import java.net.URI
 import java.nio.ByteBuffer
 import java.util.UUID
 import kotlin.io.encoding.Base64
@@ -276,29 +276,29 @@ object HlsPlaylistParser {
         }
     }
 
-    object UriUtil {
-        fun resolveToUri(baseUri: String?, referenceUri: String?): URI {
-            return URI.create(resolve(baseUri, referenceUri))
+    object UrlUtil {
+        fun resolveToUrl(baseUrl: String?, referenceUrl: String?): Url {
+            return Url(resolve(baseUrl, referenceUrl))
         }
 
 
-        /** The length of arrays returned by [.getUriIndices].  */
+        /** The length of arrays returned by [.getUrlIndices].  */
         private
         const val INDEX_COUNT: Int = 4
 
         /**
-         * An index into an array returned by [.getUriIndices].
+         * An index into an array returned by [.getUrlIndices].
          *
          *
          * The value at this position in the array is the index of the ':' after the scheme. Equals -1
-         * if the URI is a relative reference (no scheme). The hier-part starts at (schemeColon + 1),
-         * including when the URI has no scheme.
+         * if the URL is a relative reference (no scheme). The hier-part starts at (schemeColon + 1),
+         * including when the URL has no scheme.
          */
         private
         const val SCHEME_COLON: Int = 0
 
         /**
-         * An index into an array returned by [.getUriIndices].
+         * An index into an array returned by [.getUrlIndices].
          *
          *
          * The value at this position in the array is the index of the path part. Equals (schemeColon +
@@ -310,7 +310,7 @@ object HlsPlaylistParser {
         const val PATH: Int = 1
 
         /**
-         * An index into an array returned by [.getUriIndices].
+         * An index into an array returned by [.getUrlIndices].
          *
          *
          * The value at this position in the array is the index of the query part, including the '?'
@@ -321,87 +321,87 @@ object HlsPlaylistParser {
         const val QUERY: Int = 2
 
         /**
-         * An index into an array returned by [.getUriIndices].
+         * An index into an array returned by [.getUrlIndices].
          *
          *
          * The value at this position in the array is the index of the fragment part, including the '#'
-         * before the fragment. Equal to the length of the URI if no fragment part, and (length - 1) if
+         * before the fragment. Equal to the length of the URL if no fragment part, and (length - 1) if
          * the fragment part is a single '#' with no data.
          */
         private
         const val FRAGMENT: Int = 3
 
         /**
-         * Performs relative resolution of a `referenceUri` with respect to a `baseUri`.
+         * Performs relative resolution of a `referenceUrl` with respect to a `baseUrl`.
          *
          *
          * The resolution is performed as specified by RFC-3986.
          *
-         * @param baseUri The base URI.
-         * @param referenceUri The reference URI to resolve.
+         * @param baseUrl The base URL.
+         * @param referenceUrl The reference URL to resolve.
          */
-        private fun resolve(baseUri: String?, referenceUri: String?): String {
-            var baseUri = baseUri
-            var referenceUri = referenceUri
-            val uri = StringBuilder()
+        private fun resolve(baseUrl: String?, referenceUrl: String?): String {
+            var baseUrl = baseUrl
+            var referenceUrl = referenceUrl
+            val url = StringBuilder()
 
             // Map null onto empty string, to make the following logic simpler.
-            baseUri = baseUri ?: ""
-            referenceUri = referenceUri ?: ""
+            baseUrl = baseUrl ?: ""
+            referenceUrl = referenceUrl ?: ""
 
-            val refIndices: IntArray = getUriIndices(referenceUri)
+            val refIndices: IntArray = getUrlIndices(referenceUrl)
             if (refIndices[SCHEME_COLON] != -1) {
-                // The reference is absolute. The target Uri is the reference.
-                uri.append(referenceUri)
-                removeDotSegments(uri, refIndices[PATH], refIndices[QUERY])
-                return uri.toString()
+                // The reference is absolute. The target Url is the reference.
+                url.append(referenceUrl)
+                removeDotSegments(url, refIndices[PATH], refIndices[QUERY])
+                return url.toString()
             }
 
-            val baseIndices: IntArray = getUriIndices(baseUri)
+            val baseIndices: IntArray = getUrlIndices(baseUrl)
             if (refIndices[FRAGMENT] == 0) {
-                // The reference is empty or contains just the fragment part, then the target Uri is the
-                // concatenation of the base Uri without its fragment, and the reference.
-                return uri.append(baseUri, 0, baseIndices[FRAGMENT]).append(referenceUri).toString()
+                // The reference is empty or contains just the fragment part, then the target Url is the
+                // concatenation of the base Url without its fragment, and the reference.
+                return url.append(baseUrl, 0, baseIndices[FRAGMENT]).append(referenceUrl).toString()
             }
 
             if (refIndices[QUERY] == 0) {
                 // The reference starts with the query part. The target is the base up to (but excluding) the
                 // query, plus the reference.
-                return uri.append(baseUri, 0, baseIndices[QUERY]).append(referenceUri).toString()
+                return url.append(baseUrl, 0, baseIndices[QUERY]).append(referenceUrl).toString()
             }
 
             if (refIndices[PATH] != 0) {
                 // The reference has authority. The target is the base scheme plus the reference.
                 val baseLimit = baseIndices[SCHEME_COLON] + 1
-                uri.append(baseUri, 0, baseLimit).append(referenceUri)
+                url.append(baseUrl, 0, baseLimit).append(referenceUrl)
                 return removeDotSegments(
-                    uri,
+                    url,
                     baseLimit + refIndices[PATH],
                     baseLimit + refIndices[QUERY]
                 )
             }
 
-            if (referenceUri[refIndices[PATH]] == '/') {
+            if (referenceUrl[refIndices[PATH]] == '/') {
                 // The reference path is rooted. The target is the base scheme and authority (if any), plus
                 // the reference.
-                uri.append(baseUri, 0, baseIndices[PATH]).append(referenceUri)
+                url.append(baseUrl, 0, baseIndices[PATH]).append(referenceUrl)
                 return removeDotSegments(
-                    uri,
+                    url,
                     baseIndices[PATH],
                     baseIndices[PATH] + refIndices[QUERY]
                 )
             }
 
-            // The target Uri is the concatenation of the base Uri up to (but excluding) the last segment,
+            // The target Url is the concatenation of the base Url up to (but excluding) the last segment,
             // and the reference. This can be split into 2 cases:
             if (baseIndices[SCHEME_COLON] + 2 < baseIndices[PATH]
                 && baseIndices[PATH] == baseIndices[QUERY]
             ) {
                 // Case 1: The base hier-part is just the authority, with an empty path. An additional '/' is
                 // needed after the authority, before appending the reference.
-                uri.append(baseUri, 0, baseIndices[PATH]).append('/').append(referenceUri)
+                url.append(baseUrl, 0, baseIndices[PATH]).append('/').append(referenceUrl)
                 return removeDotSegments(
-                    uri,
+                    url,
                     baseIndices[PATH],
                     baseIndices[PATH] + refIndices[QUERY] + 1
                 )
@@ -410,22 +410,22 @@ object HlsPlaylistParser {
                 // it. If base hier-part has no '/', it could only mean that it is completely empty or
                 // contains only one segment, in which case the whole hier-part is excluded and the reference
                 // is appended right after the base scheme colon without an added '/'.
-                val lastSlashIndex = baseUri.lastIndexOf('/', baseIndices[QUERY] - 1)
+                val lastSlashIndex = baseUrl.lastIndexOf('/', baseIndices[QUERY] - 1)
                 val baseLimit = if (lastSlashIndex == -1) baseIndices[PATH] else lastSlashIndex + 1
-                uri.append(baseUri, 0, baseLimit).append(referenceUri)
-                return removeDotSegments(uri, baseIndices[PATH], baseLimit + refIndices[QUERY])
+                url.append(baseUrl, 0, baseLimit).append(referenceUrl)
+                return removeDotSegments(url, baseIndices[PATH], baseLimit + refIndices[QUERY])
             }
         }
 
         /**
-         * Removes dot segments from the path of a URI.
+         * Removes dot segments from the path of a URL.
          *
-         * @param uri A [StringBuilder] containing the URI.
-         * @param offset The index of the start of the path in `uri`.
-         * @param limit The limit (exclusive) of the path in `uri`.
+         * @param url A [StringBuilder] containing the URL.
+         * @param offset The index of the start of the path in `url`.
+         * @param limit The limit (exclusive) of the path in `url`.
          */
         private fun removeDotSegments(
-            uri: StringBuilder,
+            url: StringBuilder,
             offset: Int,
             limit: Int
         ): String {
@@ -433,9 +433,9 @@ object HlsPlaylistParser {
             var limit = limit
             if (offset >= limit) {
                 // Nothing to do.
-                return uri.toString()
+                return url.toString()
             }
-            if (uri[offset] == '/') {
+            if (url[offset] == '/') {
                 // If the path starts with a /, always retain it.
                 offset++
             }
@@ -445,7 +445,7 @@ object HlsPlaylistParser {
             while (i <= limit) {
                 val nextSegmentStart = if (i == limit) {
                     i
-                } else if (uri[i] == '/') {
+                } else if (url[i] == '/') {
                     i + 1
                 } else {
                     i++
@@ -453,16 +453,16 @@ object HlsPlaylistParser {
                 }
                 // We've encountered the end of a segment or the end of the path. If the final segment was
                 // "." or "..", remove the appropriate segments of the path.
-                if (i == segmentStart + 1 && uri[segmentStart] == '.') {
+                if (i == segmentStart + 1 && url[segmentStart] == '.') {
                     // Given "abc/def/./ghi", remove "./" to get "abc/def/ghi".
-                    uri.delete(segmentStart, nextSegmentStart)
+                    url.delete(segmentStart, nextSegmentStart)
                     limit -= nextSegmentStart - segmentStart
                     i = segmentStart
-                } else if (i == segmentStart + 2 && uri[segmentStart] == '.' && uri[segmentStart + 1] == '.') {
+                } else if (i == segmentStart + 2 && url[segmentStart] == '.' && url[segmentStart + 1] == '.') {
                     // Given "abc/def/../ghi", remove "def/../" to get "abc/ghi".
-                    val prevSegmentStart = uri.lastIndexOf("/", segmentStart - 2) + 1
+                    val prevSegmentStart = url.lastIndexOf("/", segmentStart - 2) + 1
                     val removeFrom = if (prevSegmentStart > offset) prevSegmentStart else offset
-                    uri.delete(removeFrom, nextSegmentStart)
+                    url.delete(removeFrom, nextSegmentStart)
                     limit -= nextSegmentStart - removeFrom
                     segmentStart = prevSegmentStart
                     i = prevSegmentStart
@@ -471,41 +471,41 @@ object HlsPlaylistParser {
                     segmentStart = i
                 }
             }
-            return uri.toString()
+            return url.toString()
         }
 
         /**
-         * Calculates indices of the constituent components of a URI.
+         * Calculates indices of the constituent components of a URL.
          *
-         * @param uriString The URI as a string.
+         * @param urlString The URL as a string.
          * @return The corresponding indices.
          */
-        private fun getUriIndices(uriString: String?): IntArray {
+        private fun getUrlIndices(urlString: String?): IntArray {
             val indices = IntArray(INDEX_COUNT)
-            if (uriString.isNullOrEmpty()) {
+            if (urlString.isNullOrEmpty()) {
                 indices[SCHEME_COLON] = -1
                 return indices
             }
 
             // Determine outer structure from right to left.
-            // Uri = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
-            val length = uriString.length
-            var fragmentIndex = uriString.indexOf('#')
+            // Url = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
+            val length = urlString.length
+            var fragmentIndex = urlString.indexOf('#')
             if (fragmentIndex == -1) {
                 fragmentIndex = length
             }
-            var queryIndex = uriString.indexOf('?')
+            var queryIndex = urlString.indexOf('?')
             if (queryIndex == -1 || queryIndex > fragmentIndex) {
                 // '#' before '?': '?' is within the fragment.
                 queryIndex = fragmentIndex
             }
             // Slashes are allowed only in hier-part so any colon after the first slash is part of the
             // hier-part, not the scheme colon separator.
-            var schemeIndexLimit = uriString.indexOf('/')
+            var schemeIndexLimit = urlString.indexOf('/')
             if (schemeIndexLimit == -1 || schemeIndexLimit > queryIndex) {
                 schemeIndexLimit = queryIndex
             }
-            var schemeIndex = uriString.indexOf(':')
+            var schemeIndex = urlString.indexOf(':')
             if (schemeIndex > schemeIndexLimit) {
                 // '/' before ':'
                 schemeIndex = -1
@@ -514,10 +514,10 @@ object HlsPlaylistParser {
             // Determine hier-part structure: hier-part = "//" authority path / path
             // This block can also cope with schemeIndex == -1.
             val hasAuthority =
-                schemeIndex + 2 < queryIndex && uriString[schemeIndex + 1] == '/' && uriString[schemeIndex + 2] == '/'
+                schemeIndex + 2 < queryIndex && urlString[schemeIndex + 1] == '/' && urlString[schemeIndex + 2] == '/'
             var pathIndex: Int
             if (hasAuthority) {
-                pathIndex = uriString.indexOf('/', schemeIndex + 3) // find first '/' after "://"
+                pathIndex = urlString.indexOf('/', schemeIndex + 3) // find first '/' after "://"
                 if (pathIndex == -1 || pathIndex > queryIndex) {
                     pathIndex = queryIndex
                 }
@@ -806,7 +806,7 @@ object HlsPlaylistParser {
 
         const val APPLICATION_MEDIA3_CUES: String = "$BASE_TYPE_APPLICATION/x-media3-cues"
 
-        /** MIME type for an image URI loaded from an external image management framework.  */
+        /** MIME type for an image URL loaded from an external image management framework.  */
         const val APPLICATION_EXTERNALLY_LOADED_IMAGE: String = "$BASE_TYPE_APPLICATION/x-image-uri"
 
 
@@ -1177,11 +1177,11 @@ object HlsPlaylistParser {
         val keyFormatVersions =
             parseOptionalStringAttr(line, REGEX_KEYFORMATVERSIONS, "1", variableDefinitions)
         if (KEYFORMAT_WIDEVINE_PSSH_BINARY == keyFormat) {
-            val uriString = parseStringAttr(line, REGEX_URI, variableDefinitions)
+            val urlString = parseStringAttr(line, REGEX_URI, variableDefinitions)
             return SchemeData(
                 uuid = C.WIDEVINE_UUID,
                 mimeType = MimeTypes.VIDEO_MP4,
-                data = Base64.Default.decode(uriString.substring(uriString.indexOf(',')))
+                data = Base64.Default.decode(urlString.substring(urlString.indexOf(',')))
             )
         } else if (KEYFORMAT_WIDEVINE_PSSH_JSON == keyFormat) {
             return SchemeData(
@@ -1190,9 +1190,9 @@ object HlsPlaylistParser {
                 data = line.encodeToByteArray()
             )
         } else if (KEYFORMAT_PLAYREADY == keyFormat && "1" == keyFormatVersions) {
-            val uriString = parseStringAttr(line, REGEX_URI, variableDefinitions)
+            val urlString = parseStringAttr(line, REGEX_URI, variableDefinitions)
             val data: ByteArray =
-                Base64.Default.decode(uriString.substring(uriString.indexOf(',')))
+                Base64.Default.decode(urlString.substring(urlString.indexOf(',')))
             val psshData: ByteArray =
                 PsshAtomUtil.buildPsshAtom(
                     systemId = C.PLAYREADY_UUID,
@@ -1270,7 +1270,7 @@ object HlsPlaylistParser {
     }
 
     data class Variant(
-        val url: URI,
+        val url: Url,
         val format: Format,
         val videoGroupId: String?,
         val audioGroupId: String?,
@@ -1323,7 +1323,7 @@ object HlsPlaylistParser {
 
     data class Rendition(
         /** The rendition's url, or null if the tag does not have a URI attribute. */
-        val url: URI?,
+        val url: Url?,
 
         /** Format information associated with this rendition. */
         val format: Format,
@@ -1336,14 +1336,14 @@ object HlsPlaylistParser {
     )
 
     data class HlsMultivariantPlaylist(
-        /** The base uri. Used to resolve relative paths. */
+        /** The base url. Used to resolve relative paths. */
         val baseUri: String,
 
         /** The list of tags in the playlist. */
         val tags: List<String>,
 
         /** All of the media playlist URLs referenced by the playlist. */
-        //val mediaPlaylistUrls: List<URI>,
+        //val mediaPlaylistUrls: List<Url>,
 
         /** The variants declared by the playlist. */
         val variants: List<Variant>,
@@ -1729,8 +1729,8 @@ object HlsPlaylistParser {
     private fun parseMultivariantPlaylist(
         iterator: Iterator<String>, baseUri: String
     ): HlsMultivariantPlaylist {
-        val urlToVariantInfos: HashMap<URI, ArrayList<VariantInfo>?> =
-            HashMap<URI, ArrayList<VariantInfo>?>()
+        val urlToVariantInfos: HashMap<Url, ArrayList<VariantInfo>?> =
+            HashMap<Url, ArrayList<VariantInfo>?>()
         val variableDefinitions = HashMap<String, String>()
         val variants: ArrayList<Variant> = ArrayList<Variant>()
         val videos: ArrayList<Rendition> = ArrayList<Rendition>()
@@ -1853,10 +1853,10 @@ object HlsPlaylistParser {
                     parseOptionalStringAttr(line, REGEX_SUBTITLES, variableDefinitions)
                 val closedCaptionsGroupId: String? =
                     parseOptionalStringAttr(line, REGEX_CLOSED_CAPTIONS, variableDefinitions)
-                val uri: URI
+                val url: Url
                 if (isIFrameOnlyVariant) {
-                    uri =
-                        UriUtil.resolveToUri(
+                    url =
+                        UrlUtil.resolveToUrl(
                             baseUri,
                             parseStringAttr(line, REGEX_URI, variableDefinitions)
                         )
@@ -1865,14 +1865,14 @@ object HlsPlaylistParser {
                         "#EXT-X-STREAM-INF must be followed by another line",  /* cause= */null
                     )
                 } else {
-                    // The following line contains #EXT-X-STREAM-INF's URI.
+                    // The following line contains #EXT-X-STREAM-INF's URL.
                     line = replaceVariableReferences(iterator.next(), variableDefinitions)
-                    uri = UriUtil.resolveToUri(baseUri, line)
+                    url = UrlUtil.resolveToUrl(baseUri, line)
                 }
 
                 val variant =
                     Variant(
-                        url = uri,
+                        url = url,
                         format = Format(
                             id = variants.size.toString(),
                             containerMimeType = MimeTypes.APPLICATION_M3U8,
@@ -1890,10 +1890,10 @@ object HlsPlaylistParser {
                         captionGroupId = closedCaptionsGroupId
                     )
                 variants.add(variant)
-                var variantInfosForUrl: ArrayList<VariantInfo>? = urlToVariantInfos[uri]
+                var variantInfosForUrl: ArrayList<VariantInfo>? = urlToVariantInfos[url]
                 if (variantInfosForUrl == null) {
                     variantInfosForUrl = ArrayList()
-                    urlToVariantInfos[uri] = variantInfosForUrl
+                    urlToVariantInfos[url] = variantInfosForUrl
                 }
                 variantInfosForUrl.add(
                     VariantInfo(
@@ -1911,7 +1911,7 @@ object HlsPlaylistParser {
         // TODO: Don't deduplicate variants by URL.
         val deduplicatedVariants = variants.distinctBy { it.url }
         /*val deduplicatedVariants: ArrayList<Variant> = ArrayList<Variant>()
-        val urlsInDeduplicatedVariants = HashSet<URI>()
+        val urlsInDeduplicatedVariants = HashSet<Url>()
         for (i in variants.indices) {
             val variant: Variant = variants[i]
             if (urlsInDeduplicatedVariants.add(variant.url)) {
@@ -1945,10 +1945,10 @@ object HlsPlaylistParser {
                 containerMimeType = MimeTypes.APPLICATION_M3U8,
             )
 
-            val referenceUri: String? =
+            val referenceUrl: String? =
                 parseOptionalStringAttr(line, REGEX_URI, variableDefinitions)
-            val uri: URI? =
-                if (referenceUri == null) null else UriUtil.resolveToUri(baseUri, referenceUri)
+            val url: Url? =
+                if (referenceUrl == null) null else UrlUtil.resolveToUrl(baseUri, referenceUrl)
             //val metadata =
             //    Metadata(HlsTrackMetadataEntry(groupId, name, emptyList<T>()))
             when (parseStringAttr(line, REGEX_TYPE, variableDefinitions)) {
@@ -1963,11 +1963,11 @@ object HlsPlaylistParser {
                             codecs = Util.getCodecsOfType(variantFormat.codecs, C.TRACK_TYPE_VIDEO)
                         )
                     }
-                    if (uri == null) {
-                        // TODO: Remove this case and add a Rendition with a null uri to videos.
+                    if (url == null) {
+                        // TODO: Remove this case and add a Rendition with a null url to videos.
                     } else {
                         //formatBuilder.setMetadata(metadata)
-                        videos.add(Rendition(url = uri, format = formatBuilder, groupId, name))
+                        videos.add(Rendition(url = url, format = formatBuilder, groupId, name))
                     }
                 }
 
@@ -1995,11 +1995,11 @@ object HlsPlaylistParser {
                         }
                     }
                     val format = formatBuilder.copy(sampleMimeType = sampleMimeType)
-                    if (uri != null) {
+                    if (url != null) {
                         //formatBuilder.setMetadata(metadata)
-                        audios.add(Rendition(uri, format, groupId, name))
+                        audios.add(Rendition(url, format, groupId, name))
                     } else if (variant != null) {
-                        // TODO: Remove muxedAudioFormat and add a Rendition with a null uri to audios.
+                        // TODO: Remove muxedAudioFormat and add a Rendition with a null url to audios.
                         muxedAudioFormat = format
                     }
                 }
@@ -2018,10 +2018,10 @@ object HlsPlaylistParser {
                     if (sampleMimeType == null) {
                         sampleMimeType = MimeTypes.TEXT_VTT
                     }
-                    if (uri != null) {
+                    if (url != null) {
                         subtitles.add(
                             Rendition(
-                                uri,
+                                url,
                                 formatBuilder.copy(sampleMimeType = sampleMimeType),
                                 groupId,
                                 name
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
index b203fd338..00d448d94 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt
@@ -112,8 +112,8 @@ object M3u8Helper2 {
         return c.doFinal(data)
     }
 
-    private fun getParentLink(uri: String): String {
-        val split = uri.split("/").toMutableList()
+    private fun getParentLink(url: String): String {
+        val split = url.split("/").toMutableList()
         split.removeAt(split.lastIndex)
         return split.joinToString("/")
     }
@@ -322,15 +322,15 @@ object M3u8Helper2 {
 
         if (!match.isNullOrEmpty()) {
             encryptionState = true
-            var encryptionUri = match[2]
+            var encryptionUrl = match[2]
 
-            if (isNotCompleteUrl(encryptionUri)) {
-                encryptionUri = "${getParentLink(playlistStream.streamUrl)}/$encryptionUri"
+            if (isNotCompleteUrl(encryptionUrl)) {
+                encryptionUrl = "${getParentLink(playlistStream.streamUrl)}/$encryptionUrl"
             }
 
             encryptionIv = match[3].encodeToByteArray()
             val encryptionKeyResponse =
-                app.get(encryptionUri, headers = playlistStream.headers, verify = false)
+                app.get(encryptionUrl, headers = playlistStream.headers, verify = false)
             val body = encryptionKeyResponse.body
             encryptionData = body.bytes()
             body.close()
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/StringUtils.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/StringUtils.kt
index 1e3a2ffb7..b9233490a 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/StringUtils.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/StringUtils.kt
@@ -1,14 +1,32 @@
 package com.lagradost.cloudstream3.utils
 
-import java.net.URLDecoder
-import java.net.URLEncoder
+import com.lagradost.cloudstream3.Prerelease
+import io.ktor.http.decodeURLQueryComponent
+import io.ktor.http.encodeURLParameter
 
 object StringUtils {
-    fun String.encodeUri(): String {
-        return URLEncoder.encode(this, "UTF-8")
+    @Prerelease
+    fun String.decodeUrl(): String {
+        return this.decodeURLQueryComponent()
     }
 
-    fun String.decodeUri(): String {
-        return URLDecoder.decode(this, "UTF-8")
+    @Prerelease
+    fun String.encodeUrl(): String {
+        return this.encodeURLParameter()
     }
-}
\ No newline at end of file
+
+    // Deprecate after next stable
+
+    /* @Deprecated(
+        message = "Use Ktor 'Url' naming convention instead.",
+        replaceWith = ReplaceWith("this.encodeUrl()")
+    ) */
+    fun String.encodeUri(): String = encodeUrl()
+
+    /* @Deprecated(
+        message = "Use Ktor 'Url' naming convention instead.",
+        replaceWith = ReplaceWith("this.decodeUrl()")
+    ) */
+    fun String.decodeUri(): String = decodeUrl()
+}
+
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt
index 6d9862d3a..8bdbf3788 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt
@@ -2,9 +2,9 @@ package com.lagradost.cloudstream3.utils
 
 import com.lagradost.cloudstream3.app
 import com.lagradost.cloudstream3.base64Decode
-import com.lagradost.cloudstream3.utils.StringUtils.decodeUri
+import com.lagradost.cloudstream3.utils.StringUtils.decodeUrl
 import com.lagradost.nicehttp.NiceResponse
-import java.net.URI
+import io.ktor.http.Url
 
 // Code heavily based on unshortenit.py form kodiondemand /addon
 
@@ -48,8 +48,8 @@ object ShortLink {
         }
     }
 
-    suspend fun unshorten(uri: String, type: String? = null): String {
-        var currentUrl = uri
+    suspend fun unshorten(url: String, type: String? = null): String {
+        var currentUrl = url
 
         val visitedUrls = mutableSetOf<String>()
         var count = 10
@@ -57,9 +57,7 @@ object ShortLink {
             visitedUrls += currentUrl
             count -= 1
 
-            val domain =
-                URI(currentUrl.trim()).host
-                    ?: throw IllegalArgumentException("No domain found in URI!")
+            val domain = Url(currentUrl.trim()).host
             currentUrl = shortList.firstOrNull {
                 it.regex.find(domain) != null || type == it.type
             }?.function?.let { it(currentUrl) } ?: break
@@ -67,8 +65,8 @@ object ShortLink {
         return currentUrl.trim()
     }
 
-    suspend fun unshortenAdfly(uri: String): String {
-        val html = app.get(uri).text
+    suspend fun unshortenAdfly(url: String): String {
+        val html = app.get(url).text
         val ysmm = Regex("""var ysmm =.*;?""").find(html)!!.value
 
         if (ysmm.isNotEmpty()) {
@@ -81,46 +79,46 @@ object ShortLink {
                 left += c[0]
                 right = c[1] + right
             }
-            val encodedUri = (left + right).toMutableList()
+            val encodedUrl = (left + right).toMutableList()
             val numbers =
-                encodedUri.mapIndexed { i, n -> Pair(i, n) }.filter { it.second.isDigit() }
+                encodedUrl.mapIndexed { i, n -> Pair(i, n) }.filter { it.second.isDigit() }
             for (el in numbers.chunked(2).dropLastWhile { it.size == 1 }) {
                 val xor = (el[0].second).code.xor(el[1].second.code)
                 if (xor < 10) {
-                    encodedUri[el[0].first] = xor.digitToChar()
+                    encodedUrl[el[0].first] = xor.digitToChar()
                 }
             }
-            val encodedbytearray = encodedUri.map { it.code.toByte() }.toByteArray()
-            var decodedUri =
+            val encodedbytearray = encodedUrl.map { it.code.toByte() }.toByteArray()
+            var decodedUrl =
                 base64Decode(encodedbytearray.toString()).dropLast(16)
                     .drop(16)
 
-            if (Regex("""go\.php\?u=""").find(decodedUri) != null) {
-                decodedUri =
-                    base64Decode(decodedUri.replace(Regex("""(.*?)u="""), ""))
+            if (Regex("""go\.php\?u=""").find(decodedUrl) != null) {
+                decodedUrl =
+                    base64Decode(decodedUrl.replace(Regex("""(.*?)u="""), ""))
             }
 
-            return decodedUri
+            return decodedUrl
         } else {
-            return uri
+            return url
         }
     }
 
-    suspend fun unshortenLinkup(uri: String): String {
+    suspend fun unshortenLinkup(url: String): String {
         var r: NiceResponse? = null
-        var uri = uri
+        var url = url
         when {
-            uri.contains("/tv/") -> uri = uri.replace("/tv/", "/tva/")
-            uri.contains("delta") -> uri = uri.replace("/delta/", "/adelta/")
-            (uri.contains("/ga/") || uri.contains("/ga2/")) -> uri =
-                base64Decode(uri.split('/').last()).trim()
+            url.contains("/tv/") -> url = url.replace("/tv/", "/tva/")
+            url.contains("delta") -> url = url.replace("/delta/", "/adelta/")
+            (url.contains("/ga/") || url.contains("/ga2/")) -> url =
+                base64Decode(url.split('/').last()).trim()
 
-            uri.contains("/speedx/") -> uri =
-                uri.replace("http://linkup.pro/speedx", "http://speedvideo.net")
+            url.contains("/speedx/") -> url =
+                url.replace("http://linkup.pro/speedx", "http://speedvideo.net")
 
             else -> {
-                r = app.get(uri, allowRedirects = true)
-                uri = r.url
+                r = app.get(url, allowRedirects = true)
+                url = r.url
                 val link =
                     Regex("<iframe[^<>]*src=\\'([^'>]*)\\'[^<>]*>").find(r.text)?.value
                         ?: Regex("""action="(?:[^/]+.*?/[^/]+/([a-zA-Z0-9_]+))">""").find(r.text)?.value
@@ -128,40 +126,40 @@ object ShortLink {
                             .elementAtOrNull(1)?.groupValues?.get(1)
 
                 if (link != null) {
-                    uri = link
+                    url = link
                 }
             }
         }
 
-        val short = Regex("""^https?://.*?(https?://.*)""").find(uri)?.value
+        val short = Regex("""^https?://.*?(https?://.*)""").find(url)?.value
         if (short != null) {
-            uri = short
+            url = short
         }
         if (r == null) {
             r = app.get(
-                uri,
+                url,
                 allowRedirects = false
             )
             if (r.headers["location"] != null) {
-                uri = r.headers["location"].toString()
+                url = r.headers["location"].toString()
             }
         }
-        if (uri.contains("snip.")) {
-            if (uri.contains("out_generator")) {
-                uri = Regex("url=(.*)\$").find(uri)!!.value
-            } else if (uri.contains("/decode/")) {
-                uri = app.get(uri, allowRedirects = true).url
+        if (url.contains("snip.")) {
+            if (url.contains("out_generator")) {
+                url = Regex("url=(.*)\$").find(url)!!.value
+            } else if (url.contains("/decode/")) {
+                url = app.get(url, allowRedirects = true).url
             }
         }
-        return uri
+        return url
     }
 
-    fun unshortenLinksafe(uri: String): String {
-        return base64Decode(uri.split("?url=").last())
+    fun unshortenLinksafe(url: String): String {
+        return base64Decode(url.split("?url=").last())
     }
 
-    suspend fun unshortenNuovoIndirizzo(uri: String): String {
-        val soup = app.get(uri, allowRedirects = true)
+    suspend fun unshortenNuovoIndirizzo(url: String): String {
+        val soup = app.get(url, allowRedirects = true)
         val header = soup.headers["refresh"]
         val link: String = if (header != null) {
             soup.headers["refresh"]!!.substringAfter("=")
@@ -171,29 +169,29 @@ object ShortLink {
         return link
     }
 
-    suspend fun unshortenNuovoLink(uri: String): String {
-        return app.get(uri, allowRedirects = true).document.selectFirst("a")!!.attr("href")
+    suspend fun unshortenNuovoLink(url: String): String {
+        return app.get(url, allowRedirects = true).document.selectFirst("a")!!.attr("href")
 
     }
 
-    suspend fun unshortenUprot(uri: String): String {
-        val page = app.get(uri).text
+    suspend fun unshortenUprot(url: String): String {
+        val page = app.get(url).text
         Regex("""<a[^>]+href="([^"]+)".*Continue""").findAll(page)
             .map { it.value.replace("""<a href="""", "") }
             .toList().forEach { link ->
-                if (link.contains("https://maxstream.video") || link.contains("https://uprot.net") && link != uri) {
+                if (link.contains("https://maxstream.video") || link.contains("https://uprot.net") && link != url) {
                     return link
                 }
             }
-        return uri
+        return url
     }
 
-    fun unshortenDavisonbarker(uri: String): String {
-        return uri.substringAfter("dest=").decodeUri()
+    fun unshortenDavisonbarker(url: String): String {
+        return url.substringAfter("dest=").decodeUrl()
     }
 
-    suspend fun unshortenIsecure(uri: String): String {
-        val doc = app.get(uri).document
-        return doc.selectFirst("iframe")?.attr("src")?.trim() ?: uri
+    suspend fun unshortenIsecure(url: String): String {
+        val doc = app.get(url).document
+        return doc.selectFirst("iframe")?.attr("src")?.trim() ?: url
     }
-}
\ No newline at end of file
+}

From b222911e29dadbfdba62c2d44e92f7973c4a647b Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Thu, 11 Jun 2026 04:29:29 -0600
Subject: [PATCH 168/177] Fix parseJson inline on stable once again! (#2908)

---
 .../kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
index 6233fd820..6ab9d3e95 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -60,8 +60,9 @@ object AppUtils {
     inline fun <reified T : Any> parseJson(value: String): T {
         // @Serializable generates a serializer at compile time; contextual serializers are
         // registered manually in serializersModule, we need both to support all cases
-        val serializer = runCatching { serializer<T>() }.getOrNull()
-            ?: json.serializersModule.getContextual(T::class)
+        val serializer = runCatching { serializer<T>() }
+            .recoverCatching { json.serializersModule.getContextual(T::class) }
+            .getOrNull()
 
         // Prefer Kotlin Serialization over Jackson
         if (serializer != null) {

From 6f9646e52f475f94005467f6256870357cb948bc Mon Sep 17 00:00:00 2001
From: Osten <11805592+LagradOst@users.noreply.github.com>
Date: Thu, 11 Jun 2026 15:06:23 +0200
Subject: [PATCH 169/177] Fix one last issue in JSON parsing :I

---
 .../kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
index 6ab9d3e95..1c635013f 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/AppUtils.kt
@@ -70,6 +70,8 @@ object AppUtils {
                 return json.decodeFromString(serializer, value)
             } catch (e: SerializationException) {
                 logError(e)
+            } catch (_: Throwable) {
+                // Pass, the above code will trigger a NoSuchMethodError on stable due to our previously undefined json variable
             }
         }
 

From 55450a02fa14d2364eca8ab5e551d2c0552b4870 Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Sat, 13 Jun 2026 02:56:45 +0200
Subject: [PATCH 170/177] Merge pull request #2904 from recloudstream/mpvrx

Feat: MpvRx
---
 .../cloudstream3/actions/VideoClickAction.kt  |  2 +
 .../cloudstream3/actions/temp/MpvRxPackage.kt | 75 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/actions/temp/MpvRxPackage.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt
index 3ed858ef3..ef042e3a6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt
@@ -20,6 +20,7 @@ import com.lagradost.cloudstream3.actions.temp.MpvExPackage
 import com.lagradost.cloudstream3.actions.temp.MpvKtPackage
 import com.lagradost.cloudstream3.actions.temp.MpvKtPreviewPackage
 import com.lagradost.cloudstream3.actions.temp.MpvPackage
+import com.lagradost.cloudstream3.actions.temp.MpvRxPackage
 import com.lagradost.cloudstream3.actions.temp.MpvYTDLPackage
 import com.lagradost.cloudstream3.actions.temp.NextPlayerPackage
 import com.lagradost.cloudstream3.actions.temp.PlayInBrowserAction
@@ -64,6 +65,7 @@ object VideoClickActionHolder {
         MpvYTDLPackage(),
         MpvKtPackage(),
         MpvKtPreviewPackage(),
+        MpvRxPackage(),
         // Always Ask option
         AlwaysAskAction(),
         // added by plugins
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/MpvRxPackage.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/MpvRxPackage.kt
new file mode 100644
index 000000000..e8bb93a99
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/MpvRxPackage.kt
@@ -0,0 +1,75 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import androidx.core.net.toUri
+import com.lagradost.api.Log
+import com.lagradost.cloudstream3.actions.OpenInAppAction
+import com.lagradost.cloudstream3.actions.updateDurationAndPosition
+import com.lagradost.cloudstream3.isEpisodeBased
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos
+import com.lagradost.cloudstream3.utils.txt
+
+/** https://github.com/Riteshp2001/mpvRx
+ *
+ * https://github.com/Riteshp2001/mpvRx/blob/00e0c5e803ab53e5757426cbf2248448ba1f49bf/app/src/main/java/app/gyrolet/mpvrx/utils/media/MediaUtils.kt#L132
+ * https://github.com/Riteshp2001/mpvRx/blob/00e0c5e803ab53e5757426cbf2248448ba1f49bf/app/src/main/java/app/gyrolet/mpvrx/utils/media/MediaUtils.kt#L56
+ * */
+class MpvRxPackage : OpenInAppAction(
+    appName = txt("mpvRx"),
+    packageName = "app.gyrolet.mpvrx",
+    intentClass = "app.gyrolet.mpvrx.ui.player.PlayerActivity"
+) {
+    override val oneSource = true
+    override suspend fun putExtra(
+        context: Context,
+        intent: Intent,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        intent.apply {
+            putExtra("title", video.name)
+            val link = result.links[index!!]
+            val headers = link.headers
+
+            setData(link.url.toUri())
+            if (headers.isNotEmpty()) {
+                // PlayerActivity expects a flat array: [key1, value1, key2, value2, ...]
+                val flat = headers.entries.flatMap { listOf(it.key, it.value) }.toTypedArray()
+                intent.putExtra("headers", flat)
+            }
+            /*val subs = result.subs // disabled due to https://github.com/Riteshp2001/mpvRx/issues/146
+            intent.putExtra("subs", subs.map { it.url.toUri() }.toTypedArray())
+            intent.putExtra(
+                "subs.titles",
+                subs.map { it.name }.toTypedArray(),
+            )
+            intent.putExtra(
+                "subs.langs",
+                subs.map { it.languageCode }.toTypedArray(),
+            )
+            val selected = subs.firstOrNull { it.matchesLanguageCode("en") }?.url?.toUri()
+            intent.putExtra("subs.enable", selected?.let { arrayOf(it) } ?: arrayOf<Uri>() )*/
+
+            if (video.tvType.isEpisodeBased()) {
+                video.season?.let { intent.putExtra("introdb_season", it) }
+                video.episode.let { intent.putExtra("introdb_episode", it) }
+            }
+
+            val position = getViewPos(video.id)?.position
+            if (position != null)
+                putExtra("position", position.toInt())
+        }
+    }
+
+    override fun onResult(activity: Activity, intent: Intent?) {
+        val position = intent?.getIntExtra("position", -1) ?: -1
+        val duration = intent?.getIntExtra("duration", -1) ?: -1
+        Log.d("MPV", "Position: $position, Duration: $duration")
+        updateDurationAndPosition(position.toLong(), duration.toLong())
+    }
+}
\ No newline at end of file

From 3417fe016051d988361d32d093e0d4df55b34a8f Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Sat, 13 Jun 2026 02:58:43 +0200
Subject: [PATCH 171/177] Feat: OnlyPlayer (#2905)

---
 .../cloudstream3/actions/VideoClickAction.kt  |  2 +
 .../cloudstream3/actions/temp/OnlyPlayer.kt   | 44 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 app/src/main/java/com/lagradost/cloudstream3/actions/temp/OnlyPlayer.kt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt
index ef042e3a6..a864b5fb7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/VideoClickAction.kt
@@ -23,6 +23,7 @@ import com.lagradost.cloudstream3.actions.temp.MpvPackage
 import com.lagradost.cloudstream3.actions.temp.MpvRxPackage
 import com.lagradost.cloudstream3.actions.temp.MpvYTDLPackage
 import com.lagradost.cloudstream3.actions.temp.NextPlayerPackage
+import com.lagradost.cloudstream3.actions.temp.OnlyPlayer
 import com.lagradost.cloudstream3.actions.temp.PlayInBrowserAction
 import com.lagradost.cloudstream3.actions.temp.PlayMirrorAction
 import com.lagradost.cloudstream3.actions.temp.ViewM3U8Action
@@ -65,6 +66,7 @@ object VideoClickActionHolder {
         MpvYTDLPackage(),
         MpvKtPackage(),
         MpvKtPreviewPackage(),
+        OnlyPlayer(),
         MpvRxPackage(),
         // Always Ask option
         AlwaysAskAction(),
diff --git a/app/src/main/java/com/lagradost/cloudstream3/actions/temp/OnlyPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/OnlyPlayer.kt
new file mode 100644
index 000000000..348be440a
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/actions/temp/OnlyPlayer.kt
@@ -0,0 +1,44 @@
+package com.lagradost.cloudstream3.actions.temp
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.core.net.toUri
+import com.lagradost.cloudstream3.actions.OpenInAppAction
+import com.lagradost.cloudstream3.ui.result.LinkLoadingResult
+import com.lagradost.cloudstream3.ui.result.ResultEpisode
+import com.lagradost.cloudstream3.utils.txt
+
+/** https://github.com/Kindness-Kismet/only_player/tree/main
+ * https://github.com/Kindness-Kismet/only_player/blob/main/feature/player/src/main/java/one/only/player/feature/player/PlayerActivity.kt */
+class OnlyPlayer : OpenInAppAction(
+    txt("Only Player"),
+    "one.only.player",
+    intentClass = "one.only.player.feature.player.PlayerActivity"
+) {
+    override val oneSource = true
+    override suspend fun putExtra(
+        context: Context,
+        intent: Intent,
+        video: ResultEpisode,
+        result: LinkLoadingResult,
+        index: Int?
+    ) {
+        /** https://github.com/Kindness-Kismet/only_player/blob/d3f55049a2913fa762d31b311146073cc2da46cb/app/src/main/java/one/only/player/navigation/CloudNavGraph.kt#L39 */
+        intent.apply {
+            val link = result.links[index!!]
+            setData(link.url.toUri())
+
+            putExtra("headers", Bundle().apply {
+                for ((key, value) in link.headers) {
+                    putExtra(key, value)
+                }
+            })
+        }
+    }
+
+    override fun onResult(activity: Activity, intent: Intent?) {
+        /* onResult does not get called */
+    }
+}
\ No newline at end of file

From 2c03a3d97664f6f82db2a773e41c20bb579b84dd Mon Sep 17 00:00:00 2001
From: firelight <147925818+fire-light42@users.noreply.github.com>
Date: Sat, 13 Jun 2026 02:59:02 +0200
Subject: [PATCH 172/177] fix gradient (#2912)

---
 app/src/main/res/layout/player_custom_layout.xml    | 1 +
 app/src/main/res/layout/player_custom_layout_tv.xml | 1 +
 app/src/main/res/layout/trailer_custom_layout.xml   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml
index 407de4a3f..04a2a1f1f 100644
--- a/app/src/main/res/layout/player_custom_layout.xml
+++ b/app/src/main/res/layout/player_custom_layout.xml
@@ -11,6 +11,7 @@
         android:id="@+id/player_metadata_scrim"
         android:layout_width="640dp"
         android:layout_height="match_parent"
+        android:layout_marginTop="-10dp"
         android:background="@drawable/bg_player_metadata_scrim_netflix"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/player_custom_layout_tv.xml b/app/src/main/res/layout/player_custom_layout_tv.xml
index 3a3076943..077929d87 100644
--- a/app/src/main/res/layout/player_custom_layout_tv.xml
+++ b/app/src/main/res/layout/player_custom_layout_tv.xml
@@ -12,6 +12,7 @@
         android:id="@+id/player_metadata_scrim"
         android:layout_width="680dp"
         android:layout_height="match_parent"
+        android:layout_marginTop="-10dp"
         android:background="@drawable/bg_player_metadata_scrim_netflix"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/trailer_custom_layout.xml b/app/src/main/res/layout/trailer_custom_layout.xml
index 76231a2d3..88a318874 100644
--- a/app/src/main/res/layout/trailer_custom_layout.xml
+++ b/app/src/main/res/layout/trailer_custom_layout.xml
@@ -11,6 +11,7 @@
         android:id="@+id/player_metadata_scrim"
         android:layout_width="640dp"
         android:layout_height="match_parent"
+        android:layout_marginTop="-10dp"
         android:background="@drawable/bg_player_metadata_scrim_netflix"
         android:visibility="gone"
         app:layout_constraintStart_toStartOf="parent"

From c045bfdc0d9a691aa0405d9831a93fb875cc2196 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Wed, 17 Jun 2026 17:03:28 -0600
Subject: [PATCH 173/177] [skip ci] MainAPI: remove
 `@OptIn(ExperimentalEncodingApi::class)` (#2930)

It is stable since Kotlin 2.2.0
---
 .../commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
index 4a9e0b10a..ffc0a938d 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
@@ -41,7 +41,6 @@ import kotlinx.datetime.format.parse
 import kotlinx.datetime.toInstant
 import kotlinx.serialization.json.Json
 import kotlin.io.encoding.Base64
-import kotlin.io.encoding.ExperimentalEncodingApi
 import kotlin.math.absoluteValue
 import kotlin.math.roundToInt
 import kotlin.time.Clock
@@ -716,12 +715,10 @@ fun base64Decode(string: String): String {
     }
 }
 
-@OptIn(ExperimentalEncodingApi::class)
 fun base64DecodeArray(string: String): ByteArray {
     return Base64.decode(string)
 }
 
-@OptIn(ExperimentalEncodingApi::class)
 fun base64Encode(array: ByteArray): String {
     return Base64.encode(array)
 }

From 943bc551e950bbf292058d26fc89c62278a87494 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Wed, 17 Jun 2026 17:34:25 -0600
Subject: [PATCH 174/177] [skip ci] HlsPlaylistParser: use base64DecodeArray
 (#2929)

---
 .../com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
index 37d5f6285..cd5d752b3 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/HlsPlaylistParser.kt
@@ -19,12 +19,11 @@
  */
 package com.lagradost.cloudstream3.utils
 
+import com.lagradost.cloudstream3.base64DecodeArray
 import io.ktor.http.Url
 import java.io.IOException
 import java.nio.ByteBuffer
 import java.util.UUID
-import kotlin.io.encoding.Base64
-import kotlin.io.encoding.ExperimentalEncodingApi
 
 @Suppress("unused")
 object HlsPlaylistParser {
@@ -1169,7 +1168,6 @@ object HlsPlaylistParser {
         return parseOptionalStringAttr(line, pattern, null, variableDefinitions)
     }
 
-    @OptIn(ExperimentalEncodingApi::class)
     @Throws(ParserException::class)
     private fun parseDrmSchemeData(
         line: String, keyFormat: String, variableDefinitions: Map<String, String>
@@ -1181,7 +1179,7 @@ object HlsPlaylistParser {
             return SchemeData(
                 uuid = C.WIDEVINE_UUID,
                 mimeType = MimeTypes.VIDEO_MP4,
-                data = Base64.Default.decode(urlString.substring(urlString.indexOf(',')))
+                data = base64DecodeArray(urlString.substring(urlString.indexOf(',')))
             )
         } else if (KEYFORMAT_WIDEVINE_PSSH_JSON == keyFormat) {
             return SchemeData(
@@ -1192,7 +1190,7 @@ object HlsPlaylistParser {
         } else if (KEYFORMAT_PLAYREADY == keyFormat && "1" == keyFormatVersions) {
             val urlString = parseStringAttr(line, REGEX_URI, variableDefinitions)
             val data: ByteArray =
-                Base64.Default.decode(urlString.substring(urlString.indexOf(',')))
+                base64DecodeArray(urlString.substring(urlString.indexOf(',')))
             val psshData: ByteArray =
                 PsshAtomUtil.buildPsshAtom(
                     systemId = C.PLAYREADY_UUID,

From b4100dbfca6ef9cc6ea9842abbed189709b94eb2 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Thu, 18 Jun 2026 01:40:30 +0200
Subject: [PATCH 175/177] feat(extractors): add flyfile.app extractor (#2925)

---
 .../cloudstream3/extractors/Flyfile.kt        | 48 +++++++++++++++++++
 .../cloudstream3/utils/ExtractorApi.kt        |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Flyfile.kt

diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Flyfile.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Flyfile.kt
new file mode 100644
index 000000000..eb6d474a5
--- /dev/null
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Flyfile.kt
@@ -0,0 +1,48 @@
+package com.lagradost.cloudstream3.extractors
+
+import com.lagradost.cloudstream3.Prerelease
+import com.lagradost.cloudstream3.SubtitleFile
+import com.lagradost.cloudstream3.app
+import com.lagradost.cloudstream3.utils.ExtractorApi
+import com.lagradost.cloudstream3.utils.ExtractorLink
+import com.lagradost.cloudstream3.utils.ExtractorLinkType
+import com.lagradost.cloudstream3.utils.newExtractorLink
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Prerelease
+open class Flyfile : ExtractorApi() {
+    override val name: String = "FlyFile"
+    override val mainUrl: String = "https://flyfile.app"
+    open val apiUrl: String = "https://api.flyfile.app"
+    override val requiresReferer: Boolean = false
+
+    override suspend fun getUrl(
+        url: String,
+        referer: String?,
+        subtitleCallback: (SubtitleFile) -> Unit,
+        callback: (ExtractorLink) -> Unit
+    ) {
+        val videoId = url.substringAfterLast("/")
+        val videoInfo = app.get("$apiUrl/api/streaming/assign/$videoId")
+            .parsed<StreamInfo>()
+
+        val streamUrl = "${videoInfo.url}/hls/${videoInfo.token}/master.m3u8"
+        callback.invoke(
+            newExtractorLink(
+                source = name,
+                name = name,
+                url = streamUrl,
+                type = ExtractorLinkType.M3U8
+            )
+        )
+    }
+
+    @Serializable
+    private data class StreamInfo(
+        @SerialName("url")
+        val url: String,
+        @SerialName("token")
+        val token: String
+    )
+}
\ No newline at end of file
diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
index 8a71714cf..f9167d08c 100644
--- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
+++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
@@ -81,6 +81,7 @@ import com.lagradost.cloudstream3.extractors.FilemoonV2
 import com.lagradost.cloudstream3.extractors.Filesim
 import com.lagradost.cloudstream3.extractors.Multimoviesshg
 import com.lagradost.cloudstream3.extractors.FlaswishCom
+import com.lagradost.cloudstream3.extractors.Flyfile
 import com.lagradost.cloudstream3.extractors.FourCX
 import com.lagradost.cloudstream3.extractors.FourPichive
 import com.lagradost.cloudstream3.extractors.FourPlayRu
@@ -1298,6 +1299,7 @@ val extractorApis: AtomicMutableList<ExtractorApi> = atomicListOf(
     GUpload(),
     HlsWish(),
     ByseQekaho(),
+    Flyfile()
 )
 
 

From 6f458fc9b57b014ee0fce42c8d90a3b4bc6c6e15 Mon Sep 17 00:00:00 2001
From: Luna712 <142361265+Luna712@users.noreply.github.com>
Date: Wed, 17 Jun 2026 17:41:02 -0600
Subject: [PATCH 176/177] Remove unused classgraph dependency (#2924)

---
 app/build.gradle.kts                                           | 1 -
 .../com/lagradost/cloudstream3/SerializationClassTester.kt     | 3 +--
 gradle/libs.versions.toml                                      | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6c784f3ef..02c1f99e8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -207,7 +207,6 @@ dependencies {
     testImplementation(libs.junit)
     testImplementation(libs.json)
     androidTestImplementation(libs.core)
-    androidTestImplementation(libs.classgraph)
     androidTestImplementation(libs.espresso.core)
     androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.instancio.core)
diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/SerializationClassTester.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/SerializationClassTester.kt
index d1a11e003..80c7b49b0 100644
--- a/app/src/androidTest/java/com/lagradost/cloudstream3/SerializationClassTester.kt
+++ b/app/src/androidTest/java/com/lagradost/cloudstream3/SerializationClassTester.kt
@@ -101,7 +101,7 @@ class SerializationClassTester {
     }
 
     // DEX files are the best solution to read all our classes dynamically.
-    // ClassGraph() can be used instead, but it only gives results on the JVM, not Android.
+    // classgraph could be used instead, but it only gives results on the JVM, not Android.
     @Suppress("DEPRECATION")
     private fun findSerializableClasses(packageName: String): List<KClass<*>> {
         val context = InstrumentationRegistry
@@ -109,7 +109,6 @@ class SerializationClassTester {
             .targetContext
 
         val dexFile = DexFile(context.packageCodePath)
-
         return dexFile.entries()
             .toList()
             .filter { it.startsWith(packageName) }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f28bc41ab..80e342c2c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,7 +8,6 @@ annotation = "1.10.0"
 appcompat = "1.7.1"
 biometric = "1.4.0-alpha07"
 buildkonfigGradlePlugin = "0.21.2"
-classgraph = "4.8.184"
 coil = { strictly = "3.3.0" } # Later versions require jvmTarget 11 or later
 colorpicker = "6b46b49"
 conscryptAndroid = { strictly = "2.5.2" } # 2.5.3 crashes everything
@@ -70,7 +69,6 @@ anime-db = { module = "com.github.recloudstream:anime-db", version.ref = "animeD
 annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
-classgraph = { group = "io.github.classgraph", name = "classgraph", version.ref = "classgraph" }
 coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
 coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
 colorpicker = { module = "com.github.recloudstream:color-picker-android", version.ref = "colorpicker" }

From 3c6bf2984e6976e20e8861dcc543bcf3e628e79b Mon Sep 17 00:00:00 2001
From: KingLucius <escuro.anjo@gmail.com>
Date: Fri, 19 Jun 2026 01:06:46 +0300
Subject: [PATCH 177/177] SyncApi Search query fix (#2932)

---
 .../syncproviders/providers/AniListApi.kt     | 25 ++++++++++---------
 .../syncproviders/providers/MALApi.kt         | 14 +++++------
 .../syncproviders/providers/SimklApi.kt       |  2 +-
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
index 7a46b4113..177018e19 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt
@@ -50,7 +50,8 @@ class AniListApi : SyncAPI() {
     override suspend fun login(redirectUrl: String, payload: String?): AuthToken? {
         val sanitizer = splitRedirectUrl(redirectUrl)
         val token = AuthToken(
-            accessToken = sanitizer["access_token"] ?: throw ErrorLoadingException("No access token"),
+            accessToken = sanitizer["access_token"]
+                ?: throw ErrorLoadingException("No access token"),
             //refreshToken = sanitizer["refresh_token"],
             accessTokenLifetime = unixTime + sanitizer["expires_in"]!!.toLong(),
         )
@@ -83,8 +84,8 @@ class AniListApi : SyncAPI() {
         return "$mainUrl/anime/$id"
     }
 
-    override suspend fun search(auth : AuthData?, query: String): List<SyncAPI.SyncSearchResult>? {
-        val data = searchShows(name) ?: return null
+    override suspend fun search(auth: AuthData?, query: String): List<SyncAPI.SyncSearchResult>? {
+        val data = searchShows(query) ?: return null
         return data.data?.page?.media?.map {
             SyncAPI.SyncSearchResult(
                 it.title.romaji ?: return null,
@@ -96,7 +97,7 @@ class AniListApi : SyncAPI() {
         }
     }
 
-    override suspend fun load(auth : AuthData?, id: String): SyncAPI.SyncResult? {
+    override suspend fun load(auth: AuthData?, id: String): SyncAPI.SyncResult? {
         val internalId = (Regex("anilist\\.co/anime/(\\d*)").find(id)?.groupValues?.getOrNull(1)
             ?: id).toIntOrNull() ?: throw ErrorLoadingException("Invalid internalId")
         val season = getSeason(internalId).data.media
@@ -158,7 +159,7 @@ class AniListApi : SyncAPI() {
         )
     }
 
-    override suspend fun status(auth : AuthData?, id: String): SyncAPI.AbstractSyncStatus? {
+    override suspend fun status(auth: AuthData?, id: String): SyncAPI.AbstractSyncStatus? {
         val internalId = id.toIntOrNull() ?: return null
         val data = getDataAboutId(auth ?: return null, internalId) ?: return null
 
@@ -459,7 +460,7 @@ class AniListApi : SyncAPI() {
         }
     }
 
-    private suspend fun getDataAboutId(auth : AuthData, id: Int): AniListTitleHolder? {
+    private suspend fun getDataAboutId(auth: AuthData, id: Int): AniListTitleHolder? {
         val q =
             """query (${'$'}id: Int = $id) { # Define which variables will be used in the query (id)
                 Media (id: ${'$'}id, type: ANIME) { # Insert our variables into the query arguments (id) (type: ANIME is hard-coded in the query)
@@ -506,7 +507,7 @@ class AniListApi : SyncAPI() {
 
     }
 
-    private suspend fun postApi(token : AuthToken, q: String, cache: Boolean = false): String? {
+    private suspend fun postApi(token: AuthToken, q: String, cache: Boolean = false): String? {
         return app.post(
             "https://graphql.anilist.co/",
             headers = mapOf(
@@ -638,7 +639,7 @@ class AniListApi : SyncAPI() {
         }
     }
 
-    override suspend fun library(auth : AuthData?): SyncAPI.LibraryMetadata? {
+    override suspend fun library(auth: AuthData?): SyncAPI.LibraryMetadata? {
         val list = getAniListAnimeListSmart(auth ?: return null)?.groupBy {
             convertAniListStringToStatus(it.status ?: "").stringRes
         }?.mapValues { group ->
@@ -666,7 +667,7 @@ class AniListApi : SyncAPI() {
         )
     }
 
-    private suspend fun getFullAniListList(auth : AuthData): FullAnilistList? {
+    private suspend fun getFullAniListList(auth: AuthData): FullAnilistList? {
         val userID = auth.user.id
         val mediaType = "ANIME"
 
@@ -714,7 +715,7 @@ class AniListApi : SyncAPI() {
         return text?.toKotlinObject()
     }
 
-    suspend fun toggleLike(auth : AuthData, id: Int): Boolean {
+    suspend fun toggleLike(auth: AuthData, id: Int): Boolean {
         val q = """mutation (${'$'}animeId: Int = $id) {
 				ToggleFavourite (animeId: ${'$'}animeId) {
 					anime {
@@ -737,7 +738,7 @@ class AniListApi : SyncAPI() {
     data class MediaListId(@JsonProperty("id") val id: Long? = null)
 
     private suspend fun postDataAboutId(
-        auth : AuthData,
+        auth: AuthData,
         id: Int,
         type: AniListStatusType,
         score: Score?,
@@ -786,7 +787,7 @@ class AniListApi : SyncAPI() {
         return data != ""
     }
 
-    private suspend fun getUser(token : AuthToken): AniListUser? {
+    private suspend fun getUser(token: AuthToken): AniListUser? {
         val q = """
 				{
   					Viewer {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt
index ba0195be6..c0a80b3c9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt
@@ -98,9 +98,9 @@ class MALApi : SyncAPI() {
         )
     }
 
-    override suspend fun search(auth : AuthData?, query: String): List<SyncAPI.SyncSearchResult>? {
+    override suspend fun search(auth: AuthData?, query: String): List<SyncAPI.SyncSearchResult>? {
         val auth = auth?.token?.accessToken ?: return null
-        val url = "$apiUrl/v2/anime?q=$name&limit=$MAL_MAX_SEARCH_LIMIT"
+        val url = "$apiUrl/v2/anime?q=$query&limit=$MAL_MAX_SEARCH_LIMIT"
         val res = app.get(
             url, headers = mapOf(
                 "Authorization" to "Bearer $auth",
@@ -122,7 +122,7 @@ class MALApi : SyncAPI() {
         Regex("""/anime/((.*)/|(.*))""").find(url)!!.groupValues.first()
 
     override suspend fun updateStatus(
-        auth : AuthData?,
+        auth: AuthData?,
         id: String,
         newStatus: SyncAPI.AbstractSyncStatus
     ): Boolean {
@@ -225,7 +225,7 @@ class MALApi : SyncAPI() {
         )
     }
 
-    override suspend fun load(auth : AuthData?, id: String): SyncAPI.SyncResult? {
+    override suspend fun load(auth: AuthData?, id: String): SyncAPI.SyncResult? {
         val auth = auth?.token?.accessToken ?: return null
         val internalId = id.toIntOrNull() ?: return null
         val url =
@@ -271,7 +271,7 @@ class MALApi : SyncAPI() {
         }
     }
 
-    override suspend fun status(auth : AuthData?, id: String): SyncAPI.AbstractSyncStatus? {
+    override suspend fun status(auth: AuthData?, id: String): SyncAPI.AbstractSyncStatus? {
         val auth = auth?.token?.accessToken ?: return null
 
         // https://myanimelist.net/apiconfig/references/api/v2#operation/anime_anime_id_get
@@ -477,7 +477,7 @@ class MALApi : SyncAPI() {
         @JsonProperty("start_time") val startTime: String?
     )
 
-    override suspend fun library(auth : AuthData?): LibraryMetadata? {
+    override suspend fun library(auth: AuthData?): LibraryMetadata? {
         val list = getMalAnimeListSmart(auth ?: return null)?.groupBy {
             convertToStatus(it.listStatus?.status ?: "").stringRes
         }?.mapValues { group ->
@@ -505,7 +505,7 @@ class MALApi : SyncAPI() {
         )
     }
 
-    private suspend fun getMalAnimeListSmart(auth : AuthData): Array<Data>? {
+    private suspend fun getMalAnimeListSmart(auth: AuthData): Array<Data>? {
         return if (requireLibraryRefresh) {
             val list = getMalAnimeList(auth.token)
             setKey(MAL_CACHED_LIST, auth.user.id.toString(), list)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
index 84a498bb0..3110b23ac 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt
@@ -911,7 +911,7 @@ class SimklApi : SyncAPI() {
 
     override suspend fun search(auth: AuthData?, query: String): List<SyncAPI.SyncSearchResult>? {
         return app.get(
-            "$mainUrl/search/", params = mapOf("client_id" to CLIENT_ID, "q" to name)
+            "$mainUrl/search/", params = mapOf("client_id" to CLIENT_ID, "q" to query)
         ).parsedSafe<Array<MediaObject>>()?.mapNotNull { it.toSyncSearchResult() }
     }