diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp index 0dba087c..5a88f5b3 100644 --- a/src/net/common/serverlobbythread.cpp +++ b/src/net/common/serverlobbythread.cpp @@ -1375,7 +1375,8 @@ ServerLobbyThread::HandleNetPacketJoinGame(boost::shared_ptr sessio && tmpData.gameType != GAME_TYPE_NORMAL && !joinGame.spectateonly()) { SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_GUEST_FORBIDDEN); } else if (tmpData.gameType == GAME_TYPE_INVITE_ONLY - && !game->IsPlayerInvited(session->GetPlayerData()->GetUniqueId())) { + && !game->IsPlayerInvited(session->GetPlayerData()->GetUniqueId()) + && !joinGame.spectateonly()) { SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_NOT_INVITED); } else if (!game->CheckPassword(password)) { SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_INVALID_PASSWORD); diff --git a/src/third_party/websocketpp/websocketpp/close.hpp b/src/third_party/websocketpp/websocketpp/close.hpp index 107b345d..d0e87663 100644 --- a/src/third_party/websocketpp/websocketpp/close.hpp +++ b/src/third_party/websocketpp/websocketpp/close.hpp @@ -197,7 +197,7 @@ union code_converter { * * If the value is in an invalid or reserved range ec is set accordingly. * - * @param [in] payload Close frame payload value recieved over the wire. + * @param [in] payload Close frame payload value received over the wire. * @param [out] ec Set to indicate what error occurred, if any. * @return The extracted value */ diff --git a/src/third_party/websocketpp/websocketpp/impl/connection_impl.hpp b/src/third_party/websocketpp/websocketpp/impl/connection_impl.hpp index 9932ca64..980e2ecc 100644 --- a/src/third_party/websocketpp/websocketpp/impl/connection_impl.hpp +++ b/src/third_party/websocketpp/websocketpp/impl/connection_impl.hpp @@ -624,7 +624,7 @@ void connection::handle_transport_init(lib::error_code const & ec) { if (ec) { std::stringstream s; - s << "handle_transport_init recieved error: "<< ec.message(); + s << "handle_transport_init received error: "<< ec.message(); m_elog.write(log::elevel::fatal,s.str()); this->terminate(ec); diff --git a/ts/pokerth_ca.ts b/ts/pokerth_ca.ts index 1900114f..7d54ae1b 100644 --- a/ts/pokerth_ca.ts +++ b/ts/pokerth_ca.ts @@ -473,7 +473,7 @@ Please verify that you are uploading a valid PokerTH log file. Esteu segur que voleu denunciar l'avatar de "%1" com a offensiu? - You will no longer recieve chat messages or game invitations from this user.<br>Do you really want to put player <b>%1</b> on ignore list? + You will no longer receive chat messages or game invitations from this user.<br>Do you really want to put player <b>%1</b> on ignore list? No rebreu més missatges del xat o invitacions de partides d'aquest usuari.<br>Realment voleu posar el jugador <b>%1</b> a la llista per ignorar? @@ -3457,7 +3457,7 @@ Podeu invitar més jugadors fent clic dret al seus noms d'usuari a la llist <span style='color:red;'>El jugador %1 no pot unir-se a %2 perquè està ocupat.</span> - You will no longer recieve chat messages or game invitations from this user.<br>Do you really want to put player <b>%1</b> on ignore list? + You will no longer receive chat messages or game invitations from this user.<br>Do you really want to put player <b>%1</b> on ignore list? No rebreu més missatges del xat o invitacions de partides d'aquest usuari.<br>Realment voleu posar el jugador <b>%1</b> a la llista per ignorar? diff --git a/ts/pokerth_cz.ts b/ts/pokerth_cz.ts index 5df721e7..0c260dbc 100644 --- a/ts/pokerth_cz.ts +++ b/ts/pokerth_cz.ts @@ -465,7 +465,7 @@ Zkontrolujte, že jste nahrávali platný PokerTH soubor záznamů.Ignorovat hráče - You will no longer recieve chat messages or game invitations from this user.<br>Do you really want to put player <b>%1</b> on ignore list? + You will no longer receive chat messages or game invitations from this user.<br>Do you really want to put player <b>%1</b> on ignore list? Od toho hráče již nebudete dostávat zprávy, ani pozvánky do hry.<br>Opravdu chcete přidat hráče <b>%1</b> do ignore listu? @@ -2250,7 +2250,7 @@ Ostatní hráče můžete pozvat kliknutím pravým tlačítkem na jejich přezd <span style='color:red;'>Hráč %1 se nemůže připojit do hry %2, protože je zaneprázdněn.</span> - You will no longer recieve chat messages or game invitations from this user.<br>Do you really want to put player <b>%1</b> on ignore list? + You will no longer receive chat messages or game invitations from this user.<br>Do you really want to put player <b>%1</b> on ignore list? Od tohoto uživatele již nebudete přijímat žádné zprávy, ani pozvánky do her.<br>Opravdu chcete přidat uživatele <b>%1</b> do ignore listu? diff --git a/ts/pokerth_ta.ts b/ts/pokerth_ta.ts index 960a73bd..ff865f1c 100644 --- a/ts/pokerth_ta.ts +++ b/ts/pokerth_ta.ts @@ -456,7 +456,7 @@ Please verify that you are uploading a valid PokerTH log file. - You will no longer recieve chat messages or game invitations from this user.<br>Do you really want to put player <b>%1</b> on ignore list? + You will no longer receive chat messages or game invitations from this user.<br>Do you really want to put player <b>%1</b> on ignore list? இந்த நபரிடமிருந்து இனி பேச்சு தகவலோ விளையாடுவதற்கு அழைப்பிதலோ பெற முடியாது.<br>இருந்தும் இந்த விளையாட்டு வீரரை <b>%1</b> புறக்கணிப்பு பட்டியலில் போட விரும்புகிறீர்களா? @@ -3110,7 +3110,7 @@ You can invite other players with right-click on their nick in the left availabl <span style='color:red;'>விளையாட்டு வீரர் %1 %2 விளையாட்டில் ஏனெனில் அவர் வேறொரு வேலையில் மும்முரமாக.</span> - You will no longer recieve chat messages or game invitations from this user.<br>Do you really want to put player <b>%1</b> on ignore list? + You will no longer receive chat messages or game invitations from this user.<br>Do you really want to put player <b>%1</b> on ignore list? இனிமேல் இந்த நபரிடமிருந்து உரையாடல் செய்தியோ விளையாட்டு அழைப்பிதலோ பெற முடியாது.<br>நீங்கள் இந்த விளையாட்டு வீரரை <b>%1</b> புறக்கணிப்பு பட்டியலில் போட விரும்புகிறீர்களா?