From 9fac112e3550df7d6df94ddb79db7a29ff97b3ce Mon Sep 17 00:00:00 2001 From: Exynox Date: Sat, 1 Jun 2024 15:06:24 +0300 Subject: [PATCH] Added required changes for the Argon2ID system --- bin/pack/locale_cz/locale/cz/locale_game.txt | 9 ++---- bin/pack/locale_de/locale/de/locale_game.txt | 9 ++---- bin/pack/locale_dk/locale/dk/locale_game.txt | 9 ++---- bin/pack/locale_en/locale/en/locale_game.txt | 9 ++---- bin/pack/locale_es/locale/es/locale_game.txt | 9 ++---- bin/pack/locale_fr/locale/fr/locale_game.txt | 9 ++---- bin/pack/locale_gr/locale/gr/locale_game.txt | 9 ++---- bin/pack/locale_hu/locale/hu/locale_game.txt | 9 ++---- bin/pack/locale_it/locale/it/locale_game.txt | 9 ++---- bin/pack/locale_nl/locale/nl/locale_game.txt | 9 ++---- bin/pack/locale_pl/locale/pl/locale_game.txt | 9 ++---- bin/pack/locale_pt/locale/pt/locale_game.txt | 9 ++---- bin/pack/locale_ro/locale/ro/locale_game.txt | 9 ++---- bin/pack/locale_ru/locale/ru/locale_game.txt | 9 ++---- bin/pack/locale_tr/locale/tr/locale_game.txt | 9 ++---- bin/pack/root/intrologin.py | 33 +++----------------- bin/pack/root/introselect.py | 1 - bin/pack/root/localeinfo.py | 4 +-- 18 files changed, 35 insertions(+), 138 deletions(-) diff --git a/bin/pack/locale_cz/locale/cz/locale_game.txt b/bin/pack/locale_cz/locale/cz/locale_game.txt index 53ae795b..725bec53 100644 --- a/bin/pack/locale_cz/locale/cz/locale_game.txt +++ b/bin/pack/locale_cz/locale/cz/locale_game.txt @@ -265,22 +265,17 @@ LEFT_TIME Zb LOGIN_CONNECT_FAILURE Chyba pøi spojení se serverem. LOGIN_CONNECT_SUCCESS Byl jsi pøipojen na server. LOGIN_CONNETING Budeš pøipojen na server... -LOGIN_FAILURE_ALREAY Tvé konto je už pøipojeno. -LOGIN_FAILURE_BE_SAME_KEY Problém s pøihlášením +LOGIN_FAILURE_ALREADY Tvé konto je už pøipojeno. LOGIN_FAILURE_BLOCK_ID Konto je zablokováno. LOGIN_FAILURE_BLOCK_LOGIN Prosím, zvolte si nìkterý z jiných serverù! -LOGIN_FAILURE_NOBILL Konto nemá k dispozici žádnou hrací dobu. LOGIN_FAILURE_NOT_AVAIL Konto není k dispozici. -LOGIN_FAILURE_NOT_EXIST_ID Konto neexistuje nebo je chybné heslo. LOGIN_FAILURE_REPAIR_ID Právì se znovu zøizují pøedmìty pro toto konto. LOGIN_FAILURE_SAMELOGIN Nìkdo se pøipojil na tvùj úèet. LOGIN_FAILURE_SHUTDOWN Server zatím není pøístupný. LOGIN_FAILURE_TOO_MANY_USER Nemohl jsi navázat spojení, protože právì hraje pøíliš mnoho hráèù. LOGIN_FAILURE_UNKNOWN Z neznámých dùvodù jsi se nemohl pøihlásit. LOGIN_FAILURE_WEB_BLOCK Byl jsi na webové stránce zablokován. Prosím zkontroluj si e-maily. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER Zadal jsi špatné èíslo. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE Zadal jsi tøikrát špatné èíslo. Tvoje pøipojení bude pøerušeno. -LOGIN_FAILURE_WRONG_PASSWORD Chybné jméno nebo heslo. +LOGIN_FAILURE_WRONG_CREDENTIALS Chybné jméno nebo heslo. LOGIN_INPUT_ID Zadej ID. LOGIN_INPUT_PASSWORD Zadej heslo. LOGIN_PROCESSING Pøihlášení probíhá... diff --git a/bin/pack/locale_de/locale/de/locale_game.txt b/bin/pack/locale_de/locale/de/locale_game.txt index 21e9b863..ba43d01f 100644 --- a/bin/pack/locale_de/locale/de/locale_game.txt +++ b/bin/pack/locale_de/locale/de/locale_game.txt @@ -236,21 +236,16 @@ LEFT_TIME Verbl. Zeit LOGIN_CONNECT_FAILURE Fehler beim Verbinden mit dem Server. LOGIN_CONNECT_SUCCESS Verbindung zum Server hergestellt. LOGIN_CONNETING Du wirst mit dem Server verbunden... -LOGIN_FAILURE_ALREAY Dein Konto ist bereits verbunden. -LOGIN_FAILURE_BE_SAME_KEY Anmeldeproblem +LOGIN_FAILURE_ALREADY Dein Konto ist bereits verbunden. LOGIN_FAILURE_BLOCK_ID Das Konto ist gesperrt. LOGIN_FAILURE_BLOCK_LOGIN Bitte wähle einen anderen Server! -LOGIN_FAILURE_NOBILL Das Konto verfügt über keine Spielzeit. LOGIN_FAILURE_NOT_AVAIL Das Konto ist nicht verfügbar. -LOGIN_FAILURE_NOT_EXIST_ID Accountname oder Passwort falsch. LOGIN_FAILURE_REPAIR_ID Für das Konto werden gerade Gegenstände wiederhergestellt. LOGIN_FAILURE_SHUTDOWN Der Server ist noch nicht offen. LOGIN_FAILURE_TOO_MANY_USER Du konntest keine Verbindung herstellen, da es zu viele Spieler gibt. LOGIN_FAILURE_UNKNOWN Du konntest dich aus unbekannten Gründen nicht anmelden. LOGIN_FAILURE_WEB_BLOCK Du wurdest auf der Webseite geblockt. Bitte überprüfe deine E-Mails. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER Du hast eine falsche Nr. eingegeben. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE Du hast dreimal eine falsche Nr. eingegeben. Deine Verbindung wird beendet. -LOGIN_FAILURE_WRONG_PASSWORD Accountname oder Passwort falsch. +LOGIN_FAILURE_WRONG_CREDENTIALS Accountname oder Passwort falsch. LOGIN_INPUT_ID Gib die ID ein. LOGIN_INPUT_PASSWORD Gib das Kennwort ein. LOGIN_PROCESSING Anmeldevorgang läuft... diff --git a/bin/pack/locale_dk/locale/dk/locale_game.txt b/bin/pack/locale_dk/locale/dk/locale_game.txt index 396b4e49..f57ec5bc 100644 --- a/bin/pack/locale_dk/locale/dk/locale_game.txt +++ b/bin/pack/locale_dk/locale/dk/locale_game.txt @@ -265,22 +265,17 @@ LEFT_TIME Resterende tid LOGIN_CONNECT_FAILURE En fejl opstod ved forbindelsen til serveren. LOGIN_CONNECT_SUCCESS Du er forbundet til serveren. LOGIN_CONNETING Forbinder til Serveren... -LOGIN_FAILURE_ALREAY Din account er allerede forbundet. -LOGIN_FAILURE_BE_SAME_KEY Registrerings problem. +LOGIN_FAILURE_ALREADY Din account er allerede forbundet. LOGIN_FAILURE_BLOCK_ID Din account er spærret. LOGIN_FAILURE_BLOCK_LOGIN Vælg venligst en anden servere. -LOGIN_FAILURE_NOBILL Denne konto har ingen spilletid tilovers. LOGIN_FAILURE_NOT_AVAIL Denne konto er ikke tilgængeligt. -LOGIN_FAILURE_NOT_EXIST_ID Forkert brugernavn eller password. LOGIN_FAILURE_REPAIR_ID For denne konto bliver der gendannet nogle genstande. LOGIN_FAILURE_SAMELOGIN En person har forbundet sig til din konto. LOGIN_FAILURE_SHUTDOWN Denne server er ikke åben. LOGIN_FAILURE_TOO_MANY_USER Du kan ikke få forbindelse med serveren, da der er for mange spillere online. LOGIN_FAILURE_UNKNOWN Du kunne ikke logge på. Årsagen er ukendt. LOGIN_FAILURE_WEB_BLOCK Du blev blokeret på websiden. Tjek venligst din e-mail. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER Du har indtastet et forkert nr. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE Du har 3 gange i træk indtastet et forkert nr. - din forbindelse blev afbrudt. -LOGIN_FAILURE_WRONG_PASSWORD Forkert brugernavn eller password. +LOGIN_FAILURE_WRONG_CREDENTIALS Forkert brugernavn eller password. LOGIN_INPUT_ID Angiv ID. LOGIN_INPUT_PASSWORD Angiv kodeordet. LOGIN_PROCESSING Registreringen med serveren er i gang... diff --git a/bin/pack/locale_en/locale/en/locale_game.txt b/bin/pack/locale_en/locale/en/locale_game.txt index 404ee5a5..0056ff1e 100644 --- a/bin/pack/locale_en/locale/en/locale_game.txt +++ b/bin/pack/locale_en/locale/en/locale_game.txt @@ -236,21 +236,16 @@ LEFT_TIME Time Remaining LOGIN_CONNECT_FAILURE Error while connecting to the server. LOGIN_CONNECT_SUCCESS You have been connected to the server. LOGIN_CONNETING You will be connected to the server... -LOGIN_FAILURE_ALREAY Your account is already connected. -LOGIN_FAILURE_BE_SAME_KEY Registration problem. +LOGIN_FAILURE_ALREADY Your account is already connected. LOGIN_FAILURE_BLOCK_ID Your account is banned. LOGIN_FAILURE_BLOCK_LOGIN Please choose one of the other servers! -LOGIN_FAILURE_NOBILL Your account had no play time. LOGIN_FAILURE_NOT_AVAIL Your account cannot be used. -LOGIN_FAILURE_NOT_EXIST_ID Account name or password incorrect. LOGIN_FAILURE_REPAIR_ID Items have been restored for this account. LOGIN_FAILURE_SHUTDOWN The server is not open yet. LOGIN_FAILURE_TOO_MANY_USER You could not connect because too many players are online. LOGIN_FAILURE_UNKNOWN You could not register for unknown reasons. LOGIN_FAILURE_WEB_BLOCK You have been blocked at the website. Please check your EMails. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER You entered a wrong number. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE You entered a wrong number three times. /n Your connection will be disabled. -LOGIN_FAILURE_WRONG_PASSWORD Account name or password incorrect. +LOGIN_FAILURE_WRONG_CREDENTIALS Account name or password incorrect. LOGIN_INPUT_ID Enter the ID. LOGIN_INPUT_PASSWORD Enter the password. LOGIN_PROCESSING Logging in... diff --git a/bin/pack/locale_es/locale/es/locale_game.txt b/bin/pack/locale_es/locale/es/locale_game.txt index 4439b9b9..ba4a75ea 100644 --- a/bin/pack/locale_es/locale/es/locale_game.txt +++ b/bin/pack/locale_es/locale/es/locale_game.txt @@ -265,22 +265,17 @@ LEFT_TIME Tiempo restante LOGIN_CONNECT_FAILURE Error al conectar al servidor. LOGIN_CONNECT_SUCCESS Has sido conectado al servidor. LOGIN_CONNETING Estás siendo conectado al servidor... -LOGIN_FAILURE_ALREAY Tu cuenta ya está conectada. -LOGIN_FAILURE_BE_SAME_KEY Problema de registro. +LOGIN_FAILURE_ALREADY Tu cuenta ya está conectada. LOGIN_FAILURE_BLOCK_ID Tu cuenta está baneada. LOGIN_FAILURE_BLOCK_LOGIN ¡Por favor, elige uno de los otros servidores! -LOGIN_FAILURE_NOBILL Tu cuenta no tiene horas de juego. LOGIN_FAILURE_NOT_AVAIL Tu cuenta no puede ser usada. -LOGIN_FAILURE_NOT_EXIST_ID Nombre de cuenta o contraseña incorrectos. LOGIN_FAILURE_REPAIR_ID Han sido restablecidos objetos para esta cuenta. LOGIN_FAILURE_SAMELOGIN Alguien se ha conectado con tu cuenta. LOGIN_FAILURE_SHUTDOWN Este servidor aún no está abierto. LOGIN_FAILURE_TOO_MANY_USER No puedes conectar porque hay demasiados jugadores conectados. LOGIN_FAILURE_UNKNOWN No te puedes registrar por razones desconocidas. LOGIN_FAILURE_WEB_BLOCK Has sido bloqueado del sitio web. Por favor comprueba tus EMails. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER Has introducido un número incorrecto. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE Has introducido un número incorrecto tres veces. /n Tu conexión será deshabilitada. -LOGIN_FAILURE_WRONG_PASSWORD Nombre de cuenta o contraseña incorrectos +LOGIN_FAILURE_WRONG_CREDENTIALS Nombre de cuenta o contraseña incorrectos LOGIN_INPUT_ID Introduce el ID. LOGIN_INPUT_PASSWORD Introduce la contraseña. LOGIN_PROCESSING Registro en curso... diff --git a/bin/pack/locale_fr/locale/fr/locale_game.txt b/bin/pack/locale_fr/locale/fr/locale_game.txt index 5ef12abd..8a01ce43 100644 --- a/bin/pack/locale_fr/locale/fr/locale_game.txt +++ b/bin/pack/locale_fr/locale/fr/locale_game.txt @@ -236,21 +236,16 @@ LEFT_TIME Temps restant LOGIN_CONNECT_FAILURE Erreur lors de la connection au serveur LOGIN_CONNECT_SUCCESS Connexion au serveur en cours. LOGIN_CONNETING Connexion au serveur en cours. -LOGIN_FAILURE_ALREAY Votre compte est déjà connecté. -LOGIN_FAILURE_BE_SAME_KEY Problème +LOGIN_FAILURE_ALREADY Votre compte est déjà connecté. LOGIN_FAILURE_BLOCK_ID Votre compte est banni LOGIN_FAILURE_BLOCK_LOGIN Veuillez choisir un autre serveur ! -LOGIN_FAILURE_NOBILL Votre compte n'a pas de temps de jeu. LOGIN_FAILURE_NOT_AVAIL Votre compte ne peut pas être utilisé. -LOGIN_FAILURE_NOT_EXIST_ID Compte ou mot de passe incorrect LOGIN_FAILURE_REPAIR_ID Sur ce compte, les objets ont été restaurés LOGIN_FAILURE_SHUTDOWN Le serveur n'est pour le moment pas ouvert LOGIN_FAILURE_TOO_MANY_USER Vous ne pouvez pas vous connecter car trop de joueurs sont actuellement en ligne. LOGIN_FAILURE_UNKNOWN Vous ne pouvez pas vous enregistrer vous des raisons inconnues. LOGIN_FAILURE_WEB_BLOCK Vous avez été bloqué sur ce site. Veuillez consulter vos mails. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER Vous avez entré un mauvais numéro. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE Vous avez entré un mauvais numéro trois fois. La connexion va être perdue. -LOGIN_FAILURE_WRONG_PASSWORD Compte ou mot de passe incorrect +LOGIN_FAILURE_WRONG_CREDENTIALS Compte ou mot de passe incorrect LOGIN_INPUT_ID Entrez le nom du compte LOGIN_INPUT_PASSWORD Entrez le mot de passe LOGIN_PROCESSING Connexion au compte en cours diff --git a/bin/pack/locale_gr/locale/gr/locale_game.txt b/bin/pack/locale_gr/locale/gr/locale_game.txt index 5450bea7..3a97664f 100644 --- a/bin/pack/locale_gr/locale/gr/locale_game.txt +++ b/bin/pack/locale_gr/locale/gr/locale_game.txt @@ -265,22 +265,17 @@ LEFT_TIME LOGIN_CONNECT_FAILURE ÓöÜëìá êáôÜ ôç óýíäåóç. LOGIN_CONNECT_SUCCESS ÓõíäÝèçêåò ìå ôïí óÝñâåñ. LOGIN_CONNETING Óýíäåóç ìå óÝñâåñ... -LOGIN_FAILURE_ALREAY Ï ëïãáñéáóìüò åßíáé Þäç óõíäåäåìÝíïò. -LOGIN_FAILURE_BE_SAME_KEY Ðñüâëçìá åããñáöÞò. +LOGIN_FAILURE_ALREADY Ï ëïãáñéáóìüò åßíáé Þäç óõíäåäåìÝíïò. LOGIN_FAILURE_BLOCK_ID Ï ëïãáñéáóìüò óïõ åßíáé ôéìùñçìÝíïò. LOGIN_FAILURE_BLOCK_LOGIN Ðáñáêáëþ äéáëÝîôå Ýíáí Üëëï óÝñâåñ. -LOGIN_FAILURE_NOBILL Ï ëïãáñéáóìüò óïõ äåí åß÷å ÷ñüíï ðáé÷íéäéïý. LOGIN_FAILURE_NOT_AVAIL Ï ëïãáñéáóìüò óïõ äå ìðïñåß íá ÷ñçóéìïðïéçèåß. -LOGIN_FAILURE_NOT_EXIST_ID ËÜèïò ëïãáñéáóìüò Þ êùäéêüò. LOGIN_FAILURE_REPAIR_ID ÁðïêáôáóôÜèçêáí áíôéêåßìåíá ãéá áõôüí ôï ëïãáñéáóìü. LOGIN_FAILURE_SAMELOGIN ÊÜðïéïò óõíäÝèçêå ìå ôïí ëïãáñéáóìü óïõ. LOGIN_FAILURE_SHUTDOWN Ï server äåí Ý÷åé áíïßîåé áêüìç. LOGIN_FAILURE_TOO_MANY_USER Äå ìðïñåßò íá óõíäåèåßò ãéáôß åßíáé ðÜñá ðïëëïß ðáßêôåò óõíäåäåìÝíïé. LOGIN_FAILURE_UNKNOWN Äå ìðüñåóåò íá åããñáöåßò ãéá Üãíùóôç áéôßá. LOGIN_FAILURE_WEB_BLOCK ¸÷åôå áðïêåëéóôåß áðü ôçí Éóôïóåëßäá. Ðáñáêáëþ äåßôå ôá E-mail óáò -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER ÅéóÞãáãåò ëÜèïò áñéèìü. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE ÅéóÞãáãåò ëÜèïò áñéèìü ôñåéò öïñÝò. /n Ç óýíäåóÞ óïõ èá ôåèåß åêôüò ëåéôïõñãßáò. -LOGIN_FAILURE_WRONG_PASSWORD ËÜèïò ëïãáñéáóìüò Þ êùäéêüò. +LOGIN_FAILURE_WRONG_CREDENTIALS ËÜèïò ëïãáñéáóìüò Þ êùäéêüò. LOGIN_INPUT_ID ÅéóÞãáãå ôçí ID. LOGIN_INPUT_PASSWORD ÅéóÞãáãå ôï óõíèçìáôéêü. LOGIN_PROCESSING Ãßíåôáé åããñáöÞ... diff --git a/bin/pack/locale_hu/locale/hu/locale_game.txt b/bin/pack/locale_hu/locale/hu/locale_game.txt index bbeb7de2..0e5229ae 100644 --- a/bin/pack/locale_hu/locale/hu/locale_game.txt +++ b/bin/pack/locale_hu/locale/hu/locale_game.txt @@ -236,21 +236,16 @@ LEFT_TIME Marad LOGIN_CONNECT_FAILURE Hiba a szerver kapcsolatban. LOGIN_CONNECT_SUCCESS A szerver kapcsolat létrejött. LOGIN_CONNETING Kapcsolódás a szerverhez... -LOGIN_FAILURE_ALREAY A számlád már csatlakoztatva van. -LOGIN_FAILURE_BE_SAME_KEY Bejelentkezési probléma +LOGIN_FAILURE_ALREADY A számlád már csatlakoztatva van. LOGIN_FAILURE_BLOCK_ID Az elõfizetõi számla le van tiltva. LOGIN_FAILURE_BLOCK_LOGIN Kérlek válassz egyet a többi szerver közül! -LOGIN_FAILURE_NOBILL Elõfizetõi számládnak nincs már játékideje LOGIN_FAILURE_NOT_AVAIL Az elõfizetõi számla nem elérhetõ. -LOGIN_FAILURE_NOT_EXIST_ID Hibás Felhasználónév vagy Jelszó. LOGIN_FAILURE_REPAIR_ID Az elõfizetõi számlára éppen tárgyak helyreállítása van folyamatban. LOGIN_FAILURE_SHUTDOWN A szerver még nem nyílt meg. LOGIN_FAILURE_TOO_MANY_USER Nem csatlakozhatsz, mert túl sokan játszanak. LOGIN_FAILURE_UNKNOWN Ismeretlen okból nem tudsz bejelentkezni. LOGIN_FAILURE_WEB_BLOCK Le lettél tiltva a web oldalon. Ellenõrizd leveleidet. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER Rossz számot adtál meg. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE Háromszor adtál meg helytelen számot. A kapcsolat lezáródik. -LOGIN_FAILURE_WRONG_PASSWORD Hibás Felhasználónév vagy Jelszó. +LOGIN_FAILURE_WRONG_CREDENTIALS Hibás Felhasználónév vagy Jelszó. LOGIN_INPUT_ID Add meg az ID-t. LOGIN_INPUT_PASSWORD Add meg a jelszót. LOGIN_PROCESSING Bejelentkezés folyamatban... diff --git a/bin/pack/locale_it/locale/it/locale_game.txt b/bin/pack/locale_it/locale/it/locale_game.txt index 5dc881bf..47f0a40f 100644 --- a/bin/pack/locale_it/locale/it/locale_game.txt +++ b/bin/pack/locale_it/locale/it/locale_game.txt @@ -265,22 +265,17 @@ LEFT_TIME Tempo rimanente LOGIN_CONNECT_FAILURE Errore di collegamento con il server. LOGIN_CONNECT_SUCCESS Sei stato collegato al server. LOGIN_CONNETING Stai per essere collegato al server. -LOGIN_FAILURE_ALREAY Il tuo account è già collegato. -LOGIN_FAILURE_BE_SAME_KEY Problema d'iscrizione +LOGIN_FAILURE_ALREADY Il tuo account è già collegato. LOGIN_FAILURE_BLOCK_ID Il tuo account è bloccato. LOGIN_FAILURE_BLOCK_LOGIN Sei pregato di scegliere un altro server! -LOGIN_FAILURE_NOBILL Il tuo account non ha tempo di gioco. LOGIN_FAILURE_NOT_AVAIL L'account non è disponibile. -LOGIN_FAILURE_NOT_EXIST_ID Nome account o password errati. LOGIN_FAILURE_REPAIR_ID Vengono rigenerati oggetti per l'account. LOGIN_FAILURE_SAMELOGIN Qualcuno si è collegato al tuo account. LOGIN_FAILURE_SHUTDOWN Il server non è ancora aperto. LOGIN_FAILURE_TOO_MANY_USER Non sei riuscito a connetterti perchè ci sono troppi giocatori LOGIN_FAILURE_UNKNOWN Non sei riuscito a connetterti per ragioni sconosciute. LOGIN_FAILURE_WEB_BLOCK È stato bloccato sulla pagina web. Per favore controlli la sua e-mail -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER Hai inserito un numero sbagliato. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE Hai inserito per tre volte un numero sbagliato. La connessione è stata conclusa. -LOGIN_FAILURE_WRONG_PASSWORD Nome account o password errati. +LOGIN_FAILURE_WRONG_CREDENTIALS Nome account o password errati. LOGIN_INPUT_ID Inserisci l'ID. LOGIN_INPUT_PASSWORD Inserisci la password. LOGIN_PROCESSING È in corso il login. diff --git a/bin/pack/locale_nl/locale/nl/locale_game.txt b/bin/pack/locale_nl/locale/nl/locale_game.txt index c4b80321..d52322a8 100644 --- a/bin/pack/locale_nl/locale/nl/locale_game.txt +++ b/bin/pack/locale_nl/locale/nl/locale_game.txt @@ -265,22 +265,17 @@ LEFT_TIME Overgebleven Tijd LOGIN_CONNECT_FAILURE Fout bij de server verbinding. LOGIN_CONNECT_SUCCESS Je bent verbonden met de server LOGIN_CONNETING Je wordt verbonden met de server... -LOGIN_FAILURE_ALREAY Je account is al verbonden. -LOGIN_FAILURE_BE_SAME_KEY Registratie probleem. +LOGIN_FAILURE_ALREADY Je account is al verbonden. LOGIN_FAILURE_BLOCK_ID Je account is geband. LOGIN_FAILURE_BLOCK_LOGIN kies een van de andere servers! -LOGIN_FAILURE_NOBILL Je account heeft geen speeltijd. LOGIN_FAILURE_NOT_AVAIL Je account kan niet worden gebruikt. -LOGIN_FAILURE_NOT_EXIST_ID Account naam of wachtwoord is incorrect LOGIN_FAILURE_REPAIR_ID Voorwerpen zijn hersteld voor dit account. LOGIN_FAILURE_SAMELOGIN Iemand heeft zich met jouw account verbonden. LOGIN_FAILURE_SHUTDOWN De server is nog niet open. LOGIN_FAILURE_TOO_MANY_USER Je kan niet verbonden worden want er zijn teveel spelers online. LOGIN_FAILURE_UNKNOWN Je kon niet registreren voor onbekende redenen. LOGIN_FAILURE_WEB_BLOCK Je bent geblokkerd bij de website. Controleer je e-mails alstublieft. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER Je hebt een verkeerd nummer ingevoerd. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE Je hebt drie keer een verkeerd nummer ingevoerd. /n Je verbinding wordt verbroken. -LOGIN_FAILURE_WRONG_PASSWORD Account naam of wachtwoord is incorrect. +LOGIN_FAILURE_WRONG_CREDENTIALS Account naam of wachtwoord is incorrect. LOGIN_INPUT_ID Voer ID in. LOGIN_INPUT_PASSWORD Voer wachtwoord in. LOGIN_PROCESSING Login proces is gestart. diff --git a/bin/pack/locale_pl/locale/pl/locale_game.txt b/bin/pack/locale_pl/locale/pl/locale_game.txt index 8eb1efb4..54effb44 100644 --- a/bin/pack/locale_pl/locale/pl/locale_game.txt +++ b/bin/pack/locale_pl/locale/pl/locale_game.txt @@ -265,22 +265,17 @@ LEFT_TIME Pozosta LOGIN_CONNECT_FAILURE B³¹d podczas ³¹czenia siê z serwerem. LOGIN_CONNECT_SUCCESS Zosta³eœ po³¹czony z serwerem. LOGIN_CONNETING Zostaniesz po³¹czony z serwerem... -LOGIN_FAILURE_ALREAY Twoje konto jest ju¿ po³¹czone. -LOGIN_FAILURE_BE_SAME_KEY Problem z rejestracj¹. +LOGIN_FAILURE_ALREADY Twoje konto jest ju¿ po³¹czone. LOGIN_FAILURE_BLOCK_ID Twoje konto jest zablokowane. LOGIN_FAILURE_BLOCK_LOGIN Serwer Zamkniêty - proszê wybraæ inny! -LOGIN_FAILURE_NOBILL Twoje konto nie ma czasu gry. LOGIN_FAILURE_NOT_AVAIL Twoje konto nie mo¿e byæ u¿yte. -LOGIN_FAILURE_NOT_EXIST_ID Nieprawid³owa nazwa konta lub has³o. LOGIN_FAILURE_REPAIR_ID Przedmioty zosta³y przywrócone dla tego konta. LOGIN_FAILURE_SAMELOGIN Ktoœ po³¹czy³ siê z Twoim kontem. LOGIN_FAILURE_SHUTDOWN Serwer nie jest jeszcze otwarty. LOGIN_FAILURE_TOO_MANY_USER Nie mo¿esz siê po³¹czyæ, poniewa¿ za du¿o graczy jest online. LOGIN_FAILURE_UNKNOWN Nie mo¿esz siê zarejestrowaæ z nieznanych powodów. LOGIN_FAILURE_WEB_BLOCK Twoje konto zosta³o zablokowane na stronie www. Proszê sprawdziæ swoj¹ pocztê e-mail. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER Wpisa³eœ nieprawid³owy numer. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE Wybra³eœ z³y numer trzy razy. /n Twoje po³¹czenie zostanie zerwane. -LOGIN_FAILURE_WRONG_PASSWORD Nieprawid³owa nazwa konta lub has³o. +LOGIN_FAILURE_WRONG_CREDENTIALS Nieprawid³owa nazwa konta lub has³o. LOGIN_INPUT_ID Podaj swoje ID. LOGIN_INPUT_PASSWORD Wpisz swoje has³o. LOGIN_PROCESSING Logowanie... diff --git a/bin/pack/locale_pt/locale/pt/locale_game.txt b/bin/pack/locale_pt/locale/pt/locale_game.txt index 12befeda..f763c9a4 100644 --- a/bin/pack/locale_pt/locale/pt/locale_game.txt +++ b/bin/pack/locale_pt/locale/pt/locale_game.txt @@ -265,22 +265,17 @@ LEFT_TIME Tempo Restante LOGIN_CONNECT_FAILURE Ocorreu um erro enquanto te ligavas ao Servidor. LOGIN_CONNECT_SUCCESS Estás ligado ao Servidor. LOGIN_CONNETING Vais ser ligado ao Servidor... -LOGIN_FAILURE_ALREAY A tua conta já está ligada. -LOGIN_FAILURE_BE_SAME_KEY Problema de registo. +LOGIN_FAILURE_ALREADY A tua conta já está ligada. LOGIN_FAILURE_BLOCK_ID A tua conta está bloqueada. LOGIN_FAILURE_BLOCK_LOGIN Por favor escolhe um dos outros Servidores! -LOGIN_FAILURE_NOBILL A tua conta não tinha tempo de jogo. LOGIN_FAILURE_NOT_AVAIL A tua conta não pode ser usada. -LOGIN_FAILURE_NOT_EXIST_ID O nome da conta ou a palavra-passe está/ão incorrecta(s). LOGIN_FAILURE_REPAIR_ID Foram restaurados Itens a esta conta. LOGIN_FAILURE_SAMELOGIN Alguém se ligou à tua conta. LOGIN_FAILURE_SHUTDOWN O Servidor ainda não está aberto. LOGIN_FAILURE_TOO_MANY_USER Não te podes ligar ao Servidor porque estão muitos jogadores ligados. LOGIN_FAILURE_UNKNOWN Não te foi possível registar por razões desconhecidas. LOGIN_FAILURE_WEB_BLOCK Foste bloqueado no site, por favor verifica os teus E-mails. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER Inseriste um número errado. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE Inseriste um número errado três vezes. /n A tua ligação vai ser anulada. -LOGIN_FAILURE_WRONG_PASSWORD O nome da conta ou a palavra-passe está/ão incorrecta(s). +LOGIN_FAILURE_WRONG_CREDENTIALS O nome da conta ou a palavra-passe está/ão incorrecta(s). LOGIN_INPUT_ID Insere o ID. LOGIN_INPUT_PASSWORD Insere a palavra-passe. LOGIN_PROCESSING Processo de Login em progresso... diff --git a/bin/pack/locale_ro/locale/ro/locale_game.txt b/bin/pack/locale_ro/locale/ro/locale_game.txt index bb4af11b..981a787c 100644 --- a/bin/pack/locale_ro/locale/ro/locale_game.txt +++ b/bin/pack/locale_ro/locale/ro/locale_game.txt @@ -265,22 +265,17 @@ LEFT_TIME Timp r LOGIN_CONNECT_FAILURE Eroare la conectarea la server. LOGIN_CONNECT_SUCCESS Ai fost conectat la server. LOGIN_CONNETING Vei fi conectat la server... -LOGIN_FAILURE_ALREAY Contul tãu este deja conectat. -LOGIN_FAILURE_BE_SAME_KEY Problemã la login +LOGIN_FAILURE_ALREADY Contul tãu este deja conectat. LOGIN_FAILURE_BLOCK_ID Contul este blocat. LOGIN_FAILURE_BLOCK_LOGIN Alege alt server! -LOGIN_FAILURE_NOBILL Contul nu deþine timp de joc. LOGIN_FAILURE_NOT_AVAIL Contul este inaccesibil. -LOGIN_FAILURE_NOT_EXIST_ID Nume contului sau parola sunt greºite. LOGIN_FAILURE_REPAIR_ID Pentru acest cont sunt refãcute obiectele. LOGIN_FAILURE_SAMELOGIN Cineva s-a conectat la contul tau. LOGIN_FAILURE_SHUTDOWN Serverul nu este încã deschis. LOGIN_FAILURE_TOO_MANY_USER Conectarea nu s-a realizat pentru ca existã prea mulþi jucãtori. LOGIN_FAILURE_UNKNOWN Login a eºuat din motive necunoscute. LOGIN_FAILURE_WEB_BLOCK Ai fost blocat pe website. Verificã-þi mailurile. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER Ai introdus un numãr greºit. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE Ai introdus de 3 ori un numãr greºit. Conectarea va fi închisã. -LOGIN_FAILURE_WRONG_PASSWORD Nume sau parola greºitã. +LOGIN_FAILURE_WRONG_CREDENTIALS Nume sau parola greºitã. LOGIN_INPUT_ID Introdu ID-ul. LOGIN_INPUT_PASSWORD Introdu parola. LOGIN_PROCESSING Conectarea ruleazã ... diff --git a/bin/pack/locale_ru/locale/ru/locale_game.txt b/bin/pack/locale_ru/locale/ru/locale_game.txt index fbeeda42..75c3d7a0 100644 --- a/bin/pack/locale_ru/locale/ru/locale_game.txt +++ b/bin/pack/locale_ru/locale/ru/locale_game.txt @@ -265,22 +265,17 @@ LEFT_TIME LOGIN_CONNECT_FAILURE Îøèáêà ïðè ñîåäèíåíèè ñ ñåðâåðîì. LOGIN_CONNECT_SUCCESS Âû ñîåäèíåíû ñ ñåðâåðîì. LOGIN_CONNETING Ïðîèñõîäèò ñîåäèíåíèå ñ ñåðâåðîì... -LOGIN_FAILURE_ALREAY Âàøà ó÷¸òíàÿ çàïèñü óæå ñîåäèíåíà. -LOGIN_FAILURE_BE_SAME_KEY Ïðîáëåìà ñ ðåãèñòðàöèåé +LOGIN_FAILURE_ALREADY Âàøà ó÷¸òíàÿ çàïèñü óæå ñîåäèíåíà. LOGIN_FAILURE_BLOCK_ID Ó÷åòíàÿ çàïèñü çàáëîêèðîâàíà. LOGIN_FAILURE_BLOCK_LOGIN Âûáåðèòå äðóãîé ñåðâåð! -LOGIN_FAILURE_NOBILL  âàøåé ó÷¸òíîé çàïèñè íåò èãðîâîãî âðåìåíè. LOGIN_FAILURE_NOT_AVAIL Ó÷¸òíàÿ çàïèñü íåäîñòóïíà. -LOGIN_FAILURE_NOT_EXIST_ID Íåâåðíîå èìÿ èëè ïàðîëü. LOGIN_FAILURE_REPAIR_ID Ïðåäìåòû äëÿ äàííîãî ó÷¸òíîé çàïèñè ñåé÷àñ âîññòàíàâëèâàþòñÿ. LOGIN_FAILURE_SAMELOGIN Êòî-òî çàøåë íà âàø àêêàóíò. LOGIN_FAILURE_SHUTDOWN Ñåðâåð ïîêà åù¸ çàêðûò. LOGIN_FAILURE_TOO_MANY_USER  ñîåäèíåíèè îòêàçàíî. Ñåðâåð ïåðåïîëíåí. LOGIN_FAILURE_UNKNOWN Ðåãèñòðàöèÿ íå ñîñòîÿëàñü ïî íåèçâåñòíûì ïðè÷èíàì. LOGIN_FAILURE_WEB_BLOCK Âàñ çàáëîêèðîâàëè íà ñàéòå. Ïîæàëóéñòà ïðîâåðüòå ñâîé Email. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER Ââåä¸í íåâåðíûé íîìåð. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE Íåâåðíûé íîìåð ââåä¸í òðèæäû. Ñâÿçü áóäåò ïðåðâàíà. -LOGIN_FAILURE_WRONG_PASSWORD Íåïðàâèëüíîå èìÿ èëè ïàðîëü. +LOGIN_FAILURE_WRONG_CREDENTIALS Íåïðàâèëüíîå èìÿ èëè ïàðîëü. LOGIN_INPUT_ID Ââåäèòå íîìåð èäåíòèôèêàöèè. LOGIN_INPUT_PASSWORD Ââåäèòå ïàðîëü. LOGIN_PROCESSING Ïðîèñõîäèò ðåãèñòðàöèÿ... diff --git a/bin/pack/locale_tr/locale/tr/locale_game.txt b/bin/pack/locale_tr/locale/tr/locale_game.txt index ba4c83da..f3f1c987 100644 --- a/bin/pack/locale_tr/locale/tr/locale_game.txt +++ b/bin/pack/locale_tr/locale/tr/locale_game.txt @@ -265,22 +265,17 @@ LEFT_TIME Kalan S LOGIN_CONNECT_FAILURE Sunucuya baðlanýrken hata LOGIN_CONNECT_SUCCESS Sunucuya baðlandýn. LOGIN_CONNETING Sunucuya baðlanýyorsun... -LOGIN_FAILURE_ALREAY Hesap zaten baðlý. -LOGIN_FAILURE_BE_SAME_KEY Kayýt problemi +LOGIN_FAILURE_ALREADY Hesap zaten baðlý. LOGIN_FAILURE_BLOCK_ID Hesabýnýz engellendi! LOGIN_FAILURE_BLOCK_LOGIN Lütfen baþka server seç! -LOGIN_FAILURE_NOBILL Hesabýnýzýn oyun süresi yok. LOGIN_FAILURE_NOT_AVAIL Hesabýnýz kullanýlamaz. -LOGIN_FAILURE_NOT_EXIST_ID Hesap ismi veya þifre yanlýþ. LOGIN_FAILURE_REPAIR_ID Bu hesap için, nesneler yüklendi. LOGIN_FAILURE_SAMELOGIN Biri senin hesabýnla giriþ yaptý. LOGIN_FAILURE_SHUTDOWN Sunucu henüz açýlmadý. LOGIN_FAILURE_TOO_MANY_USER Çok fazla kullanýcý baðlý olduðu için baðlanamazsýnýz. LOGIN_FAILURE_UNKNOWN Bilinmeyen bir nedenle kaydolamadýnýz. LOGIN_FAILURE_WEB_BLOCK Web sitesine eriþiminiz engellendi. Lütfen E-Postanýzý kontrol ediniz. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER Yanlýþ numara girdiniz. -LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE 3 kere yanlýþ numara girdiniz. Baðlantýnýz kesildi. -LOGIN_FAILURE_WRONG_PASSWORD Hesap ismi veya þifre yanlýþ. +LOGIN_FAILURE_WRONG_CREDENTIALS Hesap ismi veya þifre yanlýþ. LOGIN_INPUT_ID ID nizi yazýn. LOGIN_INPUT_PASSWORD Þifreyi gir. LOGIN_PROCESSING Giriþ iþlemi yapýlýyor... diff --git a/bin/pack/root/intrologin.py b/bin/pack/root/intrologin.py index fe145486..52188207 100644 --- a/bin/pack/root/intrologin.py +++ b/bin/pack/root/intrologin.py @@ -203,27 +203,19 @@ class LoginWindow(ui.ScriptWindow): self.loginFailureMsgDict={ #"DEFAULT" : localeInfo.LOGIN_FAILURE_UNKNOWN, - "ALREADY" : localeInfo.LOGIN_FAILURE_ALREAY, - "NOID" : localeInfo.LOGIN_FAILURE_NOT_EXIST_ID, - "WRONGPWD" : localeInfo.LOGIN_FAILURE_WRONG_PASSWORD, + "ALREADY" : localeInfo.LOGIN_FAILURE_ALREADY, + "WRONGCRD" : localeInfo.LOGIN_FAILURE_WRONG_CREDENTIALS, "FULL" : localeInfo.LOGIN_FAILURE_TOO_MANY_USER, "SHUTDOWN" : localeInfo.LOGIN_FAILURE_SHUTDOWN, "REPAIR" : localeInfo.LOGIN_FAILURE_REPAIR_ID, "BLOCK" : localeInfo.LOGIN_FAILURE_BLOCK_ID, - "WRONGMAT" : localeInfo.LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER, - "QUIT" : localeInfo.LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE, - "BESAMEKEY" : localeInfo.LOGIN_FAILURE_BE_SAME_KEY, "NOTAVAIL" : localeInfo.LOGIN_FAILURE_NOT_AVAIL, - "NOBILL" : localeInfo.LOGIN_FAILURE_NOBILL, "BLKLOGIN" : localeInfo.LOGIN_FAILURE_BLOCK_LOGIN, "WEBBLK" : localeInfo.LOGIN_FAILURE_WEB_BLOCK, - "BADSCLID" : localeInfo.LOGIN_FAILURE_WRONG_SOCIALID, - "AGELIMIT" : localeInfo.LOGIN_FAILURE_SHUTDOWN_TIME, } self.loginFailureFuncDict = { - "WRONGPWD" : self.__DisconnectAndInputPassword, - "WRONGMAT" : self.__DisconnectAndInputMatrix, + "WRONGCRD" : self.__DisconnectAndInputPassword, "QUIT" : app.Exit, } @@ -238,9 +230,7 @@ class LoginWindow(ui.ScriptWindow): if app.loggined: self.loginFailureFuncDict = { - "WRONGPWD" : app.Exit, - "WRONGMAT" : app.Exit, - "QUIT" : app.Exit, + "WRONGCRD" : app.Exit, } if musicInfo.loginMusic != "": @@ -491,20 +481,6 @@ class LoginWindow(ui.ScriptWindow): self.SetPasswordEditLineFocus() net.Disconnect() - def __DisconnectAndInputMatrix(self): - if self.connectingDialog: - self.connectingDialog.Close() - self.connectingDialog = None - - self.stream.popupWindow.Close() - self.matrixInputChanceCount -= 1 - - if self.matrixInputChanceCount <= 0: - self.__OnCloseInputDialog() - - elif self.inputDialog: - self.inputDialog.Show() - def __LoadScript(self, fileName): import dbg try: @@ -985,7 +961,6 @@ class LoginWindow(ui.ScriptWindow): def OnExit(self): self.stream.popupWindow.Close() - self.stream.popupWindow.Open(localeInfo.LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE, app.Exit, localeInfo.UI_OK) def OnUpdate(self): ServerStateChecker.Update() diff --git a/bin/pack/root/introselect.py b/bin/pack/root/introselect.py index 1cef6dd8..2f24f69d 100644 --- a/bin/pack/root/introselect.py +++ b/bin/pack/root/introselect.py @@ -350,7 +350,6 @@ class SelectCharacterWindow(ui.Window): def SameLoginDisconnect(self): self.stream.popupWindow.Close() self.stream.popupWindow.Open(localeInfo.LOGIN_FAILURE_SAMELOGIN, self.ExitSelect, localeInfo.UI_OK) - #self.stream.popupWindow.Open(localeInfo.LOGIN_FAILURE_ALREAY, app.Exit, localeInfo.UI_OK) def MakeCharacter(self, index, id, name, race, form, hair): if 0 == id: diff --git a/bin/pack/root/localeinfo.py b/bin/pack/root/localeinfo.py index f6271ecd..aaafb02e 100644 --- a/bin/pack/root/localeinfo.py +++ b/bin/pack/root/localeinfo.py @@ -46,9 +46,7 @@ __IS_ARABIC = "locale/ae" == app.GetLocalePath() __IS_CIBN10 = "locale/cibn10" == app.GetLocalePath() __IS_WE_KOREA = "locale/we_korea" == app.GetLocalePath() __IS_TAIWAN = "locale/taiwan" == app.GetLocalePath() -__IS_JAPAN = "locale/japan" == app.GetLocalePath() -LOGIN_FAILURE_WRONG_SOCIALID = "ASDF" -LOGIN_FAILURE_SHUTDOWN_TIME = "ASDF" +__IS_JAPAN = "locale/japan" == app.GetLocalePath() if __IS_CANADA: __IS_EUROPE = True