Mercurial > hg > openttd
changeset 13527:97ee12309872 draft
(svn r18048) -Change: make no distinction between unpausing because of a client aborting to join or actually joining
line wrap: on
line diff
--- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -1734,7 +1734,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :استعادة اللعب - عدد اللاعبين كافي STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :اللعب متوقف - ربط لاعب STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :الاستمرار باللعب - تم ربط اللاعب -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :الاستمرار باللعب - فشل ربط اللاعب ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :يغادر STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} قد انضم للعبة
--- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1733,7 +1733,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Jogo des-pausado (jogadores suficientes) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Jogo pausado (cliente conectando) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Jogo des-pausado (cliente conectado) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Jogo des-pausado (cliente não se conectou) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :saindo STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} entrou no jogo
--- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -1717,7 +1717,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Играта продължава (отново има достатъчно играчи) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Играта е на пауза (свързва се нов играч) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Играта продължава (новият играч се свърза) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Играта продължава (новият играч не успя да се свърже) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :напускам STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} се присъедини към играта
--- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -1734,7 +1734,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Joc en marxa (hi ha prou jugadors) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Joc en pausa (connectant client) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Joc en marxa (client connectat) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Joc en marxa (el client no s'ha pogut connectar) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :deixant STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} s'ha unit al joc
--- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -1787,7 +1787,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Igra nastavljena (dovoljno igrača) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Igra zaustavljena (spajam klijenta) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Igra nastavljena (klijent spojen) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Igra nastavljena (klijent se nije uspio spojiti) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :odlazim STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} se pridružio igri
--- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -1795,7 +1795,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Hra spuštěna (dostatek hráčů) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Hra pozastavena (hráč se připojuje) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Hra spuštěna (hráč připojen) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Hra pozastavena (hráčovi se nepovedlo připojit) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :odpojování STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} jde hrát
--- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -1732,7 +1732,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Spil ikke længere på pause (nok spillere igen) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Spil på pause (tilslutter klient) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Spil ikke længere på pause (klient tilsluttet) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Spil ikke længere på pause (klient kunne ikke tilsluttes) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :forlader STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} har tilsluttet sig spillet
--- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -1734,7 +1734,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Spel hervat (genoeg spelers) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Spel gepauzeerd (inkomende client) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Spel hervat (client verbonden) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Spel hervat (client kon geen verbinding maken) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :vertrekt STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} heeft zich bij het spel gevoegd
--- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1732,9 +1732,8 @@ ############ Leave those lines in this order!! STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Game paused (not enough players) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Game unpaused (enough players) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Game paused (connecting client) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Game unpaused (client connected) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Game unpaused (client failed to connect) +STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Game paused (connecting clients) +STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Game unpaused (no connecting clients) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :leaving STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {RAW_STRING} has joined the game
--- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -1731,7 +1731,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Game unpaused (enough players) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Game paused (connecting client) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Game unpaused (client connected) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Game unpaused (client failed to connect) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :leaving STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} has joined the game
--- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -1675,7 +1675,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Ludo malpaŭzita (sufiĉaj ludandoj) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Ludo paŭzita (konektanta kliento) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Ludo malpaŭzita (kliento konektita) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Ludo malpaŭzita (konektado de kliento fiaskis) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :forlasanta STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} ensalutis la ludon
--- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -1790,7 +1790,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Mäng jätkub (piisavalt mängijaid) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Mäng seisab (ühenduv klient) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Mäng jätkub (klient ühendunud) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Mäng jätkub (klient ei ühendunud) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :lahkub STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} liitus mänguga
--- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -1734,7 +1734,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Peliä jatketaan (tarpeeksi pelaajia) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Peli pysäytetty (yhdistävä asiakas) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Peliä jatketaan (asiakas yhdistänyt) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Peliä jatketaan (asiakkaan yhteys epäonnistui) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :poistutaan STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} on liittynyt peliin
--- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1735,7 +1735,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Partie reprise (assez de joueurs) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Partie suspendue (connexion d'un client) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Partie reprise (client connecté) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Partie reprise (échec de connexion du client) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :départ STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} a rejoint la partie
--- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -1703,7 +1703,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Partida funcionando (hai suficientes xogadores) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Partida en pausa (cliente conectando) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Partida funcionando (cliente conectado) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Partida funcionando (o cliente non pudio conectar) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :saíndo STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} uniuse á partida
--- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1735,7 +1735,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Spiel fortgesetzt (genug Spieler) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Spiel angehalten (Teilnehmer meldet sich an) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Spiel fortgesetzt (Teilnehmer ist angemeldet) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Spiel fortgesetzt (Teilnehmer konnte nicht angemeldet werden) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :geht STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} ist dem Spiel beigetreten
--- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -1798,7 +1798,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Συνέχιση παιχνιδιού (υπάρχουν αρκετοί παίκτες) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Παύση παιχνιδιού (σύνδεση πελάτη) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Συνέχιση παιχνιδιού (πελάτης συνδέθηκε) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Συνέχιση παιχνιδιού (πελάτης απέτυχε να συνδεθεί) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :αποχώρηση STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} συμμετέχει στο παιχνίδι
--- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -1732,7 +1732,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :(המשחק הופשר (יש די משתתפים STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :(המשחק הושהה (משתמש מתחבר STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :(המשחק הופשר (משתמש התחבר -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :(המשחק הופשר (חיבור משתמש נכשל ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :עוזב STR_NETWORK_MESSAGE_CLIENT_JOINED :הצטרף למשחק {STRING} ***
--- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -1768,7 +1768,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Játék elindítva (van elég játékos) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Játék felfüggesztve (kapcsolódó kliens) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Játék elindítva (a kliens sikeresen csatlakozott) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Játék elindítva (a kliens csatlakozása nem sikerült) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :kilépés STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} csatlakozott a játékhoz
--- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -1723,7 +1723,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Leikur gangsettur (nægilega margir leikmenn) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Leikur í bið (tengi notanda) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Leikur gangsettur (notandi tengdur) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Leikur gangsettur (tenging við notanda slitnaði) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :yfirgefur STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} tengdist leiknum
--- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -1734,7 +1734,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Permainan Dilanjutkan (pemain cukup) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Permainan Tertahan (menghubungi pemain lainnya) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Permainan Dilanjutkan (pemain telah terhubung) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Permainan Dilanjutkan (gagal menghubungi pemain lainnya) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :pergi STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} telah bergabung
--- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1736,7 +1736,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Partita ripresa (giocatori sufficienti) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Partita in pausa (connessione client in corso) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Partita ripresa (client connesso) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Partita ripresa (connessione client fallita) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :abbandono della partita STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} è entrato nella partita
--- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -1692,7 +1692,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :ゲーム停止解除（プレヤー人数十分） STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :ゲームは一時停止（クライアントが接続中） STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :ゲーム停止解除（クライアントが接続済み） -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :ゲーム停止解除（クライアントの接続が失敗） ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :退出 STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} は参加してきました
--- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1732,7 +1732,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :게임 재개됨 (플레이어가 충분히 모였습니다) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :게임 일시정지됨 (클라이언트 연결중) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :게임 재개됨 (클라이언트 연결됨) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :게임 재개됨 (클라이언트가 연결에 실패했습니다) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :떠남 STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING}님이 게임에 참여했습니다
--- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -1731,7 +1731,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Spēle atsākta (pietiekams dalībnieku skaits) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Spēle nopauzēta (pieslēdzas dalībniekam) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Spēle atsākta (dalībnieks pieslēdzies) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Spēle atsākta (dalībniekam neizdevās pieslēgties) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :aizeju STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} ir pievienojies spēlei
--- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -1762,7 +1762,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Žaidimas veikia (Užtenka žaidėjų) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Žaidimas sustabdytas (Prijungiamas klientas) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Žaidimas veikia (Klientas pajungtas) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Žaidimas tęsiamas (Klientas neprisijungė) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :išeinama STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} prisijungė prie žaidimo
--- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -1719,7 +1719,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Spill leeft erëm (genuch Spiller) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Spill gepaust (Spiller connectéiert) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Spill leeft erëm (Client ass connectéiert) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Spill leeft erëm (Client konnt net connectéieren) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :verloossen STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} ass dem Spill baigetrueden
--- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -1729,7 +1729,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Spill gjennopptatt (nok spillere) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Spill satt på pause (klient kobler seg til) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Spill gjennopptatt (klient koblet til) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Spill gjenopptatt (klient kunne ikke koble seg til) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :forlater STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} har blitt med i spillet
--- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -1703,7 +1703,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Spel gjenoppteke (nok spelarar) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Spel sett på pause (klient koblar seg til) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Spel gjenoppteke (klient tilkobla) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Spel gjenoppteke (klient kunne ikkje kobla seg til) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :forlet STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} har blitt med i spelet
--- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -2114,7 +2114,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Gra wznowiona (wystarczająca ilość graczy) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Gra zatrzymana (łączenie klienta) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Gra wznowiona (klient połączony) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Gra wznowiona (nieudane połączenie klienta) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :opuszczanie STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} dołączył do gry.
--- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1734,7 +1734,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Jogo a decorrer (número de jogadores suficiente) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Jogo em pausa (conexão cliente em curso) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Jogo a decorrer (cliente ligado) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Jogo a decorrer (falhou conexão cliente) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :a sair STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} entrou no jogo
--- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -1733,7 +1733,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Joc continuat (suficienţi jucători) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Joc suspendat (conectare client) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Joc continuat (client conectat) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Joc continuat (clientul nu a reuşit să se conecteze) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :iese STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} a intrat in joc
--- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1887,7 +1887,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Игра запущена (есть игроки) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Пауза (подключение клиента) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Игра запущена (клиент подключился) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Игра запущена (клиент не смог подключиться) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :покинул STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} подключился к игре
--- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -1919,7 +1919,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Partija nastavljena (ima dovoljno igrača) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Partija pauzirana (igrač se priključuje) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Partija nastavljena (igrač je priključen) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Partija nastavljena (igrač nije priključen) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :napušta STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} se priključio partiji
--- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -1733,7 +1733,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :游戏继续 (玩家数目达到要求) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :游戏暂停 (连接玩家) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :游戏继续 (玩家已链入) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :游戏继续 (玩家链入失败) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :离开 STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} 已加入游戏
--- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1800,7 +1800,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Hra spustená (dostatok hráčov) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Hra pozastavená (pripája sa klient) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Hra spustená (klient sa pripojil) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Hra spustená (zlyhalo pripojenie klienta) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :odchádza STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} vstúpil do hry
--- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -1764,7 +1764,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Igra obnovljena (dovolj igralcev) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Igra v pavzi (povezovanje gosta) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Igra obnovljena (gost povezan) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Igra obnovljena (gost se ni uspel priključiti) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :zapušča STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} pristopa k igri
--- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -1735,7 +1735,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Juego en marcha (suficientes jugadores) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Juego detenido (conectado cliente) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Juego en marcha (cliente conectado) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Juego en marcha (cliente falló la conexión) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :abandonando STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} se ha unido al juego
--- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -1732,7 +1732,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Spelet fortsätter (Tillräckligt med spelare) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Spelet pausat (Spelare ansluter) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Spelet fortsätter (Spelare ansluten) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Spelet fortsätter (Misslyckat anslutningsförsök av en spelare) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :lämnar STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} har gått med i spelet
--- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -1734,7 +1734,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :遊戲繼續 (玩家足數) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :遊戲暫停 (鏈入客戶端) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :遊戲繼續 (客戶端鏈入成功) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :遊戲繼續 (客戶端鏈入失敗) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :離開中 STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} 已加入遊戲
--- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -1733,7 +1733,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Oyun devam ediyor (yeterli oyuncu var) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Oyun durdu (istemci bağlanıyor) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Oyun devam ediyor (istemci bağlandı) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Oyun devam ediyor (istemci bağlanamadı) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :ayrılıyor STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} oyuna katıldı
--- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -1859,7 +1859,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Гру продовжено (достатньо гравців) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Гру призупинено (приєднується клієнт) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Гру продовжено (клієнт приєднався) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Гру продовжено (клієнту не вдалося приєднатися) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :виходжу... STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} приєднався до гри
--- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -1722,7 +1722,6 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Gêm wedi'i ddadseibio (digon o chwaraewyr) STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Gêm wedi'i seibio (cysylltu â chleient) STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Gêm wedi'i ddadseibio (wedi cysylltu â chleient) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL :Gêm wedi'i ddadseibio (wedi methu cysylltu â chleient) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :wrthi'n gadael STR_NETWORK_MESSAGE_CLIENT_JOINED :*** Mae {STRING} wedi ymuno â'r gêm
--- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -488,7 +488,7 @@ /* When the client was PRE_ACTIVE, the server was in pause mode, so unpause */ if (cs->status == STATUS_PRE_ACTIVE && (_pause_mode & PM_PAUSED_JOIN)) { DoCommandP(0, PM_PAUSED_JOIN, 0, CMD_PAUSE); - NetworkServerSendChat(NETWORK_ACTION_SERVER_MESSAGE, DESTTYPE_BROADCAST, 0, "", CLIENT_ID_SERVER, NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL); + NetworkServerSendChat(NETWORK_ACTION_SERVER_MESSAGE, DESTTYPE_BROADCAST, 0, "", CLIENT_ID_SERVER, NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT); } if (_network_server) {
--- a/src/network/network_type.h +++ b/src/network/network_type.h @@ -90,9 +90,8 @@ enum NetworkServerMessage { NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS, ///< Game paused (not enough players) NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS, ///< Game unpaused (enough players) - NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT, ///< Game paused (connecting client) - NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT, ///< Game unpaused (client connected) - NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL, ///< Game unpaused (client failed to connect) + NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT, ///< Game paused (connecting clients) + NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT, ///< Game unpaused (no connecting clients) NETWORK_SERVER_MESSAGE_END };