From 45c6bf0a78fc0bb3ae6cce67cf38d5dcc8186325 Mon Sep 17 00:00:00 2001 From: DNx5 Date: Sun, 6 Dec 2015 06:08:52 +0700 Subject: [PATCH 01/33] Removed DatabaseCalls class. * this class only contains wrapper of selected datasource type which every method included a code to run the task inside a new Thread. But this class doesn't help improving performance, because it's still running the task synchronously. --- src/main/java/fr/xephi/authme/AuthMe.java | 31 +- .../authme/datasource/DatabaseCalls.java | 513 ------------------ 2 files changed, 21 insertions(+), 523 deletions(-) delete mode 100644 src/main/java/fr/xephi/authme/datasource/DatabaseCalls.java diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 655a1f33b..2f6bf18f1 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -13,10 +13,20 @@ import fr.xephi.authme.command.CommandHandler; import fr.xephi.authme.command.CommandInitializer; import fr.xephi.authme.converter.Converter; import fr.xephi.authme.converter.ForceFlatToSqlite; -import fr.xephi.authme.datasource.*; +import fr.xephi.authme.datasource.CacheDataSource; +import fr.xephi.authme.datasource.DataSource; +import fr.xephi.authme.datasource.FlatFile; +import fr.xephi.authme.datasource.MySQL; +import fr.xephi.authme.datasource.SQLite; import fr.xephi.authme.hooks.BungeeCordMessage; import fr.xephi.authme.hooks.EssSpawn; -import fr.xephi.authme.listener.*; +import fr.xephi.authme.listener.AuthMeBlockListener; +import fr.xephi.authme.listener.AuthMeEntityListener; +import fr.xephi.authme.listener.AuthMeInventoryPacketAdapter; +import fr.xephi.authme.listener.AuthMePlayerListener; +import fr.xephi.authme.listener.AuthMePlayerListener16; +import fr.xephi.authme.listener.AuthMePlayerListener18; +import fr.xephi.authme.listener.AuthMeServerListener; import fr.xephi.authme.modules.ModuleManager; import fr.xephi.authme.output.ConsoleFilter; import fr.xephi.authme.output.Log4JFilter; @@ -25,7 +35,9 @@ import fr.xephi.authme.output.Messages; import fr.xephi.authme.permission.PermissionsManager; import fr.xephi.authme.permission.PlayerPermission; import fr.xephi.authme.process.Management; -import fr.xephi.authme.settings.*; +import fr.xephi.authme.settings.OtherAccounts; +import fr.xephi.authme.settings.Settings; +import fr.xephi.authme.settings.Spawn; import fr.xephi.authme.util.GeoLiteAPI; import fr.xephi.authme.util.StringUtils; import fr.xephi.authme.util.Utils; @@ -579,20 +591,19 @@ public class AuthMe extends JavaPlugin { if (isSQLite) { server.getScheduler().runTaskAsynchronously(this, new Runnable() { - @Override public void run() { int accounts = database.getAccountsRegistered(); - if (accounts >= 4000) - ConsoleLogger.showError("YOU'RE USING THE SQLITE DATABASE WITH " + accounts + "+ ACCOUNTS, FOR BETTER PERFORMANCES, PLEASE UPGRADE TO MYSQL!!"); + if (accounts >= 4000) { + ConsoleLogger.showError("YOU'RE USING THE SQLITE DATABASE WITH " + + accounts + "+ ACCOUNTS, FOR BETTER PERFORMANCES, PLEASE UPGRADE TO MYSQL!!"); + } } }); } if (Settings.isCachingEnabled) { database = new CacheDataSource(this, database); - } else { - database = new DatabaseCalls(database); } if (Settings.getDataSource == DataSource.DataSourceType.FILE) { @@ -920,14 +931,14 @@ public class AuthMe extends JavaPlugin { String realIP = player.getAddress().getAddress().getHostAddress(); String sUrl = "http://monitor-1.verygames.net/api/?action=ipclean-real-ip&out=raw&ip=%IP%&port=%PORT%"; sUrl = sUrl.replace("%IP%", player.getAddress().getAddress().getHostAddress()) - .replace("%PORT%", "" + player.getAddress().getPort()); + .replace("%PORT%", "" + player.getAddress().getPort()); try { URL url = new URL(sUrl); URLConnection urlCon = url.openConnection(); try (BufferedReader in = new BufferedReader(new InputStreamReader(urlCon.getInputStream()))) { String inputLine = in.readLine(); if (!StringUtils.isEmpty(inputLine) && !inputLine.equalsIgnoreCase("error") - && !inputLine.contains("error")) { + && !inputLine.contains("error")) { realIP = inputLine; } } catch (IOException e) { diff --git a/src/main/java/fr/xephi/authme/datasource/DatabaseCalls.java b/src/main/java/fr/xephi/authme/datasource/DatabaseCalls.java deleted file mode 100644 index ebd133e07..000000000 --- a/src/main/java/fr/xephi/authme/datasource/DatabaseCalls.java +++ /dev/null @@ -1,513 +0,0 @@ -package fr.xephi.authme.datasource; - -import fr.xephi.authme.cache.auth.PlayerAuth; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -/** - */ -public class DatabaseCalls implements DataSource { - - private final ExecutorService exec; - private final DataSource database; - - /** - * Constructor for DatabaseCalls. - * - * @param database DataSource - */ - public DatabaseCalls(DataSource database) { - this.database = database; - this.exec = Executors.newCachedThreadPool(); - } - - /** - * Method isAuthAvailable. - * - * @param user String - * - * @return boolean * @see fr.xephi.authme.datasource.DataSource#isAuthAvailable(String) - */ - @Override - public synchronized boolean isAuthAvailable(final String user) { - try { - return exec.submit(new Callable() { - public Boolean call() throws Exception { - return database.isAuthAvailable(user); - } - }).get(); - } catch (Exception e) { - return false; - } - } - - /** - * Method getAuth. - * - * @param user String - * - * @return PlayerAuth * @see fr.xephi.authme.datasource.DataSource#getAuth(String) - */ - @Override - public synchronized PlayerAuth getAuth(final String user) { - try { - return exec.submit(new Callable() { - public PlayerAuth call() throws Exception { - return database.getAuth(user); - } - }).get(); - } catch (Exception e) { - return null; - } - } - - /** - * Method saveAuth. - * - * @param auth PlayerAuth - * - * @return boolean * @see fr.xephi.authme.datasource.DataSource#saveAuth(PlayerAuth) - */ - @Override - public synchronized boolean saveAuth(final PlayerAuth auth) { - try { - return exec.submit(new Callable() { - public Boolean call() throws Exception { - return database.saveAuth(auth); - } - }).get(); - } catch (Exception e) { - return false; - } - } - - /** - * Method updateSession. - * - * @param auth PlayerAuth - * - * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSession(PlayerAuth) - */ - @Override - public synchronized boolean updateSession(final PlayerAuth auth) { - try { - return exec.submit(new Callable() { - public Boolean call() throws Exception { - return database.updateSession(auth); - } - }).get(); - } catch (Exception e) { - return false; - } - } - - /** - * Method updatePassword. - * - * @param auth PlayerAuth - * - * @return boolean * @see fr.xephi.authme.datasource.DataSource#updatePassword(PlayerAuth) - */ - @Override - public synchronized boolean updatePassword(final PlayerAuth auth) { - try { - return exec.submit(new Callable() { - public Boolean call() throws Exception { - return database.updatePassword(auth); - } - }).get(); - } catch (Exception e) { - return false; - } - } - - /** - * Method purgeDatabase. - * - * @param until long - * - * @return int * @see fr.xephi.authme.datasource.DataSource#purgeDatabase(long) - */ - @Override - public synchronized int purgeDatabase(final long until) { - try { - return exec.submit(new Callable() { - public Integer call() throws Exception { - return database.purgeDatabase(until); - } - }).get(); - } catch (Exception e) { - return -1; - } - } - - /** - * Method autoPurgeDatabase. - * - * @param until long - * - * @return List * @see fr.xephi.authme.datasource.DataSource#autoPurgeDatabase(long) - */ - @Override - public synchronized List autoPurgeDatabase(final long until) { - try { - return exec.submit(new Callable>() { - public List call() throws Exception { - return database.autoPurgeDatabase(until); - } - }).get(); - } catch (Exception e) { - return new ArrayList<>(); - } - } - - /** - * Method removeAuth. - * - * @param user String - * - * @return boolean * @see fr.xephi.authme.datasource.DataSource#removeAuth(String) - */ - @Override - public synchronized boolean removeAuth(final String user) { - try { - return exec.submit(new Callable() { - public Boolean call() throws Exception { - return database.removeAuth(user); - } - }).get(); - } catch (Exception e) { - return false; - } - } - - /** - * Method updateQuitLoc. - * - * @param auth PlayerAuth - * - * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateQuitLoc(PlayerAuth) - */ - @Override - public synchronized boolean updateQuitLoc(final PlayerAuth auth) { - try { - return exec.submit(new Callable() { - public Boolean call() throws Exception { - return database.updateQuitLoc(auth); - } - }).get(); - } catch (Exception e) { - return false; - } - } - - /** - * Method getIps. - * - * @param ip String - * - * @return int * @see fr.xephi.authme.datasource.DataSource#getIps(String) - */ - @Override - public synchronized int getIps(final String ip) { - try { - return exec.submit(new Callable() { - - public Integer call() throws Exception { - return database.getIps(ip); - } - }).get(); - } catch (Exception e) { - return -1; - } - } - - /** - * Method getAllAuthsByName. - * - * @param auth PlayerAuth - * - * @return List * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByName(PlayerAuth) - */ - @Override - public synchronized List getAllAuthsByName(final PlayerAuth auth) { - try { - return exec.submit(new Callable>() { - public List call() throws Exception { - return database.getAllAuthsByName(auth); - } - }).get(); - } catch (Exception e) { - return new ArrayList<>(); - } - } - - /** - * Method getAllAuthsByIp. - * - * @param ip String - * - * @return List * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByIp(String) - */ - @Override - public synchronized List getAllAuthsByIp(final String ip) { - try { - return exec.submit(new Callable>() { - public List call() throws Exception { - return database.getAllAuthsByIp(ip); - } - }).get(); - } catch (Exception e) { - return new ArrayList<>(); - } - } - - /** - * Method getAllAuthsByEmail. - * - * @param email String - * - * @return List * @see fr.xephi.authme.datasource.DataSource#getAllAuthsByEmail(String) - */ - @Override - public synchronized List getAllAuthsByEmail(final String email) { - try { - return exec.submit(new Callable>() { - public List call() throws Exception { - return database.getAllAuthsByEmail(email); - } - }).get(); - } catch (Exception e) { - return new ArrayList<>(); - } - } - - /** - * Method updateEmail. - * - * @param auth PlayerAuth - * - * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateEmail(PlayerAuth) - */ - @Override - public synchronized boolean updateEmail(final PlayerAuth auth) { - try { - return exec.submit(new Callable() { - public Boolean call() throws Exception { - return database.updateEmail(auth); - } - }).get(); - } catch (Exception e) { - return false; - } - } - - /** - * Method updateSalt. - * - * @param auth PlayerAuth - * - * @return boolean * @see fr.xephi.authme.datasource.DataSource#updateSalt(PlayerAuth) - */ - @Override - public synchronized boolean updateSalt(final PlayerAuth auth) { - try { - return exec.submit(new Callable() { - public Boolean call() throws Exception { - return database.updateSalt(auth); - } - }).get(); - } catch (Exception e) { - return false; - } - } - - /** - * Method close. - * - * @see fr.xephi.authme.datasource.DataSource#close() - */ - @Override - public synchronized void close() { - exec.shutdown(); - database.close(); - } - - /** - * Method reload. - * - * @see fr.xephi.authme.datasource.DataSource#reload() - */ - @Override - public synchronized void reload() { - database.reload(); - } - - /** - * Method purgeBanned. - * - * @param banned List - * - * @see fr.xephi.authme.datasource.DataSource#purgeBanned(List) - */ - @Override - public synchronized void purgeBanned(final List banned) { - new Thread(new Runnable() { - public synchronized void run() { - database.purgeBanned(banned); - } - }).start(); - } - - /** - * Method getType. - * - * @return DataSourceType * @see fr.xephi.authme.datasource.DataSource#getType() - */ - @Override - public synchronized DataSourceType getType() { - return database.getType(); - } - - /** - * Method isLogged. - * - * @param user String - * - * @return boolean * @see fr.xephi.authme.datasource.DataSource#isLogged(String) - */ - @Override - public synchronized boolean isLogged(final String user) { - try { - return exec.submit(new Callable() { - public Boolean call() throws Exception { - return database.isLogged(user); - } - }).get(); - } catch (Exception e) { - return false; - } - } - - /** - * Method setLogged. - * - * @param user String - * - * @see fr.xephi.authme.datasource.DataSource#setLogged(String) - */ - @Override - public synchronized void setLogged(final String user) { - exec.execute(new Runnable() { - public synchronized void run() { - database.setLogged(user); - } - }); - } - - /** - * Method setUnlogged. - * - * @param user String - * - * @see fr.xephi.authme.datasource.DataSource#setUnlogged(String) - */ - @Override - public synchronized void setUnlogged(final String user) { - exec.execute(new Runnable() { - public synchronized void run() { - database.setUnlogged(user); - } - }); - } - - /** - * Method purgeLogged. - * - * @see fr.xephi.authme.datasource.DataSource#purgeLogged() - */ - @Override - public synchronized void purgeLogged() { - exec.execute(new Runnable() { - public synchronized void run() { - database.purgeLogged(); - } - }); - } - - /** - * Method getAccountsRegistered. - * - * @return int * @see fr.xephi.authme.datasource.DataSource#getAccountsRegistered() - */ - @Override - public synchronized int getAccountsRegistered() { - try { - return exec.submit(new Callable() { - public Integer call() throws Exception { - return database.getAccountsRegistered(); - } - }).get(); - } catch (Exception e) { - return -1; - } - } - - /** - * Method updateName. - * - * @param oldOne String - * @param newOne String - * - * @see fr.xephi.authme.datasource.DataSource#updateName(String, String) - */ - @Override - public synchronized void updateName(final String oldOne, final String newOne) { - exec.execute(new Runnable() { - public synchronized void run() { - database.updateName(oldOne, newOne); - } - }); - } - - /** - * Method getAllAuths. - * - * @return List * @see fr.xephi.authme.datasource.DataSource#getAllAuths() - */ - @Override - public synchronized List getAllAuths() { - try { - return exec.submit(new Callable>() { - public List call() throws Exception { - return database.getAllAuths(); - } - }).get(); - } catch (Exception e) { - return new ArrayList<>(); - } - } - - /** - * Method getLoggedPlayers. - * - * @return List * @see fr.xephi.authme.datasource.DataSource#getLoggedPlayers() - */ - @Override - public List getLoggedPlayers() { - try { - return exec.submit(new Callable>() { - public List call() throws Exception { - return database.getLoggedPlayers(); - } - }).get(); - } catch (Exception e) { - return new ArrayList<>(); - } - } - -} From 1f001f2225a3e84bcafc70d8e962bdbcc038f439 Mon Sep 17 00:00:00 2001 From: DNx5 Date: Sun, 6 Dec 2015 06:10:16 +0700 Subject: [PATCH 02/33] Removed max mysql connections options from config. --- .../fr/xephi/authme/settings/Settings.java | 83 ++++++++++--------- src/main/resources/config.yml | 2 - 2 files changed, 42 insertions(+), 43 deletions(-) diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java index f35af4440..a61705866 100644 --- a/src/main/java/fr/xephi/authme/settings/Settings.java +++ b/src/main/java/fr/xephi/authme/settings/Settings.java @@ -1,5 +1,7 @@ package fr.xephi.authme.settings; +import com.google.common.base.Charsets; +import com.google.common.io.Files; import fr.xephi.authme.AuthMe; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.datasource.DataSource; @@ -8,10 +10,14 @@ import fr.xephi.authme.security.HashAlgorithm; import fr.xephi.authme.util.Wrapper; import org.bukkit.configuration.file.YamlConfiguration; -import com.google.common.base.Charsets; -import com.google.common.io.Files; - -import java.io.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; @@ -94,7 +100,7 @@ public final class Settings { getMailPort, maxLoginTry, captchaLength, saltLength, getmaxRegPerEmail, bCryptLog2Rounds, getPhpbbGroup, antiBotSensibility, antiBotDuration, delayRecall, getMaxLoginPerIp, - getMaxJoinPerIp, getMySQLMaxConnections; + getMaxJoinPerIp; protected static YamlConfiguration configFile; private static AuthMe plugin; private static Settings instance; @@ -170,7 +176,6 @@ public final class Settings { isCachingEnabled = configFile.getBoolean("DataSource.caching", true); getMySQLHost = configFile.getString("DataSource.mySQLHost", "127.0.0.1"); getMySQLPort = configFile.getString("DataSource.mySQLPort", "3306"); - getMySQLMaxConnections = configFile.getInt("DataSource.mySQLMaxConections", 25); getMySQLUsername = configFile.getString("DataSource.mySQLUsername", "authme"); getMySQLPassword = configFile.getString("DataSource.mySQLPassword", "12345"); getMySQLDatabase = configFile.getString("DataSource.mySQLDatabase", "authme"); @@ -301,39 +306,36 @@ public final class Settings { } private static String loadEmailText() { - if (!EMAIL_FILE.exists()) - saveDefaultEmailText(); - StringBuilder str = new StringBuilder(); - try { - BufferedReader in = new BufferedReader(new FileReader(EMAIL_FILE)); - String s; - while ((s = in.readLine()) != null) - str.append(s); - in.close(); - } catch(IOException e) - { - } - return str.toString(); - } + if (!EMAIL_FILE.exists()) + saveDefaultEmailText(); + StringBuilder str = new StringBuilder(); + try { + BufferedReader in = new BufferedReader(new FileReader(EMAIL_FILE)); + String s; + while ((s = in.readLine()) != null) + str.append(s); + in.close(); + } catch (IOException ignored) { + } + return str.toString(); + } - private static void saveDefaultEmailText() { - InputStream file = plugin.getResource("email.html"); - StringBuilder str = new StringBuilder(); - try { - BufferedReader in = new BufferedReader(new InputStreamReader(file, Charset.forName("utf-8"))); - String s; - while ((s = in.readLine()) != null) - str.append(s); - in.close(); - Files.touch(EMAIL_FILE); - Files.write(str.toString(), EMAIL_FILE, Charsets.UTF_8); - } - catch(Exception e) - { - } - } + private static void saveDefaultEmailText() { + InputStream file = plugin.getResource("email.html"); + StringBuilder str = new StringBuilder(); + try { + BufferedReader in = new BufferedReader(new InputStreamReader(file, Charset.forName("utf-8"))); + String s; + while ((s = in.readLine()) != null) + str.append(s); + in.close(); + Files.touch(EMAIL_FILE); + Files.write(str.toString(), EMAIL_FILE, Charsets.UTF_8); + } catch (Exception ignored) { + } + } - public static void setValue(String key, Object value) { + public static void setValue(String key, Object value) { instance.set(key, value); save(); } @@ -713,10 +715,9 @@ public final class Settings { changes = true; } - if (contains("Email.mailText")) - { - set("Email.mailText", null); - ConsoleLogger.showError("Remove Email.mailText from config, we now use the email.html file"); + if (contains("Email.mailText")) { + set("Email.mailText", null); + ConsoleLogger.showError("Remove Email.mailText from config, we now use the email.html file"); } if (changes) { diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index fd73b7733..fb8d64239 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -8,8 +8,6 @@ DataSource: mySQLHost: 127.0.0.1 # Database Port mySQLPort: '3306' - # MySql Max Connections - mySQLMaxConections: 8 # Username about Database Connection Infos mySQLUsername: authme # Password about Database Connection Infos From c196f45854049bd5601cf4fe4b9ed2dc3e742a07 Mon Sep 17 00:00:00 2001 From: DNx5 Date: Sun, 6 Dec 2015 06:12:45 +0700 Subject: [PATCH 03/33] Change getAccountsRegistered method to use normal Statement. - Log the stacktrace if something weird happens. --- .../fr/xephi/authme/datasource/MySQL.java | 68 ++++++++++++------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/src/main/java/fr/xephi/authme/datasource/MySQL.java b/src/main/java/fr/xephi/authme/datasource/MySQL.java index 69c10e824..93a2d3456 100644 --- a/src/main/java/fr/xephi/authme/datasource/MySQL.java +++ b/src/main/java/fr/xephi/authme/datasource/MySQL.java @@ -259,8 +259,9 @@ public class MySQL implements DataSource { pst.setString(1, user.toLowerCase()); ResultSet rs = pst.executeQuery(); return rs.next(); - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } return false; } @@ -312,8 +313,9 @@ public class MySQL implements DataSource { pAuth.setHash(new String(bytes)); } } - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); return null; } return pAuth; @@ -521,8 +523,9 @@ public class MySQL implements DataSource { pst.close(); } return true; - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } return false; } @@ -574,8 +577,9 @@ public class MySQL implements DataSource { pst.close(); } return true; - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } return false; } @@ -602,7 +606,7 @@ public class MySQL implements DataSource { pst.executeUpdate(); pst.close(); return true; - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); } return false; @@ -625,8 +629,9 @@ public class MySQL implements DataSource { PreparedStatement pst = con.prepareStatement(sql); pst.setLong(1, until); result = pst.executeUpdate(); - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } return result; } @@ -653,8 +658,9 @@ public class MySQL implements DataSource { sql = "DELETE FROM " + tableName + " WHERE " + columnLastLogin + "<" + until; st.executeUpdate(sql); st.close(); - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } return list; } @@ -693,8 +699,9 @@ public class MySQL implements DataSource { pst.setString(1, user); pst.executeUpdate(); return true; - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } return false; } @@ -723,8 +730,9 @@ public class MySQL implements DataSource { pst.executeUpdate(); pst.close(); return true; - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } return false; } @@ -751,8 +759,9 @@ public class MySQL implements DataSource { } rs.close(); pst.close(); - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } return countIp; } @@ -776,7 +785,7 @@ public class MySQL implements DataSource { pst.executeUpdate(); pst.close(); return true; - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); ConsoleLogger.writeStackTrace(ex); } @@ -805,8 +814,9 @@ public class MySQL implements DataSource { pst.executeUpdate(); pst.close(); return true; - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } return false; } @@ -820,9 +830,10 @@ public class MySQL implements DataSource { public void reload() { try { reloadArguments(); - } catch (Exception e) { - ConsoleLogger.showError(e.getMessage()); + } catch (Exception ex) { + ConsoleLogger.showError(ex.getMessage()); ConsoleLogger.showError("Can't reconnect to MySQL database... Please check your MySQL configuration!"); + ConsoleLogger.writeStackTrace(ex); AuthMe.getInstance().stopOrUnload(); } } @@ -861,8 +872,9 @@ public class MySQL implements DataSource { } rs.close(); pst.close(); - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } return result; } @@ -889,8 +901,9 @@ public class MySQL implements DataSource { } rs.close(); pst.close(); - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } return result; } @@ -938,8 +951,9 @@ public class MySQL implements DataSource { pst.executeUpdate(); } pst.close(); - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } } @@ -969,8 +983,9 @@ public class MySQL implements DataSource { pst.setString(1, user); ResultSet rs = pst.executeQuery(); isLogged = rs.next() && (rs.getInt(columnLogged) == 1); - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } return isLogged; } @@ -991,8 +1006,9 @@ public class MySQL implements DataSource { pst.setString(2, user.toLowerCase()); pst.executeUpdate(); pst.close(); - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } } @@ -1012,8 +1028,9 @@ public class MySQL implements DataSource { pst.setString(2, user.toLowerCase()); pst.executeUpdate(); pst.close(); - } catch (Exception ex) { + } catch (SQLException ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } } @@ -1033,6 +1050,7 @@ public class MySQL implements DataSource { pst.close(); } catch (Exception ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } } @@ -1047,15 +1065,16 @@ public class MySQL implements DataSource { public int getAccountsRegistered() { int result = 0; try (Connection con = getConnection()) { - PreparedStatement pst = con.prepareStatement("SELECT COUNT(*) FROM " + tableName + ";"); - ResultSet rs = pst.executeQuery(); + Statement st = con.createStatement(); + ResultSet rs = st.executeQuery("SELECT COUNT(*) FROM " + tableName); if (rs.next()) { result = rs.getInt(1); } rs.close(); - pst.close(); + st.close(); } catch (Exception ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } return result; } @@ -1078,6 +1097,7 @@ public class MySQL implements DataSource { pst.executeUpdate(); } catch (Exception ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } } @@ -1131,6 +1151,7 @@ public class MySQL implements DataSource { st.close(); } catch (Exception ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } return auths; } @@ -1182,6 +1203,7 @@ public class MySQL implements DataSource { } } catch (Exception ex) { ConsoleLogger.showError(ex.getMessage()); + ConsoleLogger.writeStackTrace(ex); } return auths; } From 7ba54123dbe66568f30d815faa83afc0ac4557e0 Mon Sep 17 00:00:00 2001 From: DNx5 Date: Sun, 6 Dec 2015 06:14:30 +0700 Subject: [PATCH 04/33] Update PlayerAuth builder class. --- .../xephi/authme/cache/auth/PlayerAuth.java | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/src/main/java/fr/xephi/authme/cache/auth/PlayerAuth.java b/src/main/java/fr/xephi/authme/cache/auth/PlayerAuth.java index 27ce38d84..32c4f7fdc 100644 --- a/src/main/java/fr/xephi/authme/cache/auth/PlayerAuth.java +++ b/src/main/java/fr/xephi/authme/cache/auth/PlayerAuth.java @@ -3,6 +3,11 @@ package fr.xephi.authme.cache.auth; import fr.xephi.authme.security.HashAlgorithm; import fr.xephi.authme.settings.Settings; +import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Strings.nullToEmpty; + + /** */ public class PlayerAuth { @@ -461,7 +466,7 @@ public class PlayerAuth { * @return String */ public String serialize() { - StringBuilder str = new StringBuilder(); + StringBuffer str = new StringBuffer(); char d = ';'; str.append(this.nickname).append(d); str.append(this.realName).append(d); @@ -503,34 +508,35 @@ public class PlayerAuth { public static final class Builder { private String name; - private String realName = "Player"; - private String hash = ""; - private String salt = ""; - private String ip = "127.0.0.1"; - private String world = "world"; + private String realName; + private String hash; + private String salt; + private String ip; + private String world; + private String email; + private int groupId = -1; private double x = 0.0f; private double y = 0.0f; private double z = 0.0f; private long lastLogin = System.currentTimeMillis(); - private int groupId = -1; - private String email = "your@email.com"; public PlayerAuth build() { return new PlayerAuth( - name, - hash, - salt, + checkNotNull(name).toLowerCase(), + nullToEmpty(hash), + nullToEmpty(salt), groupId, - ip, + firstNonNull(ip, "127.0.0.1"), lastLogin, - x, y, z, world, - email, - realName + x, y, z, + firstNonNull(world, "world"), + firstNonNull(email, "your@email.com"), + firstNonNull(realName, "Player") ); } public Builder name(String name) { - this.name = name.toLowerCase(); + this.name = name; return this; } From 6a503772e2595cc49580988b3df0e906b7d2572b Mon Sep 17 00:00:00 2001 From: ljacqu Date: Tue, 8 Dec 2015 22:08:22 +0100 Subject: [PATCH 05/33] Close Scanner in tools/permissions; make use of more generic services - Close scanner for all cases - Replace read from file with the one from the File service - Rename file service class to FileUtils to better reflect its purpose --- .../permissions/PermissionNodesGatherer.java | 21 ++++--------------- .../permissions/PermissionsListWriter.java | 21 +++++++++---------- ...eneratedFileWriter.java => FileUtils.java} | 7 +++---- 3 files changed, 17 insertions(+), 32 deletions(-) rename src/tools/utils/{GeneratedFileWriter.java => FileUtils.java} (89%) diff --git a/src/tools/permissions/PermissionNodesGatherer.java b/src/tools/permissions/PermissionNodesGatherer.java index 5b61adbef..4f3855748 100644 --- a/src/tools/permissions/PermissionNodesGatherer.java +++ b/src/tools/permissions/PermissionNodesGatherer.java @@ -3,12 +3,9 @@ package permissions; import fr.xephi.authme.permission.AdminPermission; import fr.xephi.authme.permission.PermissionNode; import fr.xephi.authme.permission.PlayerPermission; -import fr.xephi.authme.util.StringUtils; +import utils.FileUtils; +import utils.ToolsConstants; -import java.io.IOException; -import java.nio.charset.Charset; -import java.nio.file.Files; -import java.nio.file.Paths; import java.util.EnumSet; import java.util.HashMap; import java.util.Map; @@ -23,10 +20,6 @@ import java.util.regex.Pattern; */ public class PermissionNodesGatherer { - /** The folder in which the implementations of {@link PermissionNode} reside. */ - private static final String PERMISSION_NODE_SOURCE_FOLDER = - "src/main/java/fr/xephi/authme/permission/"; - /** * Regular expression that should match the JavaDoc comment above an enum, including * the name of the enum value. The first group (i.e. {@code \\1}) should be the JavaDoc description; @@ -100,14 +93,8 @@ public class PermissionNodesGatherer { * @return Source code of the file */ private static & PermissionNode> String getSourceForClass(Class clazz) { - String classFile = PERMISSION_NODE_SOURCE_FOLDER + clazz.getSimpleName() + ".java"; - Charset cs = Charset.forName("utf-8"); - try { - return StringUtils.join("\n", - Files.readAllLines(Paths.get(classFile), cs)); - } catch (IOException e) { - throw new RuntimeException("Failed to get the source for class '" + clazz.getSimpleName() + "'"); - } + String classFile = ToolsConstants.MAIN_SOURCE_ROOT + clazz.getName().replace(".", "/") + ".java"; + return FileUtils.readFromFile(classFile); } } diff --git a/src/tools/permissions/PermissionsListWriter.java b/src/tools/permissions/PermissionsListWriter.java index 7d361b1c5..3f675ad5c 100644 --- a/src/tools/permissions/PermissionsListWriter.java +++ b/src/tools/permissions/PermissionsListWriter.java @@ -1,7 +1,7 @@ package permissions; import utils.ANewMap; -import utils.GeneratedFileWriter; +import utils.FileUtils; import utils.TagReplacer; import utils.ToolsConstants; @@ -23,17 +23,16 @@ public class PermissionsListWriter { System.out.println("Include description? [Enter 'n' for no]"); boolean includeDescription = !matches("n", scanner); - if (!includeDescription) { - outputSimpleList(); - return; + boolean writeToFile = false; + if (includeDescription) { + System.out.println("Write to file? [Enter 'n' for console output]"); + writeToFile = !matches("n", scanner); } - - System.out.println("Write to file? [Enter 'n' for console output]"); - boolean writeToFile = !matches("n", scanner); scanner.close(); - - if (writeToFile) { + if (!includeDescription) { + outputSimpleList(); + } else if (writeToFile) { generateAndWriteFile(); } else { System.out.println(generatePermissionsList()); @@ -45,7 +44,7 @@ public class PermissionsListWriter { final String permissionsTagValue = generatePermissionsList(); Map tags = ANewMap.with("permissions", permissionsTagValue).build(); - GeneratedFileWriter.generateFileFromTemplate( + FileUtils.generateFileFromTemplate( ToolsConstants.TOOLS_SOURCE_ROOT + "permissions/permission_nodes.tpl.md", PERMISSIONS_OUTPUT_FILE, tags); System.out.println("Wrote to '" + PERMISSIONS_OUTPUT_FILE + "'"); System.out.println("Before committing, please verify the output!"); @@ -55,7 +54,7 @@ public class PermissionsListWriter { PermissionNodesGatherer gatherer = new PermissionNodesGatherer(); Map permissions = gatherer.gatherNodesWithJavaDoc(); - final String template = GeneratedFileWriter.readFromToolsFile("permissions/permission_node_entry.tpl.md"); + final String template = FileUtils.readFromToolsFile("permissions/permission_node_entry.tpl.md"); StringBuilder sb = new StringBuilder(); for (Map.Entry entry : permissions.entrySet()) { diff --git a/src/tools/utils/GeneratedFileWriter.java b/src/tools/utils/FileUtils.java similarity index 89% rename from src/tools/utils/GeneratedFileWriter.java rename to src/tools/utils/FileUtils.java index 06cbcaf3d..fb88ae27c 100644 --- a/src/tools/utils/GeneratedFileWriter.java +++ b/src/tools/utils/FileUtils.java @@ -7,13 +7,13 @@ import java.nio.file.Paths; import java.util.Map; /** - * Utility class for writing a generated file with a timestamp. + * Utility class for reading from and writing to files. */ -public final class GeneratedFileWriter { +public final class FileUtils { private final static Charset CHARSET = Charset.forName("utf-8"); - private GeneratedFileWriter() { + private FileUtils() { } public static void generateFileFromTemplate(String templateFile, String destinationFile, Map tags) { @@ -43,5 +43,4 @@ public final class GeneratedFileWriter { return readFromFile(ToolsConstants.TOOLS_SOURCE_ROOT + file); } - } From dcd06760cee3388a0e51ff3a344db31454d039cc Mon Sep 17 00:00:00 2001 From: Xephi Date: Wed, 9 Dec 2015 10:38:41 +0100 Subject: [PATCH 06/33] Display a message on bad email.html --- src/main/java/fr/xephi/authme/SendMailSSL.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/xephi/authme/SendMailSSL.java b/src/main/java/fr/xephi/authme/SendMailSSL.java index 8eb1a92be..12e0249b5 100644 --- a/src/main/java/fr/xephi/authme/SendMailSSL.java +++ b/src/main/java/fr/xephi/authme/SendMailSSL.java @@ -2,6 +2,8 @@ package fr.xephi.authme; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.settings.Settings; + +import org.apache.commons.mail.EmailException; import org.apache.commons.mail.HtmlEmail; import org.bukkit.Bukkit; @@ -81,8 +83,14 @@ public class SendMailSSL { ConsoleLogger.showError("Unable to send new password as image! Using normal text! Dest: " + mail); } } - email.setHtmlMsg(content); - email.setTextMsg(content); + try { + email.setHtmlMsg(content); + email.setTextMsg(content); + } catch (EmailException e) + { + ConsoleLogger.showError("Your email.html config contains some error and cannot be send!"); + return; + } try { email.send(); } catch (Exception e) { From 49da659d93fa5fce0f1ba7aa346689c4391255ce Mon Sep 17 00:00:00 2001 From: Xephi Date: Wed, 9 Dec 2015 11:15:09 +0100 Subject: [PATCH 07/33] Add SH Helpers tools --- src/tools/shhelpers/analyze_project.sh | 11 +++++++++++ src/tools/shhelpers/build_project.sh | 11 +++++++++++ src/tools/shhelpers/list_files.sh | 2 ++ src/tools/shhelpers/move_plugin.sh | 16 ++++++++++++++++ src/tools/shhelpers/quick_build.sh | 11 +++++++++++ src/tools/shhelpers/run_server.sh | 11 +++++++++++ src/tools/shhelpers/setvars.sh | 16 ++++++++++++++++ 7 files changed, 78 insertions(+) create mode 100644 src/tools/shhelpers/analyze_project.sh create mode 100644 src/tools/shhelpers/build_project.sh create mode 100644 src/tools/shhelpers/list_files.sh create mode 100644 src/tools/shhelpers/move_plugin.sh create mode 100644 src/tools/shhelpers/quick_build.sh create mode 100644 src/tools/shhelpers/run_server.sh create mode 100644 src/tools/shhelpers/setvars.sh diff --git a/src/tools/shhelpers/analyze_project.sh b/src/tools/shhelpers/analyze_project.sh new file mode 100644 index 000000000..ef817fca6 --- /dev/null +++ b/src/tools/shhelpers/analyze_project.sh @@ -0,0 +1,11 @@ +#!/bin/sh +# +# Usage: ./analyze_project.sh +# + +if [ -z $jarfile ]; + then + ./setvars.sh +fi + +mvn clean verify sonar:sonar -f $pomfile diff --git a/src/tools/shhelpers/build_project.sh b/src/tools/shhelpers/build_project.sh new file mode 100644 index 000000000..a9775c7a6 --- /dev/null +++ b/src/tools/shhelpers/build_project.sh @@ -0,0 +1,11 @@ +#!/bin/sh +# +# Usage: ./build_project.sh +# + +if [ -z $jarfile ]; + then + ./setvars.sh +fi + +mvn clean install -f $pomfile -B diff --git a/src/tools/shhelpers/list_files.sh b/src/tools/shhelpers/list_files.sh new file mode 100644 index 000000000..24d1c4ef6 --- /dev/null +++ b/src/tools/shhelpers/list_files.sh @@ -0,0 +1,2 @@ +#!/bin/sh +ls -aB *.sh diff --git a/src/tools/shhelpers/move_plugin.sh b/src/tools/shhelpers/move_plugin.sh new file mode 100644 index 000000000..c2278b53e --- /dev/null +++ b/src/tools/shhelpers/move_plugin.sh @@ -0,0 +1,16 @@ +#!/bin/sh +# +# Usage: ./move_plugin.sh +# + +if [ -z $jarfile ]; + then + ./setvars.sh +fi + +if [ -f $jarfile ] +then + cp $jarfile $plugins +else + echo "Target file not found: $jarfile" +fi diff --git a/src/tools/shhelpers/quick_build.sh b/src/tools/shhelpers/quick_build.sh new file mode 100644 index 000000000..3ec108a23 --- /dev/null +++ b/src/tools/shhelpers/quick_build.sh @@ -0,0 +1,11 @@ +#!/bin/sh +# +# Usage: ./analyze_project.sh +# + +if [ -z $jarfile ]; + then + ./setvars.sh +fi + +mvn install -f $pomfile -Dmaven.test.skip diff --git a/src/tools/shhelpers/run_server.sh b/src/tools/shhelpers/run_server.sh new file mode 100644 index 000000000..24fa50577 --- /dev/null +++ b/src/tools/shhelpers/run_server.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ -z $jarfile ] +then + ./setvars.sh +fi + +cd $server +java -Xmx1024M -Xms1024M -jar spigot_server.jar +cd $batdir +./list_files.sh diff --git a/src/tools/shhelpers/setvars.sh b/src/tools/shhelpers/setvars.sh new file mode 100644 index 000000000..60b067ebd --- /dev/null +++ b/src/tools/shhelpers/setvars.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +#The folder in which these .sh files are located +EXPORT batdir=/home/yourhome/IdeaProjects/AuthMeReloaded/src/tools/shhelpers/ + +#The location of the generated JAR file +EXPORT jarfile=/home/yourhome/IdeaProjects/AuthMeReloaded/target/AuthMe-5.2-SNAPSHOT.jar + +#The location of the pom.xml file of the project +EXPORT pomfile=/home/yourhome/IdeaProjects/AuthMeReloaded/pom.xml + +#The folder in which the server is located +EXPORT server=/home/yourhome/AUTHME_DEV/spigot-server/ + +#The Location of the plugins folder of the Minecraft server +EXPORT plugins=$server/plugins/ From c3d724ebce1e8f9187abfb74fa9677d6bf56aafe Mon Sep 17 00:00:00 2001 From: Xephi Date: Wed, 9 Dec 2015 11:35:29 +0100 Subject: [PATCH 08/33] Sort messages.yml file --- src/main/resources/messages/messages_bg.yml | 96 +++++++-------- src/main/resources/messages/messages_br.yml | 104 ++++++++--------- src/main/resources/messages/messages_cz.yml | 102 ++++++++-------- src/main/resources/messages/messages_de.yml | 96 +++++++-------- src/main/resources/messages/messages_en.yml | 98 ++++++++-------- src/main/resources/messages/messages_es.yml | 104 ++++++++--------- src/main/resources/messages/messages_eu.yml | 96 +++++++-------- src/main/resources/messages/messages_fi.yml | 102 ++++++++-------- src/main/resources/messages/messages_fr.yml | 104 ++++++++--------- src/main/resources/messages/messages_gl.yml | 106 ++++++++--------- src/main/resources/messages/messages_hu.yml | 102 ++++++++-------- src/main/resources/messages/messages_id.yml | 96 +++++++-------- src/main/resources/messages/messages_it.yml | 96 +++++++-------- src/main/resources/messages/messages_ko.yml | 110 +++++++++--------- src/main/resources/messages/messages_lt.yml | 102 ++++++++-------- src/main/resources/messages/messages_nl.yml | 100 ++++++++-------- src/main/resources/messages/messages_pl.yml | 102 ++++++++-------- src/main/resources/messages/messages_pt.yml | 104 ++++++++--------- src/main/resources/messages/messages_ru.yml | 102 ++++++++-------- src/main/resources/messages/messages_sk.yml | 108 ++++++++--------- src/main/resources/messages/messages_tr.yml | 96 +++++++-------- src/main/resources/messages/messages_uk.yml | 102 ++++++++-------- src/main/resources/messages/messages_vn.yml | 98 ++++++++-------- src/main/resources/messages/messages_zhcn.yml | Bin 4406 -> 4407 bytes src/main/resources/messages/messages_zhhk.yml | 106 ++++++++--------- src/main/resources/messages/messages_zhtw.yml | 108 ++++++++--------- 26 files changed, 1270 insertions(+), 1270 deletions(-) diff --git a/src/main/resources/messages/messages_bg.yml b/src/main/resources/messages/messages_bg.yml index 81a7e7088..aa34a5421 100644 --- a/src/main/resources/messages/messages_bg.yml +++ b/src/main/resources/messages/messages_bg.yml @@ -1,58 +1,58 @@ -unknown_user: '&fПотребителя не е в БД' -unsafe_spawn: '&fТвоята локация когато излезе не беше безопасна, телепортиран си на Spawn!' -not_logged_in: '&cНе си влязъл!' -reg_voluntarily: '&fМоже да се регистрираш с тази команда: - "/register парола парола"' -usage_log: '&cКоманда: /login парола' -wrong_pwd: '&cГрешна парола!' -unregistered: '&cУспешно от-регистриран!' -reg_disabled: '&cРегистрациите са изключени!' -valid_session: '&aСесията продължена!' -login: '&cВход успешен!' -vb_nonActiv: '&fТвоята регистрация не е активирана, моля провери своя Имейл!' -user_regged: '&cПотребителското име е заето!' -usage_reg: '&cКоманда: /register парола парола' -max_reg: '&fТи достигна максималния брой регистрации!' -no_perm: '&cНямаш Достъп!' +add_email: '&cМоля добави своя имейл с : /email add имейл имейл' +antibot_auto_disabled: '[AuthMe] AntiBotMod автоматично изключване след %m Минути.' +antibot_auto_enabled: '[AuthMe] AntiBotMod автоматично включен, открита е потенциална атака!' +country_banned: Твоята държава е забранена в този сървър! +email_added: '[AuthMe] Имейла добавен !' +email_changed: '[AuthMe] Имейла е сменен !' +email_confirm: '[AuthMe] Потвърди своя имейл !' +email_invalid: '[AuthMe] Грешен имейл' +email_send: '[AuthMe] Изпраен е имейл !' error: '&fПолучи се грешка; Моля свържете се с админ' +invalid_session: '&fSession Dataes doesnt corrispond Plaese wait the end of session' +kick_forvip: '&cVIP влезе докато сървъра е пълен, ти беше изгонен!' +kick_fullserver: '&cСървъра е пълен, Съжеляваме!' +logged_in: '&cВече сте влязъл!' +login: '&cВход успешен!' login_msg: '&cМоля влез с "/login парола"' -reg_msg: '&cМоля регистрирай се с "/register парола парола"' -reg_email_msg: '&cМоля регистрирай се с "/register <имейл> <имейл>"' -usage_unreg: '&cКоманда: /unregister парола' -pwd_changed: '&cПаролата е променена!' -user_unknown: '&cПотребителя не е регистриран' +logout: '&cУспешен изход от регистрацията!' +max_reg: '&fТи достигна максималния брой регистрации!' +name_len: '&cТвоя никнейм е твърде малък или голям' +new_email_invalid: '[AuthMe] Новия имейл е грешен!' +no_perm: '&cНямаш Достъп!' +not_logged_in: '&cНе си влязъл!' +old_email_invalid: '[AuthMe] Стария имейл е грешен!' +pass_len: '&cВашета парола не е достатъчно дълга или къса.' password_error: '&fПаролата не съвпада' password_error_nick: '&fYou can''t use your name as password' password_error_unsafe: '&fYou can''t use unsafe passwords' -invalid_session: '&fSession Dataes doesnt corrispond Plaese wait the end of session' -reg_only: '&fСамо за регистрирани! Моля посети http://example.com за регистрация' -logged_in: '&cВече сте влязъл!' -logout: '&cУспешен изход от регистрацията!' -same_nick: '&fПотребител с този никнейм е в игра' -registered: '&cУспешно премахната регистрация!' -pass_len: '&cВашета парола не е достатъчно дълга или къса.' -reload: '&fКонфигурацията презаредена!' -timeout: '&fВремето изтече, опитай отново!' -usage_changepassword: '&fКоманда: /changepassword СтараПарола НоваПарола' -name_len: '&cТвоя никнейм е твърде малък или голям' -regex: '&cТвоя никнейм съдържа забранени знацхи. Позволените са: REG_EX' -add_email: '&cМоля добави своя имейл с : /email add имейл имейл' +pwd_changed: '&cПаролата е променена!' recovery_email: '&cЗабравихте своята парола? Моля използвай /email recovery <имейл>' +reg_disabled: '&cРегистрациите са изключени!' +reg_email_msg: '&cМоля регистрирай се с "/register <имейл> <имейл>"' +regex: '&cТвоя никнейм съдържа забранени знацхи. Позволените са: REG_EX' +registered: '&cУспешно премахната регистрация!' + "/register парола парола"' +reg_msg: '&cМоля регистрирай се с "/register парола парола"' +reg_only: '&fСамо за регистрирани! Моля посети http://example.com за регистрация' +reg_voluntarily: '&fМоже да се регистрираш с тази команда: +reload: '&fКонфигурацията презаредена!' +same_nick: '&fПотребител с този никнейм е в игра' +timeout: '&fВремето изтече, опитай отново!' +unknown_user: '&fПотребителя не е в БД' +unregistered: '&cУспешно от-регистриран!' +unsafe_spawn: '&fТвоята локация когато излезе не беше безопасна, телепортиран си на Spawn!' usage_captcha: '&cYou need to type a captcha, please type: /captcha <код>' -wrong_captcha: '&cГрешен код, използвай : /captcha THE_CAPTCHA' -valid_captcha: '&cТвоя код е валиден!' -kick_forvip: '&cVIP влезе докато сървъра е пълен, ти беше изгонен!' -kick_fullserver: '&cСървъра е пълен, Съжеляваме!' +usage_changepassword: '&fКоманда: /changepassword СтараПарола НоваПарола' usage_email_add: '&fКоманда: /email add ' usage_email_change: '&fКоманда: /email change <СтарИмейл> <НовИмейл> ' usage_email_recovery: '&fКоманда: /email recovery <имейл>' -new_email_invalid: '[AuthMe] Новия имейл е грешен!' -old_email_invalid: '[AuthMe] Стария имейл е грешен!' -email_invalid: '[AuthMe] Грешен имейл' -email_added: '[AuthMe] Имейла добавен !' -email_confirm: '[AuthMe] Потвърди своя имейл !' -email_changed: '[AuthMe] Имейла е сменен !' -email_send: '[AuthMe] Изпраен е имейл !' -country_banned: Твоята държава е забранена в този сървър! -antibot_auto_enabled: '[AuthMe] AntiBotMod автоматично включен, открита е потенциална атака!' -antibot_auto_disabled: '[AuthMe] AntiBotMod автоматично изключване след %m Минути.' +usage_log: '&cКоманда: /login парола' +usage_reg: '&cКоманда: /register парола парола' +usage_unreg: '&cКоманда: /unregister парола' +user_regged: '&cПотребителското име е заето!' +user_unknown: '&cПотребителя не е регистриран' +valid_captcha: '&cТвоя код е валиден!' +valid_session: '&aСесията продължена!' +vb_nonActiv: '&fТвоята регистрация не е активирана, моля провери своя Имейл!' +wrong_captcha: '&cГрешен код, използвай : /captcha THE_CAPTCHA' +wrong_pwd: '&cГрешна парола!' diff --git a/src/main/resources/messages/messages_br.yml b/src/main/resources/messages/messages_br.yml index 20243c687..922f05066 100644 --- a/src/main/resources/messages/messages_br.yml +++ b/src/main/resources/messages/messages_br.yml @@ -1,58 +1,58 @@ -unknown_user: '&fNao esta no banco de dados' -unsafe_spawn: '&fA sua localização na saída não é segura, você será tele-portado para a Spawn' -not_logged_in: '&cVocê nao esta autenticado!' -reg_voluntarily: '&fVocê pode registrar o seu nickname no servidor com o comando "/register password ConfirmePassword"' -usage_log: '&cUse: /login password' -wrong_pwd: '&cPassword incorreta' -password_error_nick: '&fYou can''t use your name as password' -password_error_unsafe: '&fYou can''t use unsafe passwords' -unregistered: '&cRegistro eliminado com sucesso!' -reg_disabled: '&cRegistro de novos utilizadores desativado' -valid_session: '&cSessão válida' -login: '&cAutenticado com sucesso!' -vb_nonActiv: '&fA sua conta ainda nao foi ativada, verifique o seu email, onde irá receber instruções de como ativa-la.' -user_regged: '&cNome de usuario já registrado' -usage_reg: '&cUse: /register password ConfirmPassword' -max_reg: '&fVocê atingiu o numero máximo de registros permitidos' -no_perm: '&cSem Permissões' -error: '&fOcorreu um erro; Por favor contacte um admin' -login_msg: '&cIdentifique-se (logue) com "/login password"' -reg_msg: '&cPor favor registre-se com "/register password confirmePassword"' -reg_email_msg: '&cPor favor registre-se com "/register ""' -usage_unreg: '&cUse: /unregister password' -pwd_changed: '&cPassword alterada!' -user_unknown: '&cUsername não registrado' -password_error: '&fAs passwords não coincidem' -invalid_session: '&fDados de sessão não correspondem. Por favor aguarde o fim da sessão' -reg_only: '&fApenas jogadores registrados! Visite http://example.com para se registrar' -logged_in: '&cJá se encontra autenticado(logado)!' -logout: '&cSaida com sucesso' -same_nick: '&fO mesmo nickname já se encontra a jogar no servidor' -registered: '&cRegistrado com sucesso!' -pass_len: '&fPassword ou muito curto, ou muito longo.' -reload: '&fConfiguração e base de dados foram recarregadas' -timeout: '&fExcedeu o tempo para autenticação' -usage_changepassword: '&fUse: /changepassword PasswordAntiga PasswordNova' -name_len: '&cO seu nickname é muito curto, ou muito longo.' -regex: '&cO seu nickname contém caracteres não permitidos. Permitido: REG_EX' add_email: '&cPor favor adicione o seu email com : /email add seuEmail confirmarSeuEmail' -recovery_email: '&cPerdeu/esqueceu a sua password(senha)? Para a recupera-la escreva /email recovery ' -usage_captcha: '&cVocê precisa digitar um captcha, escreva: /captcha ' -wrong_captcha: '&cCaptcha errado, por favor escreva: /captcha THE_CAPTCHA' -valid_captcha: '&cO seu captcha é válido!' +antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automaticamente após %m minutos, esperamos que a invasão tenha parado' +antibot_auto_enabled: '[AuthMe] AntiBotMod ativado automaticamente devido a um aumento anormal de tentativas de ligação!' +country_banned: 'O seu pais é banido desse servidor' +email_added: '[AuthMe] Email adicionado!' +email_changed: '[AuthMe] Email modificado!' +email_confirm: '[AuthMe] Confirme o seu email!' +email_exists: '[AuthMe] Um email já existe na sua conta. Você pode mudalo usando o comando abaixo.' +email_invalid: '[AuthMe] Email Invalido' +email_send: '[AuthMe] Recuperação de email enviada!' +error: '&fOcorreu um erro; Por favor contacte um admin' +invalid_session: '&fDados de sessão não correspondem. Por favor aguarde o fim da sessão' kick_forvip: '&cUm jogador VIP entrou no servidor cheio!' kick_fullserver: '&cO servidor está actualmente cheio, tente mais tarde :/ !' +logged_in: '&cJá se encontra autenticado(logado)!' +login: '&cAutenticado com sucesso!' +login_msg: '&cIdentifique-se (logue) com "/login password"' +logout: '&cSaida com sucesso' +max_reg: '&fVocê atingiu o numero máximo de registros permitidos' +name_len: '&cO seu nickname é muito curto, ou muito longo.' +new_email_invalid: '[AuthMe] Novo email invalido!' +no_perm: '&cSem Permissões' +not_logged_in: '&cVocê nao esta autenticado!' +old_email_invalid: '[AuthMe] Antigo email invalido!' +pass_len: '&fPassword ou muito curto, ou muito longo.' +password_error: '&fAs passwords não coincidem' +password_error_nick: '&fYou can''t use your name as password' +password_error_unsafe: '&fYou can''t use unsafe passwords' +pwd_changed: '&cPassword alterada!' +recovery_email: '&cPerdeu/esqueceu a sua password(senha)? Para a recupera-la escreva /email recovery ' +reg_disabled: '&cRegistro de novos utilizadores desativado' +reg_email_msg: '&cPor favor registre-se com "/register ""' +regex: '&cO seu nickname contém caracteres não permitidos. Permitido: REG_EX' +registered: '&cRegistrado com sucesso!' +reg_msg: '&cPor favor registre-se com "/register password confirmePassword"' +reg_only: '&fApenas jogadores registrados! Visite http://example.com para se registrar' +reg_voluntarily: '&fVocê pode registrar o seu nickname no servidor com o comando "/register password ConfirmePassword"' +reload: '&fConfiguração e base de dados foram recarregadas' +same_nick: '&fO mesmo nickname já se encontra a jogar no servidor' +timeout: '&fExcedeu o tempo para autenticação' +unknown_user: '&fNao esta no banco de dados' +unregistered: '&cRegistro eliminado com sucesso!' +unsafe_spawn: '&fA sua localização na saída não é segura, você será tele-portado para a Spawn' +usage_captcha: '&cVocê precisa digitar um captcha, escreva: /captcha ' +usage_changepassword: '&fUse: /changepassword PasswordAntiga PasswordNova' usage_email_add: '&fUse: /email add ' usage_email_change: '&fUse: /email change ' usage_email_recovery: '&fUse: /email recovery ' -new_email_invalid: '[AuthMe] Novo email invalido!' -old_email_invalid: '[AuthMe] Antigo email invalido!' -email_invalid: '[AuthMe] Email Invalido' -email_added: '[AuthMe] Email adicionado!' -email_confirm: '[AuthMe] Confirme o seu email!' -email_changed: '[AuthMe] Email modificado!' -email_send: '[AuthMe] Recuperação de email enviada!' -email_exists: '[AuthMe] Um email já existe na sua conta. Você pode mudalo usando o comando abaixo.' -country_banned: 'O seu pais é banido desse servidor' -antibot_auto_enabled: '[AuthMe] AntiBotMod ativado automaticamente devido a um aumento anormal de tentativas de ligação!' -antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automaticamente após %m minutos, esperamos que a invasão tenha parado' +usage_log: '&cUse: /login password' +usage_reg: '&cUse: /register password ConfirmPassword' +usage_unreg: '&cUse: /unregister password' +user_regged: '&cNome de usuario já registrado' +user_unknown: '&cUsername não registrado' +valid_captcha: '&cO seu captcha é válido!' +valid_session: '&cSessão válida' +vb_nonActiv: '&fA sua conta ainda nao foi ativada, verifique o seu email, onde irá receber instruções de como ativa-la.' +wrong_captcha: '&cCaptcha errado, por favor escreva: /captcha THE_CAPTCHA' +wrong_pwd: '&cPassword incorreta' diff --git a/src/main/resources/messages/messages_cz.yml b/src/main/resources/messages/messages_cz.yml index 7492503d7..ef5a1ebc1 100644 --- a/src/main/resources/messages/messages_cz.yml +++ b/src/main/resources/messages/messages_cz.yml @@ -1,57 +1,57 @@ -unknown_user: '&cHrac neni registrovan.' -not_logged_in: '&cNeprihlasen!' -reg_voluntarily: '&cRegistruj se prikazem "/register heslo heslo".' -usage_log: '&cPouzij: "/login TvojeHeslo".' -wrong_pwd: '&cSpatne heslo.' -unregistered: '&cUspesne odregistrovan!' -reg_disabled: '&cRegistrace je zakazana!' -valid_session: '&cAutomaticke znovuprihlaseni.' -login: '&cUspesne prihlaseni!' -user_regged: '&cUzivatelske jmeno je jiz registrovano.' -password_error_nick: '&fYou can''t use your name as password' -password_error_unsafe: '&fYou can''t use unsafe passwords' -usage_reg: '&cPouzij: "/register heslo heslo".' -no_perm: '&cNemas opravneni.' -error: '&cVyskytla se chyba - kontaktujte administratora ...' -login_msg: '&cProsim prihlas se "/login TvojeHeslo".' -reg_msg: '&cProsim zaregistruj se "/register heslo heslo".' -reg_email_msg: '&cProsim registruj se pomoci "/register "' -usage_unreg: '&cPouzij: "/unregister TvojeHeslo".' -pwd_changed: '&cHeslo zmeneno!' -user_unknown: '&cUzivatelske jmeno neni registrovano.' -reg_only: '&cServer je pouze pro registrovane! Navstivte http://bit.ly/zyEzzS.' -logged_in: '&cJiz jsi prihlasen!' -logout: '&cOdhlaseni bylo uspesne.' -same_nick: '&cUzivatel s timto jmenem jiz hraje.' -registered: '&cRegistrace byla uspesna!' -reload: '&cZnovu nacteni nastaveni AuthMe probehlo uspesne.' -timeout: '&cCas pro prihlaseni vyprsel!' -unsafe_spawn: '&cTvoje pozice pri odpojeni byla nebezpecna, teleportuji na spawn!' -invalid_session: '&cChybna data pri cteni pockejte do vyprseni.' -max_reg: '&cJiz jsi prekrocil(a) limit pro pocet uctu z jedne IP.' -password_error: '&cHesla se neshoduji!' -pass_len: '&cTvoje heslo nedosahuje minimalni delky (4).' -vb_nonActiv: '&cTvuj ucet neni aktivovany, zkontrolujte si svuj E-mail.' -usage_changepassword: '&cPouzij: "/changepassword stareHeslo noveHeslo".' -name_len: '&cTvuj nick je prilis kratky, nebo prilis dlouhy' -regex: '&cTvuj nick obsahuje nepovolene znaky. Pripustne znaky jsou: REG_EX' add_email: '&cPridej prosim svuj email pomoci : /email add TvujEmail TvujEmail' -recovery_email: '&cZapomel jsi heslo? Zadej: /email recovery ' -usage_captcha: '&cPouzij: /captcha ' -wrong_captcha: '&cSpatne opsana Captcha, pouzij prosim: /captcha CAPTCHA_TEXT' -valid_captcha: '&cZadana captcha je v poradku!' +antibot_auto_disabled: '[AuthMe] AntiBotMod automaticky ukoncen po %m minutach, doufejme v konec invaze' +antibot_auto_enabled: '[AuthMe] AntiBotMod automaticky spusten z duvodu masivnich pripojeni!' +country_banned: 'Vase zeme je na tomto serveru zakazana' +email_added: '[AuthMe] Email pridan!' +email_changed: '[AuthMe] Email zmenen!' +email_confirm: '[AuthMe] Potvrd prosim svuj email!' +email_invalid: '[AuthMe] Nespravny email' +email_send: '[AuthMe] Email pro obnoveni hesla odeslan!' +error: '&cVyskytla se chyba - kontaktujte administratora ...' +invalid_session: '&cChybna data pri cteni pockejte do vyprseni.' kick_forvip: '&cVIP Hrac se pripojil na plny server!' kick_fullserver: '&cServer je plne obsazen, zkus to pozdeji prosim!' +logged_in: '&cJiz jsi prihlasen!' +login: '&cUspesne prihlaseni!' +login_msg: '&cProsim prihlas se "/login TvojeHeslo".' +logout: '&cOdhlaseni bylo uspesne.' +max_reg: '&cJiz jsi prekrocil(a) limit pro pocet uctu z jedne IP.' +name_len: '&cTvuj nick je prilis kratky, nebo prilis dlouhy' +new_email_invalid: '[AuthMe] Novy email je chybne zadan!' +no_perm: '&cNemas opravneni.' +not_logged_in: '&cNeprihlasen!' +old_email_invalid: '[AuthMe] Stary email je chybne zadan!' +pass_len: '&cTvoje heslo nedosahuje minimalni delky (4).' +password_error: '&cHesla se neshoduji!' +password_error_nick: '&fYou can''t use your name as password' +password_error_unsafe: '&fYou can''t use unsafe passwords' +pwd_changed: '&cHeslo zmeneno!' +recovery_email: '&cZapomel jsi heslo? Zadej: /email recovery ' +reg_disabled: '&cRegistrace je zakazana!' +reg_email_msg: '&cProsim registruj se pomoci "/register "' +regex: '&cTvuj nick obsahuje nepovolene znaky. Pripustne znaky jsou: REG_EX' +registered: '&cRegistrace byla uspesna!' +reg_msg: '&cProsim zaregistruj se "/register heslo heslo".' +reg_only: '&cServer je pouze pro registrovane! Navstivte http://bit.ly/zyEzzS.' +reg_voluntarily: '&cRegistruj se prikazem "/register heslo heslo".' +reload: '&cZnovu nacteni nastaveni AuthMe probehlo uspesne.' +same_nick: '&cUzivatel s timto jmenem jiz hraje.' +timeout: '&cCas pro prihlaseni vyprsel!' +unknown_user: '&cHrac neni registrovan.' +unregistered: '&cUspesne odregistrovan!' +unsafe_spawn: '&cTvoje pozice pri odpojeni byla nebezpecna, teleportuji na spawn!' +usage_captcha: '&cPouzij: /captcha ' +usage_changepassword: '&cPouzij: "/changepassword stareHeslo noveHeslo".' usage_email_add: '&fPouzij: /email add ' usage_email_change: '&fPouzij: /email change ' usage_email_recovery: '&fPouzij: /email recovery ' -new_email_invalid: '[AuthMe] Novy email je chybne zadan!' -old_email_invalid: '[AuthMe] Stary email je chybne zadan!' -email_invalid: '[AuthMe] Nespravny email' -email_added: '[AuthMe] Email pridan!' -email_confirm: '[AuthMe] Potvrd prosim svuj email!' -email_changed: '[AuthMe] Email zmenen!' -email_send: '[AuthMe] Email pro obnoveni hesla odeslan!' -country_banned: 'Vase zeme je na tomto serveru zakazana' -antibot_auto_enabled: '[AuthMe] AntiBotMod automaticky spusten z duvodu masivnich pripojeni!' -antibot_auto_disabled: '[AuthMe] AntiBotMod automaticky ukoncen po %m minutach, doufejme v konec invaze' +usage_log: '&cPouzij: "/login TvojeHeslo".' +usage_reg: '&cPouzij: "/register heslo heslo".' +usage_unreg: '&cPouzij: "/unregister TvojeHeslo".' +user_regged: '&cUzivatelske jmeno je jiz registrovano.' +user_unknown: '&cUzivatelske jmeno neni registrovano.' +valid_captcha: '&cZadana captcha je v poradku!' +valid_session: '&cAutomaticke znovuprihlaseni.' +vb_nonActiv: '&cTvuj ucet neni aktivovany, zkontrolujte si svuj E-mail.' +wrong_captcha: '&cSpatne opsana Captcha, pouzij prosim: /captcha CAPTCHA_TEXT' +wrong_pwd: '&cSpatne heslo.' diff --git a/src/main/resources/messages/messages_de.yml b/src/main/resources/messages/messages_de.yml index fa086015a..5a89d3ea4 100644 --- a/src/main/resources/messages/messages_de.yml +++ b/src/main/resources/messages/messages_de.yml @@ -1,58 +1,58 @@ -unknown_user: '&cBenutzer ist nicht in der Datenbank' -unsafe_spawn: '&cDeine Logoutposition war unsicher, du wurdest zum Spawn teleportiert' -not_logged_in: '&cNicht eingeloggt!' -reg_voluntarily: 'Du kannst dich mit folgendem Befehl registrieren "/register "' -usage_log: '&cBenutze: /login ' -wrong_pwd: '&cFalsches Passwort' -unregistered: '&cBenutzerkonto erfolgreich gelöscht!' -reg_disabled: '&cRegistrierungen sind deaktiviert' -valid_session: '&2Erfolgreich eingeloggt!' -login: '&2Erfolgreich eingeloggt!' -vb_nonActiv: '&cDein Account wurde noch nicht aktiviert. Bitte prüfe Deine E-Mails!' -user_regged: '&cBenutzername ist schon vergeben' -usage_reg: '&cBenutze: /register ' -max_reg: '&cDu hast die maximale Anzahl an Accounts erreicht' -no_perm: '&4Du hast keine Rechte, um diese Aktion auszuführen!' +add_email: '&3Bitte hinterlege Deine E-Mail Adresse: /email add ' +antibot_auto_disabled: '&2[AntiBotService] AntiBotMod wurde nach %m Minuten deaktiviert, hoffentlich ist die Invasion vorbei' +antibot_auto_enabled: '&4[AntiBotService] AntiBotMod wurde aufgrund hoher Netzauslastung automatisch aktiviert!' +country_banned: '&4Dein Land ist gesperrt' +email_added: '&2Email hinzugefügt!' +email_changed: '&2Email aktualisiert!' +email_confirm: '&cBitte bestätige deine Email!' +email_exists: '&cEine Wiederherstellungs-Email wurde bereits versandt! Nutze folgenden Befehl um eine neue Email zu versenden:' +email_invalid: '&cUngültige Email' +email_send: '&2Wiederherstellungs-Email wurde gesendet!' error: '&4Ein Fehler ist aufgetreten. Bitte kontaktiere einen Administrator' +invalid_session: '&cUngültige Session. Bitte starte das Spiel neu oder warte, bis die Session abgelaufen ist' +kick_forvip: '&3Ein VIP Spieler hat den vollen Server betreten!' +kick_fullserver: '&4Der Server ist momentan voll, Sorry!' +logged_in: '&cBereits eingeloggt!' +login: '&2Erfolgreich eingeloggt!' login_msg: '&cBitte logge Dich ein mit "/login "' -reg_msg: '&3Bitte registriere Dich mit "/register "' -reg_email_msg: '&3Bitte registriere Dich mit "/register "' -usage_unreg: '&cBenutze: /unregister ' -pwd_changed: '&2Passwort geändert!' -user_unknown: '&cBenutzername nicht registriert!' +logout: '&2Erfolgreich ausgeloggt' +max_reg: '&cDu hast die maximale Anzahl an Accounts erreicht' +name_len: '&4Dein Nickname ist zu kurz oder zu lang' +new_email_invalid: '&cDie neue Email ist ungültig!' +no_perm: '&4Du hast keine Rechte, um diese Aktion auszuführen!' +not_logged_in: '&cNicht eingeloggt!' +old_email_invalid: '&cDie alte Email ist ungültig!' +pass_len: '&cDein Passwort ist zu kurz oder zu lang!' password_error: '&cPasswörter stimmen nicht überein!' password_error_nick: '&cDu kannst nicht deinen Namen als Passwort nutzen!' password_error_unsafe: '&cDu kannst nicht unsichere Passwörter nutzen!' -invalid_session: '&cUngültige Session. Bitte starte das Spiel neu oder warte, bis die Session abgelaufen ist' -reg_only: '&4Nur für registrierte Spieler! Bitte besuche http://example.com zum registrieren' -logged_in: '&cBereits eingeloggt!' -logout: '&2Erfolgreich ausgeloggt' -same_nick: '&4Jemand mit diesem Namen spielt bereits auf dem Server!' -registered: '&2Erfolgreich registriert!' -pass_len: '&cDein Passwort ist zu kurz oder zu lang!' -reload: '&2Konfiguration und Datenbank wurden erfolgreich neu geladen' -timeout: '&4Zeitüberschreitung beim Login' -usage_changepassword: '&cBenutze: /changepassword ' -name_len: '&4Dein Nickname ist zu kurz oder zu lang' -regex: '&4Dein Nickname enthält nicht erlaubte Zeichen. Zulässige Zeichen: REG_EX' -add_email: '&3Bitte hinterlege Deine E-Mail Adresse: /email add ' +pwd_changed: '&2Passwort geändert!' recovery_email: '&3Passwort vergessen? Nutze "/email recovery " für ein neues Passwort' +reg_disabled: '&cRegistrierungen sind deaktiviert' +reg_email_msg: '&3Bitte registriere Dich mit "/register "' +regex: '&4Dein Nickname enthält nicht erlaubte Zeichen. Zulässige Zeichen: REG_EX' +registered: '&2Erfolgreich registriert!' +reg_msg: '&3Bitte registriere Dich mit "/register "' +reg_only: '&4Nur für registrierte Spieler! Bitte besuche http://example.com zum registrieren' +reg_voluntarily: 'Du kannst dich mit folgendem Befehl registrieren "/register "' +reload: '&2Konfiguration und Datenbank wurden erfolgreich neu geladen' +same_nick: '&4Jemand mit diesem Namen spielt bereits auf dem Server!' +timeout: '&4Zeitüberschreitung beim Login' +unknown_user: '&cBenutzer ist nicht in der Datenbank' +unregistered: '&cBenutzerkonto erfolgreich gelöscht!' +unsafe_spawn: '&cDeine Logoutposition war unsicher, du wurdest zum Spawn teleportiert' usage_captcha: '&3Um dich einzuloggen, tippe dieses Captcha so ein: /captcha ' -wrong_captcha: '&cFalsches Captcha, bitte nutze: /captcha THE_CAPTCHA' -valid_captcha: '&2Das Captcha ist korrekt!' -kick_forvip: '&3Ein VIP Spieler hat den vollen Server betreten!' -kick_fullserver: '&4Der Server ist momentan voll, Sorry!' +usage_changepassword: '&cBenutze: /changepassword ' usage_email_add: '&cBenutze: /email add ' usage_email_change: '&cBenutze: /email change ' usage_email_recovery: '&cBenutze: /email recovery ' -new_email_invalid: '&cDie neue Email ist ungültig!' -old_email_invalid: '&cDie alte Email ist ungültig!' -email_invalid: '&cUngültige Email' -email_added: '&2Email hinzugefügt!' -email_confirm: '&cBitte bestätige deine Email!' -email_changed: '&2Email aktualisiert!' -email_send: '&2Wiederherstellungs-Email wurde gesendet!' -email_exists: '&cEine Wiederherstellungs-Email wurde bereits versandt! Nutze folgenden Befehl um eine neue Email zu versenden:' -country_banned: '&4Dein Land ist gesperrt' -antibot_auto_enabled: '&4[AntiBotService] AntiBotMod wurde aufgrund hoher Netzauslastung automatisch aktiviert!' -antibot_auto_disabled: '&2[AntiBotService] AntiBotMod wurde nach %m Minuten deaktiviert, hoffentlich ist die Invasion vorbei' +usage_log: '&cBenutze: /login ' +usage_reg: '&cBenutze: /register ' +usage_unreg: '&cBenutze: /unregister ' +user_regged: '&cBenutzername ist schon vergeben' +user_unknown: '&cBenutzername nicht registriert!' +valid_captcha: '&2Das Captcha ist korrekt!' +valid_session: '&2Erfolgreich eingeloggt!' +vb_nonActiv: '&cDein Account wurde noch nicht aktiviert. Bitte prüfe Deine E-Mails!' +wrong_captcha: '&cFalsches Captcha, bitte nutze: /captcha THE_CAPTCHA' +wrong_pwd: '&cFalsches Passwort' diff --git a/src/main/resources/messages/messages_en.yml b/src/main/resources/messages/messages_en.yml index fdb361a31..1aa98736a 100644 --- a/src/main/resources/messages/messages_en.yml +++ b/src/main/resources/messages/messages_en.yml @@ -1,59 +1,59 @@ -kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' -unknown_user: '&cCan''t find the requested user in the database!' -unsafe_spawn: '&cYour quit location was unsafe, you have been teleported to the world''s spawnpoint.' -not_logged_in: '&cYou''re not logged in!' -reg_voluntarily: 'You can register yourself to the server with the command "/register "' -usage_log: '&cUsage: /login ' -wrong_pwd: '&cWrong password!' -unregistered: '&cSuccessfully unregistered!' -reg_disabled: '&cIn-game registration is disabled!' -valid_session: '&2Logged-in due to Session Reconnection.' -login: '&2Successful login!' -vb_nonActiv: '&cYour account isn''t activated yet, please check your emails!' -user_regged: '&cYou already have registered this username!' -usage_reg: '&cUsage: /register ' -max_reg: '&cYou have exceeded the maximum number of registrations for your connection!' -no_perm: '&4You don''t have the permission to perform this action!' +add_email: '&3Please add your email to your account with the command "/email add "' +antibot_auto_disabled: '&2[AntiBotService] AntiBot disabled disabled after %m minutes!' +antibot_auto_enabled: '&4[AntiBotService] AntiBot enabled due to the huge number of connections!' +country_banned: '&4Your country is banned from this server!' +email_added: '&2Email address successfully added to your account!' +email_changed: '&2Email address changed correctly!' +email_confirm: '&cPlease confirm your email address!' +email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' +email_invalid: '&cInvalid Email address, try again!' +email_send: '&2Recovery email sent correctly! Check your email inbox!' error: '&4An unexpected error occurred, please contact an Administrator!' +invalid_session: '&cYour IP has been changed and your session data has expired!' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +kick_forvip: '&3A VIP Player has joined the server when it was full!' +kick_fullserver: '&4The server is full, try again later!' +logged_in: '&cYou''re already logged in!' +login: '&2Successful login!' login_msg: '&cPlease, login with the command "/login "' -reg_msg: '&3Please, register to the server with the command "/register "' -reg_email_msg: '&3Please, register to the server with the command "/register "' -usage_unreg: '&cUsage: /unregister ' -pwd_changed: '&2Password changed successfully!' -user_unknown: '&cThis user isn''t registered!' +logout: '&2Logged-out successfully!' +max_reg: '&cYou have exceeded the maximum number of registrations for your connection!' +name_len: '&4Your username is either too short or too long!' +new_email_invalid: '&cInvalid New Email, try again!' +no_perm: '&4You don''t have the permission to perform this action!' +not_logged_in: '&cYou''re not logged in!' +old_email_invalid: '&cInvalid Old Email, try again!' +pass_len: '&cYour password is too short or too long! Please try with another one!' password_error: '&cPasswords didn''t match, check them again!' password_error_nick: '&cYou can''t use your name as password, please choose another one...' password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...' -invalid_session: '&cYour IP has been changed and your session data has expired!' -reg_only: '&4Only registered users can join the server! Please visit http://example.com to register yourself!' -logged_in: '&cYou''re already logged in!' -logout: '&2Logged-out successfully!' -same_nick: '&4The same username is already playing on the server!' -registered: '&2Successfully registered!' -pass_len: '&cYour password is too short or too long! Please try with another one!' -reload: '&2Configuration and database have been reloaded correctly!' -timeout: '&4Login timeout exceeded, you have been kicked from the server, please try again!' -usage_changepassword: '&cUsage: /changepassword ' -name_len: '&4Your username is either too short or too long!' -regex: '&4Your username contains illegal characters. Allowed chars: REG_EX' -add_email: '&3Please add your email to your account with the command "/email add "' +pwd_changed: '&2Password changed successfully!' recovery_email: '&3Forgot your password? Please use the command "/email recovery "' +reg_disabled: '&cIn-game registration is disabled!' +reg_email_msg: '&3Please, register to the server with the command "/register "' +regex: '&4Your username contains illegal characters. Allowed chars: REG_EX' +registered: '&2Successfully registered!' +reg_msg: '&3Please, register to the server with the command "/register "' +reg_only: '&4Only registered users can join the server! Please visit http://example.com to register yourself!' +reg_voluntarily: 'You can register yourself to the server with the command "/register "' +reload: '&2Configuration and database have been reloaded correctly!' +same_nick: '&4The same username is already playing on the server!' +timeout: '&4Login timeout exceeded, you have been kicked from the server, please try again!' +unknown_user: '&cCan''t find the requested user in the database!' +unregistered: '&cSuccessfully unregistered!' +unsafe_spawn: '&cYour quit location was unsafe, you have been teleported to the world''s spawnpoint.' usage_captcha: '&3To login you have to solve a captcha code, please use the command "/captcha "' -wrong_captcha: '&cWrong Captcha, please type "/captcha THE_CAPTCHA" into the chat!' -valid_captcha: '&2Captcha code solved correctly!' -kick_forvip: '&3A VIP Player has joined the server when it was full!' -kick_fullserver: '&4The server is full, try again later!' +usage_changepassword: '&cUsage: /changepassword ' usage_email_add: '&cUsage: /email add ' usage_email_change: '&cUsage: /email change ' usage_email_recovery: '&cUsage: /email recovery ' -new_email_invalid: '&cInvalid New Email, try again!' -old_email_invalid: '&cInvalid Old Email, try again!' -email_invalid: '&cInvalid Email address, try again!' -email_added: '&2Email address successfully added to your account!' -email_confirm: '&cPlease confirm your email address!' -email_changed: '&2Email address changed correctly!' -email_send: '&2Recovery email sent correctly! Check your email inbox!' -email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' -country_banned: '&4Your country is banned from this server!' -antibot_auto_enabled: '&4[AntiBotService] AntiBot enabled due to the huge number of connections!' -antibot_auto_disabled: '&2[AntiBotService] AntiBot disabled disabled after %m minutes!' +usage_log: '&cUsage: /login ' +usage_reg: '&cUsage: /register ' +usage_unreg: '&cUsage: /unregister ' +user_regged: '&cYou already have registered this username!' +user_unknown: '&cThis user isn''t registered!' +valid_captcha: '&2Captcha code solved correctly!' +valid_session: '&2Logged-in due to Session Reconnection.' +vb_nonActiv: '&cYour account isn''t activated yet, please check your emails!' +wrong_captcha: '&cWrong Captcha, please type "/captcha THE_CAPTCHA" into the chat!' +wrong_pwd: '&cWrong password!' diff --git a/src/main/resources/messages/messages_es.yml b/src/main/resources/messages/messages_es.yml index e91e310e8..c78251dbb 100644 --- a/src/main/resources/messages/messages_es.yml +++ b/src/main/resources/messages/messages_es.yml @@ -1,58 +1,58 @@ -# This file must be in ANSI if win, or UTF-8 if linux. -unknown_user: '&fEl usuario no está en la base de datos' -unsafe_spawn: '&fTu lugar de desconexión es inseguro, teletransportándote al punto inicial del mundo' -not_logged_in: '&c¡No has iniciado sesión!' -reg_voluntarily: '&fRegístrate con: "/register Contraseña ConfirmarContraseña"' -usage_log: '&cUso: /login contraseña' -wrong_pwd: '&cContraseña incorrecta' -unregistered: '&c¡Cuenta eliminada del registro!' -reg_disabled: '&cEl registro está desactivado' -valid_session: '&cInicio de sesión' -password_error_nick: '&fYou can''t use your name as password' -password_error_unsafe: '&fYou can''t use unsafe passwords' -login: '&c¡Sesión iniciada!' -vb_nonActiv: '&fTu cuenta no está activada aún, ¡revisa tu correo!' -user_regged: '&cUsuario ya registrado' -usage_reg: '&cUso: /register Contraseña ConfirmarContraseña' -max_reg: '&fHas excedido la cantidad máxima de registros para tu cuenta' -no_perm: '&cNo tienes permiso' -error: '&fHa ocurrido un error. Por favor contacta al administrador.' -login_msg: '&cInicia sesión con "/login contraseña"' -reg_msg: '&cPor favor, regístrate con "/register Contraseña ConfirmarContraseña"' -reg_email_msg: '&cPlease register with "/register "' -usage_unreg: '&cUso: /unregister contraseña' -pwd_changed: '&c¡Contraseña cambiada!' -user_unknown: '&cUsuario no registrado' -password_error: '&fLas contraseñas no son iguales' -invalid_session: '&fLos datos de sesión no corresponden. Por favor espera a terminar la sesión.' -reg_only: '&f¡Sólo para jugadores registrados! Por favor visita http://www.example.com/ para registrarte' -logged_in: '&c¡Ya has iniciado sesión!' -logout: '&cDesconectado correctamente.' -same_nick: '&fYa hay un usuario con ese nick conectado (posible error)' -registered: '&c¡Registrado correctamente!' -pass_len: '&fTu contraseña es muy larga o muy corta' -reload: '&fLa configuración y la base de datos han sido recargados' -timeout: '&fTiempo de espera para inicio de sesión excedido' -usage_changepassword: '&fUso: /changepw contraseñaaActual contraseñaNueva' -name_len: '&cTu nombre de usuario es muy largo o muy corto' -regex: '&cTu usuario tiene carácteres no admitidos, los cuales son: REG_EX' add_email: '&cPor favor agrega tu e-mail con: /email add tuEmail confirmarEmail' -recovery_email: '&c¿Olvidaste tu contraseña? Por favor usa /email recovery ' -usage_captcha: '&cUso: /captcha ' -wrong_captcha: '&cCaptcha incorrecto, please use : /captcha EL_CAPTCHA' -valid_captcha: '&c¡ Captcha ingresado correctamente !' +antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automáticamente luego de %m minutos. Esperamos que haya terminado' +antibot_auto_enabled: '[AuthMe] AntiBotMod activado automáticamente debido a conexiones masivas!' +country_banned: 'Tu país ha sido baneado de este servidor!' +email_added: '[AuthMe] Email agregado !' +email_changed: '[AuthMe] Email cambiado !' +email_confirm: '[AuthMe] Confirma tu Email !' +email_invalid: '[AuthMe] Email inválido' +email_send: '[AuthMe] Correo de recuperación enviado !' +error: '&fHa ocurrido un error. Por favor contacta al administrador.' +invalid_session: '&fLos datos de sesión no corresponden. Por favor espera a terminar la sesión.' kick_forvip: '&cUn jugador VIP ha ingresado al servidor lleno!' kick_fullserver: '&cEl servidor está lleno, lo sentimos!' +logged_in: '&c¡Ya has iniciado sesión!' +login: '&c¡Sesión iniciada!' +login_msg: '&cInicia sesión con "/login contraseña"' +logout: '&cDesconectado correctamente.' +max_reg: '&fHas excedido la cantidad máxima de registros para tu cuenta' +name_len: '&cTu nombre de usuario es muy largo o muy corto' +new_email_invalid: '[AuthMe] Nuevo email inválido!' +no_perm: '&cNo tienes permiso' +not_logged_in: '&c¡No has iniciado sesión!' +old_email_invalid: '[AuthMe] Email anterior inválido!' +pass_len: '&fTu contraseña es muy larga o muy corta' +password_error: '&fLas contraseñas no son iguales' +password_error_nick: '&fYou can''t use your name as password' +password_error_unsafe: '&fYou can''t use unsafe passwords' +pwd_changed: '&c¡Contraseña cambiada!' +recovery_email: '&c¿Olvidaste tu contraseña? Por favor usa /email recovery ' +reg_disabled: '&cEl registro está desactivado' +reg_email_msg: '&cPlease register with "/register "' +regex: '&cTu usuario tiene carácteres no admitidos, los cuales son: REG_EX' +registered: '&c¡Registrado correctamente!' +reg_msg: '&cPor favor, regístrate con "/register Contraseña ConfirmarContraseña"' +reg_only: '&f¡Sólo para jugadores registrados! Por favor visita http://www.example.com/ para registrarte' +reg_voluntarily: '&fRegístrate con: "/register Contraseña ConfirmarContraseña"' +reload: '&fLa configuración y la base de datos han sido recargados' +same_nick: '&fYa hay un usuario con ese nick conectado (posible error)' +# This file must be in ANSI if win, or UTF-8 if linux. +timeout: '&fTiempo de espera para inicio de sesión excedido' +unknown_user: '&fEl usuario no está en la base de datos' +unregistered: '&c¡Cuenta eliminada del registro!' +unsafe_spawn: '&fTu lugar de desconexión es inseguro, teletransportándote al punto inicial del mundo' +usage_captcha: '&cUso: /captcha ' +usage_changepassword: '&fUso: /changepw contraseñaaActual contraseñaNueva' usage_email_add: '&fUso: /email add ' usage_email_change: '&fUso: /email change ' usage_email_recovery: '&fUso: /email recovery ' -new_email_invalid: '[AuthMe] Nuevo email inválido!' -old_email_invalid: '[AuthMe] Email anterior inválido!' -email_invalid: '[AuthMe] Email inválido' -email_added: '[AuthMe] Email agregado !' -email_confirm: '[AuthMe] Confirma tu Email !' -email_changed: '[AuthMe] Email cambiado !' -email_send: '[AuthMe] Correo de recuperación enviado !' -country_banned: 'Tu país ha sido baneado de este servidor!' -antibot_auto_enabled: '[AuthMe] AntiBotMod activado automáticamente debido a conexiones masivas!' -antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automáticamente luego de %m minutos. Esperamos que haya terminado' +usage_log: '&cUso: /login contraseña' +usage_reg: '&cUso: /register Contraseña ConfirmarContraseña' +usage_unreg: '&cUso: /unregister contraseña' +user_regged: '&cUsuario ya registrado' +user_unknown: '&cUsuario no registrado' +valid_captcha: '&c¡ Captcha ingresado correctamente !' +valid_session: '&cInicio de sesión' +vb_nonActiv: '&fTu cuenta no está activada aún, ¡revisa tu correo!' +wrong_captcha: '&cCaptcha incorrecto, please use : /captcha EL_CAPTCHA' +wrong_pwd: '&cContraseña incorrecta' diff --git a/src/main/resources/messages/messages_eu.yml b/src/main/resources/messages/messages_eu.yml index 44d961de0..0a5d65bc9 100644 --- a/src/main/resources/messages/messages_eu.yml +++ b/src/main/resources/messages/messages_eu.yml @@ -1,58 +1,58 @@ -unknown_user: '&fErabiltzailea ez dago datu basean' -unsafe_spawn: '&fSpawn-era telegarraiatu zara' -not_logged_in: '&cSaioa hasi gabe!' -reg_voluntarily: '&fZure erabiltzailea erregistratu dezakezu:"/register pasahitza pasahitza"' -usage_log: '&cErabili: /login pasahitza' -wrong_pwd: '&cPasahitz okerra' -unregistered: '&cZure erregistroa ezabatu duzu!' -reg_disabled: '&cErregistroa desgaitua' -valid_session: '&cSession login' -login: '&cOngi etorri!' -vb_nonActiv: '&fZure kontua aktibatu gabe dago, konfirmatu zure emaila!' -user_regged: '&cErabiltzailea dagoeneko erregistratua' -usage_reg: '&cErabili: /register pasahitza pasahitza' -max_reg: '&fKontuko 2 erabiltzaile bakarrik izan ditzakezu' -no_perm: '&cBaimenik ez' +add_email: '&cMesedez gehitu zure emaila : /email add yourEmail confirmEmail' +antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes,hope invasion stopped' +antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' +country_banned: '[AuthMe]Zure herrialdea blokeatuta dago zerbitzari honetan' +email_added: '[AuthMe] Emaila gehitu duzu !' +email_changed: '[AuthMe] Emaila aldatua!' +email_confirm: '[AuthMe] Konfirmatu zure emaila !' +email_exists: '[AuthMe] An email already exists on your account. You can change it using the command below' +email_invalid: '[AuthMe] Email okerrea' +email_send: '[AuthMe] Berreskuratze emaila bidalita !' error: '&fErrorea; Mesedez jarri kontaktuan administratzaile batekin' +invalid_session: '&fSession Dataes doesnt corrispond Plaese wait the end of session' +kick_forvip: '&cVIP erabiltzaile bat sartu da zerbitzaria beteta zegoenean!' +kick_fullserver: '&cZerbitzaria beteta dago, Barkatu!' +logged_in: '&cDagoeneko saioa hasita!' +login: '&cOngi etorri!' login_msg: '&cMesedez erabili "/login pasahitza" saioa hasteko' -reg_msg: '&cMesedez erabili "/register pasahitza pasahitza" erregistratzeko' -reg_email_msg: '&cMesdez erabili "/register " erregistratzeko' -usage_unreg: '&cErabili: /unregister password' -pwd_changed: '&cPasahitza aldatu duzu!' -user_unknown: '&cErabiltzailea ez dago erregistratuta' +logout: '&cAtera zara' +max_reg: '&fKontuko 2 erabiltzaile bakarrik izan ditzakezu' +name_len: '&cZure erabiltzaile izena motzegia edo luzeegia da' +new_email_invalid: '[AuthMe] Email okerra!' +no_perm: '&cBaimenik ez' +not_logged_in: '&cSaioa hasi gabe!' +old_email_invalid: '[AuthMe] Email zaharra okerra!' +pass_len: '&fZure pasahitza motzegia edo luzeegia da' password_error: '&fPasahitzak ez datoz bat' password_error_nick: '&fYou can''t use your name as password, please choose another one' password_error_unsafe: '&fThe chosen password is not safe, please choose another one' -invalid_session: '&fSession Dataes doesnt corrispond Plaese wait the end of session' -reg_only: '&fErregistratuako erabiltzaileak bakarrik! Mesedez bisitatu http://example.com erregistratzeko' -logged_in: '&cDagoeneko saioa hasita!' -logout: '&cAtera zara' -same_nick: '&fZure izen berdina duen erabiltzaile bat zerbitzarian jolasten dago' -registered: '&cOndo erregistratu zara!' -pass_len: '&fZure pasahitza motzegia edo luzeegia da' -reload: '&fConfiguration and database has been reloaded' -timeout: '&fDenbora gehiegi egon zara saioa hasi gabe' -usage_changepassword: '&fErabili: /changepassword pasahitzZaharra pasahitzBerria' -name_len: '&cZure erabiltzaile izena motzegia edo luzeegia da' -regex: '&cZure erabiltzaileak karaktere debekatuak ditu. Karaktere onartuak: REG_EX' -add_email: '&cMesedez gehitu zure emaila : /email add yourEmail confirmEmail' +pwd_changed: '&cPasahitza aldatu duzu!' recovery_email: '&cPasahitza ahaztu duzu? Erabili /email recovery ' +reg_disabled: '&cErregistroa desgaitua' +reg_email_msg: '&cMesdez erabili "/register " erregistratzeko' +regex: '&cZure erabiltzaileak karaktere debekatuak ditu. Karaktere onartuak: REG_EX' +registered: '&cOndo erregistratu zara!' +reg_msg: '&cMesedez erabili "/register pasahitza pasahitza" erregistratzeko' +reg_only: '&fErregistratuako erabiltzaileak bakarrik! Mesedez bisitatu http://example.com erregistratzeko' +reg_voluntarily: '&fZure erabiltzailea erregistratu dezakezu:"/register pasahitza pasahitza"' +reload: '&fConfiguration and database has been reloaded' +same_nick: '&fZure izen berdina duen erabiltzaile bat zerbitzarian jolasten dago' +timeout: '&fDenbora gehiegi egon zara saioa hasi gabe' +unknown_user: '&fErabiltzailea ez dago datu basean' +unregistered: '&cZure erregistroa ezabatu duzu!' +unsafe_spawn: '&fSpawn-era telegarraiatu zara' usage_captcha: '&cYou need to type a captcha, please type: /captcha ' -wrong_captcha: '&cWrong Captcha, please use : /captcha THE_CAPTCHA' -valid_captcha: '&cYour captcha is valid !' -kick_forvip: '&cVIP erabiltzaile bat sartu da zerbitzaria beteta zegoenean!' -kick_fullserver: '&cZerbitzaria beteta dago, Barkatu!' +usage_changepassword: '&fErabili: /changepassword pasahitzZaharra pasahitzBerria' usage_email_add: '&fErabili: /email add ' usage_email_change: '&fErabili: /email change ' usage_email_recovery: '&fErabili: /email recovery ' -new_email_invalid: '[AuthMe] Email okerra!' -old_email_invalid: '[AuthMe] Email zaharra okerra!' -email_invalid: '[AuthMe] Email okerrea' -email_added: '[AuthMe] Emaila gehitu duzu !' -email_confirm: '[AuthMe] Konfirmatu zure emaila !' -email_changed: '[AuthMe] Emaila aldatua!' -email_send: '[AuthMe] Berreskuratze emaila bidalita !' -email_exists: '[AuthMe] An email already exists on your account. You can change it using the command below' -country_banned: '[AuthMe]Zure herrialdea blokeatuta dago zerbitzari honetan' -antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' -antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes,hope invasion stopped' +usage_log: '&cErabili: /login pasahitza' +usage_reg: '&cErabili: /register pasahitza pasahitza' +usage_unreg: '&cErabili: /unregister password' +user_regged: '&cErabiltzailea dagoeneko erregistratua' +user_unknown: '&cErabiltzailea ez dago erregistratuta' +valid_captcha: '&cYour captcha is valid !' +valid_session: '&cSession login' +vb_nonActiv: '&fZure kontua aktibatu gabe dago, konfirmatu zure emaila!' +wrong_captcha: '&cWrong Captcha, please use : /captcha THE_CAPTCHA' +wrong_pwd: '&cPasahitz okerra' diff --git a/src/main/resources/messages/messages_fi.yml b/src/main/resources/messages/messages_fi.yml index be3779c7d..b62741970 100644 --- a/src/main/resources/messages/messages_fi.yml +++ b/src/main/resources/messages/messages_fi.yml @@ -1,57 +1,57 @@ -unknown_user: '&fKäyttäjä ei ole tietokannassa!' -unsafe_spawn: '&fHengenvaarallinen poistumispaikka! Siirsimme sinut spawnille!' -not_logged_in: '&cEt ole kirjautunut sisään!' -reg_voluntarily: '&fNyt voit rekisteröidä pelaajasi palvelimellemme: "/register salasana salasana"' -usage_log: '&cKäyttötapa: /login salasana' -wrong_pwd: '&cVäärä salasana' -unregistered: '&cPelaajatili poistettu onnistuneesti!' -reg_disabled: '&cRekisteröinti on suljettu!' -valid_session: '&cIstunto jatkettu!' -login: '&cKirjauduit onnistuneesti' -vb_nonActiv: '&fKäyttäjäsi ei ole vahvistettu!' -user_regged: '&cPelaaja on jo rekisteröity' -usage_reg: '&cKäyttötapa: /register salasana salasana' -max_reg: '&fSinulla ei ole oikeuksia tehdä enempää pelaajatilejä!' -password_error_nick: '&fYou can''t use your name as password' -password_error_unsafe: '&fYou can''t use unsafe passwords' -no_perm: '&cEi oikeuksia' -error: '&fVirhe: Ota yhteys palveluntarjoojaan!' -login_msg: '&cKirjaudu palvelimmelle komennolla "/login salasana"' -reg_msg: '&cRekisteröidy palvelimellemme komennolla "/register salasana salasana"' -reg_email_msg: '&cRekisteröi sähköpostisi komennolla "/register "' -usage_unreg: '&cKäyttötapa: /unregister password' -pwd_changed: '&cSalasana vaihdettu!!' -user_unknown: '&cSalasanat eivät täsmää' -password_error: '&fSalasanat ei täsmää' -invalid_session: '&fIstunto ei täsmää! Ole hyvä ja odota istunnon loppuun' -reg_only: '&fMene sivustolle: http://example.com rekisteröityäksesi!' -logged_in: '&cOlet jo kirjautunut!' -logout: '&cKirjauduit ulos palvelimelta.' -same_nick: '&COlet jo palvelimella! &COdota käyttäjän aikakatkaisua tai ota yhteyttä palveluntarjoojaan.' -registered: '&cRekisteröidyit onnistuneesti!' -pass_len: '&fSalasanasi on liian pitkä tai lyhyt.' -reload: '&fAsetukset uudelleenladattu' -timeout: '&fKirjautumisaika meni umpeen.' -usage_changepassword: '&fKäyttötapa: /changepassword vanhaSalasana uusiSalasana' -name_len: '&cPelaajanimesi on liian lyhyt tai pitkä' -regex: '&cPelaajanimesi sisältää luvattomia merkkejä. Hyväksytyt merkit: REG_EX' add_email: '&cLisää sähköpostisi: /email add sähköpostisi sähköpostisiUudelleen' -recovery_email: '&cUnohtuiko salasana? Käytä komentoa: /email recovery ' -usage_captcha: '&cKäyttötapa: /captcha ' -wrong_captcha: '&cVäärä varmistus, käytä : /captcha CAPTCHA' -valid_captcha: '&cSinun varmistus onnistui.!' +antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' +antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' +country_banned: 'Your country is banned from this server' +email_added: '[AuthMe] Sähköposti lisätty!' +email_changed: '[AuthMe] Sähköposti vaihdettu!' +email_confirm: '[AuthMe] Vahvistuta sähköposti!' +email_invalid: '[AuthMe] Väärä sähköposti' +email_send: '[AuthMe] Palautus sähköposti lähetetty!' +error: '&fVirhe: Ota yhteys palveluntarjoojaan!' +invalid_session: '&fIstunto ei täsmää! Ole hyvä ja odota istunnon loppuun' kick_forvip: '&cVIP pelaaja liittyi täyteen palvelimeen!' kick_fullserver: '&cPalvelin on täynnä, Yritä pian uudelleen!' +logged_in: '&cOlet jo kirjautunut!' +login: '&cKirjauduit onnistuneesti' +login_msg: '&cKirjaudu palvelimmelle komennolla "/login salasana"' +logout: '&cKirjauduit ulos palvelimelta.' +max_reg: '&fSinulla ei ole oikeuksia tehdä enempää pelaajatilejä!' +name_len: '&cPelaajanimesi on liian lyhyt tai pitkä' +new_email_invalid: '[AuthMe] Uusi sähköposti on väärä!' +no_perm: '&cEi oikeuksia' +not_logged_in: '&cEt ole kirjautunut sisään!' +old_email_invalid: '[AuthMe] Vanha sähköposti on väärä!' +pass_len: '&fSalasanasi on liian pitkä tai lyhyt.' +password_error: '&fSalasanat ei täsmää' +password_error_nick: '&fYou can''t use your name as password' +password_error_unsafe: '&fYou can''t use unsafe passwords' +pwd_changed: '&cSalasana vaihdettu!!' +recovery_email: '&cUnohtuiko salasana? Käytä komentoa: /email recovery ' +reg_disabled: '&cRekisteröinti on suljettu!' +reg_email_msg: '&cRekisteröi sähköpostisi komennolla "/register "' +regex: '&cPelaajanimesi sisältää luvattomia merkkejä. Hyväksytyt merkit: REG_EX' +registered: '&cRekisteröidyit onnistuneesti!' +reg_msg: '&cRekisteröidy palvelimellemme komennolla "/register salasana salasana"' +reg_only: '&fMene sivustolle: http://example.com rekisteröityäksesi!' +reg_voluntarily: '&fNyt voit rekisteröidä pelaajasi palvelimellemme: "/register salasana salasana"' +reload: '&fAsetukset uudelleenladattu' +same_nick: '&COlet jo palvelimella! &COdota käyttäjän aikakatkaisua tai ota yhteyttä palveluntarjoojaan.' +timeout: '&fKirjautumisaika meni umpeen.' +unknown_user: '&fKäyttäjä ei ole tietokannassa!' +unregistered: '&cPelaajatili poistettu onnistuneesti!' +unsafe_spawn: '&fHengenvaarallinen poistumispaikka! Siirsimme sinut spawnille!' +usage_captcha: '&cKäyttötapa: /captcha ' +usage_changepassword: '&fKäyttötapa: /changepassword vanhaSalasana uusiSalasana' usage_email_add: '&fKäyttötapa: /email add ' usage_email_change: '&fKäyttötapa: /email change ' usage_email_recovery: '&fKäyttötapa: /email recovery ' -new_email_invalid: '[AuthMe] Uusi sähköposti on väärä!' -old_email_invalid: '[AuthMe] Vanha sähköposti on väärä!' -email_invalid: '[AuthMe] Väärä sähköposti' -email_added: '[AuthMe] Sähköposti lisätty!' -email_confirm: '[AuthMe] Vahvistuta sähköposti!' -email_changed: '[AuthMe] Sähköposti vaihdettu!' -email_send: '[AuthMe] Palautus sähköposti lähetetty!' -country_banned: 'Your country is banned from this server' -antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' -antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' +usage_log: '&cKäyttötapa: /login salasana' +usage_reg: '&cKäyttötapa: /register salasana salasana' +usage_unreg: '&cKäyttötapa: /unregister password' +user_regged: '&cPelaaja on jo rekisteröity' +user_unknown: '&cSalasanat eivät täsmää' +valid_captcha: '&cSinun varmistus onnistui.!' +valid_session: '&cIstunto jatkettu!' +vb_nonActiv: '&fKäyttäjäsi ei ole vahvistettu!' +wrong_captcha: '&cVäärä varmistus, käytä : /captcha CAPTCHA' +wrong_pwd: '&cVäärä salasana' diff --git a/src/main/resources/messages/messages_fr.yml b/src/main/resources/messages/messages_fr.yml index 51a2a53af..7bd0a8f2a 100644 --- a/src/main/resources/messages/messages_fr.yml +++ b/src/main/resources/messages/messages_fr.yml @@ -1,58 +1,58 @@ -# Traduction par: André -unknown_user: '&fUtilisateur non enregistré' -unsafe_spawn: '&fTéléportation dans un endroit sûr' -not_logged_in: '&cNon connecté!' -reg_voluntarily: '&fVous venez d''arriver? faites un "/register motdepasse confirmermotdepasse"' -usage_log: '&cUtilisez: /login motdepasse' -wrong_pwd: '&cMauvais MotdePasse' -unregistered: '&cCe compte a été supprimé!' -reg_disabled: '&cL''enregistrement est désactivé' -valid_session: '&cVous êtes authentifié' -login: '&cConnection effectuée!' -vb_nonActiv: '&fCe compte n''est pas actif, consultez vos emails!' -user_regged: '&cCe nom est deja utilisé..' -usage_reg: '&cUtilisez la commande /register motdepasse confirmermotdepasse' -max_reg: '&fLimite d''enregistrement atteinte pour ce compte' -no_perm: '&cVous n''avez pas la permission' -password_error_nick: '&fYou can''t use your name as password' -password_error_unsafe: '&fYou can''t use unsafe passwords' -error: '&fUne erreur est apparue, veuillez contacter un administrateur' -login_msg: '&cPour vous connecter, utilisez: /login motdepasse' -reg_msg: '&cPour vous inscrire, utilisez "/register motdepasse confirmermotdepasse"' -reg_email_msg: '&cPour vous inscrire, utilisez "/register "' -usage_unreg: '&cPour supprimer ce compte, utilisez: /unregister password' -pwd_changed: '&cMotdePasse changé avec succès!' -user_unknown: '&c Ce compte n''est pas enregistré' -password_error: '&fCe mot de passe est incorrect' -invalid_session: '&fSession invalide, relancez le jeu ou attendez la fin de la session' -reg_only: '&fSeul les joueurs enregistré sont admis!' -logged_in: '&cVous êtes déjà connecté!' -logout: '&cVous avez été déconnecté!' -same_nick: '&fUne personne ayant ce même pseudo joue déjà..' -registered: '&cEnregistrement réussi avec succès!' -pass_len: '&fVotre mot de passe n''est pas assez long..' -reload: '&fConfiguration et BDD relancé avec succès' -timeout: '&fVous avez été expulsé car vous êtes trop lent pour vous enregistrer !' -usage_changepassword: '&fPour changer de mot de passe, utilisez: /changepassword ancienmdp nouveaumdp' -name_len: '&cVotre pseudo est trop long ou trop court' -regex: '&cCaractères autorisés: REG_EX' add_email: '&cMerci d''ajouter votre email : /email add yourEmail confirmEmail' -recovery_email: '&cVous avez oublié votre MotdePasse? Utilisez /email recovery ' -usage_captcha: '&cTrop de tentatives de connexion échouées, utilisez: /captcha ' -wrong_captcha: '&cCaptcha incorrect, écrivez de nouveau : /captcha THE_CAPTCHA' -valid_captcha: '&cLe Captcha est valide, merci!' +antibot_auto_disabled: '[AuthMe] AntiBotMod a été désactivé automatiquement après %m Minutes, espérons que l''invasion soit arrêtée!' +antibot_auto_enabled: '[AuthMe] AntiBotMod a été activé automatiquement à cause de nombreuses connections!' +country_banned: 'Votre pays est banni de ce serveur' +email_added: '[AuthMe] Email ajouté !' +email_changed: '[AuthMe] Email changé !' +email_confirm: '[AuthMe] Confirmez votre email !' +email_invalid: '[AuthMe] Email invalide' +email_send: '[AuthMe] Email de récupération envoyé!' +error: '&fUne erreur est apparue, veuillez contacter un administrateur' +invalid_session: '&fSession invalide, relancez le jeu ou attendez la fin de la session' kick_forvip: '&cUn joueur VIP a rejoint le serveur plein!' kick_fullserver: '&cLe serveur est actuellement plein, désolé!' +logged_in: '&cVous êtes déjà connecté!' +login: '&cConnection effectuée!' +login_msg: '&cPour vous connecter, utilisez: /login motdepasse' +logout: '&cVous avez été déconnecté!' +max_reg: '&fLimite d''enregistrement atteinte pour ce compte' +name_len: '&cVotre pseudo est trop long ou trop court' +new_email_invalid: '[AuthMe] Nouvel email invalide!' +no_perm: '&cVous n''avez pas la permission' +not_logged_in: '&cNon connecté!' +old_email_invalid: '[AuthMe] Ancien email invalide!' +pass_len: '&fVotre mot de passe n''est pas assez long..' +password_error: '&fCe mot de passe est incorrect' +password_error_nick: '&fYou can''t use your name as password' +password_error_unsafe: '&fYou can''t use unsafe passwords' +pwd_changed: '&cMotdePasse changé avec succès!' +recovery_email: '&cVous avez oublié votre MotdePasse? Utilisez /email recovery ' +reg_disabled: '&cL''enregistrement est désactivé' +reg_email_msg: '&cPour vous inscrire, utilisez "/register "' +regex: '&cCaractères autorisés: REG_EX' +registered: '&cEnregistrement réussi avec succès!' +reg_msg: '&cPour vous inscrire, utilisez "/register motdepasse confirmermotdepasse"' +reg_only: '&fSeul les joueurs enregistré sont admis!' +reg_voluntarily: '&fVous venez d''arriver? faites un "/register motdepasse confirmermotdepasse"' +reload: '&fConfiguration et BDD relancé avec succès' +same_nick: '&fUne personne ayant ce même pseudo joue déjà..' +timeout: '&fVous avez été expulsé car vous êtes trop lent pour vous enregistrer !' +# Traduction par: André +unknown_user: '&fUtilisateur non enregistré' +unregistered: '&cCe compte a été supprimé!' +unsafe_spawn: '&fTéléportation dans un endroit sûr' +usage_captcha: '&cTrop de tentatives de connexion échouées, utilisez: /captcha ' +usage_changepassword: '&fPour changer de mot de passe, utilisez: /changepassword ancienmdp nouveaumdp' usage_email_add: '&fUsage: /email add ' usage_email_change: '&fUsage: /email change ' usage_email_recovery: '&fUsage: /email recovery ' -new_email_invalid: '[AuthMe] Nouvel email invalide!' -old_email_invalid: '[AuthMe] Ancien email invalide!' -email_invalid: '[AuthMe] Email invalide' -email_added: '[AuthMe] Email ajouté !' -email_confirm: '[AuthMe] Confirmez votre email !' -email_changed: '[AuthMe] Email changé !' -email_send: '[AuthMe] Email de récupération envoyé!' -country_banned: 'Votre pays est banni de ce serveur' -antibot_auto_enabled: '[AuthMe] AntiBotMod a été activé automatiquement à cause de nombreuses connections!' -antibot_auto_disabled: '[AuthMe] AntiBotMod a été désactivé automatiquement après %m Minutes, espérons que l''invasion soit arrêtée!' +usage_log: '&cUtilisez: /login motdepasse' +usage_reg: '&cUtilisez la commande /register motdepasse confirmermotdepasse' +usage_unreg: '&cPour supprimer ce compte, utilisez: /unregister password' +user_regged: '&cCe nom est deja utilisé..' +user_unknown: '&c Ce compte n''est pas enregistré' +valid_captcha: '&cLe Captcha est valide, merci!' +valid_session: '&cVous êtes authentifié' +vb_nonActiv: '&fCe compte n''est pas actif, consultez vos emails!' +wrong_captcha: '&cCaptcha incorrect, écrivez de nouveau : /captcha THE_CAPTCHA' +wrong_pwd: '&cMauvais MotdePasse' diff --git a/src/main/resources/messages/messages_gl.yml b/src/main/resources/messages/messages_gl.yml index 2ead0316e..ee8969676 100644 --- a/src/main/resources/messages/messages_gl.yml +++ b/src/main/resources/messages/messages_gl.yml @@ -1,59 +1,59 @@ -unknown_user: '&fO usuario non está na base de datos' -unsafe_spawn: '&fA localización dende a que saíches era insegura, teletransportándote ao spawn do mundo' -not_logged_in: '&cNon te identificaches!' -reg_voluntarily: '&fPodes rexistrar o teu nome no servidor co comando - "/register "' -usage_log: '&cUso: /login ' -wrong_pwd: '&cContrasinal equivocado' -unregistered: '&cFeito! Xa non estás rexistrado!' -password_error_nick: '&fYou can''t use your name as password' -password_error_unsafe: '&fYou can''t use unsafe passwords' -reg_disabled: '&cO rexistro está deshabilitado' -valid_session: '&cIdentificado mediante a sesión' -login: '&cIdentificación con éxito!' -vb_nonActiv: '&fA túa conta aínda non está activada, comproba a túa bandexa de correo!!' -user_regged: '&cEse nome de usuario xa está rexistrado' -usage_reg: '&cUso: /register contrasinal confirmarContrasinal' -max_reg: '&fExcediches o máximo de rexistros para a túa Conta' -no_perm: '&cNon tes o permiso' -error: '&fOcurriu un erro; contacta cun administrador' -login_msg: '&cPor favor, identifícate con "/login "' -reg_msg: '&cPor favor, rexístrate con "/register "' -reg_email_msg: '&cPor favor, rexístrate con "/register "' -usage_unreg: '&cUso: /unregister ' -pwd_changed: '&cCambiouse o contrasinal!' -user_unknown: '&cEse nome de usuario non está rexistrado' -password_error: '&fO contrasinal non coincide' -invalid_session: '&fOs datos de sesión non corresponden, por favor, espere a que remate a sesión' -reg_only: '&fSó xogadores rexistrados! Por favor, visita http://example.com para rexistrarte' -logged_in: '&cXa estás identificado!' -logout: '&cSesión pechada con éxito' -same_nick: '&fXa está xogando alguén co mesmo nome' -registered: '&cRexistrado con éxito!' -pass_len: '&fO teu contrasinal non alcanza a lonxitude mínima ou excede a lonxitude máxima' -reload: '&fRecargáronse a configuración e a base de datos' -timeout: '&fRematou o tempo da autentificación' -usage_changepassword: '&fUso: /changepassword ' -name_len: '&cO teu nome é demasiado curto ou demasiado longo' -regex: '&cO teu nome contén caracteres ilegais. Caracteres permitidos: REG_EX' add_email: '&cPor favor, engade o teu correo electrónico con: /email add ' -recovery_email: '&cOlvidaches o contrasinal? Por favor, usa /email recovery ' -usage_captcha: '&cNecesitas escribir un captcha, por favor escribe: /captcha ' -wrong_captcha: '&cCaptcha equivocado, por favor usa: /captcha THE_CAPTCHA' -valid_captcha: '&cO teu captcha é válido !' +antibot_auto_disabled: '[AuthMe] AntiBotMod desactivouse automáticamente despois de %m minutos, +antibot_auto_enabled: '[AuthMe] AntiBotMod conectouse automáticamente debido a conexións masivas!' +country_banned: 'O teu país está bloqueado neste servidor' +email_added: '[AuthMe] Correo engadido!' +email_changed: '[AuthMe] Cambiouse o correo!' +email_confirm: '[AuthMe] Confirma o teu correo!' +email_invalid: '[AuthMe] Correo non válido' +email_send: '[AuthMe] Enviouse o correo de confirmación!' +error: '&fOcurriu un erro; contacta cun administrador' + esperemos que a invasión se detivera' +invalid_session: '&fOs datos de sesión non corresponden, por favor, espere a que remate a sesión' kick_forvip: '&cUn xogador VIP uniuse ao servidor cheo!' kick_fullserver: '&cO servidor está actualmente cheo, sentímolo!' +logged_in: '&cXa estás identificado!' +login: '&cIdentificación con éxito!' +login_msg: '&cPor favor, identifícate con "/login "' +logout: '&cSesión pechada con éxito' +max_reg: '&fExcediches o máximo de rexistros para a túa Conta' +name_len: '&cO teu nome é demasiado curto ou demasiado longo' +new_email_invalid: '[AuthMe] O novo correo non é válido!' +no_perm: '&cNon tes o permiso' +not_logged_in: '&cNon te identificaches!' +old_email_invalid: '[AuthMe] O correo vello non é válido!' +pass_len: '&fO teu contrasinal non alcanza a lonxitude mínima ou excede a lonxitude máxima' +password_error: '&fO contrasinal non coincide' +password_error_nick: '&fYou can''t use your name as password' +password_error_unsafe: '&fYou can''t use unsafe passwords' +pwd_changed: '&cCambiouse o contrasinal!' +recovery_email: '&cOlvidaches o contrasinal? Por favor, usa /email recovery ' +reg_disabled: '&cO rexistro está deshabilitado' +reg_email_msg: '&cPor favor, rexístrate con "/register "' +regex: '&cO teu nome contén caracteres ilegais. Caracteres permitidos: REG_EX' + "/register "' +registered: '&cRexistrado con éxito!' +reg_msg: '&cPor favor, rexístrate con "/register "' +reg_only: '&fSó xogadores rexistrados! Por favor, visita http://example.com para rexistrarte' +reg_voluntarily: '&fPodes rexistrar o teu nome no servidor co comando +reload: '&fRecargáronse a configuración e a base de datos' +same_nick: '&fXa está xogando alguén co mesmo nome' +timeout: '&fRematou o tempo da autentificación' +unknown_user: '&fO usuario non está na base de datos' +unregistered: '&cFeito! Xa non estás rexistrado!' +unsafe_spawn: '&fA localización dende a que saíches era insegura, teletransportándote ao spawn do mundo' +usage_captcha: '&cNecesitas escribir un captcha, por favor escribe: /captcha ' +usage_changepassword: '&fUso: /changepassword ' usage_email_add: '&fUso: /email add ' usage_email_change: '&fUso: /email change ' usage_email_recovery: '&fUso: /email recovery ' -new_email_invalid: '[AuthMe] O novo correo non é válido!' -old_email_invalid: '[AuthMe] O correo vello non é válido!' -email_invalid: '[AuthMe] Correo non válido' -email_added: '[AuthMe] Correo engadido!' -email_confirm: '[AuthMe] Confirma o teu correo!' -email_changed: '[AuthMe] Cambiouse o correo!' -email_send: '[AuthMe] Enviouse o correo de confirmación!' -country_banned: 'O teu país está bloqueado neste servidor' -antibot_auto_enabled: '[AuthMe] AntiBotMod conectouse automáticamente debido a conexións masivas!' -antibot_auto_disabled: '[AuthMe] AntiBotMod desactivouse automáticamente despois de %m minutos, - esperemos que a invasión se detivera' +usage_log: '&cUso: /login ' +usage_reg: '&cUso: /register contrasinal confirmarContrasinal' +usage_unreg: '&cUso: /unregister ' +user_regged: '&cEse nome de usuario xa está rexistrado' +user_unknown: '&cEse nome de usuario non está rexistrado' +valid_captcha: '&cO teu captcha é válido !' +valid_session: '&cIdentificado mediante a sesión' +vb_nonActiv: '&fA túa conta aínda non está activada, comproba a túa bandexa de correo!!' +wrong_captcha: '&cCaptcha equivocado, por favor usa: /captcha THE_CAPTCHA' +wrong_pwd: '&cContrasinal equivocado' diff --git a/src/main/resources/messages/messages_hu.yml b/src/main/resources/messages/messages_hu.yml index 68fde4d1f..0dd9f0f54 100644 --- a/src/main/resources/messages/messages_hu.yml +++ b/src/main/resources/messages/messages_hu.yml @@ -1,57 +1,57 @@ -reg_only: Csak regisztrált játékosoknak! Jelentkezni a yndicraft@freemail.hu e-mail címen lehet -usage_unreg: '&cHasználat: /unregister jelszó' -registered: '&aSikeres regisztráció. Üdvözöllek!' -user_regged: '&cJátékosnév már regisztrálva' -login_msg: '&cKérlek jelentkezz be: "/login jelszó"' -not_logged_in: '&cNem vagy bejelentkezve!' -logout: '&cSikeresen kijelentkeztél' -usage_log: '&cBejelentkezés: /login jelszó' -unknown_user: User is not in database -reg_voluntarily: Regisztrálhatod beceneved a szerveren a következö parancsal "/register jelszó jelszó" -reg_disabled: '&cRegisztráció letiltva' -no_perm: '&cNincs engedélyed' -usage_reg: '&cHasználat: /register jelszó jelszóújra' -password_error_nick: '&fYou can''t use your name as password' -password_error_unsafe: '&fYou can''t use unsafe passwords' -unregistered: '&cRegisztráció sikeresen törölve!' -same_nick: Ezen a játékosnéven már játszanak -valid_session: '&cSession login' -pwd_changed: '&cJelszó cserélve!' -reload: Beálítások és adatbázis újratöltve! -timeout: Bejelentkezési idötúllépés -error: Hiba lépett fel; Lépj kapcsolatba a tulajjal' -logged_in: '&cMár be vagy jelentkezve!' -login: '&aSikeresen Beléptél! Üdvözöllek!!!' -wrong_pwd: '&4Hibás jelszó' -user_unknown: '&cJátékosnév nem regisztrált' -reg_msg: '&cKérlek Regisztrálj: "/register jelszó jelszóújra"' -reg_email_msg: '&cPlease register with "/register "' -unsafe_spawn: A kilépési helyzeted nem biztonságos, teleportálás a kezdö Spawnra. -max_reg: Csak egy karakterrel Registrálhatsz!!! -password_error: A jelszó nem illik össze -invalid_session: Session Dataes doesnt corrispond Plaese wait the end of session -pass_len: A jelszavad nem éri el a minimális hosszat -vb_nonActiv: Your Account isent Activated yet check your Emails! -usage_changepassword: 'használat: /changepassword régiJelszó újJelszó' -name_len: '&cYour nickname is too Short or too long' -regex: '&cYour nickname contains illegal characters. Allowed chars: REG_EX' add_email: '&cPlease add your email with : /email add yourEmail confirmEmail' -recovery_email: '&cForgot your password? Please use /email recovery ' -usage_captcha: '&cUsage: /captcha ' -wrong_captcha: '&cWrong Captcha, please use : /captcha THE_CAPTCHA' -valid_captcha: '&cYour captcha is valid !' +antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' +antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' +country_banned: 'Your country is banned from this server' +email_added: '[AuthMe] Email Added !' +email_changed: '[AuthMe] Email Change !' +email_confirm: '[AuthMe] Confirm your Email !' +email_invalid: '[AuthMe] Invalid Email' +email_send: '[AuthMe] Recovery Email Send !' +error: Hiba lépett fel; Lépj kapcsolatba a tulajjal' +invalid_session: Session Dataes doesnt corrispond Plaese wait the end of session kick_forvip: '&cA VIP Player join the full server!' kick_fullserver: '&cThe server is actually full, Sorry!' +logged_in: '&cMár be vagy jelentkezve!' +login: '&aSikeresen Beléptél! Üdvözöllek!!!' +login_msg: '&cKérlek jelentkezz be: "/login jelszó"' +logout: '&cSikeresen kijelentkeztél' +max_reg: Csak egy karakterrel Registrálhatsz!!! +name_len: '&cYour nickname is too Short or too long' +new_email_invalid: '[AuthMe] New email invalid!' +no_perm: '&cNincs engedélyed' +not_logged_in: '&cNem vagy bejelentkezve!' +old_email_invalid: '[AuthMe] Old email invalid!' +pass_len: A jelszavad nem éri el a minimális hosszat +password_error: A jelszó nem illik össze +password_error_nick: '&fYou can''t use your name as password' +password_error_unsafe: '&fYou can''t use unsafe passwords' +pwd_changed: '&cJelszó cserélve!' +recovery_email: '&cForgot your password? Please use /email recovery ' +reg_disabled: '&cRegisztráció letiltva' +reg_email_msg: '&cPlease register with "/register "' +regex: '&cYour nickname contains illegal characters. Allowed chars: REG_EX' +registered: '&aSikeres regisztráció. Üdvözöllek!' +reg_msg: '&cKérlek Regisztrálj: "/register jelszó jelszóújra"' +reg_only: Csak regisztrált játékosoknak! Jelentkezni a yndicraft@freemail.hu e-mail címen lehet +reg_voluntarily: Regisztrálhatod beceneved a szerveren a következö parancsal "/register jelszó jelszó" +reload: Beálítások és adatbázis újratöltve! +same_nick: Ezen a játékosnéven már játszanak +timeout: Bejelentkezési idötúllépés +unknown_user: User is not in database +unregistered: '&cRegisztráció sikeresen törölve!' +unsafe_spawn: A kilépési helyzeted nem biztonságos, teleportálás a kezdö Spawnra. +usage_captcha: '&cUsage: /captcha ' +usage_changepassword: 'használat: /changepassword régiJelszó újJelszó' usage_email_add: '&fUsage: /email add ' usage_email_change: '&fUsage: /email change ' usage_email_recovery: '&fUsage: /email recovery ' -new_email_invalid: '[AuthMe] New email invalid!' -old_email_invalid: '[AuthMe] Old email invalid!' -email_invalid: '[AuthMe] Invalid Email' -email_added: '[AuthMe] Email Added !' -email_confirm: '[AuthMe] Confirm your Email !' -email_changed: '[AuthMe] Email Change !' -email_send: '[AuthMe] Recovery Email Send !' -country_banned: 'Your country is banned from this server' -antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' -antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' +usage_log: '&cBejelentkezés: /login jelszó' +usage_reg: '&cHasználat: /register jelszó jelszóújra' +usage_unreg: '&cHasználat: /unregister jelszó' +user_regged: '&cJátékosnév már regisztrálva' +user_unknown: '&cJátékosnév nem regisztrált' +valid_captcha: '&cYour captcha is valid !' +valid_session: '&cSession login' +vb_nonActiv: Your Account isent Activated yet check your Emails! +wrong_captcha: '&cWrong Captcha, please use : /captcha THE_CAPTCHA' +wrong_pwd: '&4Hibás jelszó' diff --git a/src/main/resources/messages/messages_id.yml b/src/main/resources/messages/messages_id.yml index 2b183f3d1..63e115288 100644 --- a/src/main/resources/messages/messages_id.yml +++ b/src/main/resources/messages/messages_id.yml @@ -1,58 +1,58 @@ -unknown_user: '&cTidak dapat menemukan user yg diminta di database!' -unsafe_spawn: '&cLokasi quit kamu tidak aman, kamu telah diteleport ke titik spawn world.' -not_logged_in: '&cKamu belum login!' -reg_voluntarily: 'Kamu bisa register menggunakan command "/register "' -usage_log: '&cUsage: /login ' -wrong_pwd: '&cPassword salah!' -unregistered: '&cUnregister berhasil!' -reg_disabled: '&cRegister dalam game tidak diaktifkan!' -valid_session: '&2Otomatis login, karena sesi masih terhubung.' -login: '&2Login berhasil!' -vb_nonActiv: '&cAkunmu belum diaktifkan, silahkan periksa email kamu!' -user_regged: '&cKamu telah mendaftarkan username ini!' -usage_reg: '&cUsage: /register ' -max_reg: '&Kamu telah mencapai batas maksimum pendaftaran di server ini!' -no_perm: '&4Kamu tidak mempunyai izin melakukan ini!' +add_email: '&3Silahkan tambahkan email ke akunmu menggunakan command "/email add "' +antibot_auto_disabled: '&2[AntiBotService] AntiBot dimatikan setelah %m menit!' +antibot_auto_enabled: '&4[AntiBotService] AntiBot diaktifkan dikarenakan banyak koneksi yg diterima!' +country_banned: '&4Your country is banned from this server!' +email_added: '&2Berhasil menambahkan alamat email ke akunmu!' +email_changed: '&2Alamat email telah diubah dengan benar!' +email_confirm: '&cSilahkan konfirmasi alamat email kamu!' +email_exists: '&cEmail pemulihan sudah dikirim! kamu bisa membatalkan dan mengirimkan yg baru dengan command dibawah:' +email_invalid: '&cAlamat email tidak valid, coba lagi!' +email_send: '&2Email pemulihan akun telah dikirim! Silahkan periksa kotak masuk emailmu!' error: '&4Terjadi kesalahan tak dikenal, silahkan hubungi Administrator!' +invalid_session: '&cIP kamu telah berubah, dan sesi kamu telah berakhir!' +kick_forvip: '&3Player VIP mencoba masuk pada saat server sedang penuh!' +kick_fullserver: '&4Server sedang penuh, silahkan coba lagi nanti!' +logged_in: '&cKamu telah login!' +login: '&2Login berhasil!' login_msg: '&cSilahkan login menggunakan command "/login "' -reg_msg: '&3Silahkan mendaftar ke server menggunakan command "/register "' -reg_email_msg: '&3Silahkan mendaftar ke server menggunakan command "/register "' -usage_unreg: '&cUsage: /unregister ' -pwd_changed: '&2Berhasil mengubah password!' -user_unknown: '&cUser ini belum terdaftar!' +logout: '&2Berhasil logout!' +max_reg: '&Kamu telah mencapai batas maksimum pendaftaran di server ini!' +name_len: '&4Username kamu terlalu panjang atau terlalu pendek!' +new_email_invalid: '&cEmail baru tidak valid, coba lagi!' +no_perm: '&4Kamu tidak mempunyai izin melakukan ini!' +not_logged_in: '&cKamu belum login!' +old_email_invalid: '&cEmail lama tidak valid, coba lagi!' +pass_len: '&cPassword kamu terlalu panjang/pendek! Silahkan pilih yg lain!' password_error: '&cPassword tidak cocok, silahkan periksa dan ulangi kembali!' password_error_nick: '&cKamu tidak bisa menggunakan namamu sebagai password, silahkan coba yg lain...' password_error_unsafe: '&cPassword yg kamu pilih tidak aman, silahkan coba yg lain...' -invalid_session: '&cIP kamu telah berubah, dan sesi kamu telah berakhir!' -reg_only: '&4Hanya pengguna terdaftar yg bisa bergabung! Silahkan kunjungi http://example.com untuk mendaftar!' -logged_in: '&cKamu telah login!' -logout: '&2Berhasil logout!' -same_nick: '&4Username yg sama telah bermain di server ini!' -registered: '&2Register berhasil!' -pass_len: '&cPassword kamu terlalu panjang/pendek! Silahkan pilih yg lain!' -reload: '&2Konfigurasi dan database telah dimuat ulang!' -timeout: '&4Jangka waktu login telah habis, kamu di keluarkan dari server. Silahkan coba lagi!' -usage_changepassword: '&cUsage: /changepassword ' -name_len: '&4Username kamu terlalu panjang atau terlalu pendek!' -regex: '&4Username kamu mengandung karakter illegal. Karakter yg diijinkan: REG_EX' -add_email: '&3Silahkan tambahkan email ke akunmu menggunakan command "/email add "' +pwd_changed: '&2Berhasil mengubah password!' recovery_email: '&3Lupa password? silahkan gunakan command "/email recovery "' +reg_disabled: '&cRegister dalam game tidak diaktifkan!' +reg_email_msg: '&3Silahkan mendaftar ke server menggunakan command "/register "' +regex: '&4Username kamu mengandung karakter illegal. Karakter yg diijinkan: REG_EX' +registered: '&2Register berhasil!' +reg_msg: '&3Silahkan mendaftar ke server menggunakan command "/register "' +reg_only: '&4Hanya pengguna terdaftar yg bisa bergabung! Silahkan kunjungi http://example.com untuk mendaftar!' +reg_voluntarily: 'Kamu bisa register menggunakan command "/register "' +reload: '&2Konfigurasi dan database telah dimuat ulang!' +same_nick: '&4Username yg sama telah bermain di server ini!' +timeout: '&4Jangka waktu login telah habis, kamu di keluarkan dari server. Silahkan coba lagi!' +unknown_user: '&cTidak dapat menemukan user yg diminta di database!' +unregistered: '&cUnregister berhasil!' +unsafe_spawn: '&cLokasi quit kamu tidak aman, kamu telah diteleport ke titik spawn world.' usage_captcha: '&3Kamu harus menyelesaikan kode captcha untuk login, silahkan gunakan command "/captcha "' -wrong_captcha: '&cCaptcha salah, gunakan command "/captcha THE_CAPTCHA" pada chat!' -valid_captcha: '&2Kode captcha terselesaikan!' -kick_forvip: '&3Player VIP mencoba masuk pada saat server sedang penuh!' -kick_fullserver: '&4Server sedang penuh, silahkan coba lagi nanti!' +usage_changepassword: '&cUsage: /changepassword ' usage_email_add: '&cUsage: /email add ' usage_email_change: '&cUsage: /email change ' usage_email_recovery: '&cUsage: /email recovery ' -new_email_invalid: '&cEmail baru tidak valid, coba lagi!' -old_email_invalid: '&cEmail lama tidak valid, coba lagi!' -email_invalid: '&cAlamat email tidak valid, coba lagi!' -email_added: '&2Berhasil menambahkan alamat email ke akunmu!' -email_confirm: '&cSilahkan konfirmasi alamat email kamu!' -email_changed: '&2Alamat email telah diubah dengan benar!' -email_send: '&2Email pemulihan akun telah dikirim! Silahkan periksa kotak masuk emailmu!' -email_exists: '&cEmail pemulihan sudah dikirim! kamu bisa membatalkan dan mengirimkan yg baru dengan command dibawah:' -country_banned: '&4Your country is banned from this server!' -antibot_auto_enabled: '&4[AntiBotService] AntiBot diaktifkan dikarenakan banyak koneksi yg diterima!' -antibot_auto_disabled: '&2[AntiBotService] AntiBot dimatikan setelah %m menit!' +usage_log: '&cUsage: /login ' +usage_reg: '&cUsage: /register ' +usage_unreg: '&cUsage: /unregister ' +user_regged: '&cKamu telah mendaftarkan username ini!' +user_unknown: '&cUser ini belum terdaftar!' +valid_captcha: '&2Kode captcha terselesaikan!' +valid_session: '&2Otomatis login, karena sesi masih terhubung.' +vb_nonActiv: '&cAkunmu belum diaktifkan, silahkan periksa email kamu!' +wrong_captcha: '&cCaptcha salah, gunakan command "/captcha THE_CAPTCHA" pada chat!' +wrong_pwd: '&cPassword salah!' diff --git a/src/main/resources/messages/messages_it.yml b/src/main/resources/messages/messages_it.yml index 4e4a0fa91..76b59b21a 100644 --- a/src/main/resources/messages/messages_it.yml +++ b/src/main/resources/messages/messages_it.yml @@ -1,58 +1,58 @@ -unknown_user: 'L''utente non è presente nel database.' -unsafe_spawn: 'Il tuo punto di disconnessione risulta ostruito o insicuro, sei stato teletrasportato al punto di rigenerazione!' -not_logged_in: '&cNon hai ancora eseguito l''autenticazione!' -reg_voluntarily: 'Puoi eseguire la registrazione al server con il comando: "/register "' -usage_log: '&cUtilizzo: /login ' -wrong_pwd: '&cPassword non corretta!' -unregistered: '&cSei stato rimosso dal database con successo!' -reg_disabled: '&cLa registrazione tramite i comandi di gioco è disabilitata.' -valid_session: '&cAutenticato automaticamente attraverso la precedente sessione!' -login: '&cAutenticazone effettuata correttamente!' -vb_nonActiv: 'Il tuo account non è stato ancora verificato, controlla fra le tue email per scoprire come attivarlo!' -user_regged: '&cHai già effettuato la registrazione, non puoi eseguirla nuovamente.' -usage_reg: '&cUtilizzo: /register ' +add_email: '&cPer poter recuperare la password in futuro, aggiungi un indirizzo email al tuo account con il comando: "/email add "' +antibot_auto_disabled: "Il servizio di AntiBot è stato automaticamente disabilitato dopo %m Minuti, sperando che l'attacco sia finito!" +antibot_auto_enabled: 'Il servizio di AntiBot è stato automaticamente abilitato a seguito delle numerose connessioni!' +country_banned: 'Il tuo paese è bandito da questo server!' +email_added: 'Indirizzo email aggiunto correttamente!' +email_changed: 'Indirizzo email cambiato correttamente!' +email_confirm: 'Conferma il tuo indirizzo email!' +email_exists: 'Il tuo account ha già un''indirizzo email configurato. Se vuoi, puoi cambiarlo con il seguente comando:' +email_invalid: 'L''indirizzo email inserito non è valido' +email_send: 'Una email di recupero è stata appena inviata al tuo indirizzo email!' error: 'Qualcosa è andato storto, riporta questo errore ad un Admin!' -max_reg: 'Hai raggiunto il numero massimo di registrazioni per questo indirizzo IP!' -no_perm: '&cNon hai il permesso di eseguire questa operazione.' +invalid_session: 'I tuoi dati di connessione attuali non sono quelli utilizzati in precedenza. Attendi la fine della sessione attuale.' +kick_forvip: '&cUn utente VIP è entrato mentre il server era pieno e ha preso il tuo posto!' +kick_fullserver: '&cIl server è attualmente pieno, riprova più tardi!' +logged_in: '&cHai già eseguito l''autenticazione, non devi eseguirla nuovamente!' +login: '&cAutenticazone effettuata correttamente!' login_msg: '&cPerfavore, esegui l''autenticazione con il comando: "/login "' -reg_msg: '&cPerfavore, esegui la registrazione con il comando: "/register "' -reg_email_msg: '&cPerfavore, esegui la registrazione con il comando: "/register "' -usage_unreg: '&cUtilizzo: /unregister ' -pwd_changed: '&cPassword cambiata con successo!' -user_unknown: '&cL''utente non ha ancora eseguito la registrazione.' +logout: '&cDisconnessione avvenuta correttamente!' +max_reg: 'Hai raggiunto il numero massimo di registrazioni per questo indirizzo IP!' +name_len: '&cIl tuo nome utente è troppo corto o troppo lungo!' +new_email_invalid: 'Il nuovo indirizzo email inserito non è valido!' +no_perm: '&cNon hai il permesso di eseguire questa operazione.' +not_logged_in: '&cNon hai ancora eseguito l''autenticazione!' +old_email_invalid: 'Il vecchio indirizzo email inserito non è valido!' +pass_len: 'La password che hai inserito è troppo corta o troppo lunga, scegline un''altra!' password_error: 'Le Password non corrispondono!' password_error_nick: 'Non puoi usare il tuo nome utente come password, scegline un''altra!' password_error_unsafe: 'La password che hai inserito non è sicura, scegline un''altra!' -invalid_session: 'I tuoi dati di connessione attuali non sono quelli utilizzati in precedenza. Attendi la fine della sessione attuale.' -reg_only: 'Puoi giocare in questo server solo dopo aver effettuato la registrazione attraverso il sito web! Perfavore, vai su http://esempio.it per procedere!' -logged_in: '&cHai già eseguito l''autenticazione, non devi eseguirla nuovamente!' -logout: '&cDisconnessione avvenuta correttamente!' -same_nick: 'Questo stesso nome utente è già online sul server!' -registered: '&cRegistrato correttamente!' -pass_len: 'La password che hai inserito è troppo corta o troppo lunga, scegline un''altra!' -reload: 'La configurazione e il database sono stati ricaricati con successo!' -timeout: 'Tempo scaduto per effettuare l''autenticazione' -usage_changepassword: 'Utilizzo: /changepassword ' -name_len: '&cIl tuo nome utente è troppo corto o troppo lungo!' -regex: '&cIl tuo nome utente contiene caratteri non consentiti. I caratteri consentiti sono: REG_EX' -add_email: '&cPer poter recuperare la password in futuro, aggiungi un indirizzo email al tuo account con il comando: "/email add "' +pwd_changed: '&cPassword cambiata con successo!' recovery_email: '&cHai dimenticato la tua password? Puoi recuperarla eseguendo il comando: "/email recovery "' +reg_disabled: '&cLa registrazione tramite i comandi di gioco è disabilitata.' +reg_email_msg: '&cPerfavore, esegui la registrazione con il comando: "/register "' +regex: '&cIl tuo nome utente contiene caratteri non consentiti. I caratteri consentiti sono: REG_EX' +registered: '&cRegistrato correttamente!' +reg_msg: '&cPerfavore, esegui la registrazione con il comando: "/register "' +reg_only: 'Puoi giocare in questo server solo dopo aver effettuato la registrazione attraverso il sito web! Perfavore, vai su http://esempio.it per procedere!' +reg_voluntarily: 'Puoi eseguire la registrazione al server con il comando: "/register "' +reload: 'La configurazione e il database sono stati ricaricati con successo!' +same_nick: 'Questo stesso nome utente è già online sul server!' +timeout: 'Tempo scaduto per effettuare l''autenticazione' +unknown_user: 'L''utente non è presente nel database.' +unregistered: '&cSei stato rimosso dal database con successo!' +unsafe_spawn: 'Il tuo punto di disconnessione risulta ostruito o insicuro, sei stato teletrasportato al punto di rigenerazione!' usage_captcha: '&cAbbiamo bisogno che tu inserisca un captcha, perfavore scrivi: "/captcha THE_CAPTCHA"' -wrong_captcha: '&cCaptcha sbagliato, perfavore riprova con il comando: "/captcha THE_CAPTCHA"' -valid_captcha: '&cIl captcha inserito è valido!' -kick_forvip: '&cUn utente VIP è entrato mentre il server era pieno e ha preso il tuo posto!' -kick_fullserver: '&cIl server è attualmente pieno, riprova più tardi!' +usage_changepassword: 'Utilizzo: /changepassword ' usage_email_add: '&fUtilizzo: /email add ' usage_email_change: '&fUtilizzo: /email change ' usage_email_recovery: '&fUtilizzo: /email recovery ' -new_email_invalid: 'Il nuovo indirizzo email inserito non è valido!' -old_email_invalid: 'Il vecchio indirizzo email inserito non è valido!' -email_invalid: 'L''indirizzo email inserito non è valido' -email_added: 'Indirizzo email aggiunto correttamente!' -email_confirm: 'Conferma il tuo indirizzo email!' -email_changed: 'Indirizzo email cambiato correttamente!' -email_send: 'Una email di recupero è stata appena inviata al tuo indirizzo email!' -email_exists: 'Il tuo account ha già un''indirizzo email configurato. Se vuoi, puoi cambiarlo con il seguente comando:' -country_banned: 'Il tuo paese è bandito da questo server!' -antibot_auto_enabled: 'Il servizio di AntiBot è stato automaticamente abilitato a seguito delle numerose connessioni!' -antibot_auto_disabled: "Il servizio di AntiBot è stato automaticamente disabilitato dopo %m Minuti, sperando che l'attacco sia finito!" +usage_log: '&cUtilizzo: /login ' +usage_reg: '&cUtilizzo: /register ' +usage_unreg: '&cUtilizzo: /unregister ' +user_regged: '&cHai già effettuato la registrazione, non puoi eseguirla nuovamente.' +user_unknown: '&cL''utente non ha ancora eseguito la registrazione.' +valid_captcha: '&cIl captcha inserito è valido!' +valid_session: '&cAutenticato automaticamente attraverso la precedente sessione!' +vb_nonActiv: 'Il tuo account non è stato ancora verificato, controlla fra le tue email per scoprire come attivarlo!' +wrong_captcha: '&cCaptcha sbagliato, perfavore riprova con il comando: "/captcha THE_CAPTCHA"' +wrong_pwd: '&cPassword non corretta!' diff --git a/src/main/resources/messages/messages_ko.yml b/src/main/resources/messages/messages_ko.yml index db1bd4214..417f26a14 100644 --- a/src/main/resources/messages/messages_ko.yml +++ b/src/main/resources/messages/messages_ko.yml @@ -1,62 +1,62 @@ -# Korean translate by wolfwork # -# wolfdate25@gmail.com # -# 16.08.2014 Thanks for use # -unknown_user: '&f사용자가 데이터베이스에 존재하지 않습니다' -unsafe_spawn: '&f당신이 종료한 위치는 안전하지 않았습니다, 세계의 소환지점으로 이동합니다' -not_logged_in: '&c접속되어있지 않습니다!' -reg_voluntarily: '&f당신은 당신의 이름을 "/register 비밀번호 비밀번호확인" 명령어로 가입하실 수 있습니다' -usage_log: '&c사용법: /login 비밀번호' -wrong_pwd: '&c잘못된 비밀번호입니다' -unregistered: '&c성공적으로 탈퇴했습니다!' -reg_disabled: '&c가입이 비활성화 되어있습니다' -valid_session: '&c세션 로그인' -login: '&c성공적인 접속입니다!' -password_error_nick: '&fYou can''t use your name as password' -password_error_unsafe: '&fYou can''t use unsafe passwords' -vb_nonActiv: '&f당신의 계정은 아직 활성화되어있지 않습니다, 당신의 이메일을 확인해보세요!' -user_regged: '&c사용자이름은 이미 가입했습니다' -usage_reg: '&c사용법: /register 비밀번호 비밀번호확인' -max_reg: '&f당신은 가입할 수 있는 계정의 최대 한도를 초과했습니다' -no_perm: '&c권한이 없습니다' -error: '&f오류가 발생했습니다; 관리자에게 문의해주세요' -login_msg: '&c접속 하실려면 "/login 비밀번호"를 치세요' -reg_msg: '&c가입하실려면 "/register 비밀번호 비밀번호재입력"을 치세요' -reg_email_msg: '&c가입하실려면 "/register <이메일> <이메일재입력>을 치세요"' -usage_unreg: '&c사용법: /unregister 비밀번호' -pwd_changed: '&c비밀번호를 변경했습니다!' -user_unknown: '&c사용자이름은 가입되지 않았습니다' -password_error: '&f비밀번호가 일치하지 않습니다' -invalid_session: '&f세션일자가 적합하지 않습니다. 세션이 종료될 때까지 기다려주세요' -reg_only: '&f가입한 플레이어만이 가능합니다! 가입하실려면 http://example.com 에 방문해주세요' -logged_in: '&c이미 접속되었습니다!' -logout: '&c성공적으로 접속해제하였습니다' -same_nick: '&f같은 이름으로 이미 플레이하고 있습니다' -registered: '&c성공적으로 가입했습니다!' -pass_len: '&f당신의 비밀번호는 최소 길이에 미치지 않거나 최대 길이를 초과했습니다' -reload: '&f설정과 데이터베이스는 갱신되었습니다' -timeout: '&f접속시간 초과' -usage_changepassword: '&f사용법: /changepassword 기존비밀번호 새로운비밀번호' -name_len: '&c당신의 이름은 너무 짧거나 너무 깁니다' -regex: '&c당신의 이름에는 불법적인 글자들이 포함되어있습니다. 허용된 글자: REG_EX' +# 16.08.2014 Thanks for use # add_email: '&c당신의 이메일을 추가해주세요 : /email add 당신의이메일 이메일재입력' -recovery_email: '&c비밀번호를 잊어버리셨다고요? /email recovery <당신의이메일>을 사용하세요' -usage_captcha: '&c보안문자 입력이 필요합니다, 입력해주세요: /captcha ' -wrong_captcha: '&c잘못된 보안문자, 사용해주세요 : /captcha THE_CAPTCHA' -valid_captcha: '&c당신의 보안문자는 적합합니다!' +antibot_auto_disabled: '[AuthMe] 봇차단모드가 %m 분 후에 자동적으로 비활성화됩니다' +antibot_auto_enabled: '[AuthMe] 봇차단모드가 연결 개수 때문에 자동적으로 활성화됩니다!' +country_banned: '당신의 국가는 이 서버에서 차단당했습니다' +email_added: '[AuthMe] 이메일을 추가했습니다!' +email_changed: '[AuthMe] 이메일이 변경되었습니다!' +email_confirm: '[AuthMe] 당신의 이메일을 확인하세요!' +email_exists: '[AuthMe] 당신의 계정에 이미 이메일이 존재합니다. 아래의 명령어를 통해 이메일을 변경하실 수 있습니다' +email_invalid: '[AuthMe] 올바르지 않은 이메일' +email_send: '[AuthMe] 복구 이메일을 보냈습니다!' +error: '&f오류가 발생했습니다; 관리자에게 문의해주세요' +invalid_session: '&f세션일자가 적합하지 않습니다. 세션이 종료될 때까지 기다려주세요' kick_forvip: '&c서버가 만원인 상태일때 VIP 플레이어들만 입장이 가능합니다!' kick_fullserver: '&c서버가 만원입니다, 나중에 다시 시도해주세요' +# Korean translate by wolfwork # +logged_in: '&c이미 접속되었습니다!' +login: '&c성공적인 접속입니다!' +login_msg: '&c접속 하실려면 "/login 비밀번호"를 치세요' +logout: '&c성공적으로 접속해제하였습니다' +max_reg: '&f당신은 가입할 수 있는 계정의 최대 한도를 초과했습니다' +name_len: '&c당신의 이름은 너무 짧거나 너무 깁니다' +new_email_invalid: '[AuthMe] 새 이메일이 올바르지 않습니다!' +no_perm: '&c권한이 없습니다' +not_logged_in: '&c접속되어있지 않습니다!' +old_email_invalid: '[AuthMe] 기존 이메일이 올바르지 않습니다!' +pass_len: '&f당신의 비밀번호는 최소 길이에 미치지 않거나 최대 길이를 초과했습니다' +password_error: '&f비밀번호가 일치하지 않습니다' +password_error_nick: '&fYou can''t use your name as password' +password_error_unsafe: '&fYou can''t use unsafe passwords' +pwd_changed: '&c비밀번호를 변경했습니다!' +recovery_email: '&c비밀번호를 잊어버리셨다고요? /email recovery <당신의이메일>을 사용하세요' +reg_disabled: '&c가입이 비활성화 되어있습니다' +reg_email_msg: '&c가입하실려면 "/register <이메일> <이메일재입력>을 치세요"' +regex: '&c당신의 이름에는 불법적인 글자들이 포함되어있습니다. 허용된 글자: REG_EX' +registered: '&c성공적으로 가입했습니다!' +reg_msg: '&c가입하실려면 "/register 비밀번호 비밀번호재입력"을 치세요' +reg_only: '&f가입한 플레이어만이 가능합니다! 가입하실려면 http://example.com 에 방문해주세요' +reg_voluntarily: '&f당신은 당신의 이름을 "/register 비밀번호 비밀번호확인" 명령어로 가입하실 수 있습니다' +reload: '&f설정과 데이터베이스는 갱신되었습니다' +same_nick: '&f같은 이름으로 이미 플레이하고 있습니다' +timeout: '&f접속시간 초과' +unknown_user: '&f사용자가 데이터베이스에 존재하지 않습니다' +unregistered: '&c성공적으로 탈퇴했습니다!' +unsafe_spawn: '&f당신이 종료한 위치는 안전하지 않았습니다, 세계의 소환지점으로 이동합니다' +usage_captcha: '&c보안문자 입력이 필요합니다, 입력해주세요: /captcha ' +usage_changepassword: '&f사용법: /changepassword 기존비밀번호 새로운비밀번호' usage_email_add: '&f사용법: /email add <이메일> <이메일확인> ' usage_email_change: '&f사용법: /email change <기존이메일> <새로운이메일> ' usage_email_recovery: '&f사용법: /email recovery <이메일>' -new_email_invalid: '[AuthMe] 새 이메일이 올바르지 않습니다!' -old_email_invalid: '[AuthMe] 기존 이메일이 올바르지 않습니다!' -email_invalid: '[AuthMe] 올바르지 않은 이메일' -email_added: '[AuthMe] 이메일을 추가했습니다!' -email_confirm: '[AuthMe] 당신의 이메일을 확인하세요!' -email_changed: '[AuthMe] 이메일이 변경되었습니다!' -email_send: '[AuthMe] 복구 이메일을 보냈습니다!' -email_exists: '[AuthMe] 당신의 계정에 이미 이메일이 존재합니다. 아래의 명령어를 통해 이메일을 변경하실 수 있습니다' -country_banned: '당신의 국가는 이 서버에서 차단당했습니다' -antibot_auto_enabled: '[AuthMe] 봇차단모드가 연결 개수 때문에 자동적으로 활성화됩니다!' -antibot_auto_disabled: '[AuthMe] 봇차단모드가 %m 분 후에 자동적으로 비활성화됩니다' +usage_log: '&c사용법: /login 비밀번호' +usage_reg: '&c사용법: /register 비밀번호 비밀번호확인' +usage_unreg: '&c사용법: /unregister 비밀번호' +user_regged: '&c사용자이름은 이미 가입했습니다' +user_unknown: '&c사용자이름은 가입되지 않았습니다' +valid_captcha: '&c당신의 보안문자는 적합합니다!' +valid_session: '&c세션 로그인' +vb_nonActiv: '&f당신의 계정은 아직 활성화되어있지 않습니다, 당신의 이메일을 확인해보세요!' +# wolfdate25@gmail.com # +wrong_captcha: '&c잘못된 보안문자, 사용해주세요 : /captcha THE_CAPTCHA' +wrong_pwd: '&c잘못된 비밀번호입니다' diff --git a/src/main/resources/messages/messages_lt.yml b/src/main/resources/messages/messages_lt.yml index 80a7b3abb..b0889b8db 100644 --- a/src/main/resources/messages/messages_lt.yml +++ b/src/main/resources/messages/messages_lt.yml @@ -1,57 +1,57 @@ -unknown_user: '&cNaudotojo nera duombazeje' -unsafe_spawn: '&6Atsijungimo vieta nesaugi, perkeliame jus i atsiradimo vieta.' -not_logged_in: '&cTu neprisijunges!' -reg_voluntarily: '&ePrisiregistruokite: /register slaptazodis pakartotiSlaptazodi' -usage_log: '&eKomandos panaudojimas: /login slaptazodis' -wrong_pwd: '&cNeteisingas slaptazosdis' -unregistered: '&aSekmingai issiregistravote!' -reg_disabled: '&6Registracija yra isjungta' -valid_session: '&aSesijos prisijungimas' -login: '&aSekmingai prisijungete' -vb_nonActiv: '&aJusu vartotojas nera patvirtintas, patikrinkite el.pasta.' -user_regged: '&cVartotojo vardas jau uzregistruotas' -usage_reg: '&eNaudojimas: /register slaptazodis pakartotiSlaptazodi' -max_reg: '&cJus pasiekete maksimalu registraciju skaiciu.' -no_perm: '&cNera leidimo' -error: '&cAtsirado klaida, praneskite adminstratoriui.' -password_error_nick: '&fYou can''t use your name as password' -password_error_unsafe: '&fYou can''t use unsafe passwords' -login_msg: '&ePrasome prisijungti: /login slaptazodis' -reg_msg: '&ePrasome prisiregistruoti: /register slaptazodis pakartotiSlaptazodi' -reg_email_msg: '&cPlease register with "/register "' -usage_unreg: '&ePanaikinti registracija: "/unregister slaptazodis"' -pwd_changed: '&aSlaptazodis pakeistas' -user_unknown: '&cVartotojas neprisiregistraves' -password_error: '&cSlaptazodziai nesutampa' -invalid_session: '&cSesijos laikai nesutampa, prasome palaukti kol secija baigsis.' -reg_only: '&cTik prisiregistravusiem zaidejams: apsilankykite: http://example.com tam kad uzsiregistruoti.' -logged_in: '&cTu aju prisijunges!' -logout: '&aSekmingai atsijungete' -same_nick: '&cKazkas situo vardu jau zaidzia.' -registered: '&aSekmingai prisiregistravote.' -pass_len: '&cJusu slaptazodis buvo per ilgas arba per trumpas.' -reload: '&aNustatymai ir duomenu baze buvo perkrauta.' -timeout: '&cNespejote prisijungti' -usage_changepassword: '&ePanaudojimas: /changepassword senasSlaptazodis naujasSlaptazodis' -name_len: '&cJusu varsdas yra per ilgas arba per trumpas.' -regex: '&cJusu varde yra neledziamu simboliu, leidziami: REG_EX' add_email: '&ePrasau pridekite savo el.pasta : /email add Email confirmEmail' -recovery_email: '&cPamirsote slaptazodi? Rasykite: /email recovery el.pastas' -usage_captcha: '&cPanaudojimas: /captcha ' -wrong_captcha: '&cNeteisinga Captcha, naudokite : /captcha THE_CAPTCHA' -valid_captcha: '&cJusu captcha Teisinga!' +antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' +antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' +country_banned: 'Your country is banned from this server' +email_added: '[AuthMe] Email Added !' +email_changed: '[AuthMe] Email Change !' +email_confirm: '[AuthMe] Confirm your Email !' +email_invalid: '[AuthMe] Invalid Email' +email_send: '[AuthMe] Recovery Email Send !' +error: '&cAtsirado klaida, praneskite adminstratoriui.' +invalid_session: '&cSesijos laikai nesutampa, prasome palaukti kol secija baigsis.' kick_forvip: '&cA VIP prisijunge i pilna serveri!' kick_fullserver: '&cServeris yra pilnas, Atsiprasome.' +logged_in: '&cTu aju prisijunges!' +login: '&aSekmingai prisijungete' +login_msg: '&ePrasome prisijungti: /login slaptazodis' +logout: '&aSekmingai atsijungete' +max_reg: '&cJus pasiekete maksimalu registraciju skaiciu.' +name_len: '&cJusu varsdas yra per ilgas arba per trumpas.' +new_email_invalid: '[AuthMe] New email invalid!' +no_perm: '&cNera leidimo' +not_logged_in: '&cTu neprisijunges!' +old_email_invalid: '[AuthMe] Old email invalid!' +pass_len: '&cJusu slaptazodis buvo per ilgas arba per trumpas.' +password_error: '&cSlaptazodziai nesutampa' +password_error_nick: '&fYou can''t use your name as password' +password_error_unsafe: '&fYou can''t use unsafe passwords' +pwd_changed: '&aSlaptazodis pakeistas' +recovery_email: '&cPamirsote slaptazodi? Rasykite: /email recovery el.pastas' +reg_disabled: '&6Registracija yra isjungta' +reg_email_msg: '&cPlease register with "/register "' +regex: '&cJusu varde yra neledziamu simboliu, leidziami: REG_EX' +registered: '&aSekmingai prisiregistravote.' +reg_msg: '&ePrasome prisiregistruoti: /register slaptazodis pakartotiSlaptazodi' +reg_only: '&cTik prisiregistravusiem zaidejams: apsilankykite: http://example.com tam kad uzsiregistruoti.' +reg_voluntarily: '&ePrisiregistruokite: /register slaptazodis pakartotiSlaptazodi' +reload: '&aNustatymai ir duomenu baze buvo perkrauta.' +same_nick: '&cKazkas situo vardu jau zaidzia.' +timeout: '&cNespejote prisijungti' +unknown_user: '&cNaudotojo nera duombazeje' +unregistered: '&aSekmingai issiregistravote!' +unsafe_spawn: '&6Atsijungimo vieta nesaugi, perkeliame jus i atsiradimo vieta.' +usage_captcha: '&cPanaudojimas: /captcha ' +usage_changepassword: '&ePanaudojimas: /changepassword senasSlaptazodis naujasSlaptazodis' usage_email_add: '&fUsage: /email add ' usage_email_change: '&fUsage: /email change ' usage_email_recovery: '&fUsage: /email recovery ' -new_email_invalid: '[AuthMe] New email invalid!' -old_email_invalid: '[AuthMe] Old email invalid!' -email_invalid: '[AuthMe] Invalid Email' -email_added: '[AuthMe] Email Added !' -email_confirm: '[AuthMe] Confirm your Email !' -email_changed: '[AuthMe] Email Change !' -email_send: '[AuthMe] Recovery Email Send !' -country_banned: 'Your country is banned from this server' -antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' -antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' +usage_log: '&eKomandos panaudojimas: /login slaptazodis' +usage_reg: '&eNaudojimas: /register slaptazodis pakartotiSlaptazodi' +usage_unreg: '&ePanaikinti registracija: "/unregister slaptazodis"' +user_regged: '&cVartotojo vardas jau uzregistruotas' +user_unknown: '&cVartotojas neprisiregistraves' +valid_captcha: '&cJusu captcha Teisinga!' +valid_session: '&aSesijos prisijungimas' +vb_nonActiv: '&aJusu vartotojas nera patvirtintas, patikrinkite el.pasta.' +wrong_captcha: '&cNeteisinga Captcha, naudokite : /captcha THE_CAPTCHA' +wrong_pwd: '&cNeteisingas slaptazosdis' diff --git a/src/main/resources/messages/messages_nl.yml b/src/main/resources/messages/messages_nl.yml index f1c585e20..e7b25e898 100644 --- a/src/main/resources/messages/messages_nl.yml +++ b/src/main/resources/messages/messages_nl.yml @@ -1,56 +1,56 @@ -unknown_user: Gebruiker is niet gevonden in de database -unsafe_spawn: De locatie waar je de vorige keer het spel verliet was gevaarlijk, je bent geteleporteerd naar de spawn -not_logged_in: '&cNiet ingelogt!' -reg_voluntarily: Je kunt je gebruikersnaam registreren met "/register " -usage_log: '&cGebruik: /login ' -wrong_pwd: '&cFout wachtwoord' -unregistered: '&cRegistratie succesvol ongedaan gemaakt!' -reg_disabled: '&cRegistratie is uitgeschakeld' -valid_session: '&cSessie ingelogd' -login: '&cSuccesvol ingelogd!' -password_error_nick: '&fJe kunt je gebruikersnaam niet als wachtwoord gebruiken' -password_error_unsafe: '&fJe kunt geen onveilige wachtwoorden gebruiken' -vb_nonActiv: Je accound is nog niet geactiveerd, controleer je mailbox! -user_regged: '&cGebruikersnaam is al geregistreerd' -usage_reg: '&cGebruik: /register ' -max_reg: Je hebt de maximale registraties van jouw account overschreden. -no_perm: '&cGeen toegang!' -error: Error: neem contact op met een administrator! -login_msg: '&cLog in met "/login "' -reg_msg: '&cRegistreer met "/register "' -usage_unreg: '&cGebruik: /unregister password' -pwd_changed: '&cWachtwoord aangepast!' -user_unknown: '&cGebruikersnaam niet geregistreerd' -password_error: Wachtwoord incorrect! -invalid_session: Sessie beschadigd, wacht tot de sessie is verlopen en verbindt opnieuw. -reg_only: Alleen voor geregistreerde spelers! Bezoek http://example.com om te registreren -logged_in: '&cJe bent al ingelogd!' -logout: '&cJe bent succesvol uitgelogd' -same_nick: Er is al iemand met jou gebruikersnaam online. -registered: '&cSuccesvol geregistreerd!' -pass_len: Je gekozen wachtwoord voldoet niet aan de minimum of maximum lengte -reload: Configuratie en database is opnieuw opgestard -timeout: Login time-out: het duurde telang voor je je inlogde. -usage_changepassword: 'Gebruik: /changepassword ' -name_len: '&cJe gebruikersnaam is te kort' -regex: '&cJouw gebruikersnaam bevat illegale tekens. Toegestaane karakters: REG_EX' add_email: '&cVoeg uw E-mail alstublieft toe met: /email add ' -recovery_email: '&cWachtwoord vergeten? Gebruik alstublieft "/email recovery "' -usage_captcha: '&cGebruik: /captcha ' -wrong_captcha: '&cVerkeerde Captcha, gebruik alstublieft: /captcha THE_CAPTCHA' -valid_captcha: '&cDe captcha is geldig!' +antibot_auto_disabled: '[AuthMe] AntiBotMod automatisch uitgezet na %m minuten, hopelijk is de invasie gestopt' +antibot_auto_enabled: '[AuthMe] AntiBotMod automatisch aangezet vanewge veel verbindingen!' +country_banned: 'Jouw land is geband op deze server' +email_added: '[AuthMe] Bevestig jouw E-mail!' +email_changed: '[AuthMe] Email Veranderd!' +email_confirm: '[AuthMe] Bevestig jouw E-mail!' +email_invalid: '[AuthMe] Ongeldige E-mail' +email_send: '[AuthMe] Herstel E-mail Verzonden!' +error: Error: neem contact op met een administrator! +invalid_session: Sessie beschadigd, wacht tot de sessie is verlopen en verbindt opnieuw. kick_forvip: '&cEen VIP Gebruiker ga naar de volledige server!' kick_fullserver: '&cDe server is vol, sorry!' +logged_in: '&cJe bent al ingelogd!' +login: '&cSuccesvol ingelogd!' +login_msg: '&cLog in met "/login "' +logout: '&cJe bent succesvol uitgelogd' +max_reg: Je hebt de maximale registraties van jouw account overschreden. +name_len: '&cJe gebruikersnaam is te kort' +new_email_invalid: '[AuthMe] Nieuwe E-mail ongeldig!' +no_perm: '&cGeen toegang!' +not_logged_in: '&cNiet ingelogt!' +old_email_invalid: '[AuthMe] Oude E-mail ongeldig!' +pass_len: Je gekozen wachtwoord voldoet niet aan de minimum of maximum lengte +password_error_nick: '&fJe kunt je gebruikersnaam niet als wachtwoord gebruiken' +password_error_unsafe: '&fJe kunt geen onveilige wachtwoorden gebruiken' +password_error: Wachtwoord incorrect! +pwd_changed: '&cWachtwoord aangepast!' +recovery_email: '&cWachtwoord vergeten? Gebruik alstublieft "/email recovery "' +reg_disabled: '&cRegistratie is uitgeschakeld' +regex: '&cJouw gebruikersnaam bevat illegale tekens. Toegestaane karakters: REG_EX' +registered: '&cSuccesvol geregistreerd!' +reg_msg: '&cRegistreer met "/register "' +reg_only: Alleen voor geregistreerde spelers! Bezoek http://example.com om te registreren +reg_voluntarily: Je kunt je gebruikersnaam registreren met "/register " +reload: Configuratie en database is opnieuw opgestard +same_nick: Er is al iemand met jou gebruikersnaam online. +timeout: Login time-out: het duurde telang voor je je inlogde. +unknown_user: Gebruiker is niet gevonden in de database +unregistered: '&cRegistratie succesvol ongedaan gemaakt!' +unsafe_spawn: De locatie waar je de vorige keer het spel verliet was gevaarlijk, je bent geteleporteerd naar de spawn +usage_captcha: '&cGebruik: /captcha ' +usage_changepassword: 'Gebruik: /changepassword ' usage_email_add: '&fGebruik: /email add ' usage_email_change: '&fGebruik: /email change ' usage_email_recovery: '&fGebruik: /email recovery ' -new_email_invalid: '[AuthMe] Nieuwe E-mail ongeldig!' -old_email_invalid: '[AuthMe] Oude E-mail ongeldig!' -email_invalid: '[AuthMe] Ongeldige E-mail' -email_added: '[AuthMe] Bevestig jouw E-mail!' -email_confirm: '[AuthMe] Bevestig jouw E-mail!' -email_changed: '[AuthMe] Email Veranderd!' -email_send: '[AuthMe] Herstel E-mail Verzonden!' -country_banned: 'Jouw land is geband op deze server' -antibot_auto_enabled: '[AuthMe] AntiBotMod automatisch aangezet vanewge veel verbindingen!' -antibot_auto_disabled: '[AuthMe] AntiBotMod automatisch uitgezet na %m minuten, hopelijk is de invasie gestopt' +usage_log: '&cGebruik: /login ' +usage_reg: '&cGebruik: /register ' +usage_unreg: '&cGebruik: /unregister password' +user_regged: '&cGebruikersnaam is al geregistreerd' +user_unknown: '&cGebruikersnaam niet geregistreerd' +valid_captcha: '&cDe captcha is geldig!' +valid_session: '&cSessie ingelogd' +vb_nonActiv: Je accound is nog niet geactiveerd, controleer je mailbox! +wrong_captcha: '&cVerkeerde Captcha, gebruik alstublieft: /captcha THE_CAPTCHA' +wrong_pwd: '&cFout wachtwoord' diff --git a/src/main/resources/messages/messages_pl.yml b/src/main/resources/messages/messages_pl.yml index 952fd1cc0..14a2edc61 100644 --- a/src/main/resources/messages/messages_pl.yml +++ b/src/main/resources/messages/messages_pl.yml @@ -1,57 +1,57 @@ -logged_in: '&fJestes juz zalogowany!' -not_logged_in: '&4Nie jestes zalogowany!' -reg_disabled: '&4Rejestracja jest wylaczona' -user_regged: '&4Gracz juz jest zarejestrowany' -usage_reg: '&4Uzycie: /register haslo powtorzHaslo' -usage_log: '&cUzycie: /login haslo' -user_unknown: '&fGracz nie jest zarejestrowany' -pwd_changed: '&fHaslo zostalo zmienione!' -reg_only: '&fTylko zarejestrowani uzytkownicy maja do tego dostep!' -valid_session: '&cSesja logowania' -login_msg: '&2Prosze sie zalogowac przy uzyciu &6/login ' -reg_msg: '&2Prosze sie zarejestrowac przy uzyciu &6/register ' -reg_email_msg: '&cStworz prosze konto komenda "/register "' -timeout: '&fUplynal limit czasu zalogowania' -wrong_pwd: '&cNiepoprawne haslo' -logout: '&cPomyslnie wylogowany' -usage_unreg: '&cUzycie: /unregister haslo' -registered: '&aPomyslnie zarejestrowany!' -password_error_nick: '&fYou can''t use your name as password' -password_error_unsafe: '&fYou can''t use unsafe passwords' -unregistered: '&4Pomyslnie odrejestrowany!' -login: '&aHaslo zaakceptowane!' -no_perm: '&4Nie masz uprawnien' -same_nick: '&fTen nick juz gra' -reg_voluntarily: '&fMozesz zarejestrowac swoj nick na serwerze przy uzyciu "/register haslo powtorzHaslo"' -reload: '&fKonfiguracja bazy danych zostala przeladowana' -error: '&fBlad prosimy napisac do aministracji' -unknown_user: '&fUzytkownika nie ma w bazie danych' -unsafe_spawn: '&fTwoje pozycja jest niebezpieczna. Zostaniesz przeniesiony na bezpieczny spawn.' -invalid_session: '&fSesja zakonczona!' -max_reg: '&fPrzekroczyles limit zarejestrowanych kont na serwerze.' -password_error: '&fHaslo niepoprawne!' -pass_len: '&fTwoje haslo jest za krotkie lub za dlugie! Sprobuj ponownie...' -vb_nonActiv: '&fTwoje konto nie zostalo aktywowane! Sprawdz maila.' -usage_changepassword: '&fUzycie: /changepassword starehaslo nowehaslo' -name_len: '&cTwoje konto ma za dluga badz za krotka nazwe' -regex: '&cTwoje konto ma w nazwie niedozwolone znaki. Dozwolone znaki: REG_EX' add_email: '&cProsze dodac swoj email: /email add twojEmail powtorzEmail' -recovery_email: '&cZapomniales hasla? Prosze uzyj komendy /email recovery ' -usage_captcha: '&cWpisz: /captcha ' -wrong_captcha: '&cZly kod, prosze wpisac: /captcha THE_CAPTCHA' -valid_captcha: '&cTwoj kod jest nieprawidlowy!' +antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' +antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' +country_banned: 'Your country is banned from this server' +email_added: '[AuthMe] Email dodany!' +email_changed: '[AuthMe] Email zmieniony!' +email_confirm: '[AuthMe] Potwierdz swoj email!' +email_invalid: '[AuthMe] Nieprawidlowy email' +email_send: '[AuthMe] Email z odzyskaniem wyslany!' +error: '&fBlad prosimy napisac do aministracji' +invalid_session: '&fSesja zakonczona!' kick_forvip: '&cA Gracz VIP dolaczyl do gry!' kick_fullserver: '&cSerwer jest teraz zapelniony, przepraszamy!' +logged_in: '&fJestes juz zalogowany!' +login: '&aHaslo zaakceptowane!' +login_msg: '&2Prosze sie zalogowac przy uzyciu &6/login ' +logout: '&cPomyslnie wylogowany' +max_reg: '&fPrzekroczyles limit zarejestrowanych kont na serwerze.' +name_len: '&cTwoje konto ma za dluga badz za krotka nazwe' +new_email_invalid: '[AuthMe] Nowy email niepoprawny!' +no_perm: '&4Nie masz uprawnien' +not_logged_in: '&4Nie jestes zalogowany!' +old_email_invalid: '[AuthMe] Stary email niepoprawny!' +pass_len: '&fTwoje haslo jest za krotkie lub za dlugie! Sprobuj ponownie...' +password_error: '&fHaslo niepoprawne!' +password_error_nick: '&fYou can''t use your name as password' +password_error_unsafe: '&fYou can''t use unsafe passwords' +pwd_changed: '&fHaslo zostalo zmienione!' +recovery_email: '&cZapomniales hasla? Prosze uzyj komendy /email recovery ' +reg_disabled: '&4Rejestracja jest wylaczona' +reg_email_msg: '&cStworz prosze konto komenda "/register "' +regex: '&cTwoje konto ma w nazwie niedozwolone znaki. Dozwolone znaki: REG_EX' +registered: '&aPomyslnie zarejestrowany!' +reg_msg: '&2Prosze sie zarejestrowac przy uzyciu &6/register ' +reg_only: '&fTylko zarejestrowani uzytkownicy maja do tego dostep!' +reg_voluntarily: '&fMozesz zarejestrowac swoj nick na serwerze przy uzyciu "/register haslo powtorzHaslo"' +reload: '&fKonfiguracja bazy danych zostala przeladowana' +same_nick: '&fTen nick juz gra' +timeout: '&fUplynal limit czasu zalogowania' +unknown_user: '&fUzytkownika nie ma w bazie danych' +unregistered: '&4Pomyslnie odrejestrowany!' +unsafe_spawn: '&fTwoje pozycja jest niebezpieczna. Zostaniesz przeniesiony na bezpieczny spawn.' +usage_captcha: '&cWpisz: /captcha ' +usage_changepassword: '&fUzycie: /changepassword starehaslo nowehaslo' usage_email_add: '&fWpisz: /email add ' usage_email_change: '&fWpisz: /email change ' usage_email_recovery: '&fWpisz: /email recovery ' -new_email_invalid: '[AuthMe] Nowy email niepoprawny!' -old_email_invalid: '[AuthMe] Stary email niepoprawny!' -email_invalid: '[AuthMe] Nieprawidlowy email' -email_added: '[AuthMe] Email dodany!' -email_confirm: '[AuthMe] Potwierdz swoj email!' -email_changed: '[AuthMe] Email zmieniony!' -email_send: '[AuthMe] Email z odzyskaniem wyslany!' -country_banned: 'Your country is banned from this server' -antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' -antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' +usage_log: '&cUzycie: /login haslo' +usage_reg: '&4Uzycie: /register haslo powtorzHaslo' +usage_unreg: '&cUzycie: /unregister haslo' +user_regged: '&4Gracz juz jest zarejestrowany' +user_unknown: '&fGracz nie jest zarejestrowany' +valid_captcha: '&cTwoj kod jest nieprawidlowy!' +valid_session: '&cSesja logowania' +vb_nonActiv: '&fTwoje konto nie zostalo aktywowane! Sprawdz maila.' +wrong_captcha: '&cZly kod, prosze wpisac: /captcha THE_CAPTCHA' +wrong_pwd: '&cNiepoprawne haslo' diff --git a/src/main/resources/messages/messages_pt.yml b/src/main/resources/messages/messages_pt.yml index 02ec04208..280e329fb 100644 --- a/src/main/resources/messages/messages_pt.yml +++ b/src/main/resources/messages/messages_pt.yml @@ -1,58 +1,58 @@ -unknown_user: '&fUtilizador não existente na base de dados' -unsafe_spawn: '&fA sua localização na saída não é segura, será tele-portado para a Spawn' -not_logged_in: '&cNão autenticado!' -reg_voluntarily: '&fPode registar o seu nickname no servidor com o comando "/register password ConfirmePassword"' -usage_log: '&cUse: /login password' -wrong_pwd: '&cPassword errada!' -unregistered: '&cRegisto eliminado com sucesso!' -reg_disabled: '&cRegito de novos utilizadores desactivado' -valid_session: '&cSessão válida' -login: '&cAutenticado com sucesso!' -vb_nonActiv: '&fA sua conta não foi ainda activada, verifique o seu email onde irá receber indicações para activação de conta. ' -user_regged: '&cUtilizador já registado' -usage_reg: '&cUse: /register seu@email.com seu@email.com' -max_reg: '&cAtingiu o numero máximo de registos permitidos' -no_perm: '&cSem Permissões' -error: '&fOcorreu um erro; Por favor contacte um admin' -login_msg: '&cIdentifique-se com "/login password"' -reg_msg: '&cPor favor registe-se com "/register password confirmePassword"' -reg_email_msg: '&ePor favor registe-se com "/register "' -usage_unreg: '&cUse: /unregister password' -pwd_changed: '&cPassword alterada!' -password_error_nick: '&fYou can''t use your name as password' -password_error_unsafe: '&fYou can''t use unsafe passwords' -user_unknown: '&cUsername não registado' -password_error: '&fAs passwords não coincidem' -invalid_session: '&fDados de sessão não correspondem. Por favor aguarde o fim da sessão' -reg_only: '&fApenas jogadores registados! Visite http://example.com para se registar' -logged_in: '&cJá se encontra autenticado!' -logout: '&cSaida com sucesso' -same_nick: '&fO mesmo nickname já se encontra a jogar no servidor' -registered: '&cRegistado com sucesso!' -pass_len: '&fPassword demasiado curta' -reload: '&fConfiguração e base de dados foram recarregadas' -timeout: '&fExcedeu o tempo para autenticação' -usage_changepassword: '&fUse: /changepassword passwordAntiga passwordNova' -name_len: '&cO seu nick é demasiado curto ou muito longo.' -regex: '&cO seu nickname contém caracteres não permitidos. Permitido: REG_EX' add_email: '&cPor favor adicione o seu email com : /email add seuEmail confirmarSeuEmail' -recovery_email: '&cPerdeu a sua password? Para a recuperar escreva /email recovery ' -usage_captcha: '&cVocê precisa digitar um captcha, escreva: /captcha ' -wrong_captcha: '&cCaptcha errado, por favor escreva: /captcha THE_CAPTCHA' -valid_captcha: '&cO seu captcha é válido!' +antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automaticamente após %m minutos, esperamos que a invasão tenha parado' +antibot_auto_enabled: '[AuthMe] AntiBotMod activado automaticamente devido a um aumento anormal de tentativas de ligação!' +country_banned: 'O seu país está banido deste servidor' +email_added: 'Email adicionado com sucesso!' +email_add: '/email add ' +email_changed: 'Email alterado com sucesso!' +email_confirm: 'Confirme o seu email!' +email_invalid: 'Email inválido!' +email_send: 'Nova palavra-passe enviada para o seu email!' +error: '&fOcorreu um erro; Por favor contacte um admin' +invalid_session: '&fDados de sessão não correspondem. Por favor aguarde o fim da sessão' kick_forvip: '&cUm jogador VIP entrou no servidor cheio!' kick_fullserver: '&cO servidor está actualmente cheio, lamentamos!' +logged_in: '&cJá se encontra autenticado!' +login: '&cAutenticado com sucesso!' +login_msg: '&cIdentifique-se com "/login password"' +logout: '&cSaida com sucesso' +max_reg: '&cAtingiu o numero máximo de registos permitidos' +name_len: '&cO seu nick é demasiado curto ou muito longo.' +new_email_invalid: 'Novo email inválido!' +no_perm: '&cSem Permissões' +not_logged_in: '&cNão autenticado!' +old_email_invalid: 'Email antigo inválido!' +pass_len: '&fPassword demasiado curta' +password_error: '&fAs passwords não coincidem' +password_error_nick: '&fYou can''t use your name as password' +password_error_unsafe: '&fYou can''t use unsafe passwords' +pwd_changed: '&cPassword alterada!' +recovery_email: '&cPerdeu a sua password? Para a recuperar escreva /email recovery ' +reg_disabled: '&cRegito de novos utilizadores desactivado' +reg_email_msg: '&ePor favor registe-se com "/register "' +regex: '&cO seu nickname contém caracteres não permitidos. Permitido: REG_EX' +registered: '&cRegistado com sucesso!' +reg_msg: '&cPor favor registe-se com "/register password confirmePassword"' +reg_only: '&fApenas jogadores registados! Visite http://example.com para se registar' +reg_voluntarily: '&fPode registar o seu nickname no servidor com o comando "/register password ConfirmePassword"' +reload: '&fConfiguração e base de dados foram recarregadas' +same_nick: '&fO mesmo nickname já se encontra a jogar no servidor' +timeout: '&fExcedeu o tempo para autenticação' +unknown_user: '&fUtilizador não existente na base de dados' +unregistered: '&cRegisto eliminado com sucesso!' +unsafe_spawn: '&fA sua localização na saída não é segura, será tele-portado para a Spawn' +usage_captcha: '&cVocê precisa digitar um captcha, escreva: /captcha ' +usage_changepassword: '&fUse: /changepassword passwordAntiga passwordNova' usage_email_add: '&fUse: /email add ' usage_email_change: '&fUse: /email change ' usage_email_recovery: '&fUse: /email recovery ' -email_add: '/email add ' -new_email_invalid: 'Novo email inválido!' -old_email_invalid: 'Email antigo inválido!' -email_invalid: 'Email inválido!' -email_added: 'Email adicionado com sucesso!' -email_confirm: 'Confirme o seu email!' -email_changed: 'Email alterado com sucesso!' -email_send: 'Nova palavra-passe enviada para o seu email!' -country_banned: 'O seu país está banido deste servidor' -antibot_auto_enabled: '[AuthMe] AntiBotMod activado automaticamente devido a um aumento anormal de tentativas de ligação!' -antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automaticamente após %m minutos, esperamos que a invasão tenha parado' +usage_log: '&cUse: /login password' +usage_reg: '&cUse: /register seu@email.com seu@email.com' +usage_unreg: '&cUse: /unregister password' +user_regged: '&cUtilizador já registado' +user_unknown: '&cUsername não registado' +valid_captcha: '&cO seu captcha é válido!' +valid_session: '&cSessão válida' +vb_nonActiv: '&fA sua conta não foi ainda activada, verifique o seu email onde irá receber indicações para activação de conta. ' +wrong_captcha: '&cCaptcha errado, por favor escreva: /captcha THE_CAPTCHA' +wrong_pwd: '&cPassword errada!' diff --git a/src/main/resources/messages/messages_ru.yml b/src/main/resources/messages/messages_ru.yml index da68ae19b..b9cc5c561 100644 --- a/src/main/resources/messages/messages_ru.yml +++ b/src/main/resources/messages/messages_ru.yml @@ -1,57 +1,57 @@ -unknown_user: '&fПользователь не найден в Базе Данных' -unsafe_spawn: '&eВаше расположение перед выходом было опасным - вы перенесены на спавн' -not_logged_in: '&c&lВы еще не вошли!' -reg_voluntarily: '&aЧтобы зарегистрироваться введите: &e&l/reg ПАРОЛЬ ПОВТОР_ПАРОЛЯ' -usage_log: '&eСинтаксис: &d/l ПАРОЛЬ &eили &d/login ПАРОЛЬ' -wrong_pwd: '&c&lНеправильный пароль!' -unregistered: '&6Вы успешно удалили свой аккаунт!' -reg_disabled: '&c&lРегистрация отключена' -valid_session: '&aСессия открыта' -login: '&a&lВы успешно вошли!' -vb_nonActiv: '&6Ваш аккаунт еще не активирован! Проверьте вашу почту!' -user_regged: '&c&lТакой игрок уже зарегистрирован' -usage_reg: '&c&lИспользование: &e&l/reg ПАРОЛЬ ПОВТОР_ПАРОЛЯ' -max_reg: '&c&lВы превысили макс количество регистраций на ваш IP' -no_perm: '&c&lНедостаточно прав' -error: '&c&lПроизошла ошибка. Свяжитесь с администратором' -login_msg: '&a&lАвторизация: &e&l/l ПАРОЛЬ' -reg_msg: '&a&lРегистрация: &e&l/reg ПАРОЛЬ ПОВТОР_ПАРОЛЯ' -password_error_nick: '&c&lВы не можете использовать ваш ник в роли пароля' -password_error_unsafe: '&c&lВы не можете использовать небезопасный пароль' -reg_email_msg: '&c&lРегистрация: &e&l/reg EMAIL ПОВТОР_EMAIL' -usage_unreg: '&c&lИспользование: &e&l/unregister ПАРОЛЬ' -pwd_changed: '&2Пароль изменен!' -user_unknown: '&c&lТакой игрок не зарегистрирован' -password_error: '&c&lПароль не совпадает' -invalid_session: '&c&lСессия некорректна. Дождитесь, пока она закончится' -reg_only: '&c&lТолько для зарегистрированных! Посетите http://сайт_сервера.com/register/ для регистрации' -logged_in: '&c&lВы уже авторизированы!' -logout: '&2Вы успешно вышли' -same_nick: '&c&lТакой игрок уже играет на сервере' -registered: '&a&lУспешная регистрация!' -pass_len: '&c&lТвой пароль либо слишком длинный, либо слишком короткий' -reload: '&6Конфигурация и база данных перезагружены' -timeout: '&c&lВремя для авторизации истекло' -usage_changepassword: '&c&lИспользование: &e&l/changepassword СТАРЫЙ_ПАРОЛЬ НОВЫЙ_ПАРОЛЬ' -name_len: '&c&lВаш ник слишком длинный или слишком короткий' -regex: '&c&lВаш логин содержит запрещенные символы. Разрешенные символы: REG_EX' add_email: '&c&lДобавьте свой email: &e&l/email add ВАШ_EMAIL ВАШ_EMAIL' -recovery_email: '&c&lЗабыли пароль? Используйте &e&l/email recovery ВАШ_EMAIL' -usage_captcha: '&c&lВы должны ввести код, используйте: &e&l/captcha ' -wrong_captcha: '&c&lНеверный код, используйте: &e&l/captcha THE_CAPTCHA' -valid_captcha: '&2Вы успешно ввели код!' +antibot_auto_disabled: '&a[AuthMe] AntiBot-режим автоматичски отключен после %m мин. Надеюсь атака закончилась' +antibot_auto_enabled: '&a[AuthMe] AntiBot-режим автоматически включен из-за большого количества входов!' +country_banned: 'Вход с IP-адресов вашей страны воспрещен на этом сервере' +email_added: '[AuthMe] Email добавлен!' +email_changed: '[AuthMe] Email изменен!' +email_confirm: '[AuthMe] Подтвердите ваш Email!' +email_invalid: '[AuthMe] Недействительный email' +email_send: '[AuthMe] Письмо с инструкциями для восстановления было отправлено на ваш Email!' +error: '&c&lПроизошла ошибка. Свяжитесь с администратором' +invalid_session: '&c&lСессия некорректна. Дождитесь, пока она закончится' kick_forvip: '&6VIP игрок зашел на переполненный сервер!' kick_fullserver: '&c&lСервер переполнен!' +logged_in: '&c&lВы уже авторизированы!' +login: '&a&lВы успешно вошли!' +login_msg: '&a&lАвторизация: &e&l/l ПАРОЛЬ' +logout: '&2Вы успешно вышли' +max_reg: '&c&lВы превысили макс количество регистраций на ваш IP' +name_len: '&c&lВаш ник слишком длинный или слишком короткий' +new_email_invalid: '[AuthMe] Недействительный новый email!' +no_perm: '&c&lНедостаточно прав' +not_logged_in: '&c&lВы еще не вошли!' +old_email_invalid: '[AuthMe] Недействительный старый email!' +pass_len: '&c&lТвой пароль либо слишком длинный, либо слишком короткий' +password_error: '&c&lПароль не совпадает' +password_error_nick: '&c&lВы не можете использовать ваш ник в роли пароля' +password_error_unsafe: '&c&lВы не можете использовать небезопасный пароль' +pwd_changed: '&2Пароль изменен!' +recovery_email: '&c&lЗабыли пароль? Используйте &e&l/email recovery ВАШ_EMAIL' +reg_disabled: '&c&lРегистрация отключена' +reg_email_msg: '&c&lРегистрация: &e&l/reg EMAIL ПОВТОР_EMAIL' +regex: '&c&lВаш логин содержит запрещенные символы. Разрешенные символы: REG_EX' +registered: '&a&lУспешная регистрация!' +reg_msg: '&a&lРегистрация: &e&l/reg ПАРОЛЬ ПОВТОР_ПАРОЛЯ' +reg_only: '&c&lТолько для зарегистрированных! Посетите http://сайт_сервера.com/register/ для регистрации' +reg_voluntarily: '&aЧтобы зарегистрироваться введите: &e&l/reg ПАРОЛЬ ПОВТОР_ПАРОЛЯ' +reload: '&6Конфигурация и база данных перезагружены' +same_nick: '&c&lТакой игрок уже играет на сервере' +timeout: '&c&lВремя для авторизации истекло' +unknown_user: '&fПользователь не найден в Базе Данных' +unregistered: '&6Вы успешно удалили свой аккаунт!' +unsafe_spawn: '&eВаше расположение перед выходом было опасным - вы перенесены на спавн' +usage_captcha: '&c&lВы должны ввести код, используйте: &e&l/captcha ' +usage_changepassword: '&c&lИспользование: &e&l/changepassword СТАРЫЙ_ПАРОЛЬ НОВЫЙ_ПАРОЛЬ' usage_email_add: '&c&lИспользование: &e&l/email add ВАШ_EMAIL ПОВТОР_EMAIL' usage_email_change: '&c&lИспользование: &e&l/email change СТАРЫЙ_EMAIL НОВЫЙ_EMAIL' usage_email_recovery: '&c&lИспользование: /email recovery EMAIL' -new_email_invalid: '[AuthMe] Недействительный новый email!' -old_email_invalid: '[AuthMe] Недействительный старый email!' -email_invalid: '[AuthMe] Недействительный email' -email_added: '[AuthMe] Email добавлен!' -email_confirm: '[AuthMe] Подтвердите ваш Email!' -email_changed: '[AuthMe] Email изменен!' -email_send: '[AuthMe] Письмо с инструкциями для восстановления было отправлено на ваш Email!' -country_banned: 'Вход с IP-адресов вашей страны воспрещен на этом сервере' -antibot_auto_enabled: '&a[AuthMe] AntiBot-режим автоматически включен из-за большого количества входов!' -antibot_auto_disabled: '&a[AuthMe] AntiBot-режим автоматичски отключен после %m мин. Надеюсь атака закончилась' +usage_log: '&eСинтаксис: &d/l ПАРОЛЬ &eили &d/login ПАРОЛЬ' +usage_reg: '&c&lИспользование: &e&l/reg ПАРОЛЬ ПОВТОР_ПАРОЛЯ' +usage_unreg: '&c&lИспользование: &e&l/unregister ПАРОЛЬ' +user_regged: '&c&lТакой игрок уже зарегистрирован' +user_unknown: '&c&lТакой игрок не зарегистрирован' +valid_captcha: '&2Вы успешно ввели код!' +valid_session: '&aСессия открыта' +vb_nonActiv: '&6Ваш аккаунт еще не активирован! Проверьте вашу почту!' +wrong_captcha: '&c&lНеверный код, используйте: &e&l/captcha THE_CAPTCHA' +wrong_pwd: '&c&lНеправильный пароль!' diff --git a/src/main/resources/messages/messages_sk.yml b/src/main/resources/messages/messages_sk.yml index 010533fe8..813ab0f8a 100644 --- a/src/main/resources/messages/messages_sk.yml +++ b/src/main/resources/messages/messages_sk.yml @@ -1,61 +1,61 @@ -# Slovak translate by Judzi # -# www.judzi.eu | judzi@cs-gaming.eu # -# 02.02.2013 - 4:35 AM - Thanks for use # -logged_in: '&cAktuálne si uz prihláseny!' -not_logged_in: '&cNie si este prihláseny!' -reg_disabled: '&cRegistrácia nie je povolená' -user_regged: '&cZadané meno je uz zaregistrované' -usage_reg: '&cPríkaz: /register heslo zopakujHeslo' -usage_log: '&cPríkaz: /login heslo' -user_unknown: '&cZadané meno nie je zaregistrované!' -pwd_changed: '&cHeslo zmenené!' -reg_only: '&fVstup iba pre registrovanych! Navstiv http://example.com pre registráciu' -valid_session: '&cZapamätané prihlásenie' -login_msg: '&cPrihlás sa príkazom "/login heslo"' -reg_msg: '&cZaregistruj sa príkazom "/register heslo zopakujHeslo"' -reg_email_msg: '&cPlease register with "/register "' -timeout: '&fVyprsal cas na prihlásenie' -wrong_pwd: '&cZadal si zlé heslo' -password_error_nick: '&fYou can''t use your name as password' -password_error_unsafe: '&fYou can''t use unsafe passwords' -logout: '&cBol si úspesne odhláseny' -usage_unreg: '&cPríkaz: /unregister heslo' -registered: '&cBol si úspesne zaregistrovany' -unregistered: '&cUcet bol vymazany!' -login: '&cBol si úspesne prihláseny!' -no_perm: '&cZiadne' -same_nick: '&fHrác s tymto nickom uz hrá!' -reg_voluntarily: '&fZaregistruj sa pomocou príkazu "/register heslo zopakujHeslo"' -reload: '&fKonfigurácia a databáza bola obnovená' -error: '&fNastala chyba; Kontaktujte administrátora' -unknown_user: '&fHrac nie je v databázi' -unsafe_spawn: '&fTvoj pozícia bol nebezpecná, teleportujem hraca na spawn' -invalid_session: '&fZapamätane casove data nie su doveryhodne. Cakaj na ukoncenie spojenia' -max_reg: '&fDosiahol si maximum registrovanych uctov.' -password_error: '&fHeslá sa nezhodujú' -pass_len: '&fHeslo je velmi kratke alebo dlhe' -vb_nonActiv: '&fUcet nie je aktivny. Prezri si svoj e-mail!' -usage_changepassword: '&fPríkaz: /changepassword stareHeslo noveHeslo' -name_len: '&cTvoje meno je velmi krátke alebo dlhé' -regex: '&cTvoje meno obsahuje zakázané znaky. Povolené znaky: REG_EX' +# 02.02.2013 - 4:35 AM - Thanks for use # add_email: '&cPridaj svoj e-mail príkazom "/email add email zopakujEmail"' -recovery_email: '&cZabudol si heslo? Pouzi príkaz /email recovery ' -usage_captcha: '&cUsage: /captcha ' -wrong_captcha: '&cWrong Captcha, please use : /captcha THE_CAPTCHA' -valid_captcha: '&cYour captcha is valid !' +antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' +antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' +country_banned: 'Your country is banned from this server' +email_added: '[AuthMe] Email Added !' +email_changed: '[AuthMe] Email Change !' +email_confirm: '[AuthMe] Confirm your Email !' +email_invalid: '[AuthMe] Invalid Email' +email_send: '[AuthMe] Recovery Email Send !' +error: '&fNastala chyba; Kontaktujte administrátora' +invalid_session: '&fZapamätane casove data nie su doveryhodne. Cakaj na ukoncenie spojenia' kick_forvip: '&cA VIP Player join the full server!' kick_fullserver: '&cThe server is actually full, Sorry!' +logged_in: '&cAktuálne si uz prihláseny!' +login: '&cBol si úspesne prihláseny!' +login_msg: '&cPrihlás sa príkazom "/login heslo"' +logout: '&cBol si úspesne odhláseny' +max_reg: '&fDosiahol si maximum registrovanych uctov.' +name_len: '&cTvoje meno je velmi krátke alebo dlhé' +new_email_invalid: '[AuthMe] New email invalid!' +no_perm: '&cZiadne' +not_logged_in: '&cNie si este prihláseny!' +old_email_invalid: '[AuthMe] Old email invalid!' +pass_len: '&fHeslo je velmi kratke alebo dlhe' +password_error: '&fHeslá sa nezhodujú' +password_error_nick: '&fYou can''t use your name as password' +password_error_unsafe: '&fYou can''t use unsafe passwords' +pwd_changed: '&cHeslo zmenené!' +recovery_email: '&cZabudol si heslo? Pouzi príkaz /email recovery ' +reg_disabled: '&cRegistrácia nie je povolená' +reg_email_msg: '&cPlease register with "/register "' +regex: '&cTvoje meno obsahuje zakázané znaky. Povolené znaky: REG_EX' +registered: '&cBol si úspesne zaregistrovany' +reg_msg: '&cZaregistruj sa príkazom "/register heslo zopakujHeslo"' +reg_only: '&fVstup iba pre registrovanych! Navstiv http://example.com pre registráciu' +reg_voluntarily: '&fZaregistruj sa pomocou príkazu "/register heslo zopakujHeslo"' +reload: '&fKonfigurácia a databáza bola obnovená' +same_nick: '&fHrác s tymto nickom uz hrá!' +# Slovak translate by Judzi # +timeout: '&fVyprsal cas na prihlásenie' +unknown_user: '&fHrac nie je v databázi' +unregistered: '&cUcet bol vymazany!' +unsafe_spawn: '&fTvoj pozícia bol nebezpecná, teleportujem hraca na spawn' +usage_captcha: '&cUsage: /captcha ' +usage_changepassword: '&fPríkaz: /changepassword stareHeslo noveHeslo' usage_email_add: '&fUsage: /email add ' usage_email_change: '&fUsage: /email change ' usage_email_recovery: '&fUsage: /email recovery ' -new_email_invalid: '[AuthMe] New email invalid!' -old_email_invalid: '[AuthMe] Old email invalid!' -email_invalid: '[AuthMe] Invalid Email' -email_added: '[AuthMe] Email Added !' -email_confirm: '[AuthMe] Confirm your Email !' -email_changed: '[AuthMe] Email Change !' -email_send: '[AuthMe] Recovery Email Send !' -country_banned: 'Your country is banned from this server' -antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' -antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' +usage_log: '&cPríkaz: /login heslo' +usage_reg: '&cPríkaz: /register heslo zopakujHeslo' +usage_unreg: '&cPríkaz: /unregister heslo' +user_regged: '&cZadané meno je uz zaregistrované' +user_unknown: '&cZadané meno nie je zaregistrované!' +valid_captcha: '&cYour captcha is valid !' +valid_session: '&cZapamätané prihlásenie' +vb_nonActiv: '&fUcet nie je aktivny. Prezri si svoj e-mail!' +wrong_captcha: '&cWrong Captcha, please use : /captcha THE_CAPTCHA' +wrong_pwd: '&cZadal si zlé heslo' +# www.judzi.eu | judzi@cs-gaming.eu # diff --git a/src/main/resources/messages/messages_tr.yml b/src/main/resources/messages/messages_tr.yml index 7f0003962..5b2201077 100644 --- a/src/main/resources/messages/messages_tr.yml +++ b/src/main/resources/messages/messages_tr.yml @@ -1,58 +1,58 @@ -unknown_user: '&fKullanici veritabanina ekli degil' -unsafe_spawn: '&fDogdugunuz konum guvenli degildi, lobiye isinlaniyorsunuz...' -not_logged_in: '&cGiris Yapmadin!' -reg_voluntarily: '&fKullanici adinla kayit olabilirsin! Komut: "/register sifren sifrentekrar"' -usage_log: '&cKullanimi: /login sifren' -wrong_pwd: '&cYanlis sifre' -unregistered: '&cSunucudan kaydiniz basariyla silindi!' -reg_disabled: '&cKayit deaktif' -valid_session: '&cOturum Acma' -login: '&cBasarili giris!' -vb_nonActiv: '&fHesabin aktiflestirilmedi! Emailini kontrol et' -user_regged: '&cKullanici zaten oyunda' -usage_reg: '&cKullanimi: /register sifre sifretekrar' -max_reg: '&fMaximim kayit limitini astin!' -no_perm: '&cYetkin yok' +add_email: '&cLutfen emailini ekle : /email add ' +antibot_auto_disabled: '[AuthMe] AntiBotMode %m dakika sonra otomatik olarak isgal yuzundan devredisi birakildi' +antibot_auto_enabled: '[AuthMe] AntiBotMode otomatik olarak etkinlestirildi!' +country_banned: 'Ulken bu serverdan banlandi !' +email_added: '[AuthMe] Eposta Eklendi !' +email_changed: '[AuthMe] Eposta Degistirildi !' +email_confirm: '[AuthMe] Epostani Dogrula !' +email_exists: '[AuthMe] An email already exists on your account. You can change it using the command below' +email_invalid: '[AuthMe] Gecersiz Eposta' +email_send: '[AuthMe] Kurtarma postasi gonderildi !' error: '&fBir hata olustu; Lutfen adminle iletisime gec' +invalid_session: '&fOturum veritabanlari uyusmuyor lutfen sonunu bekleyin' +kick_forvip: '&cSenin yerine bir VIP kullanıcı girdi!' +kick_fullserver: '&cServer suanda dolu gozukuyor, Uzgunum!' +logged_in: '&cZaten Giris Yapilmis!' +login: '&cBasarili giris!' login_msg: '&cGiris Yapin : "/login sifre"' -reg_msg: '&cLutfen kaydolmak icin : "/register sifre sifretekrar"' -reg_email_msg: '&cLutfen Kaydolmak icin : "/register "' -usage_unreg: '&cKullanimi: /unregister sifren' -pwd_changed: '&cSifreniz degisti!' -user_unknown: '&cBu kullaniciyla kaydolunmamis!' +logout: '&cBasarili cikis' +max_reg: '&fMaximim kayit limitini astin!' +name_len: '&cKullanici adin cok kisa ya da cok uzun' +new_email_invalid: '[AuthMe] Yeni eposta gecersiz!' +no_perm: '&cYetkin yok' +not_logged_in: '&cGiris Yapmadin!' +old_email_invalid: '[AuthMe] Eski eposta gecersiz!' +pass_len: '&fSifren cok uzun ya da kisa olmamali ' password_error: '&fSifren eslesmiyor' password_error_nick: '&fYou can''t use your name as password, please choose another one' password_error_unsafe: '&fThe chosen password is not safe, please choose another one' -invalid_session: '&fOturum veritabanlari uyusmuyor lutfen sonunu bekleyin' -reg_only: '&fSadece kayitli uyeler girebilir ! Kayit olmak icin www.orneksite.com adresini ziyaret ediniz !' -logged_in: '&cZaten Giris Yapilmis!' -logout: '&cBasarili cikis' -same_nick: '&fAyni kullanici oyunda' -registered: '&cBasarili kayit!' -pass_len: '&fSifren cok uzun ya da kisa olmamali ' -reload: '&fKonfigurasyon dosyasi ve veritabani yüklendi' -timeout: '&fZaman Asimi' -usage_changepassword: '&fkullanimi: /changepassword eskisifre yenisifre' -name_len: '&cKullanici adin cok kisa ya da cok uzun' -regex: '&cKullanici adin ozel karakterler iceriyor. Uygun karakterler: REG_EX' -add_email: '&cLutfen emailini ekle : /email add ' +pwd_changed: '&cSifreniz degisti!' recovery_email: '&cSifreni mi unuttun? Degistirmek icin : /email recovery ' +reg_disabled: '&cKayit deaktif' +reg_email_msg: '&cLutfen Kaydolmak icin : "/register "' +regex: '&cKullanici adin ozel karakterler iceriyor. Uygun karakterler: REG_EX' +registered: '&cBasarili kayit!' +reg_msg: '&cLutfen kaydolmak icin : "/register sifre sifretekrar"' +reg_only: '&fSadece kayitli uyeler girebilir ! Kayit olmak icin www.orneksite.com adresini ziyaret ediniz !' +reg_voluntarily: '&fKullanici adinla kayit olabilirsin! Komut: "/register sifren sifrentekrar"' +reload: '&fKonfigurasyon dosyasi ve veritabani yüklendi' +same_nick: '&fAyni kullanici oyunda' +timeout: '&fZaman Asimi' +unknown_user: '&fKullanici veritabanina ekli degil' +unregistered: '&cSunucudan kaydiniz basariyla silindi!' +unsafe_spawn: '&fDogdugunuz konum guvenli degildi, lobiye isinlaniyorsunuz...' usage_captcha: '&cBir captcha yazman lazim , yazmak icin: /captcha ' -wrong_captcha: '&cYanlis Captcha, kullanmak icin : /captcha THE_CAPTCHA' -valid_captcha: '&cCaptcha gecerli !' -kick_forvip: '&cSenin yerine bir VIP kullanıcı girdi!' -kick_fullserver: '&cServer suanda dolu gozukuyor, Uzgunum!' +usage_changepassword: '&fkullanimi: /changepassword eskisifre yenisifre' usage_email_add: '&fKullanimi: /email add ' usage_email_change: '&fKullanimi: /email change ' usage_email_recovery: '&fKullanimi: /email recovery ' -new_email_invalid: '[AuthMe] Yeni eposta gecersiz!' -old_email_invalid: '[AuthMe] Eski eposta gecersiz!' -email_invalid: '[AuthMe] Gecersiz Eposta' -email_added: '[AuthMe] Eposta Eklendi !' -email_confirm: '[AuthMe] Epostani Dogrula !' -email_changed: '[AuthMe] Eposta Degistirildi !' -email_send: '[AuthMe] Kurtarma postasi gonderildi !' -email_exists: '[AuthMe] An email already exists on your account. You can change it using the command below' -country_banned: 'Ulken bu serverdan banlandi !' -antibot_auto_enabled: '[AuthMe] AntiBotMode otomatik olarak etkinlestirildi!' -antibot_auto_disabled: '[AuthMe] AntiBotMode %m dakika sonra otomatik olarak isgal yuzundan devredisi birakildi' +usage_log: '&cKullanimi: /login sifren' +usage_reg: '&cKullanimi: /register sifre sifretekrar' +usage_unreg: '&cKullanimi: /unregister sifren' +user_regged: '&cKullanici zaten oyunda' +user_unknown: '&cBu kullaniciyla kaydolunmamis!' +valid_captcha: '&cCaptcha gecerli !' +valid_session: '&cOturum Acma' +vb_nonActiv: '&fHesabin aktiflestirilmedi! Emailini kontrol et' +wrong_captcha: '&cYanlis Captcha, kullanmak icin : /captcha THE_CAPTCHA' +wrong_pwd: '&cYanlis sifre' diff --git a/src/main/resources/messages/messages_uk.yml b/src/main/resources/messages/messages_uk.yml index 6b132d8da..f60315e09 100644 --- a/src/main/resources/messages/messages_uk.yml +++ b/src/main/resources/messages/messages_uk.yml @@ -1,57 +1,57 @@ -unknown_user: '&fКористувача немає в базі даних' -unsafe_spawn: '&fМісце вашого виходу було небезпечне тому ми телепортували вас на спавн' -not_logged_in: '&cВи ще не ввійшли!' -reg_voluntarily: '&eЩоб зарєєструватися введіть команду &d"/reg Пароль Повтор_Пароля"' -usage_log: '&cВикористовуйте: &a/login Пароль &cабо &a/l Пароль' -wrong_pwd: '&cНевірний пароль' -unregistered: '&cВи успішно видалили свій акаунт!' -reg_disabled: '&cРеєстрація виключена' -valid_session: '&cСесія відкрита' -login: '&2Успішна авторизація!' -vb_nonActiv: '&fВаш акаунт не активований. Перевірте свою електронну адресу!' -user_regged: '&cТакий користувач вже зареєстрований' -usage_reg: '&cВикористовуйте: /reg Пароль Повтор_Пароля' -max_reg: '&fВи перевищили максимальне число реєстрацій на ваш IP' -no_perm: '&cУ Вас недостатньо прав' -error: '&fЩось пішло не так; Будь ласка зв`яжіться з адміністратором' -login_msg: '&cДля авторизації введіть "/login Пароль"' -reg_msg: '&cДля реєстрації введіть "/reg Пароль Повтор_Пароля"' -password_error_nick: '&fВи не можете використати ваш Нікнейм у якості паролю' -password_error_unsafe: '&fВи не можете використувати ненадійний пароль' -reg_email_msg: '&cДля реєстрації введіть "/reg Email Email"' -usage_unreg: '&cВикористовуйте: /unregister Пароль' -pwd_changed: '&cПароль змінено!' -user_unknown: '&cТакий користувач не зарєєстрований' -password_error: '&fПаролі не співпадають' -invalid_session: '&fСесія некоректна. Будь ласка зачекайте коли вона закінчиться' -reg_only: '&Вхід доступний лише зареєстрованим користувачам. Зареєструватися можна за адресою &9&nhttp://сайт_серверу.com&r' -logged_in: '&2Ви уже ввійшли!' -logout: '&cВи успішно вийшли' -same_nick: '&fГравець з вашим нікнеймом вже грає на сервері' -registered: '&cВи успішно зареєстровані!' -pass_len: '&fВаш пароль занадто довгий, або занадто короткий' -reload: '&fКонфiгурацiя i база даних успiшно перезавнтажені.' -timeout: '&fЧас для входу вийшов' -usage_changepassword: '&fВикористовуйте: /changepassword СтарийПароль НовийПароль' -name_len: '&cВаш нікнейм занадто довгий, або занадто короткий' -regex: '&cВаш нікнейм містить заборонені символи. Доступні символи: REG_EX' add_email: '&cБудь ласка додайте свою електронну скриньку: /email add ВашEmail ВашEmail' -recovery_email: '&cЗабули пароль? Введіть /email recovery ВашПароль' -usage_captcha: '&cБудь ласка введіть капчу: /captcha ' -wrong_captcha: '&cНевірне значення капчи: /captcha THE_CAPTCHA' -valid_captcha: '&cКапча введена вірно!' +antibot_auto_disabled: '[AuthMe] AntiBotMod автоматично вимкнувся, сподіваємось атака зупинена' +antibot_auto_enabled: '[AuthMe] AntiBotMod автоматично увімкнений (забагато одначасних з`єднань)!' +country_banned: 'Сервер не доступний для вашої країни | Your country is banned from this server' +email_added: '[AuthMe] &2Email додано!' +email_changed: '[AuthMe] &2Email змінено!' +email_confirm: '[AuthMe] Підтвердіть ваш Email!' +email_invalid: '[AuthMe] Невірний Email' +email_send: '[AuthMe] Лист для відновлення надіслано на ваш Email!' +error: '&fЩось пішло не так; Будь ласка зв`яжіться з адміністратором' +invalid_session: '&fСесія некоректна. Будь ласка зачекайте коли вона закінчиться' kick_forvip: '&cVIP зайшов на переповнений сервер!' kick_fullserver: '&cНажаль, сервер переповнений!' +logged_in: '&2Ви уже ввійшли!' +login: '&2Успішна авторизація!' +login_msg: '&cДля авторизації введіть "/login Пароль"' +logout: '&cВи успішно вийшли' +max_reg: '&fВи перевищили максимальне число реєстрацій на ваш IP' +name_len: '&cВаш нікнейм занадто довгий, або занадто короткий' +new_email_invalid: '[AuthMe] Новий Email недійсний!' +no_perm: '&cУ Вас недостатньо прав' +not_logged_in: '&cВи ще не ввійшли!' +old_email_invalid: '[AuthMe] Старий Email недійсний!' +pass_len: '&fВаш пароль занадто довгий, або занадто короткий' +password_error: '&fПаролі не співпадають' +password_error_nick: '&fВи не можете використати ваш Нікнейм у якості паролю' +password_error_unsafe: '&fВи не можете використувати ненадійний пароль' +pwd_changed: '&cПароль змінено!' +recovery_email: '&cЗабули пароль? Введіть /email recovery ВашПароль' +reg_disabled: '&cРеєстрація виключена' +reg_email_msg: '&cДля реєстрації введіть "/reg Email Email"' +regex: '&cВаш нікнейм містить заборонені символи. Доступні символи: REG_EX' +registered: '&cВи успішно зареєстровані!' +reg_msg: '&cДля реєстрації введіть "/reg Пароль Повтор_Пароля"' +reg_only: '&Вхід доступний лише зареєстрованим користувачам. Зареєструватися можна за адресою &9&nhttp://сайт_серверу.com&r' +reg_voluntarily: '&eЩоб зарєєструватися введіть команду &d"/reg Пароль Повтор_Пароля"' +reload: '&fКонфiгурацiя i база даних успiшно перезавнтажені.' +same_nick: '&fГравець з вашим нікнеймом вже грає на сервері' +timeout: '&fЧас для входу вийшов' +unknown_user: '&fКористувача немає в базі даних' +unregistered: '&cВи успішно видалили свій акаунт!' +unsafe_spawn: '&fМісце вашого виходу було небезпечне тому ми телепортували вас на спавн' +usage_captcha: '&cБудь ласка введіть капчу: /captcha ' +usage_changepassword: '&fВикористовуйте: /changepassword СтарийПароль НовийПароль' usage_email_add: '&fВикористовуйте: /email add ВашEmail ВашEmail' usage_email_change: '&fВикористовуйте: /email change СтарийEmail НовийEmail' usage_email_recovery: '&fВикористовуйте: /email recovery Email' -new_email_invalid: '[AuthMe] Новий Email недійсний!' -old_email_invalid: '[AuthMe] Старий Email недійсний!' -email_invalid: '[AuthMe] Невірний Email' -email_added: '[AuthMe] &2Email додано!' -email_confirm: '[AuthMe] Підтвердіть ваш Email!' -email_changed: '[AuthMe] &2Email змінено!' -email_send: '[AuthMe] Лист для відновлення надіслано на ваш Email!' -country_banned: 'Сервер не доступний для вашої країни | Your country is banned from this server' -antibot_auto_enabled: '[AuthMe] AntiBotMod автоматично увімкнений (забагато одначасних з`єднань)!' -antibot_auto_disabled: '[AuthMe] AntiBotMod автоматично вимкнувся, сподіваємось атака зупинена' +usage_log: '&cВикористовуйте: &a/login Пароль &cабо &a/l Пароль' +usage_reg: '&cВикористовуйте: /reg Пароль Повтор_Пароля' +usage_unreg: '&cВикористовуйте: /unregister Пароль' +user_regged: '&cТакий користувач вже зареєстрований' +user_unknown: '&cТакий користувач не зарєєстрований' +valid_captcha: '&cКапча введена вірно!' +valid_session: '&cСесія відкрита' +vb_nonActiv: '&fВаш акаунт не активований. Перевірте свою електронну адресу!' +wrong_captcha: '&cНевірне значення капчи: /captcha THE_CAPTCHA' +wrong_pwd: '&cНевірний пароль' diff --git a/src/main/resources/messages/messages_vn.yml b/src/main/resources/messages/messages_vn.yml index 7acb49885..0993f872a 100644 --- a/src/main/resources/messages/messages_vn.yml +++ b/src/main/resources/messages/messages_vn.yml @@ -1,55 +1,55 @@ -unknown_user: '&fNgười chơi không tồn tại trong cơ sở dữ liệu' -unsafe_spawn: '&fNơi thoát server của bạn không an toàn, đang dịch chuyển bạn tới điểm spawn của server' -not_logged_in: '&cChưa đăng nhập!' -reg_voluntarily: '&fBạn có thể đăng kí tài khoản với lệnh "/register mật-khẩu nhập-lại-mật-khẩu"' -usage_log: '&eSử dụng: /login password' -wrong_pwd: '&cSai mật khẩu' -unregistered: '&cHuỷ đăng kí thành công!' -reg_disabled: '&cHệ thống đăng kí đã bị vô hiệu' -valid_session: '&cPhiên đăng nhập còn tồn tại, bạn không cần nhập mật khẩu' -login: '&cĐăng nhập thành công!' -vb_nonActiv: '&fTài khoản của bạn chưa được kích hoạt, kiểm tra email!' -user_regged: '&cTên đăng nhập này đã được đăng kí' -usage_reg: '&eSử dụng: /register mật-khẩu nhập-lại-mật-khẩu' -max_reg: '&fSố lượng tài khoản ở IP của bạn trong server này đã quá giới hạn cho phép' -no_perm: '&cKhông có quyền' -error: '&fCó lỗi xảy ra; Báo lại cho người điều hành server' -login_msg: '&cĐăng nhập với lệnh "/login mật-khẩu"' -reg_msg: '&cĐăng kí tài khoản với lệnh "/register mật-khẩu nhập-lại-mật-khẩu"' -reg_email_msg: '&cĐăng kí email cho tài khoản với lệnh "/register "' -usage_unreg: '&eSử dụng: /unregister mật-khẩu' -pwd_changed: '&cĐã đổi mật khẩu!' -user_unknown: '&cTài khoản này chưa được đăng kí' -password_error: '&fMật khẩu không khớp' -unvalid_session: '&fPhiên đăng nhập không hồi đáp, vui lòng chờ phiên đăng nhập kết thúc' -reg_only: '&fChỉ cho phép người đã đăng kí! Hãy vào trang http://web-của.bạn/ để đăng kí' -logged_in: '&cĐã đăng nhập!' -logout: '&cThoát đăng nhập thành công' -same_nick: '&fTài khoản đang được người khác sử dụng trong server' -registered: '&cĐăng kí thành công!' -pass_len: '&fMật khẩu của bạn quá ngắn hoặc quá dài' -reload: '&fThiết lập và dữ liệu đã được nạp lại' -timeout: '&fQuá thời gian đăng nhập' -usage_changepassword: '&eSử dụng: /changepassword mật-khẩu-cũ mật-khẩu-mới' -name_len: '&cTên đăng nhập của bạn quá ngắn hoặc quá dài' -regex: '&cTên đăng nhập của bạn có chứa kí tự đặc biệt không được cho phép. Các kí tự hợp lệ: REG_EX' add_email: '&cVui lòng thêm địa chỉ email cho tài khoản với lệnh: /email add email-của-bạn nhập-lại-email-của-bạn' -recovery_email: '&cQuên mật khẩu? Hãy dùng lệnh /email recovery ' -usage_captcha: '&cBạn cần nhập mã xác nhận: /captcha ' -wrong_captcha: '&cSai mã xác nhận, nhập lại: /captcha ' -valid_captcha: '&aMã xác nhận hợp lệ!' +antibot_auto_disabled: '[AuthMe] AntiBot tự huỷ kích hoạt sau %m phút, hi vọng lượng kết nối sẽ giảm bớt' +antibot_auto_enabled: '[AuthMe] AntiBot đã được kích hoạt vì lượng người chơi kết nối vượt quá giới hạn!' +country_banned: 'Rất tiếc, quốc gia của bạn không được phép gia nhập server' +email_added: '[AuthMe] Đã thêm địa chỉ email !' +email_changed: '[AuthMe] Đã thay đổi email !' +email_confirm: '[AuthMe] Xác nhận email !' +email_invalid: '[AuthMe] Sai địa chỉ email' +email_send: '[AuthMe] Đã gửi email khôi phục mật khẩu tới bạn !' +error: '&fCó lỗi xảy ra; Báo lại cho người điều hành server' kick_forvip: '&cNgười chơi VIP đã vào server hiện đang full!' kick_fullserver: '&cXin lỗi, hiện tại server không còn trống slot để bạn có thể vào!' +logged_in: '&cĐã đăng nhập!' +login: '&cĐăng nhập thành công!' +login_msg: '&cĐăng nhập với lệnh "/login mật-khẩu"' +logout: '&cThoát đăng nhập thành công' +max_reg: '&fSố lượng tài khoản ở IP của bạn trong server này đã quá giới hạn cho phép' +name_len: '&cTên đăng nhập của bạn quá ngắn hoặc quá dài' +new_email_invalid: '[AuthMe] Địa chỉ email mới không hợp lệ!' +no_perm: '&cKhông có quyền' +not_logged_in: '&cChưa đăng nhập!' +old_email_invalid: '[AuthMe] Địa chỉ email cũ không hợp lệ!' +pass_len: '&fMật khẩu của bạn quá ngắn hoặc quá dài' +password_error: '&fMật khẩu không khớp' +pwd_changed: '&cĐã đổi mật khẩu!' +recovery_email: '&cQuên mật khẩu? Hãy dùng lệnh /email recovery ' +reg_disabled: '&cHệ thống đăng kí đã bị vô hiệu' +reg_email_msg: '&cĐăng kí email cho tài khoản với lệnh "/register "' +regex: '&cTên đăng nhập của bạn có chứa kí tự đặc biệt không được cho phép. Các kí tự hợp lệ: REG_EX' +registered: '&cĐăng kí thành công!' +reg_msg: '&cĐăng kí tài khoản với lệnh "/register mật-khẩu nhập-lại-mật-khẩu"' +reg_only: '&fChỉ cho phép người đã đăng kí! Hãy vào trang http://web-của.bạn/ để đăng kí' +reg_voluntarily: '&fBạn có thể đăng kí tài khoản với lệnh "/register mật-khẩu nhập-lại-mật-khẩu"' +reload: '&fThiết lập và dữ liệu đã được nạp lại' +same_nick: '&fTài khoản đang được người khác sử dụng trong server' +timeout: '&fQuá thời gian đăng nhập' +unknown_user: '&fNgười chơi không tồn tại trong cơ sở dữ liệu' +unregistered: '&cHuỷ đăng kí thành công!' +unsafe_spawn: '&fNơi thoát server của bạn không an toàn, đang dịch chuyển bạn tới điểm spawn của server' +unvalid_session: '&fPhiên đăng nhập không hồi đáp, vui lòng chờ phiên đăng nhập kết thúc' +usage_captcha: '&cBạn cần nhập mã xác nhận: /captcha ' +usage_changepassword: '&eSử dụng: /changepassword mật-khẩu-cũ mật-khẩu-mới' usage_email_add: '&eSử dụng: /email add ' usage_email_change: '&eSử dụng: /email change ' usage_email_recovery: '&eSử dụng: /email recovery ' -new_email_invalid: '[AuthMe] Địa chỉ email mới không hợp lệ!' -old_email_invalid: '[AuthMe] Địa chỉ email cũ không hợp lệ!' -email_invalid: '[AuthMe] Sai địa chỉ email' -email_added: '[AuthMe] Đã thêm địa chỉ email !' -email_confirm: '[AuthMe] Xác nhận email !' -email_changed: '[AuthMe] Đã thay đổi email !' -email_send: '[AuthMe] Đã gửi email khôi phục mật khẩu tới bạn !' -country_banned: 'Rất tiếc, quốc gia của bạn không được phép gia nhập server' -antibot_auto_enabled: '[AuthMe] AntiBot đã được kích hoạt vì lượng người chơi kết nối vượt quá giới hạn!' -antibot_auto_disabled: '[AuthMe] AntiBot tự huỷ kích hoạt sau %m phút, hi vọng lượng kết nối sẽ giảm bớt' \ No newline at end of file +usage_log: '&eSử dụng: /login password' +usage_reg: '&eSử dụng: /register mật-khẩu nhập-lại-mật-khẩu' +usage_unreg: '&eSử dụng: /unregister mật-khẩu' +user_regged: '&cTên đăng nhập này đã được đăng kí' +user_unknown: '&cTài khoản này chưa được đăng kí' +valid_captcha: '&aMã xác nhận hợp lệ!' +valid_session: '&cPhiên đăng nhập còn tồn tại, bạn không cần nhập mật khẩu' +vb_nonActiv: '&fTài khoản của bạn chưa được kích hoạt, kiểm tra email!' +wrong_captcha: '&cSai mã xác nhận, nhập lại: /captcha ' +wrong_pwd: '&cSai mật khẩu' diff --git a/src/main/resources/messages/messages_zhcn.yml b/src/main/resources/messages/messages_zhcn.yml index 2d28081eb221a0d9712b8104796f2297aacc7690..30e57c028244b07bf7e88aa920a7e17c8c89fa59 100644 GIT binary patch delta 232 zcmdm{v|VX(Jy-qY5CN&l*8~!PbjD;60f)(-c!VYk@!L(F!S6EJkKbeRDL$vkcla$P zJFtsPUc@RhIfdP8avV>`WDyRF$wye7CU0O;o9xD+G5H9y*W_=U7L(QZd?shGs!g0@ zHn|AMe8gcgnUCe$WIcAX$@|#MCja9qn#{ozGns`oWilIE%H(zIX%jE?OxEKHnY@X^ zV6qs{ggg$Q&75YFFEN@;w2PZuz#TBTiL+$$Gad)V$#INsK+H2ai#ZBRm$7+FmSc9A e`~zsT0*~F~6egd^*O)veAK*@yyo6DEf-L~qrcgux delta 242 zcmWNLF-yZx00zlR(zJOYi8=^HIz(uZ3_3_!3u@6&N-0it6SP(Y2a&d$C>`6OBH;!H z5r2V`sFSFZI7nu7baZeOTr|T6cW}dZ=iPezx{Ex@O>Xpnm&}ORwwSfc#IDa!F0h>5 z;KOOq)AAJD8q-e5zP-(pR;Oi5F-X00p5Eb9&+{YZ@ULT@o&1R$?@oIG0OK$mA$bq}Xg|kFQ q9bSK06@^v3!B?^wVR0;0xKcujqRO{Y # -# Last modif: 1443428389 UTC # # -------------------------------------------- # -unknown_user: '&8[&6用戶系統&8] &f用戶資料並不存在。' -unsafe_spawn: '&8[&6用戶系統&8] &f你的登出位置不安全，現在將傳送你到重生點。' -not_logged_in: '&8[&6用戶系統&8] &c你還沒有登入 ！' -reg_voluntarily: '&8[&6用戶系統&8] &f你可以使用這個指令來註冊： 《 /register <密碼> <重覆密碼> 》' -usage_log: '&8[&6用戶系統&8] &f用法： 《 /login <密碼> 》' -wrong_pwd: '&8[&6用戶系統&8] &c你輸入了錯誤的密碼。' -unregistered: '&8[&6用戶系統&8] &c你已成功刪除會員註冊記錄。' -reg_disabled: '&8[&6用戶系統&8] &c本伺服器已停止新玩家註冊。' -valid_session: '&8[&6用戶系統&8] &b嗨 ！ 歡迎回來喔～' -login: '&8[&6用戶系統&8] &c你成功登入了。' -password_error_nick: '&8[&6用戶系統&8] &c這個密碼太不安全了！' -password_error_unsafe: '&8[&6用戶系統&8] &c這個密碼太不安全了！' -vb_nonActiv: '&8[&6用戶系統&8] &f你的帳戶還沒有經過電郵驗證 ！' -user_regged: '&8[&6用戶系統&8] &c此用戶名已經註冊過了。' -usage_reg: '&8[&6用戶系統&8] &f用法： 《 /register <密碼> <重覆密碼> 》' -max_reg: '&8[&6用戶系統&8] &f你的IP地址已達到註冊數上限。' -no_perm: '&8[&6用戶系統&8] &b你可以到 CraftingHK 玩家百科中查看說明文件。' -error: '&8[&6用戶系統&8] &f發生錯誤，請與管理員聯絡。' -login_msg: '&8[&6用戶系統&8] &c請使用這個指令來登入： 《 /login <密碼> 》' -reg_msg: '&8[&6用戶系統&8] &c請使用這個指令來註冊： 《 /register <密碼> <重覆密碼> 》' -reg_email_msg: '&8[&6用戶系統&8] &c請使用這個指令來註冊： 《 /register <電郵> <重覆電郵> 》' -usage_unreg: '&8[&6用戶系統&8] &f用法： 《 /unregister <密碼> 》' -pwd_changed: '&8[&6用戶系統&8] &c你成功更換了你的密碼 ！' -user_unknown: '&8[&6用戶系統&8] &c此用戶名沒有已登記資料。' -password_error: '&8[&6用戶系統&8] &f密碼不符合。' -invalid_session: '&8[&6用戶系統&8] &f登入階段資料已損壞，請等待登入階段結束。' -reg_only: '&8[&6用戶系統&8] &f限已註冊會員，請先到 https://crafting.hk/ 註冊。' -logged_in: '&8[&6用戶系統&8] &c你已經登入過了。' -logout: '&8[&6用戶系統&8] &b你成功登出了。' -same_nick: '&8[&6用戶系統&8] &f同名玩家已在遊玩。' -registered: '&8[&6用戶系統&8] &b你成功註冊了。' -pass_len: '&8[&6用戶系統&8] &f你的密碼並不符合規定長度。' -reload: '&8[&6用戶系統&8] &b登入系統設定及資料庫重新載入完畢。' -timeout: '&8[&6用戶系統&8] &f登入逾時。' -usage_changepassword: '&8[&6用戶系統&8] &f用法： 《 /changepassword <舊密碼> <新密碼> 》' -name_len: '&8[&6用戶系統&8] &c你的用戶名不符合規定長度。' -regex: '&8[&6用戶系統&8] &c用戶名稱錯誤！ 登入系統只接受以下字符： REG_EX' add_email: '&8[&6用戶系統&8] &b請為你的帳戶立即添加電郵地址： 《 /email add <電郵地址> <重覆電郵地址> 》' -recovery_email: '&8[&6用戶系統&8] &c忘記密碼 ？ 請使用這個指令來更新密碼： 《 /email recovery <電郵地址> 》' -usage_captcha: '&8[&6用戶系統&8] &f用法： 《 /captcha <驗證碼> 》' -wrong_captcha: '&8[&6用戶系統&8] &c你所輸入的驗證碼無效，請使用 《 /captcha <驗證碼> 》 再次輸入。' -valid_captcha: '&8[&6用戶系統&8] &c你所輸入的驗證碼無效 ！' +antibot_auto_disabled: '&8[&6用戶系統&8] 不正常連接數已減少，防止機械人程序將於 %m 分鐘後停止。' +antibot_auto_enabled: '&8[&6用戶系統&8] 防止機械人程序已因應現時大量不尋常連線而啟用。' +country_banned: '&8[&6用戶系統&8] 本伺服器已停止對你的國家提供遊戲服務。' +email_added: '&8[&6用戶系統&8] 已新增你的電郵地址。' +email_changed: '&8[&6用戶系統&8] 你的電郵地址已更改。' +email_confirm: '&8[&6用戶系統&8] 請重覆輸入你的電郵地址。' +email_invalid: '&8[&6用戶系統&8] 你所填寫的電郵地址並不正確。' +email_send: '&8[&6用戶系統&8] 忘記密碼信件已寄出，請查收。' +error: '&8[&6用戶系統&8] &f發生錯誤，請與管理員聯絡。' +invalid_session: '&8[&6用戶系統&8] &f登入階段資料已損壞，請等待登入階段結束。' kick_forvip: '&c因為有VIP玩家登入了伺服器。' kick_fullserver: '&c抱歉！ 因為伺服器滿人了，所以你目前未能登入伺服器。' +# Last modif: 1443428389 UTC # +logged_in: '&8[&6用戶系統&8] &c你已經登入過了。' +login: '&8[&6用戶系統&8] &c你成功登入了。' +login_msg: '&8[&6用戶系統&8] &c請使用這個指令來登入： 《 /login <密碼> 》' +logout: '&8[&6用戶系統&8] &b你成功登出了。' +max_reg: '&8[&6用戶系統&8] &f你的IP地址已達到註冊數上限。' +name_len: '&8[&6用戶系統&8] &c你的用戶名不符合規定長度。' +new_email_invalid: '&8[&6用戶系統&8] 你所填寫的新電郵地址並不正確。' +no_perm: '&8[&6用戶系統&8] &b你可以到 CraftingHK 玩家百科中查看說明文件。' +not_logged_in: '&8[&6用戶系統&8] &c你還沒有登入 ！' +old_email_invalid: '&8[&6用戶系統&8] 你所填寫的舊電郵地址並不正確。' +pass_len: '&8[&6用戶系統&8] &f你的密碼並不符合規定長度。' +password_error: '&8[&6用戶系統&8] &f密碼不符合。' +password_error_nick: '&8[&6用戶系統&8] &c這個密碼太不安全了！' +password_error_unsafe: '&8[&6用戶系統&8] &c這個密碼太不安全了！' +pwd_changed: '&8[&6用戶系統&8] &c你成功更換了你的密碼 ！' +recovery_email: '&8[&6用戶系統&8] &c忘記密碼 ？ 請使用這個指令來更新密碼： 《 /email recovery <電郵地址> 》' +reg_disabled: '&8[&6用戶系統&8] &c本伺服器已停止新玩家註冊。' +reg_email_msg: '&8[&6用戶系統&8] &c請使用這個指令來註冊： 《 /register <電郵> <重覆電郵> 》' +regex: '&8[&6用戶系統&8] &c用戶名稱錯誤！ 登入系統只接受以下字符： REG_EX' +registered: '&8[&6用戶系統&8] &b你成功註冊了。' +reg_msg: '&8[&6用戶系統&8] &c請使用這個指令來註冊： 《 /register <密碼> <重覆密碼> 》' +reg_only: '&8[&6用戶系統&8] &f限已註冊會員，請先到 https://crafting.hk/ 註冊。' +reg_voluntarily: '&8[&6用戶系統&8] &f你可以使用這個指令來註冊： 《 /register <密碼> <重覆密碼> 》' +reload: '&8[&6用戶系統&8] &b登入系統設定及資料庫重新載入完畢。' +same_nick: '&8[&6用戶系統&8] &f同名玩家已在遊玩。' +timeout: '&8[&6用戶系統&8] &f登入逾時。' +# Translator: lifehome # +unknown_user: '&8[&6用戶系統&8] &f用戶資料並不存在。' +unregistered: '&8[&6用戶系統&8] &c你已成功刪除會員註冊記錄。' +unsafe_spawn: '&8[&6用戶系統&8] &f你的登出位置不安全，現在將傳送你到重生點。' +usage_captcha: '&8[&6用戶系統&8] &f用法： 《 /captcha <驗證碼> 》' +usage_changepassword: '&8[&6用戶系統&8] &f用法： 《 /changepassword <舊密碼> <新密碼> 》' usage_email_add: '&8[&6用戶系統&8] &f用法： 《 /email add <電郵> <重覆電郵> 》' usage_email_change: '&8[&6用戶系統&8] &f用法： 《 /email change <舊電郵> <新電郵> 》' usage_email_recovery: '&8[&6用戶系統&8] &f用法： 《 /email recovery <電郵> 》' -new_email_invalid: '&8[&6用戶系統&8] 你所填寫的新電郵地址並不正確。' -old_email_invalid: '&8[&6用戶系統&8] 你所填寫的舊電郵地址並不正確。' -email_invalid: '&8[&6用戶系統&8] 你所填寫的電郵地址並不正確。' -email_added: '&8[&6用戶系統&8] 已新增你的電郵地址。' -email_confirm: '&8[&6用戶系統&8] 請重覆輸入你的電郵地址。' -email_changed: '&8[&6用戶系統&8] 你的電郵地址已更改。' -email_send: '&8[&6用戶系統&8] 忘記密碼信件已寄出，請查收。' -country_banned: '&8[&6用戶系統&8] 本伺服器已停止對你的國家提供遊戲服務。' -antibot_auto_enabled: '&8[&6用戶系統&8] 防止機械人程序已因應現時大量不尋常連線而啟用。' -antibot_auto_disabled: '&8[&6用戶系統&8] 不正常連接數已減少，防止機械人程序將於 %m 分鐘後停止。' +usage_log: '&8[&6用戶系統&8] &f用法： 《 /login <密碼> 》' +usage_reg: '&8[&6用戶系統&8] &f用法： 《 /register <密碼> <重覆密碼> 》' +usage_unreg: '&8[&6用戶系統&8] &f用法： 《 /unregister <密碼> 》' +user_regged: '&8[&6用戶系統&8] &c此用戶名已經註冊過了。' +user_unknown: '&8[&6用戶系統&8] &c此用戶名沒有已登記資料。' +valid_captcha: '&8[&6用戶系統&8] &c你所輸入的驗證碼無效 ！' +valid_session: '&8[&6用戶系統&8] &b嗨 ！ 歡迎回來喔～' +vb_nonActiv: '&8[&6用戶系統&8] &f你的帳戶還沒有經過電郵驗證 ！' +wrong_captcha: '&8[&6用戶系統&8] &c你所輸入的驗證碼無效，請使用 《 /captcha <驗證碼> 》 再次輸入。' +wrong_pwd: '&8[&6用戶系統&8] &c你輸入了錯誤的密碼。' diff --git a/src/main/resources/messages/messages_zhtw.yml b/src/main/resources/messages/messages_zhtw.yml index 34c213119..9bd72d811 100644 --- a/src/main/resources/messages/messages_zhtw.yml +++ b/src/main/resources/messages/messages_zhtw.yml @@ -1,61 +1,61 @@ -# Translator: MineWolf50 -# Last Time Edit : 2015 / 7 / 14 , A.M.10:14 # = = = = = = = = = = = = = = = = = = = = = = = # -unknown_user: "&b【AuthMe】&6沒有在資料庫內找到該玩家。" -unsafe_spawn: '&b【AuthMe】&6你登出的地點不安全，已傳送你到安全的地點。' -not_logged_in: '&b【AuthMe】&6你還沒有登入!' -reg_voluntarily: '&b【AuthMe】&6使用 &c"/register <密碼> <確認密碼>" &6來註冊你的暱稱' -usage_log: '&b【AuthMe】&6用法: &c"/login <密碼>"' -wrong_pwd: '&b【AuthMe】&6密碼錯誤!' -unregistered: '&b【AuthMe】&6你已經成功取消註冊。' -reg_disabled: '&b【AuthMe】&6已關閉註冊功能' -password_error_nick: '&b【AuthMe】&6你不可以用你的 ID ( 名稱 ) 來當作密碼 !' -password_error_unsafe: '&b【AuthMe】&6你不可以使用這個不安全的密碼' -valid_session: '&b【AuthMe】&6你已經成功登入!' -login: '&b【AuthMe】&6密碼正確，你已成功登入!' -vb_nonActiv: '&b【AuthMe】&6你的帳號還沒有經過驗證! 檢查看看你的電子信箱 (Email) 吧!' -user_regged: '&b【AuthMe】&6這個帳號已經被註冊過了!' -usage_reg: '&b【AuthMe】&6用法: &c"/register <密碼> <確認密碼>"' -max_reg: '&b【AuthMe】&6你的 IP 位置所註冊的帳號數量已經達到最大。' -no_perm: '&b【AuthMe】&6你沒有使用該指令的權限。' -error: '&b【AuthMe】&6發生錯誤，請聯繫管理員' -login_msg: '&b【AuthMe】&6請使用 &c"/login <密碼>" &6來登入。' -reg_msg: '&b【AuthMe】&6請使用 "&c/register <密碼> <確認密碼>" 來註冊。' -reg_email_msg: '&b【AuthMe】&6請使用 &c"/register <重複Email>" 來註冊' -usage_unreg: '&b【AuthMe】&6用法: &c"/unregister <密碼>"' -pwd_changed: '&b【AuthMe】&6密碼變更成功!' -user_unknown: '&b【AuthMe】&6這個帳號還沒有註冊過' -password_error: '&b【AuthMe】&6兩次輸入的密碼不一致!' -invalid_session: '&b【AuthMe】&6憑證日期不相符!' -reg_only: '&b【AuthMe】&6請到下列網站 :「 http://example.com 」 進行註冊' -logged_in: '&b【AuthMe】&6你已經登入了!' -logout: '&b【AuthMe】&6你已成功登出' -same_nick: '&b【AuthMe】&6有同樣帳號的玩家在線上!' -registered: '&b【AuthMe】&6你已成功註冊' -pass_len: '&b【AuthMe】&6你的密碼 超過最大字數 / 小於最小字數' -reload: '&b【AuthMe】&6已重新讀取設定檔及資料庫' -timeout: '&b【AuthMe】&6超過登入時間，請稍後再試一次' -usage_changepassword: '&b【AuthMe】&6用法: &c"/changepassword <舊密碼> <新密碼>"' -name_len: '&b【AuthMe】&6你的暱稱 太長 / 太短 了!' -regex: '&b【AuthMe】&6暱稱裡包含不能使用的字符' add_email: '&b【AuthMe】&6請使用 &c"/email add <你的Email> <再次輸入你的Email>" &6來添加 Email' -recovery_email: '&b【AuthMe】&6忘記密碼了嗎? 使用 &c"/email recovery <你的Email>"' -usage_captcha: '&b【AuthMe】&6請用 &c"/captcha " &6來輸入你的驗證碼' -wrong_captcha: '&b【AuthMe】&6錯誤的驗證碼' -valid_captcha: '&b【AuthMe】&6驗證碼無效!' +antibot_auto_disabled: '&b【AuthMe】&6AntiBotMod將會於 &c%m &6分鐘後自動關閉' +antibot_auto_enabled: '&b【AuthMe】&6AntiBotMod已自動啟用!' +country_banned: '&b【AuthMe】&6你所在的地區無法進入此伺服器' +email_added: '&b【AuthMe】&6已添加Email!' +email_changed: '&b【AuthMe】&6Email已變更!' +email_confirm: '&b【AuthMe】&6請驗證你的Email!' +email_exists: '&b【AuthMe】&6這個帳戶已經有設定電子郵件了' +email_invalid: '&b【AuthMe】&6無效的Email!' +email_send: '&b【AuthMe】&6已經送出重設密碼要求至你的Email , 請查收。' +error: '&b【AuthMe】&6發生錯誤，請聯繫管理員' +invalid_session: '&b【AuthMe】&6憑證日期不相符!' kick_forvip: '&b【AuthMe】&6你已經被請出。&c原因 : 有 VIP 玩家登入伺服器' kick_fullserver: '&b【AuthMe】&6伺服器已經滿了，請等等再試一次' +# Last Time Edit : 2015 / 7 / 14 , A.M.10:14 +logged_in: '&b【AuthMe】&6你已經登入了!' +login: '&b【AuthMe】&6密碼正確，你已成功登入!' +login_msg: '&b【AuthMe】&6請使用 &c"/login <密碼>" &6來登入。' +logout: '&b【AuthMe】&6你已成功登出' +max_reg: '&b【AuthMe】&6你的 IP 位置所註冊的帳號數量已經達到最大。' +name_len: '&b【AuthMe】&6你的暱稱 太長 / 太短 了!' +new_email_invalid: '&b【AuthMe】&6新的Email無效!' +no_perm: '&b【AuthMe】&6你沒有使用該指令的權限。' +not_logged_in: '&b【AuthMe】&6你還沒有登入!' +old_email_invalid: '&b【AuthMe】&6舊的Email無效!' +pass_len: '&b【AuthMe】&6你的密碼 超過最大字數 / 小於最小字數' +password_error: '&b【AuthMe】&6兩次輸入的密碼不一致!' +password_error_nick: '&b【AuthMe】&6你不可以用你的 ID ( 名稱 ) 來當作密碼 !' +password_error_unsafe: '&b【AuthMe】&6你不可以使用這個不安全的密碼' +pwd_changed: '&b【AuthMe】&6密碼變更成功!' +recovery_email: '&b【AuthMe】&6忘記密碼了嗎? 使用 &c"/email recovery <你的Email>"' +reg_disabled: '&b【AuthMe】&6已關閉註冊功能' +reg_email_msg: '&b【AuthMe】&6請使用 &c"/register <重複Email>" 來註冊' +regex: '&b【AuthMe】&6暱稱裡包含不能使用的字符' +registered: '&b【AuthMe】&6你已成功註冊' +reg_msg: '&b【AuthMe】&6請使用 "&c/register <密碼> <確認密碼>" 來註冊。' +reg_only: '&b【AuthMe】&6請到下列網站 :「 http://example.com 」 進行註冊' +reg_voluntarily: '&b【AuthMe】&6使用 &c"/register <密碼> <確認密碼>" &6來註冊你的暱稱' +reload: '&b【AuthMe】&6已重新讀取設定檔及資料庫' +same_nick: '&b【AuthMe】&6有同樣帳號的玩家在線上!' +timeout: '&b【AuthMe】&6超過登入時間，請稍後再試一次' +# Translator: MineWolf50 +unknown_user: "&b【AuthMe】&6沒有在資料庫內找到該玩家。" +unregistered: '&b【AuthMe】&6你已經成功取消註冊。' +unsafe_spawn: '&b【AuthMe】&6你登出的地點不安全，已傳送你到安全的地點。' +usage_captcha: '&b【AuthMe】&6請用 &c"/captcha " &6來輸入你的驗證碼' +usage_changepassword: '&b【AuthMe】&6用法: &c"/changepassword <舊密碼> <新密碼>"' usage_email_add: '&b【AuthMe】&6用法: &c"/email add <你的Email> <重複Email>"' usage_email_change: '&b【AuthMe】&6用法: &c"/email change <舊的Email> <新的Email>"' usage_email_recovery: '&b【AuthMe】&6用法: &c"/email recovery <你的Email>"' -new_email_invalid: '&b【AuthMe】&6新的Email無效!' -old_email_invalid: '&b【AuthMe】&6舊的Email無效!' -email_invalid: '&b【AuthMe】&6無效的Email!' -email_added: '&b【AuthMe】&6已添加Email!' -email_confirm: '&b【AuthMe】&6請驗證你的Email!' -email_changed: '&b【AuthMe】&6Email已變更!' -email_send: '&b【AuthMe】&6已經送出重設密碼要求至你的Email , 請查收。' -email_exists: '&b【AuthMe】&6這個帳戶已經有設定電子郵件了' -country_banned: '&b【AuthMe】&6你所在的地區無法進入此伺服器' -antibot_auto_enabled: '&b【AuthMe】&6AntiBotMod已自動啟用!' -antibot_auto_disabled: '&b【AuthMe】&6AntiBotMod將會於 &c%m &6分鐘後自動關閉' \ No newline at end of file +usage_log: '&b【AuthMe】&6用法: &c"/login <密碼>"' +usage_reg: '&b【AuthMe】&6用法: &c"/register <密碼> <確認密碼>"' +usage_unreg: '&b【AuthMe】&6用法: &c"/unregister <密碼>"' +user_regged: '&b【AuthMe】&6這個帳號已經被註冊過了!' +user_unknown: '&b【AuthMe】&6這個帳號還沒有註冊過' +valid_captcha: '&b【AuthMe】&6驗證碼無效!' +valid_session: '&b【AuthMe】&6你已經成功登入!' +vb_nonActiv: '&b【AuthMe】&6你的帳號還沒有經過驗證! 檢查看看你的電子信箱 (Email) 吧!' +wrong_captcha: '&b【AuthMe】&6錯誤的驗證碼' +wrong_pwd: '&b【AuthMe】&6密碼錯誤!' From 7d7cf0909fdc5e00bdb20ce10cd3852ccb0203ec Mon Sep 17 00:00:00 2001 From: Xephi Date: Wed, 9 Dec 2015 14:53:24 +0100 Subject: [PATCH 09/33] Fix latest commit --- src/main/resources/messages/messages_es.yml | 1 - src/main/resources/messages/messages_fr.yml | 1 - src/main/resources/messages/messages_ko.yml | 4 ---- src/main/resources/messages/messages_sk.yml | 4 ---- src/main/resources/messages/messages_zhhk.yml | 5 +---- src/main/resources/messages/messages_zhtw.yml | 3 --- 6 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/main/resources/messages/messages_es.yml b/src/main/resources/messages/messages_es.yml index c78251dbb..58b118e2c 100644 --- a/src/main/resources/messages/messages_es.yml +++ b/src/main/resources/messages/messages_es.yml @@ -36,7 +36,6 @@ reg_only: '&f¡Sólo para jugadores registrados! Por favor visita http://www.exa reg_voluntarily: '&fRegístrate con: "/register Contraseña ConfirmarContraseña"' reload: '&fLa configuración y la base de datos han sido recargados' same_nick: '&fYa hay un usuario con ese nick conectado (posible error)' -# This file must be in ANSI if win, or UTF-8 if linux. timeout: '&fTiempo de espera para inicio de sesión excedido' unknown_user: '&fEl usuario no está en la base de datos' unregistered: '&c¡Cuenta eliminada del registro!' diff --git a/src/main/resources/messages/messages_fr.yml b/src/main/resources/messages/messages_fr.yml index 7bd0a8f2a..8e25f0eb9 100644 --- a/src/main/resources/messages/messages_fr.yml +++ b/src/main/resources/messages/messages_fr.yml @@ -37,7 +37,6 @@ reg_voluntarily: '&fVous venez d''arriver? faites un "/register motdepasse confi reload: '&fConfiguration et BDD relancé avec succès' same_nick: '&fUne personne ayant ce même pseudo joue déjà..' timeout: '&fVous avez été expulsé car vous êtes trop lent pour vous enregistrer !' -# Traduction par: André unknown_user: '&fUtilisateur non enregistré' unregistered: '&cCe compte a été supprimé!' unsafe_spawn: '&fTéléportation dans un endroit sûr' diff --git a/src/main/resources/messages/messages_ko.yml b/src/main/resources/messages/messages_ko.yml index 417f26a14..581a45134 100644 --- a/src/main/resources/messages/messages_ko.yml +++ b/src/main/resources/messages/messages_ko.yml @@ -1,5 +1,3 @@ - -# 16.08.2014 Thanks for use # add_email: '&c당신의 이메일을 추가해주세요 : /email add 당신의이메일 이메일재입력' antibot_auto_disabled: '[AuthMe] 봇차단모드가 %m 분 후에 자동적으로 비활성화됩니다' antibot_auto_enabled: '[AuthMe] 봇차단모드가 연결 개수 때문에 자동적으로 활성화됩니다!' @@ -14,7 +12,6 @@ error: '&f오류가 발생했습니다; 관리자에게 문의해주세요' invalid_session: '&f세션일자가 적합하지 않습니다. 세션이 종료될 때까지 기다려주세요' kick_forvip: '&c서버가 만원인 상태일때 VIP 플레이어들만 입장이 가능합니다!' kick_fullserver: '&c서버가 만원입니다, 나중에 다시 시도해주세요' -# Korean translate by wolfwork # logged_in: '&c이미 접속되었습니다!' login: '&c성공적인 접속입니다!' login_msg: '&c접속 하실려면 "/login 비밀번호"를 치세요' @@ -57,6 +54,5 @@ user_unknown: '&c사용자이름은 가입되지 않았습니다' valid_captcha: '&c당신의 보안문자는 적합합니다!' valid_session: '&c세션 로그인' vb_nonActiv: '&f당신의 계정은 아직 활성화되어있지 않습니다, 당신의 이메일을 확인해보세요!' -# wolfdate25@gmail.com # wrong_captcha: '&c잘못된 보안문자, 사용해주세요 : /captcha THE_CAPTCHA' wrong_pwd: '&c잘못된 비밀번호입니다' diff --git a/src/main/resources/messages/messages_sk.yml b/src/main/resources/messages/messages_sk.yml index 813ab0f8a..d5250157e 100644 --- a/src/main/resources/messages/messages_sk.yml +++ b/src/main/resources/messages/messages_sk.yml @@ -1,5 +1,3 @@ - -# 02.02.2013 - 4:35 AM - Thanks for use # add_email: '&cPridaj svoj e-mail príkazom "/email add email zopakujEmail"' antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' @@ -38,7 +36,6 @@ reg_only: '&fVstup iba pre registrovanych! Navstiv http://example.com pre regist reg_voluntarily: '&fZaregistruj sa pomocou príkazu "/register heslo zopakujHeslo"' reload: '&fKonfigurácia a databáza bola obnovená' same_nick: '&fHrác s tymto nickom uz hrá!' -# Slovak translate by Judzi # timeout: '&fVyprsal cas na prihlásenie' unknown_user: '&fHrac nie je v databázi' unregistered: '&cUcet bol vymazany!' @@ -58,4 +55,3 @@ valid_session: '&cZapamätané prihlásenie' vb_nonActiv: '&fUcet nie je aktivny. Prezri si svoj e-mail!' wrong_captcha: '&cWrong Captcha, please use : /captcha THE_CAPTCHA' wrong_pwd: '&cZadal si zlé heslo' -# www.judzi.eu | judzi@cs-gaming.eu # diff --git a/src/main/resources/messages/messages_zhhk.yml b/src/main/resources/messages/messages_zhhk.yml index b22984ba1..2e8aaa55f 100644 --- a/src/main/resources/messages/messages_zhhk.yml +++ b/src/main/resources/messages/messages_zhhk.yml @@ -1,4 +1,3 @@ -# -------------------------------------------- # add_email: '&8[&6用戶系統&8] &b請為你的帳戶立即添加電郵地址： 《 /email add <電郵地址> <重覆電郵地址> 》' antibot_auto_disabled: '&8[&6用戶系統&8] 不正常連接數已減少，防止機械人程序將於 %m 分鐘後停止。' antibot_auto_enabled: '&8[&6用戶系統&8] 防止機械人程序已因應現時大量不尋常連線而啟用。' @@ -12,7 +11,6 @@ error: '&8[&6用戶系統&8] &f發生錯誤，請與管理員聯絡。' invalid_session: '&8[&6用戶系統&8] &f登入階段資料已損壞，請等待登入階段結束。' kick_forvip: '&c因為有VIP玩家登入了伺服器。' kick_fullserver: '&c抱歉！ 因為伺服器滿人了，所以你目前未能登入伺服器。' -# Last modif: 1443428389 UTC # logged_in: '&8[&6用戶系統&8] &c你已經登入過了。' login: '&8[&6用戶系統&8] &c你成功登入了。' login_msg: '&8[&6用戶系統&8] &c請使用這個指令來登入： 《 /login <密碼> 》' @@ -34,12 +32,11 @@ reg_email_msg: '&8[&6用戶系統&8] &c請使用這個指令來註冊： 《 /re regex: '&8[&6用戶系統&8] &c用戶名稱錯誤！ 登入系統只接受以下字符： REG_EX' registered: '&8[&6用戶系統&8] &b你成功註冊了。' reg_msg: '&8[&6用戶系統&8] &c請使用這個指令來註冊： 《 /register <密碼> <重覆密碼> 》' -reg_only: '&8[&6用戶系統&8] &f限已註冊會員，請先到 https://crafting.hk/ 註冊。' +reg_only: '&8[&6用戶系統&8] &f限已註冊會員，請先到 http://example.com 註冊。' reg_voluntarily: '&8[&6用戶系統&8] &f你可以使用這個指令來註冊： 《 /register <密碼> <重覆密碼> 》' reload: '&8[&6用戶系統&8] &b登入系統設定及資料庫重新載入完畢。' same_nick: '&8[&6用戶系統&8] &f同名玩家已在遊玩。' timeout: '&8[&6用戶系統&8] &f登入逾時。' -# Translator: lifehome # unknown_user: '&8[&6用戶系統&8] &f用戶資料並不存在。' unregistered: '&8[&6用戶系統&8] &c你已成功刪除會員註冊記錄。' unsafe_spawn: '&8[&6用戶系統&8] &f你的登出位置不安全，現在將傳送你到重生點。' diff --git a/src/main/resources/messages/messages_zhtw.yml b/src/main/resources/messages/messages_zhtw.yml index 9bd72d811..d5bdb9019 100644 --- a/src/main/resources/messages/messages_zhtw.yml +++ b/src/main/resources/messages/messages_zhtw.yml @@ -1,4 +1,3 @@ -# = = = = = = = = = = = = = = = = = = = = = = = # add_email: '&b【AuthMe】&6請使用 &c"/email add <你的Email> <再次輸入你的Email>" &6來添加 Email' antibot_auto_disabled: '&b【AuthMe】&6AntiBotMod將會於 &c%m &6分鐘後自動關閉' antibot_auto_enabled: '&b【AuthMe】&6AntiBotMod已自動啟用!' @@ -13,7 +12,6 @@ error: '&b【AuthMe】&6發生錯誤，請聯繫管理員' invalid_session: '&b【AuthMe】&6憑證日期不相符!' kick_forvip: '&b【AuthMe】&6你已經被請出。&c原因 : 有 VIP 玩家登入伺服器' kick_fullserver: '&b【AuthMe】&6伺服器已經滿了，請等等再試一次' -# Last Time Edit : 2015 / 7 / 14 , A.M.10:14 logged_in: '&b【AuthMe】&6你已經登入了!' login: '&b【AuthMe】&6密碼正確，你已成功登入!' login_msg: '&b【AuthMe】&6請使用 &c"/login <密碼>" &6來登入。' @@ -40,7 +38,6 @@ reg_voluntarily: '&b【AuthMe】&6使用 &c"/register <密碼> <確認密碼>" & reload: '&b【AuthMe】&6已重新讀取設定檔及資料庫' same_nick: '&b【AuthMe】&6有同樣帳號的玩家在線上!' timeout: '&b【AuthMe】&6超過登入時間，請稍後再試一次' -# Translator: MineWolf50 unknown_user: "&b【AuthMe】&6沒有在資料庫內找到該玩家。" unregistered: '&b【AuthMe】&6你已經成功取消註冊。' unsafe_spawn: '&b【AuthMe】&6你登出的地點不安全，已傳送你到安全的地點。' From 30f4a00e3bf21c8b4523f3b055eedeeb40e29161 Mon Sep 17 00:00:00 2001 From: Xephi Date: Wed, 9 Dec 2015 14:54:05 +0100 Subject: [PATCH 10/33] One left --- src/main/resources/messages/messages_zhhk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/messages/messages_zhhk.yml b/src/main/resources/messages/messages_zhhk.yml index 2e8aaa55f..5125de6cb 100644 --- a/src/main/resources/messages/messages_zhhk.yml +++ b/src/main/resources/messages/messages_zhhk.yml @@ -18,7 +18,7 @@ logout: '&8[&6用戶系統&8] &b你成功登出了。' max_reg: '&8[&6用戶系統&8] &f你的IP地址已達到註冊數上限。' name_len: '&8[&6用戶系統&8] &c你的用戶名不符合規定長度。' new_email_invalid: '&8[&6用戶系統&8] 你所填寫的新電郵地址並不正確。' -no_perm: '&8[&6用戶系統&8] &b你可以到 CraftingHK 玩家百科中查看說明文件。' +no_perm: '&8[&6用戶系統&8] &b你可以到 Server 玩家百科中查看說明文件。' not_logged_in: '&8[&6用戶系統&8] &c你還沒有登入 ！' old_email_invalid: '&8[&6用戶系統&8] 你所填寫的舊電郵地址並不正確。' pass_len: '&8[&6用戶系統&8] &f你的密碼並不符合規定長度。' From e99161f3ac4cf9cb04ec840d798a1df413473ba7 Mon Sep 17 00:00:00 2001 From: Xephi Date: Wed, 9 Dec 2015 16:43:27 +0100 Subject: [PATCH 11/33] Add Shell script to sort file content --- src/tools/shhelpers/sort_file_content.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/tools/shhelpers/sort_file_content.sh diff --git a/src/tools/shhelpers/sort_file_content.sh b/src/tools/shhelpers/sort_file_content.sh new file mode 100644 index 000000000..2c9c99073 --- /dev/null +++ b/src/tools/shhelpers/sort_file_content.sh @@ -0,0 +1,6 @@ +#!/bin/sh +# +# That script sort the content of all files in the current directory +# +ls | grep -v .sort | while read file; do sort "$file" > "$file".sort; done +for file in *.sort; do mv "$file" "${file%%.sort}"; done From 9cbe57015e01d3c6bcb2cad8b4d2ba7821450967 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Thu, 10 Dec 2015 15:28:40 +0100 Subject: [PATCH 12/33] Update gson --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9e15106c8..e92495db1 100644 --- a/pom.xml +++ b/pom.xml @@ -326,7 +326,7 @@ com.google.code.gson gson - 2.4 + 2.5 compile true From 9c86fbd8bf732e7c9c96e1cb5d40bb1ec42b86bb Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Thu, 10 Dec 2015 15:44:24 +0100 Subject: [PATCH 13/33] cleanup listener class --- .../authme/listener/AuthMePlayerListener.java | 38 ++++--------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java index 7fc369944..492ebe51f 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java @@ -50,6 +50,7 @@ import org.bukkit.event.player.PlayerShearEntityEvent; import java.util.concurrent.ConcurrentHashMap; /** + * Listener class for player's events */ public class AuthMePlayerListener implements Listener { @@ -196,12 +197,6 @@ public class AuthMePlayerListener implements Listener { return; } - /* IMPOSSIBLE!!!! TODO: check this! - if(Utils.isNPC(player)) { - return; - } - */ - String name = player.getName().toLowerCase(); String joinMsg = event.getJoinMessage(); @@ -369,11 +364,16 @@ public class AuthMePlayerListener implements Listener { plugin.getManagement().performQuit(player, true); } + /* + * <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + * TODO: npc status can be used to bypass security!!! + * <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + */ + @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST) public void onPlayerPickupItem(PlayerPickupItemEvent event) { Player player = event.getPlayer(); - // TODO: npc status can be used to bypass security!!! if (Utils.checkAuth(player) || Utils.isNPC(player)) { return; } @@ -384,7 +384,6 @@ public class AuthMePlayerListener implements Listener { public void onPlayerInteract(PlayerInteractEvent event) { Player player = event.getPlayer(); - // TODO: npc status can be used to bypass security!!! if (Utils.checkAuth(player) || Utils.isNPC(player)) { return; } @@ -395,7 +394,6 @@ public class AuthMePlayerListener implements Listener { public void onPlayerConsumeItem(PlayerItemConsumeEvent event) { Player player = event.getPlayer(); - // TODO: npc status can be used to bypass security!!! if (Utils.checkAuth(player) || Utils.isNPC(player)) { return; } @@ -406,7 +404,6 @@ public class AuthMePlayerListener implements Listener { public void onPlayerInventoryOpen(InventoryOpenEvent event) { final Player player = (Player) event.getPlayer(); - // TODO: npc status can be used to bypass security!!! if (Utils.checkAuth(player) || Utils.isNPC(player)) { return; } @@ -432,8 +429,6 @@ public class AuthMePlayerListener implements Listener { return; if (Utils.checkAuth((Player) event.getWhoClicked())) return; - - // TODO: npc status can be used to bypass security!!! if (Utils.isNPC((Player) event.getWhoClicked())) return; event.setCancelled(true); @@ -448,8 +443,6 @@ public class AuthMePlayerListener implements Listener { if (Utils.checkAuth((Player) damager)) { return; } - - // TODO: npc status can be used to bypass security!!! if (Utils.isNPC((Player) damager)) { return; } @@ -461,8 +454,6 @@ public class AuthMePlayerListener implements Listener { if (Utils.checkAuth(event.getPlayer())) { return; } - - // TODO: npc status can be used to bypass security!!! if (Utils.isNPC(event.getPlayer())) { return; } @@ -474,8 +465,6 @@ public class AuthMePlayerListener implements Listener { if (Utils.checkAuth(event.getPlayer())) { return; } - - // TODO: npc status can be used to bypass security!!! if (Utils.isNPC(event.getPlayer())) { return; } @@ -487,8 +476,6 @@ public class AuthMePlayerListener implements Listener { if (Utils.checkAuth(event.getPlayer())) { return; } - - // TODO: npc status can be used to bypass security!!! if (Utils.isNPC(event.getPlayer())) { return; } @@ -500,8 +487,6 @@ public class AuthMePlayerListener implements Listener { if (Utils.checkAuth(event.getPlayer())) { return; } - - // TODO: npc status can be used to bypass security!!! if (Utils.isNPC(event.getPlayer())) { return; } @@ -513,8 +498,6 @@ public class AuthMePlayerListener implements Listener { if (Utils.checkAuth(event.getPlayer())) { return; } - - // TODO: npc status can be used to bypass security!!! if (Utils.isNPC(event.getPlayer())) { return; } @@ -536,8 +519,6 @@ public class AuthMePlayerListener implements Listener { if (Utils.checkAuth(event.getPlayer())) { return; } - - // TODO: npc status can be used to bypass security!!! if (Utils.isNPC(event.getPlayer())) { return; } @@ -560,8 +541,6 @@ public class AuthMePlayerListener implements Listener { if (Utils.checkAuth(event.getPlayer())) { return; } - - // TODO: npc status can be used to bypass security!!! if (Utils.isNPC(event.getPlayer())) { return; } @@ -573,12 +552,9 @@ public class AuthMePlayerListener implements Listener { if (Utils.checkAuth(event.getPlayer())) { return; } - - // TODO: npc status can be used to bypass security!!! if (Utils.isNPC(event.getPlayer())) { return; } event.setCancelled(true); } - } From 935e9892c4f5676f585385fdd8f94e4a3ade839c Mon Sep 17 00:00:00 2001 From: ljacqu Date: Thu, 10 Dec 2015 18:11:31 +0100 Subject: [PATCH 14/33] Tools - Create message files verifier (work in progress) - Create utility to test the message files for any unknown or missing message keys --- src/tools/messages/MessageFileVerifier.java | 78 +++++++++++++++++++ .../messages/MessagesVerifierRunner.java | 70 +++++++++++++++++ src/tools/messages/README.md | 2 + src/tools/utils/FileUtils.java | 18 +++++ src/tools/utils/ToolsConstants.java | 2 + 5 files changed, 170 insertions(+) create mode 100644 src/tools/messages/MessageFileVerifier.java create mode 100644 src/tools/messages/MessagesVerifierRunner.java create mode 100644 src/tools/messages/README.md diff --git a/src/tools/messages/MessageFileVerifier.java b/src/tools/messages/MessageFileVerifier.java new file mode 100644 index 000000000..f3b37525f --- /dev/null +++ b/src/tools/messages/MessageFileVerifier.java @@ -0,0 +1,78 @@ +package messages; + +import fr.xephi.authme.output.MessageKey; +import utils.FileUtils; +import utils.ToolsConstants; + +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Verifies that a message file has all keys as given in {@link MessageKey}. + */ +public class MessageFileVerifier { + + public static final String MESSAGES_FOLDER = ToolsConstants.MAIN_RESOURCES_ROOT + "messages/"; + private static final String NEW_LINE = "\n"; + + private final String messagesFile; + private final Map defaultMessages; + + public MessageFileVerifier(Map defaultMessages, String messagesFile) { + this.messagesFile = messagesFile; + this.defaultMessages = defaultMessages; + } + + public void verify(boolean addMissingKeys) { + Set messageKeys = getAllMessageKeys(); + List fileLines = FileUtils.readLinesFromFile(messagesFile); + for (String line : fileLines) { + // Skip comments and empty lines + if (!line.startsWith("#") && !line.trim().isEmpty()) { + handleMessagesLine(line, messageKeys); + } + } + + if (messageKeys.isEmpty()) { + System.out.println("Found all message keys"); + } else { + handleMissingKeys(messageKeys, addMissingKeys); + } + } + + private void handleMessagesLine(String line, Set messageKeys) { + if (line.indexOf(':') == -1) { + System.out.println("Skipping line in unknown format: '" + line + "'"); + return; + } + + final String key = line.substring(0, line.indexOf(':')); + if (messageKeys.contains(key)) { + messageKeys.remove(key); + } else { + System.out.println("Warning: Unknown key '" + key + "' for line '" + line + "'"); + } + } + + private void handleMissingKeys(Set missingKeys, boolean addMissingKeys) { + for (String key : missingKeys) { + if (addMissingKeys) { + String defaultMessage = defaultMessages.get(key); + FileUtils.appendToFile(messagesFile, NEW_LINE + key + ":" + defaultMessage); + System.out.println("Added missing key '" + key + "' to file"); + } else { + System.out.println("Error: Missing key '" + key + "'"); + } + } + } + + private static Set getAllMessageKeys() { + Set messageKeys = new HashSet<>(MessageKey.values().length); + for (MessageKey key : MessageKey.values()) { + messageKeys.add(key.getKey()); + } + return messageKeys; + } +} diff --git a/src/tools/messages/MessagesVerifierRunner.java b/src/tools/messages/MessagesVerifierRunner.java new file mode 100644 index 000000000..ff50e5055 --- /dev/null +++ b/src/tools/messages/MessagesVerifierRunner.java @@ -0,0 +1,70 @@ +package messages; + +import utils.FileUtils; + +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; + +/** + * TODO: ljacqu write JavaDoc + */ +public final class MessagesVerifierRunner { + + private MessagesVerifierRunner() { + } + + public static void main(String[] args) { + final Map defaultMessages = constructDefaultMessages(); + final List messagesFiles = getMessagesFiles(); + + if (messagesFiles.isEmpty()) { + throw new RuntimeException("Error getting messages file: list of files is empty"); + } + + for (File file : messagesFiles) { + System.out.println("Verifying '" + file.getName() + "'"); + MessageFileVerifier messageFileVerifier = new MessageFileVerifier(defaultMessages, file.getAbsolutePath()); + messageFileVerifier.verify(false); + System.out.println(); + } + } + + private static Map constructDefaultMessages() { + String defaultMessagesFile = MessageFileVerifier.MESSAGES_FOLDER + "messages_en.yml"; + List lines = FileUtils.readLinesFromFile(defaultMessagesFile); + Map messages = new HashMap<>(lines.size()); + for (String line : lines) { + if (line.startsWith("#") || line.trim().isEmpty()) { + continue; + } + if (line.indexOf(':') == -1) { + System.out.println("Warning! Unknown format in default messages file for line '" + line + "'"); + } else { + String key = line.substring(0, line.indexOf(':')); + messages.put(key, line.substring(line.indexOf(':') + 1)); // fixme: may throw exception + } + } + return messages; + } + + private static List getMessagesFiles() { + final Pattern messageFilePattern = Pattern.compile("messages_[a-z]{2,3}\\.yml"); + File folder = new File(MessageFileVerifier.MESSAGES_FOLDER); + File[] files = folder.listFiles(); + if (files == null) { + throw new RuntimeException("Could not read files from folder '" + folder.getName() + "'"); + } + + List messageFiles = new ArrayList<>(); + for (File file : files) { + if (messageFilePattern.matcher(file.getName()).matches()) { + messageFiles.add(file); + } + } + return messageFiles; + } +} diff --git a/src/tools/messages/README.md b/src/tools/messages/README.md new file mode 100644 index 000000000..594558a4a --- /dev/null +++ b/src/tools/messages/README.md @@ -0,0 +1,2 @@ +## Messages +Verifies the messages files and adds any missing indices with the English content as default. diff --git a/src/tools/utils/FileUtils.java b/src/tools/utils/FileUtils.java index fb88ae27c..5ad5ab25e 100644 --- a/src/tools/utils/FileUtils.java +++ b/src/tools/utils/FileUtils.java @@ -4,6 +4,8 @@ import java.io.IOException; import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; +import java.util.List; import java.util.Map; /** @@ -31,6 +33,14 @@ public final class FileUtils { } } + public static void appendToFile(String outputFile, String contents) { + try { + Files.write(Paths.get(outputFile), contents.getBytes(), StandardOpenOption.APPEND); + } catch (IOException e) { + throw new RuntimeException("Failed to append to file '" + outputFile + "'", e); + } + } + public static String readFromFile(String file) { try { return new String(Files.readAllBytes(Paths.get(file)), CHARSET); @@ -39,6 +49,14 @@ public final class FileUtils { } } + public static List readLinesFromFile(String file) { + try { + return Files.readAllLines(Paths.get(file), CHARSET); + } catch (IOException e) { + throw new RuntimeException("Could not read from file '" + file + "'", e); + } + } + public static String readFromToolsFile(String file) { return readFromFile(ToolsConstants.TOOLS_SOURCE_ROOT + file); } diff --git a/src/tools/utils/ToolsConstants.java b/src/tools/utils/ToolsConstants.java index 30cb0f413..e36ade989 100644 --- a/src/tools/utils/ToolsConstants.java +++ b/src/tools/utils/ToolsConstants.java @@ -10,6 +10,8 @@ public final class ToolsConstants { public static final String MAIN_SOURCE_ROOT = "src/main/java/"; + public static final String MAIN_RESOURCES_ROOT = "src/main/resources/"; + public static final String TOOLS_SOURCE_ROOT = "src/tools/"; public static final String DOCS_FOLDER = TOOLS_SOURCE_ROOT + "docs/"; From 5b92b30a96e4b4c141126a744c86947762a7e345 Mon Sep 17 00:00:00 2001 From: ljacqu Date: Thu, 10 Dec 2015 18:15:46 +0100 Subject: [PATCH 15/33] Revert sorting of messages - Comments in the files were out of order and then removed manually. Sorting will therefore be done in a comment-friendly way in Java --- src/main/resources/messages/messages_bg.yml | 94 ++++++++-------- src/main/resources/messages/messages_br.yml | 100 +++++++++--------- src/main/resources/messages/messages_cz.yml | 90 ++++++++-------- src/main/resources/messages/messages_de.yml | 94 ++++++++-------- src/main/resources/messages/messages_en.yml | 94 ++++++++-------- src/main/resources/messages/messages_es.yml | 93 ++++++++-------- src/main/resources/messages/messages_eu.yml | 94 ++++++++-------- src/main/resources/messages/messages_fi.yml | 92 ++++++++-------- src/main/resources/messages/messages_fr.yml | 93 ++++++++-------- src/main/resources/messages/messages_gl.yml | 94 ++++++++-------- src/main/resources/messages/messages_hu.yml | 94 ++++++++-------- src/main/resources/messages/messages_id.yml | 94 ++++++++-------- src/main/resources/messages/messages_it.yml | 94 ++++++++-------- src/main/resources/messages/messages_ko.yml | 98 +++++++++-------- src/main/resources/messages/messages_lt.yml | 92 ++++++++-------- src/main/resources/messages/messages_nl.yml | 90 ++++++++-------- src/main/resources/messages/messages_pl.yml | 90 ++++++++-------- src/main/resources/messages/messages_pt.yml | 96 ++++++++--------- src/main/resources/messages/messages_ru.yml | 92 ++++++++-------- src/main/resources/messages/messages_sk.yml | 92 ++++++++-------- src/main/resources/messages/messages_tr.yml | 94 ++++++++-------- src/main/resources/messages/messages_uk.yml | 92 ++++++++-------- src/main/resources/messages/messages_vn.yml | 98 ++++++++--------- src/main/resources/messages/messages_zhcn.yml | Bin 4407 -> 5205 bytes src/main/resources/messages/messages_zhhk.yml | 97 +++++++++-------- src/main/resources/messages/messages_zhtw.yml | 97 +++++++++-------- 26 files changed, 1182 insertions(+), 1166 deletions(-) diff --git a/src/main/resources/messages/messages_bg.yml b/src/main/resources/messages/messages_bg.yml index aa34a5421..81a7e7088 100644 --- a/src/main/resources/messages/messages_bg.yml +++ b/src/main/resources/messages/messages_bg.yml @@ -1,58 +1,58 @@ -add_email: '&cМоля добави своя имейл с : /email add имейл имейл' -antibot_auto_disabled: '[AuthMe] AntiBotMod автоматично изключване след %m Минути.' -antibot_auto_enabled: '[AuthMe] AntiBotMod автоматично включен, открита е потенциална атака!' -country_banned: Твоята държава е забранена в този сървър! -email_added: '[AuthMe] Имейла добавен !' -email_changed: '[AuthMe] Имейла е сменен !' -email_confirm: '[AuthMe] Потвърди своя имейл !' -email_invalid: '[AuthMe] Грешен имейл' -email_send: '[AuthMe] Изпраен е имейл !' -error: '&fПолучи се грешка; Моля свържете се с админ' -invalid_session: '&fSession Dataes doesnt corrispond Plaese wait the end of session' -kick_forvip: '&cVIP влезе докато сървъра е пълен, ти беше изгонен!' -kick_fullserver: '&cСървъра е пълен, Съжеляваме!' -logged_in: '&cВече сте влязъл!' -login: '&cВход успешен!' -login_msg: '&cМоля влез с "/login парола"' -logout: '&cУспешен изход от регистрацията!' -max_reg: '&fТи достигна максималния брой регистрации!' -name_len: '&cТвоя никнейм е твърде малък или голям' -new_email_invalid: '[AuthMe] Новия имейл е грешен!' -no_perm: '&cНямаш Достъп!' +unknown_user: '&fПотребителя не е в БД' +unsafe_spawn: '&fТвоята локация когато излезе не беше безопасна, телепортиран си на Spawn!' not_logged_in: '&cНе си влязъл!' -old_email_invalid: '[AuthMe] Стария имейл е грешен!' -pass_len: '&cВашета парола не е достатъчно дълга или къса.' +reg_voluntarily: '&fМоже да се регистрираш с тази команда: + "/register парола парола"' +usage_log: '&cКоманда: /login парола' +wrong_pwd: '&cГрешна парола!' +unregistered: '&cУспешно от-регистриран!' +reg_disabled: '&cРегистрациите са изключени!' +valid_session: '&aСесията продължена!' +login: '&cВход успешен!' +vb_nonActiv: '&fТвоята регистрация не е активирана, моля провери своя Имейл!' +user_regged: '&cПотребителското име е заето!' +usage_reg: '&cКоманда: /register парола парола' +max_reg: '&fТи достигна максималния брой регистрации!' +no_perm: '&cНямаш Достъп!' +error: '&fПолучи се грешка; Моля свържете се с админ' +login_msg: '&cМоля влез с "/login парола"' +reg_msg: '&cМоля регистрирай се с "/register парола парола"' +reg_email_msg: '&cМоля регистрирай се с "/register <имейл> <имейл>"' +usage_unreg: '&cКоманда: /unregister парола' +pwd_changed: '&cПаролата е променена!' +user_unknown: '&cПотребителя не е регистриран' password_error: '&fПаролата не съвпада' password_error_nick: '&fYou can''t use your name as password' password_error_unsafe: '&fYou can''t use unsafe passwords' -pwd_changed: '&cПаролата е променена!' -recovery_email: '&cЗабравихте своята парола? Моля използвай /email recovery <имейл>' -reg_disabled: '&cРегистрациите са изключени!' -reg_email_msg: '&cМоля регистрирай се с "/register <имейл> <имейл>"' -regex: '&cТвоя никнейм съдържа забранени знацхи. Позволените са: REG_EX' -registered: '&cУспешно премахната регистрация!' - "/register парола парола"' -reg_msg: '&cМоля регистрирай се с "/register парола парола"' +invalid_session: '&fSession Dataes doesnt corrispond Plaese wait the end of session' reg_only: '&fСамо за регистрирани! Моля посети http://example.com за регистрация' -reg_voluntarily: '&fМоже да се регистрираш с тази команда: -reload: '&fКонфигурацията презаредена!' +logged_in: '&cВече сте влязъл!' +logout: '&cУспешен изход от регистрацията!' same_nick: '&fПотребител с този никнейм е в игра' +registered: '&cУспешно премахната регистрация!' +pass_len: '&cВашета парола не е достатъчно дълга или къса.' +reload: '&fКонфигурацията презаредена!' timeout: '&fВремето изтече, опитай отново!' -unknown_user: '&fПотребителя не е в БД' -unregistered: '&cУспешно от-регистриран!' -unsafe_spawn: '&fТвоята локация когато излезе не беше безопасна, телепортиран си на Spawn!' -usage_captcha: '&cYou need to type a captcha, please type: /captcha <код>' usage_changepassword: '&fКоманда: /changepassword СтараПарола НоваПарола' +name_len: '&cТвоя никнейм е твърде малък или голям' +regex: '&cТвоя никнейм съдържа забранени знацхи. Позволените са: REG_EX' +add_email: '&cМоля добави своя имейл с : /email add имейл имейл' +recovery_email: '&cЗабравихте своята парола? Моля използвай /email recovery <имейл>' +usage_captcha: '&cYou need to type a captcha, please type: /captcha <код>' +wrong_captcha: '&cГрешен код, използвай : /captcha THE_CAPTCHA' +valid_captcha: '&cТвоя код е валиден!' +kick_forvip: '&cVIP влезе докато сървъра е пълен, ти беше изгонен!' +kick_fullserver: '&cСървъра е пълен, Съжеляваме!' usage_email_add: '&fКоманда: /email add ' usage_email_change: '&fКоманда: /email change <СтарИмейл> <НовИмейл> ' usage_email_recovery: '&fКоманда: /email recovery <имейл>' -usage_log: '&cКоманда: /login парола' -usage_reg: '&cКоманда: /register парола парола' -usage_unreg: '&cКоманда: /unregister парола' -user_regged: '&cПотребителското име е заето!' -user_unknown: '&cПотребителя не е регистриран' -valid_captcha: '&cТвоя код е валиден!' -valid_session: '&aСесията продължена!' -vb_nonActiv: '&fТвоята регистрация не е активирана, моля провери своя Имейл!' -wrong_captcha: '&cГрешен код, използвай : /captcha THE_CAPTCHA' -wrong_pwd: '&cГрешна парола!' +new_email_invalid: '[AuthMe] Новия имейл е грешен!' +old_email_invalid: '[AuthMe] Стария имейл е грешен!' +email_invalid: '[AuthMe] Грешен имейл' +email_added: '[AuthMe] Имейла добавен !' +email_confirm: '[AuthMe] Потвърди своя имейл !' +email_changed: '[AuthMe] Имейла е сменен !' +email_send: '[AuthMe] Изпраен е имейл !' +country_banned: Твоята държава е забранена в този сървър! +antibot_auto_enabled: '[AuthMe] AntiBotMod автоматично включен, открита е потенциална атака!' +antibot_auto_disabled: '[AuthMe] AntiBotMod автоматично изключване след %m Минути.' diff --git a/src/main/resources/messages/messages_br.yml b/src/main/resources/messages/messages_br.yml index 922f05066..20243c687 100644 --- a/src/main/resources/messages/messages_br.yml +++ b/src/main/resources/messages/messages_br.yml @@ -1,58 +1,58 @@ -add_email: '&cPor favor adicione o seu email com : /email add seuEmail confirmarSeuEmail' -antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automaticamente após %m minutos, esperamos que a invasão tenha parado' -antibot_auto_enabled: '[AuthMe] AntiBotMod ativado automaticamente devido a um aumento anormal de tentativas de ligação!' -country_banned: 'O seu pais é banido desse servidor' -email_added: '[AuthMe] Email adicionado!' -email_changed: '[AuthMe] Email modificado!' -email_confirm: '[AuthMe] Confirme o seu email!' -email_exists: '[AuthMe] Um email já existe na sua conta. Você pode mudalo usando o comando abaixo.' -email_invalid: '[AuthMe] Email Invalido' -email_send: '[AuthMe] Recuperação de email enviada!' -error: '&fOcorreu um erro; Por favor contacte um admin' -invalid_session: '&fDados de sessão não correspondem. Por favor aguarde o fim da sessão' -kick_forvip: '&cUm jogador VIP entrou no servidor cheio!' -kick_fullserver: '&cO servidor está actualmente cheio, tente mais tarde :/ !' -logged_in: '&cJá se encontra autenticado(logado)!' -login: '&cAutenticado com sucesso!' -login_msg: '&cIdentifique-se (logue) com "/login password"' -logout: '&cSaida com sucesso' -max_reg: '&fVocê atingiu o numero máximo de registros permitidos' -name_len: '&cO seu nickname é muito curto, ou muito longo.' -new_email_invalid: '[AuthMe] Novo email invalido!' -no_perm: '&cSem Permissões' +unknown_user: '&fNao esta no banco de dados' +unsafe_spawn: '&fA sua localização na saída não é segura, você será tele-portado para a Spawn' not_logged_in: '&cVocê nao esta autenticado!' -old_email_invalid: '[AuthMe] Antigo email invalido!' -pass_len: '&fPassword ou muito curto, ou muito longo.' -password_error: '&fAs passwords não coincidem' +reg_voluntarily: '&fVocê pode registrar o seu nickname no servidor com o comando "/register password ConfirmePassword"' +usage_log: '&cUse: /login password' +wrong_pwd: '&cPassword incorreta' password_error_nick: '&fYou can''t use your name as password' password_error_unsafe: '&fYou can''t use unsafe passwords' -pwd_changed: '&cPassword alterada!' -recovery_email: '&cPerdeu/esqueceu a sua password(senha)? Para a recupera-la escreva /email recovery ' -reg_disabled: '&cRegistro de novos utilizadores desativado' -reg_email_msg: '&cPor favor registre-se com "/register ""' -regex: '&cO seu nickname contém caracteres não permitidos. Permitido: REG_EX' -registered: '&cRegistrado com sucesso!' -reg_msg: '&cPor favor registre-se com "/register password confirmePassword"' -reg_only: '&fApenas jogadores registrados! Visite http://example.com para se registrar' -reg_voluntarily: '&fVocê pode registrar o seu nickname no servidor com o comando "/register password ConfirmePassword"' -reload: '&fConfiguração e base de dados foram recarregadas' -same_nick: '&fO mesmo nickname já se encontra a jogar no servidor' -timeout: '&fExcedeu o tempo para autenticação' -unknown_user: '&fNao esta no banco de dados' unregistered: '&cRegistro eliminado com sucesso!' -unsafe_spawn: '&fA sua localização na saída não é segura, você será tele-portado para a Spawn' -usage_captcha: '&cVocê precisa digitar um captcha, escreva: /captcha ' +reg_disabled: '&cRegistro de novos utilizadores desativado' +valid_session: '&cSessão válida' +login: '&cAutenticado com sucesso!' +vb_nonActiv: '&fA sua conta ainda nao foi ativada, verifique o seu email, onde irá receber instruções de como ativa-la.' +user_regged: '&cNome de usuario já registrado' +usage_reg: '&cUse: /register password ConfirmPassword' +max_reg: '&fVocê atingiu o numero máximo de registros permitidos' +no_perm: '&cSem Permissões' +error: '&fOcorreu um erro; Por favor contacte um admin' +login_msg: '&cIdentifique-se (logue) com "/login password"' +reg_msg: '&cPor favor registre-se com "/register password confirmePassword"' +reg_email_msg: '&cPor favor registre-se com "/register ""' +usage_unreg: '&cUse: /unregister password' +pwd_changed: '&cPassword alterada!' +user_unknown: '&cUsername não registrado' +password_error: '&fAs passwords não coincidem' +invalid_session: '&fDados de sessão não correspondem. Por favor aguarde o fim da sessão' +reg_only: '&fApenas jogadores registrados! Visite http://example.com para se registrar' +logged_in: '&cJá se encontra autenticado(logado)!' +logout: '&cSaida com sucesso' +same_nick: '&fO mesmo nickname já se encontra a jogar no servidor' +registered: '&cRegistrado com sucesso!' +pass_len: '&fPassword ou muito curto, ou muito longo.' +reload: '&fConfiguração e base de dados foram recarregadas' +timeout: '&fExcedeu o tempo para autenticação' usage_changepassword: '&fUse: /changepassword PasswordAntiga PasswordNova' +name_len: '&cO seu nickname é muito curto, ou muito longo.' +regex: '&cO seu nickname contém caracteres não permitidos. Permitido: REG_EX' +add_email: '&cPor favor adicione o seu email com : /email add seuEmail confirmarSeuEmail' +recovery_email: '&cPerdeu/esqueceu a sua password(senha)? Para a recupera-la escreva /email recovery ' +usage_captcha: '&cVocê precisa digitar um captcha, escreva: /captcha ' +wrong_captcha: '&cCaptcha errado, por favor escreva: /captcha THE_CAPTCHA' +valid_captcha: '&cO seu captcha é válido!' +kick_forvip: '&cUm jogador VIP entrou no servidor cheio!' +kick_fullserver: '&cO servidor está actualmente cheio, tente mais tarde :/ !' usage_email_add: '&fUse: /email add ' usage_email_change: '&fUse: /email change ' usage_email_recovery: '&fUse: /email recovery ' -usage_log: '&cUse: /login password' -usage_reg: '&cUse: /register password ConfirmPassword' -usage_unreg: '&cUse: /unregister password' -user_regged: '&cNome de usuario já registrado' -user_unknown: '&cUsername não registrado' -valid_captcha: '&cO seu captcha é válido!' -valid_session: '&cSessão válida' -vb_nonActiv: '&fA sua conta ainda nao foi ativada, verifique o seu email, onde irá receber instruções de como ativa-la.' -wrong_captcha: '&cCaptcha errado, por favor escreva: /captcha THE_CAPTCHA' -wrong_pwd: '&cPassword incorreta' +new_email_invalid: '[AuthMe] Novo email invalido!' +old_email_invalid: '[AuthMe] Antigo email invalido!' +email_invalid: '[AuthMe] Email Invalido' +email_added: '[AuthMe] Email adicionado!' +email_confirm: '[AuthMe] Confirme o seu email!' +email_changed: '[AuthMe] Email modificado!' +email_send: '[AuthMe] Recuperação de email enviada!' +email_exists: '[AuthMe] Um email já existe na sua conta. Você pode mudalo usando o comando abaixo.' +country_banned: 'O seu pais é banido desse servidor' +antibot_auto_enabled: '[AuthMe] AntiBotMod ativado automaticamente devido a um aumento anormal de tentativas de ligação!' +antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automaticamente após %m minutos, esperamos que a invasão tenha parado' diff --git a/src/main/resources/messages/messages_cz.yml b/src/main/resources/messages/messages_cz.yml index ef5a1ebc1..7492503d7 100644 --- a/src/main/resources/messages/messages_cz.yml +++ b/src/main/resources/messages/messages_cz.yml @@ -1,57 +1,57 @@ -add_email: '&cPridej prosim svuj email pomoci : /email add TvujEmail TvujEmail' -antibot_auto_disabled: '[AuthMe] AntiBotMod automaticky ukoncen po %m minutach, doufejme v konec invaze' -antibot_auto_enabled: '[AuthMe] AntiBotMod automaticky spusten z duvodu masivnich pripojeni!' -country_banned: 'Vase zeme je na tomto serveru zakazana' -email_added: '[AuthMe] Email pridan!' -email_changed: '[AuthMe] Email zmenen!' -email_confirm: '[AuthMe] Potvrd prosim svuj email!' -email_invalid: '[AuthMe] Nespravny email' -email_send: '[AuthMe] Email pro obnoveni hesla odeslan!' -error: '&cVyskytla se chyba - kontaktujte administratora ...' -invalid_session: '&cChybna data pri cteni pockejte do vyprseni.' -kick_forvip: '&cVIP Hrac se pripojil na plny server!' -kick_fullserver: '&cServer je plne obsazen, zkus to pozdeji prosim!' -logged_in: '&cJiz jsi prihlasen!' -login: '&cUspesne prihlaseni!' -login_msg: '&cProsim prihlas se "/login TvojeHeslo".' -logout: '&cOdhlaseni bylo uspesne.' -max_reg: '&cJiz jsi prekrocil(a) limit pro pocet uctu z jedne IP.' -name_len: '&cTvuj nick je prilis kratky, nebo prilis dlouhy' -new_email_invalid: '[AuthMe] Novy email je chybne zadan!' -no_perm: '&cNemas opravneni.' +unknown_user: '&cHrac neni registrovan.' not_logged_in: '&cNeprihlasen!' -old_email_invalid: '[AuthMe] Stary email je chybne zadan!' -pass_len: '&cTvoje heslo nedosahuje minimalni delky (4).' -password_error: '&cHesla se neshoduji!' +reg_voluntarily: '&cRegistruj se prikazem "/register heslo heslo".' +usage_log: '&cPouzij: "/login TvojeHeslo".' +wrong_pwd: '&cSpatne heslo.' +unregistered: '&cUspesne odregistrovan!' +reg_disabled: '&cRegistrace je zakazana!' +valid_session: '&cAutomaticke znovuprihlaseni.' +login: '&cUspesne prihlaseni!' +user_regged: '&cUzivatelske jmeno je jiz registrovano.' password_error_nick: '&fYou can''t use your name as password' password_error_unsafe: '&fYou can''t use unsafe passwords' -pwd_changed: '&cHeslo zmeneno!' -recovery_email: '&cZapomel jsi heslo? Zadej: /email recovery ' -reg_disabled: '&cRegistrace je zakazana!' -reg_email_msg: '&cProsim registruj se pomoci "/register "' -regex: '&cTvuj nick obsahuje nepovolene znaky. Pripustne znaky jsou: REG_EX' -registered: '&cRegistrace byla uspesna!' +usage_reg: '&cPouzij: "/register heslo heslo".' +no_perm: '&cNemas opravneni.' +error: '&cVyskytla se chyba - kontaktujte administratora ...' +login_msg: '&cProsim prihlas se "/login TvojeHeslo".' reg_msg: '&cProsim zaregistruj se "/register heslo heslo".' +reg_email_msg: '&cProsim registruj se pomoci "/register "' +usage_unreg: '&cPouzij: "/unregister TvojeHeslo".' +pwd_changed: '&cHeslo zmeneno!' +user_unknown: '&cUzivatelske jmeno neni registrovano.' reg_only: '&cServer je pouze pro registrovane! Navstivte http://bit.ly/zyEzzS.' -reg_voluntarily: '&cRegistruj se prikazem "/register heslo heslo".' -reload: '&cZnovu nacteni nastaveni AuthMe probehlo uspesne.' +logged_in: '&cJiz jsi prihlasen!' +logout: '&cOdhlaseni bylo uspesne.' same_nick: '&cUzivatel s timto jmenem jiz hraje.' +registered: '&cRegistrace byla uspesna!' +reload: '&cZnovu nacteni nastaveni AuthMe probehlo uspesne.' timeout: '&cCas pro prihlaseni vyprsel!' -unknown_user: '&cHrac neni registrovan.' -unregistered: '&cUspesne odregistrovan!' unsafe_spawn: '&cTvoje pozice pri odpojeni byla nebezpecna, teleportuji na spawn!' -usage_captcha: '&cPouzij: /captcha ' +invalid_session: '&cChybna data pri cteni pockejte do vyprseni.' +max_reg: '&cJiz jsi prekrocil(a) limit pro pocet uctu z jedne IP.' +password_error: '&cHesla se neshoduji!' +pass_len: '&cTvoje heslo nedosahuje minimalni delky (4).' +vb_nonActiv: '&cTvuj ucet neni aktivovany, zkontrolujte si svuj E-mail.' usage_changepassword: '&cPouzij: "/changepassword stareHeslo noveHeslo".' +name_len: '&cTvuj nick je prilis kratky, nebo prilis dlouhy' +regex: '&cTvuj nick obsahuje nepovolene znaky. Pripustne znaky jsou: REG_EX' +add_email: '&cPridej prosim svuj email pomoci : /email add TvujEmail TvujEmail' +recovery_email: '&cZapomel jsi heslo? Zadej: /email recovery ' +usage_captcha: '&cPouzij: /captcha ' +wrong_captcha: '&cSpatne opsana Captcha, pouzij prosim: /captcha CAPTCHA_TEXT' +valid_captcha: '&cZadana captcha je v poradku!' +kick_forvip: '&cVIP Hrac se pripojil na plny server!' +kick_fullserver: '&cServer je plne obsazen, zkus to pozdeji prosim!' usage_email_add: '&fPouzij: /email add ' usage_email_change: '&fPouzij: /email change ' usage_email_recovery: '&fPouzij: /email recovery ' -usage_log: '&cPouzij: "/login TvojeHeslo".' -usage_reg: '&cPouzij: "/register heslo heslo".' -usage_unreg: '&cPouzij: "/unregister TvojeHeslo".' -user_regged: '&cUzivatelske jmeno je jiz registrovano.' -user_unknown: '&cUzivatelske jmeno neni registrovano.' -valid_captcha: '&cZadana captcha je v poradku!' -valid_session: '&cAutomaticke znovuprihlaseni.' -vb_nonActiv: '&cTvuj ucet neni aktivovany, zkontrolujte si svuj E-mail.' -wrong_captcha: '&cSpatne opsana Captcha, pouzij prosim: /captcha CAPTCHA_TEXT' -wrong_pwd: '&cSpatne heslo.' +new_email_invalid: '[AuthMe] Novy email je chybne zadan!' +old_email_invalid: '[AuthMe] Stary email je chybne zadan!' +email_invalid: '[AuthMe] Nespravny email' +email_added: '[AuthMe] Email pridan!' +email_confirm: '[AuthMe] Potvrd prosim svuj email!' +email_changed: '[AuthMe] Email zmenen!' +email_send: '[AuthMe] Email pro obnoveni hesla odeslan!' +country_banned: 'Vase zeme je na tomto serveru zakazana' +antibot_auto_enabled: '[AuthMe] AntiBotMod automaticky spusten z duvodu masivnich pripojeni!' +antibot_auto_disabled: '[AuthMe] AntiBotMod automaticky ukoncen po %m minutach, doufejme v konec invaze' diff --git a/src/main/resources/messages/messages_de.yml b/src/main/resources/messages/messages_de.yml index 5a89d3ea4..fa086015a 100644 --- a/src/main/resources/messages/messages_de.yml +++ b/src/main/resources/messages/messages_de.yml @@ -1,58 +1,58 @@ -add_email: '&3Bitte hinterlege Deine E-Mail Adresse: /email add ' -antibot_auto_disabled: '&2[AntiBotService] AntiBotMod wurde nach %m Minuten deaktiviert, hoffentlich ist die Invasion vorbei' -antibot_auto_enabled: '&4[AntiBotService] AntiBotMod wurde aufgrund hoher Netzauslastung automatisch aktiviert!' -country_banned: '&4Dein Land ist gesperrt' -email_added: '&2Email hinzugefügt!' -email_changed: '&2Email aktualisiert!' -email_confirm: '&cBitte bestätige deine Email!' -email_exists: '&cEine Wiederherstellungs-Email wurde bereits versandt! Nutze folgenden Befehl um eine neue Email zu versenden:' -email_invalid: '&cUngültige Email' -email_send: '&2Wiederherstellungs-Email wurde gesendet!' -error: '&4Ein Fehler ist aufgetreten. Bitte kontaktiere einen Administrator' -invalid_session: '&cUngültige Session. Bitte starte das Spiel neu oder warte, bis die Session abgelaufen ist' -kick_forvip: '&3Ein VIP Spieler hat den vollen Server betreten!' -kick_fullserver: '&4Der Server ist momentan voll, Sorry!' -logged_in: '&cBereits eingeloggt!' -login: '&2Erfolgreich eingeloggt!' -login_msg: '&cBitte logge Dich ein mit "/login "' -logout: '&2Erfolgreich ausgeloggt' -max_reg: '&cDu hast die maximale Anzahl an Accounts erreicht' -name_len: '&4Dein Nickname ist zu kurz oder zu lang' -new_email_invalid: '&cDie neue Email ist ungültig!' -no_perm: '&4Du hast keine Rechte, um diese Aktion auszuführen!' +unknown_user: '&cBenutzer ist nicht in der Datenbank' +unsafe_spawn: '&cDeine Logoutposition war unsicher, du wurdest zum Spawn teleportiert' not_logged_in: '&cNicht eingeloggt!' -old_email_invalid: '&cDie alte Email ist ungültig!' -pass_len: '&cDein Passwort ist zu kurz oder zu lang!' +reg_voluntarily: 'Du kannst dich mit folgendem Befehl registrieren "/register "' +usage_log: '&cBenutze: /login ' +wrong_pwd: '&cFalsches Passwort' +unregistered: '&cBenutzerkonto erfolgreich gelöscht!' +reg_disabled: '&cRegistrierungen sind deaktiviert' +valid_session: '&2Erfolgreich eingeloggt!' +login: '&2Erfolgreich eingeloggt!' +vb_nonActiv: '&cDein Account wurde noch nicht aktiviert. Bitte prüfe Deine E-Mails!' +user_regged: '&cBenutzername ist schon vergeben' +usage_reg: '&cBenutze: /register ' +max_reg: '&cDu hast die maximale Anzahl an Accounts erreicht' +no_perm: '&4Du hast keine Rechte, um diese Aktion auszuführen!' +error: '&4Ein Fehler ist aufgetreten. Bitte kontaktiere einen Administrator' +login_msg: '&cBitte logge Dich ein mit "/login "' +reg_msg: '&3Bitte registriere Dich mit "/register "' +reg_email_msg: '&3Bitte registriere Dich mit "/register "' +usage_unreg: '&cBenutze: /unregister ' +pwd_changed: '&2Passwort geändert!' +user_unknown: '&cBenutzername nicht registriert!' password_error: '&cPasswörter stimmen nicht überein!' password_error_nick: '&cDu kannst nicht deinen Namen als Passwort nutzen!' password_error_unsafe: '&cDu kannst nicht unsichere Passwörter nutzen!' -pwd_changed: '&2Passwort geändert!' -recovery_email: '&3Passwort vergessen? Nutze "/email recovery " für ein neues Passwort' -reg_disabled: '&cRegistrierungen sind deaktiviert' -reg_email_msg: '&3Bitte registriere Dich mit "/register "' -regex: '&4Dein Nickname enthält nicht erlaubte Zeichen. Zulässige Zeichen: REG_EX' -registered: '&2Erfolgreich registriert!' -reg_msg: '&3Bitte registriere Dich mit "/register "' +invalid_session: '&cUngültige Session. Bitte starte das Spiel neu oder warte, bis die Session abgelaufen ist' reg_only: '&4Nur für registrierte Spieler! Bitte besuche http://example.com zum registrieren' -reg_voluntarily: 'Du kannst dich mit folgendem Befehl registrieren "/register "' -reload: '&2Konfiguration und Datenbank wurden erfolgreich neu geladen' +logged_in: '&cBereits eingeloggt!' +logout: '&2Erfolgreich ausgeloggt' same_nick: '&4Jemand mit diesem Namen spielt bereits auf dem Server!' +registered: '&2Erfolgreich registriert!' +pass_len: '&cDein Passwort ist zu kurz oder zu lang!' +reload: '&2Konfiguration und Datenbank wurden erfolgreich neu geladen' timeout: '&4Zeitüberschreitung beim Login' -unknown_user: '&cBenutzer ist nicht in der Datenbank' -unregistered: '&cBenutzerkonto erfolgreich gelöscht!' -unsafe_spawn: '&cDeine Logoutposition war unsicher, du wurdest zum Spawn teleportiert' -usage_captcha: '&3Um dich einzuloggen, tippe dieses Captcha so ein: /captcha ' usage_changepassword: '&cBenutze: /changepassword ' +name_len: '&4Dein Nickname ist zu kurz oder zu lang' +regex: '&4Dein Nickname enthält nicht erlaubte Zeichen. Zulässige Zeichen: REG_EX' +add_email: '&3Bitte hinterlege Deine E-Mail Adresse: /email add ' +recovery_email: '&3Passwort vergessen? Nutze "/email recovery " für ein neues Passwort' +usage_captcha: '&3Um dich einzuloggen, tippe dieses Captcha so ein: /captcha ' +wrong_captcha: '&cFalsches Captcha, bitte nutze: /captcha THE_CAPTCHA' +valid_captcha: '&2Das Captcha ist korrekt!' +kick_forvip: '&3Ein VIP Spieler hat den vollen Server betreten!' +kick_fullserver: '&4Der Server ist momentan voll, Sorry!' usage_email_add: '&cBenutze: /email add ' usage_email_change: '&cBenutze: /email change ' usage_email_recovery: '&cBenutze: /email recovery ' -usage_log: '&cBenutze: /login ' -usage_reg: '&cBenutze: /register ' -usage_unreg: '&cBenutze: /unregister ' -user_regged: '&cBenutzername ist schon vergeben' -user_unknown: '&cBenutzername nicht registriert!' -valid_captcha: '&2Das Captcha ist korrekt!' -valid_session: '&2Erfolgreich eingeloggt!' -vb_nonActiv: '&cDein Account wurde noch nicht aktiviert. Bitte prüfe Deine E-Mails!' -wrong_captcha: '&cFalsches Captcha, bitte nutze: /captcha THE_CAPTCHA' -wrong_pwd: '&cFalsches Passwort' +new_email_invalid: '&cDie neue Email ist ungültig!' +old_email_invalid: '&cDie alte Email ist ungültig!' +email_invalid: '&cUngültige Email' +email_added: '&2Email hinzugefügt!' +email_confirm: '&cBitte bestätige deine Email!' +email_changed: '&2Email aktualisiert!' +email_send: '&2Wiederherstellungs-Email wurde gesendet!' +email_exists: '&cEine Wiederherstellungs-Email wurde bereits versandt! Nutze folgenden Befehl um eine neue Email zu versenden:' +country_banned: '&4Dein Land ist gesperrt' +antibot_auto_enabled: '&4[AntiBotService] AntiBotMod wurde aufgrund hoher Netzauslastung automatisch aktiviert!' +antibot_auto_disabled: '&2[AntiBotService] AntiBotMod wurde nach %m Minuten deaktiviert, hoffentlich ist die Invasion vorbei' diff --git a/src/main/resources/messages/messages_en.yml b/src/main/resources/messages/messages_en.yml index 1aa98736a..fdb361a31 100644 --- a/src/main/resources/messages/messages_en.yml +++ b/src/main/resources/messages/messages_en.yml @@ -1,59 +1,59 @@ -add_email: '&3Please add your email to your account with the command "/email add "' -antibot_auto_disabled: '&2[AntiBotService] AntiBot disabled disabled after %m minutes!' -antibot_auto_enabled: '&4[AntiBotService] AntiBot enabled due to the huge number of connections!' -country_banned: '&4Your country is banned from this server!' -email_added: '&2Email address successfully added to your account!' -email_changed: '&2Email address changed correctly!' -email_confirm: '&cPlease confirm your email address!' -email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' -email_invalid: '&cInvalid Email address, try again!' -email_send: '&2Recovery email sent correctly! Check your email inbox!' -error: '&4An unexpected error occurred, please contact an Administrator!' -invalid_session: '&cYour IP has been changed and your session data has expired!' kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' -kick_forvip: '&3A VIP Player has joined the server when it was full!' -kick_fullserver: '&4The server is full, try again later!' -logged_in: '&cYou''re already logged in!' -login: '&2Successful login!' -login_msg: '&cPlease, login with the command "/login "' -logout: '&2Logged-out successfully!' -max_reg: '&cYou have exceeded the maximum number of registrations for your connection!' -name_len: '&4Your username is either too short or too long!' -new_email_invalid: '&cInvalid New Email, try again!' -no_perm: '&4You don''t have the permission to perform this action!' +unknown_user: '&cCan''t find the requested user in the database!' +unsafe_spawn: '&cYour quit location was unsafe, you have been teleported to the world''s spawnpoint.' not_logged_in: '&cYou''re not logged in!' -old_email_invalid: '&cInvalid Old Email, try again!' -pass_len: '&cYour password is too short or too long! Please try with another one!' +reg_voluntarily: 'You can register yourself to the server with the command "/register "' +usage_log: '&cUsage: /login ' +wrong_pwd: '&cWrong password!' +unregistered: '&cSuccessfully unregistered!' +reg_disabled: '&cIn-game registration is disabled!' +valid_session: '&2Logged-in due to Session Reconnection.' +login: '&2Successful login!' +vb_nonActiv: '&cYour account isn''t activated yet, please check your emails!' +user_regged: '&cYou already have registered this username!' +usage_reg: '&cUsage: /register ' +max_reg: '&cYou have exceeded the maximum number of registrations for your connection!' +no_perm: '&4You don''t have the permission to perform this action!' +error: '&4An unexpected error occurred, please contact an Administrator!' +login_msg: '&cPlease, login with the command "/login "' +reg_msg: '&3Please, register to the server with the command "/register "' +reg_email_msg: '&3Please, register to the server with the command "/register "' +usage_unreg: '&cUsage: /unregister ' +pwd_changed: '&2Password changed successfully!' +user_unknown: '&cThis user isn''t registered!' password_error: '&cPasswords didn''t match, check them again!' password_error_nick: '&cYou can''t use your name as password, please choose another one...' password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...' -pwd_changed: '&2Password changed successfully!' -recovery_email: '&3Forgot your password? Please use the command "/email recovery "' -reg_disabled: '&cIn-game registration is disabled!' -reg_email_msg: '&3Please, register to the server with the command "/register "' -regex: '&4Your username contains illegal characters. Allowed chars: REG_EX' -registered: '&2Successfully registered!' -reg_msg: '&3Please, register to the server with the command "/register "' +invalid_session: '&cYour IP has been changed and your session data has expired!' reg_only: '&4Only registered users can join the server! Please visit http://example.com to register yourself!' -reg_voluntarily: 'You can register yourself to the server with the command "/register "' -reload: '&2Configuration and database have been reloaded correctly!' +logged_in: '&cYou''re already logged in!' +logout: '&2Logged-out successfully!' same_nick: '&4The same username is already playing on the server!' +registered: '&2Successfully registered!' +pass_len: '&cYour password is too short or too long! Please try with another one!' +reload: '&2Configuration and database have been reloaded correctly!' timeout: '&4Login timeout exceeded, you have been kicked from the server, please try again!' -unknown_user: '&cCan''t find the requested user in the database!' -unregistered: '&cSuccessfully unregistered!' -unsafe_spawn: '&cYour quit location was unsafe, you have been teleported to the world''s spawnpoint.' -usage_captcha: '&3To login you have to solve a captcha code, please use the command "/captcha "' usage_changepassword: '&cUsage: /changepassword ' +name_len: '&4Your username is either too short or too long!' +regex: '&4Your username contains illegal characters. Allowed chars: REG_EX' +add_email: '&3Please add your email to your account with the command "/email add "' +recovery_email: '&3Forgot your password? Please use the command "/email recovery "' +usage_captcha: '&3To login you have to solve a captcha code, please use the command "/captcha "' +wrong_captcha: '&cWrong Captcha, please type "/captcha THE_CAPTCHA" into the chat!' +valid_captcha: '&2Captcha code solved correctly!' +kick_forvip: '&3A VIP Player has joined the server when it was full!' +kick_fullserver: '&4The server is full, try again later!' usage_email_add: '&cUsage: /email add ' usage_email_change: '&cUsage: /email change ' usage_email_recovery: '&cUsage: /email recovery ' -usage_log: '&cUsage: /login ' -usage_reg: '&cUsage: /register ' -usage_unreg: '&cUsage: /unregister ' -user_regged: '&cYou already have registered this username!' -user_unknown: '&cThis user isn''t registered!' -valid_captcha: '&2Captcha code solved correctly!' -valid_session: '&2Logged-in due to Session Reconnection.' -vb_nonActiv: '&cYour account isn''t activated yet, please check your emails!' -wrong_captcha: '&cWrong Captcha, please type "/captcha THE_CAPTCHA" into the chat!' -wrong_pwd: '&cWrong password!' +new_email_invalid: '&cInvalid New Email, try again!' +old_email_invalid: '&cInvalid Old Email, try again!' +email_invalid: '&cInvalid Email address, try again!' +email_added: '&2Email address successfully added to your account!' +email_confirm: '&cPlease confirm your email address!' +email_changed: '&2Email address changed correctly!' +email_send: '&2Recovery email sent correctly! Check your email inbox!' +email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' +country_banned: '&4Your country is banned from this server!' +antibot_auto_enabled: '&4[AntiBotService] AntiBot enabled due to the huge number of connections!' +antibot_auto_disabled: '&2[AntiBotService] AntiBot disabled disabled after %m minutes!' diff --git a/src/main/resources/messages/messages_es.yml b/src/main/resources/messages/messages_es.yml index 58b118e2c..e91e310e8 100644 --- a/src/main/resources/messages/messages_es.yml +++ b/src/main/resources/messages/messages_es.yml @@ -1,57 +1,58 @@ -add_email: '&cPor favor agrega tu e-mail con: /email add tuEmail confirmarEmail' -antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automáticamente luego de %m minutos. Esperamos que haya terminado' -antibot_auto_enabled: '[AuthMe] AntiBotMod activado automáticamente debido a conexiones masivas!' -country_banned: 'Tu país ha sido baneado de este servidor!' -email_added: '[AuthMe] Email agregado !' -email_changed: '[AuthMe] Email cambiado !' -email_confirm: '[AuthMe] Confirma tu Email !' -email_invalid: '[AuthMe] Email inválido' -email_send: '[AuthMe] Correo de recuperación enviado !' -error: '&fHa ocurrido un error. Por favor contacta al administrador.' -invalid_session: '&fLos datos de sesión no corresponden. Por favor espera a terminar la sesión.' -kick_forvip: '&cUn jugador VIP ha ingresado al servidor lleno!' -kick_fullserver: '&cEl servidor está lleno, lo sentimos!' -logged_in: '&c¡Ya has iniciado sesión!' -login: '&c¡Sesión iniciada!' -login_msg: '&cInicia sesión con "/login contraseña"' -logout: '&cDesconectado correctamente.' -max_reg: '&fHas excedido la cantidad máxima de registros para tu cuenta' -name_len: '&cTu nombre de usuario es muy largo o muy corto' -new_email_invalid: '[AuthMe] Nuevo email inválido!' -no_perm: '&cNo tienes permiso' +# This file must be in ANSI if win, or UTF-8 if linux. +unknown_user: '&fEl usuario no está en la base de datos' +unsafe_spawn: '&fTu lugar de desconexión es inseguro, teletransportándote al punto inicial del mundo' not_logged_in: '&c¡No has iniciado sesión!' -old_email_invalid: '[AuthMe] Email anterior inválido!' -pass_len: '&fTu contraseña es muy larga o muy corta' -password_error: '&fLas contraseñas no son iguales' +reg_voluntarily: '&fRegístrate con: "/register Contraseña ConfirmarContraseña"' +usage_log: '&cUso: /login contraseña' +wrong_pwd: '&cContraseña incorrecta' +unregistered: '&c¡Cuenta eliminada del registro!' +reg_disabled: '&cEl registro está desactivado' +valid_session: '&cInicio de sesión' password_error_nick: '&fYou can''t use your name as password' password_error_unsafe: '&fYou can''t use unsafe passwords' -pwd_changed: '&c¡Contraseña cambiada!' -recovery_email: '&c¿Olvidaste tu contraseña? Por favor usa /email recovery ' -reg_disabled: '&cEl registro está desactivado' -reg_email_msg: '&cPlease register with "/register "' -regex: '&cTu usuario tiene carácteres no admitidos, los cuales son: REG_EX' -registered: '&c¡Registrado correctamente!' +login: '&c¡Sesión iniciada!' +vb_nonActiv: '&fTu cuenta no está activada aún, ¡revisa tu correo!' +user_regged: '&cUsuario ya registrado' +usage_reg: '&cUso: /register Contraseña ConfirmarContraseña' +max_reg: '&fHas excedido la cantidad máxima de registros para tu cuenta' +no_perm: '&cNo tienes permiso' +error: '&fHa ocurrido un error. Por favor contacta al administrador.' +login_msg: '&cInicia sesión con "/login contraseña"' reg_msg: '&cPor favor, regístrate con "/register Contraseña ConfirmarContraseña"' +reg_email_msg: '&cPlease register with "/register "' +usage_unreg: '&cUso: /unregister contraseña' +pwd_changed: '&c¡Contraseña cambiada!' +user_unknown: '&cUsuario no registrado' +password_error: '&fLas contraseñas no son iguales' +invalid_session: '&fLos datos de sesión no corresponden. Por favor espera a terminar la sesión.' reg_only: '&f¡Sólo para jugadores registrados! Por favor visita http://www.example.com/ para registrarte' -reg_voluntarily: '&fRegístrate con: "/register Contraseña ConfirmarContraseña"' -reload: '&fLa configuración y la base de datos han sido recargados' +logged_in: '&c¡Ya has iniciado sesión!' +logout: '&cDesconectado correctamente.' same_nick: '&fYa hay un usuario con ese nick conectado (posible error)' +registered: '&c¡Registrado correctamente!' +pass_len: '&fTu contraseña es muy larga o muy corta' +reload: '&fLa configuración y la base de datos han sido recargados' timeout: '&fTiempo de espera para inicio de sesión excedido' -unknown_user: '&fEl usuario no está en la base de datos' -unregistered: '&c¡Cuenta eliminada del registro!' -unsafe_spawn: '&fTu lugar de desconexión es inseguro, teletransportándote al punto inicial del mundo' -usage_captcha: '&cUso: /captcha ' usage_changepassword: '&fUso: /changepw contraseñaaActual contraseñaNueva' +name_len: '&cTu nombre de usuario es muy largo o muy corto' +regex: '&cTu usuario tiene carácteres no admitidos, los cuales son: REG_EX' +add_email: '&cPor favor agrega tu e-mail con: /email add tuEmail confirmarEmail' +recovery_email: '&c¿Olvidaste tu contraseña? Por favor usa /email recovery ' +usage_captcha: '&cUso: /captcha ' +wrong_captcha: '&cCaptcha incorrecto, please use : /captcha EL_CAPTCHA' +valid_captcha: '&c¡ Captcha ingresado correctamente !' +kick_forvip: '&cUn jugador VIP ha ingresado al servidor lleno!' +kick_fullserver: '&cEl servidor está lleno, lo sentimos!' usage_email_add: '&fUso: /email add ' usage_email_change: '&fUso: /email change ' usage_email_recovery: '&fUso: /email recovery ' -usage_log: '&cUso: /login contraseña' -usage_reg: '&cUso: /register Contraseña ConfirmarContraseña' -usage_unreg: '&cUso: /unregister contraseña' -user_regged: '&cUsuario ya registrado' -user_unknown: '&cUsuario no registrado' -valid_captcha: '&c¡ Captcha ingresado correctamente !' -valid_session: '&cInicio de sesión' -vb_nonActiv: '&fTu cuenta no está activada aún, ¡revisa tu correo!' -wrong_captcha: '&cCaptcha incorrecto, please use : /captcha EL_CAPTCHA' -wrong_pwd: '&cContraseña incorrecta' +new_email_invalid: '[AuthMe] Nuevo email inválido!' +old_email_invalid: '[AuthMe] Email anterior inválido!' +email_invalid: '[AuthMe] Email inválido' +email_added: '[AuthMe] Email agregado !' +email_confirm: '[AuthMe] Confirma tu Email !' +email_changed: '[AuthMe] Email cambiado !' +email_send: '[AuthMe] Correo de recuperación enviado !' +country_banned: 'Tu país ha sido baneado de este servidor!' +antibot_auto_enabled: '[AuthMe] AntiBotMod activado automáticamente debido a conexiones masivas!' +antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automáticamente luego de %m minutos. Esperamos que haya terminado' diff --git a/src/main/resources/messages/messages_eu.yml b/src/main/resources/messages/messages_eu.yml index 0a5d65bc9..44d961de0 100644 --- a/src/main/resources/messages/messages_eu.yml +++ b/src/main/resources/messages/messages_eu.yml @@ -1,58 +1,58 @@ -add_email: '&cMesedez gehitu zure emaila : /email add yourEmail confirmEmail' -antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes,hope invasion stopped' -antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' -country_banned: '[AuthMe]Zure herrialdea blokeatuta dago zerbitzari honetan' -email_added: '[AuthMe] Emaila gehitu duzu !' -email_changed: '[AuthMe] Emaila aldatua!' -email_confirm: '[AuthMe] Konfirmatu zure emaila !' -email_exists: '[AuthMe] An email already exists on your account. You can change it using the command below' -email_invalid: '[AuthMe] Email okerrea' -email_send: '[AuthMe] Berreskuratze emaila bidalita !' -error: '&fErrorea; Mesedez jarri kontaktuan administratzaile batekin' -invalid_session: '&fSession Dataes doesnt corrispond Plaese wait the end of session' -kick_forvip: '&cVIP erabiltzaile bat sartu da zerbitzaria beteta zegoenean!' -kick_fullserver: '&cZerbitzaria beteta dago, Barkatu!' -logged_in: '&cDagoeneko saioa hasita!' -login: '&cOngi etorri!' -login_msg: '&cMesedez erabili "/login pasahitza" saioa hasteko' -logout: '&cAtera zara' -max_reg: '&fKontuko 2 erabiltzaile bakarrik izan ditzakezu' -name_len: '&cZure erabiltzaile izena motzegia edo luzeegia da' -new_email_invalid: '[AuthMe] Email okerra!' -no_perm: '&cBaimenik ez' +unknown_user: '&fErabiltzailea ez dago datu basean' +unsafe_spawn: '&fSpawn-era telegarraiatu zara' not_logged_in: '&cSaioa hasi gabe!' -old_email_invalid: '[AuthMe] Email zaharra okerra!' -pass_len: '&fZure pasahitza motzegia edo luzeegia da' +reg_voluntarily: '&fZure erabiltzailea erregistratu dezakezu:"/register pasahitza pasahitza"' +usage_log: '&cErabili: /login pasahitza' +wrong_pwd: '&cPasahitz okerra' +unregistered: '&cZure erregistroa ezabatu duzu!' +reg_disabled: '&cErregistroa desgaitua' +valid_session: '&cSession login' +login: '&cOngi etorri!' +vb_nonActiv: '&fZure kontua aktibatu gabe dago, konfirmatu zure emaila!' +user_regged: '&cErabiltzailea dagoeneko erregistratua' +usage_reg: '&cErabili: /register pasahitza pasahitza' +max_reg: '&fKontuko 2 erabiltzaile bakarrik izan ditzakezu' +no_perm: '&cBaimenik ez' +error: '&fErrorea; Mesedez jarri kontaktuan administratzaile batekin' +login_msg: '&cMesedez erabili "/login pasahitza" saioa hasteko' +reg_msg: '&cMesedez erabili "/register pasahitza pasahitza" erregistratzeko' +reg_email_msg: '&cMesdez erabili "/register " erregistratzeko' +usage_unreg: '&cErabili: /unregister password' +pwd_changed: '&cPasahitza aldatu duzu!' +user_unknown: '&cErabiltzailea ez dago erregistratuta' password_error: '&fPasahitzak ez datoz bat' password_error_nick: '&fYou can''t use your name as password, please choose another one' password_error_unsafe: '&fThe chosen password is not safe, please choose another one' -pwd_changed: '&cPasahitza aldatu duzu!' -recovery_email: '&cPasahitza ahaztu duzu? Erabili /email recovery ' -reg_disabled: '&cErregistroa desgaitua' -reg_email_msg: '&cMesdez erabili "/register " erregistratzeko' -regex: '&cZure erabiltzaileak karaktere debekatuak ditu. Karaktere onartuak: REG_EX' -registered: '&cOndo erregistratu zara!' -reg_msg: '&cMesedez erabili "/register pasahitza pasahitza" erregistratzeko' +invalid_session: '&fSession Dataes doesnt corrispond Plaese wait the end of session' reg_only: '&fErregistratuako erabiltzaileak bakarrik! Mesedez bisitatu http://example.com erregistratzeko' -reg_voluntarily: '&fZure erabiltzailea erregistratu dezakezu:"/register pasahitza pasahitza"' -reload: '&fConfiguration and database has been reloaded' +logged_in: '&cDagoeneko saioa hasita!' +logout: '&cAtera zara' same_nick: '&fZure izen berdina duen erabiltzaile bat zerbitzarian jolasten dago' +registered: '&cOndo erregistratu zara!' +pass_len: '&fZure pasahitza motzegia edo luzeegia da' +reload: '&fConfiguration and database has been reloaded' timeout: '&fDenbora gehiegi egon zara saioa hasi gabe' -unknown_user: '&fErabiltzailea ez dago datu basean' -unregistered: '&cZure erregistroa ezabatu duzu!' -unsafe_spawn: '&fSpawn-era telegarraiatu zara' -usage_captcha: '&cYou need to type a captcha, please type: /captcha ' usage_changepassword: '&fErabili: /changepassword pasahitzZaharra pasahitzBerria' +name_len: '&cZure erabiltzaile izena motzegia edo luzeegia da' +regex: '&cZure erabiltzaileak karaktere debekatuak ditu. Karaktere onartuak: REG_EX' +add_email: '&cMesedez gehitu zure emaila : /email add yourEmail confirmEmail' +recovery_email: '&cPasahitza ahaztu duzu? Erabili /email recovery ' +usage_captcha: '&cYou need to type a captcha, please type: /captcha ' +wrong_captcha: '&cWrong Captcha, please use : /captcha THE_CAPTCHA' +valid_captcha: '&cYour captcha is valid !' +kick_forvip: '&cVIP erabiltzaile bat sartu da zerbitzaria beteta zegoenean!' +kick_fullserver: '&cZerbitzaria beteta dago, Barkatu!' usage_email_add: '&fErabili: /email add ' usage_email_change: '&fErabili: /email change ' usage_email_recovery: '&fErabili: /email recovery ' -usage_log: '&cErabili: /login pasahitza' -usage_reg: '&cErabili: /register pasahitza pasahitza' -usage_unreg: '&cErabili: /unregister password' -user_regged: '&cErabiltzailea dagoeneko erregistratua' -user_unknown: '&cErabiltzailea ez dago erregistratuta' -valid_captcha: '&cYour captcha is valid !' -valid_session: '&cSession login' -vb_nonActiv: '&fZure kontua aktibatu gabe dago, konfirmatu zure emaila!' -wrong_captcha: '&cWrong Captcha, please use : /captcha THE_CAPTCHA' -wrong_pwd: '&cPasahitz okerra' +new_email_invalid: '[AuthMe] Email okerra!' +old_email_invalid: '[AuthMe] Email zaharra okerra!' +email_invalid: '[AuthMe] Email okerrea' +email_added: '[AuthMe] Emaila gehitu duzu !' +email_confirm: '[AuthMe] Konfirmatu zure emaila !' +email_changed: '[AuthMe] Emaila aldatua!' +email_send: '[AuthMe] Berreskuratze emaila bidalita !' +email_exists: '[AuthMe] An email already exists on your account. You can change it using the command below' +country_banned: '[AuthMe]Zure herrialdea blokeatuta dago zerbitzari honetan' +antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' +antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes,hope invasion stopped' diff --git a/src/main/resources/messages/messages_fi.yml b/src/main/resources/messages/messages_fi.yml index b62741970..be3779c7d 100644 --- a/src/main/resources/messages/messages_fi.yml +++ b/src/main/resources/messages/messages_fi.yml @@ -1,57 +1,57 @@ -add_email: '&cLisää sähköpostisi: /email add sähköpostisi sähköpostisiUudelleen' -antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' -antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' -country_banned: 'Your country is banned from this server' -email_added: '[AuthMe] Sähköposti lisätty!' -email_changed: '[AuthMe] Sähköposti vaihdettu!' -email_confirm: '[AuthMe] Vahvistuta sähköposti!' -email_invalid: '[AuthMe] Väärä sähköposti' -email_send: '[AuthMe] Palautus sähköposti lähetetty!' -error: '&fVirhe: Ota yhteys palveluntarjoojaan!' -invalid_session: '&fIstunto ei täsmää! Ole hyvä ja odota istunnon loppuun' -kick_forvip: '&cVIP pelaaja liittyi täyteen palvelimeen!' -kick_fullserver: '&cPalvelin on täynnä, Yritä pian uudelleen!' -logged_in: '&cOlet jo kirjautunut!' -login: '&cKirjauduit onnistuneesti' -login_msg: '&cKirjaudu palvelimmelle komennolla "/login salasana"' -logout: '&cKirjauduit ulos palvelimelta.' -max_reg: '&fSinulla ei ole oikeuksia tehdä enempää pelaajatilejä!' -name_len: '&cPelaajanimesi on liian lyhyt tai pitkä' -new_email_invalid: '[AuthMe] Uusi sähköposti on väärä!' -no_perm: '&cEi oikeuksia' +unknown_user: '&fKäyttäjä ei ole tietokannassa!' +unsafe_spawn: '&fHengenvaarallinen poistumispaikka! Siirsimme sinut spawnille!' not_logged_in: '&cEt ole kirjautunut sisään!' -old_email_invalid: '[AuthMe] Vanha sähköposti on väärä!' -pass_len: '&fSalasanasi on liian pitkä tai lyhyt.' -password_error: '&fSalasanat ei täsmää' +reg_voluntarily: '&fNyt voit rekisteröidä pelaajasi palvelimellemme: "/register salasana salasana"' +usage_log: '&cKäyttötapa: /login salasana' +wrong_pwd: '&cVäärä salasana' +unregistered: '&cPelaajatili poistettu onnistuneesti!' +reg_disabled: '&cRekisteröinti on suljettu!' +valid_session: '&cIstunto jatkettu!' +login: '&cKirjauduit onnistuneesti' +vb_nonActiv: '&fKäyttäjäsi ei ole vahvistettu!' +user_regged: '&cPelaaja on jo rekisteröity' +usage_reg: '&cKäyttötapa: /register salasana salasana' +max_reg: '&fSinulla ei ole oikeuksia tehdä enempää pelaajatilejä!' password_error_nick: '&fYou can''t use your name as password' password_error_unsafe: '&fYou can''t use unsafe passwords' -pwd_changed: '&cSalasana vaihdettu!!' -recovery_email: '&cUnohtuiko salasana? Käytä komentoa: /email recovery ' -reg_disabled: '&cRekisteröinti on suljettu!' -reg_email_msg: '&cRekisteröi sähköpostisi komennolla "/register "' -regex: '&cPelaajanimesi sisältää luvattomia merkkejä. Hyväksytyt merkit: REG_EX' -registered: '&cRekisteröidyit onnistuneesti!' +no_perm: '&cEi oikeuksia' +error: '&fVirhe: Ota yhteys palveluntarjoojaan!' +login_msg: '&cKirjaudu palvelimmelle komennolla "/login salasana"' reg_msg: '&cRekisteröidy palvelimellemme komennolla "/register salasana salasana"' +reg_email_msg: '&cRekisteröi sähköpostisi komennolla "/register "' +usage_unreg: '&cKäyttötapa: /unregister password' +pwd_changed: '&cSalasana vaihdettu!!' +user_unknown: '&cSalasanat eivät täsmää' +password_error: '&fSalasanat ei täsmää' +invalid_session: '&fIstunto ei täsmää! Ole hyvä ja odota istunnon loppuun' reg_only: '&fMene sivustolle: http://example.com rekisteröityäksesi!' -reg_voluntarily: '&fNyt voit rekisteröidä pelaajasi palvelimellemme: "/register salasana salasana"' -reload: '&fAsetukset uudelleenladattu' +logged_in: '&cOlet jo kirjautunut!' +logout: '&cKirjauduit ulos palvelimelta.' same_nick: '&COlet jo palvelimella! &COdota käyttäjän aikakatkaisua tai ota yhteyttä palveluntarjoojaan.' +registered: '&cRekisteröidyit onnistuneesti!' +pass_len: '&fSalasanasi on liian pitkä tai lyhyt.' +reload: '&fAsetukset uudelleenladattu' timeout: '&fKirjautumisaika meni umpeen.' -unknown_user: '&fKäyttäjä ei ole tietokannassa!' -unregistered: '&cPelaajatili poistettu onnistuneesti!' -unsafe_spawn: '&fHengenvaarallinen poistumispaikka! Siirsimme sinut spawnille!' -usage_captcha: '&cKäyttötapa: /captcha ' usage_changepassword: '&fKäyttötapa: /changepassword vanhaSalasana uusiSalasana' +name_len: '&cPelaajanimesi on liian lyhyt tai pitkä' +regex: '&cPelaajanimesi sisältää luvattomia merkkejä. Hyväksytyt merkit: REG_EX' +add_email: '&cLisää sähköpostisi: /email add sähköpostisi sähköpostisiUudelleen' +recovery_email: '&cUnohtuiko salasana? Käytä komentoa: /email recovery ' +usage_captcha: '&cKäyttötapa: /captcha ' +wrong_captcha: '&cVäärä varmistus, käytä : /captcha CAPTCHA' +valid_captcha: '&cSinun varmistus onnistui.!' +kick_forvip: '&cVIP pelaaja liittyi täyteen palvelimeen!' +kick_fullserver: '&cPalvelin on täynnä, Yritä pian uudelleen!' usage_email_add: '&fKäyttötapa: /email add ' usage_email_change: '&fKäyttötapa: /email change ' usage_email_recovery: '&fKäyttötapa: /email recovery ' -usage_log: '&cKäyttötapa: /login salasana' -usage_reg: '&cKäyttötapa: /register salasana salasana' -usage_unreg: '&cKäyttötapa: /unregister password' -user_regged: '&cPelaaja on jo rekisteröity' -user_unknown: '&cSalasanat eivät täsmää' -valid_captcha: '&cSinun varmistus onnistui.!' -valid_session: '&cIstunto jatkettu!' -vb_nonActiv: '&fKäyttäjäsi ei ole vahvistettu!' -wrong_captcha: '&cVäärä varmistus, käytä : /captcha CAPTCHA' -wrong_pwd: '&cVäärä salasana' +new_email_invalid: '[AuthMe] Uusi sähköposti on väärä!' +old_email_invalid: '[AuthMe] Vanha sähköposti on väärä!' +email_invalid: '[AuthMe] Väärä sähköposti' +email_added: '[AuthMe] Sähköposti lisätty!' +email_confirm: '[AuthMe] Vahvistuta sähköposti!' +email_changed: '[AuthMe] Sähköposti vaihdettu!' +email_send: '[AuthMe] Palautus sähköposti lähetetty!' +country_banned: 'Your country is banned from this server' +antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' +antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' diff --git a/src/main/resources/messages/messages_fr.yml b/src/main/resources/messages/messages_fr.yml index 8e25f0eb9..51a2a53af 100644 --- a/src/main/resources/messages/messages_fr.yml +++ b/src/main/resources/messages/messages_fr.yml @@ -1,57 +1,58 @@ -add_email: '&cMerci d''ajouter votre email : /email add yourEmail confirmEmail' -antibot_auto_disabled: '[AuthMe] AntiBotMod a été désactivé automatiquement après %m Minutes, espérons que l''invasion soit arrêtée!' -antibot_auto_enabled: '[AuthMe] AntiBotMod a été activé automatiquement à cause de nombreuses connections!' -country_banned: 'Votre pays est banni de ce serveur' -email_added: '[AuthMe] Email ajouté !' -email_changed: '[AuthMe] Email changé !' -email_confirm: '[AuthMe] Confirmez votre email !' -email_invalid: '[AuthMe] Email invalide' -email_send: '[AuthMe] Email de récupération envoyé!' -error: '&fUne erreur est apparue, veuillez contacter un administrateur' -invalid_session: '&fSession invalide, relancez le jeu ou attendez la fin de la session' -kick_forvip: '&cUn joueur VIP a rejoint le serveur plein!' -kick_fullserver: '&cLe serveur est actuellement plein, désolé!' -logged_in: '&cVous êtes déjà connecté!' -login: '&cConnection effectuée!' -login_msg: '&cPour vous connecter, utilisez: /login motdepasse' -logout: '&cVous avez été déconnecté!' -max_reg: '&fLimite d''enregistrement atteinte pour ce compte' -name_len: '&cVotre pseudo est trop long ou trop court' -new_email_invalid: '[AuthMe] Nouvel email invalide!' -no_perm: '&cVous n''avez pas la permission' +# Traduction par: André +unknown_user: '&fUtilisateur non enregistré' +unsafe_spawn: '&fTéléportation dans un endroit sûr' not_logged_in: '&cNon connecté!' -old_email_invalid: '[AuthMe] Ancien email invalide!' -pass_len: '&fVotre mot de passe n''est pas assez long..' -password_error: '&fCe mot de passe est incorrect' +reg_voluntarily: '&fVous venez d''arriver? faites un "/register motdepasse confirmermotdepasse"' +usage_log: '&cUtilisez: /login motdepasse' +wrong_pwd: '&cMauvais MotdePasse' +unregistered: '&cCe compte a été supprimé!' +reg_disabled: '&cL''enregistrement est désactivé' +valid_session: '&cVous êtes authentifié' +login: '&cConnection effectuée!' +vb_nonActiv: '&fCe compte n''est pas actif, consultez vos emails!' +user_regged: '&cCe nom est deja utilisé..' +usage_reg: '&cUtilisez la commande /register motdepasse confirmermotdepasse' +max_reg: '&fLimite d''enregistrement atteinte pour ce compte' +no_perm: '&cVous n''avez pas la permission' password_error_nick: '&fYou can''t use your name as password' password_error_unsafe: '&fYou can''t use unsafe passwords' -pwd_changed: '&cMotdePasse changé avec succès!' -recovery_email: '&cVous avez oublié votre MotdePasse? Utilisez /email recovery ' -reg_disabled: '&cL''enregistrement est désactivé' -reg_email_msg: '&cPour vous inscrire, utilisez "/register "' -regex: '&cCaractères autorisés: REG_EX' -registered: '&cEnregistrement réussi avec succès!' +error: '&fUne erreur est apparue, veuillez contacter un administrateur' +login_msg: '&cPour vous connecter, utilisez: /login motdepasse' reg_msg: '&cPour vous inscrire, utilisez "/register motdepasse confirmermotdepasse"' +reg_email_msg: '&cPour vous inscrire, utilisez "/register "' +usage_unreg: '&cPour supprimer ce compte, utilisez: /unregister password' +pwd_changed: '&cMotdePasse changé avec succès!' +user_unknown: '&c Ce compte n''est pas enregistré' +password_error: '&fCe mot de passe est incorrect' +invalid_session: '&fSession invalide, relancez le jeu ou attendez la fin de la session' reg_only: '&fSeul les joueurs enregistré sont admis!' -reg_voluntarily: '&fVous venez d''arriver? faites un "/register motdepasse confirmermotdepasse"' -reload: '&fConfiguration et BDD relancé avec succès' +logged_in: '&cVous êtes déjà connecté!' +logout: '&cVous avez été déconnecté!' same_nick: '&fUne personne ayant ce même pseudo joue déjà..' +registered: '&cEnregistrement réussi avec succès!' +pass_len: '&fVotre mot de passe n''est pas assez long..' +reload: '&fConfiguration et BDD relancé avec succès' timeout: '&fVous avez été expulsé car vous êtes trop lent pour vous enregistrer !' -unknown_user: '&fUtilisateur non enregistré' -unregistered: '&cCe compte a été supprimé!' -unsafe_spawn: '&fTéléportation dans un endroit sûr' -usage_captcha: '&cTrop de tentatives de connexion échouées, utilisez: /captcha ' usage_changepassword: '&fPour changer de mot de passe, utilisez: /changepassword ancienmdp nouveaumdp' +name_len: '&cVotre pseudo est trop long ou trop court' +regex: '&cCaractères autorisés: REG_EX' +add_email: '&cMerci d''ajouter votre email : /email add yourEmail confirmEmail' +recovery_email: '&cVous avez oublié votre MotdePasse? Utilisez /email recovery ' +usage_captcha: '&cTrop de tentatives de connexion échouées, utilisez: /captcha ' +wrong_captcha: '&cCaptcha incorrect, écrivez de nouveau : /captcha THE_CAPTCHA' +valid_captcha: '&cLe Captcha est valide, merci!' +kick_forvip: '&cUn joueur VIP a rejoint le serveur plein!' +kick_fullserver: '&cLe serveur est actuellement plein, désolé!' usage_email_add: '&fUsage: /email add ' usage_email_change: '&fUsage: /email change ' usage_email_recovery: '&fUsage: /email recovery ' -usage_log: '&cUtilisez: /login motdepasse' -usage_reg: '&cUtilisez la commande /register motdepasse confirmermotdepasse' -usage_unreg: '&cPour supprimer ce compte, utilisez: /unregister password' -user_regged: '&cCe nom est deja utilisé..' -user_unknown: '&c Ce compte n''est pas enregistré' -valid_captcha: '&cLe Captcha est valide, merci!' -valid_session: '&cVous êtes authentifié' -vb_nonActiv: '&fCe compte n''est pas actif, consultez vos emails!' -wrong_captcha: '&cCaptcha incorrect, écrivez de nouveau : /captcha THE_CAPTCHA' -wrong_pwd: '&cMauvais MotdePasse' +new_email_invalid: '[AuthMe] Nouvel email invalide!' +old_email_invalid: '[AuthMe] Ancien email invalide!' +email_invalid: '[AuthMe] Email invalide' +email_added: '[AuthMe] Email ajouté !' +email_confirm: '[AuthMe] Confirmez votre email !' +email_changed: '[AuthMe] Email changé !' +email_send: '[AuthMe] Email de récupération envoyé!' +country_banned: 'Votre pays est banni de ce serveur' +antibot_auto_enabled: '[AuthMe] AntiBotMod a été activé automatiquement à cause de nombreuses connections!' +antibot_auto_disabled: '[AuthMe] AntiBotMod a été désactivé automatiquement après %m Minutes, espérons que l''invasion soit arrêtée!' diff --git a/src/main/resources/messages/messages_gl.yml b/src/main/resources/messages/messages_gl.yml index ee8969676..2ead0316e 100644 --- a/src/main/resources/messages/messages_gl.yml +++ b/src/main/resources/messages/messages_gl.yml @@ -1,59 +1,59 @@ -add_email: '&cPor favor, engade o teu correo electrónico con: /email add ' -antibot_auto_disabled: '[AuthMe] AntiBotMod desactivouse automáticamente despois de %m minutos, -antibot_auto_enabled: '[AuthMe] AntiBotMod conectouse automáticamente debido a conexións masivas!' -country_banned: 'O teu país está bloqueado neste servidor' -email_added: '[AuthMe] Correo engadido!' -email_changed: '[AuthMe] Cambiouse o correo!' -email_confirm: '[AuthMe] Confirma o teu correo!' -email_invalid: '[AuthMe] Correo non válido' -email_send: '[AuthMe] Enviouse o correo de confirmación!' -error: '&fOcurriu un erro; contacta cun administrador' - esperemos que a invasión se detivera' -invalid_session: '&fOs datos de sesión non corresponden, por favor, espere a que remate a sesión' -kick_forvip: '&cUn xogador VIP uniuse ao servidor cheo!' -kick_fullserver: '&cO servidor está actualmente cheo, sentímolo!' -logged_in: '&cXa estás identificado!' -login: '&cIdentificación con éxito!' -login_msg: '&cPor favor, identifícate con "/login "' -logout: '&cSesión pechada con éxito' -max_reg: '&fExcediches o máximo de rexistros para a túa Conta' -name_len: '&cO teu nome é demasiado curto ou demasiado longo' -new_email_invalid: '[AuthMe] O novo correo non é válido!' -no_perm: '&cNon tes o permiso' +unknown_user: '&fO usuario non está na base de datos' +unsafe_spawn: '&fA localización dende a que saíches era insegura, teletransportándote ao spawn do mundo' not_logged_in: '&cNon te identificaches!' -old_email_invalid: '[AuthMe] O correo vello non é válido!' -pass_len: '&fO teu contrasinal non alcanza a lonxitude mínima ou excede a lonxitude máxima' -password_error: '&fO contrasinal non coincide' +reg_voluntarily: '&fPodes rexistrar o teu nome no servidor co comando + "/register "' +usage_log: '&cUso: /login ' +wrong_pwd: '&cContrasinal equivocado' +unregistered: '&cFeito! Xa non estás rexistrado!' password_error_nick: '&fYou can''t use your name as password' password_error_unsafe: '&fYou can''t use unsafe passwords' -pwd_changed: '&cCambiouse o contrasinal!' -recovery_email: '&cOlvidaches o contrasinal? Por favor, usa /email recovery ' reg_disabled: '&cO rexistro está deshabilitado' -reg_email_msg: '&cPor favor, rexístrate con "/register "' -regex: '&cO teu nome contén caracteres ilegais. Caracteres permitidos: REG_EX' - "/register "' -registered: '&cRexistrado con éxito!' +valid_session: '&cIdentificado mediante a sesión' +login: '&cIdentificación con éxito!' +vb_nonActiv: '&fA túa conta aínda non está activada, comproba a túa bandexa de correo!!' +user_regged: '&cEse nome de usuario xa está rexistrado' +usage_reg: '&cUso: /register contrasinal confirmarContrasinal' +max_reg: '&fExcediches o máximo de rexistros para a túa Conta' +no_perm: '&cNon tes o permiso' +error: '&fOcurriu un erro; contacta cun administrador' +login_msg: '&cPor favor, identifícate con "/login "' reg_msg: '&cPor favor, rexístrate con "/register "' +reg_email_msg: '&cPor favor, rexístrate con "/register "' +usage_unreg: '&cUso: /unregister ' +pwd_changed: '&cCambiouse o contrasinal!' +user_unknown: '&cEse nome de usuario non está rexistrado' +password_error: '&fO contrasinal non coincide' +invalid_session: '&fOs datos de sesión non corresponden, por favor, espere a que remate a sesión' reg_only: '&fSó xogadores rexistrados! Por favor, visita http://example.com para rexistrarte' -reg_voluntarily: '&fPodes rexistrar o teu nome no servidor co comando -reload: '&fRecargáronse a configuración e a base de datos' +logged_in: '&cXa estás identificado!' +logout: '&cSesión pechada con éxito' same_nick: '&fXa está xogando alguén co mesmo nome' +registered: '&cRexistrado con éxito!' +pass_len: '&fO teu contrasinal non alcanza a lonxitude mínima ou excede a lonxitude máxima' +reload: '&fRecargáronse a configuración e a base de datos' timeout: '&fRematou o tempo da autentificación' -unknown_user: '&fO usuario non está na base de datos' -unregistered: '&cFeito! Xa non estás rexistrado!' -unsafe_spawn: '&fA localización dende a que saíches era insegura, teletransportándote ao spawn do mundo' -usage_captcha: '&cNecesitas escribir un captcha, por favor escribe: /captcha ' usage_changepassword: '&fUso: /changepassword ' +name_len: '&cO teu nome é demasiado curto ou demasiado longo' +regex: '&cO teu nome contén caracteres ilegais. Caracteres permitidos: REG_EX' +add_email: '&cPor favor, engade o teu correo electrónico con: /email add ' +recovery_email: '&cOlvidaches o contrasinal? Por favor, usa /email recovery ' +usage_captcha: '&cNecesitas escribir un captcha, por favor escribe: /captcha ' +wrong_captcha: '&cCaptcha equivocado, por favor usa: /captcha THE_CAPTCHA' +valid_captcha: '&cO teu captcha é válido !' +kick_forvip: '&cUn xogador VIP uniuse ao servidor cheo!' +kick_fullserver: '&cO servidor está actualmente cheo, sentímolo!' usage_email_add: '&fUso: /email add ' usage_email_change: '&fUso: /email change ' usage_email_recovery: '&fUso: /email recovery ' -usage_log: '&cUso: /login ' -usage_reg: '&cUso: /register contrasinal confirmarContrasinal' -usage_unreg: '&cUso: /unregister ' -user_regged: '&cEse nome de usuario xa está rexistrado' -user_unknown: '&cEse nome de usuario non está rexistrado' -valid_captcha: '&cO teu captcha é válido !' -valid_session: '&cIdentificado mediante a sesión' -vb_nonActiv: '&fA túa conta aínda non está activada, comproba a túa bandexa de correo!!' -wrong_captcha: '&cCaptcha equivocado, por favor usa: /captcha THE_CAPTCHA' -wrong_pwd: '&cContrasinal equivocado' +new_email_invalid: '[AuthMe] O novo correo non é válido!' +old_email_invalid: '[AuthMe] O correo vello non é válido!' +email_invalid: '[AuthMe] Correo non válido' +email_added: '[AuthMe] Correo engadido!' +email_confirm: '[AuthMe] Confirma o teu correo!' +email_changed: '[AuthMe] Cambiouse o correo!' +email_send: '[AuthMe] Enviouse o correo de confirmación!' +country_banned: 'O teu país está bloqueado neste servidor' +antibot_auto_enabled: '[AuthMe] AntiBotMod conectouse automáticamente debido a conexións masivas!' +antibot_auto_disabled: '[AuthMe] AntiBotMod desactivouse automáticamente despois de %m minutos, + esperemos que a invasión se detivera' diff --git a/src/main/resources/messages/messages_hu.yml b/src/main/resources/messages/messages_hu.yml index 0dd9f0f54..68fde4d1f 100644 --- a/src/main/resources/messages/messages_hu.yml +++ b/src/main/resources/messages/messages_hu.yml @@ -1,57 +1,57 @@ -add_email: '&cPlease add your email with : /email add yourEmail confirmEmail' -antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' -antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' -country_banned: 'Your country is banned from this server' -email_added: '[AuthMe] Email Added !' -email_changed: '[AuthMe] Email Change !' -email_confirm: '[AuthMe] Confirm your Email !' -email_invalid: '[AuthMe] Invalid Email' -email_send: '[AuthMe] Recovery Email Send !' -error: Hiba lépett fel; Lépj kapcsolatba a tulajjal' -invalid_session: Session Dataes doesnt corrispond Plaese wait the end of session -kick_forvip: '&cA VIP Player join the full server!' -kick_fullserver: '&cThe server is actually full, Sorry!' -logged_in: '&cMár be vagy jelentkezve!' -login: '&aSikeresen Beléptél! Üdvözöllek!!!' +reg_only: Csak regisztrált játékosoknak! Jelentkezni a yndicraft@freemail.hu e-mail címen lehet +usage_unreg: '&cHasználat: /unregister jelszó' +registered: '&aSikeres regisztráció. Üdvözöllek!' +user_regged: '&cJátékosnév már regisztrálva' login_msg: '&cKérlek jelentkezz be: "/login jelszó"' -logout: '&cSikeresen kijelentkeztél' -max_reg: Csak egy karakterrel Registrálhatsz!!! -name_len: '&cYour nickname is too Short or too long' -new_email_invalid: '[AuthMe] New email invalid!' -no_perm: '&cNincs engedélyed' not_logged_in: '&cNem vagy bejelentkezve!' -old_email_invalid: '[AuthMe] Old email invalid!' -pass_len: A jelszavad nem éri el a minimális hosszat -password_error: A jelszó nem illik össze +logout: '&cSikeresen kijelentkeztél' +usage_log: '&cBejelentkezés: /login jelszó' +unknown_user: User is not in database +reg_voluntarily: Regisztrálhatod beceneved a szerveren a következö parancsal "/register jelszó jelszó" +reg_disabled: '&cRegisztráció letiltva' +no_perm: '&cNincs engedélyed' +usage_reg: '&cHasználat: /register jelszó jelszóújra' password_error_nick: '&fYou can''t use your name as password' password_error_unsafe: '&fYou can''t use unsafe passwords' -pwd_changed: '&cJelszó cserélve!' -recovery_email: '&cForgot your password? Please use /email recovery ' -reg_disabled: '&cRegisztráció letiltva' -reg_email_msg: '&cPlease register with "/register "' -regex: '&cYour nickname contains illegal characters. Allowed chars: REG_EX' -registered: '&aSikeres regisztráció. Üdvözöllek!' -reg_msg: '&cKérlek Regisztrálj: "/register jelszó jelszóújra"' -reg_only: Csak regisztrált játékosoknak! Jelentkezni a yndicraft@freemail.hu e-mail címen lehet -reg_voluntarily: Regisztrálhatod beceneved a szerveren a következö parancsal "/register jelszó jelszó" -reload: Beálítások és adatbázis újratöltve! -same_nick: Ezen a játékosnéven már játszanak -timeout: Bejelentkezési idötúllépés -unknown_user: User is not in database unregistered: '&cRegisztráció sikeresen törölve!' +same_nick: Ezen a játékosnéven már játszanak +valid_session: '&cSession login' +pwd_changed: '&cJelszó cserélve!' +reload: Beálítások és adatbázis újratöltve! +timeout: Bejelentkezési idötúllépés +error: Hiba lépett fel; Lépj kapcsolatba a tulajjal' +logged_in: '&cMár be vagy jelentkezve!' +login: '&aSikeresen Beléptél! Üdvözöllek!!!' +wrong_pwd: '&4Hibás jelszó' +user_unknown: '&cJátékosnév nem regisztrált' +reg_msg: '&cKérlek Regisztrálj: "/register jelszó jelszóújra"' +reg_email_msg: '&cPlease register with "/register "' unsafe_spawn: A kilépési helyzeted nem biztonságos, teleportálás a kezdö Spawnra. -usage_captcha: '&cUsage: /captcha ' +max_reg: Csak egy karakterrel Registrálhatsz!!! +password_error: A jelszó nem illik össze +invalid_session: Session Dataes doesnt corrispond Plaese wait the end of session +pass_len: A jelszavad nem éri el a minimális hosszat +vb_nonActiv: Your Account isent Activated yet check your Emails! usage_changepassword: 'használat: /changepassword régiJelszó újJelszó' +name_len: '&cYour nickname is too Short or too long' +regex: '&cYour nickname contains illegal characters. Allowed chars: REG_EX' +add_email: '&cPlease add your email with : /email add yourEmail confirmEmail' +recovery_email: '&cForgot your password? Please use /email recovery ' +usage_captcha: '&cUsage: /captcha ' +wrong_captcha: '&cWrong Captcha, please use : /captcha THE_CAPTCHA' +valid_captcha: '&cYour captcha is valid !' +kick_forvip: '&cA VIP Player join the full server!' +kick_fullserver: '&cThe server is actually full, Sorry!' usage_email_add: '&fUsage: /email add ' usage_email_change: '&fUsage: /email change ' usage_email_recovery: '&fUsage: /email recovery ' -usage_log: '&cBejelentkezés: /login jelszó' -usage_reg: '&cHasználat: /register jelszó jelszóújra' -usage_unreg: '&cHasználat: /unregister jelszó' -user_regged: '&cJátékosnév már regisztrálva' -user_unknown: '&cJátékosnév nem regisztrált' -valid_captcha: '&cYour captcha is valid !' -valid_session: '&cSession login' -vb_nonActiv: Your Account isent Activated yet check your Emails! -wrong_captcha: '&cWrong Captcha, please use : /captcha THE_CAPTCHA' -wrong_pwd: '&4Hibás jelszó' +new_email_invalid: '[AuthMe] New email invalid!' +old_email_invalid: '[AuthMe] Old email invalid!' +email_invalid: '[AuthMe] Invalid Email' +email_added: '[AuthMe] Email Added !' +email_confirm: '[AuthMe] Confirm your Email !' +email_changed: '[AuthMe] Email Change !' +email_send: '[AuthMe] Recovery Email Send !' +country_banned: 'Your country is banned from this server' +antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' +antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' diff --git a/src/main/resources/messages/messages_id.yml b/src/main/resources/messages/messages_id.yml index 63e115288..2b183f3d1 100644 --- a/src/main/resources/messages/messages_id.yml +++ b/src/main/resources/messages/messages_id.yml @@ -1,58 +1,58 @@ -add_email: '&3Silahkan tambahkan email ke akunmu menggunakan command "/email add "' -antibot_auto_disabled: '&2[AntiBotService] AntiBot dimatikan setelah %m menit!' -antibot_auto_enabled: '&4[AntiBotService] AntiBot diaktifkan dikarenakan banyak koneksi yg diterima!' -country_banned: '&4Your country is banned from this server!' -email_added: '&2Berhasil menambahkan alamat email ke akunmu!' -email_changed: '&2Alamat email telah diubah dengan benar!' -email_confirm: '&cSilahkan konfirmasi alamat email kamu!' -email_exists: '&cEmail pemulihan sudah dikirim! kamu bisa membatalkan dan mengirimkan yg baru dengan command dibawah:' -email_invalid: '&cAlamat email tidak valid, coba lagi!' -email_send: '&2Email pemulihan akun telah dikirim! Silahkan periksa kotak masuk emailmu!' -error: '&4Terjadi kesalahan tak dikenal, silahkan hubungi Administrator!' -invalid_session: '&cIP kamu telah berubah, dan sesi kamu telah berakhir!' -kick_forvip: '&3Player VIP mencoba masuk pada saat server sedang penuh!' -kick_fullserver: '&4Server sedang penuh, silahkan coba lagi nanti!' -logged_in: '&cKamu telah login!' -login: '&2Login berhasil!' -login_msg: '&cSilahkan login menggunakan command "/login "' -logout: '&2Berhasil logout!' -max_reg: '&Kamu telah mencapai batas maksimum pendaftaran di server ini!' -name_len: '&4Username kamu terlalu panjang atau terlalu pendek!' -new_email_invalid: '&cEmail baru tidak valid, coba lagi!' -no_perm: '&4Kamu tidak mempunyai izin melakukan ini!' +unknown_user: '&cTidak dapat menemukan user yg diminta di database!' +unsafe_spawn: '&cLokasi quit kamu tidak aman, kamu telah diteleport ke titik spawn world.' not_logged_in: '&cKamu belum login!' -old_email_invalid: '&cEmail lama tidak valid, coba lagi!' -pass_len: '&cPassword kamu terlalu panjang/pendek! Silahkan pilih yg lain!' +reg_voluntarily: 'Kamu bisa register menggunakan command "/register "' +usage_log: '&cUsage: /login ' +wrong_pwd: '&cPassword salah!' +unregistered: '&cUnregister berhasil!' +reg_disabled: '&cRegister dalam game tidak diaktifkan!' +valid_session: '&2Otomatis login, karena sesi masih terhubung.' +login: '&2Login berhasil!' +vb_nonActiv: '&cAkunmu belum diaktifkan, silahkan periksa email kamu!' +user_regged: '&cKamu telah mendaftarkan username ini!' +usage_reg: '&cUsage: /register ' +max_reg: '&Kamu telah mencapai batas maksimum pendaftaran di server ini!' +no_perm: '&4Kamu tidak mempunyai izin melakukan ini!' +error: '&4Terjadi kesalahan tak dikenal, silahkan hubungi Administrator!' +login_msg: '&cSilahkan login menggunakan command "/login "' +reg_msg: '&3Silahkan mendaftar ke server menggunakan command "/register "' +reg_email_msg: '&3Silahkan mendaftar ke server menggunakan command "/register "' +usage_unreg: '&cUsage: /unregister ' +pwd_changed: '&2Berhasil mengubah password!' +user_unknown: '&cUser ini belum terdaftar!' password_error: '&cPassword tidak cocok, silahkan periksa dan ulangi kembali!' password_error_nick: '&cKamu tidak bisa menggunakan namamu sebagai password, silahkan coba yg lain...' password_error_unsafe: '&cPassword yg kamu pilih tidak aman, silahkan coba yg lain...' -pwd_changed: '&2Berhasil mengubah password!' -recovery_email: '&3Lupa password? silahkan gunakan command "/email recovery "' -reg_disabled: '&cRegister dalam game tidak diaktifkan!' -reg_email_msg: '&3Silahkan mendaftar ke server menggunakan command "/register "' -regex: '&4Username kamu mengandung karakter illegal. Karakter yg diijinkan: REG_EX' -registered: '&2Register berhasil!' -reg_msg: '&3Silahkan mendaftar ke server menggunakan command "/register "' +invalid_session: '&cIP kamu telah berubah, dan sesi kamu telah berakhir!' reg_only: '&4Hanya pengguna terdaftar yg bisa bergabung! Silahkan kunjungi http://example.com untuk mendaftar!' -reg_voluntarily: 'Kamu bisa register menggunakan command "/register "' -reload: '&2Konfigurasi dan database telah dimuat ulang!' +logged_in: '&cKamu telah login!' +logout: '&2Berhasil logout!' same_nick: '&4Username yg sama telah bermain di server ini!' +registered: '&2Register berhasil!' +pass_len: '&cPassword kamu terlalu panjang/pendek! Silahkan pilih yg lain!' +reload: '&2Konfigurasi dan database telah dimuat ulang!' timeout: '&4Jangka waktu login telah habis, kamu di keluarkan dari server. Silahkan coba lagi!' -unknown_user: '&cTidak dapat menemukan user yg diminta di database!' -unregistered: '&cUnregister berhasil!' -unsafe_spawn: '&cLokasi quit kamu tidak aman, kamu telah diteleport ke titik spawn world.' -usage_captcha: '&3Kamu harus menyelesaikan kode captcha untuk login, silahkan gunakan command "/captcha "' usage_changepassword: '&cUsage: /changepassword ' +name_len: '&4Username kamu terlalu panjang atau terlalu pendek!' +regex: '&4Username kamu mengandung karakter illegal. Karakter yg diijinkan: REG_EX' +add_email: '&3Silahkan tambahkan email ke akunmu menggunakan command "/email add "' +recovery_email: '&3Lupa password? silahkan gunakan command "/email recovery "' +usage_captcha: '&3Kamu harus menyelesaikan kode captcha untuk login, silahkan gunakan command "/captcha "' +wrong_captcha: '&cCaptcha salah, gunakan command "/captcha THE_CAPTCHA" pada chat!' +valid_captcha: '&2Kode captcha terselesaikan!' +kick_forvip: '&3Player VIP mencoba masuk pada saat server sedang penuh!' +kick_fullserver: '&4Server sedang penuh, silahkan coba lagi nanti!' usage_email_add: '&cUsage: /email add ' usage_email_change: '&cUsage: /email change ' usage_email_recovery: '&cUsage: /email recovery ' -usage_log: '&cUsage: /login ' -usage_reg: '&cUsage: /register ' -usage_unreg: '&cUsage: /unregister ' -user_regged: '&cKamu telah mendaftarkan username ini!' -user_unknown: '&cUser ini belum terdaftar!' -valid_captcha: '&2Kode captcha terselesaikan!' -valid_session: '&2Otomatis login, karena sesi masih terhubung.' -vb_nonActiv: '&cAkunmu belum diaktifkan, silahkan periksa email kamu!' -wrong_captcha: '&cCaptcha salah, gunakan command "/captcha THE_CAPTCHA" pada chat!' -wrong_pwd: '&cPassword salah!' +new_email_invalid: '&cEmail baru tidak valid, coba lagi!' +old_email_invalid: '&cEmail lama tidak valid, coba lagi!' +email_invalid: '&cAlamat email tidak valid, coba lagi!' +email_added: '&2Berhasil menambahkan alamat email ke akunmu!' +email_confirm: '&cSilahkan konfirmasi alamat email kamu!' +email_changed: '&2Alamat email telah diubah dengan benar!' +email_send: '&2Email pemulihan akun telah dikirim! Silahkan periksa kotak masuk emailmu!' +email_exists: '&cEmail pemulihan sudah dikirim! kamu bisa membatalkan dan mengirimkan yg baru dengan command dibawah:' +country_banned: '&4Your country is banned from this server!' +antibot_auto_enabled: '&4[AntiBotService] AntiBot diaktifkan dikarenakan banyak koneksi yg diterima!' +antibot_auto_disabled: '&2[AntiBotService] AntiBot dimatikan setelah %m menit!' diff --git a/src/main/resources/messages/messages_it.yml b/src/main/resources/messages/messages_it.yml index 76b59b21a..4e4a0fa91 100644 --- a/src/main/resources/messages/messages_it.yml +++ b/src/main/resources/messages/messages_it.yml @@ -1,58 +1,58 @@ -add_email: '&cPer poter recuperare la password in futuro, aggiungi un indirizzo email al tuo account con il comando: "/email add "' -antibot_auto_disabled: "Il servizio di AntiBot è stato automaticamente disabilitato dopo %m Minuti, sperando che l'attacco sia finito!" -antibot_auto_enabled: 'Il servizio di AntiBot è stato automaticamente abilitato a seguito delle numerose connessioni!' -country_banned: 'Il tuo paese è bandito da questo server!' -email_added: 'Indirizzo email aggiunto correttamente!' -email_changed: 'Indirizzo email cambiato correttamente!' -email_confirm: 'Conferma il tuo indirizzo email!' -email_exists: 'Il tuo account ha già un''indirizzo email configurato. Se vuoi, puoi cambiarlo con il seguente comando:' -email_invalid: 'L''indirizzo email inserito non è valido' -email_send: 'Una email di recupero è stata appena inviata al tuo indirizzo email!' -error: 'Qualcosa è andato storto, riporta questo errore ad un Admin!' -invalid_session: 'I tuoi dati di connessione attuali non sono quelli utilizzati in precedenza. Attendi la fine della sessione attuale.' -kick_forvip: '&cUn utente VIP è entrato mentre il server era pieno e ha preso il tuo posto!' -kick_fullserver: '&cIl server è attualmente pieno, riprova più tardi!' -logged_in: '&cHai già eseguito l''autenticazione, non devi eseguirla nuovamente!' -login: '&cAutenticazone effettuata correttamente!' -login_msg: '&cPerfavore, esegui l''autenticazione con il comando: "/login "' -logout: '&cDisconnessione avvenuta correttamente!' -max_reg: 'Hai raggiunto il numero massimo di registrazioni per questo indirizzo IP!' -name_len: '&cIl tuo nome utente è troppo corto o troppo lungo!' -new_email_invalid: 'Il nuovo indirizzo email inserito non è valido!' -no_perm: '&cNon hai il permesso di eseguire questa operazione.' +unknown_user: 'L''utente non è presente nel database.' +unsafe_spawn: 'Il tuo punto di disconnessione risulta ostruito o insicuro, sei stato teletrasportato al punto di rigenerazione!' not_logged_in: '&cNon hai ancora eseguito l''autenticazione!' -old_email_invalid: 'Il vecchio indirizzo email inserito non è valido!' -pass_len: 'La password che hai inserito è troppo corta o troppo lunga, scegline un''altra!' +reg_voluntarily: 'Puoi eseguire la registrazione al server con il comando: "/register "' +usage_log: '&cUtilizzo: /login ' +wrong_pwd: '&cPassword non corretta!' +unregistered: '&cSei stato rimosso dal database con successo!' +reg_disabled: '&cLa registrazione tramite i comandi di gioco è disabilitata.' +valid_session: '&cAutenticato automaticamente attraverso la precedente sessione!' +login: '&cAutenticazone effettuata correttamente!' +vb_nonActiv: 'Il tuo account non è stato ancora verificato, controlla fra le tue email per scoprire come attivarlo!' +user_regged: '&cHai già effettuato la registrazione, non puoi eseguirla nuovamente.' +usage_reg: '&cUtilizzo: /register ' +error: 'Qualcosa è andato storto, riporta questo errore ad un Admin!' +max_reg: 'Hai raggiunto il numero massimo di registrazioni per questo indirizzo IP!' +no_perm: '&cNon hai il permesso di eseguire questa operazione.' +login_msg: '&cPerfavore, esegui l''autenticazione con il comando: "/login "' +reg_msg: '&cPerfavore, esegui la registrazione con il comando: "/register "' +reg_email_msg: '&cPerfavore, esegui la registrazione con il comando: "/register "' +usage_unreg: '&cUtilizzo: /unregister ' +pwd_changed: '&cPassword cambiata con successo!' +user_unknown: '&cL''utente non ha ancora eseguito la registrazione.' password_error: 'Le Password non corrispondono!' password_error_nick: 'Non puoi usare il tuo nome utente come password, scegline un''altra!' password_error_unsafe: 'La password che hai inserito non è sicura, scegline un''altra!' -pwd_changed: '&cPassword cambiata con successo!' -recovery_email: '&cHai dimenticato la tua password? Puoi recuperarla eseguendo il comando: "/email recovery "' -reg_disabled: '&cLa registrazione tramite i comandi di gioco è disabilitata.' -reg_email_msg: '&cPerfavore, esegui la registrazione con il comando: "/register "' -regex: '&cIl tuo nome utente contiene caratteri non consentiti. I caratteri consentiti sono: REG_EX' -registered: '&cRegistrato correttamente!' -reg_msg: '&cPerfavore, esegui la registrazione con il comando: "/register "' +invalid_session: 'I tuoi dati di connessione attuali non sono quelli utilizzati in precedenza. Attendi la fine della sessione attuale.' reg_only: 'Puoi giocare in questo server solo dopo aver effettuato la registrazione attraverso il sito web! Perfavore, vai su http://esempio.it per procedere!' -reg_voluntarily: 'Puoi eseguire la registrazione al server con il comando: "/register "' -reload: 'La configurazione e il database sono stati ricaricati con successo!' +logged_in: '&cHai già eseguito l''autenticazione, non devi eseguirla nuovamente!' +logout: '&cDisconnessione avvenuta correttamente!' same_nick: 'Questo stesso nome utente è già online sul server!' +registered: '&cRegistrato correttamente!' +pass_len: 'La password che hai inserito è troppo corta o troppo lunga, scegline un''altra!' +reload: 'La configurazione e il database sono stati ricaricati con successo!' timeout: 'Tempo scaduto per effettuare l''autenticazione' -unknown_user: 'L''utente non è presente nel database.' -unregistered: '&cSei stato rimosso dal database con successo!' -unsafe_spawn: 'Il tuo punto di disconnessione risulta ostruito o insicuro, sei stato teletrasportato al punto di rigenerazione!' -usage_captcha: '&cAbbiamo bisogno che tu inserisca un captcha, perfavore scrivi: "/captcha THE_CAPTCHA"' usage_changepassword: 'Utilizzo: /changepassword ' +name_len: '&cIl tuo nome utente è troppo corto o troppo lungo!' +regex: '&cIl tuo nome utente contiene caratteri non consentiti. I caratteri consentiti sono: REG_EX' +add_email: '&cPer poter recuperare la password in futuro, aggiungi un indirizzo email al tuo account con il comando: "/email add "' +recovery_email: '&cHai dimenticato la tua password? Puoi recuperarla eseguendo il comando: "/email recovery "' +usage_captcha: '&cAbbiamo bisogno che tu inserisca un captcha, perfavore scrivi: "/captcha THE_CAPTCHA"' +wrong_captcha: '&cCaptcha sbagliato, perfavore riprova con il comando: "/captcha THE_CAPTCHA"' +valid_captcha: '&cIl captcha inserito è valido!' +kick_forvip: '&cUn utente VIP è entrato mentre il server era pieno e ha preso il tuo posto!' +kick_fullserver: '&cIl server è attualmente pieno, riprova più tardi!' usage_email_add: '&fUtilizzo: /email add ' usage_email_change: '&fUtilizzo: /email change ' usage_email_recovery: '&fUtilizzo: /email recovery ' -usage_log: '&cUtilizzo: /login ' -usage_reg: '&cUtilizzo: /register ' -usage_unreg: '&cUtilizzo: /unregister ' -user_regged: '&cHai già effettuato la registrazione, non puoi eseguirla nuovamente.' -user_unknown: '&cL''utente non ha ancora eseguito la registrazione.' -valid_captcha: '&cIl captcha inserito è valido!' -valid_session: '&cAutenticato automaticamente attraverso la precedente sessione!' -vb_nonActiv: 'Il tuo account non è stato ancora verificato, controlla fra le tue email per scoprire come attivarlo!' -wrong_captcha: '&cCaptcha sbagliato, perfavore riprova con il comando: "/captcha THE_CAPTCHA"' -wrong_pwd: '&cPassword non corretta!' +new_email_invalid: 'Il nuovo indirizzo email inserito non è valido!' +old_email_invalid: 'Il vecchio indirizzo email inserito non è valido!' +email_invalid: 'L''indirizzo email inserito non è valido' +email_added: 'Indirizzo email aggiunto correttamente!' +email_confirm: 'Conferma il tuo indirizzo email!' +email_changed: 'Indirizzo email cambiato correttamente!' +email_send: 'Una email di recupero è stata appena inviata al tuo indirizzo email!' +email_exists: 'Il tuo account ha già un''indirizzo email configurato. Se vuoi, puoi cambiarlo con il seguente comando:' +country_banned: 'Il tuo paese è bandito da questo server!' +antibot_auto_enabled: 'Il servizio di AntiBot è stato automaticamente abilitato a seguito delle numerose connessioni!' +antibot_auto_disabled: "Il servizio di AntiBot è stato automaticamente disabilitato dopo %m Minuti, sperando che l'attacco sia finito!" diff --git a/src/main/resources/messages/messages_ko.yml b/src/main/resources/messages/messages_ko.yml index 581a45134..db1bd4214 100644 --- a/src/main/resources/messages/messages_ko.yml +++ b/src/main/resources/messages/messages_ko.yml @@ -1,58 +1,62 @@ -add_email: '&c당신의 이메일을 추가해주세요 : /email add 당신의이메일 이메일재입력' -antibot_auto_disabled: '[AuthMe] 봇차단모드가 %m 분 후에 자동적으로 비활성화됩니다' -antibot_auto_enabled: '[AuthMe] 봇차단모드가 연결 개수 때문에 자동적으로 활성화됩니다!' -country_banned: '당신의 국가는 이 서버에서 차단당했습니다' -email_added: '[AuthMe] 이메일을 추가했습니다!' -email_changed: '[AuthMe] 이메일이 변경되었습니다!' -email_confirm: '[AuthMe] 당신의 이메일을 확인하세요!' -email_exists: '[AuthMe] 당신의 계정에 이미 이메일이 존재합니다. 아래의 명령어를 통해 이메일을 변경하실 수 있습니다' -email_invalid: '[AuthMe] 올바르지 않은 이메일' -email_send: '[AuthMe] 복구 이메일을 보냈습니다!' -error: '&f오류가 발생했습니다; 관리자에게 문의해주세요' -invalid_session: '&f세션일자가 적합하지 않습니다. 세션이 종료될 때까지 기다려주세요' -kick_forvip: '&c서버가 만원인 상태일때 VIP 플레이어들만 입장이 가능합니다!' -kick_fullserver: '&c서버가 만원입니다, 나중에 다시 시도해주세요' -logged_in: '&c이미 접속되었습니다!' -login: '&c성공적인 접속입니다!' -login_msg: '&c접속 하실려면 "/login 비밀번호"를 치세요' -logout: '&c성공적으로 접속해제하였습니다' -max_reg: '&f당신은 가입할 수 있는 계정의 최대 한도를 초과했습니다' -name_len: '&c당신의 이름은 너무 짧거나 너무 깁니다' -new_email_invalid: '[AuthMe] 새 이메일이 올바르지 않습니다!' -no_perm: '&c권한이 없습니다' +# Korean translate by wolfwork # +# wolfdate25@gmail.com # +# 16.08.2014 Thanks for use # + +unknown_user: '&f사용자가 데이터베이스에 존재하지 않습니다' +unsafe_spawn: '&f당신이 종료한 위치는 안전하지 않았습니다, 세계의 소환지점으로 이동합니다' not_logged_in: '&c접속되어있지 않습니다!' -old_email_invalid: '[AuthMe] 기존 이메일이 올바르지 않습니다!' -pass_len: '&f당신의 비밀번호는 최소 길이에 미치지 않거나 최대 길이를 초과했습니다' -password_error: '&f비밀번호가 일치하지 않습니다' +reg_voluntarily: '&f당신은 당신의 이름을 "/register 비밀번호 비밀번호확인" 명령어로 가입하실 수 있습니다' +usage_log: '&c사용법: /login 비밀번호' +wrong_pwd: '&c잘못된 비밀번호입니다' +unregistered: '&c성공적으로 탈퇴했습니다!' +reg_disabled: '&c가입이 비활성화 되어있습니다' +valid_session: '&c세션 로그인' +login: '&c성공적인 접속입니다!' password_error_nick: '&fYou can''t use your name as password' password_error_unsafe: '&fYou can''t use unsafe passwords' -pwd_changed: '&c비밀번호를 변경했습니다!' -recovery_email: '&c비밀번호를 잊어버리셨다고요? /email recovery <당신의이메일>을 사용하세요' -reg_disabled: '&c가입이 비활성화 되어있습니다' -reg_email_msg: '&c가입하실려면 "/register <이메일> <이메일재입력>을 치세요"' -regex: '&c당신의 이름에는 불법적인 글자들이 포함되어있습니다. 허용된 글자: REG_EX' -registered: '&c성공적으로 가입했습니다!' +vb_nonActiv: '&f당신의 계정은 아직 활성화되어있지 않습니다, 당신의 이메일을 확인해보세요!' +user_regged: '&c사용자이름은 이미 가입했습니다' +usage_reg: '&c사용법: /register 비밀번호 비밀번호확인' +max_reg: '&f당신은 가입할 수 있는 계정의 최대 한도를 초과했습니다' +no_perm: '&c권한이 없습니다' +error: '&f오류가 발생했습니다; 관리자에게 문의해주세요' +login_msg: '&c접속 하실려면 "/login 비밀번호"를 치세요' reg_msg: '&c가입하실려면 "/register 비밀번호 비밀번호재입력"을 치세요' +reg_email_msg: '&c가입하실려면 "/register <이메일> <이메일재입력>을 치세요"' +usage_unreg: '&c사용법: /unregister 비밀번호' +pwd_changed: '&c비밀번호를 변경했습니다!' +user_unknown: '&c사용자이름은 가입되지 않았습니다' +password_error: '&f비밀번호가 일치하지 않습니다' +invalid_session: '&f세션일자가 적합하지 않습니다. 세션이 종료될 때까지 기다려주세요' reg_only: '&f가입한 플레이어만이 가능합니다! 가입하실려면 http://example.com 에 방문해주세요' -reg_voluntarily: '&f당신은 당신의 이름을 "/register 비밀번호 비밀번호확인" 명령어로 가입하실 수 있습니다' -reload: '&f설정과 데이터베이스는 갱신되었습니다' +logged_in: '&c이미 접속되었습니다!' +logout: '&c성공적으로 접속해제하였습니다' same_nick: '&f같은 이름으로 이미 플레이하고 있습니다' +registered: '&c성공적으로 가입했습니다!' +pass_len: '&f당신의 비밀번호는 최소 길이에 미치지 않거나 최대 길이를 초과했습니다' +reload: '&f설정과 데이터베이스는 갱신되었습니다' timeout: '&f접속시간 초과' -unknown_user: '&f사용자가 데이터베이스에 존재하지 않습니다' -unregistered: '&c성공적으로 탈퇴했습니다!' -unsafe_spawn: '&f당신이 종료한 위치는 안전하지 않았습니다, 세계의 소환지점으로 이동합니다' -usage_captcha: '&c보안문자 입력이 필요합니다, 입력해주세요: /captcha ' usage_changepassword: '&f사용법: /changepassword 기존비밀번호 새로운비밀번호' +name_len: '&c당신의 이름은 너무 짧거나 너무 깁니다' +regex: '&c당신의 이름에는 불법적인 글자들이 포함되어있습니다. 허용된 글자: REG_EX' +add_email: '&c당신의 이메일을 추가해주세요 : /email add 당신의이메일 이메일재입력' +recovery_email: '&c비밀번호를 잊어버리셨다고요? /email recovery <당신의이메일>을 사용하세요' +usage_captcha: '&c보안문자 입력이 필요합니다, 입력해주세요: /captcha ' +wrong_captcha: '&c잘못된 보안문자, 사용해주세요 : /captcha THE_CAPTCHA' +valid_captcha: '&c당신의 보안문자는 적합합니다!' +kick_forvip: '&c서버가 만원인 상태일때 VIP 플레이어들만 입장이 가능합니다!' +kick_fullserver: '&c서버가 만원입니다, 나중에 다시 시도해주세요' usage_email_add: '&f사용법: /email add <이메일> <이메일확인> ' usage_email_change: '&f사용법: /email change <기존이메일> <새로운이메일> ' usage_email_recovery: '&f사용법: /email recovery <이메일>' -usage_log: '&c사용법: /login 비밀번호' -usage_reg: '&c사용법: /register 비밀번호 비밀번호확인' -usage_unreg: '&c사용법: /unregister 비밀번호' -user_regged: '&c사용자이름은 이미 가입했습니다' -user_unknown: '&c사용자이름은 가입되지 않았습니다' -valid_captcha: '&c당신의 보안문자는 적합합니다!' -valid_session: '&c세션 로그인' -vb_nonActiv: '&f당신의 계정은 아직 활성화되어있지 않습니다, 당신의 이메일을 확인해보세요!' -wrong_captcha: '&c잘못된 보안문자, 사용해주세요 : /captcha THE_CAPTCHA' -wrong_pwd: '&c잘못된 비밀번호입니다' +new_email_invalid: '[AuthMe] 새 이메일이 올바르지 않습니다!' +old_email_invalid: '[AuthMe] 기존 이메일이 올바르지 않습니다!' +email_invalid: '[AuthMe] 올바르지 않은 이메일' +email_added: '[AuthMe] 이메일을 추가했습니다!' +email_confirm: '[AuthMe] 당신의 이메일을 확인하세요!' +email_changed: '[AuthMe] 이메일이 변경되었습니다!' +email_send: '[AuthMe] 복구 이메일을 보냈습니다!' +email_exists: '[AuthMe] 당신의 계정에 이미 이메일이 존재합니다. 아래의 명령어를 통해 이메일을 변경하실 수 있습니다' +country_banned: '당신의 국가는 이 서버에서 차단당했습니다' +antibot_auto_enabled: '[AuthMe] 봇차단모드가 연결 개수 때문에 자동적으로 활성화됩니다!' +antibot_auto_disabled: '[AuthMe] 봇차단모드가 %m 분 후에 자동적으로 비활성화됩니다' diff --git a/src/main/resources/messages/messages_lt.yml b/src/main/resources/messages/messages_lt.yml index b0889b8db..80a7b3abb 100644 --- a/src/main/resources/messages/messages_lt.yml +++ b/src/main/resources/messages/messages_lt.yml @@ -1,57 +1,57 @@ -add_email: '&ePrasau pridekite savo el.pasta : /email add Email confirmEmail' -antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' -antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' -country_banned: 'Your country is banned from this server' -email_added: '[AuthMe] Email Added !' -email_changed: '[AuthMe] Email Change !' -email_confirm: '[AuthMe] Confirm your Email !' -email_invalid: '[AuthMe] Invalid Email' -email_send: '[AuthMe] Recovery Email Send !' -error: '&cAtsirado klaida, praneskite adminstratoriui.' -invalid_session: '&cSesijos laikai nesutampa, prasome palaukti kol secija baigsis.' -kick_forvip: '&cA VIP prisijunge i pilna serveri!' -kick_fullserver: '&cServeris yra pilnas, Atsiprasome.' -logged_in: '&cTu aju prisijunges!' -login: '&aSekmingai prisijungete' -login_msg: '&ePrasome prisijungti: /login slaptazodis' -logout: '&aSekmingai atsijungete' -max_reg: '&cJus pasiekete maksimalu registraciju skaiciu.' -name_len: '&cJusu varsdas yra per ilgas arba per trumpas.' -new_email_invalid: '[AuthMe] New email invalid!' -no_perm: '&cNera leidimo' +unknown_user: '&cNaudotojo nera duombazeje' +unsafe_spawn: '&6Atsijungimo vieta nesaugi, perkeliame jus i atsiradimo vieta.' not_logged_in: '&cTu neprisijunges!' -old_email_invalid: '[AuthMe] Old email invalid!' -pass_len: '&cJusu slaptazodis buvo per ilgas arba per trumpas.' -password_error: '&cSlaptazodziai nesutampa' +reg_voluntarily: '&ePrisiregistruokite: /register slaptazodis pakartotiSlaptazodi' +usage_log: '&eKomandos panaudojimas: /login slaptazodis' +wrong_pwd: '&cNeteisingas slaptazosdis' +unregistered: '&aSekmingai issiregistravote!' +reg_disabled: '&6Registracija yra isjungta' +valid_session: '&aSesijos prisijungimas' +login: '&aSekmingai prisijungete' +vb_nonActiv: '&aJusu vartotojas nera patvirtintas, patikrinkite el.pasta.' +user_regged: '&cVartotojo vardas jau uzregistruotas' +usage_reg: '&eNaudojimas: /register slaptazodis pakartotiSlaptazodi' +max_reg: '&cJus pasiekete maksimalu registraciju skaiciu.' +no_perm: '&cNera leidimo' +error: '&cAtsirado klaida, praneskite adminstratoriui.' password_error_nick: '&fYou can''t use your name as password' password_error_unsafe: '&fYou can''t use unsafe passwords' -pwd_changed: '&aSlaptazodis pakeistas' -recovery_email: '&cPamirsote slaptazodi? Rasykite: /email recovery el.pastas' -reg_disabled: '&6Registracija yra isjungta' -reg_email_msg: '&cPlease register with "/register "' -regex: '&cJusu varde yra neledziamu simboliu, leidziami: REG_EX' -registered: '&aSekmingai prisiregistravote.' +login_msg: '&ePrasome prisijungti: /login slaptazodis' reg_msg: '&ePrasome prisiregistruoti: /register slaptazodis pakartotiSlaptazodi' +reg_email_msg: '&cPlease register with "/register "' +usage_unreg: '&ePanaikinti registracija: "/unregister slaptazodis"' +pwd_changed: '&aSlaptazodis pakeistas' +user_unknown: '&cVartotojas neprisiregistraves' +password_error: '&cSlaptazodziai nesutampa' +invalid_session: '&cSesijos laikai nesutampa, prasome palaukti kol secija baigsis.' reg_only: '&cTik prisiregistravusiem zaidejams: apsilankykite: http://example.com tam kad uzsiregistruoti.' -reg_voluntarily: '&ePrisiregistruokite: /register slaptazodis pakartotiSlaptazodi' -reload: '&aNustatymai ir duomenu baze buvo perkrauta.' +logged_in: '&cTu aju prisijunges!' +logout: '&aSekmingai atsijungete' same_nick: '&cKazkas situo vardu jau zaidzia.' +registered: '&aSekmingai prisiregistravote.' +pass_len: '&cJusu slaptazodis buvo per ilgas arba per trumpas.' +reload: '&aNustatymai ir duomenu baze buvo perkrauta.' timeout: '&cNespejote prisijungti' -unknown_user: '&cNaudotojo nera duombazeje' -unregistered: '&aSekmingai issiregistravote!' -unsafe_spawn: '&6Atsijungimo vieta nesaugi, perkeliame jus i atsiradimo vieta.' -usage_captcha: '&cPanaudojimas: /captcha ' usage_changepassword: '&ePanaudojimas: /changepassword senasSlaptazodis naujasSlaptazodis' +name_len: '&cJusu varsdas yra per ilgas arba per trumpas.' +regex: '&cJusu varde yra neledziamu simboliu, leidziami: REG_EX' +add_email: '&ePrasau pridekite savo el.pasta : /email add Email confirmEmail' +recovery_email: '&cPamirsote slaptazodi? Rasykite: /email recovery el.pastas' +usage_captcha: '&cPanaudojimas: /captcha ' +wrong_captcha: '&cNeteisinga Captcha, naudokite : /captcha THE_CAPTCHA' +valid_captcha: '&cJusu captcha Teisinga!' +kick_forvip: '&cA VIP prisijunge i pilna serveri!' +kick_fullserver: '&cServeris yra pilnas, Atsiprasome.' usage_email_add: '&fUsage: /email add ' usage_email_change: '&fUsage: /email change ' usage_email_recovery: '&fUsage: /email recovery ' -usage_log: '&eKomandos panaudojimas: /login slaptazodis' -usage_reg: '&eNaudojimas: /register slaptazodis pakartotiSlaptazodi' -usage_unreg: '&ePanaikinti registracija: "/unregister slaptazodis"' -user_regged: '&cVartotojo vardas jau uzregistruotas' -user_unknown: '&cVartotojas neprisiregistraves' -valid_captcha: '&cJusu captcha Teisinga!' -valid_session: '&aSesijos prisijungimas' -vb_nonActiv: '&aJusu vartotojas nera patvirtintas, patikrinkite el.pasta.' -wrong_captcha: '&cNeteisinga Captcha, naudokite : /captcha THE_CAPTCHA' -wrong_pwd: '&cNeteisingas slaptazosdis' +new_email_invalid: '[AuthMe] New email invalid!' +old_email_invalid: '[AuthMe] Old email invalid!' +email_invalid: '[AuthMe] Invalid Email' +email_added: '[AuthMe] Email Added !' +email_confirm: '[AuthMe] Confirm your Email !' +email_changed: '[AuthMe] Email Change !' +email_send: '[AuthMe] Recovery Email Send !' +country_banned: 'Your country is banned from this server' +antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' +antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' diff --git a/src/main/resources/messages/messages_nl.yml b/src/main/resources/messages/messages_nl.yml index e7b25e898..f1c585e20 100644 --- a/src/main/resources/messages/messages_nl.yml +++ b/src/main/resources/messages/messages_nl.yml @@ -1,56 +1,56 @@ -add_email: '&cVoeg uw E-mail alstublieft toe met: /email add ' -antibot_auto_disabled: '[AuthMe] AntiBotMod automatisch uitgezet na %m minuten, hopelijk is de invasie gestopt' -antibot_auto_enabled: '[AuthMe] AntiBotMod automatisch aangezet vanewge veel verbindingen!' -country_banned: 'Jouw land is geband op deze server' -email_added: '[AuthMe] Bevestig jouw E-mail!' -email_changed: '[AuthMe] Email Veranderd!' -email_confirm: '[AuthMe] Bevestig jouw E-mail!' -email_invalid: '[AuthMe] Ongeldige E-mail' -email_send: '[AuthMe] Herstel E-mail Verzonden!' -error: Error: neem contact op met een administrator! -invalid_session: Sessie beschadigd, wacht tot de sessie is verlopen en verbindt opnieuw. -kick_forvip: '&cEen VIP Gebruiker ga naar de volledige server!' -kick_fullserver: '&cDe server is vol, sorry!' -logged_in: '&cJe bent al ingelogd!' -login: '&cSuccesvol ingelogd!' -login_msg: '&cLog in met "/login "' -logout: '&cJe bent succesvol uitgelogd' -max_reg: Je hebt de maximale registraties van jouw account overschreden. -name_len: '&cJe gebruikersnaam is te kort' -new_email_invalid: '[AuthMe] Nieuwe E-mail ongeldig!' -no_perm: '&cGeen toegang!' +unknown_user: Gebruiker is niet gevonden in de database +unsafe_spawn: De locatie waar je de vorige keer het spel verliet was gevaarlijk, je bent geteleporteerd naar de spawn not_logged_in: '&cNiet ingelogt!' -old_email_invalid: '[AuthMe] Oude E-mail ongeldig!' -pass_len: Je gekozen wachtwoord voldoet niet aan de minimum of maximum lengte +reg_voluntarily: Je kunt je gebruikersnaam registreren met "/register " +usage_log: '&cGebruik: /login ' +wrong_pwd: '&cFout wachtwoord' +unregistered: '&cRegistratie succesvol ongedaan gemaakt!' +reg_disabled: '&cRegistratie is uitgeschakeld' +valid_session: '&cSessie ingelogd' +login: '&cSuccesvol ingelogd!' password_error_nick: '&fJe kunt je gebruikersnaam niet als wachtwoord gebruiken' password_error_unsafe: '&fJe kunt geen onveilige wachtwoorden gebruiken' -password_error: Wachtwoord incorrect! -pwd_changed: '&cWachtwoord aangepast!' -recovery_email: '&cWachtwoord vergeten? Gebruik alstublieft "/email recovery "' -reg_disabled: '&cRegistratie is uitgeschakeld' -regex: '&cJouw gebruikersnaam bevat illegale tekens. Toegestaane karakters: REG_EX' -registered: '&cSuccesvol geregistreerd!' +vb_nonActiv: Je accound is nog niet geactiveerd, controleer je mailbox! +user_regged: '&cGebruikersnaam is al geregistreerd' +usage_reg: '&cGebruik: /register ' +max_reg: Je hebt de maximale registraties van jouw account overschreden. +no_perm: '&cGeen toegang!' +error: Error: neem contact op met een administrator! +login_msg: '&cLog in met "/login "' reg_msg: '&cRegistreer met "/register "' +usage_unreg: '&cGebruik: /unregister password' +pwd_changed: '&cWachtwoord aangepast!' +user_unknown: '&cGebruikersnaam niet geregistreerd' +password_error: Wachtwoord incorrect! +invalid_session: Sessie beschadigd, wacht tot de sessie is verlopen en verbindt opnieuw. reg_only: Alleen voor geregistreerde spelers! Bezoek http://example.com om te registreren -reg_voluntarily: Je kunt je gebruikersnaam registreren met "/register " -reload: Configuratie en database is opnieuw opgestard +logged_in: '&cJe bent al ingelogd!' +logout: '&cJe bent succesvol uitgelogd' same_nick: Er is al iemand met jou gebruikersnaam online. +registered: '&cSuccesvol geregistreerd!' +pass_len: Je gekozen wachtwoord voldoet niet aan de minimum of maximum lengte +reload: Configuratie en database is opnieuw opgestard timeout: Login time-out: het duurde telang voor je je inlogde. -unknown_user: Gebruiker is niet gevonden in de database -unregistered: '&cRegistratie succesvol ongedaan gemaakt!' -unsafe_spawn: De locatie waar je de vorige keer het spel verliet was gevaarlijk, je bent geteleporteerd naar de spawn -usage_captcha: '&cGebruik: /captcha ' usage_changepassword: 'Gebruik: /changepassword ' +name_len: '&cJe gebruikersnaam is te kort' +regex: '&cJouw gebruikersnaam bevat illegale tekens. Toegestaane karakters: REG_EX' +add_email: '&cVoeg uw E-mail alstublieft toe met: /email add ' +recovery_email: '&cWachtwoord vergeten? Gebruik alstublieft "/email recovery "' +usage_captcha: '&cGebruik: /captcha ' +wrong_captcha: '&cVerkeerde Captcha, gebruik alstublieft: /captcha THE_CAPTCHA' +valid_captcha: '&cDe captcha is geldig!' +kick_forvip: '&cEen VIP Gebruiker ga naar de volledige server!' +kick_fullserver: '&cDe server is vol, sorry!' usage_email_add: '&fGebruik: /email add ' usage_email_change: '&fGebruik: /email change ' usage_email_recovery: '&fGebruik: /email recovery ' -usage_log: '&cGebruik: /login ' -usage_reg: '&cGebruik: /register ' -usage_unreg: '&cGebruik: /unregister password' -user_regged: '&cGebruikersnaam is al geregistreerd' -user_unknown: '&cGebruikersnaam niet geregistreerd' -valid_captcha: '&cDe captcha is geldig!' -valid_session: '&cSessie ingelogd' -vb_nonActiv: Je accound is nog niet geactiveerd, controleer je mailbox! -wrong_captcha: '&cVerkeerde Captcha, gebruik alstublieft: /captcha THE_CAPTCHA' -wrong_pwd: '&cFout wachtwoord' +new_email_invalid: '[AuthMe] Nieuwe E-mail ongeldig!' +old_email_invalid: '[AuthMe] Oude E-mail ongeldig!' +email_invalid: '[AuthMe] Ongeldige E-mail' +email_added: '[AuthMe] Bevestig jouw E-mail!' +email_confirm: '[AuthMe] Bevestig jouw E-mail!' +email_changed: '[AuthMe] Email Veranderd!' +email_send: '[AuthMe] Herstel E-mail Verzonden!' +country_banned: 'Jouw land is geband op deze server' +antibot_auto_enabled: '[AuthMe] AntiBotMod automatisch aangezet vanewge veel verbindingen!' +antibot_auto_disabled: '[AuthMe] AntiBotMod automatisch uitgezet na %m minuten, hopelijk is de invasie gestopt' diff --git a/src/main/resources/messages/messages_pl.yml b/src/main/resources/messages/messages_pl.yml index 14a2edc61..952fd1cc0 100644 --- a/src/main/resources/messages/messages_pl.yml +++ b/src/main/resources/messages/messages_pl.yml @@ -1,57 +1,57 @@ -add_email: '&cProsze dodac swoj email: /email add twojEmail powtorzEmail' -antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' -antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' -country_banned: 'Your country is banned from this server' -email_added: '[AuthMe] Email dodany!' -email_changed: '[AuthMe] Email zmieniony!' -email_confirm: '[AuthMe] Potwierdz swoj email!' -email_invalid: '[AuthMe] Nieprawidlowy email' -email_send: '[AuthMe] Email z odzyskaniem wyslany!' -error: '&fBlad prosimy napisac do aministracji' -invalid_session: '&fSesja zakonczona!' -kick_forvip: '&cA Gracz VIP dolaczyl do gry!' -kick_fullserver: '&cSerwer jest teraz zapelniony, przepraszamy!' logged_in: '&fJestes juz zalogowany!' -login: '&aHaslo zaakceptowane!' -login_msg: '&2Prosze sie zalogowac przy uzyciu &6/login ' -logout: '&cPomyslnie wylogowany' -max_reg: '&fPrzekroczyles limit zarejestrowanych kont na serwerze.' -name_len: '&cTwoje konto ma za dluga badz za krotka nazwe' -new_email_invalid: '[AuthMe] Nowy email niepoprawny!' -no_perm: '&4Nie masz uprawnien' not_logged_in: '&4Nie jestes zalogowany!' -old_email_invalid: '[AuthMe] Stary email niepoprawny!' -pass_len: '&fTwoje haslo jest za krotkie lub za dlugie! Sprobuj ponownie...' -password_error: '&fHaslo niepoprawne!' +reg_disabled: '&4Rejestracja jest wylaczona' +user_regged: '&4Gracz juz jest zarejestrowany' +usage_reg: '&4Uzycie: /register haslo powtorzHaslo' +usage_log: '&cUzycie: /login haslo' +user_unknown: '&fGracz nie jest zarejestrowany' +pwd_changed: '&fHaslo zostalo zmienione!' +reg_only: '&fTylko zarejestrowani uzytkownicy maja do tego dostep!' +valid_session: '&cSesja logowania' +login_msg: '&2Prosze sie zalogowac przy uzyciu &6/login ' +reg_msg: '&2Prosze sie zarejestrowac przy uzyciu &6/register ' +reg_email_msg: '&cStworz prosze konto komenda "/register "' +timeout: '&fUplynal limit czasu zalogowania' +wrong_pwd: '&cNiepoprawne haslo' +logout: '&cPomyslnie wylogowany' +usage_unreg: '&cUzycie: /unregister haslo' +registered: '&aPomyslnie zarejestrowany!' password_error_nick: '&fYou can''t use your name as password' password_error_unsafe: '&fYou can''t use unsafe passwords' -pwd_changed: '&fHaslo zostalo zmienione!' -recovery_email: '&cZapomniales hasla? Prosze uzyj komendy /email recovery ' -reg_disabled: '&4Rejestracja jest wylaczona' -reg_email_msg: '&cStworz prosze konto komenda "/register "' -regex: '&cTwoje konto ma w nazwie niedozwolone znaki. Dozwolone znaki: REG_EX' -registered: '&aPomyslnie zarejestrowany!' -reg_msg: '&2Prosze sie zarejestrowac przy uzyciu &6/register ' -reg_only: '&fTylko zarejestrowani uzytkownicy maja do tego dostep!' +unregistered: '&4Pomyslnie odrejestrowany!' +login: '&aHaslo zaakceptowane!' +no_perm: '&4Nie masz uprawnien' +same_nick: '&fTen nick juz gra' reg_voluntarily: '&fMozesz zarejestrowac swoj nick na serwerze przy uzyciu "/register haslo powtorzHaslo"' reload: '&fKonfiguracja bazy danych zostala przeladowana' -same_nick: '&fTen nick juz gra' -timeout: '&fUplynal limit czasu zalogowania' +error: '&fBlad prosimy napisac do aministracji' unknown_user: '&fUzytkownika nie ma w bazie danych' -unregistered: '&4Pomyslnie odrejestrowany!' unsafe_spawn: '&fTwoje pozycja jest niebezpieczna. Zostaniesz przeniesiony na bezpieczny spawn.' -usage_captcha: '&cWpisz: /captcha ' +invalid_session: '&fSesja zakonczona!' +max_reg: '&fPrzekroczyles limit zarejestrowanych kont na serwerze.' +password_error: '&fHaslo niepoprawne!' +pass_len: '&fTwoje haslo jest za krotkie lub za dlugie! Sprobuj ponownie...' +vb_nonActiv: '&fTwoje konto nie zostalo aktywowane! Sprawdz maila.' usage_changepassword: '&fUzycie: /changepassword starehaslo nowehaslo' +name_len: '&cTwoje konto ma za dluga badz za krotka nazwe' +regex: '&cTwoje konto ma w nazwie niedozwolone znaki. Dozwolone znaki: REG_EX' +add_email: '&cProsze dodac swoj email: /email add twojEmail powtorzEmail' +recovery_email: '&cZapomniales hasla? Prosze uzyj komendy /email recovery ' +usage_captcha: '&cWpisz: /captcha ' +wrong_captcha: '&cZly kod, prosze wpisac: /captcha THE_CAPTCHA' +valid_captcha: '&cTwoj kod jest nieprawidlowy!' +kick_forvip: '&cA Gracz VIP dolaczyl do gry!' +kick_fullserver: '&cSerwer jest teraz zapelniony, przepraszamy!' usage_email_add: '&fWpisz: /email add ' usage_email_change: '&fWpisz: /email change ' usage_email_recovery: '&fWpisz: /email recovery ' -usage_log: '&cUzycie: /login haslo' -usage_reg: '&4Uzycie: /register haslo powtorzHaslo' -usage_unreg: '&cUzycie: /unregister haslo' -user_regged: '&4Gracz juz jest zarejestrowany' -user_unknown: '&fGracz nie jest zarejestrowany' -valid_captcha: '&cTwoj kod jest nieprawidlowy!' -valid_session: '&cSesja logowania' -vb_nonActiv: '&fTwoje konto nie zostalo aktywowane! Sprawdz maila.' -wrong_captcha: '&cZly kod, prosze wpisac: /captcha THE_CAPTCHA' -wrong_pwd: '&cNiepoprawne haslo' +new_email_invalid: '[AuthMe] Nowy email niepoprawny!' +old_email_invalid: '[AuthMe] Stary email niepoprawny!' +email_invalid: '[AuthMe] Nieprawidlowy email' +email_added: '[AuthMe] Email dodany!' +email_confirm: '[AuthMe] Potwierdz swoj email!' +email_changed: '[AuthMe] Email zmieniony!' +email_send: '[AuthMe] Email z odzyskaniem wyslany!' +country_banned: 'Your country is banned from this server' +antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' +antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' diff --git a/src/main/resources/messages/messages_pt.yml b/src/main/resources/messages/messages_pt.yml index 280e329fb..02ec04208 100644 --- a/src/main/resources/messages/messages_pt.yml +++ b/src/main/resources/messages/messages_pt.yml @@ -1,58 +1,58 @@ -add_email: '&cPor favor adicione o seu email com : /email add seuEmail confirmarSeuEmail' -antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automaticamente após %m minutos, esperamos que a invasão tenha parado' -antibot_auto_enabled: '[AuthMe] AntiBotMod activado automaticamente devido a um aumento anormal de tentativas de ligação!' -country_banned: 'O seu país está banido deste servidor' -email_added: 'Email adicionado com sucesso!' -email_add: '/email add ' -email_changed: 'Email alterado com sucesso!' -email_confirm: 'Confirme o seu email!' -email_invalid: 'Email inválido!' -email_send: 'Nova palavra-passe enviada para o seu email!' -error: '&fOcorreu um erro; Por favor contacte um admin' -invalid_session: '&fDados de sessão não correspondem. Por favor aguarde o fim da sessão' -kick_forvip: '&cUm jogador VIP entrou no servidor cheio!' -kick_fullserver: '&cO servidor está actualmente cheio, lamentamos!' -logged_in: '&cJá se encontra autenticado!' -login: '&cAutenticado com sucesso!' -login_msg: '&cIdentifique-se com "/login password"' -logout: '&cSaida com sucesso' -max_reg: '&cAtingiu o numero máximo de registos permitidos' -name_len: '&cO seu nick é demasiado curto ou muito longo.' -new_email_invalid: 'Novo email inválido!' -no_perm: '&cSem Permissões' +unknown_user: '&fUtilizador não existente na base de dados' +unsafe_spawn: '&fA sua localização na saída não é segura, será tele-portado para a Spawn' not_logged_in: '&cNão autenticado!' -old_email_invalid: 'Email antigo inválido!' -pass_len: '&fPassword demasiado curta' -password_error: '&fAs passwords não coincidem' +reg_voluntarily: '&fPode registar o seu nickname no servidor com o comando "/register password ConfirmePassword"' +usage_log: '&cUse: /login password' +wrong_pwd: '&cPassword errada!' +unregistered: '&cRegisto eliminado com sucesso!' +reg_disabled: '&cRegito de novos utilizadores desactivado' +valid_session: '&cSessão válida' +login: '&cAutenticado com sucesso!' +vb_nonActiv: '&fA sua conta não foi ainda activada, verifique o seu email onde irá receber indicações para activação de conta. ' +user_regged: '&cUtilizador já registado' +usage_reg: '&cUse: /register seu@email.com seu@email.com' +max_reg: '&cAtingiu o numero máximo de registos permitidos' +no_perm: '&cSem Permissões' +error: '&fOcorreu um erro; Por favor contacte um admin' +login_msg: '&cIdentifique-se com "/login password"' +reg_msg: '&cPor favor registe-se com "/register password confirmePassword"' +reg_email_msg: '&ePor favor registe-se com "/register "' +usage_unreg: '&cUse: /unregister password' +pwd_changed: '&cPassword alterada!' password_error_nick: '&fYou can''t use your name as password' password_error_unsafe: '&fYou can''t use unsafe passwords' -pwd_changed: '&cPassword alterada!' -recovery_email: '&cPerdeu a sua password? Para a recuperar escreva /email recovery ' -reg_disabled: '&cRegito de novos utilizadores desactivado' -reg_email_msg: '&ePor favor registe-se com "/register "' -regex: '&cO seu nickname contém caracteres não permitidos. Permitido: REG_EX' -registered: '&cRegistado com sucesso!' -reg_msg: '&cPor favor registe-se com "/register password confirmePassword"' +user_unknown: '&cUsername não registado' +password_error: '&fAs passwords não coincidem' +invalid_session: '&fDados de sessão não correspondem. Por favor aguarde o fim da sessão' reg_only: '&fApenas jogadores registados! Visite http://example.com para se registar' -reg_voluntarily: '&fPode registar o seu nickname no servidor com o comando "/register password ConfirmePassword"' -reload: '&fConfiguração e base de dados foram recarregadas' +logged_in: '&cJá se encontra autenticado!' +logout: '&cSaida com sucesso' same_nick: '&fO mesmo nickname já se encontra a jogar no servidor' +registered: '&cRegistado com sucesso!' +pass_len: '&fPassword demasiado curta' +reload: '&fConfiguração e base de dados foram recarregadas' timeout: '&fExcedeu o tempo para autenticação' -unknown_user: '&fUtilizador não existente na base de dados' -unregistered: '&cRegisto eliminado com sucesso!' -unsafe_spawn: '&fA sua localização na saída não é segura, será tele-portado para a Spawn' -usage_captcha: '&cVocê precisa digitar um captcha, escreva: /captcha ' usage_changepassword: '&fUse: /changepassword passwordAntiga passwordNova' +name_len: '&cO seu nick é demasiado curto ou muito longo.' +regex: '&cO seu nickname contém caracteres não permitidos. Permitido: REG_EX' +add_email: '&cPor favor adicione o seu email com : /email add seuEmail confirmarSeuEmail' +recovery_email: '&cPerdeu a sua password? Para a recuperar escreva /email recovery ' +usage_captcha: '&cVocê precisa digitar um captcha, escreva: /captcha ' +wrong_captcha: '&cCaptcha errado, por favor escreva: /captcha THE_CAPTCHA' +valid_captcha: '&cO seu captcha é válido!' +kick_forvip: '&cUm jogador VIP entrou no servidor cheio!' +kick_fullserver: '&cO servidor está actualmente cheio, lamentamos!' usage_email_add: '&fUse: /email add ' usage_email_change: '&fUse: /email change ' usage_email_recovery: '&fUse: /email recovery ' -usage_log: '&cUse: /login password' -usage_reg: '&cUse: /register seu@email.com seu@email.com' -usage_unreg: '&cUse: /unregister password' -user_regged: '&cUtilizador já registado' -user_unknown: '&cUsername não registado' -valid_captcha: '&cO seu captcha é válido!' -valid_session: '&cSessão válida' -vb_nonActiv: '&fA sua conta não foi ainda activada, verifique o seu email onde irá receber indicações para activação de conta. ' -wrong_captcha: '&cCaptcha errado, por favor escreva: /captcha THE_CAPTCHA' -wrong_pwd: '&cPassword errada!' +email_add: '/email add ' +new_email_invalid: 'Novo email inválido!' +old_email_invalid: 'Email antigo inválido!' +email_invalid: 'Email inválido!' +email_added: 'Email adicionado com sucesso!' +email_confirm: 'Confirme o seu email!' +email_changed: 'Email alterado com sucesso!' +email_send: 'Nova palavra-passe enviada para o seu email!' +country_banned: 'O seu país está banido deste servidor' +antibot_auto_enabled: '[AuthMe] AntiBotMod activado automaticamente devido a um aumento anormal de tentativas de ligação!' +antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automaticamente após %m minutos, esperamos que a invasão tenha parado' diff --git a/src/main/resources/messages/messages_ru.yml b/src/main/resources/messages/messages_ru.yml index b9cc5c561..15eea6f3e 100644 --- a/src/main/resources/messages/messages_ru.yml +++ b/src/main/resources/messages/messages_ru.yml @@ -1,57 +1,57 @@ -add_email: '&c&lДобавьте свой email: &e&l/email add ВАШ_EMAIL ВАШ_EMAIL' -antibot_auto_disabled: '&a[AuthMe] AntiBot-режим автоматичски отключен после %m мин. Надеюсь атака закончилась' -antibot_auto_enabled: '&a[AuthMe] AntiBot-режим автоматически включен из-за большого количества входов!' -country_banned: 'Вход с IP-адресов вашей страны воспрещен на этом сервере' -email_added: '[AuthMe] Email добавлен!' -email_changed: '[AuthMe] Email изменен!' -email_confirm: '[AuthMe] Подтвердите ваш Email!' -email_invalid: '[AuthMe] Недействительный email' -email_send: '[AuthMe] Письмо с инструкциями для восстановления было отправлено на ваш Email!' -error: '&c&lПроизошла ошибка. Свяжитесь с администратором' -invalid_session: '&c&lСессия некорректна. Дождитесь, пока она закончится' -kick_forvip: '&6VIP игрок зашел на переполненный сервер!' -kick_fullserver: '&c&lСервер переполнен!' -logged_in: '&c&lВы уже авторизированы!' -login: '&a&lВы успешно вошли!' -login_msg: '&a&lАвторизация: &e&l/l ПАРОЛЬ' -logout: '&2Вы успешно вышли' -max_reg: '&c&lВы превысили макс количество регистраций на ваш IP' -name_len: '&c&lВаш ник слишком длинный или слишком короткий' -new_email_invalid: '[AuthMe] Недействительный новый email!' -no_perm: '&c&lНедостаточно прав' +unknown_user: '&fПользователь не найден в Базе Данных' +unsafe_spawn: '&eВаше расположение перед выходом было опасным - вы перенесены на спавн' not_logged_in: '&c&lВы еще не вошли!' -old_email_invalid: '[AuthMe] Недействительный старый email!' -pass_len: '&c&lТвой пароль либо слишком длинный, либо слишком короткий' -password_error: '&c&lПароль не совпадает' +reg_voluntarily: '&aЧтобы зарегистрироваться введите: &e&l/reg ПАРОЛЬ ПОВТОР_ПАРОЛЯ' +usage_log: '&eСинтаксис: &d/l ПАРОЛЬ &eили &d/login ПАРОЛЬ' +wrong_pwd: '&c&lНеправильный пароль!' +unregistered: '&6Вы успешно удалили свой аккаунт!' +reg_disabled: '&c&lРегистрация отключена' +valid_session: '&aСессия открыта' +login: '&a&lВы успешно вошли!' +vb_nonActiv: '&6Ваш аккаунт еще не активирован! Проверьте вашу почту!' +user_regged: '&c&lТакой игрок уже зарегистрирован' +usage_reg: '&c&lИспользование: &e&l/reg ПАРОЛЬ ПОВТОР_ПАРОЛЯ' +max_reg: '&c&lВы превысили макс количество регистраций на ваш IP' +no_perm: '&c&lНедостаточно прав' +error: '&c&lПроизошла ошибка. Свяжитесь с администратором' +login_msg: '&a&lАвторизация: &e&l/l ПАРОЛЬ' +reg_msg: '&a&lРегистрация: &e&l/reg ПАРОЛЬ ПОВТОР_ПАРОЛЯ' password_error_nick: '&c&lВы не можете использовать ваш ник в роли пароля' password_error_unsafe: '&c&lВы не можете использовать небезопасный пароль' -pwd_changed: '&2Пароль изменен!' -recovery_email: '&c&lЗабыли пароль? Используйте &e&l/email recovery ВАШ_EMAIL' -reg_disabled: '&c&lРегистрация отключена' reg_email_msg: '&c&lРегистрация: &e&l/reg EMAIL ПОВТОР_EMAIL' -regex: '&c&lВаш логин содержит запрещенные символы. Разрешенные символы: REG_EX' -registered: '&a&lУспешная регистрация!' -reg_msg: '&a&lРегистрация: &e&l/reg ПАРОЛЬ ПОВТОР_ПАРОЛЯ' +usage_unreg: '&c&lИспользование: &e&l/unregister ПАРОЛЬ' +pwd_changed: '&2Пароль изменен!' +user_unknown: '&c&lТакой игрок не зарегистрирован' +password_error: '&c&lПароль не совпадает' +invalid_session: '&c&lСессия некорректна. Дождитесь, пока она закончится' reg_only: '&c&lТолько для зарегистрированных! Посетите http://сайт_сервера.com/register/ для регистрации' -reg_voluntarily: '&aЧтобы зарегистрироваться введите: &e&l/reg ПАРОЛЬ ПОВТОР_ПАРОЛЯ' -reload: '&6Конфигурация и база данных перезагружены' +logged_in: '&c&lВы уже авторизированы!' +logout: '&2Вы успешно вышли' same_nick: '&c&lТакой игрок уже играет на сервере' +registered: '&a&lУспешная регистрация!' +pass_len: '&c&lТвой пароль либо слишком длинный, либо слишком короткий' +reload: '&6Конфигурация и база данных перезагружены' timeout: '&c&lВремя для авторизации истекло' -unknown_user: '&fПользователь не найден в Базе Данных' -unregistered: '&6Вы успешно удалили свой аккаунт!' -unsafe_spawn: '&eВаше расположение перед выходом было опасным - вы перенесены на спавн' -usage_captcha: '&c&lВы должны ввести код, используйте: &e&l/captcha ' usage_changepassword: '&c&lИспользование: &e&l/changepassword СТАРЫЙ_ПАРОЛЬ НОВЫЙ_ПАРОЛЬ' +name_len: '&c&lВаш ник слишком длинный или слишком короткий' +regex: '&c&lВаш логин содержит запрещенные символы. Разрешенные символы: REG_EX' +add_email: '&c&lДобавьте свой email: &e&l/email add ВАШ_EMAIL ВАШ_EMAIL' +recovery_email: '&c&lЗабыли пароль? Используйте &e&l/email recovery ВАШ_EMAIL' +usage_captcha: '&c&lВы должны ввести код, используйте: &e&l/captcha ' +wrong_captcha: '&c&lНеверный код, используйте: &e&l/captcha THE_CAPTCHA' +valid_captcha: '&2Вы успешно ввели код!' +kick_forvip: '&6VIP игрок зашел на переполненный сервер!' +kick_fullserver: '&c&lСервер переполнен!' usage_email_add: '&c&lИспользование: &e&l/email add ВАШ_EMAIL ПОВТОР_EMAIL' usage_email_change: '&c&lИспользование: &e&l/email change СТАРЫЙ_EMAIL НОВЫЙ_EMAIL' usage_email_recovery: '&c&lИспользование: /email recovery EMAIL' -usage_log: '&eСинтаксис: &d/l ПАРОЛЬ &eили &d/login ПАРОЛЬ' -usage_reg: '&c&lИспользование: &e&l/reg ПАРОЛЬ ПОВТОР_ПАРОЛЯ' -usage_unreg: '&c&lИспользование: &e&l/unregister ПАРОЛЬ' -user_regged: '&c&lТакой игрок уже зарегистрирован' -user_unknown: '&c&lТакой игрок не зарегистрирован' -valid_captcha: '&2Вы успешно ввели код!' -valid_session: '&aСессия открыта' -vb_nonActiv: '&6Ваш аккаунт еще не активирован! Проверьте вашу почту!' -wrong_captcha: '&c&lНеверный код, используйте: &e&l/captcha THE_CAPTCHA' -wrong_pwd: '&c&lНеправильный пароль!' +new_email_invalid: '[AuthMe] Недействительный новый email!' +old_email_invalid: '[AuthMe] Недействительный старый email!' +email_invalid: '[AuthMe] Недействительный email' +email_added: '[AuthMe] Email добавлен!' +email_confirm: '[AuthMe] Подтвердите ваш Email!' +email_changed: '[AuthMe] Email изменен!' +email_send: '[AuthMe] Письмо с инструкциями для восстановления было отправлено на ваш Email!' +country_banned: 'Вход с IP-адресов вашей страны воспрещен на этом сервере' +antibot_auto_enabled: '&a[AuthMe] AntiBot-режим автоматически включен из-за большого количества входов!' +antibot_auto_disabled: '&a[AuthMe] AntiBot-режим автоматичски отключен после %m мин. Надеюсь атака закончилась' diff --git a/src/main/resources/messages/messages_sk.yml b/src/main/resources/messages/messages_sk.yml index d5250157e..010533fe8 100644 --- a/src/main/resources/messages/messages_sk.yml +++ b/src/main/resources/messages/messages_sk.yml @@ -1,57 +1,61 @@ -add_email: '&cPridaj svoj e-mail príkazom "/email add email zopakujEmail"' -antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' -antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' -country_banned: 'Your country is banned from this server' -email_added: '[AuthMe] Email Added !' -email_changed: '[AuthMe] Email Change !' -email_confirm: '[AuthMe] Confirm your Email !' -email_invalid: '[AuthMe] Invalid Email' -email_send: '[AuthMe] Recovery Email Send !' -error: '&fNastala chyba; Kontaktujte administrátora' -invalid_session: '&fZapamätane casove data nie su doveryhodne. Cakaj na ukoncenie spojenia' -kick_forvip: '&cA VIP Player join the full server!' -kick_fullserver: '&cThe server is actually full, Sorry!' +# Slovak translate by Judzi # +# www.judzi.eu | judzi@cs-gaming.eu # +# 02.02.2013 - 4:35 AM - Thanks for use # + logged_in: '&cAktuálne si uz prihláseny!' -login: '&cBol si úspesne prihláseny!' -login_msg: '&cPrihlás sa príkazom "/login heslo"' -logout: '&cBol si úspesne odhláseny' -max_reg: '&fDosiahol si maximum registrovanych uctov.' -name_len: '&cTvoje meno je velmi krátke alebo dlhé' -new_email_invalid: '[AuthMe] New email invalid!' -no_perm: '&cZiadne' not_logged_in: '&cNie si este prihláseny!' -old_email_invalid: '[AuthMe] Old email invalid!' -pass_len: '&fHeslo je velmi kratke alebo dlhe' -password_error: '&fHeslá sa nezhodujú' +reg_disabled: '&cRegistrácia nie je povolená' +user_regged: '&cZadané meno je uz zaregistrované' +usage_reg: '&cPríkaz: /register heslo zopakujHeslo' +usage_log: '&cPríkaz: /login heslo' +user_unknown: '&cZadané meno nie je zaregistrované!' +pwd_changed: '&cHeslo zmenené!' +reg_only: '&fVstup iba pre registrovanych! Navstiv http://example.com pre registráciu' +valid_session: '&cZapamätané prihlásenie' +login_msg: '&cPrihlás sa príkazom "/login heslo"' +reg_msg: '&cZaregistruj sa príkazom "/register heslo zopakujHeslo"' +reg_email_msg: '&cPlease register with "/register "' +timeout: '&fVyprsal cas na prihlásenie' +wrong_pwd: '&cZadal si zlé heslo' password_error_nick: '&fYou can''t use your name as password' password_error_unsafe: '&fYou can''t use unsafe passwords' -pwd_changed: '&cHeslo zmenené!' -recovery_email: '&cZabudol si heslo? Pouzi príkaz /email recovery ' -reg_disabled: '&cRegistrácia nie je povolená' -reg_email_msg: '&cPlease register with "/register "' -regex: '&cTvoje meno obsahuje zakázané znaky. Povolené znaky: REG_EX' +logout: '&cBol si úspesne odhláseny' +usage_unreg: '&cPríkaz: /unregister heslo' registered: '&cBol si úspesne zaregistrovany' -reg_msg: '&cZaregistruj sa príkazom "/register heslo zopakujHeslo"' -reg_only: '&fVstup iba pre registrovanych! Navstiv http://example.com pre registráciu' +unregistered: '&cUcet bol vymazany!' +login: '&cBol si úspesne prihláseny!' +no_perm: '&cZiadne' +same_nick: '&fHrác s tymto nickom uz hrá!' reg_voluntarily: '&fZaregistruj sa pomocou príkazu "/register heslo zopakujHeslo"' reload: '&fKonfigurácia a databáza bola obnovená' -same_nick: '&fHrác s tymto nickom uz hrá!' -timeout: '&fVyprsal cas na prihlásenie' +error: '&fNastala chyba; Kontaktujte administrátora' unknown_user: '&fHrac nie je v databázi' -unregistered: '&cUcet bol vymazany!' unsafe_spawn: '&fTvoj pozícia bol nebezpecná, teleportujem hraca na spawn' -usage_captcha: '&cUsage: /captcha ' +invalid_session: '&fZapamätane casove data nie su doveryhodne. Cakaj na ukoncenie spojenia' +max_reg: '&fDosiahol si maximum registrovanych uctov.' +password_error: '&fHeslá sa nezhodujú' +pass_len: '&fHeslo je velmi kratke alebo dlhe' +vb_nonActiv: '&fUcet nie je aktivny. Prezri si svoj e-mail!' usage_changepassword: '&fPríkaz: /changepassword stareHeslo noveHeslo' +name_len: '&cTvoje meno je velmi krátke alebo dlhé' +regex: '&cTvoje meno obsahuje zakázané znaky. Povolené znaky: REG_EX' +add_email: '&cPridaj svoj e-mail príkazom "/email add email zopakujEmail"' +recovery_email: '&cZabudol si heslo? Pouzi príkaz /email recovery ' +usage_captcha: '&cUsage: /captcha ' +wrong_captcha: '&cWrong Captcha, please use : /captcha THE_CAPTCHA' +valid_captcha: '&cYour captcha is valid !' +kick_forvip: '&cA VIP Player join the full server!' +kick_fullserver: '&cThe server is actually full, Sorry!' usage_email_add: '&fUsage: /email add ' usage_email_change: '&fUsage: /email change ' usage_email_recovery: '&fUsage: /email recovery ' -usage_log: '&cPríkaz: /login heslo' -usage_reg: '&cPríkaz: /register heslo zopakujHeslo' -usage_unreg: '&cPríkaz: /unregister heslo' -user_regged: '&cZadané meno je uz zaregistrované' -user_unknown: '&cZadané meno nie je zaregistrované!' -valid_captcha: '&cYour captcha is valid !' -valid_session: '&cZapamätané prihlásenie' -vb_nonActiv: '&fUcet nie je aktivny. Prezri si svoj e-mail!' -wrong_captcha: '&cWrong Captcha, please use : /captcha THE_CAPTCHA' -wrong_pwd: '&cZadal si zlé heslo' +new_email_invalid: '[AuthMe] New email invalid!' +old_email_invalid: '[AuthMe] Old email invalid!' +email_invalid: '[AuthMe] Invalid Email' +email_added: '[AuthMe] Email Added !' +email_confirm: '[AuthMe] Confirm your Email !' +email_changed: '[AuthMe] Email Change !' +email_send: '[AuthMe] Recovery Email Send !' +country_banned: 'Your country is banned from this server' +antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' +antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' diff --git a/src/main/resources/messages/messages_tr.yml b/src/main/resources/messages/messages_tr.yml index 5b2201077..7f0003962 100644 --- a/src/main/resources/messages/messages_tr.yml +++ b/src/main/resources/messages/messages_tr.yml @@ -1,58 +1,58 @@ -add_email: '&cLutfen emailini ekle : /email add ' -antibot_auto_disabled: '[AuthMe] AntiBotMode %m dakika sonra otomatik olarak isgal yuzundan devredisi birakildi' -antibot_auto_enabled: '[AuthMe] AntiBotMode otomatik olarak etkinlestirildi!' -country_banned: 'Ulken bu serverdan banlandi !' -email_added: '[AuthMe] Eposta Eklendi !' -email_changed: '[AuthMe] Eposta Degistirildi !' -email_confirm: '[AuthMe] Epostani Dogrula !' -email_exists: '[AuthMe] An email already exists on your account. You can change it using the command below' -email_invalid: '[AuthMe] Gecersiz Eposta' -email_send: '[AuthMe] Kurtarma postasi gonderildi !' -error: '&fBir hata olustu; Lutfen adminle iletisime gec' -invalid_session: '&fOturum veritabanlari uyusmuyor lutfen sonunu bekleyin' -kick_forvip: '&cSenin yerine bir VIP kullanıcı girdi!' -kick_fullserver: '&cServer suanda dolu gozukuyor, Uzgunum!' -logged_in: '&cZaten Giris Yapilmis!' -login: '&cBasarili giris!' -login_msg: '&cGiris Yapin : "/login sifre"' -logout: '&cBasarili cikis' -max_reg: '&fMaximim kayit limitini astin!' -name_len: '&cKullanici adin cok kisa ya da cok uzun' -new_email_invalid: '[AuthMe] Yeni eposta gecersiz!' -no_perm: '&cYetkin yok' +unknown_user: '&fKullanici veritabanina ekli degil' +unsafe_spawn: '&fDogdugunuz konum guvenli degildi, lobiye isinlaniyorsunuz...' not_logged_in: '&cGiris Yapmadin!' -old_email_invalid: '[AuthMe] Eski eposta gecersiz!' -pass_len: '&fSifren cok uzun ya da kisa olmamali ' +reg_voluntarily: '&fKullanici adinla kayit olabilirsin! Komut: "/register sifren sifrentekrar"' +usage_log: '&cKullanimi: /login sifren' +wrong_pwd: '&cYanlis sifre' +unregistered: '&cSunucudan kaydiniz basariyla silindi!' +reg_disabled: '&cKayit deaktif' +valid_session: '&cOturum Acma' +login: '&cBasarili giris!' +vb_nonActiv: '&fHesabin aktiflestirilmedi! Emailini kontrol et' +user_regged: '&cKullanici zaten oyunda' +usage_reg: '&cKullanimi: /register sifre sifretekrar' +max_reg: '&fMaximim kayit limitini astin!' +no_perm: '&cYetkin yok' +error: '&fBir hata olustu; Lutfen adminle iletisime gec' +login_msg: '&cGiris Yapin : "/login sifre"' +reg_msg: '&cLutfen kaydolmak icin : "/register sifre sifretekrar"' +reg_email_msg: '&cLutfen Kaydolmak icin : "/register "' +usage_unreg: '&cKullanimi: /unregister sifren' +pwd_changed: '&cSifreniz degisti!' +user_unknown: '&cBu kullaniciyla kaydolunmamis!' password_error: '&fSifren eslesmiyor' password_error_nick: '&fYou can''t use your name as password, please choose another one' password_error_unsafe: '&fThe chosen password is not safe, please choose another one' -pwd_changed: '&cSifreniz degisti!' -recovery_email: '&cSifreni mi unuttun? Degistirmek icin : /email recovery ' -reg_disabled: '&cKayit deaktif' -reg_email_msg: '&cLutfen Kaydolmak icin : "/register "' -regex: '&cKullanici adin ozel karakterler iceriyor. Uygun karakterler: REG_EX' -registered: '&cBasarili kayit!' -reg_msg: '&cLutfen kaydolmak icin : "/register sifre sifretekrar"' +invalid_session: '&fOturum veritabanlari uyusmuyor lutfen sonunu bekleyin' reg_only: '&fSadece kayitli uyeler girebilir ! Kayit olmak icin www.orneksite.com adresini ziyaret ediniz !' -reg_voluntarily: '&fKullanici adinla kayit olabilirsin! Komut: "/register sifren sifrentekrar"' -reload: '&fKonfigurasyon dosyasi ve veritabani yüklendi' +logged_in: '&cZaten Giris Yapilmis!' +logout: '&cBasarili cikis' same_nick: '&fAyni kullanici oyunda' +registered: '&cBasarili kayit!' +pass_len: '&fSifren cok uzun ya da kisa olmamali ' +reload: '&fKonfigurasyon dosyasi ve veritabani yüklendi' timeout: '&fZaman Asimi' -unknown_user: '&fKullanici veritabanina ekli degil' -unregistered: '&cSunucudan kaydiniz basariyla silindi!' -unsafe_spawn: '&fDogdugunuz konum guvenli degildi, lobiye isinlaniyorsunuz...' -usage_captcha: '&cBir captcha yazman lazim , yazmak icin: /captcha ' usage_changepassword: '&fkullanimi: /changepassword eskisifre yenisifre' +name_len: '&cKullanici adin cok kisa ya da cok uzun' +regex: '&cKullanici adin ozel karakterler iceriyor. Uygun karakterler: REG_EX' +add_email: '&cLutfen emailini ekle : /email add ' +recovery_email: '&cSifreni mi unuttun? Degistirmek icin : /email recovery ' +usage_captcha: '&cBir captcha yazman lazim , yazmak icin: /captcha ' +wrong_captcha: '&cYanlis Captcha, kullanmak icin : /captcha THE_CAPTCHA' +valid_captcha: '&cCaptcha gecerli !' +kick_forvip: '&cSenin yerine bir VIP kullanıcı girdi!' +kick_fullserver: '&cServer suanda dolu gozukuyor, Uzgunum!' usage_email_add: '&fKullanimi: /email add ' usage_email_change: '&fKullanimi: /email change ' usage_email_recovery: '&fKullanimi: /email recovery ' -usage_log: '&cKullanimi: /login sifren' -usage_reg: '&cKullanimi: /register sifre sifretekrar' -usage_unreg: '&cKullanimi: /unregister sifren' -user_regged: '&cKullanici zaten oyunda' -user_unknown: '&cBu kullaniciyla kaydolunmamis!' -valid_captcha: '&cCaptcha gecerli !' -valid_session: '&cOturum Acma' -vb_nonActiv: '&fHesabin aktiflestirilmedi! Emailini kontrol et' -wrong_captcha: '&cYanlis Captcha, kullanmak icin : /captcha THE_CAPTCHA' -wrong_pwd: '&cYanlis sifre' +new_email_invalid: '[AuthMe] Yeni eposta gecersiz!' +old_email_invalid: '[AuthMe] Eski eposta gecersiz!' +email_invalid: '[AuthMe] Gecersiz Eposta' +email_added: '[AuthMe] Eposta Eklendi !' +email_confirm: '[AuthMe] Epostani Dogrula !' +email_changed: '[AuthMe] Eposta Degistirildi !' +email_send: '[AuthMe] Kurtarma postasi gonderildi !' +email_exists: '[AuthMe] An email already exists on your account. You can change it using the command below' +country_banned: 'Ulken bu serverdan banlandi !' +antibot_auto_enabled: '[AuthMe] AntiBotMode otomatik olarak etkinlestirildi!' +antibot_auto_disabled: '[AuthMe] AntiBotMode %m dakika sonra otomatik olarak isgal yuzundan devredisi birakildi' diff --git a/src/main/resources/messages/messages_uk.yml b/src/main/resources/messages/messages_uk.yml index f60315e09..6b132d8da 100644 --- a/src/main/resources/messages/messages_uk.yml +++ b/src/main/resources/messages/messages_uk.yml @@ -1,57 +1,57 @@ -add_email: '&cБудь ласка додайте свою електронну скриньку: /email add ВашEmail ВашEmail' -antibot_auto_disabled: '[AuthMe] AntiBotMod автоматично вимкнувся, сподіваємось атака зупинена' -antibot_auto_enabled: '[AuthMe] AntiBotMod автоматично увімкнений (забагато одначасних з`єднань)!' -country_banned: 'Сервер не доступний для вашої країни | Your country is banned from this server' -email_added: '[AuthMe] &2Email додано!' -email_changed: '[AuthMe] &2Email змінено!' -email_confirm: '[AuthMe] Підтвердіть ваш Email!' -email_invalid: '[AuthMe] Невірний Email' -email_send: '[AuthMe] Лист для відновлення надіслано на ваш Email!' -error: '&fЩось пішло не так; Будь ласка зв`яжіться з адміністратором' -invalid_session: '&fСесія некоректна. Будь ласка зачекайте коли вона закінчиться' -kick_forvip: '&cVIP зайшов на переповнений сервер!' -kick_fullserver: '&cНажаль, сервер переповнений!' -logged_in: '&2Ви уже ввійшли!' -login: '&2Успішна авторизація!' -login_msg: '&cДля авторизації введіть "/login Пароль"' -logout: '&cВи успішно вийшли' -max_reg: '&fВи перевищили максимальне число реєстрацій на ваш IP' -name_len: '&cВаш нікнейм занадто довгий, або занадто короткий' -new_email_invalid: '[AuthMe] Новий Email недійсний!' -no_perm: '&cУ Вас недостатньо прав' +unknown_user: '&fКористувача немає в базі даних' +unsafe_spawn: '&fМісце вашого виходу було небезпечне тому ми телепортували вас на спавн' not_logged_in: '&cВи ще не ввійшли!' -old_email_invalid: '[AuthMe] Старий Email недійсний!' -pass_len: '&fВаш пароль занадто довгий, або занадто короткий' -password_error: '&fПаролі не співпадають' +reg_voluntarily: '&eЩоб зарєєструватися введіть команду &d"/reg Пароль Повтор_Пароля"' +usage_log: '&cВикористовуйте: &a/login Пароль &cабо &a/l Пароль' +wrong_pwd: '&cНевірний пароль' +unregistered: '&cВи успішно видалили свій акаунт!' +reg_disabled: '&cРеєстрація виключена' +valid_session: '&cСесія відкрита' +login: '&2Успішна авторизація!' +vb_nonActiv: '&fВаш акаунт не активований. Перевірте свою електронну адресу!' +user_regged: '&cТакий користувач вже зареєстрований' +usage_reg: '&cВикористовуйте: /reg Пароль Повтор_Пароля' +max_reg: '&fВи перевищили максимальне число реєстрацій на ваш IP' +no_perm: '&cУ Вас недостатньо прав' +error: '&fЩось пішло не так; Будь ласка зв`яжіться з адміністратором' +login_msg: '&cДля авторизації введіть "/login Пароль"' +reg_msg: '&cДля реєстрації введіть "/reg Пароль Повтор_Пароля"' password_error_nick: '&fВи не можете використати ваш Нікнейм у якості паролю' password_error_unsafe: '&fВи не можете використувати ненадійний пароль' -pwd_changed: '&cПароль змінено!' -recovery_email: '&cЗабули пароль? Введіть /email recovery ВашПароль' -reg_disabled: '&cРеєстрація виключена' reg_email_msg: '&cДля реєстрації введіть "/reg Email Email"' -regex: '&cВаш нікнейм містить заборонені символи. Доступні символи: REG_EX' -registered: '&cВи успішно зареєстровані!' -reg_msg: '&cДля реєстрації введіть "/reg Пароль Повтор_Пароля"' +usage_unreg: '&cВикористовуйте: /unregister Пароль' +pwd_changed: '&cПароль змінено!' +user_unknown: '&cТакий користувач не зарєєстрований' +password_error: '&fПаролі не співпадають' +invalid_session: '&fСесія некоректна. Будь ласка зачекайте коли вона закінчиться' reg_only: '&Вхід доступний лише зареєстрованим користувачам. Зареєструватися можна за адресою &9&nhttp://сайт_серверу.com&r' -reg_voluntarily: '&eЩоб зарєєструватися введіть команду &d"/reg Пароль Повтор_Пароля"' -reload: '&fКонфiгурацiя i база даних успiшно перезавнтажені.' +logged_in: '&2Ви уже ввійшли!' +logout: '&cВи успішно вийшли' same_nick: '&fГравець з вашим нікнеймом вже грає на сервері' +registered: '&cВи успішно зареєстровані!' +pass_len: '&fВаш пароль занадто довгий, або занадто короткий' +reload: '&fКонфiгурацiя i база даних успiшно перезавнтажені.' timeout: '&fЧас для входу вийшов' -unknown_user: '&fКористувача немає в базі даних' -unregistered: '&cВи успішно видалили свій акаунт!' -unsafe_spawn: '&fМісце вашого виходу було небезпечне тому ми телепортували вас на спавн' -usage_captcha: '&cБудь ласка введіть капчу: /captcha ' usage_changepassword: '&fВикористовуйте: /changepassword СтарийПароль НовийПароль' +name_len: '&cВаш нікнейм занадто довгий, або занадто короткий' +regex: '&cВаш нікнейм містить заборонені символи. Доступні символи: REG_EX' +add_email: '&cБудь ласка додайте свою електронну скриньку: /email add ВашEmail ВашEmail' +recovery_email: '&cЗабули пароль? Введіть /email recovery ВашПароль' +usage_captcha: '&cБудь ласка введіть капчу: /captcha ' +wrong_captcha: '&cНевірне значення капчи: /captcha THE_CAPTCHA' +valid_captcha: '&cКапча введена вірно!' +kick_forvip: '&cVIP зайшов на переповнений сервер!' +kick_fullserver: '&cНажаль, сервер переповнений!' usage_email_add: '&fВикористовуйте: /email add ВашEmail ВашEmail' usage_email_change: '&fВикористовуйте: /email change СтарийEmail НовийEmail' usage_email_recovery: '&fВикористовуйте: /email recovery Email' -usage_log: '&cВикористовуйте: &a/login Пароль &cабо &a/l Пароль' -usage_reg: '&cВикористовуйте: /reg Пароль Повтор_Пароля' -usage_unreg: '&cВикористовуйте: /unregister Пароль' -user_regged: '&cТакий користувач вже зареєстрований' -user_unknown: '&cТакий користувач не зарєєстрований' -valid_captcha: '&cКапча введена вірно!' -valid_session: '&cСесія відкрита' -vb_nonActiv: '&fВаш акаунт не активований. Перевірте свою електронну адресу!' -wrong_captcha: '&cНевірне значення капчи: /captcha THE_CAPTCHA' -wrong_pwd: '&cНевірний пароль' +new_email_invalid: '[AuthMe] Новий Email недійсний!' +old_email_invalid: '[AuthMe] Старий Email недійсний!' +email_invalid: '[AuthMe] Невірний Email' +email_added: '[AuthMe] &2Email додано!' +email_confirm: '[AuthMe] Підтвердіть ваш Email!' +email_changed: '[AuthMe] &2Email змінено!' +email_send: '[AuthMe] Лист для відновлення надіслано на ваш Email!' +country_banned: 'Сервер не доступний для вашої країни | Your country is banned from this server' +antibot_auto_enabled: '[AuthMe] AntiBotMod автоматично увімкнений (забагато одначасних з`єднань)!' +antibot_auto_disabled: '[AuthMe] AntiBotMod автоматично вимкнувся, сподіваємось атака зупинена' diff --git a/src/main/resources/messages/messages_vn.yml b/src/main/resources/messages/messages_vn.yml index 0993f872a..29941aaa9 100644 --- a/src/main/resources/messages/messages_vn.yml +++ b/src/main/resources/messages/messages_vn.yml @@ -1,55 +1,55 @@ -add_email: '&cVui lòng thêm địa chỉ email cho tài khoản với lệnh: /email add email-của-bạn nhập-lại-email-của-bạn' -antibot_auto_disabled: '[AuthMe] AntiBot tự huỷ kích hoạt sau %m phút, hi vọng lượng kết nối sẽ giảm bớt' -antibot_auto_enabled: '[AuthMe] AntiBot đã được kích hoạt vì lượng người chơi kết nối vượt quá giới hạn!' -country_banned: 'Rất tiếc, quốc gia của bạn không được phép gia nhập server' -email_added: '[AuthMe] Đã thêm địa chỉ email !' -email_changed: '[AuthMe] Đã thay đổi email !' -email_confirm: '[AuthMe] Xác nhận email !' -email_invalid: '[AuthMe] Sai địa chỉ email' -email_send: '[AuthMe] Đã gửi email khôi phục mật khẩu tới bạn !' +unknown_user: '&fNgười chơi không tồn tại trong cơ sở dữ liệu' +unsafe_spawn: '&fNơi thoát server của bạn không an toàn, đang dịch chuyển bạn tới điểm spawn của server' +not_logged_in: '&cChưa đăng nhập!' +reg_voluntarily: '&fBạn có thể đăng kí tài khoản với lệnh "/register mật-khẩu nhập-lại-mật-khẩu"' +usage_log: '&eSử dụng: /login password' +wrong_pwd: '&cSai mật khẩu' +unregistered: '&cHuỷ đăng kí thành công!' +reg_disabled: '&cHệ thống đăng kí đã bị vô hiệu' +valid_session: '&cPhiên đăng nhập còn tồn tại, bạn không cần nhập mật khẩu' +login: '&cĐăng nhập thành công!' +vb_nonActiv: '&fTài khoản của bạn chưa được kích hoạt, kiểm tra email!' +user_regged: '&cTên đăng nhập này đã được đăng kí' +usage_reg: '&eSử dụng: /register mật-khẩu nhập-lại-mật-khẩu' +max_reg: '&fSố lượng tài khoản ở IP của bạn trong server này đã quá giới hạn cho phép' +no_perm: '&cKhông có quyền' error: '&fCó lỗi xảy ra; Báo lại cho người điều hành server' +login_msg: '&cĐăng nhập với lệnh "/login mật-khẩu"' +reg_msg: '&cĐăng kí tài khoản với lệnh "/register mật-khẩu nhập-lại-mật-khẩu"' +reg_email_msg: '&cĐăng kí email cho tài khoản với lệnh "/register "' +usage_unreg: '&eSử dụng: /unregister mật-khẩu' +pwd_changed: '&cĐã đổi mật khẩu!' +user_unknown: '&cTài khoản này chưa được đăng kí' +password_error: '&fMật khẩu không khớp' +unvalid_session: '&fPhiên đăng nhập không hồi đáp, vui lòng chờ phiên đăng nhập kết thúc' +reg_only: '&fChỉ cho phép người đã đăng kí! Hãy vào trang http://web-của.bạn/ để đăng kí' +logged_in: '&cĐã đăng nhập!' +logout: '&cThoát đăng nhập thành công' +same_nick: '&fTài khoản đang được người khác sử dụng trong server' +registered: '&cĐăng kí thành công!' +pass_len: '&fMật khẩu của bạn quá ngắn hoặc quá dài' +reload: '&fThiết lập và dữ liệu đã được nạp lại' +timeout: '&fQuá thời gian đăng nhập' +usage_changepassword: '&eSử dụng: /changepassword mật-khẩu-cũ mật-khẩu-mới' +name_len: '&cTên đăng nhập của bạn quá ngắn hoặc quá dài' +regex: '&cTên đăng nhập của bạn có chứa kí tự đặc biệt không được cho phép. Các kí tự hợp lệ: REG_EX' +add_email: '&cVui lòng thêm địa chỉ email cho tài khoản với lệnh: /email add email-của-bạn nhập-lại-email-của-bạn' +recovery_email: '&cQuên mật khẩu? Hãy dùng lệnh /email recovery ' +usage_captcha: '&cBạn cần nhập mã xác nhận: /captcha ' +wrong_captcha: '&cSai mã xác nhận, nhập lại: /captcha ' +valid_captcha: '&aMã xác nhận hợp lệ!' kick_forvip: '&cNgười chơi VIP đã vào server hiện đang full!' kick_fullserver: '&cXin lỗi, hiện tại server không còn trống slot để bạn có thể vào!' -logged_in: '&cĐã đăng nhập!' -login: '&cĐăng nhập thành công!' -login_msg: '&cĐăng nhập với lệnh "/login mật-khẩu"' -logout: '&cThoát đăng nhập thành công' -max_reg: '&fSố lượng tài khoản ở IP của bạn trong server này đã quá giới hạn cho phép' -name_len: '&cTên đăng nhập của bạn quá ngắn hoặc quá dài' -new_email_invalid: '[AuthMe] Địa chỉ email mới không hợp lệ!' -no_perm: '&cKhông có quyền' -not_logged_in: '&cChưa đăng nhập!' -old_email_invalid: '[AuthMe] Địa chỉ email cũ không hợp lệ!' -pass_len: '&fMật khẩu của bạn quá ngắn hoặc quá dài' -password_error: '&fMật khẩu không khớp' -pwd_changed: '&cĐã đổi mật khẩu!' -recovery_email: '&cQuên mật khẩu? Hãy dùng lệnh /email recovery ' -reg_disabled: '&cHệ thống đăng kí đã bị vô hiệu' -reg_email_msg: '&cĐăng kí email cho tài khoản với lệnh "/register "' -regex: '&cTên đăng nhập của bạn có chứa kí tự đặc biệt không được cho phép. Các kí tự hợp lệ: REG_EX' -registered: '&cĐăng kí thành công!' -reg_msg: '&cĐăng kí tài khoản với lệnh "/register mật-khẩu nhập-lại-mật-khẩu"' -reg_only: '&fChỉ cho phép người đã đăng kí! Hãy vào trang http://web-của.bạn/ để đăng kí' -reg_voluntarily: '&fBạn có thể đăng kí tài khoản với lệnh "/register mật-khẩu nhập-lại-mật-khẩu"' -reload: '&fThiết lập và dữ liệu đã được nạp lại' -same_nick: '&fTài khoản đang được người khác sử dụng trong server' -timeout: '&fQuá thời gian đăng nhập' -unknown_user: '&fNgười chơi không tồn tại trong cơ sở dữ liệu' -unregistered: '&cHuỷ đăng kí thành công!' -unsafe_spawn: '&fNơi thoát server của bạn không an toàn, đang dịch chuyển bạn tới điểm spawn của server' -unvalid_session: '&fPhiên đăng nhập không hồi đáp, vui lòng chờ phiên đăng nhập kết thúc' -usage_captcha: '&cBạn cần nhập mã xác nhận: /captcha ' -usage_changepassword: '&eSử dụng: /changepassword mật-khẩu-cũ mật-khẩu-mới' usage_email_add: '&eSử dụng: /email add ' usage_email_change: '&eSử dụng: /email change ' usage_email_recovery: '&eSử dụng: /email recovery ' -usage_log: '&eSử dụng: /login password' -usage_reg: '&eSử dụng: /register mật-khẩu nhập-lại-mật-khẩu' -usage_unreg: '&eSử dụng: /unregister mật-khẩu' -user_regged: '&cTên đăng nhập này đã được đăng kí' -user_unknown: '&cTài khoản này chưa được đăng kí' -valid_captcha: '&aMã xác nhận hợp lệ!' -valid_session: '&cPhiên đăng nhập còn tồn tại, bạn không cần nhập mật khẩu' -vb_nonActiv: '&fTài khoản của bạn chưa được kích hoạt, kiểm tra email!' -wrong_captcha: '&cSai mã xác nhận, nhập lại: /captcha ' -wrong_pwd: '&cSai mật khẩu' +new_email_invalid: '[AuthMe] Địa chỉ email mới không hợp lệ!' +old_email_invalid: '[AuthMe] Địa chỉ email cũ không hợp lệ!' +email_invalid: '[AuthMe] Sai địa chỉ email' +email_added: '[AuthMe] Đã thêm địa chỉ email !' +email_confirm: '[AuthMe] Xác nhận email !' +email_changed: '[AuthMe] Đã thay đổi email !' +email_send: '[AuthMe] Đã gửi email khôi phục mật khẩu tới bạn !' +country_banned: 'Rất tiếc, quốc gia của bạn không được phép gia nhập server' +antibot_auto_enabled: '[AuthMe] AntiBot đã được kích hoạt vì lượng người chơi kết nối vượt quá giới hạn!' +antibot_auto_disabled: '[AuthMe] AntiBot tự huỷ kích hoạt sau %m phút, hi vọng lượng kết nối sẽ giảm bớt' diff --git a/src/main/resources/messages/messages_zhcn.yml b/src/main/resources/messages/messages_zhcn.yml index 30e57c028244b07bf7e88aa920a7e17c8c89fa59..76d1b840578cca916a30b13f98d557ebe4ee9b94 100644 GIT binary patch literal 5205 zcmb_g-EJF26rLirsBVOcgep;ix~&AUg46^gR2opF0)-eW}qcqvXo3#_!*+l-? zq!O)mmdr=&|e(`+m)yZKk=g*ZkoB7_I+O*2y*8@#QZD3Ud+K$@8 zoO~?xdO?90qnK;pT-sW~Il_@F6yl?tkJ-vraSE5PnXh_<3z)4JDCL^}U61Q<6mM|0 zCo-vP7t&g|Ht>toChoQ!si9gg{CPan=qHZ@@)No?RyMFQ0bNUL-i5YpP`1>wjK&}- zAwrU(ocG3kUbiyoh^@ zsHps#O-%gwfGc=#)%%|DDt$`JjFrZpp$ePvL7v`d8M)#I+V4sf=rAhYeMOZ?n`ON)}4Sueht@ zU_Lyn(IeWU%mx{A?n*pbsp3S>2XiHy>(`gR#zltcpTKi1NM}wklRNlrYY$ipZZ&^D z2F+5`NF}Y_URy8x`_r!_W(;%B=qEg_hb<4#uZkzKS(d=&0RE=W@2e2Gu#Jo}baiAV zD3hyeIG35DxbA+wV=cyg6x5=KdlhxTAcUA3y;*IvXyA8z!lLa5@F_B{}6!~ z^L<31t+Rl&$Qo$txNIXPO(!19_@{@;2|*VF@um?mFGWEQxWIo|%Q61nK|Xn!zo(JT zl_Nf#EZs#*|24yxYB2~!w`w=kljr*5fJF-sQp z1-CRt;mN1HMIx09{~qW?HglcWLO<_h<+Uz1zG^IjLRQ*H7_I8midfsxSoGq#Erf~) z`T>{zrS6l8u&||gmVtz1yE+Sv;OVn$v(B6Bu=9d=%EqBfQRK6v4cs%_*}@nH`F7R# z?Z$w=0Dgev-hu>f0wZ7y;D5{Nc(w|(JcIW01xlro*Uk6czhRkSUVJJ$;i{17OdB>EtR{0AGIteta@wowZ z?uZ7j1+G2JV3+@R%S?RTeSz)C9_n85#riMXsLkSkcU`*c4HV-`hFI#p7G!BGZ|C*E z;b2i#9$HJYe8$N(mbuuTrLxio-gRWp)-N|6vLX_T3e6PT0=$H>$xCogRF>D*5KXwJ zmK2*v&}k&cwG=UL4ARBqXj=Z8sfS#?J>X6YyEL;xa>McmZS7H$UNIanC04|SlN(2y z4MCdShErY1YaQ=Ts{(M9aYk!K+vWA#b{4K=7j@2-@2*axYEjWv;?T3n8Vpy$*;))! zWbzAIh`bmv+RxOjd>XJBCz4i>7u-j;)B-40;d40Fv4D3EBNIV>FvudbKC`Gn5r)mLo7eq$u75>B7Y6_8RKXD$j?7cjmrlM z@L0mJA}yN)gM@4_YGBDPRU10h_?AR9hrf!98vY3w&NuXzGXKi=xLNy{Uwr)OEgTFeK#6R`R{GWRCw9^Z%tAdLs-F4)>ENkL{0@WhR^{npEp4uH{{d&e B-RJ-S literal 4407 zcmbVPZD>&`MVA(*f`3%l!2NOck8J+f$Dav9S7ZpvKsH!#2vaChhq7hwb5G9hx%p__2qE{L zyx$+s`yTcL>t_S>(U`#o>3Kg(vu#Xat?YTGv-`!PB_r^x(k}h0R5=v3oyGhG>)g!w z@g2mmogE2)nyDMjvYHwDw77$vIAE^nyB}(0UIyJ6HbOe%EK9!{ zz31sSOHTuInxpqP*<;Wfw<*eY+7v0)NvFM}^`+z6lBw>C>gsn(eJ|!eRv*(|>AP9_ zOrH-twa+u)vCxY+D{Ld> z5HXe|=qzRHPdQ@LLZPd$9^%=pTY zy2>ep?@Xl zRNo5gX1iGz`#g6cdOBzXrpfwWGX;y+h{&oeCr=Sf+cphTJPpY!ot=;GHa!*23ps*6 zP1=+6K{aV)gX4uxUA@pdKLNWhm8R8}3b&kdfKsEZ=ZIJME#rhk1w{Bh+A_vbVBFfH z)yi@B7kbykPX$5a)`s30k@N_<2LV9`%o-z$hRGAhq6GQiRd)uyEFKALQ&EM8s4v3f z@O%1j;9g=~k1xL^?)ZnUA0#Q7jX3Uj6fDqs!)-l(jINEZm}={pJT|Rzf6&XL#3lEc zyI#1T_1HCMpkGnnA}blnibnN-9E#2Y4xdS{O1_@#s$v4DfR;<=@Or5&DMvI*^lqHz zd0)N*Z`Ij3M6p8s*TxEwM$TdH*QJi&!9%a5MWzJLs9pEm648YkRTb|GQ4))?5{R zm(uHKLd?ACpO&YJH$zlWh)^TEMm>O@_re|jRzpM>J%D+`F#yxXsY#(rXV#jIWjDp7!e%9#!6T&89Uhy<>F-dDnfASTr!<(0#zhj_UcvVl+}#PiP%M z^yC{yz9_n7J3chS9ffUT?NtQ8)-Yn{78X0Z38vA@`K~CY!49H#>u8Q=+(WliM6S`s zb27^R!PWyW-8wKS(p0x16A5-Z1cUZw6r;&}qoV zrp z3tx46Q{))BBJ@JI@5HrqBzlD=6F<8=i%1kKoPj6EcCojpes{6Gu1q<3aJC>+8Se!| zQtk!dBX%ZXMS^wCW+uz(4v$61uU`LWX;KCD@ILm>-k{YtguO41AccJZ8vPZOq+1VnQmxf#U-v zVkUISD1^NPcr!|}9G_!;HuE6BdvK99sZM`p(yJbdrl<>blQv|3%S_CVy?m|uPQGA0 z2yDoIH6*M;Jg_AIi~33W2>oJ*6!LYZo0&0R{#trnrM-p*9eDWUcSUqdBYDm)T8olG zdP0&8gp%>FmPcW?4D_GE=ImdAQJ5IQ2N_HFHtlGF4|r>K*J*|&xGQ1LZl*`Jc{yz| zEuzOKFUK0bE#P@+eW)UN3M{9ymfpe5dOdvO5EA9wBRh?Ezj`UW&YMZ8?E=`dJmS`C zaXPA*CWpeo6-S#~KiCz-jw#=rfIYk)(apZdfaz?Qmr9OJoFDp3`et1nDkONr*x2|q z;GE88*1Y?$aq%8&PpnGfrX-L-=5Bmn(b*>R$I{JiBk8Fu^lt8p`EMUQYj5E|1MZ2i zBu@Ur@(kTjbV7msv}K66V%siQxYfghZ?mrsV!oG?t4DE;z7aN!QXC;8xdfiz4kmnp z9A`gqBM>qr&_(1*md|%6VWZBtTvU?nQ{``WI<)F)DPIXOCXV)9o}Gw$RfGh <重覆電郵地址> 》' -antibot_auto_disabled: '&8[&6用戶系統&8] 不正常連接數已減少，防止機械人程序將於 %m 分鐘後停止。' -antibot_auto_enabled: '&8[&6用戶系統&8] 防止機械人程序已因應現時大量不尋常連線而啟用。' -country_banned: '&8[&6用戶系統&8] 本伺服器已停止對你的國家提供遊戲服務。' -email_added: '&8[&6用戶系統&8] 已新增你的電郵地址。' -email_changed: '&8[&6用戶系統&8] 你的電郵地址已更改。' -email_confirm: '&8[&6用戶系統&8] 請重覆輸入你的電郵地址。' -email_invalid: '&8[&6用戶系統&8] 你所填寫的電郵地址並不正確。' -email_send: '&8[&6用戶系統&8] 忘記密碼信件已寄出，請查收。' -error: '&8[&6用戶系統&8] &f發生錯誤，請與管理員聯絡。' -invalid_session: '&8[&6用戶系統&8] &f登入階段資料已損壞，請等待登入階段結束。' -kick_forvip: '&c因為有VIP玩家登入了伺服器。' -kick_fullserver: '&c抱歉！ 因為伺服器滿人了，所以你目前未能登入伺服器。' -logged_in: '&8[&6用戶系統&8] &c你已經登入過了。' -login: '&8[&6用戶系統&8] &c你成功登入了。' -login_msg: '&8[&6用戶系統&8] &c請使用這個指令來登入： 《 /login <密碼> 》' -logout: '&8[&6用戶系統&8] &b你成功登出了。' -max_reg: '&8[&6用戶系統&8] &f你的IP地址已達到註冊數上限。' -name_len: '&8[&6用戶系統&8] &c你的用戶名不符合規定長度。' -new_email_invalid: '&8[&6用戶系統&8] 你所填寫的新電郵地址並不正確。' -no_perm: '&8[&6用戶系統&8] &b你可以到 Server 玩家百科中查看說明文件。' +# Translator: lifehome # +# Last modif: 1443428389 UTC # +# -------------------------------------------- # +unknown_user: '&8[&6用戶系統&8] &f用戶資料並不存在。' +unsafe_spawn: '&8[&6用戶系統&8] &f你的登出位置不安全，現在將傳送你到重生點。' not_logged_in: '&8[&6用戶系統&8] &c你還沒有登入 ！' -old_email_invalid: '&8[&6用戶系統&8] 你所填寫的舊電郵地址並不正確。' -pass_len: '&8[&6用戶系統&8] &f你的密碼並不符合規定長度。' -password_error: '&8[&6用戶系統&8] &f密碼不符合。' +reg_voluntarily: '&8[&6用戶系統&8] &f你可以使用這個指令來註冊： 《 /register <密碼> <重覆密碼> 》' +usage_log: '&8[&6用戶系統&8] &f用法： 《 /login <密碼> 》' +wrong_pwd: '&8[&6用戶系統&8] &c你輸入了錯誤的密碼。' +unregistered: '&8[&6用戶系統&8] &c你已成功刪除會員註冊記錄。' +reg_disabled: '&8[&6用戶系統&8] &c本伺服器已停止新玩家註冊。' +valid_session: '&8[&6用戶系統&8] &b嗨 ！ 歡迎回來喔～' +login: '&8[&6用戶系統&8] &c你成功登入了。' password_error_nick: '&8[&6用戶系統&8] &c這個密碼太不安全了！' password_error_unsafe: '&8[&6用戶系統&8] &c這個密碼太不安全了！' -pwd_changed: '&8[&6用戶系統&8] &c你成功更換了你的密碼 ！' -recovery_email: '&8[&6用戶系統&8] &c忘記密碼 ？ 請使用這個指令來更新密碼： 《 /email recovery <電郵地址> 》' -reg_disabled: '&8[&6用戶系統&8] &c本伺服器已停止新玩家註冊。' -reg_email_msg: '&8[&6用戶系統&8] &c請使用這個指令來註冊： 《 /register <電郵> <重覆電郵> 》' -regex: '&8[&6用戶系統&8] &c用戶名稱錯誤！ 登入系統只接受以下字符： REG_EX' -registered: '&8[&6用戶系統&8] &b你成功註冊了。' +vb_nonActiv: '&8[&6用戶系統&8] &f你的帳戶還沒有經過電郵驗證 ！' +user_regged: '&8[&6用戶系統&8] &c此用戶名已經註冊過了。' +usage_reg: '&8[&6用戶系統&8] &f用法： 《 /register <密碼> <重覆密碼> 》' +max_reg: '&8[&6用戶系統&8] &f你的IP地址已達到註冊數上限。' +no_perm: '&8[&6用戶系統&8] &b你可以到 CraftingHK 玩家百科中查看說明文件。' +error: '&8[&6用戶系統&8] &f發生錯誤，請與管理員聯絡。' +login_msg: '&8[&6用戶系統&8] &c請使用這個指令來登入： 《 /login <密碼> 》' reg_msg: '&8[&6用戶系統&8] &c請使用這個指令來註冊： 《 /register <密碼> <重覆密碼> 》' -reg_only: '&8[&6用戶系統&8] &f限已註冊會員，請先到 http://example.com 註冊。' -reg_voluntarily: '&8[&6用戶系統&8] &f你可以使用這個指令來註冊： 《 /register <密碼> <重覆密碼> 》' -reload: '&8[&6用戶系統&8] &b登入系統設定及資料庫重新載入完畢。' +reg_email_msg: '&8[&6用戶系統&8] &c請使用這個指令來註冊： 《 /register <電郵> <重覆電郵> 》' +usage_unreg: '&8[&6用戶系統&8] &f用法： 《 /unregister <密碼> 》' +pwd_changed: '&8[&6用戶系統&8] &c你成功更換了你的密碼 ！' +user_unknown: '&8[&6用戶系統&8] &c此用戶名沒有已登記資料。' +password_error: '&8[&6用戶系統&8] &f密碼不符合。' +invalid_session: '&8[&6用戶系統&8] &f登入階段資料已損壞，請等待登入階段結束。' +reg_only: '&8[&6用戶系統&8] &f限已註冊會員，請先到 https://crafting.hk/ 註冊。' +logged_in: '&8[&6用戶系統&8] &c你已經登入過了。' +logout: '&8[&6用戶系統&8] &b你成功登出了。' same_nick: '&8[&6用戶系統&8] &f同名玩家已在遊玩。' +registered: '&8[&6用戶系統&8] &b你成功註冊了。' +pass_len: '&8[&6用戶系統&8] &f你的密碼並不符合規定長度。' +reload: '&8[&6用戶系統&8] &b登入系統設定及資料庫重新載入完畢。' timeout: '&8[&6用戶系統&8] &f登入逾時。' -unknown_user: '&8[&6用戶系統&8] &f用戶資料並不存在。' -unregistered: '&8[&6用戶系統&8] &c你已成功刪除會員註冊記錄。' -unsafe_spawn: '&8[&6用戶系統&8] &f你的登出位置不安全，現在將傳送你到重生點。' -usage_captcha: '&8[&6用戶系統&8] &f用法： 《 /captcha <驗證碼> 》' usage_changepassword: '&8[&6用戶系統&8] &f用法： 《 /changepassword <舊密碼> <新密碼> 》' +name_len: '&8[&6用戶系統&8] &c你的用戶名不符合規定長度。' +regex: '&8[&6用戶系統&8] &c用戶名稱錯誤！ 登入系統只接受以下字符： REG_EX' +add_email: '&8[&6用戶系統&8] &b請為你的帳戶立即添加電郵地址： 《 /email add <電郵地址> <重覆電郵地址> 》' +recovery_email: '&8[&6用戶系統&8] &c忘記密碼 ？ 請使用這個指令來更新密碼： 《 /email recovery <電郵地址> 》' +usage_captcha: '&8[&6用戶系統&8] &f用法： 《 /captcha <驗證碼> 》' +wrong_captcha: '&8[&6用戶系統&8] &c你所輸入的驗證碼無效，請使用 《 /captcha <驗證碼> 》 再次輸入。' +valid_captcha: '&8[&6用戶系統&8] &c你所輸入的驗證碼無效 ！' +kick_forvip: '&c因為有VIP玩家登入了伺服器。' +kick_fullserver: '&c抱歉！ 因為伺服器滿人了，所以你目前未能登入伺服器。' usage_email_add: '&8[&6用戶系統&8] &f用法： 《 /email add <電郵> <重覆電郵> 》' usage_email_change: '&8[&6用戶系統&8] &f用法： 《 /email change <舊電郵> <新電郵> 》' usage_email_recovery: '&8[&6用戶系統&8] &f用法： 《 /email recovery <電郵> 》' -usage_log: '&8[&6用戶系統&8] &f用法： 《 /login <密碼> 》' -usage_reg: '&8[&6用戶系統&8] &f用法： 《 /register <密碼> <重覆密碼> 》' -usage_unreg: '&8[&6用戶系統&8] &f用法： 《 /unregister <密碼> 》' -user_regged: '&8[&6用戶系統&8] &c此用戶名已經註冊過了。' -user_unknown: '&8[&6用戶系統&8] &c此用戶名沒有已登記資料。' -valid_captcha: '&8[&6用戶系統&8] &c你所輸入的驗證碼無效 ！' -valid_session: '&8[&6用戶系統&8] &b嗨 ！ 歡迎回來喔～' -vb_nonActiv: '&8[&6用戶系統&8] &f你的帳戶還沒有經過電郵驗證 ！' -wrong_captcha: '&8[&6用戶系統&8] &c你所輸入的驗證碼無效，請使用 《 /captcha <驗證碼> 》 再次輸入。' -wrong_pwd: '&8[&6用戶系統&8] &c你輸入了錯誤的密碼。' +new_email_invalid: '&8[&6用戶系統&8] 你所填寫的新電郵地址並不正確。' +old_email_invalid: '&8[&6用戶系統&8] 你所填寫的舊電郵地址並不正確。' +email_invalid: '&8[&6用戶系統&8] 你所填寫的電郵地址並不正確。' +email_added: '&8[&6用戶系統&8] 已新增你的電郵地址。' +email_confirm: '&8[&6用戶系統&8] 請重覆輸入你的電郵地址。' +email_changed: '&8[&6用戶系統&8] 你的電郵地址已更改。' +email_send: '&8[&6用戶系統&8] 忘記密碼信件已寄出，請查收。' +country_banned: '&8[&6用戶系統&8] 本伺服器已停止對你的國家提供遊戲服務。' +antibot_auto_enabled: '&8[&6用戶系統&8] 防止機械人程序已因應現時大量不尋常連線而啟用。' +antibot_auto_disabled: '&8[&6用戶系統&8] 不正常連接數已減少，防止機械人程序將於 %m 分鐘後停止。' diff --git a/src/main/resources/messages/messages_zhtw.yml b/src/main/resources/messages/messages_zhtw.yml index d5bdb9019..7799782c6 100644 --- a/src/main/resources/messages/messages_zhtw.yml +++ b/src/main/resources/messages/messages_zhtw.yml @@ -1,58 +1,61 @@ -add_email: '&b【AuthMe】&6請使用 &c"/email add <你的Email> <再次輸入你的Email>" &6來添加 Email' -antibot_auto_disabled: '&b【AuthMe】&6AntiBotMod將會於 &c%m &6分鐘後自動關閉' -antibot_auto_enabled: '&b【AuthMe】&6AntiBotMod已自動啟用!' -country_banned: '&b【AuthMe】&6你所在的地區無法進入此伺服器' -email_added: '&b【AuthMe】&6已添加Email!' -email_changed: '&b【AuthMe】&6Email已變更!' -email_confirm: '&b【AuthMe】&6請驗證你的Email!' -email_exists: '&b【AuthMe】&6這個帳戶已經有設定電子郵件了' -email_invalid: '&b【AuthMe】&6無效的Email!' -email_send: '&b【AuthMe】&6已經送出重設密碼要求至你的Email , 請查收。' -error: '&b【AuthMe】&6發生錯誤，請聯繫管理員' -invalid_session: '&b【AuthMe】&6憑證日期不相符!' -kick_forvip: '&b【AuthMe】&6你已經被請出。&c原因 : 有 VIP 玩家登入伺服器' -kick_fullserver: '&b【AuthMe】&6伺服器已經滿了，請等等再試一次' -logged_in: '&b【AuthMe】&6你已經登入了!' -login: '&b【AuthMe】&6密碼正確，你已成功登入!' -login_msg: '&b【AuthMe】&6請使用 &c"/login <密碼>" &6來登入。' -logout: '&b【AuthMe】&6你已成功登出' -max_reg: '&b【AuthMe】&6你的 IP 位置所註冊的帳號數量已經達到最大。' -name_len: '&b【AuthMe】&6你的暱稱 太長 / 太短 了!' -new_email_invalid: '&b【AuthMe】&6新的Email無效!' -no_perm: '&b【AuthMe】&6你沒有使用該指令的權限。' +# Translator: MineWolf50 +# Last Time Edit : 2015 / 7 / 14 , A.M.10:14 +# = = = = = = = = = = = = = = = = = = = = = = = # +unknown_user: "&b【AuthMe】&6沒有在資料庫內找到該玩家。" +unsafe_spawn: '&b【AuthMe】&6你登出的地點不安全，已傳送你到安全的地點。' not_logged_in: '&b【AuthMe】&6你還沒有登入!' -old_email_invalid: '&b【AuthMe】&6舊的Email無效!' -pass_len: '&b【AuthMe】&6你的密碼 超過最大字數 / 小於最小字數' -password_error: '&b【AuthMe】&6兩次輸入的密碼不一致!' +reg_voluntarily: '&b【AuthMe】&6使用 &c"/register <密碼> <確認密碼>" &6來註冊你的暱稱' +usage_log: '&b【AuthMe】&6用法: &c"/login <密碼>"' +wrong_pwd: '&b【AuthMe】&6密碼錯誤!' +unregistered: '&b【AuthMe】&6你已經成功取消註冊。' +reg_disabled: '&b【AuthMe】&6已關閉註冊功能' password_error_nick: '&b【AuthMe】&6你不可以用你的 ID ( 名稱 ) 來當作密碼 !' password_error_unsafe: '&b【AuthMe】&6你不可以使用這個不安全的密碼' -pwd_changed: '&b【AuthMe】&6密碼變更成功!' -recovery_email: '&b【AuthMe】&6忘記密碼了嗎? 使用 &c"/email recovery <你的Email>"' -reg_disabled: '&b【AuthMe】&6已關閉註冊功能' -reg_email_msg: '&b【AuthMe】&6請使用 &c"/register <重複Email>" 來註冊' -regex: '&b【AuthMe】&6暱稱裡包含不能使用的字符' -registered: '&b【AuthMe】&6你已成功註冊' +valid_session: '&b【AuthMe】&6你已經成功登入!' +login: '&b【AuthMe】&6密碼正確，你已成功登入!' +vb_nonActiv: '&b【AuthMe】&6你的帳號還沒有經過驗證! 檢查看看你的電子信箱 (Email) 吧!' +user_regged: '&b【AuthMe】&6這個帳號已經被註冊過了!' +usage_reg: '&b【AuthMe】&6用法: &c"/register <密碼> <確認密碼>"' +max_reg: '&b【AuthMe】&6你的 IP 位置所註冊的帳號數量已經達到最大。' +no_perm: '&b【AuthMe】&6你沒有使用該指令的權限。' +error: '&b【AuthMe】&6發生錯誤，請聯繫管理員' +login_msg: '&b【AuthMe】&6請使用 &c"/login <密碼>" &6來登入。' reg_msg: '&b【AuthMe】&6請使用 "&c/register <密碼> <確認密碼>" 來註冊。' +reg_email_msg: '&b【AuthMe】&6請使用 &c"/register <重複Email>" 來註冊' +usage_unreg: '&b【AuthMe】&6用法: &c"/unregister <密碼>"' +pwd_changed: '&b【AuthMe】&6密碼變更成功!' +user_unknown: '&b【AuthMe】&6這個帳號還沒有註冊過' +password_error: '&b【AuthMe】&6兩次輸入的密碼不一致!' +invalid_session: '&b【AuthMe】&6憑證日期不相符!' reg_only: '&b【AuthMe】&6請到下列網站 :「 http://example.com 」 進行註冊' -reg_voluntarily: '&b【AuthMe】&6使用 &c"/register <密碼> <確認密碼>" &6來註冊你的暱稱' -reload: '&b【AuthMe】&6已重新讀取設定檔及資料庫' +logged_in: '&b【AuthMe】&6你已經登入了!' +logout: '&b【AuthMe】&6你已成功登出' same_nick: '&b【AuthMe】&6有同樣帳號的玩家在線上!' +registered: '&b【AuthMe】&6你已成功註冊' +pass_len: '&b【AuthMe】&6你的密碼 超過最大字數 / 小於最小字數' +reload: '&b【AuthMe】&6已重新讀取設定檔及資料庫' timeout: '&b【AuthMe】&6超過登入時間，請稍後再試一次' -unknown_user: "&b【AuthMe】&6沒有在資料庫內找到該玩家。" -unregistered: '&b【AuthMe】&6你已經成功取消註冊。' -unsafe_spawn: '&b【AuthMe】&6你登出的地點不安全，已傳送你到安全的地點。' -usage_captcha: '&b【AuthMe】&6請用 &c"/captcha " &6來輸入你的驗證碼' usage_changepassword: '&b【AuthMe】&6用法: &c"/changepassword <舊密碼> <新密碼>"' +name_len: '&b【AuthMe】&6你的暱稱 太長 / 太短 了!' +regex: '&b【AuthMe】&6暱稱裡包含不能使用的字符' +add_email: '&b【AuthMe】&6請使用 &c"/email add <你的Email> <再次輸入你的Email>" &6來添加 Email' +recovery_email: '&b【AuthMe】&6忘記密碼了嗎? 使用 &c"/email recovery <你的Email>"' +usage_captcha: '&b【AuthMe】&6請用 &c"/captcha " &6來輸入你的驗證碼' +wrong_captcha: '&b【AuthMe】&6錯誤的驗證碼' +valid_captcha: '&b【AuthMe】&6驗證碼無效!' +kick_forvip: '&b【AuthMe】&6你已經被請出。&c原因 : 有 VIP 玩家登入伺服器' +kick_fullserver: '&b【AuthMe】&6伺服器已經滿了，請等等再試一次' usage_email_add: '&b【AuthMe】&6用法: &c"/email add <你的Email> <重複Email>"' usage_email_change: '&b【AuthMe】&6用法: &c"/email change <舊的Email> <新的Email>"' usage_email_recovery: '&b【AuthMe】&6用法: &c"/email recovery <你的Email>"' -usage_log: '&b【AuthMe】&6用法: &c"/login <密碼>"' -usage_reg: '&b【AuthMe】&6用法: &c"/register <密碼> <確認密碼>"' -usage_unreg: '&b【AuthMe】&6用法: &c"/unregister <密碼>"' -user_regged: '&b【AuthMe】&6這個帳號已經被註冊過了!' -user_unknown: '&b【AuthMe】&6這個帳號還沒有註冊過' -valid_captcha: '&b【AuthMe】&6驗證碼無效!' -valid_session: '&b【AuthMe】&6你已經成功登入!' -vb_nonActiv: '&b【AuthMe】&6你的帳號還沒有經過驗證! 檢查看看你的電子信箱 (Email) 吧!' -wrong_captcha: '&b【AuthMe】&6錯誤的驗證碼' -wrong_pwd: '&b【AuthMe】&6密碼錯誤!' +new_email_invalid: '&b【AuthMe】&6新的Email無效!' +old_email_invalid: '&b【AuthMe】&6舊的Email無效!' +email_invalid: '&b【AuthMe】&6無效的Email!' +email_added: '&b【AuthMe】&6已添加Email!' +email_confirm: '&b【AuthMe】&6請驗證你的Email!' +email_changed: '&b【AuthMe】&6Email已變更!' +email_send: '&b【AuthMe】&6已經送出重設密碼要求至你的Email , 請查收。' +email_exists: '&b【AuthMe】&6這個帳戶已經有設定電子郵件了' +country_banned: '&b【AuthMe】&6你所在的地區無法進入此伺服器' +antibot_auto_enabled: '&b【AuthMe】&6AntiBotMod已自動啟用!' +antibot_auto_disabled: '&b【AuthMe】&6AntiBotMod將會於 &c%m &6分鐘後自動關閉' From d01713a2f59cf7a313eb8d8874b735164daf75f9 Mon Sep 17 00:00:00 2001 From: Xephi Date: Thu, 10 Dec 2015 18:31:46 +0100 Subject: [PATCH 16/33] [DEV] [NEED TEST] BungeeCord Add a way to send player login on other AuthMe instance through BungeeCord plugin channel --- .../xephi/authme/hooks/BungeeCordMessage.java | 27 +++++++++++++++++++ .../login/ProcessSyncronousPlayerLogin.java | 22 ++++++++++++++- .../logout/ProcessSyncronousPlayerLogout.java | 21 +++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java b/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java index 148773fc8..e4aca33fc 100644 --- a/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java +++ b/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java @@ -3,6 +3,9 @@ package fr.xephi.authme.hooks; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteStreams; import fr.xephi.authme.AuthMe; +import fr.xephi.authme.cache.auth.PlayerAuth; +import fr.xephi.authme.cache.auth.PlayerCache; + import org.bukkit.entity.Player; import org.bukkit.plugin.messaging.PluginMessageListener; @@ -43,6 +46,30 @@ public class BungeeCordMessage implements PluginMessageListener { // Put the IP (only the ip not the port) in the hashMap plugin.realIp.put(player.getName().toLowerCase(), ip); } + if (subChannel.equals("Forward")) + { + String str = in.readUTF(); + if (!str.startsWith("AuthMe")) + return; + String[] args = str.split(";"); + try { + String name = args[2]; + PlayerAuth auth = plugin.database.getAuth(name); + if (auth == null) + return; + if (args[1].equalsIgnoreCase("login")) + { + PlayerCache.getInstance().addPlayer(auth); + plugin.database.setLogged(name); + } + else if (args[1].equalsIgnoreCase("logout")) + { + PlayerCache.getInstance().removePlayer(name); + plugin.database.setUnlogged(name); + } + } catch (Exception e) + {} + } } } diff --git a/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java b/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java index 96f65ddc0..0c9ffd7cb 100644 --- a/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java +++ b/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java @@ -14,6 +14,10 @@ import fr.xephi.authme.listener.AuthMePlayerListener; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.util.Utils; import fr.xephi.authme.util.Utils.GroupType; + +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; + import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -113,6 +117,21 @@ public class ProcessSyncronousPlayerLogin implements Runnable { } } + protected void sendBungeeMessage() { + ByteArrayOutputStream b = new ByteArrayOutputStream(); + DataOutputStream out = new DataOutputStream(b); + try { + String str = "AuthMe;login;" + name; + out.writeUTF("Forward"); + out.writeUTF("ALL"); + out.writeUTF("AuthMe"); + out.writeShort(str.length()); + out.writeUTF(str); + player.sendPluginMessage(plugin, "BungeeCord", b.toByteArray()); + } catch (Exception e) + {} + } + /** * Method run. * @@ -186,7 +205,8 @@ public class ProcessSyncronousPlayerLogin implements Runnable { // The Login event now fires (as intended) after everything is processed Bukkit.getServer().getPluginManager().callEvent(new LoginEvent(player, true)); player.saveData(); - + if (Settings.bungee) + sendBungeeMessage(); // Login is finish, display welcome message if (Settings.useWelcomeMessage) if (Settings.broadcastWelcomeMessage) { diff --git a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java index 6b4b9c0ed..9d37320a4 100644 --- a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java +++ b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java @@ -9,6 +9,10 @@ import fr.xephi.authme.output.Messages; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.task.MessageTask; import fr.xephi.authme.task.TimeoutTask; + +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; + import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffect; @@ -38,6 +42,21 @@ public class ProcessSyncronousPlayerLogout implements Runnable { this.name = player.getName().toLowerCase(); } + protected void sendBungeeMessage() { + ByteArrayOutputStream b = new ByteArrayOutputStream(); + DataOutputStream out = new DataOutputStream(b); + try { + String str = "AuthMe;login;" + name; + out.writeUTF("Forward"); + out.writeUTF("ALL"); + out.writeUTF("AuthMe"); + out.writeShort(str.length()); + out.writeUTF(str); + player.sendPluginMessage(plugin, "BungeeCord", b.toByteArray()); + } catch (Exception e) + {} + } + /** * Method run. * @@ -76,6 +95,8 @@ public class ProcessSyncronousPlayerLogout implements Runnable { } // Player is now logout... Time to fire event ! Bukkit.getServer().getPluginManager().callEvent(new LogoutEvent(player)); + if (Settings.bungee) + sendBungeeMessage(); m.send(player, MessageKey.LOGOUT_SUCCESS); ConsoleLogger.info(player.getName() + " logged out"); } From 1ce4a111473b78cb5169b228c17bbbe9c2570b48 Mon Sep 17 00:00:00 2001 From: Xephi Date: Thu, 10 Dec 2015 18:32:41 +0100 Subject: [PATCH 17/33] [PREV COMMIT] Oops, it's logout here :D --- .../authme/process/logout/ProcessSyncronousPlayerLogout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java index 9d37320a4..69c9a80d5 100644 --- a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java +++ b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java @@ -46,7 +46,7 @@ public class ProcessSyncronousPlayerLogout implements Runnable { ByteArrayOutputStream b = new ByteArrayOutputStream(); DataOutputStream out = new DataOutputStream(b); try { - String str = "AuthMe;login;" + name; + String str = "AuthMe;logout;" + name; out.writeUTF("Forward"); out.writeUTF("ALL"); out.writeUTF("AuthMe"); From 3975e656559f103201243603f56bf29de9cf9cd5 Mon Sep 17 00:00:00 2001 From: Xephi Date: Thu, 10 Dec 2015 18:34:50 +0100 Subject: [PATCH 18/33] [DEV] [BungeeCord] Fix reading data --- src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java b/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java index e4aca33fc..a8d0f9fee 100644 --- a/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java +++ b/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java @@ -48,7 +48,12 @@ public class BungeeCordMessage implements PluginMessageListener { } if (subChannel.equals("Forward")) { - String str = in.readUTF(); + short len = in.readShort(); + byte[] data = new byte[len]; + in.readFully(data); + + //bytearray to string + String str = new String(data); if (!str.startsWith("AuthMe")) return; String[] args = str.split(";"); From 75084e62ec719d2c6748a16bee971be742b6e4e6 Mon Sep 17 00:00:00 2001 From: Xephi Date: Thu, 10 Dec 2015 18:36:31 +0100 Subject: [PATCH 19/33] [PREV COMMIT] If we set a custom channel, maybe listen at it :') --- src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java b/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java index a8d0f9fee..6f396115e 100644 --- a/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java +++ b/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java @@ -46,7 +46,7 @@ public class BungeeCordMessage implements PluginMessageListener { // Put the IP (only the ip not the port) in the hashMap plugin.realIp.put(player.getName().toLowerCase(), ip); } - if (subChannel.equals("Forward")) + if (subChannel.equals("Forward") || subChannel.equalsIgnoreCase("AuthMe")) { short len = in.readShort(); byte[] data = new byte[len]; From 12de593ec4ce05371171df7f1801844c745d2a77 Mon Sep 17 00:00:00 2001 From: Xephi Date: Thu, 10 Dec 2015 18:48:22 +0100 Subject: [PATCH 20/33] Add an info in console when player login from other server --- src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java b/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java index 6f396115e..30f9a23f6 100644 --- a/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java +++ b/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java @@ -3,6 +3,7 @@ package fr.xephi.authme.hooks; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteStreams; import fr.xephi.authme.AuthMe; +import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerCache; @@ -66,11 +67,13 @@ public class BungeeCordMessage implements PluginMessageListener { { PlayerCache.getInstance().addPlayer(auth); plugin.database.setLogged(name); + ConsoleLogger.info("Player " + auth.getNickname() + " has logged in from one of your server!"); } else if (args[1].equalsIgnoreCase("logout")) { PlayerCache.getInstance().removePlayer(name); plugin.database.setUnlogged(name); + ConsoleLogger.info("Player " + auth.getNickname() + " has logged out from one of your server!"); } } catch (Exception e) {} From 186ef965ca26d4527ab81cafeef96ae97d8d4b00 Mon Sep 17 00:00:00 2001 From: ljacqu Date: Thu, 10 Dec 2015 19:18:05 +0100 Subject: [PATCH 21/33] Message files verifier - refactoring - Separate logic from output (still potential for improvement) - Prompt user for options (single file mode / write missing keys or not) --- src/main/resources/messages/messages_sk.yml | 2 + src/main/resources/messages/messages_vn.yml | 2 +- src/tools/messages/MessageFileVerifier.java | 78 ++++++++++---- .../messages/MessagesVerifierRunner.java | 100 ++++++++++++++++-- 4 files changed, 148 insertions(+), 34 deletions(-) diff --git a/src/main/resources/messages/messages_sk.yml b/src/main/resources/messages/messages_sk.yml index 010533fe8..d2a97bfdf 100644 --- a/src/main/resources/messages/messages_sk.yml +++ b/src/main/resources/messages/messages_sk.yml @@ -59,3 +59,5 @@ email_send: '[AuthMe] Recovery Email Send !' country_banned: 'Your country is banned from this server' antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' diff --git a/src/main/resources/messages/messages_vn.yml b/src/main/resources/messages/messages_vn.yml index 29941aaa9..5cd5c5321 100644 --- a/src/main/resources/messages/messages_vn.yml +++ b/src/main/resources/messages/messages_vn.yml @@ -21,7 +21,7 @@ usage_unreg: '&eSử dụng: /unregister mật-khẩu' pwd_changed: '&cĐã đổi mật khẩu!' user_unknown: '&cTài khoản này chưa được đăng kí' password_error: '&fMật khẩu không khớp' -unvalid_session: '&fPhiên đăng nhập không hồi đáp, vui lòng chờ phiên đăng nhập kết thúc' +invalid_session: '&fPhiên đăng nhập không hồi đáp, vui lòng chờ phiên đăng nhập kết thúc' reg_only: '&fChỉ cho phép người đã đăng kí! Hãy vào trang http://web-của.bạn/ để đăng kí' logged_in: '&cĐã đăng nhập!' logout: '&cThoát đăng nhập thành công' diff --git a/src/tools/messages/MessageFileVerifier.java b/src/tools/messages/MessageFileVerifier.java index f3b37525f..3319fbd22 100644 --- a/src/tools/messages/MessageFileVerifier.java +++ b/src/tools/messages/MessageFileVerifier.java @@ -2,47 +2,61 @@ package messages; import fr.xephi.authme.output.MessageKey; import utils.FileUtils; -import utils.ToolsConstants; +import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; /** - * Verifies that a message file has all keys as given in {@link MessageKey}. + * Verifies a message file's keys to ensure that it is in sync with {@link MessageKey}, i.e. that the file contains + * all keys and that it doesn't have any unknown ones. */ public class MessageFileVerifier { - public static final String MESSAGES_FOLDER = ToolsConstants.MAIN_RESOURCES_ROOT + "messages/"; - private static final String NEW_LINE = "\n"; + private static final char NEW_LINE = '\n'; private final String messagesFile; - private final Map defaultMessages; + private final Set unknownKeys = new HashSet<>(); + // Map with the missing key and a boolean indicating whether or not it was added to the file by this object + private final Map missingKeys = new HashMap<>(); - public MessageFileVerifier(Map defaultMessages, String messagesFile) { + public MessageFileVerifier(String messagesFile) { this.messagesFile = messagesFile; - this.defaultMessages = defaultMessages; + analyze(); } - public void verify(boolean addMissingKeys) { + public Set getUnknownKeys() { + return unknownKeys; + } + + public Map getMissingKeys() { + return missingKeys; + } + + private void analyze() { + findMissingKeys(); + } + + private void findMissingKeys() { Set messageKeys = getAllMessageKeys(); List fileLines = FileUtils.readLinesFromFile(messagesFile); for (String line : fileLines) { // Skip comments and empty lines if (!line.startsWith("#") && !line.trim().isEmpty()) { - handleMessagesLine(line, messageKeys); + verifyKeyInFile(line, messageKeys); } } - if (messageKeys.isEmpty()) { - System.out.println("Found all message keys"); - } else { - handleMissingKeys(messageKeys, addMissingKeys); + // All keys that remain are keys that are absent in the file + for (String missingKey : messageKeys) { + missingKeys.put(missingKey, false); } } - private void handleMessagesLine(String line, Set messageKeys) { + private void verifyKeyInFile(String line, Set messageKeys) { if (line.indexOf(':') == -1) { System.out.println("Skipping line in unknown format: '" + line + "'"); return; @@ -52,20 +66,38 @@ public class MessageFileVerifier { if (messageKeys.contains(key)) { messageKeys.remove(key); } else { - System.out.println("Warning: Unknown key '" + key + "' for line '" + line + "'"); + unknownKeys.add(key); } } - private void handleMissingKeys(Set missingKeys, boolean addMissingKeys) { - for (String key : missingKeys) { - if (addMissingKeys) { - String defaultMessage = defaultMessages.get(key); - FileUtils.appendToFile(messagesFile, NEW_LINE + key + ":" + defaultMessage); - System.out.println("Added missing key '" + key + "' to file"); - } else { - System.out.println("Error: Missing key '" + key + "'"); + public void addMissingKeys(Map defaultMessages) { + List keysToAdd = new ArrayList<>(); + + for (Map.Entry entry : missingKeys.entrySet()) { + if (Boolean.FALSE.equals(entry.getValue())) { + String defaultMessage = defaultMessages.get(entry.getKey()); + if (defaultMessage == null) { + System.out.println("Error: Key '" + entry.getKey() + "' not present in default messages"); + } else { + keysToAdd.add(entry.getKey()); + } } } + + // Very ugly way of verifying if the last char in the file is a new line, in which case we won't start by + // adding a new line to the file. It's grossly inefficient but with the scale of the messages file it's fine + String fileContents = FileUtils.readFromFile(messagesFile); + String contentsToAdd = ""; + if (fileContents.charAt(fileContents.length() - 1) == NEW_LINE) { + contentsToAdd += NEW_LINE; + } + + // We know that all keys in keysToAdd are safe to retrieve and add + for (String keyToAdd : keysToAdd) { + contentsToAdd += keyToAdd + ":" + defaultMessages.get(keyToAdd) + NEW_LINE; + missingKeys.put(keyToAdd, true); + } + FileUtils.appendToFile(messagesFile, contentsToAdd); } private static Set getAllMessageKeys() { diff --git a/src/tools/messages/MessagesVerifierRunner.java b/src/tools/messages/MessagesVerifierRunner.java index ff50e5055..1d6e743c0 100644 --- a/src/tools/messages/MessagesVerifierRunner.java +++ b/src/tools/messages/MessagesVerifierRunner.java @@ -1,40 +1,110 @@ package messages; +import fr.xephi.authme.util.StringUtils; import utils.FileUtils; +import utils.ToolsConstants; import java.io.File; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Scanner; +import java.util.Set; import java.util.regex.Pattern; +import static java.lang.String.format; + /** * TODO: ljacqu write JavaDoc */ public final class MessagesVerifierRunner { + public static final String MESSAGES_FOLDER = ToolsConstants.MAIN_RESOURCES_ROOT + "messages/"; + private static final String SOURCES_TAG = "{msgdir}"; + private MessagesVerifierRunner() { } public static void main(String[] args) { - final Map defaultMessages = constructDefaultMessages(); - final List messagesFiles = getMessagesFiles(); + Scanner scanner = new Scanner(System.in); + System.out.println("Check a specific file only?"); + System.out.println("- Empty line will check all files in the resources messages folder (default)"); + System.out.println(format("- %s will be replaced to the messages folder %s", SOURCES_TAG, MESSAGES_FOLDER)); + String inputFile = scanner.nextLine(); - if (messagesFiles.isEmpty()) { - throw new RuntimeException("Error getting messages file: list of files is empty"); + System.out.println("Add any missing keys to files? ['y' = yes]"); + boolean addMissingKeys = "y".equals(scanner.nextLine()); + scanner.close(); + + Map defaultMessages = null; + if (addMissingKeys) { + defaultMessages = constructDefaultMessages(); } - for (File file : messagesFiles) { + List messageFiles; + if (StringUtils.isEmpty(inputFile)) { + messageFiles = getMessagesFiles(); + } else { + File customFile = new File(inputFile.replace(SOURCES_TAG, MESSAGES_FOLDER)); + messageFiles = Collections.singletonList(customFile); + if (messageFiles.isEmpty()) { + throw new RuntimeException("Error getting message files: list of files is empty"); + } + } + + for (File file : messageFiles) { System.out.println("Verifying '" + file.getName() + "'"); - MessageFileVerifier messageFileVerifier = new MessageFileVerifier(defaultMessages, file.getAbsolutePath()); - messageFileVerifier.verify(false); - System.out.println(); + MessageFileVerifier verifier = new MessageFileVerifier(file.getAbsolutePath()); + if (addMissingKeys) { + verifyFileAndAddKeys(verifier, defaultMessages); + } else { + verifyFile(verifier); + } + } + } + + private static void verifyFile(MessageFileVerifier verifier) { + Map missingKeys = verifier.getMissingKeys(); + if (missingKeys.isEmpty()) { + System.out.println(" No missing keys"); + } else { + System.out.println(" Missing keys: " + missingKeys.keySet()); + } + + Set unknownKeys = verifier.getUnknownKeys(); + if (!unknownKeys.isEmpty()) { + System.out.println(" Unknown keys: " + unknownKeys); + } + } + + private static void verifyFileAndAddKeys(MessageFileVerifier verifier, Map defaultMessages) { + Map missingKeys = verifier.getMissingKeys(); + if (missingKeys.isEmpty()) { + System.out.println(" No missing keys"); + } else { + verifier.addMissingKeys(defaultMessages); + missingKeys = verifier.getMissingKeys(); + List addedKeys = getKeysWithValue(Boolean.TRUE, missingKeys); + System.out.println("Could add missing keys " + addedKeys); + + List unsuccessfulKeys = getKeysWithValue(Boolean.FALSE, missingKeys); + if (!unsuccessfulKeys.isEmpty()) { + System.out.println(" Warning! Could not add all missing keys (problem with loading " + + "default messages?)"); + System.out.println(" Could not add keys " + unsuccessfulKeys); + } + } + + Set unknownKeys = verifier.getUnknownKeys(); + if (!unknownKeys.isEmpty()) { + System.out.println(" Unknown keys: " + unknownKeys); } } private static Map constructDefaultMessages() { - String defaultMessagesFile = MessageFileVerifier.MESSAGES_FOLDER + "messages_en.yml"; + String defaultMessagesFile = MESSAGES_FOLDER + "messages_en.yml"; List lines = FileUtils.readLinesFromFile(defaultMessagesFile); Map messages = new HashMap<>(lines.size()); for (String line : lines) { @@ -51,9 +121,19 @@ public final class MessagesVerifierRunner { return messages; } + private static List getKeysWithValue(V value, Map map) { + List result = new ArrayList<>(); + for (Map.Entry entry : map.entrySet()) { + if (value.equals(entry.getValue())) { + result.add(entry.getKey()); + } + } + return result; + } + private static List getMessagesFiles() { final Pattern messageFilePattern = Pattern.compile("messages_[a-z]{2,3}\\.yml"); - File folder = new File(MessageFileVerifier.MESSAGES_FOLDER); + File folder = new File(MESSAGES_FOLDER); File[] files = folder.listFiles(); if (files == null) { throw new RuntimeException("Could not read files from folder '" + folder.getName() + "'"); From c50c9efe8390a06bcb980ae0807626ed05407d65 Mon Sep 17 00:00:00 2001 From: ljacqu Date: Thu, 10 Dec 2015 19:31:56 +0100 Subject: [PATCH 22/33] Refine messages file verifier - Fix minor open issues - Add documentation - Rename to [hopefully] more suitable names --- src/tools/messages/MessageFileVerifier.java | 44 ++++++++++++------- .../messages/MessagesVerifierRunner.java | 15 ++++--- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/src/tools/messages/MessageFileVerifier.java b/src/tools/messages/MessageFileVerifier.java index 3319fbd22..af06298d7 100644 --- a/src/tools/messages/MessageFileVerifier.java +++ b/src/tools/messages/MessageFileVerifier.java @@ -23,30 +23,43 @@ public class MessageFileVerifier { // Map with the missing key and a boolean indicating whether or not it was added to the file by this object private final Map missingKeys = new HashMap<>(); + /** + * Create a verifier that verifies the given messages file. + * + * @param messagesFile The messages file to process + */ public MessageFileVerifier(String messagesFile) { this.messagesFile = messagesFile; - analyze(); + verifyKeys(); } + /** + * Return the list of unknown keys, i.e. the list of keys present in the file that are not + * part of the {@link MessageKey} enum. + * + * @return List of unknown keys + */ public Set getUnknownKeys() { return unknownKeys; } + /** + * Return the list of missing keys, i.e. all keys that are part of {@link MessageKey} but absent + * in the messages file. + * + * @return The list of missing keys in the file + */ public Map getMissingKeys() { return missingKeys; } - private void analyze() { - findMissingKeys(); - } - - private void findMissingKeys() { + private void verifyKeys() { Set messageKeys = getAllMessageKeys(); List fileLines = FileUtils.readLinesFromFile(messagesFile); for (String line : fileLines) { // Skip comments and empty lines if (!line.startsWith("#") && !line.trim().isEmpty()) { - verifyKeyInFile(line, messageKeys); + processKeyInFile(line, messageKeys); } } @@ -56,7 +69,7 @@ public class MessageFileVerifier { } } - private void verifyKeyInFile(String line, Set messageKeys) { + private void processKeyInFile(String line, Set messageKeys) { if (line.indexOf(':') == -1) { System.out.println("Skipping line in unknown format: '" + line + "'"); return; @@ -70,17 +83,16 @@ public class MessageFileVerifier { } } + /** + * Add missing keys to the file with the provided default (English) message. + * + * @param defaultMessages The collection of default messages + */ public void addMissingKeys(Map defaultMessages) { List keysToAdd = new ArrayList<>(); - for (Map.Entry entry : missingKeys.entrySet()) { - if (Boolean.FALSE.equals(entry.getValue())) { - String defaultMessage = defaultMessages.get(entry.getKey()); - if (defaultMessage == null) { - System.out.println("Error: Key '" + entry.getKey() + "' not present in default messages"); - } else { - keysToAdd.add(entry.getKey()); - } + if (Boolean.FALSE.equals(entry.getValue()) && defaultMessages.get(entry.getKey()) != null) { + keysToAdd.add(entry.getKey()); } } diff --git a/src/tools/messages/MessagesVerifierRunner.java b/src/tools/messages/MessagesVerifierRunner.java index 1d6e743c0..be0313990 100644 --- a/src/tools/messages/MessagesVerifierRunner.java +++ b/src/tools/messages/MessagesVerifierRunner.java @@ -17,7 +17,7 @@ import java.util.regex.Pattern; import static java.lang.String.format; /** - * TODO: ljacqu write JavaDoc + * Entry point of the messages verifier. */ public final class MessagesVerifierRunner { @@ -28,6 +28,7 @@ public final class MessagesVerifierRunner { } public static void main(String[] args) { + // Prompt user for options Scanner scanner = new Scanner(System.in); System.out.println("Check a specific file only?"); System.out.println("- Empty line will check all files in the resources messages folder (default)"); @@ -38,6 +39,7 @@ public final class MessagesVerifierRunner { boolean addMissingKeys = "y".equals(scanner.nextLine()); scanner.close(); + // Set up needed objects Map defaultMessages = null; if (addMissingKeys) { defaultMessages = constructDefaultMessages(); @@ -49,11 +51,9 @@ public final class MessagesVerifierRunner { } else { File customFile = new File(inputFile.replace(SOURCES_TAG, MESSAGES_FOLDER)); messageFiles = Collections.singletonList(customFile); - if (messageFiles.isEmpty()) { - throw new RuntimeException("Error getting message files: list of files is empty"); - } } + // Verify the given files for (File file : messageFiles) { System.out.println("Verifying '" + file.getName() + "'"); MessageFileVerifier verifier = new MessageFileVerifier(file.getAbsolutePath()); @@ -111,11 +111,11 @@ public final class MessagesVerifierRunner { if (line.startsWith("#") || line.trim().isEmpty()) { continue; } - if (line.indexOf(':') == -1) { + if (line.indexOf(':') == -1 || line.indexOf(':') == line.length() - 1) { System.out.println("Warning! Unknown format in default messages file for line '" + line + "'"); } else { String key = line.substring(0, line.indexOf(':')); - messages.put(key, line.substring(line.indexOf(':') + 1)); // fixme: may throw exception + messages.put(key, line.substring(line.indexOf(':') + 1)); } } return messages; @@ -145,6 +145,9 @@ public final class MessagesVerifierRunner { messageFiles.add(file); } } + if (messageFiles.isEmpty()) { + throw new RuntimeException("Error getting message files: list of files is empty"); + } return messageFiles; } } From f5583f443560433847bcd470498f7f338085f6dc Mon Sep 17 00:00:00 2001 From: ljacqu Date: Thu, 10 Dec 2015 19:42:19 +0100 Subject: [PATCH 23/33] Manual messages fixes; refine messages verifier - Add messages with new line to same line with &n - Add German translation for missing key - Adjust messages filename pattern to include Chinese files (with 4-letter codes) - Change verifier to only output errors (more "to-the-point" output) --- src/main/resources/messages/messages_bg.yml | 5 ++--- src/main/resources/messages/messages_de.yml | 1 + src/main/resources/messages/messages_gl.yml | 6 ++---- src/tools/messages/MessagesVerifierRunner.java | 8 ++------ 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/main/resources/messages/messages_bg.yml b/src/main/resources/messages/messages_bg.yml index 81a7e7088..efa41d582 100644 --- a/src/main/resources/messages/messages_bg.yml +++ b/src/main/resources/messages/messages_bg.yml @@ -1,8 +1,7 @@ unknown_user: '&fПотребителя не е в БД' unsafe_spawn: '&fТвоята локация когато излезе не беше безопасна, телепортиран си на Spawn!' not_logged_in: '&cНе си влязъл!' -reg_voluntarily: '&fМоже да се регистрираш с тази команда: - "/register парола парола"' +reg_voluntarily: '&fМоже да се регистрираш с тази команда:&n "/register парола парола"' usage_log: '&cКоманда: /login парола' wrong_pwd: '&cГрешна парола!' unregistered: '&cУспешно от-регистриран!' @@ -24,7 +23,7 @@ user_unknown: '&cПотребителя не е регистриран' password_error: '&fПаролата не съвпада' password_error_nick: '&fYou can''t use your name as password' password_error_unsafe: '&fYou can''t use unsafe passwords' -invalid_session: '&fSession Dataes doesnt corrispond Plaese wait the end of session' +invalid_session: '&cYour IP has been changed and your session data has expired!' reg_only: '&fСамо за регистрирани! Моля посети http://example.com за регистрация' logged_in: '&cВече сте влязъл!' logout: '&cУспешен изход от регистрацията!' diff --git a/src/main/resources/messages/messages_de.yml b/src/main/resources/messages/messages_de.yml index fa086015a..51e950bdb 100644 --- a/src/main/resources/messages/messages_de.yml +++ b/src/main/resources/messages/messages_de.yml @@ -56,3 +56,4 @@ email_exists: '&cEine Wiederherstellungs-Email wurde bereits versandt! Nutze fol country_banned: '&4Dein Land ist gesperrt' antibot_auto_enabled: '&4[AntiBotService] AntiBotMod wurde aufgrund hoher Netzauslastung automatisch aktiviert!' antibot_auto_disabled: '&2[AntiBotService] AntiBotMod wurde nach %m Minuten deaktiviert, hoffentlich ist die Invasion vorbei' +kick_antibot: 'AntiBotMod ist aktiviert! Bitte warte einige Minuten, bevor du dich mit dem Server verbindest' diff --git a/src/main/resources/messages/messages_gl.yml b/src/main/resources/messages/messages_gl.yml index 2ead0316e..dde77e191 100644 --- a/src/main/resources/messages/messages_gl.yml +++ b/src/main/resources/messages/messages_gl.yml @@ -1,8 +1,7 @@ unknown_user: '&fO usuario non está na base de datos' unsafe_spawn: '&fA localización dende a que saíches era insegura, teletransportándote ao spawn do mundo' not_logged_in: '&cNon te identificaches!' -reg_voluntarily: '&fPodes rexistrar o teu nome no servidor co comando - "/register "' +reg_voluntarily: '&fPodes rexistrar o teu nome no servidor co comando "/register "' usage_log: '&cUso: /login ' wrong_pwd: '&cContrasinal equivocado' unregistered: '&cFeito! Xa non estás rexistrado!' @@ -55,5 +54,4 @@ email_changed: '[AuthMe] Cambiouse o correo!' email_send: '[AuthMe] Enviouse o correo de confirmación!' country_banned: 'O teu país está bloqueado neste servidor' antibot_auto_enabled: '[AuthMe] AntiBotMod conectouse automáticamente debido a conexións masivas!' -antibot_auto_disabled: '[AuthMe] AntiBotMod desactivouse automáticamente despois de %m minutos, - esperemos que a invasión se detivera' +antibot_auto_disabled: '[AuthMe] AntiBotMod desactivouse automáticamente despois de %m minutos,&n esperemos que a invasión se detivera' diff --git a/src/tools/messages/MessagesVerifierRunner.java b/src/tools/messages/MessagesVerifierRunner.java index be0313990..036ea8499 100644 --- a/src/tools/messages/MessagesVerifierRunner.java +++ b/src/tools/messages/MessagesVerifierRunner.java @@ -68,8 +68,6 @@ public final class MessagesVerifierRunner { private static void verifyFile(MessageFileVerifier verifier) { Map missingKeys = verifier.getMissingKeys(); if (missingKeys.isEmpty()) { - System.out.println(" No missing keys"); - } else { System.out.println(" Missing keys: " + missingKeys.keySet()); } @@ -81,9 +79,7 @@ public final class MessagesVerifierRunner { private static void verifyFileAndAddKeys(MessageFileVerifier verifier, Map defaultMessages) { Map missingKeys = verifier.getMissingKeys(); - if (missingKeys.isEmpty()) { - System.out.println(" No missing keys"); - } else { + if (!missingKeys.isEmpty()) { verifier.addMissingKeys(defaultMessages); missingKeys = verifier.getMissingKeys(); List addedKeys = getKeysWithValue(Boolean.TRUE, missingKeys); @@ -132,7 +128,7 @@ public final class MessagesVerifierRunner { } private static List getMessagesFiles() { - final Pattern messageFilePattern = Pattern.compile("messages_[a-z]{2,3}\\.yml"); + final Pattern messageFilePattern = Pattern.compile("messages_[a-z]{2,7}\\.yml"); File folder = new File(MESSAGES_FOLDER); File[] files = folder.listFiles(); if (files == null) { From 37d769a3ce4230c24ad190030ca9e7a42afc7af4 Mon Sep 17 00:00:00 2001 From: ljacqu Date: Thu, 10 Dec 2015 19:51:29 +0100 Subject: [PATCH 24/33] Add missing keys to messages file --- src/main/resources/messages/messages_bg.yml | 4 +++- src/main/resources/messages/messages_br.yml | 1 + src/main/resources/messages/messages_cz.yml | 4 +++- src/main/resources/messages/messages_es.yml | 2 ++ src/main/resources/messages/messages_eu.yml | 1 + src/main/resources/messages/messages_fi.yml | 4 +++- src/main/resources/messages/messages_fr.yml | 4 +++- src/main/resources/messages/messages_gl.yml | 2 ++ src/main/resources/messages/messages_hu.yml | 2 ++ src/main/resources/messages/messages_id.yml | 1 + src/main/resources/messages/messages_it.yml | 1 + src/main/resources/messages/messages_ko.yml | 1 + src/main/resources/messages/messages_lt.yml | 2 ++ src/main/resources/messages/messages_nl.yml | 3 +++ src/main/resources/messages/messages_pl.yml | 2 ++ src/main/resources/messages/messages_pt.yml | 2 ++ src/main/resources/messages/messages_ru.yml | 2 ++ src/main/resources/messages/messages_tr.yml | 1 + src/main/resources/messages/messages_uk.yml | 2 ++ src/main/resources/messages/messages_vn.yml | 4 ++++ src/main/resources/messages/messages_zhhk.yml | 2 ++ src/main/resources/messages/messages_zhtw.yml | 1 + 22 files changed, 44 insertions(+), 4 deletions(-) diff --git a/src/main/resources/messages/messages_bg.yml b/src/main/resources/messages/messages_bg.yml index efa41d582..5a189ec37 100644 --- a/src/main/resources/messages/messages_bg.yml +++ b/src/main/resources/messages/messages_bg.yml @@ -42,7 +42,7 @@ wrong_captcha: '&cГрешен код, използвай : /captcha THE_CAPTCHA valid_captcha: '&cТвоя код е валиден!' kick_forvip: '&cVIP влезе докато сървъра е пълен, ти беше изгонен!' kick_fullserver: '&cСървъра е пълен, Съжеляваме!' -usage_email_add: '&fКоманда: /email add ' +usage_email_add: '&fКоманда: /email add ' usage_email_change: '&fКоманда: /email change <СтарИмейл> <НовИмейл> ' usage_email_recovery: '&fКоманда: /email recovery <имейл>' new_email_invalid: '[AuthMe] Новия имейл е грешен!' @@ -55,3 +55,5 @@ email_send: '[AuthMe] Изпраен е имейл !' country_banned: Твоята държава е забранена в този сървър! antibot_auto_enabled: '[AuthMe] AntiBotMod автоматично включен, открита е потенциална атака!' antibot_auto_disabled: '[AuthMe] AntiBotMod автоматично изключване след %m Минути.' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' diff --git a/src/main/resources/messages/messages_br.yml b/src/main/resources/messages/messages_br.yml index 20243c687..911dd23ff 100644 --- a/src/main/resources/messages/messages_br.yml +++ b/src/main/resources/messages/messages_br.yml @@ -56,3 +56,4 @@ email_exists: '[AuthMe] Um email já existe na sua conta. Você pode mudalo usan country_banned: 'O seu pais é banido desse servidor' antibot_auto_enabled: '[AuthMe] AntiBotMod ativado automaticamente devido a um aumento anormal de tentativas de ligação!' antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automaticamente após %m minutos, esperamos que a invasão tenha parado' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' diff --git a/src/main/resources/messages/messages_cz.yml b/src/main/resources/messages/messages_cz.yml index 7492503d7..591e4e757 100644 --- a/src/main/resources/messages/messages_cz.yml +++ b/src/main/resources/messages/messages_cz.yml @@ -19,7 +19,7 @@ reg_email_msg: '&cProsim registruj se pomoci "/register ' usage_captcha: '&cKäyttötapa: /captcha ' -wrong_captcha: '&cVäärä varmistus, käytä : /captcha CAPTCHA' +wrong_captcha: '&cVäärä varmistus, käytä : /captcha THE_CAPTCHA' valid_captcha: '&cSinun varmistus onnistui.!' kick_forvip: '&cVIP pelaaja liittyi täyteen palvelimeen!' kick_fullserver: '&cPalvelin on täynnä, Yritä pian uudelleen!' @@ -55,3 +55,5 @@ email_send: '[AuthMe] Palautus sähköposti lähetetty!' country_banned: 'Your country is banned from this server' antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' diff --git a/src/main/resources/messages/messages_fr.yml b/src/main/resources/messages/messages_fr.yml index 51a2a53af..a7115ddf3 100644 --- a/src/main/resources/messages/messages_fr.yml +++ b/src/main/resources/messages/messages_fr.yml @@ -25,7 +25,7 @@ pwd_changed: '&cMotdePasse changé avec succès!' user_unknown: '&c Ce compte n''est pas enregistré' password_error: '&fCe mot de passe est incorrect' invalid_session: '&fSession invalide, relancez le jeu ou attendez la fin de la session' -reg_only: '&fSeul les joueurs enregistré sont admis!' +reg_only: '&fSeul les joueurs enregistré sont admis! Visite http://example.com' logged_in: '&cVous êtes déjà connecté!' logout: '&cVous avez été déconnecté!' same_nick: '&fUne personne ayant ce même pseudo joue déjà..' @@ -56,3 +56,5 @@ email_send: '[AuthMe] Email de récupération envoyé!' country_banned: 'Votre pays est banni de ce serveur' antibot_auto_enabled: '[AuthMe] AntiBotMod a été activé automatiquement à cause de nombreuses connections!' antibot_auto_disabled: '[AuthMe] AntiBotMod a été désactivé automatiquement après %m Minutes, espérons que l''invasion soit arrêtée!' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' diff --git a/src/main/resources/messages/messages_gl.yml b/src/main/resources/messages/messages_gl.yml index dde77e191..c5a17d950 100644 --- a/src/main/resources/messages/messages_gl.yml +++ b/src/main/resources/messages/messages_gl.yml @@ -55,3 +55,5 @@ email_send: '[AuthMe] Enviouse o correo de confirmación!' country_banned: 'O teu país está bloqueado neste servidor' antibot_auto_enabled: '[AuthMe] AntiBotMod conectouse automáticamente debido a conexións masivas!' antibot_auto_disabled: '[AuthMe] AntiBotMod desactivouse automáticamente despois de %m minutos,&n esperemos que a invasión se detivera' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' diff --git a/src/main/resources/messages/messages_hu.yml b/src/main/resources/messages/messages_hu.yml index 68fde4d1f..3245ce1a6 100644 --- a/src/main/resources/messages/messages_hu.yml +++ b/src/main/resources/messages/messages_hu.yml @@ -55,3 +55,5 @@ email_send: '[AuthMe] Recovery Email Send !' country_banned: 'Your country is banned from this server' antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' diff --git a/src/main/resources/messages/messages_id.yml b/src/main/resources/messages/messages_id.yml index 2b183f3d1..e4b8279a9 100644 --- a/src/main/resources/messages/messages_id.yml +++ b/src/main/resources/messages/messages_id.yml @@ -56,3 +56,4 @@ email_exists: '&cEmail pemulihan sudah dikirim! kamu bisa membatalkan dan mengir country_banned: '&4Your country is banned from this server!' antibot_auto_enabled: '&4[AntiBotService] AntiBot diaktifkan dikarenakan banyak koneksi yg diterima!' antibot_auto_disabled: '&2[AntiBotService] AntiBot dimatikan setelah %m menit!' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' diff --git a/src/main/resources/messages/messages_it.yml b/src/main/resources/messages/messages_it.yml index 4e4a0fa91..d4cfde467 100644 --- a/src/main/resources/messages/messages_it.yml +++ b/src/main/resources/messages/messages_it.yml @@ -56,3 +56,4 @@ email_exists: 'Il tuo account ha già un''indirizzo email configurato. Se vuoi, country_banned: 'Il tuo paese è bandito da questo server!' antibot_auto_enabled: 'Il servizio di AntiBot è stato automaticamente abilitato a seguito delle numerose connessioni!' antibot_auto_disabled: "Il servizio di AntiBot è stato automaticamente disabilitato dopo %m Minuti, sperando che l'attacco sia finito!" +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' diff --git a/src/main/resources/messages/messages_ko.yml b/src/main/resources/messages/messages_ko.yml index db1bd4214..f49b0d2b3 100644 --- a/src/main/resources/messages/messages_ko.yml +++ b/src/main/resources/messages/messages_ko.yml @@ -60,3 +60,4 @@ email_exists: '[AuthMe] 당신의 계정에 이미 이메일이 존재합니다. country_banned: '당신의 국가는 이 서버에서 차단당했습니다' antibot_auto_enabled: '[AuthMe] 봇차단모드가 연결 개수 때문에 자동적으로 활성화됩니다!' antibot_auto_disabled: '[AuthMe] 봇차단모드가 %m 분 후에 자동적으로 비활성화됩니다' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' diff --git a/src/main/resources/messages/messages_lt.yml b/src/main/resources/messages/messages_lt.yml index 80a7b3abb..3c2dc2769 100644 --- a/src/main/resources/messages/messages_lt.yml +++ b/src/main/resources/messages/messages_lt.yml @@ -55,3 +55,5 @@ email_send: '[AuthMe] Recovery Email Send !' country_banned: 'Your country is banned from this server' antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' diff --git a/src/main/resources/messages/messages_nl.yml b/src/main/resources/messages/messages_nl.yml index f1c585e20..6674158ec 100644 --- a/src/main/resources/messages/messages_nl.yml +++ b/src/main/resources/messages/messages_nl.yml @@ -54,3 +54,6 @@ email_send: '[AuthMe] Herstel E-mail Verzonden!' country_banned: 'Jouw land is geband op deze server' antibot_auto_enabled: '[AuthMe] AntiBotMod automatisch aangezet vanewge veel verbindingen!' antibot_auto_disabled: '[AuthMe] AntiBotMod automatisch uitgezet na %m minuten, hopelijk is de invasie gestopt' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' +reg_email_msg: '&3Please, register to the server with the command "/register "' diff --git a/src/main/resources/messages/messages_pl.yml b/src/main/resources/messages/messages_pl.yml index 952fd1cc0..1f7498abd 100644 --- a/src/main/resources/messages/messages_pl.yml +++ b/src/main/resources/messages/messages_pl.yml @@ -55,3 +55,5 @@ email_send: '[AuthMe] Email z odzyskaniem wyslany!' country_banned: 'Your country is banned from this server' antibot_auto_enabled: '[AuthMe] AntiBotMod automatically enabled due to massive connections!' antibot_auto_disabled: '[AuthMe] AntiBotMod automatically disabled after %m Minutes, hope invasion stopped' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' diff --git a/src/main/resources/messages/messages_pt.yml b/src/main/resources/messages/messages_pt.yml index 02ec04208..bdde99740 100644 --- a/src/main/resources/messages/messages_pt.yml +++ b/src/main/resources/messages/messages_pt.yml @@ -56,3 +56,5 @@ email_send: 'Nova palavra-passe enviada para o seu email!' country_banned: 'O seu país está banido deste servidor' antibot_auto_enabled: '[AuthMe] AntiBotMod activado automaticamente devido a um aumento anormal de tentativas de ligação!' antibot_auto_disabled: '[AuthMe] AntiBotMod desactivado automaticamente após %m minutos, esperamos que a invasão tenha parado' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' diff --git a/src/main/resources/messages/messages_ru.yml b/src/main/resources/messages/messages_ru.yml index 15eea6f3e..c9de92f31 100644 --- a/src/main/resources/messages/messages_ru.yml +++ b/src/main/resources/messages/messages_ru.yml @@ -55,3 +55,5 @@ email_send: '[AuthMe] Письмо с инструкциями для восст country_banned: 'Вход с IP-адресов вашей страны воспрещен на этом сервере' antibot_auto_enabled: '&a[AuthMe] AntiBot-режим автоматически включен из-за большого количества входов!' antibot_auto_disabled: '&a[AuthMe] AntiBot-режим автоматичски отключен после %m мин. Надеюсь атака закончилась' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' diff --git a/src/main/resources/messages/messages_tr.yml b/src/main/resources/messages/messages_tr.yml index 7f0003962..4d8c6dbde 100644 --- a/src/main/resources/messages/messages_tr.yml +++ b/src/main/resources/messages/messages_tr.yml @@ -56,3 +56,4 @@ email_exists: '[AuthMe] An email already exists on your account. You can change country_banned: 'Ulken bu serverdan banlandi !' antibot_auto_enabled: '[AuthMe] AntiBotMode otomatik olarak etkinlestirildi!' antibot_auto_disabled: '[AuthMe] AntiBotMode %m dakika sonra otomatik olarak isgal yuzundan devredisi birakildi' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' diff --git a/src/main/resources/messages/messages_uk.yml b/src/main/resources/messages/messages_uk.yml index 6b132d8da..455693635 100644 --- a/src/main/resources/messages/messages_uk.yml +++ b/src/main/resources/messages/messages_uk.yml @@ -55,3 +55,5 @@ email_send: '[AuthMe] Лист для відновлення надіслано country_banned: 'Сервер не доступний для вашої країни | Your country is banned from this server' antibot_auto_enabled: '[AuthMe] AntiBotMod автоматично увімкнений (забагато одначасних з`єднань)!' antibot_auto_disabled: '[AuthMe] AntiBotMod автоматично вимкнувся, сподіваємось атака зупинена' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' diff --git a/src/main/resources/messages/messages_vn.yml b/src/main/resources/messages/messages_vn.yml index 5cd5c5321..548fbc063 100644 --- a/src/main/resources/messages/messages_vn.yml +++ b/src/main/resources/messages/messages_vn.yml @@ -53,3 +53,7 @@ email_send: '[AuthMe] Đã gửi email khôi phục mật khẩu tới bạn !' country_banned: 'Rất tiếc, quốc gia của bạn không được phép gia nhập server' antibot_auto_enabled: '[AuthMe] AntiBot đã được kích hoạt vì lượng người chơi kết nối vượt quá giới hạn!' antibot_auto_disabled: '[AuthMe] AntiBot tự huỷ kích hoạt sau %m phút, hi vọng lượng kết nối sẽ giảm bớt' +password_error_nick: '&cYou can''t use your name as password, please choose another one...' +password_error_unsafe: '&cThe chosen password isn''t safe, please choose another one...' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' diff --git a/src/main/resources/messages/messages_zhhk.yml b/src/main/resources/messages/messages_zhhk.yml index 6cd67c6ba..7c534615e 100644 --- a/src/main/resources/messages/messages_zhhk.yml +++ b/src/main/resources/messages/messages_zhhk.yml @@ -58,3 +58,5 @@ email_send: '&8[&6用戶系統&8] 忘記密碼信件已寄出，請查收。' country_banned: '&8[&6用戶系統&8] 本伺服器已停止對你的國家提供遊戲服務。' antibot_auto_enabled: '&8[&6用戶系統&8] 防止機械人程序已因應現時大量不尋常連線而啟用。' antibot_auto_disabled: '&8[&6用戶系統&8] 不正常連接數已減少，防止機械人程序將於 %m 分鐘後停止。' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' +email_exists: '&cA recovery email was already sent! You can discard it and send a new one using the command below:' diff --git a/src/main/resources/messages/messages_zhtw.yml b/src/main/resources/messages/messages_zhtw.yml index 7799782c6..d6ab4e688 100644 --- a/src/main/resources/messages/messages_zhtw.yml +++ b/src/main/resources/messages/messages_zhtw.yml @@ -59,3 +59,4 @@ email_exists: '&b【AuthMe】&6這個帳戶已經有設定電子郵件了' country_banned: '&b【AuthMe】&6你所在的地區無法進入此伺服器' antibot_auto_enabled: '&b【AuthMe】&6AntiBotMod已自動啟用!' antibot_auto_disabled: '&b【AuthMe】&6AntiBotMod將會於 &c%m &6分鐘後自動關閉' +kick_antibot: 'AntiBot protection mode is enabled! You have to wait some minutes before joining the server.' From 52b61b10f682b754d0faa3e0955cf309563cf1b3 Mon Sep 17 00:00:00 2001 From: ljacqu Date: Thu, 10 Dec 2015 20:24:20 +0100 Subject: [PATCH 25/33] Tools: Remove I/O without user confirmation, minor refactoring - Permissions: Do not write to generated file without explicit consent by user (default behavior of runners should be _not_ to do any I/O) - Fix wrong check in messages; minor output adjustment - Remove hacky check to see if last char of a file is a new line --- src/tools/messages/MessageFileVerifier.java | 17 +++++------------ src/tools/messages/MessagesVerifierRunner.java | 10 +++++++--- .../permissions/PermissionsListWriter.java | 4 ++-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/tools/messages/MessageFileVerifier.java b/src/tools/messages/MessageFileVerifier.java index af06298d7..75e9927e4 100644 --- a/src/tools/messages/MessageFileVerifier.java +++ b/src/tools/messages/MessageFileVerifier.java @@ -16,7 +16,7 @@ import java.util.Set; */ public class MessageFileVerifier { - private static final char NEW_LINE = '\n'; + private static final String NEW_LINE = "\n"; private final String messagesFile; private final Set unknownKeys = new HashSet<>(); @@ -96,20 +96,13 @@ public class MessageFileVerifier { } } - // Very ugly way of verifying if the last char in the file is a new line, in which case we won't start by - // adding a new line to the file. It's grossly inefficient but with the scale of the messages file it's fine - String fileContents = FileUtils.readFromFile(messagesFile); - String contentsToAdd = ""; - if (fileContents.charAt(fileContents.length() - 1) == NEW_LINE) { - contentsToAdd += NEW_LINE; - } - - // We know that all keys in keysToAdd are safe to retrieve and add + // We know that all keys in keysToAdd are safe to retrieve and write + StringBuilder sb = new StringBuilder(NEW_LINE); for (String keyToAdd : keysToAdd) { - contentsToAdd += keyToAdd + ":" + defaultMessages.get(keyToAdd) + NEW_LINE; + sb.append(keyToAdd).append(":").append(defaultMessages.get(keyToAdd)).append(NEW_LINE); missingKeys.put(keyToAdd, true); } - FileUtils.appendToFile(messagesFile, contentsToAdd); + FileUtils.appendToFile(messagesFile, sb.toString()); } private static Set getAllMessageKeys() { diff --git a/src/tools/messages/MessagesVerifierRunner.java b/src/tools/messages/MessagesVerifierRunner.java index 036ea8499..174c00f7f 100644 --- a/src/tools/messages/MessagesVerifierRunner.java +++ b/src/tools/messages/MessagesVerifierRunner.java @@ -21,7 +21,7 @@ import static java.lang.String.format; */ public final class MessagesVerifierRunner { - public static final String MESSAGES_FOLDER = ToolsConstants.MAIN_RESOURCES_ROOT + "messages/"; + private static final String MESSAGES_FOLDER = ToolsConstants.MAIN_RESOURCES_ROOT + "messages/"; private static final String SOURCES_TAG = "{msgdir}"; private MessagesVerifierRunner() { @@ -63,11 +63,15 @@ public final class MessagesVerifierRunner { verifyFile(verifier); } } + + if (messageFiles.size() > 1) { + System.out.println("Checked " + messageFiles.size() + " files"); + } } private static void verifyFile(MessageFileVerifier verifier) { Map missingKeys = verifier.getMissingKeys(); - if (missingKeys.isEmpty()) { + if (!missingKeys.isEmpty()) { System.out.println(" Missing keys: " + missingKeys.keySet()); } @@ -83,7 +87,7 @@ public final class MessagesVerifierRunner { verifier.addMissingKeys(defaultMessages); missingKeys = verifier.getMissingKeys(); List addedKeys = getKeysWithValue(Boolean.TRUE, missingKeys); - System.out.println("Could add missing keys " + addedKeys); + System.out.println(" Added missing keys " + addedKeys); List unsuccessfulKeys = getKeysWithValue(Boolean.FALSE, missingKeys); if (!unsuccessfulKeys.isEmpty()) { diff --git a/src/tools/permissions/PermissionsListWriter.java b/src/tools/permissions/PermissionsListWriter.java index 3f675ad5c..c8ba05540 100644 --- a/src/tools/permissions/PermissionsListWriter.java +++ b/src/tools/permissions/PermissionsListWriter.java @@ -25,8 +25,8 @@ public class PermissionsListWriter { boolean writeToFile = false; if (includeDescription) { - System.out.println("Write to file? [Enter 'n' for console output]"); - writeToFile = !matches("n", scanner); + System.out.println("Write to file? [Enter 'y' for yes]"); + writeToFile = matches("y", scanner); } scanner.close(); From a6588318c2815f5037303c690b587c6c293068df Mon Sep 17 00:00:00 2001 From: ljacqu Date: Thu, 10 Dec 2015 20:39:31 +0100 Subject: [PATCH 26/33] Fix spelling in main readme - Fix spelling errors - Remove mention of non-existent permission node "authme.*" --- README.md | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 641698715..406859f7a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@
####Development history: -[![Guava AuthMe History Video](http://img.youtube.com/vi/hJRzNfYyd9k/hqdefault.jpg)](https://www.youtube.com/watch?v=hJRzNfYyd9k) +[![Gource AuthMe History Video](http://img.youtube.com/vi/hJRzNfYyd9k/hqdefault.jpg)](https://www.youtube.com/watch?v=hJRzNfYyd9k) #####Development tools: @@ -54,12 +54,12 @@ McStats: http://mcstats.org/plugin/AuthMe #####"The best authentication plugin for the Bukkit/Spigot API!" -

Prevent username stealing on your server! Full compatible with UUIDs and Craftbukkit/Spigot 1.8.X!
-Use it to secure your Offline mode server or to incrase your Online mode server's protection!

+

Prevent username stealing on your server! Fully compatible with UUIDs and Craftbukkit/Spigot 1.8.X!
+Use it to secure your Offline mode server or to increase your Online mode server's protection!

AuthMeReloaded disallows players who aren't authenticated to do actions like placing blocks, moving,
-typing commands or use the inventory. It can also kick players with uncommon long or short player names or kick players from banned countries.

-

With the Session Login feature you don't have to execute the authentication command everytime you connect to the server! Each command and every feature can be enabled or disabled from our well structured configuration file.

+typing commands or using the inventory. It can also kick players with uncommonly long or short player names or kick players from banned countries.

+

With the Session Login feature you don't have to execute the authentication command every time you connect to the server! Each command and every feature can be enabled or disabled from our well structured configuration file.

You can also create your own translation file and, if you want, you can share it with us! :)

####Features: @@ -76,7 +76,7 @@ typing commands or use the inventory. It can also kick players with uncommon lon
  • Supported password encryption algorithms: MD5, SHA1, SHA256, xAuth, Whirlpool
  • Supported alternative registration methods:
      -
    • PHPBB, VBullettin: MD5VB - PHPBB
      • +
    • PHPBB, VBulletin: MD5VB - PHPBB
    • MyBB: MYBB
    • IPB3: IPB3
    • PhpFusion: PHPFUSION
      • @@ -96,7 +96,7 @@ typing commands or use the inventory. It can also kick players with uncommon lon
    • Protect player's inventory until a correct Authentication
    • Saves the quit location of the player
    • Automatic database Backup
      • -
    • Avariable languages: en, de, br, cz, pl, fr, uk, ru, hu, sk, es, fi, zhtw, zhhk, zhcn, lt, it, ko, pt, nl, gl, bg, eu, tr (feel free to send new translations)
      • +
    • Available languages: en, de, br, cz, pl, fr, uk, ru, hu, sk, es, fi, zhtw, zhhk, zhcn, lt, it, ko, pt, nl, gl, bg, eu, tr, vn (feel free to send new translations)
    • Built-in Deprecated FlatFile (auths.db) to SQL (authme.sql) converter!
    • Import your old database from other plugins like Rakamak, xAuth, CrazyLogin, RoyalAuth and vAuth!
    @@ -108,15 +108,14 @@ typing commands or use the inventory. It can also kick players with uncommon lon ####Commands Command list and usage ####Permissions -
    • authme.player.* - for all user command -
    • authme.admin.* - for all admin command -
    • authme.* - for all user and admin command + ####How To
      • How to Install and Setup
      • How to import database from xAuth -
      • WebSite Integration +
      • Website Integration
      • Click here for an example of the Config file
      • How to convert from Rakamak
      • Convert from FlatFile (auths.db but not the sqlite one ) to MySQL: /converter From dff4e6d135cae97450c1ade0149d2aa1d5c4d467 Mon Sep 17 00:00:00 2001 From: Xephi Date: Thu, 10 Dec 2015 20:45:46 +0100 Subject: [PATCH 27/33] Use ByteStreams from Guava --- .../process/login/ProcessSyncronousPlayerLogin.java | 8 +++++--- .../process/logout/ProcessSyncronousPlayerLogout.java | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java b/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java index 0c9ffd7cb..8d6221cf9 100644 --- a/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java +++ b/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java @@ -24,6 +24,9 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import org.bukkit.potion.PotionEffectType; +import com.google.common.io.ByteArrayDataOutput; +import com.google.common.io.ByteStreams; + /** */ public class ProcessSyncronousPlayerLogin implements Runnable { @@ -118,8 +121,7 @@ public class ProcessSyncronousPlayerLogin implements Runnable { } protected void sendBungeeMessage() { - ByteArrayOutputStream b = new ByteArrayOutputStream(); - DataOutputStream out = new DataOutputStream(b); + ByteArrayDataOutput out = ByteStreams.newDataOutput(); try { String str = "AuthMe;login;" + name; out.writeUTF("Forward"); @@ -127,7 +129,7 @@ public class ProcessSyncronousPlayerLogin implements Runnable { out.writeUTF("AuthMe"); out.writeShort(str.length()); out.writeUTF(str); - player.sendPluginMessage(plugin, "BungeeCord", b.toByteArray()); + player.sendPluginMessage(plugin, "BungeeCord", out.toByteArray()); } catch (Exception e) {} } diff --git a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java index 69c9a80d5..0355124ef 100644 --- a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java +++ b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java @@ -20,6 +20,9 @@ import org.bukkit.potion.PotionEffectType; import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scheduler.BukkitTask; +import com.google.common.io.ByteArrayDataOutput; +import com.google.common.io.ByteStreams; + /** */ public class ProcessSyncronousPlayerLogout implements Runnable { @@ -43,8 +46,7 @@ public class ProcessSyncronousPlayerLogout implements Runnable { } protected void sendBungeeMessage() { - ByteArrayOutputStream b = new ByteArrayOutputStream(); - DataOutputStream out = new DataOutputStream(b); + ByteArrayDataOutput out = ByteStreams.newDataOutput(); try { String str = "AuthMe;logout;" + name; out.writeUTF("Forward"); @@ -52,7 +54,7 @@ public class ProcessSyncronousPlayerLogout implements Runnable { out.writeUTF("AuthMe"); out.writeShort(str.length()); out.writeUTF(str); - player.sendPluginMessage(plugin, "BungeeCord", b.toByteArray()); + player.sendPluginMessage(plugin, "BungeeCord", out.toByteArray()); } catch (Exception e) {} } From 1ecee76b608d4144d2f3c69314e8a082b1435515 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Thu, 10 Dec 2015 20:53:46 +0100 Subject: [PATCH 28/33] clean imports --- .../authme/process/login/ProcessSyncronousPlayerLogin.java | 3 --- .../authme/process/logout/ProcessSyncronousPlayerLogout.java | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java b/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java index 8d6221cf9..254eb98e8 100644 --- a/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java +++ b/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java @@ -15,9 +15,6 @@ import fr.xephi.authme.settings.Settings; import fr.xephi.authme.util.Utils; import fr.xephi.authme.util.Utils.GroupType; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; - import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java index 0355124ef..94721c688 100644 --- a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java +++ b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java @@ -10,9 +10,6 @@ import fr.xephi.authme.settings.Settings; import fr.xephi.authme.task.MessageTask; import fr.xephi.authme.task.TimeoutTask; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; - import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffect; From cd1c861b4726ebac8404d7ca10c3264d60612d3c Mon Sep 17 00:00:00 2001 From: DNx5 Date: Fri, 11 Dec 2015 12:16:29 +0700 Subject: [PATCH 29/33] Bungee message update, whatever. --- .../authme/datasource/CacheDataSource.java | 4 ++ .../xephi/authme/hooks/BungeeCordMessage.java | 57 ++++++++----------- .../login/ProcessSyncronousPlayerLogin.java | 25 +++----- .../logout/ProcessSyncronousPlayerLogout.java | 25 +++----- .../process/register/AsyncRegister.java | 2 +- .../register/ProcessSyncEmailRegister.java | 3 +- ....java => ProcessSyncPasswordRegister.java} | 21 ++++++- 7 files changed, 67 insertions(+), 70 deletions(-) rename src/main/java/fr/xephi/authme/process/register/{ProcessSyncronousPasswordRegister.java => ProcessSyncPasswordRegister.java} (88%) diff --git a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java index a42c051d8..55e00246a 100644 --- a/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java +++ b/src/main/java/fr/xephi/authme/datasource/CacheDataSource.java @@ -49,6 +49,10 @@ public class CacheDataSource implements DataSource { }); } + public void addAuthToCache(PlayerAuth auth) { + cache.put(auth.getNickname().toLowerCase(), auth); + } + /** * Method isAuthAvailable. * diff --git a/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java b/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java index 30f9a23f6..d6e25117d 100644 --- a/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java +++ b/src/main/java/fr/xephi/authme/hooks/BungeeCordMessage.java @@ -6,7 +6,7 @@ import fr.xephi.authme.AuthMe; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerCache; - +import fr.xephi.authme.datasource.CacheDataSource; import org.bukkit.entity.Player; import org.bukkit.plugin.messaging.PluginMessageListener; @@ -35,8 +35,7 @@ public class BungeeCordMessage implements PluginMessageListener { * @see org.bukkit.plugin.messaging.PluginMessageListener#onPluginMessageReceived(String, Player, byte[]) */ @Override - public void onPluginMessageReceived(String channel, Player player, - byte[] message) { + public void onPluginMessageReceived(String channel, Player player, byte[] message) { if (!channel.equals("BungeeCord")) { return; } @@ -47,36 +46,28 @@ public class BungeeCordMessage implements PluginMessageListener { // Put the IP (only the ip not the port) in the hashMap plugin.realIp.put(player.getName().toLowerCase(), ip); } - if (subChannel.equals("Forward") || subChannel.equalsIgnoreCase("AuthMe")) - { - short len = in.readShort(); - byte[] data = new byte[len]; - in.readFully(data); - - //bytearray to string - String str = new String(data); - if (!str.startsWith("AuthMe")) - return; - String[] args = str.split(";"); - try { - String name = args[2]; - PlayerAuth auth = plugin.database.getAuth(name); - if (auth == null) - return; - if (args[1].equalsIgnoreCase("login")) - { - PlayerCache.getInstance().addPlayer(auth); - plugin.database.setLogged(name); - ConsoleLogger.info("Player " + auth.getNickname() + " has logged in from one of your server!"); - } - else if (args[1].equalsIgnoreCase("logout")) - { - PlayerCache.getInstance().removePlayer(name); - plugin.database.setUnlogged(name); - ConsoleLogger.info("Player " + auth.getNickname() + " has logged out from one of your server!"); - } - } catch (Exception e) - {} + if (subChannel.equalsIgnoreCase("AuthMe")) { + String str = in.readUTF(); + String[] args = str.split(";"); + String name = args[1]; + PlayerAuth auth = plugin.database.getAuth(name); + if (auth == null) { + return; + } + if ("login".equals(args[0])) { + PlayerCache.getInstance().updatePlayer(auth); + plugin.database.setLogged(name); + ConsoleLogger.info("Player " + auth.getNickname() + " has logged in from one of your server!"); + } else if ("logout".equals(args[0])) { + PlayerCache.getInstance().removePlayer(name); + plugin.database.setUnlogged(name); + ConsoleLogger.info("Player " + auth.getNickname() + " has logged out from one of your server!"); + } else if ("register".equals(args[0])) { + if (plugin.database instanceof CacheDataSource) { + ((CacheDataSource)plugin.database).addAuthToCache(auth); + } + ConsoleLogger.info("Player " + auth.getNickname() + " has registered out from one of your server!"); + } } } diff --git a/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java b/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java index 254eb98e8..f64b2274a 100644 --- a/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java +++ b/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java @@ -1,5 +1,7 @@ package fr.xephi.authme.process.login; +import com.google.common.io.ByteArrayDataOutput; +import com.google.common.io.ByteStreams; import fr.xephi.authme.AuthMe; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.backup.JsonCache; @@ -14,16 +16,12 @@ import fr.xephi.authme.listener.AuthMePlayerListener; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.util.Utils; import fr.xephi.authme.util.Utils.GroupType; - import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import org.bukkit.potion.PotionEffectType; -import com.google.common.io.ByteArrayDataOutput; -import com.google.common.io.ByteStreams; - /** */ public class ProcessSyncronousPlayerLogin implements Runnable { @@ -118,17 +116,12 @@ public class ProcessSyncronousPlayerLogin implements Runnable { } protected void sendBungeeMessage() { - ByteArrayDataOutput out = ByteStreams.newDataOutput(); - try { - String str = "AuthMe;login;" + name; - out.writeUTF("Forward"); - out.writeUTF("ALL"); - out.writeUTF("AuthMe"); - out.writeShort(str.length()); - out.writeUTF(str); - player.sendPluginMessage(plugin, "BungeeCord", out.toByteArray()); - } catch (Exception e) - {} + ByteArrayDataOutput out = ByteStreams.newDataOutput(); + out.writeUTF("Forward"); + out.writeUTF("ALL"); + out.writeUTF("AuthMe"); + out.writeUTF("login;" + name); + player.sendPluginMessage(plugin, "BungeeCord", out.toByteArray()); } /** @@ -205,7 +198,7 @@ public class ProcessSyncronousPlayerLogin implements Runnable { Bukkit.getServer().getPluginManager().callEvent(new LoginEvent(player, true)); player.saveData(); if (Settings.bungee) - sendBungeeMessage(); + sendBungeeMessage(); // Login is finish, display welcome message if (Settings.useWelcomeMessage) if (Settings.broadcastWelcomeMessage) { diff --git a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java index 94721c688..8f34c3631 100644 --- a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java +++ b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncronousPlayerLogout.java @@ -1,5 +1,7 @@ package fr.xephi.authme.process.logout; +import com.google.common.io.ByteArrayDataOutput; +import com.google.common.io.ByteStreams; import fr.xephi.authme.AuthMe; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.cache.limbo.LimboCache; @@ -9,7 +11,6 @@ import fr.xephi.authme.output.Messages; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.task.MessageTask; import fr.xephi.authme.task.TimeoutTask; - import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffect; @@ -17,9 +18,6 @@ import org.bukkit.potion.PotionEffectType; import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scheduler.BukkitTask; -import com.google.common.io.ByteArrayDataOutput; -import com.google.common.io.ByteStreams; - /** */ public class ProcessSyncronousPlayerLogout implements Runnable { @@ -43,17 +41,12 @@ public class ProcessSyncronousPlayerLogout implements Runnable { } protected void sendBungeeMessage() { - ByteArrayDataOutput out = ByteStreams.newDataOutput(); - try { - String str = "AuthMe;logout;" + name; - out.writeUTF("Forward"); - out.writeUTF("ALL"); - out.writeUTF("AuthMe"); - out.writeShort(str.length()); - out.writeUTF(str); - player.sendPluginMessage(plugin, "BungeeCord", out.toByteArray()); - } catch (Exception e) - {} + ByteArrayDataOutput out = ByteStreams.newDataOutput(); + out.writeUTF("Forward"); + out.writeUTF("ALL"); + out.writeUTF("AuthMe"); + out.writeUTF("logout;" + name); + player.sendPluginMessage(plugin, "BungeeCord", out.toByteArray()); } /** @@ -95,7 +88,7 @@ public class ProcessSyncronousPlayerLogout implements Runnable { // Player is now logout... Time to fire event ! Bukkit.getServer().getPluginManager().callEvent(new LogoutEvent(player)); if (Settings.bungee) - sendBungeeMessage(); + sendBungeeMessage(); m.send(player, MessageKey.LOGOUT_SUCCESS); ConsoleLogger.info(player.getName() + " logged out"); } diff --git a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java index 7a6352cf7..668c0e3d9 100644 --- a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java @@ -145,7 +145,7 @@ public class AsyncRegister { database.setLogged(name); } plugin.otherAccounts.addPlayer(player.getUniqueId()); - ProcessSyncronousPasswordRegister sync = new ProcessSyncronousPasswordRegister(player, plugin); + ProcessSyncPasswordRegister sync = new ProcessSyncPasswordRegister(player, plugin); plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, sync); } } diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java index dc95e33de..4d8dcf9e9 100644 --- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncEmailRegister.java @@ -64,8 +64,9 @@ public class ProcessSyncEmailRegister implements Runnable { } player.saveData(); - if (!Settings.noConsoleSpam) + if (!Settings.noConsoleSpam) { ConsoleLogger.info(player.getName() + " registered " + plugin.getIP(player)); + } } } diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java similarity index 88% rename from src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java rename to src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java index 6434cb592..4c9136def 100644 --- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousPasswordRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncPasswordRegister.java @@ -1,5 +1,7 @@ package fr.xephi.authme.process.register; +import com.google.common.io.ByteArrayDataOutput; +import com.google.common.io.ByteStreams; import fr.xephi.authme.AuthMe; import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.cache.limbo.LimboCache; @@ -21,7 +23,7 @@ import org.bukkit.scheduler.BukkitTask; /** */ -public class ProcessSyncronousPasswordRegister implements Runnable { +public class ProcessSyncPasswordRegister implements Runnable { protected final Player player; protected final String name; @@ -29,18 +31,27 @@ public class ProcessSyncronousPasswordRegister implements Runnable { private final Messages m; /** - * Constructor for ProcessSyncronousPasswordRegister. + * Constructor for ProcessSyncPasswordRegister. * * @param player Player * @param plugin AuthMe */ - public ProcessSyncronousPasswordRegister(Player player, AuthMe plugin) { + public ProcessSyncPasswordRegister(Player player, AuthMe plugin) { this.m = plugin.getMessages(); this.player = player; this.name = player.getName().toLowerCase(); this.plugin = plugin; } + private void sendBungeeMessage() { + ByteArrayDataOutput out = ByteStreams.newDataOutput(); + out.writeUTF("Forward"); + out.writeUTF("ALL"); + out.writeUTF("AuthMe"); + out.writeUTF("register;" + name); + player.sendPluginMessage(plugin, "BungeeCord", out.toByteArray()); + } + private void forceCommands() { for (String command : Settings.forceRegisterCommands) { player.performCommand(command.replace("%p", player.getName())); @@ -155,6 +166,10 @@ public class ProcessSyncronousPasswordRegister implements Runnable { } } + if (Settings.bungee) { + sendBungeeMessage(); + } + // Register is now finish , we can force all commands forceCommands(); } From 23d6801baa8ece7881200960f3bc80a93cebbe57 Mon Sep 17 00:00:00 2001 From: ljacqu Date: Sat, 12 Dec 2015 10:09:38 +0100 Subject: [PATCH 30/33] Run tool tasks from one entry point - Create scanner which scans for existing tasks - Unify options management (mostly because multiple Scanner's are a bad idea) --- src/tools/ToolsRunner.java | 136 ++++++++++++++++++ ...ierRunner.java => VerifyMessagesTask.java} | 42 +++--- .../permissions/PermissionsListWriter.java | 39 ++--- src/tools/utils/ScannerHelper.java | 33 +++++ src/tools/utils/TaskOption.java | 35 +++++ src/tools/utils/ToolTask.java | 17 +++ 6 files changed, 267 insertions(+), 35 deletions(-) create mode 100644 src/tools/ToolsRunner.java rename src/tools/messages/{MessagesVerifierRunner.java => VerifyMessagesTask.java} (79%) create mode 100644 src/tools/utils/ScannerHelper.java create mode 100644 src/tools/utils/TaskOption.java create mode 100644 src/tools/utils/ToolTask.java diff --git a/src/tools/ToolsRunner.java b/src/tools/ToolsRunner.java new file mode 100644 index 000000000..a0589f1b3 --- /dev/null +++ b/src/tools/ToolsRunner.java @@ -0,0 +1,136 @@ +import utils.ScannerHelper; +import utils.TaskOption; +import utils.ToolTask; +import utils.ToolsConstants; + +import java.io.File; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Modifier; +import java.util.HashMap; +import java.util.Map; +import java.util.Scanner; + +/** + * Main entry point for tool tasks. + */ +public class ToolsRunner { + + private static final String DIR_SEPARATOR = File.separator; + + public static void main(String... args) { + // Collect tasks and show them + File toolsFolder = new File(ToolsConstants.TOOLS_SOURCE_ROOT); + Map tasks = new HashMap<>(); + collectTasksInDirectory(toolsFolder, tasks); + showHelp(tasks); + + // Prompt user for task and handle input + System.out.println("Please enter the task to run:"); + Scanner scanner = new Scanner(System.in); + String inputTask = scanner.nextLine(); + ToolTask task = tasks.get(inputTask); + + if (task != null) { + executeTask(task, scanner); + } else { + System.out.println("Unknown task"); + } + scanner.close(); + } + + /** + * Execute the given tool task after prompting the user for the required options. + * + * @param task The task to run + * @param scanner The scanner instance + */ + private static void executeTask(ToolTask task, Scanner scanner) { + Iterable options = task.getOptions(); + Map inputOptions = new HashMap<>(); + for (TaskOption option : options) { + System.out.println(option.getDescription()); + String input = ScannerHelper.getAnswer(option.getDefaultOption(), scanner, option.getOptions()); + inputOptions.put(option.getName(), input); + } + + task.execute(inputOptions); + } + + private static void showHelp(Map taskCollection) { + System.out.println("The following tasks are available:"); + for (String key : taskCollection.keySet()) { + System.out.println("- " + key); + } + } + + // Note ljacqu 20151212: If the tools folder becomes a lot bigger, it will make sense to restrict the depth + // of this recursive collector + private static void collectTasksInDirectory(File dir, Map taskCollection) { + File[] files = dir.listFiles(); + if (files == null) { + throw new RuntimeException("Cannot read folder '" + dir + "'"); + } + for (File file : files) { + if (file.isDirectory()) { + collectTasksInDirectory(file, taskCollection); + } else if (file.isFile()) { + ToolTask task = getTaskFromFile(file); + if (task != null) { + taskCollection.put(task.getTaskName(), task); + } + } + } + } + + /** + * Return a {@link ToolTask} instance from the given file. + * + * @param file The file to load + * @return ToolTask instance or null if not applicable + */ + private static ToolTask getTaskFromFile(File file) { + Class taskClass = loadTaskClassFromFile(file); + if (taskClass == null) { + return null; + } + + try { + Constructor constructor = taskClass.getConstructor(); + return constructor.newInstance(); + } catch (NoSuchMethodException | InvocationTargetException | + IllegalAccessException | InstantiationException e) { + throw new RuntimeException("Cannot instantiate task '" + taskClass + "'"); + } + } + + /** + * Return the class the file defines if it implements a {@link ToolTask}. + * + * @return The class instance, or null if not applicable + */ + @SuppressWarnings("unchecked") + private static Class loadTaskClassFromFile(File file) { + if (!file.getName().endsWith(".java")) { + return null; + } + + String filePath = file.getPath(); + String className = filePath + .substring(ToolsConstants.TOOLS_SOURCE_ROOT.length(), filePath.length() - 5) + .replace(DIR_SEPARATOR, "."); + try { + Class clazz = ClassLoader.getSystemClassLoader().loadClass(className); + return ToolTask.class.isAssignableFrom(clazz) && isInstantiable(clazz) + ? (Class) clazz + : null; + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + } + + private static boolean isInstantiable(Class clazz) { + return !clazz.isInterface() && !Modifier.isAbstract(clazz.getModifiers()); + } + +} diff --git a/src/tools/messages/MessagesVerifierRunner.java b/src/tools/messages/VerifyMessagesTask.java similarity index 79% rename from src/tools/messages/MessagesVerifierRunner.java rename to src/tools/messages/VerifyMessagesTask.java index 174c00f7f..f0fe3533d 100644 --- a/src/tools/messages/MessagesVerifierRunner.java +++ b/src/tools/messages/VerifyMessagesTask.java @@ -2,10 +2,13 @@ package messages; import fr.xephi.authme.util.StringUtils; import utils.FileUtils; +import utils.TaskOption; +import utils.ToolTask; import utils.ToolsConstants; import java.io.File; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -17,27 +20,23 @@ import java.util.regex.Pattern; import static java.lang.String.format; /** - * Entry point of the messages verifier. + * Task to verify the keys in the messages files. */ -public final class MessagesVerifierRunner { +public final class VerifyMessagesTask implements ToolTask { private static final String MESSAGES_FOLDER = ToolsConstants.MAIN_RESOURCES_ROOT + "messages/"; + private static final Pattern MESSAGE_FILE_PATTERN = Pattern.compile("messages_[a-z]{2,7}\\.yml"); private static final String SOURCES_TAG = "{msgdir}"; - private MessagesVerifierRunner() { + @Override + public String getTaskName() { + return "verifyMessages"; } - public static void main(String[] args) { - // Prompt user for options - Scanner scanner = new Scanner(System.in); - System.out.println("Check a specific file only?"); - System.out.println("- Empty line will check all files in the resources messages folder (default)"); - System.out.println(format("- %s will be replaced to the messages folder %s", SOURCES_TAG, MESSAGES_FOLDER)); - String inputFile = scanner.nextLine(); - - System.out.println("Add any missing keys to files? ['y' = yes]"); - boolean addMissingKeys = "y".equals(scanner.nextLine()); - scanner.close(); + @Override + public void execute(Map options) { + String inputFile = options.get("custom.file"); + boolean addMissingKeys = options.get("add.missing.keys").equals("y"); // Set up needed objects Map defaultMessages = null; @@ -69,6 +68,18 @@ public final class MessagesVerifierRunner { } } + @Override + public Iterable getOptions() { + String customFileDescription = StringUtils.join(System.getProperty("line.separator"), + "Check a specific file only? (optional - enter custom filename)", + "- Empty line will check all files in the resources messages folder", + format("- %s will be replaced to the messages folder %s", SOURCES_TAG, MESSAGES_FOLDER)); + + return Arrays.asList( + new TaskOption("custom.file", customFileDescription, "", null), + new TaskOption("add.missing.keys", "Add missing keys to files? [y/n]", "n", "y", "n")); + } + private static void verifyFile(MessageFileVerifier verifier) { Map missingKeys = verifier.getMissingKeys(); if (!missingKeys.isEmpty()) { @@ -132,7 +143,6 @@ public final class MessagesVerifierRunner { } private static List getMessagesFiles() { - final Pattern messageFilePattern = Pattern.compile("messages_[a-z]{2,7}\\.yml"); File folder = new File(MESSAGES_FOLDER); File[] files = folder.listFiles(); if (files == null) { @@ -141,7 +151,7 @@ public final class MessagesVerifierRunner { List messageFiles = new ArrayList<>(); for (File file : files) { - if (messageFilePattern.matcher(file.getName()).matches()) { + if (MESSAGE_FILE_PATTERN.matcher(file.getName()).matches()) { messageFiles.add(file); } } diff --git a/src/tools/permissions/PermissionsListWriter.java b/src/tools/permissions/PermissionsListWriter.java index c8ba05540..3b1e9c33c 100644 --- a/src/tools/permissions/PermissionsListWriter.java +++ b/src/tools/permissions/PermissionsListWriter.java @@ -3,32 +3,32 @@ package permissions; import utils.ANewMap; import utils.FileUtils; import utils.TagReplacer; +import utils.TaskOption; +import utils.ToolTask; import utils.ToolsConstants; +import java.util.Arrays; import java.util.Map; -import java.util.Scanner; import java.util.Set; /** - * Class responsible for formatting a permissions node list and + * Task responsible for formatting a permissions node list and * for writing it to a file if desired. */ -public class PermissionsListWriter { +public class PermissionsListWriter implements ToolTask { private static final String PERMISSIONS_OUTPUT_FILE = ToolsConstants.DOCS_FOLDER + "permission_nodes.md"; - public static void main(String[] args) { - // Ask if result should be written to file - Scanner scanner = new Scanner(System.in); - System.out.println("Include description? [Enter 'n' for no]"); - boolean includeDescription = !matches("n", scanner); + @Override + public String getTaskName() { + return "writePermissionsList"; + } - boolean writeToFile = false; - if (includeDescription) { - System.out.println("Write to file? [Enter 'y' for yes]"); - writeToFile = matches("y", scanner); - } - scanner.close(); + @Override + public void execute(Map options) { + // Ask if result should be written to file + boolean includeDescription = options.get("include.description").equals("y"); + boolean writeToFile = options.get("write.to.file").equals("y"); if (!includeDescription) { outputSimpleList(); @@ -39,6 +39,12 @@ public class PermissionsListWriter { } } + @Override + public Iterable getOptions() { + return Arrays.asList( + new TaskOption("include.description", "Include description? [y/n]", "y", "y", "n"), + new TaskOption("write.to.file", "Write to file? [y/n]", "n", "y", "n")); + } private static void generateAndWriteFile() { final String permissionsTagValue = generatePermissionsList(); @@ -77,9 +83,4 @@ public class PermissionsListWriter { System.out.println("Total: " + nodes.size()); } - private static boolean matches(String answer, Scanner sc) { - String userInput = sc.nextLine(); - return answer.equalsIgnoreCase(userInput); - } - } diff --git a/src/tools/utils/ScannerHelper.java b/src/tools/utils/ScannerHelper.java new file mode 100644 index 000000000..b7741164d --- /dev/null +++ b/src/tools/utils/ScannerHelper.java @@ -0,0 +1,33 @@ +package utils; + +import fr.xephi.authme.util.StringUtils; + +import java.util.Scanner; + +/** + * Helper class for retrieving an answer from a Scanner. + */ +public class ScannerHelper { + + // def may be null to force the selection of one of the options + // options may be null to just select whatever comes in + public static String getAnswer(String def, Scanner scanner, String... options) { + while (true) { + String input = scanner.nextLine(); + if (StringUtils.isEmpty(input) && def != null) { + return def; + } + + if (options == null) { + return input; + } else { + for (String option : options) { + if (input.equals(option)) { + return option; + } + } + } + System.out.println("Invalid answer, please try again"); + } + } +} diff --git a/src/tools/utils/TaskOption.java b/src/tools/utils/TaskOption.java new file mode 100644 index 000000000..ad5acdd6c --- /dev/null +++ b/src/tools/utils/TaskOption.java @@ -0,0 +1,35 @@ +package utils; + +/** + * Option required by a tool task. + */ +public class TaskOption { + + private final String name; + private final String description; + private final String defaultOption; + private final String[] options; + + public TaskOption(String name, String description, String defaultOption, String... options) { + this.name = name; + this.description = description; + this.defaultOption = defaultOption; + this.options = options; + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public String getDefaultOption() { + return defaultOption; + } + + public String[] getOptions() { + return options; + } +} diff --git a/src/tools/utils/ToolTask.java b/src/tools/utils/ToolTask.java new file mode 100644 index 000000000..d74fcc3f2 --- /dev/null +++ b/src/tools/utils/ToolTask.java @@ -0,0 +1,17 @@ +package utils; + +import java.util.Map; + +/** + * Common interface for tool tasks. Note that the implementing tasks are instantiated + * with the default constructor. It is required that it be public. + */ +public interface ToolTask { + + void execute(Map options); + + String getTaskName(); + + Iterable getOptions(); + +} From 0efb419149faf92f71bf7803dd1bed48bd39c52c Mon Sep 17 00:00:00 2001 From: ljacqu Date: Sat, 12 Dec 2015 10:24:04 +0100 Subject: [PATCH 31/33] Minor - add JavaDoc to tools classes --- src/tools/ToolsRunner.java | 30 +++++++++++++++------- src/tools/messages/VerifyMessagesTask.java | 3 +++ src/tools/utils/TaskOption.java | 8 ++++++ 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/src/tools/ToolsRunner.java b/src/tools/ToolsRunner.java index a0589f1b3..04093bd19 100644 --- a/src/tools/ToolsRunner.java +++ b/src/tools/ToolsRunner.java @@ -12,18 +12,24 @@ import java.util.Map; import java.util.Scanner; /** - * Main entry point for tool tasks. + * Runner for executing tool tasks. */ -public class ToolsRunner { +public final class ToolsRunner { - private static final String DIR_SEPARATOR = File.separator; + private ToolsRunner() { + } + /** + * Entry point of the runner. + * + * @param args . + */ public static void main(String... args) { // Collect tasks and show them File toolsFolder = new File(ToolsConstants.TOOLS_SOURCE_ROOT); Map tasks = new HashMap<>(); collectTasksInDirectory(toolsFolder, tasks); - showHelp(tasks); + listAllTasks(tasks); // Prompt user for task and handle input System.out.println("Please enter the task to run:"); @@ -57,13 +63,19 @@ public class ToolsRunner { task.execute(inputOptions); } - private static void showHelp(Map taskCollection) { + private static void listAllTasks(Map taskCollection) { System.out.println("The following tasks are available:"); for (String key : taskCollection.keySet()) { System.out.println("- " + key); } } + /** + * Add all implementations of {@link ToolTask} from the given folder to the provided collection. + * + * @param dir The directory to scan + * @param taskCollection The collection to add results to + */ // Note ljacqu 20151212: If the tools folder becomes a lot bigger, it will make sense to restrict the depth // of this recursive collector private static void collectTasksInDirectory(File dir, Map taskCollection) { @@ -84,10 +96,10 @@ public class ToolsRunner { } /** - * Return a {@link ToolTask} instance from the given file. + * Return a {@link ToolTask} instance defined by the given source file. * * @param file The file to load - * @return ToolTask instance or null if not applicable + * @return ToolTask instance, or null if not applicable */ private static ToolTask getTaskFromFile(File file) { Class taskClass = loadTaskClassFromFile(file); @@ -105,7 +117,7 @@ public class ToolsRunner { } /** - * Return the class the file defines if it implements a {@link ToolTask}. + * Return the class the file defines if it implements {@link ToolTask}. * * @return The class instance, or null if not applicable */ @@ -118,7 +130,7 @@ public class ToolsRunner { String filePath = file.getPath(); String className = filePath .substring(ToolsConstants.TOOLS_SOURCE_ROOT.length(), filePath.length() - 5) - .replace(DIR_SEPARATOR, "."); + .replace(File.separator, "."); try { Class clazz = ClassLoader.getSystemClassLoader().loadClass(className); return ToolTask.class.isAssignableFrom(clazz) && isInstantiable(clazz) diff --git a/src/tools/messages/VerifyMessagesTask.java b/src/tools/messages/VerifyMessagesTask.java index f0fe3533d..cb1d3f45b 100644 --- a/src/tools/messages/VerifyMessagesTask.java +++ b/src/tools/messages/VerifyMessagesTask.java @@ -24,8 +24,11 @@ import static java.lang.String.format; */ public final class VerifyMessagesTask implements ToolTask { + /** The folder containing the message files. */ private static final String MESSAGES_FOLDER = ToolsConstants.MAIN_RESOURCES_ROOT + "messages/"; + /** Pattern of the message file names. */ private static final Pattern MESSAGE_FILE_PATTERN = Pattern.compile("messages_[a-z]{2,7}\\.yml"); + /** Tag that is replaced to the messages folder in user input. */ private static final String SOURCES_TAG = "{msgdir}"; @Override diff --git a/src/tools/utils/TaskOption.java b/src/tools/utils/TaskOption.java index ad5acdd6c..f4d32efa9 100644 --- a/src/tools/utils/TaskOption.java +++ b/src/tools/utils/TaskOption.java @@ -10,6 +10,14 @@ public class TaskOption { private final String defaultOption; private final String[] options; + /** + * Constructor. + * + * @param name Name of the option (to refer to the option) + * @param description Description shown to the user when asked to set the option + * @param defaultOption The default option. Can be null to force a value from options. + * @param options Collection of possible options. Can be null to allow any input. + */ public TaskOption(String name, String description, String defaultOption, String... options) { this.name = name; this.description = description; From 1e2a0f98badceea60b4cb84c04dd6caaf06a600e Mon Sep 17 00:00:00 2001 From: ljacqu Date: Sat, 12 Dec 2015 10:37:08 +0100 Subject: [PATCH 32/33] Tools: pass Scanner to tasks and revert options management - Remove TaskOption and central logic for processing options. It is not flexible and clear enough without investing a lot of effort. Fix is easy - just pass the scanner and let the task do what it needs to do. --- src/tools/ToolsRunner.java | 22 +--------- src/tools/messages/VerifyMessagesTask.java | 25 ++++------- .../permissions/PermissionsListWriter.java | 27 ++++++------ src/tools/utils/ScannerHelper.java | 33 -------------- src/tools/utils/TaskOption.java | 43 ------------------- src/tools/utils/ToolTask.java | 16 +++++-- 6 files changed, 36 insertions(+), 130 deletions(-) delete mode 100644 src/tools/utils/ScannerHelper.java delete mode 100644 src/tools/utils/TaskOption.java diff --git a/src/tools/ToolsRunner.java b/src/tools/ToolsRunner.java index 04093bd19..eddedc66b 100644 --- a/src/tools/ToolsRunner.java +++ b/src/tools/ToolsRunner.java @@ -1,5 +1,3 @@ -import utils.ScannerHelper; -import utils.TaskOption; import utils.ToolTask; import utils.ToolsConstants; @@ -38,31 +36,13 @@ public final class ToolsRunner { ToolTask task = tasks.get(inputTask); if (task != null) { - executeTask(task, scanner); + task.execute(scanner); } else { System.out.println("Unknown task"); } scanner.close(); } - /** - * Execute the given tool task after prompting the user for the required options. - * - * @param task The task to run - * @param scanner The scanner instance - */ - private static void executeTask(ToolTask task, Scanner scanner) { - Iterable options = task.getOptions(); - Map inputOptions = new HashMap<>(); - for (TaskOption option : options) { - System.out.println(option.getDescription()); - String input = ScannerHelper.getAnswer(option.getDefaultOption(), scanner, option.getOptions()); - inputOptions.put(option.getName(), input); - } - - task.execute(inputOptions); - } - private static void listAllTasks(Map taskCollection) { System.out.println("The following tasks are available:"); for (String key : taskCollection.keySet()) { diff --git a/src/tools/messages/VerifyMessagesTask.java b/src/tools/messages/VerifyMessagesTask.java index cb1d3f45b..2a371216f 100644 --- a/src/tools/messages/VerifyMessagesTask.java +++ b/src/tools/messages/VerifyMessagesTask.java @@ -2,13 +2,11 @@ package messages; import fr.xephi.authme.util.StringUtils; import utils.FileUtils; -import utils.TaskOption; import utils.ToolTask; import utils.ToolsConstants; import java.io.File; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -37,9 +35,14 @@ public final class VerifyMessagesTask implements ToolTask { } @Override - public void execute(Map options) { - String inputFile = options.get("custom.file"); - boolean addMissingKeys = options.get("add.missing.keys").equals("y"); + public void execute(Scanner scanner) { + System.out.println("Check a specific file only?"); + System.out.println("- Empty line will check all files in the resources messages folder (default)"); + System.out.println(format("- %s will be replaced to the messages folder %s", SOURCES_TAG, MESSAGES_FOLDER)); + String inputFile = scanner.nextLine(); + + System.out.println("Add any missing keys to files? ['y' = yes]"); + boolean addMissingKeys = "y".equals(scanner.nextLine()); // Set up needed objects Map defaultMessages = null; @@ -71,18 +74,6 @@ public final class VerifyMessagesTask implements ToolTask { } } - @Override - public Iterable getOptions() { - String customFileDescription = StringUtils.join(System.getProperty("line.separator"), - "Check a specific file only? (optional - enter custom filename)", - "- Empty line will check all files in the resources messages folder", - format("- %s will be replaced to the messages folder %s", SOURCES_TAG, MESSAGES_FOLDER)); - - return Arrays.asList( - new TaskOption("custom.file", customFileDescription, "", null), - new TaskOption("add.missing.keys", "Add missing keys to files? [y/n]", "n", "y", "n")); - } - private static void verifyFile(MessageFileVerifier verifier) { Map missingKeys = verifier.getMissingKeys(); if (!missingKeys.isEmpty()) { diff --git a/src/tools/permissions/PermissionsListWriter.java b/src/tools/permissions/PermissionsListWriter.java index 3b1e9c33c..1d06b8ceb 100644 --- a/src/tools/permissions/PermissionsListWriter.java +++ b/src/tools/permissions/PermissionsListWriter.java @@ -3,12 +3,11 @@ package permissions; import utils.ANewMap; import utils.FileUtils; import utils.TagReplacer; -import utils.TaskOption; import utils.ToolTask; import utils.ToolsConstants; -import java.util.Arrays; import java.util.Map; +import java.util.Scanner; import java.util.Set; /** @@ -25,10 +24,16 @@ public class PermissionsListWriter implements ToolTask { } @Override - public void execute(Map options) { + public void execute(Scanner scanner) { // Ask if result should be written to file - boolean includeDescription = options.get("include.description").equals("y"); - boolean writeToFile = options.get("write.to.file").equals("y"); + System.out.println("Include description? [Enter 'n' for no]"); + boolean includeDescription = !matches("n", scanner); + + boolean writeToFile = false; + if (includeDescription) { + System.out.println("Write to file? [Enter 'y' for yes]"); + writeToFile = matches("y", scanner); + } if (!includeDescription) { outputSimpleList(); @@ -39,13 +44,6 @@ public class PermissionsListWriter implements ToolTask { } } - @Override - public Iterable getOptions() { - return Arrays.asList( - new TaskOption("include.description", "Include description? [y/n]", "y", "y", "n"), - new TaskOption("write.to.file", "Write to file? [y/n]", "n", "y", "n")); - } - private static void generateAndWriteFile() { final String permissionsTagValue = generatePermissionsList(); @@ -83,4 +81,9 @@ public class PermissionsListWriter implements ToolTask { System.out.println("Total: " + nodes.size()); } + private static boolean matches(String answer, Scanner sc) { + String userInput = sc.nextLine(); + return answer.equalsIgnoreCase(userInput); + } + } diff --git a/src/tools/utils/ScannerHelper.java b/src/tools/utils/ScannerHelper.java deleted file mode 100644 index b7741164d..000000000 --- a/src/tools/utils/ScannerHelper.java +++ /dev/null @@ -1,33 +0,0 @@ -package utils; - -import fr.xephi.authme.util.StringUtils; - -import java.util.Scanner; - -/** - * Helper class for retrieving an answer from a Scanner. - */ -public class ScannerHelper { - - // def may be null to force the selection of one of the options - // options may be null to just select whatever comes in - public static String getAnswer(String def, Scanner scanner, String... options) { - while (true) { - String input = scanner.nextLine(); - if (StringUtils.isEmpty(input) && def != null) { - return def; - } - - if (options == null) { - return input; - } else { - for (String option : options) { - if (input.equals(option)) { - return option; - } - } - } - System.out.println("Invalid answer, please try again"); - } - } -} diff --git a/src/tools/utils/TaskOption.java b/src/tools/utils/TaskOption.java deleted file mode 100644 index f4d32efa9..000000000 --- a/src/tools/utils/TaskOption.java +++ /dev/null @@ -1,43 +0,0 @@ -package utils; - -/** - * Option required by a tool task. - */ -public class TaskOption { - - private final String name; - private final String description; - private final String defaultOption; - private final String[] options; - - /** - * Constructor. - * - * @param name Name of the option (to refer to the option) - * @param description Description shown to the user when asked to set the option - * @param defaultOption The default option. Can be null to force a value from options. - * @param options Collection of possible options. Can be null to allow any input. - */ - public TaskOption(String name, String description, String defaultOption, String... options) { - this.name = name; - this.description = description; - this.defaultOption = defaultOption; - this.options = options; - } - - public String getName() { - return name; - } - - public String getDescription() { - return description; - } - - public String getDefaultOption() { - return defaultOption; - } - - public String[] getOptions() { - return options; - } -} diff --git a/src/tools/utils/ToolTask.java b/src/tools/utils/ToolTask.java index d74fcc3f2..56a2a7886 100644 --- a/src/tools/utils/ToolTask.java +++ b/src/tools/utils/ToolTask.java @@ -1,6 +1,6 @@ package utils; -import java.util.Map; +import java.util.Scanner; /** * Common interface for tool tasks. Note that the implementing tasks are instantiated @@ -8,10 +8,18 @@ import java.util.Map; */ public interface ToolTask { - void execute(Map options); - + /** + * Return the name of the task. + * + * @return Name of the task + */ String getTaskName(); - Iterable getOptions(); + /** + * Execute the task. + * + * @param scanner Scanner to prompt the user with for options. Do not close it. + */ + void execute(Scanner scanner); } From 169e38be59ca3b5a2339627616f52c240bd0c1af Mon Sep 17 00:00:00 2001 From: ljacqu Date: Sat, 12 Dec 2015 11:58:16 +0100 Subject: [PATCH 33/33] Fix HelpPrinter printing the enum name instead of the permission node --- src/main/java/fr/xephi/authme/command/help/HelpPrinter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java b/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java index 56ad48d89..a4426cb4e 100644 --- a/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java +++ b/src/main/java/fr/xephi/authme/command/help/HelpPrinter.java @@ -102,7 +102,7 @@ public class HelpPrinter { if (sender instanceof Player) nodePermission = AuthMe.getInstance().getPermissionsManager().hasPermission((Player) sender, node); final String nodePermsString = ChatColor.GRAY + (nodePermission ? ChatColor.ITALIC + " (Permission!)" : ChatColor.ITALIC + " (No Permission!)"); - sender.sendMessage(" " + ChatColor.YELLOW + ChatColor.ITALIC + node + nodePermsString); + sender.sendMessage(" " + ChatColor.YELLOW + ChatColor.ITALIC + node.getNode() + nodePermsString); } // Print the default permission