Merge branch 'master' into trickplay-new

src/strings/en-us.json

@@ -23,14 +23,15 @@
     "AllLibraries": "All libraries",
     "AllowedRemoteAddressesHelp": "Comma separated list of IP addresses or IP/netmask entries for networks that will be allowed to connect remotely. If left blank, all remote addresses will be allowed.",
     "AllowCollectionManagement": "Allow this user to manage collections",
+    "AllowSubtitleManagement": "Allow this user to edit subtitles",
     "AllowFfmpegThrottling": "Throttle Transcodes",
     "AllowFfmpegThrottlingHelp": "When a transcode or remux gets far enough ahead from the current playback position, pause the process so it will consume less resources. This is most useful when watching without seeking often. Turn this off if you experience playback issues.",
     "AllowSegmentDeletion": "Delete segments",
-    "AllowSegmentDeletionHelp": "Delete old segments after they have been sent to the client. This prevents having to store the entire transcoded file on disk. Will only work with throttling enabled. Turn this off if you experience playback issues.",
+    "AllowSegmentDeletionHelp": "Delete old segments after they have been downloaded by the client. This prevents having to store the entire transcoded file on disk. Turn this off if you experience playback issues.",
     "LabelThrottleDelaySeconds": "Throttle after",
     "LabelThrottleDelaySecondsHelp": "Time in seconds after which the transcoder will be throttled. Must be large enough for the client to maintain a healthy buffer. Only works if throttling is enabled.",
     "LabelSegmentKeepSeconds": "Time to keep segments",
-    "LabelSegmentKeepSecondsHelp": "Time in seconds for which segments should be kept before they are overwritten. Must be greater than \"Throttle after\". Only works if segment deletion is enabled.",
+    "LabelSegmentKeepSecondsHelp": "Time in seconds for which segments should be kept after they are downloaded by the client. Only works if segment deletion is enabled.",
     "AllowHWTranscodingHelp": "Allow the tuner to transcode streams on the fly. This may help reduce transcoding required by the server.",
     "AllowMediaConversion": "Allow media conversion",
     "AllowMediaConversionHelp": "Grant or deny access to the convert media feature.",
@@ -186,6 +187,7 @@
     "DeleteImage": "Delete Image",
     "DeleteImageConfirmation": "Are you sure you wish to delete this image?",
     "DeleteMedia": "Delete media",
+    "DeleteName": "Delete {0}",
     "DeleteUser": "Delete User",
     "DeleteUserConfirmation": "Are you sure you wish to delete this user?",
     "Depressed": "Depressed",
@@ -899,6 +901,8 @@
     "LabelTypeText": "Text",
     "LabelUnstable": "Unstable",
     "LabelUser": "User",
+    "LabelUseReplayGainTagsHelp": "Scan audio files for replaygain tags and use them instead of computing LUFS value. (Uses less computing power. Will override 'LUFS Scan' option)",
+    "LabelUseReplayGainTags": "Use ReplayGain Tags",
     "LabelUserAgent": "User agent",
     "LabelUserLoginAttemptsBeforeLockout": "Failed login tries before user is locked out",
     "LabelUserMaxActiveSessions": "Maximum number of simultaneous user sessions",
@@ -1547,6 +1551,8 @@
     "EnableEnhancedNvdecDecoder": "Enable enhanced NVDEC decoder",
     "EnableVppTonemapping": "Enable VPP Tone mapping",
     "AllowVppTonemappingHelp": "Full Intel driver based tone-mapping. Currently works only on certain hardware with HDR10 videos. This has a higher priority compared to another OpenCL implementation.",
+    "EnableVideoToolboxTonemapping": "Enable VideoToolbox Tone mapping",
+    "AllowVideoToolboxTonemappingHelp": "Hardware-accelerated tone-mapping provided by VideoToolbox. It works with most HDR formats, including HDR10, HDR10+, and HLG, but does not work with Dolby Vision Profile 5. This has a higher priority compared to another OpenCL implementation.",
     "Controls": "Controls",
     "LabelEnableGamepad": "Enable Gamepad",
     "EnableGamepadHelp": "Listen for input from any connected controllers. (Requires: 'TV' Display Mode)",