Merge the master branch into Greg's branch #242

Merged
greg6775 merged 34 commits from master into greg-dev 2019-12-23 14:25:02 +01:00
Showing only changes of commit 60cc08daf8 - Show all commits

View file

@ -33,7 +33,7 @@ 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 if you donated some money to us. Click [here]%extra% to donate.
commands.general.about.help.description = Shows informations about Hadder.
commands.general.about.help.description = Shows information 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\!
@ -71,8 +71,8 @@ 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]%extra%
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.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