Addressing code-rabbit comments

Signed-off-by: Lance Chant <13349722+lancechant@users.noreply.github.com>

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MpvPlayerView.kt

@@ -2,14 +2,12 @@ package expo.modules.mpvplayer
 
 import android.content.Context
 import android.graphics.Color
-import android.graphics.Rect
-import android.graphics.SurfaceTexture
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
 import android.view.Surface
-import android.view.TextureView
-import android.view.View
+import android.view.SurfaceHolder
+import android.view.SurfaceView
 import android.view.ViewGroup
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
@@ -30,15 +28,26 @@ data class VideoLoadConfig(
     val cacheEnabled: String? = null,
     val cacheSeconds: Int? = null,
     val demuxerMaxBytes: Int? = null,
-    val demuxerMaxBackBytes: Int? = null
+    val demuxerMaxBackBytes: Int? = null,
 )
 
 /**
  * MpvPlayerView - ExpoView that hosts the MPV player.
- * Uses TextureView for reliable Picture-in-Picture support.
+ *
+ * Uses SurfaceView (not TextureView) so the surface routes directly to
+ * SurfaceFlinger (the OS compositor) rather than compositing into the
+ * app's window surface. This matches mpv-android's architecture and
+ * gives mpv a standalone surface.
+ *
+ * PiP black-screen mitigation: SurfaceView's surface is destroyed and
+ * recreated on PiP entry/exit, and the new surface's initial dimensions
+ * can be stale until the next layout pass. We push dimension updates to
+ * mpv via both SurfaceHolder.Callback.surfaceChanged AND an
+ * OnLayoutChangeListener, so the PiP transition (which fires layout
+ * passes on the view itself) reaches mpv promptly.
  */
 class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context, appContext),
-    MPVLayerRenderer.Delegate, TextureView.SurfaceTextureListener {
+    MPVLayerRenderer.Delegate, SurfaceHolder.Callback {
 
     companion object {
         private const val TAG = "MpvPlayerView"
@@ -52,7 +61,7 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     val onTracksReady by EventDispatcher()
     val onPictureInPictureChange by EventDispatcher()
 
-    private var textureView: TextureView
+    private var surfaceView: SurfaceView
     private var renderer: MPVLayerRenderer? = null
     private var pipController: PiPController? = null
 
@@ -63,31 +72,45 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     private var surfaceReady: Boolean = false
     private var pendingConfig: VideoLoadConfig? = null
     private var rendererStarted: Boolean = false
-    private var pendingSurface: Surface? = null
     private var activeSurface: Surface? = null
-    private var surfaceTexture: SurfaceTexture? = null
 
     // PiP state tracking
-    private var isWaitingForPiPTransition: Boolean = false
-    private var isPiPSurfaceForced: Boolean = false
     private val pipHandler = Handler(Looper.getMainLooper())
 
     init {
         setBackgroundColor(Color.BLACK)
 
-        // Create TextureView for video rendering (composites into app window for PiP support)
-        textureView = TextureView(context).apply {
+        // SurfaceView for video rendering. Routes the surface directly to
+        // SurfaceFlinger (the OS compositor), giving mpv a standalone
+        // surface. TextureView composites into the app's window surface
+        // which is less efficient and breaks PiP transitions.
+        surfaceView = SurfaceView(context).apply {
             layoutParams = ViewGroup.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT
             )
-            surfaceTextureListener = this@MpvPlayerView
         }
-        addView(textureView)
+        surfaceView.holder.addCallback(this@MpvPlayerView)
+        addView(surfaceView)
+
+        // Push dimension updates to mpv on every view bounds change. This
+        // is the primary PiP black-screen fix: entering PiP fires a layout
+        // pass on the SurfaceView itself, and we proactively tell mpv the
+        // new size so it resizes its EGL swapchain before rendering.
+        surfaceView.addOnLayoutChangeListener { _, left, top, right, bottom,
+                                                  oldLeft, oldTop, oldRight, oldBottom ->
+            val w = right - left
+            val h = bottom - top
+            val oldW = oldRight - oldLeft
+            val oldH = oldBottom - oldTop
+            if (w > 0 && h > 0 && (w != oldW || h != oldH)) {
+                renderer?.updateSurfaceSize(w, h)
+            }
+        }
 
         // Initialize PiP controller with Expo's AppContext for proper activity access
         pipController = PiPController(context, appContext)
-        pipController?.setPlayerView(textureView)
+        pipController?.setPlayerView(surfaceView)
         pipController?.delegate = object : PiPController.Delegate {
             override fun onPlay() {
                 play()
@@ -103,17 +126,17 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
 
             override fun onPictureInPictureModeChanged(isInPiP: Boolean) {
                 if (isInPiP) {
-                    if (!isWaitingForPiPTransition) {
-                        isWaitingForPiPTransition = true
-                        pipHandler.removeCallbacksAndMessages(null)
-                        for (delay in longArrayOf(500, 1000, 1500, 2000)) {
-                            pipHandler.postDelayed({ forcePiPBufferSize() }, delay)
-                        }
-                    }
-                } else {
-                    isWaitingForPiPTransition = false
+                    // Post size syncs after the PiP layout settles. Two passes
+                    // catch both the immediate surface re-attach and the
+                    // post-animation layout pass. Replaces the old TextureView
+                    // measure/layout polling hack (forcePiPBufferSize).
                     pipHandler.removeCallbacksAndMessages(null)
-                    restoreFromPiP()
+                    pipHandler.postDelayed({ syncSurfaceSizeToView() }, 100)
+                    pipHandler.postDelayed({ syncSurfaceSizeToView() }, 500)
+                } else {
+                    // Restore from PiP: surface resized back to fullscreen.
+                    pipHandler.removeCallbacksAndMessages(null)
+                    pipHandler.postDelayed({ syncSurfaceSizeToView() }, 100)
                 }
                 onPictureInPictureChange(mapOf("isActive" to isInPiP))
             }
@@ -126,7 +149,7 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
 
     /**
      * Start the renderer with the given VO driver.
-     * Called lazily on first loadVideo so the voDriver setting is available.
+     * Called lazily on first loadVideo so user settings are available.
      */
     private fun ensureRendererStarted(voDriver: String?) {
         if (rendererStarted) return
@@ -135,10 +158,14 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
             renderer?.start(voDriver ?: "gpu-next")
             rendererStarted = true
 
-            pendingSurface?.let { surface ->
+            // If the surface is already alive (surfaceCreated fired before
+            // loadVideo), attach it now. With SurfaceView the surface is
+            // owned by the holder, so we read it from there directly rather
+            // than stashing it on the side.
+            surfaceView.holder.surface?.takeIf { it.isValid }?.let { surface ->
                 activeSurface = surface
                 renderer?.attachSurface(surface)
-                pendingSurface = null
+                syncSurfaceSizeToView()
             }
         } catch (e: Exception) {
             Log.e(TAG, "Failed to start renderer: ${e.message}")
@@ -146,23 +173,20 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
         }
     }
 
-    // MARK: - TextureView.SurfaceTextureListener
+    // MARK: - SurfaceHolder.Callback
 
-    override fun onSurfaceTextureAvailable(surfaceTexture: SurfaceTexture, width: Int, height: Int) {
-        this.surfaceTexture = surfaceTexture
-        val surface = Surface(surfaceTexture)
-        surfaceTexture.setDefaultBufferSize(width, height)
+    override fun surfaceCreated(holder: SurfaceHolder) {
+        val surface = holder.surface
         surfaceReady = true
 
         if (rendererStarted) {
-            // Release the previous wrapper Surface before losing the only
-            // reference to it. cleanup() only runs on detach, so without this
-            // repeated PiP/background/resize cycles leak native surface objects.
-            activeSurface?.release()
+            // The previous Surface reference is holder-owned; do NOT release
+            // it (SurfaceView manages its lifecycle). Just track the new one.
             activeSurface = surface
             renderer?.attachSurface(surface)
-        } else {
-            pendingSurface = surface
+            // Push the actual view dimensions immediately so mpv doesn't
+            // render against stale full-screen geometry during PiP transitions.
+            syncSurfaceSizeToView()
         }
 
         // If we have a pending load, execute it now
@@ -173,20 +197,36 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
         }
     }
 
-    override fun onSurfaceTextureSizeChanged(surfaceTexture: SurfaceTexture, width: Int, height: Int) {
-        surfaceTexture.setDefaultBufferSize(width, height)
-        renderer?.updateSurfaceSize(width, height)
+    override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
+        if (width > 0 && height > 0) {
+            renderer?.updateSurfaceSize(width, height)
+        }
     }
 
-    override fun onSurfaceTextureDestroyed(surfaceTexture: SurfaceTexture): Boolean {
-        this.surfaceTexture = null
+    override fun surfaceDestroyed(holder: SurfaceHolder) {
         surfaceReady = false
         renderer?.detachSurface()
-        return false // mpv manages the SurfaceTexture
+        // Do NOT issue mpv "stop" here. Playback continues against the
+        // demuxer; when surfaceCreated fires again (PiP entry/exit, app
+        // background/foreground), we re-attach and frames resume. This
+        // matches the keep-open=always setting in MPVLayerRenderer.
+        //
+        // Do NOT release activeSurface — SurfaceView owns it via the holder.
+        activeSurface = null
     }
 
-    override fun onSurfaceTextureUpdated(surfaceTexture: SurfaceTexture) {
-        // Called every frame — no action needed, mpv drives rendering directly
+    /**
+     * Read the actual SurfaceView width/height and push them to mpv.
+     * The PiP transition can fire surfaceCreated before the view's layout
+     * has settled to PiP dimensions, so we re-sync after layout passes.
+     */
+    private fun syncSurfaceSizeToView() {
+        if (!surfaceReady) return
+        val w = surfaceView.width
+        val h = surfaceView.height
+        if (w > 0 && h > 0) {
+            renderer?.updateSurfaceSize(w, h)
+        }
     }
 
     // MARK: - Video Loading
@@ -275,7 +315,7 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
 
         // Reset view-level state so a subsequent loadVideo() on the SAME view
         // instance re-creates the mpv handle and re-attaches the still-live
-        // TextureView surface. Without this, rendererStarted stays true and
+        // SurfaceView surface. Without this, rendererStarted stays true and
         // ensureRendererStarted() early-returns, so renderer.start() is never
         // called again — but stop() already nulled the renderer's mpv handle.
         // The next loadVideo() then runs loadVideoInternal() -> renderer.load()
@@ -286,13 +326,12 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
         // which call destroy() immediately before router.replace() to the
         // same route — Expo Router reuses the same MpvPlayerView instance,
         // so the next source load happens on this view without a remount.
+        //
+        // SurfaceView note: the surface is owned by the holder and survives
+        // across destroy()/loadVideo() on the same view instance. The next
+        // ensureRendererStarted() reads it from surfaceView.holder.surface.
         rendererStarted = false
         currentUrl = null
-        // Move the active surface back to pending so ensureRendererStarted()
-        // re-attaches it to the freshly created mpv instance on next load.
-        // The Surface itself is still valid — onSurfaceTextureDestroyed has
-        // not fired because the TextureView is not being unmounted.
-        activeSurface?.let { pendingSurface = it }
         activeSurface = null
     }
 
@@ -327,59 +366,10 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
     // MARK: - Picture in Picture
 
     fun startPictureInPicture() {
-        isWaitingForPiPTransition = true
         pipController?.startPictureInPicture()
-
-        // Resize buffer to match PiP window after animation settles
-        pipHandler.removeCallbacksAndMessages(null)
-        for (delay in longArrayOf(500, 1000, 1500, 2000)) {
-            pipHandler.postDelayed({ forcePiPBufferSize() }, delay)
-        }
-    }
-
-    /**
-     * Resize the SurfaceTexture buffer AND TextureView layout to match the PiP
-     * visible rect so mpv renders at the PiP window's actual dimensions.
-     */
-    private fun forcePiPBufferSize() {
-        if (!isWaitingForPiPTransition || !surfaceReady) return
-
-        val rect = Rect()
-        textureView.getGlobalVisibleRect(rect)
-        val visW = rect.width()
-        val visH = rect.height()
-        val vw = textureView.width
-        val vh = textureView.height
-
-        if (visW <= 0 || visH <= 0 || (vw == visW && vh == visH)) return
-
-        surfaceTexture?.setDefaultBufferSize(visW, visH)
-        renderer?.updateSurfaceSize(visW, visH)
-
-        // Force TextureView layout to match PiP visible area.
-        // layoutParams alone doesn't work during PiP because the parent
-        // never re-lays out its children.
-        textureView.measure(
-            View.MeasureSpec.makeMeasureSpec(visW, View.MeasureSpec.EXACTLY),
-            View.MeasureSpec.makeMeasureSpec(visH, View.MeasureSpec.EXACTLY)
-        )
-        textureView.layout(0, 0, visW, visH)
-        isPiPSurfaceForced = true
-    }
-
-    private fun restoreFromPiP() {
-        if (!isPiPSurfaceForced) return
-        isPiPSurfaceForced = false
-
-        val lp = textureView.layoutParams
-        lp.width = ViewGroup.LayoutParams.MATCH_PARENT
-        lp.height = ViewGroup.LayoutParams.MATCH_PARENT
-        textureView.layoutParams = lp
-        textureView.requestLayout()
     }
 
     fun stopPictureInPicture() {
-        isWaitingForPiPTransition = false
         pipHandler.removeCallbacksAndMessages(null)
         pipController?.stopPictureInPicture()
     }
@@ -547,20 +537,12 @@ class MpvPlayerView(context: Context, appContext: AppContext) : ExpoView(context
      * off the JS path.
      */
     fun cleanup() {
-        isWaitingForPiPTransition = false
         pipHandler.removeCallbacksAndMessages(null)
         pipController?.stopPictureInPicture()
         renderer?.stop()
         renderer?.delegate = null
 
-        // Release the Surface that wraps the SurfaceTexture. These Surface
-        // objects are created in onSurfaceTextureAvailable and were never
-        // released; each playback session previously leaked one. The
-        // SurfaceTexture itself is owned by TextureView and released by it
-        // via onSurfaceTextureDestroyed, so we leave it alone.
-        pendingSurface?.release()
-        pendingSurface = null
-        activeSurface?.release()
+        // SurfaceView owns the Surface via its holder — do NOT release it.
         activeSurface = null
         surfaceReady = false
         currentUrl = null

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/PiPController.kt

@@ -44,6 +44,11 @@ class PiPController(private val context: Context, private val appContext: AppCon
     private var currentPosition: Double = 0.0
     private var currentDuration: Double = 0.0
     private var playbackRate: Double = 1.0
+    // Independently tracks whether the system should auto-enter PiP on home
+    // press. Decoupled from playbackRate so that disabling auto-enter
+    // (e.g. when the player unmounts) doesn't corrupt the play/pause icon
+    // state that buildPiPActions() derives from playbackRate.
+    private var autoEnterEnabled: Boolean = false
 
     private var videoWidth: Int = 0
     private var videoHeight: Int = 0
@@ -106,15 +111,37 @@ class PiPController(private val context: Context, private val appContext: AppCon
     }
 
     fun stopPictureInPicture() {
+        // Disable auto-enter eligibility without touching playbackRate.
+        // playbackRate drives the play/pause icon in buildPiPActions();
+        // mutating it here would cause a stale icon if PiP is re-entered
+        // before the next playback state callback corrects it.
+        autoEnterEnabled = false
         isInPiPMode = false
         pipEntryNotified = false
         unregisterLifecycleCallbacks()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val activity = getActivity()
-            if (activity?.isInPictureInPictureMode == true) {
-                activity.moveTaskToBack(false)
+
+        val activity = getActivity() ?: return
+
+        // Push minimal params with just auto-enter disabled. Do NOT call
+        // buildPiPParams() — it calls ensurePiPReceiverRegistered() and
+        // setActions(), which would re-register the broadcast receiver
+        // (just unregistered above) and attach play/pause/skip actions to
+        // params being torn down. That leaves a live receiver + stale
+        // actions after the player has unmounted.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            try {
+                activity.setPictureInPictureParams(
+                    PictureInPictureParams.Builder()
+                        .setAutoEnterEnabled(false)
+                        .build()
+                )
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to clear PiP auto-enter params: ${e.message}")
             }
         }
+        if (activity.isInPictureInPictureMode) {
+            activity.moveTaskToBack(false)
+        }
     }
 
     fun isCurrentlyInPiP(): Boolean = isInPiPMode
@@ -126,6 +153,7 @@ class PiPController(private val context: Context, private val appContext: AppCon
 
     fun setPlaybackRate(rate: Double) {
         playbackRate = rate
+        autoEnterEnabled = rate > 0
 
         if (rate > 0) {
             registerLifecycleCallbacks()
@@ -208,7 +236,7 @@ class PiPController(private val context: Context, private val appContext: AppCon
         builder.setActions(buildPiPActions())
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            builder.setAutoEnterEnabled(forEntering || playbackRate > 0)
+            builder.setAutoEnterEnabled(forEntering || autoEnterEnabled)
         }
 
         return builder.build()

translations/it.json

@@ -226,7 +226,7 @@
         "hide_volume_slider": "Hide Volume Slider",
         "hide_volume_slider_description": "Nascondi il cursore del volume nel lettore video",
         "hide_brightness_slider": "Hide Brightness Slider",
-        "hide_brightness_slider_description": "Nascondi il cursore della luminosità nel lettore video"
+        "hide_brightness_slider_description": "Hide the brightness slider in the video player"
       },
       "audio": {
         "audio_title": "Audio",
@@ -237,10 +237,10 @@
         "language": "Lingua",
         "transcode_mode": {
           "title": "Audio Transcoding",
-          "description": "Controlla come viene gestito l'audio surround (7.1, TrueHD, DTS-HD)",
-          "auto": "Automatico",
+          "description": "Controls how surround audio (7.1, TrueHD, DTS-HD) is handled",
+          "auto": "Auto",
           "stereo": "Force Stereo",
-          "5_1": "Consenti 5.1",
+          "5_1": "Allow 5.1",
           "passthrough": "Passthrough"
         }
       },
@@ -262,20 +262,20 @@
           "OnlyForced": "Solo forzati"
         },
         "opensubtitles_title": "OpenSubtitles",
-        "opensubtitles_hint": "Inserisci la tua chiave API OpenSubtitles per abilitare la ricerca dei sottotitoli quando il tuo server Jellyfin non ha un provider di sottotitoli configurato.",
+        "opensubtitles_hint": "Enter your OpenSubtitles API key to enable client-side subtitle search as a fallback when your Jellyfin server doesn't have a subtitle provider configured.",
         "opensubtitles_api_key": "API Key",
-        "opensubtitles_api_key_placeholder": "Inserisci la chiave API...",
-        "opensubtitles_get_key": "Ottieni la tua chiave API gratuita su opensubtitles.com/en/consumers",
+        "opensubtitles_api_key_placeholder": "Enter API key...",
+        "opensubtitles_get_key": "Get your free API key at opensubtitles.com/en/consumers",
         "mpv_subtitle_scale": "Subtitle Scale",
         "mpv_subtitle_margin_y": "Vertical Margin",
         "mpv_subtitle_align_x": "Horizontal Align",
         "mpv_subtitle_align_y": "Vertical Align",
         "align": {
-          "left": "Sinistra",
-          "center": "Centro",
-          "right": "Destra",
-          "top": "Alto",
-          "bottom": "Basso"
+          "left": "Left",
+          "center": "Center",
+          "right": "Right",
+          "top": "Top",
+          "bottom": "Bottom"
         }
       },
       "other": {
@@ -307,9 +307,9 @@
         "disabled": "Disabilitato"
       },
       "music": {
-        "title": "Musica",
-        "playback_title": "Riproduzione",
-        "playback_description": "Configura come viene riprodotta la musica.",
+        "title": "Music",
+        "playback_title": "Playback",
+        "playback_description": "Configure how music is played.",
         "prefer_downloaded": "Prefer Downloaded Songs",
         "caching_title": "Caching",
         "caching_description": "Automatically cache upcoming tracks for smoother playback.",
@@ -333,7 +333,7 @@
           "tv_quota_days": "Giorni di quota per le serie TV",
           "reset_jellyseerr_config_button": "Ripristina la configurazione di Jellyseerr",
           "unlimited": "Illimitato",
-          "plus_n_more": "+{{n}} altro",
+          "plus_n_more": "+{{n}} more",
           "order_by": {
             "DEFAULT": "Predefinito",
             "VOTE_COUNT_AND_AVERAGE": "Conteggio delle votazioni e media",
@@ -352,25 +352,25 @@
           }
         },
         "streamystats": {
-          "disable_streamystats": "Disabilita Streamystats",
+          "disable_streamystats": "Disable Streamystats",
           "enable_search": "Use for Search",
           "url": "URL",
           "server_url_placeholder": "http(s)://streamystats.example.com",
-          "streamystats_search_hint": "Inserisci l'URL per il tuo server Streamystats. L'URL dovrebbe includere http o https ed eventualmente la porta.",
+          "streamystats_search_hint": "Enter the URL for your Streamystats server. The URL should include http or https and optionally the port.",
           "read_more_about_streamystats": "Read More About Streamystats.",
-          "save": "Salva",
-          "features_title": "Funzionalità",
+          "save": "Save",
+          "features_title": "Features",
           "enable_movie_recommendations": "Movie Recommendations",
           "enable_series_recommendations": "Series Recommendations",
           "enable_promoted_watchlists": "Promoted Watchlists",
           "hide_watchlists_tab": "Hide Watchlists Tab",
-          "home_sections_hint": "Mostra consigli personalizzati e watchlist promosse da Streamystats nella home page.",
+          "home_sections_hint": "Show personalized recommendations and promoted watchlists from Streamystats on the home page.",
           "recommended_movies": "Recommended Movies",
           "recommended_series": "Recommended Series",
           "toasts": {
-            "saved": "Salvato",
-            "refreshed": "Impostazioni aggiornate dal server",
-            "disabled": "Streamystats disabilitato"
+            "saved": "Saved",
+            "refreshed": "Settings refreshed from server",
+            "disabled": "Streamystats disabled"
           },
           "refresh_from_server": "Refresh Settings from Server"
         },
@@ -385,17 +385,17 @@
         "size_used": "{{used}} di {{total}} usato",
         "delete_all_downloaded_files": "Cancella Tutti i File Scaricati",
         "music_cache_title": "Music Cache",
-        "music_cache_description": "Precarica automaticamente i brani mentre ascolti per una riproduzione più fluida e il supporto offline",
+        "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
-        "music_cache_size": "{{size}} nella cache",
-        "music_cache_cleared": "Cache musicale cancellata",
+        "music_cache_size": "{{size}} cached",
+        "music_cache_cleared": "Music cache cleared",
         "delete_all_downloaded_songs": "Delete All Downloaded Songs",
-        "downloaded_songs_size": "{{size}} scaricato",
-        "downloaded_songs_deleted": "Brani scaricati eliminati",
+        "downloaded_songs_size": "{{size}} downloaded",
+        "downloaded_songs_deleted": "Downloaded songs deleted",
         "clear_all_cache": "Clear All Cache",
         "clear_all_cache_confirm": "Clear All Cache?",
-        "clear_all_cache_confirm_desc": "Sei sicuro di voler cancellare tutti i dati nella cache? Questo cancellerà tutte le immagini nella cache, i file musicali, i sottotitoli e le cache delle interrogazioni. Le impostazioni e la sessione di login verranno mantenute.",
-        "clear_all_cache_error_desc": "Si è verificato un errore durante la cancellazione della cache."
+        "clear_all_cache_confirm_desc": "Are you sure you want to clear all cached data? This will clear all cached images, music files, subtitles, and query caches. Your settings and login session will be kept.",
+        "clear_all_cache_error_desc": "An error occurred while clearing the cache."
       },
       "intro": {
         "title": "Intro",
@@ -404,8 +404,8 @@
       },
       "logs": {
         "logs_title": "Log",
-        "export_logs": "Esporta i logs",
-        "click_for_more_info": "Clicca per maggiori informazioni",
+        "export_logs": "Export logs",
+        "click_for_more_info": "Click for more info",
         "level": "Livello",
         "no_logs_available": "Nessun log disponibile",
         "delete_all_logs": "Cancella tutti i log"
@@ -419,17 +419,17 @@
         "error_deleting_files": "Errore nella cancellazione dei file"
       },
       "security": {
-        "title": "Sicurezza",
+        "title": "Security",
         "inactivity_timeout": {
           "title": "Inactivity Timeout",
-          "disabled": "Disabilitato",
-          "1_minute": "1 minuto",
-          "5_minutes": "5 minuti",
-          "15_minutes": "15 minuti",
-          "30_minutes": "30 minuti",
-          "1_hour": "1 ora",
-          "4_hours": "4 ore",
-          "24_hours": "24 ore"
+          "disabled": "Disabled",
+          "1_minute": "1 minute",
+          "5_minutes": "5 minutes",
+          "15_minutes": "15 minutes",
+          "30_minutes": "30 minutes",
+          "1_hour": "1 hour",
+          "4_hours": "4 hours",
+          "24_hours": "24 hours"
         }
       }
     },
@@ -494,18 +494,18 @@
     "mark_as_not_played": "Mark as not Played",
     "none": "Nulla",
     "track": "Traccia",
-    "cancel": "Annulla",
-    "delete": "Cancella",
+    "cancel": "Cancel",
+    "delete": "Delete",
     "ok": "OK",
-    "remove": "Rimuovi",
-    "back": "Indietro",
-    "continue": "Continua",
-    "verifying": "Verifica in corso...",
-    "login": "Accedi",
-    "episodes": "Episodi",
-    "movies": "Film",
-    "loading": "Caricamento…",
-    "seeAll": "Visualizza tutti"
+    "remove": "Remove",
+    "back": "Back",
+    "continue": "Continue",
+    "verifying": "Verifying...",
+    "login": "Login",
+    "episodes": "Episodes",
+    "movies": "Movies",
+    "loading": "Loading…",
+    "seeAll": "See all"
   },
   "search": {
     "search": "Cerca...",
@@ -519,10 +519,10 @@
     "episodes": "Episodi",
     "collections": "Collezioni",
     "actors": "Attori",
-    "artists": "Artisti",
-    "albums": "Album",
-    "songs": "Tracce",
-    "playlists": "Playlist",
+    "artists": "Artists",
+    "albums": "Albums",
+    "songs": "Songs",
+    "playlists": "Playlists",
     "request_movies": "Film Richiesti",
     "request_series": "Serie Richieste",
     "recently_added": "Aggiunti di Recente",
@@ -554,7 +554,7 @@
       "movies": "film",
       "series": "serie TV",
       "boxsets": "cofanetti",
-      "playlists": "Playlist",
+      "playlists": "Playlists",
       "items": "elementi"
     },
     "options": {
@@ -566,7 +566,7 @@
       "cover": "Copertina",
       "show_titles": "Mostra titoli",
       "show_stats": "Mostra statistiche",
-      "options_title": "Impostazioni"
+      "options_title": "Options"
     },
     "filters": {
       "genres": "Generi",
@@ -575,10 +575,10 @@
       "filter_by": "Filter By",
       "sort_order": "Criterio di ordinamento",
       "tags": "Tag",
-      "all": "Tutto",
-      "reset": "Ripristina",
-      "asc": "Crescente",
-      "desc": "Decrescente"
+      "all": "All",
+      "reset": "Reset",
+      "asc": "Ascending",
+      "desc": "Descending"
     }
   },
   "favorites": {
@@ -595,7 +595,7 @@
     "no_links": "Nessun link"
   },
   "player": {
-    "live": "IN DIRETTA",
+    "live": "LIVE",
     "mpv_player_title": "MPV Player",
     "error": "Errore",
     "failed_to_get_stream_url": "Impossibile ottenere l'URL dello stream",
@@ -606,40 +606,40 @@
     "next_episode": "Prossimo Episodio",
     "continue_watching": "Continua a guardare",
     "go_back": "Indietro",
-    "downloaded_file_title": "Questo file è stato scaricato",
-    "downloaded_file_message": "Vuoi riprodurre il file scaricato?",
-    "downloaded_file_yes": "Si",
+    "downloaded_file_title": "You have this file downloaded",
+    "downloaded_file_message": "Do you want to play the downloaded file?",
+    "downloaded_file_yes": "Yes",
     "downloaded_file_no": "No",
-    "downloaded_file_cancel": "Annulla",
-    "swipe_down_settings": "Scorri in basso per le impostazioni",
-    "ends_at": "Termina alle {{time}}",
+    "downloaded_file_cancel": "Cancel",
+    "swipe_down_settings": "Swipe down for settings",
+    "ends_at": "Ends at {{time}}",
     "search_subtitles": "Search Subtitles",
-    "subtitle_tracks": "Tracce",
+    "subtitle_tracks": "Tracks",
     "subtitle_search": "Search & Download",
-    "download": "Scarica",
-    "subtitle_download_hint": "I sottotitoli scaricati verranno salvati nella tua libreria",
+    "download": "Download",
+    "subtitle_download_hint": "Downloaded subtitles will be saved to your library",
     "using_jellyfin_server": "Using Jellyfin Server",
-    "language": "Lingua",
-    "results": "Risultati",
-    "searching": "Ricerca in corso...",
-    "search_failed": "Ricerca fallita",
-    "no_subtitle_provider": "Nessun provider di sottotitoli configurato sul server",
-    "no_subtitles_found": "Nessun sottotitolo trovato",
-    "add_opensubtitles_key_hint": "Aggiungi la chiave API OpenSubtitles nelle impostazioni",
-    "settings": "Impostazioni",
+    "language": "Language",
+    "results": "Results",
+    "searching": "Searching...",
+    "search_failed": "Search failed",
+    "no_subtitle_provider": "No subtitle provider configured on server",
+    "no_subtitles_found": "No subtitles found",
+    "add_opensubtitles_key_hint": "Add OpenSubtitles API key in settings for client-side fallback",
+    "settings": "Settings",
     "skip_intro": "Skip Intro",
     "skip_credits": "Skip Credits",
     "stopPlayback": "Stop Playback",
-    "stopPlayingTitle": "Interrompere la riproduzione \"{{title}}\"?",
-    "stopPlayingConfirm": "Sei sicuro di voler interrompere la riproduzione?",
-    "downloaded": "Scaricato",
-    "missing_parameters": "Parametri di riproduzione mancanti"
+    "stopPlayingTitle": "Stop playing \"{{title}}\"?",
+    "stopPlayingConfirm": "Are you sure you want to stop playback?",
+    "downloaded": "Downloaded",
+    "missing_parameters": "Missing playback parameters"
   },
   "chapters": {
-    "title": "Capitoli",
-    "chapter_number": "Capitolo {{number}}",
-    "open": "Apri capitoli",
-    "close": "Chiudi i capitoli"
+    "title": "Chapters",
+    "chapter_number": "Chapter {{number}}",
+    "open": "Open chapters",
+    "close": "Close chapters"
   },
   "item_card": {
     "next_up": "Il prossimo",
@@ -664,19 +664,19 @@
     "quality": "Qualità",
     "audio": "Audio",
     "subtitles": {
-      "label": "Sottotitoli",
-      "none": "Vuoto",
-      "tracks": "Tracce"
+      "label": "Subtitle",
+      "none": "None",
+      "tracks": "Tracks"
     },
     "show_more": "Mostra di più",
     "show_less": "Mostra di meno",
-    "left": "sinistra",
-    "director": "Regista",
+    "left": "left",
+    "director": "Director",
     "cast": "Cast",
     "technical_details": "Technical Details",
     "appeared_in": "Apparso in",
-    "movies": "Film",
-    "shows": "Serie",
+    "movies": "Movies",
+    "shows": "Shows",
     "could_not_load_item": "Impossibile caricare l'elemento",
     "none": "Nessuno",
     "download": {
@@ -691,10 +691,10 @@
     "mark_played": "Mark as Watched",
     "mark_unplayed": "Mark as Unwatched",
     "resume_playback": "Resume Playback",
-    "resume_playback_description": "Vuoi continuare da dove hai lasciato o riniziare da capo?",
+    "resume_playback_description": "Do you want to continue where you left off or start from the beginning?",
     "play_from_start": "Play from Start",
-    "continue_from": "Continua da {{time}}",
-    "no_data_available": "Nessun dato disponibile"
+    "continue_from": "Continue from {{time}}",
+    "no_data_available": "No data available"
   },
   "live_tv": {
     "next": "Prossimo",
@@ -706,16 +706,16 @@
     "sports": "Sport",
     "for_kids": "Per Bambini",
     "news": "Notiziari",
-    "page_of": "Pagina {{current}} di {{total}}",
-    "no_programs": "Nessun programma disponibile",
-    "no_channels": "Nessun canale disponibile",
+    "page_of": "Page {{current}} of {{total}}",
+    "no_programs": "No programs available",
+    "no_channels": "No channels available",
     "tabs": {
-      "programs": "Programmi",
-      "guide": "Guida",
-      "channels": "Canali",
-      "recordings": "Registrazioni",
-      "schedule": "Pianifica",
-      "series": "Serie Tv"
+      "programs": "Programs",
+      "guide": "Guide",
+      "channels": "Channels",
+      "recordings": "Recordings",
+      "schedule": "Schedule",
+      "series": "Series"
     }
   },
   "jellyseerr": {
@@ -761,12 +761,12 @@
     "decline": "Rifiuta",
     "requested_by": "Richiesto da {{user}}",
     "unknown_user": "Utente Sconosciuto",
-    "select": "Seleziona",
+    "select": "Select",
     "request_all": "Request All",
     "request_seasons": "Request Seasons",
     "select_seasons": "Select Seasons",
     "request_selected": "Request Selected",
-    "n_selected": "{{count}} selezionati",
+    "n_selected": "{{count}} selected",
     "toasts": {
       "jellyseer_does_not_meet_requirements": "Il server Jellyseerr non soddisfa i requisiti minimi di versione! Aggiornare almeno alla versione 2.0.0.",
       "jellyseerr_test_failed": "Il test di Jellyseerr non è riuscito. Riprovare.",
@@ -787,39 +787,39 @@
     "library": "Libreria",
     "custom_links": "Collegamenti personalizzati",
     "favorites": "Preferiti",
-    "settings": "Impostazioni"
+    "settings": "Settings"
   },
   "music": {
-    "title": "Musica",
+    "title": "Music",
     "tabs": {
-      "suggestions": "Suggerimenti",
-      "albums": "Album",
-      "artists": "Artisti",
-      "playlists": "Playlist",
+      "suggestions": "Suggestions",
+      "albums": "Albums",
+      "artists": "Artists",
+      "playlists": "Playlists",
       "tracks": "tracks"
     },
     "recently_added": "Recently Added",
     "recently_played": "Recently Played",
     "frequently_played": "Frequently Played",
     "top_tracks": "Top Tracks",
-    "play": "Riproduci",
-    "shuffle": "Riproduzione casuale",
+    "play": "Play",
+    "shuffle": "Shuffle",
     "play_top_tracks": "Play Top Tracks",
-    "no_suggestions": "Nessun suggerimento disponibile",
-    "no_albums": "Nessun album trovato",
-    "no_artists": "Artista non trovato",
-    "no_playlists": "Nessuna playlist trovata",
-    "album_not_found": "Album non trovato",
-    "artist_not_found": "Artista non trovato",
-    "playlist_not_found": "Playlist non trovata",
+    "no_suggestions": "No suggestions available",
+    "no_albums": "No albums found",
+    "no_artists": "No artists found",
+    "no_playlists": "No playlists found",
+    "album_not_found": "Album not found",
+    "artist_not_found": "Artist not found",
+    "playlist_not_found": "Playlist not found",
     "track_options": {
       "play_next": "Play Next",
       "add_to_queue": "Add to Queue",
       "add_to_playlist": "Add to Playlist",
-      "download": "Scarica",
-      "downloaded": "Scaricato",
-      "downloading": "Scaricamento...",
-      "cached": "Memorizzato nella cache",
+      "download": "Download",
+      "downloaded": "Downloaded",
+      "downloading": "Downloading...",
+      "cached": "Cached",
       "delete_download": "Delete Download",
       "delete_cache": "Remove from Cache",
       "go_to_artist": "Go to Artist",
@@ -831,112 +831,112 @@
     "playlists": {
       "create_playlist": "Create Playlist",
       "playlist_name": "Playlist Name",
-      "enter_name": "Inserisci il nome della playlist",
-      "create": "Crea",
-      "search_playlists": "Cerca playlist...",
-      "added_to": "Aggiunto a {{name}}",
-      "added": "Aggiunto alla playlist",
-      "removed_from": "Rimosso da {{name}}",
-      "removed": "Rimosso dalla playlist",
-      "created": "Playlist creata",
+      "enter_name": "Enter playlist name",
+      "create": "Create",
+      "search_playlists": "Search playlists...",
+      "added_to": "Added to {{name}}",
+      "added": "Added to playlist",
+      "removed_from": "Removed from {{name}}",
+      "removed": "Removed from playlist",
+      "created": "Playlist created",
       "create_new": "Create New Playlist",
-      "failed_to_add": "Impossibile aggiungere alla playlist",
-      "failed_to_remove": "Impossibile rimuovere dalla playlist",
-      "failed_to_create": "Impossibile creare la playlist",
+      "failed_to_add": "Failed to add to playlist",
+      "failed_to_remove": "Failed to remove from playlist",
+      "failed_to_create": "Failed to create playlist",
       "delete_playlist": "Delete Playlist",
-      "delete_confirm": "Sei sicuro di voler eliminare\"{{name}}\"? Questa azione non può essere annullata.",
-      "deleted": "Playlist eliminata",
-      "failed_to_delete": "Impossibile eliminare la playlist"
+      "delete_confirm": "Are you sure you want to delete \"{{name}}\"? This action cannot be undone.",
+      "deleted": "Playlist deleted",
+      "failed_to_delete": "Failed to delete playlist"
     },
     "sort": {
       "title": "Sort By",
-      "alphabetical": "Alfabetico",
+      "alphabetical": "Alphabetical",
       "date_created": "Date Created"
     }
   },
   "watchlists": {
-    "title": "Da vedere",
+    "title": "Watchlists",
     "my_watchlists": "My Watchlists",
     "public_watchlists": "Public Watchlists",
     "create_title": "Create Watchlist",
     "edit_title": "Edit Watchlist",
     "create_button": "Create Watchlist",
     "save_button": "Save Changes",
-    "delete_button": "Cancella",
-    "remove_button": "Rimuovi",
-    "cancel_button": "Annulla",
-    "name_label": "Nome",
-    "name_placeholder": "Inserisci il nome della lista \"Da vedere\"",
-    "description_label": "Descrizione",
-    "description_placeholder": "Inserisci descrizione (opzionale)",
+    "delete_button": "Delete",
+    "remove_button": "Remove",
+    "cancel_button": "Cancel",
+    "name_label": "Name",
+    "name_placeholder": "Enter watchlist name",
+    "description_label": "Description",
+    "description_placeholder": "Enter description (optional)",
     "is_public_label": "Public Watchlist",
-    "is_public_description": "Permetti ad altri di vedere questa lista",
+    "is_public_description": "Allow others to view this watchlist",
     "allowed_type_label": "Content Type",
     "sort_order_label": "Default Sort Order",
     "empty_title": "No Watchlists",
-    "empty_description": "Crea la tua prima lista \"Da vedere\" per iniziare a organizzare i tuoi media",
-    "empty_watchlist": "Questa lista è vuota",
-    "empty_watchlist_hint": "Aggiungi elementi dalla tua libreria a questa lista",
+    "empty_description": "Create your first watchlist to start organizing your media",
+    "empty_watchlist": "This watchlist is empty",
+    "empty_watchlist_hint": "Add items from your library to this watchlist",
     "not_configured_title": "Streamystats Not Configured",
-    "not_configured_description": "Configura Streamystats nelle impostazioni per utilizzare le watchlist",
-    "go_to_settings": "Vai alle impostazioni",
+    "not_configured_description": "Configure Streamystats in settings to use watchlists",
+    "go_to_settings": "Go to Settings",
     "add_to_watchlist": "Add to Watchlist",
     "remove_from_watchlist": "Remove from Watchlist",
     "select_watchlist": "Select Watchlist",
     "create_new": "Create New Watchlist",
-    "item": "elemento",
-    "items": "elementi",
-    "public": "Pubblico",
-    "private": "Privato",
-    "you": "Tu",
-    "by_owner": "Da un altro utente",
-    "not_found": "\"Da vedere\" non trovata",
+    "item": "item",
+    "items": "items",
+    "public": "Public",
+    "private": "Private",
+    "you": "You",
+    "by_owner": "By another user",
+    "not_found": "Watchlist not found",
     "delete_confirm_title": "Delete Watchlist",
-    "delete_confirm_message": "Sei sicuro di voler eliminare\"{{name}}\"? Questa azione non può essere annullata.",
+    "delete_confirm_message": "Are you sure you want to delete \"{{name}}\"? This action cannot be undone.",
     "remove_item_title": "Remove from Watchlist",
-    "remove_item_message": "Rimuovere \"{{name}}\" da questa lista?",
-    "loading": "Caricamento liste...",
-    "no_compatible_watchlists": "Nessuna lista compatibile",
-    "create_one_first": "Crea una lista che accetti questo tipo di contenuto"
+    "remove_item_message": "Remove \"{{name}}\" from this watchlist?",
+    "loading": "Loading watchlists...",
+    "no_compatible_watchlists": "No compatible watchlists",
+    "create_one_first": "Create a watchlist that accepts this content type"
   },
   "playback_speed": {
     "title": "Playback Speed",
     "apply_to": "Apply To",
-    "speed": "Velocità",
+    "speed": "Speed",
     "scope": {
-      "media": "Solo questo media",
-      "show": "Questo show",
-      "all": "Tutti i media (predefinito)"
+      "media": "This media only",
+      "show": "This show",
+      "all": "All media (default)"
     }
   },
   "companion_login": {
-    "title": "Associa con la TV",
-    "align_qr": "Allinea il QR code all'interno del riquadro",
-    "enter_code_manually": "Inserisci il codice manualmente",
-    "pairing_enter_credentials": "Inserire le credenziali per la TV",
-    "pairing_code_label": "Codice di associazione",
+    "title": "Pair with TV",
+    "align_qr": "Align the QR code within the frame",
+    "enter_code_manually": "Enter code manually",
+    "pairing_enter_credentials": "Enter credentials for TV",
+    "pairing_code_label": "Pairing code",
     "server": "Server",
-    "authorize_button": "Autorizza",
-    "authorizing": "Autorizzando...",
+    "authorize_button": "Authorize",
+    "authorizing": "Authorizing...",
     "scan_again": "Scan Again",
-    "done": "Fatto",
+    "done": "Done",
     "success_title": "Authorization Sent",
-    "pairing_tv_connecting": "La TV si sta collegando al tuo account",
+    "pairing_tv_connecting": "The TV is connecting to your account",
     "error_title": "Authorization Failed",
-    "error_invalid_qr": "QR code non valido. Scansiona il codice di associazione della TV.",
-    "error_generic": "Si è verificato un errore. Riprova.",
-    "error_permission_denied": "Per scansionare i codici QR è necessaria l'autorizzazione della fotocamera.",
-    "login_as": "Accedi come {{username}}?",
-    "on_server": "su {{server}}",
-    "use_different_user": "Usa un altro utente",
-    "open_settings": "Apri le impostazioni"
+    "error_invalid_qr": "Invalid QR code. Please scan the TV pairing code.",
+    "error_generic": "Something went wrong. Please try again.",
+    "error_permission_denied": "Camera permission is required to scan QR codes.",
+    "login_as": "Log in as {{username}}?",
+    "on_server": "on {{server}}",
+    "use_different_user": "Use a different user",
+    "open_settings": "Open Settings"
   },
   "pairing": {
     "pair_with_phone": "Pair with Phone",
     "pair_with_phone_title": "Login TV",
-    "waiting_for_phone": "In attesa del telefono...",
-    "scan_with_phone": "Scansiona con l'applicazione Streamyfin sul tuo telefono",
-    "logging_in": "Accesso in corso...",
-    "logging_in_description": "Sto connettendo al server"
+    "waiting_for_phone": "Waiting for phone...",
+    "scan_with_phone": "Scan with the Streamyfin app on your phone",
+    "logging_in": "Logging in...",
+    "logging_in_description": "Connecting to your server"
   }
 }