Index: doc/README.nations
===================================================================
--- doc/README.nations	(revision 12422)
+++ doc/README.nations	(working copy)
@@ -238,40 +238,34 @@
 Leaders
 =======
 
-A leader should have a strong historical relation to the nation 
-you create. Try keeping to clearly political (e.g. not cultural, 
-athlete etc) leaders. In addition, a leader should rather be
-representative of the entire nation than regional/provincial. In short, 
-list Great Leaders(tm) only. :-) The rules are not as strict for
-female leaders though.
+A leader should be a historically notable political leader of the
+nation. It may not be a living person.
 
-An ideal leader list would consist of at least five, but not 
-many more than ten names. Avoid listing any person currently in
-office as the leader of his/her nation.
+An ideal leader list should contain between five and ten names.
 
-Leaders should be written in its native - not Anglicized - form: 
-For example "Karl XII" instead of "Charles XII" for the 
-Swedish king.
+Leaders should be written in native orthography, e.g.
+"Karl XII" instead of "Charles XII" for the Swedish king.
 
-Be as specific as possible. Use both personal and family names if 
-applicable. Monarchs should be marked with the appropriate succession
-number, using Roman numerals. Please keep to English formatting, 
-not German (Otto II.), Hungarian (IV. Béla), Danish (Valdemar 4.) 
-etc.
+Use the person's full name to avoid ambiguity.
 
-Leader names support any Unicode character, but please keep to 
+Monarchs should be marked with the appropriate succession
+number, using Roman numerals in standard English style (not German 
+e.g. "Otto II."; Hungarian e.g. "IV. Béla"; Danish e.g. "Valdemar 4."
+etc.)
+
+Freeciv support any Unicode character, but please keep to 
 Latin letters. When transcribing from a non-Latin writing system, 
 be consistent about the system of transcribation you are using.
-Also, try to avoid unnecessarily technical or heavily accented
-systems of transcribation.
+Also, try to avoid unnecessarily technical and/or heavily accented
+systems of transcription.
 
 For consistency and readability, put only one leader per line. 
 Feel free to provide a hint of the leader's identity or a brief 
 background in a comment beside any leader: This information might 
-be used at a later stage.
+be used in-game at a later stage.
 
 Leader titles for each government type (including Despotism and
-Anarchy) may be specified in a separate tag. Only English ascii
+Anarchy) may be specified in a separate tag. Only ASCII letters
 may be used in leader titles.
 
 
Index: data/nation/iraqi.ruleset
===================================================================
--- data/nation/iraqi.ruleset	(revision 12422)
+++ data/nation/iraqi.ruleset	(working copy)
@@ -8,11 +8,10 @@
  confluence of the Tigris and Euphrates rivers.")
 leader=
  "Faisal I",
- "Saddam Hussein",
  "Mohammed Baqir al-Hakim",
  "Abdul Salam Arif",
  "Bakr Sidqi"
-leader_sex="Male", "Male", "Male", "Male", "Male"
+leader_sex="Male", "Male", "Male", "Male"
 flag = "iraq"
 flag_alt = "iraq_old"
 city_style = "Babylonian"
Index: data/nation/venezuelan.ruleset
===================================================================
--- data/nation/venezuelan.ruleset	(revision 12422)
+++ data/nation/venezuelan.ruleset	(working copy)
@@ -13,16 +13,12 @@
 leader=
  "Ambrosio Alfinger",
  "Simón Bolivar",
- "Cristobal Mendoza",
- "Jose Antonio Páez",
+ "Cristóbal Mendoza",
+ "José Antonio Páez",
  "Juan Vicente Gómez",
- "Carlos Andrés Pérez",
- "Rafael Caldera",
  "Rómulo Betancourt",
  "Marcos Pérez Jiménez"
-leader_sex="Male", "Male", "Male", "Male", "Male",
-           "Male", "Male", "Male", "Male"
-
+leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male"
 flag="venezuela"
 flag_alt = "-"
 city_style = "Tropical"
Index: data/nation/indonesian.ruleset
===================================================================
--- data/nation/indonesian.ruleset	(revision 12422)
+++ data/nation/indonesian.ruleset	(working copy)
@@ -7,11 +7,8 @@
  government on the island of Java. The country has a Muslim majority and is\
  one of the most populous in the world.")
 leader=
- "Sukarno",
- "Suharto",
- "Jusuf Habibie",
- "Abdurrahman Wahid"
-leader_sex="Male", "Male", "Male", "Male"
+ "Sukarno"
+leader_sex="Male"
 flag="indonesia"
 flag_alt = "-"
 city_style = "Tropical"
Index: data/nation/swazi.ruleset
===================================================================
--- data/nation/swazi.ruleset	(revision 12422)
+++ data/nation/swazi.ruleset	(working copy)
@@ -12,9 +12,8 @@
  "Mswati II",
  "Labotsibeni",
  "Sobhuza II",
- "Ntombi",
- "Mswati III"
-leader_sex="Male", "Male", "Male", "Female", "Male", "Female", "Male"
+ "Ntombi"
+leader_sex="Male", "Male", "Male", "Female", "Male", "Female"
 flag="swaziland"
 flag_alt = "rwanda"
 city_style = "Tropical"
