1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-05-09 23:43:14 +03:00

Merge branch 'master' into dirty-button

This commit is contained in:
Macintxsh 2024-03-20 15:50:24 +03:00 committed by GitHub
commit 243eaaa3cd
Signed by: GitHub
GPG key ID: B5690EEEBB952194
12 changed files with 149 additions and 32 deletions

View file

@ -117,13 +117,13 @@
<data name="DefaultWelcomeMessage" xml:space="preserve">
<value>{0}, welcome to {1}</value>
</data>
<data name="Loaded1" xml:space="preserve">
<data name="Generic1" xml:space="preserve">
<value>Veemo!</value>
</data>
<data name="Loaded2" xml:space="preserve">
<data name="Generic2" xml:space="preserve">
<value>Woomy!</value>
</data>
<data name="Loaded3" xml:space="preserve">
<data name="Generic3" xml:space="preserve">
<value>Ngyes!</value>
</data>
<data name="YouWereBanned" xml:space="preserve">
@ -585,6 +585,12 @@
<data name="ButtonReportIssue" xml:space="preserve">
<value>Report an issue</value>
</data>
<data name="DefaultLeaveMessage" xml:space="preserve">
<value>See you soon, {0}!</value>
</data>
<data name="SettingsLeaveMessage" xml:space="preserve">
<value>Leave message</value>
</data>
<data name="InvalidTimeSpan" xml:space="preserve">
<value>Time specified incorrectly!</value>
</data>