Merged v3 branch updates

src/NadekoBot/Modules/Administration/Services/UserPunishService.cs

@@ -487,7 +487,7 @@ WHERE GuildId={guildId}
         {
             template = JsonConvert.SerializeObject(new
             {
-                color = _bcs.Data.Color.Error,
+                color = _bcs.Data.Color.Error.PackedValue >> 8,
                 description = defaultMessage 
             });
         }
@@ -502,7 +502,7 @@ WHERE GuildId={guildId}
         {
             template = JsonConvert.SerializeObject(new
             {
-                color = _bcs.Data.Color.Error,
+                color = _bcs.Data.Color.Error.PackedValue >> 8,
                 description = template
             });
         }

src/NadekoBot/Modules/Xp/Services/XpService.cs

@@ -166,10 +166,6 @@ public class XpService : INService
                     {
                         var xp = item.Sum(x => x.XpAmount);
 
-                        //1. Mass query discord users and userxpstats and get them from local dict
-                        //2. (better but much harder) Move everything to the database, and get old and new xp
-                        // amounts for every user (in order to give rewards)
-
                         var usr = uow.GetOrCreateUserXpStats(item.Key.GuildId, item.Key.User.Id);
                         var du = uow.GetOrCreateUser(item.Key.User);
 

src/NadekoBot/Modules/Xp/Xp.cs

@@ -270,7 +270,7 @@ public partial class Xp : NadekoModule<XpService>
         }
         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: