diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs
index 2db38bc7..7247c29d 100644
--- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs
+++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs
@@ -4,6 +4,7 @@ using NadekoBot.Attributes;
 using NadekoBot.Extensions;
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Globalization;
 using System.Linq;
 using System.Text;
@@ -16,10 +17,16 @@ namespace NadekoBot.Modules.Administration
         [Group]
         public class LocalizationCommands : ModuleBase
         {
+            private ImmutableDictionary<string, string> SupportedLocales { get; } = new Dictionary<string, string>()
+            {
+                {"en-US", "English, United States" },
+                {"sr-cyrl-rs", "Serbian, Cyrillic" }
+            }.ToImmutableDictionary();
+
             [NadekoCommand, Usage, Description, Aliases]
             [RequireContext(ContextType.Guild)]
             [RequireUserPermission(GuildPermission.Administrator)]
-            public async Task SetLocale([Remainder] string name = null)
+            public async Task SetLanguage([Remainder] string name = null)
             {
                 CultureInfo ci = null;
                 try
@@ -35,7 +42,7 @@ namespace NadekoBot.Modules.Administration
                         NadekoBot.Localization.SetGuildCulture(Context.Guild, ci);
                     }
 
-                    await Context.Channel.SendConfirmAsync($"Your guild's locale is now {Format.Bold(ci.ToString())} - {Format.Bold(ci.NativeName)}.").ConfigureAwait(false);
+                    await Context.Channel.SendConfirmAsync($"Your server's locale is now {Format.Bold(ci.ToString())} - {Format.Bold(ci.NativeName)}.").ConfigureAwait(false);
                 }
                 catch(Exception) {
 
@@ -46,7 +53,7 @@ namespace NadekoBot.Modules.Administration
 
             [NadekoCommand, Usage, Description, Aliases]
             [OwnerOnly]
-            public async Task SetDefaultLocale(string name)
+            public async Task SetDefaultLanguage(string name)
             {
                 CultureInfo ci = null;
                 try
@@ -70,6 +77,14 @@ namespace NadekoBot.Modules.Administration
                     await Context.Channel.SendConfirmAsync($"Failed setting locale. Revisit this command's help.").ConfigureAwait(false);
                 }
             }
+
+            [NadekoCommand, Usage, Description, Aliases]
+            [OwnerOnly]
+            public async Task ListLanguages(string name)
+            {
+                await Context.Channel.SendConfirmAsync("List Of Languages",
+                    string.Join("\n", SupportedLocales.Select(x => $"{Format.Code(x.Key)} => {x.Value}")));
+            }
         }
     }
 }
diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs
index 3c6d7404..11519c80 100644
--- a/src/NadekoBot/Resources/CommandStrings.Designer.cs
+++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs
@@ -6758,27 +6758,27 @@ namespace NadekoBot.Resources {
         /// <summary>
         ///    Looks up a localized string similar to setdefaultlocale sdl.
         /// </summary>
-        public static string setdefaultlocale_cmd {
+        public static string setdefaultlanguage_cmd {
             get {
-                return ResourceManager.GetString("setdefaultlocale_cmd", resourceCulture);
+                return ResourceManager.GetString("setdefaultlanguage_cmd", resourceCulture);
             }
         }
         
         /// <summary>
-        ///    Looks up a localized string similar to Sets the bot&apos;s default locale. All servers which use a default locale will use this one. Setting to `default` will use the host&apos;s current culture..
+        ///    Looks up a localized string similar to Sets the bot&apos;s default response language. All servers which use a default locale will use this one. Setting to `default` will use the host&apos;s current culture..
         /// </summary>
-        public static string setdefaultlocale_desc {
+        public static string setdefaultlanguage_desc {
             get {
-                return ResourceManager.GetString("setdefaultlocale_desc", resourceCulture);
+                return ResourceManager.GetString("setdefaultlanguage_desc", resourceCulture);
             }
         }
         
         /// <summary>
         ///    Looks up a localized string similar to `{0}sdl en-US` or `{0}sdl default`.
         /// </summary>
-        public static string setdefaultlocale_usage {
+        public static string setdefaultlanguage_usage {
             get {
-                return ResourceManager.GetString("setdefaultlocale_usage", resourceCulture);
+                return ResourceManager.GetString("setdefaultlanguage_usage", resourceCulture);
             }
         }
         
@@ -6812,27 +6812,27 @@ namespace NadekoBot.Resources {
         /// <summary>
         ///    Looks up a localized string similar to setlocale sl.
         /// </summary>
-        public static string setlocale_cmd {
+        public static string setlanguage_cmd {
             get {
-                return ResourceManager.GetString("setlocale_cmd", resourceCulture);
+                return ResourceManager.GetString("setlanguage_cmd", resourceCulture);
             }
         }
         
         /// <summary>
-        ///    Looks up a localized string similar to Sets this server&apos;s response locale (language). If bot&apos;s response strings have been translated to that language, bot will use that language in this server. Reset by using `default` as the locale name..
+        ///    Looks up a localized string similar to Sets this server&apos;s response language) If bot&apos;s response strings have been translated to that language, bot will use that language in this server. Reset by using `default` as the locale name..
         /// </summary>
-        public static string setlocale_desc {
+        public static string setlanguage_desc {
             get {
-                return ResourceManager.GetString("setlocale_desc", resourceCulture);
+                return ResourceManager.GetString("setlanguage_desc", resourceCulture);
             }
         }
         
         /// <summary>
         ///    Looks up a localized string similar to `{0}sl de-DE ` or `{0}sl default`.
         /// </summary>
-        public static string setlocale_usage {
+        public static string setlanguage_usage {
             get {
-                return ResourceManager.GetString("setlocale_usage", resourceCulture);
+                return ResourceManager.GetString("setlanguage_usage", resourceCulture);
             }
         }
         
diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx
index 577a1b72..23fb8072 100644
--- a/src/NadekoBot/Resources/CommandStrings.resx
+++ b/src/NadekoBot/Resources/CommandStrings.resx
@@ -3105,22 +3105,22 @@
   <data name="timezone_usage" xml:space="preserve">
     <value>`{0}timezone`</value>
   </data>
-  <data name="setdefaultlocale_cmd" xml:space="preserve">
+  <data name="setdefaultlanguage_cmd" xml:space="preserve">
     <value>setdefaultlocale sdl</value>
   </data>
-  <data name="setdefaultlocale_desc" xml:space="preserve">
-    <value>Sets the bot's default locale. All servers which use a default locale will use this one. Setting to `default` will use the host's current culture.</value>
+  <data name="setdefaultlanguage_desc" xml:space="preserve">
+    <value>Sets the bot's default response language. All servers which use a default locale will use this one. Setting to `default` will use the host's current culture.</value>
   </data>
-  <data name="setdefaultlocale_usage" xml:space="preserve">
+  <data name="setdefaultlanguage_usage" xml:space="preserve">
     <value>`{0}sdl en-US` or `{0}sdl default`</value>
   </data>
-  <data name="setlocale_cmd" xml:space="preserve">
+  <data name="setlanguage_cmd" xml:space="preserve">
     <value>setlocale sl</value>
   </data>
-  <data name="setlocale_desc" xml:space="preserve">
-    <value>Sets this server's response locale (language). If bot's response strings have been translated to that language, bot will use that language in this server. Reset by using `default` as the locale name.</value>
+  <data name="setlanguage_desc" xml:space="preserve">
+    <value>Sets this server's response language) If bot's response strings have been translated to that language, bot will use that language in this server. Reset by using `default` as the locale name.</value>
   </data>
-  <data name="setlocale_usage" xml:space="preserve">
+  <data name="setlanguage_usage" xml:space="preserve">
     <value>`{0}sl de-DE ` or `{0}sl default`</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/NadekoBot/Resources/ResponseStrings-sr-SP.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.Designer.cs
similarity index 100%
rename from src/NadekoBot/Resources/ResponseStrings-sr-SP.Designer.cs
rename to src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.Designer.cs
diff --git a/src/NadekoBot/Resources/ResponseStrings-sr-SP.resx b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx
similarity index 82%
rename from src/NadekoBot/Resources/ResponseStrings-sr-SP.resx
rename to src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx
index 63ef2430..218a7645 100644
--- a/src/NadekoBot/Resources/ResponseStrings-sr-SP.resx
+++ b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx
@@ -118,70 +118,70 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="pokemon_already_fainted" xml:space="preserve">
-    <value>{0} has already fainted.</value>
+    <value>{0} је већ онесвешћен.</value>
   </data>
   <data name="pokemon_already_full" xml:space="preserve">
-    <value>{0} already has full HP.</value>
+    <value>{0} је већ потпуно здрав.</value>
   </data>
   <data name="pokemon_already_that_type" xml:space="preserve">
-    <value>Your type is already {0}</value>
+    <value>Твој тип већ јесте {0}</value>
   </data>
   <data name="pokemon_attack" xml:space="preserve">
-    <value>used {0}{1} on {2}{3} for {4} damage.</value>
+    <value>је искористио {0}{1} на {2}{3} и нанео {4} штете.</value>
     <comment>Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage.</comment>
   </data>
   <data name="pokemon_cant_attack_again" xml:space="preserve">
-    <value>You can't attack again without retaliation!</value>
+    <value>Не можеш напасти пре узвратног ударца.</value>
   </data>
   <data name="pokemon_cant_attack_yourself" xml:space="preserve">
-    <value>You can't attack yourself.</value>
+    <value>Не можеш напасти себе.</value>
   </data>
   <data name="pokemon_fainted" xml:space="preserve">
-    <value>{0} has fainted!</value>
+    <value>{0} се онесвестио.</value>
   </data>
   <data name="pokemon_healed" xml:space="preserve">
-    <value>healed {0} with one {1}</value>
+    <value>је излечио {0} са једним {1}</value>
   </data>
   <data name="pokemon_hp_remaining" xml:space="preserve">
-    <value>{0} has {1} HP remaining.</value>
+    <value>{0} има {1} преосталог здравља.</value>
   </data>
   <data name="pokemon_invalid_move" xml:space="preserve">
-    <value>You can't use {0}. Type `{1}ml` to see a list of moves you can use.</value>
+    <value>Не можеш искористити {0}. Укуцај `{1}ml` да би видео листу удараца које можеш користити.</value>
   </data>
   <data name="pokemon_moves" xml:space="preserve">
-    <value>Movelist for {0} type</value>
+    <value>Листа покрета за {0} тип</value>
   </data>
   <data name="pokemon_not_effective" xml:space="preserve">
-    <value>It's not effective.</value>
+    <value>Није ефективно.</value>
   </data>
   <data name="pokemon_no_currency" xml:space="preserve">
-    <value>You don't have enough {0}</value>
+    <value>Немаш довољно {0}</value>
   </data>
   <data name="pokemon_revive_other" xml:space="preserve">
-    <value>revived {0} with one {1}</value>
+    <value>је оживео {0} са једним {1}</value>
   </data>
   <data name="pokemon_revive_yourself" xml:space="preserve">
-    <value>You revived yourself with one {0}</value>
+    <value>Оживео си себе са једним {0}</value>
   </data>
   <data name="pokemon_settype_success" xml:space="preserve">
-    <value>Your type has been changed to {0} for a {1}</value>
+    <value>Твој тип је промењен на {0} за један {1}</value>
   </data>
   <data name="pokemon_somewhat_effective" xml:space="preserve">
-    <value>It's somewhat effective.</value>
+    <value>Има неког ефекта!</value>
   </data>
   <data name="pokemon_super_effective" xml:space="preserve">
-    <value>It's super effective!</value>
+    <value>Супер ефективно!</value>
   </data>
   <data name="pokemon_too_many_moves" xml:space="preserve">
-    <value>You used too many moves in a row, so you can't move!</value>
+    <value>Користио си превише напада узастопно, не можеш да се крећеш!</value>
   </data>
   <data name="pokemon_type_of_user" xml:space="preserve">
-    <value>Type of {0} is {1}</value>
+    <value>{0}-ов тип је {1}</value>
   </data>
   <data name="pokemon_user_not_found" xml:space="preserve">
-    <value>User not found.</value>
+    <value>Корисник није нађен.</value>
   </data>
   <data name="pokemon_you_fainted" xml:space="preserve">
-    <value>You fainted, so you are not able to move!</value>
+    <value>Онесвешћен си, не можеш да се крећеш.</value>
   </data>
 </root>
\ No newline at end of file