src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java

@@ -16,14 +16,14 @@ public class AvatarCommand implements Command {
         if (args.length == 0) {
             Member member = event.getMember();
             event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                    .setTitle("Avatar of " + member.getUser().getAsTag())
+                    .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.avatar.success.title") + member.getUser().getAsTag())
                     .setImage(member.getUser().getAvatarUrl())
                     .setFooter(member.getUser().getAsTag())
                     .build()).queue();
         } else if (event.getMessage().getMentionedMembers().size() == 1) {
             Member member = event.getMessage().getMentionedMembers().get(0);
             event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                    .setTitle("Avatar of " + member.getUser().getAsTag())
+                    .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.avatar.success.title") + member.getUser().getAsTag())
                     .setImage(member.getUser().getAvatarUrl())
                     .setFooter(member.getUser().getAsTag())
                     .build()).queue();
@@ -46,11 +46,11 @@ public class AvatarCommand implements Command {
 
     @Override
     public String description() {
-        return "Sends the avatar of the specified member.";
+        return MessageEditor.handle("en", "commands.fun.avatar.help.description");
     }
 
     @Override
     public String usage() {
-        return "<@User>/<ID>";
+        return "[@User]/[ID]";
     }
 }

src/main/java/com/bbn/hadder/commands/fun/GifCommand.java

@@ -37,7 +37,7 @@ public class GifCommand implements Command {
                 String url = array.getJSONObject(gifIndex).get("url").toString();
                 event.getTextChannel().sendMessage(url).queue();
             } catch (Exception e) {
-                event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR).setTitle("Error").setDescription("Please try again with another term.").build()).queue();
+                event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR).setTitle("Error").setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.gif.error.description")).build()).queue();
             }
         } else event.getHelpCommand().sendHelp(this, event);
     }
@@ -49,7 +49,7 @@ public class GifCommand implements Command {
 
     @Override
     public String description() {
-        return "Look for a GIF on Giphy";
+        return MessageEditor.handle("en", "commands.fun.gif.help.description");
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/fun/MemeCommand.java

@@ -28,14 +28,14 @@ public class MemeCommand implements Command {
             JSONObject json = new JSONObject(response.body().string());
             String url = json.get("image").toString();
             event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                    .setTitle("Your random meme")
+                    .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.meme.success.title"))
                     .setImage(url)
                     .build()).queue();
         } catch (IOException e) {
             e.printStackTrace();
             event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
-                    .setTitle("Error")
-                    .setDescription("The request to the meme API could not be processed. Please try it again later.")
+                    .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "error"))
+                    .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.fun.meme.api.error"))
                     .setColor(Color.RED)
                     .build()).queue();
         }
@@ -48,7 +48,7 @@ public class MemeCommand implements Command {
 
     @Override
     public String description() {
-        return "Sends you a random meme.";
+        return MessageEditor.handle("en", "commands.fun.meme.help.description");
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/general/AboutCommand.java

@@ -13,9 +13,9 @@ public class AboutCommand implements Command {
     @Override
     public void executed(String[] args, CommandEvent event) {
         event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                .setTitle("Hadder - About")
-                .setDescription("Hadder is an open source Discord bot.")
-                .addField("Support the Developers", "Hadder is completely free for everyone. We would appreciate it you donate some money [here](https://donatebot.io/checkout/448554629282922527?buyer=" + event.getAuthor().getId() + "). :smiley:", true)
+                .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.about.success.title"))
+                .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.about.success.description"))
+                .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.about.success.field.one.title"), MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.about.success.field.one.description") + "(https://donatebot.io/checkout/448554629282922527?buyer=" + event.getAuthor().getId() + "). :smiley:", true)
                 .setThumbnail("https://bigbotnetwork.com/images/Hadder.png")
                 .build()).queue();
     }
