[Freeciv-Dev] (PR#13659) Revised japanese.ruleset

["Daniel Markstedt" <himasaram@xxxxxxxx>]

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

These are the changes:

- Added very brief legend.

- Removed Tenno from "Jimmu Tenno" because it's a title meaning emperor.

- Why Shogun under Republic? Well, why not. It makes more sense than 
Shogun under Kingdom at least. Kingdom rulers are now Emperor and Empress.

- Replaced Kita-Kyushu with Kokura and Higashi-Osaka with Fuse. They are 
the classic names of the cities.

- Removed Okinawa. It's the name of an island, not a city.

- Finally, now the spellings of cities are correct and not the 
simplified ones.


--- japanese.ruleset.old        2005-07-30 10:28:36.000000000 +0200
+++ japanese.ruleset    2005-08-12 16:56:34.000000000 +0200
@@ -3,7 +3,8 @@
 name=_("Japanese")
 plural=_("?plural:Japanese")
 class=_("Modern")
-leader="Jimmu Tenno", "Mutsuhito", "Hirohito",
+legend=_("According to traditional Japanese mythology, Japan was founded in 
the 7th century BC by the ancestral Emperor Jimmu.")
+leader="Jimmu", "Mutsuhito", "Hirohito",
        "Oda Nobunaga", "Tokugawa Ieyasu"
 leader_sex="Male", "Male", "Male", "Male", "Male"
 flag="f.japan"
@@ -11,7 +12,8 @@
 city_style = "Asian"
 
 ruler_titles = { "government",      "male_title",      "female_title"
-                 "Monarchy",        _("Shogun"),         _("Shogun")
+                 "Monarchy",        _("Emperor"),        _("Empress")
+                 "Republic",        _("Shogun"),         _("Shogun")
                  "Democracy",       _("Prime Minister"), _("Prime Minister")
 }
 
@@ -24,19 +26,20 @@
 civilwar_nations = "korean", "filipino"
 
 cities =
-  "Tokyo (ocean)",
-  "Osaka (ocean)",
-  "Yokohama (ocean)",
-  "Kyoto (!ocean)",
+  "Tōkyō (ocean)",
+  "Ōsaka (ocean)",
+  "Kyōto (!ocean)",
+  "Nara (!ocean)",
   "Sapporo (ocean)",
   "Nagoya (ocean)",
   "Fukuoka (ocean)",
-  "Kobe (ocean)",
+  "Kōbe (ocean)",
   "Hiroshima (ocean)",
   "Sendai (ocean)",
   "Kawasaki (ocean)",
-  "Kita-Kyushu (ocean)",
+  "Kokura (ocean)",
   "Saitama (!ocean)",
+  "Yokohama (ocean)",
   "Chiba (ocean)",
   "Shizuoka (ocean)",
   "Niigata (ocean)",
@@ -44,7 +47,7 @@
   "Kanazawa (ocean)",
   "Sakai (ocean)",
   "Sagamihara (!ocean)",
-  "Hachioji (!ocean)",
+  "Hachiōji (!ocean)",
   "Nagano (!ocean)",
   "Kumamoto (ocean)",
   "Okayama (ocean)",
@@ -53,27 +56,26 @@
   "Akita (ocean)",
   "Himeji (ocean)",
   "Nagasaki (ocean)",
-  "Nara (!ocean)",
   "Yokosuka (ocean)",
-  "Oita (ocean)",
+  "Ōita (ocean)",
   "Gifu (!ocean)",
   "Wakayama (ocean)",
   "Iwaki (ocean)",
   "Asahikawa (!ocean)",
   "Takamatsu (ocean)",
-  "Kochi (ocean)",
+  "Kōchi (ocean)",
   "Toyama (ocean)",
   "Naha (ocean)",
   "Aomori (ocean)",
   "Hakodate (ocean)",
   "Maebashi (!ocean)",
   "Morioka (!ocean)",
-  "Otsu",
+  "Ōtsu",
   "Tokushima (ocean)",
   "Yamagata (!ocean)",
   "Fukui (ocean)",
   "Matsumoto (!ocean)",
-  "Kofu (!ocean)",
+  "Kōfu (!ocean)",
   "Funabashi",
   "Utsunomiya (!ocean)",
   "Miyazaki (ocean)",
@@ -83,15 +85,14 @@
   "Fukushima (!ocean)",
   "Yokkaichi (ocean)",
   "Shimonoseki (ocean)",
-  "Okinawa (ocean)",
   "Hachinohe (ocean)",
   "Mito (!ocean)",
   "Sasebo (ocean)",
   "Matsue (ocean)",
   "Kawaguchi (!ocean)",
   "Kushiro (ocean)",
-  "Chofu (!ocean)",
-  "Higashi-Osaka (!ocean)",
+  "Chōfu (!ocean)",
+  "Fuse (!ocean)",
   "Kumagaya (!ocean)",
   "Amagasaki (ocean)",
   "Ichikawa",