<URL: 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 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/uk.po
===================================================================
--- po/uk.po    (revision 13857)
+++ po/uk.po    (working copy)
@@ -5282,8 +5282,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/ro.po
===================================================================
--- po/ro.po    (revision 13857)
+++ po/ro.po    (working copy)
@@ -5524,12 +5524,12 @@
 #: 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 ""
 "Versiunea clientului dumneavoastră este prea veche. Pentru a folosi acest "
 "server vă rugăm actualizaţi-vă clientul la o versiune de CVS ulterioară "
-"datei 2003-11-28 sau Freeciv 2.0 sau altă versiune ulterioară."
+"datei 2003-11-28 sau Freeciv 2.1 sau altă versiune ulterioară."
 
 #: server/srv_main.c:1137
 #, c-format
Index: po/ru.po
===================================================================
--- po/ru.po    (revision 13857)
+++ po/ru.po    (working copy)
@@ -5511,11 +5511,11 @@
 
 #: 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 ""
 "Ваш клиент слишком стар. Если Вы хотите 
использовать этот сервер, обновите "
-"ваш клиент до Freeciv версии 2.0 или выше."
+"ваш клиент до Freeciv версии 2.1 или выше."
 
 #: server/srv_main.c:1137
 #, c-format
Index: po/el.po
===================================================================
--- po/el.po    (revision 13857)
+++ po/el.po    (working copy)
@@ -5270,12 +5270,12 @@
 #: 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 ""
 "Ç åêäïóÞ óïõ åßíáé ðïëý ðáëßá. Ãéá íá ÷ñçóéìïðïéÞóåéò áõôüí ôïí åîõðçñåôçôÞ "
 "ðáñáêáëþ áíáâÜèìéóå ôïí ðåëÜôç óïõ óå ìéá CVS Ýêäïóç ýóôåñç áðü 2003-11-28 Þ "
-"Freeciv 2.0 Þ ìåôÜ."
+"Freeciv 2.1 Þ ìåôÜ."
 
 #: server/srv_main.c:1137
 #, c-format
Index: po/ar.po
===================================================================
--- po/ar.po    (revision 13857)
+++ po/ar.po    (working copy)
@@ -5170,11 +5170,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 ""
 "عميلك قديم جدا. لاستخدام هذا الخادم الرجاء 
التطوير العميل إلى اصدار CVS بعد "
-"2003-11-28 أو Freeciv 2.0 وبعد."
+"2003-11-28 أو Freeciv 2.1 وبعد."
 
 #: server/srv_main.c:1137
 #, c-format
Index: po/fr.po
===================================================================
--- po/fr.po    (revision 13857)
+++ po/fr.po    (working copy)
@@ -5555,11 +5555,11 @@
 
 #: 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 ""
 "Votre client est trop vieux. Pour utiliser ce serveur veuillez mettre votre "
-"client à jour avec une version Freeciv 2.0 ou ultérieure."
+"client à jour avec une version Freeciv 2.1 ou ultérieure."
 
 #: server/srv_main.c:1137
 #, c-format
Index: po/et.po
===================================================================
--- po/et.po    (revision 13857)
+++ po/et.po    (working copy)
@@ -5361,11 +5361,11 @@
 
 #: 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 ""
 "Su klient on liiga vana. Et seda serverit kasutada, pead uuendama oma "
-"kliendi versioonile Freeciv 2.0 või hilisemale."
+"kliendi versioonile Freeciv 2.1 või hilisemale."
 
 #: server/srv_main.c:1137
 #, c-format
Index: po/nl.po
===================================================================
--- po/nl.po    (revision 13857)
+++ po/nl.po    (working copy)
@@ -5437,11 +5437,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 ""
 "Uw client is te oud. Waardeer uw client op tot CVS versie 2003-11-28 of "
-"later of Freeciv 1.15.0 of later om deze server te gebruiken."
+"later of Freeciv 2.1 of later om deze server te gebruiken."
 
 #: server/srv_main.c:1137
 #, c-format
Index: po/pl.po
===================================================================
--- po/pl.po    (revision 13857)
+++ po/pl.po    (working copy)
@@ -5505,11 +5505,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 ""
 "Twój klient jest zbyt stary. Aby wejść na ten serwer musisz używać 
klienta w "
-"wersji co najmniej 1.15.0. (Lub z CVS'a po 18.11.2003)."
+"wersji co najmniej 2.1."
 
 #: server/srv_main.c:1137
 #, c-format
Index: po/it.po
===================================================================
--- po/it.po    (revision 13857)
+++ po/it.po    (working copy)
@@ -5531,12 +5531,12 @@
 #: 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 ""
 "Il tuo client è troppo vecchio. Per utilizzare questo server per favore "
 "passa ad una versione più recente del client. Sono compatibili le versioni "
-"ottenute dal CVS dopo il 28 novembre 2003 oppure la versione 2.0.0 di "
+"ottenute dal CVS dopo il 28 novembre 2003 oppure la versione 2.1 di "
 "Freeciv o successiva."
 
 #: server/srv_main.c:1137