Index: data/nation/afghani.ruleset
===================================================================
--- data/nation/afghani.ruleset	(revision 12422)
+++ data/nation/afghani.ruleset	(working copy)
@@ -14,9 +14,8 @@
  "Timour-i-Lang",
  "Ahmad Shah",
  "Zahir Shah",
- "Daoud Khan",
- "Mohammad Omar"
-leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male"
+ "Daoud Khan"
+leader_sex="Male", "Male", "Male", "Male", "Male", "Male"
 flag="afghanistan"
 flag_alt = "-"
 city_style = "Classical"
Index: data/nation/bengali.ruleset
===================================================================
--- data/nation/bengali.ruleset	(revision 12422)
+++ data/nation/bengali.ruleset	(working copy)
@@ -15,9 +15,8 @@
  "Devapala",
  "Jagat Malla",
  "Siraj Ud Daulah",
- "Ziaur Rahman",
- "Sheikh Hasina"
-leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male", "Female"
+ "Ziaur Rahman"
+leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male"
 flag="bangladesh"
 flag_alt = "-"
 city_style = "Asian"
Index: data/nation/brazilian.ruleset
===================================================================
--- data/nation/brazilian.ruleset	(revision 12422)
+++ data/nation/brazilian.ruleset	(working copy)
@@ -9,7 +9,7 @@
 leader=
  "Dom Pedro I",
  "Isabel",
- "Marechal Deodoro",
+ "Deodoro da Fonseca",
  "Tancredo Neves",
  "Juscelino Kubitscheck",
  "Getúlio Vargas"
Index: data/nation/cambodian.ruleset
===================================================================
--- data/nation/cambodian.ruleset	(revision 12422)
+++ data/nation/cambodian.ruleset	(working copy)
@@ -9,10 +9,9 @@
  and 14th centuries.")
 leader=
  "Pol Pot",
- "Norodom Sihanouk",
  "Ang Chan",
  "Jayavarman II"
-leader_sex="Male", "Male", "Male", "Male"
+leader_sex="Male", "Male", "Male"
 flag="kampuchea"
 flag_alt = "-"
 city_style = "Asian"
Index: data/nation/armenian.ruleset
===================================================================
--- data/nation/armenian.ruleset	(revision 12422)
+++ data/nation/armenian.ruleset	(working copy)
@@ -13,10 +13,8 @@
  "Gregor Lusarovitch",
  "Trdat III",
  "Menuas",
- "Argishtis I",
- "Levon Ter-Petrossian"
-leader_sex="Male", "Male", "Male", "Male",
-           "Male", "Male", "Male", "Male"
+ "Argishtis I"
+leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male"
 flag="armenia"
 flag_alt = "-"
 city_style = "Classical"
Index: data/nation/czech.ruleset
===================================================================
--- data/nation/czech.ruleset	(revision 12422)
+++ data/nation/czech.ruleset	(working copy)
@@ -20,12 +20,11 @@
  "Eliška Přemyslovna",
  "Anežka",
  "T. G. Masaryk",
- "Edvard Beneš",
- "Václav Havel"
+ "Edvard Beneš"
 leader_sex = "Male", "Male", "Male", "Male", "Male",
         "Male", "Male", "Male", "Female",
         "Female", "Female", "Female", "Female",
-        "Male", "Male", "Male"
+        "Male", "Male"
 
 flag = "czech"
 flag_alt = "-"
Index: data/nation/finnish.ruleset
===================================================================
--- data/nation/finnish.ruleset	(revision 12422)
+++ data/nation/finnish.ruleset	(working copy)
@@ -8,9 +8,8 @@
  systems.")
 leader=
  "C.G.E. Mannerheim",
- "Urho Kekkonen",
- "Martti Ahtisaari"
-leader_sex="Male", "Male", "Male"
+ "Urho Kekkonen"
+leader_sex="Male", "Male"
 flag="finland"
 flag_alt = "-"
 city_style = "European"
Index: data/nation/singaporean.ruleset
===================================================================
--- data/nation/singaporean.ruleset	(revision 12422)
+++ data/nation/singaporean.ruleset	(working copy)
@@ -18,23 +18,16 @@
 legend=_("Singapore is a mercantile city-state located at the southernmost\
  tip of the Malaysian Peninsula.")
 leader=
- "Tengku Long",
  "Stamford Raffles",
  "W.A. Pickering",
  "Ong Teng Cheong",
