diff --git a/pom.xml b/pom.xml index 5028ed4..da35d33 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Hadder Hadder - 1.3.3 + 1.3.11 Hadder 2019 Hadder is a multi-purpose Discord bot. @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_148 + 4.1.1_149 org.json @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.0 + 2.4.2 org.slf4j @@ -96,7 +96,7 @@ com.sedmelluq lavaplayer - 1.3.47 + 1.3.48 com.fasterxml.jackson.core diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 4335d3b..2fe8cf3 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -52,7 +52,7 @@ public class Hadder { Rethink rethink = new Rethink(config); rethink.connect(); - DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.GUILD_MEMBERS, GatewayIntent.DIRECT_MESSAGE_REACTIONS, GatewayIntent.GUILD_PRESENCES, GatewayIntent.GUILD_VOICE_STATES, GatewayIntent.GUILD_EMOJIS, GatewayIntent.GUILD_MESSAGES); + DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.getIntents(GatewayIntent.ALL_INTENTS)); builder.setAutoReconnect(true); builder.setShardsTotal(1); diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 5f8ee59..069209f 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -21,12 +21,10 @@ import com.rethinkdb.RethinkDB; import com.rethinkdb.gen.exc.ReqlNonExistenceError; import com.rethinkdb.gen.exc.ReqlOpFailedError; import com.rethinkdb.net.Connection; -import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import java.lang.reflect.Field; -import java.util.NoSuchElementException; public class Rethink { private RethinkDB r = RethinkDB.r; @@ -52,33 +50,12 @@ public class Rethink { } } - private JSONArray getAsArray(String table, String where, String value) { - try { - String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn); - return new JSONArray(string); - } catch (NoSuchElementException e) { - return null; - } catch (Exception e) { - e.printStackTrace(); - } - return new JSONArray(); - } - - public Object get(String table, String where, String value, String column) { - JSONArray array = this.getAsArray(table, where, value); - if (array.length() > 0) - if (array.getJSONObject(0).has(column)) - return array.getJSONObject(0).get(column); - else return null; - else return null; - } - public Object getByID(String table, String where, String column) { - return r.table(table).get(where).getField(column).run(conn); + return r.table(table).get(where).getField(column).run(conn).first(); } public JSONObject getObjectByID(String table, String id) { - String response = r.table(table).get(id).toJson().run(conn); + String response = String.valueOf(r.table(table).get(id).toJson().run(conn).first()); try { return new JSONObject(response); } catch (JSONException e) { @@ -163,7 +140,7 @@ public class Rethink { } } - public void pushServer(RethinkServer server) { + public void push(RethinkServer server) { JSONObject object = new JSONObject(); for (Field field : server.getClass().getDeclaredFields()) { if (!field.getName().equals("rethink")) { @@ -177,7 +154,7 @@ public class Rethink { r.table("server").get(server.getId()).update(object.toMap()).run(conn); } - public void pushUser(RethinkUser user) { + public void push(RethinkUser user) { JSONObject object = new JSONObject(); for (Field field : user.getClass().getDeclaredFields()) { if (!field.getName().equals("rethink")) { diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/RethinkServer.java index 200e13a..e54dfd9 100644 --- a/src/main/java/com/bbn/hadder/RethinkServer.java +++ b/src/main/java/com/bbn/hadder/RethinkServer.java @@ -128,6 +128,6 @@ public class RethinkServer { } public void push() { - rethink.pushServer(this); + rethink.push(this); } } diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/RethinkUser.java index cc3b41d..0579947 100644 --- a/src/main/java/com/bbn/hadder/RethinkUser.java +++ b/src/main/java/com/bbn/hadder/RethinkUser.java @@ -76,6 +76,6 @@ public class RethinkUser { } public void push() { - rethink.pushUser(this); + rethink.push(this); } } diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties index fdfd4e0..8d5f954 100644 --- a/src/main/resources/Translations/Translations_de.properties +++ b/src/main/resources/Translations/Translations_de.properties @@ -88,26 +88,20 @@ commands.misc.screenshare.channel.existing.error = Warte ma' commands.misc.screenshare.channel.existing.description = Es existiert kein Sprachkanal mit diesem Namen. \n\nHinweis\: Stelle sicher, dass der Sprachkanal auf diesem Server ist. commands.misc.screenshare.help.description = Zeigt dir den Link zum Teilen deines Bildschirms. commands.misc.serverstats.title = Serverstatistiken -commands.misc.serverstats.description = Diese Nachricht enthält einige Informationen über `&extra&` -commands.misc.serverstats.help.description = Zeigt Informationen über einen Server. +commands.misc.serverstats.description = This message contains some information about `%extra%` +commands.misc.serverstats.help.description = Shows information about a server. commands.misc.profile.error.title = Nicht gefunden commands.misc.profile.error.description = Ich kann den angegebenen Benutzer nicht finden. -commands.misc.profile.help.description = Zeigt einige Informationen über den angegebenen Benutzer. +commands.misc.profile.help.description = Shows some information about the specified user. commands.misc.code.success.title = Informationen zum Einladungscode commands.misc.code.success.description = Diese Nachricht enthält einige Informationen über den angegebenen Einladungscode. commands.misc.code.error.title = Code nicht gefunden commands.misc.code.error.description = Ich kann den angegebenen Einladungscode nicht finden. -commands.misc.code.help.description = Zeigt Informationen über einen Einladungs-Code. -commands.misc.moveall.success.title = Erfolgreich verschoben -commands.misc.moveall.success.description = Ich habe erfolgreich %extra% Mitglieder verschoben. Viel Spaß\! -commands.misc.moveall.error.equals.title = Nicht zweimal -commands.misc.moveall.error.equals.description = Der erste Sprachkanal gleicht dem zweiten. Du musst zwei verschiedene Sprachkanäle angeben. -commands.misc.moveall.error.source.int.title = Ungültige ID -commands.misc.moveall.error.source.int.description = You didn't specified a ID as the source channel. -commands.misc.moveall.error.target.int.title = Ungültige ID -commands.misc.moveall.error.target.int.description = You didn't specified a ID as the target channel. -commands.misc.moveall.help.description = Verschiebt alle Benutzer des Ursprungskanals in den Zielkanal. -commands.misc.corona.help.description = Zeigt die neuesten Statistiken von COVID-19 +commands.misc.code.help.description = Shows information about a invite code. +commands.misc.moveall.success.title = Successfully moved +commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun\! +commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. +commands.misc.corona.help.description = Show the newest stats about COVID-19 commands.moderation.ban.success.title = Erfolgreich gebannt commands.moderation.ban.success.description = Ich habe %extra% erfolgreich gebannt @@ -127,17 +121,17 @@ commands.moderation.clear.message.error.title = Keine Nachrichten\! commands.moderation.clear.message.error.description = Es gibt keine Nachrichten in diesem Kanal. commands.moderation.clear.help.description = Löscht die angegebene Anzahl von Nachrichten. commands.moderation.prefix.success.title = Erfolgreich festgelegt -commands.moderation.prefix.success.description = Ich habe erfolgreich den neuen Prefix für den Server auf `%extra% ` gesetzt. +commands.moderation.prefix.success.description = I successfully set the new prefix for the server to `%extra%`. 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 Erkennung für Einladungslinks auf diesem Server aktiviert. +commands.moderation.invitedetect.activate.success.description = I successfully activated the invite link detection for this server. commands.moderation.invitedetect.activate.error.title = Bereits aktiviert -commands.moderation.invitedetect.activate.error.description = Die Erkennung von Einladungs-Links ist auf diesem Server bereits aktiviert. +commands.moderation.invitedetect.activate.error.description = The invite link detection is already activated on this server. commands.moderation.invitedetect.deactivate.success.title = Erfolgreich deaktiviert -commands.moderation.invitedetect.deactivate.success.description = Ich habe erfolgreich die Erkennung für Einladungslinks auf diesem Server deaktiviert. +commands.moderation.invitedetect.deactivate.success.description = I successfully deactivated the invite link detection for this server. commands.moderation.invitedetect.deactivate.error.title = Bereits deaktiviert -commands.moderation.invitedetect.deactivate.error.description = Die Erkennung von Einladungs-Links ist auf diesem Server bereits deaktiviert. +commands.moderation.invitedetect.deactivate.error.description = The invite link detection is already deactivated on this server. commands.moderation.invitedetect.help.description = Aktiviert oder deaktiviert die Discord Einladungserkennung. commands.moderation.kick.success.title = %extra% Erfolgreich gekickt %extra% commands.moderation.kick.success.description = Ich habe %extra% erfolgreich gekickt. @@ -155,7 +149,7 @@ commands.moderation.nick.help.description = Benennt einen oder mehrere Benutzer commands.moderation.regionchange.regions.title = Alle Regionen commands.moderation.regionchange.success.title = Region erfolgreich gesetzt commands.moderation.regionchange.success.description = Ich habe die neue Serverregion erfolgreich zu %extra% geändert. -commands.moderation.regionchange.help.description = Ändert die Server Region zu gesperrten Regionen. +commands.moderation.regionchange.help.description = Changes the server region to locked regions. commands.moderation.role.add.success.title = Rolle(n) erfolgreich hinzugefügt commands.moderation.role.add.success.description = Ich habe %extra% Rollen zu %extra_two% Mitgliedern hinzugefügt. commands.moderation.role.remove.success.title = Rolle(n) erfolgreich entfernt @@ -170,19 +164,19 @@ commands.moderation.rules.rules.description = Der Kanal wurde erfolgreich auf %e commands.moderation.rules.role.title = Rolle zum Hinzufügen commands.moderation.rules.role.description = Die Regeln wurden erfolgreich festgelegt. Bitte sende mir den Namen der Rolle, die der Benutzer erhalten soll nachdem er die Regeln akzeptiert hat. commands.moderation.rules.role.error.title = Rolle existiert nicht -commands.moderation.rules.role.error.description = Die angegebene Rolle existiert auf diesem Server nicht. +commands.moderation.rules.role.error.description = The specified role does not exist on this server. commands.moderation.rules.role.permission.error.title = Keine Berechtigung -commands.moderation.rules.role.permission.error.description = Du kannst diese Rolle nicht auswählen, weil du keinen Zugriff auf sie hast. +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 = Der erwähnte Kanal muss auf diesem Server sein\! +commands.moderation.rules.guild.error.description = The mentioned channel must be on this server\! commands.moderation.rules.emote.accept.title = Benutzerdefiniertes Zustimmungsemote commands.moderation.rules.emote.accept.description = The role has been successfully set to %extra%. Now send me the emote on which your user should react to to get verified. -commands.moderation.rules.emote.decline.title = Benutzerdefiniertes Ablehnungsemote +commands.moderation.rules.emote.decline.title = Custom Decline Emote commands.moderation.rules.emote.decline.description = The first emote has been successfully set to %extra%. Please send me now the decline emote. -commands.moderation.rules.emote.error.access.description = Ich kann auf die benutzerdefinierten Emote(s) nicht zugreifen. -commands.moderation.rules.emote.error.equal.title = Emotes sind gleich +commands.moderation.rules.emote.error.access.description = I can not access the custom emote(s). +commands.moderation.rules.emote.error.equal.title = Emotes are equal commands.moderation.rules.emote.error.equal.description = Die zwei angegebenen Emotes sind gleich. -commands.moderation.rules.emoji.decline.description = Das erste Emote wurde erfolgreich festgelegt. Bitte sende mir jetzt das Ablehnungsemote. +commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. commands.moderation.rules.emoji.error.description = Das angegebene Emote kann nicht verwendet werden. commands.moderation.rules.success.title = Regeln erfolgreich festgelegt commands.moderation.rules.success.description = Ich habe die Regeln erfolgreich in %extra% gesendet. @@ -190,9 +184,9 @@ commands.moderation.rules.error.message.title = Keine Berechtigung commands.moderation.rules.error.message.description = Ich kann keine Nachrichten in dem angegebenen Kanal schreiben commands.moderation.rules.error.permission.title = Keine Berechtigung commands.moderation.rules.error.permission.description = Um diesen Befehl auszuführen, benötige ich die `Rollen verwalten` Berechtigung. -commands.moderation.rules.error.interact.title = Kein Zugriff -commands.moderation.rules.error.interact.description = Ich kann auf die angegebene Rolle nicht zugreifen. Stelle sicher, dass meine Rolle höher als die angegebene Rolle ist. -commands.moderation.rules.help.description = Richte Regeln auf deinem Discord Server ein +commands.moderation.rules.error.interact.title = Can't interact +commands.moderation.rules.error.interact.description = I can not interact with the specified role. Make sure my role is higher than the specified role. +commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.starboard.success.title = Kanal erfolgreich festgelegt\! commands.moderation.starboard.help.description = Legt den Kanal für das Starboard fest. commands.moderation.editrules.channel.title = Kanal der Regeln @@ -276,7 +270,7 @@ commands.music.volume.help.description = Ändere die Lautstärke der Musik. commands.music.pause.success.title = Erfolgreich pausiert commands.music.pause.success.description = Ich habe den gespielten Song erfolgreich pausiert. commands.music.pause.error.paused.title = Bereits pausiert -commands.music.pause.error.paused.description = The song is already paused. You can continue playing it with %extra%play +commands.music.pause.error.paused.description = Das Lied ist bereits pausiert. commands.music.pause.error.connected.title = Kein Kanal commands.music.pause.error.connected.description = Du musst im selben Sprachkanal wie der Bot sein, um den Song zu pausieren. commands.music.pause.help.description = Pausiere das abgespielte Lied. @@ -309,7 +303,7 @@ commands.nsfw.solo.help.description = Zeigt einen zufälligen Solo GIF. commands.nsfw.spank.help.description = Zeigt ein zufälliges spank GIF. commands.nsfw.trans.help.description = Zeigt ein zufälliges Trans Bild -commands.owner.eval.success.title = Eval-Befehl +commands.owner.eval.success.title = Eval Command commands.owner.eval.success.input = Eingabe commands.owner.eval.success.output = Ausgabe commands.owner.eval.success.timing = Timing @@ -322,7 +316,7 @@ commands.owner.guildleave.help.description = Quit from a server commands.owner.reboot.help.description = Startet den Bot neu. commands.owner.shutdown.success.title = Fährt herrunter commands.owner.shutdown.help.description = Schalte den Bot ab. -commands.owner.test.success = TEST meine Freunde +commands.owner.test.success = TEST my friends commands.owner.test.help.description = Nur ein kleiner Testbefehl commands.owner.blacklist.success.add.title = Successfully blacklisted the specified commands commands.owner.blacklist.success.add.description = I successfully added the following commands from the blacklist\:\n %extra% @@ -333,6 +327,6 @@ commands.owner.blacklist.help.description = Blacklist a user for specific comman commands.settings.language.success.title = Sprache festgelegt commands.settings.language.success.description = `%extra%` ist jetzt deine neue Sprache. commands.settings.language.help.description = Führt den angegebenen Code aus. -commands.settings.prefix.success.title = Prefix erfolgreich gesetzt +commands.settings.prefix.success.title = Successfully set prefix commands.settings.prefix.success.description = Ich habe erfolgreich den neuen Prefix für dich auf `%extra% `gesetzt. commands.settings.prefix.help.description = Legt einen neuen Prefix fest. diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 043a3f1..4ae304a 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -23,7 +23,7 @@ success\! = Success\! commands.fun.avatar.success.title = Avatar of %extra% commands.fun.avatar.error.title = User not found commands.fun.avatar.error.description = I can not find a user with this id\! -commands.fun.avatar.help.description = Sends the avatar of the specified Member. +commands.fun.avatar.help.description = Sends the avatar of the specified member. commands.fun.gif.error.description = Please try again with another term. commands.fun.gif.help.description = Looks for a GIF on Giphy. commands.fun.meme.success.title = Your random meme\: @@ -43,7 +43,7 @@ commands.general.equals.string.equals.false = Well yes but actually No. This isn commands.general.equals.string.first = First string\: commands.general.equals.string.second = Second string\: commands.general.equals.string.result = Result\: -commands.general.equals.help.description = Checks if two strings are equal. +commands.general.equals.help.description = Checks if two strings are the same. commands.general.help.description = **Description\:** commands.general.help.usage = **Usage\:** commands.general.help.example = **Example\:** @@ -103,11 +103,11 @@ commands.misc.moveall.success.description = I successfully moved %extra% members commands.misc.moveall.error.equals.title = Not twice commands.misc.moveall.error.equals.description = The first voice channel equals the second. You have to specify two different voice channels. commands.misc.moveall.error.source.int.title = Invalid ID -commands.misc.moveall.error.source.int.description = You haven't specified an ID as the source channel. +commands.misc.moveall.error.source.int.description = You didn't specified a ID as the source channel. commands.misc.moveall.error.target.int.title = Invalid ID -commands.misc.moveall.error.target.int.description = You haven't specified an ID as the target channel. +commands.misc.moveall.error.target.int.description = You didn't specified a ID as the target channel. commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. -commands.misc.corona.help.description = Shows the newest stats of COVID-19 +commands.misc.corona.help.description = Show the newest stats about COVID-19 commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties index 4d56039..1f07242 100644 --- a/src/main/resources/Translations/Translations_es.properties +++ b/src/main/resources/Translations/Translations_es.properties @@ -100,14 +100,8 @@ commands.misc.code.error.description = I can't find the specified invite code. commands.misc.code.help.description = Shows information about a invite code. commands.misc.moveall.success.title = Successfully moved commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun\! -commands.misc.moveall.error.equals.title = Not twice -commands.misc.moveall.error.equals.description = The first voice channel equals the second. You have to specify two different voice channels. -commands.misc.moveall.error.source.int.title = Invalid ID -commands.misc.moveall.error.source.int.description = You didn't specified a ID as the source channel. -commands.misc.moveall.error.target.int.title = Invalid ID -commands.misc.moveall.error.target.int.description = You didn't specified a ID as the target channel. commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. -commands.misc.corona.help.description = Shows the newest stats of COVID-19 +commands.misc.corona.help.description = Show the newest stats about COVID-19 commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% @@ -276,7 +270,7 @@ 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. You can continue playing it with %extra%play +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. diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties index 4d56039..1f07242 100644 --- a/src/main/resources/Translations/Translations_fr.properties +++ b/src/main/resources/Translations/Translations_fr.properties @@ -100,14 +100,8 @@ commands.misc.code.error.description = I can't find the specified invite code. commands.misc.code.help.description = Shows information about a invite code. commands.misc.moveall.success.title = Successfully moved commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun\! -commands.misc.moveall.error.equals.title = Not twice -commands.misc.moveall.error.equals.description = The first voice channel equals the second. You have to specify two different voice channels. -commands.misc.moveall.error.source.int.title = Invalid ID -commands.misc.moveall.error.source.int.description = You didn't specified a ID as the source channel. -commands.misc.moveall.error.target.int.title = Invalid ID -commands.misc.moveall.error.target.int.description = You didn't specified a ID as the target channel. commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. -commands.misc.corona.help.description = Shows the newest stats of COVID-19 +commands.misc.corona.help.description = Show the newest stats about COVID-19 commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% @@ -276,7 +270,7 @@ 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. You can continue playing it with %extra%play +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. diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties index 4d56039..1f07242 100644 --- a/src/main/resources/Translations/Translations_ru.properties +++ b/src/main/resources/Translations/Translations_ru.properties @@ -100,14 +100,8 @@ commands.misc.code.error.description = I can't find the specified invite code. commands.misc.code.help.description = Shows information about a invite code. commands.misc.moveall.success.title = Successfully moved commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun\! -commands.misc.moveall.error.equals.title = Not twice -commands.misc.moveall.error.equals.description = The first voice channel equals the second. You have to specify two different voice channels. -commands.misc.moveall.error.source.int.title = Invalid ID -commands.misc.moveall.error.source.int.description = You didn't specified a ID as the source channel. -commands.misc.moveall.error.target.int.title = Invalid ID -commands.misc.moveall.error.target.int.description = You didn't specified a ID as the target channel. commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. -commands.misc.corona.help.description = Shows the newest stats of COVID-19 +commands.misc.corona.help.description = Show the newest stats about COVID-19 commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% @@ -276,7 +270,7 @@ 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. You can continue playing it with %extra%play +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. diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties index 4d56039..1f07242 100644 --- a/src/main/resources/Translations/Translations_tr.properties +++ b/src/main/resources/Translations/Translations_tr.properties @@ -100,14 +100,8 @@ commands.misc.code.error.description = I can't find the specified invite code. commands.misc.code.help.description = Shows information about a invite code. commands.misc.moveall.success.title = Successfully moved commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun\! -commands.misc.moveall.error.equals.title = Not twice -commands.misc.moveall.error.equals.description = The first voice channel equals the second. You have to specify two different voice channels. -commands.misc.moveall.error.source.int.title = Invalid ID -commands.misc.moveall.error.source.int.description = You didn't specified a ID as the source channel. -commands.misc.moveall.error.target.int.title = Invalid ID -commands.misc.moveall.error.target.int.description = You didn't specified a ID as the target channel. commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. -commands.misc.corona.help.description = Shows the newest stats of COVID-19 +commands.misc.corona.help.description = Show the newest stats about COVID-19 commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% @@ -276,7 +270,7 @@ 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. You can continue playing it with %extra%play +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. diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties index 4d56039..1f07242 100644 --- a/src/main/resources/Translations/Translations_zh.properties +++ b/src/main/resources/Translations/Translations_zh.properties @@ -100,14 +100,8 @@ commands.misc.code.error.description = I can't find the specified invite code. commands.misc.code.help.description = Shows information about a invite code. commands.misc.moveall.success.title = Successfully moved commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun\! -commands.misc.moveall.error.equals.title = Not twice -commands.misc.moveall.error.equals.description = The first voice channel equals the second. You have to specify two different voice channels. -commands.misc.moveall.error.source.int.title = Invalid ID -commands.misc.moveall.error.source.int.description = You didn't specified a ID as the source channel. -commands.misc.moveall.error.target.int.title = Invalid ID -commands.misc.moveall.error.target.int.description = You didn't specified a ID as the target channel. commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. -commands.misc.corona.help.description = Shows the newest stats of COVID-19 +commands.misc.corona.help.description = Show the newest stats about COVID-19 commands.moderation.ban.success.title = Successfully banned commands.moderation.ban.success.description = I successfully baned %extra% @@ -276,7 +270,7 @@ 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. You can continue playing it with %extra%play +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.