From 54c4898a0d1810f71300c4d468c3ae9e49b0d71f Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:10:58 +0100 Subject: [PATCH 01/41] 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. From 3c6e940efcc24c2fecf3e4fbb0b576bfc3ce008b Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:10:59 +0100 Subject: [PATCH 02/41] 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. From 7a6360cef07bfd4e7d9d288188bb643bc4c75a5a Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:11:00 +0100 Subject: [PATCH 03/41] 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. From 75eb635b136627169dc68eeb3bc1e9c6047b4f44 Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:11:02 +0100 Subject: [PATCH 04/41] 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. From ea5b80a0c95ffb1fce82a15bdb3fd7519424eddf Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:11:03 +0100 Subject: [PATCH 05/41] 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. From aefcc0b8e30ed9d11ed0e8c0aa4b0433a6a759d8 Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:11:04 +0100 Subject: [PATCH 06/41] 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. From 6dfa336a854bd7bb48ec5456c759cccd45f84d35 Mon Sep 17 00:00:00 2001 From: Skidder Date: Wed, 1 Jan 2020 17:11:05 +0100 Subject: [PATCH 07/41] 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. From 190131f355a4d26b511942c262f8029ed5be6e42 Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 2 Jan 2020 23:10:45 +0100 Subject: [PATCH 08/41] 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] From ec25c6f3483fae28c7aa63907ccf406f19ed77e3 Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 2 Jan 2020 23:20:47 +0100 Subject: [PATCH 09/41] 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 From 5e96768fe8a53bd478dd96a3a4c915d7bd00d25d Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 2 Jan 2020 23:30:47 +0100 Subject: [PATCH 10/41] 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 From 8909529a9d40fb286f7c3dcda9728da76e44e612 Mon Sep 17 00:00:00 2001 From: Skidder Date: Thu, 2 Jan 2020 23:40:39 +0100 Subject: [PATCH 11/41] 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. From 484f275a11a4f6ee35815b22007925b1e81f7169 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:06 +0100 Subject: [PATCH 12/41] 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 From f7cf03c239a6a45515930bb56fdaa69fc35a7688 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:07 +0100 Subject: [PATCH 13/41] 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 From 3b38f706554563a72b78b63d57767deb96eb3848 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:09 +0100 Subject: [PATCH 14/41] 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 From c47c4eaf34110622e26689da842738cd27877ef6 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:10 +0100 Subject: [PATCH 15/41] 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 From 7638a89f280414946b501c347fbd4cf758b0239d Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:11 +0100 Subject: [PATCH 16/41] 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 From b480ea457f66f131108a9b22e200435af67a3618 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:13 +0100 Subject: [PATCH 17/41] 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 From a6b436a475336b2110eee8aa2db8ce1262605b9e Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 15:41:14 +0100 Subject: [PATCH 18/41] 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 From a894d1463204ce74edda1815e4346082dbe028f0 Mon Sep 17 00:00:00 2001 From: Skidder Date: Fri, 3 Jan 2020 22:10:30 +0100 Subject: [PATCH 19/41] 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 From 3f58aacb9d1070646cdba626a4361cf244d15082 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 00:00:29 +0100 Subject: [PATCH 20/41] 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 From 924309a5de1b48b4e5e7b0fa4d97fe2fc455fd28 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 00:10:30 +0100 Subject: [PATCH 21/41] 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. From ba46d948ccbc55a10b9503b91fbfa70bbfc6b69e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 4 Jan 2020 13:58:55 +0100 Subject: [PATCH 22/41] Perm error msg --- src/main/java/com/bbn/hadder/Hadder.java | 2 + .../hadder/commands/music/JoinCommand.java | 45 ++++++++++++------- .../Translations/Translations_en.properties | 2 + 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 85ca64f..30e53a0 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -11,6 +11,7 @@ import com.bbn.hadder.commands.settings.*; import com.bbn.hadder.commands.music.*; import com.bbn.hadder.core.*; import com.bbn.hadder.listener.*; +import net.dv8tion.jda.api.OnlineStatus; import net.dv8tion.jda.api.entities.Activity; import net.dv8tion.jda.api.sharding.DefaultShardManagerBuilder; import net.dv8tion.jda.api.sharding.ShardManager; @@ -39,6 +40,7 @@ public class Hadder { builder.setAutoReconnect(true); builder.setShardsTotal(1); builder.setActivity(Activity.streaming("on the BigBotNetwork", "https://twitch.tv/BigBotNetwork")); + builder.setStatus(OnlineStatus.DO_NOT_DISTURB); builder.setToken(config.getBotToken()); HelpCommand helpCommand = new HelpCommand(); diff --git a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java index ceafccd..acce3c6 100644 --- a/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/JoinCommand.java @@ -4,6 +4,7 @@ import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.entities.VoiceChannel; +import net.dv8tion.jda.api.exceptions.InsufficientPermissionException; import net.dv8tion.jda.api.managers.AudioManager; /* @@ -20,15 +21,22 @@ public class JoinCommand implements Command { VoiceChannel vc = event.getMember().getVoiceState().getChannel(); if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) { if (!event.getGuild().getSelfMember().getVoiceState().getChannel().getId().equals(vc.getId())) { - event.getGuild().getAudioManager().openAudioConnection(vc); - event.getTextChannel().sendMessage( - event.getMessageEditor().getMessage( - MessageEditor.MessageType.INFO, - "commands.music.join.success.title", - "", - "commands.music.join.success.description", - vc.getName()) - .build()).queue(); + try { + event.getGuild().getAudioManager().openAudioConnection(vc); + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.music.join.success.title", + "", + "commands.music.join.success.description", + vc.getName()) + .build()).queue(); + } catch (InsufficientPermissionException e) { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.join.error.permission.title", + "commands.music.join.error.permission.description") + .build()).queue(); + } } else { event.getTextChannel().sendMessage( event.getMessageEditor().getMessage( @@ -38,12 +46,19 @@ public class JoinCommand implements Command { .build()).queue(); } } else { - event.getGuild().getAudioManager().openAudioConnection(vc); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( - MessageEditor.MessageType.INFO, - "commands.music.join.success.title", "", - "commands.music.join.success.description", vc.getName()) - .build()).queue(); + try { + event.getGuild().getAudioManager().openAudioConnection(vc); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.music.join.success.title", "", + "commands.music.join.success.description", vc.getName()) + .build()).queue(); + } catch (InsufficientPermissionException e) { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.join.error.permission.title", + "commands.music.join.error.permission.description") + .build()).queue(); + } } } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 650848b..c054233 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -178,6 +178,8 @@ 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 From 7a09a2b1bc43d1b79a2fd080d1a9a29b36bfa751 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 4 Jan 2020 14:39:02 +0100 Subject: [PATCH 23/41] More error messages --- .../hadder/commands/music/LeaveCommand.java | 23 ++++++++---- .../hadder/commands/music/SkipCommand.java | 14 +++++-- .../hadder/commands/music/StopCommand.java | 21 +++++++---- .../hadder/commands/music/VolumeCommand.java | 37 +++++++++++-------- .../Translations/Translations_en.properties | 12 +++++- 5 files changed, 71 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java index ec9043c..8636984 100644 --- a/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java @@ -13,17 +13,24 @@ public class LeaveCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { if (event.getGuild().getSelfMember().getVoiceState().inVoiceChannel()) { - event.getGuild().getAudioManager().closeAudioConnection(); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( - MessageEditor.MessageType.INFO, - "commands.music.leave.success.title", - "commands.music.leave.success.description") - .build()).queue(); + if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { + event.getGuild().getAudioManager().closeAudioConnection(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( + MessageEditor.MessageType.INFO, + "commands.music.leave.success.title", + "commands.music.leave.success.description") + .build()).queue(); + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.leave.error.channel.title", + "commands.music.leave.error.channel.description") + .build()).queue(); + } } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage( MessageEditor.MessageType.ERROR, - "commands.music.leave.error.tile", - "commands.music.leave.error.description") + "commands.music.leave.error.connected.tile", + "commands.music.leave.error.connected.description") .build()).queue(); } } diff --git a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java index c2265bd..40f366f 100644 --- a/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/SkipCommand.java @@ -13,10 +13,16 @@ public class SkipCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { if (event.getAudioManager().hasPlayer(event.getGuild()) && !event.getAudioManager().getTrackManager(event.getGuild()).getQueuedTracks().isEmpty()) { - event.getAudioManager().forceSkipTrack(event); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, - "commands.music.skip.success.title", - "commands.music.skip.success.description").build()).queue(); + if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { + event.getAudioManager().forceSkipTrack(event); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.skip.success.title", + "commands.music.skip.success.description").build()).queue(); + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.skip.error.connected.title", + "commands.music.skip.error.connected.description ").build()).queue(); + } } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.info.error.title", diff --git a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java index b9336bc..56cd891 100644 --- a/src/main/java/com/bbn/hadder/commands/music/StopCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/StopCommand.java @@ -13,13 +13,20 @@ public class StopCommand implements Command { @Override public void executed(String[] args, CommandEvent event) { if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { - event.getAudioManager().players.remove(event.getGuild().getId()); - event.getAudioManager().getPlayer(event.getGuild()).destroy(); - event.getAudioManager().getTrackManager(event.getGuild()).purgeQueue(); - event.getGuild().getAudioManager().closeAudioConnection(); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, - "commands.music.stop.success.title", - "commands.music.stop.success.description").build()).queue(); + if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { + event.getAudioManager().players.remove(event.getGuild().getId()); + event.getAudioManager().getPlayer(event.getGuild()).destroy(); + event.getAudioManager().getTrackManager(event.getGuild()).purgeQueue(); + event.getGuild().getAudioManager().closeAudioConnection(); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.stop.success.title", + "commands.music.stop.success.description").build()).queue(); + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.stop.error.connected.title", + "commands.music.stop.error.connected.description") + .build()).queue(); + } } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, "commands.music.info.error.title", diff --git a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java index d0d058b..a7d3546 100644 --- a/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/VolumeCommand.java @@ -14,22 +14,29 @@ public class VolumeCommand implements Command { public void executed(String[] args, CommandEvent event) { if (args.length > 0) { if (event.getAudioManager().hasPlayer(event.getGuild()) && event.getAudioManager().getPlayer(event.getGuild()).getPlayingTrack() != null) { - try { - int volume = Integer.parseInt(args[0]); - if (volume < 201 && volume > 0 || event.getConfig().getOwners().contains(event.getAuthor().getIdLong())) { - event.getAudioManager().getPlayer(event.getGuild()).setVolume(volume); - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, - "commands.music.volume.success.title", "", - "commands.music.volume.success.description", String.valueOf(volume)).build()).queue(); - } else { - event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, - "commands.music.volume.error.int.title", - "commands.music.volume.error.int.description").build()).queue(); + if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { + try { + int volume = Integer.parseInt(args[0]); + if (volume < 201 && volume > 0 || event.getConfig().getOwners().contains(event.getAuthor().getIdLong())) { + event.getAudioManager().getPlayer(event.getGuild()).setVolume(volume); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.volume.success.title", "", + "commands.music.volume.success.description", String.valueOf(volume)).build()).queue(); + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.volume.error.int.title", + "commands.music.volume.error.int.description").build()).queue(); + } + } catch (NumberFormatException e) { + event.getHelpCommand().sendHelp(this, event); + } catch (Exception e) { + e.printStackTrace(); } - } catch (NumberFormatException e) { - event.getHelpCommand().sendHelp(this, event); - } catch (Exception e) { - e.printStackTrace(); + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.volume.error.connected.title", + "commands.volume.stop.error.connected.description") + .build()).queue(); } } else { event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index c054233..50da52a 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -183,8 +183,10 @@ commands.music.join.error.permission.description = I am not allowed to join your 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... @@ -200,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 @@ -212,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 From e2ebdf20a9eba5b8208d412427219f2621c22710 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 4 Jan 2020 14:42:09 +0100 Subject: [PATCH 24/41] #300 --- .../java/com/bbn/hadder/commands/music/PlayCommand.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java index 299d222..55808e1 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java @@ -4,6 +4,7 @@ import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.entities.Message; +import net.dv8tion.jda.api.exceptions.InsufficientPermissionException; import java.net.URL; @@ -24,6 +25,11 @@ public class PlayCommand implements Command { "commands.music.play.load.title", "⭕", "commands.music.play.load.description", "").build()).complete(); event.getAudioManager().loadTrack(input, event, msg); + } catch (InsufficientPermissionException e) { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.join.error.permission.title", + "commands.music.join.error.permission.description") + .build()).queue(); } catch (Exception ignore) { Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, "commands.music.play.load.title", "⭕", From c522fd176964658b76149e67a1efa9c5616e8325 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:50:55 +0100 Subject: [PATCH 25/41] 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 From a0be7a635bc661eaa6276df24cbac2513765d289 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:50:56 +0100 Subject: [PATCH 26/41] 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 From 0fa5160c57e4dd7612f3f9cabda65874d413afcc Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:50:57 +0100 Subject: [PATCH 27/41] 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 From 533e54db438d169ce707d5b3b5300fc0d7072466 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:50:59 +0100 Subject: [PATCH 28/41] 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 From 7be9777fb303ce33ccee3475962f0a6a1106a39a Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:51:00 +0100 Subject: [PATCH 29/41] 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 From 7e05b76ea78b059fef5eed40d6322a73e316f736 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:51:01 +0100 Subject: [PATCH 30/41] 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 From ece9abb8176d9f56488063df091e769004c02637 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sat, 4 Jan 2020 14:51:03 +0100 Subject: [PATCH 31/41] 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 From 16f1dd8e5f8f7d433b141b0da6820ad4af5cf30a Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 5 Jan 2020 01:04:10 +0100 Subject: [PATCH 32/41] Just for fun --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..a443484 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,2 @@ +FROM debian:latest +WORKDIR /home/Hadder From 78dfaa6f7b34f942178f19cee6894d032e1379f1 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 5 Jan 2020 01:36:16 +0100 Subject: [PATCH 33/41] Pause Command --- src/main/java/com/bbn/hadder/Hadder.java | 3 +- .../hadder/commands/music/PauseCommand.java | 61 +++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/bbn/hadder/commands/music/PauseCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 30e53a0..f257042 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -101,7 +101,8 @@ public class Hadder { new EditRulesCommand(), new VolumeCommand(), new StopCommand(), - new BlacklistCommand()), config, helpCommand); + new BlacklistCommand(), + new PauseCommand()), config, helpCommand); builder.addEventListeners( new MentionListener(rethink), diff --git a/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java b/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java new file mode 100644 index 0000000..f67a099 --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/music/PauseCommand.java @@ -0,0 +1,61 @@ +package com.bbn.hadder.commands.music; + +/* + * @author Skidder / GregTCLTK + */ + +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; + +public class PauseCommand 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())) { + if (!event.getAudioManager().getPlayer(event.getGuild()).isPaused()) { + event.getAudioManager().getPlayer(event.getGuild()).setPaused(true); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.pause.success.title", + "commands.music.pause.success.description") + .build()).queue(); + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.pause.error.paused.title", + "commands.music.pause.error.paused.description") + .build()).queue(); + } + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.pause.error.connected.title", + "commands.music.pause.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 + public String[] labels() { + return new String[]{"pause"}; + } + + @Override + public String description() { + return "commands.music.pause.help.description"; + } + + @Override + public String usage() { + return null; + } + + @Override + public String example() { + return null; + } +} From 3af62f2f25fcc88d5eb5d76b1eb7f3c83a184e58 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 5 Jan 2020 01:36:26 +0100 Subject: [PATCH 34/41] Unpause feature --- .../com/bbn/hadder/commands/music/PlayCommand.java | 13 +++++++++++++ .../Translations/Translations_en.properties | 11 +++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java index 55808e1..1646769 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java @@ -43,6 +43,19 @@ public class PlayCommand implements Command { "commands.music.join.error.channel.description") .build()).queue(); } + } else if (event.getAudioManager().getPlayer(event.getGuild()).isPaused()) { + if (event.getMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().inVoiceChannel() && event.getGuild().getSelfMember().getVoiceState().getChannel().equals(event.getMember().getVoiceState().getChannel())) { + event.getAudioManager().getPlayer(event.getGuild()).setPaused(false); + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.music.play.success.unpause.title", + "commands.music.play.success.unpause.description") + .build()).queue(); + } else { + event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.music.play.error.connected.title", + "commands.music.play.error.connected.description") + .build()).queue(); + } } else event.getHelpCommand().sendHelp(this, event); } 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 From f9b5d1d15a687c164382359331325ac02d11ebb4 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:04 +0100 Subject: [PATCH 35/41] 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 From c4f3f59b6f0ef11c1ca81ee8034fe2edc002305e Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:05 +0100 Subject: [PATCH 36/41] 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 From 785b895d614f723e834f1b19c808f1fefd947740 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:07 +0100 Subject: [PATCH 37/41] 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 From c4835f5981d0de0898f34831450457c482532f35 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:08 +0100 Subject: [PATCH 38/41] 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 From 9e75a2db7a93d7a3c8e1b55fe984d247f90b18ad Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:09 +0100 Subject: [PATCH 39/41] 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 From 738e593b53c45f014c5732874366c90c731a9b24 Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:11 +0100 Subject: [PATCH 40/41] 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 From d13b38f572fec7263e8c8b17a491576a0e0f6f0a Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 5 Jan 2020 01:41:12 +0100 Subject: [PATCH 41/41] 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