Re: [Freeciv-Dev] (PR#39790) Update release version in error message

[William Allen Simpson]

http://bugs.freeciv.org/Ticket/Display.html?id=39790 >

Committed S2_1 revision 13858.
Committed S2_2 revision 13859.
Committed trunk revision 13860.



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39790) Update release version in error message

[William Allen Simpson]

http://bugs.freeciv.org/Ticket/Display.html?id=39790 >

As in PR#39435, it's time to update from 2.0 to 2.1 (and 2.2)  Caught
some 1.15.0 again, too!

This is a simple replacement, so no need for fuzzy or translation effort.

In 2.1 (2.2 and trunk are similar):

Index: server/srv_main.c
===
--- server/srv_main.c   (revision 13857)
+++ server/srv_main.c   (working copy)
@@ -1040,7 +1040,7 @@
 unsigned char buffer[4096];
 struct data_out dout;
 
-freelog(LOG_ERROR,
+freelog(LOG_NORMAL,
_("Warning: rejecting old client %s"), conn_description(pconn));
 
 dio_output_init(&dout, buffer, sizeof(buffer));
@@ -1050,9 +1050,9 @@
 dio_put_uint8(&dout, 1);
 
 dio_put_bool32(&dout, FALSE);
-dio_put_string(&dout, _("Your client is too old. To use this server "
+dio_put_string(&dout, _("Your client is too old. To use this server, "
"please upgrade your client to a "
-   "Freeciv 2.0 or later."));
+   "Freeciv 2.1 or later."));
 dio_put_string(&dout, "");
 
 {
Index: po/cs.po
===
--- po/cs.po(revision 13857)
+++ po/cs.po(working copy)
@@ -5416,11 +5416,11 @@
 #: server/srv_main.c:1053
 #, fuzzy
 msgid ""
-"Your client is too old. To use this server please upgrade your client to a "
-"Freeciv 2.0 or later."
+"Your client is too old. To use this server, please upgrade your client to a "
+"Freeciv 2.1 or later."
 msgstr ""
 "Váš klient je příliš starý. Pro použití tohoto serveru, prosím 
aktualizujte "
-"klienta na CVS verzi novější než 2003-11-28 nebo Freeciv 1.15.0 nebo 
novější."
+"klienta na CVS verzi novější než 2003-11-28 nebo Freeciv 2.1 nebo 
novější."
 
 #: server/srv_main.c:1137
 #, c-format
Index: po/pt_BR.po
===
--- po/pt_BR.po (revision 13857)
+++ po/pt_BR.po (working copy)
@@ -5070,8 +5070,8 @@
 
 #: server/srv_main.c:1053
 msgid ""
-"Your client is too old. To use this server please upgrade your client to a "
-"Freeciv 2.0 or later."
+"Your client is too old. To use this server, please upgrade your client to a "
+"Freeciv 2.1 or later."
 msgstr ""
 
 #: server/srv_main.c:1137
Index: po/es.po
===
--- po/es.po(revision 13857)
+++ po/es.po(working copy)
@@ -5540,11 +5540,11 @@
 #: server/srv_main.c:1053
 #, fuzzy
 msgid ""
-"Your client is too old. To use this server please upgrade your client to a "
-"Freeciv 2.0 or later."
+"Your client is too old. To use this server, please upgrade your client to a "
+"Freeciv 2.1 or later."
 msgstr ""
 "Tu cliente es muy antiguo. Para usar este servidor actualiza tu cliente a la "
-"version CVS posterior 28-11-2003 or a Freeciv 2.0 o posterior."
+"version CVS posterior 28-11-2003 or a Freeciv 2.1 o posterior."
 
 #: server/srv_main.c:1137
 #, c-format
Index: po/ko.po
===
--- po/ko.po(revision 13857)
+++ po/ko.po(working copy)
@@ -4787,8 +4787,8 @@
 
 #: server/srv_main.c:1053
 msgid ""
-"Your client is too old. To use this server please upgrade your client to a "
-"Freeciv 2.0 or later."
+"Your client is too old. To use this server, please upgrade your client to a "
+"Freeciv 2.1 or later."
 msgstr ""
 
 #: server/srv_main.c:1137
Index: po/en_GB.po
===
--- po/en_GB.po (revision 13857)
+++ po/en_GB.po (working copy)
@@ -4798,8 +4798,8 @@
 
 #: server/srv_main.c:1053
 msgid ""
-"Your client is too old. To use this server please upgrade your client to a "
-"Freeciv 2.0 or later."
+"Your client is too old. To use this server, please upgrade your client to a "
+"Freeciv 2.1 or later."
 msgstr ""
 
 #: server/srv_main.c:1137
Index: po/no.po
===
--- po/no.po(revision 13857)
+++ po/no.po(working copy)
@@ -5378,11 +5378,11 @@
 #: server/srv_main.c:1053
 #, fuzzy
 msgid ""
-"Your client is too old. To use this server please upgrade your client to a "
-"Freeciv 2.0 or later."
+"Your client is too old. To use this server, please upgrade your client to a "
+"Freeciv 2.1 or later."
 msgstr ""
 "Din klient er for gammel. For å bruke denne serveren må du oppdatere din "
-"klient til en CVS versjon etter 2003-11-28 eller Freeciv 1.15.0 eller senere."
+"klient til en CVS versjon etter 2003-11-28 eller Freeciv 2.1 eller senere."
 
 #: server/srv_main.c:1137
 #, c-format
Index: po/hu.po
===
--- po/hu.po(revision 13857)
+++ po/hu.po(working copy)
@@ -5381,8 +5381,8 @@
 
 #: server/srv_main.c:1053
 msgid ""
-"Your client is too old. To use this server please upgrade your client to a "
-"Freeciv 2.0