Merge branch 'master' into h265

15 files changed, 404 insertions, 317 deletions

diff --git a/Emby.Server.Implementations/Localization/Core/da.json b/Emby.Server.Implementations/Localization/Core/da.json
index cb8f4576a..b01abafa1 100644
--- a/Emby.Server.Implementations/Localization/Core/da.json
+++ b/Emby.Server.Implementations/Localization/Core/da.json
@@ -18,11 +18,11 @@
     "HeaderAlbumArtists": "Albumkunstnere",
     "HeaderCameraUploads": "Kamera Uploads",
     "HeaderContinueWatching": "Fortsæt Afspilning",
-    "HeaderFavoriteAlbums": "Favoritalbum",
+    "HeaderFavoriteAlbums": "Favoritalbummer",
     "HeaderFavoriteArtists": "Favoritkunstnere",
-    "HeaderFavoriteEpisodes": "Favorit-afsnit",
-    "HeaderFavoriteShows": "Favorit-serier",
-    "HeaderFavoriteSongs": "Favorit-sange",
+    "HeaderFavoriteEpisodes": "Favoritepisoder",
+    "HeaderFavoriteShows": "Favoritserier",
+    "HeaderFavoriteSongs": "Favoritsange",
     "HeaderLiveTV": "Live TV",
     "HeaderNextUp": "Næste",
     "HeaderRecordingGroups": "Optagelsesgrupper",
diff --git a/Emby.Server.Implementations/Localization/Core/de.json b/Emby.Server.Implementations/Localization/Core/de.json
index 6fd63a514..0db201769 100644
--- a/Emby.Server.Implementations/Localization/Core/de.json
+++ b/Emby.Server.Implementations/Localization/Core/de.json
@@ -27,7 +27,7 @@
     "HeaderNextUp": "Als Nächstes",
     "HeaderRecordingGroups": "Aufnahme-Gruppen",
     "HomeVideos": "Heimvideos",
-    "Inherit": "Übernehmen",
+    "Inherit": "Vererben",
     "ItemAddedWithName": "{0} wurde der Bibliothek hinzugefügt",
     "ItemRemovedWithName": "{0} wurde aus der Bibliothek entfernt",
     "LabelIpAddressValue": "IP-Adresse: {0}",
diff --git a/Emby.Server.Implementations/Localization/Core/es-MX.json b/Emby.Server.Implementations/Localization/Core/es-MX.json
index 2285f2808..003632968 100644
--- a/Emby.Server.Implementations/Localization/Core/es-MX.json
+++ b/Emby.Server.Implementations/Localization/Core/es-MX.json
@@ -18,11 +18,11 @@
     "HeaderAlbumArtists": "Artistas del Álbum",
     "HeaderCameraUploads": "Subidos desde Camara",
     "HeaderContinueWatching": "Continuar Viendo",
-    "HeaderFavoriteAlbums": "Álbumes Favoritos",
-    "HeaderFavoriteArtists": "Artistas Favoritos",
-    "HeaderFavoriteEpisodes": "Episodios Preferidos",
-    "HeaderFavoriteShows": "Programas Preferidos",
-    "HeaderFavoriteSongs": "Canciones Favoritas",
+    "HeaderFavoriteAlbums": "Álbumes favoritos",
+    "HeaderFavoriteArtists": "Artistas favoritos",
+    "HeaderFavoriteEpisodes": "Episodios favoritos",
+    "HeaderFavoriteShows": "Programas favoritos",
+    "HeaderFavoriteSongs": "Canciones favoritas",
     "HeaderLiveTV": "TV en Vivo",
     "HeaderNextUp": "A Continuación",
     "HeaderRecordingGroups": "Grupos de Grabaciones",
diff --git a/Emby.Server.Implementations/Localization/Core/es.json b/Emby.Server.Implementations/Localization/Core/es.json
index 1850b8f25..f03184d5b 100644
--- a/Emby.Server.Implementations/Localization/Core/es.json
+++ b/Emby.Server.Implementations/Localization/Core/es.json
@@ -21,7 +21,7 @@
     "HeaderFavoriteAlbums": "Álbumes favoritos",
     "HeaderFavoriteArtists": "Artistas favoritos",
     "HeaderFavoriteEpisodes": "Episodios favoritos",
-    "HeaderFavoriteShows": "Programas favoritos",
+    "HeaderFavoriteShows": "Series favoritas",
     "HeaderFavoriteSongs": "Canciones favoritas",
     "HeaderLiveTV": "TV en directo",
     "HeaderNextUp": "Siguiendo",
diff --git a/Emby.Server.Implementations/Localization/Core/fa.json b/Emby.Server.Implementations/Localization/Core/fa.json
index 0a0c7553b..faa658ed5 100644
--- a/Emby.Server.Implementations/Localization/Core/fa.json
+++ b/Emby.Server.Implementations/Localization/Core/fa.json
@@ -5,7 +5,7 @@
     "Artists": "هنرمندان",
     "AuthenticationSucceededWithUserName": "{0} با موفقیت تایید اعتبار شد",
     "Books": "کتاب ها",
-    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "CameraImageUploadedFrom": "یک عکس جدید از دوربین ارسال شده {0}",
     "Channels": "کانال ها",
     "ChapterNameValue": "فصل {0}",
     "Collections": "کلکسیون ها",
@@ -34,17 +34,17 @@
     "LabelRunningTimeValue": "زمان اجرا: {0}",
     "Latest": "آخرین",
     "MessageApplicationUpdated": "سرور Jellyfin بروزرسانی شد",
-    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageApplicationUpdatedTo": "سرور جلیفین آپدیت شده به نسخه {0}",
     "MessageNamedServerConfigurationUpdatedWithValue": "پکربندی بخش {0} سرور  بروزرسانی شد",
     "MessageServerConfigurationUpdated": "پیکربندی سرور بروزرسانی شد",
     "MixedContent": "محتوای درهم",
     "Movies": "فیلم های سینمایی",
     "Music": "موسیقی",
     "MusicVideos": "موزیک ویدیوها",
-    "NameInstallFailed": "{0} installation failed",
+    "NameInstallFailed": "{0} نصب با مشکل مواجه شده",
     "NameSeasonNumber": "فصل {0}",
     "NameSeasonUnknown": "فصل های ناشناخته",
-    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NewVersionIsAvailable": "یک نسخه جدید جلیفین برای بروزرسانی آماده میباشد.",
     "NotificationOptionApplicationUpdateAvailable": "بروزرسانی برنامه موجود است",
     "NotificationOptionApplicationUpdateInstalled": "بروزرسانی برنامه نصب شد",
     "NotificationOptionAudioPlayback": "پخش صدا آغاز شد",
@@ -70,12 +70,12 @@
     "ProviderValue": "ارائه دهنده: {0}",
     "ScheduledTaskFailedWithName": "{0} ناموفق بود",
     "ScheduledTaskStartedWithName": "{0} شروع شد",
-    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "ServerNameNeedsToBeRestarted": "{0} احتیاج به راه اندازی مجدد",
     "Shows": "سریال ها",
     "Songs": "آهنگ ها",
     "StartupEmbyServerIsLoading": "سرور Jellyfin در حال بارگیری است. لطفا کمی بعد دوباره تلاش کنید.",
     "SubtitleDownloadFailureForItem": "دانلود زیرنویس برای {0} ناموفق بود",
-    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitleDownloadFailureFromForItem": "زیرنویس برای دانلود با مشکل مواجه شده از {0} برای {1}",
     "SubtitlesDownloadedForItem": "زیرنویس {0} دانلود شد",
     "Sync": "همگامسازی",
     "System": "سیستم",
@@ -91,7 +91,7 @@
     "UserPolicyUpdatedWithName": "سیاست کاربری برای {0} بروزرسانی شد",
     "UserStartedPlayingItemWithValues": "{0} شروع به پخش {1} کرد",
     "UserStoppedPlayingItemWithValues": "{0} پخش {1} را متوقف کرد",
