Merge branch 'master' into using-declarations

11 files changed, 70 insertions, 22 deletions

diff --git a/Emby.Server.Implementations/Localization/Core/af.json b/Emby.Server.Implementations/Localization/Core/af.json
index 977a1c2d7..b029b7042 100644
--- a/Emby.Server.Implementations/Localization/Core/af.json
+++ b/Emby.Server.Implementations/Localization/Core/af.json
@@ -112,5 +112,8 @@
     "TaskRefreshLibraryDescription": "Skandeer u media versameling vir nuwe lêers en verfris metadata.",
     "TaskRefreshLibrary": "Skandeer Media Versameling",
     "TaskRefreshChapterImagesDescription": "Maak kleinkiekeis (fotos) vir films wat hoofstukke het.",
-    "TaskRefreshChapterImages": "Verkry Hoofstuk Beelde"
+    "TaskRefreshChapterImages": "Verkry Hoofstuk Beelde",
+    "Undefined": "Ongedefineerd",
+    "Forced": "Geforseer",
+    "Default": "Oorspronklik"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/da.json b/Emby.Server.Implementations/Localization/Core/da.json
index 4ee4eb989..051d6d009 100644
--- a/Emby.Server.Implementations/Localization/Core/da.json
+++ b/Emby.Server.Implementations/Localization/Core/da.json
@@ -1,5 +1,5 @@
 {
-    "Albums": "Albums",
+    "Albums": "Albummer",
     "AppDeviceValues": "App: {0}, Enhed: {1}",
     "Application": "Applikation",
     "Artists": "Kunstnere",
diff --git a/Emby.Server.Implementations/Localization/Core/eo.json b/Emby.Server.Implementations/Localization/Core/eo.json
index 3ff7eddae..ca615cc8c 100644
--- a/Emby.Server.Implementations/Localization/Core/eo.json
+++ b/Emby.Server.Implementations/Localization/Core/eo.json
@@ -22,5 +22,26 @@
     "Artists": "Artistoj",
     "Application": "Aplikaĵo",
     "AppDeviceValues": "Aplikaĵo: {0}, Aparato: {1}",
-    "Albums": "Albumoj"
+    "Albums": "Albumoj",
+    "TasksLibraryCategory": "Libraro",
+    "VersionNumber": "Versio {0}",
+    "UserDownloadingItemWithValues": "{0} elŝutas {1}",
+    "UserCreatedWithName": "Uzanto {0} kreiĝis",
+    "User": "Uzanto",
+    "System": "Sistemo",
+    "Songs": "Kantoj",
+    "ScheduledTaskStartedWithName": "{0} komencis",
+    "ScheduledTaskFailedWithName": "{0} malsukcesis",
+    "PluginUninstalledWithName": "{0} malinstaliĝis",
+    "PluginInstalledWithName": "{0} instaliĝis",
+    "Plugin": "Kromprogramo",
+    "Playlists": "Ludlistoj",
+    "Photos": "Fotoj",
+    "NotificationOptionPluginUninstalled": "Kromprogramo malinstaliĝis",
+    "NotificationOptionNewLibraryContent": "Nova enhavo aldoniĝis",
+    "NotificationOptionPluginInstalled": "Kromprogramo instaliĝis",
+    "MusicVideos": "Muzikvideoj",
+    "LabelIpAddressValue": "IP-adreso: {0}",
+    "Genres": "Ĝenroj",
+    "DeviceOfflineWithName": "{0} malkonektis"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/gl.json b/Emby.Server.Implementations/Localization/Core/gl.json
index 12bcd793e..11139d32a 100644
--- a/Emby.Server.Implementations/Localization/Core/gl.json
+++ b/Emby.Server.Implementations/Localization/Core/gl.json
@@ -57,5 +57,27 @@
     "DeviceOnlineWithName": "{0} conectouse",
     "DeviceOfflineWithName": "{0} desconectouse",
     "Default": "Por defecto",
-    "AppDeviceValues": "Aplicación: {0}, Dispositivo: {1}"
+    "AppDeviceValues": "Aplicación: {0}, Dispositivo: {1}",
+    "TaskCleanLogs": "Limpar Carpeta de Rexistros",
+    "TaskCleanActivityLog": "Limpar Rexistro de Actividade",
+    "TasksChannelsCategory": "Canáis de Internet",
+    "TaskUpdatePlugins": "Actualizar Plugins",
+    "User": "Usuario",
+    "Undefined": "Sen definir",
+    "TvShows": "Programas de TV",
+    "System": "Sistema",
+    "Sync": "Sincronizar",
+    "SubtitleDownloadFailureFromForItem": "Fallou a descarga de subtítulos para {1} dende {0}",
+    "StartupEmbyServerIsLoading": "O Servidor Jellyfin está cargando. Por favor, reinténteo en breve.",
+    "Songs": "Cancións",
+    "Shows": "Programas",
+    "ServerNameNeedsToBeRestarted": "{0} precisa ser reiniciado",
+    "ScheduledTaskStartedWithName": "{0} comezou",
+    "ScheduledTaskFailedWithName": "{0} fallou",
+    "ProviderValue": "Provedor: {0}",
+    "PluginUpdatedWithName": "{0} foi actualizado",
+    "PluginUninstalledWithName": "{0} foi desinstalado",
+    "PluginInstalledWithName": "{0} foi instalado",
+    "Playlists": "Listas de reproducción",
+    "Photos": "Fotos"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/hu.json b/Emby.Server.Implementations/Localization/Core/hu.json
index e5707e78c..ef8070503 100644
--- a/Emby.Server.Implementations/Localization/Core/hu.json
+++ b/Emby.Server.Implementations/Localization/Core/hu.json
@@ -49,7 +49,7 @@
     "NotificationOptionAudioPlayback": "Audió lejátszás elkezdve",
     "NotificationOptionAudioPlaybackStopped": "Audió lejátszás leállítva",
     "NotificationOptionCameraImageUploaded": "Kamera kép feltöltve",
-    "NotificationOptionInstallationFailed": "Telepítési hiba",
+    "NotificationOptionInstallationFailed": "Telepítés sikertelen",
     "NotificationOptionNewLibraryContent": "Új tartalom hozzáadva",
     "NotificationOptionPluginError": "Bővítmény hiba",
     "NotificationOptionPluginInstalled": "Bővítmény telepítve",
diff --git a/Emby.Server.Implementations/Localization/Core/kk.json b/Emby.Server.Implementations/Localization/Core/kk.json
index a321e35d0..829a29ad4 100644
--- a/Emby.Server.Implementations/Localization/Core/kk.json
+++ b/Emby.Server.Implementations/Localization/Core/kk.json
@@ -109,14 +109,14 @@
     "TasksMaintenanceCategory": "Qyzmet körsetu",
     "Undefined": "Anyqtalmağan",
     "Forced": "Mäjbürlı",
-    "TaskDownloadMissingSubtitlesDescription": "Metaderekter teŋşelımderı negızınde joq subtitrlerdı Internetten ızdeidı.",
+    "TaskDownloadMissingSubtitlesDescription": "Metaderekter teŋşelımderı negızınde joq subtitrlerdı İnternetten ızdeidı.",
     "TaskRefreshChannelsDescription": "Internet-arnalar mälımetterın jaŋğyrtady.",
     "TaskCleanTranscodeDescription": "Bіr künnen asqan qaita kodtau faildaryn joiady.",
     "TaskUpdatePluginsDescription": "Avtomatty türde jaŋartuğa teŋşelgen plaginder üşın jaŋartulardy jüktep alady jäne ornatady.",
     "TaskRefreshPeopleDescription": "Tasyğyşhanadağy aktörler men rejisörler metaderekterın jaŋartady.",
     "TaskCleanLogsDescription": "{0} künnen asqan jūrnal faildaryn joiady.",
     "TaskRefreshLibraryDescription": "Tasyğyşhanadağy jaŋa faildardy skanerleidі jäne metaderekterdı jaŋğyrtady.",
-    "TaskRefreshChapterImagesDescription": "Sahnalary bar beineler üşіn nobailar jasaidy.",
+    "TaskRefreshChapterImagesDescription": "Sahnalary bar beineler üşın nobailar jasaidy.",
     "TaskCleanCacheDescription": "Jüiede qajet emes keştelgen faildardy joiady.",
     "TaskCleanActivityLogDescription": "Äreket jūrnalyndağy teŋşelgen jasynan asqan jazbalary joiady."
 }
