From 90da09e924d684f9a13ef963a1aeb6df7f0adb8f Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 31 May 2023 14:58:28 +0300 Subject: [PATCH] Version rollout (#9491) * Bump version and create initial changelog entry * Update German translation (#9489) * Update Polish.properties (#9480) * Update Polish.properties * Update Polish.properties * Update French.properties (#9479) * Update Japanese.properties (#9478) * Update Japanese.properties Testament of Faith * Update Japanese.properties Enhancer of Faith * Update Japanese.properties Religions * Update Japanese.properties some Faith Description * Update Japanese.properties add Faith Description * Update Japanese.properties delete comment * Update Spanish.properties (#9474) * Updated Brazilian_Portuguese.properties (#9473) * Update Italian.properties (#9470) --------- Co-authored-by: yairm210 Co-authored-by: mape6 Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com> Co-authored-by: Ouaz Co-authored-by: undo <3245867+undoroid@users.noreply.github.com> Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com> Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com> Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com> --- .../Brazilian_Portuguese.properties | 3 +- .../jsons/translations/French.properties | 2 +- .../jsons/translations/German.properties | 3 +- .../jsons/translations/Italian.properties | 3 +- .../jsons/translations/Japanese.properties | 62 +++++++++---------- .../jsons/translations/Polish.properties | 4 +- .../jsons/translations/Spanish.properties | 4 +- buildSrc/src/main/kotlin/BuildConfig.kt | 4 +- changelog.md | 11 ++++ core/src/com/unciv/UncivGame.kt | 2 +- .../metadata/android/en-US/changelogs/873.txt | 10 +++ 11 files changed, 63 insertions(+), 45 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/873.txt diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 4d9ba933e8..6faea1e979 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -501,8 +501,7 @@ Map copy and paste = Copiar e colar mapa Position: [param] = Posição: [param] Starting location(s): [param] = Locais de partida: [param] Continent: [param] ([amount] tiles) = Continente: [param] ([amount] painéis) - # Requires translation! -Resource abundance = +Resource abundance = Abundância de recursos Change map to fit selected ruleset? = Mudar o mapa para se ajustar às regras selecionadas? Area: [amount] tiles, [amount2] continents/islands = Área: [amount] painéis, [amount2] continentes/ilhas Area: [amount] tiles, [amount2]% water, [amount3] continents/islands = Área: [amount] painéis, [amount2]% de água, [amount3] continentes/ilhas diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index c8e68429f7..d09c387588 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -502,7 +502,7 @@ Position: [param] = Position : [param] Starting location(s): [param] = Position(s) de départ : [param] Continent: [param] ([amount] tiles) = Continent : [param] ([amount] cases) # Requires translation! -Resource abundance = +Resource abundance = Abondance de la ressource Change map to fit selected ruleset? = Modifier la carte pour l'adapter aux règles sélectionnées ? Area: [amount] tiles, [amount2] continents/islands = Surface : [amount] cases, [amount2] continents/îles Area: [amount] tiles, [amount2]% water, [amount3] continents/islands = Surface : [amount] cases, [amount2]% d'eau, [amount3] continents/îles diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 6e552623bb..6d69801941 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -501,8 +501,7 @@ Map copy and paste = Karte kopieren/einfügen Position: [param] = Position: [param] Starting location(s): [param] = Startpositionen: [param] Continent: [param] ([amount] tiles) = Kontinent: [param] ([amount] Felder) - # Requires translation! -Resource abundance = +Resource abundance = Ressourcenreichtum Change map to fit selected ruleset? = Karte ändern, um sie dem neuen Regelwerk anzupassen? Area: [amount] tiles, [amount2] continents/islands = Fläche: [amount] Felder, [amount2] Kontinente/Inseln Area: [amount] tiles, [amount2]% water, [amount3] continents/islands = Bereich: [amount] Felder, [amount2]% Wasser, [amount3] Kontinente/Inseln diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index af5d26d2ee..2c90849804 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -505,8 +505,7 @@ Map copy and paste = Copia e incolla mappa Position: [param] = Posizione: [param] Starting location(s): [param] = Posizione/i iniziali: [param] Continent: [param] ([amount] tiles) = Continente: [param] ([amount] caselle) - # Requires translation! -Resource abundance = +Resource abundance = Abbondanza di risorse Change map to fit selected ruleset? = Vuoi cambiare mappa per il ruleset specifico? Area: [amount] tiles, [amount2] continents/islands = Area: [amount] caselle, [amount2] continenti/isole Area: [amount] tiles, [amount2]% water, [amount3] continents/islands = Area: [amount] caselle, [amount2]% acqua, [amount3] continenti/isole diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index e7cc98f7bd..1c3a315ac9 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -1688,7 +1688,7 @@ Expand Pantheon = # Requires translation! Follow [belief] = # Requires translation! -Religions and Beliefs = +Religions and Beliefs = 宗教と信仰 # Requires translation! Majority Religion: [name] = # Requires translation! @@ -1938,9 +1938,9 @@ ConditionalsPlacement = before [stats] from [tileFilter] tiles without [tileFilter2] [cityFilter] = [cityFilter][tileFilter2]以外の[tileFilter]タイルから[stats] [stats] from each Trade Route = 各交易路から[stats] # Requires translation! -[stats] for each global city following this religion = +[stats] for each global city following this religion = この宗教を信仰している都市ごとに[stats] # Requires translation! -[stats] from every [amount] global followers [cityFilter] = +[stats] from every [amount] global followers [cityFilter] = [cityFilter]信徒[amount]人ごとに[stats] # Requires translation! Ensures a minimum tile yield of [stats] = [relativeAmount]% [stat] = [stat][relativeAmount]% @@ -1986,7 +1986,7 @@ May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a # Requires translation! May choose [amount] additional belief(s) of any type when [foundingOrEnhancing] a religion = # Requires translation! -[stats] when a city adopts this religion for the first time (modified by game speed) = +[stats] when a city adopts this religion for the first time (modified by game speed) = この都市が初めてこの宗教に改宗したときに[stats](ゲーム速度によって変化) [relativeAmount]% Unhappiness from [populationFilter] [cityFilter] = [cityFilter][populationFilter]からの不満が[relativeAmount]% [relativeAmount]% Food consumption by specialists [cityFilter] = [cityFilter]専門家の食料の消費[relativeAmount]% [relativeAmount]% of excess happiness converted to [stat] = 余剰幸福度の[relativeAmount]%が[stat]に変換される @@ -2050,12 +2050,12 @@ Gain [amount] Influence with a [baseUnitFilter] gift to a City-State = [baseUnit # Requires translation! [relativeAmount]% Faith cost of generating Great Prophet equivalents = # Requires translation! -Resting point for Influence with City-States following this religion [amount] = +Resting point for Influence with City-States following this religion [amount] =　この宗教を信仰する都市国家への影響力が[amount]増加 # Requires translation! May not annex cities = Provides a sum of gold each time you spend a Great Person = 偉人を消費する度にゴールドを獲得 # Requires translation! -[stats] whenever a Great Person is expended = +[stats] whenever a Great Person is expended = 偉人を消費する度に[stats]を獲得 Receive free [unit] when you discover [tech] = [tech]を発見後、[unit]を無償で受け取れる Enables Open Borders agreements = 国境開放を有効化 Enables Research agreements = 研究協定が可能になる @@ -2076,9 +2076,9 @@ Enables embarkation for land units = 地上ユニットの乗船が可能にな Enables [mapUnitFilter] units to enter ocean tiles = [mapUnitFilter]ユニットが水上タイルに移動できる Population loss from nuclear attacks [relativeAmount]% [cityFilter] = [cityFilter]核攻撃からの人口減少[relativeAmount]% # Requires translation! -[relativeAmount]% Natural religion spread [cityFilter] = +[relativeAmount]% Natural religion spread [cityFilter] = [cityFilter]宗教の自然伝播速度[relativeAmount]%増加 # Requires translation! -Religion naturally spreads to cities [amount] tiles away = +Religion naturally spreads to cities [amount] tiles away = 宗教が自然に[amount]タイル以内の都市に広がる Starting tech = スタートアップ技術 Starts with [tech] = [tech]で始まる Starts with [policy] adopted = [policy]を採用した状態で始まる @@ -2155,9 +2155,9 @@ Can transform to [unit] = [amount] Range = 範囲[amount] [amount] HP when healing = 回復時にHP[amount] # Requires translation! -[relativeAmount]% Spread Religion Strength = +[relativeAmount]% Spread Religion Strength = 改宗力が[relativeAmount]%増加 # Requires translation! -When spreading religion to a city, gain [amount] times the amount of followers of other religions as [stat] = +When spreading religion to a city, gain [amount] times the amount of followers of other religions as [stat] = 他宗教の都市に布教すると、信徒の[amount]倍の[stat]を獲得 Can only attack [combatantFilter] units = [combatantFilter]ユニットのみを攻撃できる Can only attack [tileFilter] tiles = [tileFilter]タイルのみを攻撃できる Cannot attack = 攻撃できない @@ -5415,7 +5415,7 @@ Sacred Waters = 聖なる水 Stone Circles = 環状列石 # Requires translation! -Follower = +Follower = 信徒 Asceticism = 苦行 Cathedrals = 大聖堂 @@ -5449,62 +5449,62 @@ Religious Community = 宗教共同体 Swords into Ploughshares = 剣を鋤の刃に # Requires translation! -Founder = +Founder = 創始者 # Requires translation! -Ceremonial Burial = +Ceremonial Burial = 葬儀 # Requires translation! -Church Property = +Church Property = 協会資産 # Requires translation! -Initiation Rites = +Initiation Rites = 入信の儀式 # Requires translation! -Interfaith Dialogue = +Interfaith Dialogue = 宗教間対話 # Requires translation! -Papal Primacy = +Papal Primacy = 教皇の首位性 # Requires translation! -Peace Loving = +Peace Loving = 平和主義 # Requires translation! -Pilgrimage = +Pilgrimage = 巡礼 # Requires translation! -Tithe = +Tithe = 十分の一税 # Requires translation! -World Church = +World Church = 世界教会運動 # Requires translation! -Enhancer = +Enhancer = 強化者 # Requires translation! -Defender of the Faith = +Defender of the Faith = 信仰の守護者 # Requires translation! -Holy Order = +Holy Order = 聖職叙任 # Requires translation! -Itinerant Preachers = +Itinerant Preachers = 巡回説教師 # Requires translation! -Just War = +Just War = 正義の戦い # Requires translation! -Messiah = +Messiah = 救世主 # Requires translation! -Missionary Zeal = +Missionary Zeal = 布教の情熱 # Requires translation! -Religious Texts = +Religious Texts = 宗教書 # Requires translation! -Religious Unity = +Religious Unity = 信仰による結束 # Requires translation! -Reliquary = +Reliquary = 聖骨箱 #################### Lines from Buildings from Civ V - Gods & Kings #################### diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 09d0be3a15..a5a1cf25b8 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -453,7 +453,7 @@ Base Ruleset = Zasady gry [amount] Beliefs = [amount] Wierzeń World Wrap = Zawijanie świata -World wrap maps are very memory intensive - creating large world wrap maps on Android can lead to crashes! = Zawijane mapy świata wymagają dużej ilości pamięci — tworzenie dużych map tego typu w systemie Android może prowadzić do błedów! +World wrap maps are very memory intensive - creating large world wrap maps on Android can lead to crashes! = Zawijane mapy świata wymagają dużej ilości pamięci — tworzenie dużych map tego typu w systemie Android może prowadzić do błędów! Anything above 80 by 50 may work very slowly on Android! = Wartości między 50 a 80 mogą działać bardzo wolno na systemie Android! Anything above 40 may work very slowly on Android! = Wartości powyżej 40 mogą działać bardzo wolno na systemie Android! @@ -503,7 +503,7 @@ Position: [param] = Pozycja: [param] Starting location(s): [param] = Pozycja początkowa: [param] Continent: [param] ([amount] tiles) = Kontynent: [param] ([amount] pól) # Requires translation! -Resource abundance = +Resource abundance = Obfitość surowców Change map to fit selected ruleset? = Zmienić mapę aby pasowała do wybranego zestawu reguł? Area: [amount] tiles, [amount2] continents/islands = Obszar: [amount] pól, kontynenty / wyspy: [amount2] Area: [amount] tiles, [amount2]% water, [amount3] continents/islands = Obszar: [amount] pól, woda: [amount2]%, kontynenty / wyspy: [amount3] diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 0ed5562b4a..943110e238 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -502,7 +502,7 @@ Position: [param] = Posición: [param] Starting location(s): [param] = Posiciones iniciales: [param] Continent: [param] ([amount] tiles) = Continente: [param] ([amount] casillas) # Requires translation! -Resource abundance = +Resource abundance = Abundancia de recursos Change map to fit selected ruleset? = ¿Cambiar mapa para que se ajuste al reglamento seleccionado? Area: [amount] tiles, [amount2] continents/islands = Area: [amount] casillas, [amount2] continentes/islas Area: [amount] tiles, [amount2]% water, [amount3] continents/islands = Area: [amount] casillas, [amount2]% agua, [amount3] continentes/islas @@ -512,7 +512,7 @@ Do you want to load another map without saving the recent changes? = ¿Quieres c River generation failed! = ¡Generación de ríos fallida! Please don't use step 'Landmass' with map type 'Empty', create a new empty map instead. = Por favor nó uses el paso "Continente" con el tipo de mapa "Vacío", crea un nuevo mapa en vez. This map has errors: = Este mapa tiene errores: -The incompatible elements have been removed. = Los elementos incompatibles han sido removidos. +The incompatible elements have been removed. = Los elementos incompatibles han sido removidos. ## Map/Tool names My new map = Mi mapa nuevo diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index d69eab49da..dd5479d445 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -4,8 +4,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.8.21" const val appName = "Unciv" - const val appCodeNumber = 872 - const val appVersion = "4.6.15" + const val appCodeNumber = 873 + const val appVersion = "4.6.16" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 88f745f48d..e39eb77e34 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,14 @@ +## 4.6.16 + +Spectators do not get natural wonder discovery notifications + +By SomeTroglodyte: +- Unit Overview: Improving a tile is also "what the unit is doing" +- Replacement PlatformSaverLoader for Linux X11 systems +- All notifications from Overview are now temporary + +Fix bug worker will not replace improvement to enable strategy resour… - By janarvid + ## 4.6.15 'Crop yield' chart displays correct data diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 1cecf6147b..866927656c 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -531,7 +531,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci companion object { //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT - val VERSION = Version("4.6.15", 872) + val VERSION = Version("4.6.16", 873) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/873.txt b/fastlane/metadata/android/en-US/changelogs/873.txt new file mode 100644 index 0000000000..6465d63878 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/873.txt @@ -0,0 +1,10 @@ + + +Spectators do not get natural wonder discovery notifications + +By SomeTroglodyte: +- Unit Overview: Improving a tile is also "what the unit is doing" +- Replacement PlatformSaverLoader for Linux X11 systems +- All notifications from Overview are now temporary + +Fix bug worker will not replace improvement to enable strategy resour… - By janarvid \ No newline at end of file