Re: [Freeciv-Dev] (PR#39842) rulesetdir in already started game and bounds_check_nation

Mon, 03 Dec 2007 15:49:35 -0800 

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39842 >

The first part of your patch: something similar had already been applied in
2.2/trunk!

The second part of your patch: actually needed 5 of them, and there's no
good reason to print out the same number that was logged the line before in
bounds_check_nation....  (See the end of the patch.)

The missing part of the patch needed to check the game state.  So, made
the test order the same as in debug and load commands.  (Top of patch.)

While comparing stdinhand between branches, discovered translation errors
that had already been fixed in 2.2/trunk: canceled, and a missing _().
Backported to 2.1.

Also, found some more 2.1 msgid updates for PR#39943.

Committed S2_1 revision 14125 with po updates.
Committed S2_2 revision 14126.
Committed trunk revision 14127.


Index: server/stdinhand.c
===================================================================
--- server/stdinhand.c  (revision 14124)
+++ server/stdinhand.c  (working copy)
@@ -1005,7 +1005,7 @@
   if (is_restricted(caller) && !from_cmdline) {
     if (!is_safe_filename(serv_filename)) {
       cmd_reply(CMD_READ_SCRIPT, caller, C_FAIL,
-                _("Name \"%s\" disallowed for security reasons."), 
+                _("Name \"%s\" disallowed for security reasons."),
                 serv_filename);
       return FALSE;
     }
@@ -1146,8 +1146,9 @@
 static bool write_command(struct connection *caller, char *arg, bool check)
 {
   if (is_restricted(caller)) {
-    cmd_reply(CMD_WRITE_SCRIPT, caller, C_OK, _("You cannot use the write "
-              "command on this server for security reasons."));
+    cmd_reply(CMD_WRITE_SCRIPT, caller, C_FAIL,
+              _("You cannot use the write command on this server"
+              " for security reasons."));
     return FALSE;
   } else if (!check) {
     write_init_script(arg);
@@ -2236,7 +2237,7 @@
 }
 
 /******************************************************************
-  ...
+  Turn on selective debugging.
 ******************************************************************/
 static bool debug_command(struct connection *caller, char *str, 
                           bool check)
@@ -3216,9 +3217,16 @@
     cmd_reply(CMD_LOAD, caller, C_FAIL, _("Usage: load <game name>"));
     return FALSE;
   }
+  if (S_S_INITIAL != server_state()) {
+    cmd_reply(CMD_LOAD, caller, C_FAIL,
+              _("Cannot load a game while another is running."));
+    send_load_game_info(FALSE);
+    return FALSE;
+  }
   if (!is_safe_filename(filename) && is_restricted(caller)) {
-    cmd_reply(CMD_LOAD, caller, C_FAIL, _("Name \"%s\" disallowed for "
-              "security reasons."), filename);
+    cmd_reply(CMD_LOAD, caller, C_FAIL,
+              _("Name \"%s\" disallowed for security reasons."),
+              filename);
     return FALSE;
   }
   {
@@ -3247,13 +3255,6 @@
     }
   }
 
-  if (S_S_INITIAL != server_state()) {
-    cmd_reply(CMD_LOAD, caller, C_FAIL, _("Cannot load a game while another "
-                                          "is running."));
-    send_load_game_info(FALSE);
-    return FALSE;
-  }
-
   /* attempt to parse the file */
 
   if (!section_file_load_nodup(&file, arg)) {
@@ -3314,7 +3315,7 @@
   Load rulesets from a given ruleset directory.
 
   Security: There are some rudimentary checks in load_rulesets() to see
-  if this directory realls is a viable ruleset directory. For public
+  if this directory really is a viable ruleset directory. For public
   servers, we check against directory redirection (is_safe_filename) and
   other bad stuff in the directory name, and will only use directories
   inside the data directories.
@@ -3327,13 +3328,19 @@
              _("Current ruleset directory is \"%s\""), game.rulesetdir);
     return FALSE;
   }
+  if (S_S_INITIAL != server_state()) {
+    cmd_reply(CMD_RULESETDIR, caller, C_FAIL,
+              _("This setting can't be modified after the game has started."));
+    return FALSE;
+  }
   if (is_restricted(caller)
       && (!is_safe_filename(str) || strchr(str, '.'))) {
     cmd_reply(CMD_RULESETDIR, caller, C_SYNTAX,
-             _("Ruleset directory name \"%s\" disallowed for security "
-               "reasons."), str);
+              _("Name \"%s\" disallowed for security reasons."),
+              str);
     return FALSE;
   }  
