Merge the master branch into Greg's branch #233

Merged
greg6775 merged 15 commits from master into greg-dev 2019-12-22 11:11:20 +01:00
2 changed files with 3 additions and 45 deletions
Showing only changes of commit d965d8f065 - Show all commits

View file

@ -220,45 +220,3 @@ commands.settings.language.help.usage = <Language code>
commands.settings.prefix.success.title = %extra% Successfully set %extra%
commands.settings.prefix.success.description = I successfully set the new prefix for you to %extra%.
commands.settings.prefix.help.description = Sets a new Prefix
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.moderation.starboard.successchannel=

View file

@ -92,9 +92,9 @@ commands.moderation.ban.massban.success.description = I successfully baned %extr
commands.moderation.ban.help.description = Bans one ore more user from the server
commands.moderation.lear.all.success.title = Successfully deleted
commands.moderation.lear.all.success.description = I successfully deleted %extra% messages.
commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99!
commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\!
commands.moderation.clear.success.description = Successfully deleted %extra% messages.
commands.moderation.clear.message.error.title = No messages!
commands.moderation.clear.message.error.title = No messages\!
commands.moderation.clear.message.error.description = There are no messages in this channel.
commands.moderation.clear.help.description = Deletes the specified number of messages.
commands.moderation.prefix.success.title = %extra% Successfully set %extra%
@ -163,7 +163,7 @@ commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote
commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote.
commands.moderation.rules.emoji.error.description = The given emote can't be used.
commands.moderation.rules.help.description = Setup the rules on your Discord server
commands.moderation.starboard.successchannel=Successfully set the Channel!
commands.moderation.starboard.successchannel=Successfully set the Channel\!
commands.music.join.success.title = Successfully connected
commands.music.join.success.description = I successfully connected to %extra%.