From 32d46b24df2db06a2beea6072014a9dc41419212 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 9 Dec 2022 12:52:38 +0200 Subject: [PATCH] Version rollout (#8103) * Bump version and create initial changelog entry * Update Italian.properties (#8100) * Update German translations (#8097) * Update French.properties (#8096) * Update Spanish.properties (#8095) * Updated Brazilian_Portuguese.properties (#8094) Co-authored-by: yairm210 Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com> Co-authored-by: MartinP Co-authored-by: Ouaz Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com> Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com> --- .../Brazilian_Portuguese.properties | 9 +++------ .../jsons/translations/French.properties | 6 +++--- .../jsons/translations/German.properties | 13 +++++-------- .../jsons/translations/Italian.properties | 9 +++------ .../jsons/translations/Spanish.properties | 10 +++++----- buildSrc/src/main/kotlin/BuildConfig.kt | 4 ++-- changelog.md | 18 ++++++++++++++++++ core/src/com/unciv/UncivGame.kt | 2 +- .../metadata/android/en-US/changelogs/774.txt | 17 +++++++++++++++++ 9 files changed, 57 insertions(+), 31 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/774.txt diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 163f550e44..c2efed574b 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -813,8 +813,7 @@ We have captured a barbarian encampment and recovered [goldAmount] gold! = Nós An enemy [unitType] has joined us! = Um(a) inimigo(a) [unitType] se juntou a nós! After an unknown civilization entered the [eraName], we have recruited [spyName] as a spy! = Depois que uma civilização desconhecida entrou na [eraName], nós recrutamos [spyName] como espião! We have recruited [spyName] as a spy! = Recrutamos [spyName] como espião! - # Requires translation! -[unitName] can be promoted! = +[unitName] can be promoted! = [unitName] pode ser promovido! # This might be needed for a rewrite of Germany's unique - see #7376 A barbarian [unitType] has joined us! = Um(a) [unitType] bárbaro(a) se uniu à nós! @@ -1331,8 +1330,7 @@ Defence bonus = Bônus de defesa Movement cost = Custo de movimento for = por Missing translations: = Traduções faltando: - # Requires translation! -Screen Size = +Screen Size = Tamanho da Tela Tileset = Estilo mapa Unitset = Conjunto de unidades UI Skin = Skin da interface do usuário @@ -3168,8 +3166,7 @@ Las Palmas = Las Palmas Tenerife = Tenerife Spain = Espanha 100 Gold for discovering a Natural Wonder (bonus enhanced to 500 Gold if first to discover it) = 100 Ouro pela descoberta de uma Maravilha Natural (Valor aumentado para 500 Ouro se for o primeiro a descobrir a Maravilha Natural) - # Requires translation! -[stats] for every known Natural Wonder = +[stats] for every known Natural Wonder = [stats] para cada Maravilha Natural conhecida [relativeAmount]% Yield from every [tileFilter/buildingFilter] = [relativeAmount]% de rendimento de cada [tileFilter/buildingFilter] Askia = Ásquia Maomé I diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index adac7f5bd6..08c76ec9f7 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -814,7 +814,7 @@ An enemy [unitType] has joined us! = Un(e) [unitType] ennemi(e) a rejoint nos ra After an unknown civilization entered the [eraName], we have recruited [spyName] as a spy! = Après qu'une civilisation inconnue soit entrée dans l'ère [eraName], nous avons recruté [spyName] comme espion ! We have recruited [spyName] as a spy! = Nous avons recruté [spyName] comme espion ! # Requires translation! -[unitName] can be promoted! = +[unitName] can be promoted! = [unitName] peut être promu(e) ! # This might be needed for a rewrite of Germany's unique - see #7376 A barbarian [unitType] has joined us! = Un(e) [unitType] barbare a rejoint nos rangs ! @@ -1332,7 +1332,7 @@ Movement cost = Coût de mouvement for = pour Missing translations: = Traductions manquantes : # Requires translation! -Screen Size = +Screen Size = Taille d'écran Tileset = Style des cases Unitset = Style des unités UI Skin = Style de l'interface @@ -3169,7 +3169,7 @@ Tenerife = Tenerife Spain = Espagne 100 Gold for discovering a Natural Wonder (bonus enhanced to 500 Gold if first to discover it) = 100 Or pour la découverte d'une Merveille Naturelle (bonus augmenté à 500 Or si premier à la découvrir) # Requires translation! -[stats] for every known Natural Wonder = +[stats] for every known Natural Wonder = [stats] pour chaque Merveille Naturelle connue [relativeAmount]% Yield from every [tileFilter/buildingFilter] = [relativeAmount]% Rendement pour chaque [tileFilter/buildingFilter] Askia = Askia diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index aab048407d..6842e53ba0 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -528,7 +528,7 @@ Sprout vegetation = Pflanzen sprießen lassen Spawn rare features = Außergewöhnliches Gelände Distribute ice = Eis verteilen Assign continent IDs = Kontinent-IDs zuweisen -Place Natural Wonders = Platziere natürliche Wunder +Place Natural Wonders = Platziere Naturwunder Let the rivers flow = Flüsse fließen lassen Spread Resources = Ressourcen verteilen Create ancient ruins = Ruinen verteilen @@ -813,8 +813,7 @@ We have captured a barbarian encampment and recovered [goldAmount] gold! = Wir h An enemy [unitType] has joined us! = Eine feindliche [unitType] Einheit hat sich uns angeschlossen! After an unknown civilization entered the [eraName], we have recruited [spyName] as a spy! = Nachdem eine unbekannte Zivilisation das [eraName] Zeitalter erreicht hat, haben wir [spyName] als Spion rekrutiert. We have recruited [spyName] as a spy! = Wir haben [spyName] als Spion rekrutiert. - # Requires translation! -[unitName] can be promoted! = +[unitName] can be promoted! = [unitName] kann befördert werden! # This might be needed for a rewrite of Germany's unique - see #7376 A barbarian [unitType] has joined us! = Eine Einheit [unitType] der Barbaren hat sich uns angeschlossen! @@ -1331,8 +1330,7 @@ Defence bonus = Verteidigungsbonus Movement cost = Bewegungskosten for = für Missing translations: = Fehlende Übersetzungen: - # Requires translation! -Screen Size = +Screen Size = Bildschirmgröße Tileset = Feldgrafik-Satz Unitset = Einheitengrafik-Satz UI Skin = Aussehen der Benutzeroberfläche @@ -1348,7 +1346,7 @@ Terrain feature [feature] does not exist in ruleset! = Geländemerkmal [feature] Resource [resource] does not exist in ruleset! = Ressource [resource] fehlt im Regelwerk! Improvement [improvement] does not exist in ruleset! = Verbesserung [improvement] fehlt im Regelwerk! Nation [nation] does not exist in ruleset! = Die Nation [nation] existiert nicht im Regelwerk! -Natural Wonder [naturalWonder] does not exist in ruleset! = Das natürliche Wunder [naturalWonder] existiert nicht im Regelwerk! +Natural Wonder [naturalWonder] does not exist in ruleset! = Das Naturwunder [naturalWonder] existiert nicht im Regelwerk! # Civilopedia difficulty levels Player settings = Spieler-Einstellungen @@ -3168,8 +3166,7 @@ Las Palmas = Las Palmas Tenerife = Teneriffa Spain = Spanien 100 Gold for discovering a Natural Wonder (bonus enhanced to 500 Gold if first to discover it) = 100 Gold beim Entdecken eines Naturwunders (Bonus erhöht sich auf 500 Gold, wenn zuerst entdeckt) - # Requires translation! -[stats] for every known Natural Wonder = +[stats] for every known Natural Wonder = [stats] für jedes bekannte Naturwunder [relativeAmount]% Yield from every [tileFilter/buildingFilter] = [relativeAmount]% Ertrag von jedem [tileFilter/buildingFilter] Askia = Askia diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 8a97c1e976..9f91c0c92e 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -818,8 +818,7 @@ We have captured a barbarian encampment and recovered [goldAmount] gold! = Abbia An enemy [unitType] has joined us! = L'unità nemica [unitType] si è unita a noi! After an unknown civilization entered the [eraName], we have recruited [spyName] as a spy! = Con l'entrata nell'[eraName] di una civiltà ignota, abbiamo reclutato una nuova spia, [spyName]! We have recruited [spyName] as a spy! = Abbiamo reclutato una nuova spia, [spyName]! - # Requires translation! -[unitName] can be promoted! = +[unitName] can be promoted! = L'unità [unitName] può essere promossa! # This might be needed for a rewrite of Germany's unique - see #7376 A barbarian [unitType] has joined us! = L'unità barbarica [unitType] si è unita a noi! @@ -1336,8 +1335,7 @@ Defence bonus = Bonus di Difesa Movement cost = Costi di movimento for = per Missing translations: = Traduzioni mancanti: - # Requires translation! -Screen Size = +Screen Size = Dimensioni schermo Tileset = Set celle Unitset = Set unità UI Skin = Skin UI @@ -3183,8 +3181,7 @@ Las Palmas = Las Palmas Tenerife = Tenerife Spain = Spagna 100 Gold for discovering a Natural Wonder (bonus enhanced to 500 Gold if first to discover it) = 100 Oro quando scopri una Meraviglia Naturale (500 se la scopri per primo) - # Requires translation! -[stats] for every known Natural Wonder = +[stats] for every known Natural Wonder = [stats] per ogni Meraviglia Naturale nota [relativeAmount]% Yield from every [tileFilter/buildingFilter] = [relativeAmount]% resa per ogni [tileFilter/buildingFilter] Askia = Askia diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 94825bd1ed..f7ba9a73b0 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -814,7 +814,7 @@ An enemy [unitType] has joined us! = ¡Un [unitType] enemigo ha cambiado de band After an unknown civilization entered the [eraName], we have recruited [spyName] as a spy! = Después de que una civilización desconocida entró en la [eraName], ¡hemos reclutado un Espía llamado [spyName]! We have recruited [spyName] as a spy! = ¡Hemos reclutado a [spyName] como Espía! # Requires translation! -[unitName] can be promoted! = +[unitName] can be promoted! = ¡Asenso disponible para [unitName]! # This might be needed for a rewrite of Germany's unique - see #7376 A barbarian [unitType] has joined us! = ¡Un [unitType] bárbaro se ha unido a nosotros! @@ -1332,7 +1332,7 @@ Movement cost = Coste de movimiento for = para Missing translations: = Traducciones faltantes: # Requires translation! -Screen Size = +Screen Size = Tamaño de Pantalla Tileset = Aspecto de Casillas Unitset = Aspecto de Unidades UI Skin = Aspecto de la IU @@ -1982,7 +1982,7 @@ Broadcast Tower = Torre de Emisión Eiffel Tower = Torre Eiffel 'We live only to discover beauty, all else is a form of waiting' - Kahlil Gibran = "Vivimos sólo para descubrir la belleza, todo lo demás es una forma de esperar." - Kahlil Gibrán # Requires translation! -[stats] per [amount] social policies adopted = +[stats] per [amount] social policies adopted = [stats] por cada [amount] políticas sociales adoptadas Statue of Liberty = Estatua de la Libertad 'Give me your tired, your poor, your huddled masses yearning to breathe free, the wretched refuse of your teeming shore. Send these, the homeless, tempest-tossed to me, I lift my lamp beside the golden door!' - Emma Lazarus = "Dame tus pobres, agotados, tus innumerables masas que aspiran a vivir libres, los desgraciados rechazan tus orillas superpobladas. Envíamelos, los desheredados, que la tormenta los traiga de vuelta, ¡pongo mi lampara sobre la puerta de oro!" - Emma Larazo @@ -3170,7 +3170,7 @@ Tenerife = Tenerife Spain = España 100 Gold for discovering a Natural Wonder (bonus enhanced to 500 Gold if first to discover it) = 100 de ¤Oro por descubrir una Maravilla Natural (bonificación de 500 ¤Oro si es la primera en descubrirla) # Requires translation! -[stats] for every known Natural Wonder = +[stats] for every known Natural Wonder = [stats] por cada Maravilla Natural descubierta [relativeAmount]% Yield from every [tileFilter/buildingFilter] = [relativeAmount]% al Rendimiento de cada [tileFilter/buildingFilter] Askia = Askia @@ -6149,7 +6149,7 @@ when between [amount] and [amount2] Happiness = cuando entre [amount] y [amount2 when below [amount] Happiness = cuando por debajo de[amount] felicidad during the [era] = durante el [era] # Requires translation! -if starting in the [era] = +if starting in the [era] = si se empieza en la [era] if no other Civilization has researched this = si nadie más la ha investigado after adopting [policy] = después de adoptar [policy] before founding a Pantheon = antes de fundar un Panteón diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index e99f122552..13538ead40 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.7.0" const val appName = "Unciv" - const val appCodeNumber = 773 - const val appVersion = "4.3.6-patch1" + const val appCodeNumber = 774 + const val appVersion = "4.3.7" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 0ef06dcf90..13a7a21967 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,21 @@ +## 4.3.7 + +Resolved - 'loading' popup between turns only appears if there's a significant delay + +Auto-Screenshot for f-droid as well + +xyz server as default multiplayer server + +Automated screenshots! :D + +Fixes for Repair + +Fixed all CSs getting unique units and unique luxuries + +UnitActions seprated into own atlas - By vegeta1k95 + +added button to paste from clipboard when downloading a mod - By alexban011 + ## 4.3.6 Resolved single turn repair, repair turn inconsistencies diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index bff3d58111..d87e454d83 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -470,7 +470,7 @@ class UncivGame(parameters: UncivGameParameters) : Game() { companion object { //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT - val VERSION = Version("4.3.6", 772) + val VERSION = Version("4.3.7", 774) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/774.txt b/fastlane/metadata/android/en-US/changelogs/774.txt new file mode 100644 index 0000000000..8713a3c460 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/774.txt @@ -0,0 +1,17 @@ + + +Resolved - 'loading' popup between turns only appears if there's a significant delay + +Auto-Screenshot for f-droid as well + +xyz server as default multiplayer server + +Automated screenshots! :D + +Fixes for Repair + +Fixed all CSs getting unique units and unique luxuries + +UnitActions seprated into own atlas - By vegeta1k95 + +added button to paste from clipboard when downloading a mod - By alexban011 \ No newline at end of file