[Freeciv-Dev] (PR#16642) British English in source

["Daniel Markstedt" <himasaram@xxxxxxxx>]

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

Minimal patch that changes two instances of "cancelled" to "canceled". 

Should be applied to TRUNK only to avoid fuzzying S2_1 l10ns.

-Daniel

Index: server/stdinhand.c
===================================================================
--- server/stdinhand.c  (revision 11887)
+++ server/stdinhand.c  (working copy)
@@ -3438,7 +3438,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 "
+               _("Your new vote canceled your "
                  "previous vote."));
       votes[idx].command[0] = '\0';
     }
Index: server/plrhand.c
===================================================================
--- server/plrhand.c    (revision 11887)
+++ server/plrhand.c    (working copy)
@@ -616,7 +616,7 @@
                   get_nation_name_plural(pplayer2->nation),
                   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,
                   get_nation_name_plural(pplayer2->nation),