From 54c4898a0d1810f71300c4d468c3ae9e49b0d71f Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:10:58 +0100 Subject: [PATCH 01/58] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 6e6e7af..a1bc2d6 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -247,6 +247,7 @@ commands.owner.shutdown.success.title = Fährt herrunter commands.owner.shutdown.help.description = Shuts the Bot down commands.owner.test.success = TEST my friends commands.owner.test.help.description = Just a little Test Command +commands.owner.blacklist.help.description = Blacklist a user for specific commands commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. -- 2.45.3 From 3c6e940efcc24c2fecf3e4fbb0b576bfc3ce008b Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:10:59 +0100 Subject: [PATCH 02/58] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index f142696..0ca8de0 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -247,6 +247,7 @@ commands.owner.shutdown.success.title = Shutdown commands.owner.shutdown.help.description = Shuts the Bot down commands.owner.test.success = TEST my friends commands.owner.test.help.description = Just a little Test Command +commands.owner.blacklist.help.description = Blacklist a user for specific commands commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. -- 2.45.3 From 7a6360cef07bfd4e7d9d288188bb643bc4c75a5a Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:11:00 +0100 Subject: [PATCH 03/58] New translations Translations_en.properties (Spanish) New Spanish translation --- src/main/resources/Translations/Translations_es.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index f142696..0ca8de0 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -247,6 +247,7 @@ commands.owner.shutdown.success.title = Shutdown commands.owner.shutdown.help.description = Shuts the Bot down commands.owner.test.success = TEST my friends commands.owner.test.help.description = Just a little Test Command +commands.owner.blacklist.help.description = Blacklist a user for specific commands commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. -- 2.45.3 From 75eb635b136627169dc68eeb3bc1e9c6047b4f44 Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:11:02 +0100 Subject: [PATCH 04/58] New translations Translations_en.properties (French) New French translation --- src/main/resources/Translations/Translations_fr.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index f142696..0ca8de0 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -247,6 +247,7 @@ commands.owner.shutdown.success.title = Shutdown commands.owner.shutdown.help.description = Shuts the Bot down commands.owner.test.success = TEST my friends commands.owner.test.help.description = Just a little Test Command +commands.owner.blacklist.help.description = Blacklist a user for specific commands commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. -- 2.45.3 From ea5b80a0c95ffb1fce82a15bdb3fd7519424eddf Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:11:03 +0100 Subject: [PATCH 05/58] New translations Translations_en.properties (Russian) New Russian translation --- src/main/resources/Translations/Translations_ru.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index f142696..0ca8de0 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -247,6 +247,7 @@ commands.owner.shutdown.success.title = Shutdown commands.owner.shutdown.help.description = Shuts the Bot down commands.owner.test.success = TEST my friends commands.owner.test.help.description = Just a little Test Command +commands.owner.blacklist.help.description = Blacklist a user for specific commands commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. -- 2.45.3 From aefcc0b8e30ed9d11ed0e8c0aa4b0433a6a759d8 Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:11:04 +0100 Subject: [PATCH 06/58] New translations Translations_en.properties (Turkish) New Turkish translation --- src/main/resources/Translations/Translations_tr.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index f142696..0ca8de0 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -247,6 +247,7 @@ commands.owner.shutdown.success.title = Shutdown commands.owner.shutdown.help.description = Shuts the Bot down commands.owner.test.success = TEST my friends commands.owner.test.help.description = Just a little Test Command +commands.owner.blacklist.help.description = Blacklist a user for specific commands commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. -- 2.45.3 From 6dfa336a854bd7bb48ec5456c759cccd45f84d35 Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:11:05 +0100 Subject: [PATCH 07/58] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- src/main/resources/Translations/Translations_zh.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index f142696..0ca8de0 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -247,6 +247,7 @@ commands.owner.shutdown.success.title = Shutdown commands.owner.shutdown.help.description = Shuts the Bot down commands.owner.test.success = TEST my friends commands.owner.test.help.description = Just a little Test Command +commands.owner.blacklist.help.description = Blacklist a user for specific commands commands.settings.language.success.title = Language set commands.settings.language.success.description = `%extra%` is your new language now. -- 2.45.3 From 190131f355a4d26b511942c262f8029ed5be6e42 Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 2 Jan 2020 23:10:45 +0100 Subject: [PATCH 08/58] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index a1bc2d6..a6c3d1c 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -29,10 +29,10 @@ commands.general.equals.string.equals.false = Ja, aber eigentlich nein. Das ist commands.general.equals.string.first = Erster String\: commands.general.equals.string.second = Zweiter String\: commands.general.equals.string.result = Ergebnis\: -commands.general.equals.help.description = Checks if two strings are the same. -commands.general.help.description = **Description\:** +commands.general.equals.help.description = Prüft, ob zwei Strings gleich sind. +commands.general.help.description = **Beschreibung\:** commands.general.help.usage = **Benutzung\:** -commands.general.help.example = **Example\:** +commands.general.help.example = **Beispiel\:** commands.general.help.error.description = Ich brauche die Links Einbetten Berechtigung, um das Hilfe-Menü zu senden\! commands.general.help.help.description = Zeigt jeden Befehl an und erklärt seine Verwendung. commands.general.help.help.label = [Name des Commands] -- 2.45.3 From ec25c6f3483fae28c7aa63907ccf406f19ed77e3 Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 2 Jan 2020 23:20:47 +0100 Subject: [PATCH 09/58] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index a6c3d1c..a7656d1 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -56,10 +56,10 @@ commands.misc.github.success.repositories = Öffentliche Repositories commands.misc.github.success.gists = Öffentliche Gists commands.misc.github.success.followers = Abonnenten commands.misc.github.success.following = Folgt -commands.misc.github.api.error.title = API error +commands.misc.github.api.error.title = API-Fehler commands.misc.github.api.error.description = Die GitHub API könnte im Moment nicht verfügbar sein\! -commands.misc.github.user.error.title = User doesn't exist -commands.misc.github.user.error.description = I can not find a user named like this\! +commands.misc.github.user.error.title = Benutzer existiert nicht +commands.misc.github.user.error.description = Ich kann keinen Benutzer finden der so heißt\! commands.misc.github.connect.title = Verbinde dein GH Konto commands.misc.github.connect.description = [Bitte verbinde dein GitHub-Konto hier]%extra% commands.misc.github.help.description = Zeigt Informationen über ein GitHub Benutzerprofil an. @@ -79,11 +79,11 @@ commands.moderation.ban.success.description = Ich habe %extra% erfolgreich geban commands.moderation.ban.error.title = Nicht möglich commands.moderation.ban.myself.error.description = Ich kann mich nicht selbst bannen\! commands.moderation.ban.yourself.error.description = Du kannst dich nicht selbst bannen\! -commands.moderation.ban.massban.success.description = I successfully banned %extra% members\! -commands.moderation.ban.help.description = Bans one or more users from the server. +commands.moderation.ban.massban.success.description = Ich habe erfolgreich %extra% Mitglieder gebannt\! +commands.moderation.ban.help.description = Bannt einen oder mehrere Benutzer vom Server. commands.moderation.lear.all.success.title = Erfolgreich gelöscht commands.moderation.lear.all.success.description = Ich habe erfolgreich %extra% Nachrichten gelöscht. -commands.moderation.clear.number.error.title = Invalid number +commands.moderation.clear.number.error.title = Ungültige Nummer commands.moderation.clear.number.error.description = Sie müssen eine Zahl zwischen 1 und 99 wählen\! commands.moderation.clear.success.title = Erfolgreich gelöscht commands.moderation.clear.success.description.singular = Nachricht erfolgreich gelöscht. @@ -96,7 +96,7 @@ commands.moderation.prefix.success.description = Ich habe den neuen Prefix für commands.moderation.prefix.error.description = Der Prefix darf nicht **"** enthalten commands.moderation.prefix.help.description = Legt den Guild-Prefix fest. commands.moderation.invitedetect.activate.success.title = Erfolgreich aktiviert -commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this guild. +commands.moderation.invitedetect.activate.success.description = Ich habe erfolgreich die Einladungs-Link-Erkennung für diese Guild aktiviert. commands.moderation.invitedetect.activate.error.title = Bereits aktiviert commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. commands.moderation.invitedetect.deactivate.success.title = Erfolgreich deaktiviert -- 2.45.3 From 5e96768fe8a53bd478dd96a3a4c915d7bd00d25d Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 2 Jan 2020 23:30:47 +0100 Subject: [PATCH 10/58] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index a7656d1..b9b30fb 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -98,7 +98,7 @@ commands.moderation.prefix.help.description = Legt den Guild-Prefix fest. commands.moderation.invitedetect.activate.success.title = Erfolgreich aktiviert commands.moderation.invitedetect.activate.success.description = Ich habe erfolgreich die Einladungs-Link-Erkennung für diese Guild aktiviert. commands.moderation.invitedetect.activate.error.title = Bereits aktiviert -commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this guild. +commands.moderation.invitedetect.activate.error.description = Die Einladungs-Link-Erkennung ist bereits auf dieser Guild aktiviert. commands.moderation.invitedetect.deactivate.success.title = Erfolgreich deaktiviert commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. commands.moderation.invitedetect.deactivate.error.title = Bereits deaktiviert -- 2.45.3 From 8909529a9d40fb286f7c3dcda9728da76e44e612 Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 2 Jan 2020 23:40:39 +0100 Subject: [PATCH 11/58] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index b9b30fb..dabed7c 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -100,7 +100,7 @@ commands.moderation.invitedetect.activate.success.description = Ich habe erfolgr commands.moderation.invitedetect.activate.error.title = Bereits aktiviert commands.moderation.invitedetect.activate.error.description = Die Einladungs-Link-Erkennung ist bereits auf dieser Guild aktiviert. commands.moderation.invitedetect.deactivate.success.title = Erfolgreich deaktiviert -commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this guild. +commands.moderation.invitedetect.deactivate.success.description = Ich habe erfolgreich die Einladungs-Link-Erkennung für diese Guild deaktiviert. commands.moderation.invitedetect.deactivate.error.title = Bereits deaktiviert commands.moderation.invitedetect.deactivate.error.description = Die Einladungslink-Erkennung ist auf dieser Guild bereits deaktiviert. commands.moderation.invitedetect.help.description = Aktiviert oder deaktiviert die Discord Einladungserkennung. -- 2.45.3 From 484f275a11a4f6ee35815b22007925b1e81f7169 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:06 +0100 Subject: [PATCH 12/58] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index dabed7c..bb8bd49 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -45,8 +45,8 @@ commands.misc.feedback.title.request.title = Feedback-Thema commands.misc.feedback.title.request.description = Bitte senden Sie mir das Thema des Feedbacks. commands.misc.feedback.description.request.title = Feedback Beschreibung commands.misc.feedback.description.request.description = Bitte senden Sie mir jetzt die Feedback Beschreibung. -commands.misc.feedback.help.description = Sendet Feedback direkt an die Entwickler. commands.misc.feedback.success.title = Feedback erfolgreich gesendet\! +commands.misc.feedback.help.description = Sendet Feedback direkt an die Entwickler. commands.misc.github.link.title = Verbinde dein GitHub Konto commands.misc.github.success.title = Informationen über %extra% commands.misc.github.success.bio = Biographie @@ -81,8 +81,8 @@ commands.moderation.ban.myself.error.description = Ich kann mich nicht selbst ba commands.moderation.ban.yourself.error.description = Du kannst dich nicht selbst bannen\! commands.moderation.ban.massban.success.description = Ich habe erfolgreich %extra% Mitglieder gebannt\! commands.moderation.ban.help.description = Bannt einen oder mehrere Benutzer vom Server. -commands.moderation.lear.all.success.title = Erfolgreich gelöscht -commands.moderation.lear.all.success.description = Ich habe erfolgreich %extra% Nachrichten gelöscht. +commands.moderation.clear.all.success.title = Erfolgreich gelöscht +commands.moderation.clear.all.success.description = Ich habe erfolgreich %extra% Nachrichten gelöscht. commands.moderation.clear.number.error.title = Ungültige Nummer commands.moderation.clear.number.error.description = Sie müssen eine Zahl zwischen 1 und 99 wählen\! commands.moderation.clear.success.title = Erfolgreich gelöscht @@ -136,6 +136,8 @@ commands.moderation.rules.role.title = Role to assign commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. commands.moderation.rules.role.error.title = Rolle existiert nicht commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.role.permission.error.title = No permission +commands.moderation.rules.role.permission.error.description = You cannot select this role because you cannot interact with it. commands.moderation.rules.guild.error.title = Falsche Guild commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! commands.moderation.rules.emote.accept.title = Custom Accept Emote @@ -153,6 +155,7 @@ commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! +commands.moderation.starboard.help.description = Sets the starboard channel. commands.moderation.editrules.channel.title = Rules channel commands.moderation.editrules.channel.description = Please send me the channel with the rules as mention commands.moderation.editrules.channel.found.error.title = Kanal konnte nicht gefunden werden @@ -175,12 +178,12 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins your voice channel +commands.music.join.help.description = Joins your voice channel. commands.music.leave.success.title = Successfully disconnected commands.music.leave.success.description = I successfully disconnected from the Voice Channel commands.music.leave.error.tile = Nicht verbunden commands.music.leave.error.description = Ich bin derzeit in keinem Sprachkanal auf dieser Guild -commands.music.leave.help.description = Verlässt einen Sprachkanal +commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... commands.music.play.success.loading.title = %extra% Now playing %extra% @@ -192,22 +195,22 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube -commands.music.play.help.description = Plays a song +commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track commands.music.info.error.description = I am not playing anything at the moment -commands.music.info.help.description = Shows information about the playing song -commands.music.stop.help.description = Stops the song +commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment commands.music.queue.success.title = Queue commands.music.queue.success.description = This is the queue\: \n %extra% -commands.music.queue.help.description = Shows the music queue +commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song -commands.music.skip.help.description = Skips the currently playing song +commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number -- 2.45.3 From f7cf03c239a6a45515930bb56fdaa69fc35a7688 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:07 +0100 Subject: [PATCH 13/58] New translations Translations_en.properties (English) New English translation --- .../Translations/Translations_en.properties | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 0ca8de0..650848b 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -45,8 +45,8 @@ commands.misc.feedback.title.request.title = Feedback Topic commands.misc.feedback.title.request.description = Please send me the feedback topic. commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.feedback.success.title = Feedback successfully sent\! +commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.github.link.title = Link your GitHub Account commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio @@ -81,8 +81,8 @@ commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! commands.moderation.ban.massban.success.description = I successfully banned %extra% members\! commands.moderation.ban.help.description = Bans one or more users from the server. -commands.moderation.lear.all.success.title = Successfully deleted -commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. +commands.moderation.clear.all.success.title = Successfully deleted +commands.moderation.clear.all.success.description = I successfully deleted %extra% messages. commands.moderation.clear.number.error.title = Invalid number commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! commands.moderation.clear.success.title = Successfully cleared @@ -136,6 +136,8 @@ commands.moderation.rules.role.title = Role to assign commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.role.permission.error.title = No permission +commands.moderation.rules.role.permission.error.description = You cannot select this role because you cannot interact with it. commands.moderation.rules.guild.error.title = Wrong Guild commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! commands.moderation.rules.emote.accept.title = Custom Accept Emote @@ -153,6 +155,7 @@ commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! +commands.moderation.starboard.help.description = Sets the starboard channel. commands.moderation.editrules.channel.title = Rules channel commands.moderation.editrules.channel.description = Please send me the channel with the rules as mention commands.moderation.editrules.channel.found.error.title = Channel not found @@ -175,12 +178,12 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins your voice channel +commands.music.join.help.description = Joins your voice channel. commands.music.leave.success.title = Successfully disconnected commands.music.leave.success.description = I successfully disconnected from the Voice Channel commands.music.leave.error.tile = Not connected commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel +commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... commands.music.play.success.loading.title = %extra% Now playing %extra% @@ -192,22 +195,22 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube -commands.music.play.help.description = Plays a song +commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track commands.music.info.error.description = I am not playing anything at the moment -commands.music.info.help.description = Shows information about the playing song -commands.music.stop.help.description = Stops the song +commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment commands.music.queue.success.title = Queue commands.music.queue.success.description = This is the queue\: \n %extra% -commands.music.queue.help.description = Shows the music queue +commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song -commands.music.skip.help.description = Skips the currently playing song +commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number -- 2.45.3 From 3b38f706554563a72b78b63d57767deb96eb3848 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:09 +0100 Subject: [PATCH 14/58] New translations Translations_en.properties (Spanish) New Spanish translation --- .../Translations/Translations_es.properties | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index 0ca8de0..650848b 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -45,8 +45,8 @@ commands.misc.feedback.title.request.title = Feedback Topic commands.misc.feedback.title.request.description = Please send me the feedback topic. commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.feedback.success.title = Feedback successfully sent\! +commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.github.link.title = Link your GitHub Account commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio @@ -81,8 +81,8 @@ commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! commands.moderation.ban.massban.success.description = I successfully banned %extra% members\! commands.moderation.ban.help.description = Bans one or more users from the server. -commands.moderation.lear.all.success.title = Successfully deleted -commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. +commands.moderation.clear.all.success.title = Successfully deleted +commands.moderation.clear.all.success.description = I successfully deleted %extra% messages. commands.moderation.clear.number.error.title = Invalid number commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! commands.moderation.clear.success.title = Successfully cleared @@ -136,6 +136,8 @@ commands.moderation.rules.role.title = Role to assign commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.role.permission.error.title = No permission +commands.moderation.rules.role.permission.error.description = You cannot select this role because you cannot interact with it. commands.moderation.rules.guild.error.title = Wrong Guild commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! commands.moderation.rules.emote.accept.title = Custom Accept Emote @@ -153,6 +155,7 @@ commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! +commands.moderation.starboard.help.description = Sets the starboard channel. commands.moderation.editrules.channel.title = Rules channel commands.moderation.editrules.channel.description = Please send me the channel with the rules as mention commands.moderation.editrules.channel.found.error.title = Channel not found @@ -175,12 +178,12 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins your voice channel +commands.music.join.help.description = Joins your voice channel. commands.music.leave.success.title = Successfully disconnected commands.music.leave.success.description = I successfully disconnected from the Voice Channel commands.music.leave.error.tile = Not connected commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel +commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... commands.music.play.success.loading.title = %extra% Now playing %extra% @@ -192,22 +195,22 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube -commands.music.play.help.description = Plays a song +commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track commands.music.info.error.description = I am not playing anything at the moment -commands.music.info.help.description = Shows information about the playing song -commands.music.stop.help.description = Stops the song +commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment commands.music.queue.success.title = Queue commands.music.queue.success.description = This is the queue\: \n %extra% -commands.music.queue.help.description = Shows the music queue +commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song -commands.music.skip.help.description = Skips the currently playing song +commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number -- 2.45.3 From c47c4eaf34110622e26689da842738cd27877ef6 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:10 +0100 Subject: [PATCH 15/58] New translations Translations_en.properties (French) New French translation --- .../Translations/Translations_fr.properties | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index 0ca8de0..650848b 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -45,8 +45,8 @@ commands.misc.feedback.title.request.title = Feedback Topic commands.misc.feedback.title.request.description = Please send me the feedback topic. commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.feedback.success.title = Feedback successfully sent\! +commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.github.link.title = Link your GitHub Account commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio @@ -81,8 +81,8 @@ commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! commands.moderation.ban.massban.success.description = I successfully banned %extra% members\! commands.moderation.ban.help.description = Bans one or more users from the server. -commands.moderation.lear.all.success.title = Successfully deleted -commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. +commands.moderation.clear.all.success.title = Successfully deleted +commands.moderation.clear.all.success.description = I successfully deleted %extra% messages. commands.moderation.clear.number.error.title = Invalid number commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! commands.moderation.clear.success.title = Successfully cleared @@ -136,6 +136,8 @@ commands.moderation.rules.role.title = Role to assign commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.role.permission.error.title = No permission +commands.moderation.rules.role.permission.error.description = You cannot select this role because you cannot interact with it. commands.moderation.rules.guild.error.title = Wrong Guild commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! commands.moderation.rules.emote.accept.title = Custom Accept Emote @@ -153,6 +155,7 @@ commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! +commands.moderation.starboard.help.description = Sets the starboard channel. commands.moderation.editrules.channel.title = Rules channel commands.moderation.editrules.channel.description = Please send me the channel with the rules as mention commands.moderation.editrules.channel.found.error.title = Channel not found @@ -175,12 +178,12 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins your voice channel +commands.music.join.help.description = Joins your voice channel. commands.music.leave.success.title = Successfully disconnected commands.music.leave.success.description = I successfully disconnected from the Voice Channel commands.music.leave.error.tile = Not connected commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel +commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... commands.music.play.success.loading.title = %extra% Now playing %extra% @@ -192,22 +195,22 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube -commands.music.play.help.description = Plays a song +commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track commands.music.info.error.description = I am not playing anything at the moment -commands.music.info.help.description = Shows information about the playing song -commands.music.stop.help.description = Stops the song +commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment commands.music.queue.success.title = Queue commands.music.queue.success.description = This is the queue\: \n %extra% -commands.music.queue.help.description = Shows the music queue +commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song -commands.music.skip.help.description = Skips the currently playing song +commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number -- 2.45.3 From 7638a89f280414946b501c347fbd4cf758b0239d Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:11 +0100 Subject: [PATCH 16/58] New translations Translations_en.properties (Russian) New Russian translation --- .../Translations/Translations_ru.properties | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index 0ca8de0..650848b 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -45,8 +45,8 @@ commands.misc.feedback.title.request.title = Feedback Topic commands.misc.feedback.title.request.description = Please send me the feedback topic. commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.feedback.success.title = Feedback successfully sent\! +commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.github.link.title = Link your GitHub Account commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio @@ -81,8 +81,8 @@ commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! commands.moderation.ban.massban.success.description = I successfully banned %extra% members\! commands.moderation.ban.help.description = Bans one or more users from the server. -commands.moderation.lear.all.success.title = Successfully deleted -commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. +commands.moderation.clear.all.success.title = Successfully deleted +commands.moderation.clear.all.success.description = I successfully deleted %extra% messages. commands.moderation.clear.number.error.title = Invalid number commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! commands.moderation.clear.success.title = Successfully cleared @@ -136,6 +136,8 @@ commands.moderation.rules.role.title = Role to assign commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.role.permission.error.title = No permission +commands.moderation.rules.role.permission.error.description = You cannot select this role because you cannot interact with it. commands.moderation.rules.guild.error.title = Wrong Guild commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! commands.moderation.rules.emote.accept.title = Custom Accept Emote @@ -153,6 +155,7 @@ commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! +commands.moderation.starboard.help.description = Sets the starboard channel. commands.moderation.editrules.channel.title = Rules channel commands.moderation.editrules.channel.description = Please send me the channel with the rules as mention commands.moderation.editrules.channel.found.error.title = Channel not found @@ -175,12 +178,12 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins your voice channel +commands.music.join.help.description = Joins your voice channel. commands.music.leave.success.title = Successfully disconnected commands.music.leave.success.description = I successfully disconnected from the Voice Channel commands.music.leave.error.tile = Not connected commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel +commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... commands.music.play.success.loading.title = %extra% Now playing %extra% @@ -192,22 +195,22 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube -commands.music.play.help.description = Plays a song +commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track commands.music.info.error.description = I am not playing anything at the moment -commands.music.info.help.description = Shows information about the playing song -commands.music.stop.help.description = Stops the song +commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment commands.music.queue.success.title = Queue commands.music.queue.success.description = This is the queue\: \n %extra% -commands.music.queue.help.description = Shows the music queue +commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song -commands.music.skip.help.description = Skips the currently playing song +commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number -- 2.45.3 From b480ea457f66f131108a9b22e200435af67a3618 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:13 +0100 Subject: [PATCH 17/58] New translations Translations_en.properties (Turkish) New Turkish translation --- .../Translations/Translations_tr.properties | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index 0ca8de0..650848b 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -45,8 +45,8 @@ commands.misc.feedback.title.request.title = Feedback Topic commands.misc.feedback.title.request.description = Please send me the feedback topic. commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.feedback.success.title = Feedback successfully sent\! +commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.github.link.title = Link your GitHub Account commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio @@ -81,8 +81,8 @@ commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! commands.moderation.ban.massban.success.description = I successfully banned %extra% members\! commands.moderation.ban.help.description = Bans one or more users from the server. -commands.moderation.lear.all.success.title = Successfully deleted -commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. +commands.moderation.clear.all.success.title = Successfully deleted +commands.moderation.clear.all.success.description = I successfully deleted %extra% messages. commands.moderation.clear.number.error.title = Invalid number commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! commands.moderation.clear.success.title = Successfully cleared @@ -136,6 +136,8 @@ commands.moderation.rules.role.title = Role to assign commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.role.permission.error.title = No permission +commands.moderation.rules.role.permission.error.description = You cannot select this role because you cannot interact with it. commands.moderation.rules.guild.error.title = Wrong Guild commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! commands.moderation.rules.emote.accept.title = Custom Accept Emote @@ -153,6 +155,7 @@ commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! +commands.moderation.starboard.help.description = Sets the starboard channel. commands.moderation.editrules.channel.title = Rules channel commands.moderation.editrules.channel.description = Please send me the channel with the rules as mention commands.moderation.editrules.channel.found.error.title = Channel not found @@ -175,12 +178,12 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins your voice channel +commands.music.join.help.description = Joins your voice channel. commands.music.leave.success.title = Successfully disconnected commands.music.leave.success.description = I successfully disconnected from the Voice Channel commands.music.leave.error.tile = Not connected commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel +commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... commands.music.play.success.loading.title = %extra% Now playing %extra% @@ -192,22 +195,22 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube -commands.music.play.help.description = Plays a song +commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track commands.music.info.error.description = I am not playing anything at the moment -commands.music.info.help.description = Shows information about the playing song -commands.music.stop.help.description = Stops the song +commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment commands.music.queue.success.title = Queue commands.music.queue.success.description = This is the queue\: \n %extra% -commands.music.queue.help.description = Shows the music queue +commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song -commands.music.skip.help.description = Skips the currently playing song +commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number -- 2.45.3 From a6b436a475336b2110eee8aa2db8ce1262605b9e Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:14 +0100 Subject: [PATCH 18/58] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- .../Translations/Translations_zh.properties | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index 0ca8de0..650848b 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -45,8 +45,8 @@ commands.misc.feedback.title.request.title = Feedback Topic commands.misc.feedback.title.request.description = Please send me the feedback topic. commands.misc.feedback.description.request.title = Feedback Description commands.misc.feedback.description.request.description = Please send me the feedback description now. -commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.feedback.success.title = Feedback successfully sent\! +commands.misc.feedback.help.description = Sends feedback directly to the developers. commands.misc.github.link.title = Link your GitHub Account commands.misc.github.success.title = Information about %extra% commands.misc.github.success.bio = User bio @@ -81,8 +81,8 @@ commands.moderation.ban.myself.error.description = I can not ban myself\! commands.moderation.ban.yourself.error.description = You can not ban yourself\! commands.moderation.ban.massban.success.description = I successfully banned %extra% members\! commands.moderation.ban.help.description = Bans one or more users from the server. -commands.moderation.lear.all.success.title = Successfully deleted -commands.moderation.lear.all.success.description = I successfully deleted %extra% messages. +commands.moderation.clear.all.success.title = Successfully deleted +commands.moderation.clear.all.success.description = I successfully deleted %extra% messages. commands.moderation.clear.number.error.title = Invalid number commands.moderation.clear.number.error.description = You have to choose a number between 1 and 99\! commands.moderation.clear.success.title = Successfully cleared @@ -136,6 +136,8 @@ commands.moderation.rules.role.title = Role to assign commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. +commands.moderation.rules.role.permission.error.title = No permission +commands.moderation.rules.role.permission.error.description = You cannot select this role because you cannot interact with it. commands.moderation.rules.guild.error.title = Wrong Guild commands.moderation.rules.guild.error.description = The mentioned channel must be on this guild\! commands.moderation.rules.emote.accept.title = Custom Accept Emote @@ -153,6 +155,7 @@ commands.moderation.rules.error.message.title = Can't write messages commands.moderation.rules.error.message.description = I can not write messages in the specified channel commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Successfully set the Channel\! +commands.moderation.starboard.help.description = Sets the starboard channel. commands.moderation.editrules.channel.title = Rules channel commands.moderation.editrules.channel.description = Please send me the channel with the rules as mention commands.moderation.editrules.channel.found.error.title = Channel not found @@ -175,12 +178,12 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins your voice channel +commands.music.join.help.description = Joins your voice channel. commands.music.leave.success.title = Successfully disconnected commands.music.leave.success.description = I successfully disconnected from the Voice Channel commands.music.leave.error.tile = Not connected commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild -commands.music.leave.help.description = Leaves a voice channel +commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... commands.music.play.success.loading.title = %extra% Now playing %extra% @@ -192,22 +195,22 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube -commands.music.play.help.description = Plays a song +commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track commands.music.info.error.description = I am not playing anything at the moment -commands.music.info.help.description = Shows information about the playing song -commands.music.stop.help.description = Stops the song +commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment commands.music.queue.success.title = Queue commands.music.queue.success.description = This is the queue\: \n %extra% -commands.music.queue.help.description = Shows the music queue +commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song -commands.music.skip.help.description = Skips the currently playing song +commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number -- 2.45.3 From 2b558c00fe4e602be04b38d79a138d7b289523d1 Mon Sep 17 00:00:00 2001 From: Hax Date: Fri, 3 Jan 2020 18:23:06 +0100 Subject: [PATCH 19/58] Queue length --- .../java/com/bbn/hadder/commands/music/QueueCommand.java | 6 ++++-- src/main/resources/Translations/Translations_en.properties | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java b/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java index c3f7140..0336a2b 100644 --- a/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java @@ -23,11 +23,13 @@ public class QueueCommand implements Command { } else { Set queue = event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks(); StringBuilder builder = new StringBuilder(); + long queuelength = 0; for (AudioInfo g : queue) { - builder.append("**").append(g.getTrack().getInfo().author).append("**: `").append(g.getTrack().getInfo().title).append("` \n"); + queuelength = queuelength + g.getTrack().getInfo().length; + builder.append("("+event.getAudioManager().getTimestamp(g.getTrack().getInfo().length)+") **").append(g.getTrack().getInfo().author).append("**: `").append(g.getTrack().getInfo().title).append("` \n"); } event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, - "commands.music.queue.success.title", "", + "commands.music.queue.success.title", "("+String.valueOf(event.getAudioManager().getTimestamp(queuelength))+")", "commands.music.queue.success.description", builder.toString()) .build()).queue(); } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 650848b..1d409f1 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -205,7 +205,7 @@ commands.music.info.error.description = I am not playing anything at the moment commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment -commands.music.queue.success.title = Queue +commands.music.queue.success.title = Queue %extra% commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped -- 2.45.3 From aebe60d27cddba4b3f32dd5636416aafbf78a25a Mon Sep 17 00:00:00 2001 From: Hax Date: Fri, 3 Jan 2020 19:15:40 +0100 Subject: [PATCH 20/58] Added #128 --- .../java/com/bbn/hadder/listener/RulesListener.java | 10 ++++++++-- .../resources/Translations/Translations_en.properties | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java index d71d1d4..55f3ef6 100644 --- a/src/main/java/com/bbn/hadder/listener/RulesListener.java +++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java @@ -22,7 +22,7 @@ public class RulesListener extends ListenerAdapter { if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot()) { if (event.getReactionEmote().isEmote()) { if (rethink.getRulesAEmote(event.getGuild().getId()).equals(event.getReactionEmote().getId())) { - event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue(); + addRole(event); } else if (rethink.getRulesDEmote(event.getGuild().getId()).equals(event.getReactionEmote().getId())) { event.getReaction().removeReaction(event.getUser()).queue(); if (event.getGuild().getSelfMember().canInteract(event.getMember())) { @@ -31,7 +31,7 @@ public class RulesListener extends ListenerAdapter { } } else if (event.getReactionEmote().isEmoji()) { if (rethink.getRulesAEmote(event.getGuild().getId()).equals(event.getReactionEmote().getEmoji())) { - event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue(); + addRole(event); } else if (rethink.getRulesDEmote(event.getGuild().getId()).equals(event.getReactionEmote().getEmoji())) { event.getReaction().removeReaction(event.getUser()).queue(); if (event.getGuild().getSelfMember().canInteract(event.getMember())) { @@ -42,6 +42,12 @@ public class RulesListener extends ListenerAdapter { } } + private void addRole(MessageReactionAddEvent event) { + if (event.getMember().getRoles().contains(event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId())))) { + event.getGuild().removeRoleFromMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue(); + } else event.getGuild().addRoleToMember(event.getMember(), event.getGuild().getRoleById(rethink.getRulesRID(event.getGuild().getId()))).reason("Accepted rules").queue(); + } + @Override public void onMessageReactionRemove(MessageReactionRemoveEvent event) { if (event.getMessageId().equals(rethink.getRulesMID(event.getGuild().getId())) && !event.getMember().getUser().isBot()) { diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 1d409f1..e7dee3e 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -132,8 +132,8 @@ commands.moderation.rules.channel.error.title = Channel not found commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. commands.moderation.rules.rules.title = Rules message commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.title = Role to assign/remove +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives/loses after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. commands.moderation.rules.role.permission.error.title = No permission -- 2.45.3 From a894d1463204ce74edda1815e4346082dbe028f0 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 22:10:30 +0100 Subject: [PATCH 21/58] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index bb8bd49..f65e9cf 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -178,39 +178,39 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Joins your voice channel. -commands.music.leave.success.title = Successfully disconnected -commands.music.leave.success.description = I successfully disconnected from the Voice Channel +commands.music.join.help.description = Tretet deinem Sprachkanal bei. +commands.music.leave.success.title = Verbindung erfolgreich getrennt +commands.music.leave.success.description = Ich habe die Verbindung zum Sprachkanal erfolgreich getrennt commands.music.leave.error.tile = Nicht verbunden commands.music.leave.error.description = Ich bin derzeit in keinem Sprachkanal auf dieser Guild commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... -commands.music.play.success.loading.title = %extra% Now playing %extra% -commands.music.play.success.title = Title -commands.music.play.success.author = Author -commands.music.play.success.length = Length +commands.music.play.success.loading.title = spielt jetzt +commands.music.play.success.title = Titel +commands.music.play.success.author = Autor +commands.music.play.success.length = Länge commands.music.play.success.tracks = Tracks -commands.music.play.error.load.title = %extra% Load failed %extra% -commands.music.play.error.load.description = Unfortunately I can not load the given song +commands.music.play.error.load.title = Laden fehlgeschlagen +commands.music.play.error.load.description = Leider kann ich das angegebene Lied nicht laden commands.music.play.error.match.title = %extra% No matches %extra% -commands.music.play.error.match.description = I can not find a song named this on YouTube -commands.music.play.help.description = Plays the specified song. -commands.music.stop.success.title = Successfully stopped -commands.music.stop.success.description = I successfully stopped the song. -commands.music.stop.help.description = Stops the song. +commands.music.play.error.match.description = Ich kann keinen Song mit dem Namen auf YouTube finden +commands.music.play.help.description = Spielt den angegebenen Song ab. +commands.music.stop.success.title = Erfolgreich gestoppt +commands.music.stop.success.description = Ich habe den Song erfolgreich gestoppt. +commands.music.stop.help.description = Stoppt den Song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track commands.music.info.error.description = I am not playing anything at the moment -commands.music.info.help.description = Shows information about the playing song. -commands.music.queue.error.title = No queue -commands.music.queue.error.description = There are no queued songs at the moment -commands.music.queue.success.title = Queue +commands.music.info.help.description = Zeigt Informationen über das abgespielte Lied. +commands.music.queue.error.title = Keine Warteschlange +commands.music.queue.error.description = Momentan sind keine Lieder in der Warteschlange +commands.music.queue.success.title = Warteschlange commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. -commands.music.skip.success.title = Successfully skipped -commands.music.skip.success.description = I successfully skipped to the next song -commands.music.skip.help.description = Skips the currently playing song. +commands.music.skip.success.title = Erfolgreich übersprungen +commands.music.skip.success.description = Ich habe erfolgreich zum nächsten Song übersprungen +commands.music.skip.help.description = Überspringt den gerade abgespielten Song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number -- 2.45.3 From 3f58aacb9d1070646cdba626a4361cf244d15082 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 00:00:29 +0100 Subject: [PATCH 22/58] New translations Translations_en.properties (German) New German translation --- .../resources/Translations/Translations_de.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index f65e9cf..151f946 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -96,11 +96,11 @@ commands.moderation.prefix.success.description = Ich habe den neuen Prefix für commands.moderation.prefix.error.description = Der Prefix darf nicht **"** enthalten commands.moderation.prefix.help.description = Legt den Guild-Prefix fest. commands.moderation.invitedetect.activate.success.title = Erfolgreich aktiviert -commands.moderation.invitedetect.activate.success.description = Ich habe erfolgreich die Einladungs-Link-Erkennung für diese Guild aktiviert. +commands.moderation.invitedetect.activate.success.description = Ich habe erfolgreich die Erkennung für Einladungslinks auf diesem Server aktiviert. commands.moderation.invitedetect.activate.error.title = Bereits aktiviert -commands.moderation.invitedetect.activate.error.description = Die Einladungs-Link-Erkennung ist bereits auf dieser Guild aktiviert. +commands.moderation.invitedetect.activate.error.description = Die Erkennung für Einladungslinks ist bereits auf diesem Server aktiviert. commands.moderation.invitedetect.deactivate.success.title = Erfolgreich deaktiviert -commands.moderation.invitedetect.deactivate.success.description = Ich habe erfolgreich die Einladungs-Link-Erkennung für diese Guild deaktiviert. +commands.moderation.invitedetect.deactivate.success.description = Ich habe erfolgreich die Erkennung für Einladungslinks auf diesem Server deaktiviert. commands.moderation.invitedetect.deactivate.error.title = Bereits deaktiviert commands.moderation.invitedetect.deactivate.error.description = Die Einladungslink-Erkennung ist auf dieser Guild bereits deaktiviert. commands.moderation.invitedetect.help.description = Aktiviert oder deaktiviert die Discord Einladungserkennung. @@ -178,7 +178,7 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. -commands.music.join.help.description = Tretet deinem Sprachkanal bei. +commands.music.join.help.description = Tritt deinem Sprachkanal bei. commands.music.leave.success.title = Verbindung erfolgreich getrennt commands.music.leave.success.description = Ich habe die Verbindung zum Sprachkanal erfolgreich getrennt commands.music.leave.error.tile = Nicht verbunden @@ -186,7 +186,7 @@ commands.music.leave.error.description = Ich bin derzeit in keinem Sprachkanal a commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... -commands.music.play.success.loading.title = spielt jetzt +commands.music.play.success.loading.title = Jetzt läuft commands.music.play.success.title = Titel commands.music.play.success.author = Autor commands.music.play.success.length = Länge -- 2.45.3 From 924309a5de1b48b4e5e7b0fa4d97fe2fc455fd28 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 00:10:30 +0100 Subject: [PATCH 23/58] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 151f946..2608d85 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -186,15 +186,15 @@ commands.music.leave.error.description = Ich bin derzeit in keinem Sprachkanal a commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... -commands.music.play.success.loading.title = Jetzt läuft +commands.music.play.success.loading.title = %extra% Jetzt läuft %extra% commands.music.play.success.title = Titel commands.music.play.success.author = Autor commands.music.play.success.length = Länge commands.music.play.success.tracks = Tracks -commands.music.play.error.load.title = Laden fehlgeschlagen +commands.music.play.error.load.title = %extra% Laden fehlgeschlagen %extra% commands.music.play.error.load.description = Leider kann ich das angegebene Lied nicht laden commands.music.play.error.match.title = %extra% No matches %extra% -commands.music.play.error.match.description = Ich kann keinen Song mit dem Namen auf YouTube finden +commands.music.play.error.match.description = Ich kann keinen Song mit diesem Namen auf YouTube finden commands.music.play.help.description = Spielt den angegebenen Song ab. commands.music.stop.success.title = Erfolgreich gestoppt commands.music.stop.success.description = Ich habe den Song erfolgreich gestoppt. -- 2.45.3 From c522fd176964658b76149e67a1efa9c5616e8325 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:50:55 +0100 Subject: [PATCH 24/58] New translations Translations_en.properties (German) New German translation --- .../Translations/Translations_de.properties | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 2608d85..264e6b7 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -178,11 +178,15 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. +commands.music.join.error.permission.title = No permission +commands.music.join.error.permission.description = I am not allowed to join your voice channel. commands.music.join.help.description = Tritt deinem Sprachkanal bei. commands.music.leave.success.title = Verbindung erfolgreich getrennt commands.music.leave.success.description = Ich habe die Verbindung zum Sprachkanal erfolgreich getrennt -commands.music.leave.error.tile = Nicht verbunden -commands.music.leave.error.description = Ich bin derzeit in keinem Sprachkanal auf dieser Guild +commands.music.leave.error.channel.title = No channel +commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot. +commands.music.leave.error.connected.tile = Nicht verbunden +commands.music.leave.error.connected.description = Ich bin derzeit in keinem Sprachkanal auf dieser Guild commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... @@ -198,6 +202,8 @@ commands.music.play.error.match.description = Ich kann keinen Song mit diesem Na commands.music.play.help.description = Spielt den angegebenen Song ab. commands.music.stop.success.title = Erfolgreich gestoppt commands.music.stop.success.description = Ich habe den Song erfolgreich gestoppt. +commands.music.stop.error.connected.title = No channel +commands.music.stop.error.connected.description = You have to be in the same voice channel as the bot to stop the song. commands.music.stop.help.description = Stoppt den Song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track @@ -210,11 +216,15 @@ commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Erfolgreich übersprungen commands.music.skip.success.description = Ich habe erfolgreich zum nächsten Song übersprungen +commands.music.skip.error.connected.title = No channel +commands.music.skip.error.connected.description = You have to be in the same voice channel as the bot to skip the song. commands.music.skip.help.description = Überspringt den gerade abgespielten Song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number commands.music.volume.error.int.description = The volume have to be between 1 and 200 +commands.music.volume.error.connected.title = No channel +commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF wird nicht angezeigt? Klicke hier -- 2.45.3 From a0be7a635bc661eaa6276df24cbac2513765d289 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:50:56 +0100 Subject: [PATCH 25/58] New translations Translations_en.properties (English) New English translation --- .../Translations/Translations_en.properties | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 650848b..50da52a 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -178,11 +178,15 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. +commands.music.join.error.permission.title = No permission +commands.music.join.error.permission.description = I am not allowed to join your voice channel. commands.music.join.help.description = Joins your voice channel. commands.music.leave.success.title = Successfully disconnected commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +commands.music.leave.error.channel.title = No channel +commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot. +commands.music.leave.error.connected.tile = Not connected +commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... @@ -198,6 +202,8 @@ commands.music.play.error.match.description = I can not find a song named this o commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.error.connected.title = No channel +commands.music.stop.error.connected.description = You have to be in the same voice channel as the bot to stop the song. commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track @@ -210,11 +216,15 @@ commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song +commands.music.skip.error.connected.title = No channel +commands.music.skip.error.connected.description = You have to be in the same voice channel as the bot to skip the song. commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number commands.music.volume.error.int.description = The volume have to be between 1 and 200 +commands.music.volume.error.connected.title = No channel +commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here -- 2.45.3 From 0fa5160c57e4dd7612f3f9cabda65874d413afcc Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:50:57 +0100 Subject: [PATCH 26/58] New translations Translations_en.properties (Spanish) New Spanish translation --- .../Translations/Translations_es.properties | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index 650848b..50da52a 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -178,11 +178,15 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. +commands.music.join.error.permission.title = No permission +commands.music.join.error.permission.description = I am not allowed to join your voice channel. commands.music.join.help.description = Joins your voice channel. commands.music.leave.success.title = Successfully disconnected commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +commands.music.leave.error.channel.title = No channel +commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot. +commands.music.leave.error.connected.tile = Not connected +commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... @@ -198,6 +202,8 @@ commands.music.play.error.match.description = I can not find a song named this o commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.error.connected.title = No channel +commands.music.stop.error.connected.description = You have to be in the same voice channel as the bot to stop the song. commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track @@ -210,11 +216,15 @@ commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song +commands.music.skip.error.connected.title = No channel +commands.music.skip.error.connected.description = You have to be in the same voice channel as the bot to skip the song. commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number commands.music.volume.error.int.description = The volume have to be between 1 and 200 +commands.music.volume.error.connected.title = No channel +commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here -- 2.45.3 From 533e54db438d169ce707d5b3b5300fc0d7072466 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:50:59 +0100 Subject: [PATCH 27/58] New translations Translations_en.properties (French) New French translation --- .../Translations/Translations_fr.properties | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index 650848b..50da52a 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -178,11 +178,15 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. +commands.music.join.error.permission.title = No permission +commands.music.join.error.permission.description = I am not allowed to join your voice channel. commands.music.join.help.description = Joins your voice channel. commands.music.leave.success.title = Successfully disconnected commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +commands.music.leave.error.channel.title = No channel +commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot. +commands.music.leave.error.connected.tile = Not connected +commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... @@ -198,6 +202,8 @@ commands.music.play.error.match.description = I can not find a song named this o commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.error.connected.title = No channel +commands.music.stop.error.connected.description = You have to be in the same voice channel as the bot to stop the song. commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track @@ -210,11 +216,15 @@ commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song +commands.music.skip.error.connected.title = No channel +commands.music.skip.error.connected.description = You have to be in the same voice channel as the bot to skip the song. commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number commands.music.volume.error.int.description = The volume have to be between 1 and 200 +commands.music.volume.error.connected.title = No channel +commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here -- 2.45.3 From 7be9777fb303ce33ccee3475962f0a6a1106a39a Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:51:00 +0100 Subject: [PATCH 28/58] New translations Translations_en.properties (Russian) New Russian translation --- .../Translations/Translations_ru.properties | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index 650848b..50da52a 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -178,11 +178,15 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. +commands.music.join.error.permission.title = No permission +commands.music.join.error.permission.description = I am not allowed to join your voice channel. commands.music.join.help.description = Joins your voice channel. commands.music.leave.success.title = Successfully disconnected commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +commands.music.leave.error.channel.title = No channel +commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot. +commands.music.leave.error.connected.tile = Not connected +commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... @@ -198,6 +202,8 @@ commands.music.play.error.match.description = I can not find a song named this o commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.error.connected.title = No channel +commands.music.stop.error.connected.description = You have to be in the same voice channel as the bot to stop the song. commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track @@ -210,11 +216,15 @@ commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song +commands.music.skip.error.connected.title = No channel +commands.music.skip.error.connected.description = You have to be in the same voice channel as the bot to skip the song. commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number commands.music.volume.error.int.description = The volume have to be between 1 and 200 +commands.music.volume.error.connected.title = No channel +commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here -- 2.45.3 From 7e05b76ea78b059fef5eed40d6322a73e316f736 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:51:01 +0100 Subject: [PATCH 29/58] New translations Translations_en.properties (Turkish) New Turkish translation --- .../Translations/Translations_tr.properties | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index 650848b..50da52a 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -178,11 +178,15 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. +commands.music.join.error.permission.title = No permission +commands.music.join.error.permission.description = I am not allowed to join your voice channel. commands.music.join.help.description = Joins your voice channel. commands.music.leave.success.title = Successfully disconnected commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +commands.music.leave.error.channel.title = No channel +commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot. +commands.music.leave.error.connected.tile = Not connected +commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... @@ -198,6 +202,8 @@ commands.music.play.error.match.description = I can not find a song named this o commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.error.connected.title = No channel +commands.music.stop.error.connected.description = You have to be in the same voice channel as the bot to stop the song. commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track @@ -210,11 +216,15 @@ commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song +commands.music.skip.error.connected.title = No channel +commands.music.skip.error.connected.description = You have to be in the same voice channel as the bot to skip the song. commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number commands.music.volume.error.int.description = The volume have to be between 1 and 200 +commands.music.volume.error.connected.title = No channel +commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here -- 2.45.3 From ece9abb8176d9f56488063df091e769004c02637 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:51:03 +0100 Subject: [PATCH 30/58] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- .../Translations/Translations_zh.properties | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index 650848b..50da52a 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -178,11 +178,15 @@ commands.music.join.error.connecting.trying.title = Already trying to connect commands.music.join.error.connecting.trying.description = Hadder is already trying to connect. Please wait a moment commands.music.join.error.channel.title = No Voice Channel commands.music.join.error.channel.description = You aren't in a Voice Channel. +commands.music.join.error.permission.title = No permission +commands.music.join.error.permission.description = I am not allowed to join your voice channel. commands.music.join.help.description = Joins your voice channel. commands.music.leave.success.title = Successfully disconnected commands.music.leave.success.description = I successfully disconnected from the Voice Channel -commands.music.leave.error.tile = Not connected -commands.music.leave.error.description = I'm currently in no Voice Channel on this Guild +commands.music.leave.error.channel.title = No channel +commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot. +commands.music.leave.error.connected.tile = Not connected +commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild commands.music.leave.help.description = Leaves your voice channel. commands.music.play.load.title = %extra% Now loading %extra% commands.music.play.load.description = Trying to load the song... @@ -198,6 +202,8 @@ commands.music.play.error.match.description = I can not find a song named this o commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. +commands.music.stop.error.connected.title = No channel +commands.music.stop.error.connected.description = You have to be in the same voice channel as the bot to stop the song. commands.music.stop.help.description = Stops the song. commands.music.info.success.title = Track info commands.music.info.error.title = No playing track @@ -210,11 +216,15 @@ commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped commands.music.skip.success.description = I successfully skipped to the next song +commands.music.skip.error.connected.title = No channel +commands.music.skip.error.connected.description = You have to be in the same voice channel as the bot to skip the song. commands.music.skip.help.description = Skips the currently playing song. commands.music.volume.success.title = Successfully set commands.music.volume.success.description = I successfully set the new volume to %extra% commands.music.volume.error.int.title = Invalid number commands.music.volume.error.int.description = The volume have to be between 1 and 200 +commands.music.volume.error.connected.title = No channel +commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. commands.nsfw.gif.error.title = GIF not showing? Click here -- 2.45.3 From f9b5d1d15a687c164382359331325ac02d11ebb4 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:04 +0100 Subject: [PATCH 31/58] New translations Translations_en.properties (German) New German translation --- .../resources/Translations/Translations_de.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index 264e6b7..c269bfa 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -199,6 +199,10 @@ commands.music.play.error.load.title = %extra% Laden fehlgeschlagen %extra% commands.music.play.error.load.description = Leider kann ich das angegebene Lied nicht laden commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = Ich kann keinen Song mit diesem Namen auf YouTube finden +commands.music.play.success.unpause.title = Successfully continued +commands.music.play.success.unpause.description = I successfully continued playing the song. +commands.music.play.error.connected.title = No channel +commands.music.play.error.connected.description = You have to be in the same voice channel as the bot to continue the song. commands.music.play.help.description = Spielt den angegebenen Song ab. commands.music.stop.success.title = Erfolgreich gestoppt commands.music.stop.success.description = Ich habe den Song erfolgreich gestoppt. @@ -226,6 +230,13 @@ commands.music.volume.error.int.description = The volume have to be between 1 an commands.music.volume.error.connected.title = No channel commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. +commands.music.pause.success.title = Successfully paused +commands.music.pause.success.description = I successfully paused the played song. +commands.music.pause.error.paused.title = Already paused +commands.music.pause.error.paused.description = The song is already paused. +commands.music.pause.error.connected.title = No channel +commands.music.pause.error.connected.description = You have to be in the same voice channel as the bot to pause the song. +commands.music.pause.help.description = Pause the playing song. commands.nsfw.gif.error.title = GIF wird nicht angezeigt? Klicke hier commands.nsfw.img.error.title = Bild wird nicht angezeigt? Klicke hier -- 2.45.3 From c4f3f59b6f0ef11c1ca81ee8034fe2edc002305e Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:05 +0100 Subject: [PATCH 32/58] New translations Translations_en.properties (English) New English translation --- .../resources/Translations/Translations_en.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 50da52a..edd9925 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -199,6 +199,10 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube +commands.music.play.success.unpause.title = Successfully continued +commands.music.play.success.unpause.description = I successfully continued playing the song. +commands.music.play.error.connected.title = No channel +commands.music.play.error.connected.description = You have to be in the same voice channel as the bot to continue the song. commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. @@ -226,6 +230,13 @@ commands.music.volume.error.int.description = The volume have to be between 1 an commands.music.volume.error.connected.title = No channel commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. +commands.music.pause.success.title = Successfully paused +commands.music.pause.success.description = I successfully paused the played song. +commands.music.pause.error.paused.title = Already paused +commands.music.pause.error.paused.description = The song is already paused. +commands.music.pause.error.connected.title = No channel +commands.music.pause.error.connected.description = You have to be in the same voice channel as the bot to pause the song. +commands.music.pause.help.description = Pause the playing song. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here -- 2.45.3 From 785b895d614f723e834f1b19c808f1fefd947740 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:07 +0100 Subject: [PATCH 33/58] New translations Translations_en.properties (Spanish) New Spanish translation --- .../resources/Translations/Translations_es.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index 50da52a..edd9925 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -199,6 +199,10 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube +commands.music.play.success.unpause.title = Successfully continued +commands.music.play.success.unpause.description = I successfully continued playing the song. +commands.music.play.error.connected.title = No channel +commands.music.play.error.connected.description = You have to be in the same voice channel as the bot to continue the song. commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. @@ -226,6 +230,13 @@ commands.music.volume.error.int.description = The volume have to be between 1 an commands.music.volume.error.connected.title = No channel commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. +commands.music.pause.success.title = Successfully paused +commands.music.pause.success.description = I successfully paused the played song. +commands.music.pause.error.paused.title = Already paused +commands.music.pause.error.paused.description = The song is already paused. +commands.music.pause.error.connected.title = No channel +commands.music.pause.error.connected.description = You have to be in the same voice channel as the bot to pause the song. +commands.music.pause.help.description = Pause the playing song. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here -- 2.45.3 From c4835f5981d0de0898f34831450457c482532f35 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:08 +0100 Subject: [PATCH 34/58] New translations Translations_en.properties (French) New French translation --- .../resources/Translations/Translations_fr.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index 50da52a..edd9925 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -199,6 +199,10 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube +commands.music.play.success.unpause.title = Successfully continued +commands.music.play.success.unpause.description = I successfully continued playing the song. +commands.music.play.error.connected.title = No channel +commands.music.play.error.connected.description = You have to be in the same voice channel as the bot to continue the song. commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. @@ -226,6 +230,13 @@ commands.music.volume.error.int.description = The volume have to be between 1 an commands.music.volume.error.connected.title = No channel commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. +commands.music.pause.success.title = Successfully paused +commands.music.pause.success.description = I successfully paused the played song. +commands.music.pause.error.paused.title = Already paused +commands.music.pause.error.paused.description = The song is already paused. +commands.music.pause.error.connected.title = No channel +commands.music.pause.error.connected.description = You have to be in the same voice channel as the bot to pause the song. +commands.music.pause.help.description = Pause the playing song. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here -- 2.45.3 From 9e75a2db7a93d7a3c8e1b55fe984d247f90b18ad Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:09 +0100 Subject: [PATCH 35/58] New translations Translations_en.properties (Russian) New Russian translation --- .../resources/Translations/Translations_ru.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index 50da52a..edd9925 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -199,6 +199,10 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube +commands.music.play.success.unpause.title = Successfully continued +commands.music.play.success.unpause.description = I successfully continued playing the song. +commands.music.play.error.connected.title = No channel +commands.music.play.error.connected.description = You have to be in the same voice channel as the bot to continue the song. commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. @@ -226,6 +230,13 @@ commands.music.volume.error.int.description = The volume have to be between 1 an commands.music.volume.error.connected.title = No channel commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. +commands.music.pause.success.title = Successfully paused +commands.music.pause.success.description = I successfully paused the played song. +commands.music.pause.error.paused.title = Already paused +commands.music.pause.error.paused.description = The song is already paused. +commands.music.pause.error.connected.title = No channel +commands.music.pause.error.connected.description = You have to be in the same voice channel as the bot to pause the song. +commands.music.pause.help.description = Pause the playing song. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here -- 2.45.3 From 738e593b53c45f014c5732874366c90c731a9b24 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:11 +0100 Subject: [PATCH 36/58] New translations Translations_en.properties (Turkish) New Turkish translation --- .../resources/Translations/Translations_tr.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index 50da52a..edd9925 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -199,6 +199,10 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube +commands.music.play.success.unpause.title = Successfully continued +commands.music.play.success.unpause.description = I successfully continued playing the song. +commands.music.play.error.connected.title = No channel +commands.music.play.error.connected.description = You have to be in the same voice channel as the bot to continue the song. commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. @@ -226,6 +230,13 @@ commands.music.volume.error.int.description = The volume have to be between 1 an commands.music.volume.error.connected.title = No channel commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. +commands.music.pause.success.title = Successfully paused +commands.music.pause.success.description = I successfully paused the played song. +commands.music.pause.error.paused.title = Already paused +commands.music.pause.error.paused.description = The song is already paused. +commands.music.pause.error.connected.title = No channel +commands.music.pause.error.connected.description = You have to be in the same voice channel as the bot to pause the song. +commands.music.pause.help.description = Pause the playing song. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here -- 2.45.3 From d13b38f572fec7263e8c8b17a491576a0e0f6f0a Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:12 +0100 Subject: [PATCH 37/58] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- .../resources/Translations/Translations_zh.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index 50da52a..edd9925 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -199,6 +199,10 @@ commands.music.play.error.load.title = %extra% Load failed %extra% commands.music.play.error.load.description = Unfortunately I can not load the given song commands.music.play.error.match.title = %extra% No matches %extra% commands.music.play.error.match.description = I can not find a song named this on YouTube +commands.music.play.success.unpause.title = Successfully continued +commands.music.play.success.unpause.description = I successfully continued playing the song. +commands.music.play.error.connected.title = No channel +commands.music.play.error.connected.description = You have to be in the same voice channel as the bot to continue the song. commands.music.play.help.description = Plays the specified song. commands.music.stop.success.title = Successfully stopped commands.music.stop.success.description = I successfully stopped the song. @@ -226,6 +230,13 @@ commands.music.volume.error.int.description = The volume have to be between 1 an commands.music.volume.error.connected.title = No channel commands.music.volume.error.connected.description = You have to be in the same voice channel as the bot to change the volume. commands.music.volume.help.description = Change the volume of the music. +commands.music.pause.success.title = Successfully paused +commands.music.pause.success.description = I successfully paused the played song. +commands.music.pause.error.paused.title = Already paused +commands.music.pause.error.paused.description = The song is already paused. +commands.music.pause.error.connected.title = No channel +commands.music.pause.error.connected.description = You have to be in the same voice channel as the bot to pause the song. +commands.music.pause.help.description = Pause the playing song. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here -- 2.45.3 From 266bbef903034f60d43e23e4dc8213afff603f17 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 13:21:58 +0000 Subject: [PATCH 38/58] Bump lavaplayer from 1.3.32 to 1.3.33 Bumps lavaplayer from 1.3.32 to 1.3.33. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 712e13f..baf5300 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ com.sedmelluq lavaplayer - 1.3.32 + 1.3.33 -- 2.45.3 From e51f2c84697af975a8fb1dd9d60fcc2c156521d9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 13:22:20 +0000 Subject: [PATCH 39/58] Bump JDA from 4.1.0_93 to 4.1.0_95 Bumps JDA from 4.1.0_93 to 4.1.0_95. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 712e13f..3b0c4f9 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ net.dv8tion JDA - 4.1.0_93 + 4.1.0_95 org.json -- 2.45.3 From b79e1fbf740eeb047b96100191520c027e4f73aa Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Jan 2020 16:04:56 +0100 Subject: [PATCH 40/58] Codacy --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a443484..bad7422 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,2 @@ -FROM debian:latest +FROM debian:buster WORKDIR /home/Hadder -- 2.45.3 From 305e17568fe7dce72169f4f1676c93fe3454b57f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Jan 2020 18:21:49 +0100 Subject: [PATCH 41/58] Introducing loop command --- src/main/java/com/bbn/hadder/Hadder.java | 3 +- .../hadder/commands/music/LoopCommand.java | 36 +++++++++++++++++++ .../Translations/Translations_en.properties | 1 + 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/bbn/hadder/commands/music/LoopCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index f257042..b4a6cbb 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -102,7 +102,8 @@ public class Hadder { new VolumeCommand(), new StopCommand(), new BlacklistCommand(), - new PauseCommand()), config, helpCommand); + new PauseCommand(), + new LoopCommand()), config, helpCommand); builder.addEventListeners( new MentionListener(rethink), diff --git a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java new file mode 100644 index 0000000..014d3b4 --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java @@ -0,0 +1,36 @@ +package com.bbn.hadder.commands.music; + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; + +/** + * @author Skidder / GregTCLTK + */ + +public class LoopCommand implements Command { + + @Override + public void executed(String[] args, CommandEvent event) { + + } + + @Override + public String[] labels() { + return new String[]{"loop", "repeat"}; + } + + @Override + public String description() { + return "commands.music.loop.help.description"; + } + + @Override + public String usage() { + return null; + } + + @Override + public String example() { + return null; + } +} diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index edd9925..8ae39ff 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -237,6 +237,7 @@ commands.music.pause.error.paused.description = The song is already paused. commands.music.pause.error.connected.title = No channel commands.music.pause.error.connected.description = You have to be in the same voice channel as the bot to pause the song. commands.music.pause.help.description = Pause the playing song. +commands.music.loop.help.description = Repeats a song/queue. commands.nsfw.gif.error.title = GIF not showing? Click here commands.nsfw.img.error.title = Image not showing? Click here -- 2.45.3 From c687cef65da0e299303b4517cec019c31c7bd7e3 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Jan 2020 18:26:59 +0100 Subject: [PATCH 42/58] Error messages --- .../bbn/hadder/commands/music/LoopCommand.java | 16 +++++++++++++++- .../Translations/Translations_en.properties | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java index 014d3b4..a47b7a3 100644 --- a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java @@ -2,6 +2,7 @@ package com.bbn.hadder.commands.music; import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; /** * @author Skidder / GregTCLTK @@ -11,7 +12,20 @@ public class LoopCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { - + if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { + if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { + + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.loop.error.connected.title", + "commands.music.loop.error.connected.description") + .build()).queue(); + } + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.info.error.title", + "commands.music.info.error.description").build()).queue(); + } } @Override diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 8ae39ff..a7a3a61 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -237,6 +237,8 @@ commands.music.pause.error.paused.description = The song is already paused. commands.music.pause.error.connected.title = No channel commands.music.pause.error.connected.description = You have to be in the same voice channel as the bot to pause the song. commands.music.pause.help.description = Pause the playing song. +commands.music.loop.error.connected.title = No channel +commands.music.loop.error.connected.description = You have to be in the same voice channel as the bot to set the repeat status. commands.music.loop.help.description = Repeats a song/queue. commands.nsfw.gif.error.title = GIF not showing? Click here -- 2.45.3 From 4198f1e24580a99b870438de626fe24d4a806b5e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Jan 2020 18:38:02 +0100 Subject: [PATCH 43/58] Loop function --- .../java/com/bbn/hadder/audio/TrackManager.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index b4c1e9a..bb95194 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -19,6 +19,8 @@ public class TrackManager extends AudioEventAdapter { private final AudioPlayer player; private final Queue queue; + private boolean loop = false; + AudioTrack lastTrack; public TrackManager(AudioPlayer player) { this.player = player; @@ -48,7 +50,9 @@ public class TrackManager extends AudioEventAdapter { @Override public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { Guild g = queue.poll().getAuthor().getGuild(); - if (queue.isEmpty()) { + if (loop) { + player.startTrack(lastTrack.makeClone(), false); + } else if (queue.isEmpty()) { g.getAudioManager().closeAudioConnection(); } else { player.playTrack(queue.element().getTrack()); @@ -67,6 +71,16 @@ public class TrackManager extends AudioEventAdapter { queue.remove(entry); } + public boolean isLoop() + { + return loop; + } + + public void setLoop(boolean repeating) + { + this.loop = repeating; + } + public AudioInfo getTrackInfo(AudioTrack track) { return queue.stream().filter(audioInfo -> audioInfo.getTrack().equals(track)).findFirst().orElse(null); } -- 2.45.3 From fb0ef99d8384c9d26da56789caf5ef1c559f88e2 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Jan 2020 18:40:03 +0100 Subject: [PATCH 44/58] Integrate the loop function --- .../java/com/bbn/hadder/commands/music/LoopCommand.java | 8 +++++++- .../resources/Translations/Translations_en.properties | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java index a47b7a3..86ae1f1 100644 --- a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java @@ -14,7 +14,13 @@ public class LoopCommand implements Command { public void executed(String[] args, CommandEvent event) { if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { - + if (event.getAudioManager().getTrackManager(event.getGuild()).isLoop()) { + event.getAudioManager().getTrackManager(event.getGuild()).setLoop(false); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.loop.success.loop.title", "commands.music.loop.success.loop.description").build()).queue(); + } else { + event.getAudioManager().getTrackManager(event.getGuild()).setLoop(true); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.loop.success.unloop.title", "commands.music.loop.success.unloop.description").build()).queue(); + } } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.loop.error.connected.title", diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index a7a3a61..6e2760e 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -237,6 +237,10 @@ commands.music.pause.error.paused.description = The song is already paused. commands.music.pause.error.connected.title = No channel commands.music.pause.error.connected.description = You have to be in the same voice channel as the bot to pause the song. commands.music.pause.help.description = Pause the playing song. +commands.music.loop.success.loop.title = Successfully activated +commands.music.loop.success.loop.description = I will now repeat the currently played song. +commands.music.loop.success.unloop.title = Successfully deactivated +commands.music.loop.success.unloop.description = I will no longer repeat the currently played song. commands.music.loop.error.connected.title = No channel commands.music.loop.error.connected.description = You have to be in the same voice channel as the bot to set the repeat status. commands.music.loop.help.description = Repeats a song/queue. -- 2.45.3 From 93d5acda5d7de2c8c36f8dc02fbdbb6f55c2eac7 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Jan 2020 18:43:20 +0100 Subject: [PATCH 45/58] Switch --- src/main/java/com/bbn/hadder/commands/music/LoopCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java index 86ae1f1..5003134 100644 --- a/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/LoopCommand.java @@ -16,10 +16,10 @@ public class LoopCommand implements Command { if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { if (event.getAudioManager().getTrackManager(event.getGuild()).isLoop()) { event.getAudioManager().getTrackManager(event.getGuild()).setLoop(false); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.loop.success.loop.title", "commands.music.loop.success.loop.description").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.loop.success.unloop.title", "commands.music.loop.success.unloop.description").build()).queue(); } else { event.getAudioManager().getTrackManager(event.getGuild()).setLoop(true); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.loop.success.unloop.title", "commands.music.loop.success.unloop.description").build()).queue(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.loop.success.loop.title", "commands.music.loop.success.loop.description").build()).queue(); } } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, -- 2.45.3 From 8b855b267663fb713df81479094ade9cb9f5ea20 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 6 Jan 2020 21:11:01 +0100 Subject: [PATCH 46/58] Some stuff --- src/main/java/com/bbn/hadder/audio/TrackManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index bb95194..2c76914 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -49,9 +49,10 @@ public class TrackManager extends AudioEventAdapter { @Override public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { + this.lastTrack = track; Guild g = queue.poll().getAuthor().getGuild(); if (loop) { - player.startTrack(lastTrack.makeClone(), false); + player.playTrack(lastTrack.makeClone()); } else if (queue.isEmpty()) { g.getAudioManager().closeAudioConnection(); } else { -- 2.45.3 From c82daf0fba92b09a5cc0713e7211f127cd17141f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Tue, 7 Jan 2020 16:41:13 +0100 Subject: [PATCH 47/58] /voice --- src/main/java/com/bbn/hadder/audio/TrackManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index 2c76914..d24ea3e 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -52,7 +52,7 @@ public class TrackManager extends AudioEventAdapter { this.lastTrack = track; Guild g = queue.poll().getAuthor().getGuild(); if (loop) { - player.playTrack(lastTrack.makeClone()); + player.playTrack(this.lastTrack.makeClone()); } else if (queue.isEmpty()) { g.getAudioManager().closeAudioConnection(); } else { -- 2.45.3 From 762a383ace8982bcbca77a037aae02ee8976d663 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 7 Jan 2020 18:51:05 +0100 Subject: [PATCH 48/58] New translations Translations_en.properties (German) New German translation --- src/main/resources/Translations/Translations_de.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index c269bfa..bdd918a 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -132,8 +132,8 @@ commands.moderation.rules.channel.error.title = Kanal konnte nicht gefunden werd commands.moderation.rules.channel.error.description = Ich kann den angegebenen Kanal nicht finden. Bitte starte das Setup erneut. commands.moderation.rules.rules.title = Rules message commands.moderation.rules.rules.description = Der Kanal wurde erfolgreich auf %extra% gesetzt. Bitte senden Sie mir jetzt die Regeln. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.title = Role to assign/remove +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives/loses after he accepted the rules. commands.moderation.rules.role.error.title = Rolle existiert nicht commands.moderation.rules.role.error.description = The specified role does not exist on this guild. commands.moderation.rules.role.permission.error.title = No permission @@ -215,7 +215,7 @@ commands.music.info.error.description = I am not playing anything at the moment commands.music.info.help.description = Zeigt Informationen über das abgespielte Lied. commands.music.queue.error.title = Keine Warteschlange commands.music.queue.error.description = Momentan sind keine Lieder in der Warteschlange -commands.music.queue.success.title = Warteschlange +commands.music.queue.success.title = Queue %extra% commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Erfolgreich übersprungen -- 2.45.3 From 3fc63b57d955ce120aedf1dfc6038a3c1349e7a0 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 7 Jan 2020 18:51:06 +0100 Subject: [PATCH 49/58] New translations Translations_en.properties (English) New English translation --- src/main/resources/Translations/Translations_en.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index edd9925..f5dd88b 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -132,8 +132,8 @@ commands.moderation.rules.channel.error.title = Channel not found commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. commands.moderation.rules.rules.title = Rules message commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.title = Role to assign/remove +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives/loses after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. commands.moderation.rules.role.permission.error.title = No permission @@ -215,7 +215,7 @@ commands.music.info.error.description = I am not playing anything at the moment commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment -commands.music.queue.success.title = Queue +commands.music.queue.success.title = Queue %extra% commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped -- 2.45.3 From e56c2d94ebacada792a99c41330f789b6ca9bd54 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 7 Jan 2020 18:51:08 +0100 Subject: [PATCH 50/58] New translations Translations_en.properties (Spanish) New Spanish translation --- src/main/resources/Translations/Translations_es.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index edd9925..f5dd88b 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -132,8 +132,8 @@ commands.moderation.rules.channel.error.title = Channel not found commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. commands.moderation.rules.rules.title = Rules message commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.title = Role to assign/remove +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives/loses after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. commands.moderation.rules.role.permission.error.title = No permission @@ -215,7 +215,7 @@ commands.music.info.error.description = I am not playing anything at the moment commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment -commands.music.queue.success.title = Queue +commands.music.queue.success.title = Queue %extra% commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped -- 2.45.3 From b9379a2ab49db9d2758944d26325dcd8e964b3be Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 7 Jan 2020 18:51:09 +0100 Subject: [PATCH 51/58] New translations Translations_en.properties (French) New French translation --- src/main/resources/Translations/Translations_fr.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index edd9925..f5dd88b 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -132,8 +132,8 @@ commands.moderation.rules.channel.error.title = Channel not found commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. commands.moderation.rules.rules.title = Rules message commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.title = Role to assign/remove +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives/loses after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. commands.moderation.rules.role.permission.error.title = No permission @@ -215,7 +215,7 @@ commands.music.info.error.description = I am not playing anything at the moment commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment -commands.music.queue.success.title = Queue +commands.music.queue.success.title = Queue %extra% commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped -- 2.45.3 From 5a5644988620a3b85ce86309735e5376472b45b8 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 7 Jan 2020 18:51:10 +0100 Subject: [PATCH 52/58] New translations Translations_en.properties (Russian) New Russian translation --- src/main/resources/Translations/Translations_ru.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index edd9925..f5dd88b 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -132,8 +132,8 @@ commands.moderation.rules.channel.error.title = Channel not found commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. commands.moderation.rules.rules.title = Rules message commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.title = Role to assign/remove +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives/loses after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. commands.moderation.rules.role.permission.error.title = No permission @@ -215,7 +215,7 @@ commands.music.info.error.description = I am not playing anything at the moment commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment -commands.music.queue.success.title = Queue +commands.music.queue.success.title = Queue %extra% commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped -- 2.45.3 From bfd2888ad896664c402904b99a9ea7a20d5cab44 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 7 Jan 2020 18:51:12 +0100 Subject: [PATCH 53/58] New translations Translations_en.properties (Turkish) New Turkish translation --- src/main/resources/Translations/Translations_tr.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index edd9925..f5dd88b 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -132,8 +132,8 @@ commands.moderation.rules.channel.error.title = Channel not found commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. commands.moderation.rules.rules.title = Rules message commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.title = Role to assign/remove +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives/loses after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. commands.moderation.rules.role.permission.error.title = No permission @@ -215,7 +215,7 @@ commands.music.info.error.description = I am not playing anything at the moment commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment -commands.music.queue.success.title = Queue +commands.music.queue.success.title = Queue %extra% commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped -- 2.45.3 From 0f558eb3170db326dda8714ce2e8716a1702c543 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 7 Jan 2020 18:51:13 +0100 Subject: [PATCH 54/58] New translations Translations_en.properties (Chinese Simplified) New Chinese Simplified translation --- src/main/resources/Translations/Translations_zh.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index edd9925..f5dd88b 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -132,8 +132,8 @@ commands.moderation.rules.channel.error.title = Channel not found commands.moderation.rules.channel.error.description = I can't find the specified channel. Please start the setup again. commands.moderation.rules.rules.title = Rules message commands.moderation.rules.rules.description = The channel was successfully set to %extra%. Please send me the rules now. -commands.moderation.rules.role.title = Role to assign -commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives after he accepted the rules. +commands.moderation.rules.role.title = Role to assign/remove +commands.moderation.rules.role.description = The rules were successfully set. Please send me the name of the role which the user receives/loses after he accepted the rules. commands.moderation.rules.role.error.title = Role does not exist commands.moderation.rules.role.error.description = The specified role does not exist on this guild. commands.moderation.rules.role.permission.error.title = No permission @@ -215,7 +215,7 @@ commands.music.info.error.description = I am not playing anything at the moment commands.music.info.help.description = Shows information about the playing song. commands.music.queue.error.title = No queue commands.music.queue.error.description = There are no queued songs at the moment -commands.music.queue.success.title = Queue +commands.music.queue.success.title = Queue %extra% commands.music.queue.success.description = This is the queue\: \n %extra% commands.music.queue.help.description = Shows the music queue. commands.music.skip.success.title = Successfully skipped -- 2.45.3 From c559c9cb569fb6e12d33a9ec6cffea5ec1847103 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 9 Jan 2020 16:55:05 +0100 Subject: [PATCH 55/58] Best commit ;) --- pom.xml | 10 +++++----- src/main/java/com/bbn/hadder/Rethink.java | 5 ++++- src/main/java/com/bbn/hadder/audio/TrackManager.java | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 1dfff84..23010ad 100644 --- a/pom.xml +++ b/pom.xml @@ -26,11 +26,11 @@ json 20190722 - - com.rethinkdb - rethinkdb-driver - 2.3.3 - + + com.rethinkdb + rethinkdb-driver + 2.3.3 + org.slf4j slf4j-simple diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 6ef9d10..53b7116 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -133,7 +133,10 @@ public class Rethink { } public void insertUser(String id) { - this.insert("user", r.hashMap("id", id).with("prefix", "h.").with("language", "en").with("blacklisted", "none")); + this.insert("user", r.hashMap("id", id) + .with("prefix", "h.") + .with("language", "en") + .with("blacklisted", "none")); } public void setBlackListed(String id, String commands) { diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index d24ea3e..ed3e93b 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -52,6 +52,7 @@ public class TrackManager extends AudioEventAdapter { this.lastTrack = track; Guild g = queue.poll().getAuthor().getGuild(); if (loop) { + player.playTrack(this.lastTrack.makeClone()); } else if (queue.isEmpty()) { g.getAudioManager().closeAudioConnection(); -- 2.45.3 From 78e67fea3132b9a363b73abcbc1635cc71a111d2 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 9 Jan 2020 16:58:38 +0100 Subject: [PATCH 56/58] New Rethink functions --- src/main/java/com/bbn/hadder/Rethink.java | 28 +++++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 53b7116..5ff7c94 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -70,6 +70,22 @@ public class Rethink { } } + public void update(String table, String value, String what, int whatvalue) { + try { + r.table(table).get(value).update(r.hashMap(what, whatvalue)).run(conn); + } catch (ClassCastException e) { + e.printStackTrace(); + } + } + + public void update(String table, String value, String what, boolean whatvalue) { + try { + r.table(table).get(value).update(r.hashMap(what, whatvalue)).run(conn); + } catch (ClassCastException e) { + e.printStackTrace(); + } + } + public void insert(String table, Object object) { try { r.table(table).insert(object).run(conn); @@ -122,7 +138,8 @@ public class Rethink { } public void insertGuild(String id) { - this.insert("server", r.hashMap("id", id) + this.insert("server", r + .hashMap("id", id) .with("prefix", "h.") .with("message_id", "") .with("role_id", "") @@ -133,7 +150,8 @@ public class Rethink { } public void insertUser(String id) { - this.insert("user", r.hashMap("id", id) + this.insert("user", r + .hashMap("id", id) .with("prefix", "h.") .with("language", "en") .with("blacklisted", "none")); @@ -207,11 +225,7 @@ public class Rethink { } public void setInviteDetection(String guild_id, boolean b) { - try { - r.table("server").get(guild_id).update(r.hashMap("invite_detect", b)).run(conn); - } catch (ClassCastException e) { - e.printStackTrace(); - } + this.update("server", guild_id, "invite_detect", b); } public Boolean getInviteDetection(String guild_id) { -- 2.45.3 From 29c491fae9a5022a3d27f68ee0aec2cdd268f3c8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2020 13:42:45 +0000 Subject: [PATCH 57/58] Bump discord-webhooks from 0.1.8 to 0.2.0 Bumps discord-webhooks from 0.1.8 to 0.2.0. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 23010ad..6926c73 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ club.minnced discord-webhooks - 0.1.8 + 0.2.0 org.kohsuke -- 2.45.3 From 3de4153c873c33e06c011520ea435ff1b5658d21 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 10 Jan 2020 19:26:03 +0100 Subject: [PATCH 58/58] Loop command fix --- src/main/java/com/bbn/hadder/audio/TrackManager.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bbn/hadder/audio/TrackManager.java b/src/main/java/com/bbn/hadder/audio/TrackManager.java index ed3e93b..489c12f 100644 --- a/src/main/java/com/bbn/hadder/audio/TrackManager.java +++ b/src/main/java/com/bbn/hadder/audio/TrackManager.java @@ -20,7 +20,6 @@ public class TrackManager extends AudioEventAdapter { private final AudioPlayer player; private final Queue queue; private boolean loop = false; - AudioTrack lastTrack; public TrackManager(AudioPlayer player) { this.player = player; @@ -49,11 +48,9 @@ public class TrackManager extends AudioEventAdapter { @Override public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) { - this.lastTrack = track; - Guild g = queue.poll().getAuthor().getGuild(); + Guild g = queue.element().getAuthor().getGuild(); if (loop) { - - player.playTrack(this.lastTrack.makeClone()); + player.playTrack(track.makeClone()); } else if (queue.isEmpty()) { g.getAudioManager().closeAudioConnection(); } else { -- 2.45.3