@@ -27,7 +27,7 @@ public class AboutCommand implements Command {
 
     @Override
     public String description() {
-        return "Shows infos about Hadder.";
+        return MessageEditor.handle("en", "commands.general.about.help.description");
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/general/EqualsCommand.java

@@ -16,22 +16,22 @@ public class EqualsCommand implements Command {
         event.getChannel().sendMessage(
                 new MessageEditor()
                         .setDefaultSettings(MessageEditor.MessageType.INFO)
-                        .setTitle("Please send me the first String")
+                        .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.first.request"))
                         .build()).queue();
         new EventWaiter().newOnMessageEventWaiter(msgevent -> {
             String firstString = msgevent.getMessage().getContentRaw();
             event.getChannel().sendMessage(
                     new MessageEditor()
                             .setDefaultSettings(
-                                    MessageEditor.MessageType.INFO).setTitle("Please send me the second String").build()).queue();
+                                    MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.second.request")).build()).queue();
             new EventWaiter().newOnMessageEventWaiter(msgevent2 -> {
                 String secondString = msgevent2.getMessage().getContentRaw();
                 event.getChannel().sendMessage(
                         new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                                .setTitle((firstString.equals(secondString)) ? "Yes! The first string equals the second string!" : "Well yes, but actually No. This isn't the same.")
-                                .addField("First String", firstString, false)
-                                .addField("Second String", secondString, false)
-                                .addField("Result", String.valueOf(firstString.equals(secondString)), false)
+                                .setTitle((firstString.equals(secondString)) ? MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.equals.true") : MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.equals.false"))
+                                .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.first"), firstString, false)
+                                .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.second"), secondString, false)
+                                .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.equals.string.result"), String.valueOf(firstString.equals(secondString)), false)
                                 .build()).queue();
             }, event.getJDA(), event.getAuthor());
         }, event.getJDA(), event.getAuthor());
@@ -44,7 +44,7 @@ public class EqualsCommand implements Command {
 
     @Override
     public String description() {
-        return "Check if two strings are the same.";
+        return MessageEditor.handle("en", "commands.general.equals.help.description");
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/general/HelpCommand.java

@@ -51,7 +51,7 @@ public class HelpCommand implements Command {
                 }
             }
         } else {
-            event.getTextChannel().sendMessage("I need the Embed Links Permission to send the Help Menu!").queue();
+            event.getTextChannel().sendMessage(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.help.error.description")).queue();
         }
     }
 
@@ -74,11 +74,11 @@ public class HelpCommand implements Command {
 
     @Override
     public String description() {
-        return "Shows each command or explains its usage.";
+        return MessageEditor.handle("en", "commands.general.help.help.description");
     }
 
     @Override
     public String usage() {
-        return "[CommandName]";
+        return MessageEditor.handle("en", "commands.general.help.help.label");
     }
 }

src/main/java/com/bbn/hadder/commands/general/InviteCommand.java

@@ -1,9 +1,5 @@
 package com.bbn.hadder.commands.general;
 
-/*
- * @author Skidder / GregTCLTK
- */
-
 import com.bbn.hadder.Hadder;
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
@@ -18,8 +14,8 @@ public class InviteCommand implements Command {
     @Override
     public void executed(String[] args, CommandEvent event) {
         event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                .setTitle("Invite me!")
-                .setDescription("[Invite me here!](https://discordapp.com/oauth2/authorize?client_id="  + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId() + "&scope=bot&permissions=470133879)")
+                .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.invite.success.title"))
+                .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.general.invite.success.description") + "(https://discordapp.com/oauth2/authorize?client_id="  + Hadder.shardManager.getGuilds().get(0).getSelfMember().getId() + "&scope=bot&permissions=470133879)")
                 .build()).queue();
     }
 
@@ -30,7 +26,7 @@ public class InviteCommand implements Command {
 
     @Override
     public String description() {
-        return "Shows the invitation to invite Hadder to your server.";
+        return MessageEditor.handle("en", "commands.general.invite.help.description");
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/general/PingCommand.java

@@ -22,7 +22,7 @@ public class PingCommand implements Command {
 
     @Override
     public String description() {
-        return "Shows the ping to the Discord API.";
+        return MessageEditor.handle("en", "commands.general.ping.help.description");
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/misc/FeedbackCommand.java

@@ -19,14 +19,14 @@ public class FeedbackCommand implements Command {
     @Override
     public void executed(String[] args, CommandEvent event) {
         event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                .setTitle("Feedback Topic")
-                .setDescription("Please send me the feedback topic.")
+                .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.title.request.title"))
+                .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.title.request.description"))
                 .build()).queue();
         new EventWaiter().newOnMessageEventWaiter(event1 -> {
                 String title = event1.getMessage().getContentDisplay();
                 event1.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                        .setTitle("Feedback Description")
-                        .setDescription("Please send me the feedback description now.")
+                        .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.description.request.title"))
+                        .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.feedback.description.request.description"))
                         .build()).queue();
             new EventWaiter().newOnMessageEventWaiter(event2 -> {
                 String description = event2.getMessage().getContentDisplay();
@@ -53,7 +53,7 @@ public class FeedbackCommand implements Command {
 
     @Override
     public String description() {
-        return "Sends feedback directly to the developers.";
+        return MessageEditor.handle("en", "commands.misc.feedback.help.description");
     }
 
     @Override

src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java

@@ -21,7 +21,7 @@ public class GitHubCommand implements Command {
     public void executed(String[] args, CommandEvent event) {
         if (args.length > 0) {
             if (args[0].equals("link")) {
-                event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("Link your GitHub Account").setDescription("https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942").build()).queue();
+                event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.link.title")).setDescription("https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942").build()).queue();
             } else {
                 Request request = new Request.Builder().url("https://api.github.com/users/" + args[0]).build();
                 try {
@@ -45,27 +45,27 @@ public class GitHubCommand implements Command {
                     if (!json.getString("blog").equals("")) website = json.getString("blog");
 
                     event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                            .setAuthor("Information about " + nickname + " (" + args[0] + ")", "https://github.com/" + args[0] + "", "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png")
+                            .setAuthor(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.title") + nickname + " (" + args[0] + ")", "https://github.com/" + args[0] + "", "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png")
                             .setThumbnail(json.getString("avatar_url"))
-                            .addField("User bio", bio, false)
-                            .addField("Location", location, true)
-                            .addField("Website", website, true)
-                            .addField("Public repositories", String.valueOf(json.getInt("public_repos")), true)
-                            .addField("Public gists", String.valueOf(json.getInt("public_gists")), true)
-                            .addField("Followers", String.valueOf(json.getInt("followers")), true)
-                            .addField("Following", String.valueOf(json.getInt("following")), true)
+                            .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.bio"), bio, false)
+                            .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.location"), location, true)
+                            .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.website"), website, true)
+                            .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.repositories"), String.valueOf(json.getInt("public_repos")), true)
+                            .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.gists"), String.valueOf(json.getInt("public_gists")), true)
+                            .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.followers"), String.valueOf(json.getInt("followers")), true)
+                            .addField(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.success.following"), String.valueOf(json.getInt("following")), true)
                             .build()).queue();
 
                 } catch (IOException | NullPointerException e) {
-                    event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR).setDescription("The GitHub API might be down at the moment!").build()).queue();
+                    event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.api.error.description")).build()).queue();
                 } catch (JSONException e) {
-                    event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription("This user does not exist!").build()).queue();
+                    event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING).setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.user.error.description")).build()).queue();
                 }
             }
         } else {
             event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                    .setTitle("Connect you GH account")
-                    .setDescription("[Please connect your GitHub account here](https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942)")
+                    .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.connect.title"))
+                    .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.github.connect.description") + "(https://github.com/login/oauth/authorize?client_id=25321f690bb1b6952942)")
                     .build()).queue();
         }
     }
@@ -77,11 +77,11 @@ public class GitHubCommand implements Command {
 
     @Override
     public String description() {
-        return "Displays information about a GitHub user profile.";
+        return MessageEditor.handle("en", "commands.misc.github.help.description");
     }
 
     @Override
     public String usage() {
-        return "<Username>";
+        return MessageEditor.handle("en", "username");
     }
 }

src/main/java/com/bbn/hadder/commands/misc/ScreenShareCommand.java

@@ -19,14 +19,14 @@ public class ScreenShareCommand implements Command {
                     try {
                         if (vc.getIdLong() == Long.parseLong(args[0])) {
                             event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                                    .setTitle("Here's your Url to share your Screen")
+                                    .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.success.title"))
                                     .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vc.getId() + "/").build()).queue();
                             return;
                         }
                     } catch (NumberFormatException e) {
                         event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
-                                .setTitle("Wait, that's illegal")
-                                .setDescription("This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote: Make sure the Voice Channel is on this Guild.").build()).queue();
+                                .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.id.error.title"))
+                                .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.id.error.description")).build()).queue();
                         event.getHelpCommand().sendHelp(this, event);
                         return;
                     }
@@ -35,8 +35,8 @@ public class ScreenShareCommand implements Command {
                 List<VoiceChannel> vcs = event.getGuild().getVoiceChannelsByName(String.join(" ", args), true);
                 if (vcs.size() > 1) {
                     EmbedBuilder eb = new EmbedBuilder()
-                            .setTitle("Please Choose a Voice Channel")
-                            .setDescription("There is more than one channel with this name");
+                            .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.channel.error.title"))
+                            .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.channel.error.description"));
                     for (int i = 0; i < vcs.size(); i++) {
                         VoiceChannel voiceChannel = vcs.get(i);
                         eb.addField(i + ": " + voiceChannel.getName(), voiceChannel.getId(), false);
@@ -47,29 +47,29 @@ public class ScreenShareCommand implements Command {
                             int i = Integer.parseInt(msgevent.getMessage().getContentRaw());
                             if (vcs.size() > i) {
                                 event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                                        .setTitle("Here's your Url to share your Screen")
+                                        .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.success.title"))
                                         .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(i).getId() + "/").build()).queue();
                             } else {
 
                                 event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
-                                        .setTitle("You specified a wrong number!").build()).queue();
+                                        .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.number.error.title")).build()).queue();
                                 event.getHelpCommand().sendHelp(this, event);
                             }
                         } catch (NumberFormatException e) {
                             event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
-                                    .setTitle("Wait, that's illegal")
-                                    .setDescription("This isn't a Number.").build()).queue();
+                                    .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.id.error.title"))
+                                    .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.number.error.description")).build()).queue();
                             event.getHelpCommand().sendHelp(this, event);
                         }
                     }, event.getJDA(), event.getAuthor());
                 } else if (vcs.size()==0) {
                     event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.ERROR)
-                            .setTitle("Hol' up")
-                            .setDescription("There is no Voice Channel named like this. \n\nNote: Make sure the Voice Channel is on this Guild.").build()).queue();
+                            .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.channel.existing.error"))
+                            .setDescription(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.channel.existing.description")).build()).queue();
                     event.getHelpCommand().sendHelp(this, event);
                 } else {
                     event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
-                            .setTitle("Here's your Url to share your Screen")
+                            .setTitle(MessageEditor.handle(event.getRethink().getLanguage(event.getAuthor().getId()), "commands.misc.screenshare.success.title"))
                             .setDescription("http://discordapp.com/channels/" + event.getGuild().getId() + "/" + vcs.get(0).getId() + "/").build()).queue();
                 }
             }
@@ -85,11 +85,11 @@ public class ScreenShareCommand implements Command {
 
     @Override
     public String description() {
-        return "Shows you the link to share your screen.";
+        return MessageEditor.handle("en", "commands.misc.screenshare.help.description");
     }
 
     @Override
     public String usage() {
-        return "<VoiceChannelID|VoiceChannelName>";
+        return MessageEditor.handle("en", "vc-name/id");
     }
 }

src/main/resources/Translations/Translations_en.properties

@@ -2,118 +2,121 @@
 # @author Skidder / GregTCLTK
 #
 
-Hadder=Hadder
+#
+# @author Skidder / GregTCLTK
+#
 
-user/id= <@User>/<ID>
-searchterm=<SearchTerm>
-username=<Username>
-number=<Number>
-guildprefix=<New Guild-Prefix>
-<@User>=<@User>
-on/off=<on/off>
-vc-name/id=<VoiceChannelID|VoiceChannelName>
-user+nickname=<@user> <New Nickname>
+Hadder = Hadder
 
-error=Error
-none=None
-success!=Success!
+searchterm = <SearchTerm>
+username = <Username>
+number = <Number>
+guildprefix = <New Guild-Prefix>
+<@User> = <@User>
+on/off = <on/off>
+vc-name/id = <VoiceChannelID|VoiceChannelName>
+user+nickname = <@user> <New Nickname>
 
-commands.fun.avatar.success.title=Avatar of
-commands.fun.avatar.help.description=Sends the avatar of the specified member.
-commands.fun.gif.error.description=Please try again with another term.
-commands.fun.gif.help.description=Look for a GIF on Giphy
-commands.fun.meme.success.title=Your random meme
-commands.fun.meme.api.error=The request to the meme API could not be processed. Please try it again later.
-commands.fun.meme.help.description=Sends you a random meme.
+error = Error
+none = None
+success! = Success!
 
-commands.general.about.success.title=Hadder - About
-commands.general.about.success.description=Hadder is an open source Discord bot.
-commands.general.about.success.field.one.title=Support the Developers
-commands.general.about.success.field.one.description=Hadder is completely free for everyone. We would appreciate it you donate some money [here]
-commands.general.about.help.description=Shows infos about Hadder
-commands.general.equals.string.first.request=Please send me the first String
-commands.general.equals.string.second.request=Please send me the second String
-commands.general.equals.string.equals.true=Yes! The first string equals the second string!
-commands.general.equals.string.equals.false=Well yes but actually No. This isn't the same.
-commands.general.equals.string.first=First String
-commands.general.equals.string.second=Second String
-commands.general.equals.string.result=Result
-commands.general.equals.help.description=Check if two strings are the same
-commands.general.help.error.description=I need the Embed Links Permission to send the Help Menu!
-commands.general.help.help.description=Shows each command or explains its usage
-commands.general.help.help.label=[CommandName]
-commands.general.invite.success.title=Invite me!
-commands.general.invite.success.description=[Invite me here!]
-commands.general.invite.help.description=Shows the invitation to invite Hadder to your server
-commands.general.ping.help.description=Shows the ping to the Discord API
+commands.fun.avatar.success.title = Avatar of 
+commands.fun.avatar.help.description = Sends the avatar of the specified member.
+commands.fun.gif.error.description = Please try again with another term.
+commands.fun.gif.help.description = Look for a GIF on Giphy
+commands.fun.meme.success.title = Your random meme
+commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later.
+commands.fun.meme.help.description = Sends you a random meme.
 
-commands.misc.feedback.title.request.title=Feedback Topic
-commands.misc.feedback.title.request.description=Please send me the feedback topic.
-commands.misc.feedback.description.request.title=Feedback Description
-commands.misc.feedback.description.request.description=Please send me the feedback description now.
-commands.misc.feedback.help.description=Sends feedback directly to the developers.
-commands.misc.github.link.title=Link your GitHub Account
-commands.misc.github.success.title=Information about
-commands.misc.github.success.bio=User bio
-commands.misc.github.success.location=Location
-commands.misc.github.success.website=Website
-commands.misc.github.success.repositories=Public repositories
-commands.misc.github.success.gists=Public gists
-commands.misc.github.success.followers=Followers
-commands.misc.github.success.following=Following
-commands.misc.github.api.error.description=The GitHub API might be down at the moment!
-commands.misc.github.user.error.description=This user does not exist!
-commands.misc.github.connect.title=Connect you GH account
-commands.misc.github.connect.description=Please connect your GitHub account here
-commands.misc.github.help.description=Displays information about a GitHub user profile.
-commands.misc.screenshare.success.title=Here's your Url to share your Screen
-commands.misc.screenshare.id.error.title=Wait that's illegal
-commands.misc.screenshare.id.error.description=This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote: Make sure the Voice Channel is on this Guild.
-commands.misc.screenshare.channel.error.title=Please Choose a Voice Channel
-commands.misc.screenshare.channel.error.description=There is more than one channel with this name
-commands.misc.screenshare.number.error.title=You specified a wrong number!
-commands.misc.screenshare.number.error.description=This isn't a Number.
-commands.misc.screenshare.channel.existing.error=Hol' up
-commands.misc.screenshare.channel.existing.description=There is no Voice Channel named like this. \n\nNote: Make sure the Voice Channel is on this Guild.
-commands.misc.screenshare.help.description=Shows you the link to share your screen.
+commands.general.about.success.title = Hadder - About
+commands.general.about.success.description = Hadder is an open source Discord bot.
+commands.general.about.success.field.one.title = Support the Developers
+commands.general.about.success.field.one.description = Hadder is completely free for everyone. We would appreciate it you donate some money [here]
+commands.general.about.help.description = Shows infos about Hadder
+commands.general.equals.string.first.request = Please send me the first String
+commands.general.equals.string.second.request = Please send me the second String
+commands.general.equals.string.equals.true = Yes! The first string equals the second string!
+commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same.
+commands.general.equals.string.first = First String
+commands.general.equals.string.second = Second String
+commands.general.equals.string.result = Result
+commands.general.equals.help.description = Check if two strings are the same
+commands.general.help.error.description = I need the Embed Links Permission to send the Help Menu!
+commands.general.help.help.description = Shows each command or explains its usage
+commands.general.help.help.label = [CommandName]
+commands.general.invite.success.title = Invite me!
+commands.general.invite.success.description = [Invite me here!]
+commands.general.invite.help.description = Shows the invitation to invite Hadder to your server
+commands.general.ping.help.description = Shows the ping to the Discord API
 
-commands.moderation.ban.success.title=Successfully banned
-commands.moderation.ban.success.description=I successfully baned
-commands.moderation.ban.error.title=Not possible
-commands.moderation.ban.myself.error.description=I can not ban myself!
-commands.moderation.ban.yourself.error.description=You can't ban yourself!
-commands.moderation.ban.help.description=Bans one ore more user from the server
-commands.moderation.clear.number.error.description=You have to choose a number between 1 and 200!
-commands.moderation.clear.success.description=Successfully deleted 69 messages.
-commands.moderation.clear.help.description=Deletes the specified number of messages.
-commands.moderation.prefix.success.title=Successfully set
-commands.moderation.prefix.success.description=I successfully set the new prefix for the guild to
-commands.moderation.prefix.error.description=The prefix must not contain **\**
-commands.moderation.prefix.help.description=Sets the Guild-Prefix.
-commands.moderation.invitedetect.activate.success.title=Successfully activated
-commands.moderation.invitedetect.activate.success.description=I successfully activated the invite link detection for this guild.
-commands.moderation.invitedetect.activate.error.title=Already activated
-commands.moderation.invitedetect.activate.error.description=The invite link detection is already activated on this guild.
-commands.moderation.invitedetect.deactivate.success.title=Successfully deactivated
-commands.moderation.invitedetect.deactivate.success.description=I successfully deactivated the invite link detection for this guild.
-commands.moderation.invitedetect.deactivate.error.title=Already deactivated
-commands.moderation.invitedetect.deactivate.error.description=The invite link detection is already deactivated on this guild.
-commands.moderation.invitedetect.help.description=Activate or deactivate the Discord invite link detection.
-commands.moderation.kick.success.title=Successfully kicked
-commands.moderation.kick.success.description=I successfully kicked
-commands.moderation.kick.myself.error.description=I can not kick myself!
-commands.moderation.kick.yourself.error.description=You can't kick yourself.
-commands.moderation.kick.mass.success.description=I successfully kicked 69 Members!
-commands.moderation.kick.help.description=Kicks one or more user from the server.
-commands.moderation.link.request.success.description=If i'm on this guild i sent a message to accept the link.
-commands.moderation.link.error.title=Wait that's illegal.
-commands.moderation.link.request.error.description=You specified the same guild as the guild on which you're reading this
-commands.moderation.link.request.accept.title=Skidder wants to link guilds!
-commands.moderation.link.request.accept.description=React with the reactions to accept or decline it
-commands.moderation.link.set.title=Set the thing boi
-commands.moderation.link.help.description=Links two or more servers.
-commands.moderation.nick.success.title=Successfully nicked
-commands.moderation.nick.success.description=I successfully nicked
-commands.moderation.nick.myself.success.description=I successfully changed my nickname.
-commands.moderation.nick.mass.success.description=I successfully nicked 69 Members!
-commands.moderation.nick.help.description=Rename a one or more user.
+commands.misc.feedback.title.request.title = Feedback Topic
+commands.misc.feedback.title.request.description = Please send me the feedback topic.
+commands.misc.feedback.description.request.title = Feedback Description
+commands.misc.feedback.description.request.description = Please send me the feedback description now.
+commands.misc.feedback.help.description = Sends feedback directly to the developers.
+commands.misc.github.link.title = Link your GitHub Account
+commands.misc.github.success.title = Information about 
+commands.misc.github.success.bio = User bio
+commands.misc.github.success.location = Location
+commands.misc.github.success.website = Website
+commands.misc.github.success.repositories = Public repositories
+commands.misc.github.success.gists = Public gists
+commands.misc.github.success.followers = Followers
+commands.misc.github.success.following = Following
+commands.misc.github.api.error.description = The GitHub API might be down at the moment!
+commands.misc.github.user.error.description = This user does not exist!
+commands.misc.github.connect.title = Connect you GH account
+commands.misc.github.connect.description = [Please connect your GitHub account here]
+commands.misc.github.help.description = Displays information about a GitHub user profile.
+commands.misc.screenshare.success.title = Here's your Url to share your Screen
+commands.misc.screenshare.id.error.title = Wait that's illegal
+commands.misc.screenshare.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID? \n\nNote: Make sure the Voice Channel is on this Guild.
+commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel
+commands.misc.screenshare.channel.error.description = There is more than one channel with this name
+commands.misc.screenshare.number.error.title = You specified a wrong number!
+commands.misc.screenshare.number.error.description = This isn't a Number.
+commands.misc.screenshare.channel.existing.error = Hol' up
+commands.misc.screenshare.channel.existing.description = There is no Voice Channel named like this. \n\nNote: Make sure the Voice Channel is on this Guild.
+commands.misc.screenshare.help.description = Shows you the link to share your screen.
+
+commands.moderation.ban.success.title = Successfully banned
+commands.moderation.ban.success.description = I successfully baned
+commands.moderation.ban.error.title = Not possible
+commands.moderation.ban.myself.error.description = I can not ban myself!
+commands.moderation.ban.yourself.error.description = You can't ban yourself!
+commands.moderation.ban.help.description = Bans one ore more user from the server
+commands.moderation.clear.number.error.description = You have to choose a number between 1 and 200!
+commands.moderation.clear.success.description = Successfully deleted 69 messages.
+commands.moderation.clear.help.description = Deletes the specified number of messages.
+commands.moderation.prefix.success.title = Successfully set
+commands.moderation.prefix.success.description = I successfully set the new prefix for the guild to
+commands.moderation.prefix.error.description = The prefix must not contain **\**
+commands.moderation.prefix.help.description = Sets the Guild-Prefix.
+commands.moderation.invitedetect.activate.success.title = Successfully activated
+commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild.
+commands.moderation.invitedetect.activate.error.title = Already activated
+commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild.
+commands.moderation.invitedetect.deactivate.success.title = Successfully deactivated
+commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild.
+commands.moderation.invitedetect.deactivate.error.title = Already deactivated
+commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this guild.
+commands.moderation.invitedetect.help.description = Activate or deactivate the Discord invite link detection.
+commands.moderation.kick.success.title = Successfully kicked
+commands.moderation.kick.success.description = I successfully kicked
+commands.moderation.kick.myself.error.description = I can not kick myself!
+commands.moderation.kick.yourself.error.description = You can't kick yourself.
+commands.moderation.kick.mass.success.description = I successfully kicked 69 Members!
+commands.moderation.kick.help.description = Kicks one or more user from the server.
+commands.moderation.link.request.success.description = If i'm on this guild i sent a message to accept the link.
+commands.moderation.link.error.title = Wait that's illegal.
+commands.moderation.link.request.error.description = You specified the same guild as the guild on which you're reading this
+commands.moderation.link.request.accept.title = Skidder wants to link guilds!
+commands.moderation.link.request.accept.description = React with the reactions to accept or decline it
+commands.moderation.link.set.title = Set the thing boi
+commands.moderation.link.help.description = Links two or more servers.
+commands.moderation.nick.success.title = Successfully nicked
+commands.moderation.nick.success.description = I successfully nicked
+commands.moderation.nick.myself.success.description = I successfully changed my nickname.
+commands.moderation.nick.mass.success.description = I successfully nicked 69 Members!
+commands.moderation.nick.help.description = Rename a one or more user.