<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40694 >

> [dmarks - Thu Jan 29 12:50:37 2009]:
> 
> I don't think we should make changes to strings in S2_1 just to
> fix minor grammar/spelling mistakes - as long as it won't cause
> controversoy or misunderstanding. ;)

I have noticed that the most active translators were primarily
basing their reports on S2_1, so I assumed they would want to
have these strings fixed for 2.1.9.

I was planning on committing the other bunch of i18n fixes
(40684~40693) to S2_1 too; should I then commit those just
to trunk?


> Some comments on the trunk patch:
> 
> @@ -5,7 +5,7 @@ plural=_("?plural:Armenians")
>   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")
> + gained independence from the USSR in 1991.")
> 
> Is "USSR" a better choice of word than "Soviet Union" here?

Ok "Soviet Union".


> @@ -4,13 +4,13 @@ name=_("Illyrian")
>   plural=_("?plural:Illyrians")
>   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,\
> -  Corcyra island and Ambracia bay in prehistoric Epirus to the south,
\
> -  mixing with Thracians in Dardania to the east,\
> -  and settling Messapia across the Adriatic Sea.\
> -  Illyrian kingdoms were independent for centuries,\
> -  until conquered by the Roman Republic.")
> + western part of the Balkan Peninsula before 1000 BC, \
> + including Dalmatia to the north, and\
> + Corcyra island and Ambracia bay in prehistoric Epirus to the south.\
> + They mixed with Thracians in Dardania to the east,\
> + and settled Messapia across the Adriatic Sea.\
> + Illyrian kingdoms were independent for centuries,\
> + until conquered by the Roman Republic.")
> 
> I think "the Dalmatians" refer to the Illyrian tribe, whereas
> "Dalmatia" is the Roman province. I'd prefer to use the former,
> but at the same time it's odd to mix names of tribes and
> geographic places in the same sentence. Let's just remove the
> reference altogether instead. Wikipedia lists 38 distinct Illyrian
> tribes[1] so I don't see why they get the special treatment. ;)

Ok.


-----------------------------------------------------------------------
特別待遇だといいなあ。
 data/nation/armenian.ruleset    |    2 +-
 data/nation/illyrian.ruleset    |   13 ++++++-------
 data/nation/malian.ruleset      |    4 ++--
 data/nation/mayan.ruleset       |    4 ++--
 data/nation/soviet.ruleset      |    9 +++++----
 data/nation/westphalian.ruleset |    2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/data/nation/armenian.ruleset b/data/nation/armenian.ruleset
index caba625..3d84a77 100644
--- a/data/nation/armenian.ruleset
+++ b/data/nation/armenian.ruleset
@@ -5,7 +5,7 @@ plural=_("?plural:Armenians")
 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")
+ gained independence from the Soviet Union in 1991.")
 leader=
  "Armenak",
  "Ishpuinis",
diff --git a/data/nation/illyrian.ruleset b/data/nation/illyrian.ruleset
index 42fd664..6118892 100644
--- a/data/nation/illyrian.ruleset
+++ b/data/nation/illyrian.ruleset
@@ -4,13 +4,12 @@ name=_("Illyrian")
 plural=_("?plural:Illyrians")
 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,\
-  Corcyra island and Ambracia bay in prehistoric Epirus to the south,\
-  mixing with Thracians in Dardania to the east,\
-  and settling Messapia across the Adriatic Sea.\
-  Illyrian kingdoms were independent for centuries,\
-  until conquered by the Roman Republic.")
+ western part of the Balkan Peninsula before 1000 BC, including\
+ Corcyra island and Ambracia bay in prehistoric Epirus to the south.\
+ They mixed with Thracians in Dardania to the east,\
+ and settled Messapia across the Adriatic Sea.\
+ Illyrian kingdoms were independent for centuries,\
+ until conquered by the Roman Republic.")
 
 ; listed from legendary founder, until conquered by romans.
 ; researching turns out to be annoyingly difficult due to
diff --git a/data/nation/malian.ruleset b/data/nation/malian.ruleset
index 1c115d2..58dfe40 100644
--- a/data/nation/malian.ruleset
+++ b/data/nation/malian.ruleset
@@ -6,8 +6,8 @@ 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\
- with it's capital in Timbuktu was the most influential. This empire\
- reigned from the 14th to the 17th century and was famed for it's wealth and\
+ with its capital in Timbuktu was the most influential. This empire\
+ reigned from the 14th to the 17th century and was famed for its wealth and\
  benevolent kings. The modern Republic of Mali derives its name from this\
  empire.")
 leader=
diff --git a/data/nation/mayan.ruleset b/data/nation/mayan.ruleset
index 046a78d..c163b6c 100644
--- a/data/nation/mayan.ruleset
+++ b/data/nation/mayan.ruleset
@@ -3,8 +3,8 @@
 name=_("Mayan")
 plural=_("?plural:Mayas")
 groups="Ancient", "Medieval", "American"
-legend=_("The Mayans were a Mesoamerican civilization. Famous for building\
- great pyramids and palaces in the jungle.")
+legend=_("The Mayans were a Mesoamerican civilization. They are\
+ famous for building great pyramids and palaces in the jungle.")
 leader=
  "K'uk B'alam",
  "Zac-Kuk",
