[Freeciv-Dev] (PR#15441) nation changes

["Daniel Markstedt" <himasaram@xxxxxxxx>]

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

Minor changes to nations.

Stalin removed from Russian now when we have him in Soviet.

Vercingetorix reinserted as French leader in French language rendering.

-Daniel

Index: data/nation/gallic.ruleset
===================================================================
--- data/nation/gallic.ruleset  (revision 11553)
+++ data/nation/gallic.ruleset  (working copy)
@@ -27,6 +27,8 @@
 init_buildings=""
 init_government="Despotism"
 init_units=""
+
+conflicts_with = "french", "belgian"
 civilwar_nations = "french", "belgian"
 
 ; City names from various articles on Wikipedia:
Index: data/nation/french.ruleset
===================================================================
--- data/nation/french.ruleset  (revision 11553)
+++ data/nation/french.ruleset  (working copy)
@@ -11,10 +11,12 @@
  "Charlemagne",
  "Louis XIV",
  "Charles de Gaulle",
- "Jeanne d'Arc",
+ "Vercingétorix",
  "Chlodwig",
- "Charles Martel"
-leader_sex="Male", "Male", "Male", "Male", "Female", "Male", "Male"
+ "Charles Martel",
+ "Jeanne d'Arc"
+leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male",
+ "Female"
 flag="france"
 flag_alt = "-"
 city_style = "Celtic"
Index: data/nation/soviet.ruleset
===================================================================
--- data/nation/soviet.ruleset  (revision 11553)
+++ data/nation/soviet.ruleset  (working copy)
@@ -11,7 +11,7 @@
  shocks it disintegrated into fifteen independent countries")
 leader=
  "Vladimir Lenin",
- "Iosif V. Stalin",
+ "Iosif Stalin",
  "Nikita Khruschov",
  "Leonid Brezhnev",
  "Yuriy Andropov",
Index: data/nation/russian.ruleset
===================================================================
--- data/nation/russian.ruleset (revision 11553)
+++ data/nation/russian.ruleset (working copy)
@@ -30,14 +30,13 @@
  "Pavel I",
  "Nikolay I",
  "Aleksandr II",
- "Iosif Stalin",
  "Anna Ioannovna",
  "Elizaveta Petrovna",
  "Ekaterina II"        ; also Yekaterina, Catherine: compare Yekaterinburg
 
 leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male",
    "Male", "Male", "Male", "Male", "Male", "Male", "Male", "Male",
-   "Male", "Female", "Female", "Female"
+   "Female", "Female", "Female"
 flag="russia"
 flag_alt = "-"
 city_style = "European"