diff --git a/Emby.Server.Implementations/Localization/Core/lt-LT.json b/Emby.Server.Implementations/Localization/Core/lt-LT.json
index d4cb592ef..9920ef4d5 100644
--- a/Emby.Server.Implementations/Localization/Core/lt-LT.json
+++ b/Emby.Server.Implementations/Localization/Core/lt-LT.json
@@ -113,5 +113,9 @@
     "TasksChannelsCategory": "Internetiniai Kanalai",
     "TasksApplicationCategory": "Programa",
     "TasksLibraryCategory": "Mediateka",
-    "TasksMaintenanceCategory": "Priežiūra"
+    "TasksMaintenanceCategory": "Priežiūra",
+    "TaskCleanActivityLog": "Švarus veiklos žurnalas",
+    "Undefined": "Neapibrėžtas",
+    "Forced": "Priverstas",
+    "Default": "Numatytas"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/pt-BR.json b/Emby.Server.Implementations/Localization/Core/pt-BR.json
index 5ec8f1e88..323dcced0 100644
--- a/Emby.Server.Implementations/Localization/Core/pt-BR.json
+++ b/Emby.Server.Implementations/Localization/Core/pt-BR.json
@@ -16,7 +16,7 @@
     "Folders": "Pastas",
     "Genres": "Gêneros",
     "HeaderAlbumArtists": "Artistas do Álbum",
-    "HeaderContinueWatching": "Continuar Assistindo",
+    "HeaderContinueWatching": "Continuar assistindo",
     "HeaderFavoriteAlbums": "Álbuns Favoritos",
     "HeaderFavoriteArtists": "Artistas favoritos",
     "HeaderFavoriteEpisodes": "Episódios favoritos",