-    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueHasBeenAddedToLibrary": "{0} اضافه شده به کتابخانه رسانه شما",
     "ValueSpecialEpisodeName": "ویژه- {0}",
     "VersionNumber": "نسخه {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/hu.json b/Emby.Server.Implementations/Localization/Core/hu.json
index c0f988abe..a2fc126a2 100644
--- a/Emby.Server.Implementations/Localization/Core/hu.json
+++ b/Emby.Server.Implementations/Localization/Core/hu.json
@@ -19,9 +19,9 @@
     "HeaderCameraUploads": "Kamera feltöltések",
     "HeaderContinueWatching": "Folyamatban lévő filmek",
     "HeaderFavoriteAlbums": "Kedvenc Albumok",
-    "HeaderFavoriteArtists": "Kedvenc Művészek",
+    "HeaderFavoriteArtists": "Kedvenc Előadók",
     "HeaderFavoriteEpisodes": "Kedvenc Epizódok",
-    "HeaderFavoriteShows": "Kedvenc Műsorok",
+    "HeaderFavoriteShows": "Kedvenc Sorozatok",
     "HeaderFavoriteSongs": "Kedvenc Dalok",
     "HeaderLiveTV": "Élő TV",
     "HeaderNextUp": "Következik",
diff --git a/Emby.Server.Implementations/Localization/Core/ja.json b/Emby.Server.Implementations/Localization/Core/ja.json
index 0967ef424..4aa0637c5 100644
--- a/Emby.Server.Implementations/Localization/Core/ja.json
+++ b/Emby.Server.Implementations/Localization/Core/ja.json
@@ -1 +1,96 @@
-{}
+{
+    "Albums": "アルバム",
+    "AppDeviceValues": "アプリ: {0}, デバイス: {1}",
+    "Application": "アプリケーション",
+    "Artists": "アーティスト",
+    "AuthenticationSucceededWithUserName": "{0} 認証に成功しました",
+    "Books": "ブック",
+    "CameraImageUploadedFrom": "新しいカメライメージが {0}からアップロードされました",
+    "Channels": "チャンネル",
+    "ChapterNameValue": "チャプター {0}",
+    "Collections": "コレクション",
+    "DeviceOfflineWithName": "{0} が切断されました",
+    "DeviceOnlineWithName": "{0} が接続されました",
+    "FailedLoginAttemptWithUserName": "ログインを試行しましたが {0}によって失敗しました",
+    "Favorites": "お気に入り",
+    "Folders": "フォルダー",
+    "Genres": "ジャンル",
+    "HeaderAlbumArtists": "アルバムアーティスト",
+    "HeaderCameraUploads": "カメラアップロード",
+    "HeaderContinueWatching": "視聴を続ける",
+    "HeaderFavoriteAlbums": "お気に入りのアルバム",
+    "HeaderFavoriteArtists": "お気に入りのアーティスト",
+    "HeaderFavoriteEpisodes": "お気に入りのエピソード",
+    "HeaderFavoriteShows": "お気に入りの番組",
+    "HeaderFavoriteSongs": "お気に入りの曲",
+    "HeaderLiveTV": "ライブTV",
+    "HeaderNextUp": "次",
+    "HeaderRecordingGroups": "レコーディンググループ",
+    "HomeVideos": "ホームビデオ",
+    "Inherit": "継承",
+    "ItemAddedWithName": "{0} をライブラリに追加しました",
+    "ItemRemovedWithName": "{0} をライブラリから削除しました",
+    "LabelIpAddressValue": "IPアドレス: {0}",
+    "LabelRunningTimeValue": "稼働時間: {0}",
+    "Latest": "最新",
+    "MessageApplicationUpdated": "Jellyfin Server が更新されました",
+    "MessageApplicationUpdatedTo": "Jellyfin Server が {0}に更新されました",
+    "MessageNamedServerConfigurationUpdatedWithValue": "サーバー設定項目の {0} が更新されました",
+    "MessageServerConfigurationUpdated": "サーバー設定が更新されました",
+    "MixedContent": "ミックスコンテンツ",
+    "Movies": "ムービー",
+    "Music": "ミュージック",
+    "MusicVideos": "ミュージックビデオ",
+    "NameInstallFailed": "{0}のインストールに失敗しました",
+    "NameSeasonNumber": "シーズン {0}",
+    "NameSeasonUnknown": "不明なシーズン",
+    "NewVersionIsAvailable": "新しいバージョンの Jellyfin Server がダウンロード可能です。",
+    "NotificationOptionApplicationUpdateAvailable": "アプリケーションの更新があります",
+    "NotificationOptionApplicationUpdateInstalled": "アプリケーションは最新です",
+    "NotificationOptionAudioPlayback": "オーディオの再生を開始",
+    "NotificationOptionAudioPlaybackStopped": "オーディオの再生をストップしました",
+    "NotificationOptionCameraImageUploaded": "カメライメージがアップロードされました",
+    "NotificationOptionInstallationFailed": "インストール失敗",
+    "NotificationOptionNewLibraryContent": "新しいコンテンツを追加しました",
+    "NotificationOptionPluginError": "プラグインに障害が発生しました",
+    "NotificationOptionPluginInstalled": "プラグインがインストールされました",
+    "NotificationOptionPluginUninstalled": "プラグインがアンインストールされました",
+    "NotificationOptionPluginUpdateInstalled": "プラグインのアップデートをインストールしました",
+    "NotificationOptionServerRestartRequired": "サーバーを再起動してください",
+    "NotificationOptionTaskFailed": "スケジュールされていたタスクの失敗",
+    "NotificationOptionUserLockedOut": "ユーザーはロックされています",
+    "NotificationOptionVideoPlayback": "ビデオの再生を開始しました",
+    "NotificationOptionVideoPlaybackStopped": "ビデオを停止しました",
+    "Photos": "フォト",
+    "Playlists": "プレイリスト",
+    "Plugin": "プラグイン",
+    "PluginInstalledWithName": "{0} がインストールされました",
+    "PluginUninstalledWithName": "{0} がアンインストールされました",
+    "PluginUpdatedWithName": "{0} が更新されました",
+    "ProviderValue": "プロバイダ: {0}",
+    "ScheduledTaskFailedWithName": "{0} が失敗しました",
+    "ScheduledTaskStartedWithName": "{0} が開始されました",
+    "ServerNameNeedsToBeRestarted": "{0} を再起動してください",
+    "Shows": "番組",
+    "Songs": "曲",
+    "StartupEmbyServerIsLoading": "Jellyfin Server は現在読み込み中です。しばらくしてからもう一度お試しください。",
+    "SubtitleDownloadFailureFromForItem": "{0} から {1}の字幕のダウンロードに失敗しました",
+    "SubtitlesDownloadedForItem": "{0} の字幕がダウンロードされました",
+    "Sync": "同期",
+    "System": "システム",
+    "TvShows": "テレビ番組",
+    "User": "ユーザー",
+    "UserCreatedWithName": "ユーザー {0} が作成されました",
+    "UserDeletedWithName": "User {0} を削除しました",
+    "UserDownloadingItemWithValues": "{0} が {1} をダウンロードしています",
+    "UserLockedOutWithName": "ユーザー {0} はロックされています",
+    "UserOfflineFromDevice": "{0} は {1} から切断しました",
+    "UserOnlineFromDevice": "{0} は {1} からオンラインになりました",
+    "UserPasswordChangedWithName": "ユーザー {0} のパスワードは変更されました",
+    "UserPolicyUpdatedWithName": "ユーザーポリシーが{0}に更新されました",
+    "UserStartedPlayingItemWithValues": "{0} は {2}で{1} を再生しています",
+    "UserStoppedPlayingItemWithValues": "{0} は{2}で{1} の再生が終わりました",
+    "ValueHasBeenAddedToLibrary": "{0}はあなたのメディアライブラリに追加されました",
+    "ValueSpecialEpisodeName": "スペシャル - {0}",
+    "VersionNumber": "バージョン {0}"
+}
diff --git a/Emby.Server.Implementations/Localization/Core/ko.json b/Emby.Server.Implementations/Localization/Core/ko.json
index 21808fd18..f2b7c408c 100644
--- a/Emby.Server.Implementations/Localization/Core/ko.json
+++ b/Emby.Server.Implementations/Localization/Core/ko.json
@@ -1,88 +1,88 @@
 {
-    "Albums": "Albums",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "Application": "Application",
-    "Artists": "Artists",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "Books": "Books",
-    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-    "Channels": "Channels",
-    "ChapterNameValue": "Chapter {0}",
-    "Collections": "Collections",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "DeviceOnlineWithName": "{0} is connected",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "Favorites": "Favorites",
-    "Folders": "Folders",
-    "Genres": "Genres",
+    "Albums": "앨범",
+    "AppDeviceValues": "앱: {0}, 디바이스: {1}",
+    "Application": "애플리케이션",
+    "Artists": "아티스트",
+    "AuthenticationSucceededWithUserName": "{0} 인증에 성공했습니다.",
+    "Books": "책",
+    "CameraImageUploadedFrom": "새로운 카메라 이미지가 {0}에서 업로드되었습니다.",
+    "Channels": "채널",
+    "ChapterNameValue": "챕터 {0}",
+    "Collections": "컬렉션",
+    "DeviceOfflineWithName": "{0}가 접속이 끊어졌습니다.",
+    "DeviceOnlineWithName": "{0}가 접속되었습니다.",
+    "FailedLoginAttemptWithUserName": "{0}에서 로그인이 실패했습니다.",
+    "Favorites": "즐겨찾기",
+    "Folders": "폴더",
+    "Genres": "장르",
     "HeaderAlbumArtists": "앨범 아티스트",
-    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderCameraUploads": "카메라 업로드",
     "HeaderContinueWatching": "계속 시청하기",
-    "HeaderFavoriteAlbums": "Favorite Albums",
-    "HeaderFavoriteArtists": "Favorite Artists",
-    "HeaderFavoriteEpisodes": "Favorite Episodes",
+    "HeaderFavoriteAlbums": "좋아하는 앨범",
+    "HeaderFavoriteArtists": "좋아하는 아티스트",
+    "HeaderFavoriteEpisodes": "좋아하는 에피소드",
     "HeaderFavoriteShows": "즐겨찾는 쇼",
-    "HeaderFavoriteSongs": "Favorite Songs",
-    "HeaderLiveTV": "Live TV",
-    "HeaderNextUp": "Next Up",
-    "HeaderRecordingGroups": "Recording Groups",
-    "HomeVideos": "Home videos",
-    "Inherit": "Inherit",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "Latest": "Latest",
-    "MessageApplicationUpdated": "Jellyfin Server has been updated",
-    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MixedContent": "Mixed content",
-    "Movies": "Movies",
-    "Music": "Music",
-    "MusicVideos": "Music videos",
-    "NameInstallFailed": "{0} installation failed",
-    "NameSeasonNumber": "Season {0}",
-    "NameSeasonUnknown": "Season Unknown",
-    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "Photos": "Photos",
-    "Playlists": "Playlists",
-    "Plugin": "Plugin",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "PluginUpdatedWithName": "{0} was updated",
-    "ProviderValue": "Provider: {0}",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-    "Shows": "Shows",
-    "Songs": "Songs",
+    "HeaderFavoriteSongs": "좋아하는 노래",
+    "HeaderLiveTV": "TV 방송",
+    "HeaderNextUp": "다음으로",
+    "HeaderRecordingGroups": "녹화 그룹",
+    "HomeVideos": "홈 비디오",
+    "Inherit": "상속",
+    "ItemAddedWithName": "{0} 라이브러리에 추가됨",
+    "ItemRemovedWithName": "{0} 라이브러리에서 제거됨",
+    "LabelIpAddressValue": "IP 주소: {0}",
+    "LabelRunningTimeValue": "상영 시간: {0}",
+    "Latest": "최근",
+    "MessageApplicationUpdated": "Jellyfin 서버 업데이트됨",
+    "MessageApplicationUpdatedTo": "Jellyfin 서버가 {0}로 업데이트됨",
+    "MessageNamedServerConfigurationUpdatedWithValue": "서버 환경 설정 {0} 섹션 업데이트 됨",
+    "MessageServerConfigurationUpdated": "서버 환경 설정 업데이드됨",
+    "MixedContent": "혼합 콘텐츠",
+    "Movies": "영화",
+    "Music": "음악",
+    "MusicVideos": "뮤직 비디오",
+    "NameInstallFailed": "{0} 설치 실패.",
+    "NameSeasonNumber": "시즌 {0}",
+    "NameSeasonUnknown": "알 수 없는 시즌",
+    "NewVersionIsAvailable": "새 버전의 Jellyfin 서버를 사용할 수 있습니다.",
+    "NotificationOptionApplicationUpdateAvailable": "애플리케이션 업데이트 사용 가능",
+    "NotificationOptionApplicationUpdateInstalled": "애플리케이션 업데이트가 설치됨",
+    "NotificationOptionAudioPlayback": "오디오 재생을 시작함",
+    "NotificationOptionAudioPlaybackStopped": "오디오 재생이 중지됨",
+    "NotificationOptionCameraImageUploaded": "카메라 이미지가 업로드됨",
+    "NotificationOptionInstallationFailed": "설치 실패",
+    "NotificationOptionNewLibraryContent": "새 콘텐트가 추가됨",
+    "NotificationOptionPluginError": "플러그인 실패",
+    "NotificationOptionPluginInstalled": "플러그인이 설치됨",
+    "NotificationOptionPluginUninstalled": "플러그인이 설치 제거됨",
+    "NotificationOptionPluginUpdateInstalled": "플러그인 업데이트가 설치됨",
+    "NotificationOptionServerRestartRequired": "서버를 다시 시작하십시오",
+    "NotificationOptionTaskFailed": "예약 작업 실패",
+    "NotificationOptionUserLockedOut": "사용자가 잠겼습니다",
+    "NotificationOptionVideoPlayback": "비디오 재생을 시작함",
+    "NotificationOptionVideoPlaybackStopped": "비디오 재생이 중지됨",
+    "Photos": "사진",
+    "Playlists": "재생목록",
+    "Plugin": "플러그인",
+    "PluginInstalledWithName": "{0} 설치됨",
+    "PluginUninstalledWithName": "{0} 설치 제거됨",
+    "PluginUpdatedWithName": "{0} 업데이트됨",
+    "ProviderValue": "제공자: {0}",
+    "ScheduledTaskFailedWithName": "{0} 실패",
+    "ScheduledTaskStartedWithName": "{0} 시작",
+    "ServerNameNeedsToBeRestarted": "{0} 를 재시작하십시오",
+    "Shows": "프로그램",
+    "Songs": "노래",
     "StartupEmbyServerIsLoading": "Jellyfin 서버를 불러오고 있습니다. 잠시후 다시시도 해주세요.",
     "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "Sync": "Sync",
-    "System": "System",
-    "TvShows": "TV Shows",
-    "User": "User",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserDeletedWithName": "User {0} has been deleted",
+    "SubtitleDownloadFailureFromForItem": "{0}에서 {1} 자막 다운로드에 실패했습니다",
+    "SubtitlesDownloadedForItem": "{0} 자막을 다운로드했습니다",
+    "Sync": "동기화",
+    "System": "시스템",
+    "TvShows": "TV 쇼",
+    "User": "사용자",
+    "UserCreatedWithName": "사용자 {0} 생성됨",
+    "UserDeletedWithName": "사용자 {0} 삭제됨",
     "UserDownloadingItemWithValues": "{0} is downloading {1}",
     "UserLockedOutWithName": "User {0} has been locked out",
     "UserOfflineFromDevice": "{0} has disconnected from {1}",
diff --git a/Emby.Server.Implementations/Localization/Core/pl.json b/Emby.Server.Implementations/Localization/Core/pl.json
index 92b12409d..e72f1a262 100644
--- a/Emby.Server.Implementations/Localization/Core/pl.json
+++ b/Emby.Server.Implementations/Localization/Core/pl.json
@@ -18,11 +18,11 @@
     "HeaderAlbumArtists": "Wykonawcy albumów",
     "HeaderCameraUploads": "Przekazane obrazy",
     "HeaderContinueWatching": "Kontynuuj odtwarzanie",
-    "HeaderFavoriteAlbums": "Albumy ulubione",
-    "HeaderFavoriteArtists": "Wykonawcy ulubieni",
-    "HeaderFavoriteEpisodes": "Odcinki ulubione",
-    "HeaderFavoriteShows": "Seriale ulubione",
-    "HeaderFavoriteSongs": "Utwory ulubione",
+    "HeaderFavoriteAlbums": "Ulubione albumy",
+    "HeaderFavoriteArtists": "Ulubieni wykonawcy",
+    "HeaderFavoriteEpisodes": "Ulubione odcinki",
+    "HeaderFavoriteShows": "Ulubione seriale",
+    "HeaderFavoriteSongs": "Ulubione utwory",
     "HeaderLiveTV": "Telewizja",
     "HeaderNextUp": "Do obejrzenia",
     "HeaderRecordingGroups": "Grupy nagrań",
@@ -41,26 +41,26 @@
     "Movies": "Filmy",
     "Music": "Muzyka",
     "MusicVideos": "Teledyski",
-    "NameInstallFailed": "Instalacja {0} nieudana.",
+    "NameInstallFailed": "Instalacja {0} nieudana",
     "NameSeasonNumber": "Sezon {0}",
-    "NameSeasonUnknown": "Sezon nieznany",
+    "NameSeasonUnknown": "Nieznany sezon",
     "NewVersionIsAvailable": "Nowa wersja serwera Jellyfin jest dostępna do pobrania.",
     "NotificationOptionApplicationUpdateAvailable": "Dostępna aktualizacja aplikacji",
-    "NotificationOptionApplicationUpdateInstalled": "Zainstalowano aktualizację aplikacji",
+    "NotificationOptionApplicationUpdateInstalled": "Zaktualizowano aplikację",
     "NotificationOptionAudioPlayback": "Rozpoczęto odtwarzanie muzyki",
     "NotificationOptionAudioPlaybackStopped": "Odtwarzane dźwięku zatrzymane",
-    "NotificationOptionCameraImageUploaded": "Przekazano obraz z urządzenia mobilnego",
-    "NotificationOptionInstallationFailed": "Niepowodzenie instalacji",
+    "NotificationOptionCameraImageUploaded": "Przekazano obraz z urządzenia przenośnego",
+    "NotificationOptionInstallationFailed": "Nieudana instalacja",
     "NotificationOptionNewLibraryContent": "Dodano nową zawartość",
     "NotificationOptionPluginError": "Awaria wtyczki",
     "NotificationOptionPluginInstalled": "Zainstalowano wtyczkę",
     "NotificationOptionPluginUninstalled": "Odinstalowano wtyczkę",
-    "NotificationOptionPluginUpdateInstalled": "Zainstalowano aktualizację wtyczki",
+    "NotificationOptionPluginUpdateInstalled": "Zaktualizowano wtyczkę",
     "NotificationOptionServerRestartRequired": "Wymagane ponowne uruchomienie serwera",
     "NotificationOptionTaskFailed": "Awaria zaplanowanego zadania",
     "NotificationOptionUserLockedOut": "Użytkownik zablokowany",
     "NotificationOptionVideoPlayback": "Rozpoczęto odtwarzanie wideo",
-    "NotificationOptionVideoPlaybackStopped": "Odtwarzanie wideo zatrzymane",
+    "NotificationOptionVideoPlaybackStopped": "Zatrzymano odtwarzanie wideo",
     "Photos": "Zdjęcia",
     "Playlists": "Listy odtwarzania",
     "Plugin": "Wtyczka",
@@ -73,7 +73,7 @@
     "ServerNameNeedsToBeRestarted": "{0} wymaga ponownego uruchomienia",
     "Shows": "Seriale",
     "Songs": "Utwory",
-    "StartupEmbyServerIsLoading": "Twa wczytywanie serwera Jellyfin. Spróbuj ponownie za chwilę.",
+    "StartupEmbyServerIsLoading": "Trwa wczytywanie serwera Jellyfin. Spróbuj ponownie za chwilę.",
     "SubtitleDownloadFailureForItem": "Pobieranie napisów dla {0} zakończone niepowodzeniem",
     "SubtitleDownloadFailureFromForItem": "Nieudane pobieranie napisów z {0} dla {1}",
     "SubtitlesDownloadedForItem": "Pobrano napisy dla {0}",
@@ -91,7 +91,7 @@
     "UserPolicyUpdatedWithName": "Zmieniono zasady użytkowania dla {0}",
     "UserStartedPlayingItemWithValues": "{0} odtwarza {1} na {2}",
     "UserStoppedPlayingItemWithValues": "{0} zakończył odtwarzanie {1} na {2}",
-    "ValueHasBeenAddedToLibrary": "{0} został dodany to biblioteki mediów",
+    "ValueHasBeenAddedToLibrary": "{0} został dodany do biblioteki mediów",
     "ValueSpecialEpisodeName": "Specjalne - {0}",
     "VersionNumber": "Wersja {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/pt-BR.json b/Emby.Server.Implementations/Localization/Core/pt-BR.json
index dbc9c4c4b..c4ce16dc8 100644
--- a/Emby.Server.Implementations/Localization/Core/pt-BR.json
+++ b/Emby.Server.Implementations/Localization/Core/pt-BR.json
@@ -5,7 +5,7 @@
     "Artists": "Artistas",
     "AuthenticationSucceededWithUserName": "{0} autenticado com sucesso",
     "Books": "Livros",
-    "CameraImageUploadedFrom": "Uma nova imagem da câmera foi submetida de {0}",
+    "CameraImageUploadedFrom": "Uma nova imagem da câmera foi enviada de {0}",
     "Channels": "Canais",
     "ChapterNameValue": "Capítulo {0}",
     "Collections": "Coletâneas",
@@ -32,19 +32,19 @@
     "ItemRemovedWithName": "{0} foi removido da biblioteca",
     "LabelIpAddressValue": "Endereço IP: {0}",
     "LabelRunningTimeValue": "Tempo de execução: {0}",
-    "Latest": "Recente",
-    "MessageApplicationUpdated": "O servidor Jellyfin foi atualizado",
-    "MessageApplicationUpdatedTo": "O Servidor Jellyfin foi atualizado para {0}",
+    "Latest": "Recentes",
+    "MessageApplicationUpdated": "Servidor Jellyfin atualizado",
+    "MessageApplicationUpdatedTo": "Servidor Jellyfin atualizado para {0}",
     "MessageNamedServerConfigurationUpdatedWithValue": "A seção {0} da configuração do servidor foi atualizada",
     "MessageServerConfigurationUpdated": "A configuração do servidor foi atualizada",
     "MixedContent": "Conteúdo misto",
     "Movies": "Filmes",
     "Music": "Música",
-    "MusicVideos": "Vídeos musicais",
+    "MusicVideos": "Clipes",
     "NameInstallFailed": "A instalação de {0} falhou",
     "NameSeasonNumber": "Temporada {0}",
     "NameSeasonUnknown": "Temporada Desconhecida",
-    "NewVersionIsAvailable": "Uma nova versão do servidor Jellyfin está disponível para download.",
+    "NewVersionIsAvailable": "Uma nova versão do Servidor Jellyfin está disponível para download.",
     "NotificationOptionApplicationUpdateAvailable": "Atualização de aplicativo disponível",
     "NotificationOptionApplicationUpdateInstalled": "Atualização de aplicativo instalada",
     "NotificationOptionAudioPlayback": "Reprodução de áudio iniciada",
@@ -79,7 +79,7 @@
     "SubtitlesDownloadedForItem": "Legendas baixadas para {0}",
     "Sync": "Sincronizar",
     "System": "Sistema",
-    "TvShows": "Séries de TV",
+    "TvShows": "Séries",
     "User": "Usuário",
     "UserCreatedWithName": "O usuário {0} foi criado",
     "UserDeletedWithName": "O usuário {0} foi excluído",
diff --git a/Emby.Server.Implementations/Localization/Core/pt-PT.json b/Emby.Server.Implementations/Localization/Core/pt-PT.json
index dc69d8af2..387604f03 100644
--- a/Emby.Server.Implementations/Localization/Core/pt-PT.json
+++ b/Emby.Server.Implementations/Localization/Core/pt-PT.json
@@ -1,97 +1,97 @@
 {
-    "Albums": "Albums",
-    "AppDeviceValues": "App: {0}, Device: {1}",
+    "Albums": "Álbuns",
+    "AppDeviceValues": "Aplicação {0}, Dispositivo:{1}",
     "Application": "Aplicação",
-    "Artists": "Artists",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "Books": "Books",
-    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
-    "Channels": "Channels",
-    "ChapterNameValue": "Chapter {0}",
-    "Collections": "Collections",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "DeviceOnlineWithName": "{0} is connected",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "Favorites": "Favorites",
-    "Folders": "Folders",
-    "Genres": "Genres",
-    "HeaderAlbumArtists": "Album Artists",
+    "Artists": "Artistas",
+    "AuthenticationSucceededWithUserName": "{0} autenticado com sucesso",
+    "Books": "Livros",
+    "CameraImageUploadedFrom": "Uma nova imagem proveniente de uma câmara foi enviada a partir de {0}",
+    "Channels": "Canais",
+    "ChapterNameValue": "Capítulo {0}",
+    "Collections": "Coleções",
+    "DeviceOfflineWithName": "{0} desligou-se",
+    "DeviceOnlineWithName": "{0} ligou-se",
+    "FailedLoginAttemptWithUserName": "Tentativa de login falhada a partir de {0}",
+    "Favorites": "Favoritos",
+    "Folders": "Pastas",
+    "Genres": "Géneros",
+    "HeaderAlbumArtists": "Artistas do Álbum",
     "HeaderCameraUploads": "Camera Uploads",
-    "HeaderContinueWatching": "Continuar a ver",
-    "HeaderFavoriteAlbums": "Favorite Albums",
-    "HeaderFavoriteArtists": "Favorite Artists",
-    "HeaderFavoriteEpisodes": "Favorite Episodes",
+    "HeaderContinueWatching": "Continuar a Ver",
+    "HeaderFavoriteAlbums": "Álbuns Favoritos",
+    "HeaderFavoriteArtists": "Artistas Favoritos",
+    "HeaderFavoriteEpisodes": "Episódios Favoritos",
     "HeaderFavoriteShows": "Séries Favoritas",
-    "HeaderFavoriteSongs": "Favorite Songs",
-    "HeaderLiveTV": "Live TV",
-    "HeaderNextUp": "Next Up",
-    "HeaderRecordingGroups": "Recording Groups",
+    "HeaderFavoriteSongs": "Músicas Favoritas",
+    "HeaderLiveTV": "TV em Direto",
+    "HeaderNextUp": "A Seguir",
+    "HeaderRecordingGroups": "Grupos de Gravação",
     "HomeVideos": "Home videos",
     "Inherit": "Inherit",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "Latest": "Latest",
-    "MessageApplicationUpdated": "Jellyfin Server has been updated",
-    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MixedContent": "Mixed content",
-    "Movies": "Movies",
-    "Music": "Music",
-    "MusicVideos": "Music videos",
-    "NameInstallFailed": "{0} installation failed",
-    "NameSeasonNumber": "Season {0}",
-    "NameSeasonUnknown": "Season Unknown",
-    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+    "ItemAddedWithName": "{0} foi adicionado à biblioteca",
+    "ItemRemovedWithName": "{0} foi removido da biblioteca",
+    "LabelIpAddressValue": "Endereço IP: {0}",
+    "LabelRunningTimeValue": "Duração: {0}",
+    "Latest": "Mais Recente",
+    "MessageApplicationUpdated": "O servidor Jellyfin foi atualizado",
+    "MessageApplicationUpdatedTo": "O servidor Jellyfin foi atualizado para a versão {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Configurações de servidor na secção {0} foram atualizadas",
+    "MessageServerConfigurationUpdated": "A configuração do servidor foi atualizada",
+    "MixedContent": "Conteúdo Misto",
+    "Movies": "Filmes",
+    "Music": "Música",
+    "MusicVideos": "Videoclips",
+    "NameInstallFailed": "{0} falha na instalação",
+    "NameSeasonNumber": "Temporada {0}",
+    "NameSeasonUnknown": "Temporada Desconhecida",
+    "NewVersionIsAvailable": "Está disponível para transferência uma nova versão do servidor Jellyfin.",
+    "NotificationOptionApplicationUpdateAvailable": "Atualização de aplicação disponível",
+    "NotificationOptionApplicationUpdateInstalled": "Atualização de aplicação instalada",
+    "NotificationOptionAudioPlayback": "Reprodução Iniciada",
+    "NotificationOptionAudioPlaybackStopped": "Reprodução Parada",
     "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "Photos": "Photos",
-    "Playlists": "Playlists",
-    "Plugin": "Plugin",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "PluginUpdatedWithName": "{0} was updated",
+    "NotificationOptionInstallationFailed": "Falha na instalação",
+    "NotificationOptionNewLibraryContent": "Novo conteúdo adicionado",
+    "NotificationOptionPluginError": "Falha na extensão",
+    "NotificationOptionPluginInstalled": "Extensão instalada",
+    "NotificationOptionPluginUninstalled": "Extensão desinstalada",
+    "NotificationOptionPluginUpdateInstalled": "Extensão atualizada",
+    "NotificationOptionServerRestartRequired": "Necessário reiniciar o servidor",
+    "NotificationOptionTaskFailed": "Falha em tarefa agendada",
+    "NotificationOptionUserLockedOut": "Utilizador bloqueado",
+    "NotificationOptionVideoPlayback": "Reprodução do vídeo iniciada",
+    "NotificationOptionVideoPlaybackStopped": "Reprodução do vídeo parada",
+    "Photos": "Fotografias",
+    "Playlists": "Listas de Reprodução",
+    "Plugin": "Extensão",
+    "PluginInstalledWithName": "{0} foi instalado",
+    "PluginUninstalledWithName": "{0} foi desinstalado",
+    "PluginUpdatedWithName": "{0} foi atualizado",
     "ProviderValue": "Provider: {0}",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
-    "Shows": "Shows",
-    "Songs": "Songs",
-    "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
+    "ScheduledTaskFailedWithName": "{0} falhou",
+    "ScheduledTaskStartedWithName": "{0} iniciou",
+    "ServerNameNeedsToBeRestarted": "{0} necessita de ser reiniciado",
+    "Shows": "Séries",
+    "Songs": "Músicas",
+    "StartupEmbyServerIsLoading": "O servidor Jellyfin está a iniciar. Tente novamente mais tarde.",
     "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "Sync": "Sync",
-    "System": "System",
-    "TvShows": "TV Shows",
-    "User": "User",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
-    "UserStartedPlayingItemWithValues": "{0} is playing {1} on {2}",
-    "UserStoppedPlayingItemWithValues": "{0} has finished playing {1} on {2}",
-    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
-    "ValueSpecialEpisodeName": "Especial -  {0}",
-    "VersionNumber": "Version {0}"
+    "SubtitleDownloadFailureFromForItem": "Falha na transferência de legendas a partir de {0} para {1}",
+    "SubtitlesDownloadedForItem": "Transferidas legendas para {0}",
+    "Sync": "Sincronização",
+    "System": "Sistema",
+    "TvShows": "Programas TV",
+    "User": "Utilizador",
+    "UserCreatedWithName": "Utilizador {0} criado",
+    "UserDeletedWithName": "Utilizador {0} apagado",
+    "UserDownloadingItemWithValues": "{0} está a transferir {1}",
+    "UserLockedOutWithName": "Utilizador {0} bloqueado",
+    "UserOfflineFromDevice": "{0} desligou-se a partir de {1}",
+    "UserOnlineFromDevice": "{0} ligou-se a partir de {1}",
+    "UserPasswordChangedWithName": "Palavra-passe alterada para o utilizador {0}",
+    "UserPolicyUpdatedWithName": "Política de utilizador alterada para {0}",
+    "UserStartedPlayingItemWithValues": "{0} está a reproduzir {1} em {2}",
+    "UserStoppedPlayingItemWithValues": "{0} terminou a reprodução de {1} em {2}",
+    "ValueHasBeenAddedToLibrary": "{0} foi adicionado à sua biblioteca multimédia",
+    "ValueSpecialEpisodeName": "Especial - {0}",
+    "VersionNumber": "Versão {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/sk.json b/Emby.Server.Implementations/Localization/Core/sk.json
index bc7e7184e..6eade7942 100644
--- a/Emby.Server.Implementations/Localization/Core/sk.json
+++ b/Emby.Server.Implementations/Localization/Core/sk.json
@@ -1,6 +1,6 @@
 {
     "Albums": "Albumy",
-    "AppDeviceValues": "Aplikácia: {0}, Zariadenie: {1}",
+    "AppDeviceValues": "Apka: {0}, Zariadenie: {1}",
     "Application": "Aplikácia",
     "Artists": "Umelci",
     "AuthenticationSucceededWithUserName": "{0} úspešne overený",
@@ -9,14 +9,14 @@
     "Channels": "Kanály",
     "ChapterNameValue": "Kapitola {0}",
     "Collections": "Zbierky",
-    "DeviceOfflineWithName": "{0} je odpojený",
+    "DeviceOfflineWithName": "{0} sa odpojil",
     "DeviceOnlineWithName": "{0} je pripojený",
     "FailedLoginAttemptWithUserName": "Neúspešný pokus o prihlásenie z {0}",
     "Favorites": "Obľúbené",
     "Folders": "Priečinky",
     "Genres": "Žánre",
     "HeaderAlbumArtists": "Album Artists",
-    "HeaderCameraUploads": "Camera Uploads",
+    "HeaderCameraUploads": "Nahrané fotografie",
     "HeaderContinueWatching": "Pokračujte v pozeraní",
     "HeaderFavoriteAlbums": "Obľúbené albumy",
     "HeaderFavoriteArtists": "Obľúbení umelci",
@@ -25,7 +25,7 @@
     "HeaderFavoriteSongs": "Obľúbené pesničky",
     "HeaderLiveTV": "Živá TV",
     "HeaderNextUp": "Nasleduje",
-    "HeaderRecordingGroups": "Recording Groups",
+    "HeaderRecordingGroups": "Skupiny nahrávok",
     "HomeVideos": "Domáce videá",
     "Inherit": "Zdediť",
     "ItemAddedWithName": "{0} bol pridaný do knižnice",
@@ -34,17 +34,17 @@
     "LabelRunningTimeValue": "Dĺžka: {0}",
     "Latest": "Najnovšie",
     "MessageApplicationUpdated": "Jellyfin Server bol aktualizovaný",
-    "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}",
+    "MessageApplicationUpdatedTo": "Jellyfin Server bol aktualizový na {0}",
     "MessageNamedServerConfigurationUpdatedWithValue": "Sekcia {0} konfigurácie servera bola aktualizovaná",
-    "MessageServerConfigurationUpdated": "Konfigurácia servera aktualizovaná",
+    "MessageServerConfigurationUpdated": "Konfigurácia servera bola aktualizovaná",
     "MixedContent": "Zmiešaný obsah",
     "Movies": "Filmy",
     "Music": "Hudba",
     "MusicVideos": "Hudobné videá",
-    "NameInstallFailed": "{0} installation failed",
+    "NameInstallFailed": "Inštalácia {0} zlyhala",
     "NameSeasonNumber": "Sezóna {0}",
     "NameSeasonUnknown": "Neznáma sezóna",
-    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NewVersionIsAvailable": "Nová verzia Jellyfin Server je dostupná na stiahnutie.",
     "NotificationOptionApplicationUpdateAvailable": "Je dostupná aktualizácia aplikácie",
     "NotificationOptionApplicationUpdateInstalled": "Aktualizácia aplikácie nainštalovaná",
     "NotificationOptionAudioPlayback": "Spustené prehrávanie audia",
@@ -70,16 +70,16 @@
     "ProviderValue": "Poskytovateľ: {0}",
     "ScheduledTaskFailedWithName": "{0} zlyhalo",
     "ScheduledTaskStartedWithName": "{0} started",
-    "ServerNameNeedsToBeRestarted": "{0} needs to be restarted",
+    "ServerNameNeedsToBeRestarted": "{0} vyžaduje reštart",
     "Shows": "Series",
     "Songs": "Skladby",
     "StartupEmbyServerIsLoading": "Jellyfin Server sa spúšťa. Skúste to prosím o chvíľu znova.",
     "SubtitleDownloadFailureForItem": "Sťahovanie titulkov pre {0} zlyhalo",
-    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitleDownloadFailureFromForItem": "Sťahovanie titulkov z {0} pre {1} zlyhalo",
     "SubtitlesDownloadedForItem": "Titulky pre {0} stiahnuté",
-    "Sync": "Sync",
+    "Sync": "Synchronizácia",
     "System": "Systém",
-    "TvShows": "TV Shows",
+    "TvShows": "TV seriály",
     "User": "Používateľ",
     "UserCreatedWithName": "Používateľ {0} bol vytvorený",
     "UserDeletedWithName": "Používateľ {0} bol vymazaný",
@@ -91,7 +91,7 @@
     "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
     "UserStartedPlayingItemWithValues": "{0} spustil prehrávanie {1}",
     "UserStoppedPlayingItemWithValues": "{0} zastavil prehrávanie {1}",
-    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueHasBeenAddedToLibrary": "{0} bolo pridané do vašej knižnice médií",
     "ValueSpecialEpisodeName": "Špeciál - {0}",
     "VersionNumber": "Verzia {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/zh-CN.json b/Emby.Server.Implementations/Localization/Core/zh-CN.json
index 6f7d362d3..63aa6a557 100644
--- a/Emby.Server.Implementations/Localization/Core/zh-CN.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-CN.json
@@ -5,7 +5,7 @@
     "Artists": "艺术家",
     "AuthenticationSucceededWithUserName": "{0} 成功验证",
     "Books": "书籍",
-    "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}",
+    "CameraImageUploadedFrom": "已从 {0} 上传了一张新的相机图像",
     "Channels": "频道",
     "ChapterNameValue": "章节 {0}",
     "Collections": "合集",
@@ -44,7 +44,7 @@
     "NameInstallFailed": "{0} 安装失败",
     "NameSeasonNumber": "季 {0}",
     "NameSeasonUnknown": "未知季",
-    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
+    "NewVersionIsAvailable": "Jellyfin Server 有新版本可以下载。",
     "NotificationOptionApplicationUpdateAvailable": "有可用的应用程序更新",
     "NotificationOptionApplicationUpdateInstalled": "应用程序更新已安装",
     "NotificationOptionAudioPlayback": "音频开始播放",
@@ -75,7 +75,7 @@
     "Songs": "歌曲",
     "StartupEmbyServerIsLoading": "Jellyfin 服务器加载中。请稍后再试。",
     "SubtitleDownloadFailureForItem": "为 {0} 下载字幕失败",
-    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}",
+    "SubtitleDownloadFailureFromForItem": "无法从 {0} 下载 {1} 的字幕",
     "SubtitlesDownloadedForItem": "已为 {0} 下载了字幕",
     "Sync": "同步",
     "System": "系统",
@@ -91,7 +91,7 @@
     "UserPolicyUpdatedWithName": "用户协议已经被更新为 {0}",
     "UserStartedPlayingItemWithValues": "{0} 已开始播放 {1}",
     "UserStoppedPlayingItemWithValues": "{0} 已停止播放 {1}",
-    "ValueHasBeenAddedToLibrary": "{0} has been added to your media library",
+    "ValueHasBeenAddedToLibrary": "{0} 已添加至您的媒体库中",
     "ValueSpecialEpisodeName": "特典 - {0}",
     "VersionNumber": "版本 {0}"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/zh-TW.json b/Emby.Server.Implementations/Localization/Core/zh-TW.json
index effff5566..293fc28a8 100644
--- a/Emby.Server.Implementations/Localization/Core/zh-TW.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-TW.json
@@ -89,5 +89,8 @@
     "UserStoppedPlayingItemWithValues": "{0} 已停止在 {2} 播放 {1}",
     "ValueHasBeenAddedToLibrary": "{0} 已新增至您的媒體庫",
     "ValueSpecialEpisodeName": "特典 - {0}",
-    "VersionNumber": "版本 {0}"
+    "VersionNumber": "版本 {0}",
+    "HeaderRecordingGroups": "錄製組",
+    "Inherit": "繼承",
+    "SubtitleDownloadFailureFromForItem": "無法為 {1} 從 {0} 下載字幕"
 }
diff --git a/Emby.Server.Implementations/Localization/LocalizationManager.cs b/Emby.Server.Implementations/Localization/LocalizationManager.cs
index 8c49b6405..13cdc50ca 100644
--- a/Emby.Server.Implementations/Localization/LocalizationManager.cs
+++ b/Emby.Server.Implementations/Localization/LocalizationManager.cs
@@ -17,43 +17,49 @@ using Microsoft.Extensions.Logging;
 namespace Emby.Server.Implementations.Localization
 {
     /// <summary>
-    /// Class LocalizationManager
+    /// Class LocalizationManager.
     /// </summary>
     public class LocalizationManager : ILocalizationManager
     {
-        /// <summary>
-        /// The _configuration manager
-        /// </summary>
-        private readonly IServerConfigurationManager _configurationManager;
+        private const string DefaultCulture = "en-US";
+        private static readonly Assembly _assembly = typeof(LocalizationManager).Assembly;
+        private static readonly string[] _unratedValues = { "n/a", "unrated", "not rated" };
 
         /// <summary>
-        /// The us culture
+        /// The _configuration manager.
         /// </summary>
-        private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
+        private readonly IServerConfigurationManager _configurationManager;
+        private readonly IJsonSerializer _jsonSerializer;
+        private readonly ILogger _logger;
 
         private readonly Dictionary<string, Dictionary<string, ParentalRating>> _allParentalRatings =
             new Dictionary<string, Dictionary<string, ParentalRating>>(StringComparer.OrdinalIgnoreCase);
 
-        private readonly IJsonSerializer _jsonSerializer;
-        private readonly ILogger _logger;
-        private static readonly Assembly _assembly = typeof(LocalizationManager).Assembly;
+        private readonly ConcurrentDictionary<string, Dictionary<string, string>> _dictionaries =
+            new ConcurrentDictionary<string, Dictionary<string, string>>(StringComparer.OrdinalIgnoreCase);
+
+        private List<CultureDto> _cultures;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="LocalizationManager" /> class.
         /// </summary>
         /// <param name="configurationManager">The configuration manager.</param>
         /// <param name="jsonSerializer">The json serializer.</param>
-        /// <param name="loggerFactory">The logger factory</param>
+        /// <param name="logger">The logger.</param>
         public LocalizationManager(
             IServerConfigurationManager configurationManager,
             IJsonSerializer jsonSerializer,
-            ILoggerFactory loggerFactory)
+            ILogger<LocalizationManager> logger)
         {
             _configurationManager = configurationManager;
             _jsonSerializer = jsonSerializer;
-            _logger = loggerFactory.CreateLogger(nameof(LocalizationManager));
+            _logger = logger;
         }
 
+        /// <summary>
+        /// Loads all resources into memory.
+        /// </summary>
+        /// <returns><see cref="Task" />.</returns>
         public async Task LoadAll()
         {
             const string RatingsResource = "Emby.Server.Implementations.Localization.Ratings.";
@@ -82,9 +88,10 @@ namespace Emby.Server.Implementations.Localization
 
                         string[] parts = line.Split(',');
                         if (parts.Length == 2
-                            && int.TryParse(parts[1], NumberStyles.Integer, UsCulture, out var value))
+                            && int.TryParse(parts[1], NumberStyles.Integer, CultureInfo.InvariantCulture, out var value))
                         {
-                            dict.Add(parts[0], new ParentalRating { Name = parts[0], Value = value });
+                            var name = parts[0];
+                            dict.Add(name, new ParentalRating(name, value));
                         }
 #if DEBUG
                         else
@@ -101,16 +108,11 @@ namespace Emby.Server.Implementations.Localization
             await LoadCultures().ConfigureAwait(false);
         }
 
-        public string NormalizeFormKD(string text)
-            => text.Normalize(NormalizationForm.FormKD);
-
-        private CultureDto[] _cultures;
-
         /// <summary>
         /// Gets the cultures.
         /// </summary>
-        /// <returns>IEnumerable{CultureDto}.</returns>
-        public CultureDto[] GetCultures()
+        /// <returns><see cref="IEnumerable{CultureDto}" />.</returns>
+        public IEnumerable<CultureDto> GetCultures()
             => _cultures;
 
         private async Task LoadCultures()
@@ -168,9 +170,10 @@ namespace Emby.Server.Implementations.Localization
                 }
             }
 
