Merge branch 'develop' into fix/subtitle-track-selection

The close-first + runAfterInteractions pattern is needed only in the player,
where selecting a subtitle can navigate (replacePlayer for a burn-in switch
while transcoding). On the item detail page the selection just updates state, so
deferring it until after the modal is dismissed re-renders the page after focus
returns and yanks TV focus — leaving navigation stuck. Gate the deferral behind
deferApplyUntilDismissed (set by the in-player caller only); the detail page runs
the selection before closing, preserving focus.

app/(auth)/(tabs)/(home)/settings.tv.tsx

@@ -854,13 +854,6 @@ export default function SettingsTV() {
               updateSettings({ mergeNextUpAndContinueWatching: value })
             }
           />
-          <TVSettingsToggle
-            label={t("home.settings.appearance.use_episode_images_next_up")}
-            value={settings.useEpisodeImagesForNextUp}
-            onToggle={(value) =>
-              updateSettings({ useEpisodeImagesForNextUp: value })
-            }
-          />
           <TVSettingsToggle
             label={t("home.settings.appearance.show_home_backdrop")}
             value={settings.showHomeBackdrop}

app/(auth)/(tabs)/(home)/settings/appearance/hide-libraries/page.tsx

@@ -2,9 +2,8 @@ import { getUserViewsApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
 import { useAtomValue } from "jotai";
 import { useTranslation } from "react-i18next";
-import { ScrollView, View } from "react-native";
+import { ScrollView, Switch, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
 import { Text } from "@/components/common/Text";
 import { Loader } from "@/components/Loader";
 import { ListGroup } from "@/components/list/ListGroup";
@@ -51,12 +50,12 @@ export default function AppearanceHideLibrariesPage() {
     >
       <DisabledSetting
         disabled={pluginSettings?.hiddenLibraries?.locked === true}
-        className='px-4 pt-4'
+        className='px-4'
       >
         <ListGroup title={t("home.settings.other.hide_libraries")}>
           {data?.map((view) => (
             <ListItem key={view.Id} title={view.Name} onPress={() => {}}>
-              <SettingSwitch
+              <Switch
                 value={settings.hiddenLibraries?.includes(view.Id!) || false}
                 onValueChange={(value) => {
                   updateSettings({
@@ -72,7 +71,7 @@ export default function AppearanceHideLibrariesPage() {
           ))}
         </ListGroup>
         <Text className='px-4 text-xs text-neutral-500 mt-1'>
-          {t("home.settings.other.select_libraries_you_want_to_hide")}
+          {t("home.settings.other.select_liraries_you_want_to_hide")}
         </Text>
       </DisabledSetting>
     </ScrollView>

app/(auth)/(tabs)/(home)/settings/hide-libraries/page.tsx

@@ -2,8 +2,7 @@ import { getUserViewsApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
 import { useAtomValue } from "jotai";
 import { useTranslation } from "react-i18next";
-import { View } from "react-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
+import { Switch, View } from "react-native";
 import { Text } from "@/components/common/Text";
 import { Loader } from "@/components/Loader";
 import { ListGroup } from "@/components/list/ListGroup";
@@ -47,7 +46,7 @@ export default function HideLibrariesPage() {
       <ListGroup>
         {data?.map((view) => (
           <ListItem key={view.Id} title={view.Name} onPress={() => {}}>
-            <SettingSwitch
+            <Switch
               value={settings.hiddenLibraries?.includes(view.Id!) || false}
               onValueChange={(value) => {
                 updateSettings({
@@ -61,7 +60,7 @@ export default function HideLibrariesPage() {
         ))}
       </ListGroup>
       <Text className='px-4 text-xs text-neutral-500 mt-1'>
-        {t("home.settings.other.select_libraries_you_want_to_hide")}
+        {t("home.settings.other.select_liraries_you_want_to_hide")}
       </Text>
     </DisabledSetting>
   );

app/(auth)/(tabs)/(home)/settings/music/page.tsx

@@ -3,9 +3,9 @@ import { useQuery } from "@tanstack/react-query";
 import { useCallback, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, ScrollView, View } from "react-native";
+import { Switch } from "react-native-gesture-handler";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { toast } from "sonner-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
 import { Text } from "@/components/common/Text";
 import { ListGroup } from "@/components/list/ListGroup";
 import { ListItem } from "@/components/list/ListItem";
@@ -136,7 +136,7 @@ export default function MusicSettingsPage() {
             title={t("home.settings.music.prefer_downloaded")}
             disabled={pluginSettings?.preferLocalAudio?.locked}
           >
-            <SettingSwitch
+            <Switch
               value={settings.preferLocalAudio}
               disabled={pluginSettings?.preferLocalAudio?.locked}
               onValueChange={(value) =>
@@ -159,7 +159,7 @@ export default function MusicSettingsPage() {
               title={t("home.settings.music.lookahead_enabled")}
               disabled={pluginSettings?.audioLookaheadEnabled?.locked}
             >
-              <SettingSwitch
+              <Switch
                 value={settings.audioLookaheadEnabled}
                 disabled={pluginSettings?.audioLookaheadEnabled?.locked}
                 onValueChange={(value) =>
@@ -233,7 +233,7 @@ export default function MusicSettingsPage() {
                 })}
               />
             </ListGroup>
-            <ListGroup className='mt-4'>
+            <ListGroup>
               <ListItem
                 textColor='red'
                 onPress={onDeleteDownloadedSongsClicked}

app/(auth)/(tabs)/(home)/settings/playback-controls/page.tsx

@@ -17,14 +17,13 @@ export default function PlaybackControlsPage() {
       contentContainerStyle={{
         paddingLeft: insets.left,
         paddingRight: insets.right,
-        paddingBottom: insets.bottom,
       }}
     >
       <View
         className='p-4 flex flex-col'
         style={{ paddingTop: Platform.OS === "android" ? 10 : 0 }}
       >
-        <View>
+        <View className='mb-4'>
           <MediaProvider>
             <MediaToggles className='mb-4' />
             <GestureControls className='mb-4' />

app/(auth)/(tabs)/(home)/settings/plugins/marlin-search/page.tsx

@@ -4,13 +4,13 @@ import { useTranslation } from "react-i18next";
 import {
   Linking,
   ScrollView,
+  Switch,
   TextInput,
   TouchableOpacity,
   View,
 } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { toast } from "sonner-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
 import { Text } from "@/components/common/Text";
 import { ListGroup } from "@/components/list/ListGroup";
 import { ListItem } from "@/components/list/ListItem";
@@ -72,7 +72,7 @@ export default function MarlinSearchPage() {
         paddingRight: insets.right,
       }}
     >
-      <DisabledSetting disabled={disabled} className='px-4 pt-4'>
+      <DisabledSetting disabled={disabled} className='px-4'>
         <ListGroup>
           <DisabledSetting
             disabled={
@@ -90,7 +90,7 @@ export default function MarlinSearchPage() {
                 queryClient.invalidateQueries({ queryKey: ["search"] });
               }}
             >
-              <SettingSwitch
+              <Switch
                 value={settings.searchEngine === "Marlin"}
                 disabled={!!pluginSettings?.streamyStatsServerUrl?.value}
                 onValueChange={(value) => {

app/(auth)/(tabs)/(home)/settings/plugins/streamystats/page.tsx

@@ -4,13 +4,13 @@ import { useTranslation } from "react-i18next";
 import {
   Linking,
   ScrollView,
+  Switch,
   TextInput,
   TouchableOpacity,
   View,
 } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { toast } from "sonner-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
 import { Text } from "@/components/common/Text";
 import { ListGroup } from "@/components/list/ListGroup";
 import { ListItem } from "@/components/list/ListItem";
@@ -134,7 +134,7 @@ export default function StreamystatsPage() {
         paddingRight: insets.right,
       }}
     >
-      <View className='px-4 pt-4'>
+      <View className='px-4'>
         <ListGroup className='flex-1'>
           <ListItem
             title={t("home.settings.plugins.streamystats.url")}
@@ -173,7 +173,7 @@ export default function StreamystatsPage() {
             title={t("home.settings.plugins.streamystats.enable_search")}
             disabledByAdmin={pluginSettings?.searchEngine?.locked === true}
           >
-            <SettingSwitch
+            <Switch
               value={useForSearch}
               disabled={!isStreamystatsEnabled}
               onValueChange={setUseForSearch}
@@ -187,7 +187,7 @@ export default function StreamystatsPage() {
               pluginSettings?.streamyStatsMovieRecommendations?.locked === true
             }
           >
-            <SettingSwitch
+            <Switch
               value={movieRecs}
               onValueChange={setMovieRecs}
               disabled={!isStreamystatsEnabled}
@@ -201,7 +201,7 @@ export default function StreamystatsPage() {
               pluginSettings?.streamyStatsSeriesRecommendations?.locked === true
             }
           >
-            <SettingSwitch
+            <Switch
               value={seriesRecs}
               onValueChange={setSeriesRecs}
               disabled={!isStreamystatsEnabled}
@@ -215,7 +215,7 @@ export default function StreamystatsPage() {
               pluginSettings?.streamyStatsPromotedWatchlists?.locked === true
             }
           >
-            <SettingSwitch
+            <Switch
               value={promotedWatchlists}
               onValueChange={setPromotedWatchlists}
               disabled={!isStreamystatsEnabled}
@@ -225,7 +225,7 @@ export default function StreamystatsPage() {
             title={t("home.settings.plugins.streamystats.hide_watchlists_tab")}
             disabledByAdmin={pluginSettings?.hideWatchlistsTab?.locked === true}
           >
-            <SettingSwitch
+            <Switch
               value={hideWatchlistsTab}
               onValueChange={setHideWatchlistsTab}
               disabled={!isStreamystatsEnabled}

app/(auth)/player/direct-player.tsx

@@ -7,7 +7,6 @@ import {
   RepeatMode,
 } from "@jellyfin/sdk/lib/generated-client";
 import {
-  getMediaInfoApi,
   getPlaystateApi,
   getUserLibraryApi,
 } from "@jellyfin/sdk/lib/utils/api";
@@ -26,6 +25,10 @@ import { Controls } from "@/components/video-player/controls/Controls";
 import { Controls as TVControls } from "@/components/video-player/controls/Controls.tv";
 import { PlayerProvider } from "@/components/video-player/controls/contexts/PlayerContext";
 import { VideoProvider } from "@/components/video-player/controls/contexts/VideoContext";
+import {
+  LOCAL_SUBTITLE_INDEX_START,
+  toServerSubtitleIndex,
+} from "@/components/video-player/controls/types";
 import {
   PlaybackSpeedScope,
   updatePlaybackSpeedSettings,
@@ -50,15 +53,16 @@ import { DownloadedItem } from "@/providers/Downloads/types";
 import { useInactivity } from "@/providers/InactivityProvider";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { OfflineModeProvider } from "@/providers/OfflineModeProvider";
-
 import { getSubtitlesForItem } from "@/utils/atoms/downloadedSubtitles";
 import { useSettings } from "@/utils/atoms/settings";
 import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
 import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
 import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
 import {
+  applyMpvSubtitleSelection,
+  getExternalSubtitleUrl,
   getMpvAudioId,
-  getMpvSubtitleId,
+  isImageBasedSubtitle,
 } from "@/utils/jellyfin/subtitleUtils";
 import { writeToLog } from "@/utils/log";
 import { msToTicks, ticksToSeconds } from "@/utils/time";
@@ -311,37 +315,6 @@ export default function DirectPlayerPage() {
   // Ref to store the stream fetch function for refreshing subtitle tracks
   const refetchStreamRef = useRef<(() => Promise<Stream | null>) | null>(null);
 
-  // Live TV opens a server-side live stream via autoOpenLiveStream. If it is
-  // never closed, Jellyfin's M3U tuner limit fills up and every channel then
-  // fails with "simultaneous stream limit has been reached". reportPlaybackStopped
-  // handles a clean stop, but a channel switch (the player re-fetches in place)
-  // or an unmount after an error bypass it, so track the open live stream and
-  // release it on those paths too.
-  const apiRef = useRef(api);
-  useEffect(() => {
-    apiRef.current = api;
-  }, [api]);
-
-  const releaseLiveStream = useCallback(
-    (liveStreamId: string | null) => {
-      if (!liveStreamId || !apiRef.current || offline) return;
-      // Best effort: a failed close must not break teardown, and the slot is
-      // also freed by the server's reap as a backstop.
-      getMediaInfoApi(apiRef.current)
-        .closeLiveStream({ liveStreamId })
-        .catch(() => {});
-    },
-    [offline],
-  );
-
-  // The effect cleanup releases the live stream both when it changes (channel
-  // switch, which re-runs the effect) and when the player unmounts, so no
-  // manual previous-id tracking is needed.
-  useEffect(() => {
-    const liveStreamId = stream?.mediaSource?.LiveStreamId ?? null;
-    return () => releaseLiveStream(liveStreamId);
-  }, [stream?.mediaSource?.LiveStreamId, releaseLiveStream]);
-
   useEffect(() => {
     const fetchStreamData = async (): Promise<Stream | null> => {
       setStreamStatus({ isLoading: true, isError: false });
@@ -477,12 +450,6 @@ export default function DirectPlayerPage() {
         MediaSourceId: mediaSourceId,
         PositionTicks: currentTimeInTicks,
         PlaySessionId: stream.sessionId,
-        // Release the server-side live stream (and its tuner slot) on stop.
-        // Jellyfin only closes a live stream opened via autoOpenLiveStream when
-        // the stop report carries its LiveStreamId; without it the stream leaks
-        // and Live TV eventually fails for everyone with "M3U simultaneous
-        // stream limit has been reached". Undefined for non-live items (no-op).
-        LiveStreamId: stream.mediaSource?.LiveStreamId ?? undefined,
       },
     });
   }, [api, item, mediaSourceId, stream, progress, offline]);
@@ -657,32 +624,20 @@ export default function DirectPlayerPage() {
     const mediaSource = stream.mediaSource;
     const isTranscoding = Boolean(mediaSource?.TranscodingUrl);
 
-    // Get external subtitle URLs
-    // - Online: prepend API base path to server URLs
-    // - Offline: use local file paths (stored in DeliveryUrl during download)
-    let externalSubs: string[] | undefined;
-    if (!offline && api?.basePath) {
-      externalSubs = mediaSource?.MediaStreams?.filter(
-        (s) =>
-          s.Type === "Subtitle" &&
-          s.DeliveryMethod === "External" &&
-          s.DeliveryUrl,
-      ).map((s) => `${api.basePath}${s.DeliveryUrl}`);
-    } else if (offline) {
-      externalSubs = mediaSource?.MediaStreams?.filter(
-        (s) =>
-          s.Type === "Subtitle" &&
-          s.DeliveryMethod === "External" &&
-          s.DeliveryUrl,
-      ).map((s) => s.DeliveryUrl!);
-    }
+    // Get external subtitle URLs — getExternalSubtitleUrl is the shared source
+    // of truth with identity matching (online: basePath + DeliveryUrl unless
+    // IsExternalUrl; offline: local file path stored in DeliveryUrl).
+    const externalSubs = mediaSource?.MediaStreams?.filter(
+      (s) => s.Type === "Subtitle" && s.DeliveryMethod === "External",
+    )
+      .map((s) =>
+        getExternalSubtitleUrl(s, { offline, basePath: api?.basePath }),
+      )
+      .filter((u): u is string => !!u);
 
-    // Calculate track IDs for initial selection
-    const initialSubtitleId = getMpvSubtitleId(
-      mediaSource,
-      subtitleIndex,
-      isTranscoding,
-    );
+    // Audio maps positionally (audio tracks aren't reordered or hidden like
+    // subtitles). The subtitle selection is applied later, once MPV's real track
+    // list is known — see applySubtitleSelection / onTracksReady.
     const initialAudioId = getMpvAudioId(
       mediaSource,
       audioIndex,
@@ -700,7 +655,6 @@ export default function DirectPlayerPage() {
       url: stream.url,
       startPosition: startPos,
       autoplay: true,
-      initialSubtitleId,
       initialAudioId,
       // Pass cache/buffer settings from user preferences
       cacheConfig: {
@@ -748,7 +702,6 @@ export default function DirectPlayerPage() {
     playbackPositionFromUrl,
     api?.basePath,
     api?.accessToken,
-    subtitleIndex,
     audioIndex,
     offline,
     settings.mpvCacheEnabled,
@@ -938,7 +891,9 @@ export default function DirectPlayerPage() {
         const queryParams = new URLSearchParams({
           itemId: item?.Id ?? "",
           audioIndex: String(index),
-          subtitleIndex: String(currentSubtitleIndex),
+          // A local (client-downloaded) sub only exists in the dying mpv
+          // instance — the server must be asked for "none" (-1) instead.
+          subtitleIndex: String(toServerSubtitleIndex(currentSubtitleIndex)),
           mediaSourceId: stream?.mediaSource?.Id ?? "",
           bitrateValue: bitrateValue?.toString() ?? "",
           playbackPosition: msToTicks(progress.get()).toString(),
@@ -974,30 +929,103 @@ export default function DirectPlayerPage() {
   );
 
   // TV subtitle track change handler
+  /**
+   * Resolve a Jellyfin subtitle index against MPV's *real* track list and apply
+   * it. Identity-based (external by filename, embedded by language/title) so it
+   * stays correct across external/embedded reordering and server-hidden embedded
+   * subs — unlike positional mapping. Reused for initial selection (onTracksReady,
+   * fired again after each external sub-add) and runtime changes.
+   */
+  const applySubtitleSelection = useCallback(
+    async (jellyfinSubtitleIndex: number) => {
+      const subtitleStreams = stream?.mediaSource?.MediaStreams?.filter(
+        (s) => s.Type === "Subtitle",
+      );
+      return applyMpvSubtitleSelection(videoRef.current, {
+        subtitleStreams,
+        jellyfinSubtitleIndex,
+        getExpectedExternalUrl: (s) =>
+          getExternalSubtitleUrl(s, { offline, basePath: api?.basePath }),
+      });
+    },
+    [stream?.mediaSource, offline, api?.basePath],
+  );
+
+  // Re-negotiate the stream with new track params (server re-processes it,
+  // e.g. to burn an image sub in or out). Same-item mirror of VideoContext's
+  // replacePlayer, resuming at the live position.
+  const replaceWithTrackSelection = useCallback(
+    (params: { subtitleIndex?: string; audioIndex?: string }) => {
+      const queryParams = new URLSearchParams({
+        itemId: item?.Id ?? "",
+        audioIndex: params.audioIndex ?? String(currentAudioIndex ?? ""),
+        subtitleIndex:
+          params.subtitleIndex ??
+          String(toServerSubtitleIndex(currentSubtitleIndex)),
+        mediaSourceId: stream?.mediaSource?.Id ?? "",
+        bitrateValue: bitrateValue?.toString() ?? "",
+        playbackPosition: msToTicks(progress.get()).toString(),
+      }).toString();
+      // Destroy the current mpv instance before re-navigating, same rationale as
+      // goToNextItem: Expo Router briefly holds two players during the
+      // transition and two decoders/surfaces OOM-kill low-RAM devices.
+      videoRef.current?.destroy().catch(() => {});
+      router.replace(`player/direct-player?${queryParams}` as any);
+    },
+    [
+      item?.Id,
+      currentAudioIndex,
+      currentSubtitleIndex,
+      stream?.mediaSource?.Id,
+      bitrateValue,
+      router,
+      progress,
+    ],
+  );
+
+  // TV/mobile subtitle track change handler
   const handleSubtitleIndexChange = useCallback(
     async (index: number) => {
-      setCurrentSubtitleIndex(index);
+      // Local (client-downloaded) subs are loaded via addSubtitleFile, not
+      // resolvable against server streams — just track the live index.
+      if (index <= LOCAL_SUBTITLE_INDEX_START) {
+        setCurrentSubtitleIndex(index);
+        return;
+      }
 
-      // Check if we're transcoding
+      const subs = stream?.mediaSource?.MediaStreams?.filter(
+        (s) => s.Type === "Subtitle",
+      );
       const isTranscoding = Boolean(stream?.mediaSource?.TranscodingUrl);
+      const target = subs?.find((s) => s.Index === index);
+      const current = subs?.find((s) => s.Index === currentSubtitleIndex);
+      // Burned-in subs are pixels, not tracks: switching TO one and switching
+      // AWAY from an active one both need a server re-process (same guard as
+      // VideoContext's needsReplace on the mobile menu path).
+      const needsReplace =
+        isTranscoding &&
+        ((target && isImageBasedSubtitle(target)) ||
+          (current && isImageBasedSubtitle(current)));
+      if (needsReplace) {
+        replaceWithTrackSelection({ subtitleIndex: String(index) });
+        return;
+      }
 
-      if (index === -1) {
-        // Disable subtitles
-        await videoRef.current?.disableSubtitles?.();
-      } else {
-        // Convert Jellyfin index to MPV track ID
-        const mpvTrackId = getMpvSubtitleId(
-          stream?.mediaSource,
-          index,
-          isTranscoding,
-        );
-
-        if (mpvTrackId !== undefined && mpvTrackId !== -1) {
-          await videoRef.current?.setSubtitleTrack?.(mpvTrackId);
-        }
+      setCurrentSubtitleIndex(index);
+      const result = await applySubtitleSelection(index);
+      // Safety net: a menu-listed sub the player can't select (server-burned
+      // Encode, sidecar never sub-added) needs the server to re-process the
+      // stream with it.
+      if (result.kind === "notFound" || result.kind === "burnedIn") {
+        replaceWithTrackSelection({ subtitleIndex: String(index) });
       }
     },
-    [stream?.mediaSource],
+    [
+      applySubtitleSelection,
+      replaceWithTrackSelection,
+      stream?.mediaSource,
+      currentSubtitleIndex,
+    ],
   );
 
   // Technical info toggle handler
@@ -1116,6 +1144,10 @@ export default function DirectPlayerPage() {
         previousItem.UserData?.PlaybackPositionTicks?.toString() ?? "",
     }).toString();
 
+    // Free the current mpv instance before navigating, matching goToNextItem —
+    // otherwise two decoders/surfaces overlap during the transition and can
+    // OOM-kill low-RAM devices.
+    videoRef.current?.destroy().catch(() => {});
     router.replace(`player/direct-player?${queryParams}` as any);
   }, [
     previousItem,
@@ -1128,9 +1160,24 @@ export default function DirectPlayerPage() {
   ]);
 
   // TV: Add subtitle file to player (for client-side downloaded subtitles)
-  const addSubtitleFile = useCallback(async (path: string) => {
-    await videoRef.current?.addSubtitleFile?.(path, true);
-  }, []);
+  const addSubtitleFile = useCallback(
+    async (path: string) => {
+      // Set the live index to the new local sub's REAL index BEFORE the add.
+      // Local subs are keyed LOCAL_SUBTITLE_INDEX_START - position, so use the
+      // downloaded path's position (not a blanket sentinel, which would collide
+      // with the first local sub at -100 and mis-record the selection). Any
+      // local index resolves to notFound on the onTracksReady re-apply, so it
+      // still doesn't clobber the freshly selected track; carry-over now keeps
+      // the correct local sub.
+      const locals = itemId ? getSubtitlesForItem(itemId) : [];
+      const pos = locals.findIndex((s) => s.filePath === path);
+      setCurrentSubtitleIndex(
+        LOCAL_SUBTITLE_INDEX_START - (pos >= 0 ? pos : 0),
+      );
+      await videoRef.current?.addSubtitleFile?.(path, true);
+    },
+    [itemId],
+  );
 
   // TV: Refresh subtitle tracks after server-side subtitle download
   // Re-fetches the media source to pick up newly downloaded subtitles
@@ -1356,12 +1403,16 @@ export default function DirectPlayerPage() {
                   console.error("Video Error:", e.nativeEvent);
                   Alert.alert(
                     t("player.error"),
-                    t("player.an_error_occurred_while_playing_the_video"),
+                    t("player.an_error_occured_while_playing_the_video"),
                   );
                   writeToLog("ERROR", "Video Error", e.nativeEvent);
                 }}
                 onTracksReady={() => {
                   setTracksReady(true);
+                  // Fired after embedded tracks enumerate and again after each
+                  // external sub-add; re-resolve so the final fire (full track
+                  // list) selects the right track by identity.
+                  void applySubtitleSelection(currentSubtitleIndex);
                 }}
               />
               {!hasPlaybackStarted && (

app/(auth)/tv-subtitle-modal.tsx

@@ -13,6 +13,7 @@ import {
   ActivityIndicator,
   Animated,
   Easing,
+  InteractionManager,
   Pressable,
   ScrollView,
   StyleSheet,
@@ -645,10 +646,23 @@ export default function TVSubtitleModal() {
 
   const handleTrackSelect = useCallback(
     (option: { setTrack?: () => void }) => {
+      if (modalState?.deferApplyUntilDismissed) {
+        // Player: setTrack can navigate (replacePlayer for a burn-in switch
+        // while transcoding); a router.replace fired while this modal is the
+        // active route targets the MODAL and is swallowed. Close FIRST, apply
+        // after dismissal.
+        handleClose();
+        InteractionManager.runAfterInteractions(() => option.setTrack?.());
+        return;
+      }
+      // Detail page: setTrack only updates state. Run it BEFORE closing so the
+      // re-render happens while the modal is up; deferring it until after
+      // dismissal re-renders the detail page after focus returns and yanks TV
+      // focus, leaving navigation stuck.
       option.setTrack?.();
       handleClose();
     },
-    [handleClose],
+    [handleClose, modalState?.deferApplyUntilDismissed],
   );
 
   const handleDownload = useCallback(

app/_layout.tsx

@@ -85,8 +85,7 @@ configureReanimatedLogger({
 if (!Platform.isTV) {
   Notifications.setNotificationHandler({
     handleNotification: async () => ({
-      shouldShowBanner: true,
-      shouldShowList: true,
+      shouldShowAlert: true,
       shouldPlaySound: true,
       shouldSetBadge: false,
     }),
@@ -351,12 +350,9 @@ function Layout() {
       notificationListener.current =
         Notifications?.addNotificationReceivedListener(
           (notification: Notification) => {
-            // Log only the title — serializing the whole notification touches
-            // the deprecated dataString getter (deprecation warning) and dumps
-            // noisy payloads into the console.
             console.log(
-              "Notification received while app running:",
-              notification.request.content.title,
+              "Notification received while app running",
+              notification,
             );
           },
         );

components/ContinueWatchingPoster.tsx

@@ -35,10 +35,8 @@ const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
       return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
     }
     if (item.Type === "Episode") {
-      // Matched pair: the parent that owns the Thumb (ParentThumbItemId), not the
-      // backdrop owner — otherwise the Thumb tag is requested on the wrong item → black.
-      if (item.ParentThumbItemId && item.ParentThumbImageTag) {
-        return `${api?.basePath}/Items/${item.ParentThumbItemId}/Images/Thumb?fillHeight=389&quality=80&tag=${item.ParentThumbImageTag}`;
+      if (item.ParentBackdropItemId && item.ParentThumbImageTag) {
+        return `${api?.basePath}/Items/${item.ParentBackdropItemId}/Images/Thumb?fillHeight=389&quality=80&tag=${item.ParentThumbImageTag}`;
       }
 
       return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
@@ -63,8 +61,7 @@ const ContinueWatchingPoster: React.FC<ContinueWatchingPosterProps> = ({
     }
 
     return `${api?.basePath}/Items/${item.Id}/Images/Primary?fillHeight=389&quality=80`;
-    // useEpisodePoster in deps so flipping the prop re-computes the URL live.
-  }, [api, item, useEpisodePoster]);
+  }, [item]);
 
   if (!url)
     return <View className='aspect-video border border-neutral-800 w-44' />;

components/ItemContent.tv.tsx

@@ -40,7 +40,10 @@ import {
   TVSeriesNavigation,
   TVTechnicalDetails,
 } from "@/components/tv";
-import type { Track } from "@/components/video-player/controls/types";
+import {
+  LOCAL_SUBTITLE_INDEX_START,
+  type Track,
+} from "@/components/video-player/controls/types";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
 import useDefaultPlaySettings from "@/hooks/useDefaultPlaySettings";
@@ -56,6 +59,7 @@ import { useSettings } from "@/utils/atoms/settings";
 import type { TVOptionItem } from "@/utils/atoms/tvOptionModal";
 import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
 import { getPrimaryImageUrlById } from "@/utils/jellyfin/image/getPrimaryImageUrlById";
+import { compareTracksForMenu } from "@/utils/jellyfin/subtitleUtils";
 import { formatDuration, runtimeTicksToMinutes } from "@/utils/time";
 
 const { width: SCREEN_WIDTH, height: SCREEN_HEIGHT } = Dimensions.get("window");
@@ -232,12 +236,13 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
       return streams ?? [];
     }, [selectedOptions?.mediaSource]);
 
-    // Get available subtitle tracks (raw MediaStream[] for label lookup)
+    // Get available subtitle tracks (raw MediaStream[] for label lookup),
+    // ordered like jellyfin-web (embedded first, externals last, forced/default up).
     const subtitleStreams = useMemo(() => {
       const streams = selectedOptions?.mediaSource?.MediaStreams?.filter(
         (s) => s.Type === "Subtitle",
       );
-      return streams ?? [];
+      return streams ? [...streams].sort(compareTracksForMenu) : [];
     }, [selectedOptions?.mediaSource]);
 
     // Store handleSubtitleChange in a ref for stable callback reference
@@ -248,9 +253,6 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
     // State to trigger refresh of local subtitles list
     const [localSubtitlesRefreshKey, setLocalSubtitlesRefreshKey] = useState(0);
 
-    // Starting index for local (client-downloaded) subtitles
-    const LOCAL_SUBTITLE_INDEX_START = -100;
-
     // Convert MediaStream[] to Track[] for the modal (with setTrack callbacks)
     // Also includes locally downloaded subtitles from OpenSubtitles
     const subtitleTracksForModal = useMemo((): Track[] => {
@@ -411,11 +413,13 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
             )
           : freshItem.MediaSources?.[0];
 
-        // Get subtitle streams from the fresh data
-        const streams =
-          mediaSource?.MediaStreams?.filter(
+        // Get subtitle streams from the fresh data, ordered like jellyfin-web
+        // (embedded first, externals last) — same as the initial list.
+        const streams = [
+          ...(mediaSource?.MediaStreams?.filter(
             (s: MediaStream) => s.Type === "Subtitle",
-          ) ?? [];
+          ) ?? []),
+        ].sort(compareTracksForMenu);
 
         // Convert to Track[] with setTrack callbacks
         const tracks: Track[] = streams.map((stream) => ({

components/MediaSourceButton.tsx

@@ -7,6 +7,7 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { ActivityIndicator, TouchableOpacity, View } from "react-native";
 import type { ThemeColors } from "@/hooks/useImageColorsReturn";
+import { compareTracksForMenu } from "@/utils/jellyfin/subtitleUtils";
 import { BITRATES } from "./BitRateSheet";
 import type { SelectedOptions } from "./ItemContent";
 import { type OptionGroup, PlatformDropdown } from "./PlatformDropdown";
@@ -63,9 +64,12 @@ export const MediaSourceButton: React.FC<Props> = ({
 
   const subtitleStreams = useMemo(
     () =>
-      selectedOptions.mediaSource?.MediaStreams?.filter(
-        (x) => x.Type === "Subtitle",
-      ) || [],
+      // Order like jellyfin-web (embedded first, externals last, forced/default up).
+      [
+        ...(selectedOptions.mediaSource?.MediaStreams?.filter(
+          (x) => x.Type === "Subtitle",
+        ) || []),
+      ].sort(compareTracksForMenu),
     [selectedOptions.mediaSource],
   );
 

components/SubtitleTrackSelector.tsx

@@ -2,6 +2,7 @@ import type { MediaSourceInfo } from "@jellyfin/sdk/lib/generated-client/models"
 import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, TouchableOpacity, View } from "react-native";
+import { compareTracksForMenu } from "@/utils/jellyfin/subtitleUtils";
 import { tc } from "@/utils/textTools";
 import { Text } from "./common/Text";
 import { type OptionGroup, PlatformDropdown } from "./PlatformDropdown";
@@ -22,7 +23,9 @@ export const SubtitleTrackSelector: React.FC<Props> = ({
   const [open, setOpen] = useState(false);
 
   const subtitleStreams = useMemo(() => {
-    return source?.MediaStreams?.filter((x) => x.Type === "Subtitle");
+    const subs = source?.MediaStreams?.filter((x) => x.Type === "Subtitle");
+    // Order like jellyfin-web (embedded first, externals last, forced/default up).
+    return subs ? [...subs].sort(compareTracksForMenu) : subs;
   }, [source]);
 
   const selectedSubtitleSteam = useMemo(

components/common/SettingSwitch.tsx

@@ -1,40 +0,0 @@
-import type React from "react";
-import { Platform, Switch, type SwitchProps, View } from "react-native";
-
-/**
- * Settings toggle. Android's native Switch lays out ~40px tall / ~56px wide and
- * inflates list rows (iOS renders it ~31px). A plain `transform: scale` is
- * visual-only and does NOT shrink the layout box, so we pin the Switch inside a
- * FIXED-SIZE box (overflow hidden) and center it:
- *  - the fixed height caps the row height (compact, uniform rows),
- *  - the fixed width + centering keep the switch in the exact same spot in the
- *    on/off states (a non-fixed wrapper let its width fluctuate between states,
- *    which shifted the switch sideways on toggle).
- * iOS renders the switch untouched.
- *
- * Tunables: BOX_H drives the row height; SCALE shrinks the visual to fit the
- * box; keep BOX_W >= scaled visual width to avoid clipping the switch sideways.
- */
-const BOX_W = 40;
-const BOX_H = 30;
-const SCALE = 0.9;
-
-export const SettingSwitch: React.FC<SwitchProps> = (props) => {
-  if (Platform.OS !== "android") return <Switch {...props} />;
-  return (
-    <View
-      style={{
-        width: BOX_W,
-        height: BOX_H,
-        alignItems: "center",
-        justifyContent: "center",
-        overflow: "hidden",
-      }}
-    >
-      <Switch
-        {...props}
-        style={[props.style, { transform: [{ scale: SCALE }] }]}
-      />
-    </View>
-  );
-};

components/downloads/SeriesCard.tsx

@@ -16,12 +16,9 @@ export const SeriesCard: React.FC<{ items: BaseItemDto[] }> = ({ items }) => {
   const { showActionSheetWithOptions } = useActionSheet();
   const router = useRouter();
 
-  // Keyed on SeriesId so recycled FlashList cells re-read the correct poster
-  // instead of freezing the first-rendered series' image (empty deps bug).
   const base64Image = useMemo(() => {
-    const seriesId = items[0]?.SeriesId;
-    return seriesId ? storage.getString(seriesId) : undefined;
-  }, [items[0]?.SeriesId]);
+    return storage.getString(items[0].SeriesId!);
+  }, []);
 
   const deleteSeries = useCallback(
     async () =>

components/home/InfiniteScrollingCollectionList.tsx

@@ -15,7 +15,6 @@ import {
 import { SectionHeader } from "@/components/common/SectionHeader";
 import { Text } from "@/components/common/Text";
 import MoviePoster from "@/components/posters/MoviePoster";
-import { useSettings } from "@/utils/atoms/settings";
 import { Colors } from "../../constants/Colors";
 import ContinueWatchingPoster from "../ContinueWatchingPoster";
 import { TouchableItemRouter } from "../common/TouchableItemRouter";
@@ -86,7 +85,6 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
   }, [isSuccess, onLoaded]);
 
   const { t } = useTranslation();
-  const { settings } = useSettings();
 
   // Flatten all pages into a single array (and de-dupe by Id to avoid UI duplicates)
   const allItems = useMemo(() => {
@@ -188,10 +186,7 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
                 `}
               >
                 {item.Type === "Episode" && orientation === "horizontal" && (
-                  <ContinueWatchingPoster
-                    item={item}
-                    useEpisodePoster={settings?.useEpisodeImagesForNextUp}
-                  />
+                  <ContinueWatchingPoster item={item} />
                 )}
                 {item.Type === "Episode" && orientation === "vertical" && (
                   <SeriesPoster item={item} />

components/home/InfiniteScrollingCollectionList.tv.tsx

@@ -24,7 +24,6 @@ import { useScaledTVTypography } from "@/constants/TVTypography";
 import useRouter from "@/hooks/useAppRouter";
 import { useTVItemActionModal } from "@/hooks/useTVItemActionModal";
 import { SortByOption, SortOrderOption } from "@/utils/atoms/filters";
-import { useSettings } from "@/utils/atoms/settings";
 import { scaleSize } from "@/utils/scaleSize";
 
 // Extra padding to accommodate scale animation (1.05x) and glow shadow
@@ -166,7 +165,6 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
     });
 
   const { t } = useTranslation();
-  const { settings } = useSettings();
 
   const allItems = useMemo(() => {
     const items = data?.pages.flat() ?? [];
@@ -233,7 +231,6 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
             hasTVPreferredFocus={isFirstItem}
             onFocus={() => handleItemFocus(item)}
             width={itemWidth}
-            preferEpisodeImage={settings?.useEpisodeImagesForNextUp}
           />
         </View>
       );
@@ -246,7 +243,6 @@ export const InfiniteScrollingCollectionList: React.FC<Props> = ({
       showItemActions,
       handleItemFocus,
       ITEM_GAP,
-      settings?.useEpisodeImagesForNextUp,
     ],
   );
 

components/home/ScrollingCollectionList.tsx

@@ -9,7 +9,6 @@ import { ScrollView, View, type ViewProps } from "react-native";
 import { Text } from "@/components/common/Text";
 import MoviePoster from "@/components/posters/MoviePoster";
 import { useInView } from "@/hooks/useInView";
-import { useSettings } from "@/utils/atoms/settings";
 import ContinueWatchingPoster from "../ContinueWatchingPoster";
 import { TouchableItemRouter } from "../common/TouchableItemRouter";
 import { ItemCardText } from "../ItemCardText";
@@ -51,7 +50,6 @@ export const ScrollingCollectionList: React.FC<Props> = ({
   });
 
   const { t } = useTranslation();
-  const { settings } = useSettings();
 
   // Show skeleton if loading OR if lazy loading is enabled and not in view yet
   const shouldShowSkeleton = isLoading || (enableLazyLoading && !isInView);
@@ -110,10 +108,7 @@ export const ScrollingCollectionList: React.FC<Props> = ({
                 `}
               >
                 {item.Type === "Episode" && orientation === "horizontal" && (
-                  <ContinueWatchingPoster
-                    item={item}
-                    useEpisodePoster={settings?.useEpisodeImagesForNextUp}
-                  />
+                  <ContinueWatchingPoster item={item} />
                 )}
                 {item.Type === "Episode" && orientation === "vertical" && (
                   <SeriesPoster item={item} />

components/home/TVHeroCarousel.tsx

@@ -65,11 +65,10 @@ const HeroCard: React.FC<HeroCardProps> = React.memo(
     const posterUrl = useMemo(() => {
       if (!api) return null;
 
-      // For episodes, always use series thumb.
-      // Matched pair: ParentThumbItemId owns the Thumb tag, not ParentBackdropItemId.
+      // For episodes, always use series thumb
       if (item.Type === "Episode") {
-        if (item.ParentThumbItemId && item.ParentThumbImageTag) {
-          return `${api.basePath}/Items/${item.ParentThumbItemId}/Images/Thumb?fillHeight=400&quality=80&tag=${item.ParentThumbImageTag}`;
+        if (item.ParentThumbImageTag) {
+          return `${api.basePath}/Items/${item.ParentBackdropItemId}/Images/Thumb?fillHeight=400&quality=80&tag=${item.ParentThumbImageTag}`;
         }
         if (item.SeriesId) {
           return `${api.basePath}/Items/${item.SeriesId}/Images/Thumb?fillHeight=400&quality=80`;

components/list/ListGroup.tsx

@@ -23,11 +23,9 @@ export const ListGroup: React.FC<PropsWithChildren<Props>> = ({
 
   return (
     <View {...props}>
-      {title ? (
-        <Text className='ml-4 mb-1 uppercase text-[#8E8D91] text-xs'>
-          {title}
-        </Text>
-      ) : null}
+      <Text className='ml-4 mb-1 uppercase text-[#8E8D91] text-xs'>
+        {title}
+      </Text>
       <View
         style={[]}
         className='flex flex-col rounded-xl overflow-hidden pl-0 bg-neutral-900'

components/list/ListItem.tsx

@@ -1,6 +1,6 @@
 import { Ionicons } from "@expo/vector-icons";
 import type { PropsWithChildren, ReactNode } from "react";
-import { Platform, TouchableOpacity, View, type ViewProps } from "react-native";
+import { TouchableOpacity, View, type ViewProps } from "react-native";
 import { Text } from "../common/Text";
 
 interface Props extends ViewProps {
@@ -34,17 +34,12 @@ export const ListItem: React.FC<PropsWithChildren<Props>> = ({
 }) => {
   const effectiveSubtitle = disabledByAdmin ? "Disabled by admin" : subtitle;
   const isDisabled = disabled || disabledByAdmin;
-  // Keep the row floor uniform; Android trims padding slightly (its native
-  // controls sit taller). Switch height is capped via SettingSwitch so toggle
-  // rows match non-toggle rows.
-  const rowSizing =
-    Platform.OS === "android" ? "min-h-[42px] py-1.5" : "min-h-[42px] py-2";
   if (onPress)
     return (
       <TouchableOpacity
         disabled={isDisabled}
         onPress={onPress}
-        className={`flex flex-row items-center justify-between bg-neutral-900 ${rowSizing} pr-4 pl-4 ${isDisabled ? "opacity-50" : ""}`}
+        className={`flex flex-row items-center justify-between bg-neutral-900 min-h-[42px] py-2 pr-4 pl-4 ${isDisabled ? "opacity-50" : ""}`}
         {...(viewProps as any)}
       >
         <ListItemContent
@@ -63,7 +58,7 @@ export const ListItem: React.FC<PropsWithChildren<Props>> = ({
     );
   return (
     <View
-      className={`flex flex-row items-center justify-between bg-neutral-900 ${rowSizing} pr-4 pl-4 ${isDisabled ? "opacity-50" : ""}`}
+      className={`flex flex-row items-center justify-between bg-neutral-900 min-h-[42px] py-2 pr-4 pl-4 ${isDisabled ? "opacity-50" : ""}`}
       {...viewProps}
     >
       <ListItemContent

components/login/Login.tsx

@@ -146,7 +146,7 @@ export const Login: React.FC = () => {
       } else {
         Alert.alert(
           t("login.connection_failed"),
-          t("login.an_unexpected_error_occurred"),
+          t("login.an_unexpected_error_occured"),
         );
       }
     } finally {

components/login/TVLogin.tsx

@@ -437,7 +437,7 @@ export const TVLogin: React.FC = () => {
       } else {
         Alert.alert(
           t("login.connection_failed"),
-          t("login.an_unexpected_error_occurred"),
+          t("login.an_unexpected_error_occured"),
         );
       }
     } finally {
@@ -499,7 +499,7 @@ export const TVLogin: React.FC = () => {
         const message =
           error instanceof Error
             ? error.message
-            : t("login.an_unexpected_error_occurred");
+            : t("login.an_unexpected_error_occured");
         Alert.alert(t("login.connection_failed"), message);
         goToQRScreen();
       } finally {
@@ -523,7 +523,7 @@ export const TVLogin: React.FC = () => {
         } else {
           Alert.alert(
             t("login.connection_failed"),
-            t("login.an_unexpected_error_occurred"),
+            t("login.an_unexpected_error_occured"),
           );
         }
       } finally {
@@ -768,7 +768,7 @@ export const TVLogin: React.FC = () => {
               const message =
                 error instanceof Error
                   ? error.message
-                  : t("login.an_unexpected_error_occurred");
+                  : t("login.an_unexpected_error_occured");
               Alert.alert(t("login.connection_failed"), message);
               goToQRScreen();
             });

components/settings/AppearanceSettings.tsx

@@ -1,8 +1,7 @@
 import type React from "react";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { Linking } from "react-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
+import { Linking, Switch } from "react-native";
 import DisabledSetting from "@/components/settings/DisabledSetting";
 import useRouter from "@/hooks/useAppRouter";
 import { useSettings } from "@/utils/atoms/settings";
@@ -28,7 +27,6 @@ export const AppearanceSettings: React.FC = () => {
       <ListGroup title={t("home.settings.appearance.title")} className=''>
         <ListItem
           title={t("home.settings.other.show_custom_menu_links")}
-          subtitle={t("home.settings.other.show_custom_menu_links_hint")}
           disabled={pluginSettings?.showCustomMenuLinks?.locked}
           onPress={() =>
             Linking.openURL(
@@ -36,7 +34,7 @@ export const AppearanceSettings: React.FC = () => {
             )
           }
         >
-          <SettingSwitch
+          <Switch
             value={settings.showCustomMenuLinks}
             disabled={pluginSettings?.showCustomMenuLinks?.locked}
             onValueChange={(value) =>
@@ -46,51 +44,31 @@ export const AppearanceSettings: React.FC = () => {
         </ListItem>
         <ListItem
           title={t("home.settings.appearance.merge_next_up_continue_watching")}
-          subtitle={t(
-            "home.settings.appearance.merge_next_up_continue_watching_hint",
-          )}
         >
-          <SettingSwitch
+          <Switch
             value={settings.mergeNextUpAndContinueWatching}
             onValueChange={(value) =>
               updateSettings({ mergeNextUpAndContinueWatching: value })
             }
           />
         </ListItem>
-        <ListItem
-          title={t("home.settings.appearance.use_episode_images_next_up")}
-          subtitle={t(
-            "home.settings.appearance.use_episode_images_next_up_hint",
-          )}
-        >
-          <SettingSwitch
-            value={settings.useEpisodeImagesForNextUp}
-            onValueChange={(value) =>
-              updateSettings({ useEpisodeImagesForNextUp: value })
-            }
-          />
-        </ListItem>
-        <ListItem
-          title={t("home.settings.appearance.hide_remote_session_button")}
-          subtitle={t(
-            "home.settings.appearance.hide_remote_session_button_hint",
-          )}
-        >
-          <SettingSwitch
-            value={settings.hideRemoteSessionButton}
-            onValueChange={(value) =>
-              updateSettings({ hideRemoteSessionButton: value })
-            }
-          />
-        </ListItem>
         <ListItem
           onPress={() =>
             router.push("/settings/appearance/hide-libraries/page")
           }
           title={t("home.settings.other.hide_libraries")}
-          subtitle={t("home.settings.other.select_libraries_you_want_to_hide")}
           showArrow
         />
+        <ListItem
+          title={t("home.settings.appearance.hide_remote_session_button")}
+        >
+          <Switch
+            value={settings.hideRemoteSessionButton}
+            onValueChange={(value) =>
+              updateSettings({ hideRemoteSessionButton: value })
+            }
+          />
+        </ListItem>
       </ListGroup>
     </DisabledSetting>
   );

components/settings/AudioToggles.tsx

@@ -2,7 +2,7 @@ import { Ionicons } from "@expo/vector-icons";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, View, type ViewProps } from "react-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
+import { Switch } from "react-native-gesture-handler";
 import { AudioTranscodeMode, useSettings } from "@/utils/atoms/settings";
 import { Text } from "../common/Text";
 import { ListGroup } from "../list/ListGroup";
@@ -135,7 +135,7 @@ export const AudioToggles: React.FC<Props> = ({ ...props }) => {
           title={t("home.settings.audio.set_audio_track")}
           disabled={pluginSettings?.rememberAudioSelections?.locked}
         >
-          <SettingSwitch
+          <Switch
             value={settings.rememberAudioSelections}
             disabled={pluginSettings?.rememberAudioSelections?.locked}
             onValueChange={(value) =>

components/settings/ChromecastSettings.tsx

@@ -1,5 +1,4 @@
-import { View } from "react-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
+import { Switch, View } from "react-native";
 import { useSettings } from "@/utils/atoms/settings";
 import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
@@ -10,7 +9,7 @@ export const ChromecastSettings: React.FC = ({ ...props }) => {
     <View {...props}>
       <ListGroup title={"Chromecast"}>
         <ListItem title={"Enable H265 for Chromecast"}>
-          <SettingSwitch
+          <Switch
             value={settings.enableH265ForChromecast}
             onValueChange={(enableH265ForChromecast) =>
               updateSettings({ enableH265ForChromecast })

components/settings/GestureControls.tsx

@@ -2,7 +2,7 @@ import type React from "react";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import type { ViewProps } from "react-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
+import { Switch } from "react-native";
 import DisabledSetting from "@/components/settings/DisabledSetting";
 import { useSettings } from "@/utils/atoms/settings";
 import { ListGroup } from "../list/ListGroup";
@@ -39,7 +39,7 @@ export const GestureControls: React.FC<Props> = ({ ...props }) => {
           )}
           disabled={pluginSettings?.enableHorizontalSwipeSkip?.locked}
         >
-          <SettingSwitch
+          <Switch
             value={settings.enableHorizontalSwipeSkip}
             disabled={pluginSettings?.enableHorizontalSwipeSkip?.locked}
             onValueChange={(enableHorizontalSwipeSkip) =>
@@ -55,7 +55,7 @@ export const GestureControls: React.FC<Props> = ({ ...props }) => {
           )}
           disabled={pluginSettings?.enableLeftSideBrightnessSwipe?.locked}
         >
-          <SettingSwitch
+          <Switch
             value={settings.enableLeftSideBrightnessSwipe}
             disabled={pluginSettings?.enableLeftSideBrightnessSwipe?.locked}
             onValueChange={(enableLeftSideBrightnessSwipe) =>
@@ -71,7 +71,7 @@ export const GestureControls: React.FC<Props> = ({ ...props }) => {
           )}
           disabled={pluginSettings?.enableRightSideVolumeSwipe?.locked}
         >
-          <SettingSwitch
+          <Switch
             value={settings.enableRightSideVolumeSwipe}
             disabled={pluginSettings?.enableRightSideVolumeSwipe?.locked}
             onValueChange={(enableRightSideVolumeSwipe) =>
@@ -87,7 +87,7 @@ export const GestureControls: React.FC<Props> = ({ ...props }) => {
           )}
           disabled={pluginSettings?.hideVolumeSlider?.locked}
         >
-          <SettingSwitch
+          <Switch
             value={settings.hideVolumeSlider}
             disabled={pluginSettings?.hideVolumeSlider?.locked}
             onValueChange={(hideVolumeSlider) =>
@@ -103,7 +103,7 @@ export const GestureControls: React.FC<Props> = ({ ...props }) => {
           )}
           disabled={pluginSettings?.hideBrightnessSlider?.locked}
         >
-          <SettingSwitch
+          <Switch
             value={settings.hideBrightnessSlider}
             disabled={pluginSettings?.hideBrightnessSlider?.locked}
             onValueChange={(hideBrightnessSlider) =>

components/settings/KefinTweaks.tsx

@@ -1,6 +1,5 @@
 import { useTranslation } from "react-i18next";
-import { Text, View } from "react-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
+import { Switch, Text, View } from "react-native";
 import { useSettings } from "@/utils/atoms/settings";
 
 export const KefinTweaksSettings = () => {
@@ -21,7 +20,7 @@ export const KefinTweaksSettings = () => {
             {isEnabled ? t("Watchlist On") : t("Watchlist Off")}
           </Text>
 
-          <SettingSwitch
+          <Switch
             value={isEnabled}
             onValueChange={(value) => updateSettings({ useKefinTweaks: value })}
             trackColor={{ false: "#555", true: "purple" }}

components/settings/LocalNetworkSettings.tsx

@@ -2,9 +2,8 @@ import { Ionicons } from "@expo/vector-icons";
 import type React from "react";
 import { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { TouchableOpacity, View } from "react-native";
+import { Switch, TouchableOpacity, View } from "react-native";
 import { toast } from "sonner-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
 import { useWifiSSID } from "@/hooks/useWifiSSID";
 import { useServerUrl } from "@/providers/ServerUrlProvider";
 import { storage } from "@/utils/mmkv";
@@ -148,10 +147,7 @@ export function LocalNetworkSettings(): React.ReactElement | null {
           title={t("home.settings.network.auto_switch_enabled")}
           subtitle={t("home.settings.network.auto_switch_description")}
         >
-          <SettingSwitch
-            value={config.enabled}
-            onValueChange={handleToggleEnabled}
-          />
+          <Switch value={config.enabled} onValueChange={handleToggleEnabled} />
         </ListItem>
       </ListGroup>
 

components/settings/MpvSubtitleSettings.tsx

@@ -1,7 +1,6 @@
 import { Ionicons } from "@expo/vector-icons";
 import { useMemo } from "react";
-import { Platform, View, type ViewProps } from "react-native";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
+import { Platform, Switch, View, type ViewProps } from "react-native";
 import { Stepper } from "@/components/inputs/Stepper";
 import { Text } from "../common/Text";
 import { ListGroup } from "../list/ListGroup";
@@ -123,7 +122,7 @@ export const MpvSubtitleSettings: React.FC<Props> = ({ ...props }) => {
         )}
 
         <ListItem title='Opaque Background'>
-          <SettingSwitch
+          <Switch
             value={settings.mpvSubtitleBackgroundEnabled ?? false}
             onValueChange={(value) =>
               updateSettings({ mpvSubtitleBackgroundEnabled: value })

components/settings/OtherSettings.tsx

@@ -3,9 +3,8 @@ import { TFunction } from "i18next";
 import type React from "react";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { Linking, View } from "react-native";
+import { Linking, Switch, View } from "react-native";
 import { BITRATES } from "@/components/BitrateSelector";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
 import { PlatformDropdown } from "@/components/PlatformDropdown";
 import DisabledSetting from "@/components/settings/DisabledSetting";
 import useRouter from "@/hooks/useAppRouter";
@@ -133,7 +132,7 @@ export const OtherSettings: React.FC = () => {
           title={t("home.settings.other.safe_area_in_controls")}
           disabled={pluginSettings?.safeAreaInControlsEnabled?.locked}
         >
-          <SettingSwitch
+          <Switch
             value={settings.safeAreaInControlsEnabled}
             disabled={pluginSettings?.safeAreaInControlsEnabled?.locked}
             onValueChange={(value) =>
@@ -151,7 +150,7 @@ export const OtherSettings: React.FC = () => {
             )
           }
         >
-          <SettingSwitch
+          <Switch
             value={settings.showCustomMenuLinks}
             disabled={pluginSettings?.showCustomMenuLinks?.locked}
             onValueChange={(value) =>
@@ -189,7 +188,7 @@ export const OtherSettings: React.FC = () => {
           title={t("home.settings.other.disable_haptic_feedback")}
           disabled={pluginSettings?.disableHapticFeedback?.locked}
         >
-          <SettingSwitch
+          <Switch
             value={settings.disableHapticFeedback}
             disabled={pluginSettings?.disableHapticFeedback?.locked}
             onValueChange={(disableHapticFeedback) =>

components/settings/PlaybackControlsSettings.tsx

@@ -3,9 +3,8 @@ import { TFunction } from "i18next";
 import type React from "react";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { View } from "react-native";
+import { Switch, View } from "react-native";
 import { BITRATES } from "@/components/BitrateSelector";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
 import { PlatformDropdown } from "@/components/PlatformDropdown";
 import { PLAYBACK_SPEEDS } from "@/components/PlaybackSpeedSelector";
 import DisabledSetting from "@/components/settings/DisabledSetting";
@@ -116,7 +115,7 @@ export const PlaybackControlsSettings: React.FC = () => {
 
   return (
     <DisabledSetting disabled={disabled}>
-      <ListGroup title={t("home.settings.other.other_title")} className='mb-4'>
+      <ListGroup title={t("home.settings.other.other_title")} className=''>
         <ListItem
           title={t("home.settings.other.video_orientation")}
           disabled={pluginSettings?.defaultVideoOrientation?.locked}
@@ -147,7 +146,7 @@ export const PlaybackControlsSettings: React.FC = () => {
           title={t("home.settings.other.safe_area_in_controls")}
           disabled={pluginSettings?.safeAreaInControlsEnabled?.locked}
         >
-          <SettingSwitch
+          <Switch
             value={settings.safeAreaInControlsEnabled}
             disabled={pluginSettings?.safeAreaInControlsEnabled?.locked}
             onValueChange={(value) =>
@@ -206,7 +205,7 @@ export const PlaybackControlsSettings: React.FC = () => {
           title={t("home.settings.other.disable_haptic_feedback")}
           disabled={pluginSettings?.disableHapticFeedback?.locked}
         >
-          <SettingSwitch
+          <Switch
             value={settings.disableHapticFeedback}
             disabled={pluginSettings?.disableHapticFeedback?.locked}
             onValueChange={(disableHapticFeedback) =>
@@ -219,7 +218,7 @@ export const PlaybackControlsSettings: React.FC = () => {
           title={t("home.settings.other.auto_play_next_episode")}
           disabled={pluginSettings?.autoPlayNextEpisode?.locked}
         >
-          <SettingSwitch
+          <Switch
             value={settings.autoPlayNextEpisode}
             disabled={pluginSettings?.autoPlayNextEpisode?.locked}
             onValueChange={(autoPlayNextEpisode) =>

components/settings/QuickConnect.tsx

@@ -58,7 +58,7 @@ export const QuickConnect: React.FC<Props> = ({ ...props }) => {
           successHapticFeedback();
           Alert.alert(
             t("home.settings.quick_connect.success"),
-            t("home.settings.quick_connect.quick_connect_authorized"),
+            t("home.settings.quick_connect.quick_connect_autorized"),
           );
           setQuickConnectCode(undefined);
           bottomSheetModalRef?.current?.close();

components/settings/StorageSettings.tsx

@@ -1,6 +1,6 @@
-import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useQuery } from "@tanstack/react-query";
 import { useTranslation } from "react-i18next";
-import { Alert, Platform, View } from "react-native";
+import { Platform, View } from "react-native";
 import { toast } from "sonner-native";
 import { Text } from "@/components/common/Text";
 import { Colors } from "@/constants/Colors";
@@ -12,7 +12,6 @@ import { ListItem } from "../list/ListItem";
 export const StorageSettings = () => {
   const { deleteAllFiles, appSizeUsage } = useDownload();
   const { t } = useTranslation();
-  const queryClient = useQueryClient();
   const successHapticFeedback = useHaptic("success");
   const errorHapticFeedback = useHaptic("error");
 
@@ -28,38 +27,16 @@ export const StorageSettings = () => {
         used: (app.total - app.remaining) / app.total,
       };
     },
-    // Keep the bar moving while a download is writing to disk.
-    refetchInterval: 10 * 1000,
   });
 
-  const onDeleteClicked = () => {
-    Alert.alert(
-      t("home.settings.storage.delete_all_downloaded_files_confirm"),
-      t("home.settings.storage.delete_all_downloaded_files_confirm_desc"),
-      [
-        {
-          text: t("common.cancel"),
-          style: "cancel",
-        },
-        {
-          text: t("common.ok"),
-          style: "destructive",
-          onPress: async () => {
-            try {
-              await deleteAllFiles();
-              successHapticFeedback();
-            } catch (_e) {
-              errorHapticFeedback();
-              toast.error(t("home.settings.toasts.error_deleting_files"));
-            } finally {
-              // Reflect the freed space immediately instead of waiting for
-              // the next poll.
-              queryClient.invalidateQueries({ queryKey: ["appSize"] });
-            }
-          },
-        },
-      ],
-    );
+  const onDeleteClicked = async () => {
+    try {
+      await deleteAllFiles();
+      successHapticFeedback();
+    } catch (_e) {
+      errorHapticFeedback();
+      toast.error(t("home.settings.toasts.error_deleting_files"));
+    }
   };
 
   const calculatePercentage = (value: number, total: number) => {
@@ -125,7 +102,7 @@ export const StorageSettings = () => {
         </View>
       </View>
       {!Platform.isTV && (
-        <ListGroup className={Platform.OS === "android" ? "mt-4" : undefined}>
+        <ListGroup>
           <ListItem
             textColor='red'
             onPress={onDeleteClicked}

components/settings/SubtitleToggles.tsx

@@ -3,8 +3,8 @@ import { SubtitlePlaybackMode } from "@jellyfin/sdk/lib/generated-client";
 import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, View, type ViewProps } from "react-native";
+import { Switch } from "react-native-gesture-handler";
 import { Input } from "@/components/common/Input";
-import { SettingSwitch } from "@/components/common/SettingSwitch";
 import { Stepper } from "@/components/inputs/Stepper";
 import { useSettings } from "@/utils/atoms/settings";
 import { Text } from "../common/Text";
@@ -98,7 +98,6 @@ export const SubtitleToggles: React.FC<Props> = ({ ...props }) => {
   return (
     <View {...props}>
       <ListGroup
-        className='mb-4'
         title={t("home.settings.subtitles.subtitle_title")}
         description={
           <Text className='text-[#8E8D91] text-xs'>
@@ -153,7 +152,7 @@ export const SubtitleToggles: React.FC<Props> = ({ ...props }) => {
           title={t("home.settings.subtitles.set_subtitle_track")}
           disabled={pluginSettings?.rememberSubtitleSelections?.locked}
         >
-          <SettingSwitch
+          <Switch
             value={settings.rememberSubtitleSelections}
             disabled={pluginSettings?.rememberSubtitleSelections?.locked}
             onValueChange={(value) =>

components/tv/TVPosterCard.tsx

@@ -72,9 +72,6 @@ export interface TVPosterCardProps {
 
   /** Custom image URL getter - if not provided, uses smart URL logic */
   imageUrlGetter?: (item: BaseItemDto) => string | undefined;
-
-  /** For horizontal episodes, prefer the episode's own image over the series thumb */
-  preferEpisodeImage?: boolean;
 }
 
 /**
@@ -111,7 +108,6 @@ export const TVPosterCard: React.FC<TVPosterCardProps> = ({
   glowColor = "white",
   scaleAmount = 1.05,
   imageUrlGetter,
-  preferEpisodeImage = false,
 }) => {
   const api = useAtomValue(apiAtom);
   const posterSizes = useScaledTVPosterSizes();
@@ -143,14 +139,9 @@ export const TVPosterCard: React.FC<TVPosterCardProps> = ({
     if (orientation === "horizontal") {
       // Episode: prefer series thumb image for consistent look (like hero section)
       if (item.Type === "Episode") {
-        // Opt-in: use the episode's own image instead of the series thumb.
-        if (preferEpisodeImage && item.ImageTags?.Primary) {
-          return `${api.basePath}/Items/${item.Id}/Images/Primary?fillHeight=600&quality=80&tag=${item.ImageTags.Primary}`;
-        }
-        // First try parent/series thumb (horizontal series artwork).
-        // Matched pair: ParentThumbItemId owns the Thumb tag, not ParentBackdropItemId.
-        if (item.ParentThumbItemId && item.ParentThumbImageTag) {
-          return `${api.basePath}/Items/${item.ParentThumbItemId}/Images/Thumb?fillHeight=700&quality=80&tag=${item.ParentThumbImageTag}`;
+        // First try parent/series thumb (horizontal series artwork)
+        if (item.ParentBackdropItemId && item.ParentThumbImageTag) {
+          return `${api.basePath}/Items/${item.ParentBackdropItemId}/Images/Thumb?fillHeight=700&quality=80&tag=${item.ParentThumbImageTag}`;
         }
         // Fall back to episode's own primary image
         if (item.ImageTags?.Primary) {
@@ -182,7 +173,7 @@ export const TVPosterCard: React.FC<TVPosterCardProps> = ({
       item,
       width: width * 2, // 2x for quality on large screens
     });
-  }, [api, item, orientation, width, imageUrlGetter, preferEpisodeImage]);
+  }, [api, item, orientation, width, imageUrlGetter]);
 
   // Progress calculation
   const progress = useMemo(() => {

components/video-player/controls/Controls.tv.tsx

@@ -51,6 +51,7 @@ import { useOfflineMode } from "@/providers/OfflineModeProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import type { TVOptionItem } from "@/utils/atoms/tvOptionModal";
 import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
+import { compareTracksForMenu } from "@/utils/jellyfin/subtitleUtils";
 import { formatTimeString, msToTicks, ticksToMs } from "@/utils/time";
 import { CONTROLS_CONSTANTS } from "./constants";
 import { useVideoContext } from "./contexts/VideoContext";
@@ -317,8 +318,10 @@ export const Controls: FC<Props> = ({
     try {
       const streams = (await onRefreshSubtitleTracks?.()) ?? [];
       // Skip streams without a real index: `?? -1` would alias them to the
-      // "disable subtitles" sentinel and mis-route selection.
-      return streams
+      // "disable subtitles" sentinel and mis-route selection. Order like
+      // jellyfin-web (embedded first, externals last, forced/default up).
+      return [...streams]
+        .sort(compareTracksForMenu)
         .filter((stream) => typeof stream.Index === "number")
         .map((stream) => {
           const index = stream.Index as number;
@@ -601,6 +604,9 @@ export const Controls: FC<Props> = ({
       mediaSourceId: mediaSource?.Id,
       subtitleTracks: tracksWithoutDisable,
       currentSubtitleIndex: subtitleIndex ?? -1,
+      // In-player selection can navigate (replacePlayer for burn-in switches);
+      // apply it after the modal route is dismissed so it isn't swallowed.
+      deferApplyUntilDismissed: true,
       onDisableSubtitles: () => {
         // Find and call the "Disable" track's setTrack from VideoContext
         const disableTrack = videoContextSubtitleTracks?.find(

components/video-player/controls/contexts/VideoContext.tsx

@@ -23,32 +23,29 @@
  *    - Used to report playback state to Jellyfin server
  *    - Value of -1 means disabled/none
  *
- * 2. MPV INDEX (track.mpvIndex)
- *    - MPV's internal track ID
- *    - MPV orders tracks as: [all embedded, then all external]
- *    - IDs: 1..embeddedCount for embedded, embeddedCount+1.. for external
- *    - Value of -1 means track needs replacePlayer() (e.g., burned-in sub)
+ * 2. PLAYER TRACK (selected by IDENTITY, not position)
+ *    - Selection resolves the server Index against MPV's REAL track list via
+ *      applyMpvSubtitleSelection: externals matched by external-filename,
+ *      embedded by language/title. `track.mpvIndex` is no longer used to select
+ *      (kept -1) — positional mapping mis-selected when externals/embedded were
+ *      reordered or the server hid embedded subs (#954 et al.).
  *
  * ============================================================================
  * SUBTITLE HANDLING
  * ============================================================================
  *
- * Embedded (DeliveryMethod.Embed):
- *   - Already in MPV's track list
- *   - Select via setSubtitleTrack(mpvId)
- *
- * External (DeliveryMethod.External):
- *   - Loaded into MPV on video start
- *   - Select via setSubtitleTrack(embeddedCount + externalPosition + 1)
+ * Embedded & External:
+ *   - Selected via applyMpvSubtitleSelection (identity match against the live
+ *     track list). Menu order matches jellyfin-web (compareTracksForMenu:
+ *     embedded first, externals last, forced/default float up).
  *
  * Image-based during transcoding:
- *   - Burned into video by Jellyfin, not in MPV
- *   - Requires replacePlayer() to change
+ *   - Burned into video by Jellyfin, not in MPV → replacePlayer() to change.
  */
 
-import { SubtitleDeliveryMethod } from "@jellyfin/sdk/lib/generated-client";
 import { File } from "expo-file-system";
 import { useLocalSearchParams } from "expo-router";
+import { useAtomValue } from "jotai";
 import type React from "react";
 import {
   createContext,
@@ -61,16 +58,18 @@ import {
 import { Platform } from "react-native";
 import useRouter from "@/hooks/useAppRouter";
 import type { MpvAudioTrack } from "@/modules";
+import { apiAtom } from "@/providers/JellyfinProvider";
 import { useOfflineMode } from "@/providers/OfflineModeProvider";
 import { getSubtitlesForItem } from "@/utils/atoms/downloadedSubtitles";
-import { isImageBasedSubtitle } from "@/utils/jellyfin/subtitleUtils";
-import type { Track } from "../types";
+import {
+  applyMpvSubtitleSelection,
+  compareTracksForMenu,
+  getExternalSubtitleUrl,
+  isImageBasedSubtitle,
+} from "@/utils/jellyfin/subtitleUtils";
+import { LOCAL_SUBTITLE_INDEX_START, type Track } from "../types";
 import { usePlayerContext, usePlayerControls } from "./PlayerContext";
 
-// Starting index for local (client-downloaded) subtitles
-// Uses negative indices to avoid collision with Jellyfin indices
-const LOCAL_SUBTITLE_INDEX_START = -100;
-
 interface VideoContextProps {
   subtitleTracks: Track[] | null;
   audioTracks: Track[] | null;
@@ -87,6 +86,7 @@ export const VideoProvider: React.FC<{ children: ReactNode }> = ({
   const { tracksReady, mediaSource, downloadedItem } = usePlayerContext();
   const playerControls = usePlayerControls();
   const offline = useOfflineMode();
+  const api = useAtomValue(apiAtom);
   const router = useRouter();
 
   const { itemId, audioIndex, bitrateValue, subtitleIndex, playbackPosition } =
@@ -126,10 +126,17 @@ export const VideoProvider: React.FC<{ children: ReactNode }> = ({
     audioIndex?: string;
     subtitleIndex?: string;
   }) => {
+    // The URL param can hold a local-sub sentinel (selected via setParams) that
+    // only exists in the dying player — the server must get "none" (-1) instead.
+    // NaN (missing/blank param) fails the comparison and passes through as-is.
+    const fallbackSubtitleIndex =
+      Number.parseInt(subtitleIndex, 10) <= LOCAL_SUBTITLE_INDEX_START
+        ? "-1"
+        : subtitleIndex;
     const queryParams = new URLSearchParams({
       itemId: itemId ?? "",
       audioIndex: params.audioIndex ?? audioIndex,
-      subtitleIndex: params.subtitleIndex ?? subtitleIndex,
+      subtitleIndex: params.subtitleIndex ?? fallbackSubtitleIndex,
       mediaSourceId: mediaSource?.Id ?? "",
       bitrateValue: bitrateValue,
       playbackPosition: playbackPosition,
@@ -141,6 +148,19 @@ export const VideoProvider: React.FC<{ children: ReactNode }> = ({
   useEffect(() => {
     if (!tracksReady) return;
 
+    // Guard every state commit against stale runs: api?.basePath /
+    // isCurrentSubImageBased can flip mid-run and restart this effect, and an
+    // earlier async run (which captured an old `api`) must not finish later and
+    // overwrite the fresh track list with callbacks bound to stale closures.
+    // The cleanup flips `cancelled`, so any late commit from a dead run is dropped.
+    let cancelled = false;
+    const commitSubtitleTracks = (next: Track[]) => {
+      if (!cancelled) setSubtitleTracks(next);
+    };
+    const commitAudioTracks = (next: Track[]) => {
+      if (!cancelled) setAudioTracks(next);
+    };
+
     const fetchTracks = async () => {
       // Check if this is offline transcoded content
       // For transcoded offline content, only ONE audio track exists in the file
@@ -166,10 +186,10 @@ export const VideoProvider: React.FC<{ children: ReactNode }> = ({
               },
             },
           ];
-          setAudioTracks(audio);
+          commitAudioTracks(audio);
         } else {
           // Fallback: show no audio tracks if the stored track wasn't found
-          setAudioTracks([]);
+          commitAudioTracks([]);
         }
 
         // For subtitles in transcoded offline content:
@@ -179,6 +199,24 @@ export const VideoProvider: React.FC<{ children: ReactNode }> = ({
           downloadedItem.userData.subtitleStreamIndex;
         const subs: Track[] = [];
 
+        // If an IMAGE subtitle was burned into the transcoded download it's in the
+        // video pixels — it can't be turned off or swapped. Show only that entry
+        // instead of advertising "Disable"/text controls that can't affect it.
+        const burnedInSub = allSubs.find(
+          (s) => s.Index === downloadedSubtitleIndex,
+        );
+        if (burnedInSub && isImageBasedSubtitle(burnedInSub)) {
+          commitSubtitleTracks([
+            {
+              name: `${burnedInSub.DisplayTitle || "Unknown"} (burned in)`,
+              index: burnedInSub.Index ?? -1,
+              mpvIndex: -1,
+              setTrack: () => {},
+            },
+          ]);
+          return;
+        }
+
         // Add "Disable" option
         subs.push({
           name: "Disable",
@@ -190,123 +228,84 @@ export const VideoProvider: React.FC<{ children: ReactNode }> = ({
           },
         });
 
-        // For text-based subs, they should still be available in the file
-        let subIdx = 1;
-        for (const sub of allSubs) {
-          if (sub.IsTextSubtitleStream) {
+        // Text subs are muxed into the transcoded file and switchable; resolve by
+        // identity against MPV's real track list (same as online). Order matches web.
+        // Image subs aren't in the transcoded file (only the burned one was, handled
+        // above), so skip them here.
+        for (const sub of [...allSubs].sort(compareTracksForMenu)) {
+          if (!isImageBasedSubtitle(sub)) {
             subs.push({
               name: sub.DisplayTitle || "Unknown",
               index: sub.Index ?? -1,
-              mpvIndex: subIdx,
+              mpvIndex: -1,
               setTrack: () => {
-                playerControls.setSubtitleTrack(subIdx);
-                router.setParams({ subtitleIndex: String(sub.Index) });
-              },
-            });
-            subIdx++;
-          } else if (sub.Index === downloadedSubtitleIndex) {
-            // This image-based sub was burned in - show it but indicate it's active
-            subs.push({
-              name: `${sub.DisplayTitle || "Unknown"} (burned in)`,
-              index: sub.Index ?? -1,
-              mpvIndex: -1, // Can't be changed
-              setTrack: () => {
-                // Already burned in, just update params
                 router.setParams({ subtitleIndex: String(sub.Index) });
+                void applyMpvSubtitleSelection(playerControls, {
+                  subtitleStreams: allSubs,
+                  jellyfinSubtitleIndex: sub.Index ?? -1,
+                  getExpectedExternalUrl: (s) => {
+                    if (!s.DeliveryUrl) return undefined;
+                    if (offline) return s.DeliveryUrl;
+                    return api?.basePath
+                      ? `${api.basePath}${s.DeliveryUrl}`
+                      : undefined;
+                  },
+                });
               },
             });
           }
         }
 
-        setSubtitleTracks(subs.sort((a, b) => a.index - b.index));
+        commitSubtitleTracks(subs);
         return;
       }
 
       // MPV track handling
       const audioData = await playerControls.getAudioTracks().catch(() => null);
+      if (cancelled) return;
       const playerAudio = (audioData as MpvAudioTrack[]) ?? [];
 
-      // Separate embedded vs external subtitles from Jellyfin's list
-      // MPV orders tracks as: [all embedded, then all external]
-      const embeddedSubs = allSubs.filter(
-        (s) => s.DeliveryMethod === SubtitleDeliveryMethod.Embed,
-      );
-      const externalSubs = allSubs.filter(
-        (s) => s.DeliveryMethod === SubtitleDeliveryMethod.External,
-      );
-
-      // Count embedded subs that will be in MPV
-      // (excludes image-based subs during transcoding as they're burned in)
-      const embeddedInPlayer = embeddedSubs.filter(
-        (s) => !isTranscoding || !isImageBasedSubtitle(s),
-      );
-
       const subs: Track[] = [];
 
-      // Process all Jellyfin subtitles
-      for (const sub of allSubs) {
-        const isEmbedded = sub.DeliveryMethod === SubtitleDeliveryMethod.Embed;
-        const isExternal =
-          sub.DeliveryMethod === SubtitleDeliveryMethod.External;
-
-        // For image-based subs during transcoding, need to refresh player
-        if (isTranscoding && isImageBasedSubtitle(sub)) {
-          subs.push({
-            name: sub.DisplayTitle || "Unknown",
-            index: sub.Index ?? -1,
-            mpvIndex: -1,
-            setTrack: () => {
-              replacePlayer({ subtitleIndex: String(sub.Index) });
-            },
-          });
-          continue;
-        }
-
-        // Calculate MPV track ID based on type
-        // MPV IDs: [1..embeddedCount] for embedded, [embeddedCount+1..] for external
-        let mpvId = -1;
-
-        if (isEmbedded) {
-          // Find position among embedded subs that are in player
-          const embeddedPosition = embeddedInPlayer.findIndex(
-            (s) => s.Index === sub.Index,
-          );
-          if (embeddedPosition !== -1) {
-            mpvId = embeddedPosition + 1; // 1-based ID
-          }
-        } else if (isExternal) {
-          // Find position among external subs, offset by embedded count
-          const externalPosition = externalSubs.findIndex(
-            (s) => s.Index === sub.Index,
-          );
-          if (externalPosition !== -1) {
-            mpvId = embeddedInPlayer.length + externalPosition + 1;
-          }
-        }
+      // Process all Jellyfin subtitles. Selection resolves against MPV's real
+      // track list by identity (applyMpvSubtitleSelection) — never positional
+      // index math, which mis-selects across external/embedded reordering and
+      // server-hidden embedded subs (#954/#1690/#618/#1467/#976/#1451).
+      // Order matches jellyfin-web (embedded first, externals last, forced/default up).
+      for (const sub of [...allSubs].sort(compareTracksForMenu)) {
+        // Image-based subs during transcoding are burned into the video by the
+        // server; both switching TO one and switching AWAY from a currently
+        // active one require a player refresh (re-transcode), not a track change.
+        const needsReplace =
+          isTranscoding &&
+          (isImageBasedSubtitle(sub) || isCurrentSubImageBased);
 
         subs.push({
           name: sub.DisplayTitle || "Unknown",
           index: sub.Index ?? -1,
-          mpvIndex: mpvId,
+          mpvIndex: -1,
           setTrack: () => {
-            // Transcoding + switching to/from image-based sub
-            if (
-              isTranscoding &&
-              (isImageBasedSubtitle(sub) || isCurrentSubImageBased)
-            ) {
+            if (needsReplace) {
               replacePlayer({ subtitleIndex: String(sub.Index) });
               return;
             }
-
-            // Direct switch in player
-            if (mpvId !== -1) {
-              playerControls.setSubtitleTrack(mpvId);
-              router.setParams({ subtitleIndex: String(sub.Index) });
-              return;
-            }
-
-            // Fallback - refresh player
-            replacePlayer({ subtitleIndex: String(sub.Index) });
+            router.setParams({ subtitleIndex: String(sub.Index) });
+            void applyMpvSubtitleSelection(playerControls, {
+              subtitleStreams: allSubs,
+              jellyfinSubtitleIndex: sub.Index ?? -1,
+              // Mirror how external subs are loaded into MPV (online: basePath +
+              // DeliveryUrl, offline: local DeliveryUrl) so identity matching by
+              // external-filename lines up.
+              getExpectedExternalUrl: (s) =>
+                getExternalSubtitleUrl(s, { offline, basePath: api?.basePath }),
+            }).then((result) => {
+              // Safety net: a menu-listed sub the player can't select (server-
+              // burned Encode, sidecar never sub-added) only shows up after the
+              // server re-processes the stream with it.
+              if (result.kind === "notFound" || result.kind === "burnedIn") {
+                replacePlayer({ subtitleIndex: String(sub.Index) });
+              }
+            });
           },
         });
       }
@@ -374,12 +373,29 @@ export const VideoProvider: React.FC<{ children: ReactNode }> = ({
         }
       }
 
-      setSubtitleTracks(subs.sort((a, b) => a.index - b.index));
-      setAudioTracks(audio);
+      // Already in jellyfin-web order (sorted iteration above); "Disable" stays
+      // at the front (unshifted), local downloaded subs at the end.
+      commitSubtitleTracks(subs);
+      commitAudioTracks(audio);
     };
 
     fetchTracks();
-  }, [tracksReady, mediaSource, offline, downloadedItem, itemId]);
+    return () => {
+      cancelled = true;
+    };
+    // api?.basePath: setTrack builds external-sub URLs from it — rebuild once the
+    // API is ready so online externals don't resolve with undefined.
+    // isCurrentSubImageBased: setTrack closes over it for the transcode replacePlayer
+    // decision — rebuild when it flips so we refresh the stream when we should.
+  }, [
+    tracksReady,
+    mediaSource,
+    offline,
+    downloadedItem,
+    itemId,
+    api?.basePath,
+    isCurrentSubImageBased,
+  ]);
 
   return (
     <VideoContext.Provider value={{ subtitleTracks, audioTracks }}>

components/video-player/controls/types.ts

@@ -28,4 +28,20 @@ type Track = {
   localPath?: string;
 };
 
+/**
+ * Synthetic `Track.index` base for client-side downloaded subtitles (loaded via
+ * `addSubtitleFile`, no matching Jellyfin MediaStream). Local sub k gets
+ * `LOCAL_SUBTITLE_INDEX_START - k`, so `index <= LOCAL_SUBTITLE_INDEX_START`
+ * identifies a local track.
+ */
+export const LOCAL_SUBTITLE_INDEX_START = -100;
+
+/**
+ * Map a client-side subtitle index to what the Jellyfin stream API understands.
+ * Local sentinel indexes have no matching MediaStream on the server, which
+ * expects -1 ("no subtitles") when re-negotiating a stream.
+ */
+export const toServerSubtitleIndex = (index: number): number =>
+  index <= LOCAL_SUBTITLE_INDEX_START ? -1 : index;
+
 export type { EmbeddedSubtitle, ExternalSubtitle, Track, TranscodedSubtitle };

hooks/useTVSubtitleModal.ts

@@ -14,6 +14,7 @@ interface ShowSubtitleModalParams {
   onServerSubtitleDownloaded?: () => void;
   onLocalSubtitleDownloaded?: (path: string) => void;
   refreshSubtitleTracks?: () => Promise<Track[]>;
+  deferApplyUntilDismissed?: boolean;
 }
 
 export const useTVSubtitleModal = () => {
@@ -30,6 +31,7 @@ export const useTVSubtitleModal = () => {
         onServerSubtitleDownloaded: params.onServerSubtitleDownloaded,
         onLocalSubtitleDownloaded: params.onLocalSubtitleDownloaded,
         refreshSubtitleTracks: params.refreshSubtitleTracks,
+        deferApplyUntilDismissed: params.deferApplyUntilDismissed,
       });
       router.push("/(auth)/tv-subtitle-modal");
     },

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

@@ -532,16 +532,29 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
             
             val trackId = mpv?.getPropertyInt("track-list/$i/id") ?: continue
             val track = mutableMapOf<String, Any>("id" to trackId)
-            
+
             mpv?.getPropertyString("track-list/$i/title")?.let { track["title"] = it }
             mpv?.getPropertyString("track-list/$i/lang")?.let { track["lang"] = it }
-            
+            mpv?.getPropertyString("track-list/$i/codec")?.let { track["codec"] = it }
+
+            // Identity fields used to map a Jellyfin subtitle to the real track
+            // (instead of fragile positional counting). `external` + `external-filename`
+            // uniquely identify a sub-added sidecar. `ff-index` is exposed for
+            // diagnostics / potential future exact-index matching; the current
+            // resolver matches embedded tracks by language/title, not ff-index.
+            val external = mpv?.getPropertyBoolean("track-list/$i/external") ?: false
+            track["external"] = external
+            mpv?.getPropertyString("track-list/$i/external-filename")?.let {
+                track["externalFilename"] = it
+            }
+            mpv?.getPropertyInt("track-list/$i/ff-index")?.let { track["ffIndex"] = it }
+
             val selected = mpv?.getPropertyBoolean("track-list/$i/selected") ?: false
             track["selected"] = selected
-            
+
             tracks.add(track)
         }
-        
+
         return tracks
     }
     
@@ -840,6 +853,13 @@ class MPVLayerRenderer(private val context: Context) : MPVLib.EventObserver {
                 initialAudioId?.let { if (it > 0) setAudioTrack(it) }
                 initialSubtitleId?.let { setSubtitleTrack(it) } ?: disableSubtitles()
 
+                // The disable above can race a JS-side identity selection that
+                // landed before FILE_LOADED (JS no longer passes an initial sid).
+                // Re-emit tracksReady so the idempotent JS re-apply always runs
+                // after it — for embedded-only files this is the only
+                // post-FILE_LOADED fire.
+                mainHandler.post { delegate?.onTracksReady() }
+
                 if (!isReadyToSeek) {
                     isReadyToSeek = true
                     mainHandler.post { delegate?.onReadyToSeek() }

modules/mpv-player/ios/MPVLayerRenderer.swift

@@ -508,6 +508,15 @@ final class MPVLayerRenderer {
             } else {
                 disableSubtitles()
             }
+            // The disable above can race a JS-side identity selection that
+            // landed before FILE_LOADED (JS no longer passes an initial sid).
+            // Re-emit tracksReady so the idempotent JS re-apply always runs
+            // after it — for embedded-only files this is the only
+            // post-FILE_LOADED fire.
+            DispatchQueue.main.async { [weak self] in
+                guard let self else { return }
+                self.delegate?.renderer(self, didBecomeTracksReady: true)
+            }
             if !isReadyToSeek {
                 isReadyToSeek = true
                 DispatchQueue.main.async { [weak self] in
@@ -759,8 +768,8 @@ final class MPVLayerRenderer {
                   trackType == "sub" else { continue }
             
             var trackId: Int64 = 0
-            getProperty(handle: handle, name: "track-list/\(i)/id", format: MPV_FORMAT_INT64, value: &trackId)
-            
+            guard getProperty(handle: handle, name: "track-list/\(i)/id", format: MPV_FORMAT_INT64, value: &trackId) >= 0 else { continue }
+
             var track: [String: Any] = ["id": Int(trackId)]
             
             if let title = getStringProperty(handle: handle, name: "track-list/\(i)/title") {
@@ -770,12 +779,34 @@ final class MPVLayerRenderer {
             if let lang = getStringProperty(handle: handle, name: "track-list/\(i)/lang") {
                 track["lang"] = lang
             }
-            
+
+            if let codec = getStringProperty(handle: handle, name: "track-list/\(i)/codec") {
+                track["codec"] = codec
+            }
+
+            // Identity fields used to map a Jellyfin subtitle to the real track
+            // (instead of fragile positional counting). `external` + `external-filename`
+            // uniquely identify a sub-added sidecar. `ff-index` is exposed for
+            // diagnostics / potential future exact-index matching; the current
+            // resolver matches embedded tracks by language/title, not ff-index.
+            var external: Int32 = 0
+            getProperty(handle: handle, name: "track-list/\(i)/external", format: MPV_FORMAT_FLAG, value: &external)
+            track["external"] = external != 0
+
+            if let extFilename = getStringProperty(handle: handle, name: "track-list/\(i)/external-filename") {
+                track["externalFilename"] = extFilename
+            }
+
+            var ffIndex: Int64 = 0
+            if getProperty(handle: handle, name: "track-list/\(i)/ff-index", format: MPV_FORMAT_INT64, value: &ffIndex) >= 0 {
+                track["ffIndex"] = Int(ffIndex)
+            }
+
             var selected: Int32 = 0
             getProperty(handle: handle, name: "track-list/\(i)/selected", format: MPV_FORMAT_FLAG, value: &selected)
             track["selected"] = selected != 0
-            
-            Logger.shared.log("getSubtitleTracks: found sub track id=\(trackId), title=\(track["title"] ?? "none"), lang=\(track["lang"] ?? "none")", type: "Info")
+
+            Logger.shared.log("getSubtitleTracks: found sub track id=\(trackId), title=\(track["title"] ?? "none"), lang=\(track["lang"] ?? "none"), external=\(external != 0)", type: "Info")
             tracks.append(track)
         }
         
@@ -872,8 +903,8 @@ final class MPVLayerRenderer {
                   trackType == "audio" else { continue }
             
             var trackId: Int64 = 0
-            getProperty(handle: handle, name: "track-list/\(i)/id", format: MPV_FORMAT_INT64, value: &trackId)
-            
+            guard getProperty(handle: handle, name: "track-list/\(i)/id", format: MPV_FORMAT_INT64, value: &trackId) >= 0 else { continue }
+
             var track: [String: Any] = ["id": Int(trackId)]
             
             if let title = getStringProperty(handle: handle, name: "track-list/\(i)/title") {

modules/mpv-player/src/MpvPlayer.types.ts

@@ -141,6 +141,14 @@ export type SubtitleTrack = {
   id: number;
   title?: string;
   lang?: string;
+  /** Subtitle codec (mpv `codec`), e.g. "subrip", "ass", "hdmv_pgs_subtitle". */
+  codec?: string;
+  /** True if loaded from a separate file via `sub-add` (mpv `external`). */
+  external?: boolean;
+  /** For external tracks: the exact URL/path it was loaded from (mpv `external-filename`). */
+  externalFilename?: string;
+  /** FFmpeg stream index (mpv `ff-index`); not guaranteed for non-lavf demuxers. */
+  ffIndex?: number;
   selected?: boolean;
 };
 

providers/Downloads/fileOperations.ts

@@ -96,24 +96,5 @@ export function getDownloadedItemSize(id: string): number {
  */
 export function calculateTotalDownloadedSize(): number {
   const items = getAllDownloadedItems();
-  return items.reduce((sum, item) => {
-    // Trickplay bytes count too — getDownloadedItemSize models per-item size
-    // as video + trickplay, the total must match.
-    const trickplaySize = item.trickPlayData?.size ?? 0;
-    // Read the live file size on disk so the total reflects actual usage and
-    // self-heals items whose stored videoFileSize is 0 (old schema, or
-    // `fileInfo.size` was undefined at download time). Fall back to the stored
-    // value if the file can't be stat'd.
-    if (item.videoFilePath) {
-      try {
-        const file = new File(filePathToUri(item.videoFilePath));
-        if (file.exists) {
-          return sum + (file.size ?? item.videoFileSize ?? 0) + trickplaySize;
-        }
-      } catch (error) {
-        console.warn("Failed to stat downloaded file for size:", error);
-      }
-    }
-    return sum + (item.videoFileSize ?? 0) + trickplaySize;
-  }, 0);
+  return items.reduce((sum, item) => sum + (item.videoFileSize || 0), 0);
 }

providers/Downloads/hooks/useDownloadOperations.ts

@@ -289,24 +289,7 @@ export function useDownloadOperations({
   );
 
   const appSizeUsage = useCallback(async () => {
-    let totalSize = calculateTotalDownloadedSize();
-
-    // Also count in-progress downloads (they write straight to their final
-    // path) so the growing file shows up as app usage instead of drifting
-    // into the generic device share until completion.
-    for (const process of processes) {
-      try {
-        const file = new File(
-          Paths.document,
-          `${generateFilename(process.item)}.mp4`,
-        );
-        if (file.exists) {
-          totalSize += file.size ?? 0;
-        }
-      } catch {
-        // File not created yet — ignore.
-      }
-    }
+    const totalSize = calculateTotalDownloadedSize();
 
     try {
       const [freeDiskStorage, totalDiskCapacity] = await Promise.all([
@@ -327,7 +310,7 @@ export function useDownloadOperations({
         appSize: totalSize,
       };
     }
-  }, [processes]);
+  }, []);
 
   return {
     startBackgroundDownload,

providers/JellyfinProvider.tsx

@@ -386,7 +386,7 @@ export const JellyfinProvider: React.FC<{ children: ReactNode }> = ({
             default:
               throw new Error(
                 t(
-                  "login.an_unexpected_error_occurred_did_you_enter_the_correct_url",
+                  "login.an_unexpected_error_occured_did_you_enter_the_correct_url",
                 ),
               );
           }

translations/ar.json

@@ -16,14 +16,14 @@
     "got_it": "حسنًا",
     "connection_failed": "فشل الاتصال",
     "could_not_connect_to_server": "تعذر الاتصال بالخادم. يرجى التحقق من الرابط واتصال الشبكة.",
-    "an_unexpected_error_occurred": "حدث خطأ غير متوقع",
+    "an_unexpected_error_occured": "حدث خطأ غير متوقع",
     "change_server": "تغيير الخادم",
     "invalid_username_or_password": "اسم المستخدم أو كلمة المرور غير صالحة",
     "user_does_not_have_permission_to_log_in": "ليس لدى المستخدم صَلاحِيَة تسجيل الدخول",
     "server_is_taking_too_long_to_respond_try_again_later": "يستغرق الخادم وقتًا طويلاً للرد، يرجى المحاولة مرة أخرى لاحقًا",
     "server_received_too_many_requests_try_again_later": "تلقى الخادم عددًا كبيرًا جدًا من الطلبات، يرجى المحاولة مرة أخرى لاحقًا.",
     "there_is_a_server_error": "هناك خطأ في الخادم",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "حدث خطأ غير متوقع. هل أدخلت رابط الخادم بشكل صحيح؟",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "حدث خطأ غير متوقع. هل أدخلت رابط الخادم بشكل صحيح؟",
     "too_old_server_text": "تم اكتشاف خادم Jellyfin غير مدعوم",
     "too_old_server_description": "يرجى تحديث Jellyfin إلى أحدث إصدار"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "تفويض الدخول السريع",
         "enter_the_quick_connect_code": "أدخل رمز الدخول السريع...",
         "success": "نجاح",
-        "quick_connect_authorized": "تم تفويض الدخول السريع",
+        "quick_connect_autorized": "تم تفويض الدخول السريع",
         "error": "خطأ",
         "invalid_code": "رمز غير صالح",
         "authorize": "تفويض"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "إظهار روابط القائمة المخصصة",
         "show_large_home_carousel": "إظهار شريط العرض الكبير (تجريبي)",
         "hide_libraries": "إخفاء المكتبات",
-        "select_libraries_you_want_to_hide": "اختر المكتبات التي تريد إخفاءها من تبويب المكتبة وأقسام الصفحة الرئيسية.",
+        "select_liraries_you_want_to_hide": "اختر المكتبات التي تريد إخفاءها من تبويب المكتبة وأقسام الصفحة الرئيسية.",
         "disable_haptic_feedback": "تعطيل ردود الفعل اللمسية",
         "default_quality": "الجودة الافتراضية",
         "default_playback_speed": "سرعة التشغيل الافتراضية",
@@ -384,8 +384,6 @@
         "device_usage": "الجهاز {{availableSpace}}%",
         "size_used": "تم استخدام {{used}} من {{total}}",
         "delete_all_downloaded_files": "حذف جميع الملفات التي تم تنزيلها",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "التخزين المؤقت للموسيقى",
         "music_cache_description": "تخزين الأغاني تلقائياً أثناء الاستماع لضمان تشغيل أكثر سلاسة ودعم الاستماع بدون اتصال",
         "clear_music_cache": "مسح التخزين المؤقت للموسيقى",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "اختر",
     "no_trailer_available": "لا يوجد مقطع دعائي متوفر",
     "video": "فيديو",
     "audio": "الصوت",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "خطأ",
     "failed_to_get_stream_url": "فشل في الحصول على رابط البث",
-    "an_error_occurred_while_playing_the_video": "حدث خطأ أثناء تشغيل الفيديو. تحقق من السجلات في الإعدادات.",
+    "an_error_occured_while_playing_the_video": "حدث خطأ أثناء تشغيل الفيديو. تحقق من السجلات في الإعدادات.",
     "client_error": "خطأ في المشغّل",
     "could_not_create_stream_for_chromecast": "تعذر إنشاء بث لـChromecast",
     "message_from_server": "رسالة من الخادم: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/ca.json

@@ -16,14 +16,14 @@
     "got_it": "Entesos",
     "connection_failed": "Ha fallat la connexió",
     "could_not_connect_to_server": "No s'ha pogut connectar amb el servidor. Comproveu l'URL i la connexió de xarxa.",
-    "an_unexpected_error_occurred": "S'ha produït un error inesperat",
+    "an_unexpected_error_occured": "S'ha produït un error inesperat",
     "change_server": "Canvia el servidor",
     "invalid_username_or_password": "Nom d'usuari o contrasenya incorrectes",
     "user_does_not_have_permission_to_log_in": "L'usuari no té permís per iniciar sessió",
     "server_is_taking_too_long_to_respond_try_again_later": "El servidor triga massa a respondre, torneu-ho a provar més tard",
     "server_received_too_many_requests_try_again_later": "El servidor ha rebut massa sol·licituds, torneu-ho a provar més tard.",
     "there_is_a_server_error": "Error del servidor",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "S'ha produït un error inesperat. Heu introduït correctament l'URL del servidor?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "S'ha produït un error inesperat. Heu introduït correctament l'URL del servidor?",
     "too_old_server_text": "Unsupported Jellyfin Server Discovered",
     "too_old_server_description": "Please update Jellyfin to the latest version"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Autoritza connexió ràpida",
         "enter_the_quick_connect_code": "Introdueix el codi de connexió ràpida...",
         "success": "Èxit",
-        "quick_connect_authorized": "Connexió ràpida autoritzada",
+        "quick_connect_autorized": "Connexió ràpida autoritzada",
         "error": "Error",
         "invalid_code": "Codi invàlid",
         "authorize": "Autoritza"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Mostrar enllaços del menú personalitzats",
         "show_large_home_carousel": "Show Large Home Carousel (beta)",
         "hide_libraries": "Oculta biblioteques",
-        "select_libraries_you_want_to_hide": "Seleccioneu les biblioteques que voleu ocultar de la pestanya Biblioteca i de les seccions de la pàgina d'inici.",
+        "select_liraries_you_want_to_hide": "Seleccioneu les biblioteques que voleu ocultar de la pestanya Biblioteca i de les seccions de la pàgina d'inici.",
         "disable_haptic_feedback": "Desactiva la resposta hàptica",
         "default_quality": "Qualitat per defecte",
         "default_playback_speed": "Default Playback Speed",
@@ -384,8 +384,6 @@
         "device_usage": "Dispositiu {{availableSpace}}%",
         "size_used": "{{used}} de {{total}} utilitzat",
         "delete_all_downloaded_files": "Suprimeix tots els fitxers descarregats",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music Cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Select",
     "no_trailer_available": "No trailer available",
     "video": "Vídeo",
     "audio": "Àudio",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Error",
     "failed_to_get_stream_url": "No s'ha pogut obtenir l'URL del flux",
-    "an_error_occurred_while_playing_the_video": "S'ha produït un error en reproduir el vídeo. Consulteu els registres a la configuració.",
+    "an_error_occured_while_playing_the_video": "S'ha produït un error en reproduir el vídeo. Consulteu els registres a la configuració.",
     "client_error": "Error del client",
     "could_not_create_stream_for_chromecast": "No s'ha pogut crear un flux per a Chromecast",
     "message_from_server": "Missatge del servidor: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/cs.json

@@ -16,14 +16,14 @@
     "got_it": "Rozumím",
     "connection_failed": "Připojení se nezdařilo",
     "could_not_connect_to_server": "Nelze se připojit k serveru. Zkontrolujte adresu URL a síťové připojení.",
-    "an_unexpected_error_occurred": "Došlo k neočekávané chybě",
+    "an_unexpected_error_occured": "Došlo k neočekávané chybě",
     "change_server": "Změnit server",
     "invalid_username_or_password": "Neplatné uživatelské jméno nebo heslo",
     "user_does_not_have_permission_to_log_in": "Uživatel nemá oprávnění k přihlášení",
     "server_is_taking_too_long_to_respond_try_again_later": "Reakce na server trvá příliš dlouho, zkuste to znovu později",
     "server_received_too_many_requests_try_again_later": "Server obdržel příliš mnoho požadavků, opakujte akci později.",
     "there_is_a_server_error": "Došlo k chybě serveru",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "Došlo k neočekávané chybě. Vložili jste adresu URL serveru?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Došlo k neočekávané chybě. Vložili jste adresu URL serveru?",
     "too_old_server_text": "Objeven nepodporovaný Jellyfin server",
     "too_old_server_description": "Prosím aktualizujte Jellyfin na nejnovější verzi"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Autorizovat rychlé připojení",
         "enter_the_quick_connect_code": "Zadejte kód rychlého připojení...",
         "success": "Úspěšně",
-        "quick_connect_authorized": "Oprávněné Rychlé připojení",
+        "quick_connect_autorized": "Oprávněné Rychlé připojení",
         "error": "Chyba",
         "invalid_code": "Neplatný kód",
         "authorize": "Autorizovat"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Zobrazit vlastní Menu odkazy",
         "show_large_home_carousel": "Zobrazit velký přehled (beta)",
         "hide_libraries": "Skrýt knihovny",
-        "select_libraries_you_want_to_hide": "Vyberte knihovny, které chcete skrýt v záložce Knihovna a v sekcích domovské stránky.",
+        "select_liraries_you_want_to_hide": "Vyberte knihovny, které chcete skrýt v záložce Knihovna a v sekcích domovské stránky.",
         "disable_haptic_feedback": "Zakázat Haptickou zpětnou vazbu",
         "default_quality": "Výchozí kvalita",
         "default_playback_speed": "Default Playback Speed",
@@ -384,8 +384,6 @@
         "device_usage": "Zařízení {{availableSpace}}%",
         "size_used": "{{used}} z {{total}} využito",
         "delete_all_downloaded_files": "Odstranit všechny stažené soubory",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music Cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Vybrat",
     "no_trailer_available": "Přípojné vozidlo není k dispozici",
     "video": "Video",
     "audio": "Zvuk",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Chyba",
     "failed_to_get_stream_url": "Nepodařilo se získat URL streamu",
-    "an_error_occurred_while_playing_the_video": "Při přehrávání videa došlo k chybě. Zkontrolujte logy v nastavení.",
+    "an_error_occured_while_playing_the_video": "Při přehrávání videa došlo k chybě. Zkontrolujte logy v nastavení.",
     "client_error": "Chyba klienta",
     "could_not_create_stream_for_chromecast": "Nelze vytvořit stream pro Chromecast",
     "message_from_server": "Zpráva od serveru: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/da.json

@@ -16,14 +16,14 @@
     "got_it": "Forstået",
     "connection_failed": "Forbindelsen mislykkedes",
     "could_not_connect_to_server": "Kunne ikke oprette forbindelse til serveren. Tjek venligst URL'en og din netværksforbindelse.",
-    "an_unexpected_error_occurred": "Der opstod en uventet fejl",
+    "an_unexpected_error_occured": "Der opstod en uventet fejl",
     "change_server": "Skift server",
     "invalid_username_or_password": "Ugyldigt brugernavn eller adgangskode",
     "user_does_not_have_permission_to_log_in": "Brugeren har ikke tilladelse til at logge ind",
     "server_is_taking_too_long_to_respond_try_again_later": "Serveren svarer for langsomt, prøv igen senere",
     "server_received_too_many_requests_try_again_later": "Serveren modtog for mange forespørgsler, prøv igen senere.",
     "there_is_a_server_error": "Der er en serverfejl",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "Der opstod en uventet fejl. Har du indtastet serverens URL korrekt?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Der opstod en uventet fejl. Har du indtastet serverens URL korrekt?",
     "too_old_server_text": "Ikke Understøttet Jellyfin Server Opdaget",
     "too_old_server_description": "Opdater venligst Jellyfin til den seneste version"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Autoriser Hurtigforbindelse",
         "enter_the_quick_connect_code": "Indtast koden til hurtigforbindelse...",
         "success": "Succes",
-        "quick_connect_authorized": "Hurtigforbindelse autoriseret",
+        "quick_connect_autorized": "Hurtigforbindelse autoriseret",
         "error": "Fejl",
         "invalid_code": "Ugyldig kode",
         "authorize": "Autoriser"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Vis tilpassede menulinks",
         "show_large_home_carousel": "Show Large Home Carousel (beta)",
         "hide_libraries": "Skjul biblioteker",
-        "select_libraries_you_want_to_hide": "Vælg de biblioteker, du ønsker at skjule fra fanen Bibliotek og startside sektionerne.",
+        "select_liraries_you_want_to_hide": "Vælg de biblioteker, du ønsker at skjule fra fanen Bibliotek og startside sektionerne.",
         "disable_haptic_feedback": "Deaktiver haptisk feedback",
         "default_quality": "Standard kvalitet",
         "default_playback_speed": "Default Playback Speed",
@@ -384,8 +384,6 @@
         "device_usage": "Enhedsforbrug: {{availableSpace}}%",
         "size_used": "{{used}} af {{total}} brugt",
         "delete_all_downloaded_files": "Slet alle downloadede filer",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music Cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Vælg",
     "no_trailer_available": "Intet påhængskøretøj tilgængeligt",
     "video": "Video",
     "audio": "Lyd",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Fejl",
     "failed_to_get_stream_url": "Kunne ikke hente stream URL'en",
-    "an_error_occurred_while_playing_the_video": "Der opstod en fejl under afspilning af videoen. Tjek logfilerne i indstillinger.",
+    "an_error_occured_while_playing_the_video": "Der opstod en fejl under afspilning af videoen. Tjek logfilerne i indstillinger.",
     "client_error": "Klientfejl",
     "could_not_create_stream_for_chromecast": "Kunne ikke oprette en stream til Chromecast",
     "message_from_server": "Besked fra server: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/de.json

@@ -16,14 +16,14 @@
     "got_it": "Verstanden",
     "connection_failed": "Verbindung fehlgeschlagen",
     "could_not_connect_to_server": "Verbindung zum Server fehlgeschlagen. Bitte überprüf die URL und deine Netzwerkverbindung.",
-    "an_unexpected_error_occurred": "Ein unerwarteter Fehler ist aufgetreten",
+    "an_unexpected_error_occured": "Ein unerwarteter Fehler ist aufgetreten",
     "change_server": "Server wechseln",
     "invalid_username_or_password": "Ungültiger Benutzername oder Passwort",
     "user_does_not_have_permission_to_log_in": "Benutzer hat keine Berechtigung, um sich anzumelden",
     "server_is_taking_too_long_to_respond_try_again_later": "Der Server benötigt zu lange, um zu antworten. Bitte versuch es später erneut",
     "server_received_too_many_requests_try_again_later": "Der Server hat zu viele Anfragen erhalten. Bitte versuch es später erneut.",
     "there_is_a_server_error": "Es gibt einen Serverfehler",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "Ein unerwarteter Fehler ist aufgetreten. Hast du die Server-URL korrekt eingegeben?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Ein unerwarteter Fehler ist aufgetreten. Hast du die Server-URL korrekt eingegeben?",
     "too_old_server_text": "Nicht unterstützter Jellyfin Server entdeckt",
     "too_old_server_description": "Bitte aktualisiere Jellyfin auf die neueste Version"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Quick Connect autorisieren",
         "enter_the_quick_connect_code": "Quick Connect-Code eingeben...",
         "success": "Erfolgreich verbunden",
-        "quick_connect_authorized": "Quick Connect autorisiert",
+        "quick_connect_autorized": "Quick Connect autorisiert",
         "error": "Fehler",
         "invalid_code": "Ungültiger Code",
         "authorize": "Autorisieren"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Benutzerdefinierte Menülinks anzeigen",
         "show_large_home_carousel": "Zeige große Startseiten-Übersicht (Beta)",
         "hide_libraries": "Bibliotheken ausblenden",
-        "select_libraries_you_want_to_hide": "Bibliotheken auswählen die aus dem Bibliothekstab und der Startseite ausgeblendet werden sollen.",
+        "select_liraries_you_want_to_hide": "Bibliotheken auswählen die aus dem Bibliothekstab und der Startseite ausgeblendet werden sollen.",
         "disable_haptic_feedback": "Haptisches Feedback deaktivieren",
         "default_quality": "Standardqualität",
         "default_playback_speed": "Standard-Wiedergabegeschwindigkeit",
@@ -384,8 +384,6 @@
         "device_usage": "Gerät {{availableSpace}}%",
         "size_used": "{{used}} von {{total}} genutzt",
         "delete_all_downloaded_files": "Alle heruntergeladenen Dateien löschen",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Musik-Cache",
         "music_cache_description": "Beim Anhören Titel automatisch in den Cache laden um bessere Wiedergabe und Offline-Wiedergabe zu ermöglichen",
         "clear_music_cache": "Musik-Cache leeren",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Auswählen",
     "no_trailer_available": "Kein Trailer verfügbar",
     "video": "Video",
     "audio": "Audio",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Fehler",
     "failed_to_get_stream_url": "Fehler beim Abrufen der Stream-URL",
-    "an_error_occurred_while_playing_the_video": "Ein Fehler ist beim Abspielen des Videos aufgetreten. Logs in den Einstellungen überprüfen.",
+    "an_error_occured_while_playing_the_video": "Ein Fehler ist beim Abspielen des Videos aufgetreten. Logs in den Einstellungen überprüfen.",
     "client_error": "Client-Fehler",
     "could_not_create_stream_for_chromecast": "Konnte keinen Stream für Chromecast erstellen",
     "message_from_server": "Nachricht vom Server: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "language": "Sprache",
     "results": "Ergebnisse",
+    "searching": "Suche ...",
     "search_failed": "Suche fehlgeschlagen",
     "no_subtitle_provider": "Kein Untertitelanbieter auf dem Server konfiguriert",
     "no_subtitles_found": "Keine Untertitel gefunden",

translations/el.json

@@ -16,14 +16,14 @@
     "got_it": "Το Κατάλαβα",
     "connection_failed": "Η Σύνδεση Απέτυχε",
     "could_not_connect_to_server": "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή. Παρακαλώ ελέγξτε τη διεύθυνση URL και τη σύνδεση δικτύου σας.",
-    "an_unexpected_error_occurred": "Παρουσιάστηκε Απροσδόκητο Σφάλμα",
+    "an_unexpected_error_occured": "Παρουσιάστηκε Απροσδόκητο Σφάλμα",
     "change_server": "Αλλαγή Διακομιστή",
     "invalid_username_or_password": "Μη έγκυρο όνομα χρήστη ή κωδικός πρόσβασης",
     "user_does_not_have_permission_to_log_in": "Ο χρήστης δεν έχει άδεια να συνδεθεί",
     "server_is_taking_too_long_to_respond_try_again_later": "Ο διακομιστής καθυστερεί πάρα πολύ για να απαντήσει, δοκιμάστε ξανά αργότερα",
     "server_received_too_many_requests_try_again_later": "Ο διακομιστής έλαβε πάρα πολλά αιτήματα, δοκιμάστε ξανά αργότερα.",
     "there_is_a_server_error": "Υπάρχει ένα σφάλμα διακομιστή",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "Παρουσιάστηκε μη αναμενόμενο σφάλμα. Εισαγάγετε σωστά το URL του διακομιστή?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Παρουσιάστηκε μη αναμενόμενο σφάλμα. Εισαγάγετε σωστά το URL του διακομιστή?",
     "too_old_server_text": "Ανακαλύφθηκε Μη Υποστηριζόμενος Εξυπηρετητής Jellyfin",
     "too_old_server_description": "Παρακαλούμε ενημερώστε το Jellyfin στην τελευταία έκδοση"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Εξουσιοδότηση Γρήγορης Σύνδεσης",
         "enter_the_quick_connect_code": "Εισάγετε τον κωδικό γρήγορης σύνδεσης...",
         "success": "Επιτυχία",
-        "quick_connect_authorized": "Γρήγορη Σύνδεση Εξουσιοδοτήθηκε",
+        "quick_connect_autorized": "Γρήγορη Σύνδεση Εξουσιοδοτήθηκε",
         "error": "Σφάλμα",
         "invalid_code": "Μη Έγκυρος Κωδικός",
         "authorize": "Εξουσιοδότηση"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Εμφάνιση Προσαρμοσμένων Συνδέσμων Μενού",
         "show_large_home_carousel": "Show Large Home Carousel (beta)",
         "hide_libraries": "Απόκρυψη Βιβλιοθηκών",
-        "select_libraries_you_want_to_hide": "Επιλέξτε τις βιβλιοθήκες που θέλετε να αποκρύψετε από την καρτέλα της Βιβλιοθήκης και τις ενότητες της αρχικής σελίδας.",
+        "select_liraries_you_want_to_hide": "Επιλέξτε τις βιβλιοθήκες που θέλετε να αποκρύψετε από την καρτέλα της Βιβλιοθήκης και τις ενότητες της αρχικής σελίδας.",
         "disable_haptic_feedback": "Απενεργοποίηση Απτικής Ανατροφοδότησης",
         "default_quality": "Προεπιλεγμένη Ποιότητα",
         "default_playback_speed": "Default Playback Speed",
@@ -384,8 +384,6 @@
         "device_usage": "Device {{availableSpace}}%",
         "size_used": "{{used}} {{total}} Χρησιμοποιείται",
         "delete_all_downloaded_files": "Διαγραφή Όλων Των Ληφθέντων Αρχείων",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music Cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Επιλογή",
     "no_trailer_available": "Δεν υπάρχει διαθέσιμο ρυμουλκούμενο",
     "video": "Βίντεο",
     "audio": "Ήχος",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Σφάλμα",
     "failed_to_get_stream_url": "Αποτυχία λήψης του URL ροής",
-    "an_error_occurred_while_playing_the_video": "Παρουσιάστηκε σφάλμα κατά την αναπαραγωγή του βίντεο. Ελέγξτε τα αρχεία καταγραφής στις ρυθμίσεις.",
+    "an_error_occured_while_playing_the_video": "Παρουσιάστηκε σφάλμα κατά την αναπαραγωγή του βίντεο. Ελέγξτε τα αρχεία καταγραφής στις ρυθμίσεις.",
     "client_error": "Σφάλμα Πελάτη",
     "could_not_create_stream_for_chromecast": "Αδυναμία δημιουργίας ροής για το Chromecast",
     "message_from_server": "Μήνυμα από το διακομιστή: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/en.json

@@ -16,14 +16,14 @@
     "got_it": "Got it",
     "connection_failed": "Connection failed",
     "could_not_connect_to_server": "Could not connect to the server. Please check the URL and your network connection.",
-    "an_unexpected_error_occurred": "An unexpected error occurred",
+    "an_unexpected_error_occured": "An unexpected error occurred",
     "change_server": "Change server",
     "invalid_username_or_password": "Invalid username or password",
     "user_does_not_have_permission_to_log_in": "User does not have permission to log in",
     "server_is_taking_too_long_to_respond_try_again_later": "Server is taking too long to respond, try again later",
     "server_received_too_many_requests_try_again_later": "Server received too many requests, try again later.",
     "there_is_a_server_error": "There is a server error",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "An unexpected error occurred. Did you enter the server URL correctly?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "An unexpected error occurred. Did you enter the server URL correctly?",
     "too_old_server_text": "Unsupported Jellyfin server discovered",
     "too_old_server_description": "Please update Jellyfin to the latest version"
   },
@@ -137,11 +137,7 @@
       "appearance": {
         "title": "Appearance",
         "merge_next_up_continue_watching": "Merge Continue watching & Next up",
-        "merge_next_up_continue_watching_hint": "Combine Continue Watching and Next Up into a single home row.",
-        "use_episode_images_next_up": "Use episode images for Next Up & Continue Watching",
-        "use_episode_images_next_up_hint": "Show each episode's own thumbnail in the Next Up and Continue Watching rows instead of the series image.",
         "hide_remote_session_button": "Hide remote session button",
-        "hide_remote_session_button_hint": "Hide the remote-sessions button from the home header.",
         "show_home_backdrop": "Dynamic home backdrop",
         "show_hero_carousel": "Hero carousel",
         "show_series_poster_on_episode": "Show series poster on episodes",
@@ -192,7 +188,7 @@
         "authorize_button": "Authorize Quick Connect",
         "enter_the_quick_connect_code": "Enter the Quick Connect code...",
         "success": "Success",
-        "quick_connect_authorized": "Quick Connect authorized",
+        "quick_connect_autorized": "Quick Connect authorized",
         "error": "Error",
         "invalid_code": "Invalid code",
         "authorize": "Authorize"
@@ -300,10 +296,9 @@
         },
         "safe_area_in_controls": "Safe area in controls",
         "show_custom_menu_links": "Show custom menu links",
-        "show_custom_menu_links_hint": "Show the custom links your server administrator added in the web config.",
         "show_large_home_carousel": "Show large home carousel (beta)",
         "hide_libraries": "Hide libraries",
-        "select_libraries_you_want_to_hide": "Select the libraries you want to hide from the Library tab and home page sections.",
+        "select_liraries_you_want_to_hide": "Select the libraries you want to hide from the Library tab and home page sections.",
         "disable_haptic_feedback": "Disable haptic feedback",
         "default_quality": "Default quality",
         "default_playback_speed": "Default playback speed",
@@ -389,8 +384,6 @@
         "device_usage": "Device {{availableSpace}}%",
         "size_used": "{{used}} of {{total}} used",
         "delete_all_downloaded_files": "Delete all downloaded files",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear music cache",
@@ -605,7 +598,7 @@
     "mpv_player_title": "MPV player",
     "error": "Error",
     "failed_to_get_stream_url": "Failed to get the stream URL",
-    "an_error_occurred_while_playing_the_video": "An error occurred while playing the video. Check logs in settings.",
+    "an_error_occured_while_playing_the_video": "An error occurred while playing the video. Check logs in settings.",
     "client_error": "Client error",
     "could_not_create_stream_for_chromecast": "Could not create a stream for Chromecast",
     "message_from_server": "Message from server: {{message}}",

translations/es.json

@@ -16,14 +16,14 @@
     "got_it": "Entendido",
     "connection_failed": "Conexión fallida",
     "could_not_connect_to_server": "No se pudo conectar al servidor. Por favor comprueba la URL y tu conexión de red.",
-    "an_unexpected_error_occurred": "Ha ocurrido un error inesperado",
+    "an_unexpected_error_occured": "Ha ocurrido un error inesperado",
     "change_server": "Cambiar servidor",
     "invalid_username_or_password": "Usuario o contraseña inválidos",
     "user_does_not_have_permission_to_log_in": "El usuario no tiene permiso para iniciar sesión",
     "server_is_taking_too_long_to_respond_try_again_later": "El servidor está tardando mucho en responder, inténtalo de nuevo más tarde.",
     "server_received_too_many_requests_try_again_later": "El servidor está recibiendo muchas peticiones, inténtalo de nuevo más tarde.",
     "there_is_a_server_error": "Hay un error en el servidor",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "Ha ocurrido un error inesperado. ¿Has introducido la URL correcta?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Ha ocurrido un error inesperado. ¿Has introducido la URL correcta?",
     "too_old_server_text": "Servidor Jellyfin no soportado descubierto",
     "too_old_server_description": "Por favor, actualiza Jellyfin a la última versión"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Autorizar conexión rápida",
         "enter_the_quick_connect_code": "Introduce el código de conexión rápida...",
         "success": "Hecho",
-        "quick_connect_authorized": "Conexión rápida autorizada",
+        "quick_connect_autorized": "Conexión rápida autorizada",
         "error": "Error",
         "invalid_code": "Código inválido",
         "authorize": "Autorizar"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Mostrar enlaces de menú personalizados",
         "show_large_home_carousel": "Mostrar carrusel del menú principal grande (beta)",
         "hide_libraries": "Ocultar bibliotecas",
-        "select_libraries_you_want_to_hide": "Selecciona las bibliotecas que quieres ocultar de la pestaña Bibliotecas y de Inicio.",
+        "select_liraries_you_want_to_hide": "Selecciona las bibliotecas que quieres ocultar de la pestaña Bibliotecas y de Inicio.",
         "disable_haptic_feedback": "Desactivar feedback háptico",
         "default_quality": "Calidad por defecto",
         "default_playback_speed": "Velocidad de reproducción predeterminada",
@@ -384,8 +384,6 @@
         "device_usage": "Dispositivo {{availableSpace}}%",
         "size_used": "{{used}} de {{total}} usado",
         "delete_all_downloaded_files": "Eliminar todos los archivos descargados",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Caché de música",
         "music_cache_description": "Cachear automáticamente las canciones mientras escuchas una reproducción más suave y soporte sin conexión",
         "clear_music_cache": "Borrar Caché de Música",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Seleccionar",
     "no_trailer_available": "No hay tráiler disponible",
     "video": "Vídeo",
     "audio": "Audio",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Error",
     "failed_to_get_stream_url": "Error al obtener la URL del Steam",
-    "an_error_occurred_while_playing_the_video": "Ha ocurrido un error al reproducir el vídeo. Comprueba los registros en la configuración.",
+    "an_error_occured_while_playing_the_video": "Ha ocurrido un error al reproducir el vídeo. Comprueba los registros en la configuración.",
     "client_error": "Error del cliente",
     "could_not_create_stream_for_chromecast": "No se pudo crear el Steam para Chromecast",
     "message_from_server": "Mensaje del servidor: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/fi.json

@@ -16,14 +16,14 @@
     "got_it": "Okei",
     "connection_failed": "Yhteys epäonnistui",
     "could_not_connect_to_server": "Yhteyttä palvelimeen ei voitu muodostaa. Tarkista URL-osoite ja verkkoyhteytesi.",
-    "an_unexpected_error_occurred": "Odottamaton virhe tapahtui",
+    "an_unexpected_error_occured": "Odottamaton virhe tapahtui",
     "change_server": "Vaihda palvelinta",
     "invalid_username_or_password": "Virheellinen käyttäjätunnus tai salasana",
     "user_does_not_have_permission_to_log_in": "Käyttäjällä ei ole oikeuksia kirjautua sisään",
     "server_is_taking_too_long_to_respond_try_again_later": "Palvelin reagoi liian hitaasti, yritä myöhemmin uudelleen",
     "server_received_too_many_requests_try_again_later": "Palvelin sai liian monta pyyntöä, yritä myöhemmin uudelleen.",
     "there_is_a_server_error": "Palvelimessa on virhe",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "Odottamaton virhe tapahtui. Syötitkö palvelimen URL-osoitteen oikein?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Odottamaton virhe tapahtui. Syötitkö palvelimen URL-osoitteen oikein?",
     "too_old_server_text": "Ei-tuettu Jellyfin-palvelin löydetty",
     "too_old_server_description": "Ole hyvä ja päivitä Jellyfin uusimpaan versioon"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Valtuuta pikayhdistys",
         "enter_the_quick_connect_code": "Syötä nopean yhteyden koodi...",
         "success": "Onnistui",
-        "quick_connect_authorized": "Pikayhdistys valtuutettu",
+        "quick_connect_autorized": "Pikayhdistys valtuutettu",
         "error": "Virhe",
         "invalid_code": "Virheellinen koodi",
         "authorize": "Valtuuta"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Näytä mukautetut valikkolinkit",
         "show_large_home_carousel": "Näytä suuri kotikaruselli (beta)",
         "hide_libraries": "Piilota kirjastot",
-        "select_libraries_you_want_to_hide": "Valitse kirjastot, jotka haluat piilottaa Kirjasto-välilehdeltä ja etusivun osioista.",
+        "select_liraries_you_want_to_hide": "Valitse kirjastot, jotka haluat piilottaa Kirjasto-välilehdeltä ja etusivun osioista.",
         "disable_haptic_feedback": "Poista haptinen palautteet käytöstä",
         "default_quality": "Oletuslaatu",
         "default_playback_speed": "Default Playback Speed",
@@ -384,8 +384,6 @@
         "device_usage": "Laitteen käyttö {{availableSpace}}%",
         "size_used": "{{used}} / {{total}} käytössä",
         "delete_all_downloaded_files": "Poista kaikki ladatut tiedostot",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music Cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Valitse",
     "no_trailer_available": "Perävaunua ei saatavilla",
     "video": "Video",
     "audio": "Ääni",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Virhe",
     "failed_to_get_stream_url": "Lähetyksen URL-osoitteen haku epäonnistui",
-    "an_error_occurred_while_playing_the_video": "Videon toiston yhteydessä tapahtui virhe. Tarkista lokit asetuksista.",
+    "an_error_occured_while_playing_the_video": "Videon toiston yhteydessä tapahtui virhe. Tarkista lokit asetuksista.",
     "client_error": "Asiakkaan Virhe",
     "could_not_create_stream_for_chromecast": "Suoratoistoa ei voitu luoda Chromecastia varten",
     "message_from_server": "Viesti palvelimelta: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/fr.json

@@ -4,9 +4,9 @@
     "error_title": "Erreur",
     "login_title": "Se connecter",
     "login_to_title": "Se connecter à",
-    "select_user": "Sélectionnez un utilisateur pour vous connecter",
-    "add_user_to_login": "Ajouter un utilisateur pour se connecter",
-    "add_user": "Ajouter un utilisateur",
+    "select_user": "Select a user to log in",
+    "add_user_to_login": "Add a user to log in",
+    "add_user": "Add User",
     "username_placeholder": "Nom d'utilisateur",
     "password_placeholder": "Mot de passe",
     "login_button": "Se connecter",
@@ -16,14 +16,14 @@
     "got_it": "D'accord",
     "connection_failed": "La connexion a échoué",
     "could_not_connect_to_server": "Impossible de se connecter au serveur. Veuillez vérifier l’URL et votre connexion réseau.",
-    "an_unexpected_error_occurred": "Une erreur inattendue s'est produite",
+    "an_unexpected_error_occured": "Une erreur inattendue s'est produite",
     "change_server": "Changer de serveur",
     "invalid_username_or_password": "Nom d'utilisateur ou mot de passe invalide",
     "user_does_not_have_permission_to_log_in": "L'utilisateur n'a pas la permission de se connecter",
     "server_is_taking_too_long_to_respond_try_again_later": "Le serveur prend trop de temps à répondre, réessayez plus tard",
     "server_received_too_many_requests_try_again_later": "Le serveur a reçu trop de demandes, réessayez plus tard.",
     "there_is_a_server_error": "Il y a une erreur de serveur",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "Une erreur inattendue s’est produite. Avez-vous correctement saisi l’URL du serveur ?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Une erreur inattendue s’est produite. Avez-vous correctement saisi l’URL du serveur ?",
     "too_old_server_text": "Serveur Jellyfin non pris en charge découvert",
     "too_old_server_description": "Veuillez mettre à jour Jellyfin vers la dernière version"
   },
@@ -42,19 +42,19 @@
     "please_login_again": "Votre session enregistrée a expiré. Veuillez vous connecter à nouveau.",
     "remove_saved_login": "Supprimer l'identifiant enregistré",
     "remove_saved_login_description": "Cela supprimera vos identifiants enregistrés pour ce serveur. Vous devrez saisir à nouveau votre nom d’utilisateur et votre mot de passe la prochaine fois.",
-    "accounts_count": "{{count}} comptes",
+    "accounts_count": "Comptes {{count}}",
     "select_account": "Sélectionnez un compte",
     "add_account": "Ajouter un compte",
     "remove_account_description": "Cela supprimera les identifiants enregistrés pour {{username}}.",
-    "remove_server": "Supprimer le serveur",
-    "remove_server_description": "Ceci supprimera {{server}} et tous les comptes enregistrés de votre liste.",
-    "select_your_server": "Sélectionnez votre serveur",
-    "add_server_to_get_started": "Ajouter un serveur pour commencer",
-    "add_server": "Ajouter un serveur",
-    "change_server": "Changer de serveur"
+    "remove_server": "Remove Server",
+    "remove_server_description": "This will remove {{server}} and all saved accounts from your list.",
+    "select_your_server": "Select Your Server",
+    "add_server_to_get_started": "Add a server to get started",
+    "add_server": "Add Server",
+    "change_server": "Change Server"
   },
   "save_account": {
-    "title": "Enregistrer le compte",
+    "title": "Sauvegarder le compte",
     "save_for_later": "Enregistrer ce compte",
     "security_option": "Options de sécurité",
     "no_protection": "Aucune protection",
@@ -95,9 +95,9 @@
     "oops": "Oups !",
     "error_message": "Quelque chose s'est mal passé.\nVeuillez vous reconnecter à nouveau.",
     "continue_watching": "Continuer à regarder",
-    "continue": "Continuer",
+    "continue": "Continue",
     "next_up": "À suivre",
-    "continue_and_next_up": "Continuer à regarder et à suivre",
+    "continue_and_next_up": "Continuer de regarder et à suivre",
     "recently_added_in": "Ajoutés récemment dans {{libraryName}}",
     "suggested_movies": "Films suggérés",
     "suggested_episodes": "Épisodes suggérés",
@@ -120,10 +120,10 @@
       "settings_title": "Paramètres",
       "log_out_button": "Déconnexion",
       "switch_user": {
-        "title": "Changer d'utilisateur",
-        "account": "Compte",
-        "switch_user": "Changer d'utilisateur sur ce serveur",
-        "current": "actuel"
+        "title": "Switch User",
+        "account": "Account",
+        "switch_user": "Switch User on This Server",
+        "current": "current"
       },
       "categories": {
         "title": "Catégories"
@@ -136,32 +136,32 @@
       },
       "appearance": {
         "title": "Apparence",
-        "merge_next_up_continue_watching": "Fusionner « Continuer à regarder » et « À suivre »",
+        "merge_next_up_continue_watching": "Fusionner, continuer à regarder et à suivre",
         "hide_remote_session_button": "Masquer le bouton de session distante",
-        "show_home_backdrop": "Arrière-plan d'accueil dynamique",
-        "show_hero_carousel": "Carrousel principal",
-        "show_series_poster_on_episode": "Afficher l'affiche de la série sur les épisodes",
-        "theme_music": "Musique de thème",
-        "display_size": "Taille d'affichage",
-        "display_size_small": "Petite",
-        "display_size_default": "Par défaut",
-        "display_size_large": "Grande",
-        "display_size_extra_large": "Très grande"
+        "show_home_backdrop": "Dynamic Home Backdrop",
+        "show_hero_carousel": "Hero Carousel",
+        "show_series_poster_on_episode": "Show Series Poster on Episodes",
+        "theme_music": "Theme Music",
+        "display_size": "Display Size",
+        "display_size_small": "Small",
+        "display_size_default": "Default",
+        "display_size_large": "Large",
+        "display_size_extra_large": "Extra Large"
       },
       "network": {
         "title": "Réseau",
         "local_network": "Réseau local",
-        "auto_switch_enabled": "Basculement automatique à la maison",
+        "auto_switch_enabled": "Basculement automatique quand à la maison",
         "auto_switch_description": "Basculer automatiquement vers l'URL locale lorsque vous êtes connecté au Wi-Fi de la maison",
         "local_url": "URL locale",
-        "local_url_hint": "Entrez l'adresse de votre serveur local (par exemple http://192.168.1.100:8096)",
+        "local_url_hint": "Entrez l'adresse de votre serveur local (exemple, http://192.168.1.100:8096)",
         "local_url_placeholder": "http://192.168.1.100:8096",
         "home_wifi_networks": "Réseaux Wi-Fi domestiques",
         "add_current_network": "Ajouter \"{{ssid}}\"",
-        "not_connected_to_wifi": "Non connecté au Wi-Fi",
+        "not_connected_to_wifi": "Non connecté au WiFi",
         "no_networks_configured": "Pas de réseau configuré",
-        "add_network_hint": "Ajouter votre réseau Wi-Fi domestique pour activer le basculement automatique",
-        "current_wifi": "Wi-Fi actuel",
+        "add_network_hint": "Ajouter votre réseau Wi-Fi domestique pour activer la commutation automatique",
+        "current_wifi": "WiFi actuel",
         "using_url": "Utilisant",
         "local": "URL locale",
         "remote": "URL à distance",
@@ -172,9 +172,9 @@
         "not_configured": "Non configuré",
         "network_added": "Réseau ajouté",
         "network_already_added": "Réseau déjà ajouté",
-        "no_wifi_connected": "Non connecté au Wi-Fi",
+        "no_wifi_connected": "Non connecté au WiFi",
         "permission_denied": "Autorisation de localisation refusée",
-        "permission_denied_explanation": "Une autorisation de localisation est requise pour détecter le réseau Wi-Fi afin de basculer automatiquement. Veuillez l'activer dans les paramètres."
+        "permission_denied_explanation": "Une autorisation de localisation est requise pour détecter le réseau Wifi afin de changer automatiquement. Veuillez l’activer dans les paramètres."
       },
       "user_info": {
         "user_info_title": "Informations utilisateur",
@@ -184,35 +184,35 @@
         "app_version": "Version de l'application"
       },
       "quick_connect": {
-        "quick_connect_title": "Connexion rapide",
-        "authorize_button": "Autoriser une connexion rapide",
-        "enter_the_quick_connect_code": "Entrez le code de connexion rapide...",
+        "quick_connect_title": "Connexion Rapide",
+        "authorize_button": "Autoriser une Connexion Rapide",
+        "enter_the_quick_connect_code": "Entrez le code de Connexion Rapide...",
         "success": "Succès",
-        "quick_connect_authorized": "Connexion rapide autorisée",
+        "quick_connect_autorized": "Connexion Rapide autorisé",
         "error": "Erreur",
         "invalid_code": "Code invalide",
         "authorize": "Autoriser"
       },
       "media_controls": {
-        "media_controls_title": "Contrôles média",
+        "media_controls_title": "Contrôles Média",
         "forward_skip_length": "Durée de saut en avant",
         "rewind_length": "Durée de retour en arrière",
         "seconds_unit": "s"
       },
       "buffer": {
-        "title": "Paramètres du tampon",
-        "cache_mode": "Mode de cache",
+        "title": "Buffer Settings",
+        "cache_mode": "Cache Mode",
         "cache_auto": "Auto",
-        "cache_yes": "Activé",
-        "cache_no": "Désactivé",
-        "buffer_duration": "Durée du tampon",
-        "max_cache_size": "Taille maximale du cache",
-        "max_backward_cache": "Cache arrière maximal"
+        "cache_yes": "Enabled",
+        "cache_no": "Disabled",
+        "buffer_duration": "Buffer Duration",
+        "max_cache_size": "Max Cache Size",
+        "max_backward_cache": "Max Backward Cache"
       },
       "vo_driver": {
-        "title": "Sortie vidéo",
-        "vo_mode": "Pilote VO",
-        "gpu_next": "gpu-next (Recommandé)",
+        "title": "Video Output",
+        "vo_mode": "VO Driver",
+        "gpu_next": "gpu-next (Recommended)",
         "gpu": "gpu"
       },
       "gesture_controls": {
@@ -225,8 +225,8 @@
         "right_side_volume_description": "Glisser vers le haut/bas sur le côté droit pour ajuster le volume",
         "hide_volume_slider": "Masquer le curseur de volume",
         "hide_volume_slider_description": "Masquer le curseur de volume dans le lecteur vidéo",
-        "hide_brightness_slider": "Masquer le curseur de luminosité",
-        "hide_brightness_slider_description": "Masquer le curseur de luminosité dans le lecteur vidéo"
+        "hide_brightness_slider": "Cacher le curseur de luminosité",
+        "hide_brightness_slider_description": "Masquer le curseur de volume dans le lecteur vidéo"
       },
       "audio": {
         "audio_title": "Audio",
@@ -234,14 +234,14 @@
         "audio_language": "Langue audio",
         "audio_hint": "Choisissez une langue audio par défaut.",
         "none": "Aucune",
-        "language": "Langue",
+        "language": "Langage",
         "transcode_mode": {
           "title": "Transcodage audio",
           "description": "Contrôle la gestion de l'audio surround (7.1, TrueHD, DTS-HD)",
           "auto": "Auto",
           "stereo": "Forcer la stéréo",
           "5_1": "Autoriser 5.1",
-          "passthrough": "Passthrough"
+          "passthrough": "Intercommunication"
         }
       },
       "subtitles": {
@@ -252,7 +252,7 @@
         "set_subtitle_track": "Piste de sous-titres de l'élément précédent",
         "subtitle_size": "Taille des sous-titres",
         "none": "Aucune",
-        "language": "Langue",
+        "language": "Langage",
         "loading": "Chargement",
         "modes": {
           "Default": "Par défaut",
@@ -262,20 +262,20 @@
           "OnlyForced": "Forcés seulement"
         },
         "opensubtitles_title": "OpenSubtitles",
-        "opensubtitles_hint": "Entrez votre clé API OpenSubtitles pour activer la recherche de sous-titres côté client comme solution de secours lorsque votre serveur Jellyfin n'a pas de fournisseur de sous-titres configuré.",
-        "opensubtitles_api_key": "Clé API",
-        "opensubtitles_api_key_placeholder": "Entrez la clé API...",
-        "opensubtitles_get_key": "Obtenez votre clé API gratuite sur opensubtitles.com/fr/consumers",
-        "mpv_subtitle_scale": "Échelle des sous-titres",
-        "mpv_subtitle_margin_y": "Marge verticale",
-        "mpv_subtitle_align_x": "Alignement horizontal",
-        "mpv_subtitle_align_y": "Alignement vertical",
+        "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": "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": "Gauche",
-          "center": "Centre",
-          "right": "Droite",
-          "top": "Haut",
-          "bottom": "Bas"
+          "left": "Left",
+          "center": "Center",
+          "right": "Right",
+          "top": "Top",
+          "bottom": "Bottom"
         }
       },
       "other": {
@@ -283,38 +283,38 @@
         "video_orientation": "Orientation vidéo",
         "orientation": "Orientation",
         "orientations": {
-          "DEFAULT": "Suivre l'orientation de l'appareil",
+          "DEFAULT": "Par défaut",
           "ALL": "Toutes",
-          "PORTRAIT": "Portrait auto",
-          "PORTRAIT_UP": "Portrait haut",
-          "PORTRAIT_DOWN": "Portrait bas",
-          "LANDSCAPE": "Paysage auto",
-          "LANDSCAPE_LEFT": "Paysage gauche",
-          "LANDSCAPE_RIGHT": "Paysage droite",
+          "PORTRAIT": "Portrait",
+          "PORTRAIT_UP": "Portrait Haut",
+          "PORTRAIT_DOWN": "Portrait Bas",
+          "LANDSCAPE": "Paysage",
+          "LANDSCAPE_LEFT": "Paysage Gauche",
+          "LANDSCAPE_RIGHT": "Paysage Droite",
           "OTHER": "Autre",
           "UNKNOWN": "Inconnu"
         },
         "safe_area_in_controls": "Zone de sécurité dans les contrôles",
         "show_custom_menu_links": "Afficher les liens personnalisés",
         "show_large_home_carousel": "Afficher le grand carrousel d’accueil (bêta)",
-        "hide_libraries": "Masquer les bibliothèques",
-        "select_libraries_you_want_to_hide": "Sélectionnez les bibliothèques que vous souhaitez masquer dans l'onglet Bibliothèque et les sections de la page d'accueil.",
+        "hide_libraries": "Cacher des bibliothèques",
+        "select_liraries_you_want_to_hide": "Sélectionnez les bibliothèques que vous souhaitez masquer dans l'onglet Bibliothèque et les sections de la page d'accueil.",
         "disable_haptic_feedback": "Désactiver le retour haptique",
         "default_quality": "Qualité par défaut",
         "default_playback_speed": "Vitesse de lecture par défaut",
         "auto_play_next_episode": "Lecture automatique de l'épisode suivant",
-        "max_auto_play_episode_count": "Nombre max d'épisodes en lecture automatique",
+        "max_auto_play_episode_count": "Nombre d'épisodes en lecture automatique max",
         "disabled": "Désactivé"
       },
       "music": {
         "title": "Musique",
         "playback_title": "Lecture",
         "playback_description": "Configurer le mode de lecture de la musique.",
-        "prefer_downloaded": "Préférer les musiques téléchargées",
+        "prefer_downloaded": "Supprimer toutes les musiques téléchargées",
         "caching_title": "Mise en cache",
         "caching_description": "Mettre automatiquement en cache les pistes à venir pour une lecture plus fluide.",
-        "lookahead_enabled": "Activer la mise en cache anticipée",
-        "lookahead_count": "Pistes à mettre en cache à l'avance",
+        "lookahead_enabled": "Activer la mise en cache guidée",
+        "lookahead_count": "Pistes à pré-mettre en cache",
         "max_cache_size": "Taille max de cache"
       },
       "plugins": {
@@ -333,7 +333,7 @@
           "tv_quota_days": "Jours de quota de séries",
           "reset_jellyseerr_config_button": "Réinitialiser la configuration Seerr",
           "unlimited": "Illimité",
-          "plus_n_more": "+{{n}} de plus",
+          "plus_n_more": "+{{n}} Plus",
           "order_by": {
             "DEFAULT": "Par défaut",
             "VOTE_COUNT_AND_AVERAGE": "Nombre de votes et moyenne",
@@ -341,7 +341,7 @@
           }
         },
         "marlin_search": {
-          "enable_marlin_search": "Activer la recherche Marlin",
+          "enable_marlin_search": "Activer Marlin Search",
           "url": "URL",
           "server_url_placeholder": "http(s)://domaine.org:port",
           "marlin_search_hint": "Entrez l'URL du serveur Marlin. L'URL devrait inclure http ou https et optionnellement le port.",
@@ -362,10 +362,10 @@
           "features_title": "Fonctionnalités",
           "enable_movie_recommendations": "Recommandations de films",
           "enable_series_recommendations": "Recommandations de séries",
-          "enable_promoted_watchlists": "Listes de suivi promues",
-          "hide_watchlists_tab": "Masquer l'onglet des listes de suivi",
-          "home_sections_hint": "Afficher des recommandations personnalisées et des listes de suivi promues de Streamystats sur la page d’accueil.",
-          "recommended_movies": "Films recommandés",
+          "enable_promoted_watchlists": "Listes de lecture promues",
+          "hide_watchlists_tab": "Masquer l'onglet des listes de lecture",
+          "home_sections_hint": "Afficher des recommandations personnalisées et des listes de lecture promues de Streamystats sur la page d’accueil.",
+          "recommended_movies": "Films Recommandés",
           "recommended_series": "Séries recommandées",
           "toasts": {
             "saved": "Enregistré",
@@ -375,7 +375,7 @@
           "refresh_from_server": "Rafraîchir les paramètres depuis le serveur"
         },
         "kefinTweaks": {
-          "watchlist_enabler": "Activer l'intégration de la liste de suivi"
+          "watchlist_enabler": "Activer l'intégration de notre liste de lecture"
         }
       },
       "storage": {
@@ -384,8 +384,6 @@
         "device_usage": "Appareil {{availableSpace}}%",
         "size_used": "{{used}} de {{total}} utilisés",
         "delete_all_downloaded_files": "Supprimer tous les fichiers téléchargés",
-        "delete_all_downloaded_files_confirm": "Supprimer tous les fichiers téléchargés ?",
-        "delete_all_downloaded_files_confirm_desc": "Êtes-vous sûr de vouloir supprimer tous les fichiers téléchargés ? Cette action est irréversible.",
         "music_cache_title": "Mise en cache de la musique",
         "music_cache_description": "Mettez automatiquement en cache les chansons au fur et à mesure que vous écoutez pour une lecture plus fluide et une prise en charge hors ligne",
         "clear_music_cache": "Vider le cache de la musique",
@@ -394,10 +392,10 @@
         "delete_all_downloaded_songs": "Supprimer toutes les musiques téléchargées",
         "downloaded_songs_size": "{{size}} téléchargé",
         "downloaded_songs_deleted": "Chansons téléchargées supprimées",
-        "clear_all_cache": "Effacer tout le cache",
-        "clear_all_cache_confirm": "Effacer tout le cache ?",
-        "clear_all_cache_confirm_desc": "Êtes-vous sûr de vouloir effacer toutes les données en cache ? Cela supprimera toutes les images, fichiers musicaux, sous-titres et caches de requêtes mis en cache. Vos paramètres et votre session de connexion seront conservés.",
-        "clear_all_cache_error_desc": "Une erreur est survenue lors de l'effacement du cache."
+        "clear_all_cache": "Clear All Cache",
+        "clear_all_cache_confirm": "Clear All 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": "Introduction",
@@ -421,17 +419,17 @@
         "error_deleting_files": "Erreur lors de la suppression des fichiers"
       },
       "security": {
-        "title": "Sécurité",
+        "title": "Security",
         "inactivity_timeout": {
-          "title": "Délai d'inactivité",
-          "disabled": "Désactivé",
+          "title": "Inactivity Timeout",
+          "disabled": "Disabled",
           "1_minute": "1 minute",
           "5_minutes": "5 minutes",
           "15_minutes": "15 minutes",
           "30_minutes": "30 minutes",
-          "1_hour": "1 heure",
-          "4_hours": "4 heures",
-          "24_hours": "24 heures"
+          "1_hour": "1 hour",
+          "4_hours": "4 hours",
+          "24_hours": "24 hours"
         }
       }
     },
@@ -448,7 +446,7 @@
       "delete_all_movies_button": "Supprimer tous les films",
       "delete_all_series_button": "Supprimer toutes les séries",
       "delete_all_button": "Supprimer tous les médias",
-      "delete_all_other_media_button": "Supprimer les autres médias",
+      "delete_all_other_media_button": "Supprimer un autre média",
       "active_download": "Téléchargement actif",
       "no_active_downloads": "Pas de téléchargements actifs",
       "active_downloads": "Téléchargements actifs",
@@ -456,7 +454,7 @@
       "new_app_version_requires_re_download_description": "La nouvelle mise à jour nécessite que le contenu soit téléchargé à nouveau. Veuillez supprimer tout le contenu téléchargé et réessayer.",
       "back": "Retour",
       "delete": "Supprimer",
-      "delete_download": "Supprimer le téléchargement",
+      "delete_download": "Delete Download",
       "something_went_wrong": "Quelque chose s'est mal passé",
       "could_not_get_stream_url_from_jellyfin": "Impossible d'obtenir l'URL du flux depuis Jellyfin",
       "eta": "ETA {{eta}}",
@@ -467,7 +465,7 @@
         "deleted_all_series_successfully": "Toutes les séries ont été supprimées avec succès !",
         "failed_to_delete_all_series": "Échec de la suppression de toutes les séries",
         "deleted_media_successfully": "Les autres médias ont été supprimés avec succès !",
-        "failed_to_delete_media": "Échec de la suppression des autres médias",
+        "failed_to_delete_media": "Échec de la suppression d'un autre média",
         "download_cancelled": "Téléchargement annulé",
         "could_not_delete_download": "Impossible de supprimer le téléchargement",
         "download_completed": "Téléchargement terminé",
@@ -485,16 +483,17 @@
     }
   },
   "common": {
-    "no_results": "Aucun résultat",
+    "no_results": "No Results",
+    "select": "Sélectionner",
     "no_trailer_available": "Aucune bande-annonce disponible",
     "video": "Vidéo",
     "audio": "Audio",
     "subtitle": "Sous-titres",
     "play": "Lecture",
-    "mark_as_played": "Marquer comme vu",
-    "mark_as_not_played": "Marquer comme non vu",
+    "mark_as_played": "Mark as Played",
+    "mark_as_not_played": "Mark as not Played",
     "none": "Aucun",
-    "track": "Piste",
+    "track": "Suivre",
     "cancel": "Annuler",
     "delete": "Supprimer",
     "ok": "Ok",
@@ -502,15 +501,15 @@
     "back": "Précédent",
     "continue": "Continuer",
     "verifying": "Vérification...",
-    "login": "Connexion",
-    "episodes": "Épisodes",
-    "movies": "Films",
-    "loading": "Chargement…",
-    "seeAll": "Tout afficher"
+    "login": "Login",
+    "episodes": "Episodes",
+    "movies": "Movies",
+    "loading": "Loading…",
+    "seeAll": "See all"
   },
   "search": {
     "search": "Rechercher...",
-    "x_items": "{{count}} médias",
+    "x_items": "{{count}} Médias",
     "library": "Bibliothèque",
     "discover": "Découvrir",
     "no_results": "Aucun résultat",
@@ -528,7 +527,7 @@
     "request_series": "Demander une série",
     "recently_added": "Ajoutés récemment",
     "recent_requests": "Demandes récentes",
-    "plex_watchlist": "Liste de suivi Plex",
+    "plex_watchlist": "Liste de lecture Plex",
     "trending": "Tendance",
     "popular_movies": "Films populaires",
     "movie_genres": "Genres de films",
@@ -537,7 +536,7 @@
     "popular_tv": "Séries populaires",
     "tv_genres": "Genres des séries",
     "upcoming_tv": "Séries à venir",
-    "networks": "Chaînes",
+    "networks": "Studios",
     "tmdb_movie_keyword": "Mots-clés de film TMDB",
     "tmdb_movie_genre": "Genre de film TMDB",
     "tmdb_tv_keyword": "Mots-clés de séries TMDB",
@@ -554,7 +553,7 @@
     "item_types": {
       "movies": "Films",
       "series": "Séries",
-      "boxsets": "Coffrets",
+      "boxsets": "Coffrets ",
       "playlists": "Playlists",
       "items": "Médias"
     },
@@ -576,10 +575,10 @@
       "filter_by": "Filtrer par",
       "sort_order": "Ordre de tri",
       "tags": "Tags",
-      "all": "Tout",
-      "reset": "Réinitialiser",
-      "asc": "Croissant",
-      "desc": "Décroissant"
+      "all": "All",
+      "reset": "Reset",
+      "asc": "Ascending",
+      "desc": "Descending"
     }
   },
   "favorites": {
@@ -593,14 +592,14 @@
     "noData": "Marquez des éléments comme favoris pour les voir apparaître ici pour un accès rapide."
   },
   "custom_links": {
-    "no_links": "Aucun lien"
+    "no_links": "Aucuns liens"
   },
   "player": {
-    "live": "EN DIRECT",
-    "mpv_player_title": "Lecteur MPV",
+    "live": "LIVE",
+    "mpv_player_title": "MPV Player",
     "error": "Erreur",
     "failed_to_get_stream_url": "Échec de l'obtention de l'URL du flux",
-    "an_error_occurred_while_playing_the_video": "Une erreur s’est produite lors de la lecture de la vidéo. Vérifiez les journaux dans les paramètres.",
+    "an_error_occured_while_playing_the_video": "Une erreur s’est produite lors de la lecture de la vidéo. Vérifiez les journaux dans les paramètres.",
     "client_error": "Erreur du client",
     "could_not_create_stream_for_chromecast": "Impossible de créer un flux sur la Chromecast",
     "message_from_server": "Message du serveur : {{message}}",
@@ -612,71 +611,72 @@
     "downloaded_file_yes": "Oui",
     "downloaded_file_no": "Non",
     "downloaded_file_cancel": "Annuler",
-    "swipe_down_settings": "Balayez vers le bas pour les paramètres",
-    "ends_at": "Se termine à {{time}}",
-    "search_subtitles": "Rechercher des sous-titres",
-    "subtitle_tracks": "Pistes",
-    "subtitle_search": "Rechercher et télécharger",
-    "download": "Télécharger",
-    "subtitle_download_hint": "Les sous-titres téléchargés seront enregistrés dans votre bibliothèque",
-    "using_jellyfin_server": "Utilisation du serveur Jellyfin",
-    "language": "Langue",
-    "results": "Résultats",
-    "search_failed": "Recherche échouée",
-    "no_subtitle_provider": "Aucun fournisseur de sous-titres configuré sur le serveur",
-    "no_subtitles_found": "Aucun sous-titre trouvé",
-    "add_opensubtitles_key_hint": "Ajoutez une clé API OpenSubtitles dans les paramètres pour une solution de secours côté client",
-    "settings": "Paramètres",
-    "skip_intro": "Passer l'intro",
-    "skip_credits": "Passer le générique",
-    "stopPlayback": "Arrêter la lecture",
-    "stopPlayingTitle": "Arrêter de lire \"{{title}}\" ?",
-    "stopPlayingConfirm": "Êtes-vous sûr de vouloir arrêter la lecture ?",
-    "downloaded": "Téléchargé",
-    "missing_parameters": "Paramètres de lecture manquants"
+    "swipe_down_settings": "Swipe down for settings",
+    "ends_at": "Ends at {{time}}",
+    "search_subtitles": "Search Subtitles",
+    "subtitle_tracks": "Tracks",
+    "subtitle_search": "Search & Download",
+    "download": "Download",
+    "subtitle_download_hint": "Downloaded subtitles will be saved to your library",
+    "using_jellyfin_server": "Using Jellyfin Server",
+    "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": "Stop playing \"{{title}}\"?",
+    "stopPlayingConfirm": "Are you sure you want to stop playback?",
+    "downloaded": "Downloaded",
+    "missing_parameters": "Missing playback parameters"
   },
   "chapters": {
-    "title": "Chapitres",
-    "chapter_number": "Chapitre {{number}}",
-    "open": "Ouvrir les chapitres",
-    "close": "Fermer les chapitres"
+    "title": "Chapters",
+    "chapter_number": "Chapter {{number}}",
+    "open": "Open chapters",
+    "close": "Close chapters"
   },
   "item_card": {
     "next_up": "À suivre",
-    "no_items_to_display": "Aucun média à afficher",
+    "no_items_to_display": "Aucuns médias à afficher",
     "cast_and_crew": "Distribution et équipe",
     "series": "Séries",
     "seasons": "Saisons",
     "season": "Saison",
-    "from_this_series": "De cette série",
-    "more_from_this_season": "Plus de cette saison",
-    "view_series": "Voir la série",
-    "view_season": "Voir la saison",
-    "select_season": "Sélectionner une saison",
+    "from_this_series": "From This Series",
+    "more_from_this_season": "More from this Season",
+    "view_series": "View Series",
+    "view_season": "View Season",
+    "select_season": "Select Season",
     "no_episodes_for_this_season": "Aucun épisode pour cette saison",
     "overview": "Aperçu",
     "more_with": "Plus avec {{name}}",
     "similar_items": "Médias similaires",
-    "no_similar_items_found": "Aucun média similaire trouvé",
+    "no_similar_items_found": "Aucuns médias similaires trouvés",
     "video": "Vidéo",
     "more_details": "Plus de détails",
     "media_options": "Options média",
     "quality": "Qualité",
     "audio": "Audio",
     "subtitles": {
-      "label": "Sous-titres",
-      "none": "Aucun",
-      "tracks": "Pistes"
+      "label": "Subtitle",
+      "none": "None",
+      "tracks": "Tracks"
     },
     "show_more": "Afficher plus",
     "show_less": "Afficher moins",
-    "left": "restant",
-    "director": "Réalisateur",
-    "cast": "Distribution",
-    "technical_details": "Détails techniques",
+    "left": "left",
+    "director": "Director",
+    "cast": "Cast",
+    "technical_details": "Technical Details",
     "appeared_in": "Apparu dans",
-    "movies": "Films",
-    "shows": "Séries",
+    "movies": "Movies",
+    "shows": "Shows",
     "could_not_load_item": "Impossible de charger le média",
     "none": "Aucun",
     "download": {
@@ -688,13 +688,13 @@
       "download_unwatched_only": "Non visionné uniquement",
       "download_button": "Télécharger"
     },
-    "mark_played": "Marquer comme vu",
-    "mark_unplayed": "Marquer comme non vu",
-    "resume_playback": "Reprendre la lecture",
-    "resume_playback_description": "Voulez-vous continuer où vous vous êtes arrêté ou commencer à partir du début ?",
-    "play_from_start": "Lire depuis le début",
-    "continue_from": "Continuer depuis {{time}}",
-    "no_data_available": "Aucune donnée disponible"
+    "mark_played": "Mark as Watched",
+    "mark_unplayed": "Mark as Unwatched",
+    "resume_playback": "Resume Playback",
+    "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": "Continue from {{time}}",
+    "no_data_available": "No data available"
   },
   "live_tv": {
     "next": "Suivant",
@@ -706,16 +706,16 @@
     "sports": "Sports",
     "for_kids": "Pour enfants",
     "news": "Actualités",
-    "page_of": "Page {{current}} sur {{total}}",
-    "no_programs": "Aucun programme disponible",
-    "no_channels": "Aucune chaîne disponible",
+    "page_of": "Page {{current}} of {{total}}",
+    "no_programs": "No programs available",
+    "no_channels": "No channels available",
     "tabs": {
-      "programs": "Programmes",
+      "programs": "Programs",
       "guide": "Guide",
-      "channels": "Chaînes",
-      "recordings": "Enregistrements",
-      "schedule": "Programmation",
-      "series": "Séries"
+      "channels": "Channels",
+      "recordings": "Recordings",
+      "schedule": "Schedule",
+      "series": "Series"
     }
   },
   "jellyseerr": {
@@ -725,7 +725,7 @@
     "whats_wrong": "Quel est le problème ?",
     "issue_type": "Type de problème",
     "select_an_issue": "Sélectionnez un problème",
-    "types": "Types",
+    "types": "Types de fichiers",
     "describe_the_issue": "(optionnel) Décrivez le problème...",
     "submit_button": "Soumettre",
     "report_issue_button": "Signaler un problème",
@@ -734,7 +734,7 @@
     "failed_to_login": "Échec de la connexion",
     "cast": "Distribution",
     "details": "Détails",
-    "status": "Statut",
+    "status": "Statuts",
     "original_title": "Titre original",
     "series_type": "Type de série",
     "release_dates": "Dates de sortie",
@@ -752,32 +752,32 @@
     "tags": "Tags",
     "quality_profile": "Profil de qualité",
     "root_folder": "Dossier racine",
-    "season_all": "Saison (Toutes)",
+    "season_all": "Saison (Tous)",
     "season_number": "Saison {{season_number}}",
-    "number_episodes": "{{episode_number}} épisodes",
+    "number_episodes": "{{episode_number}} Épisodes",
     "born": "Né(e) le",
-    "appearances": "Apparitions",
+    "appearances": "Apparences",
     "approve": "Valider",
     "decline": "Refuser",
     "requested_by": "Demandé par {{user}}",
     "unknown_user": "Utilisateur inconnu",
-    "select": "Sélectionner",
-    "request_all": "Tout demander",
-    "request_seasons": "Demander des saisons",
-    "select_seasons": "Sélectionner les saisons",
-    "request_selected": "Demander la sélection",
-    "n_selected": "{{count}} sélectionnés",
+    "select": "Select",
+    "request_all": "Request All",
+    "request_seasons": "Request Seasons",
+    "select_seasons": "Select Seasons",
+    "request_selected": "Request Selected",
+    "n_selected": "{{count}} selected",
     "toasts": {
       "jellyseer_does_not_meet_requirements": "Seerr ne répond pas aux exigences ! Veuillez mettre à jour au moins vers la version 2.0.0.",
       "jellyseerr_test_failed": "Le test Seerr a échoué. Veuillez réessayer.",
       "failed_to_test_jellyseerr_server_url": "Échec du test de l'URL du serveur Seerr",
       "issue_submitted": "Problème soumis !",
-      "requested_item": "{{item}} demandé !",
+      "requested_item": "{{item}}} demandé !",
       "you_dont_have_permission_to_request": "Vous n'avez pas la permission de demander !",
-      "something_went_wrong_requesting_media": "Une erreur s'est produite lors de la demande du média !",
+      "something_went_wrong_requesting_media": "Quelque chose s'est mal passé en demandant le média !",
       "request_approved": "Demande approuvée !",
-      "request_declined": "Demande refusée !",
-      "failed_to_approve_request": "Échec de l'approbation de la demande",
+      "request_declined": "Demande déclinée !",
+      "failed_to_approve_request": "Échec d'approbation de la demande",
       "failed_to_decline_request": "Échec du refus de la demande"
     }
   },
@@ -787,7 +787,7 @@
     "library": "Bibliothèque",
     "custom_links": "Liens personnalisés",
     "favorites": "Favoris",
-    "settings": "Réglages"
+    "settings": "Settings"
   },
   "music": {
     "title": "Musique",
@@ -807,13 +807,13 @@
     "play_top_tracks": "Jouer les pistes les plus populaires",
     "no_suggestions": "Pas de suggestion disponible",
     "no_albums": "Pas d'albums trouvés",
-    "no_artists": "Pas d'artistes trouvés",
+    "no_artists": "Pas d'artistes trouvé",
     "no_playlists": "Pas de playlists trouvées",
     "album_not_found": "Album introuvable",
     "artist_not_found": "Artiste introuvable",
     "playlist_not_found": "Playlist introuvable",
     "track_options": {
-      "play_next": "Lire ensuite",
+      "play_next": "Lecture suivante",
       "add_to_queue": "Ajouter à la file d'attente",
       "add_to_playlist": "Ajouter à la playlist",
       "download": "Télécharger",
@@ -822,15 +822,15 @@
       "cached": "En cache",
       "delete_download": "Supprimer un téléchargement",
       "delete_cache": "Supprimer du cache",
-      "go_to_artist": "Aller à l'artiste",
-      "go_to_album": "Aller à l'album",
+      "go_to_artist": "Voir l'artiste",
+      "go_to_album": "Aller à l’album",
       "add_to_favorites": "Ajouter aux favoris",
       "remove_from_favorites": "Retirer des favoris",
       "remove_from_playlist": "Retirer de la playlist"
     },
     "playlists": {
-      "create_playlist": "Créer une playlist",
-      "playlist_name": "Nom de la playlist",
+      "create_playlist": "Créer une Playlist",
+      "playlist_name": "Nom de la Playlist",
       "enter_name": "Entrer le nom de la playlist",
       "create": "Créer",
       "search_playlists": "Rechercher des playlists...",
@@ -841,10 +841,10 @@
       "created": "Playlist créée",
       "create_new": "Créer une nouvelle playlist",
       "failed_to_add": "Échec de l'ajout à la playlist",
-      "failed_to_remove": "Échec du retrait de la playlist",
-      "failed_to_create": "Échec de la création de la playlist",
+      "failed_to_remove": "Échec de la suppression de la playlist",
+      "failed_to_create": "Échec de la suppression de la playlist",
       "delete_playlist": "Supprimer la playlist",
-      "delete_confirm": "Êtes-vous sûr de vouloir supprimer « {{name}} » ? Cette action est irréversible.",
+      "delete_confirm": "Êtes-vous sûr de vouloir supprimer « {{ name }} » ? Cette action est irréversible.",
       "deleted": "Playlist supprimée",
       "failed_to_delete": "Échec de la suppression de la playlist"
     },
@@ -855,46 +855,46 @@
     }
   },
   "watchlists": {
-    "title": "Listes de suivi",
-    "my_watchlists": "Mes listes de suivi",
-    "public_watchlists": "Listes de suivi publiques",
-    "create_title": "Créer une liste de suivi",
-    "edit_title": "Modifier la liste de suivi",
-    "create_button": "Créer une liste de suivi",
+    "title": "Listes de lecture",
+    "my_watchlists": "Mes listes de lecture",
+    "public_watchlists": "Watchlist publique",
+    "create_title": "Créer une Watchlist",
+    "edit_title": "Modifier la Watchlist",
+    "create_button": "Créer une Watchlist",
     "save_button": "Enregistrer les modifications",
     "delete_button": "Supprimer",
     "remove_button": "Retirer",
     "cancel_button": "Annuler",
     "name_label": "Nom",
-    "name_placeholder": "Entrez le nom de la liste de suivi",
+    "name_placeholder": "Entrer le nom de la playlist",
     "description_label": "Description",
     "description_placeholder": "Entrez la description (facultatif)",
-    "is_public_label": "Liste de suivi publique",
+    "is_public_label": "Liste de lecture Publique",
     "is_public_description": "Autoriser d'autres personnes à voir cette liste de suivi",
     "allowed_type_label": "Type de contenu",
     "sort_order_label": "Ordre de tri par défaut",
-    "empty_title": "Aucune liste de suivi",
+    "empty_title": "Pas de Watchlists",
     "empty_description": "Créez votre première liste de suivi pour commencer à organiser vos médias",
     "empty_watchlist": "Cette liste de suivi est vide",
     "empty_watchlist_hint": "Ajouter des éléments de votre bibliothèque à cette liste de suivi",
     "not_configured_title": "Streamystats non configuré",
     "not_configured_description": "Configurer Streamystats dans les paramètres pour utiliser les listes de suivi",
-    "go_to_settings": "Accédez aux paramètres",
-    "add_to_watchlist": "Ajouter à la liste de suivi",
-    "remove_from_watchlist": "Retirer de la liste de suivi",
+    "go_to_settings": "Accédez aux Paramètres",
+    "add_to_watchlist": "Ajouter à la Watchlist",
+    "remove_from_watchlist": "Retirer de la Watchlist",
     "select_watchlist": "Sélectionner la liste de suivi",
-    "create_new": "Créer une nouvelle liste de suivi",
-    "item": "élément",
-    "items": "éléments",
+    "create_new": "Créer une Watchlist",
+    "item": "médias",
+    "items": "élément",
     "public": "Publique",
     "private": "Privée",
-    "you": "Vous",
+    "you": "Vous-même",
     "by_owner": "Par un autre utilisateur",
-    "not_found": "Liste de suivi introuvable",
-    "delete_confirm_title": "Supprimer la liste de suivi",
-    "delete_confirm_message": "Voulez-vous vraiment supprimer « {{name}} » ? Cette action est irréversible.",
-    "remove_item_title": "Retirer de la liste de suivi",
-    "remove_item_message": "Retirer « {{name}} » de cette liste de suivi ?",
+    "not_found": "Playlist introuvable",
+    "delete_confirm_title": "Supprimer la Watchlist",
+    "delete_confirm_message": "Tous les médias (par défaut)",
+    "remove_item_title": "Retirer de la Watchlist",
+    "remove_item_message": "Retirer «{{name}}» de cette liste de suivi?",
     "loading": "Chargement des listes de suivi...",
     "no_compatible_watchlists": "Aucune liste de suivi compatible",
     "create_one_first": "Créer une liste de suivi qui accepte ce type de contenu"
@@ -910,33 +910,33 @@
     }
   },
   "companion_login": {
-    "title": "Associer à la TV",
-    "align_qr": "Alignez le code QR dans le cadre",
-    "enter_code_manually": "Saisir le code manuellement",
-    "pairing_enter_credentials": "Entrez les identifiants pour le téléviseur",
-    "pairing_code_label": "Code d'appairage",
-    "server": "Serveur",
-    "authorize_button": "Autoriser",
-    "authorizing": "Autorisation en cours...",
-    "scan_again": "Scanner à nouveau",
-    "done": "Terminé",
-    "success_title": "Autorisation envoyée",
-    "pairing_tv_connecting": "La TV se connecte à votre compte",
-    "error_title": "Échec de l'autorisation",
-    "error_invalid_qr": "Code QR invalide. Veuillez scanner le code d'appairage du téléviseur.",
-    "error_generic": "Une erreur s'est produite. Veuillez réessayer.",
-    "error_permission_denied": "L'accès à la caméra est nécessaire pour scanner les QR codes.",
-    "login_as": "Se connecter en tant que {{username}} ?",
-    "on_server": "sur {{server}}",
-    "use_different_user": "Utiliser un autre utilisateur",
-    "open_settings": "Ouvrir les paramètres"
+    "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": "Authorize",
+    "authorizing": "Authorizing...",
+    "scan_again": "Scan Again",
+    "done": "Done",
+    "success_title": "Authorization Sent",
+    "pairing_tv_connecting": "The TV is connecting to your account",
+    "error_title": "Authorization Failed",
+    "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": "Associer au téléphone",
-    "pair_with_phone_title": "Se connecter sur la TV",
-    "waiting_for_phone": "En attente du téléphone...",
-    "scan_with_phone": "Scanner avec l'application Streamyfin sur votre téléphone",
-    "logging_in": "Connexion en cours...",
-    "logging_in_description": "Connexion à votre serveur"
+    "pair_with_phone": "Pair with Phone",
+    "pair_with_phone_title": "Login TV",
+    "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"
   }
 }

translations/he.json

@@ -16,14 +16,14 @@
     "got_it": "קיבלתי",
     "connection_failed": "ההתחברות נכשלה",
     "could_not_connect_to_server": "לא היה ניתן להתחבר לשרת. אנא בדוק את הקישור ואת חיבור הרשת שלך.",
-    "an_unexpected_error_occurred": "קרתה שגיאה לא צפויה",
+    "an_unexpected_error_occured": "קרתה שגיאה לא צפויה",
     "change_server": "החלף שרת",
     "invalid_username_or_password": "שם משתמש או סיסמה שגויים",
     "user_does_not_have_permission_to_log_in": "לחשבון זה אין גישה להתחבר",
     "server_is_taking_too_long_to_respond_try_again_later": "השרת לוקח יותר מדי זמן כדי להגיב, נסה שוב מאוחר יותר",
     "server_received_too_many_requests_try_again_later": "השרת קיבל יותר מדי קריאות, נסה שוב מאוחר יותר",
     "there_is_a_server_error": "קרתה שגיאה בצד השרת",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "קרתה שגיאה לא צפויה. האם כתובת השרת שהוקלדה נכונה?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "קרתה שגיאה לא צפויה. האם כתובת השרת שהוקלדה נכונה?",
     "too_old_server_text": "נמצא שרת Jellyfin שלא נתמך",
     "too_old_server_description": "אנא עדכן את גרסת ה-Jellyfin למעודכנת ביותר"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "אשר התחברות מהירה",
         "enter_the_quick_connect_code": "הקלד את קוד ההתחברות המהירה...",
         "success": "הצלחה",
-        "quick_connect_authorized": "חיבור מהיר אושר",
+        "quick_connect_autorized": "חיבור מהיר אושר",
         "error": "שגיאה",
         "invalid_code": "קוד שגוי",
         "authorize": "אשר"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "הצג קישורים לתפריטים מותאמים אישית",
         "show_large_home_carousel": "הצג קרוסלה גדולה במסך הבית (בטא)",
         "hide_libraries": "הסתר ספריות",
-        "select_libraries_you_want_to_hide": "בחר את הספריות שתרצה להסתיר ממסך הספריות וגם ממסך הבית.",
+        "select_liraries_you_want_to_hide": "בחר את הספריות שתרצה להסתיר ממסך הספריות וגם ממסך הבית.",
         "disable_haptic_feedback": "בטל משוב רטט",
         "default_quality": "איכות ברירת מחדל",
         "default_playback_speed": "Default Playback Speed",
@@ -384,8 +384,6 @@
         "device_usage": "מכשיר {{availableSpace}}%",
         "size_used": "השתמשת ב-{{used}} מתוך {{total}}",
         "delete_all_downloaded_files": "מחק את כל הקבצים שהורדו",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music Cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "בחר",
     "no_trailer_available": "אין טריילר זמין",
     "video": "וידאו",
     "audio": "שמע",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "שגיאה",
     "failed_to_get_stream_url": "נכשל בהשגת קישור הזרם",
-    "an_error_occurred_while_playing_the_video": "קרתה תקלה במהלך הניגון של הקובץ. בדוק את הלוגים בהגדרות.",
+    "an_error_occured_while_playing_the_video": "קרתה תקלה במהלך הניגון של הקובץ. בדוק את הלוגים בהגדרות.",
     "client_error": "שגיאת לקוח",
     "could_not_create_stream_for_chromecast": "נכשל ביצירת זרם עבור Chromecast",
     "message_from_server": "הודעה מהשרת: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/hu.json

@@ -16,14 +16,14 @@
     "got_it": "Értettem",
     "connection_failed": "Kapcsolódás Sikertelen",
     "could_not_connect_to_server": "Nem sikerült csatlakozni a szerverhez. Kérjük, ellenőrizd az URL-t és a hálózati kapcsolatot.",
-    "an_unexpected_error_occurred": "Váratlan Hiba Történt",
+    "an_unexpected_error_occured": "Váratlan Hiba Történt",
     "change_server": "Szerverváltás",
     "invalid_username_or_password": "Érvénytelen Felhasználónév vagy Jelszó",
     "user_does_not_have_permission_to_log_in": "A felhasználónak nincs jogosultsága a bejelentkezéshez",
     "server_is_taking_too_long_to_respond_try_again_later": "A szerver túl sokáig válaszol, próbáld újra később",
     "server_received_too_many_requests_try_again_later": "A szerver túl sok kérést kapott, próbáld újra később.",
     "there_is_a_server_error": "Szerverhiba történt",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "Váratlan hiba történt. Helyesen adtad meg a szerver URL-jét?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Váratlan hiba történt. Helyesen adtad meg a szerver URL-jét?",
     "too_old_server_text": "Nem Támogatott Jellyfin-szerver",
     "too_old_server_description": "Frissítsd a Jellyfint a legújabb verzióra"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Gyorscsatlakozás Engedélyezése",
         "enter_the_quick_connect_code": "Add meg a gyors csatlakozási kódot...",
         "success": "Siker",
-        "quick_connect_authorized": "Gyorscsatlakozás Engedélyezve",
+        "quick_connect_autorized": "Gyorscsatlakozás Engedélyezve",
         "error": "Hiba",
         "invalid_code": "Érvénytelen Kód",
         "authorize": "Engedélyezés"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Egyéni Menülinkek Megjelenítése",
         "show_large_home_carousel": "Show Large Home Carousel (beta)",
         "hide_libraries": "Könyvtárak Elrejtése",
-        "select_libraries_you_want_to_hide": "Válaszd ki azokat a könyvtárakat, amelyeket el szeretnél rejteni a Könyvtár fülön és a kezdőlapon.",
+        "select_liraries_you_want_to_hide": "Válaszd ki azokat a könyvtárakat, amelyeket el szeretnél rejteni a Könyvtár fülön és a kezdőlapon.",
         "disable_haptic_feedback": "Haptikus Visszajelzés Letiltása",
         "default_quality": "Alapértelmezett Minőség",
         "default_playback_speed": "Default Playback Speed",
@@ -384,8 +384,6 @@
         "device_usage": "Eszköz {{availableSpace}}%",
         "size_used": "{{used}} / {{total}} Használatban",
         "delete_all_downloaded_files": "Minden Letöltött Fájl Törlése",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music Cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Select",
     "no_trailer_available": "No trailer available",
     "video": "Videó",
     "audio": "Hang",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Hiba",
     "failed_to_get_stream_url": "Nem sikerült lekérni a stream URL-t",
-    "an_error_occurred_while_playing_the_video": "Hiba történt a videó lejátszása közben. Ellenőrizd a naplókat a beállításokban.",
+    "an_error_occured_while_playing_the_video": "Hiba történt a videó lejátszása közben. Ellenőrizd a naplókat a beállításokban.",
     "client_error": "Kliens Hiba",
     "could_not_create_stream_for_chromecast": "A Chromecast stream létrehozása sikertelen volt",
     "message_from_server": "Üzenet a szervertől: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/it.json

@@ -16,14 +16,14 @@
     "got_it": "Capito",
     "connection_failed": "Connessione fallita",
     "could_not_connect_to_server": "Impossibile connettersi al server. Controllare l'URL e la connessione di rete.",
-    "an_unexpected_error_occurred": "Si è verificato un errore inaspettato",
+    "an_unexpected_error_occured": "Si è verificato un errore inaspettato",
     "change_server": "Cambiare il server",
     "invalid_username_or_password": "Nome utente o password non validi",
     "user_does_not_have_permission_to_log_in": "L'utente non ha il permesso di accedere",
     "server_is_taking_too_long_to_respond_try_again_later": "Il server sta impiegando troppo tempo per rispondere, riprovare più tardi",
     "server_received_too_many_requests_try_again_later": "Il server ha ricevuto troppe richieste, riprovare più tardi.",
     "there_is_a_server_error": "Si è verificato un errore del server",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "Si è verificato un errore imprevisto. L'URL del server è stato inserito correttamente?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Si è verificato un errore imprevisto. L'URL del server è stato inserito correttamente?",
     "too_old_server_text": "Scoperto Server Jellyfin non supportato",
     "too_old_server_description": "Aggiorna Jellyfin all'ultima versione"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Autorizza Connessione Rapida",
         "enter_the_quick_connect_code": "Inserisci il codice per la Connessione Rapida...",
         "success": "Successo",
-        "quick_connect_authorized": "Connessione Rapida autorizzata",
+        "quick_connect_autorized": "Connessione Rapida autorizzata",
         "error": "Errore",
         "invalid_code": "Codice invalido",
         "authorize": "Autorizza"
@@ -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": {
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Mostra i link del menu personalizzato",
         "show_large_home_carousel": "Mostra Carosello Grande nella Home (beta)",
         "hide_libraries": "Nascondi Librerie",
-        "select_libraries_you_want_to_hide": "Selezionate le librerie che volete nascondere dalla scheda Libreria e dalle sezioni della pagina iniziale.",
+        "select_liraries_you_want_to_hide": "Selezionate le librerie che volete nascondere dalla scheda Libreria e dalle sezioni della pagina iniziale.",
         "disable_haptic_feedback": "Disabilita il feedback aptico",
         "default_quality": "Qualità predefinita",
         "default_playback_speed": "Default Playback Speed",
@@ -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"
         },
@@ -384,20 +384,18 @@
         "device_usage": "Dispositivo {{availableSpace}}%",
         "size_used": "{{used}} di {{total}} usato",
         "delete_all_downloaded_files": "Cancella Tutti i File Scaricati",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "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",
@@ -406,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"
@@ -421,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"
         }
       }
     },
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Seleziona",
     "no_trailer_available": "Nessun trailer disponibile",
     "video": "Video",
     "audio": "Audio",
@@ -495,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...",
@@ -520,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",
@@ -555,7 +554,7 @@
       "movies": "film",
       "series": "serie TV",
       "boxsets": "cofanetti",
-      "playlists": "Playlist",
+      "playlists": "Playlists",
       "items": "elementi"
     },
     "options": {
@@ -567,7 +566,7 @@
       "cover": "Copertina",
       "show_titles": "Mostra titoli",
       "show_stats": "Mostra statistiche",
-      "options_title": "Impostazioni"
+      "options_title": "Options"
     },
     "filters": {
       "genres": "Generi",
@@ -576,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": {
@@ -596,50 +595,51 @@
     "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",
-    "an_error_occurred_while_playing_the_video": "Si è verificato un errore durante la riproduzione del video. Controllare i log nelle impostazioni.",
+    "an_error_occured_while_playing_the_video": "Si è verificato un errore durante la riproduzione del video. Controllare i log nelle impostazioni.",
     "client_error": "Errore del client",
     "could_not_create_stream_for_chromecast": "Impossibile creare uno stream per Chromecast",
     "message_from_server": "Messaggio dal server",
     "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",
-    "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"
   }
 }

translations/ja.json

@@ -16,14 +16,14 @@
     "got_it": "了解",
     "connection_failed": "接続に失敗しました",
     "could_not_connect_to_server": "サーバーに接続できませんでした。URLとネットワーク接続を確認してください。",
-    "an_unexpected_error_occurred": "予期しないエラーが発生しました",
+    "an_unexpected_error_occured": "予期しないエラーが発生しました",
     "change_server": "サーバーの変更",
     "invalid_username_or_password": "ユーザー名またはパスワードが無効です",
     "user_does_not_have_permission_to_log_in": "ユーザーにログイン権限がありません",
     "server_is_taking_too_long_to_respond_try_again_later": "サーバーの応答に時間がかかりすぎています。しばらくしてからもう一度お試しください。",
     "server_received_too_many_requests_try_again_later": "サーバーにリクエストが多すぎます。後でもう一度お試しください。",
     "there_is_a_server_error": "サーバーエラーが発生しました",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "予期しないエラーが発生しました。サーバーのURLを正しく入力しましたか？",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "予期しないエラーが発生しました。サーバーのURLを正しく入力しましたか？",
     "too_old_server_text": "サポートされていないJellyfinサーバー発見",
     "too_old_server_description": "Jellyfinを最新バージョンにアップデートしてください"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "クイックコネクトを承認する",
         "enter_the_quick_connect_code": "クイックコネクトコードを入力...",
         "success": "成功しました",
-        "quick_connect_authorized": "クイックコネクトが承認されました",
+        "quick_connect_autorized": "クイックコネクトが承認されました",
         "error": "エラー",
         "invalid_code": "無効なコードです",
         "authorize": "承認"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "カスタムメニューのリンクを表示",
         "show_large_home_carousel": "大きなヒーロー（Beta）",
         "hide_libraries": "ライブラリを非表示",
-        "select_libraries_you_want_to_hide": "ライブラリタブとホームページセクションから非表示にするライブラリを選択します。",
+        "select_liraries_you_want_to_hide": "ライブラリタブとホームページセクションから非表示にするライブラリを選択します。",
         "disable_haptic_feedback": "触覚フィードバックを無効にする",
         "default_quality": "デフォルトの品質",
         "default_playback_speed": "Default Playback Speed",
@@ -384,8 +384,6 @@
         "device_usage": "デバイス {{availableSpace}}%",
         "size_used": "{{used}} / {{total}} 使用済み",
         "delete_all_downloaded_files": "すべてのダウンロードファイルを削除",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music Cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "選択",
     "no_trailer_available": "トレーラーがありません",
     "video": "映像",
     "audio": "音声",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "エラー",
     "failed_to_get_stream_url": "ストリームURLを取得できませんでした",
-    "an_error_occurred_while_playing_the_video": "動画の再生中にエラーが発生しました。設定でログを確認してください。",
+    "an_error_occured_while_playing_the_video": "動画の再生中にエラーが発生しました。設定でログを確認してください。",
     "client_error": "クライアントエラー",
     "could_not_create_stream_for_chromecast": "Chromecastのストリームを作成できませんでした",
     "message_from_server": "サーバーからのメッセージ",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/ko.json

@@ -16,14 +16,14 @@
     "got_it": "성공",
     "connection_failed": "연결 실패",
     "could_not_connect_to_server": "서버에 연결되지 않았습니다. URL과 네트워크 상태를 확인하세요.",
-    "an_unexpected_error_occurred": "예기치 않은 오류가 발생했습니다",
+    "an_unexpected_error_occured": "예기치 않은 오류가 발생했습니다",
     "change_server": "서버 변경",
     "invalid_username_or_password": "잘못된 아이디 혹은 비밀번호입니다",
     "user_does_not_have_permission_to_log_in": "로그인 하기 위한 권한이 없습니다",
     "server_is_taking_too_long_to_respond_try_again_later": "서버 응답이 너무 느립니다. 나중에 다시 시도하세요",
     "server_received_too_many_requests_try_again_later": "서버가 너무 많은 요청을 받았습니다. 나중에 다시 시도하세요.",
     "there_is_a_server_error": "서버 에러",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "예기치 않은 오류가 발생했습니다. 서버 URL을 올바르게 입력하셨습니까?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "예기치 않은 오류가 발생했습니다. 서버 URL을 올바르게 입력하셨습니까?",
     "too_old_server_text": "Unsupported Jellyfin Server Discovered",
     "too_old_server_description": "Please update Jellyfin to the latest version"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "퀵 커넥트 승인",
         "enter_the_quick_connect_code": "퀵 커넥트 코드 입력...",
         "success": "성공",
-        "quick_connect_authorized": "퀵 커넥트 승인됨",
+        "quick_connect_autorized": "퀵 커넥트 승인됨",
         "error": "오류",
         "invalid_code": "유효하지 않은 코드",
         "authorize": "승인"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "사용자 지정 메뉴 링크 표시",
         "show_large_home_carousel": "대형 홈 슬라이드 배너 표시 (베타)",
         "hide_libraries": "라이브러리 숨기기",
-        "select_libraries_you_want_to_hide": "Select the libraries you want to hide from the Library tab and home page sections.",
+        "select_liraries_you_want_to_hide": "Select the libraries you want to hide from the Library tab and home page sections.",
         "disable_haptic_feedback": "Disable Haptic Feedback",
         "default_quality": "Default Quality",
         "default_playback_speed": "Default Playback Speed",
@@ -384,8 +384,6 @@
         "device_usage": "디바이스 {{availableSpace}}%",
         "size_used": "{{used}} of {{total}} Used",
         "delete_all_downloaded_files": "Delete All Downloaded Files",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music Cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Select",
     "no_trailer_available": "No trailer available",
     "video": "Video",
     "audio": "Audio",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Error",
     "failed_to_get_stream_url": "Failed to get the stream URL",
-    "an_error_occurred_while_playing_the_video": "An error occurred while playing the video. Check logs in settings.",
+    "an_error_occured_while_playing_the_video": "An error occurred while playing the video. Check logs in settings.",
     "client_error": "Client Error",
     "could_not_create_stream_for_chromecast": "Could not create a stream for Chromecast",
     "message_from_server": "Message from Server: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/nl.json

@@ -16,14 +16,14 @@
     "got_it": "Begrepen",
     "connection_failed": "Verbinding mislukt",
     "could_not_connect_to_server": "Kon niet verbinden met de server. Controleer de URL en je netwerkverbinding.",
-    "an_unexpected_error_occurred": "Er is een onverwachte fout opgetreden",
+    "an_unexpected_error_occured": "Er is een onverwachte fout opgetreden",
     "change_server": "Server wijzigen",
     "invalid_username_or_password": "Onjuiste gebruikersnaam of wachtwoord",
     "user_does_not_have_permission_to_log_in": "Gebruiker heeft geen rechten om aan te melden",
     "server_is_taking_too_long_to_respond_try_again_later": "De server doet er te lang over om te antwoorden, probeer later opnieuw",
     "server_received_too_many_requests_try_again_later": "De server heeft te veel aanvragen ontvangen, probeer later opnieuw",
     "there_is_a_server_error": "Er is een serverfout",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "Er is een onverwachte fout opgetreden. Heb je de server URL correct ingegeven?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Er is een onverwachte fout opgetreden. Heb je de server URL correct ingegeven?",
     "too_old_server_text": "Niet-ondersteunde Jellyfin Server Ontdekt",
     "too_old_server_description": "Werk Jellyfin bij naar de laatste versie"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Snel Verbinden toestaan",
         "enter_the_quick_connect_code": "Vul de Snel Verbinden code in...",
         "success": "Succes",
-        "quick_connect_authorized": "Snel Verbinden toegestaan",
+        "quick_connect_autorized": "Snel Verbinden toegestaan",
         "error": "Fout",
         "invalid_code": "Ongeldige code",
         "authorize": "Toestaan"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Aangepaste menulinks tonen",
         "show_large_home_carousel": "Toon grote carrousel op startpagina (bèta)",
         "hide_libraries": "Verberg Bibliotheken",
-        "select_libraries_you_want_to_hide": "Selecteer de bibliotheken die je wil verbergen van de Bibliotheektab en hoofdpagina onderdelen.",
+        "select_liraries_you_want_to_hide": "Selecteer de bibliotheken die je wil verbergen van de Bibliotheektab en hoofdpagina onderdelen.",
         "disable_haptic_feedback": "Haptische feedback uitschakelen",
         "default_quality": "Standaard kwaliteit",
         "default_playback_speed": "Standaard Afspeelsnelheid",
@@ -384,8 +384,6 @@
         "device_usage": "Toestel {{availableSpace}}%",
         "size_used": "{{used}} van {{total}} gebruikt",
         "delete_all_downloaded_files": "Verwijder alle gedownloade bestanden",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music Cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Selecteren",
     "no_trailer_available": "Geen trailer beschikbaar",
     "video": "Video",
     "audio": "Audio",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Fout",
     "failed_to_get_stream_url": "De stream-URL kon niet worden verkregen",
-    "an_error_occurred_while_playing_the_video": "Er is een fout opgetreden tijdens het afspelen van de video. Controleer de logs in de instellingen.",
+    "an_error_occured_while_playing_the_video": "Er is een fout opgetreden tijdens het afspelen van de video. Controleer de logs in de instellingen.",
     "client_error": "Fout van de client",
     "could_not_create_stream_for_chromecast": "Kon geen stream maken voor Chromecast",
     "message_from_server": "Bericht van de server",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/no.json

@@ -16,14 +16,14 @@
     "got_it": "Har det",
     "connection_failed": "Tilkobling mislyktes",
     "could_not_connect_to_server": "Kunne ikke koble til serveren. Kontroller nettadressen og nettverkstilkoblingen.",
-    "an_unexpected_error_occurred": "En uventet feil oppstod",
+    "an_unexpected_error_occured": "En uventet feil oppstod",
     "change_server": "Endre server",
     "invalid_username_or_password": "Ugyldig brukernavn eller passord",
     "user_does_not_have_permission_to_log_in": "Brukeren har ikke tillatelse til å logge inn",
     "server_is_taking_too_long_to_respond_try_again_later": "Serveren tar for lang tid å svare, prøv igjen senere",
     "server_received_too_many_requests_try_again_later": "Serveren mottok for mange forespørsler, prøv igjen senere.",
     "there_is_a_server_error": "Det er en serverfeil",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "Det oppstod en uventet feil. Sendte du inn URLen til serveren riktig?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Det oppstod en uventet feil. Sendte du inn URLen til serveren riktig?",
     "too_old_server_text": "Ustøttet Jellyfin Server oppdaget",
     "too_old_server_description": "Vennligst oppdater Jellyfin til nyeste versjon"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Autoriser rask tilkobling",
         "enter_the_quick_connect_code": "Skriv inn hurtig-tilkobling kode...",
         "success": "Vellykket",
-        "quick_connect_authorized": "Hurtig tilkobling autorisert",
+        "quick_connect_autorized": "Hurtig tilkobling autorisert",
         "error": "Feil",
         "invalid_code": "Ugyldig kode",
         "authorize": "Autoriser"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Vis tilpassede menylenker",
         "show_large_home_carousel": "Show Large Home Carousel (beta)",
         "hide_libraries": "Skjul biblioteker",
-        "select_libraries_you_want_to_hide": "Velg bibliotekene du vil skjule deg for Biblioteket og avsnittene for hjemmesider.",
+        "select_liraries_you_want_to_hide": "Velg bibliotekene du vil skjule deg for Biblioteket og avsnittene for hjemmesider.",
         "disable_haptic_feedback": "Deaktiver Haptisk tilbakemelding",
         "default_quality": "Standard kvalitet",
         "default_playback_speed": "Default Playback Speed",
@@ -384,8 +384,6 @@
         "device_usage": "Enhet {{availableSpace}}%",
         "size_used": "{{used}} av {{total}} er i bruk",
         "delete_all_downloaded_files": "Slett alle nedlastede filer",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music Cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Velg",
     "no_trailer_available": "Ingen trailer tilgjengelig",
     "video": "Video",
     "audio": "Lyd",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Feil",
     "failed_to_get_stream_url": "Kan ikke hente nettadressen for stream",
-    "an_error_occurred_while_playing_the_video": "En feil oppstod under video. Sjekk loggene i innstillingene.",
+    "an_error_occured_while_playing_the_video": "En feil oppstod under video. Sjekk loggene i innstillingene.",
     "client_error": "Feil med annonsør",
     "could_not_create_stream_for_chromecast": "Kan ikke opprette en strøm for Chromecast",
     "message_from_server": "Melding fra tjener: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/pl.json

@@ -16,14 +16,14 @@
     "got_it": "Rozumiem",
     "connection_failed": "Połączenie nieudane",
     "could_not_connect_to_server": "Nie można połączyć się z serwerem. Sprawdź adres URL oraz połączenie sieciowe.",
-    "an_unexpected_error_occurred": "Wystąpił nieoczekiwany błąd",
+    "an_unexpected_error_occured": "Wystąpił nieoczekiwany błąd",
     "change_server": "Zmień serwer",
     "invalid_username_or_password": "Nieprawidłowa nazwa użytkownika lub hasło",
     "user_does_not_have_permission_to_log_in": "Użytkownik nie ma uprawnień do logowania",
     "server_is_taking_too_long_to_respond_try_again_later": "Serwer zbyt długo nie odpowiada – spróbuj ponownie później",
     "server_received_too_many_requests_try_again_later": "Serwer otrzymał zbyt wiele żądań – spróbuj ponownie później.",
     "there_is_a_server_error": "Wystąpił błąd serwera",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "Wystąpił nieoczekiwany błąd. Czy wpisałeś poprawny adres URL?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Wystąpił nieoczekiwany błąd. Czy wpisałeś poprawny adres URL?",
     "too_old_server_text": "Wykryto nieobsługiwany serwer Jellyfin",
     "too_old_server_description": "Proszę zaktualizować Jellyfin do najnowszej wersji"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Autoryzuj szybkie połączenie",
         "enter_the_quick_connect_code": "Wpisz kod szybkiego połączenia...",
         "success": "Sukces",
-        "quick_connect_authorized": "Szybkie połączenie autoryzowane",
+        "quick_connect_autorized": "Szybkie połączenie autoryzowane",
         "error": "Błąd",
         "invalid_code": "Nieprawidłowy kod",
         "authorize": "Autoryzuj"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Pokaż niestandardowe odnośniki w menu",
         "show_large_home_carousel": "Wyświetl Dużą Karuzelę na ekranie głównym (beta)",
         "hide_libraries": "Ukryj biblioteki",
-        "select_libraries_you_want_to_hide": "Wybierz biblioteki, które chcesz ukryć na karcie Biblioteka i w sekcjach strony głównej.",
+        "select_liraries_you_want_to_hide": "Wybierz biblioteki, które chcesz ukryć na karcie Biblioteka i w sekcjach strony głównej.",
         "disable_haptic_feedback": "Wyłącz wibracje",
         "default_quality": "Domyślna jakość",
         "default_playback_speed": "Domyślna prędkość odtwarzania",
@@ -384,8 +384,6 @@
         "device_usage": "Urządzenie {{availableSpace}}%",
         "size_used": "{{used}} z {{total}} wykorzystane",
         "delete_all_downloaded_files": "Usuń wszystkie pobrane pliki",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Bufor muzyki",
         "music_cache_description": "Automatycznie buforuj piosenki w trakcie słuchania dla płynniejszego odtwarzania i wsparcia offline",
         "clear_music_cache": "Wyczyść bufor muzyki",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Wybierz",
     "no_trailer_available": "Brak dostępnego zwiastunu",
     "video": "Wideo",
     "audio": "Dźwięk",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Błąd",
     "failed_to_get_stream_url": "Nie udało się pobrać adresu strumienia",
-    "an_error_occurred_while_playing_the_video": "Wystąpił błąd podczas odtwarzania wideo. Sprawdź logi w ustawieniach.",
+    "an_error_occured_while_playing_the_video": "Wystąpił błąd podczas odtwarzania wideo. Sprawdź logi w ustawieniach.",
     "client_error": "Błąd klienta",
     "could_not_create_stream_for_chromecast": "Nie udało się utworzyć strumienia dla Chromecasta",
     "message_from_server": "Wiadomość z serwera: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/pt.json

@@ -16,14 +16,14 @@
     "got_it": "Tenho isso",
     "connection_failed": "Falha na conexão",
     "could_not_connect_to_server": "Não foi possível conectar ao servidor. Verifique a URL e sua conexão de rede.",
-    "an_unexpected_error_occurred": "An unexpected error occurred",
+    "an_unexpected_error_occured": "Ocorreu um erro inesperado",
     "change_server": "Alterar Servidor",
     "invalid_username_or_password": "Usuário ou senha inválidos",
     "user_does_not_have_permission_to_log_in": "Usuário não tem permissão para fazer login",
     "server_is_taking_too_long_to_respond_try_again_later": "O servidor está demorando muito para responder, tente novamente mais tarde",
     "server_received_too_many_requests_try_again_later": "O servidor recebeu muitos pedidos, tente novamente mais tarde.",
     "there_is_a_server_error": "Existe um erro no servidor",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "An unexpected error occurred. Did you enter the server URL correctly?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Ocorreu um erro inesperado. Você inseriu a URL do servidor corretamente?",
     "too_old_server_text": "Servidor Jellyfin Descoberto Não Suportado",
     "too_old_server_description": "Por favor, atualize o Jellyfin para a versão mais recente"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Autorizar conexão rápida",
         "enter_the_quick_connect_code": "Insira o código de conexão rápida...",
         "success": "Sucesso",
-        "quick_connect_authorized": "Quick Connect authorized",
+        "quick_connect_autorized": "Acesso Rápido Autorizado",
         "error": "Erro",
         "invalid_code": "Código inválido",
         "authorize": "Autorizar"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Mostrar Links de Menu Personalizado",
         "show_large_home_carousel": "Mostrar Carrossel Grande (beta)",
         "hide_libraries": "Ocultar bibliotecas",
-        "select_libraries_you_want_to_hide": "Select the libraries you want to hide from the Library tab and home page sections.",
+        "select_liraries_you_want_to_hide": "Selecione as bibliotecas que você deseja ocultar da aba Biblioteca e seções da página inicial.",
         "disable_haptic_feedback": "Desativar o retorno tátil",
         "default_quality": "Qualidade Padrão",
         "default_playback_speed": "Velocidade padrão de reprodução",
@@ -384,8 +384,6 @@
         "device_usage": "Dispositivo {{availableSpace}}%",
         "size_used": "{{used}} de {{total}} Utilizados",
         "delete_all_downloaded_files": "Excluir todos os arquivos baixados",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Cache de Música",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Limpar Cache de Música",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Selecionar",
     "no_trailer_available": "Nenhum trailer disponível",
     "video": "Vídeo",
     "audio": "Áudio",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "ERRO",
     "failed_to_get_stream_url": "Falha ao obter a URL de transmissão",
-    "an_error_occurred_while_playing_the_video": "An error occurred while playing the video. Check logs in settings.",
+    "an_error_occured_while_playing_the_video": "Ocorreu um erro ao reproduzir o vídeo. Verifique os logs nas configurações.",
     "client_error": "Erro de Cliente",
     "could_not_create_stream_for_chromecast": "Não foi possível criar um fluxo para o Chromecast",
     "message_from_server": "Mensagem do Servidor: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/ro.json

@@ -16,14 +16,14 @@
     "got_it": "Am înţeles",
     "connection_failed": "Conectare eșuată",
     "could_not_connect_to_server": "Nu s-a putut conecta la server. Verificați adresa URL și conexiunea la internet.",
-    "an_unexpected_error_occurred": "A apărut o eroare neașteptată",
+    "an_unexpected_error_occured": "A apărut o eroare neașteptată",
     "change_server": "Schimba",
     "invalid_username_or_password": "Nume de utilizator sau parolă greșită",
     "user_does_not_have_permission_to_log_in": "Utilizatorul nu are permisiunea de a se conecta",
     "server_is_taking_too_long_to_respond_try_again_later": "Serverul răspunde prea greu, încearcă din nou mai târziu.",
     "server_received_too_many_requests_try_again_later": "Serverul a primit prea multe solicitări, încercați din nou mai târziu.",
     "there_is_a_server_error": "Eroare de server",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "A apărut o eroare neașteptată. Ați introdus corect adresa URL a serverului?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "A apărut o eroare neașteptată. Ați introdus corect adresa URL a serverului?",
     "too_old_server_text": "Serverul Jellyfin Neacceptat Descoperit",
     "too_old_server_description": "Vă rugăm să actualizați Jellyfin la cea mai recentă versiune"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Autorizare conectare rapidă",
         "enter_the_quick_connect_code": "Introduceți codul pt. conectare rapidă...",
         "success": "Succes",
-        "quick_connect_authorized": "Conectare rapidă autorizată",
+        "quick_connect_autorized": "Conectare rapidă autorizată",
         "error": "Eroare",
         "invalid_code": "Cod invalid.",
         "authorize": "Autorizează"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Afișează link-uri personalizate în meniu",
         "show_large_home_carousel": "Arată Caruselul Media Mare (beta)",
         "hide_libraries": "Ascunde bibliotecile",
-        "select_libraries_you_want_to_hide": "Selectează bibliotecile pe care dorești să le ascunzi din fila Bibliotecă și din secțiunile paginii principale.",
+        "select_liraries_you_want_to_hide": "Selectează bibliotecile pe care dorești să le ascunzi din fila Bibliotecă și din secțiunile paginii principale.",
         "disable_haptic_feedback": "Dezactivează vibrațiile tactile",
         "default_quality": "Calitate implicită",
         "default_playback_speed": "Default Playback Speed",
@@ -384,8 +384,6 @@
         "device_usage": "Dispozitiv {{availableSpace}}%",
         "size_used": "{{used}} din {{total}} folosit",
         "delete_all_downloaded_files": "Ștergeți toate fișierele descărcate",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music Cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Selectare",
     "no_trailer_available": "Nicio remorcă disponibilă",
     "video": "Video",
     "audio": "Audio",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Eroare",
     "failed_to_get_stream_url": "Nu s-a putut obține adresa URL a fluxului",
-    "an_error_occurred_while_playing_the_video": "A apărut o eroare la redarea videoclipului. Verificați jurnalele în setări.",
+    "an_error_occured_while_playing_the_video": "A apărut o eroare la redarea videoclipului. Verificați jurnalele în setări.",
     "client_error": "Eroare client",
     "could_not_create_stream_for_chromecast": "Nu s-a putut crea un flux pentru Chromecast",
     "message_from_server": "Mesaj de la server: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/ru.json

@@ -16,14 +16,14 @@
     "got_it": "Принято",
     "connection_failed": "Соединение не удалось",
     "could_not_connect_to_server": "Не удалось подключиться к серверу. Пожалуйста, проверьте URL и ваше интернет-соединение.",
-    "an_unexpected_error_occurred": "Возникла непредвиденная ошибка",
+    "an_unexpected_error_occured": "Возникла непредвиденная ошибка",
     "change_server": "Поменять сервер",
     "invalid_username_or_password": "Неправильное имя пользователя или пароль",
     "user_does_not_have_permission_to_log_in": "Пользователь не имеет прав на вход",
     "server_is_taking_too_long_to_respond_try_again_later": "Сервер долго не отвечает, попробуйте позже",
     "server_received_too_many_requests_try_again_later": "Сервер получил слишком много запросов, попробуйте позже.",
     "there_is_a_server_error": "Возникла ошибка сервера",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "Возникла непредвиденная ошибка. Вы правильно ввели URL?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Возникла непредвиденная ошибка. Вы правильно ввели URL?",
     "too_old_server_text": "Обнаружен неподдерживаемый сервер Jellyfin",
     "too_old_server_description": "Пожалуйста, обновите Jellyfin до последней версии"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Авторизовать через быстрое подключение",
         "enter_the_quick_connect_code": "Введите код для быстрого подключения...",
         "success": "Успех",
-        "quick_connect_authorized": "Быстрое подключение авторизовано",
+        "quick_connect_autorized": "Быстрое подключение авторизовано",
         "error": "Ошибка",
         "invalid_code": "Неверный код",
         "authorize": "Авторизовать"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Показать ссылки пользовательского меню",
         "show_large_home_carousel": "Показывать большую карусель (beta)",
         "hide_libraries": "Скрыть библиотеки",
-        "select_libraries_you_want_to_hide": "Выберите Библиотеки, которое хотите спрятать из вкладки Библиотеки и домашней страницы.",
+        "select_liraries_you_want_to_hide": "Выберите Библиотеки, которое хотите спрятать из вкладки Библиотеки и домашней страницы.",
         "disable_haptic_feedback": "Отключить тактильную обратную связь",
         "default_quality": "Качество по умолчанию",
         "default_playback_speed": "Скорость воспроизведения по умолчанию",
@@ -384,8 +384,6 @@
         "device_usage": "Устройство {{availableSpace}}%",
         "size_used": "{{used}} из {{total}} использовано",
         "delete_all_downloaded_files": "Удалить все загруженные файлы",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Кеш музыки",
         "music_cache_description": "Автоматически кешировать песни по мере прослушивания для плавного воспроизведения и поддержки отсутствия интернета",
         "clear_music_cache": "Очистить кеш музыки",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Выбрать",
     "no_trailer_available": "Трейлер недоступен",
     "video": "Видео",
     "audio": "Звук",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Ошибка",
     "failed_to_get_stream_url": "Не удалось получить URL потока",
-    "an_error_occurred_while_playing_the_video": "Возникла Неожиданная ошибка во время воспроизведения. Проверьте логи в настройках.",
+    "an_error_occured_while_playing_the_video": "Возникла Неожиданная ошибка во время воспроизведения. Проверьте логи в настройках.",
     "client_error": "Ошибка клиента",
     "could_not_create_stream_for_chromecast": "Не удалось создать поток для Chromecast",
     "message_from_server": "Сообщение от сервера: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/sv.json

@@ -16,14 +16,14 @@
     "got_it": "Koden har mottagits",
     "connection_failed": "Anslutningen Misslyckades",
     "could_not_connect_to_server": "Det gick inte att ansluta till servern. Kontrollera webbadressen och din nätverksanslutning.",
-    "an_unexpected_error_occurred": "Ett Oväntat Fel Uppstod",
+    "an_unexpected_error_occured": "Ett Oväntat Fel Uppstod",
     "change_server": "Byt Server",
     "invalid_username_or_password": "Ogiltigt användarnamn eller lösenord",
     "user_does_not_have_permission_to_log_in": "Användaren har inte behörighet att logga in",
     "server_is_taking_too_long_to_respond_try_again_later": "Servern svarar för långsamt, försök igen senare",
     "server_received_too_many_requests_try_again_later": "Servern har fått för många förfrågningar, försök igen senare.",
     "there_is_a_server_error": "Ett serverfel uppstod",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "Ett oväntat fel uppstod. Har du angett serverns URL korrekt?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Ett oväntat fel uppstod. Har du angett serverns URL korrekt?",
     "too_old_server_text": "Jellyfin Servern Stöds Inte",
     "too_old_server_description": "Var God Uppdatera Jellyfin Till Den Senaste Versionen"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Godkänn snabbanslutning",
         "enter_the_quick_connect_code": "Ange snabbanslutningskod...",
         "success": "Snabbanslutning lyckades",
-        "quick_connect_authorized": "Snabbanslutning Godkänd",
+        "quick_connect_autorized": "Snabbanslutning Godkänd",
         "error": "Fel",
         "invalid_code": "Ogiltig kod",
         "authorize": "Autentisera"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Visa anpassade menylänkar",
         "show_large_home_carousel": "Visa toppbanner (beta)",
         "hide_libraries": "Dölj bibliotek",
-        "select_libraries_you_want_to_hide": "Välj de bibliotek du vill dölja på fliken Bibliotek och på startsidan.",
+        "select_liraries_you_want_to_hide": "Välj de bibliotek du vill dölja på fliken Bibliotek och på startsidan.",
         "disable_haptic_feedback": "Stäng av vibrationer",
         "default_quality": "Förvald Kvalitet",
         "default_playback_speed": "Default Playback Speed",
@@ -384,8 +384,6 @@
         "device_usage": "Telefon {{availableSpace}}%",
         "size_used": "{{used}} av {{total}} används",
         "delete_all_downloaded_files": "Ta bort alla nerladdade filer",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Musikcache",
         "music_cache_description": "Cacha automatiskt låtar när du lyssnar för smidigare uppspelning och offline-stöd",
         "clear_music_cache": "Rensa musikcache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "Inga resultat",
+    "select": "Välj",
     "no_trailer_available": "Ingen trailer tillgänglig",
     "video": "Video",
     "audio": "Ljud",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Fel",
     "failed_to_get_stream_url": "Kunde inte hämta stream-URL",
-    "an_error_occurred_while_playing_the_video": "Ett fel uppstod vid uppspelning av videon. Kontrollera loggarna i inställningarna.",
+    "an_error_occured_while_playing_the_video": "Ett fel uppstod vid uppspelning av videon. Kontrollera loggarna i inställningarna.",
     "client_error": "Klientfel",
     "could_not_create_stream_for_chromecast": "Kunde inte skapa stream för Chromecast",
     "message_from_server": "Meddelande från servern: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Använder Jellyfin-server",
     "language": "Språk",
     "results": "Resultat",
+    "searching": "Söker...",
     "search_failed": "Sökningen misslyckades",
     "no_subtitle_provider": "Ingen undertextleverantör konfigurerad på servern",
     "no_subtitles_found": "Inga undertexter hittades",

translations/th.json

@@ -16,14 +16,14 @@
     "got_it": "Got It",
     "connection_failed": "Connection Failed",
     "could_not_connect_to_server": "Could not connect to the server. Please check the URL and your network connection.",
-    "an_unexpected_error_occurred": "An unexpected error occurred",
+    "an_unexpected_error_occured": "An Unexpected Error Occurred",
     "change_server": "Change Server",
     "invalid_username_or_password": "Invalid Username or Password",
     "user_does_not_have_permission_to_log_in": "ผู้ใช้ไม่มีสิทธิ์ในการเข้าสู่ระบบ",
     "server_is_taking_too_long_to_respond_try_again_later": "Server is taking too long to respond, try again later",
     "server_received_too_many_requests_try_again_later": "Server received too many requests, try again later.",
     "there_is_a_server_error": "There is a server error",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "An unexpected error occurred. Did you enter the server URL correctly?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "",
     "too_old_server_text": "Unsupported Jellyfin Server Discovered",
     "too_old_server_description": "Please update Jellyfin to the latest version"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Authorize Quick Connect",
         "enter_the_quick_connect_code": "Enter the quick connect code...",
         "success": "Success",
-        "quick_connect_authorized": "Quick Connect authorized",
+        "quick_connect_autorized": "Quick Connect Authorized",
         "error": "Error",
         "invalid_code": "Invalid Code",
         "authorize": "Authorize"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Show Custom Menu Links",
         "show_large_home_carousel": "Show Large Home Carousel (beta)",
         "hide_libraries": "Hide Libraries",
-        "select_libraries_you_want_to_hide": "Select the libraries you want to hide from the Library tab and home page sections.",
+        "select_liraries_you_want_to_hide": "Select the libraries you want to hide from the Library tab and home page sections.",
         "disable_haptic_feedback": "Disable Haptic Feedback",
         "default_quality": "Default Quality",
         "default_playback_speed": "Default Playback Speed",
@@ -384,8 +384,6 @@
         "device_usage": "Device {{availableSpace}}%",
         "size_used": "{{used}} of {{total}} Used",
         "delete_all_downloaded_files": "Delete All Downloaded Files",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music Cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Select",
     "no_trailer_available": "No trailer available",
     "video": "Video",
     "audio": "Audio",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Error",
     "failed_to_get_stream_url": "Failed to get the stream URL",
-    "an_error_occurred_while_playing_the_video": "An error occurred while playing the video. Check logs in settings.",
+    "an_error_occured_while_playing_the_video": "An error occurred while playing the video. Check logs in settings.",
     "client_error": "Client Error",
     "could_not_create_stream_for_chromecast": "Could not create a stream for Chromecast",
     "message_from_server": "Message from Server: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/tlh.json

@@ -16,14 +16,14 @@
     "got_it": "jIyaj",
     "connection_failed": "ngoQlaHbe'",
     "could_not_connect_to_server": "SeHlaw veS Ho'Do'laHbe'. URL 'ej ret ghun mej.",
-    "an_unexpected_error_occurred": "num ghIq Doch",
+    "an_unexpected_error_occured": "num ghIq Doch",
     "change_server": "Ho'Do' veS yIghoS",
     "invalid_username_or_password": "tlhIngan pagh ngoq De' law'be'",
     "user_does_not_have_permission_to_log_in": "tlhIngan lut 'el je'laHbe'",
     "server_is_taking_too_long_to_respond_try_again_later": "Ho'Do' veS jachrup. pItlh yIHaD",
     "server_received_too_many_requests_try_again_later": "Ho'Do' veS lutlh ngeb petlh law'. pItlh yIHaD.",
     "there_is_a_server_error": "Ho'Do' veS ghIq maS",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "num ghIq Doch. URL mej Danej'a'?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "num ghIq Doch. URL mej Danej'a'?",
     "too_old_server_text": "Unsupported Jellyfin Server Discovered",
     "too_old_server_description": "**Jellyfin chu'qu' Dotlh yIchoHmoH**"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "parmaq ngoQ yIje'",
         "enter_the_quick_connect_code": "parmaq ngoQ De' yI'el...",
         "success": "Qapla'",
-        "quick_connect_authorized": "parmaq ngoQ je'laH",
+        "quick_connect_autorized": "parmaq ngoQ je'laH",
         "error": "ghIq",
         "invalid_code": "De' law'be'",
         "authorize": "yIje'"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "menuDaq ret teqlu' yInej",
         "show_large_home_carousel": "Show Large Home Carousel (beta)",
         "hide_libraries": "De'wI' bom yIQIj",
-        "select_libraries_you_want_to_hide": "De'wI' bom Danej QIj yIwIv.",
+        "select_liraries_you_want_to_hide": "De'wI' bom Danej QIj yIwIv.",
         "disable_haptic_feedback": "Qub quvHa' yIQIj",
         "default_quality": "wa' luj",
         "default_playback_speed": "Default Playback Speed",
@@ -384,8 +384,6 @@
         "device_usage": "naDev {{availableSpace}}%",
         "size_used": "{{used}} / {{total}} ram",
         "delete_all_downloaded_files": "Hoch Qaw' Doch yIQaw'",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music Cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Select",
     "no_trailer_available": "No trailer available",
     "video": "mu'tlhegh",
     "audio": "QoQ",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "ghIq",
     "failed_to_get_stream_url": "tlhol ret URL tu'laHbe'",
-    "an_error_occurred_while_playing_the_video": "mu'tlhegh tlholDI' ghIq. menDaq De' qon mej.",
+    "an_error_occured_while_playing_the_video": "mu'tlhegh tlholDI' ghIq. menDaq De' qon mej.",
     "client_error": "lut 'el ghIq",
     "could_not_create_stream_for_chromecast": "Chromecast tlhol ret qonlaHbe'",
     "message_from_server": "Ho'Do' veS jach: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/tr.json

@@ -16,14 +16,14 @@
     "got_it": "Anlaşıldı",
     "connection_failed": "Bağlantı başarısız",
     "could_not_connect_to_server": "Sunucuya bağlanılamadı. Lütfen URL'yi ve ağ bağlantınızı kontrol edin.",
-    "an_unexpected_error_occurred": "Beklenmedik bir hata oluştu",
+    "an_unexpected_error_occured": "Beklenmedik bir hata oluştu",
     "change_server": "Sunucu değiştir",
     "invalid_username_or_password": "Geçersiz kullanıcı adı veya şifre",
     "user_does_not_have_permission_to_log_in": "Kullanıcının giriş yapma izni yok",
     "server_is_taking_too_long_to_respond_try_again_later": "Sunucunun yanıt vermesi çok uzun sürüyor, lütfen daha sonra tekrar deneyin",
     "server_received_too_many_requests_try_again_later": "Sunucu çok fazla istek aldı, lütfen daha sonra tekrar deneyin.",
     "there_is_a_server_error": "Sunucu hatası var",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "Beklenmedik bir hata oluştu. Sunucu URL'sini doğru girdiğinizden emin misiniz?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Beklenmedik bir hata oluştu. Sunucu URL'sini doğru girdiğinizden emin misiniz?",
     "too_old_server_text": "Desteklenmeyen Jellyfin Sunucu sürümü bulundu.",
     "too_old_server_description": "Lütfen Jellyfin'i en son sürüme güncelleyin."
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Hızlı Bağlantıyı Yetkilendir",
         "enter_the_quick_connect_code": "Hızlı bağlantı kodunu girin...",
         "success": "Başarılı",
-        "quick_connect_authorized": "Hızlı Bağlantı Yetkilendirildi",
+        "quick_connect_autorized": "Hızlı Bağlantı Yetkilendirildi",
         "error": "Hata",
         "invalid_code": "Geçersiz kod",
         "authorize": "Yetkilendir"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Özel Menü Bağlantılarını Göster",
         "show_large_home_carousel": "Show Large Home Carousel (beta)",
         "hide_libraries": "Kütüphaneleri Gizle",
-        "select_libraries_you_want_to_hide": "Kütüphane sekmesinden ve ana sayfa bölümlerinden gizlemek istediğiniz kütüphaneleri seçin.",
+        "select_liraries_you_want_to_hide": "Kütüphane sekmesinden ve ana sayfa bölümlerinden gizlemek istediğiniz kütüphaneleri seçin.",
         "disable_haptic_feedback": "Dokunsal Geri Bildirimi Devre Dışı Bırak",
         "default_quality": "Varsayılan kalite",
         "default_playback_speed": "Varsayılan Oynatma Hızı",
@@ -384,8 +384,6 @@
         "device_usage": "Cihaz {{availableSpace}}%",
         "size_used": "{{used}} / {{total}} kullanıldı",
         "delete_all_downloaded_files": "Tüm indirilen dosyaları sil",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Müzik Ön Belleği",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Müzik Ön Belleğini Temizle",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Seç",
     "no_trailer_available": "Fragman mevcut değil",
     "video": "Video",
     "audio": "Ses",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Hata",
     "failed_to_get_stream_url": "Yayın URL'si alınamadı",
-    "an_error_occurred_while_playing_the_video": "Video oynatılırken bir hata oluştu. Ayarlardaki günlüklere bakın.",
+    "an_error_occured_while_playing_the_video": "Video oynatılırken bir hata oluştu. Ayarlardaki günlüklere bakın.",
     "client_error": "İstemci hatası",
     "could_not_create_stream_for_chromecast": "Chromecast için yayın oluşturulamadı",
     "message_from_server": "Sunucudan mesaj: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/uk.json

@@ -16,14 +16,14 @@
     "got_it": "Готово",
     "connection_failed": "Помилка зʼєднання",
     "could_not_connect_to_server": "Неможливо підʼєднатися до серверу. Будь ласка перевірте URL і ваше зʼєднання з мережею",
-    "an_unexpected_error_occurred": "Сталася несподівана помилка",
+    "an_unexpected_error_occured": "Сталася несподівана помилка",
     "change_server": "Змінити сервер",
     "invalid_username_or_password": "Неправильні імʼя користувача або пароль",
     "user_does_not_have_permission_to_log_in": "Користувач не маю дозволу на вхід",
     "server_is_taking_too_long_to_respond_try_again_later": "Сервер відповідає занадто довго, будь-ласка спробуйте пізніше",
     "server_received_too_many_requests_try_again_later": "Сервер отримав забагато запитів, будь ласка спробуйте пізніше.",
     "there_is_a_server_error": "Відбулася помилка на стороні сервера",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "Відбулася несподівана помилка. Чи введений URL сервера правильний?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Відбулася несподівана помилка. Чи введений URL сервера правильний?",
     "too_old_server_text": "Unsupported Jellyfin Server Discovered",
     "too_old_server_description": "Please update Jellyfin to the latest version"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Авторизуйте Швидке Зʼєднання",
         "enter_the_quick_connect_code": "Введіть код для швидкого зʼєднання...",
         "success": "Успіх",
-        "quick_connect_authorized": "Швидке Зʼєднання авторизовано",
+        "quick_connect_autorized": "Швидке Зʼєднання авторизовано",
         "error": "Помилка",
         "invalid_code": "Не правильний код",
         "authorize": "Авторизувати"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Показати користувацькі посилання меню",
         "show_large_home_carousel": "Show Large Home Carousel (beta)",
         "hide_libraries": "Сховати медіатеки",
-        "select_libraries_you_want_to_hide": "Виберіть медіатеки, що бажаєте приховати з вкладки Медіатека і з секції на головній сторінці.",
+        "select_liraries_you_want_to_hide": "Виберіть медіатеки, що бажаєте приховати з вкладки Медіатека і з секції на головній сторінці.",
         "disable_haptic_feedback": "Вимкнути тактильний зворотний зв'язок",
         "default_quality": "Якість за замовченням",
         "default_playback_speed": "Default Playback Speed",
@@ -384,8 +384,6 @@
         "device_usage": "Гаджет {{availableSpace}}%",
         "size_used": "{{used}} з {{total}} використано",
         "delete_all_downloaded_files": "Видалити усі завантаженні файли",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music Cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Select",
     "no_trailer_available": "No trailer available",
     "video": "Video",
     "audio": "Audio",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Помилка",
     "failed_to_get_stream_url": "Не вдалося отримати URL-адресу потоку",
-    "an_error_occurred_while_playing_the_video": "Під час відтворення відео сталася помилка. Перевірте журнал в налаштуваннях.",
+    "an_error_occured_while_playing_the_video": "Під час відтворення відео сталася помилка. Перевірте журнал в налаштуваннях.",
     "client_error": "Помилка клієнту",
     "could_not_create_stream_for_chromecast": "Не вдалося створити потік для Chromecast",
     "message_from_server": "Повідомлення від серверу: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/vi.json

@@ -16,14 +16,14 @@
     "got_it": "Đã hiểu",
     "connection_failed": "Kết nối thất bại",
     "could_not_connect_to_server": "Không thể kết nối tới máy chủ. Vui lòng kiểm tra URL và kết nối mạng.",
-    "an_unexpected_error_occurred": "Đã xảy ra lỗi không mong muốn",
+    "an_unexpected_error_occured": "Đã xảy ra lỗi không mong muốn",
     "change_server": "Đổi máy chủ",
     "invalid_username_or_password": "Tên đăng nhập hoặc mật khẩu không đúng",
     "user_does_not_have_permission_to_log_in": "Người dùng không có quyền đăng nhập",
     "server_is_taking_too_long_to_respond_try_again_later": "Máy chủ phản hồi quá lâu, vui lòng thử lại sau",
     "server_received_too_many_requests_try_again_later": "Máy chủ nhận quá nhiều yêu cầu, vui lòng thử lại sau.",
     "there_is_a_server_error": "Đã xảy ra lỗi ở máy chủ",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "Đã xảy ra lỗi không mong muốn. Bạn có chắc đã nhập đúng URL máy chủ?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "Đã xảy ra lỗi không mong muốn. Bạn có chắc đã nhập đúng URL máy chủ?",
     "too_old_server_text": "Unsupported Jellyfin Server Discovered",
     "too_old_server_description": "Please update Jellyfin to the latest version"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Cho phép Kết nối nhanh",
         "enter_the_quick_connect_code": "Nhập mã kết nối nhanh...",
         "success": "Thành công",
-        "quick_connect_authorized": "Kết nối nhanh đã được cho phép",
+        "quick_connect_autorized": "Kết nối nhanh đã được cho phép",
         "error": "Lỗi",
         "invalid_code": "Mã không hợp lệ",
         "authorize": "Cho phép"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Hiện liên kết tùy chỉnh",
         "show_large_home_carousel": "Show Large Home Carousel (beta)",
         "hide_libraries": "Ẩn thư viện",
-        "select_libraries_you_want_to_hide": "Chọn các thư viện muốn ẩn khỏi mục Thư viện và Trang chủ.",
+        "select_liraries_you_want_to_hide": "Chọn các thư viện muốn ẩn khỏi mục Thư viện và Trang chủ.",
         "disable_haptic_feedback": "Tắt phản hồi rung",
         "default_quality": "Chất lượng mặc định",
         "default_playback_speed": "Default Playback Speed",
@@ -384,8 +384,6 @@
         "device_usage": "Thiết bị sử dụng {{availableSpace}}%",
         "size_used": "{{used}} / {{total}} đã dùng",
         "delete_all_downloaded_files": "Xóa toàn bộ tập tin đã tải",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music Cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Select",
     "no_trailer_available": "No trailer available",
     "video": "Video",
     "audio": "Âm thanh",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Lỗi",
     "failed_to_get_stream_url": "Không thể lấy URL phát trực tiếp",
-    "an_error_occurred_while_playing_the_video": "Có lỗi khi phát video. Xem nhật ký trong cài đặt.",
+    "an_error_occured_while_playing_the_video": "Có lỗi khi phát video. Xem nhật ký trong cài đặt.",
     "client_error": "Lỗi phía máy khách",
     "could_not_create_stream_for_chromecast": "Không thể tạo luồng cho Chromecast",
     "message_from_server": "Thông báo từ máy chủ: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

translations/zh.json

@@ -16,14 +16,14 @@
     "got_it": "Got It",
     "connection_failed": "Connection Failed",
     "could_not_connect_to_server": "Could not connect to the server. Please check the URL and your network connection.",
-    "an_unexpected_error_occurred": "An unexpected error occurred",
+    "an_unexpected_error_occured": "An Unexpected Error Occurred",
     "change_server": "Change Server",
     "invalid_username_or_password": "Invalid Username or Password",
     "user_does_not_have_permission_to_log_in": "User does not have permission to log in",
     "server_is_taking_too_long_to_respond_try_again_later": "Server is taking too long to respond, try again later",
     "server_received_too_many_requests_try_again_later": "Server received too many requests, try again later.",
     "there_is_a_server_error": "There is a server error",
-    "an_unexpected_error_occurred_did_you_enter_the_correct_url": "An unexpected error occurred. Did you enter the server URL correctly?",
+    "an_unexpected_error_occured_did_you_enter_the_correct_url": "An unexpected error occurred. Did you enter the server URL correctly?",
     "too_old_server_text": "Unsupported Jellyfin Server Discovered",
     "too_old_server_description": "Please update Jellyfin to the latest version"
   },
@@ -188,7 +188,7 @@
         "authorize_button": "Authorize Quick Connect",
         "enter_the_quick_connect_code": "Enter the quick connect code...",
         "success": "Success",
-        "quick_connect_authorized": "Quick Connect authorized",
+        "quick_connect_autorized": "Quick Connect Authorized",
         "error": "Error",
         "invalid_code": "Invalid Code",
         "authorize": "Authorize"
@@ -298,7 +298,7 @@
         "show_custom_menu_links": "Show Custom Menu Links",
         "show_large_home_carousel": "Show Large Home Carousel (beta)",
         "hide_libraries": "Hide Libraries",
-        "select_libraries_you_want_to_hide": "Select the libraries you want to hide from the Library tab and home page sections.",
+        "select_liraries_you_want_to_hide": "Select the libraries you want to hide from the Library tab and home page sections.",
         "disable_haptic_feedback": "Disable Haptic Feedback",
         "default_quality": "Default Quality",
         "default_playback_speed": "Default Playback Speed",
@@ -384,8 +384,6 @@
         "device_usage": "Device {{availableSpace}}%",
         "size_used": "{{used}} of {{total}} Used",
         "delete_all_downloaded_files": "Delete All Downloaded Files",
-        "delete_all_downloaded_files_confirm": "Delete All Downloaded Files?",
-        "delete_all_downloaded_files_confirm_desc": "Are you sure you want to delete all downloaded files? This action cannot be undone.",
         "music_cache_title": "Music Cache",
         "music_cache_description": "Automatically cache songs as you listen for smoother playback and offline support",
         "clear_music_cache": "Clear Music Cache",
@@ -486,6 +484,7 @@
   },
   "common": {
     "no_results": "No Results",
+    "select": "Select",
     "no_trailer_available": "No trailer available",
     "video": "Video",
     "audio": "Audio",
@@ -600,7 +599,7 @@
     "mpv_player_title": "MPV Player",
     "error": "Error",
     "failed_to_get_stream_url": "Failed to get the stream URL",
-    "an_error_occurred_while_playing_the_video": "An error occurred while playing the video. Check logs in settings.",
+    "an_error_occured_while_playing_the_video": "An error occurred while playing the video. Check logs in settings.",
     "client_error": "Client Error",
     "could_not_create_stream_for_chromecast": "Could not create a stream for Chromecast",
     "message_from_server": "Message from Server: {{message}}",
@@ -622,6 +621,7 @@
     "using_jellyfin_server": "Using Jellyfin Server",
     "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",

utils/atoms/settings.ts

@@ -274,9 +274,6 @@ export type Settings = {
   hideBrightnessSlider: boolean;
   usePopularPlugin: boolean;
   mergeNextUpAndContinueWatching: boolean;
-  // Use the episode's own image (instead of the series thumb) for the
-  // "Next Up" and "Continue Watching" home rows.
-  useEpisodeImagesForNextUp: boolean;
   // TV-specific settings
   showHomeBackdrop: boolean;
   showTVHeroCarousel: boolean;
@@ -385,7 +382,6 @@ export const defaultValues: Settings = {
   hideBrightnessSlider: false,
   usePopularPlugin: true,
   mergeNextUpAndContinueWatching: false,
-  useEpisodeImagesForNextUp: false,
   // TV-specific settings
   showHomeBackdrop: true,
   showTVHeroCarousel: true,

utils/atoms/tvSubtitleModal.ts

@@ -11,6 +11,14 @@ export type TVSubtitleModalState = {
   onServerSubtitleDownloaded?: () => void;
   onLocalSubtitleDownloaded?: (path: string) => void;
   refreshSubtitleTracks?: () => Promise<Track[]>;
+  /**
+   * Run the selection callback AFTER the modal route is dismissed. Needed when
+   * `setTrack` navigates (the player's replacePlayer for a burn-in switch),
+   * which would be swallowed by the still-active modal route. Leave false for
+   * callers whose selection only updates state (the item detail page), so the
+   * update runs before dismissal and doesn't yank focus after it returns.
+   */
+  deferApplyUntilDismissed?: boolean;
 } | null;
 
 export const tvSubtitleModalAtom = atom<TVSubtitleModalState>(null);

utils/jellyfin/subtitleUtils.test.ts

@@ -0,0 +1,485 @@
+import { describe, expect, test } from "bun:test";
+import type {
+  MediaStream,
+  SubtitleDeliveryMethod,
+} from "@jellyfin/sdk/lib/generated-client";
+import {
+  applyMpvSubtitleSelection,
+  compareTracksForMenu,
+  getExternalSubtitleUrl,
+  isExternalSubtitle,
+  type PlayerSubtitleTrack,
+  resolveSubtitleTrack,
+} from "@/utils/jellyfin/subtitleUtils";
+
+// String-enum values as typed literals — avoids a runtime SDK import (see subtitleUtils.ts).
+const External = "External" as SubtitleDeliveryMethod;
+const Embed = "Embed" as SubtitleDeliveryMethod;
+const Encode = "Encode" as SubtitleDeliveryMethod;
+const Hls = "Hls" as SubtitleDeliveryMethod;
+
+// --- fixtures --------------------------------------------------------------
+
+const sub = (o: Partial<MediaStream> & { Index: number }): MediaStream =>
+  ({ Type: "Subtitle", ...o }) as MediaStream;
+
+const ext = (Index: number, o: Partial<MediaStream> = {}): MediaStream =>
+  sub({
+    Index,
+    DeliveryMethod: External,
+    IsExternal: true,
+    DeliveryUrl: `/sub/${Index}.srt`,
+    ...o,
+  });
+
+const emb = (Index: number, o: Partial<MediaStream> = {}): MediaStream =>
+  sub({ Index, DeliveryMethod: Embed, ...o });
+
+const track = (o: PlayerSubtitleTrack): PlayerSubtitleTrack => o;
+
+// Mirror direct-player.tsx online URL builder.
+const urlBuilder =
+  (base: string) =>
+  (s: MediaStream): string | undefined =>
+    s.DeliveryUrl ? `${base}${s.DeliveryUrl}` : undefined;
+
+const resolve = (
+  streams: MediaStream[],
+  index: number | undefined,
+  player: PlayerSubtitleTrack[],
+  getExpectedExternalUrl = urlBuilder("http://srv"),
+) =>
+  resolveSubtitleTrack({
+    subtitleStreams: streams,
+    jellyfinSubtitleIndex: index,
+    playerTracks: player,
+    getExpectedExternalUrl,
+  });
+
+// --- tests -----------------------------------------------------------------
+
+describe("isExternalSubtitle", () => {
+  test("true for External delivery or the IsExternal flag, not a bare DeliveryUrl", () => {
+    expect(isExternalSubtitle(ext(0))).toBe(true);
+    expect(isExternalSubtitle(sub({ Index: 1, IsExternal: true }))).toBe(true);
+    expect(isExternalSubtitle(emb(2))).toBe(false);
+    // A DeliveryUrl alone (e.g. an Hls-delivered sub) is NOT a sub-added sidecar.
+    expect(isExternalSubtitle(sub({ Index: 3, DeliveryUrl: "/x.srt" }))).toBe(
+      false,
+    );
+  });
+
+  test("a sidecar re-delivered by the server (Hls/Encode) is NOT external", () => {
+    // IsExternal only wins while no device-specific delivery method is assigned;
+    // once the server picks Hls (inside the stream) or Encode (burned), the
+    // track is not a sub-added sidecar and must not use the external path.
+    expect(
+      isExternalSubtitle(
+        sub({ Index: 0, IsExternal: true, DeliveryMethod: Hls }),
+      ),
+    ).toBe(false);
+    expect(
+      isExternalSubtitle(
+        sub({ Index: 0, IsExternal: true, DeliveryMethod: Encode }),
+      ),
+    ).toBe(false);
+  });
+});
+
+describe("resolveSubtitleTrack — disable / notFound", () => {
+  test("index -1 or undefined disables", () => {
+    expect(resolve([], -1, [])).toEqual({ kind: "disable" });
+    expect(resolve([], undefined, [])).toEqual({ kind: "disable" });
+  });
+
+  test("index not present returns notFound", () => {
+    expect(resolve([emb(0)], 99, [track({ id: 1 })])).toEqual({
+      kind: "notFound",
+    });
+  });
+});
+
+describe("resolveSubtitleTrack — hidden embedded (#954)", () => {
+  // Server hides embedded subs: MediaStreams lists only the 3 externals,
+  // but mpv still demuxes the 3 embedded from the file → externals get ids 4,5,6.
+  const streams = [
+    ext(0, { Language: "por" }),
+    ext(1, { Language: "eng" }),
+    ext(2, { Language: "eng", Title: "SDH" }),
+  ];
+  const player = [
+    track({ id: 1, external: false, language: "eng", title: "CC" }),
+    track({ id: 2, external: false, language: "spa" }),
+    track({ id: 3, external: false, language: "fre" }),
+    track({ id: 4, external: true, externalFilename: "http://srv/sub/0.srt" }),
+    track({ id: 5, external: true, externalFilename: "http://srv/sub/1.srt" }),
+    track({ id: 6, external: true, externalFilename: "http://srv/sub/2.srt" }),
+  ];
+
+  test("each external maps to the right player id by filename (not 1,2,3)", () => {
+    expect(resolve(streams, 0, player)).toEqual({ kind: "select", trackId: 4 });
+    expect(resolve(streams, 1, player)).toEqual({ kind: "select", trackId: 5 });
+    expect(resolve(streams, 2, player)).toEqual({ kind: "select", trackId: 6 });
+  });
+
+  test("falls back to external ordinal when filenames are unavailable", () => {
+    const noNames = player.map((t) =>
+      t.external ? { ...t, externalFilename: undefined } : t,
+    );
+    expect(resolve(streams, 1, noNames)).toEqual({
+      kind: "select",
+      trackId: 5,
+    });
+  });
+});
+
+describe("resolveSubtitleTrack — external/embed reversal (non-hidden)", () => {
+  // Jellyfin lists externals first; mpv lists embedded first then externals.
+  const streams = [
+    ext(0, { Language: "eng" }),
+    emb(1, { Language: "spa" }),
+    emb(2, { Language: "fre" }),
+  ];
+  const player = [
+    track({ id: 1, external: false, language: "spa" }),
+    track({ id: 2, external: false, language: "fre" }),
+    track({ id: 3, external: true, externalFilename: "http://srv/sub/0.srt" }),
+  ];
+
+  test("external resolves by filename, embedded by language", () => {
+    expect(resolve(streams, 0, player)).toEqual({ kind: "select", trackId: 3 });
+    expect(resolve(streams, 1, player)).toEqual({ kind: "select", trackId: 1 });
+    expect(resolve(streams, 2, player)).toEqual({ kind: "select", trackId: 2 });
+  });
+});
+
+describe("resolveSubtitleTrack — external without DeliveryUrl (#1763 CodeRabbit)", () => {
+  // Middle external has no DeliveryUrl → never loaded into the player.
+  const streams = [
+    ext(0, { Language: "eng", DeliveryUrl: "/sub/a.srt" }),
+    sub({ Index: 1, DeliveryMethod: External, IsExternal: true }),
+    ext(2, { Language: "fre", DeliveryUrl: "/sub/c.srt" }),
+  ];
+  const player = [
+    track({ id: 4, external: true, externalFilename: "http://srv/sub/a.srt" }),
+    track({ id: 5, external: true, externalFilename: "http://srv/sub/c.srt" }),
+  ];
+
+  test("loaded externals still map correctly despite the gap", () => {
+    expect(resolve(streams, 0, player)).toEqual({ kind: "select", trackId: 4 });
+    expect(resolve(streams, 2, player)).toEqual({ kind: "select", trackId: 5 });
+  });
+
+  test("selecting the unloaded external returns notFound", () => {
+    expect(resolve(streams, 1, player)).toEqual({ kind: "notFound" });
+  });
+});
+
+describe("resolveSubtitleTrack — embedded matching", () => {
+  test("unique language match wins even when player order differs (not positional)", () => {
+    const streams = [emb(0, { Language: "eng" }), emb(1, { Language: "jpn" })];
+    // Player lists them in the OPPOSITE order — a positional map would mis-pick.
+    const player = [
+      track({ id: 1, external: false, language: "jpn" }),
+      track({ id: 2, external: false, language: "eng" }),
+    ];
+    expect(resolve(streams, 0, player)).toEqual({ kind: "select", trackId: 2 }); // eng
+    expect(resolve(streams, 1, player)).toEqual({ kind: "select", trackId: 1 }); // jpn
+  });
+
+  test("same-language tracks with no distinguishing title fall back to ordinal among matches", () => {
+    const streams = [emb(0, { Language: "eng" }), emb(1, { Language: "eng" })];
+    // Both eng, no title → identity can't disambiguate → ordinal among matches.
+    const player = [
+      track({ id: 5, external: false, language: "eng" }),
+      track({ id: 6, external: false, language: "eng" }),
+    ];
+    expect(resolve(streams, 0, player)).toEqual({ kind: "select", trackId: 5 });
+    expect(resolve(streams, 1, player)).toEqual({ kind: "select", trackId: 6 });
+  });
+
+  test("falls back to embedded ordinal when no language/title info", () => {
+    const streams = [emb(0), emb(1)];
+    const player = [
+      track({ id: 1, external: false }),
+      track({ id: 2, external: false }),
+    ];
+    expect(resolve(streams, 1, player)).toEqual({ kind: "select", trackId: 2 });
+  });
+});
+
+describe("compareTracksForMenu — jellyfin-web order", () => {
+  test("externals sort after embedded despite lower Index", () => {
+    const sorted = [
+      ext(0, { Language: "eng" }),
+      emb(7, { Language: "fra" }),
+    ].sort(compareTracksForMenu);
+    expect(sorted.map((s) => s.Index)).toEqual([7, 0]);
+  });
+
+  test("forced then default float to the top within a group", () => {
+    const sorted = [
+      emb(2, { Language: "eng" }),
+      emb(1, { Language: "eng", IsDefault: true }),
+      emb(0, { Language: "eng", IsForced: true }),
+    ].sort(compareTracksForMenu);
+    expect(sorted.map((s) => s.Index)).toEqual([0, 1, 2]);
+  });
+
+  test("full Okiku order: embedded first, externals last by Index", () => {
+    const streams = [
+      ext(0, { Language: "eng" }),
+      ext(1, { Language: "eng" }),
+      ext(2, { Language: "fra" }),
+      ext(3, { Language: "fra" }),
+      emb(7, { Language: "fra", Title: "French" }),
+    ];
+    expect([...streams].sort(compareTracksForMenu).map((s) => s.Index)).toEqual(
+      [7, 0, 1, 2, 3],
+    );
+  });
+});
+
+describe("resolveSubtitleTrack — same-identity group ordinal (duplicate languages)", () => {
+  // [jpn, eng, eng] with no titles: the eng group starts at embedded position 1,
+  // so the group ordinal (not the global one) must drive the pick.
+  const streams = [
+    emb(0, { Language: "jpn" }),
+    emb(1, { Language: "eng" }),
+    emb(2, { Language: "eng" }),
+  ];
+  const playerTracks = [
+    track({ id: 1, language: "jpn" }),
+    track({ id: 2, language: "eng" }),
+    track({ id: 3, language: "eng" }),
+  ];
+
+  test("first eng selects the first matching player track", () => {
+    expect(resolve(streams, 1, playerTracks)).toEqual({
+      kind: "select",
+      trackId: 2,
+    });
+  });
+
+  test("second eng selects the second matching player track", () => {
+    expect(resolve(streams, 2, playerTracks)).toEqual({
+      kind: "select",
+      trackId: 3,
+    });
+  });
+});
+
+describe("resolveSubtitleTrack — server-burned (Encode) streams", () => {
+  const burned = emb(2, {
+    DeliveryMethod: Encode,
+    IsTextSubtitleStream: false,
+    Codec: "pgssub",
+  });
+
+  test("selecting a burned-in sub returns burnedIn (a stream refresh, not a track)", () => {
+    expect(resolve([burned, emb(3)], 2, [track({ id: 1 })])).toEqual({
+      kind: "burnedIn",
+    });
+  });
+
+  test("burned-in streams do not shift the embedded ordinal", () => {
+    // Player only demuxes the two untagged text subs; the burned PGS is pixels.
+    const streams = [burned, emb(3), emb(4)];
+    const playerTracks = [track({ id: 1 }), track({ id: 2 })];
+    expect(resolve(streams, 3, playerTracks)).toEqual({
+      kind: "select",
+      trackId: 1,
+    });
+    expect(resolve([burned, emb(3)], 3, [track({ id: 1 })])).toEqual({
+      kind: "select",
+      trackId: 1,
+    });
+  });
+});
+
+describe("resolveSubtitleTrack — Hls-delivered sidecar goes through the embedded path", () => {
+  test("resolves by identity against the player's in-stream track", () => {
+    const hlsSidecar = sub({
+      Index: 0,
+      IsExternal: true,
+      DeliveryMethod: Hls,
+      DeliveryUrl: "/videos/x/subs/0.vtt",
+      Language: "fre",
+    });
+    const r = resolve([hlsSidecar, emb(1, { Language: "eng" })], 0, [
+      track({ id: 1, language: "fre" }),
+      track({ id: 2, language: "eng" }),
+    ]);
+    expect(r).toEqual({ kind: "select", trackId: 1 });
+  });
+});
+
+describe("applyMpvSubtitleSelection — short-circuits", () => {
+  test("disable (-1) never reads the player track list", async () => {
+    let enumerated = false;
+    let disabled = false;
+    const r = await applyMpvSubtitleSelection(
+      {
+        getSubtitleTracks: async () => {
+          enumerated = true;
+          return [];
+        },
+        setSubtitleTrack: () => {},
+        disableSubtitles: () => {
+          disabled = true;
+        },
+      },
+      { subtitleStreams: [], jellyfinSubtitleIndex: -1 },
+    );
+    expect(r).toEqual({ kind: "disable" });
+    expect(disabled).toBe(true);
+    expect(enumerated).toBe(false);
+  });
+
+  test("burned-in target returns without touching the player", async () => {
+    let enumerated = false;
+    const r = await applyMpvSubtitleSelection(
+      {
+        getSubtitleTracks: async () => {
+          enumerated = true;
+          return [];
+        },
+        setSubtitleTrack: () => {},
+        disableSubtitles: () => {},
+      },
+      {
+        subtitleStreams: [
+          emb(2, { DeliveryMethod: Encode, IsTextSubtitleStream: false }),
+        ],
+        jellyfinSubtitleIndex: 2,
+      },
+    );
+    expect(r).toEqual({ kind: "burnedIn" });
+    expect(enumerated).toBe(false);
+  });
+});
+
+describe("getExternalSubtitleUrl — server contract (MediaInfoHelper)", () => {
+  test("server-relative DeliveryUrl gets the basePath prefix", () => {
+    expect(
+      getExternalSubtitleUrl(ext(0, { DeliveryUrl: "/sub/0.srt" }), {
+        offline: false,
+        basePath: "http://srv",
+      }),
+    ).toBe("http://srv/sub/0.srt");
+  });
+
+  test("IsExternalUrl means DeliveryUrl is already absolute — no prefix", () => {
+    expect(
+      getExternalSubtitleUrl(
+        ext(0, {
+          DeliveryUrl: "https://cdn.example/sub.srt",
+          IsExternalUrl: true,
+        }),
+        { offline: false, basePath: "http://srv" },
+      ),
+    ).toBe("https://cdn.example/sub.srt");
+  });
+
+  test("offline returns the stored local path as-is", () => {
+    expect(
+      getExternalSubtitleUrl(ext(0, { DeliveryUrl: "file:///subs/0.srt" }), {
+        offline: true,
+        basePath: "http://srv",
+      }),
+    ).toBe("file:///subs/0.srt");
+  });
+
+  test("no DeliveryUrl or no basePath online → undefined", () => {
+    expect(
+      getExternalSubtitleUrl(sub({ Index: 0, IsExternal: true }), {
+        offline: false,
+        basePath: "http://srv",
+      }),
+    ).toBeUndefined();
+    expect(
+      getExternalSubtitleUrl(ext(0), { offline: false, basePath: undefined }),
+    ).toBeUndefined();
+  });
+});
+
+describe("resolveSubtitleTrack — language tag variants (ISO 639-1 / 639-2 B-T / IETF)", () => {
+  test("Jellyfin 639-2/B matches mpv 639-2/T and 639-1 tags", () => {
+    // Server says "ger" (639-2/B); muxers can surface "deu" (/T) or "de" (639-1).
+    const streams = [emb(0, { Language: "ger" }), emb(1, { Language: "fre" })];
+    const playerT = [
+      track({ id: 1, language: "deu" }),
+      track({ id: 2, language: "fra" }),
+    ];
+    expect(resolve(streams, 0, playerT)).toEqual({
+      kind: "select",
+      trackId: 1,
+    });
+    expect(resolve(streams, 1, playerT)).toEqual({
+      kind: "select",
+      trackId: 2,
+    });
+
+    const player1 = [
+      track({ id: 1, language: "de" }),
+      track({ id: 2, language: "fr" }),
+    ];
+    expect(resolve(streams, 0, player1)).toEqual({
+      kind: "select",
+      trackId: 1,
+    });
+  });
+
+  test("IETF tags reduce to their primary subtag", () => {
+    const streams = [emb(0, { Language: "eng" }), emb(1, { Language: "spa" })];
+    const player = [
+      track({ id: 1, language: "en-US" }),
+      track({ id: 2, language: "es-419" }),
+    ];
+    expect(resolve(streams, 0, player)).toEqual({ kind: "select", trackId: 1 });
+    expect(resolve(streams, 1, player)).toEqual({ kind: "select", trackId: 2 });
+  });
+
+  test("different languages still never match ('ger' vs 'gre')", () => {
+    const streams = [emb(0, { Language: "ger" })];
+    const player = [
+      track({ id: 1, language: "gre" }),
+      track({ id: 2, language: "ger" }),
+    ];
+    expect(resolve(streams, 0, player)).toEqual({ kind: "select", trackId: 2 });
+  });
+});
+
+describe("compareTracksForMenu — stable order across play methods (8 Mile live find)", () => {
+  test("transcode re-delivery (SRT→External, PGS→Encode) must not reshuffle the menu", () => {
+    // In-file order: srt(1) srt(2) pgs(3) pgs(4), plus a real sidecar ext(0).
+    const directPlay = [
+      ext(0, { Language: "eng" }),
+      emb(1, { Language: "fre" }),
+      emb(2, { Language: "eng" }),
+      emb(3, { Language: "fre", IsTextSubtitleStream: false }),
+      emb(4, { Language: "eng", IsTextSubtitleStream: false }),
+    ];
+    // Same file while transcoding: server re-delivers embedded text as External
+    // (extracted) and burns image subs (Encode). IsExternal stays a FILE property.
+    const transcoding = [
+      ext(0, { Language: "eng" }),
+      emb(1, { Language: "fre", DeliveryMethod: External, DeliveryUrl: "/x1" }),
+      emb(2, { Language: "eng", DeliveryMethod: External, DeliveryUrl: "/x2" }),
+      emb(3, {
+        Language: "fre",
+        IsTextSubtitleStream: false,
+        DeliveryMethod: Encode,
+      }),
+      emb(4, {
+        Language: "eng",
+        IsTextSubtitleStream: false,
+        DeliveryMethod: Encode,
+      }),
+    ];
+    const order = (streams: MediaStream[]) =>
+      [...streams].sort(compareTracksForMenu).map((s) => s.Index);
+    expect(order(directPlay)).toEqual([1, 2, 3, 4, 0]);
+    expect(order(transcoding)).toEqual(order(directPlay));
+  });
+});

utils/jellyfin/subtitleUtils.ts

@@ -1,91 +1,584 @@
 /**
- * Subtitle utility functions for mapping between Jellyfin and MPV track indices.
+ * Subtitle utilities: resolve a Jellyfin subtitle stream to the right track in
+ * the *player's real track list* by identity — never by positional counting.
  *
- * Jellyfin uses server-side indices (e.g., 3, 4, 5 for subtitles in MediaStreams).
- * MPV uses its own track IDs starting from 1, only counting tracks loaded into MPV.
+ * Why: Jellyfin renumbers MediaStreams (externals first); the player enumerates
+ * embedded-from-container first and externals (`sub-add`) last; and a library that
+ * hides embedded subs drops them from MediaStreams while the player still demuxes
+ * them from the file. Positional Index→id mapping therefore mis-selects (e.g.
+ * picking Spanish shows English). See {@link resolveSubtitleTrack}.
  *
  * Image-based subtitles (PGS, VOBSUB) during transcoding are burned into the video
- * and NOT available in MPV's track list.
+ * and absent from the player's track list.
  */
 
-import {
-  type MediaSourceInfo,
-  type MediaStream,
+import type {
+  MediaSourceInfo,
+  MediaStream,
   SubtitleDeliveryMethod,
 } from "@jellyfin/sdk/lib/generated-client";
 
+// "External" is the value of SubtitleDeliveryMethod.External. Compared as a typed
+// literal so this util needs no *runtime* import of the SDK barrel — which pulls in
+// the axios-dependent `/api` modules and breaks unit tests under `bun test`.
+const EXTERNAL_DELIVERY = "External" as SubtitleDeliveryMethod;
+const ENCODE_DELIVERY = "Encode" as SubtitleDeliveryMethod;
+
 /** Check if subtitle is image-based (PGS, VOBSUB, etc.) */
 export const isImageBasedSubtitle = (sub: MediaStream): boolean =>
   sub.IsTextSubtitleStream === false;
 
 /**
- * Determine if a subtitle will be available in MPV's track list.
- *
- * A subtitle is in MPV if:
- * - Delivery is Embed/Hls/External AND not an image-based sub during transcode
+ * Burned into the video by the server (`DeliveryMethod === Encode`, e.g. image
+ * subs while transcoding, or sidecar formats no profile can deliver). Never a
+ * selectable player track — switching to/away requires a stream refresh.
  */
-export const isSubtitleInMpv = (
-  sub: MediaStream,
-  isTranscoding: boolean,
-): boolean => {
-  // During transcoding, image-based subs are burned in, not in MPV
-  if (isTranscoding && isImageBasedSubtitle(sub)) {
-    return false;
-  }
+export const isBurnedInSubtitle = (sub: MediaStream): boolean =>
+  sub.DeliveryMethod === ENCODE_DELIVERY;
 
-  // Embed/Hls/External methods mean the sub is loaded into MPV
-  return (
-    sub.DeliveryMethod === SubtitleDeliveryMethod.Embed ||
-    sub.DeliveryMethod === SubtitleDeliveryMethod.Hls ||
-    sub.DeliveryMethod === SubtitleDeliveryMethod.External
-  );
+/**
+ * A Jellyfin subtitle stream is "external" when the server delivers it as a
+ * sub-added sidecar — i.e. `DeliveryMethod === External` (or the `IsExternal`
+ * flag before a device-specific delivery method is assigned).
+ *
+ * Deliberately NOT keyed on `DeliveryUrl`: an Hls-delivered sub also carries a
+ * `DeliveryUrl` but lives inside the player's track list (not `sub-add`-ed), so
+ * it must resolve through the embedded path. Keeping this in lockstep with the
+ * load sites (which only `sub-add` `DeliveryMethod === External`) and with the
+ * menu comparator below avoids a sub being sorted as embedded yet resolved as
+ * external (→ `notFound`).
+ */
+export const isExternalSubtitle = (sub: MediaStream): boolean =>
+  sub.DeliveryMethod === EXTERNAL_DELIVERY ||
+  (sub.DeliveryMethod == null && sub.IsExternal === true);
+
+/**
+ * The exact URL/path an external sub is (or would be) loaded into the player
+ * with. Single source of truth for BOTH the load site (`videoSource`
+ * externalSubtitles) and identity matching (`getExpectedExternalUrl`) — the
+ * filename match only works while the two stay byte-identical.
+ *
+ * Server contract (MediaInfoHelper.SetDeviceSpecificSubtitleInfo): DeliveryUrl
+ * is server-relative (`/Videos/...`, may carry `?ApiKey=`) UNLESS
+ * `IsExternalUrl` is set — then it is already an absolute URL and must not be
+ * prefixed. Offline: DeliveryUrl holds the local file path.
+ */
+export const getExternalSubtitleUrl = (
+  sub: MediaStream,
+  opts: { offline: boolean; basePath?: string | null },
+): string | undefined => {
+  if (!sub.DeliveryUrl) return undefined;
+  if (opts.offline || sub.IsExternalUrl) return sub.DeliveryUrl;
+  return opts.basePath ? `${opts.basePath}${sub.DeliveryUrl}` : undefined;
 };
 
 /**
- * Calculate the MPV track ID for a given Jellyfin subtitle index.
+ * Order subtitle MediaStreams for the selection menu exactly like jellyfin-web's
+ * `itemHelper.sortTracks`: in-container tracks first then external, and within
+ * each group forced first, then default, then `Index` ascending. Callers prepend
+ * their own "None/Off" entry separately.
  *
- * MPV track IDs are 1-based and only count subtitles that are actually in MPV.
- * We iterate through all subtitles, counting only those in MPV, until we find
- * the one matching the Jellyfin index.
- *
- * @param mediaSource - The media source containing subtitle streams
- * @param jellyfinSubtitleIndex - The Jellyfin server-side subtitle index (-1 = disabled)
- * @param isTranscoding - Whether the stream is being transcoded
- * @returns MPV track ID (1-based), or -1 if disabled, or undefined if not in MPV
+ * The Jellyfin server inserts external (sidecar) streams at the FRONT of
+ * `MediaStreams` (low indices), so raw Index order shows externals first — this
+ * comparator flips that to match web (externals last). Uses the raw `IsExternal`
+ * flag exactly like web's `sortTracks` (itemHelper.js): it is a property of the
+ * FILE, so the menu order stays identical between direct play and transcode —
+ * delivery-based grouping would reshuffle entries when the server re-delivers
+ * extracted text subs as External and burns image subs (Encode). Ordering is
+ * purely cosmetic; selection resolves by `Index` identity regardless.
  */
-export const getMpvSubtitleId = (
-  mediaSource: MediaSourceInfo | null | undefined,
-  jellyfinSubtitleIndex: number | undefined,
-  isTranscoding: boolean,
-): number | undefined => {
-  // -1 or undefined means disabled
+export const compareTracksForMenu = (a: MediaStream, b: MediaStream): number =>
+  Number(a.IsExternal ?? false) - Number(b.IsExternal ?? false) ||
+  Number(b.IsForced ?? false) - Number(a.IsForced ?? false) ||
+  Number(b.IsDefault ?? false) - Number(a.IsDefault ?? false) ||
+  // Missing Index sorts to the end (not 0, which would float it to the top and
+  // collide with a real Index 0).
+  (a.Index ?? Number.MAX_SAFE_INTEGER) - (b.Index ?? Number.MAX_SAFE_INTEGER);
+
+/**
+ * Identity of a subtitle track as reported by the *player's real track list*
+ * (mpv `track-list`, or a Cast media-track list). Player-agnostic on purpose so
+ * the same resolver can drive the mpv player today and the Chromecast backend later.
+ */
+export type PlayerSubtitleTrack = {
+  /** Player-side id used to actually select the track (mpv `sid`, cast trackId). */
+  id: number;
+  /** True if loaded from a separate file (mpv `external`). */
+  external?: boolean;
+  /** For external tracks: the exact URL/path it was loaded from (mpv `external-filename`). */
+  externalFilename?: string;
+  language?: string;
+  title?: string;
+  codec?: string;
+};
+
+export type SubtitleSelection =
+  | { kind: "select"; trackId: number }
+  | { kind: "disable" }
+  /** Target is server-burned (Encode) — only a stream refresh can show/hide it. */
+  | { kind: "burnedIn" }
+  | { kind: "notFound" };
+
+/** Decode percent-encoding and strip a leading `file://` scheme for tolerant comparison. */
+const normalizeUrl = (url: string): string => {
+  let u = url;
+  try {
+    u = decodeURIComponent(u);
+  } catch {
+    // not decodable — compare raw
+  }
+  return u.replace(/^file:\/\//, "");
+};
+
+const externalFilenameMatches = (
+  trackFilename: string | undefined,
+  expectedUrl: string | undefined,
+): boolean => {
+  if (!trackFilename || !expectedUrl) return false;
+  const a = normalizeUrl(trackFilename);
+  const b = normalizeUrl(expectedUrl);
+  return a === b || a.endsWith(b) || b.endsWith(a);
+};
+
+const eq = (a?: string | null, b?: string | null): boolean =>
+  !!a && !!b && a.toLowerCase() === b.toLowerCase();
+
+/**
+ * ISO 639-1 (2-letter) and ISO 639-2/T tags mapped to their ISO 639-2/B form,
+ * so tags from different muxers/servers compare equal ("de"/"deu"/"ger" → "ger").
+ * Jellyfin normalizes probe results to 639-2/B, but mkv `LanguageIETF` tags
+ * ("en-US") and some muxers' 639-1 or /T tags leak through to mpv's `lang`.
+ */
+const LANG_CANONICAL: Record<string, string> = {
+  // ISO 639-1 → 639-2/B
+  aa: "aar",
+  ab: "abk",
+  ae: "ave",
+  af: "afr",
+  ak: "aka",
+  am: "amh",
+  an: "arg",
+  ar: "ara",
+  as: "asm",
+  av: "ava",
+  ay: "aym",
+  az: "aze",
+  ba: "bak",
+  be: "bel",
+  bg: "bul",
+  bh: "bih",
+  bi: "bis",
+  bm: "bam",
+  bn: "ben",
+  bo: "tib",
+  br: "bre",
+  bs: "bos",
+  ca: "cat",
+  ce: "che",
+  ch: "cha",
+  co: "cos",
+  cr: "cre",
+  cs: "cze",
+  cu: "chu",
+  cv: "chv",
+  cy: "wel",
+  da: "dan",
+  de: "ger",
+  dv: "div",
+  dz: "dzo",
+  ee: "ewe",
+  el: "gre",
+  en: "eng",
+  eo: "epo",
+  es: "spa",
+  et: "est",
+  eu: "baq",
+  fa: "per",
+  ff: "ful",
+  fi: "fin",
+  fj: "fij",
+  fo: "fao",
+  fr: "fre",
+  fy: "fry",
+  ga: "gle",
+  gd: "gla",
+  gl: "glg",
+  gn: "grn",
+  gu: "guj",
+  gv: "glv",
+  ha: "hau",
+  he: "heb",
+  hi: "hin",
+  ho: "hmo",
+  hr: "hrv",
+  ht: "hat",
+  hu: "hun",
+  hy: "arm",
+  hz: "her",
+  ia: "ina",
+  id: "ind",
+  ie: "ile",
+  ig: "ibo",
+  ii: "iii",
+  ik: "ipk",
+  io: "ido",
+  is: "ice",
+  it: "ita",
+  iu: "iku",
+  ja: "jpn",
+  jv: "jav",
+  ka: "geo",
+  kg: "kon",
+  ki: "kik",
+  kj: "kua",
+  kk: "kaz",
+  kl: "kal",
+  km: "khm",
+  kn: "kan",
+  ko: "kor",
+  kr: "kau",
+  ks: "kas",
+  ku: "kur",
+  kv: "kom",
+  kw: "cor",
+  ky: "kir",
+  la: "lat",
+  lb: "ltz",
+  lg: "lug",
+  li: "lim",
+  ln: "lin",
+  lo: "lao",
+  lt: "lit",
+  lu: "lub",
+  lv: "lav",
+  mg: "mlg",
+  mh: "mah",
+  mi: "mao",
+  mk: "mac",
+  ml: "mal",
+  mn: "mon",
+  mr: "mar",
+  ms: "may",
+  mt: "mlt",
+  my: "bur",
+  na: "nau",
+  nb: "nob",
+  nd: "nde",
+  ne: "nep",
+  ng: "ndo",
+  nl: "dut",
+  nn: "nno",
+  no: "nor",
+  nr: "nbl",
+  nv: "nav",
+  ny: "nya",
+  oc: "oci",
+  oj: "oji",
+  om: "orm",
+  or: "ori",
+  os: "oss",
+  pa: "pan",
+  pi: "pli",
+  pl: "pol",
+  ps: "pus",
+  pt: "por",
+  qu: "que",
+  rm: "roh",
+  rn: "run",
+  ro: "rum",
+  ru: "rus",
+  rw: "kin",
+  sa: "san",
+  sc: "srd",
+  sd: "snd",
+  se: "sme",
+  sg: "sag",
+  si: "sin",
+  sk: "slo",
+  sl: "slv",
+  sm: "smo",
+  sn: "sna",
+  so: "som",
+  sq: "alb",
+  sr: "srp",
+  ss: "ssw",
+  st: "sot",
+  su: "sun",
+  sv: "swe",
+  sw: "swa",
+  ta: "tam",
+  te: "tel",
+  tg: "tgk",
+  th: "tha",
+  ti: "tir",
+  tk: "tuk",
+  tl: "tgl",
+  tn: "tsn",
+  to: "ton",
+  tr: "tur",
+  ts: "tso",
+  tt: "tat",
+  tw: "twi",
+  ty: "tah",
+  ug: "uig",
+  uk: "ukr",
+  ur: "urd",
+  uz: "uzb",
+  ve: "ven",
+  vi: "vie",
+  vo: "vol",
+  wa: "wln",
+  wo: "wol",
+  xh: "xho",
+  yi: "yid",
+  yo: "yor",
+  za: "zha",
+  zh: "chi",
+  zu: "zul",
+  // ISO 639-2/T → /B (the 20 languages with two distinct 3-letter codes)
+  bod: "tib",
+  ces: "cze",
+  cym: "wel",
+  deu: "ger",
+  ell: "gre",
+  eus: "baq",
+  fas: "per",
+  fra: "fre",
+  hye: "arm",
+  isl: "ice",
+  kat: "geo",
+  mkd: "mac",
+  mri: "mao",
+  msa: "may",
+  mya: "bur",
+  nld: "dut",
+  ron: "rum",
+  slk: "slo",
+  sqi: "alb",
+  zho: "chi",
+};
+
+/** Canonicalize a language tag: lowercase, primary subtag ("en-US" → "en"), 639-2/B. */
+const canonicalLang = (raw: string): string => {
+  const primary = raw.trim().toLowerCase().split("-")[0];
+  return LANG_CANONICAL[primary] ?? primary;
+};
+
+/** Language-tag comparison across ISO 639-1 / 639-2 B/T / IETF variants. */
+const langEq = (a?: string | null, b?: string | null): boolean =>
+  !!a && !!b && canonicalLang(a) === canonicalLang(b);
+
+/** Match an embedded player track to a Jellyfin stream by language/title (codec-agnostic). */
+const embeddedIdentityMatches = (
+  track: PlayerSubtitleTrack,
+  stream: MediaStream,
+): boolean => {
+  if (langEq(track.language, stream.Language)) {
+    // When both carry a title it must agree; otherwise language alone is enough.
+    if (track.title && stream.Title) return eq(track.title, stream.Title);
+    return true;
+  }
+  // No language on one side — fall back to a title match.
+  if (!track.language || !stream.Language) return eq(track.title, stream.Title);
+  return false;
+};
+
+/**
+ * Resolve the player track id for a given Jellyfin subtitle index by matching
+ * against the player's REAL track list (identity), never by positional counting.
+ *
+ * Why identity, not position: Jellyfin renumbers `MediaStreams` (externals first)
+ * while the player enumerates embedded-from-container first and externals
+ * (`sub-add`) last; and when a library hides embedded subs they vanish from
+ * `MediaStreams` but still physically exist in the file the player demuxes.
+ * Positional Index→id mapping therefore mis-selects (e.g. picking Spanish shows
+ * English — issues #954/#1690/#618/#1467/#976/#1451).
+ *
+ * Strategy:
+ *  - disabled (-1/undefined) → `disable`
+ *  - external Jellyfin sub → match the player track by `externalFilename`
+ *    (exact identity, immune to hidden-embedded shifts); fall back to the
+ *    ordinal among *loadable* externals (Swiftfin: externals are the list tail).
+ *  - embedded Jellyfin sub → match by language/title among non-external tracks;
+ *    fall back to the embedded ordinal (container order aligns on both sides).
+ *
+ * Player-agnostic: pass any player's track list + a URL builder, so the mpv
+ * player and (later) the Chromecast backend share one source of truth.
+ */
+export const resolveSubtitleTrack = (params: {
+  subtitleStreams: MediaStream[] | undefined;
+  jellyfinSubtitleIndex: number | undefined;
+  playerTracks: PlayerSubtitleTrack[];
+  /** Build the exact URL/path an external Jellyfin sub was loaded into the player with. */
+  getExpectedExternalUrl?: (sub: MediaStream) => string | undefined;
+}): SubtitleSelection => {
+  const { jellyfinSubtitleIndex, playerTracks, getExpectedExternalUrl } =
+    params;
+  const subtitleStreams = params.subtitleStreams ?? [];
+
   if (jellyfinSubtitleIndex === undefined || jellyfinSubtitleIndex === -1) {
-    return -1;
+    return { kind: "disable" };
   }
 
-  const allSubs =
-    mediaSource?.MediaStreams?.filter((s) => s.Type === "Subtitle") || [];
+  const target = subtitleStreams.find((s) => s.Index === jellyfinSubtitleIndex);
+  if (!target) return { kind: "notFound" };
 
-  // Find the subtitle with the matching Jellyfin index
-  const targetSub = allSubs.find((s) => s.Index === jellyfinSubtitleIndex);
+  // Server-burned subs are pixels, not tracks — signal the caller to refresh
+  // the stream instead of hunting for a track that cannot exist.
+  if (isBurnedInSubtitle(target)) return { kind: "burnedIn" };
 
-  // If the target subtitle isn't in MPV (e.g., image-based during transcode), return undefined
-  if (!targetSub || !isSubtitleInMpv(targetSub, isTranscoding)) {
-    return undefined;
+  if (isExternalSubtitle(target)) {
+    const playerExternals = playerTracks.filter((t) => t.external === true);
+
+    // 1) Exact identity by external filename — robust against hidden-embedded offset.
+    const expectedUrl = getExpectedExternalUrl?.(target);
+    const byName = playerExternals.find((t) =>
+      externalFilenameMatches(t.externalFilename, expectedUrl),
+    );
+    if (byName) return { kind: "select", trackId: byName.id };
+
+    // 2) Fallback: externals are appended in MediaStreams order → ordinal among
+    //    *loadable* externals (those actually added to the player) stays in lockstep
+    //    with the player's external list, skipping ones with no DeliveryUrl (#1763).
+    const externalStreams = subtitleStreams.filter(isExternalSubtitle);
+    const loadableExternals = getExpectedExternalUrl
+      ? externalStreams.filter((s) => getExpectedExternalUrl(s))
+      : externalStreams;
+    const ordinal = loadableExternals.findIndex(
+      (s) => s.Index === jellyfinSubtitleIndex,
+    );
+    if (ordinal >= 0 && ordinal < playerExternals.length) {
+      return { kind: "select", trackId: playerExternals[ordinal].id };
+    }
+    return { kind: "notFound" };
   }
 
-  // Count MPV track position (1-based)
-  let mpvIndex = 0;
-  for (const sub of allSubs) {
-    if (isSubtitleInMpv(sub, isTranscoding)) {
-      mpvIndex++;
-      if (sub.Index === jellyfinSubtitleIndex) {
-        return mpvIndex;
-      }
+  // Embedded / in-container subtitle. Burned-in (Encode) streams are excluded:
+  // they are baked into the video and never appear in the player's track list,
+  // so counting them would shift every ordinal below.
+  const embeddedStreams = subtitleStreams.filter(
+    (s) => !isExternalSubtitle(s) && !isBurnedInSubtitle(s),
+  );
+  const playerEmbedded = playerTracks.filter((t) => t.external !== true);
+
+  // 1) Identity by language/title (unique match wins).
+  const identityMatches = playerEmbedded.filter((t) =>
+    embeddedIdentityMatches(t, target),
+  );
+  if (identityMatches.length === 1) {
+    return { kind: "select", trackId: identityMatches[0].id };
+  }
+
+  // 2) Multiple same-identity tracks: ordinal within the same-identity GROUP —
+  //    the k-th matching stream corresponds to the k-th matching player track
+  //    (container order is preserved on both sides, filter preserves order).
+  //    The group ordinal, not the global one: with [jpn, eng, eng] the first
+  //    eng is global position 1 but group position 0.
+  if (identityMatches.length > 1) {
+    const groupStreams = embeddedStreams.filter((s) =>
+      identityMatches.some((t) => embeddedIdentityMatches(t, s)),
+    );
+    const groupOrdinal = groupStreams.findIndex(
+      (s) => s.Index === jellyfinSubtitleIndex,
+    );
+    if (groupOrdinal >= 0) {
+      const idx = Math.min(groupOrdinal, identityMatches.length - 1);
+      return { kind: "select", trackId: identityMatches[idx].id };
     }
   }
 
-  return undefined;
+  // 3) Fallback: embedded order is container order on both sides → ordinal.
+  const ordinal = embeddedStreams.findIndex(
+    (s) => s.Index === jellyfinSubtitleIndex,
+  );
+  if (ordinal >= 0 && ordinal < playerEmbedded.length) {
+    return { kind: "select", trackId: playerEmbedded[ordinal].id };
+  }
+  return { kind: "notFound" };
+};
+
+/**
+ * A subtitle track as reported by a concrete player's track-list API
+ * (mpv `getSubtitleTracks`, or a Cast track list). `lang` mirrors mpv's field name.
+ */
+export type PlayerSubtitleTrackRaw = {
+  id: number;
+  lang?: string;
+  title?: string;
+  codec?: string;
+  external?: boolean;
+  externalFilename?: string;
+};
+
+/**
+ * Minimal player surface needed to select a subtitle. Satisfied structurally by
+ * the mpv player ref and (later) implementable by the Chromecast backend.
+ */
+export interface SubtitleSelectablePlayer {
+  getSubtitleTracks: () => Promise<PlayerSubtitleTrackRaw[] | null | undefined>;
+  setSubtitleTrack: (trackId: number) => unknown;
+  disableSubtitles: () => unknown;
+}
+
+/**
+ * Read the player's real track list, resolve the Jellyfin subtitle index by
+ * identity ({@link resolveSubtitleTrack}) and apply the result. Single entry point
+ * for both the mobile controls and the player screen, so selection stays
+ * consistent everywhere. Returns the resolution for callers that want to react.
+ */
+export const applyMpvSubtitleSelection = async (
+  player: SubtitleSelectablePlayer | null | undefined,
+  params: {
+    subtitleStreams: MediaStream[] | undefined;
+    jellyfinSubtitleIndex: number;
+    /** Build the exact URL/path an external sub was loaded into the player with. */
+    getExpectedExternalUrl?: (sub: MediaStream) => string | undefined;
+  },
+): Promise<SubtitleSelection> => {
+  if (!player) return { kind: "notFound" };
+
+  // Called fire-and-forget (`void applyMpvSubtitleSelection(...)`), so any native
+  // rejection from getSubtitleTracks/setSubtitleTrack/disableSubtitles must be
+  // swallowed here instead of escaping as an unhandled promise rejection.
+  try {
+    // Short-circuit the outcomes that don't need the player's track list, so
+    // the common subtitles-off case skips a full native enumeration.
+    if (params.jellyfinSubtitleIndex === -1) {
+      await player.disableSubtitles();
+      return { kind: "disable" };
+    }
+    const burnTarget = params.subtitleStreams?.find(
+      (s) => s.Index === params.jellyfinSubtitleIndex,
+    );
+    if (burnTarget && isBurnedInSubtitle(burnTarget)) {
+      return { kind: "burnedIn" };
+    }
+
+    const tracks = (await player.getSubtitleTracks()) ?? [];
+    const selection = resolveSubtitleTrack({
+      subtitleStreams: params.subtitleStreams,
+      jellyfinSubtitleIndex: params.jellyfinSubtitleIndex,
+      playerTracks: tracks.map((t) => ({
+        id: t.id,
+        external: t.external,
+        externalFilename: t.externalFilename,
+        language: t.lang,
+        title: t.title,
+        codec: t.codec,
+      })),
+      getExpectedExternalUrl: params.getExpectedExternalUrl,
+    });
+
+    if (selection.kind === "select") {
+      await player.setSubtitleTrack(selection.trackId);
+    } else if (selection.kind === "disable") {
+      await player.disableSubtitles();
+    }
+    // notFound → leave current selection (e.g. image subs burned in while transcoding)
+    return selection;
+  } catch {
+    return { kind: "notFound" };
+  }
 };
 
 /**