Merge branch 'master' into EnableLibrary

src/strings/en-us.json

@@ -10,6 +10,7 @@
     "AddToPlayQueue": "Add to play queue",
     "AgeValue": "({0} years old)",
     "AirDate": "Air date",
+    "AirPlay": "AirPlay",
     "Aired": "Aired",
     "Album": "Album",
     "AlbumArtist": "Album Artist",
@@ -23,6 +24,7 @@
     "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",
+    "AllowContentWithTagsHelp": "Only show media with at least one of the specified tags.",
     "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.",
@@ -66,6 +68,7 @@
     "BirthLocation": "Birth location",
     "BirthPlaceValue": "Birth place: {0}",
     "Blacklist": "Blacklist",
+    "BlockContentWithTagsHelp": "Hide media with at least one of the specified tags.",
     "BookLibraryHelp": "Audio and text books are supported. Review the {0} book naming guide {1}.",
     "Books": "Books",
     "Box": "Box",
@@ -1602,6 +1605,8 @@
     "EnableIntelLowPowerHevcHwEncoder": "Enable Intel Low-Power HEVC hardware encoder",
     "IntelLowPowerEncHelp": "Low-Power Encoding can keep unnecessary CPU-GPU sync. On Linux they must be disabled if the i915 HuC firmware is not configured.",
     "LabelHardwareEncodingOptions": "Hardware encoding options",
+    "LabelEncodingFormatOptions": "Encoding format options",
+    "EncodingFormatHelp": "Select the video encoding that Jellyfin should transcode to. Jellyfin will use software encoding when hardware acceleration for the selected format is not available. H264 encoding will always be enabled.",
     "AudioIsExternal": "The audio stream is external",
     "VideoBitrateNotSupported": "The video's bitrate is not supported",
     "UnknownVideoStreamInfo": "The video stream info is unknown",
@@ -1620,7 +1625,7 @@
     "Select": "Select",
     "ThemeSong": "Theme Song",
     "ThemeVideo": "Theme Video",
-    "EnableEnhancedNvdecDecoderHelp": "Experimental NVDEC implementation, do not enable this option unless you encounter decoding errors.",
+    "EnableEnhancedNvdecDecoderHelp": "Enhanced NVDEC implementation, disable this option to use CUVID if you encounter decoding errors.",
     "EnableSplashScreen": "Enable the splash screen",
     "LabelVppTonemappingBrightness": "VPP Tone mapping brightness gain",
     "LabelVppTonemappingBrightnessHelp": "Apply brightness gain in VPP tone mapping. The recommended and default values are 16 and 0.",