-            _cultures = list.ToArray();
+            _cultures = list;
         }
 
+        /// <inheritdoc />
         public CultureDto FindLanguageInfo(string language)
             => GetCultures()
                 .FirstOrDefault(i =>
@@ -179,25 +182,19 @@ namespace Emby.Server.Implementations.Localization
                     || i.ThreeLetterISOLanguageNames.Contains(language, StringComparer.OrdinalIgnoreCase)
                     || string.Equals(i.TwoLetterISOLanguageName, language, StringComparison.OrdinalIgnoreCase));
 
-        /// <summary>
-        /// Gets the countries.
-        /// </summary>
-        /// <returns>IEnumerable{CountryInfo}.</returns>
-        public Task<CountryInfo[]> GetCountries()
-            => _jsonSerializer.DeserializeFromStreamAsync<CountryInfo[]>(
+        /// <inheritdoc />
+        public IEnumerable<CountryInfo> GetCountries()
+            => _jsonSerializer.DeserializeFromStream<IEnumerable<CountryInfo>>(
                     _assembly.GetManifestResourceStream("Emby.Server.Implementations.Localization.countries.json"));
 
-        /// <summary>
-        /// Gets the parental ratings.
-        /// </summary>
-        /// <returns>IEnumerable{ParentalRating}.</returns>
+        /// <inheritdoc />
         public IEnumerable<ParentalRating> GetParentalRatings()
             => GetParentalRatingsDictionary().Values;
 
         /// <summary>
         /// Gets the parental ratings dictionary.
         /// </summary>
-        /// <returns>Dictionary{System.StringParentalRating}.</returns>
+        /// <returns><see cref="Dictionary{String, ParentalRating}" />.</returns>
         private Dictionary<string, ParentalRating> GetParentalRatingsDictionary()
         {
             var countryCode = _configurationManager.Configuration.MetadataCountryCode;
@@ -207,14 +204,14 @@ namespace Emby.Server.Implementations.Localization
                 countryCode = "us";
             }
 
-           return GetRatings(countryCode) ?? GetRatings("us");
+            return GetRatings(countryCode) ?? GetRatings("us");
         }
 
         /// <summary>
         /// Gets the ratings.
         /// </summary>
         /// <param name="countryCode">The country code.</param>
