Merge branch 'master' into unavailable-yt-video-trailer-bug-fix

src/strings/en-us.json

@@ -150,6 +150,8 @@
     "DefaultSubtitlesHelp": "Subtitles are loaded based on the default and forced flags in the embedded metadata. Language preferences are considered when multiple options are available.",
     "DeinterlaceMethodHelp": "Select the deinterlacing method to use when software transcoding interlaced content. When hardware acceleration supporting hardware deinterlacing is enabled the hardware deinterlacer will be used instead of this setting.",
     "Delete": "Delete",
+    "DeleteAll": "Delete All",
+    "DeleteDevicesConfirmation": "Are you sure you wish to delete all devices? All other sessions will be logged out. Devices will reappear the next time a user signs in.", 
     "DeleteDeviceConfirmation": "Are you sure you wish to delete this device? It will reappear the next time a user signs in with it.",
     "DeleteImage": "Delete Image",
     "DeleteImageConfirmation": "Are you sure you wish to delete this image?",
@@ -298,6 +300,7 @@
     "HeaderDateIssued": "Date Issued",
     "HeaderDefaultRecordingSettings": "Default Recording Settings",
     "HeaderDeleteDevice": "Delete Device",
+    "HeaderDeleteDevices": "Delete All Devices",
     "HeaderDeleteItem": "Delete Item",
     "HeaderDeleteItems": "Delete Items",
     "HeaderDeleteProvider": "Delete Provider",
@@ -1037,8 +1040,6 @@
     "OptionDislikes": "Dislikes",
     "OptionDisplayFolderView": "Display a folder view to show plain media folders",
     "OptionDisplayFolderViewHelp": "Display folders alongside your other media libraries. This can be useful if you'd like to have a plain folder view.",
-    "OptionDownloadImagesInAdvance": "Download images in advance",
-    "OptionDownloadImagesInAdvanceHelp": "By default, most images are only downloaded when requested by a client. Enable this option to download all images in advance, as new media is imported. This may cause significantly longer library scans.",
     "OptionDvd": "DVD",
     "OptionEmbedSubtitles": "Embed within container",
     "OptionEnableAccessFromAllDevices": "Enable access from all devices",
@@ -1417,6 +1418,12 @@
     "LabelTonemappingParamHelp": "Tune the tone mapping algorithm. The recommended and default values are NaN. Generally leave it blank.",
     "StopPlayback": "Stop playback",
     "ClearQueue": "Clear queue",
+    "HeaderSelectFallbackFontPath" : "Select Fallback Font Folder Path",
+    "HeaderSelectFallbackFontPathHelp": "Browse or enter the path of the fallback font folder to use for rendering ASS/SSA subtitles.",
+    "LabelFallbackFontPath": "Fallback font folder path:",
+    "LabelFallbackFontPathHelp": "Specify a path containing fallback fonts for rendering ASS/SSA subtitles. The maximum allowed total font size is 20 MB. Lightweight and web-friendly font formats such as woff2 are recommended.",
+    "EnableFallbackFont" : "Enable fallback fonts",
+    "EnableFallbackFontHelp" : "Enable custom alternate fonts. This can avoid the problem of incorrect subtitle rendering.",
     "LabelSubtitleVerticalPosition": "Vertical position:",
     "SubtitleVerticalPositionHelp": "Line number where text appears. Positive numbers indicate top down. Negative numbers indicate bottom up.",
     "Preview": "Preview",