From 647484a5e0b8f9ddf38c6633ce570beae4ab73f4 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 25 Dec 2024 20:46:03 +0200 Subject: [PATCH] Version rollout (#12709) * Bump version and create initial changelog entry * Update Latin translation (#12708) * Update Latin translation * Update translation * Fix translation * Update Catalan.properties (#12700) * Update French.properties (#12698) * Update Brazilian_Portuguese.properties (#12696) * Update Indonesian.properties (#12695) Translation and corrections. * Update Russian.properties (#12694) * Update Russian.properties * Update Russian.properties * Update Croatian translation (#12693) * update untranslated lines * fix error --------- Co-authored-by: yairm210 Co-authored-by: sls1005 <90055573+sls1005@users.noreply.github.com> Co-authored-by: Joan Josep Co-authored-by: Ouaz Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com> Co-authored-by: X2003 <158255876+Xenia2003@users.noreply.github.com> Co-authored-by: dadadnet Co-authored-by: metablaster <44481081+metablaster@users.noreply.github.com> --- .../Brazilian_Portuguese.properties | 3 +- .../jsons/translations/Catalan.properties | 52 +++++-------- .../jsons/translations/Croatian.properties | 3 +- .../jsons/translations/French.properties | 2 +- .../jsons/translations/Indonesian.properties | 6 +- .../jsons/translations/Latin.properties | 74 +++++++++---------- .../jsons/translations/Russian.properties | 3 +- buildSrc/src/main/kotlin/BuildConfig.kt | 4 +- changelog.md | 17 +++++ core/src/com/unciv/UncivGame.kt | 2 +- .../android/en-US/changelogs/1086.txt | 16 ++++ 11 files changed, 98 insertions(+), 84 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/1086.txt diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index ab0e1f746a..050400f358 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -2087,8 +2087,7 @@ Roads connect tiles across rivers = Estradas conectam painéis através dos rios [relativeAmount]% maintenance on road & railroads = [relativeAmount]% de manutenção em estradas e ferrovias No Maintenance costs for improvements in [tileFilter] tiles = Sem custos de manutenção para melhorias nos painéis [tileFilter] [relativeAmount]% construction time for [improvementFilter] improvements = [relativeAmount]% de tempo de construção para melhorias de [improvementFilter] - # Requires translation! -Can build [improvementFilter] improvements at a [relativeAmount]% rate = +Can build [improvementFilter] improvements at a [relativeAmount]% rate = Pode construir melhorias [improvementFilter] a uma taxa de [relativeAmount]% [relativeAmount]% maintenance cost for buildings [cityFilter] = [relativeAmount]% de custo de manutenção para edifícios [cityFilter] Remove [buildingFilter] [cityFilter] = Remover [buildingFilter] [cityFilter] Sell [buildingFilter] buildings [cityFilter] = Vender edifícios [buildingFilter] de [cityFilter] diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties index a94e3a1d97..ed3668a674 100644 --- a/android/assets/jsons/translations/Catalan.properties +++ b/android/assets/jsons/translations/Catalan.properties @@ -1884,8 +1884,7 @@ Enable multiplayer status button in singleplayer games = En partides d’un sol Update status of currently played game every: = Actualitza l’estat de la partida actual cada: In-game, update status of all games every: = Mentre s’està a la partida, actualitza l’estat de totes les partides cada: Server address = Adreça del servidor - # Requires translation! -Check connection = +Check connection = Comprova la connexió Awaiting response... = S’espera una resposta... Success! = s’ha rebut la resposta correctament. Failed! = Error: No s’ha rebut resposta. @@ -2088,8 +2087,7 @@ Roads connect tiles across rivers = Les carreteres també connecten caselles a t [relativeAmount]% maintenance on road & railroads = [relativeAmount] % de manteniment de carreteres i ferrocarrils No Maintenance costs for improvements in [tileFilter] tiles = Les millores en caselles [tileFilter] no tenen costos de manteniment. [relativeAmount]% construction time for [improvementFilter] improvements = [relativeAmount] % de temps de construcció per a millores [improvementFilter] - # Requires translation! -Can build [improvementFilter] improvements at a [relativeAmount]% rate = +Can build [improvementFilter] improvements at a [relativeAmount]% rate = Pot construir millores [improvementFilter] a un ritme [relativeAmount] % [relativeAmount]% maintenance cost for buildings [cityFilter] = [relativeAmount] % de cost de manteniment dels edificis [cityFilter] Remove [buildingFilter] [cityFilter] = Treu [buildingFilter] [cityFilter] Sell [buildingFilter] buildings [cityFilter] = Ven el(s) edifici(s) [buildingFilter] [cityFilter] @@ -2461,8 +2459,7 @@ Gain a free [beliefType] belief = Obtén una creença [beliefType] Triggers voting for the Diplomatic Victory = Desencadena la votació de victòria diplomàtica Instantly consumes [positiveAmount] [stockpiledResource] = Consumeix [positiveAmount] [stockpiledResource] a l’instant Instantly provides [positiveAmount] [stockpiledResource] = Proveeix [positiveAmount] [stockpiledResource] a l’instant - # Requires translation! -Instantly gain [amount] [stockpile] = +Instantly gain [amount] [stockpile] = Guanya [amount] [stockpile] instantàniament Gain [amount] [stat] = Guanya [amount] [stat] Gain [amount]-[amount2] [stat] = Guanya [amount]-[amount2] [stat] Gain enough Faith for a Pantheon = Guanya prou fe per un panteó @@ -7127,17 +7124,13 @@ Toggle notification list display = Mostra/Amaga la llista de notificacions On the World screen, swipe the notification list to the right to temporarily hide it. Click the "Bell" button to display them again. = A la vista del món, llisqueu la llista de notificacions a la dreta per a amagar-la temporalment. Si feu clic al botó amb forma de campana, es tornarà a mostrar la llista. The default state for the notification list can be set in Options > Display > UI - Notifications on world screen. = L’estat per defecte de la llista de notificació es pot establir a Opcions → Vídeo → Interfície gràfica ‒ Notificacions a la vista del món. Entering a City Screen quickly = Com entrar a la vista de ciutat de pressa - # Requires translation! -You can Right-click or long press a city button on the World screen. The result is the same as tapping it twice - once to select and move the button, again to trigger a reaction: show the City Screen (if the city is yours to inspect), or offer the foreign city info popup. = +You can Right-click or long press a city button on the World screen. The result is the same as tapping it twice - once to select and move the button, again to trigger a reaction: show the City Screen (if the city is yours to inspect), or offer the foreign city info popup. = Podeu fer clic amb el botó dret o manteniu premut el botó d'una ciutat a la vista del món. El resultat és el mateix que tocant-lo dos cops ‒ un per a seleccionar i moure el botó i un altre per a activar la reacció: mostrar la vista de ciutat (si la ciutat és vostra per a inspeccionar) o oferir un missatge emergent amb informació de la ciutat estrangera. Upgrade multiple units of the same type = Com millorar diverses unitats del mateix tipus On the World screen, select an unit that can be upgraded, then right-click or long press the "Upgrade" button to open a popup menu allowing to upgrade all units of this type at once. = A la vista del món, seleccioneu una unitat que es pugui millorar i feu clic amb el botó dret o mantingueu premut el botó de «Millora» per a obrir un menú emergent que permet millorar totes les unitats d’aquest tipus a la vegada. - # Requires translation! -In the Units overview, the same upgrade menu is available by clicking the unit icon in the "Upgrade" column. When an unit is upgradeable, the icon is lit if conditions are met (enough gold and/or resources), otherwise it is dimmed. = +In the Units overview, the same upgrade menu is available by clicking the unit icon in the "Upgrade" column. When an unit is upgradeable, the icon is lit if conditions are met (enough gold and/or resources), otherwise it is dimmed. = A la vista d’unitats, el mateix menú de millora està disponible fent clic a la icona d’unitat a la columna de «Millora». Quan una unitat es pot millorar i es compleixen le condicions per a fer-ho (hi ha prou or i/o recursos), la icona es mostra ressaltada; altrament, es veurà amb un color apagat. Additional controls for the construction queue = Controls addicionals de la cua de construcció - # Requires translation! -Right-click or long press a construction item to open a popup menu with additional controls, allowing to manage production of the same item in all cities, by issuing the commands from the same City Screen. = - # Requires translation! -The "Disable" option moves an item to a separated "Disabled" tab, preventing its automatic queueing by the "Auto-assign city production" option. To move a disabled item back to its initial place, enter again the popup menu, and choose "Enable". = +Right-click or long press a construction item to open a popup menu with additional controls, allowing to manage production of the same item in all cities, by issuing the commands from the same City Screen. = Feu cloc amb el botó dret o mantingueu premuda un element de construcció per a obrir un menú emergent amb controls addicionals que permeten gestionar-ne la producció a totes les ciutats, executant ordres des d’una sola vista de ciutat. +The "Disable" option moves an item to a separated "Disabled" tab, preventing its automatic queueing by the "Auto-assign city production" option. To move a disabled item back to its initial place, enter again the popup menu, and choose "Enable". = L’opció de «Desactivar» mou l’element a una pestanya de «Desactivats» separada i evita que la unitat es posi automàticament a la cua amb l’opció «Assigna automàticament la producció de les ciutats». Per a moure una altra vegada la unitat al seu lloc inicial, entreu al menú emergent de nou i feu clic a «Activa». Disabled items are set globally and persistent: they are not reset in a new game, or by restarting Unciv. = Els elements desactivats es poden establir de manera global i persistent: no es restableixen si es comença una partida nova ni quan es reinicia l’Unciv. Show Great Person Points breakdown = Mostra un resum dels punts de Gran Personatge In the right sidepanel, click a Great People row to display the details of Great Person Points (GPP) accumulated each turn by the current city, for this type of Great People. = Al panell de la dreta, feu clic a una fila de gran personatge per a mostrar els detalls del punts de gran personatge (PGP) que s’acumulen cada torn a la ciutat actual per a aquest tipus de gran personatge. @@ -7149,8 +7142,7 @@ Right-click or long press multiple techs to append them to the research queue, w Overview screens = Vistes generals Reveal known resources on world screen = Mostra els recursos coneguts a la vista del món In the Resources overview, click on a resource icon to center the world screen on tiles already discovered and providing this resource. = A la vista de recursos, feu clic en una icona de recurs per a centrar la vista del món en caselles descobertes que tinguin aquest recurs. - # 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. = Alternativament, feu clic al nombre «sense millorar» per a centrar la vista del món només en caselles de la vostra propietat (o de les ciutats-estat aliades) on el recurs no està millorat. If more than one tile is available, click repeatedly on the notification to cycle through all of them. = Si hi ha més d’una casella disponible, feu clic diverses vegades a la notificació per a passar per totes elles. Show diagram line colors = Mostra els colors de les línies del diagrama In Politics overview > Show diagram, you can click anywhere inside the diagram to display a table listing all relationship line colors and their meaning. = A Política → Mostra diagrama, podeu fer clic a qualsevol lloc de dins del diagrama per a mostrar una taula amb línies que mostren quin tipus de relació hi ha entre les civilitzacions. @@ -7160,25 +7152,17 @@ External links support right-click or long press to copy the link to the clipboa Example: The 'Open Github page' button on the Mod management screen. = Exemple: El botó «Obre la pàgina de GitHub» de la vista de gestió de mods. Differences from Civilization V = Diferències amb el Civilization V - # Requires translation! -Production Focus\nIn Civilization V, the Food yield in a city is calculated first, then population grows by consuming stored food (growth), then production is calculated, and so on one by one the other stats are calculated. Thus, citizens can produce yields in the same turn as they are born. The city focus is set to Production to assign the newborn citizen to a hill so they'll contribute Production, and then manually reassigned to a growth tile on the next turn. Alternatively, you can set city focus to Gold (e.g. with Cerro de Potosi), Faith (e.g. with Mount Sinai) or whatever gains the most yields. In Unciv, citizens only start producing yields on the next turn, so you can ignore this whole concept = - # Requires translation! -Science Queueing\nIn Civilization V, Science yield is calculated after production, so if you finish an item and have Science (or Gold) queued as a perpetual construction, the Production overflow from item will be converted into Science (or Gold), but the Production is not consumed, as this will only happen again on the next turn. By immediately swapping out your perpetual construction for an item on the next turn, you'll get this Science (or Gold) for free. This doesn't apply to Unciv, so don't bother. = - # Requires translation! -Double Aqueducts\nIn Civilization V, the game sells existing copies of the building for you before providing a free copy of the building. So, if you build an aqueduct in a city, and then in the turn of adopting Tradition Complete you sell a cheap building (e.g a shrine) beforehand, the game is unable to sell more than 1 building per turn, and thus you'll keep your aqueduct, together with the new free aqueduct. Not applicable to Unciv. = - # Requires translation! -Legalism Oxford\nIn Civilization V, national wonders such as Oxford University are considered culture buildings, so you can get them for free with Legalism. Not applicable to Unciv. = - # Requires translation! -Roads and Forts\nIn Civilization V, you can't use roads and forts in enemy territory. In Unciv, you can use them, so instead of mindlessly constructing them everywhere when at war, you need to decide if and when they'll benefit you more than your opponents = - # Requires translation! -Citizen Conversion\nIn Civilization V, a citizen is born religious if the parent city is already converted. This is not the case in Unciv, which can lead to temporary deconversion of a city when it grows. = - # Requires translation! -Unassigned Citizens\nIn Civilization V, unassigned citizens are considered specialists, and subject to the same type of bonuses (e.g. Korea's ability). It can be worthwhile to leave citizens unassigned, instead of being assigned to a tile. Not applicable to Unciv. = - # Requires translation! -Settler Construction\nIn Civilization V, cities can't starve when constructing settlers, so you can assign all citizens to production tiles and none to food tiles. In Unciv, citizens keep consuming two food per turn. = +Production Focus\nIn Civilization V, the Food yield in a city is calculated first, then population grows by consuming stored food (growth), then production is calculated, and so on one by one the other stats are calculated. Thus, citizens can produce yields in the same turn as they are born. The city focus is set to Production to assign the newborn citizen to a hill so they'll contribute Production, and then manually reassigned to a growth tile on the next turn. Alternatively, you can set city focus to Gold (e.g. with Cerro de Potosi), Faith (e.g. with Mount Sinai) or whatever gains the most yields. In Unciv, citizens only start producing yields on the next turn, so you can ignore this whole concept = Objectiu de producció\nAl Civilization V, la producció de menjar d’una ciutat es calcula primer, la població creix amb el menjar emmagatzemat, després es calcula la producció i totes les altres estadístiques una a una. Així, els ciutadans poden produir el mateix torn que naixen. L’objectiu de producció de la ciutat s’estableix a «Producció» per a assignar el nounascut a un turó per tal que contribueixi a la producció i, després, es reassigna manualment a una casella de menjar al proper torn. Alternativament, podeu establir l’objectiu de producció a «Or» (com ara amb el Cerro Rico), «Fe» (com ara amb el Mont Sinaí) o el que sigui que vulgueu. A l’Unciv, els ciutadans acabats de nàixer produeixen el proper torn i podeu ignorar tot aquest paràgraf. +Science Queueing\nIn Civilization V, Science yield is calculated after production, so if you finish an item and have Science (or Gold) queued as a perpetual construction, the Production overflow from item will be converted into Science (or Gold), but the Production is not consumed, as this will only happen again on the next turn. By immediately swapping out your perpetual construction for an item on the next turn, you'll get this Science (or Gold) for free. This doesn't apply to Unciv, so don't bother. = Cua d’investigació\nAl Civilization V, la ciència produïda es calcula després de la producció i si acabeu un element i teniu com a següent element perpetu a produir a la cua de producció ciència o or, l’excés de producció es convertirà en ciència o or, però la producció no es consumeix, ja que això succeiria al proper torn. Per això, si s’intercanvia la construcció perpètua per un element al proper torn, aconseguiu aquesta quantitat de ciència o or gratis. Això no passa a l’Unciv, així que no us preocupeu. +Double Aqueducts\nIn Civilization V, the game sells existing copies of the building for you before providing a free copy of the building. So, if you build an aqueduct in a city, and then in the turn of adopting Tradition Complete you sell a cheap building (e.g a shrine) beforehand, the game is unable to sell more than 1 building per turn, and thus you'll keep your aqueduct, together with the new free aqueduct. Not applicable to Unciv. = Aqüeductes dobles\nAl Civilization V, el joc ven les còpies existents d’una estructura abans de proporcionar-ne una còpia gratuïta. Així, si construïu un aqüeducte en una ciutat i després durant el torn que completeu la branca de «Tradició» veneu abans un edifici barat ‒com ara un santuari‒, el joc no pot vendre més d’una estructura per torn i manteniu l’aqüeducte antic i n’obteniu un de nou. Això a l’Unciv no passa. +Legalism Oxford\nIn Civilization V, national wonders such as Oxford University are considered culture buildings, so you can get them for free with Legalism. Not applicable to Unciv. = El legalisme i la Universitat d’Oxford\nAl Civilization V, les meravelles nacionals, com ara la Universitat d’Oxford, es consideren edificis culturals i es poden obtenir gratuïtament amb el «Legalisme». En canvi, a l’Unciv, això no passa. +Roads and Forts\nIn Civilization V, you can't use roads and forts in enemy territory. In Unciv, you can use them, so instead of mindlessly constructing them everywhere when at war, you need to decide if and when they'll benefit you more than your opponents = Carreteres i forts\nAl Civilization V, les carreteres i forts del territori enemic no es poden fer servir. En canvi, a l’Unciv, sí que es poden fer servir. Per tant, abans de construir-ne sense pensar per tots els llocs quan esteu en guerra, heu de mirar si us poden beneficiar més a vós o als vostres oponents. +Citizen Conversion\nIn Civilization V, a citizen is born religious if the parent city is already converted. This is not the case in Unciv, which can lead to temporary deconversion of a city when it grows. = Conversió de ciutadans\nAl Civilization V, un ciutadà naix amb una religió determinada si la ciutat natal ja s’ha convertit. En canvi, a l’Unciv, els ciutadans neixen sense seguir cap religió, fet que pot provocar a una desconversió temporal d’una ciutat quan creix. +Unassigned Citizens\nIn Civilization V, unassigned citizens are considered specialists, and subject to the same type of bonuses (e.g. Korea's ability). It can be worthwhile to leave citizens unassigned, instead of being assigned to a tile. Not applicable to Unciv. = Ciutadans sense assignar\nAl Civilization V, els ciutadans sense assignar es consideren especialistes i obtenen les bonificacions corresponents, com ara l’habilitat de Corea. Pot valer la pena deixar alguns ciutadans sense assignar, en lloc d’assignar-los a alguna casella. Això a l’Unciv no s’aplica. +Settler Construction\nIn Civilization V, cities can't starve when constructing settlers, so you can assign all citizens to production tiles and none to food tiles. In Unciv, citizens keep consuming two food per turn. = Producció de colons\nAl Civilization V, les ciutats no poden patir fam quan produeixen colons i per això podeu assignar tots els ciutadans a caselles de producció i cap a les de menjar. A l’Unciv, els ciutadans continuen consumint dues unitats de menjar a cada torn. Water Melee Attack\nAs result of a Discord poll, Water Melee units can attack military land units on the shore, unlike in Civilization V. = Atac cos a cos marítim\nCom a resultat d’una enquesta del Discord, les unitats marítimes que poden realitzar atacs cos a cos poden atacar unitats terrestres militars a la costa, a diferència del Civilization V. -Tile improvements\nIn Civilzation V, workers start working on an improvement-under-construction at the beginning of movement. Unciv changes this, to allow players to assign workers to tiles, and then reconsider and change improvement or move them elsewhere. = Millores de casella\nAl Civilization V, els treballadors comencen a treballar en millores en construcció al principi del moviment. Unciv ho canvia, per tal que els jugadors puguin assignar treballadors a les caselles i, llavors, reconsiderar-ho i canviar la millora o morue la unitat a algun altre lloc. -Forest and Jungle Visibility\nIn Unciv, forests and jungles are visible 1 tile outside visibility range. In Civilization V, this is the behaviour of hills and mountains, but not of forests and jungles, yet jungle and forest can block hills, and hill + forest can block mountain, indicating they're on the same elevation. This is considered to be a bug in the otherwise well-structured visibility logic in Civilization V. = Visibilitat dels boscos i les selves\nA l’Unciv, els boscos i les selves són visibles a 1 casella fora de l’abast de visibilitat. Al Civilization V, aquest és el comportament dels turons i de les muntanyes, però no de boscos i selves, encara que els boscos i les selves poden blocar turons i que turó + bosc pot blocar muntanya, indicant que estan a la mateixa altura. Això es considera un error de la lògica de la visibilitat del Civilization V. +Tile improvements\nIn Civilzation V, workers start working on an improvement-under-construction at the beginning of movement. Unciv changes this, to allow players to assign workers to tiles, and then reconsider and change improvement or move them elsewhere. = Millores de les caselles\nAl Civilization V, els treballadors comencen a treballar en millores en construcció al principi del moviment. Unciv ho modifica, per tal que els jugadors puguin assignar treballadors a les caselles i, llavors, reconsiderar-ho i canviar la millora o morue la unitat a algun altre lloc. +Forest and Jungle Visibility\nIn Unciv, forests and jungles are visible 1 tile outside visibility range. In Civilization V, this is the behaviour of hills and mountains, but not of forests and jungles, yet jungle and forest can block hills, and hill + forest can block mountain, indicating they're on the same elevation. This is considered to be a bug in the otherwise well-structured visibility logic in Civilization V. = Visibilitat dels boscos i les selves\nA l’Unciv, els boscos i les selves són visibles a una casella fora de l’abast de visibilitat. Al Civilization V, aquest és el comportament dels turons i de les muntanyes, però no de boscos i selves, encara que els boscos i les selves poden blocar turons i que turó + bosc pot blocar muntanya, indicant que estan a la mateixa altura. Això es considera un error de la lògica de la visibilitat del Civilization V. Founding Cities\nThe Settler is a unit that can found a new city. You can build a Settler unit in a city with at least 2 population, and then move them to a good location to found a new city. This will usually be your main way of acquiring more cities. = Fundació de ciutats\nEl colon és una unitat que pot fundar una ciutat nova. Podeu construir un colon en una ciutat que tingui com a mínim una població de 2 i després el podeu moure fins a un bon lloc on fundar la nova ciutat. Food conversion to Production\nDuring the construction of a Settler, the city will not grow. Instead, the 1st, 2nd, 4th, and from there on every 4th, excess Food (Growth) is converted into Production, with the rest of the excess Food being lost. = Conversió de menjar en producció\nDurant la construcció d’un colon, la ciutat no creixerà. En canvi, l’excés de menjar (creixement) primer, segon, quart i, a partir del quart, cada quatre, es converteix en producció i la resta de producció de menjar es perd. diff --git a/android/assets/jsons/translations/Croatian.properties b/android/assets/jsons/translations/Croatian.properties index 39545242f8..c0e2a30bff 100644 --- a/android/assets/jsons/translations/Croatian.properties +++ b/android/assets/jsons/translations/Croatian.properties @@ -2088,7 +2088,7 @@ Roads connect tiles across rivers = Ceste povezuju polja preko rijeka No Maintenance costs for improvements in [tileFilter] tiles = Nema troškova održavanja za unaprjeđenja na [tileFilter] poljima [relativeAmount]% construction time for [improvementFilter] improvements = [relativeAmount]% vremena izgradnje za [improvementFilter] unaprjeđenja # Requires translation! -Can build [improvementFilter] improvements at a [relativeAmount]% rate = +Can build [improvementFilter] improvements at a [relativeAmount]% rate = Može izgraditi [improvementFilter] unaprjeđenje po stopi od [relativeAmount]%. [relativeAmount]% maintenance cost for buildings [cityFilter] = [relativeAmount]% troškova održavanja za zgrade [cityFilter] Remove [buildingFilter] [cityFilter] = Ukloni [buildingFilter] [cityFilter] Sell [buildingFilter] buildings [cityFilter] = Prodaj [buildingFilter] zgrade [cityFilter] @@ -7167,4 +7167,3 @@ Forest and Jungle Visibility\nIn Unciv, forests and jungles are visible 1 tile o Founding Cities\nThe Settler is a unit that can found a new city. You can build a Settler unit in a city with at least 2 population, and then move them to a good location to found a new city. This will usually be your main way of acquiring more cities. = Osnivanje gradova\nNaseljenik je jedinica koja može osnovati novi grad. Možete izgraditi jedinicu Naseljenika u gradu s najmanje 2 stanovnika, a zatim ih premjestiti na dobru lokaciju kako biste osnovali novi grad. To će obično biti vaš glavni način stjecanja više gradova. Food conversion to Production\nDuring the construction of a Settler, the city will not grow. Instead, the 1st, 2nd, 4th, and from there on every 4th, excess Food (Growth) is converted into Production, with the rest of the excess Food being lost. = Pretvorba hrane u proizvodnju\nTijekom izgradnje Naseljenika, grad neće rasti. Umjesto toga, 1., 2., 4., a odatle svaki 4., višak Hrane (Rast) pretvara se u Proizvodnju, a ostatak viška Hrane se gubi. - diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index f6008a6714..6a72da4e09 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -2088,7 +2088,7 @@ Roads connect tiles across rivers = Les routes relient les cases par-delà les r No Maintenance costs for improvements in [tileFilter] tiles = Pas de coûts d'entretien pour les aménagements sur les cases [tileFilter] [relativeAmount]% construction time for [improvementFilter] improvements = [relativeAmount]% temps nécessaire pour construire les aménagements [improvementFilter] # Requires translation! -Can build [improvementFilter] improvements at a [relativeAmount]% rate = +Can build [improvementFilter] improvements at a [relativeAmount]% rate = Peut construire les aménagements [improvementFilter] à une vitesse de [relativeAmount]% [relativeAmount]% maintenance cost for buildings [cityFilter] = [relativeAmount]% coût d'entretien pour les bâtiments [cityFilter] Remove [buildingFilter] [cityFilter] = Supprime [buildingFilter] [cityFilter] Sell [buildingFilter] buildings [cityFilter] = Vendre les bâtiments [buildingFilter] [cityFilter] diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 3a93b75572..4ee57ac468 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -2088,7 +2088,7 @@ Roads connect tiles across rivers = Jalan menghubungkan ubin di seberang sungai No Maintenance costs for improvements in [tileFilter] tiles = Tidak memerlukan biaya Pemeliharaan untuk peningkatan di ubin [tileFilter] [relativeAmount]% construction time for [improvementFilter] improvements = [relativeAmount]% waktu pembangunan untuk peningkatan [improvementFilter] # Requires translation! -Can build [improvementFilter] improvements at a [relativeAmount]% rate = +Can build [improvementFilter] improvements at a [relativeAmount]% rate = Dapat membangun peningkatan [improvementFilter] pada kecepatan [relativeAmount]% [relativeAmount]% maintenance cost for buildings [cityFilter] = [relativeAmount]% biaya pemeliharaan untuk bangunan-bangunan [cityFilter] Remove [buildingFilter] [cityFilter] = Hancurkan [buildingFilter] [cityFilter] Sell [buildingFilter] buildings [cityFilter] = Jual bangunan [buildingFilter] [cityFilter] @@ -5665,13 +5665,13 @@ Tithe = Persembahan World Church = Gereja Dunia -Defender of the Faith = Pelindung Iman +Defender of the Faith = Pembela Iman Holy Order = Perintah Suci Itinerant Preachers = Pengkhotbah Pengembara -Just War = Hanya Perang +Just War = Perang yang Adil Messiah = Mesias diff --git a/android/assets/jsons/translations/Latin.properties b/android/assets/jsons/translations/Latin.properties index e21ffdaaf5..6fec52b036 100644 --- a/android/assets/jsons/translations/Latin.properties +++ b/android/assets/jsons/translations/Latin.properties @@ -1019,7 +1019,7 @@ Music = Musica # Requires translation! Skip = # Requires translation! -Currently playing: [title] = +Currently playing: [title] = Nunc canitur: [title] Download music = Affer musicam Downloading... = Affero... Could not download music! = Non potui musicam afferre! @@ -1894,17 +1894,17 @@ Culture cost modifier: [amount]%♪ = Coefficiens ad sumptum de cultura: [amount Faith cost modifier: [amount]%☮ = Coefficiens ad sumptum de fide: [amount]%☮ Improvement build length modifier: [amount]%⏳ = Coefficiens ad longinquitatem ad constructionem meliorationum: [amount]%⏳ # Requires translation! -Diplomatic deal duration: [amount] turns⏳ = +Diplomatic deal duration: [amount] turns⏳ = Longinquitas negotiationis diplomaticæ: [amount] gressus⏳ # Requires translation! -Gold gift influence gain modifier: [amount]%¤ = +Gold gift influence gain modifier: [amount]%¤ = Influentia merenda de dono solidorum: [amount]%¤ # Requires translation! City-state tribute scaling interval: [amount] turns⏳ = Barbarian spawn modifier: [amount]%† = Coefficiens ad generationem barbarorum: [amount]%† Golden age length modifier: [amount]%⌣ = Coefficiens ad longinquitatem saeculi aurei: [amount]%⌣ # Requires translation! -Adjacent city religious pressure: [amount]☮ = +Adjacent city religious pressure: [amount]☮ = Impulsus religiosus urbis adjacentis: [amount]☮ # Requires translation! -Peace deal duration: [amount] turns⏳ = +Peace deal duration: [amount] turns⏳ = Longinquitas pacis negotiationis: [amount] gressus ⏳ Start year: [comment] = Annus initialis: [comment] Pillaging this improvement yields [stats] = Direptio hujus tegulæ producat res quæ sint [stats] Pillaging this improvement yields approximately [stats] = Direptio hujus tegulæ producat res quæ circiter sint [stats] @@ -1915,7 +1915,7 @@ Units: = Centuriae: Unit types = Formae centuriarum Domain: [param] = Plaga: [param] # Requires translation! -Toggle UI (World Screen only) = +Toggle UI (World Screen only) = Intermutare rem-inter-facies (solummodo in ostentu mundi) Overrides yields from underlying terrain = Cooperit res de humo sub se producendas (ut eæ non producantur) No yields = Sine productu Mod: [modname] = Mutatio: [modname] @@ -3005,9 +3005,9 @@ Your so-called 'defensive pact' is worth nothing. = Id quod vocas 'fœdus de def You have publicly denounced us! = Aperte criminavisti nos! You have denounced our allies = Criminavisti socium nostrum # Requires translation! -You refused to stop settling cities near us = +You refused to stop settling cities near us = Abdicavisti desinere condere oppida prope nos # Requires translation! -You refused to stop spreading religion to us = +You refused to stop spreading religion to us = Abdicavisti desinere sternere religionem ad nos You betrayed your promise to not settle cities near us = Prodidistis vestrum promissum quo ne conderetis oppida prope nos You betrayed your promise to not spread your religion to us = Prodidistis vestrum promissum quo ne sterneretis religionem ad nos # Requires translation! @@ -3023,26 +3023,26 @@ You sided with a City-State over us = Suffragavisti civitatem contra nos You spied on us! = Estis speculati nos! You took the alliance we had with a City-State = Abstulistis nostram societatem cum una civitate # Requires translation! -Years of peace have strengthened our relations. = +Years of peace have strengthened our relations. = Pax annorum firmavit societatem nostram. # Requires translation! -Our mutual military struggle brings us closer together. = +Our mutual military struggle brings us closer together. = Societas bilateralis militaris nostra fecit nos propinquiores. We applaud your liberation of conquered cities! = Applaudimus vestræ liberationi captarum urbium! # Requires translation! -We have signed a public declaration of friendship = +We have signed a public declaration of friendship = Signavimus aperiendam prædicationem amicitiæ You have declared friendship with our allies = Cum sociis nostris indixisti amicitiam We have signed a promise to protect each other. = Signavimus fœdus ad protectionem utrique nostri. You have declared a defensive pact with our allies = Cum sociis nostris indixisti fœdus de defensione You have denounced our enemies = Criminavisti hostes nostros # Requires translation! -Our open borders have brought us closer together. = -You fulfilled your promise to stop settling cities near us! = Perfecistis promissum quo consisteretis condendum oppida prope nos! -You fulfilled your promise to stop spreading religion to us! = Perfecistis promissum quo consisteretis sternendum religionem ad nos! +Our open borders have brought us closer together. = Fines aperti nostri fecerunt nos propinquiores. +You fulfilled your promise to stop settling cities near us! = Perfecistis promissum quo desineretis condere oppida prope nos! +You fulfilled your promise to stop spreading religion to us! = Perfecistis promissum quo desineretis sternere religionem ad nos! You gave us units! = Dedisti nobis centurias! # Requires translation! -We appreciate your gifts = +We appreciate your gifts = Appretiamus donum vestrum You returned captured units to us = Reddidistis nobis centurias captas # Requires translation! -We believe in the same religion = +We believe in the same religion = Credimus religioni identicæ #################### Lines from key bindings ####################### @@ -3050,9 +3050,9 @@ We believe in the same religion = Main Menu = Electio Prima World Screen = Ostentus Mundi # Requires translation! -AutoPlay menu = +AutoPlay menu = Electio ludi automatarii # Requires translation! -NextTurn menu = +NextTurn menu = Electio indicandi gressum perfectum esse Map Panning = Motus Tabulae Unit Actions = Actiones Centuriae City Screen = Ostentus urbis @@ -3066,9 +3066,9 @@ Next Turn = Indicare gressum perfectum esse # Requires translation! Next Turn Alternate = # Requires translation! -Open AutoPlay menu = +Open AutoPlay menu = Evoca electionem ludi automatarii Empire Overview = Breviarium imperii -Music Player = Cantatrum Musicarum +Music Player = Cantorium Musicarum # Requires translation! Developer Console = Empire Overview Trades = Mercatus, breviario imperii @@ -3091,7 +3091,7 @@ Toggle Yield Display = Quit Game = Ludo exeo New Game = Ludus novus Espionage = Speculatio -Undo = Non fecerim +Undo = Retexo # Requires translation! Toggle UI = # Requires translation! @@ -3137,19 +3137,19 @@ Show Stats = Ostende Statisticas # Requires translation! Toggle Stat Details = # Requires translation! -Great People Detail = +Great People Detail = Enarratio personarum magnarum # Requires translation! -Specialist Detail = +Specialist Detail = Enarratio specialistarum # Requires translation! -Religion Detail = +Religion Detail = Enarratio religionis # Requires translation! -Buildings Detail = +Buildings Detail = Enarratio ædificiorum Default Focus = Defixa anteposita Open the Search Dialog = Evoco dialogum investigationis # Requires translation! -Confirm Dialog = +Confirm Dialog = Dialogum affirmare # Requires translation! -Cancel Dialog = +Cancel Dialog = Dialogum rescindere Upgrade All = Armo omnes [stat] Focus = [stat] defiga(n)tur @@ -3307,9 +3307,9 @@ Castle = Castrum Mughal Fort = # Requires translation! -Himeji Castle = +Himeji Castle = Himeji Castrum # Requires translation! -'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 = +'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 = 'Bushido in praesentia mortis fit verum. Hoc indicat eligere mortem quandocumque electio inter vitam et mortem est. Sine alia significatione est.' - Yamamoto Tsunetomo Ironworks = Fabrica Ferrea @@ -3322,16 +3322,16 @@ Opera House = Theatrum Melodramaticum # Requires translation! Sistine Chapel = # Requires translation! -'I live and love in God's peculiar light.' - Michelangelo Buonarroti = +'I live and love in God's peculiar light.' - Michelangelo Buonarroti = 'Vivo et amo in luce peculiari Dei.' - Michael Angelus Bonarotius Bank = Argentaria # Requires translation! -Satrap's Court = +Satrap's Court = Satrapia Forbidden Palace = Regia Vetita # Requires translation! -'Most of us can, as we choose, make of this world either a palace or a prison' - John Lubbock = +'Most of us can, as we choose, make of this world either a palace or a prison' - John Lubbock = 'Plerique nostrorum possunt, ita ut eligamus, facere hunc mundum regiam aut carcer' - John Lubbock Theatre = Theatrum @@ -3372,7 +3372,7 @@ Big Ben = Turris Horologii Military Academy = Academia Militaris # Requires translation! -Brandenburg Gate = +Brandenburg Gate = Porta Brandenburgensis # Requires translation! 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = @@ -6312,7 +6312,7 @@ Currency = Nummularia 'Instrumental or mechanical science is the noblest and, above all others, the most useful.' - Leonardo da Vinci = Engineering = Ingeniaria # Requires translation! -'When pieces of bronze or gold or iron break, the metal-smith welds them together again in the fire, and the bond is established.' - Sri Guru Granth Sahib = +'When pieces of bronze or gold or iron break, the metal-smith welds them together again in the fire, and the bond is established.' - Sri Guru Granth Sahib = 'Quando partes æris vel auri vel ferri rumpuntur, faber metalli denuo in igne conjuncte conflat eas, et nexus conditur.' - Sri Guru Granth Sahib Metal Casting = Conflatorium # Requires translation! @@ -6372,7 +6372,7 @@ Fertilizer = Laetamen 'It is well that war is so terrible, or we should grow too fond of it.' - Robert E. Lee = 'Bene est quod bellum est tam terribile, aut id nimis amantes fiamus.' - Robert E. Lee Rifling = Sclopetum -'If the brain were so simple we could understand it, we would be so simple we couldn't.' - Lyall Watson = 'Si cerebrum sit tam simplex ut possimus id intellegere, nos simus tam simplices ut id non possimus.' - Lyall Watson +'If the brain were so simple we could understand it, we would be so simple we couldn't.' - Lyall Watson = 'Si cerebrum sit tam simplex ut possimus id intellegere, nos simus tam simplices ne possimus ita facere.' - Lyall Watson Biology = Biologia 'The nations of the West hope that by means of steam communication all the world will become as one family.' - Townsend Harris = 'Populi occidentis sperant quod, per communicationem vaporis, mundus omnis fiet acsi una familia sit.' - Townsend Harris Steam Power = Potentia Vaporaria @@ -8845,7 +8845,7 @@ an ancient prophecy = Drama and Poetry = Drama et Poetica # Requires translation! -'The merchants and the traders have come; their profits are pre-ordained...' - Sri Guru Granth Sahib = +'The merchants and the traders have come; their profits are pre-ordained...' - Sri Guru Granth Sahib = 'Mercatores et negotiatores venerunt; commoda eorum sunt præordinata...' - Sri Guru Granth Sahib Guilds = Guildæ @@ -9354,7 +9354,7 @@ Spreading religion happens naturally, but can be sped up using missionaries or g Missionaries can be bought in cities following a major religion, and will take the religion of that city. = Missionarii possunt emi in urbe quae sequitur religionem pleram, et asciscet religionem illius urbis. So do take care where you are buying them! If another civilization has converted one of your cities to their religion, missionaries bought there will follow their religion. = Sic cures locum ubi emis eos! Si qua alia civilizatio convertit unam de urbibus tuis ad religionem eorum, missionarius ibi emptus sequitur religionem eorum. Great prophets always have your religion when they appear, even if they are bought in cities following other religions, but captured great prophets do retain their original religion. = Propheta magnus semper habet religionem tuam quom is apparet, etsi emitur in urbibus quae sequuntur religiones alias, sed prophetae magni capti vero retinent suam religionem originalem. -Both great prophets and missionaries are able to spread religion to cities when they are inside its borders, even cities of other civilizations. = Prophetae magni et missionarii utrique possunt sternere religionem ad urbes quom sunt intra fines earum etsi urbium civilizationum aliarum. +Both great prophets and missionaries are able to spread religion to cities when they are inside its borders, even cities of other civilizations. = Utrique prophetarum magnorum et missionariorum possunt sternere religionem ad urbes quom sunt intra fines earum etsi urbium civilizationum aliarum. These two units can even enter tiles of civilizations with whom you don't have an open borders agreement! = Hae duae centuriae etiam possunt ingredi tegulas civilizationum, cum quibus non habes concordiam de apertione finium! But do take care, missionaries will lose 250 religious strength each turn they end while in foreign lands. = Sed cures, missionarii amittant 250 potentiam religiosam gressu quo cumque in terris alienis sunt quom gressus perficitur. This diminishes their effectiveness when spreading religion, and if their religious strength ever reaches 0, they have lost their faith and disappear. = Hoc minuat efficaciam eorum quom sternunt religionem. Si potentia religiosa eorum quando attingit 0, amiserint fidem suam et disparebunt. diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index b695cc11c2..e4e1548b25 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -2087,8 +2087,7 @@ Roads connect tiles across rivers = Мосты позволяют проклад [relativeAmount]% maintenance on road & railroads = [relativeAmount]% к стоимости обслуживания дорог и железных дорог No Maintenance costs for improvements in [tileFilter] tiles = Улучшения на клетках [tileFilter] содержатся бесплатно [relativeAmount]% construction time for [improvementFilter] improvements = [relativeAmount]% времени постройки для улучшения [improvementFilter] - # Requires translation! -Can build [improvementFilter] improvements at a [relativeAmount]% rate = +Can build [improvementFilter] improvements at a [relativeAmount]% rate = Может строить [improvementFilter] улучшения клеток с [relativeAmount]% скоростью [relativeAmount]% maintenance cost for buildings [cityFilter] = [relativeAmount]% к стоимости содержания зданий [cityFilter] Remove [buildingFilter] [cityFilter] = Убрать [buildingFilter] [cityFilter] Sell [buildingFilter] buildings [cityFilter] = Продать здания [buildingFilter] в [cityFilter] diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 9848e12f56..53b4b7f32b 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.9.24" const val appName = "Unciv" - const val appCodeNumber = 1085 - const val appVersion = "4.14.17" + const val appCodeNumber = 1086 + const val appVersion = "4.14.18" const val gdxVersion = "1.12.1" const val ktorVersion = "2.3.12" diff --git a/changelog.md b/changelog.md index e612de5d51..7d82e15850 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,20 @@ +## 4.14.18 + +undo + +Cache edge images for faster update()s on all tilegroups (e.g. unit click) + +Resolved - "close unit table" button does not cycle units + +By SeventhM: +- Allow stat from battle uniques to also give stockpiles +- Fix gaining resources twice when it is gained from a city + +By czyh2022: +- Allow civs to trade with each other before settling their first cities +- Delete duplicate trade denied message +- Cancel the chain reaction of defense pact + ## 4.14.17 Fixed ANRs for: diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 98cbe59093..5bd404097a 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -486,7 +486,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.14.17", 1085) + val VERSION = Version("4.14.18", 1086) //endregion /** Global reference to the one Gdx.Game instance created by the platform launchers - do not use without checking [isCurrentInitialized] first. */ diff --git a/fastlane/metadata/android/en-US/changelogs/1086.txt b/fastlane/metadata/android/en-US/changelogs/1086.txt new file mode 100644 index 0000000000..55cc378228 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/1086.txt @@ -0,0 +1,16 @@ + + +undo + +Cache edge images for faster update()s on all tilegroups (e.g. unit click) + +Resolved - "close unit table" button does not cycle units + +By SeventhM: +- Allow stat from battle uniques to also give stockpiles +- Fix gaining resources twice when it is gained from a city + +By czyh2022: +- Allow civs to trade with each other before settling their first cities +- Delete duplicate trade denied message +- Cancel the chain reaction of defense pact \ No newline at end of file