[Freeciv-Dev] Re: (PR#2591) Nondenominational calendar patch
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
Raimar Falke via RT <rt@xxxxxxxxxxxxxx>:
> *reading the threads* You need a flag for the Barsoomians (sp?).
I'll work on that today.
> I have applied the small docu changes. I have applied the extra-leader
> patch (_except_ dunedain.ruleset, here you you and Paul have to come
> to an agreement). Please resend the class/legend patch without the
> EC/BCE. Did I miss anything?
Enclosed please find the class-legend patch with BC/AD correction and
lines wrapped as you requested and all other nits corrected.
This brings you guys fully up to date with my changes except for the
Barsoom patch. My understanding is that Paul was OK with the Barsoom
patch provided we get categorization of the nations going. I've supplied
the data for that, and you said you'd supply the dialog code. So I
think we're fulfilling his conditions.
I know what I want the Barsoom flag to look like. What dimensions should
it be? Is there a format guide for flags anywhere?
--
<a href="http://www.tuxedo.org/~esr/";>Eric S. Raymond</a>
? DIFF
? autom4te-2.53.cache
Index: data/nation/american.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/american.ruleset,v
retrieving revision 1.6
diff -u -r1.6 american.ruleset
--- data/nation/american.ruleset 2002/12/17 22:40:57 1.6
+++ data/nation/american.ruleset 2002/12/20 01:18:24
@@ -2,60 +2,56 @@
name=_("American")
plural=_("?plural:Americans")
+class=_("Modern")
+legend=_("Formally named the United States of America. Independent from \
+Great Britain from 1776AD.")
leader="George Washington",
"John Adams",
"Thomas Jefferson",
"James Madison",
- "James Monroe",
- "John Quincy Adams",
+ ;"James Monroe",
+ ;"John Quincy Adams",
"Andrew Jackson",
- "Martin Van Buren",
- "William Henry Harrison",
- "John Tyler",
- "James Polk",
- "Zachary Taylor",
- "Millard Filmore",
- "Franklin Pierce",
- "James Buchanan",
- "Abraham Lincoln"
-
-# "Andew Johnson",
-# "Ulysses S. Grant",
-# "Rutherford Hayes",
-# "James Garfield",
-# "Chester Alan Arthur",
-# "Grover Cleveland",
-# "Benjamin Harrison",
-# "William McKinley",
-# "Theodore Roosevelt",
-# "William Howard Taft",
-# "Woodrow Wilson",
-# "Warren Harding",
-# "Calvin Coolidge",
-# "Herbert Hoover",
-# "Franklin D. Roosevelt",
-# "Harry S. Truman",
-# "Dwight Eisenhower",
-# "John F. Kennedy",
-# "Lyndon Johnson",
-# "Richard Nixon",
-# "Gerald W. Ford",
-# "Jimmy Carter",
-# "Ronald Reagan",
-# "George H. W. Bush",
-# "Bill Clinton",
-# "George W. Bush",
-# "Eleanor Roosevelt"
+ ;"Martin Van Buren",
+ ;"William Henry Harrison",
+ ;"John Tyler",
+ ;"James Polk",
+ ;"Zachary Taylor",
+ ;"Millard Filmore",
+ ;"Franklin Pierce",
+ ;"James Buchanan",
+ "Abraham Lincoln",
+ ;"Andew Johnson",
+ "Ulysses S. Grant",
+ ;"Rutherford Hayes",
+ ;"James Garfield",
+ ;"Chester Alan Arthur",
+ ;"Grover Cleveland",
+ ;"Benjamin Harrison",
+ ;"William McKinley",
+ "Theodore Roosevelt",
+ ;"William Howard Taft",
+ ;"Woodrow Wilson",
+ ;"Warren Harding",
+ ;"Calvin Coolidge",
+ ;"Herbert Hoover",
+ "Franklin D. Roosevelt",
+ "Harry S. Truman",
+ ;"Dwight Eisenhower",
+ "John F. Kennedy",
+ "Lyndon Johnson",
+ "Richard Nixon",
+ ;"Gerald W. Ford",
+ ;"Jimmy Carter",
+ "Ronald Reagan",
+ "George H. W. Bush",
+ ;"Bill Clinton",
+ ;"George W. Bush",
+ "Eleanor Roosevelt"
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", "Male",
- #"Male", "Male", "Male", "Male", "Male",
- #"Male", "Male", "Male",
- #"Female"
+ "Female"
flag="f.usa"
flag_alt = "-"
city_style = "European"
Index: data/nation/arab.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/arab.ruleset,v
retrieving revision 1.3
diff -u -r1.3 arab.ruleset
--- data/nation/arab.ruleset 2001/12/11 16:16:43 1.3
+++ data/nation/arab.ruleset 2002/12/20 01:18:24
@@ -2,6 +2,8 @@
name=_("Arab")
plural=_("?plural:Arabs")
+class=_("Historical")
+legend=_("The Arab/Islamic civilization of 622AD-1495AD.")
leader="Mohammad", "Umar", "Harun al-Rashid", "Saladin"
leader_sex="Male", "Male", "Male", "Male"
flag ="f.arab"
Index: data/nation/argentine.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/argentine.ruleset,v
retrieving revision 1.7
diff -u -r1.7 argentine.ruleset
--- data/nation/argentine.ruleset 2002/05/03 17:12:04 1.7
+++ data/nation/argentine.ruleset 2002/12/20 01:18:24
@@ -2,6 +2,8 @@
name=_("Argentine")
plural=_("?plural:Argentines")
+class=_("Modern")
+legend=_("Argentina 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"
Index: data/nation/australian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/australian.ruleset,v
retrieving revision 1.5
diff -u -r1.5 australian.ruleset
--- data/nation/australian.ruleset 2002/04/30 12:52:55 1.5
+++ data/nation/australian.ruleset 2002/12/20 01:18:24
@@ -2,6 +2,9 @@
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"
Index: data/nation/aztec.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/aztec.ruleset,v
retrieving revision 1.4
diff -u -r1.4 aztec.ruleset
--- data/nation/aztec.ruleset 2002/11/18 19:46:25 1.4
+++ data/nation/aztec.ruleset 2002/12/20 01:18:24
@@ -2,6 +2,11 @@
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 AD, 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"
Index: data/nation/babylonian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/babylonian.ruleset,v
retrieving revision 1.5
diff -u -r1.5 babylonian.ruleset
--- data/nation/babylonian.ruleset 2002/12/17 22:40:57 1.5
+++ data/nation/babylonian.ruleset 2002/12/20 01:18:24
@@ -2,6 +2,10 @@
name=_("Babylonian")
plural=_("?plural:Babylonians")
+class=_("Historical")
+legend=_("Babylon was the dominent city of Mesopotamia from the 18th to \
+7th centuries BC 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"
Index: data/nation/bavarian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/bavarian.ruleset,v
retrieving revision 1.3
diff -u -r1.3 bavarian.ruleset
--- data/nation/bavarian.ruleset 2001/12/11 16:16:43 1.3
+++ data/nation/bavarian.ruleset 2002/12/20 01:18:24
@@ -2,6 +2,9 @@
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"
Index: data/nation/boer.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/boer.ruleset,v
retrieving revision 1.5
diff -u -r1.5 boer.ruleset
--- data/nation/boer.ruleset 2002/04/30 12:52:55 1.5
+++ data/nation/boer.ruleset 2002/12/20 01:18:24
@@ -2,6 +2,11 @@
name=_("Boer")
plural=_("?plural:Boers")
+class=_("Historical")
+legend=_("The Boers were Dutch settlers in British-controlled South \
+Africa from 1650AD. 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",
Index: data/nation/brazilian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/brazilian.ruleset,v
retrieving revision 1.7
diff -u -r1.7 brazilian.ruleset
--- data/nation/brazilian.ruleset 2002/11/18 19:46:25 1.7
+++ data/nation/brazilian.ruleset 2002/12/20 01:18:24
@@ -2,6 +2,10 @@
name=_("Brazilian")
plural=_("?plural:Brazilians")
+class=_("Modern")
+legend=_("Brazil was founded as a colony of Portugal 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"
Index: data/nation/canadian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/canadian.ruleset,v
retrieving revision 1.4
diff -u -r1.4 canadian.ruleset
--- data/nation/canadian.ruleset 2002/04/30 12:52:55 1.4
+++ data/nation/canadian.ruleset 2002/12/20 01:18:24
@@ -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"
Index: data/nation/carthaginian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/carthaginian.ruleset,v
retrieving revision 1.3
diff -u -r1.3 carthaginian.ruleset
--- data/nation/carthaginian.ruleset 2001/12/11 16:16:43 1.3
+++ data/nation/carthaginian.ruleset 2002/12/20 01:18:24
@@ -2,6 +2,10 @@
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 centuries \
+BC. Carthage was destroyed by Rome in 146BC.")
leader="Hannibal", "Hasdrubal", "Hamilcar", "Dido"
leader_sex="Male", "Male", "Male", "Female"
flag="f.tunisia"
Index: data/nation/catalan.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/catalan.ruleset,v
retrieving revision 1.7
diff -u -r1.7 catalan.ruleset
--- data/nation/catalan.ruleset 2002/05/03 17:12:04 1.7
+++ data/nation/catalan.ruleset 2002/12/20 01:18:24
@@ -2,6 +2,9 @@
name=_("Catalan")
plural=_("?plural:Catalans")
+class=_("Historical")
+legend=_("Catalunya (aka Catalonia in English) 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 +31,9 @@
wonder="A.Smith's Trading Co."
government="Republic"
+; This city list does not actually correspond to medieval Catalonia,
+; but rather to the "Pa�sos Catalans" of modern ethnolinguistic
+; nationalists.
cities =
"Barcelona", "Tarragona", "Lleida", "Girona", "Perpiny�", "Valencia",
"Tolosa", "Ripoll", "Vic", "La Seu d'Urgell", "Cardona", "Tortosa",
Index: data/nation/chilean.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/chilean.ruleset,v
retrieving revision 1.9
diff -u -r1.9 chilean.ruleset
--- data/nation/chilean.ruleset 2002/06/12 07:54:32 1.9
+++ data/nation/chilean.ruleset 2002/12/20 01:18:24
@@ -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",
Index: data/nation/chinese.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/chinese.ruleset,v
retrieving revision 1.4
diff -u -r1.4 chinese.ruleset
--- data/nation/chinese.ruleset 2002/11/18 19:46:25 1.4
+++ data/nation/chinese.ruleset 2002/12/20 01:18:24
@@ -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 = "-"
Index: data/nation/cornish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/cornish.ruleset,v
retrieving revision 1.4
diff -u -r1.4 cornish.ruleset
--- data/nation/cornish.ruleset 2002/04/30 12:52:56 1.4
+++ data/nation/cornish.ruleset 2002/12/20 01:18:24
@@ -2,6 +2,9 @@
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"
Index: data/nation/croatian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/croatian.ruleset,v
retrieving revision 1.3
diff -u -r1.3 croatian.ruleset
--- data/nation/croatian.ruleset 2001/10/12 12:22:21 1.3
+++ data/nation/croatian.ruleset 2002/12/20 01:18:25
@@ -2,6 +2,11 @@
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",
Index: data/nation/czech.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/czech.ruleset,v
retrieving revision 1.3
diff -u -r1.3 czech.ruleset
--- data/nation/czech.ruleset 2001/12/11 16:16:43 1.3
+++ data/nation/czech.ruleset 2002/12/20 01:18:25
@@ -2,7 +2,9 @@
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",
Index: data/nation/danish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/danish.ruleset,v
retrieving revision 1.6
diff -u -r1.6 danish.ruleset
--- data/nation/danish.ruleset 2002/12/17 20:10:19 1.6
+++ data/nation/danish.ruleset 2002/12/20 01:18:25
@@ -2,6 +2,9 @@
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",
Index: data/nation/dunedain.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/dunedain.ruleset,v
retrieving revision 1.6
diff -u -r1.6 dunedain.ruleset
--- data/nation/dunedain.ruleset 2002/11/18 19:46:25 1.6
+++ data/nation/dunedain.ruleset 2002/12/20 01:18:25
@@ -6,8 +6,12 @@
name=_("Dunedain")
plural=_("?plural:Dunedan")
-leader="Elros", "Tar-Ancalim�", "M�riel", "Elendil", "Isildur", "Aragorn"
-leader_sex="Male", "Female", "Female", "Male", "Male", "Male"
+class=_("Fictional")
+legend=_("The Men of the West from J.R.R. Tolkien's Middle Earth fantasies.")
+leader="Elros", "Tar-Ancalim�", "M�riel", "Elendil", "Isildur", "Aragorn",
+ "Tarannon Falastur", "Thorongil", "Ar-Pharazon", "Beruthiel"
+leader_sex="Male", "Female", "Female", "Male", "Male", "Male",
+ "Male", "Male", "Male", "Female"
flag = "f.dunedain"
flag_alt = "-"
city_style = "Classical"
Index: data/nation/dutch.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/dutch.ruleset,v
retrieving revision 1.6
diff -u -r1.6 dutch.ruleset
--- data/nation/dutch.ruleset 2002/07/11 12:43:17 1.6
+++ data/nation/dutch.ruleset 2002/12/20 01:18:25
@@ -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"
Index: data/nation/egyptian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/egyptian.ruleset,v
retrieving revision 1.4
diff -u -r1.4 egyptian.ruleset
--- data/nation/egyptian.ruleset 2002/12/17 20:10:19 1.4
+++ data/nation/egyptian.ruleset 2002/12/20 01:18:25
@@ -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",
Index: data/nation/english.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/english.ruleset,v
retrieving revision 1.6
diff -u -r1.6 english.ruleset
--- data/nation/english.ruleset 2002/12/17 20:10:19 1.6
+++ data/nation/english.ruleset 2002/12/20 01:18:25
@@ -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",
Index: data/nation/estonian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/estonian.ruleset,v
retrieving revision 1.3
diff -u -r1.3 estonian.ruleset
--- data/nation/estonian.ruleset 2001/10/12 12:22:22 1.3
+++ data/nation/estonian.ruleset 2002/12/20 01:18:25
@@ -2,6 +2,9 @@
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",
Index: data/nation/filipino.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/filipino.ruleset,v
retrieving revision 1.7
diff -u -r1.7 filipino.ruleset
--- data/nation/filipino.ruleset 2002/12/17 20:10:19 1.7
+++ data/nation/filipino.ruleset 2002/12/20 01:18:25
@@ -2,7 +2,9 @@
name=_("Filipino")
plural=_("?plural:Filipinos")
-leader="Ramon Magsagay","Jose Rizal", "Luis Taruc", "Sergio Osmena",
"Ferdinand Marcos"
+class=_("Modern")
+leader="Ramon Magsagay","Jose Rizal", "Luis Taruc", "Sergio Osmena",
+ "Ferdinand Marcos"
leader_sex="Male", "Male", "Male", "Male", "Male"
flag="f.philippines"
flag_alt = "-"
Index: data/nation/finnish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/finnish.ruleset,v
retrieving revision 1.3
diff -u -r1.3 finnish.ruleset
--- data/nation/finnish.ruleset 2001/12/11 16:16:44 1.3
+++ data/nation/finnish.ruleset 2002/12/20 01:18:25
@@ -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",
Index: data/nation/french.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/french.ruleset,v
retrieving revision 1.6
diff -u -r1.6 french.ruleset
--- data/nation/french.ruleset 2002/12/17 22:40:57 1.6
+++ data/nation/french.ruleset 2002/12/20 01:18:25
@@ -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"
Index: data/nation/german.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/german.ruleset,v
retrieving revision 1.9
diff -u -r1.9 german.ruleset
--- data/nation/german.ruleset 2002/06/01 19:57:26 1.9
+++ data/nation/german.ruleset 2002/12/20 01:18:25
@@ -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",
Index: data/nation/greek.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/greek.ruleset,v
retrieving revision 1.6
diff -u -r1.6 greek.ruleset
--- data/nation/greek.ruleset 2002/12/17 22:40:57 1.6
+++ data/nation/greek.ruleset 2002/12/20 01:18:25
@@ -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"
Index: data/nation/hungarian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/hungarian.ruleset,v
retrieving revision 1.4
diff -u -r1.4 hungarian.ruleset
--- data/nation/hungarian.ruleset 2002/05/03 16:30:22 1.4
+++ data/nation/hungarian.ruleset 2002/12/20 01:18:25
@@ -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"
Index: data/nation/inca.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/inca.ruleset,v
retrieving revision 1.4
diff -u -r1.4 inca.ruleset
--- data/nation/inca.ruleset 2002/11/18 19:46:25 1.4
+++ data/nation/inca.ruleset 2002/12/20 01:18:25
@@ -2,6 +2,12 @@
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"
Index: data/nation/indian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/indian.ruleset,v
retrieving revision 1.4
diff -u -r1.4 indian.ruleset
--- data/nation/indian.ruleset 2002/11/18 19:46:25 1.4
+++ data/nation/indian.ruleset 2002/12/20 01:18:25
@@ -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)"
Index: data/nation/irish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/irish.ruleset,v
retrieving revision 1.5
diff -u -r1.5 irish.ruleset
--- data/nation/irish.ruleset 2002/12/17 20:10:19 1.5
+++ data/nation/irish.ruleset 2002/12/20 01:18:25
@@ -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"
Index: data/nation/israeli.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/israeli.ruleset,v
retrieving revision 1.5
diff -u -r1.5 israeli.ruleset
--- data/nation/israeli.ruleset 2001/12/11 16:16:44 1.5
+++ data/nation/israeli.ruleset 2002/12/20 01:18:25
@@ -2,8 +2,12 @@
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 series 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"
Index: data/nation/italian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/italian.ruleset,v
retrieving revision 1.3
diff -u -r1.3 italian.ruleset
--- data/nation/italian.ruleset 2001/10/12 12:22:23 1.3
+++ data/nation/italian.ruleset 2002/12/20 01:18:25
@@ -2,6 +2,11 @@
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",
Index: data/nation/japanese.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/japanese.ruleset,v
retrieving revision 1.4
diff -u -r1.4 japanese.ruleset
--- data/nation/japanese.ruleset 2002/11/18 19:46:25 1.4
+++ data/nation/japanese.ruleset 2002/12/20 01:18:25
@@ -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"
Index: data/nation/korean.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/korean.ruleset,v
retrieving revision 1.4
diff -u -r1.4 korean.ruleset
--- data/nation/korean.ruleset 2002/11/18 19:46:26 1.4
+++ data/nation/korean.ruleset 2002/12/20 01:18:25
@@ -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"
Index: data/nation/latvian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/latvian.ruleset,v
retrieving revision 1.5
diff -u -r1.5 latvian.ruleset
--- data/nation/latvian.ruleset 2002/06/03 21:32:39 1.5
+++ data/nation/latvian.ruleset 2002/12/20 01:18:26
@@ -2,6 +2,7 @@
name=_("Latvian")
plural=_("?plural:Latvians")
+class=_("Modern")
leader="Karlis Ulmanis", "Guntis Ulmanis",
"Vaira Vike Freiberga", "Namejs"
leader_sex="Male", "Male",
Index: data/nation/lithuanian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/lithuanian.ruleset,v
retrieving revision 1.4
diff -u -r1.4 lithuanian.ruleset
--- data/nation/lithuanian.ruleset 2001/10/12 12:22:23 1.4
+++ data/nation/lithuanian.ruleset 2002/12/20 01:18:26
@@ -2,6 +2,10 @@
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"
Index: data/nation/mongol.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/mongol.ruleset,v
retrieving revision 1.4
diff -u -r1.4 mongol.ruleset
--- data/nation/mongol.ruleset 2002/11/18 19:46:26 1.4
+++ data/nation/mongol.ruleset 2002/12/20 01:18:26
@@ -2,8 +2,13 @@
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 = "Asian"
Index: data/nation/mordor.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/mordor.ruleset,v
retrieving revision 1.4
diff -u -r1.4 mordor.ruleset
--- data/nation/mordor.ruleset 2002/11/18 19:46:26 1.4
+++ data/nation/mordor.ruleset 2002/12/20 01:18:26
@@ -2,8 +2,11 @@
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 \
+Middle Earth fantasies.")
+leader="Sauron", "Angmar", "Gorthaur", "Melkor"
+leader_sex="Male", "Male", "Male", "Male"
flag = "f.mordor"
flag_alt = "-"
city_style = "Tropical"
@@ -27,5 +30,8 @@
"Minas Morgul", "Cirith Ungol", "Moria", "Angmar", "Gorgoroth",
"Morgai", "Nurn", "Khand", "Rh�n", "Harad", "Dagorlad", "Ephel D�ath",
"Ered Lithui", "Emyn Muil", "N�rnen", "Poros", "Harnen", "Lugb�rz",
- "Angband", "Carn D�m", "Utumno", "Amon Amarth", "Uruk-hai", "Olog-hai",
- "Azog", "Bolg", "Gorbag", "Shagrat", "Grishn�kh", "Glamhoth"
+ "Angband", "Carn D�m", "Utumno", "Amon Amarth", "Thangorodrim",
+ "Orthanc", "Angrenost", "Mount Fang", "Cirith Gorgor", "Moontower",
+ "Hells of Iron", "Ud�n", "Havens of Umbar", "Phurunargian", "Khand",
+ "Rh�n", "Sammath Naur"
+
Index: data/nation/persian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/persian.ruleset,v
retrieving revision 1.3
diff -u -r1.3 persian.ruleset
--- data/nation/persian.ruleset 2001/12/11 16:16:45 1.3
+++ data/nation/persian.ruleset 2002/12/20 01:18:26
@@ -2,6 +2,9 @@
name=_("Persian")
plural=_("?plural:Persians")
+class=_("Historical")
+legend=_("The first Persan (Achmaenid) Empire lasted from 55BC-330BC; \
+the second (Sassanid) from 226AD-642AD.")
leader="Cyrus", "Darius", "Xerxes", "Ardashir"
leader_sex="Male", "Male", "Male", "Male"
flag="f.iran"
Index: data/nation/polish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/polish.ruleset,v
retrieving revision 1.10
diff -u -r1.10 polish.ruleset
--- data/nation/polish.ruleset 2002/07/10 13:38:32 1.10
+++ data/nation/polish.ruleset 2002/12/20 01:18:26
@@ -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"
Index: data/nation/portuguese.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/portuguese.ruleset,v
retrieving revision 1.4
diff -u -r1.4 portuguese.ruleset
--- data/nation/portuguese.ruleset 2002/05/03 17:00:45 1.4
+++ data/nation/portuguese.ruleset 2002/12/20 01:18:26
@@ -2,6 +2,10 @@
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"
Index: data/nation/roman.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/roman.ruleset,v
retrieving revision 1.8
diff -u -r1.8 roman.ruleset
--- data/nation/roman.ruleset 2002/12/17 22:40:57 1.8
+++ data/nation/roman.ruleset 2002/12/20 01:18:26
@@ -2,6 +2,7 @@
name=_("Roman")
plural=_("?plural:Romans")
+class=_("Historical")
leader="Caesar", "Augustus", "Vespasian", "Nero", "Trajan", "Marcus Aurelius",
"Tiberius", "Constantine",
"Livia", "Messalina"
Index: data/nation/russian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/russian.ruleset,v
retrieving revision 1.3
diff -u -r1.3 russian.ruleset
--- data/nation/russian.ruleset 2001/12/11 16:16:45 1.3
+++ data/nation/russian.ruleset 2002/12/20 01:18:26
@@ -2,6 +2,9 @@
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"
Index: data/nation/scottish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/scottish.ruleset,v
retrieving revision 1.7
diff -u -r1.7 scottish.ruleset
--- data/nation/scottish.ruleset 2002/04/30 12:52:57 1.7
+++ data/nation/scottish.ruleset 2002/12/20 01:18:26
@@ -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",
Index: data/nation/serbian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/serbian.ruleset,v
retrieving revision 1.4
diff -u -r1.4 serbian.ruleset
--- data/nation/serbian.ruleset 2001/10/12 12:22:24 1.4
+++ data/nation/serbian.ruleset 2002/12/20 01:18:26
@@ -2,6 +2,10 @@
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",
Index: data/nation/silesian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/silesian.ruleset,v
retrieving revision 1.3
diff -u -r1.3 silesian.ruleset
--- data/nation/silesian.ruleset 2001/10/12 12:22:24 1.3
+++ data/nation/silesian.ruleset 2002/12/20 01:18:26
@@ -2,6 +2,9 @@
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"
Index: data/nation/singaporean.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/singaporean.ruleset,v
retrieving revision 1.5
diff -u -r1.5 singaporean.ruleset
--- data/nation/singaporean.ruleset 2002/11/18 19:46:26 1.5
+++ data/nation/singaporean.ruleset 2002/12/20 01:18:26
@@ -14,6 +14,9 @@
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",
Index: data/nation/sioux.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/sioux.ruleset,v
retrieving revision 1.4
diff -u -r1.4 sioux.ruleset
--- data/nation/sioux.ruleset 2002/04/30 12:52:57 1.4
+++ data/nation/sioux.ruleset 2002/12/20 01:18:26
@@ -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"
Index: data/nation/slovenian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/slovenian.ruleset,v
retrieving revision 1.3
diff -u -r1.3 slovenian.ruleset
--- data/nation/slovenian.ruleset 2001/10/12 12:22:24 1.3
+++ data/nation/slovenian.ruleset 2002/12/20 01:18:26
@@ -2,6 +2,9 @@
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"
Index: data/nation/spanish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/spanish.ruleset,v
retrieving revision 1.4
diff -u -r1.4 spanish.ruleset
--- data/nation/spanish.ruleset 2002/05/03 17:12:04 1.4
+++ data/nation/spanish.ruleset 2002/12/20 01:18:26
@@ -2,6 +2,11 @@
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",
Index: data/nation/swedish.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/swedish.ruleset,v
retrieving revision 1.9
diff -u -r1.9 swedish.ruleset
--- data/nation/swedish.ruleset 2002/07/09 11:27:32 1.9
+++ data/nation/swedish.ruleset 2002/12/20 01:18:26
@@ -2,6 +2,7 @@
name=_("Swedish")
plural=_("?plural:Swedes")
+class=_("Modern")
leader=
"Erik Segerg�ll", "Olof Sk�tkonung", "Gustav Vasa", "Erik", "Karl",
Index: data/nation/thai.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/thai.ruleset,v
retrieving revision 1.5
diff -u -r1.5 thai.ruleset
--- data/nation/thai.ruleset 2002/11/18 19:46:26 1.5
+++ data/nation/thai.ruleset 2002/12/20 01:18:26
@@ -2,6 +2,10 @@
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",
Index: data/nation/turk.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/turk.ruleset,v
retrieving revision 1.4
diff -u -r1.4 turk.ruleset
--- data/nation/turk.ruleset 2002/06/20 15:26:11 1.4
+++ data/nation/turk.ruleset 2002/12/20 01:18:26
@@ -2,6 +2,11 @@
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",
Index: data/nation/ukrainian.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/ukrainian.ruleset,v
retrieving revision 1.3
diff -u -r1.3 ukrainian.ruleset
--- data/nation/ukrainian.ruleset 2001/12/11 16:16:45 1.3
+++ data/nation/ukrainian.ruleset 2002/12/20 01:18:26
@@ -2,7 +2,11 @@
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 = "-"
Index: data/nation/vietnamese.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/vietnamese.ruleset,v
retrieving revision 1.4
diff -u -r1.4 vietnamese.ruleset
--- data/nation/vietnamese.ruleset 2002/11/18 19:46:26 1.4
+++ data/nation/vietnamese.ruleset 2002/12/20 01:18:26
@@ -2,8 +2,12 @@
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 AD 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 = "Asian"
Index: data/nation/viking.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/viking.ruleset,v
retrieving revision 1.4
diff -u -r1.4 viking.ruleset
--- data/nation/viking.ruleset 2002/12/17 20:10:19 1.4
+++ data/nation/viking.ruleset 2002/12/20 01:18:27
@@ -2,6 +2,10 @@
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 +30,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 +41,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 +52,3 @@
; added to Freeciv by Gaute Strokkenes RCNUWC 96-98
; for sentimental reasons.
- "Fjaler"
Index: data/nation/welsh.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/welsh.ruleset,v
retrieving revision 1.4
diff -u -r1.4 welsh.ruleset
--- data/nation/welsh.ruleset 2002/04/30 12:52:57 1.4
+++ data/nation/welsh.ruleset 2002/12/20 01:18:27
@@ -2,6 +2,9 @@
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"
Index: data/nation/zulu.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/zulu.ruleset,v
retrieving revision 1.6
diff -u -r1.6 zulu.ruleset
--- data/nation/zulu.ruleset 2002/12/17 22:40:57 1.6
+++ data/nation/zulu.ruleset 2002/12/20 01:18:27
@@ -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,9 @@
"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",
|
|
