tMetaserver connect message reworded; some comments added for the benefit of tr… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 62cd2c69dba8aa79e59a6ee24a6ff60d7c5300d0 | |
parent d7b71c435e1ce260777c5f527f05645e66630dd2 | |
Author: Ben Webb <[email protected]> | |
Date: Fri, 12 Jul 2002 17:22:52 +0000 | |
Metaserver connect message reworded; some comments added for the benefit | |
of translators. | |
Diffstat: | |
M po/de.po | 2 +- | |
M po/fr.po | 2 +- | |
M po/nn.po | 2 +- | |
M po/pl.po | 2 +- | |
M po/pt_BR.po | 2 +- | |
M src/gui_client/newgamedia.c | 7 +++++++ | |
M src/serverside.c | 6 +++++- | |
7 files changed, 17 insertions(+), 6 deletions(-) | |
--- | |
diff --git a/po/de.po b/po/de.po | |
t@@ -2967,7 +2967,7 @@ msgstr "" | |
#: src/serverside.c:297 | |
#, c-format | |
-msgid "Waiting for metaserver connect to %s:%u..." | |
+msgid "Waiting for connect to metaserver at %s:%u..." | |
msgstr "Warte auf Verbinung zu Metaserver %s:%u..." | |
#: src/serverside.c:366 | |
diff --git a/po/fr.po b/po/fr.po | |
t@@ -2970,7 +2970,7 @@ msgstr "" | |
#: src/serverside.c:297 | |
#, c-format | |
-msgid "Waiting for metaserver connect to %s:%u..." | |
+msgid "Waiting for connect to metaserver at %s:%u..." | |
msgstr "" | |
#: src/serverside.c:366 | |
diff --git a/po/nn.po b/po/nn.po | |
t@@ -3095,7 +3095,7 @@ msgstr "Prøver for ofte å kopla til metatenaren - vent… | |
#: src/serverside.c:299 | |
#, fuzzy, c-format | |
-msgid "Waiting for metaserver connect to %s:%u..." | |
+msgid "Waiting for connect to metaserver at %s:%u..." | |
msgstr "Ventar på metatenar-samband til %s:%u..." | |
#: src/serverside.c:368 | |
diff --git a/po/pl.po b/po/pl.po | |
t@@ -2955,7 +2955,7 @@ msgstr "" | |
#: src/serverside.c:297 | |
#, c-format | |
-msgid "Waiting for metaserver connect to %s:%u..." | |
+msgid "Waiting for connect to metaserver at %s:%u..." | |
msgstr "" | |
#: src/serverside.c:366 | |
diff --git a/po/pt_BR.po b/po/pt_BR.po | |
t@@ -2969,7 +2969,7 @@ msgstr "" | |
#: src/serverside.c:297 | |
#, c-format | |
-msgid "Waiting for metaserver connect to %s:%u..." | |
+msgid "Waiting for connect to metaserver at %s:%u..." | |
msgstr "" | |
#: src/serverside.c:366 | |
diff --git a/src/gui_client/newgamedia.c b/src/gui_client/newgamedia.c | |
t@@ -256,16 +256,23 @@ void DisplayConnectStatus(gboolean meta, | |
case NBS_SOCKSCONNECT: | |
switch (sockstat) { | |
case NBSS_METHODS: | |
+ /* Tell the user that we've successfully connected to a SOCKS server, | |
+ * and are now ready to tell it to initiate the "real" connection */ | |
text = g_strdup_printf(_("Status: Connected to SOCKS server %s..."), | |
Socks.name); | |
SetStartGameStatus(text); | |
g_free(text); | |
break; | |
case NBSS_USERPASSWD: | |
+ /* Tell the user that the SOCKS server is asking us for a username | |
+ * and password */ | |
SetStartGameStatus(_("Status: Authenticating with SOCKS server")); | |
break; | |
case NBSS_CONNECT: | |
text = | |
+ /* Tell the user that all necessary SOCKS authentication has been | |
+ * completed, and now we're going to try to have it connect to | |
+ * the final destination */ | |
g_strdup_printf(_("Status: Asking SOCKS for connect to %s..."), | |
meta ? MetaServer.Name : ServerName); | |
SetStartGameStatus(text); | |
diff --git a/src/serverside.c b/src/serverside.c | |
t@@ -296,7 +296,7 @@ void RegisterWithMetaServer(gboolean Up, gboolean SendData, | |
g_string_free(body, TRUE); | |
if (retval) { | |
- dopelog(2, LF_SERVER, _("Waiting for metaserver connect to %s:%u..."), | |
+ dopelog(2, LF_SERVER, _("Waiting for connect to metaserver at %s:%u..."), | |
MetaServer.Name, MetaServer.Port); | |
} else { | |
MetaConnectError(MetaConn); | |
t@@ -1014,6 +1014,8 @@ static void HandleServerCommand(char *string, NetworkBuf… | |
} else if (g_strncasecmp(string, "kill ", 5) == 0) { | |
tmp = GetPlayerByName(string + 5, FirstServer); | |
if (tmp) { | |
+ /* The named user has been removed from the server following | |
+ * a "kill" command */ | |
g_print(_("%s killed\n"), GetPlayerName(tmp)); | |
BroadcastToClients(C_NONE, C_KILL, GetPlayerName(tmp), tmp, | |
(Player *)FirstServer->data); | |
t@@ -3033,6 +3035,8 @@ int RandomOffer(Player *To) | |
SendPlayerData(To); | |
SendPrintMessage(NULL, C_NONE, To, text->str); | |
} else if (Sanitized) { | |
+ /* Debugging message: we would normally have a random drug-related | |
+ * event here, but "Sanitized" mode is turned on */ | |
dopelog(3, LF_SERVER, _("Sanitized away a RandomOffer")); | |
} else if (r < 50) { | |
amount = brandom(3, 7); |