Merge remote-tracking branch 'origin/development' into development

morpheus65535 · Dec 3, 2024 · 852f424 · 852f424
2 parents d7f06bb + 4d022c2
commit 852f424
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/frontend/src/pages/Settings/Providers/list.ts b/frontend/src/pages/Settings/Providers/list.ts
@@ -151,7 +151,8 @@ export const ProviderList: Readonly<ProviderInfo[]> = [
   {
     key: "embeddedsubtitles",
     name: "Embedded Subtitles",
-    description: "Embedded Subtitles from your Media Files",
+    description:
+      "This provider extracts embedded subtitles from your media files. You must disable 'Treat Embedded Subtitles as Downloaded' in Settings -> Subtitles for this provider to work.",
     inputs: [
       {
         type: "chips",

diff --git a/frontend/src/pages/Settings/Subtitles/index.tsx b/frontend/src/pages/Settings/Subtitles/index.tsx
@@ -159,11 +159,12 @@ const SettingsSubtitlesView: FunctionComponent = () => {
       </Section>
       <Section header="Embedded Subtitles">
         <Check
-          label="Use Embedded Subtitles"
+          label="Treat Embedded Subtitles as Downloaded"
           settingKey="settings-general-use_embedded_subs"
         ></Check>
         <Message>
-          Use embedded subtitles in media files when determining missing ones.
+          Treat embedded subtitles in media files as already downloaded when
+          determining missing ones.
         </Message>
         <CollapseBox indent settingKey="settings-general-use_embedded_subs">
           <Selector
@@ -179,21 +180,21 @@ const SettingsSubtitlesView: FunctionComponent = () => {
             settingKey="settings-general-ignore_pgs_subs"
           ></Check>
           <Message>
-            Ignores PGS Subtitles in Embedded Subtitles detection.
+            Ignore PGS Subtitles when detecting embedded subtitles.
           </Message>
           <Check
             label="Ignore Embedded VobSub Subtitles"
             settingKey="settings-general-ignore_vobsub_subs"
           ></Check>
           <Message>
-            Ignores VobSub Subtitles in Embedded Subtitles detection.
+            Ignore VobSub Subtitles when detecting embedded subtitles.
           </Message>
           <Check
             label="Ignore Embedded ASS Subtitles"
             settingKey="settings-general-ignore_ass_subs"
           ></Check>
           <Message>
-            Ignores ASS Subtitles in Embedded Subtitles detection.
+            Ignore ASS Subtitles when detecting embedded subtitles.
           </Message>
           <Check
             label="Show Only Desired Languages"