Author: cazfi
Date: Wed Feb 25 23:16:40 2015
New Revision: 28316

URL: http://svn.gna.org/viewcvs/freeciv?rev=28316&view=rev
Log:
Changed spelling of happyborders option value "disable" to "disabled" to match 
other similar
options.

See bug #23279

Modified:
    branches/S2_6/data/civ2civ3/game.ruleset
    branches/S2_6/server/settings.c

Modified: branches/S2_6/data/civ2civ3/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/game.ruleset?rev=28316&r1=28315&r2=28316&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/game.ruleset    (original)
+++ branches/S2_6/data/civ2civ3/game.ruleset    Wed Feb 25 23:16:40 2015
@@ -688,7 +688,7 @@
       "sciencebox", 100
       "borders", "ENABLED"
       "foggedborders", "ENABLED"
-      "happyborders", "DISABLE"
+      "happyborders", "DISABLED"
       "restrictinfra", "ENABLED"
       "unreachableprotects", "DISABLED"
       "onsetbarbs", 120

Modified: branches/S2_6/server/settings.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/settings.c?rev=28316&r1=28315&r2=28316&view=diff
==============================================================================
--- branches/S2_6/server/settings.c     (original)
+++ branches/S2_6/server/settings.c     Wed Feb 25 23:16:40 2015
@@ -353,7 +353,7 @@
 static const struct sset_val_name *happyborders_name(int happyborders)
 {
   switch (happyborders) {
-  NAME_CASE(HB_DISABLED, "DISABLE", N_("Borders are not helping"));
+  NAME_CASE(HB_DISABLED, "DISABLED", N_("Borders are not helping"));
   NAME_CASE(HB_NATIONAL, "NATIONAL", N_("Happy within own borders"));
   NAME_CASE(HB_ALLIANCE, "ALLIED", N_("Happy within allied borders"));
   }


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to