diff --git a/.run/desktop.run.xml b/.run/Desktop.run.xml similarity index 90% rename from .run/desktop.run.xml rename to .run/Desktop.run.xml index 05da135fcb..3330382cd0 100644 --- a/.run/desktop.run.xml +++ b/.run/Desktop.run.xml @@ -1,11 +1,11 @@ - + \ No newline at end of file diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 9df76cdcd1..0635791c73 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -352,7 +352,6 @@ Lost ability (vs [originalUnit]): [ability] = 失うアビリティ（[originalU Upgrade all [count] [unit] ([cost] gold) = すべて([count])の[unit]をアップグレード（[cost]ゴールド） National ability = 文明アビリティ [firstValue] vs [secondValue] = [secondValue]→[firstValue] - # Requires translation! [amount1]% [stat1] vs [amount2]% [stat2] = [amount2]% [stat2]→[amount1]% [stat1] Gained = 獲得 Lost = 喪失 @@ -386,7 +385,6 @@ Custom = カスタム Map Generation Type = マップ生成タイプ Enabled Map Generation Types = マップ生成タイプ Example map = マップの例 - # Requires translation! Scenario file [name] is invalid. = シナリオファイル「[name]」は無効です。 # Map types @@ -1565,7 +1563,6 @@ Add all [comment] in capital = すべての[comment]を首都に運搬 Destroy all players = すべてのプレイヤーを撃破 Capture all capitals = すべての首都を占領 Complete [amount] Policy branches = [amount]系統の社会制度をコンプリート - # Requires translation! Have more [countable1] than each player's [countable2] = 各プレイヤーの[countable2]よりも多くの[countable1]を所持 You have won a [victoryType] Victory! = あなたの文明は[victoryType]勝利しました！ [civilization] has won a [victoryType] Victory! = [civilization]が[victoryType]勝利しました！ @@ -1774,7 +1771,6 @@ Mod filter: = Modフィルター: -Combined- = -複合- Search! = 検索！ Results = 結果 - # Requires translation! Revealed by: = 発見するのに必要： Nothing found! = なにも見つかりませんでした！ @@ -2555,11 +2551,8 @@ upon discovering [techFilter] technology = 技術[techFilter]を発見した時 upon entering the [era] = [era]に移行した時 upon entering a new era = 新しい時代に移行した時 upon adopting [policy/belief] = [policy/belief]を採用した時 - # Requires translation! upon declaring war on [civFilter] Civilizations = [civFilter]文明に宣戦布告した時 - # Requires translation! upon being declared war on by [civFilter] Civilizations = [civFilter]文明に宣戦布告された時 - # Requires translation! upon entering a war with [civFilter] Civilizations = [civFilter]文明と戦争状態になった時 upon declaring friendship = 友好宣言をした時 upon declaring a defensive pact = 防衛協定を宣言した時 @@ -2645,7 +2638,6 @@ Military = 軍事 non-air = 非空軍 Nuclear Weapon = 核兵器 Great Person = 偉人 - # Requires translation! relevant = 適切な ######### Unit Type Filters ########### @@ -2843,7 +2835,6 @@ MetaModifier = メタ的な補正 #################### Lines from Countables ####################### year = 年 - # Requires translation! [stat] Per Turn = 毎ターンの[stat] Completed Policy branches = 完了した社会制度系統 [cityFilter] Cities = [cityFilter]都市 diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties index f6bd6c4d97..57722fe0d7 100644 --- a/android/assets/jsons/translations/Vietnamese.properties +++ b/android/assets/jsons/translations/Vietnamese.properties @@ -5490,6 +5490,7 @@ Missile = Tên Lửa Armor = giáp WaterCivilian = nướcdândụng + WaterMelee = nướccậnchiến WaterRanged = nướctầmxa diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 78e3bd7c63..5bb8d3fd83 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -38,5 +38,5 @@ Thai = 15 Traditional_Chinese = 97 Turkish = 96 Ukrainian = 99 -Vietnamese = 100 +Vietnamese = 99 Zulu = 9 diff --git a/changelog.md b/changelog.md index 9f1bcf2b5a..b61954d013 100644 --- a/changelog.md +++ b/changelog.md @@ -1,26 +1,14 @@ ## 4.17.17 -Resolved - Force rankings doesn't evaluate all unit conditionals as multiplicative +Force rankings doesn't evaluate all unit conditionals as multiplicative -Resolved - Include IDEA configurations, by @SomeTroglodyte +Handle mods removing techs, adding/removing eras -Handle mods removing techs - remove from techsToResearch list +Post-battle movement doesn't occur if during the battle the unit lost movement points -Handle mods adding/removing eras +conditionals in event choices work again -chore(purity): TargetHelper - -chore(purity) - -Resolved - Post-battle movement doesn't occur if during the battle the unit lost movement points - -Fixed - conditionals in event choices work again - -update - By EmperorPinguin - -By itanasi: -- Fix div-by-0 crash when no cities -- Fix crash with minor Civs +AI updates - By EmperorPinguin ## 4.17.16 diff --git a/fastlane/metadata/android/en-US/changelogs/1158.txt b/fastlane/metadata/android/en-US/changelogs/1158.txt index 2d48d43b5d..e3be4c8528 100644 --- a/fastlane/metadata/android/en-US/changelogs/1158.txt +++ b/fastlane/metadata/android/en-US/changelogs/1158.txt @@ -1,23 +1,9 @@ +Force rankings doesn't evaluate all unit conditionals as multiplicative +Handle mods removing techs, adding/removing eras -Resolved - Force rankings doesn't evaluate all unit conditionals as multiplicative +Post-battle movement doesn't occur if during the battle the unit lost movement points -Resolved - Include IDEA configurations, by @SomeTroglodyte +conditionals in event choices work again -Handle mods removing techs - remove from techsToResearch list - -Handle mods adding/removing eras - -chore(purity): TargetHelper - -chore(purity) - -Resolved - Post-battle movement doesn't occur if during the battle the unit lost movement points - -Fixed - conditionals in event choices work again - -update - By EmperorPinguin - -By itanasi: -- Fix div-by-0 crash when no cities -- Fix crash with minor Civs \ No newline at end of file +AI updates - By EmperorPinguin \ No newline at end of file