-        /// <returns>The ratings</returns>
+        /// <returns>The ratings.</returns>
         private Dictionary<string, ParentalRating> GetRatings(string countryCode)
         {
             _allParentalRatings.TryGetValue(countryCode, out var value);
@@ -222,14 +219,7 @@ namespace Emby.Server.Implementations.Localization
             return value;
         }
 
-        private static readonly string[] _unratedValues = { "n/a", "unrated", "not rated" };
-
         /// <inheritdoc />
-        /// <summary>
-        /// Gets the rating level.
-        /// </summary>
-        /// <param name="rating">Rating field</param>
-        /// <returns>The rating level</returns>&gt;
         public int? GetRatingLevel(string rating)
         {
             if (string.IsNullOrEmpty(rating))
@@ -277,6 +267,7 @@ namespace Emby.Server.Implementations.Localization
             return null;
         }
 
+        /// <inheritdoc />
         public bool HasUnicodeCategory(string value, UnicodeCategory category)
         {
             foreach (var chr in value)
@@ -290,11 +281,13 @@ namespace Emby.Server.Implementations.Localization
             return false;
         }
 
+        /// <inheritdoc />
         public string GetLocalizedString(string phrase)
         {
             return GetLocalizedString(phrase, _configurationManager.Configuration.UICulture);
         }
 
