[Freeciv-Dev] Re: (PR#14449) Citystyle names should use Q_() macro
|
Complete.Org:
Mailing Lists:
Archives:
freeciv-dev:
November 2005: [Freeciv-Dev] Re: (PR#14449) Citystyle names should use Q_() macro |
|
[Freeciv-Dev] Re: (PR#14449) Citystyle names should use Q_() macro[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
<URL: http://bugs.freeciv.org/Ticket/Display.html?id=14449 > Daniel Markstedt wrote on Nov 28, 03:02 (-0800): > 2005-11-28 kl. 18.42 skrev Christian Knoke: > > >> Here's a patch to solve the issue by making geographical group names > >> nouns, while keeping city style names adjectives. It also renames city > >> style 'Babylonian' to 'Mesopotamian' in order to separate it from the > >> Babylonian nation. > >> > >> IMHO the most simple and elegant solution. > > > > I'm not sure it is. I still prefer a ?group: (or ?citystyle: for another > > occasion) flag. It is pretty clear for translators. You don't have to > > read the source. And you avoid overlapping of meanings that still may > > occur with some languages. > To add qualifiers to every single group is just too much work to > implement and maintain (several hundred occations.) Unless some kind > and skilled programmer devise another syntax for defining groups, of > course. Not being a skilled programmer, the attached script and diff adds a '?group:' qualifier to all groups in the nation rulesets. gettext is sensible enough to keep all translations while adding a fuzzy mark. Please check whether I got the diff right before applying. > Even if we go with qualifiers instead, what do you think about the name > change of Babylonian city style to Mesopotamian? More neutral, IMHO. I can provide the same for city_style. But I just notice that the styles aren't marked for translation in the nation rulesets, so it is probably enough to add the qualifier in the data/*/cities.ruleset files? Christian -- Christian Knoke * * * http://cknoke.de * * * * * * * * * Ceterum censeo Microsoft esse dividendum.
diff -Nur freeciv/data/nation/aborigines.ruleset
freeciv-q/data/nation/aborigines.ruleset
--- freeciv/data/nation/aborigines.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/aborigines.ruleset 2005-11-28 13:57:41.913614872
+0100
@@ -2,7 +2,7 @@
name=_("Australian Aboriginal")
plural=_("?plural:Aborigines")
-groups=_("Ancient"), _("Oceanian")
+groups=_("?group:Ancient"), _("?group: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 freeciv/data/nation/afghani.ruleset
freeciv-q/data/nation/afghani.ruleset
--- freeciv/data/nation/afghani.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/afghani.ruleset 2005-11-28 13:57:41.950609248
+0100
@@ -4,7 +4,7 @@
name=_("Afghani")
plural=_("?plural:Afghanis")
-groups=_("Modern"), _("Asian")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/algerian.ruleset
freeciv-q/data/nation/algerian.ruleset
--- freeciv/data/nation/algerian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/algerian.ruleset 2005-11-28 13:57:41.976605296
+0100
@@ -2,7 +2,7 @@
name=_("Algerian")
plural=_("?plural:Algerians")
-groups=_("Modern"), _("African")
+groups=_("?group:Modern"), _("?group:African")
legend=_("Algeria is an Arabic nation in North Africa. It is historically\
inhabited by the Berber people.")
leader=
diff -Nur freeciv/data/nation/american.ruleset
freeciv-q/data/nation/american.ruleset
--- freeciv/data/nation/american.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/american.ruleset 2005-11-28 13:57:42.006600736
+0100
@@ -2,7 +2,7 @@
name=_("American")
plural=_("?plural:Americans")
-groups=_("Modern"), _("American")
+groups=_("?group:Modern"), _("?group:American")
legend=_("Formally named the United States of America. Independent from\
Great Britain after a revolution in 1776-1783AD.")
leader="George Washington",
diff -Nur freeciv/data/nation/arab.ruleset freeciv-q/data/nation/arab.ruleset
--- freeciv/data/nation/arab.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/arab.ruleset 2005-11-28 13:57:42.032596784 +0100
@@ -2,7 +2,7 @@
name=_("Arab")
plural=_("?plural:Arabs")
-groups=_("Medieval"), _("Asian"), _("African")
+groups=_("?group:Medieval"), _("?group:Asian"), _("?group:African")
legend=_("The Arab/Islamic civilization of 622AD-1495AD.")
leader=
"Mohammad",
diff -Nur freeciv/data/nation/aramean.ruleset
freeciv-q/data/nation/aramean.ruleset
--- freeciv/data/nation/aramean.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/aramean.ruleset 2005-11-28 13:57:42.058592832
+0100
@@ -2,7 +2,7 @@
name=_("Aramean")
plural=_("?plural:Arameans")
-groups=_("Ancient"), _("Asian")
+groups=_("?group:Ancient"), _("?group:Asian")
legend=_("According to legend, the Aramean people are the descendants of\
Aram, the grandson of Noah.")
leader=
diff -Nur freeciv/data/nation/argentine.ruleset
freeciv-q/data/nation/argentine.ruleset
--- freeciv/data/nation/argentine.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/argentine.ruleset 2005-11-28 13:57:42.085588728
+0100
@@ -3,7 +3,7 @@
; Nation name should be "Argentinean" for consistency.
name=_("Argentine")
plural=_("?plural:Argentines")
-groups=_("Modern"), _("American")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/armenian.ruleset
freeciv-q/data/nation/armenian.ruleset
--- freeciv/data/nation/armenian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/armenian.ruleset 2005-11-28 13:57:42.112584624
+0100
@@ -2,7 +2,7 @@
name=_("Armenian")
plural=_("?plural:Armenians")
-groups=_("Ancient"), _("Modern"), _("European")
+groups=_("?group:Ancient"), _("?group:Modern"), _("?group: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 freeciv/data/nation/assyrian.ruleset
freeciv-q/data/nation/assyrian.ruleset
--- freeciv/data/nation/assyrian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/assyrian.ruleset 2005-11-28 13:57:42.138580672
+0100
@@ -2,7 +2,7 @@
name=_("Assyrian")
plural=_("?plural:Assyrians")
-groups=_("Ancient"), _("Asian")
+groups=_("?group:Ancient"), _("?group:Asian")
legend=_("Assyria was an empire in northern Mesopotamia, named after its\
capital Ashur.")
leader=
diff -Nur freeciv/data/nation/australian.ruleset
freeciv-q/data/nation/australian.ruleset
--- freeciv/data/nation/australian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/australian.ruleset 2005-11-28 13:57:42.165576568
+0100
@@ -2,7 +2,7 @@
name=_("Australian")
plural=_("?plural:Australians")
-groups=_("Modern"), _("Oceanian")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/austrian.ruleset
freeciv-q/data/nation/austrian.ruleset
--- freeciv/data/nation/austrian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/austrian.ruleset 2005-11-28 13:57:42.191572616
+0100
@@ -2,7 +2,7 @@
name=_("Austrian")
plural=_("?plural:Austrians")
-groups=_("Modern"), _("European")
+groups=_("?group:Modern"), _("?group:European")
legend=_("Austria means Eastern Realm, given its position as the far east\
territory of the medieval Holy Roman Empire.")
leader=
diff -Nur freeciv/data/nation/aztec.ruleset freeciv-q/data/nation/aztec.ruleset
--- freeciv/data/nation/aztec.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/aztec.ruleset 2005-11-28 13:57:42.217568664 +0100
@@ -2,7 +2,7 @@
name=_("Aztec")
plural=_("?plural:Aztecs")
-groups=_("Medieval"), _("American")
+groups=_("?group:Medieval"), _("?group:American")
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.\
diff -Nur freeciv/data/nation/babylonian.ruleset
freeciv-q/data/nation/babylonian.ruleset
--- freeciv/data/nation/babylonian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/babylonian.ruleset 2005-11-28 13:57:42.243564712
+0100
@@ -2,7 +2,7 @@
name=_("Babylonian")
plural=_("?plural:Babylonians")
-groups=_("Ancient"), _("Asian")
+groups=_("?group:Ancient"), _("?group: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 freeciv/data/nation/bavarian.ruleset
freeciv-q/data/nation/bavarian.ruleset
--- freeciv/data/nation/bavarian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/bavarian.ruleset 2005-11-28 13:57:42.294556960
+0100
@@ -2,7 +2,7 @@
name=_("Bavarian")
plural=_("?plural:Bavarians")
-groups=_("Medieval"), _("European")
+groups=_("?group:Medieval"), _("?group:European")
legend=_("Bavaria, before national unification in 1870AD, was one of the\
largest of the German kingdoms.")
leader =
diff -Nur freeciv/data/nation/belgian.ruleset
freeciv-q/data/nation/belgian.ruleset
--- freeciv/data/nation/belgian.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/belgian.ruleset 2005-11-28 13:57:42.321552856
+0100
@@ -2,7 +2,7 @@
name=_("Belgian")
plural=_("?plural:Belgians")
-groups=_("Modern"), _("European")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/bengali.ruleset
freeciv-q/data/nation/bengali.ruleset
--- freeciv/data/nation/bengali.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/bengali.ruleset 2005-11-28 13:57:42.347548904
+0100
@@ -2,7 +2,7 @@
name=_("Bengali")
plural=_("?plural:Bengalis")
-groups=_("Asian"), _("Medieval"), _("Modern")
+groups=_("?group:Asian"), _("?group:Medieval"), _("?group: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 freeciv/data/nation/boer.ruleset freeciv-q/data/nation/boer.ruleset
--- freeciv/data/nation/boer.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/boer.ruleset 2005-11-28 13:57:42.373544952 +0100
@@ -2,7 +2,7 @@
name=_("Boer")
plural=_("?plural:Boers")
-groups= _("African")
+groups= _("?group: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 freeciv/data/nation/bosnia.ruleset
freeciv-q/data/nation/bosnia.ruleset
--- freeciv/data/nation/bosnia.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/bosnia.ruleset 2005-11-28 13:57:42.400540848
+0100
@@ -3,7 +3,7 @@
; Nation name should be "Bosnian-Herzegovinian" for consistency.
name=_("Bosnia & Herzegovina")
plural=_("?plural:Bosnians")
-groups=_("Modern"), _("European")
+groups=_("?group:Modern"), _("?group:European")
legend=_("The nation of Bosnia & Herzegovina was created following the\
exceedingly bloody Yugoslav wars of the early 90s.")
leader=
diff -Nur freeciv/data/nation/brazilian.ruleset
freeciv-q/data/nation/brazilian.ruleset
--- freeciv/data/nation/brazilian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/brazilian.ruleset 2005-11-28 13:57:42.427536744
+0100
@@ -2,7 +2,7 @@
name=_("Brazilian")
plural=_("?plural:Brazilians")
-groups=_("Modern"), _("American")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/british.ruleset
freeciv-q/data/nation/british.ruleset
--- freeciv/data/nation/british.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/british.ruleset 2005-11-28 13:57:42.454532640
+0100
@@ -2,7 +2,7 @@
name=_("British")
plural=_("?plural:Britons")
-groups=_("Modern"), _("European")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/bulgarian.ruleset
freeciv-q/data/nation/bulgarian.ruleset
--- freeciv/data/nation/bulgarian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/bulgarian.ruleset 2005-11-28 13:57:42.481528536
+0100
@@ -2,7 +2,7 @@
name=_("Bulgarian")
plural=_("?plural:Bulgarians")
-groups=_("Modern"), _("Medieval"), _("European")
+groups=_("?group:Modern"), _("?group:Medieval"), _("?group: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 freeciv/data/nation/burmese.ruleset
freeciv-q/data/nation/burmese.ruleset
--- freeciv/data/nation/burmese.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/burmese.ruleset 2005-11-28 13:57:42.508524432
+0100
@@ -2,7 +2,7 @@
name=_("Burmese")
plural=_("?plural:Burmese")
-groups=_("Medieval"), _("Modern"), _("Asian")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group:Asian")
legend=_("The Union of Burma (officially \"Myanmar\") is the largest country\
in mainland Southeast Asia.")
leader=
diff -Nur freeciv/data/nation/byzantium.ruleset
freeciv-q/data/nation/byzantium.ruleset
--- freeciv/data/nation/byzantium.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/byzantium.ruleset 2005-11-28 13:57:42.535520328
+0100
@@ -2,7 +2,7 @@
name=_("Byzantine")
plural=_("?plural:Byzantines")
-groups=_("Medieval"), _("Asian"), _("European"), _("African")
+groups=_("?group:Medieval"), _("?group:Asian"), _("?group:European"),
_("?group:African")
legend=_("At the time of the decline of the old Roman empire, the Emperor\
Constanine 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 freeciv/data/nation/canadian.ruleset
freeciv-q/data/nation/canadian.ruleset
--- freeciv/data/nation/canadian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/canadian.ruleset 2005-11-28 13:57:42.561516376
+0100
@@ -2,7 +2,7 @@
name=_("Canadian")
plural=_("?plural:Canadians")
-groups=_("Modern"), _("American")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/carthaginian.ruleset
freeciv-q/data/nation/carthaginian.ruleset
--- freeciv/data/nation/carthaginian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/carthaginian.ruleset 2005-11-28 13:57:42.588512272
+0100
@@ -2,7 +2,7 @@
name=_("Carthaginian")
plural=_("?plural:Carthaginians")
-groups=_("Ancient"), _("African")
+groups=_("?group:Ancient"), _("?group:African")
; Carthage being a successor-state of the Phoenician empire
conflicts_with="phoenician"
legend=_("The Carthaginians, descendants of Phoenician traders,\
diff -Nur freeciv/data/nation/catalan.ruleset
freeciv-q/data/nation/catalan.ruleset
--- freeciv/data/nation/catalan.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/catalan.ruleset 2005-11-28 13:57:42.615508168
+0100
@@ -2,7 +2,7 @@
name=_("Catalan")
plural=_("?plural:Catalans")
-groups=_("Medieval"), _("European")
+groups=_("?group:Medieval"), _("?group: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 freeciv/data/nation/chilean.ruleset
freeciv-q/data/nation/chilean.ruleset
--- freeciv/data/nation/chilean.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/chilean.ruleset 2005-11-28 13:57:42.642504064
+0100
@@ -2,7 +2,7 @@
name=_("Chilean")
plural=_("?plural:Chileans")
-groups=_("Modern"), _("American")
+groups=_("?group:Modern"), _("?group:American")
legend=_("Chile is located on the south-western coast of South America.")
leader=
"Pedro de Valdivia",
diff -Nur freeciv/data/nation/chinese.ruleset
freeciv-q/data/nation/chinese.ruleset
--- freeciv/data/nation/chinese.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/chinese.ruleset 2005-11-28 13:57:42.671499656
+0100
@@ -2,7 +2,7 @@
name=_("Chinese")
plural=_("?plural:Chinese")
-groups=_("Ancient"), _("Medieval"), _("Modern"), _("Asian")
+groups=_("?group:Ancient"), _("?group:Medieval"), _("?group:Modern"),
_("?group: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 of\
diff -Nur freeciv/data/nation/colombian.ruleset
freeciv-q/data/nation/colombian.ruleset
--- freeciv/data/nation/colombian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/colombian.ruleset 2005-11-28 13:57:42.697495704
+0100
@@ -2,7 +2,7 @@
name=_("Colombian")
plural=_("?plural:Colombians")
-groups=_("Modern"), _("American")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/cornish.ruleset
freeciv-q/data/nation/cornish.ruleset
--- freeciv/data/nation/cornish.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/cornish.ruleset 2005-11-28 13:57:42.723491752
+0100
@@ -2,7 +2,7 @@
name = _("Cornish")
plural = _("?plural:Cornish")
-groups= _("Medieval"), _("European")
+groups= _("?group:Medieval"), _("?group:European")
legend=_("Cornwall is a region in the extreme southwest of England,\
traditionally the home of the legendary King Arthur.")
leader =
diff -Nur freeciv/data/nation/croatian.ruleset
freeciv-q/data/nation/croatian.ruleset
--- freeciv/data/nation/croatian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/croatian.ruleset 2005-11-28 13:57:42.750487648
+0100
@@ -2,7 +2,7 @@
name=_("Croatian")
plural=_("?plural:Croatians")
-groups=_("Modern"), _("European")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/cuban.ruleset freeciv-q/data/nation/cuban.ruleset
--- freeciv/data/nation/cuban.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/cuban.ruleset 2005-11-28 13:57:42.776483696 +0100
@@ -2,7 +2,7 @@
name=_("Cuban")
plural=_("?plural:Cubans")
-groups=_("Modern"), _("American")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/czech.ruleset freeciv-q/data/nation/czech.ruleset
--- freeciv/data/nation/czech.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/czech.ruleset 2005-11-28 13:57:42.803479592 +0100
@@ -2,7 +2,7 @@
name = _("Czech")
plural = _("?plural:Czechs")
-groups=_("Modern"), _("Medieval"), _("European")
+groups=_("?group:Modern"), _("?group:Medieval"), _("?group: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 freeciv/data/nation/danish.ruleset
freeciv-q/data/nation/danish.ruleset
--- freeciv/data/nation/danish.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/danish.ruleset 2005-11-28 13:57:42.830475488
+0100
@@ -2,7 +2,7 @@
name=_("Danish")
plural=_("?plural:Danes")
-groups=_("Modern"), _("Medieval"), _("European")
+groups=_("?group:Modern"), _("?group:Medieval"), _("?group: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 freeciv/data/nation/dunedain.ruleset
freeciv-q/data/nation/dunedain.ruleset
--- freeciv/data/nation/dunedain.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/dunedain.ruleset 2005-11-28 13:57:42.856471536
+0100
@@ -6,7 +6,7 @@
name=_("Dunedain")
plural=_("?plural:Dunedan")
-groups=_("Fictional")
+groups=_("?group:Fictional")
legend=_("The Men of the West from J.R.R. Tolkien's Middle Earth fantasies.")
leader=
"Elros",
diff -Nur freeciv/data/nation/dutch.ruleset freeciv-q/data/nation/dutch.ruleset
--- freeciv/data/nation/dutch.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/dutch.ruleset 2005-11-28 13:57:42.884467280 +0100
@@ -2,7 +2,7 @@
name=_("Dutch")
plural=_("?plural:Dutch")
-groups=_("Modern"), _("Medieval"), _("European")
+groups=_("?group:Modern"), _("?group:Medieval"), _("?group: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 freeciv/data/nation/egyptian.ruleset
freeciv-q/data/nation/egyptian.ruleset
--- freeciv/data/nation/egyptian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/egyptian.ruleset 2005-11-28 13:57:42.913462872
+0100
@@ -2,7 +2,7 @@
name=_("Egyptian")
plural=_("?plural:Egyptians")
-groups=_("Ancient"), _("Modern"), _("African")
+groups=_("?group:Ancient"), _("?group:Modern"), _("?group: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 freeciv/data/nation/elvish.ruleset
freeciv-q/data/nation/elvish.ruleset
--- freeciv/data/nation/elvish.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/elvish.ruleset 2005-11-28 13:57:42.939458920
+0100
@@ -5,7 +5,7 @@
; Nation name should be "Elvish" for consistency.
name=_("Elves")
plural=_("?plural:Elves")
-groups=_("Fictional")
+groups=_("?group:Fictional")
legend=_("The ancient Elves of J.R.R. Tolkien's Middle Earth fantasies.")
; /* <-- avoid gettext warnings
; Starting with the six High Kings of the Noldor, folowed by other kings
diff -Nur freeciv/data/nation/english.ruleset
freeciv-q/data/nation/english.ruleset
--- freeciv/data/nation/english.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/english.ruleset 2005-11-28 13:57:42.967454664
+0100
@@ -2,7 +2,7 @@
name=_("English")
plural=_("?plural:English")
-groups=_("Medieval"), _("European")
+groups=_("?group:Medieval"), _("?group: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 freeciv/data/nation/estonian.ruleset
freeciv-q/data/nation/estonian.ruleset
--- freeciv/data/nation/estonian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/estonian.ruleset 2005-11-28 13:57:42.993450712
+0100
@@ -2,7 +2,7 @@
name=_("Estonian")
plural=_("?plural:Estonians")
-groups=_("Modern"), _("European")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/ethiopian.ruleset
freeciv-q/data/nation/ethiopian.ruleset
--- freeciv/data/nation/ethiopian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/ethiopian.ruleset 2005-11-28 13:57:43.019446760
+0100
@@ -2,7 +2,7 @@
name=_("Ethiopian")
plural=_("?plural:Ethiopians")
-groups=_("Modern"), _("Ancient"), _("African")
+groups=_("?group:Modern"), _("?group:Ancient"), _("?group:African")
legend=_("Ethiopia is the oldest nation in Africa and the only one to\
remain independent during European colonialism.")
leader=
diff -Nur freeciv/data/nation/filipino.ruleset
freeciv-q/data/nation/filipino.ruleset
--- freeciv/data/nation/filipino.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/filipino.ruleset 2005-11-28 13:57:43.045442808
+0100
@@ -2,7 +2,7 @@
name=_("Filipino")
plural=_("?plural:Filipinos")
-groups=_("Modern"), _("Asian")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/finnish.ruleset
freeciv-q/data/nation/finnish.ruleset
--- freeciv/data/nation/finnish.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/finnish.ruleset 2005-11-28 13:57:43.072438704
+0100
@@ -2,7 +2,7 @@
name=_("Finnish")
plural=_("?plural:Finns")
-groups=_("Modern"), _("European")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/french.ruleset
freeciv-q/data/nation/french.ruleset
--- freeciv/data/nation/french.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/french.ruleset 2005-11-28 13:57:43.099434600
+0100
@@ -2,7 +2,7 @@
name=_("French")
plural=_("?plural:French")
-groups=_("Modern"), _("Medieval"), _("European")
+groups=_("?group:Modern"), _("?group:Medieval"), _("?group: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 freeciv/data/nation/galician.ruleset
freeciv-q/data/nation/galician.ruleset
--- freeciv/data/nation/galician.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/galician.ruleset 2005-11-28 13:57:43.125430648
+0100
@@ -2,7 +2,7 @@
name=_("Galician")
plural=_("?plural:Galicians")
-groups=_("Medieval"), _("European")
+groups=_("?group:Medieval"), _("?group:European")
legend=_("Galicia is a region in the northwest of Spain, just above\
Portugal.")
leader=
diff -Nur freeciv/data/nation/gallic.ruleset
freeciv-q/data/nation/gallic.ruleset
--- freeciv/data/nation/gallic.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/gallic.ruleset 2005-11-28 13:57:43.152426544
+0100
@@ -2,7 +2,7 @@
name=_("Gallic")
plural=_("?plural:Gauls")
-groups=_("Ancient"), _("European")
+groups=_("?group:Ancient"), _("?group:European")
legend=_("The Gauls were a Celtic people occupying what is now France and\
Belgium.")
leader=
diff -Nur freeciv/data/nation/georgian.ruleset
freeciv-q/data/nation/georgian.ruleset
--- freeciv/data/nation/georgian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/georgian.ruleset 2005-11-28 13:57:43.178422592
+0100
@@ -2,7 +2,7 @@
name=_("Georgian")
plural=_("?plural:Georgians")
-groups=_("Medieval"), _("Modern"), _("European")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group:European")
legend=_("The Georgians were one of the first peoples in history to adopt\
Christianity, in the 300s AD.")
leader=
diff -Nur freeciv/data/nation/german.ruleset
freeciv-q/data/nation/german.ruleset
--- freeciv/data/nation/german.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/german.ruleset 2005-11-28 13:57:43.209417880
+0100
@@ -2,7 +2,7 @@
name = _("German")
plural = _("?plural:Germans")
-groups = _("Modern"), _("Medieval"), _("European")
+groups = _("?group:Modern"), _("?group:Medieval"), _("?group: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 freeciv/data/nation/greek.ruleset freeciv-q/data/nation/greek.ruleset
--- freeciv/data/nation/greek.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/greek.ruleset 2005-11-28 13:57:43.236413776 +0100
@@ -2,7 +2,7 @@
name=_("Greek")
plural=_("?plural:Greeks")
-groups=_("Ancient"), _("European")
+groups=_("?group:Ancient"), _("?group:European")
legend=_("The ancient Greeks, between Mycenae and the Roman conquest.")
leader=
"Alexandros Molossus",
diff -Nur freeciv/data/nation/group.sh~ freeciv-q/data/nation/group.sh~
--- freeciv/data/nation/group.sh~ 1970-01-01 01:00:00.000000000 +0100
+++ freeciv-q/data/nation/group.sh~ 2005-11-28 13:57:39.112040776 +0100
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+pattern='s/^\(groups.*\)_("\([^?].*\)")/\1_("?group:\2")/g'
+
+for i in *.ruleset ; do
+ cat $i | sed $pattern | sed $pattern | sed $pattern | sed $pattern >
$i.new
+# mv $i.new $i
+done
diff -Nur freeciv/data/nation/hellenic.ruleset
freeciv-q/data/nation/hellenic.ruleset
--- freeciv/data/nation/hellenic.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/hellenic.ruleset 2005-11-28 13:57:43.263409672
+0100
@@ -2,7 +2,7 @@
name=_("Hellenic")
plural=_("?plural:Hellenes")
-groups=_("Modern"), _("European")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/hittite.ruleset
freeciv-q/data/nation/hittite.ruleset
--- freeciv/data/nation/hittite.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/hittite.ruleset 2005-11-28 13:57:43.289405720
+0100
@@ -2,7 +2,7 @@
name=_("Hittite")
plural=_("?plural:Hittites")
-groups=_("Ancient"), _("Asian")
+groups=_("?group:Ancient"), _("?group: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 freeciv/data/nation/hobbits.ruleset
freeciv-q/data/nation/hobbits.ruleset
--- freeciv/data/nation/hobbits.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/hobbits.ruleset 2005-11-28 13:57:43.315401768
+0100
@@ -2,7 +2,7 @@
name=_("Hobbit")
plural=_("?plural:Hobbits")
-groups=_("Fictional")
+groups=_("?group:Fictional")
legend=_("The Hobbits of the Shire, from J.R.R. Tolkien's Middle Earth\
fantasies.")
; These are pretty arbitrary. Peregrin was Thain of Tookland;
diff -Nur freeciv/data/nation/hungarian.ruleset
freeciv-q/data/nation/hungarian.ruleset
--- freeciv/data/nation/hungarian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/hungarian.ruleset 2005-11-28 13:57:43.342397664
+0100
@@ -2,7 +2,7 @@
name=_("Hungarian")
plural=_("?plural:Hungarians")
-groups=_("Medieval"), _("Modern"), _("European")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group:European")
legend=_("Legend says that Hungary was founded by Arpad in the 9th\
century.")
conflicts_with="indian" ; Similar flags
diff -Nur freeciv/data/nation/icelandic.ruleset
freeciv-q/data/nation/icelandic.ruleset
--- freeciv/data/nation/icelandic.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/icelandic.ruleset 2005-11-28 13:57:43.368393712
+0100
@@ -2,7 +2,7 @@
name=_("Icelandic")
plural=_("?plural:Icelanders")
-groups=_("Modern"), _("European")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/inca.ruleset freeciv-q/data/nation/inca.ruleset
--- freeciv/data/nation/inca.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/inca.ruleset 2005-11-28 13:57:43.395389608 +0100
@@ -2,7 +2,7 @@
name=_("Inca")
plural=_("?plural:Incas")
-groups=_("Medieval"), _("American")
+groups=_("?group:Medieval"), _("?group: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 freeciv/data/nation/indian.ruleset
freeciv-q/data/nation/indian.ruleset
--- freeciv/data/nation/indian.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/indian.ruleset 2005-11-28 13:57:43.421385656
+0100
@@ -2,7 +2,7 @@
name=_("Indian")
plural=_("?plural:Indians")
-groups=_("Ancient"), _("Medieval"), _("Modern"), _("Asian")
+groups=_("?group:Ancient"), _("?group:Medieval"), _("?group:Modern"),
_("?group:Asian")
legend=_("The cradle of Ancient Indian civilization lay in the Indus river\
valley in modern-day Pakistan.")
leader=
diff -Nur freeciv/data/nation/indonesian.ruleset
freeciv-q/data/nation/indonesian.ruleset
--- freeciv/data/nation/indonesian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/indonesian.ruleset 2005-11-28 13:57:43.447381704
+0100
@@ -2,7 +2,7 @@
name=_("Indonesian")
plural=_("?plural:Indonesians")
-groups=_("Modern"), _("Asian")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/inuit.ruleset freeciv-q/data/nation/inuit.ruleset
--- freeciv/data/nation/inuit.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/inuit.ruleset 2005-11-28 13:57:43.474377600 +0100
@@ -2,7 +2,7 @@
name=_("Inuit")
plural=_("?plural:Inuits")
-groups=_("American")
+groups=_("?group: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 freeciv/data/nation/iraqi.ruleset freeciv-q/data/nation/iraqi.ruleset
--- freeciv/data/nation/iraqi.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/iraqi.ruleset 2005-11-28 13:57:43.501373496 +0100
@@ -2,7 +2,7 @@
name=_("Iraqi")
plural=_("?plural:Iraqis")
-groups=_("Modern"), _("Asian")
+groups=_("?group:Modern"), _("?group:Asian")
legend=_("The Republic of Iraq was founded after the fall of the Ottoman\
empire. It encompasses the ancient region of Mesopotamia at the\
confluence of the Tigris and Euphrates Rivers.")
diff -Nur freeciv/data/nation/irish.ruleset freeciv-q/data/nation/irish.ruleset
--- freeciv/data/nation/irish.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/irish.ruleset 2005-11-28 13:57:43.530369088 +0100
@@ -2,7 +2,7 @@
name = _("Irish")
plural = _("?plural:Irish")
-groups=_("Medieval"), _("Modern"), _("European")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group: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 freeciv/data/nation/iroquois.ruleset
freeciv-q/data/nation/iroquois.ruleset
--- freeciv/data/nation/iroquois.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/iroquois.ruleset 2005-11-28 13:57:43.558364832
+0100
@@ -2,7 +2,7 @@
name=_("Iroquois")
plural=_("?plural:Iroquois")
-groups=_("Medieval"), _("American")
+groups=_("?group:Medieval"), _("?group: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 freeciv/data/nation/israeli.ruleset
freeciv-q/data/nation/israeli.ruleset
--- freeciv/data/nation/israeli.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/israeli.ruleset 2005-11-28 13:57:43.584360880
+0100
@@ -2,7 +2,7 @@
name=_("Israeli")
plural=_("?plural:Israelis")
-groups=_("Ancient"), _("Modern"), _("Asian")
+groups=_("?group:Ancient"), _("?group:Modern"), _("?group: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 freeciv/data/nation/italian.ruleset
freeciv-q/data/nation/italian.ruleset
--- freeciv/data/nation/italian.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/italian.ruleset 2005-11-28 13:57:43.611356776
+0100
@@ -2,7 +2,7 @@
name = _("Italian")
plural = _("?plural:Italians")
-groups=_("Medieval"), _("Modern"), _("European")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group: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 freeciv/data/nation/japanese.ruleset
freeciv-q/data/nation/japanese.ruleset
--- freeciv/data/nation/japanese.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/japanese.ruleset 2005-11-28 13:57:43.639352520
+0100
@@ -19,7 +19,7 @@
name=_("Japanese")
plural=_("?plural:Japanese")
-groups=_("Medieval"), _("Modern"), _("Asian")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group:Asian")
legend=_("According to traditional Japanese mythology, Japan was founded\
in the 7th century BC by the ancestral Emperor Jimmu.")
leader=
diff -Nur freeciv/data/nation/kampuchean.ruleset
freeciv-q/data/nation/kampuchean.ruleset
--- freeciv/data/nation/kampuchean.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/kampuchean.ruleset 2005-11-28 13:57:43.666348416
+0100
@@ -2,7 +2,7 @@
name=_("Kampuchean")
plural=_("?plural:Kampucheans")
-groups=_("Modern"), _("Medieval"), _("Asian")
+groups=_("?group:Modern"), _("?group:Medieval"), _("?group: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 freeciv/data/nation/kenyan.ruleset
freeciv-q/data/nation/kenyan.ruleset
--- freeciv/data/nation/kenyan.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/kenyan.ruleset 2005-11-28 13:57:43.693344312
+0100
@@ -2,7 +2,7 @@
name = _("Kenyan")
plural = _("?plural:Kenyans")
-groups=_("Modern"), _("African")
+groups=_("?group:Modern"), _("?group:African")
legend=_("Kenya gained independence from Britain in December 1963.")
leader =
"Jomo Kenyatta",
diff -Nur freeciv/data/nation/korean.ruleset
freeciv-q/data/nation/korean.ruleset
--- freeciv/data/nation/korean.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/korean.ruleset 2005-11-28 13:57:43.720340208
+0100
@@ -2,7 +2,7 @@
name=_("Korean")
plural=_("?plural:Koreans")
-groups=_("Modern"), _("Medieval"), _("Asian")
+groups=_("?group:Modern"), _("?group:Medieval"), _("?group: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 freeciv/data/nation/lankese.ruleset
freeciv-q/data/nation/lankese.ruleset
--- freeciv/data/nation/lankese.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/lankese.ruleset 2005-11-28 13:57:43.747336104
+0100
@@ -2,7 +2,7 @@
name=_("Lankese")
plural=_("?plural:Lankese")
-groups=_("Ancient"), _("Medieval"), _("Modern"), _("Asian")
+groups=_("?group:Ancient"), _("?group:Medieval"), _("?group:Modern"),
_("?group: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 freeciv/data/nation/latvian.ruleset
freeciv-q/data/nation/latvian.ruleset
--- freeciv/data/nation/latvian.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/latvian.ruleset 2005-11-28 13:57:43.773332152
+0100
@@ -2,7 +2,7 @@
name=_("Latvian")
plural=_("?plural:Latvians")
-groups=_("Modern"), _("European")
+groups=_("?group:Modern"), _("?group:European")
legend=_("Latvia gained independence from the Russian Empire in 1920, was\
incorporated into the Soviet Union in 1940 and finally gained independence\
again in 1991.")
diff -Nur freeciv/data/nation/libyan.ruleset
freeciv-q/data/nation/libyan.ruleset
--- freeciv/data/nation/libyan.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/libyan.ruleset 2005-11-28 13:57:43.799328200
+0100
@@ -2,7 +2,7 @@
name=_("Libyan")
plural=_("?plural:Libyans")
-groups=_("Modern"), _("African")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/lithuanian.ruleset
freeciv-q/data/nation/lithuanian.ruleset
--- freeciv/data/nation/lithuanian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/lithuanian.ruleset 2005-11-28 13:57:43.826324096
+0100
@@ -2,7 +2,7 @@
name=_("Lithuanian")
plural=_("?plural:Lithuanians")
-groups=_("Medieval"), _("Modern"), _("European")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group:European")
conflicts_with="bulgarian" ; Similar flags
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\
diff -Nur freeciv/data/nation/malagasy.ruleset
freeciv-q/data/nation/malagasy.ruleset
--- freeciv/data/nation/malagasy.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/malagasy.ruleset 2005-11-28 13:57:43.853319992
+0100
@@ -2,7 +2,7 @@
name=_("Malagasy")
plural=_("?plural:Malagasies")
-groups=_("Medieval"), _("Modern"), _("African")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group: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 freeciv/data/nation/malaysian.ruleset
freeciv-q/data/nation/malaysian.ruleset
--- freeciv/data/nation/malaysian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/malaysian.ruleset 2005-11-28 13:57:43.882315584
+0100
@@ -2,7 +2,7 @@
name = _("Malaysian")
plural = _("?plural:Malaysians")
-groups = _("Modern"), _("Asian")
+groups = _("?group:Modern"), _("?group:Asian")
legend = _("Malaysia was started with the founding of Malacca (Melaka) by\
Parameswara in the early 14th century.")
leader =
diff -Nur freeciv/data/nation/malian.ruleset
freeciv-q/data/nation/malian.ruleset
--- freeciv/data/nation/malian.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/malian.ruleset 2005-11-28 13:57:43.910311328
+0100
@@ -2,7 +2,7 @@
name=_("Malian")
plural=_("?plural:Malians")
-groups=_("Modern"), _("Medieval"), _("African")
+groups=_("?group:Modern"), _("?group:Medieval"), _("?group: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 freeciv/data/nation/manchu.ruleset
freeciv-q/data/nation/manchu.ruleset
--- freeciv/data/nation/manchu.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/manchu.ruleset 2005-11-28 13:57:43.936307376
+0100
@@ -2,7 +2,7 @@
name=_("Manchu")
plural=_("?plural:Manchus")
-groups=_("Medieval"), _("Asian")
+groups=_("?group:Medieval"), _("?group: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 freeciv/data/nation/maori.ruleset freeciv-q/data/nation/maori.ruleset
--- freeciv/data/nation/maori.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/maori.ruleset 2005-11-28 13:57:43.963303272 +0100
@@ -2,7 +2,7 @@
name=_("Maori")
plural=_("?plural:Maori")
-groups=_("Oceanian")
+groups=_("?group: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 freeciv/data/nation/martian.ruleset
freeciv-q/data/nation/martian.ruleset
--- freeciv/data/nation/martian.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/martian.ruleset 2005-11-28 13:57:43.988299472
+0100
@@ -2,7 +2,7 @@
name=_("Martian")
plural=_("?plural:Martians")
-groups=_("Fictional")
+groups=_("?group:Fictional")
legend=_("Marsmen landed on Earth in 4000 BC!")
leader=
"Ray Bradbury",
diff -Nur freeciv/data/nation/mayan.ruleset freeciv-q/data/nation/mayan.ruleset
--- freeciv/data/nation/mayan.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/mayan.ruleset 2005-11-28 13:57:44.015295368 +0100
@@ -2,7 +2,7 @@
name=_("Mayan")
plural=_("?plural:Mayans")
-groups=_("Ancient"), _("Medieval"), _("American")
+groups=_("?group:Ancient"), _("?group:Medieval"), _("?group:American")
legend=_("The Mayans were a Mesoamerican civilization. Famous for building\
great pyramids and palaces in the jungle.")
leader=
diff -Nur freeciv/data/nation/mexican.ruleset
freeciv-q/data/nation/mexican.ruleset
--- freeciv/data/nation/mexican.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/mexican.ruleset 2005-11-28 13:57:44.041291416
+0100
@@ -2,7 +2,7 @@
name=_("Mexican")
plural=_("?plural:Mexicans")
-groups=_("Modern"), _("American")
+groups=_("?group:Modern"), _("?group:American")
legend=_("Mexico borrows its name from the Mexica people, another name for\
the Aztecs.")
leader=
diff -Nur freeciv/data/nation/mongol.ruleset
freeciv-q/data/nation/mongol.ruleset
--- freeciv/data/nation/mongol.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/mongol.ruleset 2005-11-28 13:57:44.068287312
+0100
@@ -2,7 +2,7 @@
name=_("Mongol")
plural=_("?plural:Mongols")
-groups=_("Medieval"), _("Modern"), _("Asian")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group: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 freeciv/data/nation/mordor.ruleset
freeciv-q/data/nation/mordor.ruleset
--- freeciv/data/nation/mordor.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/mordor.ruleset 2005-11-28 13:57:44.095283208
+0100
@@ -2,7 +2,7 @@
name=_("Mordor")
plural=_("?plural:Mordors")
-groups=_("Fictional")
+groups=_("?group:Fictional")
legend=_("The armies of the Dark Lord Sauron, from J.R.R. Tolkien's\
Middle Earth fantasies.")
leader=
diff -Nur freeciv/data/nation/newzealand.ruleset
freeciv-q/data/nation/newzealand.ruleset
--- freeciv/data/nation/newzealand.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/newzealand.ruleset 2005-11-28 13:57:44.121279256
+0100
@@ -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=_("?group:Modern"), _("?group: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 freeciv/data/nation/nigerian.ruleset
freeciv-q/data/nation/nigerian.ruleset
--- freeciv/data/nation/nigerian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/nigerian.ruleset 2005-11-28 13:57:44.147275304
+0100
@@ -2,7 +2,7 @@
name=_("Nigerian")
plural=_("?plural:Nigerians")
-groups=_("Modern"), _("African")
+groups=_("?group:Modern"), _("?group:African")
legend=_("Nigeria won full independence from British rule in 1960.")
leader=
"Abubakar Tafawa Balewa",
diff -Nur freeciv/data/nation/norwegian.ruleset
freeciv-q/data/nation/norwegian.ruleset
--- freeciv/data/nation/norwegian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/norwegian.ruleset 2005-11-28 13:57:44.175271048
+0100
@@ -2,7 +2,7 @@
name=_("Norwegian")
plural=_("?plural:Norwegians")
-groups=_("Modern"), _("European")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/papuan.ruleset
freeciv-q/data/nation/papuan.ruleset
--- freeciv/data/nation/papuan.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/papuan.ruleset 2005-11-28 13:57:44.201267096
+0100
@@ -2,7 +2,7 @@
name=_("Papuan")
plural=_("?plural:Papuans")
-groups=_("Modern"), _("Oceanian")
+groups=_("?group:Modern"), _("?group:Oceanian")
legend=_("The Papuans are a Melanesian people on the island of New Guinea.")
leader=
"Paias Wingti",
diff -Nur freeciv/data/nation/persian.ruleset
freeciv-q/data/nation/persian.ruleset
--- freeciv/data/nation/persian.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/persian.ruleset 2005-11-28 13:57:44.228262992
+0100
@@ -2,7 +2,7 @@
name=_("Persian")
plural=_("?plural:Persians")
-groups=_("Ancient"), _("Modern"), _("Asian")
+groups=_("?group:Ancient"), _("?group:Modern"), _("?group:Asian")
legend=_("The first Persian (Achaemenid) Empire lasted from 550BC to 330BC;\
the second (Sassanid) from 226AD to 642AD.")
leader=
diff -Nur freeciv/data/nation/phoenician.ruleset
freeciv-q/data/nation/phoenician.ruleset
--- freeciv/data/nation/phoenician.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/phoenician.ruleset 2005-11-28 13:57:44.254259040
+0100
@@ -2,7 +2,7 @@
name=_("Phoenician")
plural=_("?plural:Phoenicians")
-groups=_("Ancient"), _("Asian")
+groups=_("?group:Ancient"), _("?group:Asian")
legend=_("Phoenicia was an ancient civilization, based in what is now the\
coastal regions of Lebanon and Syria.")
leader=
diff -Nur freeciv/data/nation/polish.ruleset
freeciv-q/data/nation/polish.ruleset
--- freeciv/data/nation/polish.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/polish.ruleset 2005-11-28 13:57:44.281254936
+0100
@@ -2,7 +2,7 @@
name=_("Polish")
plural=_("?plural:Poles")
-groups=_("Medieval"), _("Modern"), _("European")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group: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 freeciv/data/nation/portuguese.ruleset
freeciv-q/data/nation/portuguese.ruleset
--- freeciv/data/nation/portuguese.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/portuguese.ruleset 2005-11-28 13:57:44.308250832
+0100
@@ -2,7 +2,7 @@
name=_("Portuguese")
plural=_("?plural:Portuguese")
-groups=_("Medieval"), _("Modern"), _("European")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group: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 freeciv/data/nation/quebecois.ruleset
freeciv-q/data/nation/quebecois.ruleset
--- freeciv/data/nation/quebecois.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/quebecois.ruleset 2005-11-28 13:57:44.334246880
+0100
@@ -2,7 +2,7 @@
name=_("Quebecois")
plural=_("?plural:Quebecois")
-groups= _("American")
+groups= _("?group:American")
legend=_("Quebec is the largest province of Canada, housing the majority of\
the Francophone population of America. It is also the only political unit\
in North America where English is not an official language.")
diff -Nur freeciv/data/nation/romanian.ruleset
freeciv-q/data/nation/romanian.ruleset
--- freeciv/data/nation/romanian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/romanian.ruleset 2005-11-28 13:57:44.362242624
+0100
@@ -2,7 +2,7 @@
name=_("Romanian")
plural=_("?plural:Romanians")
-groups=_("Modern"), _("European")
+groups=_("?group:Modern"), _("?group:European")
legend=_("Romania appeared at the begining of the 20th century AD, when the\
small states of Transylvania, Walachia, and Moldavia joined. It is a\
country inhabited by people speaking a language reminiscent from the time\
diff -Nur freeciv/data/nation/roman.ruleset freeciv-q/data/nation/roman.ruleset
--- freeciv/data/nation/roman.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/roman.ruleset 2005-11-28 13:57:44.389238520 +0100
@@ -2,7 +2,7 @@
name=_("Roman")
plural=_("?plural:Romans")
-groups=_("Ancient"), _("European")
+groups=_("?group:Ancient"), _("?group: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 freeciv/data/nation/russian.ruleset
freeciv-q/data/nation/russian.ruleset
--- freeciv/data/nation/russian.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/russian.ruleset 2005-11-28 13:57:44.417234264
+0100
@@ -2,7 +2,7 @@
name=_("Russian")
plural=_("?plural:Russians")
-groups=_("Medieval"), _("Modern"), _("European"), _("Asian")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group:European"),
_("?group:Asian")
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 freeciv/data/nation/ryukyuan.ruleset
freeciv-q/data/nation/ryukyuan.ruleset
--- freeciv/data/nation/ryukyuan.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/ryukyuan.ruleset 2005-11-28 13:57:44.443230312
+0100
@@ -2,7 +2,7 @@
name=_("Ryukyuan")
plural=_("?plural:Ryukyuans")
-groups=_("Medieval"), _("Asian")
+groups=_("?group:Medieval"), _("?group: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 freeciv/data/nation/sami.ruleset freeciv-q/data/nation/sami.ruleset
--- freeciv/data/nation/sami.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/sami.ruleset 2005-11-28 13:57:44.471226056 +0100
@@ -2,7 +2,7 @@
name=_("Sami")
plural=_("?plural:Sami")
-groups=_("European")
+groups=_("?group: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 freeciv/data/nation/scottish.ruleset
freeciv-q/data/nation/scottish.ruleset
--- freeciv/data/nation/scottish.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/scottish.ruleset 2005-11-28 13:57:44.498221952
+0100
@@ -2,7 +2,7 @@
name=_("Scottish")
plural=_("?plural:Scots")
-groups=_("Medieval"), _("European")
+groups=_("?group:Medieval"), _("?group: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 freeciv/data/nation/serbian.ruleset
freeciv-q/data/nation/serbian.ruleset
--- freeciv/data/nation/serbian.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/serbian.ruleset 2005-11-28 13:57:44.525217848
+0100
@@ -2,7 +2,7 @@
name=_("Serbian")
plural=_("?plural:Serbians")
-groups=_("Modern"), _("Medieval"), _("European")
+groups=_("?group:Modern"), _("?group:Medieval"), _("?group: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 freeciv/data/nation/silesian.ruleset
freeciv-q/data/nation/silesian.ruleset
--- freeciv/data/nation/silesian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/silesian.ruleset 2005-11-28 13:57:44.552213744
+0100
@@ -2,7 +2,7 @@
name=_("Silesian")
plural=_("?plural:Silesians")
-groups=_("Medieval"), _("European")
+groups=_("?group:Medieval"), _("?group:European")
legend=_("Silesia is a region of southern Poland that was at one time an\
independent kingdom.")
leader = "WÅ?adysÅ?aw Wygnaniec",
diff -Nur freeciv/data/nation/singaporean.ruleset
freeciv-q/data/nation/singaporean.ruleset
--- freeciv/data/nation/singaporean.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/singaporean.ruleset 2005-11-28 13:57:44.579209640
+0100
@@ -14,7 +14,7 @@
name=_("Singaporean")
plural=_("?plural:Singaporeans")
-groups=_("Modern"), _("Asian")
+groups=_("?group:Modern"), _("?group:Asian")
legend=_("Singapore is a mercantile city-state located at the southernmost\
tip of the Malaysian Peninsula.")
leader=
diff -Nur freeciv/data/nation/sioux.ruleset freeciv-q/data/nation/sioux.ruleset
--- freeciv/data/nation/sioux.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/sioux.ruleset 2005-11-28 13:57:44.606205536 +0100
@@ -2,7 +2,7 @@
name=_("Sioux")
plural=_("?plural:Sioux")
-groups=_("Medieval"), _("American")
+groups=_("?group:Medieval"), _("?group: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 freeciv/data/nation/slovakian.ruleset
freeciv-q/data/nation/slovakian.ruleset
--- freeciv/data/nation/slovakian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/slovakian.ruleset 2005-11-28 13:57:44.634201280
+0100
@@ -2,7 +2,7 @@
name=_("Slovakian")
plural=_("?plural:Slovakians")
-groups=_("Medieval"), _("Modern"), _("European")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group: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 freeciv/data/nation/slovenian.ruleset
freeciv-q/data/nation/slovenian.ruleset
--- freeciv/data/nation/slovenian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/slovenian.ruleset 2005-11-28 13:57:44.661197176
+0100
@@ -2,7 +2,7 @@
name=_("Slovenian")
plural=_("?plural:Slovenians")
-groups=_("Medieval"), _("Modern"), _("European")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group:European")
legend=_("Slovenia was the most western and northern republic of the old\
Yugoslav Federation.")
leader=
diff -Nur freeciv/data/nation/southafrican.ruleset
freeciv-q/data/nation/southafrican.ruleset
--- freeciv/data/nation/southafrican.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/southafrican.ruleset 2005-11-28 13:57:44.689192920
+0100
@@ -2,7 +2,7 @@
name=_("South African")
plural=_("?plural:South Africans")
-groups=_("Modern"), _("African")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/spanish.ruleset
freeciv-q/data/nation/spanish.ruleset
--- freeciv/data/nation/spanish.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/spanish.ruleset 2005-11-28 13:57:44.717188664
+0100
@@ -2,7 +2,7 @@
name=_("Spanish")
plural=_("?plural:Spanish")
-groups=_("Medieval"),_("Modern"),_("European")
+groups=_("?group:Medieval"),_("?group:Modern"),_("?group: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 freeciv/data/nation/sudanese.ruleset
freeciv-q/data/nation/sudanese.ruleset
--- freeciv/data/nation/sudanese.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/sudanese.ruleset 2005-11-28 13:57:44.743184712
+0100
@@ -2,7 +2,7 @@
name=_("Sudanese")
plural=_("?plural:Sudanese")
-groups=_("Modern"), _("African")
+groups=_("?group:Modern"), _("?group:African")
legend=_("In 1820 Sudan came under Egyptian rule and later British rule.\
Sudan became independent in 1956.")
leader=
diff -Nur freeciv/data/nation/sumerian.ruleset
freeciv-q/data/nation/sumerian.ruleset
--- freeciv/data/nation/sumerian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/sumerian.ruleset 2005-11-28 13:57:44.769180760
+0100
@@ -2,7 +2,7 @@
name=_("Sumerian")
plural=_("?plural:Sumerians")
-groups=_("Ancient"), _("Asian")
+groups=_("?group:Ancient"), _("?group: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 freeciv/data/nation/swazi.ruleset freeciv-q/data/nation/swazi.ruleset
--- freeciv/data/nation/swazi.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/swazi.ruleset 2005-11-28 13:57:44.796176656 +0100
@@ -2,7 +2,7 @@
name=_("Swazi")
plural=_("?plural:Swazis")
-groups=_("Medieval"), _("Modern"), _("African")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group:African")
legend=_("The Swazis is a Bantu people of southern Africa. Under the\
leadership of Mswati II, the Swazis expanded their territory and\
stabilized the southern frontier with the Zulus.")
diff -Nur freeciv/data/nation/swedish.ruleset
freeciv-q/data/nation/swedish.ruleset
--- freeciv/data/nation/swedish.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/swedish.ruleset 2005-11-28 13:57:44.825172248
+0100
@@ -2,7 +2,7 @@
name=_("Swedish")
plural=_("?plural:Swedes")
-groups=_("Medieval"), _("Modern"), _("European")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group: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 freeciv/data/nation/swiss.ruleset freeciv-q/data/nation/swiss.ruleset
--- freeciv/data/nation/swiss.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/swiss.ruleset 2005-11-28 13:57:44.851168296 +0100
@@ -2,7 +2,7 @@
name=_("Swiss")
plural=_("?plural:Swiss")
-groups=_("Modern"), _("Medieval"), _("European")
+groups=_("?group:Modern"), _("?group:Medieval"), _("?group:European")
legend=_("Switzerland is a federation of cantons, some of which have more\
than 700 years of history as a confederacy.")
leader=
diff -Nur freeciv/data/nation/taiwanese.ruleset
freeciv-q/data/nation/taiwanese.ruleset
--- freeciv/data/nation/taiwanese.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/taiwanese.ruleset 2005-11-28 13:57:44.878164192
+0100
@@ -2,7 +2,7 @@
name=_("Taiwanese")
plural=_("?plural:Taiwanese")
-groups=_("Modern"), _("Asian")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/thai.ruleset freeciv-q/data/nation/thai.ruleset
--- freeciv/data/nation/thai.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/thai.ruleset 2005-11-28 13:57:44.906159936 +0100
@@ -2,7 +2,7 @@
name=_("Thai")
plural=_("?plural:Thai")
-groups=_("Modern"), _("Medieval"), _("Asian")
+groups=_("?group:Modern"), _("?group:Medieval"), _("?group: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 freeciv/data/nation/tibetan.ruleset
freeciv-q/data/nation/tibetan.ruleset
--- freeciv/data/nation/tibetan.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/tibetan.ruleset 2005-11-28 13:57:44.933155832
+0100
@@ -2,7 +2,7 @@
name=_("Tibetan")
plural=_("?plural:Tibetans")
-groups=_("Medieval"), _("Asian")
+groups=_("?group:Medieval"), _("?group: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 freeciv/data/nation/tunisian.ruleset
freeciv-q/data/nation/tunisian.ruleset
--- freeciv/data/nation/tunisian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/tunisian.ruleset 2005-11-28 13:57:44.959151880
+0100
@@ -2,7 +2,7 @@
name=_("Tunisian")
plural=_("?plural:Tunisians")
-groups=_("Modern"), _("African")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/turk.ruleset freeciv-q/data/nation/turk.ruleset
--- freeciv/data/nation/turk.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/turk.ruleset 2005-11-28 13:57:44.985147928 +0100
@@ -2,7 +2,7 @@
name=_("Turk")
plural=_("?plural:Turks")
-groups=_("Medieval"), _("Modern"), _("Asian")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group: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 freeciv/data/nation/ukrainian.ruleset
freeciv-q/data/nation/ukrainian.ruleset
--- freeciv/data/nation/ukrainian.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/ukrainian.ruleset 2005-11-28 13:57:45.011143976
+0100
@@ -2,7 +2,7 @@
name=_("Ukrainian")
plural=_("?plural:Ukrainians")
-groups=_("Modern"), _("European")
+groups=_("?group:Modern"), _("?group: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 freeciv/data/nation/uyghur.ruleset
freeciv-q/data/nation/uyghur.ruleset
--- freeciv/data/nation/uyghur.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/uyghur.ruleset 2005-11-28 13:57:45.038139872
+0100
@@ -2,7 +2,7 @@
name=_("Uyghur")
plural=_("?plural:Uyghurs")
-groups=_("Medieval"), _("Asian")
+groups=_("?group:Medieval"), _("?group: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 freeciv/data/nation/venezuelan.ruleset
freeciv-q/data/nation/venezuelan.ruleset
--- freeciv/data/nation/venezuelan.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/venezuelan.ruleset 2005-11-28 13:57:45.065135768
+0100
@@ -3,7 +3,7 @@
; Nation name should be "Venezuelan" for consistency.
name=_("Venezuela")
plural=_("?plural:Venezuelans")
-groups=_("American"), _("Modern")
+groups=_("?group:American"), _("?group: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 freeciv/data/nation/vietnamese.ruleset
freeciv-q/data/nation/vietnamese.ruleset
--- freeciv/data/nation/vietnamese.ruleset 2005-11-27 18:56:58.000000000
+0100
+++ freeciv-q/data/nation/vietnamese.ruleset 2005-11-28 13:57:45.091131816
+0100
@@ -2,7 +2,7 @@
name=_("Vietnamese")
plural=_("?plural:Vietnamese")
-groups=_("Medieval"), _("Modern"), _("Asian")
+groups=_("?group:Medieval"), _("?group:Modern"), _("?group: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 freeciv/data/nation/viking.ruleset
freeciv-q/data/nation/viking.ruleset
--- freeciv/data/nation/viking.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/viking.ruleset 2005-11-28 13:57:45.118127712
+0100
@@ -2,7 +2,7 @@
name=_("Viking")
plural=_("?plural:Vikings")
-groups=_("Medieval"), _("European")
+groups=_("?group:Medieval"), _("?group: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 freeciv/data/nation/welsh.ruleset freeciv-q/data/nation/welsh.ruleset
--- freeciv/data/nation/welsh.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/welsh.ruleset 2005-11-28 13:57:45.145123608 +0100
@@ -2,7 +2,7 @@
name=_("Welsh")
plural=_("?plural:Welsh")
-groups= _("Medieval"), _("European")
+groups= _("?group:Medieval"), _("?group: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 freeciv/data/nation/zulu.ruleset freeciv-q/data/nation/zulu.ruleset
--- freeciv/data/nation/zulu.ruleset 2005-11-27 18:56:58.000000000 +0100
+++ freeciv-q/data/nation/zulu.ruleset 2005-11-28 13:57:45.171119656 +0100
@@ -2,7 +2,7 @@
name=_("Zulu")
plural=_("?plural:Zulus")
-groups=_("African")
+groups=_("?group: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.")
|
