Merge branch 'v3' of https://gitlab.com/kwoth/nadekobot into v3

src/NadekoBot/Modules/Searches/TranslatorCommands.cs

@@ -12,7 +12,7 @@ namespace NadekoBot.Modules.Searches
         public class TranslateCommands : NadekoSubmodule<ITranslateService>
         {
             [NadekoCommand, Aliases]
-            public async Task Translate(string from, string to, [Leftover] string text = null)
+            public async Task Translate(string from, string to, [Leftover] string text)
             {
                 try
                 {

src/NadekoBot/Modules/Xp/Xp.cs

@@ -1,4 +1,4 @@
-using Discord;
+using Discord;
 using Discord.Commands;
 using Discord.WebSocket;
 using NadekoBot.Common.Attributes;
@@ -278,7 +278,7 @@ namespace NadekoBot.Modules.Xp
             }
             else
             {
-                await ReplyConfirmLocalizedAsync(strs.excluded(Format.Bold(channel.ToString())));
+                await ReplyConfirmLocalizedAsync(strs.not_excluded(Format.Bold(channel.ToString())));
             }
         }
 

src/NadekoBot/data/strings/commands/commands.en-US.yml

@@ -1143,9 +1143,9 @@ butts:
   args:
     - ""
 translate:
-  desc: "Translates from>to text. From the given language to the destination language."
+  desc: "Translates text from the given language to the destination language."
   args:
-    - "en>fr Hello"
+    - "en fr Hello"
 translangs:
   desc: "Lists the valid languages for translation."
   args: