From 22fd10498e528c623fcbdf0e5ab9bc482ff15c21 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 31 May 2020 23:02:07 +0300 Subject: [PATCH] 3.9.0 --- .../Brazilian_Portuguese.properties | 2 + .../jsons/translations/Czech.properties | 2 + .../jsons/translations/Dutch.properties | 2 + .../jsons/translations/English.properties | 2 + .../jsons/translations/French.properties | 2 + .../jsons/translations/German.properties | 2 + .../jsons/translations/Indonesian.properties | 5 +- .../jsons/translations/Italian.properties | 2 + .../jsons/translations/Japanese.properties | 599 +----------------- .../jsons/translations/Korean.properties | 4 +- .../jsons/translations/Malay.properties | 2 + .../jsons/translations/Polish.properties | 2 + .../jsons/translations/Portuguese.properties | 2 + .../jsons/translations/Romanian.properties | 2 + .../jsons/translations/Russian.properties | 8 +- .../Simplified_Chinese.properties | 2 + .../jsons/translations/Spanish.properties | 2 + .../Traditional_Chinese.properties | 2 + .../jsons/translations/Turkish.properties | 2 + .../jsons/translations/Ukrainian.properties | 2 + .../completionPercentages.properties | 4 +- buildSrc/src/main/kotlin/BuildConfig.kt | 4 +- changelog.md | 14 + .../logic/civilization/CivilizationInfo.kt | 2 + 24 files changed, 66 insertions(+), 606 deletions(-) diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 21baabd8fa..fd4cd69a3c 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -3544,6 +3544,8 @@ Philosophy = Filosofia Currency = Moeda 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Melhor é pão com coração feliz do que riqueza com tormento.' - Amenemope Engineering = Engenharia + # Requires translation! +Roads connect tiles across rivers = 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'Ciência mecânica ou instrumental é a mais nobre e, acima de todas, a mais útil.' - Leonardo da Vinci Iron Working = Trabalho com ferro 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Não espere o aço ficar quente para bater, mas faça-o quente batendo.' - William Butler Yeats diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 5af6527b49..d711c50a24 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -3714,6 +3714,8 @@ Philosophy = Filozofie Currency = Platidlo 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Je lepší jíst se šťastným srdce, než se soužit v bohatství.' - Amenemope Engineering = Inženýrství + # Requires translation! +Roads connect tiles across rivers = 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'Instrumentální nebo mechanická věda je ze všech nejušlechtileší a především nejužitešnější.' - Leonardo da Vinci Iron Working = Zpracování železa 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Nečekejte s útokem, dokud se nerozžhaví železo, ale rozžhavte ho údery.' - William Butler Yeats diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 95193c5009..086e84d5ab 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -4739,6 +4739,8 @@ Currency = Geld 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = Engineering = Ingenieurswezen # Requires translation! +Roads connect tiles across rivers = + # Requires translation! 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = Iron Working = Ijzer Bewerking # Requires translation! diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 9d18c2522e..11617ddf79 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -5012,6 +5012,8 @@ Currency = # Requires translation! Engineering = # Requires translation! +Roads connect tiles across rivers = + # Requires translation! 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = # Requires translation! Iron Working = diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index f497aade43..8697c586a0 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -2673,6 +2673,8 @@ Philosophy = Philosophie Currency = Monnaie 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Mieux vaut du pain avec un cœur heureux, que des richesses avec des tracas.' - Aménémopé Engineering = Ingénierie + # Requires translation! +Roads connect tiles across rivers = 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'La science des instruments et de la mécanique est la plus noble et, par dessus tout, la plus utile.' - Léonard de Vinci Iron Working = Travail du fer 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'N'attendez pas que le fer soit chaud pour le frapper, mais frapper le pour qu'il soit chaud.' - William Butler Yeats diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 0b8e1e372c..0fd7b52e23 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -2669,6 +2669,8 @@ Philosophy = Philosophie Currency = Währung 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Besser ist Brot mit einem glücklichen Herzen als Reichtum mit Verdruss.' - Amenemope Engineering = Ingenieurwesen + # Requires translation! +Roads connect tiles across rivers = 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'Die instrumentelle oder mechanische Wissenschaft ist die edelste und vor allem die nützlichste.' - Leonardo da Vinci Iron Working = Eisenbearbeitung 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Warten nicht, bis das Bügeleisen heiß ist, sondern mach es durch Schläge heiß.' - William Butler Yeats diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index d19bb6cb5a..4bb580fb9e 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -254,7 +254,6 @@ Could not load game from clipboard! = Tidak bisa memuat game dari papan klip! Start game! = Mulai permainan! Map Options = Opsi peta Game Options = Opsi permainan - # Requires translation! Civilizations = Peradaban Map Type = Tipe peta Generated = Digenerasi Game @@ -265,7 +264,6 @@ Default = Default Pangaea = Pangaea Perlin = Perlin Continents = Kontinen - # Requires translation! Archipelago = Kepulauan Number of City-States = Banyaknya negara kota One City Challenge = Tantangan satu kota saja @@ -617,7 +615,6 @@ Points per turn = Poin per giliran Convert production to gold at a rate of 4 to 1 = Konversi produksi ke emas dalam perbandingan 4 banding 1 Convert production to science at a rate of [rate] to 1 = Konversi produksi ke ilmu pengetahuan dalam perbandingan [rate] banding 1 The city will not produce anything. = Kota ini tidak akan memproduksi apapun. - # Requires translation! Worked by [cityName] = Dikerjakan oleh [cityName] # Technology UI @@ -2668,6 +2665,8 @@ Philosophy = Filosofi Currency = Mata Uang 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Lebih baik sepotong roti dengan hati yang senang daripada kekayaan dengan kejengkelan.' - Amenemope Engineering = Keinsinyuran + # Requires translation! +Roads connect tiles across rivers = 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'Ilmu pengetahuan instrumental atau mekanikal adalah yang paling luhur dan, di atas semuanya, yang paling berguna.' - Leonardo da Vinci Iron Working = Pertukangan Besi 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Jangan menunggu untuk menempa hingga besinya panas, tetapi buatlah dia panas dengan menempanya.' - William Butler Yeats diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 70c27e4d88..635110d34f 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -2665,6 +2665,8 @@ Philosophy = Filosofia Currency = Valuta 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Meglio il pane con un cuore felice, che la ricchezza con l'afflizione.' - Amenemope Engineering = Ingegneria + # Requires translation! +Roads connect tiles across rivers = 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'La scienza degli strumenti e della meccanica è la più nobile di tutte, e soprattutto la più utile.' - Leonardo da Vinci Iron Working = Lavorazione del ferro 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Non aspettate che il ferro sia caldo prima di batterlo; rendetelo caldo con i vostri colpi.' - William Butler Yeats diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 0f55076119..011c8148c7 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -109,7 +109,6 @@ You fulfilled your promise to stop settling cities near us! = この文明の近 You refused to stop settling cities near us = この文明の近くで都市の建設をやめることを拒否 Your arrogant demands are in bad taste = 傲慢な要求は味が悪い Your use of nuclear weapons is disgusting! = 核兵器の使用 - # Requires translation! You have stolen our lands! = 領土を略奪 Demands = 要求 @@ -292,7 +291,6 @@ Default = デフォルト Pangaea = パンゲア Perlin = パーリンノイズ Continents = 大陸 - # Requires translation! Archipelago = 多島海 Number of City-States = 都市国家の数 One City Challenge = ワンシティチャレンジ @@ -313,13 +311,10 @@ Hide advanced settings = 詳細設定を閉じる Map Height = マップの高さ Temperature extremeness = 極度な気候 Resource richness = 資源の数 - # Requires translation! Vegetation richness = 植生の豊かさ - # Requires translation! Rare features richness = レアな特徴の豊富さ Max Coast extension = 海岸の長さ Biome areas extension = バイオームエリア - # Requires translation! Water level = 水域レベル Reset to default = デフォルトに戻す @@ -354,7 +349,6 @@ Starting Era = 始める年代 It looks like we can't make a map with the parameters you requested! = リクエストしたパラメータを使用してマップを作成できないようです Maybe you put too many players into too small a map? = この人数にはマップが小さすぎます No human players selected! = 人間のプレイヤーがいません！ - # Requires translation! Mods: = Mod: # Multiplayer @@ -387,11 +381,8 @@ Could not refresh! = 進行できませんでした Last refresh: [time] minutes ago = 最終進行:[time]数分前 Current Turn: = 現在のターン： Add Currently Running Game = 現在実行中のゲームを追加 - # Requires translation! Game name = ゲームネーム - # Requires translation! Loading latest game state... = 最新のゲーム状態を読み込み中... - # Requires translation! Couldn't download the latest game state! = 最新のゲーム状態をダウンロードできませんでした # Save game menu @@ -412,7 +403,6 @@ Upload map = マップをアップロード Could not upload map! = マップをアップロードできませんでした！ Map uploaded successfully! = マップをアップロードしました！ Saving... = セーブ中 - # Requires translation! It looks like your saved game can't be loaded! = セーブしたゲームを読み込めません # Requires translation! If you could copy your game data ("Copy saved game to clipboard" - = @@ -450,12 +440,10 @@ Show pixel improvements = ピクセルの資材活用施設を表示 Enable nuclear weapons = 核兵器を有効にする Fontset = フォントセット Continuous rendering = 連続レンダリング - # Requires translation! When disabled, saves battery life but certain animations will be suspended = 無効にするとバッテリーを節約できますが、特定のアニメーションは停止されます + # Requires translation! Order trade offers by amount = - # Requires translation! Generate translation files = 翻訳ファイルの生成 - # Requires translation! Translation files are generated successfully. = 翻訳ファイルが正常に生成されました # Notifications @@ -532,13 +520,9 @@ Your relationship with [cityStateName] degraded = [cityStateName]との関係が A new barbarian encampment has spawned! = 新しい蛮族の野営地が出現しました！ Received [goldAmount] Gold for capturing [cityName] = [cityName]を獲得して[goldAmount]ゴールドを受け取りました。 Our proposed trade request is no longer relevant! = 提案された取引の申込みはもはや関係ありません。 - # Requires translation! [defender] could not withdraw from a [attacker] - blocked. = [defender]は[attacker]から撤退できなかった。-邪魔された - # Requires translation! [defender] withdrew from a [attacker] = [defender]が[attacker]から撤退した。 - # Requires translation! [building] has provided [amount] Gold! = [building]が[amount]ゴールドを提供しました。 - # Requires translation! [civName] has stolen your territory! = [civName]はあなたの領土を略奪しました! @@ -602,22 +586,16 @@ Civilopedia = シヴィロペディア Start new game = 新しくゲームを始める Save game = セーブ Load game = ロード - # Requires translation! Main menu = メインメニュー - # Requires translation! Resume = 再開 - # Requires translation! Cannot resume game! = ゲームを再開できません - # Requires translation! Quickstart = クイックスタート Victory status = 勝利条件 Social policies = 社会制度 Community = コミュニティ Close = 閉じる Do you want to exit the game? = ゲームを終了しますか？ - # Requires translation! Start bias: = 開始バイアス: - # Requires translation! Avoid [terrain] = [terrain]を避ける # City screen @@ -627,7 +605,6 @@ Raze city = 都市を破壊 Stop razing city = 破壊をやめる Buy for [amount] gold = [amount]ゴールドで買う Buy = 買う - # Requires translation! You have [amount] gold = [amount]を所持 Currently you have [amount] gold. = 今の所持金は[amount]ゴールドです。 Would you like to purchase [constructionName] for [buildingGoldCost] gold? = [buildingGoldCost]ゴールドで[constructionName]を購入しますか？ @@ -670,7 +647,6 @@ Points per turn = ターンごとのポイント Convert production to gold at a rate of 4 to 1 = 生産力を4対1の割合でゴールドに変換する Convert production to science at a rate of [rate] to 1 = 生産力を[rate]対1の割合で科学力に変換する The city will not produce anything. = 都市は何も生産しません - # Requires translation! Worked by [cityName] = [cityName]で勤務 # Technology UI @@ -790,17 +766,11 @@ Remove your troops in our border immediately! = あなたは我々の土地に Sorry. = すまない Never! = そんなことはない！ - # Requires translation! Offer Declaration of Friendship ([30] turns) = 友好宣言を提出（[30]ターン） - # Requires translation! My friend, shall we declare our friendship to the world? = 友よ、世界に向けて友好宣言しないか？ - # Requires translation! Sign Declaration of Friendship ([30] turns) = 有効宣言の署名（[30]ターン） - # Requires translation! We are not interested. = 我々には興味がない - # Requires translation! We have signed a Declaration of Friendship with [otherCiv]! = [otherCiv]との友好宣言に署名しました! - # Requires translation! [otherCiv] has denied our Declaration of Friendship! = [otherCiv]が友好宣言を却下しました Basics = 基本 @@ -808,7 +778,6 @@ Resources = 資源 Terrains = 地形 Tile Improvements = タイル整備 Unique to [civName], replaces [unitName] = [civName]のユニークユニット。[unitName]を置き換え - # Requires translation! Unique to [civName] = [civName]のユニーク Tutorials = チュートリアル Cost = 費用 @@ -820,9 +789,7 @@ Placed on [terrainType] = [terrainType]に配置 Can be found on = 入手可能条件: Improved by [improvement] = [improvement]で改善 Bonus stats for improvement: = 資源活用施設のためのボーナス統計： - # Requires translation! Buildings that consume this resource: = この資源を消費する建物： - # Requires translation! Units that consume this resource: = この資源を消費するユニット： Can be built on = 建設可能タイル Defence bonus = 防衛ボーナス @@ -843,9 +810,7 @@ Improvements = 資源活用施設と文明 Clear current map = マップをクリア Save map = マップを保存 Download map = マップをダウンロード - # Requires translation! Loading... = ロード中... - # Requires translation! Filter: = フィルター： Exit map editor = マップエディタを終了 [nation] starting location = [nation]の出現場所 @@ -875,28 +840,19 @@ Strategic Resource = 戦略資源 Unhappiness = 不幸 Victory Types = 勝利条件の種類 Workers = 労働者 - # Requires translation! City Expansion = 都市の拡大 - # Requires translation! Combat = 戦闘 - # Requires translation! Experience = 経験値 - # Requires translation! Pillaging = 略奪 - # Requires translation! Research Agreements = 研究協定 # Other civilopedia things Nations = 文明 Promotions = 昇進 Available for [unitTypes] = [unitTypes]で利用可能 - # Requires translation! Free promotion: = 無償昇進： - # Requires translation! Free promotions: = 無償昇進： - # Requires translation! Free for [units] = 無償の[units] - # Requires translation! [bonus] with [tech] = [tech]で[bonus] # Policies @@ -938,9 +894,7 @@ WaterSubmarine = 潜水ユニット Mounted = 騎乗ユニット Armor = 機甲ユニット City = 都市 - # Requires translation! Missile = ミサイル - # Requires translation! WaterAircraftCarrier = 水上航空母艦 # Units @@ -973,13 +927,9 @@ Multiplayer options = マルチプレイ設定 Enable out-of-game turn notifications = アプリ外のターン通知を有効にする Time between turn checks out-of-game (in minutes) = アプリ外のターンチェックの間隔（分） Show persistent notification for turn notifier service = ターン通知機能の永続的な通知を表示する - # Requires translation! Take user ID from clipboard = クリップボードからユーザーIDを取得 - # Requires translation! Doing this will reset your current user ID to the clipboard contents - are you sure? = これを行うと、現在のユーザーIDがクリップボードの内容にリセットされます-よろしいですか？ - # Requires translation! ID successfully set! = IDが設定されました！ - # Requires translation! Invalid ID! = IDが無効です！ #################### Lines from Buildings.json #################### @@ -1027,20 +977,13 @@ Colossus = ロードス島の巨神像 Culture and Gold costs of acquiring new tiles reduced by 25% in this city = タイル獲得のための文化とゴールド-25% Krepost = クレポスト - # Requires translation! 'He spoke, the son of Kronos, and nodded his head with the dark brows, and the immortally anointed hair of the great god swept from his divine head, and all Olympos was shaken' - The Iliad = 「暗褐色の眉を持つクロノスの息子はそう言うとうなずき、油によって永遠に清められた偉大なる髪を神聖なる頭部よりなびかせ、オリンポス全土を震撼させた」 - イリアス - # Requires translation! +15% Combat Strength for all units when attacking Cities = 都市を攻撃中の全ユニットに戦闘力+15% - # Requires translation! Statue of Zeus = ゼウス像 - # Requires translation! 'The whole earth is the tomb of heroic men and their story is not given only on stone over their clay but abides everywhere without visible symbol woven into the stuff of other men's lives.' - Pericles = 「偉大な者たちにとっては、大地そのものが墓となる。彼らの偉業は単にその墓石に刻まれるだけに留まらず、人々の暮らしのそこここに、眼には見えぬ形で存在しているからである」 - ペリクレス - # Requires translation! Provides a sum of gold each time you spend a Great Person = 偉人を消費する度にゴールドを獲得 - # Requires translation! +2 Gold for each source of Marble and Stone = 大理石または石材1つにつきゴールド+2 - # Requires translation! Mausoleum of Halicarnassus = マウソロス霊廟 +1 food from Ocean and Coast tiles = 海岸、海のタイルに食料+1 @@ -1228,7 +1171,6 @@ Big Ben = ビッグベン Broadcast Tower = 放送塔 'We live only to discover beauty, all else is a form of waiting' - Kahlil Gibran = 「我々は美を発見するためだけに生きている。その他すべてはそれを待つ形態のひとつにすぎない。」 - ハリール・ジブラーン - # Requires translation! Provides 1 happiness per 2 additional social policies adopted = 追加で採用された社会政策2件につき幸福度＋1 Eiffel Tower = エッフェル塔 @@ -1354,25 +1296,15 @@ Ramad = ラマディ Ana = アナ Haradum = ハラドゥム Agrab = アグラブ - # Requires translation! Uqair = ウカイル - # Requires translation! Gubba = グッバ - # Requires translation! Hafriyat = ハフリヤット - # Requires translation! Nagar = ナガル - # Requires translation! Shubat Enlil = シュバットエンリル - # Requires translation! Urhai = ウルハイ - # Requires translation! Urkesh = アーケシュ - # Requires translation! Awan = アワン - # Requires translation! Riblah = リブラ - # Requires translation! Tayma = タイマ Greece = ギリシャ @@ -1420,29 +1352,17 @@ Chalkis = カルキス Pylos = ピュロス Pella = ペッラ Naxos = ナクソス - # Requires translation! Larissa = ラリッサ - # Requires translation! Apollonia = アポロニア - # Requires translation! Messene = メッセン - # Requires translation! Orchomenos = オルコメノス - # Requires translation! Ambracia = アカルナニア - # Requires translation! Kos = コス - # Requires translation! Knidos = クニドス - # Requires translation! Amphipolis = アンフィポリス - # Requires translation! Patras = パトラス - # Requires translation! Lamia = ラミア - # Requires translation! Nafplion = ナフプリオン - # Requires translation! Apolyton = アポリトン China = 中国 @@ -1491,27 +1411,16 @@ Maoming = 茂名 Shaoguan = 韶関 Yangjiang = 陽江 Heyuan = 河源 - # Requires translation! Huangshi = 黄石 - # Requires translation! Yichang = 宜昌 - # Requires translation! Yingtian = 英田 - # Requires translation! Xinyu = 新余 - # Requires translation! Xinzheng = 新正 - # Requires translation! Handan = 新鄭 - # Requires translation! Dunhuang = 敦煌 - # Requires translation! Gaoyu = 高郵 - # Requires translation! Nantong = 南通 - # Requires translation! Weifang = 濰坊 - # Requires translation! Xikang = 西康 Egypt = エジプト @@ -1531,7 +1440,6 @@ Good day. = # Requires translation! Oh, it's you. = Thebes = テーベ - # Requires translation! Memphis = メンフィス Heliopolis = ヘリオポリス Elephantine = エレファンティネ @@ -1561,41 +1469,23 @@ Akhmin = アフミーム Karnak = カルナック Luxor = ルクソール El Kab = エル・カブ - # Requires translation! Armant = ヘルモンティス - # Requires translation! Balat = バラット - # Requires translation! Ellahun = エラフン - # Requires translation! Hawara = ハワーラ - # Requires translation! Dashur = ダシュル - # Requires translation! Damanhur = ダマンハー - # Requires translation! Abusir = アブシール - # Requires translation! Herakleopolis = ヘラクレオポリス - # Requires translation! Akoris = アコリス - # Requires translation! Benihasan = ベニハサン - # Requires translation! Badari = バダリ - # Requires translation! Hermopolis = エルモポリス - # Requires translation! Amrah = アムラ - # Requires translation! Koptos = コプトス - # Requires translation! Ombos = オンボス - # Requires translation! Naqada = ナカダ - # Requires translation! Semna = セムナ - # Requires translation! Soleb = ソレブ England = イギリス @@ -1630,7 +1520,6 @@ Norwich = ノリッジ Leeds = リーズ Reading = リーディング Birmingham = バーミンガム - # Requires translation! Richmond = リッチモンド Exeter = エクセター Cambridge = ケンブリッジ @@ -1645,21 +1534,13 @@ Berwick = ベリック Bath = バース Mumbles = マンブルズ Southampton = サウサンプトン - # Requires translation! Sheffield = シェフィールド - # Requires translation! Salisbury = ソールズベリー - # Requires translation! Colchester = コルチェスター - # Requires translation! Plymouth = プリマス - # Requires translation! Lancaster = ランカスター - # Requires translation! Blackpool = ブラックプール - # Requires translation! Winchester = ウィンチェスター - # Requires translation! Hull = ハル France = フランス @@ -1708,21 +1589,13 @@ Limoges = リモージュ Nancy = ナンシー Lille = リール Caen = カン - # Requires translation! Toulon = ツーロン - # Requires translation! Le Havre = ル・アーブル - # Requires translation! Lourdes = ルルド - # Requires translation! Cannes = カンヌ - # Requires translation! Aix-En-Provence = エクス＝アン＝プロヴァンス - # Requires translation! La Rochelle = ラ・ロシェル - # Requires translation! Bourges = ブールジュ - # Requires translation! Calais = カレー Russia = ロシア @@ -1741,84 +1614,45 @@ How would you like it if I propose this kind of exchange? = Hello! = # Requires translation! What do you need?! = - # Requires translation! Moscow = モスクワ - # Requires translation! St. Petersburg = サンクトペテルブルク - # Requires translation! Novgorod = ノヴゴロド - # Requires translation! Rostov = ロストフ・ナ・ドヌー - # Requires translation! Yaroslavl = ヤロスラブリ - # Requires translation! Yekaterinburg = エカテリンブルグ - # Requires translation! Yakutsk = ヤクーツク - # Requires translation! Vladivostok = ウラジオストク - # Requires translation! Smolensk = スモレンスク - # Requires translation! Orenburg = オレンブルク - # Requires translation! Krasnoyarsk = クラスノヤルスク - # Requires translation! Khabarovsk = ハバロフスク - # Requires translation! Bryansk = ブリャンスク - # Requires translation! Tver = トヴェリ - # Requires translation! Novosibirsk = ノヴォシビルスク - # Requires translation! Magadan = マガダン - # Requires translation! Murmansk = ムルマンスク - # Requires translation! Irkutsk = イルクーツク - # Requires translation! Chita = チタ - # Requires translation! Samara = サマーラ - # Requires translation! Arkhangelsk = アルハンゲリスク - # Requires translation! Chelyabinsk = チェリャビンスク - # Requires translation! Tobolsk = トボリスク - # Requires translation! Vologda = ボログダ - # Requires translation! Omsk = オムスク - # Requires translation! Astrakhan = アストラハン - # Requires translation! Kursk = クルスク - # Requires translation! Saratov = サラトフ - # Requires translation! Tula = トゥーラ - # Requires translation! Vladimir = ウラジーミル - # Requires translation! Perm = ペルミ - # Requires translation! Voronezh = ヴォロネジ - # Requires translation! Pskov = プスコフ - # Requires translation! Starayarussa = スタラヤ・ルーサ - # Requires translation! Kostoma = コストロマ - # Requires translation! Nizhniy Novgorod = ニジニ・ノヴゴロド - # Requires translation! Suzdal = スーズダリ - # Requires translation! Magnitogorsk = マグニトゴルスク - # Requires translation! Rome = ローマ Augustus Caesar = アウグストゥス # Requires translation! @@ -1835,81 +1669,43 @@ I offer this, for your consideration. = Hail. = # Requires translation! What do you want? = - # Requires translation! Antium = アンツィオ - # Requires translation! Cumae = クーマエ - # Requires translation! Neapolis = ナポリ - # Requires translation! Ravenna = ラベンナ - # Requires translation! Arretium = アレッツォ - # Requires translation! Mediolanum = ミラノ - # Requires translation! Arpinum = アルピーノ - # Requires translation! Circei = チルチェイ - # Requires translation! Setia = セッツェ - # Requires translation! Satricum = サトリカム - # Requires translation! Ardea = アルデール - # Requires translation! Ostia = オスティア - # Requires translation! Velitrae = ベッレトリ - # Requires translation! Viroconium = ビロコニウム - # Requires translation! Tarentum = ターラント - # Requires translation! Brundisium = ブリンディジ - # Requires translation! Caesaraugusta = カエサルグスタ - # Requires translation! Caesarea = カイザリア - # Requires translation! Palmyra = パルミラ - # Requires translation! Signia = セーニ - # Requires translation! Aquileia = アクイレイア - # Requires translation! Clusium = クルシウム - # Requires translation! Sutrium = ストリー - # Requires translation! Cremona = クレモナ - # Requires translation! Placentia = ピアチェンツァ - # Requires translation! Hispalis = ヒスパリス - # Requires translation! Artaxata = アルタシャト - # Requires translation! Aurelianorum = アウレリアノラム - # Requires translation! Nicopolis = ニコポリス - # Requires translation! Agrippina = アグリッピナ - # Requires translation! Verona = ベローナ - # Requires translation! Corfinium = コルフィニウム - # Requires translation! Treverii = トレヴェリー - # Requires translation! Sirmium = シルミウム - # Requires translation! Augustadorum = オーガスタドール - # Requires translation! Curia = クリア - # Requires translation! Interrama = インターラマ - # Requires translation! Adria = アドリア Arabia = アラビア @@ -1926,71 +1722,38 @@ Welcome foreigner, I am Harun Al-Rashid, Caliph of the Arabs. Come and tell me a Come forth, let's do business. = # Requires translation! Peace be upon you. = - # Requires translation! Mecca = メッカ - # Requires translation! Medina = メディナ - # Requires translation! Damascus = ダマスカス - # Requires translation! Baghdad = バグダッド - # Requires translation! Najran = ナジュラーン - # Requires translation! Kufah = クーファ - # Requires translation! Basra = バスラ - # Requires translation! Khurasan = ホラーサーン - # Requires translation! Anjar = アンジャル - # Requires translation! Fustat = フスタート - # Requires translation! Aden = アデン - # Requires translation! Yamama = ヤマーマ - # Requires translation! Muscat = マスカット - # Requires translation! Mansura = マンスーラ - # Requires translation! Bukhara = ブハラ - # Requires translation! Fez = フェス - # Requires translation! Shiraz = シーラーズ - # Requires translation! Merw = マリ - # Requires translation! Balkh = バルフ - # Requires translation! Mosul = モースル - # Requires translation! Aydab = アイダブ - # Requires translation! Bayt = バイト - # Requires translation! Suhar = ソハール - # Requires translation! Taif = タイフ - # Requires translation! Hama = ハマー - # Requires translation! Tabuk = タブーク - # Requires translation! Sana'a = サナア - # Requires translation! Shihr = シフル - # Requires translation! Tripoli = トリポリ - # Requires translation! Tunis = チュニス - # Requires translation! Kairouan = カイルアン - # Requires translation! Algiers = アルジェ - # Requires translation! Oran = オラン America = アメリカ @@ -2007,107 +1770,56 @@ The people of the United States of America welcome you. = Is the following trade of interest to you? = # Requires translation! Well? = - # Requires translation! Washington = ワシントン - # Requires translation! New York = ニューヨーク - # Requires translation! Boston = ボストン - # Requires translation! Philadelphia = フィラデルフィア - # Requires translation! Atlanta = アトランタ - # Requires translation! Chicago = シカゴ - # Requires translation! Seattle = シアトル - # Requires translation! San Francisco = サンフランシスコ - # Requires translation! Los Angeles = ロサンゼルス - # Requires translation! Houston = ヒューストン - # Requires translation! Portland = ポートランド - # Requires translation! St. Louis = セントルイス - # Requires translation! Miami = マイアミ - # Requires translation! Buffalo = バッファロー - # Requires translation! Detroit = デトロイト - # Requires translation! New Orleans = ニューオーリンズ - # Requires translation! Baltimore = ボルチモア - # Requires translation! Denver = デンバー - # Requires translation! Cincinnati = シンシナティ - # Requires translation! Dallas = ダラス - # Requires translation! Cleveland = クリーブランド - # Requires translation! Kansas City = カンザスシティ - # Requires translation! San Diego = サンディエゴ - # Requires translation! Las Vegas = ラスベガス - # Requires translation! Phoenix = フェニックス - # Requires translation! Albuquerque = アルバカーキ - # Requires translation! Minneapolis = ミネアポリス - # Requires translation! Pittsburgh = ピッツバーグ - # Requires translation! Oakland = オークランド - # Requires translation! Tampa Bay = タンパ湾 - # Requires translation! Orlando = オーランド - # Requires translation! Tacoma = タコマ - # Requires translation! Santa Fe = サンタフェ - # Requires translation! Olympia = オリンピア - # Requires translation! Hunt Valley = ハント・バレー - # Requires translation! Springfield = スプリングフィールド - # Requires translation! Palo Alto = パロアルト - # Requires translation! Centralia = セントラリア - # Requires translation! Spokane = スポーカン - # Requires translation! Jacksonville = ジャクソンビル - # Requires translation! Svannah = サバンナ - # Requires translation! Charleston = チャールストン - # Requires translation! San Antonio = サン・アントニオ - # Requires translation! Anchorage = アンカレジ - # Requires translation! Sacramento = サクラメント - # Requires translation! Reno = リノ - # Requires translation! Salt Lake City = ソルト・レーク・シティ - # Requires translation! Boise = ボイシ - # Requires translation! Milwaukee = ミルウォーキー - # Requires translation! Santa Cruz = サンタクルーズ - # Requires translation! Little Rock = リトルロック Japan = 日本 @@ -2124,85 +1836,46 @@ We hope for a fair and just relationship with you, who are renowned for military I would be grateful if you agreed on the following proposal. = # Requires translation! Oh, it's you... = - # Requires translation! Kyoto = 京都 - # Requires translation! Osaka = 大阪 - # Requires translation! Tokyo = 東京 - # Requires translation! Satsuma = 薩摩 # Requires translation! -Kagoshima =鹿児島 - # Requires translation! +Kagoshima = Nara = 奈良 - # Requires translation! Nagoya = 名古屋 - # Requires translation! Izumo = 出雲 - # Requires translation! Nagasaki = 長崎 - # Requires translation! Yokohama = 横浜 - # Requires translation! Shimonoseki = 下関 - # Requires translation! Matsuyama = 松山 - # Requires translation! Sapporo = 札幌 - # Requires translation! Hakodate = 函館 - # Requires translation! Ise = 伊勢 - # Requires translation! Toyama = 富山 - # Requires translation! Fukushima = 福島 - # Requires translation! Suo = 周防 - # Requires translation! Bizen = 備前 - # Requires translation! Echizen = 越前 - # Requires translation! Izumi = 和泉 - # Requires translation! Omi = 近江 - # Requires translation! Echigo = 越後 - # Requires translation! Kozuke = 上野 - # Requires translation! Sado = 佐渡 - # Requires translation! Kobe = 神戸 - # Requires translation! Nagano = 長野 - # Requires translation! Hiroshima = 広島 - # Requires translation! Takayama = 高山 - # Requires translation! Akita = 秋田 - # Requires translation! Fukuoka = 福岡 - # Requires translation! Aomori = 青森 - # Requires translation! Kamakura = 鎌倉 - # Requires translation! Kochi = 高知 - # Requires translation! Naha = 那覇 - # Requires translation! Sendai = 仙台 - # Requires translation! Gifu = 岐阜 - # Requires translation! Yamaguchi = 山口 - # Requires translation! Ota = 大田 - # Requires translation! Tottori = 鳥取 India = インド @@ -2219,67 +1892,36 @@ Hello, I am Mohandas Gandhi. My people call me Bapu, but please, call me friend. My friend, are you interested in this arrangement? = # Requires translation! I wish you peace. = - # Requires translation! Delhi = デリー - # Requires translation! Mumbai = ムンバイ - # Requires translation! Vijayanagara = ヴィジャヤナガル - # Requires translation! Pataliputra = パータリプトラ - # Requires translation! Varanasi = ワーラーナシー - # Requires translation! Agra = アーグラ - # Requires translation! Calcutta = コルカタ - # Requires translation! Lahore = ラホール - # Requires translation! Bangalore = ベンガルール - # Requires translation! Hyderabad = ハイデラバード - # Requires translation! Madurai = マドゥライ - # Requires translation! Ahmedabad = アフマダーバード - # Requires translation! Kolhapur = コールハープル - # Requires translation! Prayaga = プラヤガ - # Requires translation! Ayodhya = アヨーディヤー - # Requires translation! Indraprastha = インドラプラスタ - # Requires translation! Mathura = マトゥラー - # Requires translation! Ujjain = ウッジャイン - # Requires translation! Gulbarga = グルバルガ - # Requires translation! Jaunpur = ジャウンプル - # Requires translation! Rajagriha = 王舎城 - # Requires translation! Sravasti = 舎衛城 - # Requires translation! Tiruchirapalli = ティルチラーパッリ - # Requires translation! Thanjavur = タンジャーブル - # Requires translation! Bodhgaya = ブッダガヤ - # Requires translation! Kushinagar = クシナガラ - # Requires translation! Amaravati = アマラベイ - # Requires translation! Gaur = ガウル - # Requires translation! Gwalior = グワーリオール - # Requires translation! Jaipur = ジャイプル - # Requires translation! Karachi = カラチ Germany = ドイツ @@ -2298,115 +1940,60 @@ It would be in your best interest, to carefully consider this proposal. = What now? = # Requires translation! So, out with it! = - # Requires translation! Berlin = ベルリン - # Requires translation! Hamburg = ハンブルク - # Requires translation! Munich = ミュンヘン - # Requires translation! Cologne = ケルン - # Requires translation! Frankfurt = フランクフルト - # Requires translation! Essen = エッセン - # Requires translation! Dortmund = ドルトムント - # Requires translation! Stuttgart = シュトゥットガルト - # Requires translation! Dusseldorf = デュッセルドルフ - # Requires translation! Bremen = ブレーメン - # Requires translation! Hannover = ハノーファー - # Requires translation! Duisburg = デュイスブルク - # Requires translation! Leipzig = ライプツィヒ - # Requires translation! Dresden = ドレスデン - # Requires translation! Bonn = ボン - # Requires translation! Bochum = ボーフム - # Requires translation! Bielefeld = ビーレフェルト - # Requires translation! Karlsruhe = カールスルーエ - # Requires translation! Gelsenkirchen = ゲルゼンキルヘン - # Requires translation! Wiesbaden = ヴィースバーデン - # Requires translation! Munster = ミュンスター - # Requires translation! Rostok = ロストック - # Requires translation! Chemnitz = ケムニッツ - # Requires translation! Braunschweig = ブラウンシュワイク - # Requires translation! Halle = ハレ - # Requires translation! Mצnchengladbach = メンヒェングラートバッハ - # Requires translation! Kiel = キール - # Requires translation! Wuppertal = ヴッパータール - # Requires translation! Freiburg = フライブルク - # Requires translation! Hagen = ハーゲン - # Requires translation! Erfurt = エアフルト - # Requires translation! Kaiserslautern = カイザースラウテルン - # Requires translation! Kassel = カッセル - # Requires translation! Oberhausen = オーバーハウゼン - # Requires translation! Hamm = ハム - # Requires translation! Saarbrucken = ザールブリュッケン - # Requires translation! Krefeld = クレーフェルト - # Requires translation! Pirmasens = ピルマゼンス - # Requires translation! Potsdam = ポツダム - # Requires translation! Solingen = ゾーリンゲン - # Requires translation! Osnabruck = オスナブリュック - # Requires translation! Ludwingshafen = ルートウィヒスハーフェン - # Requires translation! Leverkusen = レーバークーゼン - # Requires translation! Oldenburg = オルデンブルク - # Requires translation! Neuss = ノイス - # Requires translation! Mulheim = ミュールハイム - # Requires translation! Darmstadt = ダルムシュタット - # Requires translation! Herne = ヘルネ - # Requires translation! Wurzburg = ヴュルツブルク - # Requires translation! Recklinghausen = レックリングハウゼン - # Requires translation! Gצttingen = ゲッティンゲン - # Requires translation! Wolfsburg = ウォルフスブルク - # Requires translation! Koblenz = コブレンツ - # Requires translation! Hildesheim = ヒルデスハイム - # Requires translation! Erlangen = エルランゲン The Ottomans = オスマントルコ @@ -2421,75 +2008,41 @@ Ruin! Ruin! Istanbul becomes Iram of the Pillars, remembered only by the melanch From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm Suleiman, Kayser-I Rum, and I bestow upon you my welcome! = # Requires translation! Let us do business! Would you be interested? = - # Requires translation! Istanbul = イスタンブール - # Requires translation! Edirne = エディルネ - # Requires translation! Ankara = アンカラ - # Requires translation! Bursa = ブルサ - # Requires translation! Konya = コンヤ - # Requires translation! Samsun = サムスン - # Requires translation! Gaziantep = ガズィアンテプ # Requires translation! -Diyabakir =ディヤルバクル - # Requires translation! +Diyabakir = Izmir = イズミル - # Requires translation! Kayseri = カイセリ - # Requires translation! Malatya = マラティヤ - # Requires translation! Marsin = メルスィン - # Requires translation! Antalya = アンタルヤ - # Requires translation! Zonguldak = ゾングルダク - # Requires translation! Denizli = デニズリ - # Requires translation! Ordu = オルドゥ - # Requires translation! Mugia = ムヒア - # Requires translation! Eskishehir = エスキシェヒル - # Requires translation! Inebolu = イネボル - # Requires translation! Sinop = シノプ - # Requires translation! Adana = アダナ - # Requires translation! Artuin = アルトウィン - # Requires translation! Bodrum = ボドルム - # Requires translation! Eregli = カラデニズ・エレーリ - # Requires translation! Silifke = シリフケ - # Requires translation! Sivas = シワス - # Requires translation! Amasya = アマスヤ - # Requires translation! Marmaris = マルマリス - # Requires translation! Trabzon = トラブゾン - # Requires translation! Erzurum = エルズルム - # Requires translation! Urfa = シャンルウルファ - # Requires translation! Izmit = イズミト - # Requires translation! Afyonkarhisar = アフヨン - # Requires translation! Bitlis = ビトリス - # Requires translation! Yalova = ヤロヴァ Korea = 朝鮮 @@ -2506,63 +2059,34 @@ Welcome to the palace of Choson, stranger. I am the learned King Sejong, who loo We have many things to discuss and have much to benefit from each other. = # Requires translation! Oh, it's you = - # Requires translation! Seoul = ソウル - # Requires translation! Busan = 釜山 - # Requires translation! Jeonju = 全州 - # Requires translation! Daegu = 大邱 - # Requires translation! Pyongyang = 平壌 - # Requires translation! Kaesong = 開城 - # Requires translation! Suwon = 水原 - # Requires translation! Gwangju = 光州 - # Requires translation! Gangneung = 江陵 - # Requires translation! Hamhung = 咸興 - # Requires translation! Wonju = 原州 - # Requires translation! Ulsan = 蔚山 - # Requires translation! Changwon = 昌原 - # Requires translation! Andong = 安東 - # Requires translation! Gongju = 公州 - # Requires translation! Haeju = 海州 - # Requires translation! Cheongju = 清州 - # Requires translation! Mokpo = 木浦 - # Requires translation! Dongducheon = 東豆川 - # Requires translation! Geoje = 巨済 - # Requires translation! Suncheon = 順天 - # Requires translation! Jinju = 晋州 - # Requires translation! Sangju = 尚州 - # Requires translation! Rason = 羅先 - # Requires translation! Gyeongju = 慶州 - # Requires translation! Chungju = 忠州 - # Requires translation! Sacheon = 泗川 - # Requires translation! Gimje = 金堤 - # Requires translation! Anju = 安州 Iroquois = イロコイ @@ -2577,65 +2101,37 @@ You have defeated us... but our spirits will never be vanquished! We shall retur Greetings, stranger. I am Hiawatha, speaker for the Iroquois. We seek peace with all, but we do not shrink from war. = # Requires translation! Does this trade work for you, my friend? = - # Requires translation! Onoondaga = オノンダガ - # Requires translation! Osininka = オシンインカ - # Requires translation! Grand River = グランドリバー - # Requires translation! Akwesasme = アクウェサスネ - # Requires translation! Buffalo Creek = バッファロー・クリーク - # Requires translation! Brantford = ブラントフォード - # Requires translation! Montreal = モントリオール - # Requires translation! Genesse River = ジェネシーリバー - # Requires translation! Canandaigua Lake = カナンデーグア湖 - # Requires translation! Lake Simcoe = シムコー湖 - # Requires translation! Salamanca = サラマンカ - # Requires translation! Gowanda = ゴウォンダ - # Requires translation! Cuba = キューバ - # Requires translation! Akron = アクロン - # Requires translation! Kanesatake = カナサタケ - # Requires translation! Ganienkeh = ガニエンケ - # Requires translation! Cayuga Castle = カユガ・キャッスル - # Requires translation! Chondote = チョンドテ - # Requires translation! Canajoharie = カナジョハリー - # Requires translation! Nedrow = ネドロウ - # Requires translation! Oneida Lake = オナイダ湖 - # Requires translation! Kanonwalohale = カノンワロハレ - # Requires translation! Green Bay = グリーンベイ - # Requires translation! Southwold = サウスウォールド # Requires translation! +Mohawk Valley = Schoharie = スカハリー - # Requires translation! Bay of Quinte = クゥインテ湾 - # Requires translation! Kanawale = カナワレ - # Requires translation! Kanatsiokareke = カナツィオカレク - # Requires translation! Tyendinaga = ティエンディナガ - # Requires translation! Hahta = ハータ Persia = ペルシア @@ -2654,132 +2150,69 @@ In my endless magnanimity, I am making you this offer. You agree, of course? = Good day to you! = # Requires translation! Ahh... you... = - # Requires translation! Persepolis = ペルセポリス - # Requires translation! Parsagadae = パサルガダエ - # Requires translation! Susa = スーサ - # Requires translation! Ecbatana = エクバタナ - # Requires translation! Tarsus = タルサス - # Requires translation! Gordium = ゴルディウム - # Requires translation! Bactra = バクトラ - # Requires translation! Sardis = サルディス - # Requires translation! Ergili = エルギル - # Requires translation! Dariushkabir = ダリウス・カビル - # Requires translation! Ghulaman = グラマン - # Requires translation! Zohak = ゾハク - # Requires translation! Istakhr = イスタブル - # Requires translation! Jinjan = ジンジャン - # Requires translation! Borazjan = ボラズジャン - # Requires translation! Herat = ヘラート - # Requires translation! Dakyanus = ダキヤヌス - # Requires translation! Bampur = バンプール - # Requires translation! Turengtepe = トゥラン・テペ - # Requires translation! Rey = レイ - # Requires translation! Thuspa = トゥシュパ - # Requires translation! Hasanlu = ハサンル - # Requires translation! Gabae = ガバエ - # Requires translation! Merv = メリブ - # Requires translation! Behistun = ベヒストゥーン - # Requires translation! Kandahar = カンダハル - # Requires translation! Altintepe = アントゥン・テペ - # Requires translation! Bunyan = バニヤン - # Requires translation! Charsadda = チャールサダ - # Requires translation! Uratyube = ウラ・テューベ - # Requires translation! Dura Europos = ドゥラ・エウロポス - # Requires translation! Aleppo = アレッポ - # Requires translation! Qatna = カンタ Kabul = カブール - # Requires translation! Capisa = カピサ - # Requires translation! Kyreskhata = キュレスカタ - # Requires translation! Marakanda = マラカンダ - # Requires translation! Peshawar = ペシャワール - # Requires translation! Van = ヴァン - # Requires translation! Pteira = ペテイラ - # Requires translation! Arshada = アルシャダ - # Requires translation! Artakaona = アルタコアナ - # Requires translation! Aspabota = アスパボタ - # Requires translation! Autiyara = アンティヤラ - # Requires translation! Bagastana = バガスタナ - # Requires translation! Baxtri = バシトリ - # Requires translation! Darmasa = ダルマサ - # Requires translation! Daphnai = ダピナイ - # Requires translation! Drapsaka = ドラプサカ - # Requires translation! Eion = エイオン - # Requires translation! Gandutava = ガンドゥタヴァ - # Requires translation! Gaugamela = ガウガメラ - # Requires translation! Harmozeia = ハルモジア - # Requires translation! Ekatompylos = ヘカトンピュロス - # Requires translation! Izata = イザタ - # Requires translation! Kampada = カンパダ - # Requires translation! Kapisa = カピサ - # Requires translation! Karmana = カルマナ - # Requires translation! Kounaxa = クナクサ - # Requires translation! Kuganaka = クガナカ - # Requires translation! Nautaka = ナウタカ - # Requires translation! Paishiyauvada = パイシヤウヴァダ - # Requires translation! Patigrbana = パティグルバナ - # Requires translation! Phrada = フラダ Polynesia = ポリネシア @@ -3197,9 +2630,7 @@ Nalayh = # Requires translation! Tes = - # Requires translation! Inca = インカ - # Requires translation! Pachacuti = パチャクティ # Requires translation! Resistance is futile! You cannot hope to stand against the mighty Incan empire. If you will not surrender immediately, then prepare for war! = @@ -3286,9 +2717,7 @@ Chucuito = # Requires translation! Choquequirao = - # Requires translation! Denmark = デンマーク - # Requires translation! Harald Bluetooth = ハーラル # Requires translation! If I am to be honest, I tire of those pointless charades. Why don't we settle our disputes on the field of battle, like true men? Perhaps the skalds will sing of your valor... or mine! = @@ -3730,6 +3159,8 @@ Philosophy = 哲学 Currency = 通貨 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 「悩みをもたらす富よりもパンと明るい気持ちのほうがいい」- アメンエムオペト Engineering = 工学 + # Requires translation! +Roads connect tiles across rivers = 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 「機械科学とは最も崇高なものであり、他のいかなるものよりも有益である」- レオナルド・ダ・ヴィンチ Iron Working = 鉄器 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 「鉄は熱くなるまで打つのを待つのではなく、打って熱くせよ」- ウィリアム・バトラー・イェイツ @@ -3956,9 +3387,7 @@ Quarry = 採石場 Fishing Boats = 漁船 - # Requires translation! Gives a defensive bonus of 50% = 要塞内に駐留中のユニットに50%の防御ボーナス - # Requires translation! Fort = 要塞 Road = 道路 @@ -3977,7 +3406,6 @@ Remove Road = 道路削除 Remove Railroad = 鉄道削除 - # Requires translation! Cancel improvement order = 建設をキャンセル Academy = アカデミー @@ -3988,22 +3416,16 @@ Manufactory = 製造所 Customs house = 税関 - # Requires translation! Gives a defensive bonus of 100% = 城塞内に駐留しているユニットに防衛力100% - # Requires translation! Deal 30 damage to adjacent enemy units = 隣接する敵ユニットに30ダメージ - # Requires translation! Citadel = 城塞 +1 additional Culture for each adjacent Moai = 隣接するモアイの数だけ+1 Can only be built on Coastal tiles = 沿岸タイルでのみ構築可能 Moai = モアイ - # Requires translation! +1 food for each adjacent Mountain = 山岳近接ボーナス＋1 - # Requires translation! Cannot be built on bonus resource = ボーナス資源の上では建設できない - # Requires translation! Terrace farm = 棚田 Ancient ruins = 古代遺跡 @@ -4234,9 +3656,7 @@ Haka War Dance = 出陣の踊り「ハカ」 Rejuvenation = 若返り All healing effects doubled = すべての治癒効果が倍増 - # Requires translation! Slinger Withdraw = 白兵攻撃不可 - # Requires translation! May withdraw before melee (133%) = 白兵の攻撃前に撤退(133%) @@ -4261,7 +3681,6 @@ Archer = 弓兵 Bowman = バビロニア弓兵 - # Requires translation! Slinger = 投石兵 Work Boats = 作業船 @@ -4322,15 +3741,12 @@ Longswordsman = 長剣士 Samurai = 侍 Combat very likely to create Great Generals = 大将軍の獲得率が高い - # Requires translation! Berserker = バーサーカー - # Requires translation! Amphibious = 上陸作戦 Pikeman = 長槍兵 Landsknecht = ランツクネヒト - # Requires translation! Can move immediately once bought = 購入直後から移動が可能 Galleass = ガレアス船 @@ -4393,11 +3809,8 @@ Triplane = 三翼飛行機 Great War Bomber = 第1次大戦爆撃機 - # Requires translation! Norwegian Ski Infantry = ノルウェーのスキー歩兵 - # Requires translation! Double movement in Snow, Tundra and Hills = 氷土、ツンドラ、丘陵での移動力が2倍 - # Requires translation! +25% bonus in Snow, Tundra and Hills = 氷土、ツンドラ、丘陵で戦闘ボーナス+25% Cavalry = 騎兵隊 diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 876a45d52f..00e5fa66a8 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -169,7 +169,6 @@ Strategic resources = 전략 자원 [resourceName] not required = [resourceName] 자원이 불필요함 Lost ability = 없어진 특성 National ability = 문명 특성 - # It doesn't need to be translated, but for 100% translation. [firstValue] vs [secondValue] = [firstValue] vs [secondValue] # Nations @@ -2668,6 +2667,8 @@ Philosophy = 철학 Currency = 화폐 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = '마음이 행복할 때의 빵 한 조각이 불행할 때의 부보다 낫다.' - 아메네모페 Engineering = 공학 + # Requires translation! +Roads connect tiles across rivers = 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = '계기학과 기계학이야말로, 그 무엇보다 고상하고 유용한 과학이다.' - 레오나르도 다 빈치 Iron Working = 철제 기술 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = '철이 달았을 때까지 기다렸다 치지 마라. 쳐서 달구라.' - 윌리엄 버틀러 예이츠 @@ -3481,4 +3482,3 @@ Certain bonuses are given when you are at above 30 influence.\nWhen you have abo Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = 후지 산, 지브롤터 암벽, 대보초 등의 '자연 경관'은 어느 지형들과도 다른 독특한 특성을 지닙니다.\n자연 경관은 맵에 하나씩밖에 없고, 유닛이 지나갈 수 없으며\n 도시에서 자연 경관에 생산을 할당하면 많은 양의 문화, 과학, 금, 생산력 등을 얻을 수 있습니다.\n따라서 자연 경관을 최대한 빨리 확보하는 것이 중요하다고 할 수 있습니다. - diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 6dabadd934..f3f29a9c99 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -4888,6 +4888,8 @@ Currency = Mata Wang 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = Engineering = Kejuruteraan # Requires translation! +Roads connect tiles across rivers = + # Requires translation! 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = Iron Working = Pekerja Besi # Requires translation! diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 7ff2b67c68..cf643ad2ac 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -2719,6 +2719,8 @@ Philosophy = Filozofia Currency = Waluta 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Rozradowanemu sercu lepszy chleb, niż bogactwo w utrapieniu.' – Amenemope Engineering = Inżynieria + # Requires translation! +Roads connect tiles across rivers = 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'Nauka instrumentalna, zwana też mechaniczną, to najszlachetniejsza z dziedzin, a przede wszystkim najbardziej użyteczna.' – Leonardo da Vinci Iron Working = Obróbka żelaza 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Nie czekaj z kuciem, aż żelazo będzie gorące; uderzaj, by je rozgrzać.' – William Butler Yeats diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 1ecea2ae00..b351194ffe 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -3899,6 +3899,8 @@ Philosophy = Filosofia Currency = Moeda 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Melhor é pão com coração feliz do que riqueza com tormento.' - Amenemope Engineering = Engenharia + # Requires translation! +Roads connect tiles across rivers = 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'Ciência mecânica ou instrumental é a mais nobre e, acima de todas, a mais útil.' - Leonardo da Vinci Iron Working = Trabalho com ferro 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Não espere o aço ficar quente para bater, mas faça-o quente batendo.' - William Butler Yeats diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index cf513450a5..85e509e9d4 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -3968,6 +3968,8 @@ Currency = Monedă 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Mai bine să ai pâine cu inimă fericită decât bogăție cu vexare' - Amenemope Engineering = Inginerie # Requires translation! +Roads connect tiles across rivers = + # Requires translation! 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = Iron Working = Prelucrarea fierului # Requires translation! diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 055555eea8..5672a372dd 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -254,7 +254,6 @@ Could not load game from clipboard! = Не удалось загрузить и Start game! = Начать игру! Map Options = Настройка карты Game Options = Настройка игры - # Requires translation! Civilizations = Цивилизации Map Type = Тип карты Generated = Сгенерированная @@ -616,7 +615,6 @@ Points per turn = Очков за ход Convert production to gold at a rate of 4 to 1 = Обмен производства на золото 4 к 1 Convert production to science at a rate of [rate] to 1 = Обмен производства на науку [rate] к 1 The city will not produce anything. = Город ничего не будет производить. - # Requires translation! Worked by [cityName] = Обрабатывается в г. [cityName] # Technology UI @@ -1113,7 +1111,7 @@ Taj Mahal = Тадж-Махал 'Things always seem fairer when we look back at them, and it is out of that inaccessible tower of the past that Longing leans and beckons.' - James Russell Lowell = 'Многое начинает казаться лучше, когда остается в прошлом - и из этой неприступной башни Прошлого нас зовет и манит рукою Тоска.' - Джеймс Расселл Лоуэлл Free great scientist appears = Появляется бесплатный Великий Ученый -Science gained from research agreements +50% = Договор об исследовании приносит на 50% больше науки +Science gained from research agreements +50% = +50% к науке от договора об исследовании Porcelain Tower = Фарфоровая башня Must not be on hill = Город должен быть на холме @@ -1175,7 +1173,7 @@ Solar Plant = Солнечные электростанции Sydney Opera House = Сиднейский Оперный театр 'In preparing for battle I have always found that plans are useless, but planning is indispensable.' - Dwight D. Eisenhower = 'При подготовке к битве планы незаменимы, но, как только битва началась, план становится совершенно бесполезным.' - Дуайт Эйзенхауэр -Gold cost of upgrading military units reduced by 33% = Стоимость улучшения юнита снижается на 33% +Gold cost of upgrading military units reduced by 33% = -33% к стоимости улучшения юнита Pentagon = Пентагон Increases production of spaceship parts by 50% = Ускоряет производство частей космического корабля на 50% @@ -2667,6 +2665,8 @@ Philosophy = Философия Currency = Деньги 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Лучше хлеб, который съедается с радостным сердцем, чем богатство с заботами.' - Аменемоп Engineering = Инженерное дело + # Requires translation! +Roads connect tiles across rivers = 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'Механика — самая благородная и, главное, самая полезная из наук.' - Леонардо да Винчи Iron Working = Обработка железа 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Не жди, пока железо станет горячим для ковки - но куй, и оно станет горячим.' - Уильям Батлер Йейтс diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index b8a3b79d0e..650af83a21 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -2965,6 +2965,8 @@ Philosophy = 哲学 Currency = 货币制度 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = “快乐的温饱胜过烦恼的富裕。”——阿蒙尼莫普（古埃及学者） Engineering = 工程学 + # Requires translation! +Roads connect tiles across rivers = 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = “研究工具或机械的学问是最崇高的，也是所有学问当中最有用的。”——列奥纳多·达·芬奇 Iron Working = 铁器 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = “不要等铁变热才对其锻打；而要通过锻打而使其变热。”——威廉·巴特勒·叶芝 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 466dce361b..11dbf6c9c5 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -3258,6 +3258,8 @@ Philosophy = Filosofía Currency = Moneda 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Mejor es el pan con un corazón feliz que riquesas con vejación" - Amenemope Engineering = Ingeniería + # Requires translation! +Roads connect tiles across rivers = 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'La ciencia mecánica o instrumental es la mas noble, y por sobre todas las demas, la mas útil.' - Leonardo da Vinci Iron Working = Trabajo del hierro 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'No esperes a golpear el hierro cuando este caliente, si no que hazlo caliente por golpearlo.' - William Butler Yeats diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index cf8750fe51..c182e6dc6d 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -3694,6 +3694,8 @@ Philosophy = 哲學 Currency = 貨幣制度 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = “快樂的溫飽勝過煩惱的富裕。”——阿蒙尼莫普（古埃及學者） Engineering = 工程學 + # Requires translation! +Roads connect tiles across rivers = 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = “研究工具或機械的學問是最崇高的，也是所有學問當中最有用的。”——列奧納多·達·芬奇 Iron Working = 鐵器 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = “不要等鐵變熱才對其鍛打；而要通過鍛打而使其變熱。”——威廉·巴特勒·葉芝 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 8518f28f37..eb38572b00 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -3266,6 +3266,8 @@ Philosophy = Felsefe Currency = Para Birimi 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = 'Mutlu kalpli ekmek, sıkıntılı servetten daha iyidir.' - Amenemope Engineering = Mühendislik + # Requires translation! +Roads connect tiles across rivers = 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = 'Enstrümantal veya mekanik bilim en asil ve hepsinden önemlisi en faydalı olanıdır.' - Leonardo da Vinci Iron Working = Demir İşleme 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Demir sıcak olana kadar vurmayı beklemeyin, ancak vurarak ısınmasını sağlayın.' - William Butler Yeats diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 3805f41cdb..159084fb21 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -2667,6 +2667,8 @@ Philosophy = Філософія Currency = Гроші 'Better is bread with a happy heart than wealth with vexation.' - Amenemope = «Краще шмат хліба зі щастям, ніж багатство з клопотами.» — Аменемопет. Настанови Engineering = Інженерія + # Requires translation! +Roads connect tiles across rivers = 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = «Інструментальна чи механічна наука — це найблагородніша і, найкорисніша за всі інші.» — Леонардо да Вінчі Iron Working = Виплавка металів 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = «Не чекайте з ударами, до розігріву криці, тому зробіть її гарячою ударами.» — Вільям Батлер Єтс diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 623c7d0f47..deca2f46f3 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -1,4 +1,4 @@ -Brazilian_Portuguese = 66 +Brazilian_Portuguese = 65 Traditional_Chinese = 63 Italian = 99 Polish = 97 @@ -7,7 +7,7 @@ Romanian = 47 Korean = 99 Simplified_Chinese = 89 German = 99 -Japanese = 60 +Japanese = 80 Turkish = 76 English = 1 Ukrainian = 99 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 12226ca2d1..05a9554ab2 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -3,8 +3,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.3.71" const val appName = "Unciv" - const val appCodeNumber = 432 - const val appVersion = "3.8.12-patch1" + const val appCodeNumber = 433 + const val appVersion = "3.9.0" const val gdxVersion = "1.9.10" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 5c93182adc..8fb25c867d 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,17 @@ +## 3.9.0 + +Added rivers, and river generation! + +Game now saves save files in external storage on Android when possible. + +Resolved #2672 - Difficulties are sorted by ascending difficulty in Civilopedia + +Resolved #2660 - Remove Fallout now enabled by Atomic Theory, not Agriculture + +Great person uniques can be added to any modded unit + +Translation updates + ## 3.8.12 By dbaelz: diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index 8bbc1e430c..1a4ac2485f 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -272,6 +272,8 @@ class CivilizationInfo { && (citiesCreated > 0 || !getCivUnits().any { it.name == Constants.settler }) fun getEra(): String { + if(tech.researchedTechnologies.isEmpty()) + return gameInfo.ruleSet.getEras().first() val maxEraOfTech = tech.researchedTechnologies .asSequence() .map { it.column!! }