diff --git a/data/nation/soviet.ruleset b/data/nation/soviet.ruleset
index 059463b..24244e2 100644
--- a/data/nation/soviet.ruleset
+++ b/data/nation/soviet.ruleset
@@ -3,12 +3,13 @@
 name=_("Soviet")
 plural=_("?plural:Soviets")
 groups="European", "Asian"
-legend=_("Soviet Union's history starts in November 1917,\
+legend=_("The history of the Soviet Union starts in November 1917,\
  when under Lenin's leadership a Bolshevik revolution occurred.\
  On December 31 1922, four Soviet republics integrated into one\
- country. Soviet Union became one of most powerful states in\
- the 20th century. But by the end of 1991 due to many social\
- shocks it disintegrated into fifteen independent countries")
+ country. The Soviet Union became one of most powerful states in\
+ the 20th century, but by the end of 1991 it had disintegrated\
+ into fifteen independent countries due to social and economic\
+ problems.")
 leader=
  "Vladimir Lenin",
  "Iosif Stalin",
diff --git a/data/nation/westphalian.ruleset b/data/nation/westphalian.ruleset
index 40539c6..91a55e1 100644
--- a/data/nation/westphalian.ruleset
+++ b/data/nation/westphalian.ruleset
@@ -4,7 +4,7 @@ name=_("Westphalian")
 plural=_("?plural:Westphalians")
 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\
+ region of the duchy of Saxony. Today it makes up the northern part of\
  the largest German federal state, North Rhine-Westphalia.")
 leader =
  "Widukind",
 data/nation/armenian.ruleset |    2 +-
 data/nation/illyrian.ruleset |   13 ++++++-------
 data/nation/mayan.ruleset    |    4 ++--
 data/nation/soviet.ruleset   |    9 +++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/data/nation/armenian.ruleset b/data/nation/armenian.ruleset
index caba625..3d84a77 100644
--- a/data/nation/armenian.ruleset
+++ b/data/nation/armenian.ruleset
@@ -5,7 +5,7 @@ plural=_("?plural:Armenians")
 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")
+ gained independence from the Soviet Union in 1991.")
 leader=
  "Armenak",
  "Ishpuinis",
diff --git a/data/nation/illyrian.ruleset b/data/nation/illyrian.ruleset
index d9b002a..3872b43 100644
--- a/data/nation/illyrian.ruleset
+++ b/data/nation/illyrian.ruleset
@@ -4,13 +4,12 @@ name=_("Illyrian")
 plural=_("?plural:Illyrians")
 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,\
-  Corcyra island and Ambracia bay in prehistoric Epirus to the south,\
-  mixing with Thracians in Dardania to the east,\
-  and settling Messapia across the Adriatic Sea.\
-  Illyrian kingdoms were independent for centuries,\
-  until conquered by the Roman Republic.")
+ western part of the Balkan Peninsula before 1000 BC, including\
+ Corcyra island and Ambracia bay in prehistoric Epirus to the south.\
+ They mixed with Thracians in Dardania to the east,\
+ and settled Messapia across the Adriatic Sea.\
+ Illyrian kingdoms were independent for centuries,\
+ until conquered by the Roman Republic.")
 
 ; listed from legendary founder, until conquered by romans.
 ; researching turns out to be annoyingly difficult due to
diff --git a/data/nation/mayan.ruleset b/data/nation/mayan.ruleset
index c3cc032..3234972 100644
--- a/data/nation/mayan.ruleset
+++ b/data/nation/mayan.ruleset
@@ -3,8 +3,8 @@
 name=_("Mayan")
 plural=_("?plural:Mayas")
 groups="Ancient", "Medieval", "American"
-legend=_("The Mayans were a Mesoamerican civilization. Famous for building\
- great pyramids and palaces in the jungle.")
+legend=_("The Mayans were a Mesoamerican civilization. They are\
+ famous for building great pyramids and palaces in the jungle.")
 leader=
  "K'uk B'alam",
  "Zac-Kuk",
diff --git a/data/nation/soviet.ruleset b/data/nation/soviet.ruleset
index 06025b3..7a42029 100644
--- a/data/nation/soviet.ruleset
+++ b/data/nation/soviet.ruleset
@@ -3,12 +3,13 @@
 name=_("Soviet")
 plural=_("?plural:Soviets")
 groups="European", "Asian"
-legend=_("Soviet Union's history starts in November 1917,\
+legend=_("The history of the Soviet Union starts in November 1917,\
  when under Lenin's leadership a Bolshevik revolution occurred.\
  On December 31 1922, four Soviet republics integrated into one\
- country. Soviet Union became one of most powerful states in\
- the 20th century. But by the end of 1991 due to many social\
- shocks it disintegrated into fifteen independent countries")
+ country. The Soviet Union became one of most powerful states in\
+ the 20th century, but by the end of 1991 it had disintegrated\
+ into fifteen independent countries due to social and economic\
+ problems.")
 leader=
  "Vladimir Lenin",
  "Iosif Stalin",
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to