[Freeciv-Dev] (PR#39813) civil war nation "turk" is unknown

Mon, 29 Oct 2007 13:53:19 -0800 

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

After changing to "Turkish", somebody forgot to update the civilwar nations.
Note these names are the rule name=_("...") in the ruleset, not the ruleset
name, nor the section name (too many names)....

Also, "Bosnian-Herzegovinian"!

Patch that fixes the nation and po files (with fuzzy).



Index: data/nation/phoenician.ruleset
===================================================================
--- data/nation/phoenician.ruleset      (revision 13898)
+++ data/nation/phoenician.ruleset      (working copy)
@@ -33,7 +33,7 @@
 init_buildings=""
 init_government="Despotism"
 init_units=""
-civilwar_nations="turk", "carthaginian", "israeli"
+civilwar_nations="turkish", "carthaginian", "israeli"
 
 cities =
  "Sur",        ; English: "Tyre"
Index: data/nation/moldovan.ruleset
===================================================================
--- data/nation/moldovan.ruleset        (revision 13898)
+++ data/nation/moldovan.ruleset        (working copy)
@@ -31,7 +31,7 @@
 init_government="Despotism"
 init_units=""
 
-civilwar_nations = "romanian", "ukrainian", "turk"
+civilwar_nations = "romanian", "ukrainian", "turkish"
 
 cities =
   "Chişinau",
Index: data/nation/ottoman.ruleset
===================================================================
--- data/nation/ottoman.ruleset (revision 13898)
+++ data/nation/ottoman.ruleset (working copy)
@@ -35,7 +35,7 @@
 init_government="Despotism"
 init_units=""
 
-conflicts_with="turk"
+conflicts_with="turkish"
 civilwar_nations="arab", "armenian", "hellenic"
 
 ; Cities from all over the empire
Index: data/nation/azeri.ruleset
===================================================================
--- data/nation/azeri.ruleset   (revision 13898)
+++ data/nation/azeri.ruleset   (working copy)
@@ -47,7 +47,7 @@
 init_units=""
 
 conflicts_with="soviet"
-civilwar_nations="turk", "persian", "armenian"
+civilwar_nations="turkish", "persian", "armenian"
 
 ; http://de.wikipedia.org/wiki/Liste_der_Städte_in_Aserbaidschan
 cities =
Index: data/nation/hellenic.ruleset
===================================================================
--- data/nation/hellenic.ruleset        (revision 13898)
+++ data/nation/hellenic.ruleset        (working copy)
@@ -25,7 +25,7 @@
 init_units=""
 
 conflicts_with = "greek", "byzantine"
-civilwar_nations = "turk", "italian"
+civilwar_nations = "turkish", "italian"
 
 cities =
  "Athina",
Index: data/nation/thracian.ruleset
===================================================================
--- data/nation/thracian.ruleset        (revision 13898)
+++ data/nation/thracian.ruleset        (working copy)
@@ -29,7 +29,7 @@
 init_government="Despotism"
 init_units=""
 
-civilwar_nations="turk", "illyrian"
+civilwar_nations="turkish", "illyrian"
 
 cities =
  "Uscudama",
Index: data/nation/syrian.ruleset
===================================================================
--- data/nation/syrian.ruleset  (revision 13898)
+++ data/nation/syrian.ruleset  (working copy)
@@ -23,7 +23,7 @@
 
 ; Similar flags:
 conflicts_with="iraqi"
-civilwar_nations="turk", "israeli"
+civilwar_nations="turkish", "israeli"
 
 ; http://pl.wikipedia.org/wiki/Miasta_Syrii
 cities =
Index: data/nation/byzantium.ruleset
===================================================================
--- data/nation/byzantium.ruleset       (revision 13898)
+++ data/nation/byzantium.ruleset       (working copy)
@@ -35,7 +35,7 @@
 
 ; Byzantium was a successor-empire of the Hellenic culture
 conflicts_with = "greek"
-civilwar_nations = "greek", "italian", "turk", "arab"
+civilwar_nations = "greek", "italian", "turkish", "arab"
 
 cities =
  "Konstantinoupolis (ocean)",  ; Constantinople / Istanbul
Index: data/nation/kurd.ruleset
===================================================================
--- data/nation/kurd.ruleset    (revision 13898)
+++ data/nation/kurd.ruleset    (working copy)
@@ -35,7 +35,7 @@
 init_government="Despotism"
 init_units=""
 
-civilwar_nations = "iranian", "iraqi", "turk", "syrian"
+civilwar_nations = "iranian", "iraqi", "turkish", "syrian"
 
 cities =
  "Hewlêr", ; Kurdish name for Arbil (Iraq)
Index: data/nation/serbian.ruleset
===================================================================
--- data/nation/serbian.ruleset (revision 13898)
+++ data/nation/serbian.ruleset (working copy)
@@ -42,7 +42,7 @@
 init_government="Despotism"
 init_units=""
 
-civilwar_nations = "slovenian", "croatian", "bosnia"
+civilwar_nations = "slovenian", "croatian", "bosnian-herzegovinian"
 
 cities =
  "Beograd",
Index: data/nation/uyghur.ruleset
===================================================================
--- data/nation/uyghur.ruleset  (revision 13898)
+++ data/nation/uyghur.ruleset  (working copy)
@@ -34,7 +34,7 @@
 init_buildings=""
 init_government="Despotism"
 init_units=""
-civilwar_nations = "turk", "tocharian"
+civilwar_nations = "turkish", "tocharian"
 
 cities =
  "Ürümqi",
Index: po/cs.po
===================================================================
--- po/cs.po    (revision 13898)
+++ po/cs.po    (working copy)
@@ -26504,7 +26504,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "Turecký"
 
 #: data/nation/turk.ruleset:4
Index: po/pt_BR.po
===================================================================
--- po/pt_BR.po (revision 13898)
+++ po/pt_BR.po (working copy)
@@ -25223,7 +25223,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "Turco"
 
 #: data/nation/turk.ruleset:4
Index: po/es.po
===================================================================
--- po/es.po    (revision 13898)
+++ po/es.po    (working copy)
@@ -27299,7 +27299,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "Turco"
 
 #: data/nation/turk.ruleset:4
Index: po/en_GB.po
===================================================================
--- po/en_GB.po (revision 13898)
+++ po/en_GB.po (working copy)
@@ -24175,7 +24175,7 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+msgid "Turkish"
 msgstr ""
 
 #: data/nation/turk.ruleset:4
Index: po/no.po
===================================================================
--- po/no.po    (revision 13898)
+++ po/no.po    (working copy)
@@ -26834,7 +26834,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "tyrkisk"
 
 #: data/nation/turk.ruleset:4
Index: po/hu.po
===================================================================
--- po/hu.po    (revision 13898)
+++ po/hu.po    (working copy)
@@ -25961,7 +25961,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "török"
 
 #: data/nation/turk.ruleset:4
Index: po/uk.po
===================================================================
--- po/uk.po    (revision 13898)
+++ po/uk.po    (working copy)
@@ -26366,7 +26366,8 @@
 "ôÕÒËÍÅΦÓÔÁÎ ÏÔÒÉÍÁ× ÎÅÚÁÌÅÖΦÓÔØ ×¦Ä òÁÄÑÎÓØËÏÇÏ óÏÀÚÕ Õ 1991."
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "ôÕÒËÉ"
 
 #: data/nation/turk.ruleset:4
Index: po/ro.po
===================================================================
--- po/ro.po    (revision 13898)
+++ po/ro.po    (working copy)
@@ -25521,7 +25521,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "turc"
 
 #: data/nation/turk.ruleset:4
Index: po/ru.po
===================================================================
--- po/ru.po    (revision 13898)
+++ po/ru.po    (working copy)
@@ -27068,7 +27068,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "ôÕÒËÉ"
 
 #: data/nation/turk.ruleset:4
Index: po/el.po
===================================================================
--- po/el.po    (revision 13898)
+++ po/el.po    (working copy)
@@ -25938,7 +25938,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "Ôïýñêïò"
 
 #: data/nation/turk.ruleset:4
Index: po/ar.po
===================================================================
--- po/ar.po    (revision 13898)
+++ po/ar.po    (working copy)
@@ -25726,7 +25726,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "تركي"
 
 #: data/nation/turk.ruleset:4
Index: po/fr.po
===================================================================
--- po/fr.po    (revision 13898)
+++ po/fr.po    (working copy)
@@ -27340,7 +27340,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "Turc"
 
 #: data/nation/turk.ruleset:4
Index: po/et.po
===================================================================
--- po/et.po    (revision 13898)
+++ po/et.po    (working copy)
@@ -25181,7 +25181,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "türklane"
 
 #: data/nation/turk.ruleset:4
Index: po/nl.po
===================================================================
--- po/nl.po    (revision 13898)
+++ po/nl.po    (working copy)
@@ -27071,7 +27071,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "Turkse"
 
 #: data/nation/turk.ruleset:4
Index: po/pl.po
===================================================================
--- po/pl.po    (revision 13898)
+++ po/pl.po    (working copy)
@@ -26960,7 +26960,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "Turecki"
 
 #: data/nation/turk.ruleset:4
Index: po/lt.po
===================================================================
--- po/lt.po    (revision 13898)
+++ po/lt.po    (working copy)
@@ -25058,7 +25058,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "Turkijos"
 
 #: data/nation/turk.ruleset:4
Index: po/pt.po
===================================================================
--- po/pt.po    (revision 13898)
+++ po/pt.po    (working copy)
@@ -26948,7 +26948,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "Turco"
 
 #: data/nation/turk.ruleset:4
Index: po/ca.po
===================================================================
--- po/ca.po    (revision 13898)
+++ po/ca.po    (working copy)
@@ -27270,7 +27270,8 @@
 "Turkmenistan va obtenir la independència de la Unió Soviètica el 1991."
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "Turc"
 
 #: data/nation/turk.ruleset:4
Index: po/da.po
===================================================================
--- po/da.po    (revision 13898)
+++ po/da.po    (working copy)
@@ -26740,7 +26740,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "Tyrker"
 
 #: data/nation/turk.ruleset:4
Index: po/fa.po
===================================================================
--- po/fa.po    (revision 13898)
+++ po/fa.po    (working copy)
@@ -24362,7 +24362,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "ترکیه"
 
 #: data/nation/turk.ruleset:4
Index: po/sv.po
===================================================================
--- po/sv.po    (revision 13898)
+++ po/sv.po    (working copy)
@@ -27240,7 +27240,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "turk"
 
 #: data/nation/turk.ruleset:4
Index: po/de.po
===================================================================
--- po/de.po    (revision 13898)
+++ po/de.po    (working copy)
@@ -27054,7 +27054,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "türkisch"
 
 #: data/nation/turk.ruleset:4
Index: po/ja.po
===================================================================
--- po/ja.po    (revision 13898)
+++ po/ja.po    (working copy)
@@ -28193,7 +28193,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "トルコ人"
 
 #: data/nation/turk.ruleset:4
Index: po/he.po
===================================================================
--- po/he.po    (revision 13898)
+++ po/he.po    (working copy)
@@ -24099,7 +24099,7 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+msgid "Turkish"
 msgstr ""
 
 #: data/nation/turk.ruleset:4
Index: po/fi.po
===================================================================
--- po/fi.po    (revision 13898)
+++ po/fi.po    (working copy)
@@ -27316,7 +27316,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "turkkilaisten"
 
 #: data/nation/turk.ruleset:4
Index: po/zh_CN.po
===================================================================
--- po/zh_CN.po (revision 13898)
+++ po/zh_CN.po (working copy)
@@ -25987,7 +25987,8 @@
 msgstr ""
 
 #: data/nation/turk.ruleset:3
-msgid "Turk"
+#, fuzzy
+msgid "Turkish"
 msgstr "ÍÁ¶úÆäÈË"
 
 #: data/nation/turk.ruleset:4

_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to