Merge the master branch into Greg's branch #250

Merged
greg6775 merged 9 commits from master into greg-dev 2019-12-25 00:56:03 +01:00
Showing only changes of commit 1c272f9066 - Show all commits

View file

@ -40,7 +40,7 @@ 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\!
commands.general.equals.string.equals.false = Well yes but actually No. This isn't the same.
commands.general.equals.string.first = First string\:
commands.general.equals.string.second = Second String
commands.general.equals.string.second = Second string\:
commands.general.equals.string.result = Result\:
commands.general.equals.help.description = Check if two strings are the same
commands.general.help.field.usage = Usage\:
@ -232,4 +232,4 @@ commands.settings.language.help.description = Sets the new primary language for
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.settings.prefix.help.description = Sets a new prefix.