Index: po/lt.po
===================================================================
--- po/lt.po    (revision 13857)
+++ po/lt.po    (working copy)
@@ -5000,12 +5000,12 @@
 #: 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 ""
 "Jūsų klientas yra per senas. Kad galėtumėte prisijungti prie šio 
serverio, "
 "prašome atsinaujinti savo klientą iš CVS į naujesnį nei 2003-11-28 arba "
-"Freeciv 1.15.0 ir naujesnį."
+"Freeciv 2.1 ir naujesnį."
 
 #: server/srv_main.c:1137
 #, c-format
Index: po/pt.po
===================================================================
--- po/pt.po    (revision 13857)
+++ po/pt.po    (working copy)
@@ -5306,8 +5306,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/ca.po
===================================================================
--- po/ca.po    (revision 13857)
+++ po/ca.po    (working copy)
@@ -5425,11 +5425,11 @@
 
 #: 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 ""
 "El teu client és massa antic. Per utilitzar aquest servidor actualitza si us 
"
-"plau el teu client a Freeciv 2.0 o posterior."
+"plau el teu client a Freeciv 2.1 o posterior."
 
 #: server/srv_main.c:1137
 #, c-format
Index: po/da.po
===================================================================
--- po/da.po    (revision 13857)
+++ po/da.po    (working copy)
@@ -5434,11 +5434,11 @@
 
 #: 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 ""
 "Din klient er for gammel. For at anvende denne server skal du opgradere din "
-"klient til Freeciv 2.0 eller senere."
+"klient til Freeciv 2.1 eller senere."
 
 #: server/srv_main.c:1137
 #, c-format
Index: po/tr.po
===================================================================
--- po/tr.po    (revision 13857)
+++ po/tr.po    (working copy)
@@ -5019,8 +5019,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/fa.po
===================================================================
--- po/fa.po    (revision 13857)
+++ po/fa.po    (working copy)
@@ -4799,8 +4799,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/de.po
===================================================================
--- po/de.po    (revision 13857)
+++ po/de.po    (working copy)
@@ -5512,11 +5512,11 @@
 
 #: 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 ""
 "Ihr Client ist zu alt. Um diesen Server zu benutzen, benötigen SieFreeciv "
-"Version 2.0 oder neuer."
+"Version 2.1 oder neuer."
 
 # EH: Diese Fehlermeldung sollte mE nicht übersetzt werden.
 #: server/srv_main.c:1137
Index: po/sv.po
===================================================================
--- po/sv.po    (revision 13857)
+++ po/sv.po    (working copy)
@@ -5460,11 +5460,11 @@
 
 #: 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 ""
 "Din klient är för gammal. För att använda denna server måste du 
uppgradera "
-"till Freeciv 2.0 eller senare."
+"till Freeciv 2.1 eller senare."
 
 #: server/srv_main.c:1137
 #, c-format
Index: po/ja.po
===================================================================
--- po/ja.po    (revision 13857)
+++ po/ja.po    (working copy)
@@ -5807,10 +5807,10 @@
 # clefs
 #: 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 ""
-"あなたのクライアントは古すぎます。このサーバでプレイするには,Freeciv
 2.0以降"
+"あなたのクライアントは古すぎます。このサーバでプレイするには,Freeciv
 2.1以降"
 
"のクライアントにアップグレードしてください。クライアントのアップグレードには
 "
 "1 クライアントあたり 0 円が必要です。"
 
Index: po/he.po
===================================================================
--- po/he.po    (revision 13857)
+++ po/he.po    (working copy)
@@ -4808,8 +4808,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/fi.po
===================================================================
--- po/fi.po    (revision 13857)
+++ po/fi.po    (working copy)
@@ -5550,11 +5550,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 ""
 "Asiakasohjelmasi on liian vanha. Ole hyvä ja päivitä ohjelmasi joko "
-"vähintään Freeciv-versioon 2.0 tai CVS-versioon, joka ei ole 28.11.2003:a "
+"vähintään Freeciv-versioon 2.1 tai CVS-versioon, joka ei ole 28.11.2003:a "
 "vanhempi."
 
 #: server/srv_main.c:1137
Index: po/zh_CN.po
===================================================================
--- po/zh_CN.po (revision 13857)
+++ po/zh_CN.po (working copy)
@@ -5164,11 +5164,11 @@
 
 #: 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 ""
 "ÄúµÄ¿Í»§¶ËÌ«¾ÉÁË¡£ÒªÊ¹Óô˷þÎñÆ÷ÇëÉý¼¶ÄúµÄ¿Í»§¶ËΪÍíÓÚ2003-11-28µÄCVS°æ±¾»ò "
-"Freeciv 2.0 »ò¸ü¸ß¡£"
+"Freeciv 2.1 »ò¸ü¸ß¡£"
 
 #: server/srv_main.c:1137
 #, c-format
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to