Merge remote-tracking branch 'upstream/master'

soultaco83 · Oct 10, 2024 · 8b407fa · 8b407fa
2 parents 0332cc5 + 176ebec
commit 8b407fa
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 11 deletions.
diff --git a/src/apps/dashboard/AppOverrides.scss b/src/apps/dashboard/AppOverrides.scss
@@ -9,7 +9,7 @@ $drawer-width: 240px;
 
 // Fix dashboard pages layout to work with drawer
 .dashboardDocument {
-    .mainAnimatedPage {
+    .mainAnimatedPage:not(.metadataEditorPage) {
         @media all and (min-width: $mui-bp-md) {
             left: $drawer-width;
         }
@@ -31,4 +31,8 @@ $drawer-width: 240px;
             padding-top: 3.25rem;
         }
     }
+
+    .metadataEditorPage {
+        padding-top: 3.25rem !important;
+    }
 }
diff --git a/src/apps/dashboard/components/drawer/sections/ServerDrawerSection.tsx b/src/apps/dashboard/components/drawer/sections/ServerDrawerSection.tsx
@@ -91,7 +91,7 @@ const ServerDrawerSection = () => {
                         <ListItemText inset primary={globalize.translate('Display')} />
                     </ListItemLink>
                     <ListItemLink to='/dashboard/libraries/metadata' sx={{ pl: 4 }}>
-                        <ListItemText inset primary={globalize.translate('Metadata')} />
+                        <ListItemText inset primary={globalize.translate('MetadataManager')} />
                     </ListItemLink>
                     <ListItemLink to='/dashboard/libraries/nfo' sx={{ pl: 4 }}>
                         <ListItemText inset primary={globalize.translate('TabNfoSettings')} />

diff --git a/src/controllers/dashboard/metadataimages.html b/src/controllers/dashboard/metadataimages.html
@@ -1,4 +1,4 @@
-<div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-title="${Metadata}">
+<div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-title="${LabelMetadata}">
 
     <div>
 

diff --git a/src/controllers/edititemmetadata.html b/src/controllers/edititemmetadata.html
@@ -11,7 +11,7 @@
         </div>
     </div>
     <div>
-        <div class="editPageInnerContent padded-top padded-bottom-page">
+        <div class="editPageInnerContent padded-bottom-page">
         </div>
     </div>
 </div>
diff --git a/src/controllers/user/menu/index.html b/src/controllers/user/menu/index.html
@@ -89,7 +89,7 @@ <h2 class="sectionTitle" style="padding-left:.25em;">${HeaderAdmin}</h2>
                     <div class="listItem">
                         <span class="material-icons listItemIcon listItemIcon-transparent mode_edit" aria-hidden="true"></span>
                         <div class="listItemBody">
-                            <div class="listItemBodyText">${Metadata}</div>
+                            <div class="listItemBodyText">${MetadataManager}</div>
                         </div>
                     </div>
                 </a>

diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
@@ -333,7 +333,7 @@ function refreshLibraryInfoInDrawer(user) {
         html += globalize.translate('HeaderAdmin');
         html += '</h3>';
         html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkManageServer" data-itemid="dashboard" href="#/dashboard"><span class="material-icons navMenuOptionIcon dashboard" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('TabDashboard')}</span></a>`;
-        html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder editorViewMenu" data-itemid="editor" href="#/metadata"><span class="material-icons navMenuOptionIcon mode_edit" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('Metadata')}</span></a>`;
+        html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder editorViewMenu" data-itemid="editor" href="#/metadata"><span class="material-icons navMenuOptionIcon mode_edit" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('MetadataManager')}</span></a>`;
         html += '</div>';
     }
 

diff --git a/src/strings/el.json b/src/strings/el.json
@@ -1761,5 +1761,6 @@
     "PreferEmbeddedExtrasTitlesOverFileNames": "Προτιμήστε τους ενσωματωμένους τίτλους από τα ονόματα αρχείων για πρόσθετα",
     "PreferEmbeddedExtrasTitlesOverFileNamesHelp": "Τα πρόσθετα έχουν συχνά το ίδιο ενσωματωμένο όνομα με τον γονέα, ελέγξτε αυτό για να χρησιμοποιήσετε ενσωματωμένους τίτλους για αυτά ούτως ή άλλως.",
     "LabelSegmentKeepSecondsHelp": "Χρονικό διάστημα σε δευτερόλεπτα, για το οποίο τα τμήματα θα διατηρούνται έπειτα από την λήψη τους από τον χρήστη. Λειτουργεί μόνο αν η ανίχνευση τμημάτων είναι ενεργοποιημένη.",
-    "AllowSubtitleManagement": "Επίτρεψε στον χρήστη να επεξεργάζεται υποτίτλους"
+    "AllowSubtitleManagement": "Επίτρεψε στον χρήστη να επεξεργάζεται υποτίτλους",
+    "AllowContentWithTagsHelp": "Μόνο εμφάνιση πολυμέσων με τουλάχιστον μία από τις καθορισμένες ετικέτες."
 }
