[Freeciv-Dev] Re: [freeciv-data] Re: (PR#3597) german ruleset new version

["ChrisK@xxxxxxxx" <ChrisK@xxxxxxxx>]

On Sun, Mar 09, 2003 at 12:58:47PM -0800, Cameron Morland wrote:
> > +legend = _("Germany was united in 1871 by the Prussian military \
> > +force.  After World War I it became a republic, but fell into \
> > +Nazism 1933 and started World War II.  After the war it was split \
> > +into two states, that reunited 1990 when the USSR collapsed.")
> 
> I would say "which reunited", and you certainly want "in 1990". I also
> would prefer "Soviet Union", and one style guide, at least, agrees.
> 
> +into two states, which reunited in 1990 when the Soviet Union collapsed.")

Thank you. Version 3 attached.

Christian

-- 
Christian Knoke     * * *      http://www.enter.de/~c.knoke/
* * * * * * * * *  Ceterum censeo Microsoft esse dividendum.

--- german.ruleset.orig Sun Mar  9 19:01:55 2003
+++ german.ruleset      Sun Mar  9 22:15:07 2003
@@ -1,55 +1,162 @@
 [nation_german]
 
-name=_("German")
-plural=_("?plural:Germans")
-class=_("Modern")
-leader="Frederick", "Otto", "Wilhelm", "Bismarck", "Hitler",
-  "Barbarossa", "Luther", "Müntzer"
-leader_sex="Male", "Male", "Male", "Male", "Male",
-  "Male", "Male", "Male"
-flag="f.germany"
-flag_alt = "-"
-city_style = "European"
+name   = _("German")
+plural = _("?plural:Germans")
+class  = _("Modern")
+
+legend = _("Germany was united in 1871 by the Prussian military \
+force.  After World War I it became a republic, but fell into \
+Nazism 1933 and started World War II.  After the war it was split \
+into two states, which reunited in 1990 when the Soviet Union \
+collapsed.")
+
+leader = "Arminius", "Alarich", "Karl der Große", "Otto I.", 
+         "Friedrich I. Barbarossa", "Friedrich II.", "Wilhelm I.",
+         "Otto von Bismarck", "Friedrich Ebert", "Adolf Hitler", 
+         "Konrad Adenauer", "Willy Brandt", "Erich Honecker"
+leader_sex = "Male", "Male", "Male", "Male", "Male", "Male", "Male", 
+             "Male", "Male", "Male", "Male", "Male", "Male"
+
+flag         = "f.germany"
+flag_alt     = "-"
+city_style   = "European"
 ruler_titles = { "government",      "male_title",       "female_title"
-                 "Democracy",       _("Chancellor"),    _("Chancellor")
-                 "Fundamentalism",  _("Princebishop"),  _("Princebishop")
+                 "Republic",       _("President"),       _("President") 
+                 "Democracy",      _("Chancellor"),      _("Chancellor")
+                 "Fundamentalism", _("Archbishop"),      _("Archbishop")
+                 "Communism",      _("First Secretary"), _("First Secretary")
                }
 
-attack=2
-expand=0
-civilized=2
-advisors=100,100,100,100,100,100,100
-init_techs=""
+attack     = 2
+expand     = 0
+civilized  = 2
+advisors   = 100,100,100,100,100,100,100
+init_techs = ""
 
 tech_goals = "The Republic", "Iron Working", "Gunpowder", "Explosives",
              "Flight"
-wonder="J.S. Bach's Cathedral"
-government="Republic"
+wonder     = "J.S. Bach's Cathedral"
+government = "Republic"
 
 cities =
-  "Berlin", "Hamburg", "München", "Köln", "Frankfurt am Main (river)",
-  "Essen", "Dortmund", "Stuttgart", "Düsseldorf", "Bremen",
-  "Duisburg", "Hannover", "Nürnberg", "Leipzig", "Dresden",
-  "Bochum", "Wuppertal (river)", "Bielefeld", "Mannheim", "Bonn",
-  "Halle/Saale", "Gelsenkirchen", "Chemnitz", "Karlsruhe", "Wiesbaden",
-  "Magdeburg", "Münster", "Mönchengladbach", "Augsburg", "Braunschweig",
-  "Krefeld", "Kiel", "Aachen", "Rostock", "Oberhausen",
-  "Lübeck", "Hagen", "Kassel", "Erfurt", "Freiburg i. Br.",
-  "Saarbrücken (river)", "Mainz", "Hamm", "Herne",
-  "Mülheim an der Ruhr (river)", "Ludwigshafen (river)", "Osnabrück (river)",
-  "Solingen", "Leverkusen", "Neuss", "Oldenburg", "Darmstadt",
-  "Heidelberg (hills)", "Potsdam", "Bremerhaven (ocean)", "Paderborn (river)",
-  "Würzburg", "Göttingen", "Cottbus", "Wolfsburg", "Recklinghausen",
-  "Regensburg", "Remscheid", "Gera", "Heilbronn a. N. (river)",
-  "Schwerin", "Bottrop", "Salzgitter", "Pforzheim", "Offenbach a. M. (river)",
-  "Ulm", "Siegen", "Koblenz", "Ingolstadt", "Fürth", "Zwickau", "Reutlingen",
-  "Moers", "Hildesheim", "Witten", "Bergisch Gladbach", "Erlangen",
-  "Kaiserslautern", "Jena", "Trier", "Frankfurt/Oder (river)", "Fulda",
-  "Bamberg", "Marburg", "Wittenberg (hills)",
-  "Weimar", "Baden-Baden", "Passau", "Verden", "Wismar", "Nördlingen",
-  "Stralsund (ocean)", "Mansfeld", "Donauwörth (river)", "Dessau",
-  "Worms", "Wittstock", "Mühlberg (hills)", "Speyer", "Kleve",
-  "Landau", "Rosheim", "Schmalkalden", "Lutter", "Barmen",
-  "Wiesloch", "Rosslau", "Minden", "Sinsheim", "Gotha",
-  "Philippsburg", "Halberstadt", "Hersfeld", "Altenburg", "Klostergrab",
-  "Elberfeld"
+  "Berlin (grassland, !mountains)", 
+  "Hamburg(grassland, swamp, ocean, river, !mountains)",
+  "München (hills, mountains, !ocean)", 
+  "Köln (plains, hills, river)", 
+  "Frankfurt am Main (grassland, hills, river, !ocean)",
+  "Essen (grassland, hills, !river)", 
+  "Dortmund (grassland, hills)",
+  "Stuttgart (hills, !ocean)", 
+  "Düsseldorf (grassland, hills, river)", 
+  "Bremen (grassland, plains, swamp, ocean, river, !mountains)",
+  "Duisburg (grassland, hills, river)",
+  "Hannover (grassland, plains, !mountains)",
+  "Nürnberg (hills, mountains, river, !ocean)", 
+  "Leipzig (grassland, plains, hills, !ocean)",
+  "Dresden (plains, hills, river, !ocean)",
+  "Bochum (grassland, plains, hills, !river)",
+  "Wuppertal (grassland, plains, hills, river)",
+  "Bielefeld (plains, forest, !mountains)",
+  "Mannheim (grassland, forest, river, !ocean)",
+  "Bonn (plains, forest, river)",
+  "Halle/Saale (grassland, plains, river, !ocean, !mountains)",
+  "Gelsenkirchen (grassland, plains, !mountains)",
+  "Chemnitz (hills, mountains, !ocean)",
+  "Karlsruhe (plains, forest, river, !ocean)",
+  "Wiesbaden (plains, hills, river, !ocean)",
+  "Magdeburg (grassland, plains, river)",
+  "Münster (grassland, plains, !river)",
+  "Mönchengladbach (grassland, plains, !river)", 
+  "Augsburg (forest, hills, mountains, river, !ocean)",
+  "Braunschweig (grassland, plains)",
+  "Krefeld (grassland, plains, !river)",
+  "Kiel (grassland, swamp, ocean, !mountains)",
+  "Aachen (plains, hills)",
+  "Rostock (grassland, ocean, river, !mountains)",
+  "Oberhausen (grassland, plains, river)",
+  "Lübeck (grassland, ocean, river, !mountains)",
+  "Hagen (plains, hills)",
+  "Kassel (plains, forest, !ocean)",
+  "Erfurt (hills, forest, !ocean)",
+  "Freiburg i. Br. (plains, forest, hills, mountains, !ocean)",
+  "Saarbrücken (forest, hills, river, !ocean)",
+  "Mainz (plains, hills, river, !ocean)",
+  "Hamm (grassland, hills)",
+  "Herne (plains, hills)",
+  "Mülheim an der Ruhr (grassland, hills, river)",
+  "Ludwigshafen (grassland, forest, river, !ocean)",
+  "Osnabrück (grassland, plains, forest)",
+  "Solingen (plains, hills, !river)",
+  "Leverkusen (plains, hills, river)",
+  "Neuss (plains, hills, river)",
+  "Oldenburg (grassland, swamp, ocean, river, !mountains)",
+  "Darmstadt (grassland, forest, !ocean)",
+  "Heidelberg (forest, hills, river, !ocean)",
+  "Potsdam (grassland, swamp, !mountains)",
+  "Bremerhaven (grassland, swamp, ocean, river, !mountains)",
+  "Paderborn (plains, forest)",
+  "Würzburg (plains, forest, river, !ocean)",
+  "Göttingen (forest, hills, !ocean)",
+  "Cottbus (swamp, plains, forest, river)",
+  "Wolfsburg (grassland, plains)",
+  "Recklinghausen (grassland, plains, hills, !river)",
+  "Regensburg (forest, hills, river, !ocean)",
+  "Remscheid (plains, hills, !river)",
+  "Gera (forest, hills)",
+  "Heilbronn a. N. (plains, forest, river)",
+  "Schwerin (grassland, ocean, !mountains)",
+  "Bottrop (grassland, plains, hills)",
+  "Salzgitter (plains, forest, hills)",
+  "Pforzheim (grassland, forest, river, !ocean)",
+  "Offenbach a. M. (grassland, hills, river, !ocean)",
+  "Ulm (forest, hills, river, !ocean)",
+  "Siegen (forest, hills, river)",
+  "Koblenz (forest, hills, river, !ocean)", 
+  "Ingolstadt (hills, river, !ocean)",
+  "Fürth (hills, !ocean)",
+  "Zwickau (forest, hills, !ocean)",
+  "Reutlingen (forest, hills, !ocean)",
+  "Moers (plains, hills)",
+  "Hildesheim (plains, hills)",
+  "Witten (grassland, hills, river)",
+  "Bergisch Gladbach (plains, hills, !river)",
+  "Erlangen (forest, hills, river, !ocean)",
+  "Kaiserslautern (plains, forest, !ocean)",
+  "Jena (hills, river, !ocean)",
+  "Trier (forest, river, !ocean)",
+  "Frankfurt/Oder (grassland, plains, swamp, river)",
+  "Fulda (hills, river, !ocean)",
+  "Bamberg (forest, hills, !ocean)",
+  "Marburg (hills, river, !ocean)",
+  "Wittenberg (grassland, plains, river, !mountains)",
+  "Weimar (plains, forest, !ocean)",
+  "Baden-Baden (forest, hills, mountains, !ocean)",
+  "Passau (hills, mountains, river, !ocean)",
+  "Verden (grassland, plains, swamp, ocean)",
+  "Wismar (grassland, ocean, !mountains)",
+  "Nördlingen (forest, hills, !river, !ocean)",
+  "Stralsund (grassland, ocean, !mountains)",
+  "Mansfeld (plains, hills, !ocean)",
+  "Donauwörth (hills, mountains, river)",
+  "Dessau (plains, forest)",
+  "Worms (plains, forest, river, !ocean)",
+  "Wittstock (grassland, plains, ocean, !mountains)",
+  "Mühlberg (plains, river, !ocean)",
+  "Speyer (plains, hills, river, !ocean)",
+  "Kleve (grassland, plains, river)",
+  "Landau (forest, hills, !ocean)",
+  "Rosheim (forest, hills, !ocean)",
+  "Schmalkalden (forest, hills, !ocean)",
+  "Lutter (forest, hills)",
+  "Barmen (grassland, plains, hills, river)",
+  "Wiesloch (forest, hills, river, !ocean)",
+  "Rosslau (grassland, plains, river)",
+  "Minden (grassland, hills, swamp, river)",
+  "Sinsheim (forest, hills)",
+  "Gotha (forest, hills)",
+  "Philippsburg (grassland, forest, hills, !ocean)",
+  "Halberstadt (plains, hills)",
+  "Bad Hersfeld (forest, hills)",
+  "Altenburg (forest, hills, !ocean)",
+  "Klostergrab",
+  "Elberfeld (grassland, plains, hills, river)"