From d95cf13a41dae02d087e1d176d5466e4de00b12f Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 18 Jul 2022 19:17:36 +0300 Subject: [PATCH] Version rollout (#7481) * Bump version and create initial changelog entry * Update Turkish.properties (#7473) * Ukrainian translations (#7472) * Update Spanish.properties (#7471) * Update Catalan.properties (#7467) * Update French.properties (#7466) * Update Italian.properties (#7464) * Update German translation (#7463) * Update German translation * Update German translation * Update Lithuanian.properties (#7462) Co-authored-by: yairm210 Co-authored-by: HasChad <58506555+HasChad@users.noreply.github.com> Co-authored-by: Jack Rainy Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com> Co-authored-by: Joan Josep Co-authored-by: Ouaz Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com> Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com> Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com> --- .../jsons/translations/Catalan.properties | 6 +- .../jsons/translations/French.properties | 6 +- .../jsons/translations/German.properties | 3 +- .../jsons/translations/Italian.properties | 6 +- .../jsons/translations/Lithuanian.properties | 7 +- .../jsons/translations/Spanish.properties | 10 +-- .../jsons/translations/Turkish.properties | 3 +- .../jsons/translations/Ukrainian.properties | 82 +++++++++---------- buildSrc/src/main/kotlin/BuildConfig.kt | 4 +- changelog.md | 16 ++++ core/src/com/unciv/UncivGame.kt | 2 +- .../metadata/android/en-US/changelogs/739.txt | 15 ++++ 12 files changed, 92 insertions(+), 68 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/739.txt diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties index 21242cf4fe..3450f4b7ee 100644 --- a/android/assets/jsons/translations/Catalan.properties +++ b/android/assets/jsons/translations/Catalan.properties @@ -1227,8 +1227,7 @@ Annex = Annexiona-la Annexed cities become part of your regular empire. = Les ciutats annexionades formen part del vostre imperi. Their citizens generate 2x the unhappiness, unless you build a courthouse. = Els seus ciutadans generen el doble d'infelicitat si la ciutat no té jutjat. Puppet = Converteix-la en titella - # Requires translation! -Puppeted cities do not increase your tech or policy cost. = +Puppeted cities do not increase your tech or policy cost. = Les ciutats titella no augmenten el cost de les polítiques ni de les recerques. You have no control over the the production of puppeted cities. = No controleu la producció de les ciutats titella. Puppeted cities also generate 25% less Gold and Science. = Les ciutats titella també generen un 25 % menys d'or i de ciència. A puppeted city can be annexed at any time. = Una ciutat titella es pot annexionar en qualsevol moment. @@ -5501,8 +5500,7 @@ The city can no longer put up any resistance!\nHowever, to conquer it, you must After Conquering = Després de la conquesta When conquering a city, you can choose to liberate, annex, puppet, or raze the city. = Quan es conquereix una ciutat, podeu triar alliberar-la, annexionar-la, controlar-la com una titella o arrasar la ciutat. - # Requires translation! -\nLiberating the city will return it to its original owner, giving you a massive diplomatic boost with them!\n\nAnnexing the city will give you full control over it, but also increase the citizens' unhappiness to 2x!\nThis can be mitigated by building a courthouse in the city, returning the citizen's unhappiness to normal.\n\nPuppeting the city will mean that you have no control on the city's production.\nThe city will not increase your tech or policy cost.\nA puppeted city can be annexed at any time, but annexed cities cannot be returned to a puppeted state!\n\nRazing the city will lower its population by 1 each turn until the city is destroyed!\nYou cannot raze a city that is either the starting capital of a civilization or the holy city of a religion. = +\nLiberating the city will return it to its original owner, giving you a massive diplomatic boost with them!\n\nAnnexing the city will give you full control over it, but also increase the citizens' unhappiness to 2x!\nThis can be mitigated by building a courthouse in the city, returning the citizen's unhappiness to normal.\n\nPuppeting the city will mean that you have no control on the city's production.\nThe city will not increase your tech or policy cost.\nA puppeted city can be annexed at any time, but annexed cities cannot be returned to a puppeted state!\n\nRazing the city will lower its population by 1 each turn until the city is destroyed!\nYou cannot raze a city that is either the starting capital of a civilization or the holy city of a religion. = \nAlliberant una ciutat, es retorna al seu propietari original, donant-vos una bonificació diplomàtica gran amb l'altra civilització o ciutat-estat.\n\nUna annexió en dóna el control total, però també duplicarà la infelicitat.\nAixò es pot mitigar si a la ciutat s'hi construeix un jutjat, que retorna la infelicitat a la ràtio normal.\n\nConvertint una ciutat a ciutat titella voldrà dir que no tindreu control de la producció de la ciutat.\nLa ciutat no comptarà pel cost de polítiques ni de tecnologies.\nUna ciutat titella es pot annexionar en qualsevol moment, però a l'inrevés no.\n\nArrasar la ciutat farà que la població vagi descendint en 1 unitat cada torn fins que la ciutat quedi destruïda.\nNo podeu arrasar una ciutat que sigui la capital inicial d'una civilització o la ciutat sagrada d'una religió. You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminately, so don't let your \n civilian units go near them, and be careful of your scout! = Heu trobat una unitat bàrbara!\nEls bàrbars ataquen a tothom, així que no deixeu\nles unitat civils a prop i aneu amb compte amb el vostre explorador! diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index ceafd1f119..63e57816da 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -1228,7 +1228,7 @@ Annexed cities become part of your regular empire. = Les villes annexées sont i Their citizens generate 2x the unhappiness, unless you build a courthouse. = Leurs citoyens génèrent un mécontentement x2, à moins de construire un tribunal. Puppet = Fantochiser # Requires translation! -Puppeted cities do not increase your tech or policy cost. = +Puppeted cities do not increase your tech or policy cost. = Les villes fantoches n'augmentent pas vos coûts en technologies ou doctrines. You have no control over the the production of puppeted cities. = Vous ne contrôlez pas la production des villes fantoches. Puppeted cities also generate 25% less Gold and Science. = Les villes fantoches génèrent -25% d'Or et de Science. A puppeted city can be annexed at any time. = Une ville fantoche peut être annexée à n'importe quel moment. @@ -5026,7 +5026,7 @@ Can spend Gold to annex or puppet a City-State that has been your ally for [amou Dido = Didon Tell me, do you all know how numerous my armies, elephants and the gdadons are? No? Today, you shall find out! = Dites-moi, savez-vous combien mes soldats, éléphants et gdadons sont nombreux ? Non ? Et bien, vous aurez la réponse aujourd'hui ! Fate is against you. You earned the animosity of Carthage in your exploration. Your days are numbered. = Le destin vous est défavorable. Vous avez récolté l'animosité de Carthage par vos agissements. Vos jours sont comptés. -The fates became to hate me. This is it? You wouldn't destroy us so without their help. = Les Parques m'ont abandonné. Est-ce donc la fin ? Vous ne nous auriez pas détruit sans leur aide. +The fates became to hate me. This is it? You wouldn't destroy us so without their help. = Les Parques m'ont abandonnée. Est-ce donc la fin ? Vous n'auriez jamais pu nous vaincre sans leur aide. The Phoenicians welcome you to this most pleasant kingdom. I am Dido, the queen of Carthage and all that belongs to it. = Les Phéniciens vous souhaitent la bienvenue dans leur magnifique royaume. Je suis Didon, Reine de Carthage et de tout ce qui lui appartient. I just had the marvelous idea, and I think you'll appreciate it too. = Je viens d'avoir cette merveilleuse idée, et je pense que vous aussi l'apprécierez. What is it now? = Que voulez-vous encore ? @@ -5502,7 +5502,7 @@ The city can no longer put up any resistance!\nHowever, to conquer it, you must After Conquering = Villes conquises When conquering a city, you can choose to liberate, annex, puppet, or raze the city. = Lors de la conquête d'une ville, vous pouvez choisir de la libérer, l'annexer, la fantochiser, ou la raser. # Requires translation! -\nLiberating the city will return it to its original owner, giving you a massive diplomatic boost with them!\n\nAnnexing the city will give you full control over it, but also increase the citizens' unhappiness to 2x!\nThis can be mitigated by building a courthouse in the city, returning the citizen's unhappiness to normal.\n\nPuppeting the city will mean that you have no control on the city's production.\nThe city will not increase your tech or policy cost.\nA puppeted city can be annexed at any time, but annexed cities cannot be returned to a puppeted state!\n\nRazing the city will lower its population by 1 each turn until the city is destroyed!\nYou cannot raze a city that is either the starting capital of a civilization or the holy city of a religion. = +\nLiberating the city will return it to its original owner, giving you a massive diplomatic boost with them!\n\nAnnexing the city will give you full control over it, but also increase the citizens' unhappiness to 2x!\nThis can be mitigated by building a courthouse in the city, returning the citizen's unhappiness to normal.\n\nPuppeting the city will mean that you have no control on the city's production.\nThe city will not increase your tech or policy cost.\nA puppeted city can be annexed at any time, but annexed cities cannot be returned to a puppeted state!\n\nRazing the city will lower its population by 1 each turn until the city is destroyed!\nYou cannot raze a city that is either the starting capital of a civilization or the holy city of a religion. = \nLibérer la ville la restitue à son propriétaire initial, ce qui améliore grandement votre relation diplomatique avec ce dernier !\n\nAnnexer la ville vous permet de la contrôler totalement, mais doublera le mécontentement de ses citoyens !\nCet effet peut être atténué en construisant un Tribunal dans la ville, ramenant le mécontentement des citoyens à son niveau normal.\n\nFantochiser la ville signifie que vous n'avez aucun contrôle sur la production de la ville.\nLa ville n'augmentera pas le coût de vos Recherches ou Doctrines.\nUne ville fantoche peut être annexée à tout moment, mais une ville annexée ne peut pas redevenir une ville fantoche !\n\nRaser la ville diminuera sa population de 1 à chaque tour, jusqu'à que la ville soit détruite !\nVous ne pouvez pas raser une ville s'il s'agit de la capitale de départ d'une civilisation ou bien de la ville sainte d'une religion. You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminately, so don't let your \n civilian units go near them, and be careful of your scout! = Vous avez rencontré une unité barbare !\nLes barbares attaquent tous ceux qu'ils croisent, donc n'envoyez \n pas vos unités civiles près d'eux, et gardez un oeil sur vos éclaireurs ! diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 6f257fac84..bb28f37dd0 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -1227,8 +1227,7 @@ Annex = Annektieren Annexed cities become part of your regular empire. = Annektierte Städte werden Teil Eures Reichs Their citizens generate 2x the unhappiness, unless you build a courthouse. = Deren Bürger generieren 2x soviel Unzufriedenheit, solange bis Ihr ein Gerichtsgebäude gebaut habt. Puppet = Marionette - # Requires translation! -Puppeted cities do not increase your tech or policy cost. = +Puppeted cities do not increase your tech or policy cost. = Marionettenstädte erhöhen weder die Kosten für Technologie noch für Sozialpolitik. You have no control over the the production of puppeted cities. = Ihr habt keine Kontrolle über die Produktion von Marionettenstädten. Puppeted cities also generate 25% less Gold and Science. = Marionettenstädte generieren 25% weniger Gold und Wissenschaft. A puppeted city can be annexed at any time. = Eine Marionettenstadt kann jederzeit annektiert werden. diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 9ec4270409..2fdbec7357 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -1232,8 +1232,7 @@ Annex = Annetti Annexed cities become part of your regular empire. = Le città annesse faranno parte regolare del tuo impero. Their citizens generate 2x the unhappiness, unless you build a courthouse. = I loro cittadini genereranno il doppio dell'Infelicità, fino a quando non costruirai un Palazzo di giustizia. Puppet = Riduci a Stato Fantoccio - # Requires translation! -Puppeted cities do not increase your tech or policy cost. = +Puppeted cities do not increase your tech or policy cost. = Gli stati fantoccio non apportano alcun incremento ai costi in Scienza e nelle politiche sociali. You have no control over the the production of puppeted cities. = Non hai alcun controllo sulla produzione delle città fantoccio. Puppeted cities also generate 25% less Gold and Science. = Gli stati fantoccio generano anche il 25% di Oro e Scienza in meno. A puppeted city can be annexed at any time. = Puoi annettere una città fantoccio ogni volta che vuoi, ma ricorda che è un processo irreversibile. @@ -5517,8 +5516,7 @@ The city can no longer put up any resistance!\nHowever, to conquer it, you must After Conquering = Città conquistata! When conquering a city, you can choose to liberate, annex, puppet, or raze the city. = Conquistata una città nemica, puoi scegliere se raderla al suolo, ridurla a stato fantoccio o annetterla al tuo impero.\nSe scegli la prima opzione, la città perderà un abitante ogni turno, fino a scomparire del tutto. (Translation update needed!) - # Requires translation! -\nLiberating the city will return it to its original owner, giving you a massive diplomatic boost with them!\n\nAnnexing the city will give you full control over it, but also increase the citizens' unhappiness to 2x!\nThis can be mitigated by building a courthouse in the city, returning the citizen's unhappiness to normal.\n\nPuppeting the city will mean that you have no control on the city's production.\nThe city will not increase your tech or policy cost.\nA puppeted city can be annexed at any time, but annexed cities cannot be returned to a puppeted state!\n\nRazing the city will lower its population by 1 each turn until the city is destroyed!\nYou cannot raze a city that is either the starting capital of a civilization or the holy city of a religion. = +\nLiberating the city will return it to its original owner, giving you a massive diplomatic boost with them!\n\nAnnexing the city will give you full control over it, but also increase the citizens' unhappiness to 2x!\nThis can be mitigated by building a courthouse in the city, returning the citizen's unhappiness to normal.\n\nPuppeting the city will mean that you have no control on the city's production.\nThe city will not increase your tech or policy cost.\nA puppeted city can be annexed at any time, but annexed cities cannot be returned to a puppeted state!\n\nRazing the city will lower its population by 1 each turn until the city is destroyed!\nYou cannot raze a city that is either the starting capital of a civilization or the holy city of a religion. = \nSe liberi una città la restituirai al suo possessore originale, nei confronti del quale otterrai un bonus diplomatico!\n\nAnnettere la città ti permetterà di prendere pieno controllo su di essa, ma raddoppierà l'Infelicità dei cittadini!\nL'effetto negativo è mitigabile costruendo un palazzo della giustizia, che ripristinerà l'Infelicità ai livelli normali.\n\nRendere la città uno stato fantoccio porterà un controllo parziale dove sarà impossibile controllare la produzione cittadina.\nIn compenso, il costo di Scienza e delle politiche sociali resterà invariato.\nPuoi annettere una città fantoccio quando vuoi, ma ricorda che è un processo irriversibile!\n\nRadere al suolo la città abbasserà di 1 il livello di popolazione ogni turno, fino alla distruzione finale.\nNon è possibile radere al suolo nè la capitale iniziale di una civiltà nè la città santa di una religione. You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminately, so don't let your \n civilian units go near them, and be careful of your scout! = Hai incontrato un'unità barbarica!\nI barbari attaccano chiunque indiscriminatamente, quindi tieni le tue unità civili lontane dalla loro vista, e stai attento col tuo esploratore! diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index d3cec99baa..c5cdf50f8c 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -1227,8 +1227,7 @@ Annex = Aneksuoti Annexed cities become part of your regular empire. = Aneksuoti miestai taps jūsų imperijos dalimi. Their citizens generate 2x the unhappiness, unless you build a courthouse. = Jų piliečiai bus 2 kartus nelaimingesni, kol nepastatysite teismo rūmų. Puppet = Marionetė - # Requires translation! -Puppeted cities do not increase your tech or policy cost. = +Puppeted cities do not increase your tech or policy cost. = Miestai-marionetės nedidina technologijų ar institutų kainos You have no control over the the production of puppeted cities. = Jūs nevaldote jų gamybos. Puppeted cities also generate 25% less Gold and Science. = Taip pat miestai-satelitai gamina ketvirčiu mažiau aukso ir mokslo. A puppeted city can be annexed at any time. = Miestą-satelitą galima bet kada aneksuoti. @@ -1343,7 +1342,7 @@ Eras = Eros Embarked strength: [amount]† = Įlaipintų jėga: [amount]† Base unit buy cost: [amount]¤ = Bazinių dalinių pirkimo kaina: [amount]¤ Research agreement cost: [amount]¤ = Tyrimų susitarimo kaina: [amount]¤ -Speeds = Sparčiau +Speeds = Greičiai General speed modifier: [amount]%⏳ = Bendras greičio mod.: [amount]%⏳ Production cost modifier: [amount]%⚙ = Gamybos kainos mod.: [amount]%⚙ Gold cost modifier: [amount]%¤ = Kainos auksu mod.: [amount]%¤ @@ -5021,7 +5020,7 @@ Saalbach = Zalbah Lienz = Lienc Steyr = Shtajr Austria = Austrija -Can spend Gold to annex or puppet a City-State that has been your ally for [amount] turns. = Už auksą galite aneksuoti ar padaryti klusniu vasalu laisvąjį miestą, kuri buvo sąjungininku [amount] ir daugiau ėjimų +Can spend Gold to annex or puppet a City-State that has been your ally for [amount] turns. = Už auksą galite aneksuoti ar padaryti klusniu vasalu laisvąjį miestą, kuris buvo sąjungininku [amount] ir daugiau ėjimų Dido = Didonė Tell me, do you all know how numerous my armies, elephants and the gdadons are? No? Today, you shall find out! = Štai sakykite, ar žinote kokio dydžio mano armijos? Ne? Šiandien pat sužinosite! diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 229e5a4f97..b5a285bacf 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -1177,10 +1177,10 @@ Location = Ubicación Unimproved = No mejorado Number of tiles with this resource\nin your territory, without an\nappropriate improvement to use it = Cantidad de casillas con este recurso\nen tu territorio, sin la\nmejora requerida para trabajarlo We Love The King Day = Día de Adoración al Rey -WLTK+ = DAaR+ +WLTK+ = DAR+ Number of your cities celebrating\n'We Love The King Day' thanks\nto access to this resource = Número de ciudades celebrando el\n"Día de Adoración al Rey" gracias\nal acceso a este recurso -WLTK demand = Demanda para DAaR -WLTK- = DAaR- +WLTK demand = Demandado para DAR +WLTK- = DAR- 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" Trade request = Propuesta de Comercio @@ -1228,7 +1228,7 @@ Annexed cities become part of your regular empire. = Las ciudades anexionadas pa Their citizens generate 2x the unhappiness, unless you build a courthouse. = Sus ciudadanos generan el doble de infelicidad a no ser que construyas un juzgado. Puppet = Convertir en títere # Requires translation! -Puppeted cities do not increase your tech or policy cost. = +Puppeted cities do not increase your tech or policy cost. = Las ciudades títere no aumentan el coste de tecnologías ni de políticas. You have no control over the the production of puppeted cities. = No puedes controlar la producción en las ciudades títere. Puppeted cities also generate 25% less Gold and Science. = Las ciudades títere generan un 25% menos de Oro y Ciencia. A puppeted city can be annexed at any time. = Una ciudad títere puede ser anexionada en cualquier momento. @@ -5502,7 +5502,7 @@ The city can no longer put up any resistance!\nHowever, to conquer it, you must After Conquering = Después de Conquistar When conquering a city, you can choose to liberate, annex, puppet, or raze the city. = Cuando conquistas una ciudad, puedes elegir entre liberarla, convertirla en títere, anexionarla, o arrasarla. # Requires translation! -\nLiberating the city will return it to its original owner, giving you a massive diplomatic boost with them!\n\nAnnexing the city will give you full control over it, but also increase the citizens' unhappiness to 2x!\nThis can be mitigated by building a courthouse in the city, returning the citizen's unhappiness to normal.\n\nPuppeting the city will mean that you have no control on the city's production.\nThe city will not increase your tech or policy cost.\nA puppeted city can be annexed at any time, but annexed cities cannot be returned to a puppeted state!\n\nRazing the city will lower its population by 1 each turn until the city is destroyed!\nYou cannot raze a city that is either the starting capital of a civilization or the holy city of a religion. = +\nLiberating the city will return it to its original owner, giving you a massive diplomatic boost with them!\n\nAnnexing the city will give you full control over it, but also increase the citizens' unhappiness to 2x!\nThis can be mitigated by building a courthouse in the city, returning the citizen's unhappiness to normal.\n\nPuppeting the city will mean that you have no control on the city's production.\nThe city will not increase your tech or policy cost.\nA puppeted city can be annexed at any time, but annexed cities cannot be returned to a puppeted state!\n\nRazing the city will lower its population by 1 each turn until the city is destroyed!\nYou cannot raze a city that is either the starting capital of a civilization or the holy city of a religion. = \nLiberar la ciudad la retorna a su dueño original, ¡dandote una gran bonificación diplomatica con ellos!\n\nAnexionar la ciudad te dá control total de ella, ¡pero también aumenta la infelicidad de los ciudadanos x2!\n Esto puede ser mitigado construyendo un Juzgado en la ciudad, devolviendo la infelicidad a niveles normales.\n\nConvertír la ciudad en títere significa que no tienes control sobre su producción.\n La ciudad no aumentará el coste de tecnologías ni politicas.\n Una ciudad títere puede ser anexionada en cualquier momento, ¡pero las anexionadas no se pueden convertír en títere!\n\n¡Arrasar la ciudad bajará la población uno a uno hasta que la ciudad se destruya!\n No puedes arrasar ciudades que hayan sido la capital original o ciudad santa de una religión. You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminately, so don't let your \n civilian units go near them, and be careful of your scout! = ¡Has encontrado una unidad bárbara!\nLos bárbaros atacan indiscriminadamente a cualquiera, por ello no dejes\n a tus unidades civiles ir cerca de ellos, y ten cuidad con tus exploradores. diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 1eb75ca489..aae31bee26 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -4434,8 +4434,7 @@ City ruins = Şehir Kalıntıları A bleak reminder of the destruction wreaked by War = Savaşın yol açtığı yıkımın iç karartıcı bir hatırlatıcısı City center = Şehir merkezi - # Requires translation! -Irremovable = +Irremovable = Kaldırılamaz Marks the center of a city = Şehir merkezini işaret eder Appearance changes with the technological era of the owning civilization = Dış görünüşü uygarlığın içinde bulunduğu çağ ile değişir diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 89fc73c1e7..7584ba0618 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -30,8 +30,8 @@ Fastlane_full_description = Delete = Видалити # Base ruleset names -Civ V - Vanilla = Civ V - Vanilla -Civ V - Gods & Kings = Civ V - Gods & Kings +Civ V - Vanilla = Civ V - Оригінальна +Civ V - Gods & Kings = Civ V - Боги та Королі # Tutorial tasks @@ -1742,7 +1742,7 @@ Temple of Artemis = Храм Артеміди # Requires translation! 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.' - Robert Louis Stevenson = [relativeAmount]% [stat] [cityFilter] = [relativeAmount]% [stat] [cityFilter] -[relativeAmount]% Production when constructing [baseUnitFilter] units [cityFilter] = [relativeAmount]% до створення [baseUnitFilter] підрозділів у [cityFilter] +[relativeAmount]% Production when constructing [baseUnitFilter] units [cityFilter] = [relativeAmount]% до створення [baseUnitFilter] підрозділів [cityFilter] The Great Lighthouse = Александрійський маяк 'They that go down to the sea in ships, that do business in great waters; these see the works of the Lord, and his wonders in the deep.' - The Bible, Psalms 107:23-24 = «Ті, хто по морю пливе кораблями, хто чинить зайняття своє на великій воді; вони бачили чини Господні та чуда Його в глибині!» — Біблія, Псалом 107:23-34. @@ -1790,7 +1790,7 @@ New [baseUnitFilter] units start with [amount] Experience [cityFilter] = Нов Krepost = Фортеця [relativeAmount]% Culture cost of natural border growth [cityFilter] = [relativeAmount]% вартості культурного розширення кордонів [cityFilter] -[relativeAmount]% Gold cost of acquiring tiles [cityFilter] = [relativeAmount]% вартості для придбання клітинок у [cityFilter] +[relativeAmount]% Gold cost of acquiring tiles [cityFilter] = [relativeAmount]% вартості для придбання клітинок [cityFilter] Statue of Zeus = Статуя Зевса 'He spoke, the son of Kronos, and nodded his head with the dark brows, and the immortally anointed hair of the great god swept from his divine head, and all Olympos was shaken' - The Iliad = «Він, син Кроноса, мовив та похитав головою з-під темних бров, та волосся помазане бессмертям величного бога впало з його святої голови, та весь Олімп здригнувся» — Ілліада. @@ -1834,7 +1834,7 @@ The Oracle = Оракул Free Social Policy = Надає безкоштовну соціальну інституцію National Epic = Національний епос -[relativeAmount]% Great Person generation [cityFilter] = [relativeAmount]% до створення Видатних осіб у [cityFilter] +[relativeAmount]% Great Person generation [cityFilter] = [relativeAmount]% до створення Видатних осіб [cityFilter] Market = Ринок @@ -1844,7 +1844,7 @@ Provides 1 extra copy of each improved luxury resource near this City = Нада Mint = Монетний двір Aqueduct = Акведук -[relativeAmount]% Food is carried over after population increases [cityFilter] = [relativeAmount]% їжі переноситься на майбутнє після зростання населення у [cityFilter] +[relativeAmount]% Food is carried over after population increases [cityFilter] = [relativeAmount]% їжі переноситься на майбутнє після зростання населення [cityFilter] Heroic Epic = Героїчний епос All newly-trained [baseUnitFilter] units [cityFilter] receive the [promotion] promotion = Усі нові [baseUnitFilter] підрозділи [cityFilter] отримують підвищення [promotion] @@ -1924,7 +1924,7 @@ Satrap's Court = Двір сатрапа Forbidden Palace = Заборонене місто 'Most of us can, as we choose, make of this world either a palace or a prison' - John Lubbock = «Більшість з нас може, за власним вибором, зробити цей світ палацом або в’язницею» — Джон Лаббок. -[relativeAmount]% Unhappiness from [populationFilter] [cityFilter] = [relativeAmount]% нещастя від [populationFilter] у [cityFilter] +[relativeAmount]% Unhappiness from [populationFilter] [cityFilter] = [relativeAmount]% нещастя від [populationFilter] [cityFilter] Theatre = Театр @@ -2062,44 +2062,44 @@ Deity = Бог Warrior = Воїн # Requires translation! -cityAncient = +cityAncient = Доісторичне місто Ancient era = Доісторичність Spearman = Списник # Requires translation! -cityClassical = +cityClassical = Античне місто Classical era = Античність # Requires translation! -cityMedieval = +cityMedieval = Середньовічне місто Medieval era = Середньовіччя Pikeman = Пікінер # Requires translation! -cityRenaissance = +cityRenaissance = Місто епохи відродження Renaissance era = Відродження Musketman = Мушкетник # Requires translation! -cityIndustrial = +cityIndustrial = Промислове місто Industrial era = Промислова ера Rifleman = Карабінер # Requires translation! -cityModern = +cityModern = Сучасне місто Modern era = Сучасність Infantry = Піхота # Requires translation! -cityAtomic = +cityAtomic = Місто часів холодної війни Atomic era = Холодна війна # Requires translation! -cityInformation = +cityInformation = Місто інформаційної ери Information era = Інформаційна ера # Requires translation! -cityFuture = +cityFuture = Місто майбутнього Future era = Майбутнє @@ -3586,7 +3586,7 @@ You gormless radger! You'll dine on your own teeth before you set foot in Irelan A lonely wind blows through the highlands today. A dirge for Ireland. Can you hear it? = Хех! Хороша перемога. Dublin = Дублін # Requires translation! -Will not be chosen for new games = +Will not be chosen for new games = Не буде обраний для нових ігор You shall stain this land no longer with your vileness! To arms, my countrymen - we ride to war! = Ви не залишили нам вибору. Війні бути. Traitorous man! The Celtic peoples will not stand for such wanton abuse and slander - I shall have your head! = Прекрасно, ми цього не забудемо. @@ -3603,9 +3603,9 @@ Sidon = Сидон We don't like your face. To arms! = Ви нам не подобаєтесь. До зброї! # Requires translation! -You will see you have just bitten off more than you can chew. = +You will see you have just bitten off more than you can chew. = Ви скоро побачите, що відкусили більше ніж можете проковтнути. # Requires translation! -This ship may sink, but our spirits will linger. = +This ship may sink, but our spirits will linger. = Цей корабель може й тоне, але наші душі ще будуть тут. Valletta = Валлетта Can only heal by pillaging = Може відновлюватись тільки грабіжництвом @@ -3619,15 +3619,15 @@ Provides the cheapest [stat] building in your first [amount] cities for free = Oligarchy = Олігархія Units in cities cost no Maintenance = Підрозділи у містах не потребують обслуговування # Requires translation! -with a garrison = +with a garrison = з гарнізоном # Requires translation! -[relativeAmount]% Strength for cities = +[relativeAmount]% Strength for cities = [relativeAmount]% сили для міст Landed Elite = Землевласники [relativeAmount]% growth [cityFilter] = [relativeAmount]% до росту [cityFilter] Monarchy = Монархія Tradition Complete = Традиція завершена # Requires translation! -Tradition = +Tradition = Традиція Collective Rule = Колективне керівництво Citizenship = Права і обов’язки громадянина @@ -3638,7 +3638,7 @@ Meritocracy = Меритократія Liberty Complete = Лібералізм завершено Free Great Person = Безкоштовно з’являється видатна особа # Requires translation! -Liberty = +Liberty = Лібералізм Warrior Code = Кодекс воїна Discipline = Дисципліна @@ -3663,9 +3663,9 @@ Reformation = Реформація Free Religion = Свобода віросповідання Piety Complete = Побожність завершена # Requires translation! -Piety = +Piety = Побожність # Requires translation! -before adopting [policy] = +before adopting [policy] = до прийняття [policy] Philantropy = Філантропія Gifts of Gold to City-States generate [relativeAmount]% more Influence = Подарунки містам-державам дають на [relativeAmount]% більше впливу @@ -3684,7 +3684,7 @@ Patronage Complete = Патронаж завершено Influence of all other civilizations with all city-states degrades [relativeAmount]% faster = Вплив усіх інших цивілізацій на усі міста-держави зменшується на [relativeAmount]% швидше Triggers the following global alert: [comment] = З'явиться наступне глобальне повідомлення: [comment] # Requires translation! -Patronage = +Patronage = Патронаж Naval Tradition = Морська традиція Trade Unions = Профспілки @@ -3695,7 +3695,7 @@ Protectionism = Протекціонізм [amount] Happiness from each type of luxury resource = Commerce Complete = Торгівля завершена # Requires translation! -Commerce = +Commerce = Торгівля Secularism = Секуляризм Humanism = Людяність @@ -3703,13 +3703,13 @@ Free Thought = Вільнодумство Sovereignty = Державний суверенітет while the empire is happy = поки імперія щаслива # Requires translation! -[relativeAmount]% [stat] = +[relativeAmount]% [stat] = [relativeAmount]% [stat] Scientific Revolution = Наукова революція [amount] Free Technologies = [amount] безкоштовних технологій Rationalism Complete = Раціоналізм завершено [stats] from all [buildingFilter] buildings = [stats] за всі споруди у категорії [buildingFilter] # Requires translation! -Rationalism = +Rationalism = Раціоналізм Constitution = Конституція Universal Suffrage = Загальне виборче право @@ -3722,7 +3722,7 @@ Free Speech = Свобода слова Democracy = Демократія Freedom Complete = Свобода завершена # Requires translation! -Freedom = +Freedom = Свобода Populism = Популізм Militarism = Мілітаризм @@ -3733,9 +3733,9 @@ Police State = Поліційна держава Total War = Тотальна війна Autocracy Complete = Автократія завершена # Requires translation! -for [amount] turns = +for [amount] turns = на [amount] ходів # Requires translation! -Autocracy = +Autocracy = Автократія United Front = Об'єднаний фронт Militaristic City-States grant units [amount] times as fast when you are at war with a common nation = Військові міста-держави дарують підрозділи у [amount] разів швидше під час війни зі спільним суперником @@ -3747,7 +3747,7 @@ Socialism = Соціалізм Communism = Комунізм Order Complete = Порядок завершено # Requires translation! -Order = +Order = Порядок #################### Lines from Quests from Civ V - Vanilla #################### @@ -3786,15 +3786,15 @@ We need your protection to stop the aggressions of [civName]. By signing a Pledg Contest Culture = Культурне змагання # Requires translation! -The civilization with the largest Culture growth will gain a reward. = +The civilization with the largest Culture growth will gain a reward. = Цивілізація з найбільшим приростом Культури отримає нагороду. Contest Faith = Релігійне змагання # Requires translation! -The civilization with the largest Faith growth will gain a reward. = +The civilization with the largest Faith growth will gain a reward. = Цивілізація з найбільшим приростом Віри отримає нагороду. Contest Technologies = Технологічне змагання # Requires translation! -The civilization with the largest number of new Technologies researched will gain a reward. = +The civilization with the largest number of new Technologies researched will gain a reward. = Цивілізація з найбільшою кількістю нових завершених досліджень отримає нагороду. Invest = Інвестуйте # Requires translation! @@ -4073,9 +4073,9 @@ Lakes = Озера Fresh water = прісноводні Mountain = Гори -Has an elevation of [amount] for visibility calculations = Має висоту [amount] видимости +Has an elevation of [amount] for visibility calculations = Має висоту [amount] видимості # Requires translation! -Units ending their turn on this terrain take [amount] damage = +Units ending their turn on this terrain take [amount] damage = Підрозділи, що закінчують свій хід на цій клітинці, отримують [amount] пошкоджень Snow = Сніг @@ -4086,16 +4086,16 @@ Forest = Ліс Provides a one-time Production bonus to the closest city when cut down = Забезпечує одноразовий бонус до виробництва найближчому місті при вирубці Blocks line-of-sight from tiles at same elevation = Блокує лінію огляду з клітинок на цій же висоті # Requires translation! -[amount]% Chance to be destroyed by nukes = +[amount]% Chance to be destroyed by nukes = [amount]% шансу бути знищеним ядерною зброєю # Requires translation! -A Camp can be built here without cutting it down = +A Camp can be built here without cutting it down = Табір може бути побудований тут без вирубки Jungle = Джунглі Marsh = Болото Rare feature = Рідкісна риса # Requires translation! -Only Polders can be built here = +Only Polders can be built here = Лише польдер може бути побудований тут Fallout = Радіоактивні опади # Requires translation! diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 64d0b0b8c8..0af315e8d5 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -3,8 +3,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.7.0" const val appName = "Unciv" - const val appCodeNumber = 738 - const val appVersion = "4.1.19" + const val appCodeNumber = 739 + const val appVersion = "4.1.20" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 58d0c5b57f..24c659aafb 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,19 @@ +## 4.1.20 + +Resolve -Can no longer receive negative gold offers from AI + +Keep progress in notification scroll when updating + +Stat colors unified - for use in notifications, improvements, yield icons, etc + +Gray out city state friend bonus when allied - By Azzurite + +By OptimizedForDensity: +- Minor reweight of AI policy selection +- Stop transported units from being able to pillage tiles + +Fix getting settlers from ancient ruins on one-city challenge - By MindaugasRumsa51 + ## 4.1.19 Interception always takes an attack - By itanasi diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 1064c4fc20..be1e07846e 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -451,7 +451,7 @@ class UncivGame(parameters: UncivGameParameters) : Game() { companion object { //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT - val VERSION = Version("4.1.19", 738) + val VERSION = Version("4.1.20", 739) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/739.txt b/fastlane/metadata/android/en-US/changelogs/739.txt new file mode 100644 index 0000000000..776db24f73 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/739.txt @@ -0,0 +1,15 @@ + + +Resolve -Can no longer receive negative gold offers from AI + +Keep progress in notification scroll when updating + +Stat colors unified - for use in notifications, improvements, yield icons, etc + +Gray out city state friend bonus when allied - By Azzurite + +By OptimizedForDensity: +- Minor reweight of AI policy selection +- Stop transported units from being able to pillage tiles + +Fix getting settlers from ancient ruins on one-city challenge - By MindaugasRumsa51 \ No newline at end of file