[Freeciv-Dev] Re: (PR#14449) Citystyle names should use Q_() macro
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
<URL: http://bugs.freeciv.org/Ticket/Display.html?id=14449 >
It looks to me that the ?nationgroup qualifiers in data/*/nations.ruleset
are sufficient to provide optimal translations. This is (obviously) because the
?nationgroup qualified strings are used at the right places - and not the
group names in nation/*.ruleset.
Though it is not necessary to add ?nationgroup qualifiers in the
nation/*.rulesets.
Still, the group names there are marked for translation, leading to double
entries in freeciv.pot.
The attached diff removes the _() functions ans spares the unqualified group
names from the po files.
This works, as it seems, quite well without using the Qn_() macro here. But
maybe someone can doublecheck this.
Christian
--
Christian Knoke * * * http://cknoke.de
* * * * * * * * * Ceterum censeo Microsoft esse dividendum.
diff -Nur v21/data/nation/aborigines.ruleset
v21-groups/data/nation/aborigines.ruleset
--- v21/data/nation/aborigines.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/aborigines.ruleset 2006-04-05 11:42:56.926250896
+0200
@@ -2,7 +2,7 @@
name=_("Australian Aboriginal")
plural=_("?plural:Aborigines")
-groups=_("Oceanian")
+groups="Oceanian"
legend=_("Australian Aborigines is a collective term for the original\
inhabitants of the Australian continent. Aborigines from different parts of\
Australia refer to themselves with different names, including Koori,\
diff -Nur v21/data/nation/afghani.ruleset v21-groups/data/nation/afghani.ruleset
--- v21/data/nation/afghani.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/afghani.ruleset 2006-04-05 11:42:56.933249832
+0200
@@ -2,7 +2,7 @@
name=_("Afghani")
plural=_("?plural:Afghanis")
-groups=_("Modern"), _("Asian")
+groups="Modern", "Asian"
legend=_("Afghanistan, often called the crossroads of Central Asia, has had\
a very turbulent history. Through the ages, the country has been occupied\
by many forces including the Persian Empire, Genghis Khan and Alexander the\
diff -Nur v21/data/nation/algerian.ruleset
v21-groups/data/nation/algerian.ruleset
--- v21/data/nation/algerian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/algerian.ruleset 2006-04-05 11:42:56.940248768
+0200
@@ -2,7 +2,7 @@
name=_("Algerian")
plural=_("?plural:Algerians")
-groups=_("Modern"), _("African")
+groups="Modern", "African"
legend=_("Algeria is an Arabic nation in North Africa. It is historically\
inhabited by the Berber people.")
leader=
diff -Nur v21/data/nation/american.ruleset
v21-groups/data/nation/american.ruleset
--- v21/data/nation/american.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/american.ruleset 2006-04-05 11:42:56.948247552
+0200
@@ -2,7 +2,7 @@
name=_("American")
plural=_("?plural:Americans")
-groups=_("Modern"), _("American")
+groups="Modern", "American"
legend=_("Formally named the United States of America. Independent from\
Great Britain after a revolution in 1776-1783AD.")
leader="George Washington",
diff -Nur v21/data/nation/antarctican.ruleset
v21-groups/data/nation/antarctican.ruleset
--- v21/data/nation/antarctican.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/antarctican.ruleset 2006-04-05 11:42:56.955246488
+0200
@@ -2,7 +2,7 @@
name=_("Antarctican")
plural=_("?plural:Antarcticans")
-groups=_("Fictional")
+groups="Fictional"
legend=_("Independent South Pole, land of penguins.")
leader=
"Tux",
diff -Nur v21/data/nation/arab.ruleset v21-groups/data/nation/arab.ruleset
--- v21/data/nation/arab.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/arab.ruleset 2006-04-05 11:42:56.962245424 +0200
@@ -2,7 +2,7 @@
name=_("Arab")
plural=_("?plural:Arabs")
-groups=_("Medieval"), _("Asian"), _("African")
+groups="Medieval", "Asian", "African"
legend=_("The Arab/Islamic civilization of 622AD-1495AD.")
leader=
"Mohammad",
diff -Nur v21/data/nation/aramean.ruleset v21-groups/data/nation/aramean.ruleset
--- v21/data/nation/aramean.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/aramean.ruleset 2006-04-05 11:42:56.970244208
+0200
@@ -2,7 +2,7 @@
name=_("Aramean")
plural=_("?plural:Arameans")
-groups=_("Ancient"), _("Asian")
+groups="Ancient", "Asian"
legend=_("According to legend, the Aramean people are the descendants of\
Aram, the grandson of Noah.")
leader=
diff -Nur v21/data/nation/argentine.ruleset
v21-groups/data/nation/argentine.ruleset
--- v21/data/nation/argentine.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/argentine.ruleset 2006-04-05 11:42:56.977243144
+0200
@@ -3,7 +3,7 @@
; Nation name should be "Argentinean" for consistency.
name=_("Argentine")
plural=_("?plural:Argentines")
-groups=_("Modern"), _("American")
+groups="Modern", "American"
; /* TRANS: The fourth letter in "Peron" should be */
; /* TRANS: U+00F3 LATIN SMALL LETTER O WITH ACUTE if available in */
; /* TRANS: your charset. In ISO-8859-1 (ISO Latin 1) this is 243. */
diff -Nur v21/data/nation/armenian.ruleset
v21-groups/data/nation/armenian.ruleset
--- v21/data/nation/armenian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/armenian.ruleset 2006-04-05 11:42:56.985241928
+0200
@@ -2,7 +2,7 @@
name=_("Armenian")
plural=_("?plural:Armenians")
-groups=_("Ancient"), _("Modern"), _("European")
+groups="Ancient", "Modern", "European"
legend=_("According to legend, the Armenian people are the descendants of\
Haik - the great-great-grandson of Noah. The modern Republic of Armenia\
gained independence from Soviet in 1991 AD")
diff -Nur v21/data/nation/assyrian.ruleset
v21-groups/data/nation/assyrian.ruleset
--- v21/data/nation/assyrian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/assyrian.ruleset 2006-04-05 11:42:56.993240712
+0200
@@ -2,7 +2,7 @@
name=_("Assyrian")
plural=_("?plural:Assyrians")
-groups=_("Ancient"), _("Asian")
+groups="Ancient", "Asian"
legend=_("Assyria was an empire in northern Mesopotamia, named after its\
capital Ashur.")
leader=
diff -Nur v21/data/nation/australian.ruleset
v21-groups/data/nation/australian.ruleset
--- v21/data/nation/australian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/australian.ruleset 2006-04-05 11:42:57.002239344
+0200
@@ -2,7 +2,7 @@
name=_("Australian")
plural=_("?plural:Australians")
-groups=_("Modern"), _("Oceanian")
+groups="Modern", "Oceanian"
legend=_("Australia was founded as a British penal colony in 1788AD. It is\
the only country on earth to occupy an entire continent.")
leader =
diff -Nur v21/data/nation/austrian.ruleset
v21-groups/data/nation/austrian.ruleset
--- v21/data/nation/austrian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/austrian.ruleset 2006-04-05 11:42:57.009238280
+0200
@@ -2,7 +2,7 @@
name=_("Austrian")
plural=_("?plural:Austrians")
-groups=_("Modern"), _("European")
+groups="Modern", "European"
legend=_("Austria means Eastern Realm, given its position as the far east\
territory of the medieval Holy Roman Empire.")
leader=
diff -Nur v21/data/nation/aztec.ruleset v21-groups/data/nation/aztec.ruleset
--- v21/data/nation/aztec.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/aztec.ruleset 2006-04-05 11:42:57.017237064
+0200
@@ -2,7 +2,7 @@
name=_("Aztec")
plural=_("?plural:Aztecs")
-groups=_("Medieval"), _("American")
+groups="Medieval", "American"
legend=_("The Azteca, a Nahuatl speaking people 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. \
diff -Nur v21/data/nation/babylonian.ruleset
v21-groups/data/nation/babylonian.ruleset
--- v21/data/nation/babylonian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/babylonian.ruleset 2006-04-05 11:42:57.024236000
+0200
@@ -2,7 +2,7 @@
name=_("Babylonian")
plural=_("?plural:Babylonians")
-groups=_("Ancient"), _("Asian")
+groups="Ancient", "Asian"
legend=_("Babylon was the dominant city of Mesopotamia from the 18th to\
7th centuries BC under a succession of peoples including Amorites,\
Kassites, Assyrians, and Chaldeans.")
diff -Nur v21/data/nation/bavarian.ruleset
v21-groups/data/nation/bavarian.ruleset
--- v21/data/nation/bavarian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/bavarian.ruleset 2006-04-05 11:42:57.038233872
+0200
@@ -2,7 +2,7 @@
name=_("Bavarian")
plural=_("?plural:Bavarians")
-groups=_("Medieval"), _("European")
+groups="Medieval", "European"
legend=_("Bavaria, before national unification in 1870AD, was one of the\
largest of the German kingdoms.")
leader =
diff -Nur v21/data/nation/belgian.ruleset v21-groups/data/nation/belgian.ruleset
--- v21/data/nation/belgian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/belgian.ruleset 2006-04-05 11:42:57.045232808
+0200
@@ -2,7 +2,7 @@
name=_("Belgian")
plural=_("?plural:Belgians")
-groups=_("Modern"), _("European")
+groups="Modern", "European"
legend = _("Belgium gained independance from the Dutch Kingdom in 1830.\
Belgium is mainly characterized by its movement from a unified state\
to a federal one. This is the result of the Flemish and the\
diff -Nur v21/data/nation/bengali.ruleset v21-groups/data/nation/bengali.ruleset
--- v21/data/nation/bengali.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/bengali.ruleset 2006-04-05 11:42:57.053231592
+0200
@@ -2,7 +2,7 @@
name=_("Bengali")
plural=_("?plural:Bengalis")
-groups=_("Asian"), _("Medieval"), _("Modern")
+groups="Asian", "Medieval", "Modern"
legend=_("Bengal is a region in the easternmost part of the Indian\
subcontinent. The first recorded independent king of the Bengali is\
Shashanka who reigned around 606 AD. Today the People's Republic of\
diff -Nur v21/data/nation/boer.ruleset v21-groups/data/nation/boer.ruleset
--- v21/data/nation/boer.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/boer.ruleset 2006-04-05 11:42:57.060230528 +0200
@@ -2,7 +2,7 @@
name=_("Boer")
plural=_("?plural:Boers")
-groups= _("African")
+groups= "African"
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\
diff -Nur v21/data/nation/bosnia.ruleset v21-groups/data/nation/bosnia.ruleset
--- v21/data/nation/bosnia.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/bosnia.ruleset 2006-04-05 11:42:57.068229312
+0200
@@ -3,7 +3,7 @@
; Nation name should be "Bosnian-Herzegovinian" for consistency.
name=_("Bosnia & Herzegovina")
plural=_("?plural:Bosnians")
-groups=_("Modern"), _("European")
+groups="Modern", "European"
legend=_("Bosnia and Herzegovina is a country in south-east Europe, and the\
home of three constituent peoples: Bosniaks, Serbs, and Croats.")
leader=
diff -Nur v21/data/nation/brazilian.ruleset
v21-groups/data/nation/brazilian.ruleset
--- v21/data/nation/brazilian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/brazilian.ruleset 2006-04-05 11:42:57.075228248
+0200
@@ -2,7 +2,7 @@
name=_("Brazilian")
plural=_("?plural:Brazilians")
-groups=_("Modern"), _("American")
+groups="Modern", "American"
legend=_("Brazil was founded as a colony of Portugal but became\
independent in 1822AD. It is the only country in the New World that\
has been the seat of a monarchy.")
diff -Nur v21/data/nation/british.ruleset v21-groups/data/nation/british.ruleset
--- v21/data/nation/british.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/british.ruleset 2006-04-05 11:42:57.082227184
+0200
@@ -2,7 +2,7 @@
name=_("British")
plural=_("?plural:Britons")
-groups=_("Modern"), _("European")
+groups="Modern", "European"
legend=_("The United Kingdom was created in 1707 as a negotiated agreement\
between the kingdom of England and the kingdom of Scotland. The country -\
also known as Great Britain - became the leading industrial and maritime\
diff -Nur v21/data/nation/bulgarian.ruleset
v21-groups/data/nation/bulgarian.ruleset
--- v21/data/nation/bulgarian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/bulgarian.ruleset 2006-04-05 11:42:57.090225968
+0200
@@ -2,7 +2,7 @@
name=_("Bulgarian")
plural=_("?plural:Bulgarians")
-groups=_("Modern"), _("Medieval"), _("European")
+groups="Modern", "Medieval", "European"
legend=_("Bulgar leader Khan Asparukh led his people into the northern\
Balkans, and founded Bulgaria in 681. This was the first Slavic\
nation-state in history.")
diff -Nur v21/data/nation/burmese.ruleset v21-groups/data/nation/burmese.ruleset
--- v21/data/nation/burmese.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/burmese.ruleset 2006-04-05 11:42:57.097224904
+0200
@@ -2,7 +2,7 @@
name=_("Burmese")
plural=_("?plural:Burmese")
-groups=_("Medieval"), _("Modern"), _("Asian")
+groups="Medieval", "Modern", "Asian"
legend=_("The Union of Burma (officially \"Myanmar\") is the largest country\
in mainland Southeast Asia.")
leader=
diff -Nur v21/data/nation/byzantium.ruleset
v21-groups/data/nation/byzantium.ruleset
--- v21/data/nation/byzantium.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/byzantium.ruleset 2006-04-05 11:42:57.104223840
+0200
@@ -2,7 +2,7 @@
name=_("Byzantine")
plural=_("?plural:Byzantines")
-groups=_("Medieval"), _("Asian"), _("European")
+groups="Medieval", "Asian", "European"
legend=_("At the time of the decline of the old Roman empire, the Emperor\
Constantine moved the empire's capital to Byzantium and formed a new empire\
mostly known as the Eastern Roman empire or the Byzantine empire. This\
diff -Nur v21/data/nation/canadian.ruleset
v21-groups/data/nation/canadian.ruleset
--- v21/data/nation/canadian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/canadian.ruleset 2006-04-05 11:42:57.112222624
+0200
@@ -2,7 +2,7 @@
name=_("Canadian")
plural=_("?plural:Canadians")
-groups=_("Modern"), _("American")
+groups="Modern", "American"
conflicts_with="quebecois", "inuit"
legend=_("Canada is the geographically northernmost country in world: The\
Magnetic North Pole currently lies on Canadian territory.")
diff -Nur v21/data/nation/carthaginian.ruleset
v21-groups/data/nation/carthaginian.ruleset
--- v21/data/nation/carthaginian.ruleset 2006-03-22 12:46:44.000000000
+0100
+++ v21-groups/data/nation/carthaginian.ruleset 2006-04-05 11:42:57.119221560
+0200
@@ -2,7 +2,7 @@
name=_("Carthaginian")
plural=_("?plural:Carthaginians")
-groups=_("Ancient"), _("African")
+groups="Ancient", "African"
; Carthage being a successor-state of the Phoenician empire
conflicts_with="phoenician"
legend=_("The Carthaginians, descendants of Phoenician traders,\
diff -Nur v21/data/nation/catalan.ruleset v21-groups/data/nation/catalan.ruleset
--- v21/data/nation/catalan.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/catalan.ruleset 2006-04-05 11:42:57.126220496
+0200
@@ -2,7 +2,7 @@
name=_("Catalan")
plural=_("?plural:Catalans")
-groups=_("Medieval"), _("European")
+groups="Medieval", "European"
legend=_("Catalunya (aka Catalonia in English) is the north-eastern-most\
coastal region of Spain near the southern foot of the Pyrenees.")
leader=
diff -Nur v21/data/nation/chilean.ruleset v21-groups/data/nation/chilean.ruleset
--- v21/data/nation/chilean.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/chilean.ruleset 2006-04-05 11:42:57.134219280
+0200
@@ -2,7 +2,7 @@
name=_("Chilean")
plural=_("?plural:Chileans")
-groups=_("Modern"), _("American")
+groups="Modern", "American"
legend=_("Chile is located on the south-western coast of South America.")
leader=
"Pedro de Valdivia",
diff -Nur v21/data/nation/chinese.ruleset v21-groups/data/nation/chinese.ruleset
--- v21/data/nation/chinese.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/chinese.ruleset 2006-04-05 11:42:57.141218216
+0200
@@ -2,7 +2,7 @@
name=_("Chinese")
plural=_("?plural:Chinese")
-groups=_("Ancient"), _("Medieval"), _("Modern"), _("Asian")
+groups="Ancient", "Medieval", "Modern", "Asian"
legend=_("China is the oldest major civilization that is still in existence\
today, with written records dating back over 3,500 years. After first\
being unified by the Qin dynasty in 221BC, China alternated between periods\
diff -Nur v21/data/nation/colombian.ruleset
v21-groups/data/nation/colombian.ruleset
--- v21/data/nation/colombian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/colombian.ruleset 2006-04-05 11:42:57.149217000
+0200
@@ -2,7 +2,7 @@
name=_("Colombian")
plural=_("?plural:Colombians")
-groups=_("Modern"), _("American")
+groups="Modern", "American"
legend=_("Colombia is a country in northern South America. The region was\
an Amerindian cultural center in pre-European time. The Spanish began\
settling Colombia's north coast around 1500. In 1819 the The Republic of\
diff -Nur v21/data/nation/confederate.ruleset
v21-groups/data/nation/confederate.ruleset
--- v21/data/nation/confederate.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/confederate.ruleset 2006-04-05 11:42:57.156215936
+0200
@@ -2,7 +2,7 @@
name=_("Confederate")
plural=_("?plural:Confederates")
-groups=_("Transitional")
+groups="Transitional"
legend=_("The Confederate States of America was a splinter nation of the\
United States during the American Civil War. It was formed in 1861 by six\
Southern states but had to abandon their claims of independence a few\
diff -Nur v21/data/nation/cornish.ruleset v21-groups/data/nation/cornish.ruleset
--- v21/data/nation/cornish.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/cornish.ruleset 2006-04-05 11:42:57.163214872
+0200
@@ -2,7 +2,7 @@
name = _("Cornish")
plural = _("?plural:Cornish")
-groups= _("Medieval"), _("European")
+groups= "Medieval", "European"
legend=_("Cornwall is a region in the extreme southwest of England,\
traditionally the home of the legendary King Arthur.")
leader =
diff -Nur v21/data/nation/croatian.ruleset
v21-groups/data/nation/croatian.ruleset
--- v21/data/nation/croatian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/croatian.ruleset 2006-04-05 11:42:57.171213656
+0200
@@ -2,7 +2,7 @@
name=_("Croatian")
plural=_("?plural:Croatians")
-groups=_("Modern"), _("European")
+groups="Modern", "European"
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\
diff -Nur v21/data/nation/cuban.ruleset v21-groups/data/nation/cuban.ruleset
--- v21/data/nation/cuban.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/cuban.ruleset 2006-04-05 11:42:57.178212592
+0200
@@ -2,7 +2,7 @@
name=_("Cuban")
plural=_("?plural:Cubans")
-groups=_("Modern"), _("American")
+groups="Modern", "American"
legend=_("Cuba came under Spanish control in the 16th century. In the\
following centuries, the island became one of the leading producers of\
tobacco, sugar and coffee in the world. Cuba was granted nominal\
diff -Nur v21/data/nation/czech.ruleset v21-groups/data/nation/czech.ruleset
--- v21/data/nation/czech.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/czech.ruleset 2006-04-05 11:42:57.185211528
+0200
@@ -2,7 +2,7 @@
name = _("Czech")
plural = _("?plural:Czechs")
-groups=_("Modern"), _("Medieval"), _("European")
+groups="Modern", "Medieval", "European"
legend=_("Today's Czech Republic was until 1993 part of Czechoslovakia,\
which had been until 1918 part of the Austro-Hungarian Empire.")
leader =
diff -Nur v21/data/nation/danish.ruleset v21-groups/data/nation/danish.ruleset
--- v21/data/nation/danish.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/danish.ruleset 2006-04-05 11:42:57.193210312
+0200
@@ -2,7 +2,7 @@
name=_("Danish")
plural=_("?plural:Danes")
-groups=_("Modern"), _("Medieval"), _("European")
+groups="Modern", "Medieval", "European"
; /* TRANS: The third letter in "Blatand" should be */
; /* TRANS: A+00E5 LATIN SMALL LETTER A WITH RING if available in */
; /* TRANS: your charset. In ISO-8859-1 (ISO Latin 1) this is 0xE5. */
diff -Nur v21/data/nation/dutch.ruleset v21-groups/data/nation/dutch.ruleset
--- v21/data/nation/dutch.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/dutch.ruleset 2006-04-05 11:42:57.200209248
+0200
@@ -2,7 +2,7 @@
name=_("Dutch")
plural=_("?plural:Dutch")
-groups=_("Modern"), _("Medieval"), _("European")
+groups="Modern", "Medieval", "European"
legend=_("When the Holy Roman Emperor sentenced the entire population to\
death, the people of the Netherlands revolted and declared themselves\
independent, forming the Union of Utrecht in 1579. The Netherlands grew\
diff -Nur v21/data/nation/egyptian.ruleset
v21-groups/data/nation/egyptian.ruleset
--- v21/data/nation/egyptian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/egyptian.ruleset 2006-04-05 11:42:57.208208032
+0200
@@ -2,7 +2,7 @@
name=_("Egyptian")
plural=_("?plural:Egyptians")
-groups=_("Ancient"), _("African")
+groups="Ancient", "African"
legend=_("Egypt was the second-oldest of the world's civilizations. Since\
ancient times it has been unusually urbanized, supporting a large\
population on silt deposited by the annual floodings of the Nile.")
diff -Nur v21/data/nation/english.ruleset v21-groups/data/nation/english.ruleset
--- v21/data/nation/english.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/english.ruleset 2006-04-05 11:42:57.215206968
+0200
@@ -2,7 +2,7 @@
name=_("English")
plural=_("?plural:English")
-groups=_("Medieval"), _("European")
+groups="Medieval", "European"
legend=_("England was unified by Alfred the Great of Wessex in the late\
9th century AD, only to be conquered by William of Normandy a century\
later, in the last successful invasion of the country.")
diff -Nur v21/data/nation/estonian.ruleset
v21-groups/data/nation/estonian.ruleset
--- v21/data/nation/estonian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/estonian.ruleset 2006-04-05 11:42:57.222205904
+0200
@@ -2,7 +2,7 @@
name=_("Estonian")
plural=_("?plural:Estonians")
-groups=_("Modern"), _("European")
+groups="Modern", "European"
legend=_("Estonia is a small country on the south shore of the eastern\
Baltic Sea. Its people and language are closely related to those of\
Finland.")
diff -Nur v21/data/nation/ethiopian.ruleset
v21-groups/data/nation/ethiopian.ruleset
--- v21/data/nation/ethiopian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/ethiopian.ruleset 2006-04-05 11:42:57.229204840
+0200
@@ -2,7 +2,7 @@
name=_("Ethiopian")
plural=_("?plural:Ethiopians")
-groups=_("Modern"), _("Ancient"), _("African")
+groups="Modern", "Ancient", "African"
legend=_("Ethiopia is the oldest nation in Africa and the only one to\
remain independent during European colonialism.")
leader=
diff -Nur v21/data/nation/filipino.ruleset
v21-groups/data/nation/filipino.ruleset
--- v21/data/nation/filipino.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/filipino.ruleset 2006-04-05 11:42:57.237203624
+0200
@@ -2,7 +2,7 @@
name=_("Filipino")
plural=_("?plural:Filipinos")
-groups=_("Modern"), _("Asian")
+groups="Modern", "Asian"
conflicts_with="czech" ; Similar flags
legend=_("After centuries of Spanish rule, the Philippines were ceded to\
the Americans in 1898. They attained home rule in 1935 and independence in\
diff -Nur v21/data/nation/finnish.ruleset v21-groups/data/nation/finnish.ruleset
--- v21/data/nation/finnish.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/finnish.ruleset 2006-04-05 11:42:57.244202560
+0200
@@ -2,7 +2,7 @@
name=_("Finnish")
plural=_("?plural:Finns")
-groups=_("Modern"), _("European")
+groups="Modern", "European"
legend=_("Finland is a small, cold country on the northern fringe of Europe,\
noted for exporting timber, cellular phones, and world-class operating\
systems.")
diff -Nur v21/data/nation/french.ruleset v21-groups/data/nation/french.ruleset
--- v21/data/nation/french.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/french.ruleset 2006-04-05 11:42:57.251201496
+0200
@@ -2,7 +2,7 @@
name=_("French")
plural=_("?plural:French")
-groups=_("Modern"), _("Medieval"), _("European")
+groups="Modern", "Medieval", "European"
legend=_("France has long been a major power in Europe. French conquerer\
kings like Napoleon and Charlemagne each united large parts of\
Europe under the French flag.")
diff -Nur v21/data/nation/galician.ruleset
v21-groups/data/nation/galician.ruleset
--- v21/data/nation/galician.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/galician.ruleset 2006-04-05 11:42:57.259200280
+0200
@@ -2,7 +2,7 @@
name=_("Galician")
plural=_("?plural:Galicians")
-groups=_("Medieval"), _("European")
+groups="Medieval", "European"
legend=_("Galicia is a region in the northwest of Spain, just above\
Portugal.")
leader=
diff -Nur v21/data/nation/gallic.ruleset v21-groups/data/nation/gallic.ruleset
--- v21/data/nation/gallic.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/gallic.ruleset 2006-04-05 11:42:57.266199216
+0200
@@ -2,7 +2,7 @@
name=_("Gallic")
plural=_("?plural:Gauls")
-groups=_("Ancient"), _("European")
+groups="Ancient", "European"
legend=_("The Gauls were a Celtic people occupying what is now France and\
Belgium.")
leader=
diff -Nur v21/data/nation/georgian.ruleset
v21-groups/data/nation/georgian.ruleset
--- v21/data/nation/georgian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/georgian.ruleset 2006-04-05 11:42:57.273198152
+0200
@@ -2,7 +2,7 @@
name=_("Georgian")
plural=_("?plural:Georgians")
-groups=_("Medieval"), _("Modern"), _("European")
+groups="Medieval", "Modern", "European"
legend=_("The Georgians were one of the first peoples in history to adopt\
Christianity, in the 300s AD.")
leader=
diff -Nur v21/data/nation/german.ruleset v21-groups/data/nation/german.ruleset
--- v21/data/nation/german.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/german.ruleset 2006-04-05 11:42:57.281196936
+0200
@@ -2,7 +2,7 @@
name = _("German")
plural = _("?plural:Germans")
-groups = _("Modern"), _("Medieval"), _("European")
+groups = "Modern", "Medieval", "European"
legend = _("Germany was united in 1871 by the Prussian military \
force. After World War I it became a republic, but fell into \
diff -Nur v21/data/nation/german.ruleset~ v21-groups/data/nation/german.ruleset~
diff -Nur v21/data/nation/greek.ruleset v21-groups/data/nation/greek.ruleset
--- v21/data/nation/greek.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/greek.ruleset 2006-04-05 11:42:57.290195568
+0200
@@ -2,7 +2,7 @@
name=_("Greek")
plural=_("?plural:Greeks")
-groups=_("Ancient"), _("European")
+groups="Ancient", "European"
legend=_("The ancient Greeks, between Mycenae and the Roman conquest.")
leader=
"Alexandros Molossus",
diff -Nur v21/data/nation/hellenic.ruleset
v21-groups/data/nation/hellenic.ruleset
--- v21/data/nation/hellenic.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/hellenic.ruleset 2006-04-05 11:42:57.297194504
+0200
@@ -2,7 +2,7 @@
name=_("Hellenic")
plural=_("?plural:Hellenes")
-groups=_("Modern"), _("European")
+groups="Modern", "European"
legend=_("The Hellenic Republic - also known as Greece - was created when\
the Hellenic people gained independence from the Ottoman Empire in 1832.")
leader=
diff -Nur v21/data/nation/hittite.ruleset v21-groups/data/nation/hittite.ruleset
--- v21/data/nation/hittite.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/hittite.ruleset 2006-04-05 11:42:57.305193288
+0200
@@ -2,7 +2,7 @@
name=_("Hittite")
plural=_("?plural:Hittites")
-groups=_("Ancient"), _("Asian")
+groups="Ancient", "Asian"
legend=_("The Hittite kingdom lasted from about 1680 BC to about 1180 BC.\
They were the first civilisation to discover iron working. At its height,\
they controlled central Anatolia, north-western Syria and Mesopotamia down\
diff -Nur v21/data/nation/hungarian.ruleset
v21-groups/data/nation/hungarian.ruleset
--- v21/data/nation/hungarian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/hungarian.ruleset 2006-04-05 11:42:57.313192072
+0200
@@ -2,7 +2,7 @@
name=_("Hungarian")
plural=_("?plural:Hungarians")
-groups=_("Medieval"), _("Modern"), _("European")
+groups="Medieval", "Modern", "European"
legend=_("Legend says that Hungary was founded by Arpad in the 9th\
century.")
conflicts_with="indian" ; Similar flags
diff -Nur v21/data/nation/icelandic.ruleset
v21-groups/data/nation/icelandic.ruleset
--- v21/data/nation/icelandic.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/icelandic.ruleset 2006-04-05 11:42:57.320191008
+0200
@@ -2,7 +2,7 @@
name=_("Icelandic")
plural=_("?plural:Icelanders")
-groups=_("Modern"), _("European")
+groups="Modern", "European"
legend=_("Iceland was discovered and settled by Norwegian Vikings in the\
late 9th century. The island was kept initially under the Norwegian and\
later the Danish crown until independence from Denmark in 1944.")
diff -Nur v21/data/nation/illyrian.ruleset
v21-groups/data/nation/illyrian.ruleset
--- v21/data/nation/illyrian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/illyrian.ruleset 2006-04-05 11:42:57.328189792
+0200
@@ -2,7 +2,7 @@
name=_("Illyrian")
plural=_("?plural:Illyrians")
-groups=_("Ancient"), _("European")
+groups="Ancient", "European"
legend=_("Illyrians were Indo-European tribes who appeared in the\
western part of the Balkan Peninsula before 1000 BC,\
including the Dalmatians to the north,\
diff -Nur v21/data/nation/inca.ruleset v21-groups/data/nation/inca.ruleset
--- v21/data/nation/inca.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/inca.ruleset 2006-04-05 11:42:57.335188728 +0200
@@ -2,7 +2,7 @@
name=_("Inca")
plural=_("?plural:Incas")
-groups=_("Medieval"), _("American")
+groups="Medieval", "American"
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\
diff -Nur v21/data/nation/indian.ruleset v21-groups/data/nation/indian.ruleset
--- v21/data/nation/indian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/indian.ruleset 2006-04-05 11:42:57.343187512
+0200
@@ -2,7 +2,7 @@
name=_("Indian")
plural=_("?plural:Indians")
-groups=_("Ancient"), _("Medieval"), _("Modern"), _("Asian")
+groups="Ancient", "Medieval", "Modern", "Asian"
legend=_("The cradle of Ancient Indian civilization lay in the Indus river\
valley in modern-day Pakistan.")
leader=
diff -Nur v21/data/nation/indonesian.ruleset
v21-groups/data/nation/indonesian.ruleset
--- v21/data/nation/indonesian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/indonesian.ruleset 2006-04-05 11:42:57.350186448
+0200
@@ -2,7 +2,7 @@
name=_("Indonesian")
plural=_("?plural:Indonesians")
-groups=_("Modern"), _("Asian")
+groups="Modern", "Asian"
legend=_("Indonesia is a large country on the Malay Archipelago with central\
government on the island of Java. The country has a Muslim majority and is\
one of the most populous in the world.")
diff -Nur v21/data/nation/inuit.ruleset v21-groups/data/nation/inuit.ruleset
--- v21/data/nation/inuit.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/inuit.ruleset 2006-04-05 11:42:57.357185384
+0200
@@ -2,7 +2,7 @@
name=_("Inuit")
plural=_("?plural:Inuits")
-groups=_("American")
+groups="American"
legend=_("The Inuit, or Eskimos, inhabit northern Canada and Greenland.\
Legend says that the Great Shaman Qitdlarssuaq lead his people to Thule\
(Qaanaaq) on the west coast of Greenland in the 10th century. All Inuit\
diff -Nur v21/data/nation/iraqi.ruleset v21-groups/data/nation/iraqi.ruleset
--- v21/data/nation/iraqi.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/iraqi.ruleset 2006-04-05 11:42:57.365184168
+0200
@@ -2,7 +2,7 @@
name=_("Iraqi")
plural=_("?plural:Iraqis")
-groups=_("Modern"), _("Asian")
+groups="Modern", "Asian"
legend=_("Iraq was founded after the fall of the Ottoman\
empire. It is encompassing the ancient region of Mesopotamia at the\
confluence of the Tigris and Euphrates rivers.")
diff -Nur v21/data/nation/irish.ruleset v21-groups/data/nation/irish.ruleset
--- v21/data/nation/irish.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/irish.ruleset 2006-04-05 11:42:57.373182952
+0200
@@ -2,7 +2,7 @@
name = _("Irish")
plural = _("?plural:Irish")
-groups=_("Medieval"), _("Modern"), _("European")
+groups="Medieval", "Modern", "European"
legend=_("Ireland held out against the Romans and Vikings but was\
conquered by the Normans in 1171. It was ruled by the English until 1922\
when most of the country was granted limited autonomy, becoming a republic\
diff -Nur v21/data/nation/iroquois.ruleset
v21-groups/data/nation/iroquois.ruleset
--- v21/data/nation/iroquois.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/iroquois.ruleset 2006-04-05 11:42:57.381181736
+0200
@@ -2,7 +2,7 @@
name=_("Iroquois")
plural=_("?plural:Iroquois")
-groups=_("Medieval"), _("American")
+groups="Medieval", "American"
legend=_("The Iroquois Confederacy - known as Haudenosaunee in their own\
language - was a North American group of nations with common language and\
culture. They were based in what is now upstate New York and consisted\
diff -Nur v21/data/nation/israeli.ruleset v21-groups/data/nation/israeli.ruleset
--- v21/data/nation/israeli.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/israeli.ruleset 2006-04-05 11:42:57.388180672
+0200
@@ -2,7 +2,7 @@
name=_("Israeli")
plural=_("?plural:Israelis")
-groups=_("Ancient"), _("Modern"), _("Asian")
+groups="Ancient", "Modern", "Asian"
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.")
diff -Nur v21/data/nation/italian.ruleset v21-groups/data/nation/italian.ruleset
--- v21/data/nation/italian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/italian.ruleset 2006-04-05 11:42:57.395179608
+0200
@@ -2,7 +2,7 @@
name = _("Italian")
plural = _("?plural:Italians")
-groups=_("Medieval"), _("Modern"), _("European")
+groups="Medieval", "Modern", "European"
legend=_("The Italian nation was unified in 1870AD 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\
diff -Nur v21/data/nation/japanese.ruleset
v21-groups/data/nation/japanese.ruleset
--- v21/data/nation/japanese.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/japanese.ruleset 2006-04-05 11:42:57.403178392
+0200
@@ -19,7 +19,7 @@
name=_("Japanese")
plural=_("?plural:Japanese")
-groups=_("Medieval"), _("Modern"), _("Asian")
+groups="Medieval", "Modern", "Asian"
legend=_("According to traditional Japanese mythology, Japan was founded\
in the 7th century BC by the ancestral Emperor Jimmu.")
leader=
diff -Nur v21/data/nation/kampuchean.ruleset
v21-groups/data/nation/kampuchean.ruleset
--- v21/data/nation/kampuchean.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/kampuchean.ruleset 2006-04-05 11:42:57.410177328
+0200
@@ -2,7 +2,7 @@
name=_("Kampuchean")
plural=_("?plural:Kampucheans")
-groups=_("Modern"), _("Medieval"), _("Asian")
+groups="Modern", "Medieval", "Asian"
legend=_("Kampuchea is the modern successor state of the mighty Khmer\
Empire, which ruled most of the Indochinese Peninsula between the 11th\
and 14th centuries.")
diff -Nur v21/data/nation/kenyan.ruleset v21-groups/data/nation/kenyan.ruleset
--- v21/data/nation/kenyan.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/kenyan.ruleset 2006-04-05 11:42:57.418176112
+0200
@@ -2,7 +2,7 @@
name = _("Kenyan")
plural = _("?plural:Kenyans")
-groups=_("Modern"), _("African")
+groups="Modern", "African"
legend=_("Kenya gained independence from Britain in December 1963.")
leader =
"Jomo Kenyatta",
diff -Nur v21/data/nation/korean.ruleset v21-groups/data/nation/korean.ruleset
--- v21/data/nation/korean.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/korean.ruleset 2006-04-05 11:42:57.425175048
+0200
@@ -2,7 +2,7 @@
name=_("Korean")
plural=_("?plural:Koreans")
-groups=_("Modern"), _("Medieval"), _("Asian")
+groups="Modern", "Medieval", "Asian"
legend=_("According to legend, the first Korean kingdom was founded in\
prehistory by the ancestral Tangun in southern Manchuria. The Korean\
kingdoms was united in 668 by king Munmu. Today the Korean peninsula is\
diff -Nur v21/data/nation/lankese.ruleset v21-groups/data/nation/lankese.ruleset
--- v21/data/nation/lankese.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/lankese.ruleset 2006-04-05 11:42:57.433173832
+0200
@@ -2,7 +2,7 @@
name=_("Lankese")
plural=_("?plural:Lankese")
-groups=_("Ancient"), _("Medieval"), _("Modern"), _("Asian")
+groups="Ancient", "Medieval", "Modern", "Asian"
legend=_("Prince Vijaya came to Sri Lanka from Orissa, in north-eastern\
India during the 6th century BC and founded the Sinhalese kingdom there.\
During British colonialism the country was known as Ceylon.")
diff -Nur v21/data/nation/latvian.ruleset v21-groups/data/nation/latvian.ruleset
--- v21/data/nation/latvian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/latvian.ruleset 2006-04-05 11:42:57.440172768
+0200
@@ -2,7 +2,7 @@
name=_("Latvian")
plural=_("?plural:Latvians")
-groups=_("Modern"), _("European")
+groups="Modern", "European"
legend = _("In the aftermath of WWI Latvia proclaimed its independence\
from Russia. In 1940, Latvia was forcibly occupied by the Soviet Union.\
diff -Nur v21/data/nation/libyan.ruleset v21-groups/data/nation/libyan.ruleset
--- v21/data/nation/libyan.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/libyan.ruleset 2006-04-05 11:42:57.447171704
+0200
@@ -2,7 +2,7 @@
name=_("Libyan")
plural=_("?plural:Libyans")
-groups=_("Modern"), _("African")
+groups="Modern", "African"
legend=_("The region that is now Libya was a Roman colony until it was\
conquered by the Arab civilization in the 7th century. In 1912 it came\
under the control of Italy and after the Second World War Libya was granted\
diff -Nur v21/data/nation/lithuanian.ruleset
v21-groups/data/nation/lithuanian.ruleset
--- v21/data/nation/lithuanian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/lithuanian.ruleset 2006-04-05 11:42:57.455170488
+0200
@@ -2,7 +2,7 @@
name=_("Lithuanian")
plural=_("?plural:Lithuanians")
-groups=_("Medieval"), _("Modern"), _("European")
+groups="Medieval", "Modern", "European"
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")
diff -Nur v21/data/nation/malagasy.ruleset
v21-groups/data/nation/malagasy.ruleset
--- v21/data/nation/malagasy.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/malagasy.ruleset 2006-04-05 11:42:57.462169424
+0200
@@ -2,7 +2,7 @@
name=_("Malagasy")
plural=_("?plural:Malagasies")
-groups=_("Medieval"), _("Modern"), _("African")
+groups="Medieval", "Modern", "African"
legend=_("The Malagasy are the people of Madagascar. For centuries, tribes\
from Indonesia, East Africa and the Arab world have gathered on the\
island.")
diff -Nur v21/data/nation/malian.ruleset v21-groups/data/nation/malian.ruleset
--- v21/data/nation/malian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/malian.ruleset 2006-04-05 11:42:57.477167144
+0200
@@ -2,7 +2,7 @@
name=_("Malian")
plural=_("?plural:Malians")
-groups=_("Modern"), _("Medieval"), _("African")
+groups="Modern", "Medieval", "African"
legend=_("Sub-Saharan Africa has been a cultural and ethnical melting pot\
for millennia. In medieval times, the region was home to a succession of\
empires called the Sahelian kingdoms. Of these, the Islamic Mali empire\
diff -Nur v21/data/nation/manchu.ruleset v21-groups/data/nation/manchu.ruleset
--- v21/data/nation/manchu.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/manchu.ruleset 2006-04-05 11:42:57.484166080
+0200
@@ -2,7 +2,7 @@
name=_("Manchu")
plural=_("?plural:Manchus")
-groups=_("Medieval"), _("Asian")
+groups="Medieval", "Asian"
legend=_("The Manchus were a semi-nomadic people originating from the region\
called Manchuria in Northeast Asia. In the 17th century they conquered and\
ruled China as the Manchu Empire until 1911.")
diff -Nur v21/data/nation/maori.ruleset v21-groups/data/nation/maori.ruleset
--- v21/data/nation/maori.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/maori.ruleset 2006-04-05 11:42:57.491165016
+0200
@@ -2,7 +2,7 @@
name=_("Maori")
plural=_("?plural:Maori")
-groups=_("Oceanian")
+groups="Oceanian"
legend=_("The Maori are a Polynesian people that migrated to and settled the\
island group that is now New Zealand. According to archeological evidence,\
the migration commenced in the 900s and continued until the 1400s.")
diff -Nur v21/data/nation/martian.ruleset v21-groups/data/nation/martian.ruleset
--- v21/data/nation/martian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/martian.ruleset 2006-04-05 11:42:57.498163952
+0200
@@ -2,7 +2,7 @@
name=_("Martian")
plural=_("?plural:Martians")
-groups=_("Fictional")
+groups="Fictional"
legend=_("Marsmen landed on Earth in 4000 BC!")
leader=
"Ray Bradbury",
diff -Nur v21/data/nation/mayan.ruleset v21-groups/data/nation/mayan.ruleset
--- v21/data/nation/mayan.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/mayan.ruleset 2006-04-05 11:42:57.506162736
+0200
@@ -2,7 +2,7 @@
name=_("Mayan")
plural=_("?plural:Mayas")
-groups=_("Ancient"), _("Medieval"), _("American")
+groups="Ancient", "Medieval", "American"
legend=_("The Mayans were a Mesoamerican civilization. Famous for building\
great pyramids and palaces in the jungle.")
leader=
diff -Nur v21/data/nation/mexican.ruleset v21-groups/data/nation/mexican.ruleset
--- v21/data/nation/mexican.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/mexican.ruleset 2006-04-05 11:42:57.513161672
+0200
@@ -2,7 +2,7 @@
name=_("Mexican")
plural=_("?plural:Mexicans")
-groups=_("Modern"), _("American")
+groups="Modern", "American"
legend=_("Mexico borrows its name from the Mexica people, another name for\
the Aztecs.")
leader=
diff -Nur v21/data/nation/mongol.ruleset v21-groups/data/nation/mongol.ruleset
--- v21/data/nation/mongol.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/mongol.ruleset 2006-04-05 11:42:57.521160456
+0200
@@ -2,7 +2,7 @@
name=_("Mongol")
plural=_("?plural:Mongols")
-groups=_("Medieval"), _("Modern"), _("Asian")
+groups="Medieval", "Modern", "Asian"
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\
diff -Nur v21/data/nation/newzealand.ruleset
v21-groups/data/nation/newzealand.ruleset
--- v21/data/nation/newzealand.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/newzealand.ruleset 2006-04-05 11:42:57.528159392
+0200
@@ -3,7 +3,7 @@
; Nation name should be "New Zealandic" (like "Icelandic") for consistency.
name=_("New Zealand")
plural=_("?plural:New Zealanders")
-groups=_("Modern"), _("Oceanian")
+groups="Modern", "Oceanian"
conflicts_with="australian" ; Similar flags
legend=_("The island group of New Zealand was annexed by Britain in 1840.\
Following a royal proclamation in 1907, the country became an independent\
diff -Nur v21/data/nation/nigerian.ruleset
v21-groups/data/nation/nigerian.ruleset
--- v21/data/nation/nigerian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/nigerian.ruleset 2006-04-05 11:42:57.535158328
+0200
@@ -2,7 +2,7 @@
name=_("Nigerian")
plural=_("?plural:Nigerians")
-groups=_("Modern"), _("African")
+groups="Modern", "African"
legend=_("Nigeria won full independence from British rule in 1960.")
leader=
"Abubakar Tafawa Balewa",
diff -Nur v21/data/nation/norwegian.ruleset
v21-groups/data/nation/norwegian.ruleset
--- v21/data/nation/norwegian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/norwegian.ruleset 2006-04-05 11:42:57.543157112
+0200
@@ -2,7 +2,7 @@
name=_("Norwegian")
plural=_("?plural:Norwegians")
-groups=_("Modern"), _("European")
+groups="Modern", "European"
legend=_("After centuries of Danish rule, the Norwegians made their\
own constitution in Eidsvoll, 1814AD. Finally, in 1905AD the Norwegians\
got their independence after a union with Sweden.")
diff -Nur v21/data/nation/ottoman.ruleset v21-groups/data/nation/ottoman.ruleset
--- v21/data/nation/ottoman.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/ottoman.ruleset 2006-04-05 11:42:57.550156048
+0200
@@ -2,7 +2,7 @@
name=_("Ottoman")
plural=_("?plural:Ottomans")
-groups=_("Medieval"), _("Asian"), _("European")
+groups="Medieval", "Asian", "European"
legend=_("In the beginning of the 14th century Osman, a leader of a\
minor Turkic tribe in western Anatolia, conquered all his neigboring\
tribes. A century later the Byzantine capital fell to\
diff -Nur v21/data/nation/papuan.ruleset v21-groups/data/nation/papuan.ruleset
--- v21/data/nation/papuan.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/papuan.ruleset 2006-04-05 11:42:57.558154832
+0200
@@ -2,7 +2,7 @@
name=_("Papuan")
plural=_("?plural:Papuans")
-groups=_("Modern"), _("Oceanian")
+groups="Modern", "Oceanian"
legend=_("The Papuans are a Melanesian people on the island of New Guinea.")
leader=
"Paias Wingti",
diff -Nur v21/data/nation/persian.ruleset v21-groups/data/nation/persian.ruleset
--- v21/data/nation/persian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/persian.ruleset 2006-04-05 11:42:57.565153768
+0200
@@ -2,7 +2,7 @@
name=_("Persian")
plural=_("?plural:Persians")
-groups=_("Ancient"),_("Asian")
+groups="Ancient","Asian"
legend=_("The first Persian (Achaemenid) Empire lasted from 550BC to 330BC;\
the second (Sassanid) from 226AD to 642AD.")
leader=
diff -Nur v21/data/nation/phoenician.ruleset
v21-groups/data/nation/phoenician.ruleset
--- v21/data/nation/phoenician.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/phoenician.ruleset 2006-04-05 11:42:57.572152704
+0200
@@ -2,7 +2,7 @@
name=_("Phoenician")
plural=_("?plural:Phoenicians")
-groups=_("Ancient"), _("Asian")
+groups="Ancient", "Asian"
legend=_("Phoenicia was an ancient civilization, based in what is now the\
coastal regions of Lebanon and Syria.")
leader=
diff -Nur v21/data/nation/polish.ruleset v21-groups/data/nation/polish.ruleset
--- v21/data/nation/polish.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/polish.ruleset 2006-04-05 11:42:57.580151488
+0200
@@ -2,7 +2,7 @@
name=_("Polish")
plural=_("?plural:Poles")
-groups=_("Medieval"), _("Modern"), _("European")
+groups="Medieval", "Modern", "European"
legend=_("The Polish state was formed about a millennium ago, and reached\
its Golden Age near the end of the 16th century.")
leader="Mieszko I",
diff -Nur v21/data/nation/portuguese.ruleset
v21-groups/data/nation/portuguese.ruleset
--- v21/data/nation/portuguese.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/portuguese.ruleset 2006-04-05 11:42:57.587150424
+0200
@@ -2,7 +2,7 @@
name=_("Portuguese")
plural=_("?plural:Portuguese")
-groups=_("Medieval"), _("Modern"), _("European")
+groups="Medieval", "Modern", "European"
legend=_("Portugal founded the first of the great mercantile empires\
in the 1400s on the shipbuilding advances funded by Prince Henry the\
Navigator.")
diff -Nur v21/data/nation/quebecois.ruleset
v21-groups/data/nation/quebecois.ruleset
--- v21/data/nation/quebecois.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/quebecois.ruleset 2006-04-05 11:42:57.595149208
+0200
@@ -2,7 +2,7 @@
name=_("Quebecois")
plural=_("?plural:Quebecois")
-groups= _("American")
+groups= "American"
legend=_("Quebec is the largest province of Canada, housing the majority of\
the Francophone population of America.")
leader=
diff -Nur v21/data/nation/romanian.ruleset
v21-groups/data/nation/romanian.ruleset
--- v21/data/nation/romanian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/romanian.ruleset 2006-04-05 11:42:57.603147992
+0200
@@ -2,7 +2,7 @@
name=_("Romanian")
plural=_("?plural:Romanians")
-groups=_("Modern"), _("Medieval"), _("European")
+groups="Modern", "Medieval", "European"
legend=_("Romania as a nation was formed at the beginning of the 20th\
century, when the states of Transylvania, Wallachia, and Moldavia merged.\
It is a country inhabited by people speaking a language reminiscent from\
diff -Nur v21/data/nation/roman.ruleset v21-groups/data/nation/roman.ruleset
--- v21/data/nation/roman.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/roman.ruleset 2006-04-05 11:42:57.610146928
+0200
@@ -2,7 +2,7 @@
name=_("Roman")
plural=_("?plural:Romans")
-groups=_("Ancient"), _("European")
+groups="Ancient", "European"
legend=_("Rome was, in legend, founded by Romulus in 753 BC. At its\
height, Rome controlled nearly all of Europe, northern Africa and\
Mesopotamia.")
diff -Nur v21/data/nation/russian.ruleset v21-groups/data/nation/russian.ruleset
--- v21/data/nation/russian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/russian.ruleset 2006-04-05 11:42:57.618145712
+0200
@@ -2,7 +2,7 @@
name=_("Russian")
plural=_("?plural:Russians")
-groups=_("Medieval"), _("Modern"), _("European")
+groups="Medieval", "Modern", "European"
legend=_("According to legend, Slavic and Finnic tribes of Novgorod invited\
in the year 862 the Varangian (Viking) king Rurik to bring order to their\
land. Rurik established Kievan Rus in this realm, the first Russian state.\
diff -Nur v21/data/nation/ryukyuan.ruleset
v21-groups/data/nation/ryukyuan.ruleset
--- v21/data/nation/ryukyuan.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/ryukyuan.ruleset 2006-04-05 11:42:57.626144496
+0200
@@ -2,7 +2,7 @@
name=_("Ryukyuan")
plural=_("?plural:Ryukyuans")
-groups=_("Medieval"), _("Asian")
+groups="Medieval", "Asian"
legend=_("The Ryukyu Kingdom (1372-1879) was the Land of Propriety, a\
peaceful maritime trading nation eventually invaded, occupied, and annexed\
by Japan.")
diff -Nur v21/data/nation/sami.ruleset v21-groups/data/nation/sami.ruleset
--- v21/data/nation/sami.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/sami.ruleset 2006-04-05 11:42:57.633143432 +0200
@@ -2,7 +2,7 @@
name=_("Sami")
plural=_("?plural:Sami")
-groups=_("European")
+groups="European"
legend=_("The Sami, or Lapps, are a people of northern Scandinavia. Their\
nation spans over the northernmost regions of the Scandinavian countries:\
Finnmark of Norway and Lapland of Sweden and Finland.")
diff -Nur v21/data/nation/scottish.ruleset
v21-groups/data/nation/scottish.ruleset
--- v21/data/nation/scottish.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/scottish.ruleset 2006-04-05 11:42:57.641142216
+0200
@@ -2,7 +2,7 @@
name=_("Scottish")
plural=_("?plural:Scots")
-groups=_("Medieval"), _("European")
+groups="Medieval", "European"
legend=_("Scotland, originally settled in late Roman times by Irish\
raiders who displaced the native Picts, was an independent kingdom from\
around 1034AD to the Union of Crowns with England in 1701.")
diff -Nur v21/data/nation/serbian.ruleset v21-groups/data/nation/serbian.ruleset
--- v21/data/nation/serbian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/serbian.ruleset 2006-04-05 11:42:57.648141152
+0200
@@ -2,7 +2,7 @@
name=_("Serbian")
plural=_("?plural:Serbians")
-groups=_("Modern"), _("Medieval"), _("European")
+groups="Modern", "Medieval", "European"
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.")
diff -Nur v21/data/nation/silesian.ruleset
v21-groups/data/nation/silesian.ruleset
--- v21/data/nation/silesian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/silesian.ruleset 2006-04-05 11:42:57.656139936
+0200
@@ -2,7 +2,7 @@
name=_("Silesian")
plural=_("?plural:Silesians")
-groups=_("Medieval"), _("European")
+groups="Medieval", "European"
legend=_("Silesia is a region of southern Poland that was at one time an\
independent kingdom.")
leader = "WÅ?adysÅ?aw Wygnaniec",
diff -Nur v21/data/nation/singaporean.ruleset
v21-groups/data/nation/singaporean.ruleset
--- v21/data/nation/singaporean.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/singaporean.ruleset 2006-04-05 11:42:57.664138720
+0200
@@ -14,7 +14,7 @@
name=_("Singaporean")
plural=_("?plural:Singaporeans")
-groups=_("Modern"), _("Asian")
+groups="Modern", "Asian"
legend=_("Singapore is a mercantile city-state located at the southernmost\
tip of the Malaysian Peninsula.")
leader=
diff -Nur v21/data/nation/sioux.ruleset v21-groups/data/nation/sioux.ruleset
--- v21/data/nation/sioux.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/sioux.ruleset 2006-04-05 11:42:57.671137656
+0200
@@ -2,7 +2,7 @@
name=_("Sioux")
plural=_("?plural:Sioux")
-groups=_("Medieval"), _("American")
+groups="Medieval", "American"
legend=_("The Sioux was a North American nation that fought several\
decisive battles against the United States. It consisted of three distinct\
groups of tribes: the Lakota, the Dakota and the Nakota.")
diff -Nur v21/data/nation/slovakian.ruleset
v21-groups/data/nation/slovakian.ruleset
--- v21/data/nation/slovakian.ruleset 2006-04-02 11:49:09.000000000 +0200
+++ v21-groups/data/nation/slovakian.ruleset 2006-04-05 11:42:57.679136440
+0200
@@ -2,7 +2,7 @@
name=_("Slovakian")
plural=_("?plural:Slovakians")
-groups=_("Medieval"), _("Modern"), _("European")
+groups="Medieval", "Modern", "European"
legend=_("Slovakia is a country in the heart of Europe. Formerly part of\
Czechoslovakia, until 1918 it was part of the Austro-Hungarian Empire.")
leader=
diff -Nur v21/data/nation/slovenian.ruleset
v21-groups/data/nation/slovenian.ruleset
--- v21/data/nation/slovenian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/slovenian.ruleset 2006-04-05 11:42:57.686135376
+0200
@@ -2,7 +2,7 @@
name=_("Slovenian")
plural=_("?plural:Slovenians")
-groups=_("Medieval"), _("Modern"), _("European")
+groups="Medieval", "Modern", "European"
legend=_("Slovenia was the most western and northern republic of the old\
Yugoslav Federation.")
leader=
diff -Nur v21/data/nation/southafrican.ruleset
v21-groups/data/nation/southafrican.ruleset
--- v21/data/nation/southafrican.ruleset 2006-03-22 12:46:44.000000000
+0100
+++ v21-groups/data/nation/southafrican.ruleset 2006-04-05 11:42:57.693134312
+0200
@@ -2,7 +2,7 @@
name=_("South African")
plural=_("?plural:South Africans")
-groups=_("Modern"), _("African")
+groups="Modern", "African"
legend=_("Dutch settlers began colonizing southern Africa in the 17th\
century. After many wars between primarily Boers (descendants of Dutch\
settlers), British forces and Zulus, the Union of South Africa was created\
diff -Nur v21/data/nation/soviet.ruleset v21-groups/data/nation/soviet.ruleset
--- v21/data/nation/soviet.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/soviet.ruleset 2006-04-05 11:42:57.700133248
+0200
@@ -2,7 +2,7 @@
name=_("Soviet")
plural=_("?plural:Soviets")
-groups=_("Transitional")
+groups="Transitional"
legend=_("Soviet Union's history starts in November 1917,\
when under Lenin's leadership a Bolshevik revolution occurred.\
On December 31 1922, four Soviet republics integrated into one\
diff -Nur v21/data/nation/spanish.ruleset v21-groups/data/nation/spanish.ruleset
--- v21/data/nation/spanish.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/spanish.ruleset 2006-04-05 11:42:57.708132032
+0200
@@ -2,7 +2,7 @@
name=_("Spanish")
plural=_("?plural:Spanish")
-groups=_("Medieval"),_("Modern"),_("European")
+groups="Medieval","Modern","European"
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 1492AD, the same year\
diff -Nur v21/data/nation/sudanese.ruleset
v21-groups/data/nation/sudanese.ruleset
--- v21/data/nation/sudanese.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/sudanese.ruleset 2006-04-05 11:42:57.715130968
+0200
@@ -2,7 +2,7 @@
name=_("Sudanese")
plural=_("?plural:Sudanese")
-groups=_("Modern"), _("African")
+groups="Modern", "African"
legend=_("In 1820 Sudan came under Egyptian rule and later British rule.\
Sudan became independent in 1956.")
leader=
diff -Nur v21/data/nation/sumerian.ruleset
v21-groups/data/nation/sumerian.ruleset
--- v21/data/nation/sumerian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/sumerian.ruleset 2006-04-05 11:42:57.723129752
+0200
@@ -2,7 +2,7 @@
name=_("Sumerian")
plural=_("?plural:Sumerians")
-groups=_("Ancient"), _("Asian")
+groups="Ancient", "Asian"
legend=_("Sumer controlled southern Mesopotamia until the rise of\
Babylonia. Tablets of Sumerian writing some 5500 years old have been\
found, pre-dating every other writing in history.")
diff -Nur v21/data/nation/swazi.ruleset v21-groups/data/nation/swazi.ruleset
--- v21/data/nation/swazi.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/swazi.ruleset 2006-04-05 11:42:57.730128688
+0200
@@ -2,7 +2,7 @@
name=_("Swazi")
plural=_("?plural:Swazis")
-groups=_("Modern"), _("African")
+groups="Modern", "African"
legend=_("The Swazis is a Bantu people of southern Africa. Under the\
leadership of Mswati II (1820 - 1868), the Swazis expanded their territory\
and stabilized the southern frontier with the Zulus.")
diff -Nur v21/data/nation/swedish.ruleset v21-groups/data/nation/swedish.ruleset
--- v21/data/nation/swedish.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/swedish.ruleset 2006-04-05 11:42:57.738127472
+0200
@@ -2,7 +2,7 @@
name=_("Swedish")
plural=_("?plural:Swedes")
-groups=_("Medieval"), _("Modern"), _("European")
+groups="Medieval", "Modern", "European"
legend=_("The Kingdom of Sweden was christianized and consolidated as a\
political entity by the 12th century AD. The country rose to prominence as\
one of the great powers of Europe in the 17th century, following\
diff -Nur v21/data/nation/swiss.ruleset v21-groups/data/nation/swiss.ruleset
--- v21/data/nation/swiss.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/swiss.ruleset 2006-04-05 11:42:57.745126408
+0200
@@ -2,7 +2,7 @@
name=_("Swiss")
plural=_("?plural:Swiss")
-groups=_("Modern"), _("Medieval"), _("European")
+groups="Modern", "Medieval", "European"
legend=_("Switzerland is a federation of cantons, some of which have more\
than 700 years of history as a confederacy.")
leader=
diff -Nur v21/data/nation/taiwanese.ruleset
v21-groups/data/nation/taiwanese.ruleset
--- v21/data/nation/taiwanese.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/taiwanese.ruleset 2006-04-05 11:42:57.752125344
+0200
@@ -2,7 +2,7 @@
name=_("Taiwanese")
plural=_("?plural:Taiwanese")
-groups=_("Modern"), _("Asian")
+groups="Modern", "Asian"
legend=_("When the Chinese nationalists lost the armed struggle against the\
Chinese communists, the nationalist government evacuated to the island of\
Taiwan where they formed the Republic of China.")
diff -Nur v21/data/nation/texan.ruleset v21-groups/data/nation/texan.ruleset
--- v21/data/nation/texan.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/texan.ruleset 2006-04-05 11:42:57.759124280
+0200
@@ -2,7 +2,7 @@
name=_("Texan")
plural=_("?plural:Texans")
-groups=_("American")
+groups="American"
legend=_("Texas is second largest and second most populous state of the\
USA, famous for it's \"larger than life\" cowboy mentality.")
leader=
diff -Nur v21/data/nation/thai.ruleset v21-groups/data/nation/thai.ruleset
--- v21/data/nation/thai.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/thai.ruleset 2006-04-05 11:42:57.767123064 +0200
@@ -2,7 +2,7 @@
name=_("Thai")
plural=_("?plural:Thai")
-groups=_("Modern"), _("Medieval"), _("Asian")
+groups="Modern", "Medieval", "Asian"
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 AD.")
diff -Nur v21/data/nation/tibetan.ruleset v21-groups/data/nation/tibetan.ruleset
--- v21/data/nation/tibetan.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/tibetan.ruleset 2006-04-05 11:42:57.774122000
+0200
@@ -2,7 +2,7 @@
name=_("Tibetan")
plural=_("?plural:Tibetans")
-groups=_("Medieval"), _("Asian")
+groups="Medieval", "Asian"
legend=_("The Tibetan homeland is sometimes called the \"Roof of the\
World\", the highest elevated region in the world. In the 7th century,\
Tibet emerged as a formidable empire under the leadership of king Songtsen\
diff -Nur v21/data/nation/tunisian.ruleset
v21-groups/data/nation/tunisian.ruleset
--- v21/data/nation/tunisian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/tunisian.ruleset 2006-04-05 11:42:57.781120936
+0200
@@ -2,7 +2,7 @@
name=_("Tunisian")
plural=_("?plural:Tunisians")
-groups=_("Modern"), _("African")
+groups="Modern", "African"
legend=_("The Phoenicians founded Carthage in the area where Tunisia is\
today. Carthage later became a major power in the Mediterranean region\
until it was defeated by the Romans in 146 BC. Later the Arab Muslim\
diff -Nur v21/data/nation/turk.ruleset v21-groups/data/nation/turk.ruleset
--- v21/data/nation/turk.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/turk.ruleset 2006-04-05 11:42:57.788119872 +0200
@@ -2,7 +2,7 @@
name=_("Turk")
plural=_("?plural:Turks")
-groups=_("Modern"), _("Asian")
+groups="Modern", "Asian"
legend=_("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\
diff -Nur v21/data/nation/ukrainian.ruleset
v21-groups/data/nation/ukrainian.ruleset
--- v21/data/nation/ukrainian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/ukrainian.ruleset 2006-04-05 11:42:57.795118808
+0200
@@ -2,7 +2,7 @@
name=_("Ukrainian")
plural=_("?plural:Ukrainians")
-groups=_("Modern"), _("European")
+groups="Modern", "European"
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.")
diff -Nur v21/data/nation/uyghur.ruleset v21-groups/data/nation/uyghur.ruleset
--- v21/data/nation/uyghur.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/uyghur.ruleset 2006-04-05 11:42:57.803117592
+0200
@@ -2,7 +2,7 @@
name=_("Uyghur")
plural=_("?plural:Uyghurs")
-groups=_("Medieval"), _("Asian")
+groups="Medieval", "Asian"
legend=_("Uyghur was an east Turk empire and civilization. At its height in\
820 AD it controlled most of Central and North Asia. After clashing with\
the Chinese for several centuries, they were finally subdued by the Qing\
diff -Nur v21/data/nation/venezuelan.ruleset
v21-groups/data/nation/venezuelan.ruleset
--- v21/data/nation/venezuelan.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/venezuelan.ruleset 2006-04-05 11:42:57.810116528
+0200
@@ -3,7 +3,7 @@
; Nation name should be "Venezuelan" for consistency.
name=_("Venezuela")
plural=_("?plural:Venezuelans")
-groups=_("American"), _("Modern")
+groups="American", "Modern"
; /* TRANS: The fourth letter in "Simon" should be */
; /* TRANS: U+00F3 LATIN SMALL LETTER O WITH ACUTE if available in */
; /* TRANS: your charset. In ISO-8859-1 (ISO Latin 1) this is 243. */
diff -Nur v21/data/nation/vietnamese.ruleset
v21-groups/data/nation/vietnamese.ruleset
--- v21/data/nation/vietnamese.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/vietnamese.ruleset 2006-04-05 11:42:57.818115312
+0200
@@ -2,7 +2,7 @@
name=_("Vietnamese")
plural=_("?plural:Vietnamese")
-groups=_("Medieval"), _("Modern"), _("Asian")
+groups="Medieval", "Modern", "Asian"
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.")
diff -Nur v21/data/nation/viking.ruleset v21-groups/data/nation/viking.ruleset
--- v21/data/nation/viking.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/viking.ruleset 2006-04-05 11:42:57.825114248
+0200
@@ -2,7 +2,7 @@
name=_("Viking")
plural=_("?plural:Vikings")
-groups=_("Medieval"), _("European")
+groups="Medieval", "European"
legend=_("The Vikings raided and traded along the coasts of Europe\
between 800AD and 1100AD. Viking raiders eventually became the rulers of\
Normandy, Russia, and a short-lived kingdom in Sicily.")
diff -Nur v21/data/nation/welsh.ruleset v21-groups/data/nation/welsh.ruleset
--- v21/data/nation/welsh.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/welsh.ruleset 2006-04-05 11:42:57.832113184
+0200
@@ -2,7 +2,7 @@
name=_("Welsh")
plural=_("?plural:Welsh")
-groups= _("Medieval"), _("European")
+groups= "Medieval", "European"
legend=_("The Welsh at one time controlled all of what is now England\
until being driven into the mountainous western reaches by invading\
Saxons.")
diff -Nur v21/data/nation/westphalian.ruleset
v21-groups/data/nation/westphalian.ruleset
--- v21/data/nation/westphalian.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/westphalian.ruleset 2006-04-05 11:42:57.839112120
+0200
@@ -2,7 +2,7 @@
name=_("Westphalian")
plural=_("?plural:Westphalians")
-groups=_("Medieval"), _("European")
+groups="Medieval", "European"
legend=_("Westphalia, before becoming a Prussian province, was the western\
region the duchy of Saxony. Present-day it consists of the Northern part of\
the largest German federal state, North Rhine-Westphalia.")
diff -Nur v21/data/nation/zulu.ruleset v21-groups/data/nation/zulu.ruleset
--- v21/data/nation/zulu.ruleset 2006-03-22 12:46:44.000000000 +0100
+++ v21-groups/data/nation/zulu.ruleset 2006-04-05 11:42:57.847110904 +0200
@@ -2,7 +2,7 @@
name=_("Zulu")
plural=_("?plural:Zulus")
-groups=_("African")
+groups="African"
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.")
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Freeciv-Dev] Re: (PR#14449) Citystyle names should use Q_() macro,
Christian Knoke <=
|
|
