Merge pull request #2959 from MediaBrowser/dev

Dev

2 files changed, 14 insertions, 3 deletions

diff --git a/Emby.Server.Implementations/Localization/Core/ru.json b/Emby.Server.Implementations/Localization/Core/ru.json
index a921349a3..d9cd74273 100644
--- a/Emby.Server.Implementations/Localization/Core/ru.json
+++ b/Emby.Server.Implementations/Localization/Core/ru.json
@@ -54,7 +54,7 @@
     "UserDeletedWithName": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c {0} \u0431\u044b\u043b \u0443\u0434\u0430\u043b\u0451\u043d",
     "UserConfigurationUpdatedWithName": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043f\u043e\u043b\u044c\u0437-\u043b\u044f {0} \u0431\u044b\u043b\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430",
     "MessageServerConfigurationUpdated": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0431\u044b\u043b\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430",
-    "MessageNamedServerConfigurationUpdatedWithValue": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 (\u0440\u0430\u0437\u0434\u0435\u043b {0}) \u0431\u044b\u043b\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430",
+    "MessageNamedServerConfigurationUpdatedWithValue": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u0441\u0435\u0440\u0432\u0435\u0440\u0430 (\u0440\u0430\u0437\u0434\u0435\u043b {0}) \u0431\u044b\u043b\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430",
     "MessageApplicationUpdated": "Emby Server \u0431\u044b\u043b \u043e\u0431\u043d\u043e\u0432\u043b\u0451\u043d",
     "FailedLoginAttemptWithUserName": "{0} - \u043f\u043e\u043f\u044b\u0442\u043a\u0430 \u0432\u0445\u043e\u0434\u0430 \u043d\u0435\u0443\u0434\u0430\u0447\u043d\u0430",
     "AuthenticationSucceededWithUserName": "{0} - \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u044f \u0443\u0441\u043f\u0435\u0448\u043d\u0430",
diff --git a/Emby.Server.Implementations/Localization/LocalizationManager.cs b/Emby.Server.Implementations/Localization/LocalizationManager.cs
index 278a39cd1..b0cee12be 100644
--- a/Emby.Server.Implementations/Localization/LocalizationManager.cs
+++ b/Emby.Server.Implementations/Localization/LocalizationManager.cs
@@ -387,36 +387,47 @@ namespace Emby.Server.Implementations.Localization
             return new LocalizatonOption[]
             {
                 new LocalizatonOption{ Name="Arabic", Value="ar"},
+                new LocalizatonOption{ Name="Belarusian (Belarus)", Value="be-BY"},
                 new LocalizatonOption{ Name="Bulgarian (Bulgaria)", Value="bg-BG"},
                 new LocalizatonOption{ Name="Catalan", Value="ca"},
                 new LocalizatonOption{ Name="Chinese Simplified", Value="zh-CN"},
                 new LocalizatonOption{ Name="Chinese Traditional", Value="zh-TW"},
+                new LocalizatonOption{ Name="Chinese Traditional (Hong Kong)", Value="zh-HK"},
                 new LocalizatonOption{ Name="Croatian", Value="hr"},
                 new LocalizatonOption{ Name="Czech", Value="cs"},
                 new LocalizatonOption{ Name="Danish", Value="da"},
                 new LocalizatonOption{ Name="Dutch", Value="nl"},
                 new LocalizatonOption{ Name="English (United Kingdom)", Value="en-GB"},
-                new LocalizatonOption{ Name="English (United States)", Value="en-us"},
+                new LocalizatonOption{ Name="English (United States)", Value="en-US"},
                 new LocalizatonOption{ Name="Finnish", Value="fi"},
                 new LocalizatonOption{ Name="French", Value="fr"},
                 new LocalizatonOption{ Name="French (Canada)", Value="fr-CA"},
                 new LocalizatonOption{ Name="German", Value="de"},
                 new LocalizatonOption{ Name="Greek", Value="el"},
                 new LocalizatonOption{ Name="Hebrew", Value="he"},
+                new LocalizatonOption{ Name="Hindi (India)", Value="hi-IN"},
                 new LocalizatonOption{ Name="Hungarian", Value="hu"},
                 new LocalizatonOption{ Name="Indonesian", Value="id"},
                 new LocalizatonOption{ Name="Italian", Value="it"},
+                new LocalizatonOption{ Name="Japanese", Value="ja"},
                 new LocalizatonOption{ Name="Kazakh", Value="kk"},
+                new LocalizatonOption{ Name="Korean", Value="ko"},
+                new LocalizatonOption{ Name="Lithuanian", Value="lt-LT"},
+                new LocalizatonOption{ Name="Malay", Value="ms"},
                 new LocalizatonOption{ Name="Norwegian Bokmål", Value="nb"},
                 new LocalizatonOption{ Name="Persian", Value="fa"},
                 new LocalizatonOption{ Name="Polish", Value="pl"},
                 new LocalizatonOption{ Name="Portuguese (Brazil)", Value="pt-BR"},
                 new LocalizatonOption{ Name="Portuguese (Portugal)", Value="pt-PT"},
+                new LocalizatonOption{ Name="Romanian", Value="ro"},
                 new LocalizatonOption{ Name="Russian", Value="ru"},
+                new LocalizatonOption{ Name="Slovak", Value="sk"},
                 new LocalizatonOption{ Name="Slovenian (Slovenia)", Value="sl-SI"},
-                new LocalizatonOption{ Name="Spanish", Value="es-ES"},
+                new LocalizatonOption{ Name="Spanish", Value="es"},
+                new LocalizatonOption{ Name="Spanish (Latin America)", Value="es-419"},
                 new LocalizatonOption{ Name="Spanish (Mexico)", Value="es-MX"},
                 new LocalizatonOption{ Name="Swedish", Value="sv"},
+                new LocalizatonOption{ Name="Swiss German", Value="gsw"},
                 new LocalizatonOption{ Name="Turkish", Value="tr"},
                 new LocalizatonOption{ Name="Ukrainian", Value="uk"},
                 new LocalizatonOption{ Name="Vietnamese", Value="vi"}