Merge Greg's branch into the master branch #230

Merged
greg6775 merged 39 commits from greg-dev into master 2019-12-21 18:14:56 +01:00
2 changed files with 4 additions and 2 deletions
Showing only changes of commit 5be162fd1a - Show all commits

View file

@ -67,11 +67,11 @@ public class ClydeCommand implements Command {
@Override
public String description() {
return "Send a message as a Clyde webhook.";
return "commands.fun.clyde.help.description";
}
@Override
public String usage() {
return "<Message-Content>";
return "content";
}
}

View file

@ -13,6 +13,7 @@ vc-name/id = <VoiceChannelID|VoiceChannelName>
user+nickname = <@user> <New Nickname>
region = <region>
guildid = <Guild-ID>
content = <Message-content>
error = Error
none = None
@ -25,6 +26,7 @@ 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.fun.clyde.help.description = Send a message as a webhook named Clyde.
commands.general.about.success.title = Hadder - About
commands.general.about.success.description = Hadder is an open source Discord bot.