- "S.R. Nathan",
- "Lee Kuan Yew",
- "Yusof bin Ishak",
- "Ah Beng",
- "Ah Lian"
-leader_sex="Male", "Male", "Male", "Male",
-  "Male", "Male", "Male", "Male", "Female"
+ "Yusof bin Ishak"
+leader_sex="Male", "Male", "Male", "Male"
 flag="singapore"
 flag_alt = "-"
 city_style = "Asian"
 
 ruler_titles = { "government",	"male_title",		"female_title"
-		 "Despotism",	_("Ah"),		_("?female:Ah")
 		 "Monarchy",	_("Sultan"),		_("Sultana")
 		 ; /* TRANS: Encik = Sir */
 		 "Communism",	_("Encik"),		_("?female:Encik")
Index: data/nation/swiss.ruleset
===================================================================
--- data/nation/swiss.ruleset	(revision 12422)
+++ data/nation/swiss.ruleset	(working copy)
@@ -9,12 +9,8 @@
  "Wilhelm Tell",
  "Arnold von Winkelried",
  "Hermann Gessler",
- "Henri Guisan",
- "Adolf Ogi",
- "Ruth Dreifuss",
- "Christoph Blocher"
-leader_sex="Male", "Male", "Male", "Male", "Male",
-  "Female", "Male"
+ "Henri Guisan"
+leader_sex="Male", "Male", "Male", "Male"
 flag="switzerland"
 flag_alt = "-"
 city_style = "European"
Index: data/nation/aymara.ruleset
===================================================================
--- data/nation/aymara.ruleset	(revision 12422)
+++ data/nation/aymara.ruleset	(working copy)
@@ -8,7 +8,7 @@
  Aymara kingdoms that thrived around the Titicaca lake until they\
  were conquered by the Incas.")
 leader=
- "Tupax Katari",	; a.k.a. Julián Apasa
+ "Tupax Katari",	; born Julián Apasa
  "Pawlu Sarati",
  "Santos Marka Thula",
  "Wartulina Sisa",
@@ -19,7 +19,7 @@
  "Apasa Tuqi",
  "Rumi Maki",
  "Qhawiri",
- "Fausto Reynaga"
+ "Fausto Reynaga"	; born José Félix
 leader_sex="Male", "Male", "Male", "Female", "Male",
  "Male", "Male", "Male", "Male", "Male", "Male", "Male"
 flag="aymara"
Index: data/nation/bosnia.ruleset
===================================================================
--- data/nation/bosnia.ruleset	(revision 12422)
+++ data/nation/bosnia.ruleset	(working copy)
@@ -12,14 +12,12 @@
  "Stjepan Tomaš",
  "Nikola Filipović",
  "Avdo Humo",
- "Seid Maglajlija",
  "Alija Izetbegović",
  "Husein-beg Gradaščević",
  "Džemal Bijedić"
 leader_sex="Male", "Male", "Male",
            "Male", "Male", "Male",
-           "Male", "Male", "Male",
-           "Male"
+           "Male", "Male", "Male"
 flag="bosnia"
 flag_alt = "-"
 city_style = "European"
Index: data/nation/irish.ruleset
===================================================================
--- data/nation/irish.ruleset	(revision 12422)
+++ data/nation/irish.ruleset	(working copy)
@@ -36,17 +36,6 @@
  "Male", "Female", "Male", "Female", "Male", "Male", "Male", "Male", "Male",
  "Male", "Male", "Male", "Female", "Male", "Male"
 
-; See doc/README.nations for the current Freeciv policy on leaders
-
-; "Hanna Sheehy-Skeffington", "Padraig Pearse", "Jim Larkin",
-; "Augusta Gregory", "Maud Gonne", "Michael Davitt", "James Connolly",
-; "O'Sullivan Beara", "Robert Emmett", "Anne Devlin", "Kathleen Lynn", 
-; "W.B. Yeats", "Kathleen Clarke", "Anne Bonny", "Alice Kyteler"
-
-; "Female", "Male", "Male", "Female", "Female",
-; "Male", "Male", "Male", "Male", "Female", "Female", "Male", 
-; "Female", "Female", "Female"
-
 flag="ireland"
 flag_alt = "-"
 city_style = "Celtic"
Index: data/nation/korean.ruleset
===================================================================
--- data/nation/korean.ruleset	(revision 12422)
+++ data/nation/korean.ruleset	(working copy)
@@ -20,10 +20,9 @@
  "Min",		; Queen of Joseon - fiercely opposed Japanese oppression
  "Kim Il-sung",	; Eternal leader of North Korea
  "Syngman Rhee",	; First president of South Korea
- "Park Chung Hee",	; Second president of South Korea
- "Kim Dae-jung"		; Fifth president of South Korea
+ "Park Chung Hee"	; Second president of South Korea
 leader_sex= "Male", "Male", "Female", "Male", "Male", "Male", "Male", "Male",
-            "Female", "Male", "Male", "Male", "Male"
+            "Female", "Male", "Male", "Male"
 flag="korea"
 flag_alt = "-"
 city_style = "Asian"
Index: data/nation/cuban.ruleset
===================================================================
--- data/nation/cuban.ruleset	(revision 12422)
+++ data/nation/cuban.ruleset	(working copy)
@@ -8,11 +8,10 @@
  tobacco, sugar and coffee in the world. Cuba was granted nominal\
  independence in 1902.")
 leader=
-  "Fidel Castro",
   "Ernesto Che Guevara",
   "José Martí",
   "Camilo Cienfuegos"
-leader_sex="Male", "Male", "Male", "Male"
+leader_sex="Male", "Male", "Male"
 flag="cuba"
 flag_alt = "-"
 city_style = "Classical"
Index: data/nation/burmese.ruleset
===================================================================
--- data/nation/burmese.ruleset	(revision 12422)
+++ data/nation/burmese.ruleset	(working copy)
@@ -10,14 +10,9 @@
  "Alaungpaya",
  "Mindon",
  "Supayalatt",
- "Khin Nyunt",
  "Ne Win",
- "U Nu",
- "Aung San Suu Kyi",
- "Maung Aye"
-leader_sex="Male", "Male", "Male", "Female",
-           "Male", "Male", "Male", "Female", "Male"
-
+ "U Nu"
+leader_sex="Male", "Male", "Male", "Female",  "Male", "Male"
 flag="myanmar"
 flag_alt = "taiwan"	; similar design
 city_style = "Asian"
Index: data/nation/bulgarian.ruleset
===================================================================
--- data/nation/bulgarian.ruleset	(revision 12422)
+++ data/nation/bulgarian.ruleset	(working copy)
@@ -20,7 +20,7 @@
  "Ivan-Assen",
  "Ivaylo",
  "Ivan Shishman",
- "Alexander Batemberg"
+ "Alexander I Battemberg"
 leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male", "Male",
            "Male", "Male", "Male", "Male", "Male", "Male"
 flag="bulgaria"
Index: data/nation/taiwanese.ruleset
===================================================================
--- data/nation/taiwanese.ruleset	(revision 12422)
+++ data/nation/taiwanese.ruleset	(working copy)
@@ -8,10 +8,8 @@
  Taiwan where they formed the Republic of China.")
 leader=
  "Sun Yat Sen",
- "Chiang Kai Shek",
- "Lee Teng Hui",
- "Kung Fu Tse"
-leader_sex="Male", "Male", "Male", "Male"
+ "Chiang Kai Shek"
+leader_sex="Male", "Male"
 flag="taiwan"
 flag_alt = "-"
 city_style = "Asian"
Index: data/nation/algerian.ruleset
===================================================================
--- data/nation/algerian.ruleset	(revision 12422)
+++ data/nation/algerian.ruleset	(working copy)
@@ -6,17 +6,12 @@
 legend=_("Algeria is an Arabic nation in North Africa. It is historically\
  inhabited by the Berber people.")
 leader=
- "Ahmed Ben Bella",
- "Houari Boumédiènne",
+ "Houari Boumédienne",
  "Kahina",
  "Kusayla",
  "Abd al-Qadir",
- "Benjedid Chadly",
- "Mohammad Boudiaff",
- "Liamine Zeroual"
-
-leader_sex="Male", "Male", 
-  "Female", "Male", "Male", "Male", "Male", "Male"
+ "Mohammad Boudiaff"
+leader_sex="Male", "Female", "Male", "Male", "Male"
 flag="algeria"
 flag_alt = "-"
 city_style = "Classical"
Index: data/nation/japanese.ruleset
===================================================================
--- data/nation/japanese.ruleset	(revision 12422)
+++ data/nation/japanese.ruleset	(working copy)
@@ -1,22 +1,5 @@
 [nation_japanese]
 
-; For cities and leaders, we use ASCII transliterations of the Japanese
-; characters.  Using true Japanese (Kanji or Hiragana) is overkill for
-; those used to latin characters (but would be desirable for Japanese
-; players).  Other transliterations that use accented latin characters
-; are also unnecessary.  Here we stick to ascii using the Hepburn
-; romanization.
-;
-; This is a serious problem for Japanese players since they would obviously
-; want to see these names using their native alphabet.  The only ways to
-; solve this would be to allow translation of city names (forcing translators
-; to translate or at least wade through all of the thousands of available
-; names) or to distribute a separate Japanese ruleset for Japanese
-; players to use (which would not be that hard; just substitute in the
-; correct native characters, in UTF-8, into this file).
-;
-; This is also a problem for many other nations that use non-latin alphabets.
-
 name=_("Japanese")
 plural=_("?plural:Japanese")
 groups="Medieval", "Modern", "Asian"
Index: data/nation/latvian.ruleset
===================================================================
--- data/nation/latvian.ruleset	(revision 12422)
+++ data/nation/latvian.ruleset	(working copy)
@@ -12,14 +12,14 @@
 leader =
  "Namiesis",
  "Viestards",
- "Tâlibalds",
+ "Tālibalds",
  "Visvaldis",
- "Kriðjânis Valdemârs",
- "Jânis Balodis",
+ "Kriðjānis Valdemārs",
+ "Jānis Balodis",
  "Pçteris Radziòð",
- "Jorìis Zemitâns",
- "Jânis Èakste",
- "Kârlis Ulmanis"
+ "Jorìis Zemitāns",
+ "Jānis Èakste",
+ "Kārlis Ulmanis"
 leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male", "Male",
  "Male", "Male"
 
Index: data/nation/croatian.ruleset
===================================================================
--- data/nation/croatian.ruleset	(revision 12422)
+++ data/nation/croatian.ruleset	(working copy)
@@ -14,15 +14,15 @@
  "Domagoj",
  "Branimir",
  "Tomislav",
- "Stjepan Drzislav",
- "Petar Kresimir IV",
- "Zvonimir",
- "Nikola Subic Zrinski",
+ "Stjepan Držislav",
+ "Petar Krešimir IV",
+ "Dmitar Zvonimir",
+ "Nikola Šubić Zrinski",
  "Matija Gubec",
  "Petar Zrinski",
  "Franjo Frankopan",
- "Franjo Tudjman",
- "Josip Ban Jelacic"
+ "Franjo Tuđman",
+ "Josip Jelačić"
 leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male",
            "Male", "Male", "Male", "Male", "Male", "Male", "Male",
            "Male"
Index: data/nation/malaysian.ruleset
===================================================================
--- data/nation/malaysian.ruleset	(revision 12422)
+++ data/nation/malaysian.ruleset	(working copy)
@@ -11,11 +11,9 @@
  "Perak",
  "Hang Tuah",
  "Abdul Rahman",
- "Abdul Razak",
- "Mahathir bin Mohamad",
- "Anwar Ibrahim"
+ "Abdul Razak"
 
-leader_sex = "Male", "Male", "Male", "Male", "Male", "Male", "Male", "Male"
+leader_sex = "Male", "Male", "Male", "Male", "Male", "Male"
 flag = "malaysia"
 flag_alt = "-"
 city_style = "Tropical"
Index: data/nation/american.ruleset
===================================================================
--- data/nation/american.ruleset	(revision 12422)
+++ data/nation/american.ruleset	(working copy)
@@ -34,20 +34,13 @@
        "John F. Kennedy", 
        "Lyndon Johnson",
        "Richard Nixon",
-       "Gerald W. Ford",
-       "Jimmy Carter",
-       "Ronald Reagan",
-       "George H. W. Bush",
-       "Bill Clinton",
-       "Eleanor Roosevelt"
+       "Ronald Reagan"
 leader_sex="Male", "Male", "Male", "Male", "Male", 
            "Male", "Male", "Male", "Male", "Male", 
            "Male", "Male", "Male", "Male", "Male", 
            "Male", "Male", "Male", "Male", "Male", 
            "Male", "Male", "Male", "Male", "Male", 
-           "Male", "Male", "Male", "Male", "Male", 
-           "Male", "Male", "Male", "Male",
-           "Female"
+           "Male", "Male", "Male", "Male", "Male"
 flag="usa"
 flag_alt = "-"
 city_style = "Celtic"
Index: data/nation/basque.ruleset
===================================================================
--- data/nation/basque.ruleset	(revision 12422)
+++ data/nation/basque.ruleset	(working copy)
@@ -25,20 +25,15 @@
  "José Antonio Aguirre",
  "Sabino Arana",
  "Fernando Buesa",
- "Carlos Garaikoetxea",
- "Jon Idigoras",
  "Patxi Iturrioz",
  "Federico Krutwig",
- "Begoña Lasagabaster",
  "Jesús María de Leizaola",
- "María San Gil",
  "Mario Onaindia",
  "Ramón Rubial Cavia",
  "Tomas Zumalakarregi Imaz"
 
-leader_sex="Male", "Male", "Male", "Male", "Male",
-           "Male", "Male", "Male", "Male", "Female",
-           "Male", "Female", "Male", "Male", "Male"
+leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male",
+           "Male", "Male", "Male", "Male"
 flag="euskadi"
 flag_alt = "-"
 city_style = "Celtic"
Index: data/nation/lankese.ruleset
===================================================================
--- data/nation/lankese.ruleset	(revision 12422)
+++ data/nation/lankese.ruleset	(working copy)
@@ -10,9 +10,8 @@
  "Vijaya",
  "Parakramabahu I",
  "Kasyapa",
- "J.R. Jayewardene",
- "Chandrika Kumaratunga"
-leader_sex="Male", "Male", "Male", "Male", "Female"
+ "J.R. Jayewardene"
+leader_sex="Male", "Male", "Male", "Male"
 flag="srilanka"
 flag_alt = "-"
 city_style = "Asian"
Index: data/nation/southafrican.ruleset
===================================================================
--- data/nation/southafrican.ruleset	(revision 12422)
+++ data/nation/southafrican.ruleset	(working copy)
@@ -12,14 +12,10 @@
  in 1994, long-time political prisoner Nelson Mandela was elected the\
  first truly democratically elected president of South Africa.")
 leader=
- "F.W. de Klerk",
- "Nelson Mandela",
- "Winnie Mandela",
- "Desmond Tutu",
+ "P.W. Botha",
  "J.C. Smuts",
- "Mangosuthu Buthelezi",
  "H.F. Verwoerd"
-leader_sex="Male", "Male", "Female", "Male", "Male", "Male", "Male"
+leader_sex="Male", "Male", "Male"
 flag="south_africa"
 flag_alt = "-"
 city_style = "Tropical"
Index: data/nation/inuit.ruleset
===================================================================
--- data/nation/inuit.ruleset	(revision 12422)
+++ data/nation/inuit.ruleset	(working copy)
@@ -9,12 +9,9 @@
  of today are descendents of the Thule culture.")
 leader=
  "Qitdlarssuaq",
- "Nakasuk",
- "Jonathan Motzfeldt",
- "Paul Okalik",
- "Nancy Karetak-Lindell"
+ "Nakasuk"
 
-leader_sex="Male", "Male", "Male", "Male", "Female"
+leader_sex="Male", "Male"
 flag="greenland"
 flag_alt = "-"
 city_style = "European"
Index: data/nation/norwegian.ruleset
===================================================================
--- data/nation/norwegian.ruleset	(revision 12422)
+++ data/nation/norwegian.ruleset	(working copy)
@@ -10,16 +10,9 @@
  "Johan Nygaardsvold",
  "Einar Gerhardsen",
  "Trygve Bratteli",
- "Odvar Nordli",
- "Gro Harlem Brundtland",
- "Kåre Willoch",
  "Jan P. Syse",
- "Torbjørn Jagland",
- "Kjell Magne Bondevik",
  "Haakon VII"
-leader_sex="Male", "Male", "Male", "Male", "Female",
-	   "Male", "Male", "Male", "Male", "Male"
-
+leader_sex="Male", "Male", "Male", "Male", "Male"
 flag="norway"
 flag_alt = "denmark"  ; Now used by Danish
 city_style = "European"
Index: data/nation/nigerian.ruleset
===================================================================
--- data/nation/nigerian.ruleset	(revision 12422)
+++ data/nation/nigerian.ruleset	(working copy)
@@ -6,9 +6,8 @@
 legend=_("Nigeria won full independence from British rule in 1960.")
 leader=
  "Abubakar Tafawa Balewa",
- "Shehu Shagari",
  "Nnamdi Azikiwe"
-leader_sex="Male", "Male", "Male"
+leader_sex="Male", "Male"
 flag="nigeria"
 flag_alt = "-"
 city_style = "Tropical"
Index: data/nation/danish.ruleset
===================================================================
--- data/nation/danish.ruleset	(revision 12422)
+++ data/nation/danish.ruleset	(working copy)
@@ -25,7 +25,7 @@
  "Valdemar III",
  "Valdemar Atterdag",
  "Christian IV",
- "Margrethe I"
+ "Margrete I"
 leader_sex=
   "Male", "Male", "Male", "Male", "Male",
   "Male", "Male", "Male", "Male", "Male",
Index: data/nation/filipino.ruleset
===================================================================
--- data/nation/filipino.ruleset	(revision 12422)
+++ data/nation/filipino.ruleset	(working copy)
@@ -8,13 +8,12 @@
  the Americans in 1898. They attained home rule in 1935 and independence in\
  1946.")
 leader=
- "Ramon Magsagay",
+ "Ramon Magsaysay",
  "Jose Rizal",
  "Luis Taruc",
- "Sergio Osmena", 
- "Ferdinand Marcos",
- "Corazon Aquino"
-leader_sex="Male", "Male", "Male", "Male", "Male", "Female"
+ "Sergio Osmeña", 
+ "Ferdinand Marcos"
+leader_sex="Male", "Male", "Male", "Male", "Male"
 flag="philippines"
 flag_alt = "-"
 city_style = "Tropical"
Index: data/nation/icelandic.ruleset
===================================================================
--- data/nation/icelandic.ruleset	(revision 12422)
+++ data/nation/icelandic.ruleset	(working copy)
@@ -10,13 +10,11 @@
 leader=
  "Jón Sigurdsson",
  "Ingólfur Arnarson",
- "Davíð Oddsson",
  "Sveinn Björnsson",
  "Ásgeir Ásgeirsson",
- "Kristján Eldjárn",
- "Vigdís Finnbogadóttir"
+ "Kristján Eldjárn"
 
-leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Female"
+leader_sex="Male", "Male", "Male", "Male", "Male"
 
 flag="iceland"
 flag_alt = "norway"
Index: data/nation/argentine.ruleset
===================================================================
--- data/nation/argentine.ruleset	(revision 12422)
+++ data/nation/argentine.ruleset	(working copy)
@@ -18,11 +18,8 @@
  "Bernardino Rivadavia",
  "Domingo Sarmiento",
  "Juan Domingo Perón",
- "Eva Duarte de Perón",
- "Carlos Saúl Menem"
-leader_sex="Male", "Male", "Male",
-           "Male", "Male", "Male",
-           "Female", "Male"
+ "Eva Duarte de Perón"
+leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Female"
 flag="argentina"
 flag_alt = "-"
 city_style = "European"
Index: data/nation/papuan.ruleset
===================================================================
--- data/nation/papuan.ruleset	(revision 12422)
+++ data/nation/papuan.ruleset	(working copy)
@@ -5,12 +5,8 @@
 groups="Modern", "Oceanian"
 legend=_("The Papuans are a Melanesian people on the island of New Guinea.")
 leader=
- "Paias Wingti",
- "Julius Chan",
- "Mekere Morauta",
- "Rabbie Namaliu",
  "Bill Skate"
-leader_sex="Male", "Male", "Male", "Male", "Male"
+leader_sex="Male"
 flag = "papua_newguinea"
 flag_alt = "-"
 city_style = "Tropical"
Index: data/nation/tunisian.ruleset
===================================================================
--- data/nation/tunisian.ruleset	(revision 12422)
+++ data/nation/tunisian.ruleset	(working copy)
@@ -14,13 +14,12 @@
  1956.")
 leader=
  "Hussein bin Ali Agha",
- "Khair al-Din",
- "Mustafa Khaznadar",
+ "Khair ad-Din",
+ "Mustapha Khaznadar",
  "Muhammad al-Munsif",
  "Habib Bourguiba",
- "Hedi Amira Nouira",
- "Muhammad Mzali"
-leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male"
+ "Hedi Amara Nouira"
+leader_sex="Male", "Male", "Male", "Male", "Male", "Male"
 flag="tunisia"
 flag_alt = "-"
 city_style = "Classical"
Index: data/nation/slovenian.ruleset
===================================================================
--- data/nation/slovenian.ruleset	(revision 12422)
+++ data/nation/slovenian.ruleset	(working copy)
@@ -9,7 +9,7 @@
  "Valuka",
  "Valtunk",
  "Kocelj",
- "Primoz Trubar"
+ "Primož Trubar"
 leader_sex="Male", "Male", "Male", "Male"
 flag="slovenia"
 flag_alt = "-"
Index: data/nation/aborigines.ruleset
===================================================================
--- data/nation/aborigines.ruleset	(revision 12422)
+++ data/nation/aborigines.ruleset	(working copy)
@@ -10,12 +10,10 @@
 leader=
  "Yagan",
  "Neville Bonner",
- "Galarrwuy Yunupingu",
- "Isabell Coe",
  "Beruk",		; Also known as William Barak
  "Gatjil Djerrkura",
  "Pearl Gibbs"
-leader_sex="Male", "Male", "Male", "Female", "Male", "Male", "Female"
+leader_sex="Male", "Male", "Male", "Male", "Female"
 flag="aborigines"
 flag_alt = "-"
 city_style = "Tropical"
Index: data/nation/kenyan.ruleset
===================================================================
--- data/nation/kenyan.ruleset	(revision 12422)
+++ data/nation/kenyan.ruleset	(working copy)
@@ -5,15 +5,19 @@
 groups="Modern", "African"
 legend=_("Kenya gained independence from Britain in December 1963.")
 leader =
- "Jomo Kenyatta",
- "Nabongo",
- "Wangari Maathai",
- "Ezekiel Apindi"
-leader_sex = "Male", "Male", "Female", "Male"
+ "Shiundu",
+ "Mumia",
+ "Ezekiel Apindi",
+ "Jomo Kenyatta"
+leader_sex = "Male", "Male", "Male", "Male"
 flag = "kenya"
 flag_alt = "-"
 city_style = "Tropical"
 
+ruler_titles = { "government",      "male_title",      "female_title"
+                 "Monarchy",        _("Nabongo"),      _("Nabongo")
+}
+
 init_techs=""
 init_buildings=""
 init_government="Despotism"
Index: data/nation/georgian.ruleset
===================================================================
--- data/nation/georgian.ruleset	(revision 12422)
+++ data/nation/georgian.ruleset	(working copy)
@@ -12,10 +12,8 @@
  "Tamar",
  "Davit IV",
  "Alexandre Bagrationi",
- "Merab Kostava",
- "Eduard Shevardnadze"
-leader_sex="Male", "Male", "Male", "Female",
-           "Male", "Male", "Male", "Male"
+ "Merab Kostava"
+leader_sex="Male", "Male", "Male", "Female", "Male", "Male", "Male"
 flag="georgia"
 flag_alt = "-"
 city_style = "European"
Index: data/nation/australian.ruleset
===================================================================
--- data/nation/australian.ruleset	(revision 12422)
+++ data/nation/australian.ruleset	(working copy)
@@ -14,7 +14,7 @@
  "John Curtin",
  "Enid Lyons",
  "Harold Holt",
- "Edmond Barton",
+ "Edmund Barton",
  "Elizabeth Nicholls",
  "Edith Cowan"
 leader_sex = "Male", "Female", "Male", "Female", "Male", "Male", "Female",
Index: data/nation/romanian.ruleset
===================================================================
--- data/nation/romanian.ruleset	(revision 12422)
+++ data/nation/romanian.ruleset	(working copy)
@@ -22,10 +22,9 @@
  "Carol I",			; First and second king of the house of
  "Ferdinand I",			; Hohenzollern-Sigmaringen
  "Nicolae Antonescu",
- "Nicolae Ceausescu",
- "Ion Iliescu"
+ "Nicolae Ceausescu"
 leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male", "Male",
-           "Male", "Male", "Male", "Male", "Male"
+           "Male", "Male", "Male", "Male"
 flag="romania"
 flag_alt = "-"
 city_style = "Classical"
Index: data/nation/galician.ruleset
===================================================================
--- data/nation/galician.ruleset	(revision 12422)
+++ data/nation/galician.ruleset	(working copy)
@@ -6,12 +6,12 @@
 legend=_("Galicia is a region in the northwest of Spain, just above\
  Portugal.")
 leader=
- "Don Afonso",
+ "Afonso",
  "Diego Xelmírez",
  "Hermerico",
- "Pedro Pardo de Cela",
+ "Pero Pardo de Cela",
  "Rosalía de Castro",
- "Don Manuel"
+ "Manuel"
 leader_sex="Male", "Male", "Male", "Male",
            "Female", "Male"
 flag="galicia"
@@ -20,9 +20,9 @@
 
 ruler_titles = { "government",      "male_title",          "female_title"
                  "Democracy", _("Primeiro Ministro"),  _("Primeira Ministra")
-                 "Despotism",       _("Dictador"),         _("Dictadora")
+                 "Despotism",       _("Don"),              _("Doña")
                  "Monarchy",        _("Rei"),              _("Raina")
-                 "Republic",        _("Presidente"),        _("Presidenta")
+                 "Republic",        _("Presidente"),       _("Presidenta")
                  "Fundamentalism",  _("Gran Bardo"),      _("Grande Bardesa")
                }
 
Index: data/nation/sudanese.ruleset
===================================================================
--- data/nation/sudanese.ruleset	(revision 12422)
+++ data/nation/sudanese.ruleset	(working copy)
@@ -7,13 +7,10 @@
  Sudan became independent in 1956.")
 leader=
  "Muhammad ibn Abdalla",
- "Gaadar Muhammad Nimeiri",
+ "Gaafar Nimeiry",
  "Suwar al-Dahab",
- "Ibrahim Abboud",
- "Sadiq el-Mahdi",
- "Jaafar el-Nemery",
- "Abdul Rahman Swaredahab"
-leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male"
+ "Ibrahim Abboud"
+leader_sex="Male", "Male", "Male", "Male"
 flag="sudan"
 flag_alt = "-"
 city_style = "Classical"
Index: data/nation/libyan.ruleset
===================================================================
--- data/nation/libyan.ruleset	(revision 12422)
+++ data/nation/libyan.ruleset	(working copy)
@@ -8,14 +8,12 @@
  under the control of Italy and after the Second World War Libya was granted\
  independence as a condition of the Allied peace treaty with Italy.")
 leader=
- "Muammar al-Qadhafi",
  "Omar al-Moktar",
  "Suleiman Safar",
- "Ahmad ash Sharif", 
- "Suleiman Baruni",
+ "Ahmad ash-Sharif",
  "Muhammad Idris",
  "Ramadan as Suwaythi"
-leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male"
+leader_sex="Male", "Male", "Male", "Male", "Male"
 flag ="libya"
 flag_alt = "-"
 city_style = "Classical"
Index: data/nation/european.ruleset
===================================================================
--- data/nation/european.ruleset	(revision 12422)
+++ data/nation/european.ruleset	(working copy)
@@ -13,14 +13,8 @@
  "Jean Rey",
  "Franco Maria Malfatti",
  "Sicco L. Mansholt",
- "François-Xavier Ortoli",
- "Roy Jenkins",
- "Gaston Edmont Thorn",
- "Jacques Delors",
- "Jacques Santer",
- "Romano Prodi"
-leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male", "Male",
-           "Male", "Male"
+ "Roy Jenkins"
+leader_sex="Male", "Male", "Male", "Male", "Male"
 flag="europe"
 flag_alt = "-"
 city_style = "European"
Index: data/nation/estonian.ruleset
===================================================================
--- data/nation/estonian.ruleset	(revision 12422)
+++ data/nation/estonian.ruleset	(working copy)
@@ -11,11 +11,8 @@
  "Lembitu",
  "Carl Robert Jakobson",
  "Konstantin Päts",
- "Tunne Kelam",
- "Lennart Meri",
- "Mart Laar"
-leader_sex="Male", "Male", "Male", "Male",
-  "Male", "Male", "Male"
+ "Lennart Meri"
+leader_sex="Male", "Male", "Male", "Male", "Male"
 flag="estonia"
 flag_alt = "-"
 city_style = "European"
Index: data/nation/sami.ruleset
===================================================================
--- data/nation/sami.ruleset	(revision 12422)
+++ data/nation/sami.ruleset	(working copy)
@@ -7,12 +7,11 @@
  over the northernmost regions of the Scandinavian countries and\
  northwestern Russia.")
 leader=
- "Ole Henrik Magga",	; Sami politician and current chairman of UNPFII
  "Aslak Hætta",		; Rebellion leader against Norwegian rule
  "Matts Heiva",		; 17th century influential noaydde (shaman)
  "Kuta-Vuorok",		; 18th century influential noaydde
  "Elsa Laula"		; Early Sami political activist
-leader_sex="Male", "Male", "Male", "Male", "Female"
+leader_sex="Male", "Male", "Male", "Female"
 flag="sapmi"
 flag_alt = "-"
 city_style = "European"