Merge remote-tracking branch 'origin/master' into no-limits

src/strings/en-us.json

@@ -179,6 +179,7 @@
     "DefaultErrorMessage": "There was an error processing the request. Please try again later.",
     "DefaultMetadataLangaugeDescription": "These are your defaults and can be customized on a per-library basis.",
     "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 transcoding interlaced content.",
     "Delete": "Delete",
     "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",
@@ -521,7 +522,7 @@
     "Images": "Images",
     "ImportFavoriteChannelsHelp": "If enabled, only channels that are marked as favorite on the tuner device will be imported.",
     "ImportMissingEpisodesHelp": "If enabled, information about missing episodes will be imported into your Jellyfin database and displayed within seasons and series. This may cause significantly longer library scans.",
-    "InstallingPackage": "Installing {0}",
+    "InstallingPackage": "Installing {0} (version {1})",
     "InstantMix": "Instant mix",
     "ItemCount": "{0} items",
     "Items": "Items",
@@ -603,6 +604,7 @@
     "LabelDefaultScreen": "Default screen:",
     "LabelDefaultUser": "Default user:",
     "LabelDefaultUserHelp": "Determines which user library should be displayed on connected devices. This can be overridden for each device using profiles.",
+    "LabelDeinterlaceMethod": "Deinterlacing method:",
     "LabelDeviceDescription": "Device description",
     "LabelDidlMode": "DIDL mode:",
     "LabelDiscNumber": "Disc number:",
@@ -1212,9 +1214,9 @@
     "OriginalAirDateValue": "Original air date: {0}",
     "OtherArtist": "Other Artist",
     "Overview": "Overview",
-    "PackageInstallCancelled": "{0} installation cancelled.",
-    "PackageInstallCompleted": "{0} installation completed.",
-    "PackageInstallFailed": "{0} installation failed.",
+    "PackageInstallCancelled": "{0} (version {1}) installation cancelled.",
+    "PackageInstallCompleted": "{0} (version {1}) installation completed.",
+    "PackageInstallFailed": "{0} (version {1}) installation failed.",
     "ParentalRating": "Parental rating",
     "PasswordMatchError": "Password and password confirmation must match.",
     "PasswordResetComplete": "The password has been reset.",
@@ -1237,7 +1239,7 @@
     "PlayFromBeginning": "Play from beginning",
     "PlayNext": "Play next",
     "PlayNextEpisodeAutomatically": "Play next episode automatically",
-    "PlaybackErrorNoCompatibleStream": "There was an issue with the client profiling and the server isn't sending a compatible media format.",
+    "PlaybackErrorNoCompatibleStream": "This client isn't compatible with the media and the server isn't sending a compatible media format.",
     "Played": "Played",
     "Playlists": "Playlists",
     "PleaseAddAtLeastOneFolder": "Please add at least one folder to this library by clicking the Add button.",
@@ -1481,6 +1483,20 @@
     "XmlTvNewsCategoriesHelp": "Programs with these categories will be displayed as news programs. Separate multiple with '|'.",
     "XmlTvPathHelp": "A path to a XMLTV file. Jellyfin will read this file and periodically check it for updates. You are responsible for creating and updating the file.",
     "XmlTvSportsCategoriesHelp": "Programs with these categories will be displayed as sports programs. Separate multiple with '|'.",
+    "Yadif": "Yadif",
+    "YadifBob": "Yadif Bob",
     "Yes": "Yes",
-    "Yesterday": "Yesterday"
+    "Yesterday": "Yesterday",
+    "PathNotFound": "The path could not be found. Please ensure the path is valid and try again.",
+    "WriteAccessRequired": "Jellyfin Server requires write access to this folder. Please ensure write access and try again.",
+    "ListPaging": "{0}-{1} of {2}",
+    "PersonRole": "as {0}",
+    "LastSeen": "Last seen {0}",
+    "DailyAt": "Daily at {0}",
+    "WeeklyAt": "{0}s at {1}",
+    "OnWakeFromSleep": "On wake from sleep",
+    "EveryXMinutes": "Every {0} minutes",
+    "EveryHour": "Every hour",
+    "EveryXHours": "Every {0} hours",
+    "OnApplicationStartup": "On application startup"
 }