+
   my_snprintf(filename, sizeof(filename), "%s", str);
   pfilename = datafilename(filename);
   if (!pfilename) {
@@ -3476,8 +3483,7 @@
      * vote command. You can only have one vote at a time. */
     if (votes[idx].command[0] != '\0') {
       cmd_reply(CMD_VOTE, caller, C_COMMENT,
-               _("Your new vote cancelled your "
-                 "previous vote."));
+               _("Your new vote canceled your previous vote."));
       votes[idx].command[0] = '\0';
     }
 
@@ -3494,8 +3500,9 @@
       check_vote(&votes[idx]); /* update vote numbers, maybe auto-accept */
       return TRUE;
     } else {
-      cmd_reply(CMD_VOTE, caller, C_FAIL, "Your new vote (\"%s\") was not "
-                "legal or was not recognized.", full_command);
+      cmd_reply(CMD_VOTE, caller, C_FAIL,
+                _("Your new vote (\"%s\") was not legal or was not 
recognized."),
+                full_command);
       return FALSE;
     }
   }
Index: server/plrhand.c
===================================================================
--- server/plrhand.c    (revision 14124)
+++ server/plrhand.c    (working copy)
@@ -614,7 +614,7 @@
                   nation_plural_for_player(pplayer2),
                   diplstate_text(new_type));
   notify_player(pplayer2, NULL, E_TREATY_BROKEN,
-                  _(" %s cancelled the diplomatic agreement! "
+                  _(" %s canceled the diplomatic agreement! "
                     "The diplomatic state between the %s and the %s "
                     "is now %s."), pplayer->name,
                   nation_plural_for_player(pplayer2),
Index: po/cs.po
===================================================================
--- po/cs.po    (revision 14124)
+++ po/cs.po    (working copy)
@@ -467,7 +467,7 @@
 msgstr ""
 
 #: common/events.c:125
-msgid "Unit: Became More Veteran"
+msgid "Unit: Promoted to Veteran"
 msgstr ""
 
 #: common/events.c:126
@@ -3648,7 +3648,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 " %s zrušili diplomatické dohody! Diplomatický stav mezi %s a %s je nyní 
%s."
@@ -6400,7 +6400,7 @@
 msgstr "Neznamý příkaz.  Zkuste '%shelp'."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "Váš nový hlas zrušil vaše předchozí hlasování."
 
 #: server/stdinhand.c:3488
Index: po/pt_BR.po
===================================================================
--- po/pt_BR.po (revision 14124)
+++ po/pt_BR.po (working copy)
@@ -3540,7 +3540,7 @@
 #: server/plrhand.c:617
 #, fuzzy, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 "Jogo:  %s cancelam o acordo diplomático! O estado diplomático entre os %s e 
"
@@ -6106,7 +6106,7 @@
 msgstr "Comando desconhecido.  Consulte '%shelp'."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr ""
 
 #: server/stdinhand.c:3488
Index: po/es.po
===================================================================
--- po/es.po    (revision 14124)
+++ po/es.po    (working copy)
@@ -3688,7 +3688,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 "¡%s ha cancelado el acuerdo diplomático! El estado diplomático entre los %s "
@@ -6550,7 +6550,7 @@
 msgstr "Comando desconocido.  Prueba '%shelp'."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "Tu nuevo voto ha cancelado el previo."
 
 #: server/stdinhand.c:3488
Index: po/ko.po
===================================================================
--- po/ko.po    (revision 14124)
+++ po/ko.po    (working copy)
@@ -3322,7 +3322,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 
@@ -5740,7 +5740,7 @@
 msgstr ""
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr ""
 
 #: server/stdinhand.c:3488
Index: po/en_GB.po
===================================================================
--- po/en_GB.po (revision 14124)
+++ po/en_GB.po (working copy)
@@ -3331,7 +3331,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 " %s cancelled the diplomatic agreement! The diplomatic state between the %s "
@@ -5751,7 +5751,7 @@
 msgstr ""
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "Your new vote cancelled your previous vote."
 
 #: server/stdinhand.c:3488
Index: po/no.po
===================================================================
--- po/no.po    (revision 14124)
+++ po/no.po    (working copy)
@@ -436,7 +436,8 @@
 msgstr "Enhet: Forsvarer overlevde"
 
 #: common/events.c:125
-msgid "Unit: Became More Veteran"
+#, fuzzy
+msgid "Unit: Promoted to Veteran"
 msgstr "Enhet: Ble mer erfaren veteran"
 
 #: common/events.c:126
@@ -3606,7 +3607,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 "%s avbrøt den diplomatiske avtalen! Det diplomatiske forholdet mellom %s og %"
@@ -6367,7 +6368,7 @@
 msgstr "Ukjent kommando.  Forsøk '%shelp'."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "Din nye stemme endret din tidligere stemme."
 
 #: server/stdinhand.c:3488
Index: po/hu.po
===================================================================
--- po/hu.po    (revision 14124)
+++ po/hu.po    (working copy)
@@ -425,7 +425,7 @@
 msgstr "Egység: Védõ túlélése"
 
 #: common/events.c:125
-msgid "Unit: Became More Veteran"
+msgid "Unit: Promoted to Veteran"
 msgstr ""
 
 #: common/events.c:126
@@ -3631,7 +3631,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 "Játék:  %s megszegte az egyezményt! A(z) %s és a(z) %s között a diplomáciai "
@@ -6398,7 +6398,7 @@
 msgstr "Ismeretlen parancs.  Próbálkozz '%shelp'-pel!"
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr ""
 
 #: server/stdinhand.c:3488
Index: po/uk.po
===================================================================
--- po/uk.po    (revision 14124)
+++ po/uk.po    (working copy)
@@ -423,7 +423,7 @@
 msgstr "ð¦ÄÒÏÚĦÌ: úÁÈÉÓÎÉË ×æ̦×"
 
 #: common/events.c:125
-msgid "Unit: Became More Veteran"
+msgid "Unit: Promoted to Veteran"
 msgstr ""
 
 #: common/events.c:126
@@ -3576,7 +3576,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 "çÒÁ:  %s ÐÅÒÅÒ×Á× Ä¦ÐÌÏÍÁÔÉÞΦ ÕÇÏÄÉ! äÉÐÌÏÍÁÔÉÞÎÉÊ ÓÔÁÎ Í¦Ö %s ÔÁ %s "
@@ -6285,7 +6285,7 @@
 msgstr "îÅצÄÏÍÁ ËÏÍÁÎÄÁ. óÐÒÏÂÕÊÔÅ '%shelp'."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr ""
 
 #: server/stdinhand.c:3488
Index: po/ro.po
===================================================================
--- po/ro.po    (revision 14124)
+++ po/ro.po    (working copy)
@@ -3681,7 +3681,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 "%s a anulat înţelegerea! Starea diplomatică între %s şi %s este acum %s."
@@ -6521,7 +6521,7 @@
 msgstr "Comandă necunoscută.  Încearcaţi '%shelp'."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "Noul vot l-a anulat pe cel precedent."
 
 #: server/stdinhand.c:3488
Index: po/ru.po
===================================================================
--- po/ru.po    (revision 14124)
+++ po/ru.po    (working copy)
@@ -432,7 +432,8 @@
 msgstr "Соедининение: защитник выжил"
 
 #: common/events.c:125
-msgid "Unit: Became More Veteran"
+#, fuzzy
+msgid "Unit: Promoted to Veteran"
 msgstr "Соединение: получен новый ветеранский 
уровень"
 
 #: common/events.c:126
@@ -3707,7 +3708,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 "%s разорвали договор! Дипломатическое 
состояние между %s и %s сейчас %s."
@@ -6521,7 +6522,7 @@
 msgstr "Неизвестная команда. Попробуйте '%shelp'."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "Ваше новое голосование отменяет 
предыдущее голосование."
 
 #: server/stdinhand.c:3488
Index: po/el.po
===================================================================
--- po/el.po    (revision 14124)
+++ po/el.po    (working copy)
@@ -422,7 +422,8 @@
 msgstr "ÌïíÜäá:"
 
 #: common/events.c:125
-msgid "Unit: Became More Veteran"
+#, fuzzy
+msgid "Unit: Promoted to Veteran"
 msgstr "ÌïíÜäá:"
 
 #: common/events.c:126
@@ -3473,7 +3474,7 @@
 #: server/plrhand.c:617
 #, fuzzy, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 " %s áêýñùóå ôç äéðëùìáôéêÞ óõìöùíßá! ÐëÝïí ç äéðëùìáôéêÞ êáôÜóôáóç áíÜìåóá "
@@ -6235,7 +6236,7 @@
 msgstr ""
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr ""
 
 #: server/stdinhand.c:3488
Index: po/ar.po
===================================================================
--- po/ar.po    (revision 14124)
+++ po/ar.po    (working copy)
@@ -418,7 +418,8 @@
 msgstr "الوحدة: تم نجاة المدافع"
 
 #: common/events.c:125
-msgid "Unit: Became More Veteran"
+#, fuzzy
+msgid "Unit: Promoted to Veteran"
 msgstr "الوحدة: أصبح أكثر خبرة"
 
 #: common/events.c:126
@@ -3522,7 +3523,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 "الغى  %s الاتفاقية الدبلوماسية! الحالة 
الدبلوماسية بين ال %s و ال %s هي اﻵن %"
@@ -6139,7 +6140,7 @@
 msgstr "الأمر مجهول.  حاول '%shelp'."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "الغى تصويتك القديم تصويتك السابق."
 
 #: server/stdinhand.c:3488
Index: po/fr.po
===================================================================
--- po/fr.po    (revision 14124)
+++ po/fr.po    (working copy)
@@ -3712,7 +3712,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 " %s a rompu le pacte ! Les relations diplomatiques entre les %s et les %s "
@@ -6572,7 +6572,7 @@
 msgstr "Commande inconnue. Essayez \"%shelp\"."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "Votre nouveau vote a annulé le précédent."
 
 #: server/stdinhand.c:3488
Index: po/et.po
===================================================================
--- po/et.po    (revision 14124)
+++ po/et.po    (working copy)
@@ -3592,7 +3592,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr " %s lõpetasid leppe! %s ja %s diplomaatiline suhe on nüüd %s."
 
@@ -6343,7 +6343,7 @@
 msgstr "Tundmatu käsk.  Vaata '%shelp'"
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "Sinu uus hääletus anulleeris su eelmise hääletuse."
 
 #: server/stdinhand.c:3488
Index: po/nl.po
===================================================================
--- po/nl.po    (revision 14124)
+++ po/nl.po    (working copy)
@@ -418,7 +418,8 @@
 msgstr "Eenheid: Verdediger overleefde"
 
 #: common/events.c:125
-msgid "Unit: Became More Veteran"
+#, fuzzy
+msgid "Unit: Promoted to Veteran"
 msgstr "Eenheid: Werd meer veteraan"
 
 #: common/events.c:126
@@ -3639,7 +3640,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 "%s beëindigde de politieke overeenkomst! De diplomatieke toestand tussen de %"
@@ -6421,7 +6422,7 @@
 msgstr "Onbekende opdracht. Probeer '%shelp'."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "Uw nieuwe stem annuleerde uw vorige stem."
 
 #: server/stdinhand.c:3488
Index: po/pl.po
===================================================================
--- po/pl.po    (revision 14124)
+++ po/pl.po    (working copy)
@@ -472,7 +472,7 @@
 msgstr ""
 
 #: common/events.c:125
-msgid "Unit: Became More Veteran"
+msgid "Unit: Promoted to Veteran"
 msgstr ""
 
 #: common/events.c:126
@@ -3714,7 +3714,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 "%s zerwał(a) porozumienie dyplomatyczne! Stanem dyplomatycznym między %s i 
%"
@@ -6500,7 +6500,7 @@
 msgstr "Nieznana komenda.  Spróbuj '%shelp'."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "Twój nowy głos unieważnił poprzedni."
 
 #: server/stdinhand.c:3488
Index: po/it.po
===================================================================
--- po/it.po    (revision 14124)
+++ po/it.po    (working copy)
@@ -428,7 +428,8 @@
 msgstr "Unità: difensore sopravvissuto"
 
 #: common/events.c:125
-msgid "Unit: Became More Veteran"
+#, fuzzy
+msgid "Unit: Promoted to Veteran"
 msgstr "Unità: acquisita più esperienza"
 
 #: common/events.c:126
@@ -3681,7 +3682,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 "Gioco: gli %s hanno cancellato l'accordo diplomatico! Lo stato diplomatico "
@@ -6546,7 +6547,7 @@
 msgstr "Comando sconosciuto.  Provate '%shelp'."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "Il tuo nuovo voto ha cancellato il tuo voto precedente."
 
 #: server/stdinhand.c:3488
Index: po/lt.po
===================================================================
--- po/lt.po    (revision 14124)
+++ po/lt.po    (working copy)
@@ -418,7 +418,8 @@
 msgstr "Dalinys: Gynėjas išgyveno"
 
 #: common/events.c:125
-msgid "Unit: Became More Veteran"
+#, fuzzy
+msgid "Unit: Promoted to Veteran"
 msgstr "Dalinys: Gavo daugiau veterano taškų"
 
 #: common/events.c:126
@@ -3508,7 +3509,7 @@
 #: server/plrhand.c:617
 #, fuzzy, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 " %s atšaukė diplomatinį susitarimą! Diplomatinė būsena tarp %s ir %s 
dabar "
@@ -5963,7 +5964,7 @@
 msgstr "Nežinoma komanda. Bandykite '%shelp'."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "Jūsų naujas balsas panaikino ankstesnį jūsų balsą."
 
 #: server/stdinhand.c:3488
Index: po/ca.po
===================================================================
--- po/ca.po    (revision 14124)
+++ po/ca.po    (working copy)
@@ -3656,7 +3656,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 " %s ha cancel·lat el tractat diplomàtic! L'estat diplomàtic entre %s i %s "
@@ -6459,7 +6459,7 @@
 msgstr "Comanda desconeguda.  Prova '%shelp'."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "El teu nou vot ha cancel·lat l'anterior."
 
 #: server/stdinhand.c:3488
Index: po/pt.po
===================================================================
--- po/pt.po    (revision 14124)
+++ po/pt.po    (working copy)
@@ -3585,7 +3585,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 "Jogo:  %s cancelam o acordo diplomático! O estado diplomático entre os %s e 
"
@@ -6318,7 +6318,7 @@
 msgstr "Comando desconhecido.  Consulte '%shelp'."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr ""
 
 #: server/stdinhand.c:3488
Index: po/da.po
===================================================================
--- po/da.po    (revision 14124)
+++ po/da.po    (working copy)
@@ -3639,7 +3639,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 "Folkeslaget %s afbrød den diplomatiske aftale! Det diplomatiske forhold "
@@ -6415,7 +6415,7 @@
 msgstr "Ukendt kommando. Prøv '%shelp'."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "Din nye stemmeafgivning afløser din tidligere. "
 
 #: server/stdinhand.c:3488
Index: po/tr.po
===================================================================
--- po/tr.po    (revision 14124)
+++ po/tr.po    (working copy)
@@ -3543,7 +3543,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr " %s antlaşmayı bozdu! %s ve %s arasındaki diplomatik durum artık 
%s."
 
@@ -6194,7 +6194,7 @@
 msgstr ""
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "Yeni oyunuz önceki oyunuzu iptal etti."
 
 #: server/stdinhand.c:3488
Index: po/fa.po
===================================================================
--- po/fa.po    (revision 14124)
+++ po/fa.po    (working copy)
@@ -3334,7 +3334,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 "%s قرارداد دیپلماتیک را لغو کرد! وضعیت 
دیپلماتیک بین %s و %s اکنون %s است."
@@ -5753,7 +5753,7 @@
 msgstr ""
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr ""
 
 #: server/stdinhand.c:3488
Index: po/de.po
===================================================================
--- po/de.po    (revision 14124)
+++ po/de.po    (working copy)
@@ -3708,7 +3708,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 "Die %s haben das Abkommen gekündigt! Zwischen den %s und den %s herrscht nun 
"
@@ -6505,7 +6505,7 @@
 msgstr "Unbekannter Befehl. '%shelp' gibt nähere Informationen."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "Deine Wahl wurde abgeändert."
 
 #: server/stdinhand.c:3488
Index: po/sv.po
===================================================================
--- po/sv.po    (revision 14124)
+++ po/sv.po    (working copy)
@@ -3670,7 +3670,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 "%s avbröt det diplomatiska samförståndet; %s och %s befinner sig nu i %s."
@@ -6435,7 +6435,7 @@
 msgstr "Okänt kommando. Försök med \"%shelp\"."
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "Din nya röst nollställde din tidigare röst."
 
 #: server/stdinhand.c:3488
Index: po/ja.po
===================================================================
--- po/ja.po    (revision 14124)
+++ po/ja.po    (working copy)
@@ -3954,7 +3954,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr "%sは外交条約を破棄しました! 
%sと%sの外交状態はいま%sです。"
 
@@ -6871,7 +6871,7 @@
 
 # clefs
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "再投票したので，前回の票は無効になります。"
 
 # clefs
Index: po/he.po
===================================================================
--- po/he.po    (revision 14124)
+++ po/he.po    (working copy)
@@ -420,7 +420,8 @@
 msgstr "יחידה: יחידת־מגן שרדה"
 
 #: common/events.c:125
-msgid "Unit: Became More Veteran"
+#, fuzzy
+msgid "Unit: Promoted to Veteran"
 msgstr "יחידה: הפכה יותר וותיקת קרבות"
 
 #: common/events.c:126
@@ -3343,7 +3344,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 
@@ -5761,7 +5762,7 @@
 msgstr ""
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr ""
 
 #: server/stdinhand.c:3488
Index: po/fi.po
===================================================================
--- po/fi.po    (revision 14124)
+++ po/fi.po    (working copy)
@@ -3707,7 +3707,7 @@
 #: server/plrhand.c:617
 #, fuzzy, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 "%s peruutti diplomaattisen sopimuksen - %s ja %s toteavat, että kansojen "
@@ -6553,7 +6553,7 @@
 
 #: server/stdinhand.c:3479
 #, fuzzy
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "Uusi äänesi peruutti edellisen äänesi."
 
 #: server/stdinhand.c:3488
Index: po/zh_CN.po
===================================================================
--- po/zh_CN.po (revision 14124)
+++ po/zh_CN.po (working copy)
@@ -3479,7 +3479,7 @@
 #: server/plrhand.c:617
 #, c-format
 msgid ""
-" %s cancelled the diplomatic agreement! The diplomatic state between the %s "
+" %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr "%s È¡ÏûÁËÍ⽻Э¶¨£¡ %s ºÍ %s ¼äµÄÍ⽻״̬ÏÖÔÚΪ %s¡£"
 
@@ -6135,7 +6135,7 @@
 msgstr "δ֪µÄÃüÁî¡£ÊÔÓá°%shelp¡±¡£"
 
 #: server/stdinhand.c:3479
-msgid "Your new vote cancelled your previous vote."
+msgid "Your new vote canceled your previous vote."
 msgstr "ÄúµÄÐÂͶƱȡÏûÁËÄúÒÔÇ°µÄͶƱ¡£"
 
 #: server/stdinhand.c:3488
Index: common/nation.c
===================================================================
--- common/nation.c     (revision 14124)
+++ common/nation.c     (working copy)
@@ -46,14 +46,18 @@
                                int loglevel, const char *func_name)
 {
   if (game.control.nation_count == 0) {
-    freelog(loglevel, "%s before nations setup", func_name);
+    freelog(loglevel, "%s() called before nations setup", func_name);
     return FALSE;
   }
+  if (NULL == pnation) {
+    freelog(loglevel, "%s() has NULL nation", func_name);
+    return FALSE;
+  }
   if (pnation->index < 0
       || pnation->index >= game.control.nation_count
       || &nations[pnation->index] != pnation) {
-    freelog(loglevel, "Bad nation id %d (count %d) in %s",
-           pnation->index, game.control.nation_count, func_name);
+    freelog(loglevel, "%s() has bad nation index %d (count %d)",
+           func_name, pnation->index, game.control.nation_count);
     return FALSE;
   }
   return TRUE;
@@ -166,7 +170,7 @@
 bool is_nation_playable(const struct nation_type *nation)
 {
   if (!bounds_check_nation(nation, LOG_FATAL, "is_nation_playable")) {
-    die("wrong nation %d", nation->index);
+    die("bad nation");
   }
   return nation->is_playable;
 }
@@ -180,7 +184,7 @@
 bool is_nation_barbarian(const struct nation_type *nation)
 {
   if (!bounds_check_nation(nation, LOG_FATAL, "is_nation_barbarian")) {
-    die("wrong nation %d", nation->index);
+    die("bad nation");
   }
   return nation->is_barbarian;
 }
@@ -192,7 +196,7 @@
 struct leader *get_nation_leaders(const struct nation_type *nation, int *dim)
 {
   if (!bounds_check_nation(nation, LOG_FATAL, "get_nation_leader_names")) {
-    die("wrong nation %d", nation->index);
+    die("bad nation");
   }
   *dim = nation->leader_count;
   return nation->leaders;
@@ -252,7 +256,7 @@
 {
   assert(plr != NULL);
   if (!bounds_check_nation(plr->nation, LOG_FATAL, "nation_of_player")) {
-    die("wrong nation %d", plr->nation->index);
+    die("bad nation");
   }
   return plr->nation;
 }
@@ -395,7 +399,7 @@
 int city_style_of_nation(const struct nation_type *pnation)
 {
   if (!bounds_check_nation(pnation, LOG_FATAL, "city_style_of_nation")) {
-    die("wrong nation %d", pnation->index);
+    die("bad nation");
   }
   return pnation->city_style;
 }

_______________________________________________
Freeciv-dev mailing list
[email protected]
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to