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 667bc275df - Show all commits

View file

@ -73,9 +73,9 @@ commands.misc.github.connect.description = [Please connect your GitHub account h
commands.misc.github.help.description = Displays information about a GitHub user profile. 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.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.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.id.error.description = This ID is invalid. \nMaybe you entered a wrong ID. \n\nNote\: Make sure the Voice Channel is in this Guild.
commands.misc.screenshare.channel.error.title = Please Choose a Voice Channel 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.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.title = You specified a wrong number\!
commands.misc.screenshare.number.error.description = This isn't a 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.error = Hol' up