Version rollout (#10312)

* Bump version and create initial changelog entry

* Update Catalan.properties (#10310)

* Fix Manufactory name (#10306)

* Fix Manufactory name

Like, why on earth was it called the same as the factory??

* Update Spanish.properties

* Update Spanish.properties

* Update Japanese.properties (#10269)

* Update Japanese.properties

* Update Japanese.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: North Field <56919414+Harukin1030@users.noreply.github.com>
This commit is contained in:
Yair Morgenstern
2023-10-13 11:42:15 +03:00
committed by GitHub
parent e587f28a88
commit bfa64ea18d
7 changed files with 431 additions and 435 deletions

View File

@ -748,8 +748,7 @@ Reset = Restableix
Show zoom buttons in world screen = Mostra els botons de zoom a la vista del món
Experimental Demographics scoreboard = Utilitza la puntuació demogràfica experimental
# Requires translation!
Size of Unitset art in Civilopedia =
Size of Unitset art in Civilopedia = Mida de lart dUnitset a la Civilopèdia
### Visual Hints subgroup
@ -932,20 +931,15 @@ Your city [cityName] can bombard the enemy! = [cityName] pot bombardejar lene
[amount] of your cities can bombard the enemy! = [amount] ciutats vostres poden bombardejar lenemic!
[amount] enemy units were spotted near our territory = shan vist [amount] unitats enemigues a prop del nostre territori.
[amount] enemy units were spotted in our territory = shan vist [amount] unitats enemigues al nostre territori.
# Requires translation!
A(n) [nukeType] from [civName] has exploded in our territory! =
# Requires translation!
A(n) [nukeType] has been detonated by [civName]! =
# Requires translation!
A(n) [nukeType] has been detonated by an unkown civilization! =
# Requires translation!
After an attempted attack by our [nukeType], [civName] has declared war on us! =
After being hit by our [nukeType], [civName] has declared war on us! = Després que la nostra [nukeType] hagi impactat al seu territori, [civName] ens ha declarat la guerra!
A(n) [nukeType] from [civName] has exploded in our territory! = Un(a) [nukeType] de [civName] ha explotat al nostre territori!
A(n) [nukeType] has been detonated by [civName]! = [civName] ha detonat un(a) [nukeType]!
A(n) [nukeType] has been detonated by an unkown civilization! = Una civilització desconeguda ha detonat un(a) [nukeType]!
After an attempted attack by our [nukeType], [civName] has declared war on us! = Després del nostre intent datac amb un(a) [nukeType], [civName] ens ha declarat la guerra!
After being hit by our [nukeType], [civName] has declared war on us! = Després que el/la nostre/a [nukeType] hagi impactat al seu territori, [civName] ens ha declarat la guerra!
The civilization of [civName] has been destroyed! = La civilització [civName] ha sigut destruïda!
The City-State of [name] has been destroyed! = La ciutat-estat de [name] ha sigut destruïda!
Your [ourUnit] captured an enemy [theirUnit]! = El vostre [ourUnit] ha capturat un [theirUnit] enemic.
# Requires translation!
Your captured [unitName] has been returned by [civName] =
Your captured [unitName] has been returned by [civName] = [civName] us retorna una unitat [unitName] que us van capturar.
Your [ourUnit] plundered [amount] [Stat] from [theirUnit] = El vostre [ourUnit] ha saquejat [amount] [Stat] de [theirUnit].
We have captured a barbarian encampment and recovered [goldAmount] gold! = Hem capturat un campament bàrbar i aconseguim [goldAmount] dor!
An enemy [unitType] has joined us! = Sens ha unit un [unitType] enemic!
@ -1336,7 +1330,7 @@ Spread Religion = Difon la religió
Spread [religionName] = Difon el [religionName]
Remove Heresy = Elimina lheretgia
Found a Religion = Funda una religió
Enhance a Religion = Difon una religió
Enhance a Religion = Magnifica una religió
Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Els vostres ciutadans estan tan feliços amb el vostre regnat que limperi entra en una edat dor!
You have entered the [newEra]! = Heu entrat a l[newEra]!
[civName] has entered the [eraName]! = [civName] ha entrat a l[eraName]!
@ -1426,8 +1420,7 @@ Civilization Info = Informació de la civilització
Relations = Relacions
Trade request = Sol·licitud de comerç
Garrisoned by unit = Guarnit per una unitat
# Requires translation!
Status\n(puppet, resistance or being razed) =
Status\n(puppet, resistance or being razed) = Estat\n(titella, resistència o en procés darrassament)
# Victory
@ -1662,7 +1655,7 @@ Choose a name for your religion = Trieu un nom per la religió
Choose a [beliefType] belief! = Tria una creença de [beliefType]
Choose any belief! = Tria una creença qualsevol
Found [religionName] = Funda el [religionName]
Enhance [religionName] = Difon [religionName]
Enhance [religionName] = Magnifica [religionName]
Choose a pantheon = Tria un panteó
Choose a Religion = Tria una religió
Found Religion = Funda una religió
@ -1702,7 +1695,7 @@ Pantheon = Panteó
Founding religion = Religió fundadora
Religion = Religió
Enhancing religion = La religió es difon.
Enhanced religion = La religió sha difós.
Enhanced religion = La religió sha magnificat.
# Espionage
# As espionage is WIP, these strings are currently not shown in-game,
@ -2050,12 +2043,10 @@ Automatically built in all cities where it is buildable = Es construeix automàt
Creates a [improvementName] improvement on a specific tile = Crea una millora [improvementName] en una casella específica.
Founds a new city = Funda una ciutat nova
Can instantly construct a [improvementFilter] improvement = Pot construir una millora de [improvementFilter] immediatament
# Requires translation!
Can Spread Religion =
# Requires translation!
Can remove other religions from cities =
Can Spread Religion = Pot difondre una religió.
Can remove other religions from cities = Pot eliminar altres religions a les ciutats
May found a religion = Pot fundar una religió.
May enhance a religion = Pot difondre una religió.
May enhance a religion = Pot magnificar una religió.
Can build [improvementFilter/terrainFilter] improvements on tiles = Pot construir millores de casella com ara [improvementFilter/terrainFilter].
May create improvements on water resources = Crea millores en recursos aquàtics
Can be added to [comment] in the Capital = Es pot col·locar a [comment] a la capital
@ -2359,7 +2350,7 @@ in all cities with a world wonder = a totes les ciutats amb una meravella mundia
in all cities connected to capital = a totes les ciutats connectades amb la capital
in all cities with a garrison = a totes les ciutats amb guarnició
in all cities in which the majority religion is a major religion = a totes les ciutats on la religió majoritària és una religió principal
in all cities in which the majority religion is an enhanced religion = a totes les ciutats on la religió majoritària és una religió difosa
in all cities in which the majority religion is an enhanced religion = a totes les ciutats on la religió majoritària és una religió magnificada
in non-enemy foreign cities = a ciutats estrangeres no enemigues
in foreign cities = a ciutats estrangeres
in annexed cities = en ciutats annexionades
@ -2437,8 +2428,7 @@ Policy = Política
FounderBelief = Creença de fundador
FollowerBelief = Creença de seguidor
Building = Edifici
# Requires translation!
UnitAction =
UnitAction = Acció de la unitat
Unit = Unitat
UnitType = Tipus dunitat
Promotion = Ascens
@ -5290,7 +5280,7 @@ Tithe = Delmes
World Church = Església mundial
Enhancer = Difonedor
Enhancer = Magnificador
Defender of the Faith = Defensor de la fe
Holy Order = Orde sagrada
@ -6232,8 +6222,7 @@ Truffles = Trufes
#################### Lines from UnitPromotions from Civ V - Gods & Kings ####################
# Requires translation!
Devout =
Devout = Devot
Hussar = Hússar
@ -6485,13 +6474,13 @@ This great prophet can be used for multiple things: Constructing a holy site, fo
When founding your religion, you may choose another two beliefs. The founder belief will only apply to you, while the follower belief will apply to all cities following your religion. = Quan es funda una vostra religió, es poden triar dues creences més. La creença de fundador només saplica al jugador i la creença de seguidor saplica a totes les ciutats que segueien la religió.
Additionally, the city where you used your great prophet will become the holy city of that religion. = A més a més, la ciutat on susa el gran profeta es converteix en la ciutat sagrada de la religió.
Once you have founded a religion, great prophets will keep being born every so often, though the amount of Faith☮ you have to save up will be higher. = Un cop sha fundat una religió, els grans profetes continuaran naixent de tant en tant, encara que la quantitat de fe (☮) necessària serà cada vegada més gran.
One of these great prophets can then be used to enhance your religion. = Llavors, podeu fer servir un dels grans profetes per a difondre la religió.
One of these great prophets can then be used to enhance your religion. = Llavors, podeu fer servir un dels grans profetes per a magnificar la religió.
This will allow you to choose another follower belief, as well as an enhancer belief, that only applies to you. = Això permet triar una altra creença de seguidor i una de difusió, que només saplica al jugador.
Do take care founding a religion soon, only about half the players in the game are able to found a religion! = Mireu de fundar una religió aviat, ja que només aproximadament la meitat dels jugadors de la partida podran fundar-ne una.
Beliefs = Creences
There are four types of beliefs: Pantheon, Founder, Follower and Enhancer beliefs. = Hi ha quatre tipus de creences: panteó, fundador, seguidor i difusió de creences.
Pantheon and Follower beliefs apply to each city following your religion, while Founder and Enhancer beliefs only apply to the founder of a religion. = Les creences de panteó i de seguidor sapliquen a les ciutats que hagin adoptat la religió, mentre que les de fundador i difusió només sapliquen al fundador de la religió.
There are four types of beliefs: Pantheon, Founder, Follower and Enhancer beliefs. = Hi ha quatre tipus de creences: panteó, fundador, seguidor i magnificació de creences.
Pantheon and Follower beliefs apply to each city following your religion, while Founder and Enhancer beliefs only apply to the founder of a religion. = Les creences de panteó i de seguidor sapliquen a les ciutats que hagin adoptat la religió, mentre que les de fundador i magnificació només sapliquen al fundador de la religió.
Religion inside cities = Religió dins les ciutats
When founding a city, it won't follow a religion immediately. = Quan es funda una ciutat, no adoptarà una religió immediatament.

File diff suppressed because it is too large Load Diff

View File

@ -1379,11 +1379,11 @@ Upgrade = Mejorar
Defeated = Derrotado
[numberOfCivs] Civilizations in the game = [numberOfCivs] Civilizaciones en la partida
Our Civilization: = Nuestra Civilización:
Known and alive ([numberOfCivs]) = Conocido y en juego ([numberOfCivs])
Known and defeated ([numberOfCivs]) = Conocido y derrotado ([numberOfCivs])
Known and alive ([numberOfCivs]) = Conocidas y vivas ([numberOfCivs])
Known and defeated ([numberOfCivs]) = Conocidas y derrotadas ([numberOfCivs])
Tiles = Casillas
Natural Wonders = Maravillas Naturales
Treasury deficit = Déficit de tesorería
Treasury deficit = Déficit de la tesorería
Unknown = Desconocida
Not built = Sin construír
Not found = No encontrado
@ -1407,7 +1407,7 @@ Trade offer = Oferta de Comercio
Resources we're offering in trades = Recursos que estamos exportando
Number of your cities\ndemanding this resource for\n'We Love The King Day' = Número de ciudades\ndemandando este recurso para el\n"Día de Adoración al Rey"
Politics = Política
Show global politics = Mostar Geopolítica Mundial
Show global politics = Mostrar Geopolítica Mundial
Show diagram = Mostrar Diagrama
At war with [enemy] = En Guerra con [enemy]
Defensive pact with [civName] = Pacto defensivo con [civName]
@ -4659,9 +4659,9 @@ Repairs a pillaged Improvement or Route = Repara una Mejora o Ruta saqueada
Academy = Academia
Landmark = Edificio Emblemático
Landmark = Lugar Emblemático
Manufactory = Fábrica
Manufactory = Industria
Customs house = Aduana
@ -4669,13 +4669,13 @@ Holy site = Lugar Sagrado
Citadel = Ciudadela
Moai = Móai
Moai = Mi
Terrace farm = Terrazas de cultivo
Ancient ruins = Ruinas Antiguas
City ruins = Ciudad en ruinas
City ruins = Ruinas de ciudad
A bleak reminder of the destruction wreaked by War = Un lúgrube recordatorio de la destrucción causada por la Guerra
City center = Centro de la ciudad

View File

@ -4,8 +4,8 @@ package com.unciv.build
object BuildConfig {
const val kotlinVersion = "1.8.21"
const val appName = "Unciv"
const val appCodeNumber = 922
const val appVersion = "4.8.12"
const val appCodeNumber = 923
const val appVersion = "4.8.13"
const val gdxVersion = "1.11.0"
const val ktorVersion = "2.2.3"

View File

@ -1,3 +1,27 @@
## 4.8.13
chore: 'use gold' automation from NextTurnAutomation
chore: Extract city resource functions from City file
chore: Removed dead functions
chore: Split 'city state civ diplomacy table' from DiplomacyScreen
chore: Split 'major civ diplomacy table' from DiplomacyScreen
chore: Extracted all 'next turn' logic from DiplomacyManager to DiplomacyTurnManager
By SeventhM:
- Fix auto assign production not working after a building is built
- Fix consuming resources not being affected by conditionals
By SomeTroglodyte:
- Allow games with zero researched techs to be 'before' the Ancient Era
- Minor Fix: VictoryScreenIllustrations
- Split Fonts.kt
- Fix font "symbols" not showing
## 4.8.12
Automated units can fortify/set up/other actions

View File

@ -536,7 +536,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.8.12", 922)
val VERSION = Version("4.8.13", 923)
//endregion
lateinit var Current: UncivGame

View File

@ -0,0 +1,23 @@
chore: 'use gold' automation from NextTurnAutomation
chore: Extract city resource functions from City file
chore: Removed dead functions
chore: Split 'city state civ diplomacy table' from DiplomacyScreen
chore: Split 'major civ diplomacy table' from DiplomacyScreen
chore: Extracted all 'next turn' logic from DiplomacyManager to DiplomacyTurnManager
By SeventhM:
- Fix auto assign production not working after a building is built
- Fix consuming resources not being affected by conditionals
By SomeTroglodyte:
- Allow games with zero researched techs to be 'before' the Ancient Era
- Minor Fix: VictoryScreenIllustrations
- Split Fonts.kt
- Fix font "symbols" not showing