[Freeciv-Dev] (PR#16752) Nation names

["Daniel Markstedt" <markstedt@xxxxxxxxx>]

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

This transaction appears to have no content

This resolves my comments about nonstandard nation names. In trunk, two
nation names are changed while in S2_1, the comments are only removed - to
avoid breaking savegame compatibility and fuzzying localizations.

-Daniel
This resolves my comments about nonstandard nation names. In trunk, two
nation names are changed while in S2_1, the comments are only removed -
to avoid breaking savegame compatibility and fuzzying localizations.

-Daniel
Index: data/nation/venezuelan.ruleset
===================================================================
--- data/nation/venezuelan.ruleset      (revision 11897)
+++ data/nation/venezuelan.ruleset      (working copy)
@@ -1,6 +1,5 @@
 [nation_venezuelan]
 
-; Nation name should be "Venezuelan" for consistency.
 name=_("Venezuela")
 plural=_("?plural:Venezuelans")
 groups=_("American"), _("Modern")
Index: data/nation/bosnia.ruleset
===================================================================
--- data/nation/bosnia.ruleset  (revision 11897)
+++ data/nation/bosnia.ruleset  (working copy)
@@ -1,6 +1,5 @@
 [nation_bosnia]
 
-; Nation name should be "Bosnian-Herzegovinian" for consistency.
 name=_("Bosnia & Herzegovina")
 plural=_("?plural:Bosnians")
 groups=_("Modern"), _("European")
Index: data/nation/argentine.ruleset
===================================================================
--- data/nation/argentine.ruleset       (revision 11897)
+++ data/nation/argentine.ruleset       (working copy)
@@ -1,6 +1,5 @@
 [nation_argentine]
 
-; Nation name should be "Argentinean" for consistency.
 name=_("Argentine")
 plural=_("?plural:Argentines")
 groups=_("Modern"), _("American")
Index: data/nation/newzealand.ruleset
===================================================================
--- data/nation/newzealand.ruleset      (revision 11897)
+++ data/nation/newzealand.ruleset      (working copy)
@@ -1,6 +1,5 @@
 [nation_newzealand]
 
-; Nation name should be "New Zealandic" (like "Icelandic") for consistency.
 name=_("New Zealand")
 plural=_("?plural:New Zealanders")
 groups=_("Modern"), _("Oceanian")
@@ -28,7 +27,6 @@
 init_units=""
 civilwar_nations="maori", "british"
 
-; Part of this city list can be moved to Maori nation
 cities =
  "Wellington (hills, ocean)",
  "Auckland (hills, ocean)",

Index: data/nation/venezuelan.ruleset
===================================================================
--- data/nation/venezuelan.ruleset      (revision 11897)
+++ data/nation/venezuelan.ruleset      (working copy)
@@ -1,7 +1,6 @@
 [nation_venezuelan]
 
-; Nation name should be "Venezuelan" for consistency.
-name=_("Venezuela")
+name=_("Venezuelan")
 plural=_("?plural:Venezuelans")
 groups=_("American"), _("Modern")
 ; /* TRANS: The fourth letter in "Simon" should be */
Index: data/nation/bosnia.ruleset
===================================================================
--- data/nation/bosnia.ruleset  (revision 11897)
+++ data/nation/bosnia.ruleset  (working copy)
@@ -1,7 +1,6 @@
 [nation_bosnia]
 
-; Nation name should be "Bosnian-Herzegovinian" for consistency.
-name=_("Bosnia & Herzegovina")
+name=_("Bosnian-Herzegovinian")
 plural=_("?plural:Bosnians")
 groups=_("Modern"), _("European")
 legend=_("Bosnia and Herzegovina is a country in south-east Europe, and the\
Index: data/nation/argentine.ruleset
===================================================================
--- data/nation/argentine.ruleset       (revision 11897)
+++ data/nation/argentine.ruleset       (working copy)
@@ -1,6 +1,5 @@
 [nation_argentine]
 
-; Nation name should be "Argentinean" for consistency.
 name=_("Argentine")
 plural=_("?plural:Argentines")
 groups=_("Modern"), _("American")
Index: data/nation/newzealand.ruleset
===================================================================
--- data/nation/newzealand.ruleset      (revision 11897)
+++ data/nation/newzealand.ruleset      (working copy)
@@ -1,10 +1,8 @@
 [nation_newzealand]
 
-; Nation name should be "New Zealandic" (like "Icelandic") for consistency.
 name=_("New Zealand")
 plural=_("?plural:New Zealanders")
 groups=_("Modern"), _("Oceanian")
-conflicts_with="australian"    ; Similar flags
 legend=_("The island group of New Zealand was annexed by Britain in 1840.\
  Following a royal proclamation in 1907, the country became an independent\
  dominion within the Commonwealth of Nations.")
@@ -26,9 +24,11 @@
 init_buildings=""
 init_government="Despotism"
 init_units=""
+
+; Similar flags
+conflicts_with="australian"
 civilwar_nations="maori", "british"
 
-; Part of this city list can be moved to Maori nation
 cities =
  "Wellington (hills, ocean)",
  "Auckland (hills, ocean)",