Complete.Org: Mailing Lists: Archives: freeciv-dev: December 2002:
[Freeciv-Dev] (PR#2587) class and legend data patch -- oops, with patch
Home

[Freeciv-Dev] (PR#2587) class and legend data patch -- oops, with patch

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: undisclosed-recipients:;
Subject: [Freeciv-Dev] (PR#2587) class and legend data patch -- oops, with patch this time!
From: "esr@xxxxxxxxxxx via RT" <rt@xxxxxxxxxxxxxx>
Date: Mon, 16 Dec 2002 01:22:57 -0800
Reply-to: rt@xxxxxxxxxxxxxx

As discussed on the freeciv-data list, this patch adds class attributes for 
all nations and legend attributes for most.  It adds a few more cities and
leaders, as well.

I considered splitting the Historical category into Historical and Regional,
but I think that is more likely to stir political argument than just having
one category.

This should be applied on top of my previous two data patches, the original
Barsoom patch and the corrections.

-- 
                <a href="http://www.tuxedo.org/~esr/";>Eric S. Raymond</a>

Diffs between last version checked in and current workfile(s):

--- american.ruleset    2002/12/11 14:00:53     1.3
+++ american.ruleset    2002/12/13 19:53:03
@@ -2,6 +2,8 @@
 
 name=_("American")
 plural=_("?plural:Americans")
+class=_("Modern")
+legend=_("Formally named the United States of America.  Independent from Great 
Britain from 1776CE.")
 leader="George Washington",
        "John Adams",
        "Thomas Jefferson", 
--- arab.ruleset        2002/12/13 18:17:40     1.1
+++ arab.ruleset        2002/12/13 19:50:30
@@ -2,6 +2,8 @@
 
 name=_("Arab")
 plural=_("?plural:Arabs")
+class=_("Historical")
+legend=_("The Arab/Islamic civilization of 622CE-1495CE.")
 leader="Mohammad", "Umar", "Harun al-Rashid", "Saladin"
 leader_sex="Male", "Male", "Male", "Male"
 flag ="f.arab"
--- argentine.ruleset   2002/12/13 18:18:01     1.1
+++ argentine.ruleset   2002/12/14 00:07:05
@@ -2,6 +2,8 @@
 
 name=_("Argentine")
 plural=_("?plural:Argentines")
+class=_("Modern")
+legend=_("Argentine is located on the south-eastern coast of South America.")
 leader="José de San Martín", "Juan Manuel de Rosas", "Justo Urquiza",
        "Bernardino Rivadavia", "Domingo Sarmiento", "Juan Domingo Perón",
        "Eva Duarte de Perón", "Carlos Saúl Menem"
--- australian.ruleset  2002/12/13 18:18:22     1.1
+++ australian.ruleset  2002/12/14 04:01:22
@@ -2,6 +2,8 @@
 
 name=_("Australian")
 plural=_("?plural:Australians")
+class=_("Modern")
+legend=_("Australia was founded as a British penal colony in 1788. It is the 
only country on earth to occupy an entire continent.")
 leader="Robert Menzies"
 leader_sex="Male"
 flag="f.australia"
--- aztec.ruleset       2002/12/13 18:18:37     1.1
+++ aztec.ruleset       2002/12/13 19:47:07
@@ -2,6 +2,8 @@
 
 name=_("Aztec")
 plural=_("?plural:Aztecs")
+class=_("Historical")
+legend=_("The Azteca, a group of barbarians from the Sonoran desert, seized 
control of the Toltec-derived civilizations of Central Mexico during the 15th 
century CE, reviving the practice of human sacrifice.  They were conquered by 
the Spanish under Cortez in 1524.")
 leader="Montezuma", "Cuahtemoc", "Itzcoatl", "Axayacatl"
 leader_sex="Male", "Male", "Male", "Male"
 flag="f.mexico"
--- babylonian.ruleset  2002/12/11 14:00:53     1.3
+++ babylonian.ruleset  2002/12/13 20:05:19
@@ -2,6 +2,8 @@
 
 name=_("Babylonian")
 plural=_("?plural:Babylonians")
+class=_("Historical")
+legend=_("Babylon was the dominent city of Mesopotamia from the 18th to 7th 
centuries BCE under a succession of peoples including Amorites, Kassites, 
Assyrians, and Chaldeans.")
 leader="Hammurabi", "Sargon", "Nebuchadnezzar", "Tiglath-Pileser"
 leader_sex="Male", "Male", "Male", "Male"
 flag = "f.iraq_old"
--- barsoom.ruleset     2002/12/11 14:00:53     1.3
+++ barsoom.ruleset     2002/12/14 16:41:12
@@ -5,6 +5,8 @@
 
 name=_("Barsoom")
 plural=_("?plural:Barsoomians")
+class=_("Fictional")
+legend=_("The Barsoomian civilization from Edgar Rice Burrough's Mars novels.")
 leader="John Carter", "Tars Tarkas", "Carthoris", "Vad Varo", 
         "Tardos Mor", "Mors Kajak",  "Gahan", "Kar Komak",
         "Dejah Thoris", "Llana", "Tara", "Thuvia"
--- bavarian.ruleset    2002/12/13 18:19:43     1.1
+++ bavarian.ruleset    2002/12/14 16:48:18
@@ -2,6 +2,8 @@
 
 name=_("Bavarian")
 plural=_("?plural:Bavarians")
+class=_("Historical")
+legend=_("Bavaria, before national unification in 1870, was one of the largest 
of the German kingdoms.") 
 leader = "Ludwig II", "Maximilian", "Joseph", "F.J.Strauss"
 leader_sex = "Male", "Male", "Male", "Male"
 flag="f.bavarian"
--- boer.ruleset        2002/12/13 18:20:09     1.1
+++ boer.ruleset        2002/12/13 20:15:37
@@ -2,6 +2,8 @@
 
 name=_("Boer")
 plural=_("?plural:Boers")
+class=_("Historical")
+legend=_("The Boers were Dutch settlers in British-controlled South Africa 
from 1650CE.  They briefly controlled two republics, the Transvaal and the 
Orange Free State, before being defeated by the British in the war of 
1899-1902.")
 leader= "Jacobus Pretorius", "Louis Botha", "Wessel Pretorius",
        "Paulus Krüger", "Piet Retief", "Jan Smuts"
 leader_sex= "Male", "Male", "Male",
--- brazilian.ruleset   2002/12/13 18:20:27     1.1
+++ brazilian.ruleset   2002/12/14 04:07:29
@@ -2,6 +2,8 @@
 
 name=_("Brazilian")
 plural=_("?plural:Brazilians")
+class=_("Modern")
+legend=_("Brazil was founded as a colony of Brazil but became independent in 
1822. It is the only country in the New World that has been the seat of a 
monarchy.")
 leader="Dom Pedro I", "Princesa Isabel", "Marechal Deodoro",
        "Tancredo Neves", "Juscelino Kubitscheck", "Getúlio Vargas"
 leader_sex="Male", "Female", "Male", "Male", "Male", "Male"
--- canadian.ruleset    2002/12/13 18:20:43     1.1
+++ canadian.ruleset    2002/12/15 07:45:55
@@ -2,8 +2,9 @@
 
 name=_("Canadian")
 plural=_("?plural:Canadians")
-leader="Pierre Trudeau", "John A. MacDonald", "John Diefenbaker"
-leader_sex="Male", "Male", "Male"
+class=_("Modern")
+leader="Pierre Trudeau", "John A. MacDonald", "John Diefenbaker", "Mackenzie 
King"
+leader_sex="Male", "Male", "Male", "Male"
 flag="f.canada"
 flag_alt = "f.united_kingdom"
 city_style = "European"
--- carthaginian.ruleset        2002/12/13 18:21:01     1.1
+++ carthaginian.ruleset        2002/12/13 20:25:57
@@ -2,6 +2,8 @@
 
 name=_("Carthaginian")
 plural=_("?plural:Carthaginians")
+class=_("Historical")
+legend=_("The Carthaginians, descendendents of Phoenician traders, ran a naval 
empire in the Mediterranean from the 5th to 2nd centures BCE. Carthage was 
destroyed by Rome in 146BCE.")
 leader="Hannibal", "Hasdrubal", "Hamilcar", "Dido"
 leader_sex="Male", "Male", "Male", "Female"
 flag="f.tunisia"
--- catalan.ruleset     2002/12/13 18:21:44     1.1
+++ catalan.ruleset     2002/12/14 16:48:27
@@ -2,6 +2,8 @@
 
 name=_("Catalan")
 plural=_("?plural:Catalans")
+class=_("Historical")
+legend=_("Catalan (aka Catalonia) is the north-eastern-most coastal region of 
Spain near the southern foot of the Pyrenees.")
 leader="Guifré el Pilós", "Ramon Berenguer IV", "Jaume I", "Pere II",
        "Lluis Companys", "Josep Tarradellas"
 leader_sex="Male", "Male", "Male", "Male",
@@ -28,6 +30,9 @@
 wonder="A.Smith's Trading Co."
 government="Republic"
 
+; This city list does not actually correspond to medieval Catalonia,
+; but rather to the "Catalon dos Pasos" of modern ethnolinguistic
+; nationalists.
 cities =
   "Barcelona", "Tarragona", "Lleida", "Girona", "Perpinyà", "Valencia",
   "Tolosa", "Ripoll", "Vic", "La Seu d'Urgell", "Cardona", "Tortosa",
--- chilean.ruleset     2002/12/13 18:22:04     1.1
+++ chilean.ruleset     2002/12/14 16:34:37
@@ -2,6 +2,8 @@
 
 name=_("Chilean")
 plural=_("?plural:Chileans")
+class=_("Modern")
+legend=_("Chile is located on the south-western coast of South America.")
 leader="Pedro de Valdivia", "Bernardo O'Higgins", "José Miguel Carrera",
        "Manuel Blanco Encalada", "Diego Portales", "Manuel Montt",
        "Arturo Alessandri", "Augusto Pinochet"
@@ -38,7 +40,7 @@
   "San Antonio", "La Calera (hills)", "Chillán", "Talcahuano", "Osorno",
   "Valdivia", "Puerto Varas (ocean)", "Llanquihue", "Ancud", "Castro",
   "Calama", "Arica", "Constitución", "Chañaral", "Cauquenes",
-  "Puente alto (river, hills)", "Talagante", "Melipilla", "Peumo",
+  "Puente Alto (river, hills)", "Talagante", "Melipilla", "Peumo",
   "Puerto Natales (ocean)", "Lota", "Ovalle", "Huasco", "Mejillones",
   "Victoria", "San Felipe", "Frutillar", "Illapel", "Angol",
   "San Fernando", "Toltén", "Curicó", "Pisagua", "Tocopilla",
--- chinese.ruleset     2002/12/13 18:22:20     1.1
+++ chinese.ruleset     2002/12/14 16:37:20
@@ -2,9 +2,11 @@
 
 name=_("Chinese")
 plural=_("?plural:Chinese")
-leader="Mao", "Cixi", "Wu Zetian", "Li Shimin", "Liu Bang", "Qin Shihuang",
-       "Liu Bei", "Cao Cao", "Sun Quan"
-leader_sex="Male", "Female", "Female", "Male", "Male", "Male",
+class=_("Modern")
+legend=_("China has the largest population of any nation on earth.")
+leader="Mao Zedong", "Sun Yat-Sen", "Cixi", "Wu Zetian", "Li Shimin",
+       "Liu Bang", "Qin Shihuang", "Liu Bei", "Cao Cao", "Sun Quan"
+leader_sex="Male", "Male", "Female", "Female", "Male", "Male", "Male",
            "Male", "Male", "Male"
 flag="f.china"
 flag_alt = "-"
--- cornish.ruleset     2002/12/13 18:23:42     1.1
+++ cornish.ruleset     2002/12/14 16:48:37
@@ -2,6 +2,8 @@
 
 name = _("Cornish")
 plural = _("?plural:Cornish")
+class=_("Historical")
+legend=_("Cornwall is a region in the extreme southwest of England, 
traditionally the home of the legendary King Arthur.")
 leader = "Arthur", "Jonathen Trelawny", "Thomas Flamank", "Michael Joseph"
 leader_sex = "Male", "Male", "Male", "Male"
 flag = "f.cornwall"
--- croatian.ruleset    2002/12/13 18:24:15     1.1
+++ croatian.ruleset    2002/12/16 00:04:06
@@ -2,6 +2,8 @@
 
 name=_("Croatian")
 plural=_("?plural:Croatians")
+class=_("Modern")
+legend="Croatia is the region of the Southern Slavs that was held by the 
Austro-Hungarian Empire, rather than coming under Ottoman rule after the 
collapse of Byzantium. During most of the 20th century it was part of the 
Yugoslav Federation."
 leader="Ljudevit Posavski", "Borna", "Trpimir", "Domagoj", "Branimir",
        "Tomislav", "Stjepan Drzislav", "Petar Kresimir IV", "Zvonimir",
        "Nikola Subic Zrinski", "Matija Gubec", "Petar Zrinski",
--- czech.ruleset       2002/12/13 18:24:38     1.1
+++ czech.ruleset       2002/12/16 00:15:47
@@ -2,7 +2,8 @@
 
 name = _("Czech")
 plural = _("?plural:Czechs")
-
+class=_("Modern")
+legend=_("Today's Czech Republic was until 1993 part of Czechoslovakia, which 
had been until 1918 part of the Austro-Hungarian Empire.")
 leader = "Jan Lucembursky", "Otakar II", "Karel IV", "Vaclav", "Jiri z 
Podebrad",
          "Jan Zizka", "Jan Hus", "Zavis z Falknstejna", "Libuse",
          "Kunhuta", "Alzbeta Pomoranska", "Eliska Premyslovna", "Anezka",
--- danish.ruleset      2002/12/11 13:25:18     1.2
+++ danish.ruleset      2002/12/16 00:29:05
@@ -2,6 +2,8 @@
 
 name=_("Danish")
 plural=_("?plural:Danes")
+class=_("Modern")
+legend=_("The founding of the Danish kingdom is generally assigned to the 
reign of Harald Blåtand, who unified what is now Denmark between 958 and 988.")
 leader=
   "Gudfred", "Gorm den Gamle", "Harald Blåtand", "Svend Tveskæg",
   "Knud den Store", "Hardeknud", "Svend", "Knud", "Valdemar",
--- dunedain.ruleset    2002/12/11 13:25:18     1.2
+++ dunedain.ruleset    2002/12/13 20:29:35
@@ -6,6 +6,8 @@
 
 name=_("Dunedain")
 plural=_("?plural:Dunedan")
+class=_("Fictional")
+legend=_("The Men of the West from J.R.R. Tolkien's 'Lord of the Rings' 
trilogy.")
 leader="Elros", "Tar-Ancalimë", "Míriel", "Elendil", "Isildur", "Aragorn",
        "Tarannon Falastur", "Thorongil", "Ar-Pharazon", "Beruthiel"
 leader_sex="Male", "Female", "Female", "Male", "Male", "Male",
--- dutch.ruleset       2002/12/13 18:26:59     1.1
+++ dutch.ruleset       2002/12/13 20:30:27
@@ -2,6 +2,7 @@
 
 name=_("Dutch")
 plural=_("?plural:Dutch")
+class=_("Modern")
 leader="Willem", "Maurits", "Emma", "Wilhelmina", "Juliana", "Beatrix"
 leader_sex="Male", "Male", "Female", "Female", "Female", "Female"
 flag="f.netherlands"
--- egyptian.ruleset    2002/12/11 13:25:18     1.2
+++ egyptian.ruleset    2002/12/13 20:31:34
@@ -2,6 +2,7 @@
 
 name=_("Egyptian")
 plural=_("?plural:Egyptians")
+class=_("Historical")
 leader="Rameses", "Cleopatra", "Tutankhamun", "Narmer", "Thutmose",
        "Hatshepsut", "Nefertiti", "Cheops"
 leader_sex="Male", "Female", "Male", "Male", "Male",
--- english.ruleset     2002/12/11 13:25:18     1.2
+++ english.ruleset     2002/12/13 20:31:51
@@ -2,6 +2,7 @@
 
 name=_("English")
 plural=_("?plural:English")
+class=_("Modern")
 leader="Elizabeth", "William the Conqueror", "Richard Lionheart", "Henry VIII",
        "Oliver Cromwell", "Victoria", "Winston Churchill"
 leader_sex="Female", "Male", "Male", "Male",
--- estonian.ruleset    2002/12/13 18:28:05     1.1
+++ estonian.ruleset    2002/12/13 20:33:31
@@ -2,6 +2,8 @@
 
 name=_("Estonian")
 plural=_("?plural:Estonians")
+class=_("Modern")
+legend=_("Estonia is a small country on the south shore of the estern Baltic 
Sea.  Its people and language are closely related to those of Finland.")
 leader="Kalevipoeg", "Lembitu", "Carl Robert Jakobson", "Konstatin Päts",
   "Tunne Kelam", "Lennart Meri"
 leader_sex="Male", "Male", "Male", "Male",
--- filipino.ruleset    2002/12/11 13:25:18     1.2
+++ filipino.ruleset    2002/12/13 20:33:53
@@ -2,6 +2,7 @@
 
 name=_("Filipino")
 plural=_("?plural:Filipinos")
+class=_("Modern")
 leader="Ramon Magsagay","Jose Rizal", "Luis Taruc", "Sergio Osmena", 
"Ferdinand Marcos"
 leader_sex="Male", "Male", "Male", "Male", "Male"
 flag="f.philippines"
--- finnish.ruleset     2002/12/13 18:28:29     1.1
+++ finnish.ruleset     2002/12/13 20:34:05
@@ -2,6 +2,7 @@
 
 name=_("Finnish")
 plural=_("?plural:Finns")
+class=_("Modern")
 leader="Carl Gustav Mannerheim", "Urho Kekkonen", "Martti Ahtisaari",
        "Tarja Halonen", "Linus Torvalds"
 leader_sex="Male", "Male", "Male",
--- french.ruleset      2002/12/11 14:00:53     1.3
+++ french.ruleset      2002/12/13 20:34:14
@@ -2,6 +2,7 @@
 
 name=_("French")
 plural=_("?plural:French")
+class=_("Modern")
 leader="Napoleon", "Charlemagne", "Louis XIV", "Charles de Gaulle",
        "Vercingetorix", "Chlodwig", "Charles Martel"
 leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male"
--- german.ruleset      2002/12/13 18:28:55     1.1
+++ german.ruleset      2002/12/13 20:34:24
@@ -2,6 +2,7 @@
 
 name=_("German")
 plural=_("?plural:Germans")
+class=_("Modern")
 leader="Frederick", "Otto", "Wilhelm", "Bismarck", "Hitler",
   "Barbarossa", "Luther", "Müntzer"
 leader_sex="Male", "Male", "Male", "Male", "Male",
--- greek.ruleset       2002/12/11 14:00:53     1.3
+++ greek.ruleset       2002/12/13 21:49:21
@@ -2,6 +2,8 @@
 
 name=_("Greek")
 plural=_("?plural:Greeks")
+class=_("Historical")
+legend=_("The ancient Greeks, between Mycenae and the Roman conquest.")
 leader="Alexander", "Perikles", "Leonidas", "Solon"
 leader_sex="Male", "Male", "Male", "Male"
 flag="f.greece"
--- hungarian.ruleset   2002/12/13 18:29:24     1.1
+++ hungarian.ruleset   2002/12/13 21:49:36
@@ -2,6 +2,7 @@
 
 name=_("Hungarian")
 plural=_("?plural:Hungarians")
+class=_("Modern")
 leader="Árpád", "Szent István", "Károly Róbert",
        "Hunyadi Mátyás", "Mária Terézia", "Batthyány"
 leader_sex="Male", "Male", "Male", "Male", "Female", "Male"
--- inca.ruleset        2002/12/13 18:29:36     1.1
+++ inca.ruleset        2002/12/13 21:56:07
@@ -2,6 +2,8 @@
 
 name=_("Inca")
 plural=_("?plural:Incas")
+class=_("Historical")
+legend=_("The Inca were an Amerind people of the Northern Andes who conquered 
an empire stretching along the west coast of South America from what is now 
southern Chile nearly to the Equator. They had the bad timing to do it just a 
few decades before the Spanish conquistadores arrived in their part of the 
world in the mid-1500s.")
 leader="Tupac", "Manco Capac", "Atahualpa", "Pachacuti"
 leader_sex="Male", "Male", "Male", "Male"
 flag="f.peru"
--- indian.ruleset      2002/12/13 18:29:55     1.1
+++ indian.ruleset      2002/12/13 21:58:56
@@ -1,6 +1,7 @@
 [nation_indian]
 
 name=_("Indian")
+class=_("Modern")
 plural=_("?plural:Indians")
 leader="Gandhi", "Ashoka", "Chandragupta", "Indhira Gandhi"
 leader_sex="Male", "Male", "Male", "Female"
@@ -29,4 +30,5 @@
   "Colombo", "Madurai", "Coimbatore", "Calicut", "Trivandrum",
   "Nagpur", "Chittagong", "Multan", "Amritsar", "Srinagar",
   "Agra", "Bhopal", "Patna", "Surat", "Jaipur", "Varanasi",
-  "Allahabad", "Indore", "Mysore", "Raipur", "Gaya"
+  "Allahabad", "Indore", "Mysore", "Raipur", "Gaya", "Cawnpore",
+  "Poona (hills)"
--- irish.ruleset       2002/12/11 13:25:18     1.2
+++ irish.ruleset       2002/12/13 23:28:40
@@ -2,6 +2,7 @@
 
 name = _("Irish")
 plural = _("?plural:Irish")
+class=_("Historical")
 leader = "Brian Boru", "Cuchulain", "Patrick", "Ollam Fodla", "Lugh"
 leader_sex = "Male", "Male", "Male", "Male", "Male"
 flag="f.ireland"
--- israeli.ruleset     2002/12/13 18:30:38     1.1
+++ israeli.ruleset     2002/12/15 03:14:08
@@ -2,8 +2,10 @@
 
 name=_("Israeli")
 plural=_("?plural:Israelis")
-leader="Solomon", "David", "David Ben-Gurion", "Ze'ev Zabotinsky"
-leader_sex="Male", "Male", "Male", "Male"
+class=_("Modern")
+legend=_("The nation of Israel was founded in 1948 as a scattered collection 
of cantons in British Palestine, and has gradually expanded through winning a 
serioes of wars launched against it in 1948, 1967 and 1973.")
+leader="Solomon", "David", "David Ben-Gurion", "Ze'ev Zabotinsky", "Golda Meir"
+leader_sex="Male", "Male", "Male", "Male", "Female"
 flag="f.israel"
 flag_alt = "-"
 city_style = "European"
--- italian.ruleset     2002/12/13 18:30:50     1.1
+++ italian.ruleset     2002/12/15 03:22:13
@@ -2,6 +2,8 @@
 
 name = _("Italian")
 plural = _("?plural:Italians")
+class=_("Modern")
+legend=_("The Italian nation was unified in 1870 after decades of campaigning 
by indigenous nationalists. It was a monarchy under the House of Savoy until 
1922, then a fascist state until 1945 after which democracy was restored by the 
WWII victors.")
 leader = "Giuseppe Garibaldi", "Giuseppe Mazzini", "Palmiro Togliatti",
          "Giacomo Matteotti"
 leader_sex = "Male", "Male", "Male",
--- japanese.ruleset    2002/12/13 18:31:08     1.1
+++ japanese.ruleset    2002/12/13 23:29:13
@@ -2,6 +2,7 @@
 
 name=_("Japanese")
 plural=_("?plural:Japanese")
+class=_("Modern")
 leader="Mutsuhito", "Jimmu Tenno", "Hirohito", "Tokugawa Ieyasu"
 leader_sex="Male", "Male", "Male", "Male"
 flag="f.japan"
--- kenyan.ruleset      2002/12/13 18:31:22     1.1
+++ kenyan.ruleset      2002/12/13 23:29:27
@@ -2,7 +2,8 @@
 
 name = _("Kenyan")
 plural = _("?plural:Kenyans")
-leader = "Kenyatta"
+class=_("Modern")
+leader = "Jomo Kenyatta"
 leader_sex = "Male"
 flag = "f.kenya"
 flag_alt = "-"
--- korean.ruleset      2002/12/13 18:31:42     1.1
+++ korean.ruleset      2002/12/13 23:29:55
@@ -2,6 +2,7 @@
 
 name=_("Korean")
 plural=_("?plural:Koreans")
+class=_("Modern")
 leader="T'aejong", "Kim Ir Sen", "Pak Dzonghyi", "Wang Gon"
 leader_sex="Male", "Male", "Male", "Male"
 flag="f.korea"
--- latvian.ruleset     2002/12/13 18:31:52     1.1
+++ latvian.ruleset     2002/12/13 23:30:05
@@ -2,6 +2,7 @@
 
 name=_("Latvian")
 plural=_("?plural:Latvians")
+class=_("Modern")
 leader="Karlis Ulmanis", "Guntis Ulmanis", 
   "Vaira Vike Freiberga", "Namejs"
 leader_sex="Male", "Male", 
--- lithuanian.ruleset  2002/12/13 18:32:09     1.1
+++ lithuanian.ruleset  2002/12/13 23:31:50
@@ -2,6 +2,8 @@
 
 name=_("Lithuanian")
 plural=_("?plural:Lithuanians")
+class=_("Modern")
+legend=_("Lithuania is a small country on the south coast of the Baltic Sea, 
northeast of Poland.  Lithuanian is the most archaic and complex of the 
northern Indo-European languages")
 leader="Gediminas", "Mindaugas", "Vytautas", "Antanas Smetona"
 leader_sex="Male", "Male", "Male", "Male"
 flag="f.lithuania"
--- mongol.ruleset      2002/12/13 18:32:22     1.1
+++ mongol.ruleset      2002/12/15 03:49:23
@@ -2,8 +2,10 @@
 
 name=_("Mongol")
 plural=_("?plural:Mongols")
-leader="Genghis", "Ogodei", "Timur", "Batu", "Tokhtamysh"
-leader_sex="Male", "Male", "Male", "Male", "Male"
+class=_("Historical")
+legend=_("In the centuries after their unification by Genghis Khan, the 
Mongols conquered the largest empire in human history, encompassing most of the 
continent of Asia.  They became notorious for the utter ruthlessness in 
warfare.")
+leader="Genghis", "Ogodei", "Bayan", "Timur", "Batu", "Tokhtamysh"
+leader_sex="Male", "Male", "Male", "Male", "Male", "Male"
 flag="f.mongolia"
 flag_alt = "-"
 city_style = "European"
--- mordor.ruleset      2002/12/13 18:32:54     1.1
+++ mordor.ruleset      2002/12/13 23:34:49
@@ -2,8 +2,10 @@
 
 name=_("Mordor")
 plural=_("?plural:Mordors")
-leader="Sauron", "Angmar", "Gorthaur"
-leader_sex="Male", "Male", "Male"
+class=_("Fictional")
+legend=_("The armies of the Dark Lord Sauron, from J.R.R. Tolkien's 'Lord of 
the Rings' trilogy.")
+leader="Sauron", "Angmar", "Gorthaur", "Melkor"
+leader_sex="Male", "Male", "Male", "Male"
 flag = "f.mordor"
 flag_alt = "-"
 city_style = "Classical"
--- persian.ruleset     2002/12/13 18:33:49     1.1
+++ persian.ruleset     2002/12/13 23:39:58
@@ -2,6 +2,8 @@
 
 name=_("Persian")
 plural=_("?plural:Persians")
+class=_("Historical")
+legend=_("The first Persan (Achmaenid) Empire lasted from 55BCE-330BCE; the 
second (Sassanid) from 226CE-642CE.")
 leader="Cyrus", "Darius", "Xerxes", "Ardashir"
 leader_sex="Male", "Male", "Male", "Male"
 flag="f.iran"
--- polish.ruleset      2002/12/13 18:34:25     1.1
+++ polish.ruleset      2002/12/13 23:41:28
@@ -2,6 +2,7 @@
 
 name=_("Polish")
 plural=_("?plural:Polish")
+class=_("Modern")
 leader="Mieszko I", "Wladyslaw Lokietek", "Kazimierz Wielki", "Jadwiga",
        "Wladyslaw Jagiello", "Stefan Batory", "Jan III Sobieski",
        "Stanislaw Poniatowski", "Kosciuszko", "Pilsudski"
--- portuguese.ruleset  2002/12/13 18:34:37     1.1
+++ portuguese.ruleset  2002/12/15 04:20:41
@@ -2,6 +2,8 @@
 
 name=_("Portuguese")
 plural=_("?plural:Portuguese")
+class=_("Modern")
+legend=_("Portugal founded the first of the great mercantile empires in the 
1400s on the shipbuilding advances funded by Prince Henry the Navigator.")
 leader="Afonso Henriques", "Afonso IV", "João II"
 leader_sex="Male", "Male", "Male"
 flag="f.portugal"
--- roman.ruleset       2002/12/11 14:00:53     1.3
+++ roman.ruleset       2002/12/13 23:41:47
@@ -2,6 +2,7 @@
 
 name=_("Roman")
 plural=_("?plural:Romans")
+class=_("Historical")
 leader="Caesar", "Augustus", "Vespasian", "Nero", "Trajan", "Marcus Aurelius",
        "Tiberius", "Constantine",
        "Livia", "Messalina"
--- russian.ruleset     2002/12/13 18:35:22     1.1
+++ russian.ruleset     2002/12/14 16:55:08
@@ -2,6 +2,8 @@
 
 name=_("Russian")
 plural=_("?plural:Russians")
+class=_("Modern")
+legend=_("Russia originated as the Kievan Rus, territory siezed by Vikings 
from what is now Sweden during the early medieval period.")
 leader="Catherine II", "Ivan the Terrible", "Stalin", "Peter", "Anne"
 leader_sex="Female", "Male", "Male", "Male", "Female"
 flag="f.russia"
--- scottish.ruleset    2002/12/13 18:35:41     1.1
+++ scottish.ruleset    2002/12/13 23:43:37
@@ -2,6 +2,7 @@
 
 name=_("Scottish")
 plural=_("?plural:Scots")
+class=_("Modern")
 leader="Henry McLeish", "Donald Dewar", "Charles", "James",
        "Robert the Bruce", "William Wallace", "Mary Stuart"
 leader_sex="Male", "Male", "Male", "Male",
--- serbian.ruleset     2002/12/13 18:35:54     1.1
+++ serbian.ruleset     2002/12/14 16:52:29
@@ -2,6 +2,8 @@
 
 name=_("Serbian")
 plural=_("?plural:Serbians")
+class=_("Modern")
+legend=_("Serbia is part of the region of the Southern Slavs that was 
conquered by the Ottomans after the collapse of the Byzantine Empire.  During 
most of the 20th century it was part of the Yugoslav Federation.")
 leader="Vlastimir", "Caslav", "Vojislav", "Mihailo", "Bodin", "Nemanja",
        "Stefan Prvovjencani", "Stefan Uros", "Milutin", "Dusan",
        "Karadorde Petrovic", "Milos Obrenovic", "Aleksandar Petrovic",
--- silesian.ruleset    2002/12/13 18:36:04     1.1
+++ silesian.ruleset    2002/12/13 23:45:10
@@ -2,6 +2,8 @@
 
 name=_("Silesian")
 plural=_("?plural:Silesians")
+class=_("Historical")
+legend=_("Silesia is a region of Poland that was at one time an independent 
kingdom.")
 leader="Wladislaw the Exile", "Henryk the Godfearing"
 leader_sex="Male", "Male"
 flag="f.silesia"
--- singaporean.ruleset 2002/12/13 18:36:53     1.1
+++ singaporean.ruleset 2002/12/13 23:46:32
@@ -14,6 +14,8 @@
 
 name=_("Singaporean")
 plural=_("?plural:Singaporeans")
+class=_("Modern")
+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",
--- sioux.ruleset       2002/12/13 18:37:08     1.1
+++ sioux.ruleset       2002/12/13 23:46:44
@@ -2,6 +2,7 @@
 
 name=_("Sioux")
 plural=_("?plural:Sioux")
+class=_("Historical")
 leader="Sitting Bull", "Crazy Horse", "Little Crow", "Red Cloud"
 leader_sex="Male", "Male", "Male", "Male"
 flag="f.cheyenne"
--- slovenian.ruleset   2002/12/13 18:37:41     1.1
+++ slovenian.ruleset   2002/12/13 23:48:04
@@ -2,6 +2,8 @@
 
 name=_("Slovenian")
 plural=_("?plural:Slovenians")
+class=_("Modern")
+legend=_("Slovenia was the most western and northern republic of the old 
Yugoslav Federation.")
 leader="Valuka", "Valtunk", "Kocelj", "Primoz Trubar"
 leader_sex="Male", "Male", "Male", "Male"
 flag="f.slovenia"
--- spanish.ruleset     2002/12/13 18:38:00     1.1
+++ spanish.ruleset     2002/12/15 08:13:29
@@ -2,6 +2,8 @@
 
 name=_("Spanish")
 plural=_("?plural:Spanish")
+class=_("Modern")
+legend=_("The modern Spanish nation was formed when the rulers of the kingdoms 
of Castille and Aragon led the recapture of the Iberian peninsula from the 
Moslems.  The Reconquista was completed in 1492, the same year Columbus 
sailed.")
 leader="Viriato", "Recaredo I", "Alfonso X", "Fernando V", "Isabel I",
        "Carlos I", "Felipe II", "Carlos III", "Franco", "Mortadelo"
 leader_sex="Male", "Male", "Male", "Male", "Female",
--- swedish.ruleset     2002/12/13 18:39:10     1.1
+++ swedish.ruleset     2002/12/13 23:48:29
@@ -2,6 +2,7 @@
 
 name=_("Swedish")
 plural=_("?plural:Swedes")
+class=_("Modern")
 
 leader=
   "Erik Segergäll", "Olof Skötkonung", "Gustav Vasa", "Erik", "Karl",
--- thai.ruleset        2002/12/13 18:39:26     1.1
+++ thai.ruleset        2002/12/15 08:09:45
@@ -2,6 +2,8 @@
 
 name=_("Thai")
 plural=_("?plural:Thai")
+class=_("Modern")
+legend=_("The Thai kingdom was the only country in Southeast Asia to preserve 
its independence throught the colonial era of the 18th and 19th centuries.")
 leader = "Rama Thibodi", "Chao Phya Chakri", "Maha Mongkut", "Chulalongkorn",
          "Pibul Songgram", "Seni Pramoya"
 leader_sex = "Male", "Male", "Male", "Male",
--- turk.ruleset        2002/12/13 18:39:38     1.1
+++ turk.ruleset        2002/12/15 08:08:03
@@ -2,6 +2,8 @@
 
 name=_("Turk")
 plural=_("?plural:Turks")
+class=_("Modern")
+lgend=_("Modern Turkey is the successor state of the Ottoman Empire, which 
collapsed and was dismembered by the victors in World War I after backing the 
Central Powers.  The country was subsequently reformed and secularized by Kemal 
Mustapha, the hero of the defense of Gallipoli.")
 leader="Kemal Atatürk", "Süleyman", "Osman", "Murat",
        "Selim", "Mehmet"
 leader_sex="Male", "Male", "Male", "Male",
--- ukrainian.ruleset   2002/12/13 18:39:57     1.1
+++ ukrainian.ruleset   2002/12/15 08:04:16
@@ -2,7 +2,9 @@
 
 name=_("Ukrainian")
 plural=_("?plural:Ukrainians")
-leader="Khmelnistkyi","Petlura"
+class=_("Modern")
+legend=_("The Ukraine is a vast region on the westernmost marches of the 
former Soviet Union. It includes some of the most fertile black-soil cropland 
on Earth.")
+leader="Bohdan Khmelnitskyi","Simon Petlura"
 leader_sex="Male","Male"
 flag="f.ukraine"
 flag_alt = "-"
--- vietnamese.ruleset  2002/12/13 18:40:14     1.1
+++ vietnamese.ruleset  2002/12/16 00:49:11
@@ -2,8 +2,10 @@
 
 name=_("Vietnamese")
 plural=_("?plural:Vietnamese")
-leader="Ly Bon", "Gia Long", "Bao Dai", "Ho Chi Minh", "Ngo Ding Diem"
-leader_sex="Male", "Male", "Male", "Male", "Male"
+class=_("Modern")
+legend=_("The Vietnamese nation was founded in the first century CE by twin 
sisters who became the war leaders of a revolt against a Chinese military 
governor.")
+leader="Trung Trac", "Trung Nhi", "Ly Bon", "Gia Long", "Bao Dai", "Ho Chi 
Minh", "Ngo Ding Diem"
+leader_sex="Female","Female", "Male", "Male", "Male", "Male", "Male"
 flag="f.vietnam"
 flag_alt = "-"
 city_style = "European"
--- viking.ruleset      2002/12/11 13:25:18     1.2
+++ viking.ruleset      2002/12/16 00:25:38
@@ -2,6 +2,8 @@
 
 name=_("Viking")
 plural=_("?plural:Vikings")
+class=_("Historical")
+legend=_("The Vikings raided and traded along the coasts of Europe between 800 
and 1100. Viking raids eventually became the rulers of Normandy, Russia, and a 
short-lived kingdom in Sicily.")
 leader="Erik Blodøks", "Harald Hårfagre", "Hrolf Gangr", "Rollo",
        "Gro Harlem Brundtland", "Haakon VII", "Aud Ivarsdottr"
 leader_sex="Male", "Male", "Male", "Male", 
@@ -26,6 +28,7 @@
 
 ;Norwegian (and Icelandic) names.
 ;Norwegian places listed up in the order it struck my mind.
+;Thorshavn and Hedeby (Haithabu) were Viking cities in the premodern period.
 
 cities =
  "Oslo", "Bergen", "Kaupang", "Stavanger", "Nidaros", "Narvik", "Tromsø",
@@ -36,7 +39,7 @@
  "Lillehammer", "Lillestrøm", "Strømmen", "Fredrikborg", "Halden", "Karmøy",
  "Kragerø", "Fauske", "Bodø", "Andenes", "Stokkmarknes", "Svolvær",
  "Sortland", "Moss", "Honningsvåg", "Hammerfest", "Ås", "Os", "Tynset",
- "Longyearbyen", "Mandal",
+ "Longyearbyen", "Mandal", "Thorshavn", "Hedeby"
 
 ; Eg skal ikkje gløyme kvelden, det var ein augustikveld,
 ; Vårherre heldt fest for folket i Fjaler prestegjeld,
@@ -47,4 +50,3 @@
 ; added to Freeciv by Gaute Strokkenes RCNUWC 96-98
 ; for sentimental reasons.
 
- "Fjaler"
--- welsh.ruleset       2002/12/13 18:40:54     1.1
+++ welsh.ruleset       2002/12/15 07:48:43
@@ -2,6 +2,8 @@
 
 name=_("Welsh")
 plural=_("?plural:Welsh")
+class=_("Historical")
+legend=_("The Welsh at one time controlled all of what is now England until 
being driven into the mountainous western reaches by invading Saxons.")
 leader="Llywelyn ap Gruffudd", "Hywel Dda", "Owain Glyndwr"
 leader_sex="Male", "Male", "Male"
 flag="f.wales"
--- zulu.ruleset        2002/12/11 14:00:53     1.3
+++ zulu.ruleset        2002/12/16 00:48:34
@@ -2,6 +2,7 @@
 
 name=_("Zulu")
 plural=_("?plural:Zulus")
+class=_("Historical")
 ; According to <http://www.anglo.50megs.com/zulu_kings.htm>, this is the
 ; complete Zulu king list.  It's in regnal order, except that Utshaka
 ; (Westernized "Shaka" or "Chaka"), the best known of the kings, has 
@@ -10,6 +11,7 @@
        "Unkosinkulu", "Umageba",  "Upunga", "Undaba", "Ujama", 
        "Usenzangakona", "Udingana", "Umpande", "Ucetywayo", "Udinuzulu", 
        "Usolomona"
+legend=_("The Zulus are a warlike Bantu people who migrated from west-central 
Africa into southern Africa beginning in the early 1700s, conquering the native 
Khoisan peoples and clashing with European settlers.")
 leader_sex="Male", "Male", "Male", "Male", "Male", 
            "Male", "Male", "Male", "Male", "Male", 
            "Male", "Male", "Male", "Male", "Male", 

End of diffs.

[Prev in Thread] Current Thread [Next in Thread]