diff --git a/Emby.Server.Implementations/Localization/Core/sv.json b/Emby.Server.Implementations/Localization/Core/sv.json
index 345d41e9e..b5a7fa5b8 100644
--- a/Emby.Server.Implementations/Localization/Core/sv.json
+++ b/Emby.Server.Implementations/Localization/Core/sv.json
@@ -117,5 +117,6 @@
     "TaskCleanActivityLogDescription": "Radera aktivitets logg inlägg som är äldre än definerad ålder.",
     "TaskCleanActivityLog": "Rensa Aktivitets Logg",
     "Undefined": "odefinierad",
-    "Forced": "Tvingad"
+    "Forced": "Tvingad",
+    "Default": "Standard"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/th.json b/Emby.Server.Implementations/Localization/Core/th.json
index 71dd2c7a3..5bf58baf8 100644
--- a/Emby.Server.Implementations/Localization/Core/th.json
+++ b/Emby.Server.Implementations/Localization/Core/th.json
@@ -50,7 +50,7 @@
     "HeaderFavoriteArtists": "ศิลปินที่ชื่นชอบ",
     "HeaderFavoriteAlbums": "อัมบั้มที่ชื่นชอบ",
     "HeaderContinueWatching": "ดูต่อ",
-    "HeaderAlbumArtists": "อัลบั้มศิลปิน",
+    "HeaderAlbumArtists": "ศิลปินอัลบั้ม",
     "Genres": "ประเภท",
     "Folders": "โฟลเดอร์",
     "Favorites": "รายการโปรด",
@@ -112,5 +112,6 @@
     "System": "ระบบ",
     "Sync": "ซิงค์",
     "SubtitleDownloadFailureFromForItem": "ไม่สามารถดาวน์โหลดคำบรรยายจาก {0} สำหรับ {1} ได้",
-    "StartupEmbyServerIsLoading": "กำลังโหลดเซิร์ฟเวอร์ Jellyfin โปรดลองอีกครั้งในอีกสักครู่"
+    "StartupEmbyServerIsLoading": "กำลังโหลดเซิร์ฟเวอร์ Jellyfin โปรดลองอีกครั้งในอีกสักครู่",
+    "Default": "ค่าเริ่มต้น"
 }
diff --git a/Emby.Server.Implementations/Localization/LocalizationManager.cs b/Emby.Server.Implementations/Localization/LocalizationManager.cs
index 3f9e22106..220e423bf 100644
--- a/Emby.Server.Implementations/Localization/LocalizationManager.cs
+++ b/Emby.Server.Implementations/Localization/LocalizationManager.cs
@@ -7,11 +7,11 @@ using System.Linq;
 using System.Reflection;
 using System.Text.Json;
 using System.Threading.Tasks;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Json;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.Serialization;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.Localization
@@ -36,7 +36,7 @@ namespace Emby.Server.Implementations.Localization
 
         private List<CultureDto> _cultures;
 
-        private readonly JsonSerializerOptions _jsonOptions = JsonDefaults.GetOptions();
+        private readonly JsonSerializerOptions _jsonOptions = JsonDefaults.Options;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="LocalizationManager" /> class.
@@ -73,8 +73,7 @@ namespace Emby.Server.Implementations.Localization
                 using (var str = _assembly.GetManifestResourceStream(resource))
                 using (var reader = new StreamReader(str))
                 {
-                    string line;
-                    while ((line = await reader.ReadLineAsync().ConfigureAwait(false)) != null)
+                    await foreach (var line in reader.ReadAllLinesAsync().ConfigureAwait(false))
                     {
                         if (string.IsNullOrWhiteSpace(line))
                         {
@@ -119,10 +118,8 @@ namespace Emby.Server.Implementations.Localization
             using (var stream = _assembly.GetManifestResourceStream(ResourcePath))
             using (var reader = new StreamReader(stream))
             {
-                while (!reader.EndOfStream)
+                await foreach (var line in reader.ReadAllLinesAsync().ConfigureAwait(false))
                 {
-                    var line = await reader.ReadLineAsync().ConfigureAwait(false);
-
                     if (string.IsNullOrWhiteSpace(line))
                     {
                         continue;
@@ -180,7 +177,7 @@ namespace Emby.Server.Implementations.Localization
         /// <inheritdoc />
         public IEnumerable<CountryInfo> GetCountries()
         {
-            StreamReader reader = new StreamReader(_assembly.GetManifestResourceStream("Emby.Server.Implementations.Localization.countries.json"));
+            using StreamReader reader = new StreamReader(_assembly.GetManifestResourceStream("Emby.Server.Implementations.Localization.countries.json"));
 
             return JsonSerializer.Deserialize<IEnumerable<CountryInfo>>(reader.ReadToEnd(), _jsonOptions);
         }
@@ -316,10 +313,9 @@ namespace Emby.Server.Implementations.Localization
             }
 
             const string Prefix = "Core";
-            var key = Prefix + culture;
 
             return _dictionaries.GetOrAdd(
-                key,
+                culture,
                 f => GetDictionary(Prefix, culture, DefaultCulture + ".json").GetAwaiter().GetResult());
         }