diff --git a/src/strings/en-gb.json b/src/strings/en-gb.json
@@ -94,7 +94,7 @@
     "Box": "Box",
     "BoxRear": "Box (rear)",
     "Browse": "Browse",
-    "BurnSubtitlesHelp": "Determine if the server should burn in subtitles while transcoding videos. Avoiding this will greatly improve performance. Select Auto to burn image based formats (VobSub, PGS, SUB, IDX, etc.) and certain ASS or SSA subtitles.",
+    "BurnSubtitlesHelp": "Determine if the server should burn in subtitles. Avoiding this will greatly improve performance. Select Auto to burn image-based formats (VobSub, PGS, SUB, IDX, etc.) and certain ASS or SSA subtitles.",
     "ButtonAddMediaLibrary": "Add Media Library",
     "ButtonAddScheduledTaskTrigger": "Add Trigger",
     "ButtonAddServer": "Add Server",
@@ -1967,5 +1967,9 @@
     "DateModified": "Date modified",
     "MessageCancelSeriesTimerError": "An error occurred while cancelling the series timer",
     "MessageCancelTimerError": "An error occurred while cancelling the timer",
-    "MessageSplitVersionsError": "An error occurred while splitting versions"
+    "MessageSplitVersionsError": "An error occurred while splitting versions",
+    "LabelScreensaverTime": "Screensaver Time",
+    "AlwaysBurnInSubtitleWhenTranscoding": "Always burn in subtitle when transcoding",
+    "AlwaysBurnInSubtitleWhenTranscodingHelp": "Burn in all subtitles when transcoding is triggered. This ensures subtitle synchronisation after transcoding at the cost of reduced transcoding speed.",
+    "LabelScreensaverTimeHelp": "The amount of time in seconds of inactivity required to start the screensaver."
 }
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
@@ -1147,7 +1147,6 @@
     "MessageUnableToConnectToServer": "We're unable to connect to the selected server right now. Please ensure it is running and try again.",
     "MessageUnauthorizedUser": "You are not authorized to access the server at this time. Please contact your server administrator for more information.",
     "MessageUnsetContentHelp": "Content will be displayed as plain folders. For best results use the metadata manager to set the content types of sub-folders.",
-    "Metadata": "Metadata",
     "MetadataManager": "Metadata Manager",
     "MetadataSettingChangeHelp": "Changing metadata settings will affect new content added going forward. To refresh existing content, open the detail screen and click the 'Refresh' button, or do bulk refreshes using the 'Metadata Manager'.",
     "MillisecondsUnit": "ms",

diff --git a/src/styles/metadataeditor.scss b/src/styles/metadataeditor.scss
@@ -56,7 +56,7 @@
 @media all and (min-width: 50em) {
     .editPageSidebar {
         position: fixed;
-        top: 5.2em;
+        top: 3.25rem;
         bottom: 0;
         width: 30%;
         display: block;