+        /// <inheritdoc />
         public string GetLocalizedString(string phrase, string culture)
         {
             if (string.IsNullOrEmpty(culture))
@@ -317,12 +310,7 @@ namespace Emby.Server.Implementations.Localization
             return phrase;
         }
 
-        private const string DefaultCulture = "en-US";
-
-        private readonly ConcurrentDictionary<string, Dictionary<string, string>> _dictionaries =
-            new ConcurrentDictionary<string, Dictionary<string, string>>(StringComparer.OrdinalIgnoreCase);
-
-        public Dictionary<string, string> GetLocalizationDictionary(string culture)
+        private Dictionary<string, string> GetLocalizationDictionary(string culture)
         {
             if (string.IsNullOrEmpty(culture))
             {
@@ -332,8 +320,9 @@ namespace Emby.Server.Implementations.Localization
             const string prefix = "Core";
             var key = prefix + culture;
 
-            return _dictionaries.GetOrAdd(key,
-                    f => GetDictionary(prefix, culture, DefaultCulture + ".json").GetAwaiter().GetResult());
+            return _dictionaries.GetOrAdd(
+                key,
+                f => GetDictionary(prefix, culture, DefaultCulture + ".json").GetAwaiter().GetResult());
         }
 
         private async Task<Dictionary<string, string>> GetDictionary(string prefix, string culture, string baseFilename)
@@ -390,45 +379,45 @@ namespace Emby.Server.Implementations.Localization
             return culture + ".json";
         }
 
