Merge branch 'master' into burn-subtitle-transcoding

src/strings/en-us.json

@@ -158,7 +158,7 @@
     "ChannelNumber": "Channel number",
     "Channels": "Channels",
     "CinemaModeConfigurationHelp": "Cinema mode brings the theater experience straight to your living room with the ability to play trailers and custom intros before the main feature.",
-    "SelectAudioNormalizationHelp": "Track gain - adjusts the volume of each track so they playback with the same loudness. Album gain - adjusts the volume of all the tracks in an album only, keeping the album's dynamic range.",
+    "SelectAudioNormalizationHelp": "Track gain - adjusts the volume of each track so they playback with the same loudness. Album gain - adjusts the volume of all the tracks in an album only, keeping the album's dynamic range. Switching between \"Off\" and other options requires restarting the current playback.",
     "ClearQueue": "Clear queue",
     "ClientSettings": "Client Settings",
     "Collections": "Collections",
@@ -193,6 +193,7 @@
     "DailyAt": "Daily at {0}",
     "Data": "Data",
     "DateAdded": "Date added",
+    "DateModified": "Date modified",
     "DatePlayed": "Date played",
     "DeathDateValue": "Died: {0}",
     "Default": "Default",
@@ -586,6 +587,7 @@
     "LabelAudioChannels": "Audio channels",
     "LabelAudioCodec": "Audio codec",
     "LabelAudioLanguagePreference": "Preferred audio language",
+    "LabelAudioTagSettings": "Audio Tag settings",
     "LabelSelectAudioNormalization": "Audio Normalization",
     "LabelSelectPreferredTranscodeVideoAudioCodec": "Preferred transcode audio codec in video playback",
     "LabelAudioSampleRate": "Audio sample rate",
@@ -636,6 +638,8 @@
     "LabelCustomCssHelp": "Apply your custom CSS code for theming/branding on the web interface.",
     "LabelCustomDeviceDisplayNameHelp": "Supply a custom display name or leave empty to use the name reported by the device.",
     "LabelCustomRating": "Custom rating",
+    "LabelCustomTagDelimiters": "Custom Tag Delimiter",
+    "LabelCustomTagDelimitersHelp": "Characters to be treated as delimiters to separate tags.",
     "LabelDashboardTheme": "Server Dashboard theme",
     "LabelDate": "Date",
     "LabelDateAdded": "Date added",
@@ -646,6 +650,8 @@
     "LabelDeathDate": "Death date",
     "LabelDefaultScreen": "Default screen",
     "LabelDeinterlaceMethod": "Deinterlacing method",
+    "LabelDelimiterWhitelist": "Delimiter Whitelist",
+    "LabelDelimiterWhitelistHelp": "Items to be excluded from tag splitting. One item per line.",
     "LabelDeveloper": "Developer",
     "LabelDisableCustomCss": "Disable custom CSS code for theming/branding provided from the server.",
     "LabelDisableVbrAudioEncoding": "Disable VBR audio encoding",
@@ -1064,6 +1070,8 @@
     "MessageAreYouSureDeleteSubtitles": "Are you sure you wish to delete this subtitle file?",
     "MessageAreYouSureYouWishToRemoveMediaFolder": "Are you sure you wish to remove this media folder?",
     "MessageBrowsePluginCatalog": "Browse our plugin catalog to view available plugins.",
+    "MessageCancelSeriesTimerError": "An error occurred while canceling the series timer",
+    "MessageCancelTimerError": "An error occurred while canceling the timer",
     "MessageChangeRecordingPath": "Changing your recording folder will not migrate existing recordings from the old location to the new. You'll need to move them manually if desired.",
     "MessageConfirmAppExit": "Do you want to exit?",
     "MessageConfirmDeleteGuideProvider": "Are you sure you wish to delete this guide provider?",
@@ -1116,6 +1124,7 @@
     "MessageRenameMediaFolder": "Renaming a media library will cause all metadata to be lost, proceed with caution.",
     "MessageRepositoryInstallDisclaimer": "WARNING: Installing a third party plugin repository carries risks. It may contain unstable or malicious code, and may change at any time. Only install repositories from authors that you trust.",
     "MessageSent": "Message sent.",
+    "MessageSplitVersionsError": "An error occurred while splitting versions",
     "MessageSyncPlayCreateGroupDenied": "Permission required to create a group.",
     "MessageSyncPlayDisabled": "SyncPlay disabled.",
     "MessageSyncPlayEnabled": "SyncPlay enabled.",
@@ -1337,6 +1346,8 @@
     "PreferEmbeddedExtrasTitlesOverFileNamesHelp": "Extras often have the same embedded name as the parent, check this to use embedded titles for them anyway.",
     "PreferEmbeddedTitlesOverFileNames": "Prefer embedded titles over filenames",
     "PreferEmbeddedTitlesOverFileNamesHelp": "Determine the display title to use when no internet metadata or local metadata is available.",
+    "PreferNonstandardArtistsTag": "Prefer ARTISTS tag if available",
+    "PreferNonstandardArtistsTagHelp": "Use the non-standard ARTISTS tag instead of ARTIST tag when available.",
     "AllowEmbeddedSubtitles": "Disable different types of embedded subtitles",
     "AllowEmbeddedSubtitlesHelp": "Disable subtitles that are packaged within media containers. Requires a full library refresh.",
     "AllowEmbeddedSubtitlesAllowAllOption": "Allow All",
@@ -1571,6 +1582,8 @@
     "UnsupportedPlayback": "Jellyfin cannot decrypt content protected by DRM but all content will be tried regardless, including protected titles. Some files may appear completely black due to encryption or other unsupported features, such as interactive titles.",
     "Up": "Up",
     "Upload": "Upload",
+    "UseCustomTagDelimiters": "Use custom tag delimiter",
+    "UseCustomTagDelimitersHelp": "Split artist/genre tags with custom characters.",
     "UseDoubleRateDeinterlacing": "Double the frame rate when deinterlacing",
     "UseDoubleRateDeinterlacingHelp": "This setting uses the field rate when deinterlacing, often referred to as bob deinterlacing, which doubles the frame rate of the video to provide full motion like what you would see when viewing interlaced video on a TV.",
     "UseEpisodeImagesInNextUp": "Use episode images in 'Next Up' and 'Continue Watching' sections",
@@ -1737,7 +1750,7 @@
     "Trickplay": "Trickplay",
     "LabelTrickplayAccel": "Enable hardware decoding",
     "LabelTrickplayAccelEncoding": "Enable hardware accelerated MJPEG encoding",
-    "LabelTrickplayAccelEncodingHelp": "Currently only available on QSV, VAAPI and VideoToolbox, this option has no effect on other hardware acceleration methods.",
+    "LabelTrickplayAccelEncodingHelp": "Currently only available on QSV, VA-API, VideoToolbox and RKMPP, this option has no effect on other hardware acceleration methods.",
     "LabelTrickplayKeyFrameOnlyExtraction": "Only generate images from key frames",
     "LabelTrickplayKeyFrameOnlyExtractionHelp": "Extract key frames only for significantly faster processing with less accurate timing. If the configured hardware decoder does not support this mode, will use the software decoder instead.",
     "NonBlockingScan": "Non Blocking - queues generation, then returns",