Skip to content

Commit

Permalink
Version rollout (#11602)
Browse files Browse the repository at this point in the history
* Bump version and create initial changelog entry

* Update French.properties (#11599)

* Update Indonesian.properties (#11598)

* Update Indonesian.properties

Translated all the new words and corrected the mistranslated words.

* Update Indonesian.properties

* Update Indonesian.properties

* Update Brazilian_Portuguese.properties (#11595)

* Update Italian.properties (#11594)

* Update Ukrainian translations (#11593)

Co-authored-by: Kostiantyn Ko <mormat.iam@gmail.com>

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: X2003 <158255876+Xenia2003@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>
Co-authored-by: Kostiantyn Ko <test9@mormat.name>
Co-authored-by: Kostiantyn Ko <mormat.iam@gmail.com>
  • Loading branch information
8 people committed May 16, 2024
1 parent 55201f9 commit 99801c7
Show file tree
Hide file tree
Showing 9 changed files with 84 additions and 69 deletions.
15 changes: 5 additions & 10 deletions android/assets/jsons/translations/Brazilian_Portuguese.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1774,12 +1774,9 @@ Your spy [spyName] was killed trying to steal Technology in [cityName]! = Seu es

# Rigging elections
Your spy successfully rigged the election in [cityName]! = Seu espião fraudou com sucesso as eleições em [cityName]!
# Requires translation!
Your spy lost the election in [cityStateName] to [civName]! =
# Requires translation!
The election in [cityStateName] were rigged by [civName]! =
# Requires translation!
Your spy lost the election in [cityName]! =
Your spy lost the election in [cityStateName] to [civName]! = Seu espião perdeu a eleição em [cityStateName] para [civName]!
The election in [cityStateName] were rigged by [civName]! = As eleições em [cityStateName] foram fraudadas pelo [civName]!
Your spy lost the election in [cityName]! = Seu espião perdeu a eleição em [cityName]!

# Spy fleeing city
After the city of [cityName] was destroyed, your spy [spyName] has fled back to our hideout. = Depois que a cidade de [cityName] foi destruída, seu espião [spyName] fugiu de volta para o nosso esconderijo.
Expand Down Expand Up @@ -2385,8 +2382,7 @@ Free Great Person = Grande Personlidade Gratuita
Discover [tech] = Descobre [tech]
Adopt [policy] = Adota [policy]
Remove [policy] = Remover [policy]
# Requires translation!
Remove [policy] and refund [amount]% of its cost =
Remove [policy] and refund [amount]% of its cost = Remover [policy] e reembolsar [amount]% do seu custo
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]
Expand Down Expand Up @@ -2617,8 +2613,7 @@ Establishing Network = Estabelecendo Rede
Observing City = Observando a Cidade
Stealing Tech = Roubando Tecnologia
Rigging Elections = Fraudando Eleições
# Requires translation!
Counter-intelligence =
Counter-intelligence = Contra-inteligência
Dead = Morto
Expand Down
12 changes: 6 additions & 6 deletions android/assets/jsons/translations/French.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1773,13 +1773,13 @@ Your spy [spyName] stole the Technology [techName] from [cityName]! = Votre espi
Your spy [spyName] was killed trying to steal Technology in [cityName]! = Votre espion [spyName] a été neutralisé en essayant de voler une technologie dans [cityName] !
# Rigging elections
Your spy successfully rigged the election in [cityName]! = Votre espion a truqué les élections avec succès dans [cityName] !
Your spy successfully rigged the election in [cityName]! = Votre espion a truqué les élections avec succès à [cityName] !
# Requires translation!
Your spy lost the election in [cityStateName] to [civName]! =
Your spy lost the election in [cityStateName] to [civName]! = Votre espion a été doublé par [civName] pour truquer les élections à [cityStateName] !
# Requires translation!
The election in [cityStateName] were rigged by [civName]! =
The election in [cityStateName] were rigged by [civName]! = Les élections à [cityStateName] ont été truquées par [civName] !
# Requires translation!
Your spy lost the election in [cityName]! =
Your spy lost the election in [cityName]! = Votre espion n'a pas réussi à truquer les élections à [cityName] !

# Spy fleeing city
After the city of [cityName] was destroyed, your spy [spyName] has fled back to our hideout. = Après que la ville de [cityName] ait été détruite, notre espion [spyName] a fui vers son repaire !
Expand Down Expand Up @@ -2386,7 +2386,7 @@ Discover [tech] = Découvrir [tech]
Adopt [policy] = Adopter [policy]
Remove [policy] = Abandonner [policy]
# Requires translation!
Remove [policy] and refund [amount]% of its cost =
Remove [policy] and refund [amount]% of its cost = Abandonner [policy] et récupérer [amount]% de son coût
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]
Expand Down Expand Up @@ -2618,7 +2618,7 @@ Observing City = Observe une ville
Stealing Tech = Vole une technologie
Rigging Elections = Truque les élections
# Requires translation!
Counter-intelligence =
Counter-intelligence = Contre-espionnage
Dead = Neutralisé
Expand Down
42 changes: 21 additions & 21 deletions android/assets/jsons/translations/Indonesian.properties

Large diffs are not rendered by default.

38 changes: 16 additions & 22 deletions android/assets/jsons/translations/Italian.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1330,7 +1330,7 @@ Occupied! = Occupa!
Attack = Attacca
Bombard = Bombarda
NUKE = NUCLEARIZZA!
Captured! = Cattura!
Captured! = Conquista!
Cannot gain more XP from Barbarians = Non puoi ottenere più XP dai barbari

# Battle modifier categories
Expand Down Expand Up @@ -1474,17 +1474,17 @@ Status\n(puppet, resistance or being razed) = Status\n(fantoccio, resistenza o s
Built [building] = Costruisci [building]
Add all [comment] in capital = Porta tutte le [comment] nella capitale
Destroy all players = Distruggi tutti i giocatori avversari
Capture all capitals = Cattura tutte le capitali
Capture all capitals = Conquista tutte le capitali
Complete [amount] Policy branches = Completa [amount] rami delle politiche sociali
You have won a [victoryType] Victory! = Hai ottenuto una vittoria [victoryType]!
[civilization] has won a [victoryType] Victory! = La civiltà [civilization] ha ottenuto una vittoria [victoryType]!
Your civilization stands above all others! The exploits of your people shall be remembered until the end of civilization itself! = Dopo secoli di evoluzione della storia dell'umanità, la tua civiltà si erge sopra tutte le altre! Le imprese del tuo popolo saranno ricordate fino alla fine della civiltà stessa!
Your civilization stands above all others! The exploits of your people shall be remembered until the end of civilization itself! = Dopo secoli di evoluzione della storia dell'umanità, la tua nazione si erge sopra tutte le altre! Le imprese del tuo popolo saranno ricordate fino alla fine della civiltà stessa!
You have been defeated. Your civilization has been overwhelmed by its many foes. But your people do not despair, for they know that one day you shall return - and lead them forward to victory! = Sei stato sconfitto. La tua civiltà è stata spazzata via dai suoi nemici. Ma il tuo popolo non dispera, perché sa che un giorno tornerai... e lo condurrai alla vittoria!
One more turn...! = Aspetta! Solo un altro turno...
Destroy [civName] = Distruggi [civName]
Capture [cityName] = Cattura [cityName]
Capture [cityName] = Conquista [cityName]
Destroy ? * [civName] = Distruggere ? * [civName]
Capture ? * [cityName] = Catturare ? * [cityName]
Capture ? * [cityName] = Conquistare ? * [cityName]
Majority religion of ? * [civName] = Religione prevalente di ? * [civName]
Our status = I tuoi progressi
Global status = Progressi globali
Expand Down Expand Up @@ -1774,12 +1774,9 @@ Your spy [spyName] was killed trying to steal Technology in [cityName]! = La tua

# Rigging elections
Your spy successfully rigged the election in [cityName]! = La tua spia è riuscita a dirottare le elezioni a [cityName]!
# Requires translation!
Your spy lost the election in [cityStateName] to [civName]! =
# Requires translation!
The election in [cityStateName] were rigged by [civName]! =
# Requires translation!
Your spy lost the election in [cityName]! =
Your spy lost the election in [cityStateName] to [civName]! = La tua spia ha perso le elezioni a [cityStateName] contro [civName]!
The election in [cityStateName] were rigged by [civName]! = [civName] ha truccato le elezioni a [cityStateName]!
Your spy lost the election in [cityName]! = La tua spia ha perso le elezioni a [cityName]!

# Spy fleeing city
After the city of [cityName] was destroyed, your spy [spyName] has fled back to our hideout. = Dopo la distruzione di [cityName], la tua spia [spyName] è tornata nel tuo covo.
Expand Down Expand Up @@ -1914,7 +1911,7 @@ Gain a free [building] [cityFilter] = Ottieni [building] gratis [cityFilter]
Only available after [] turns = Disponibile solo tra [] turni
This Unit upgrades for free = L'Unità è aggiornabile grauitamente
[stats] when a city adopts this religion for the first time = [stats] quando una città adotta questa religione per la prima volta
Never destroyed when the city is captured = Mai distrutto quando la città viene catturata
Never destroyed when the city is captured = Mai distrutto quando la città viene conquistata
Invisible to others = Invisibile per le altre unità
# Unused Resources
Expand Down Expand Up @@ -2120,8 +2117,8 @@ Must not be next to [tileFilter] = Non deve trovarsi presso [tileFilter]
Indicates the capital city = Indica la città capitale
Moves to new capital when capital changes = Si sposta verso la nuova capitale quando la si cambia
Provides 1 extra copy of each improved luxury resource near this City = Concede 1 copia aggiuntiva di ogni risorsa di lusso migliorata vicino alla città
Destroyed when the city is captured = Distrutto quando la città viene catturata
Doubles Gold given to enemy if city is captured = Raddoppia l'Oro dato al nemico se la Città viene catturata
Destroyed when the city is captured = Distrutto quando la città viene conquistata
Doubles Gold given to enemy if city is captured = Raddoppia l'Oro dato al nemico se la Città viene conquistata
Remove extra unhappiness from annexed cities = Elimina l'Infelicità extra proveniente dalle Città occupate
Connects trade routes over water = Consente le rotte commerciali marittime
Automatically built in all cities where it is buildable = Costruito automaticamente in tutte le città dove è costruibile
Expand Down Expand Up @@ -2175,7 +2172,7 @@ No defensive terrain penalty = Nessuna penalità difensiva di terreno
Damage is ignored when determining unit Strength = Le unità combattono al pieno delle loro forze anche se danneggiate
Uncapturable = Non catturabile
May withdraw before melee ([amount]%) = Può ritirarsi da un attacco da mischia ([amount]%)
Unable to capture cities = Non può catturare città
Unable to capture cities = Non può conquistare città
Unable to pillage tiles = Non può saccheggiare miglioramenti
No movement cost to pillage = Nessun costo di movimento per il saccheggio
Can move after attacking = Può muoversi dopo aver attaccato
Expand Down Expand Up @@ -2385,8 +2382,7 @@ Free Great Person = Ottieni un Grande Personaggio gratuito
Discover [tech] = Scopri [tech]
Adopt [policy] = Adotta [policy]
Remove [policy] = Rimuovi [policy]
# Requires translation!
Remove [policy] and refund [amount]% of its cost =
Remove [policy] and refund [amount]% of its cost = Rimuovi [policy] e rimborsa il [amount]% del suo costo
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]
Expand Down Expand Up @@ -2619,8 +2615,7 @@ Establishing Network = Stabilisce una rete di spie
Observing City = Osserva la città
Stealing Tech = Ruba una tecnologia
Rigging Elections = Manipola le elezioni
# Requires translation!
Counter-intelligence =
Counter-intelligence = Controspionaggio
Dead = Morta
Expand Down Expand Up @@ -5414,7 +5409,7 @@ You have achieved victory through mastery of Science! You have conquered the mys
Complete 5 policy branches and\nbuild the Utopia Project to win! = Completa 5 rami delle politiche sociali\ne costruisci il Progetto Utopia per vincere!
You have achieved victory through the awesome power of your Culture. Your civilization's greatness - the magnificence of its monuments and the power of its artists - have astounded the world! Poets will honor you as long as beauty brings gladness to a weary heart. = Hai ottenuto la vittoria attraverso il maestoso potere della tua cultura. La grandezza della tua civiltà, la magnificenza dei suoi monumenti e il talento dei suoi artisti ha sbalordito il mondo! I poeti ti ononeranno per sempre, finché la bellezza continuerà a portare sollievo ai cuori affaticati.
Capture all enemy Capitals\nto win! = Vinci catturando\ntutte le capitali nemiche!
Capture all enemy Capitals\nto win! = Vinci conquistando\ntutte le capitali nemiche!
The world has been convulsed by war. Many great and powerful civilizations have fallen, but you have survived - and emerged victorious! The world will long remember your glorious triumph! = Il mondo è stato straziato dalla guerra. Molte grandi e potenti civiltà sono cadute, ma tu sei sopravvissuto e sei emerso vittorioso. Il mondo ricorderà a lungo il tuo glorioso trionfo!
Build the UN and be voted\nworld leader to win! = Costruisci le Nazioni Unite\ne diventa Leader Mondiale!
Expand Down Expand Up @@ -6874,8 +6869,7 @@ Right-click or long press multiple techs to append them to the research queue, w
Overview screens = Schermata panoramiche
Reveal known resources on world screen = Rivela risorse note sulla schermata mondiale
In the Resources overview, click on a resource icon to center the world screen on tiles already discovered and providing this resource. = Nella panoramica Risorse, clicca su un'icona per centrare la schermata mondiale su caselle già scoperte in possesso di tale risorsa.
# Requires translation!
Alternatively, click on the "Unimproved" number to center the world screen only on owned (by you or your allied City-states) tiles where the resource is not improved. =
Alternatively, click on the "Unimproved" number to center the world screen only on owned (by you or your allied City-states) tiles where the resource is not improved. = In alternativa, clicca sul numero "Non migliorate" al centro della schermata mondiale solo sulle caselle possedute (da te o da città-stato tue alleate) dove la risorsa non è migliorata.
If more than one tile is available, click repeatedly on the notification to cycle through all of them. = Se esiste più di una casella di tale tipo, clicca ripetutamente sulla notifica per ciclare tra di esse.
Show diagram line colors = Mostra colori nei diagrammi
In Politics overview > Show diagram, you can click anywhere inside the diagram to display a table listing all relationship line colors and their meaning. = Nella schermata Politica > Mostra diagramma, puoi cliccare dovi vuoi all'interno del diagramma per mostrare una tabella che visualizza tutti i colori dei rapporti e cosa vogliono dire.
Expand Down
13 changes: 6 additions & 7 deletions android/assets/jsons/translations/Ukrainian.properties
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ Auto-assign city production = Автоматичне виробництво у
Auto-build roads = Автоматичне будівництво доріг
Automated workers replace improvements = Автоматизовані працівники замінюють покращення
Automated units move on turn start = Автоматичний рух підрозділів на початку ходу
Automated units can upgrade = Автоматизовані підрозділи можуть вдосконалюватись
Automated units can upgrade = Автоматизовані підрозділи можуть покращуватись
Automated units choose promotions = Автоматизовані підрозділи самі обирають підвищення
Cities auto-bombard at end of turn = Міста автоматично обстрілюють ворога в кінці ходу
Order trade offers by amount = Сортувати торгові пропозиції за кількістю
Expand Down Expand Up @@ -1777,11 +1777,11 @@ Your spy [spyName] was killed trying to steal Technology in [cityName]! = Ваш
# Rigging elections
Your spy successfully rigged the election in [cityName]! = Ваш шпигун успішно сфальсифікував вибори в [cityName]!
# Requires translation!
Your spy lost the election in [cityStateName] to [civName]! =
Your spy lost the election in [cityStateName] to [civName]! = Ваш шпигун програв вибори в [cityStateName] нації [civName]!
# Requires translation!
The election in [cityStateName] were rigged by [civName]! =
The election in [cityStateName] were rigged by [civName]! = Вибори в [cityStateName] були сфальсифіковані нацією [civName]!
# Requires translation!
Your spy lost the election in [cityName]! =
Your spy lost the election in [cityName]! = Ваш шпигун програв вибори в [cityName]!

# Spy fleeing city
After the city of [cityName] was destroyed, your spy [spyName] has fled back to our hideout. = Після знищення міста [cityName], ваш шпигун [spyName] втік назад в укриття.
Expand Down Expand Up @@ -2388,7 +2388,7 @@ Discover [tech] = Дослідити Технологію [tech]
Adopt [policy] = Прийняти Політику [policy]
Remove [policy] = Видалити [policy]
# Requires translation!
Remove [policy] and refund [amount]% of its cost =
Remove [policy] and refund [amount]% of its cost = Видалити [policy] і повернути [amount]% від її вартості
Free Technology = Надає безкоштовну технологію
[positiveAmount] Free Technologies = [positiveAmount] безкоштовних Технологій
[positiveAmount] free random researchable Tech(s) from the [era] = [positiveAmount] безкоштовних випадкових технологій з [era]
Expand Down Expand Up @@ -2620,7 +2620,7 @@ Observing City = Спостерігати за містом
Stealing Tech = Вкрасти технологію
Rigging Elections = Фальсифікувати вибори
# Requires translation!
Counter-intelligence =
Counter-intelligence = Контр-розвідка
Dead = Мертвий


Expand Down Expand Up @@ -6943,4 +6943,3 @@ Miscellaneous = Різне
External links = Зовнішні посилання
External links support right-click or long press to copy the link to the clipboard instead of launching the browser. = Зовнішні посилання підтримують правий клік або довге натиснення для копіювання посилання в буфер обміну замість відкриття браузера.
Example: The 'Open Github page' button on the Mod management screen. = Приклад: кнопка 'Відкрити сторінку Github' на екрані керування Модами.

4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/BuildConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package com.unciv.build
object BuildConfig {
const val kotlinVersion = "1.8.21"
const val appName = "Unciv"
const val appCodeNumber = 996
const val appVersion = "4.11.12"
const val appCodeNumber = 997
const val appVersion = "4.11.13"

const val gdxVersion = "1.12.1"
const val ktorVersion = "2.2.3"
Expand Down
14 changes: 14 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
## 4.11.13

Barbarian water units no longer pillage

By SomeTroglodyte:
- Console: tile setowner, civ removepolicy
- Fix crash when a starting unit has a random conditional
- Espionage icons

By tuvus:
- Spies can be moved on map
- City state coup
- AI doesn't settle very unfavorable locations

## 4.11.12

By tuvus:
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/UncivGame.kt
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,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.12", 996)
val VERSION = Version("4.11.13", 997)
//endregion

/** Global reference to the one Gdx.Game instance created by the platform launchers - do not use without checking [isCurrentInitialized] first. */
Expand Down
13 changes: 13 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/997.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@


Barbarian water units no longer pillage

By SomeTroglodyte:
- Console: tile setowner, civ removepolicy
- Fix crash when a starting unit has a random conditional
- Espionage icons

By tuvus:
- Spies can be moved on map
- City state coup
- AI doesn't settle very unfavorable locations

0 comments on commit 99801c7

Please sign in to comment.