diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 86ca0e4ead..b9fa8fb817 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -207,12 +207,9 @@ Pledge to protect = Comprometa-se para proteger Declare Protection of [cityStateName]? = Declarar proteção de [cityStateName]? Build [improvementName] on [resourceName] (200 Gold) = Construir [improvementName] na [resourceName] (200 Ouro) Gift Improvement = Presentear Melhoria - # Requires translation! -[civName] is able to provide [unitName] once [techName] [isOrAre] researched. = - # Requires translation! -is = - # Requires translation! -are = +[civName] is able to provide [unitName] once [techName] [isOrAre] researched. = [civName] é capaz de fornecer [unitName] assim que [techName] [isOrAre] pesquisado(a). +is = é +are = são Diplomatic Marriage ([amount] Gold) = Casamento Diplomático ([amount] Ouro) We have married into the ruling family of [civName], bringing them under our control. = Nós nos casamos com a família governante de [civName], trazendo eles sob nosso controle. @@ -2355,8 +2352,7 @@ Free Great Person = Grande Personlidade Gratuita [amount] population in a random city = [amount] de população em uma cidade aleatória Discover [tech] = Descobre [tech] Adopt [policy] = Adota [policy] - # Requires translation! -Remove [policy] = +Remove [policy] = Remover [policy] Free Technology = Tecnologia Gratuita [positiveAmount] Free Technologies = [positiveAmount] Tecnologias Gratuitas [positiveAmount] free random researchable Tech(s) from the [era] = [positiveAmount] de tecnologia(s) pesquisável(es) aleatória(s) gratuita(s) da [era] @@ -2428,8 +2424,7 @@ Cannot be used as permanent audiovisual mod = Não pode ser usado como mod audio ######### combatantFilter ########### - # Requires translation! -City = +City = Cidade ######### Map Unit Filters ########### diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index a46b03e1b1..87e73bd900 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -207,7 +207,7 @@ Pledge to protect = Promettre la protection Declare Protection of [cityStateName]? = Déclarer protéger [cityStateName] ? Build [improvementName] on [resourceName] (200 Gold) = Construire [improvementName] sur [resourceName] (200 Or) Gift Improvement = Présent amélioré -[civName] is able to provide [unitName] once [techName] [isOrAre] researched. = [civName] est capable de fournir [unitName] une fois [techName] [isOrAre] recherchée. +[civName] is able to provide [unitName] once [techName] [isOrAre] researched. = [civName] peut fournir [unitName] si [techName] [isOrAre] recherchée(s). is = est are = sont @@ -2353,7 +2353,7 @@ Free Great Person = Personnage Illustre gratuit Discover [tech] = Découvrir [tech] Adopt [policy] = Adopter [policy] # Requires translation! -Remove [policy] = +Remove [policy] = Abandonner [policy] Free Technology = Technologie gratuite [positiveAmount] Free Technologies = [positiveAmount] technologie(s) gratuite(s) [positiveAmount] free random researchable Tech(s) from the [era] = [positiveAmount] technologie(s) gratuite(s) aléatoire(s) disponible(s) pour [era] @@ -2836,7 +2836,7 @@ Mughal Fort = Fort Moghol Himeji Castle = Château de Himeji 'Bushido is realized in the presence of death. This means choosing death whenever there is a choice between life and death. There is no other reasoning.' - Yamamoto Tsunetomo = 'J'ai découvert que mourir est au coeur du bushido. Lorsque, confronté à deux alternatives, vivre ou mourir, sans hésitation, il nous faut choisir la mort.' - Yamamoto Tsunetomo -Ironworks = Usine Sidérurgique +Ironworks = Ferronnerie Armory = Dépôt d'Armes diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 1efb535205..a959458a1d 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -207,12 +207,9 @@ Pledge to protect = Impegnati a proteggere Declare Protection of [cityStateName]? = Vuoi impegnarti a proteggere [cityStateName]? Build [improvementName] on [resourceName] (200 Gold) = Costruisci [improvementName] su [resourceName] (200 Oro) Gift Improvement = Dona miglioramento - # Requires translation! -[civName] is able to provide [unitName] once [techName] [isOrAre] researched. = - # Requires translation! -is = - # Requires translation! -are = +[civName] is able to provide [unitName] once [techName] [isOrAre] researched. = [civName] ti concede [unitName] quando [techName] [isOrAre] scoperta. +is = è +are = sono Diplomatic Marriage ([amount] Gold) = Matrimonio diplomatico ([amount] Gold) We have married into the ruling family of [civName], bringing them under our control. = Abbiamo sposato la famiglia regnante di [civName], portandola sotto il nostro controllo. @@ -2355,8 +2352,7 @@ Free Great Person = Ottieni un Grande Personaggio gratuito [amount] population in a random city = [amount] abitanti in una città casuale Discover [tech] = Scopri [tech] Adopt [policy] = Adotta [policy] - # Requires translation! -Remove [policy] = +Remove [policy] = Rimuovi [policy] Free Technology = Dona una tecnologia gratuita [positiveAmount] Free Technologies = [positiveAmount] Tecnologie gratuite [positiveAmount] free random researchable Tech(s) from the [era] = [positiveAmount] tecnologie casuali ricercabili dall'[era] @@ -2428,8 +2424,7 @@ Cannot be used as permanent audiovisual mod = Non usabile come mod audiovisuale ######### combatantFilter ########### - # Requires translation! -City = +City = Città ######### Map Unit Filters ########### diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index d934aeab8b..3a154a4790 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -208,11 +208,11 @@ Declare Protection of [cityStateName]? = Zadeklarować ochronę dla miasta [city Build [improvementName] on [resourceName] (200 Gold) = Zbuduj [improvementName] na [resourceName] (200¤ Złota) Gift Improvement = Podaruj Ulepszenie # Requires translation! -[civName] is able to provide [unitName] once [techName] [isOrAre] researched. = +[civName] is able to provide [unitName] once [techName] [isOrAre] researched. = [civName] może przekazywać jednostki [unitName] gdy technologia [techName] [isOrAre] zbadana # Requires translation! -is = +is = jest # Requires translation! -are = +are = są Diplomatic Marriage ([amount] Gold) = Małżeństwo dyplomatyczne ([amount] ¤Złota) We have married into the ruling family of [civName], bringing them under our control. = Doprowadziliśmy do małżeństwa dyplomatycznego z miastem [civName], dzięki temu przejęliśmy nad nim kontrolę. @@ -2343,7 +2343,7 @@ when number of [countable] is different than [countable2] = gdy liczba [countabl when number of [countable] is greater than [countable2] = gdy liczba [countable] jest większa od liczby [countable2] when number of [countable] is less than [countable2] = gdy liczba [countable] jest mniejsza od liczby [countable2] # Requires translation! -when number of [countable] is between [countable2] and [countable3] = +when number of [countable] is between [countable2] and [countable3] = gdy liczba [countable] jest pomiędzy [countable2] a [countable3] Free [unit] appears = Darmowy [unit] [positiveAmount] free [unit] units appear = [positiveAmount] darmowe jednostki [unit] Free [unit] found in the ruins = Bezpłatna jednostka [unit] została znaleziona w ruinach @@ -2357,7 +2357,7 @@ Free Great Person = Darmowy Wielki Człowiek Discover [tech] = Odkrywa [tech] Adopt [policy] = Przyjmuje [policy] # Requires translation! -Remove [policy] = +Remove [policy] = Zrezygnuj z ustroju [policy] Free Technology = Otrzymasz 1 darmową technologię [positiveAmount] Free Technologies = [positiveAmount] darmowe technologie [positiveAmount] free random researchable Tech(s) from the [era] = [positiveAmount] bezpłatnych losowych technologii z: [era] @@ -2430,7 +2430,7 @@ Cannot be used as permanent audiovisual mod = Nie może zostać użyty jako mod ######### combatantFilter ########### # Requires translation! -City = +City = Miasto ######### Map Unit Filters ########### diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 5b35765e42..34b87dcd82 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 = 985 - const val appVersion = "4.11.2" + const val appCodeNumber = 986 + const val appVersion = "4.11.3" const val gdxVersion = "1.12.1" const val ktorVersion = "2.2.3" diff --git a/changelog.md b/changelog.md index 24d8e8794a..4fc11120d2 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,27 @@ +## 4.11.3 + +Cannot trade screen for civs you're at war with through notification action + +docs: Info regarding triggerable uniques + +Remove city-state construction bonuses from difficulty + +Fix untranslateables + +By tuvus: +- Espionage Uniques, Buildings and Policy +- Civs with a spy set up in a foreign city can view some information + +By SomeTroglodyte: +- Fix "Connect road" going through Mountains +- New game and custom/mod maps UI update and sync fixes + +Allow players to close the policy screen with free policies - By SeventhM + +Implement Same-majority-religion-based diplomatic modifier - By TommasoPetrolito + +Allow AI civilian unit to consider other triggerable uniques - By woo1127 + ## 4.11.2 Mod checker warns against deprecated conditionals diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index ee18706649..1a2f6dd737 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -464,7 +464,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.11.2", 985) + val VERSION = Version("4.11.3", 986) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/986.txt b/fastlane/metadata/android/en-US/changelogs/986.txt new file mode 100644 index 0000000000..3f2d268312 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/986.txt @@ -0,0 +1,23 @@ + + +Cannot trade screen for civs you're at war with through notification action + +docs: Info regarding triggerable uniques + +Remove city-state construction bonuses from difficulty + +Fix untranslateables + +By tuvus: +- Espionage Uniques, Buildings and Policy +- Civs with a spy set up in a foreign city can view some information + +By SomeTroglodyte: +- Fix "Connect road" going through Mountains +- New game and custom/mod maps UI update and sync fixes + +Allow players to close the policy screen with free policies - By SeventhM + +Implement Same-majority-religion-based diplomatic modifier - By TommasoPetrolito + +Allow AI civilian unit to consider other triggerable uniques - By woo1127 \ No newline at end of file