Skip to content

Commit 997f72d

Browse files
yairm210OuazRanbutXenia2003
authored
Version rollout (#14734)
* Bump version and create initial changelog entry * Update French.properties (#14733) * Update Brazilian_Portuguese.properties (#14726) * Update Indonesian.properties (#14721) --------- Co-authored-by: yairm210 <yairm210@users.noreply.github.com> Co-authored-by: Ouaz <Ouaz@users.noreply.github.com> Co-authored-by: Vitor Gabriel <Ranbut_Beater@protonmail.com> Co-authored-by: X2003 <158255876+Xenia2003@users.noreply.github.com>
1 parent f53e44c commit 997f72d

7 files changed

Lines changed: 98 additions & 35 deletions

File tree

android/assets/jsons/translations/Brazilian_Portuguese.properties

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -219,16 +219,11 @@ Current leader(s): [leaders], you: [yourScore] = Líder(es) atual(is): [leaders]
219219
[civInfo] with [value] [valueType] = [civInfo] com [value] [valueType]
220220

221221
Demands = Exigências
222-
# Requires translation!
223-
ACCEPTING DEMAND =
224-
# Requires translation!
225-
REJECTING DEMAND =
226-
# Requires translation!
227-
We will comply, but our consent is given grudgingly. =
228-
# Requires translation!
229-
Your demands are in poor taste. We shall decide this matter on our own. =
230-
# Requires translation!
231-
Did you really expect us to bend to such brazen demands? =
222+
ACCEPTING DEMAND = ACEITANDO A EXIGÊNCIA
223+
REJECTING DEMAND = REJEITANDO A EXIGÊNCIA
224+
We will comply, but our consent is given grudgingly. = Iremos acatar o pedido, mas o nosso consentimento é dado a contragosto.
225+
Your demands are in poor taste. We shall decide this matter on our own. = Suas exigências são de mau gosto. Decidiremos essa questão por conta própria.
226+
Did you really expect us to bend to such brazen demands? = Você realmente esperava que cedêssemos a exigências tão descaradas?
232227

233228
I've been informed that my armies have taken tribute from [civName], a city-state under your protection.\nI assure you, this was quite unintentional, and I hope that this does not serve to drive us apart. = Fui informado de que meus exércitos cobraram tributo de [civName], uma Cidade-Estado sob sua proteção.\nEu afirmo para você, que isso foi não intencional, e espero que isso não sirva para nos separar.
234229
We asked [civName] for a tribute recently and they gave in.\nYou promised to protect them from such things, but we both know you cannot back that up. = Nós cobramos tributos de [civName] recentemente e eles cederam.\nVocê prometeu protege-los, mas ambos sabemos que você consegue fazer isso.
@@ -2517,10 +2512,8 @@ on foreign continents = em continentes estrangeiros
25172512
when adjacent to a [mapUnitFilter] unit = quando adjacente a uma unidade [mapUnitFilter]
25182513
when above [positiveAmount] HP = quando acima de [positiveAmount] HP
25192514
when below [positiveAmount] HP = quando abaixo de [positiveAmount] HP
2520-
# Requires translation!
2521-
when below [positiveAmount] movement =
2522-
# Requires translation!
2523-
when above [positiveAmount] movement =
2515+
when below [positiveAmount] movement = quando abaixo de [positiveAmount] de movimento
2516+
when above [positiveAmount] movement = quando acima de [positiveAmount] de movimento
25242517
if it hasn't used other actions yet = se ainda não usou outras ações
25252518
when stacked with a [mapUnitFilter] unit = quando empilhado com uma unidade [mapUnitFilter]
25262519
when not stacked with a [mapUnitFilter] unit = quando não estiver empilhado com uma unidade [mapUnitFilter]
@@ -2606,8 +2599,7 @@ upon adopting [policy/belief] = ao adotar [policy/belief]
26062599
upon declaring war on [civFilter] Civilizations = ao declarar guerra às civilizações [civFilter]
26072600
upon being declared war on by [civFilter] Civilizations = ao ser declarada guerra por civilizações [civFilter]
26082601
upon entering a war with [civFilter] Civilizations = ao entrar em guerra com civilizações [civFilter]
2609-
# Requires translation!
2610-
upon signing a peace treaty with [civFilter] Civilizations =
2602+
upon signing a peace treaty with [civFilter] Civilizations = ao assinar um tratado de paz com as civilizações [civFilter]
26112603
upon declaring friendship = ao declarar amizade
26122604
upon declaring a defensive pact = ao declarar um pacto defensivo
26132605
upon entering a Golden Age = ao entrar em uma Era de Ouro

android/assets/jsons/translations/French.properties

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,15 +220,15 @@ Current leader(s): [leaders], you: [yourScore] = En tête : [leaders]; Votre sco
220220

221221
Demands = Demandes
222222
# Requires translation!
223-
ACCEPTING DEMAND =
223+
ACCEPTING DEMAND = DEMANDE ACCEPTÉE
224224
# Requires translation!
225-
REJECTING DEMAND =
225+
REJECTING DEMAND = DEMANDE REJETÉE
226226
# Requires translation!
227-
We will comply, but our consent is given grudgingly. =
227+
We will comply, but our consent is given grudgingly. = Nous respecterons votre demande, mais sans grand enthousiasme.
228228
# Requires translation!
229-
Your demands are in poor taste. We shall decide this matter on our own. =
229+
Your demands are in poor taste. We shall decide this matter on our own. = Vos demandes sont de mauvais aloi. Nous ferons ce qu'il nous sied.
230230
# Requires translation!
231-
Did you really expect us to bend to such brazen demands? =
231+
Did you really expect us to bend to such brazen demands? = Pensiez-vous vraiment que nous allions céder à vos exigences éhontées ?
232232

233233
I've been informed that my armies have taken tribute from [civName], a city-state under your protection.\nI assure you, this was quite unintentional, and I hope that this does not serve to drive us apart. = J'ai appris que mes armées ont obtenu un tribut de [civName], une cité-état sous votre protection.\nSoyez assuré que cela était une méprise, et j'espère que notre relation n'en sera pas entachée.
234234
We asked [civName] for a tribute recently and they gave in.\nYou promised to protect them from such things, but we both know you cannot back that up. = Nous avons demandé récemment un tribut à [civName] et ils ont fini par obéir.\nVous aviez promis de les protéger contre de tels agissements, mais nous savons tous deux que vous ne pouviez tenir parole.
@@ -2518,9 +2518,9 @@ when adjacent to a [mapUnitFilter] unit = adjacente(s) à une unité [mapUnitFil
25182518
when above [positiveAmount] HP = quand à plus de [positiveAmount] PV
25192519
when below [positiveAmount] HP = quand à moins de [positiveAmount] PV
25202520
# Requires translation!
2521-
when below [positiveAmount] movement =
2521+
when below [positiveAmount] movement = quand à moins de [positiveAmount] Mouvements
25222522
# Requires translation!
2523-
when above [positiveAmount] movement =
2523+
when above [positiveAmount] movement = quand à plus de [positiveAmount] Mouvements
25242524
if it hasn't used other actions yet = si aucune autre action n'a été utilisée auparavant
25252525
when stacked with a [mapUnitFilter] unit = quand empilé avec une unité [mapUnitFilter]
25262526
when not stacked with a [mapUnitFilter] unit = quand non empilé avec une unité [mapUnitFilter]
@@ -2607,7 +2607,7 @@ upon declaring war on [civFilter] Civilizations = en déclarant la guerre à des
26072607
upon being declared war on by [civFilter] Civilizations = en s'étant fait déclarer la guerre par des civilisations [civFilter]
26082608
upon entering a war with [civFilter] Civilizations = en participant à une guerre avec des civilisations [civFilter]
26092609
# Requires translation!
2610-
upon signing a peace treaty with [civFilter] Civilizations =
2610+
upon signing a peace treaty with [civFilter] Civilizations = en signant un traité de paix avec les civilisations [civFilter]
26112611
upon declaring friendship = en signant une déclaration d'amitié
26122612
upon declaring a defensive pact = en signant un pacte de défense
26132613
upon entering a Golden Age = en entrant dans un Âge d'Or

android/assets/jsons/translations/Indonesian.properties

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,15 +220,15 @@ Current leader(s): [leaders], you: [yourScore] = Pemimpin saat ini: [leaders], k
220220

221221
Demands = Tuntutan
222222
# Requires translation!
223-
ACCEPTING DEMAND =
223+
ACCEPTING DEMAND = MENERIMA TUNTUTAN
224224
# Requires translation!
225-
REJECTING DEMAND =
225+
REJECTING DEMAND = MENOLAK TUNTUTAN
226226
# Requires translation!
227-
We will comply, but our consent is given grudgingly. =
227+
We will comply, but our consent is given grudgingly. = Kami akan menurutinya, tetapi kami enggan memberikan persetujuan kami.
228228
# Requires translation!
229-
Your demands are in poor taste. We shall decide this matter on our own. =
229+
Your demands are in poor taste. We shall decide this matter on our own. = Tuntutanmu sangat tidak sopan. Kami akan memutuskan hal ini sendiri.
230230
# Requires translation!
231-
Did you really expect us to bend to such brazen demands? =
231+
Did you really expect us to bend to such brazen demands? = Apakah kau mengharapkan kami untuk menuruti tuntutan-tuntutan kurang ajar seperti itu?
232232

233233
I've been informed that my armies have taken tribute from [civName], a city-state under your protection.\nI assure you, this was quite unintentional, and I hope that this does not serve to drive us apart. = Aku telah diberitahu bahwa pasukanku telah menagih upeti dari [civName], negara-kota yang berada di bawah perlindunganmu.\nAku bisa menjamin bahwa ini bukan hal yang disengaja, dan aku harap hal ini tidak merusak hubungan kita.
234234
We asked [civName] for a tribute recently and they gave in.\nYou promised to protect them from such things, but we both know you cannot back that up. = Kami meminta [civName] untuk mengirimkan upeti baru-baru ini dan mereka mengirimkannya.\nEngkau telah berjanji untuk melindungi mereka dari hal-hal seperti itu, tetapi kita berdua tahu bahwa kamu tidak mampu mendukungnya.
@@ -2518,9 +2518,9 @@ when adjacent to a [mapUnitFilter] unit = saat di dekat unit [mapUnitFilter]
25182518
when above [positiveAmount] HP = saat di atas [positiveAmount] HP
25192519
when below [positiveAmount] HP = saat di bawah [positiveAmount] HP
25202520
# Requires translation!
2521-
when below [positiveAmount] movement =
2521+
when below [positiveAmount] movement = saat di bawah [positiveAmount] pergerakan
25222522
# Requires translation!
2523-
when above [positiveAmount] movement =
2523+
when above [positiveAmount] movement = saat di atas [positiveAmount] pergerakan
25242524
if it hasn't used other actions yet = jika belum melakukan tindakan-tindakan lainnya
25252525
when stacked with a [mapUnitFilter] unit = saat ditumpuk bersama unit [mapUnitFilter]
25262526
when not stacked with a [mapUnitFilter] unit = saat tidak ditumpuk bersama unit [mapUnitFilter]
@@ -2607,7 +2607,7 @@ upon declaring war on [civFilter] Civilizations = setelah menyatakan perang terh
26072607
upon being declared war on by [civFilter] Civilizations = setelah dinyatakannya perang oleh Peradaban [civFilter]
26082608
upon entering a war with [civFilter] Civilizations = setelah memasuki perang dengan Peradaban [civFilter]
26092609
# Requires translation!
2610-
upon signing a peace treaty with [civFilter] Civilizations =
2610+
upon signing a peace treaty with [civFilter] Civilizations = setelah menandatangani perjanjian damai dengan Peradaban [civFilter]
26112611
upon declaring friendship = setelah menyatakan persahabatan
26122612
upon declaring a defensive pact = setelah menyatakan pakta pertahanan
26132613
upon entering a Golden Age = setelah memasuki Masa Keemasan

buildSrc/src/main/kotlin/BuildConfig.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.unciv.build
33

44
object BuildConfig {
55
const val appName = "Unciv"
6-
const val appCodeNumber = 1211
7-
const val appVersion = "4.20.0"
6+
const val appCodeNumber = 1212
7+
const val appVersion = "4.20.1"
88
const val identifier = "com.unciv.app"
99
}

changelog.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
## 4.20.1
2+
3+
perf(ram): Remove memory allocations when retrieving units of an empty tile
4+
5+
perf(ram): Reduce memory allocations in city presenter on worldscreen updates, when the city remains the same
6+
7+
perf(ram): Reduce memory allocations for clicking on minimap tiles
8+
9+
perf(ram): Reduce memory allocations for clicking on tiles significantly - accounts for 40% of ALL GAME RAM (!!!) on a large game I tested
10+
11+
perf(ram): Reduce memory allocations for initial game load
12+
13+
Resolved - barbarian encampments removed when tile enters civ territory
14+
15+
.
16+
17+
Resolved - diplomacy action randomness is seeded
18+
19+
Resolved - peace/war declarations on a third civ are not considered trade "gifts"
20+
21+
Resolved - run construction button DTO construction calc a second time upon error to "catch" comodification errors
22+
23+
chore: Add "is A-star pathing enabled" to crash reports since it's a common question
24+
25+
Resolved - buildings with "Moves to new capital when capital changes" not destroyed when city is captured
26+
27+
Resolved - max JVM heap space *actually* increased to 4GB for Desktop packed executables
28+
29+
Resolved - notifications are shown in UI in order of addition
30+
31+
By unciv-loof:
32+
- Denouncement popups with customizable leader messages and audio hook
33+
- Autosave on turn 0
34+
35+
[Lint] Use full funtion bodies in UnitPresenter - By SeventhM
36+
137
## 4.20.0
238

339
By unciv-loof:

core/src/com/unciv/UncivGame.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
466466

467467
companion object {
468468
//region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT
469-
val VERSION = Version("4.20.0", 1211)
469+
val VERSION = Version("4.20.1", 1212)
470470
//endregion
471471

472472
/** Global reference to the one Gdx.Game instance created by the platform launchers - do not use without checking [isCurrentInitialized] first. */
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
2+
3+
perf(ram): Remove memory allocations when retrieving units of an empty tile
4+
5+
perf(ram): Reduce memory allocations in city presenter on worldscreen updates, when the city remains the same
6+
7+
perf(ram): Reduce memory allocations for clicking on minimap tiles
8+
9+
perf(ram): Reduce memory allocations for clicking on tiles significantly - accounts for 40% of ALL GAME RAM (!!!) on a large game I tested
10+
11+
perf(ram): Reduce memory allocations for initial game load
12+
13+
Resolved - barbarian encampments removed when tile enters civ territory
14+
15+
.
16+
17+
Resolved - diplomacy action randomness is seeded
18+
19+
Resolved - peace/war declarations on a third civ are not considered trade "gifts"
20+
21+
Resolved - run construction button DTO construction calc a second time upon error to "catch" comodification errors
22+
23+
chore: Add "is A-star pathing enabled" to crash reports since it's a common question
24+
25+
Resolved - buildings with "Moves to new capital when capital changes" not destroyed when city is captured
26+
27+
Resolved - max JVM heap space *actually* increased to 4GB for Desktop packed executables
28+
29+
Resolved - notifications are shown in UI in order of addition
30+
31+
By unciv-loof:
32+
- Denouncement popups with customizable leader messages and audio hook
33+
- Autosave on turn 0
34+
35+
[Lint] Use full funtion bodies in UnitPresenter - By SeventhM

0 commit comments

Comments
 (0)