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

William Allen Simpson wrote:
> 3: Unused entries in file data/default/nations.ruleset:
> 3:   unused entry: nation_barbarian.is_observer
> 3:   unused entry: nation_bosnia.ciwilwar_nations
> 3:   unused entry: nation_bosnia.ciwilwar_nations,1
> 3:   unused entry: nation_texan.conflicting_nations
> 3:   unused entry: nation_texan.conflicting_nations,1
> 
> That's probably civil instead of ciwil!
> 
Couldn't figure out what to do about is_observer.  Here's the first
installment on trivial nation fixes for 2.1.0b4 and trunk.

--- ../bosnia.ruleset   Sun Feb 18 23:01:53 2007
+++ data/nation/bosnia.ruleset  Fri May 18 15:09:25 2007
@@ -23,6 +23,7 @@
 city_style = "European"
 
 ruler_titles = { "government",      "male_title",      "female_title"
+                ; /* TRANS: Ban = Duke */
                 "Despotism",       _("Ban"),          _("Ban")
                 "Monarchy",        _("King"),         _("Queen")
                  "Republic",        _("President"),    _("President")
@@ -34,7 +35,7 @@
 init_government="Despotism"
 init_units=""
 
-ciwilwar_nations="croatian", "serbian"
+civilwar_nations="croatian", "serbian"
 
 cities =
  "Sarajevo",
--- ../texan.ruleset    Sun Feb 18 23:01:53 2007
+++ data/nation/texan.ruleset   Fri May 18 15:03:20 2007
@@ -4,7 +4,7 @@
 plural=_("?plural:Texans")
 groups="American"
 legend=_("Texas is second largest and second most populous state of the\
- USA, famous for it's \"larger than life\" cowboy mentality.")
+ USA, famous for its \"larger than life\" cowboy mentality.")
 leader=
  "Sam Houston",
  "Stephen F. Austin",
@@ -16,8 +16,8 @@
 flag_alt = "usa"
 city_style = "European"
 ruler_titles = { "government",      "male_title",      "female_title"
-                 "Republic",        _("Governor"),      _("Governor")
-                 "Fundamentalism",  _("Reverend"),      _("Reverend")
+                 "Republic",        _("Governor"),      _("?female:Governor")
+                 "Fundamentalism",  _("Reverend"),      _("?female:Reverend")
                }
 
 init_techs=""
@@ -25,7 +25,7 @@
 init_government="Despotism"
 init_units=""
 
-conflicting_nations="american", "chilean" ; Latter because of similar flags
+conflicts_with="american", "chilean" ; Latter because of similar flags
 civilwar_nations="american", "mexican"
 
 cities =
Index: azeri.ruleset
===================================================================
--- azeri.ruleset       (revision 12962)
+++ azeri.ruleset       (working copy)
@@ -46,7 +46,7 @@
 init_government="Despotism"
 init_units=""
 
-conflict_with="soviet"
+conflicts_with="soviet"
 civilwar_nations="turk", "persian", "armenian"
 
 ; http://de.wikipedia.org/wiki/Liste_der_Städte_in_Aserbaidschan
Index: texan.ruleset
===================================================================
--- texan.ruleset       (revision 12962)
+++ texan.ruleset       (working copy)
@@ -4,7 +4,7 @@
 plural=_("?plural:Texans")
 groups="American"
 legend=_("Texas is second largest and second most populous state of the\
- USA, famous for it's \"larger than life\" cowboy mentality.")
+ USA, famous for its \"larger than life\" cowboy mentality.")
 leader=
  "Sam Houston",
  "Stephen F. Austin",
Index: purhepecha.ruleset
===================================================================
--- purhepecha.ruleset  (revision 12962)
+++ purhepecha.ruleset  (working copy)
@@ -2,7 +2,7 @@
 
 name=_("P'urhepecha")
 plural=_("?plural:P'urhepecha")
-gourps="Medieval", "American"
+groups="Medieval", "American"
 
 legend=_("The P'urhepecha are a people native to the modern Mexican state of\
  Michoacan, the heart of a former empire known to them as Irechecua\
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to