From 0436e67342dfc64b41e5183facfac4703ebe6f2c Mon Sep 17 00:00:00 2001 From: yairm210 Date: Mon, 16 Aug 2021 19:31:12 +0300 Subject: [PATCH] 3.16.4-patch1 --- .../jsons/translations/Indonesian.properties | 4 --- .../jsons/translations/Japanese.properties | 31 ------------------- .../jsons/translations/Swedish.properties | 4 --- .../completionPercentages.properties | 8 ++--- buildSrc/src/main/kotlin/BuildConfig.kt | 4 +-- changelog.md | 6 ++++ 6 files changed, 12 insertions(+), 45 deletions(-) diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index f33a80bd33..70560fb753 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -532,7 +532,6 @@ Our influence with City-States has started dropping faster! = Pengaruh kita deng You gained [Stats] as your religion was spread to [cityName] = Anda telah mendapat [Stats] karena agamamu telah menyebar ke [cityName] You gained [Stats] as your religion was spread to an unknown city = Anda telah mendapat [Stats] karena agamamu telah menyebar ke kota lain Your city [cityName] was converted to [religionName]! = Kotamu, [cityName], telah berpindah agama menjadi [religionName]! - # Requires translation! Your [unitName] lost its faith after spending too long inside enemy territory! = [unitName] kepunyaanmu murtad setelah menetap terlalu lama di daerah musuh! @@ -4266,7 +4265,6 @@ Nuclear Missile = Rudal Nuklir Helicopter Gunship = Helikopter Tempur All tiles cost 1 movement = Membutuhkan 1 pergerakan untuk berpindah ke daerah lain - # Requires translation! Ignores Zone of Control = Tidak dipengaruhi zona kontrol Unable to capture cities = Tidak dapat menyerbu kota @@ -4303,7 +4301,6 @@ Great Prophet = Nabi Besar Can construct [tileImprovement] if it hasn't spread religion yet = Dapat membangun [tileImprovement] jika beliau belum pernah menyebarkan agama Can spread religion [amount] times = Dapat menyebarkan agama [amount] kali May found a religion = Dapat mendirikan sebuah agama - # Requires translation! May enter foreign tiles without open borders = Dapat memasuki daerah asing tanpa memerlukan izin pembukaan perbatasan Religious Unit = Unit Agama @@ -4314,7 +4311,6 @@ Khan = Khan Heal adjacent units for an additional 15 HP per turn = Menyembuhkan unit bersebelahan 15 HP tiap giliran Missionary = Misionaris - # Requires translation! May enter foreign tiles without open borders, but loses [amount] religious strength each turn it ends there = Dapat memasuki daerah asing tanpa memerlukan izin pembukaan perbatasan, tetapi kekuatan agamanya berkurang sebanyak [amount] tiap giliran jika mengakhiri giliran di daerah asing tersebut Can be purchased with [stat] [cityFilter] = Dapat dibeli dengan [stat] [cityFilter] diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 98c42d014d..c315f1d58f 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -21,11 +21,8 @@ Oh no! It looks like something went DISASTROUSLY wrong! This is ABSOLUTELY not s # Buildings - # Requires translation! Unsellable = 売却不可 - # Requires translation! Not displayed as an available construction unless [building] is built = [building]が建設されるまで、利用可能な建造物として表示されない - # Requires translation! Not displayed as an available construction without [resource] = [resource]がなければ、利用可能な建造物として表示されない Choose a free great person = 無償の偉人を選択 @@ -40,28 +37,21 @@ Requires [buildingName] to be built in the city = 都市で[buildingName]を建 Requires [buildingName] to be built in all cities = すべての都市で [buildingName]を建設する必要がある Provides a free [buildingName] in the city = 都市に無償の[buildingName]を提供 Requires worked [resource] near city = 都市の近郊で稼働する[resource]が必要 - # Requires translation! Requires at least one of the following resources worked near the city: = 次のリソースが都市の近くで少なくとも一つ必要： Wonder is being built elsewhere = 他の都市で建設済み - # Requires translation! National Wonder is being built elsewhere = 自然遺産は別の地で生成されている Requires a [buildingName] in all cities = すべての都市に[buildingName]が必要 Requires a [buildingName] in this city = 都市に[buildingName]が必要 - # Requires translation! Cannot be built with [buildingName] = [buildingName]では建設できない Consumes 1 [resource] = [resource]が必要 Consumes [amount] [resource] = [resource]が[amount]必要 Required tech: [requiredTech] = 必要な技術:[requiredTech] Requires [PolicyOrNationalWonder] = [PolicyOrNationalWonder]が必要 Cannot be purchased = 購入不可 - # Requires translation! Can only be purchased = 購入のみ - # Requires translation! See also = 参照 - # Requires translation! Requires at least one of the following: = 次の一つが必要： - # Requires translation! Requires all of the following: = 次のすべてが必要： # Requires translation! Leads to [techName] = @@ -77,7 +67,6 @@ Remove from queue = 予約キューから消去 Show stats drilldown = 都市の統計を表示 Show construction queue = 生産キューを表示 Save = セーブ - # Requires translation! Cancel = キャンセル Diplomacy = 外交 @@ -86,7 +75,6 @@ Peace = 平和 Research Agreement = 研究協定 Declare war = 宣戦布告 Declare war on [civName]? = [civName]に宣戦布告しますか？ - # Requires translation! Let's begin! = 戦だ [civName] has declared war on us! = [civName]に宣戦布告されました！ [leaderName] of [nation] = [nation] / [leaderName] @@ -113,11 +101,8 @@ We will remember this. = このことは忘れないからな [civName] and [targetCivName] have signed a Peace Treaty! = [civName]と[targetCivName] は平和条約に署名した [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] と[targetCivName] は友好宣言に署名した [civName] has denounced [targetCivName]! = [civName]は[targetCivName]を非難した - # Requires translation! Do you want to break your promise to [leaderName]? = [leaderName]との合意を破棄する - # Requires translation! We promised not to settle near them ([count] turns remaining) = 我々は彼らの近くに定住しないことに合意した（残り[count]ターン） - # Requires translation! They promised not to settle near us ([count] turns remaining) = 彼らは我々の近くに定住しないことに合意した（残り[count]ターン） Unforgivable = 宿敵 @@ -154,7 +139,6 @@ You refused to stop settling cities near us = 近くに定住しないという Your arrogant demands are in bad taste = 図々しい要求 Your use of nuclear weapons is disgusting! = 核兵器の使用 You have stolen our lands! = 領土からの略奪 - # Requires translation! You gave us units! = ユニットの寄付 Demands = 要求 @@ -169,21 +153,14 @@ Provides [amountOfCulture] culture at 30 Influence = 影響力30で文化力+[am Provides 3 food in capital and 1 food in other cities at 30 Influence = 影響力30で首都に食料+3、その他の都市に食料+1 Provides 3 happiness at 30 Influence = 影響力30で幸福度+30 Provides land units every 20 turns at 30 Influence = 影響力30で20ターンごとに軍事ユニットを提供 - # Requires translation! Give a Gift = 寄付をする Gift [giftAmount] gold (+[influenceAmount] influence) = [giftAmount]ゴールドを寄付（影響力+[influenceAmount]） Relationship changes in another [turnsToRelationshipChange] turns = [turnsToRelationshipChange]ターンで別の関係の変更 - # Requires translation! Protected by = 宗主国： - # Requires translation! Revoke Protection = 保護をやめる - # Requires translation! Pledge to protect = 保護の誓約 - # Requires translation! Declare Protection of [cityStateName]? = [cityStateName]の保護を宣言 - # Requires translation! Build [improvementName] on [resourceName] (200 Gold) = [resourceName]に[improvementName]を建設（200ゴールド） - # Requires translation! Gift Improvement = 寄付内容を変更 @@ -249,7 +226,6 @@ Game Options = ゲーム設定 Civilizations = Civilizations Map Type = マップタイプ Map file = マップファイル - # Requires translation! Could not load map! = マップを読み込めません Generated = 生成 Existing = 既存 @@ -259,7 +235,6 @@ Default = デフォルト Pangaea = パンゲア Perlin = パーリンノイズ Continents = 大陸 - # Requires translation! Four Corners = 四方の陸 Archipelago = 多島海 Number of City-States = 都市国家の数 @@ -275,18 +250,12 @@ Cultural = 文化 Map Shape = マップ形状 Hexagonal = 六角形 Rectangular = 長方形 - # Requires translation! Height = 高さ - # Requires translation! Width = 幅 - # Requires translation! Radius = 半径 - # Requires translation! Enable Religion = 宗教を有効化 - # Requires translation! Advanced Settings = 詳細設定 - # Requires translation! RNG Seed = RNG値 Map Height = マップの高さ Temperature extremeness = 極度な気候 diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index 70fe820dbc..5cb1f9bab4 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -532,7 +532,6 @@ Our influence with City-States has started dropping faster! = Vårt inflytande m You gained [Stats] as your religion was spread to [cityName] = Du fick [Stats] när din religion spreds till [cityName] You gained [Stats] as your religion was spread to an unknown city = Du fick [Stats] när din religion spreds till en okänd stad Your city [cityName] was converted to [religionName]! = Din stad [cityName] konverterades till [religionName]! - # Requires translation! Your [unitName] lost its faith after spending too long inside enemy territory! = Din [unitName] förlorade sin tro efter att ha tillbringat för lång tid inom fiendens territorium! @@ -4266,7 +4265,6 @@ Nuclear Missile = Kärnvapenmissil Helicopter Gunship = Attackhelikopter All tiles cost 1 movement = Alla rutor kostar 1 förflyttning - # Requires translation! Ignores Zone of Control = Bortser från Kontrollzon Unable to capture cities = Kan inte inta städer @@ -4303,7 +4301,6 @@ Great Prophet = Stor Profet Can construct [tileImprovement] if it hasn't spread religion yet = Kan bygga [tileImprovement] om den inte spridit religion än Can spread religion [amount] times = Kan sprida religion [amount] gånger May found a religion = Kan stifta en religion - # Requires translation! May enter foreign tiles without open borders = Kan gå in i utländska rutor utan öppna gränser Religious Unit = Religiös Enhet @@ -4314,7 +4311,6 @@ Khan = Khan Heal adjacent units for an additional 15 HP per turn = Läker angränsande enheter för ytterligare 15 KP per drag Missionary = Missionär - # Requires translation! May enter foreign tiles without open borders, but loses [amount] religious strength each turn it ends there = Kan gå in i utländska rutor utan öppna gränser, men förlorar [amount] religiös styrka varje drag som den slutför där Can be purchased with [stat] [cityFilter] = Kan köpas med [stat] [cityFilter] diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 1dadaf16a4..ea28922633 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -1,13 +1,13 @@ Persian_(Pinglish-UN) = 21 -Italian = 99 +Italian = 100 Russian = 96 German = 99 -Swedish = 99 +Swedish = 100 Turkish = 92 Ukrainian = 90 French = 81 Portuguese = 69 -Indonesian = 99 +Indonesian = 100 Finnish = 52 Malay = 17 Spanish = 99 @@ -20,7 +20,7 @@ Simplified_Chinese = 99 Bulgarian = 22 Korean = 96 Persian_(Pinglish-DIN) = 21 -Japanese = 81 +Japanese = 82 English = 1 Czech = 93 Hungarian = 64 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 2e867ca142..4c5c4a3c51 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.4.30" const val appName = "Unciv" - const val appCodeNumber = 607 - const val appVersion = "3.16.4 " + const val appCodeNumber = 608 + const val appVersion = "3.16.4-patch1" const val gdxVersion = "1.10.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 4469a10900..f392869c3e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,9 @@ +## 3.16.4-patch1 + +Fixed crash from conquering cities - By xlenstra + +Fix DOS attack perpetrated by CityInfoReligionManager on Json Serializer - By SomeTroglodyte + ## 3.16.4 Implemented Zone of Control mechanic - by avdstaaij