greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

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
Conversation 0 Commits 34 Files changed 2 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 758fee0a57 - Show all commits

4
src/main/resources/Translations/Translations_en.properties
View file

@ -68,14 +68,14 @@ 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.title = Connect your 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.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.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.description = This isn't a Number.
commands.misc.screenshare.channel.existing.error = Hol' up