diff --git a/lang/Czech.ini b/lang/Czech.ini index eea7fddc6..8a4c3951a 100644 --- a/lang/Czech.ini +++ b/lang/Czech.ini @@ -5,8 +5,6 @@ LEFT_THIS_LEVEL = "@ opustil tento level" ENTERED_THIS_LEVEL = "@ vstoupil do tohoto levelu" ENTERED = "@ vstoupil do \n#" SERVER_CLOSED = "\\#ffa0a0\\Odpojeno:\\#dcdcdc\\ Server se uzavřel" -DISCORD_ERROR = "Discord nahlásil chybu.\nPro opravení, zkuste: \n1. Zavřít hru.\n2. Restartovat Discord.\n3. Spustit hru." -DISCORD_DETECT = "\\#ffa0a0\\Chyba:\\#dcdcdc\\ Discord se nepodařilo najít.\n\\#a0a0a0\\Zkuste zavřít hru, restartovat Discord a znovu hru otevřít" DISCONNECT_FULL = "\\#ffa0a0\\Odpojeno:\\#dcdcdc\\ Server je plný." DISCONNECT_KICK = "\\#ffa0a0\\Odpojeno:\\#dcdcdc\\ Server vás vyhodil." DISCONNECT_BAN = "\\#ffa0a0\\Odpojeno:\\#dcdcdc\\ Server vás zablokoval." diff --git a/lang/Dutch.ini b/lang/Dutch.ini index 9ebca2592..01ec791b4 100644 --- a/lang/Dutch.ini +++ b/lang/Dutch.ini @@ -5,8 +5,6 @@ LEFT_THIS_LEVEL = "@ heeft dit level verlaten." ENTERED_THIS_LEVEL = "@ is dit level in gegaan." ENTERED = "@ is \n# ingegaan." SERVER_CLOSED = "\\#ffa0a0\\Verbinding verbroken:\\#dcdcdc\\ server is dicht gegaan." -DISCORD_ERROR = "Er is een probleem met Discord.\nOm te repareren, probeer: \n1. De game af te sluiten.\n2. Discord opnieuw opstarten\n3. Het spel op te starten" -DISCORD_DETECT = "\\#ffa0a0\\Error:\\#dcdcdc\\ Kan Discord niet vinden.\n\\#a0a0a0\\Probeer om het spel af te sluiten, Discord opnieuw opstarten, en het spel weer op starten." DISCONNECT_FULL = "\\#ffa0a0\\Verbinding verbroken:\\#dcdcdc\\ De server is vol." DISCONNECT_KICK = "\\#ffa0a0\\Verbinding verbroken:\\#dcdcdc\\ De server heeft je eruit geschopt" DISCONNECT_BAN = "\\#ffa0a0\\Verbinding verbroken:\\#dcdcdc\\ De server heeft je verbannen." diff --git a/lang/English.ini b/lang/English.ini index eb7e099dd..e773948a9 100644 --- a/lang/English.ini +++ b/lang/English.ini @@ -5,8 +5,6 @@ LEFT_THIS_LEVEL = "@ left this level" ENTERED_THIS_LEVEL = "@ entered this level" ENTERED = "@ entered\n#" SERVER_CLOSED = "\\#ffa0a0\\Disconnected:\\#dcdcdc\\ Server closed" -DISCORD_ERROR = "Discord threw an error.\nTo fix, try: \n1. Close the game.\n2. Restart Discord.\n3. Start the game." -DISCORD_DETECT = "\\#ffa0a0\\Error:\\#dcdcdc\\ Could not detect Discord.\n\\#a0a0a0\\Try closing the game, restarting Discord, and opening the game again." DISCONNECT_FULL = "\\#ffa0a0\\Disconnected:\\#dcdcdc\\ The server is full." DISCONNECT_KICK = "\\#ffa0a0\\Disconnected:\\#dcdcdc\\ You have been kicked." DISCONNECT_BAN = "\\#ffa0a0\\Disconnected:\\#dcdcdc\\ You have been banned." diff --git a/lang/French.ini b/lang/French.ini index be5734940..fa84cbd9f 100644 --- a/lang/French.ini +++ b/lang/French.ini @@ -5,8 +5,6 @@ LEFT_THIS_LEVEL = "@ a quitté ce niveau" ENTERED_THIS_LEVEL = "@ est entré(e) dans ce niveau" ENTERED = "@ est entré(e) dans\n#" SERVER_CLOSED = "\\#ffa0a0\\Déconnecté(e) :\\#dcdcdc\\ Le serveur est fermé." -DISCORD_ERROR = "Erreur Discord.\nPour régler le problème, essayez de : \n1. Fermer le jeu.\n2. Redémarrer Discord.\n3. Relancer le jeu." -DISCORD_DETECT = "\\#ffa0a0\\Erreur :\\#dcdcdc\\ Discord n'a pas été détecté.\n\\#a0a0a0\\Essayez de fermer le jeu, relancez Discord, puis relancez le jeu." DISCONNECT_FULL = "\\#ffa0a0\\Déconnecté(e) :\\#dcdcdc\\ Le groupe est complet." DISCONNECT_KICK = "\\#ffa0a0\\Déconnecté(e) :\\#dcdcdc\\ Vous avez été expulsé(e)." DISCONNECT_BAN = "\\#ffa0a0\\Déconnecté(e) :\\#dcdcdc\\ Vous avez été banni(e)." diff --git a/lang/German.ini b/lang/German.ini index 9b90ddb72..6834fa161 100644 --- a/lang/German.ini +++ b/lang/German.ini @@ -5,8 +5,6 @@ LEFT_THIS_LEVEL = "@ hat dieses Level verlassen." ENTERED_THIS_LEVEL = "@ hat dieses Level betreten." ENTERED = "@ ist beigetreten\n#" SERVER_CLOSED = "\\#ffa0a0\\Verbindung getrennt:\\#dcdcdc\\ Der Server wurde geschlossen!" -DISCORD_ERROR = "Discord hat einen Fehler verursacht.\nUm dies zu vermeiden, versuche: \n1. das Spiel zu schließen.\n2. Discord neu zu starten.\n3. das Spiel erneut zu starten." -DISCORD_DETECT = "\\#ffa0a0\\Fehlermeldung:\\#dcdcdc\\ Discord konnte nicht gefunden werden.\n\\#a0a0a0\\Versuche, das Spiel zu schließen, Discord neu zu starten und dann das Spiel anschließend wieder zu öffnen." DISCONNECT_FULL = "\\#ffa0a0\\Verbindung getrennt:\\#dcdcdc\\ Der Server ist bereits voll." DISCONNECT_KICK = "\\#ffa0a0\\Verbindung getrennt:\\#dcdcdc\\ Du wurdest vom Server gekickt." DISCONNECT_BAN = "\\#ffa0a0\\Verbindung getrennt:\\#dcdcdc\\ Der Bann-Hammer hat gesprochen." diff --git a/lang/Italian.ini b/lang/Italian.ini index e56fb870b..ec16c4ea4 100644 --- a/lang/Italian.ini +++ b/lang/Italian.ini @@ -5,8 +5,6 @@ LEFT_THIS_LEVEL = "@ ha lasciato il livello" ENTERED_THIS_LEVEL = "@ è entrato nel livello" ENTERED = "@ è entrato in\n#" SERVER_CLOSED = "\\#ffa0a0\\Disconnesso:\\#dcdcdc\\ server chiuso" -DISCORD_ERROR = "Discord ha avuto un errore\nPer risolverlo, prova a: \n1. Chiudere il gioco.\n2. Riavviare Discord.\n3. Avviare il gioco." -DISCORD_DETECT = "\\#ffa0a0\\Errore:\\#dcdcdc\\ impossibile individuare Discord.\n\\#a0a0a0\\Prova a chiudere il gioco, riavviare Discord, e poi riaprire il gioco." DISCONNECT_FULL = "\\#ffa0a0\\Disconnesso:\\#dcdcdc\\ il server è pieno." DISCONNECT_KICK = "\\#ffa0a0\\Disconnesso:\\#dcdcdc\\ sei stato espulso." DISCONNECT_BAN = "\\#ffa0a0\\Disconnesso:\\#dcdcdc\\ sei stato bandito." diff --git a/lang/Japanese.ini b/lang/Japanese.ini index 5f84cc4fe..d6fb8c89e 100644 --- a/lang/Japanese.ini +++ b/lang/Japanese.ini @@ -5,8 +5,6 @@ LEFT_THIS_LEVEL = "@ がこのコースから出ました" ENTERED_THIS_LEVEL = "@ がこのコースに入りました" ENTERED = "@ が \n# に入りました" SERVER_CLOSED = "\\#ffa0a0\\切断されました:\\#dcdcdc\\ ルームが閉じられました。" -DISCORD_ERROR = "Discordエラーが発生しました。\n解決するには、\n1. ゲームを終了する\n2. Discordを再起動する\n3. もう一度ゲームを開く\nの手順で進めてください。" -DISCORD_DETECT = "\\#ffa0a0\\エラー:\\#dcdcdc\\ Discordを検出できませんでした。\n\\#a0a0a0\\ゲームを終了し、Discordを再起動してから、もう一度お試しください。" DISCONNECT_FULL = "\\#ffa0a0\\切断されました:\\#dcdcdc\\ ルームが満員です。" DISCONNECT_KICK = "\\#ffa0a0\\切断されました:\\#dcdcdc\\ キックされました。" DISCONNECT_BAN = "\\#ffa0a0\\切断されました:\\#dcdcdc\\ BANされました。" diff --git a/lang/Polish.ini b/lang/Polish.ini index dfaccfd43..c9dd28401 100644 --- a/lang/Polish.ini +++ b/lang/Polish.ini @@ -5,8 +5,6 @@ LEFT_THIS_LEVEL = "Gracz @ opuścił ten poziom" ENTERED_THIS_LEVEL = "Gracz @ wszedł do tego poziomu" ENTERED = "Gracz @ wszedł do\n#" SERVER_CLOSED = "\\#ffa0a0\\Rozłączono:\\#dcdcdc\\ Serwer zamknięty" -DISCORD_ERROR = "Discord zgłosił błąd.\nAby to naprawić, spróbuj:\n1. Zamknąć grę.\n2. Zrestartować Discorda.\n3. Uruchomić grę." -DISCORD_DETECT = "\\#ffa0a0\\Błąd:\\#c8c8c8\\ Nie wykryto Discorda.\n\\#a0a0a0\\Spróbuj zamknąć grę, zrestartować Discorda i uruchomić grę ponownie." DISCONNECT_FULL = "\\#ffa0a0\\Rozłączono:\\#c8c8c8\\ Pokój jest pełny." DISCONNECT_KICK = "\\#ffa0a0\\Rozłączono:\\#c8c8c8\\ Wyrzucono cię z serwera." DISCONNECT_BAN = "\\#ffa0a0\\Rozłączono:\\#c8c8c8\\ Zbanowano cię na serwerze." diff --git a/lang/Portuguese.ini b/lang/Portuguese.ini index 260a1ad51..2fa00255c 100644 --- a/lang/Portuguese.ini +++ b/lang/Portuguese.ini @@ -5,8 +5,6 @@ LEFT_THIS_LEVEL = "@ saiu desta fase" ENTERED_THIS_LEVEL = "@ entrou nesta fase" ENTERED = "@ entrou em\n#" SERVER_CLOSED = "\\#ffa0a0\\Desconectado:\\#dcdcdc\\ A sala foi fechada." -DISCORD_ERROR = "Ocorreu um erro no Discord.\nPara consertar, tente: \n1. Fechar o jogo.\n2. Reiniciar o Discord.\n3. Iniciar o jogo." -DISCORD_DETECT = "\\#ffa0a0\\Erro:\\#dcdcdc\\ Discord não detectado.\n\\#a0a0a0\\Tente fechar o jogo, reiniciar o Discord, e abrir o jogo novamente." DISCONNECT_FULL = "\\#ffa0a0\\Desconectado:\\#dcdcdc\\ A sala está cheia." DISCONNECT_KICK = "\\#ffa0a0\\Desconectado:\\#dcdcdc\\ Você foi expulso(a)." DISCONNECT_BAN = "\\#ffa0a0\\Desconectado:\\#dcdcdc\\ Você foi banido(a)." diff --git a/lang/Russian.ini b/lang/Russian.ini index 0cca45878..4b87501bb 100644 --- a/lang/Russian.ini +++ b/lang/Russian.ini @@ -5,8 +5,6 @@ LEFT_THIS_LEVEL = "@ вышел из уровня" ENTERED_THIS_LEVEL = "@ вошел в уровень" ENTERED = "@ вошел в\n#" SERVER_CLOSED = "\\#ffa0a0\\Отключение:\\#dcdcdc\\ сервер закрыт" -DISCORD_ERROR = "Дискорд выдал ошибку.\nЧтобы исправить, попробуйте: \n1. Закрыть игру.\n2. Перезапустить дискорд.\n3. Запустить игру." -DISCORD_DETECT = "\\#ffa0a0\\Ошибка:\\#dcdcdc\\ Не удалось обнаружить Дискорд.\n\\#a0a0a0\\Попробуйте закрыть игру, перезапустить дискорд и снова открыть игру." DISCONNECT_FULL = "\\#ffa0a0\\Отключение:\\#dcdcdc\\ Сервер заполнен." DISCONNECT_KICK = "\\#ffa0a0\\Отключение:\\#dcdcdc\\ Хост вас выгнал." DISCONNECT_BAN = "\\#ffa0a0\\Отключение:\\#dcdcdc\\ Хост заблокировал вас." diff --git a/lang/Spanish.ini b/lang/Spanish.ini index 982f38fb8..6cee56dd1 100644 --- a/lang/Spanish.ini +++ b/lang/Spanish.ini @@ -5,8 +5,6 @@ LEFT_THIS_LEVEL = "@ ha salido del nivel" ENTERED_THIS_LEVEL = "@ se ha unido a tu nivel" ENTERED = "@ ha entrado a \n#" SERVER_CLOSED = "\\#ffa0a0\\Desconectado:\\#dcdcdc\\ El servidor ha sido cerrado." -DISCORD_ERROR = "Discord ha lanzado un error.\nPara solucionarlo, intenta: \n1. Cerrar el juego.\n2. Reiniciar Discord.\n3. Iniciar el juego." -DISCORD_DETECT = "\\#ffa0a0\\Error:\\#dcdcdc\\ No se ha podido detectar Discord.\n\\#a0a0a0\\Prueba a cerrar el juego, reiniciar Discord, e iniciar el juego otra vez." DISCONNECT_FULL = "\\#ffa0a0\\Desconectado:\\#dcdcdc\\ La partida está llena." DISCONNECT_KICK = "\\#ffa0a0\\Desconectado:\\#dcdcdc\\ has sido\nexpulsado del servidor" DISCONNECT_BAN = "\\#ffa0a0\\Desconectado:\\#dcdcdc\\ has sido\nbaneado del servidor" diff --git a/src/pc/discord/discord.c b/src/pc/discord/discord.c index c64a7b6d9..b8deba067 100644 --- a/src/pc/discord/discord.c +++ b/src/pc/discord/discord.c @@ -25,9 +25,6 @@ static void discord_sdk_log_callback(UNUSED void* hook_data, enum EDiscordLogLev void discord_fatal_message(int rc) { // Discord usually does this because of loss of connection to Discord LOG_ERROR("Discord fatal: %d", rc); - /*char errorMessage[132] = { 0 }; - snprintf(errorMessage, 132, "%s\nRC: %d", DLANG(NOTIF, DISCORD_ERROR), rc); - djui_popup_create(errorMessage, 6);*/ } void discord_fatal(int rc) { @@ -130,7 +127,6 @@ static void discord_initialize(void) { if (rc) { LOG_ERROR("DiscordCreate failed: %d", rc); - //djui_popup_create(DLANG(NOTIF, DISCORD_DETECT), 3); sDiscordFailed = true; return; }