-        public LocalizationOption[] GetLocalizationOptions()
-            => new LocalizationOption[]
-            {
-                new LocalizationOption("Arabic", "ar"),
-                new LocalizationOption("Bulgarian (Bulgaria)", "bg-BG"),
-                new LocalizationOption("Catalan", "ca"),
-                new LocalizationOption("Chinese Simplified", "zh-CN"),
-                new LocalizationOption("Chinese Traditional", "zh-TW"),
-                new LocalizationOption("Croatian", "hr"),
-                new LocalizationOption("Czech", "cs"),
-                new LocalizationOption("Danish", "da"),
-                new LocalizationOption("Dutch", "nl"),
-                new LocalizationOption("English (United Kingdom)", "en-GB"),
-                new LocalizationOption("English (United States)", "en-US"),
-                new LocalizationOption("French", "fr"),
-                new LocalizationOption("French (Canada)", "fr-CA"),
-                new LocalizationOption("German", "de"),
-                new LocalizationOption("Greek", "el"),
-                new LocalizationOption("Hebrew", "he"),
-                new LocalizationOption("Hungarian", "hu"),
-                new LocalizationOption("Italian", "it"),
-                new LocalizationOption("Kazakh", "kk"),
-                new LocalizationOption("Korean", "ko"),
-                new LocalizationOption("Lithuanian", "lt-LT"),
-                new LocalizationOption("Malay", "ms"),
-                new LocalizationOption("Norwegian Bokmål", "nb"),
-                new LocalizationOption("Persian", "fa"),
-                new LocalizationOption("Polish", "pl"),
-                new LocalizationOption("Portuguese (Brazil)", "pt-BR"),
-                new LocalizationOption("Portuguese (Portugal)", "pt-PT"),
-                new LocalizationOption("Russian", "ru"),
-                new LocalizationOption("Slovak", "sk"),
-                new LocalizationOption("Slovenian (Slovenia)", "sl-SI"),
-                new LocalizationOption("Spanish", "es"),
-                new LocalizationOption("Spanish (Argentina)", "es-AR"),
-                new LocalizationOption("Spanish (Mexico)", "es-MX"),
-                new LocalizationOption("Swedish", "sv"),
-                new LocalizationOption("Swiss German", "gsw"),
-                new LocalizationOption("Turkish", "tr")
-            };
+        /// <inheritdoc />
+        public IEnumerable<LocalizationOption> GetLocalizationOptions()
+        {
+            yield return new LocalizationOption("Arabic", "ar");
+            yield return new LocalizationOption("Bulgarian (Bulgaria)", "bg-BG");
+            yield return new LocalizationOption("Catalan", "ca");
+            yield return new LocalizationOption("Chinese Simplified", "zh-CN");
+            yield return new LocalizationOption("Chinese Traditional", "zh-TW");
+            yield return new LocalizationOption("Croatian", "hr");
+            yield return new LocalizationOption("Czech", "cs");
+            yield return new LocalizationOption("Danish", "da");
+            yield return new LocalizationOption("Dutch", "nl");
+            yield return new LocalizationOption("English (United Kingdom)", "en-GB");
+            yield return new LocalizationOption("English (United States)", "en-US");
+            yield return new LocalizationOption("French", "fr");
+            yield return new LocalizationOption("French (Canada)", "fr-CA");
+            yield return new LocalizationOption("German", "de");
+            yield return new LocalizationOption("Greek", "el");
+            yield return new LocalizationOption("Hebrew", "he");
+            yield return new LocalizationOption("Hungarian", "hu");
+            yield return new LocalizationOption("Italian", "it");
+            yield return new LocalizationOption("Kazakh", "kk");
+            yield return new LocalizationOption("Korean", "ko");
+            yield return new LocalizationOption("Lithuanian", "lt-LT");
+            yield return new LocalizationOption("Malay", "ms");
+            yield return new LocalizationOption("Norwegian Bokmål", "nb");
+            yield return new LocalizationOption("Persian", "fa");
+            yield return new LocalizationOption("Polish", "pl");
+            yield return new LocalizationOption("Portuguese (Brazil)", "pt-BR");
+            yield return new LocalizationOption("Portuguese (Portugal)", "pt-PT");
+            yield return new LocalizationOption("Russian", "ru");
+            yield return new LocalizationOption("Slovak", "sk");
+            yield return new LocalizationOption("Slovenian (Slovenia)", "sl-SI");
+            yield return new LocalizationOption("Spanish", "es");
+            yield return new LocalizationOption("Spanish (Argentina)", "es-AR");
+            yield return new LocalizationOption("Spanish (Mexico)", "es-MX");
+            yield return new LocalizationOption("Swedish", "sv");
+            yield return new LocalizationOption("Swiss German", "gsw");
+            yield return new LocalizationOption("Turkish", "tr");
+        }
     }
 }