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

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

On Mon, Mar 24, 2003 at 04:16:46AM -0800, Gregory Berkolaiko wrote:
> 
> On Sun, 23 Mar 2003, ChrisK@xxxxxxxx wrote:
> 
> > On Sun, Mar 09, 2003 at 01:19:35PM -0800, Christian Knoke wrote:
> > > 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.
> > 
> > Some kind soul might want to commit this now. :)
> 
> Not that I care, but USSR collapsed in 1991 and the two events share a 
> common cause rather than follow from one another.

Ok, since Jason's picked the wrong patch anyway, do you agree with the
following fix?

Christian

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

--- german.ruleset.orig Mon Mar 24 07:06:07 2003
+++ german.ruleset      Tue Mar 25 13:48:45 2003
@@ -7,7 +7,7 @@
 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.")
+into two states, which reunited in 1990 at the end of the Cold War.")
 
 leader = "Arminius", "Alarich", "Karl der Große", "Otto I.", 
          "Friedrich I. Barbarossa", "Friedrich II.", "Wilhelm I.",