From 0e8107e3a16344126953d2b0db0240c9d0c37ebb Mon Sep 17 00:00:00 2001 From: Christian Ohm Date: Tue, 5 Jan 2010 17:50:28 +0000 Subject: [PATCH] Fix grammar, typos, don't translate kickPlayer messages. Those are only shown in the log anyway, the in-game messages are still translated. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8993 4a71c877-e1ca-e34f-864e-861f7616d084 --- lib/netplay/netplay.c | 14 +++++++------- src/multiint.c | 6 +++--- src/multijoin.c | 8 ++++---- src/multiplay.c | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/netplay/netplay.c b/lib/netplay/netplay.c index c2d968c55..81399b599 100644 --- a/lib/netplay/netplay.c +++ b/lib/netplay/netplay.c @@ -1172,7 +1172,7 @@ static void recvVersionCheck() { debug(LOG_NET, "Received wrong version string [%s, %d.%d] from player %u. Expected [%s, %d.%d]", playersVersion, MajorVersion, MinorVersion, victim, VersionString, NETCODE_VERSION_MAJOR, NETCODE_VERSION_MINOR); - sasprintf((char**)&msg, _("Player %u has the wrong game version. Auto kicking."), victim); + sasprintf((char**)&msg, _("Player %u has the wrong game version. Auto kicking."), victim); sendTextMessage(msg, true); sasprintf((char**)&msg, "you have version [%s], we expect [%s].", playersVersion, VersionString); @@ -1195,9 +1195,9 @@ static void recvVersionCheck() if (NetPlay.GamePassworded && playerVersionFlag[victim] && !playerPasswordFlag[victim]) { // really should ban them. :P - debug(LOG_ERROR, "Received correct version string [%s] from player %u", playersVersion, victim); - debug(LOG_ERROR, "Did NOT receive passowrd from them --Autokicking ip %s", "123" ); - kickPlayer(victim, "you have attempted to thwart the security measuers. Entry denied!", ERROR_CHEAT); + debug(LOG_NET, "Received correct version string [%s] from player %u", playersVersion, victim); + debug(LOG_NET, "Did NOT receive password from them, auto kicking."); + kickPlayer(victim, "you have attempted to thwart the security measures. Entry denied!", ERROR_CHEAT); } } @@ -1212,7 +1212,7 @@ static void VersionCheckTimeOut(uint32_t victim) if(NetPlay.isHost) { - kickPlayer( victim, "you have the wrong version; update it! (Version string never received.)", ERROR_WRONGVERSION ); + kickPlayer(victim, "you have the wrong version (version string never received).", ERROR_WRONGVERSION); // reset flags /time after we kick them NetPlay.players[victim].versionCheckTime = -1; @@ -1297,12 +1297,12 @@ void recvPasswordCheck(void) { debug(LOG_NET, "Received *wrong* password [%s] from player %u. Expected [%s]", passwordreceived, victim, NetPlay.gamePassword); - sasprintf((char**)&msg, _("Player %u has the wrong password. Auto kicking."), victim ); + sasprintf((char**)&msg, _("Player %u has the wrong password. Auto kicking."), victim ); sendTextMessage(msg, true); if (NetPlay.isHost) { - kickPlayer(victim, "you have the wrong password! Entry denied!", ERROR_WRONGPASSWORD); + kickPlayer(victim, "you entered the wrong password. Entry denied!", ERROR_WRONGPASSWORD); playerPasswordFlag[victim] = false; } } diff --git a/src/multiint.c b/src/multiint.c index 1ad0f6fc2..e7bb0acf5 100644 --- a/src/multiint.c +++ b/src/multiint.c @@ -2702,7 +2702,7 @@ static void processMultiopWidgets(UDWORD id) } sasprintf(&msg, _("The host has kicked %s from the game!"), getPlayerName(j)); sendTextMessage(msg, true); - kickPlayer(victim, _("you are unwanted by the host"), ERROR_KICKED ); + kickPlayer(victim, "you are unwanted by the host.", ERROR_KICKED); resetReadyStatus(true); //reset and send notification to all clients } } @@ -2842,14 +2842,14 @@ void frontendMultiMessages(void) { case STUCK_IN_FILE_LOOP: debug(LOG_WARNING, "Received file cancel request from player %u, They are stuck in a loop?", victim); - kickPlayer(victim, "couldn't upload file for some reason. ", ERROR_UNKNOWNFILEISSUE); + kickPlayer(victim, "the host couldn't send a file for some reason.", ERROR_UNKNOWNFILEISSUE); NetPlay.players[victim].wzFile.isCancelled = true; NetPlay.players[victim].wzFile.isSending = false; break; case ALREADY_HAVE_FILE: default: - debug(LOG_WARNING, "Received file cancel request from player %u, They already have the file ?", victim); + debug(LOG_WARNING, "Received file cancel request from player %u, they already have the file.", victim); NetPlay.players[victim].wzFile.isCancelled = true; NetPlay.players[victim].wzFile.isSending = false; break; diff --git a/src/multijoin.c b/src/multijoin.c index 9feaf14ee..503fa7924 100644 --- a/src/multijoin.c +++ b/src/multijoin.c @@ -276,7 +276,7 @@ BOOL MultiPlayerJoin(UDWORD playerIndex) // if skirmish and game full, then kick... if (NetPlay.playercount > game.maxPlayers) { - kickPlayer(playerIndex, "Sorry, game is full!", ERROR_FULL); + kickPlayer(playerIndex, "the game is already full.", ERROR_FULL); } } return true; @@ -327,12 +327,12 @@ bool recvDataCheck(void) { char msg[256] = {'\0'}; - sprintf(msg, _("Kicking player, %s, because data doesn't match!"), getPlayerName(i)); + sprintf(msg, _("Kicking player %s, game data doesn't match!"), getPlayerName(i)); sendTextMessage(msg, true); addConsoleMessage(msg, LEFT_JUSTIFY, NOTIFY_MESSAGE); - kickPlayer(player, _("Data doesn't match!"), ERROR_WRONGDATA); - debug(LOG_WARNING, "Kicking Player %s,(%u), they are using a mod or have modified their data.", getPlayerName(i), player); + kickPlayer(player, "your data doesn't match the host's!", ERROR_WRONGDATA); + debug(LOG_WARNING, "Kicking Player %s (%u), they are using a mod or have modified their data.", getPlayerName(i), player); } else { diff --git a/src/multiplay.c b/src/multiplay.c index 87f43f2ed..83c62350d 100644 --- a/src/multiplay.c +++ b/src/multiplay.c @@ -280,7 +280,7 @@ BOOL multiPlayerLoop(void) sendTextMessage(msg, true); addConsoleMessage(msg, LEFT_JUSTIFY, NOTIFY_MESSAGE); - kickPlayer(index, _("It is not nice to cheat!"), ERROR_CHEAT); + kickPlayer(index, "it is not nice to cheat!", ERROR_CHEAT); debug(LOG_WARNING, "Kicking Player %s (%u), they tried to bypass data integrity check!", getPlayerName(index), index); } } @@ -767,7 +767,7 @@ BOOL recvMessage(void) if (selectedPlayer == player_id) // we've been told to leave. { - debug(LOG_ERROR, "You were kicked because, %s", reason); + debug(LOG_ERROR, "You were kicked because %s", reason); setPlayerHasLost(true); } break;