diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index dc8a151be8..3c0b26398a 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -2872,7 +2872,7 @@ It is over. Perhaps now I shall have peace, at last. = C'est terminé. Peut-êtr Are you real or a phantom? = Êtes-vous un fantôme, ou fait de chair et de sang ? It appears that you do have a reason for existing – to make this deal with me. = Il semble que vous ayez une raison d'exister - conclure cet accord avec moi. Greetings. = Salutations. -What do YOU want?! = Et VOUS, que voulez-vous ? +What do YOU want?! = Encore vous ?! Ingenuity = Ingéniosité Babylon = Babylone Akkad = Akkad @@ -2974,7 +2974,7 @@ You have proven to be a cunning and competent adversary. I congratulate you on y Greetings, I am Empress Wu Zetian. China desires peace and development. You leave us alone, we'll leave you alone. = Salutations, je suis l'Impératrice Wu Zetian. La Chine désire paix et développement. Laissez-nous tranquilles, nous vous laisserons tranquilles. My friend, do you think you can accept this request? = Mon ami, pensez-vous que vous pouvez accepter cette demande ? How are you today? = Comment allez-vous aujourd'hui ? -Oh. It's you? = Oh ! C'est vous ? +Oh. It's you? = Oh... C'est vous ? Art of War = L'Art de la Guerre Beijing = Pékin Shanghai = Shanghaï @@ -3025,8 +3025,8 @@ You are a fool who evokes pity. You have brought my hostility upon yourself and Strike me down and my soul will torment yours forever, you have won nothing. = Mettez-moi à terre et mon âme tourmentera la vôtre pour l'éternité, vous n'avez rien gagné. Greetings, I am Ramesses the god. I am the living embodiment of Egypt, mother and father of all civilizations. = Salutations, je suis le dieu Ramsès. Je suis l'incarnation vivante de l’Égypte, mère et père de toutes les civilisations. Generous Egypt makes you this offer. = La généreuse Égypte vous fait cette offre. -Good day. = Belle journée. -Oh, it's you. = Oh ! C'est vous. +Good day. = Salutations. +Oh, it's you. = Ah, c'est vous. Monument Builders = Bâtisseurs de Monuments Thebes = Thèbes Memphis = Memphis @@ -3084,7 +3084,7 @@ We shall never surrender. = Nous ne nous rendrons jamais. You have triumphed over us. The day is yours. = Vous avez triomphé de nous. Ce jour est vôtre. We are pleased to meet you. = Nous sommes heureux de vous rencontrer. Would you be interested in a trade agreement with England? = Seriez-vous intéressé par un accord commercial avec l'Angleterre ? -Hello, again. = Bonjour... à nouveau. +Hello, again. = Et bonjour. Oh, it's you! = Oh ! C'est vous ! Sun Never Sets = Le Soleil ne se Couche Jamais London = Londres @@ -3476,8 +3476,8 @@ Corrupted villain! We will bring you into the ground! = Vil personnage ! Je vous Germany has been destroyed. I weep for the future generations. = L'Allemagne est détruite. J'en suis triste pour les générations futures. Guten Tag. In the name of the great German people, I bid you welcome. = Guten Tag. Au nom du grand peuple germanique, je vous souhaite la bienvenue. It would be in your best interest, to carefully consider this proposal. = Il serait dans votre plus grand intérêt d'étudier attentivement cette proposition. -What now? = Quoi encore ? -So, out with it! = Bien, finissons-en ! +What now? = C'est à quel sujet ? +So, out with it! = Bien, faites vite ! Furor Teutonicus = Furor Teutonicus Berlin = Berlin Hamburg = Hambourg @@ -3665,7 +3665,7 @@ Curse you! You are beneath me, son of a donkey driver! I will crush you! = Soyez You mongrel! Cursed be you! The world will long lament your heinous crime! = Vaurien ! Soyez maudit ! Le monde méprisera encore longtemps vos crimes haineux ! Peace be on you! I am Darius, the great and outstanding king of kings of great Persia... but I suppose you knew that. = Que la paix soit sur vous ! Je suis Darius, le grand et éblouissant roi des rois de la splendide Perse... mais j'imagine que vous le saviez déjà. In my endless magnanimity, I am making you this offer. You agree, of course? = Dans mon infinie magnanimité, je vous propose cette offre. Vous l'acceptez, bien sûr ? -Good day to you! = Belle journée à vous ! +Good day to you! = Bienvenue à vous ! Ahh... you... = Ah... Vous... Achaemenid Legacy = Héritage Achéménide Persepolis = Persépolis @@ -4006,7 +4006,7 @@ How did you darken the sun? I ruled with diligence and mercy—see that you do s How are you? You stand before Pachacuti Inca Yupanqui. = Comment allez-vous ? Vous vous tenez devant Pachacutec Inca Yupanqui. The Incan people offer this fair trade. = Le peuple Inca vous offre cette échange équitable. How are you doing? = Comment allez-vous ? -What do you want now? = Que voulez-vous, à présent ? +What do you want now? = Que voulez-vous encore ? Great Andean Road = Le Chemin de l'Inca Cuzco = Cuzco Tiwanaku = Tiwanaku @@ -5693,7 +5693,7 @@ Now what is this?! You ask me to add your riches to my great avails. The invitat My people will mourn me not with tears, but with human blood. = Mon peuple ne versera pas de larmes, mais fera couler le sang. You are in the presence of Attila, scourge of Rome. Do not let hubris be your downfall as well. = Tu es en présence d'Attila, le fléau de Rome. Veille bien à ce que l'hubris ne provoque pas aussi ta chute. This is better than you deserve, but let it not be said that I am an unfair man. = Tu ne mérites pas autant, mais l'on ne pourra clamer que je suis homme injuste. -Good day to you. = Bonne journée à toi. +Good day to you. = Bienvenue à toi. Scourge of God = Fléau de Dieu Balamber = Balamber Uldin = Uldin @@ -5767,8 +5767,8 @@ Ha ha ha, captain Gars will be very glad to head out to war again. = Ha ha ha, l I am Sweden's king. You can take my lands, my people, my kingdom, but you will never reach the House of Vasa. = Je suis le roi de Suède. Puissiez-vous prendre mes terres, mon peuple, mon royaume, jamais vous n'atteindrez la Maison Vasa. Stranger, welcome to the Snow King's kingdom! I am Gustavus Adolphus, member of the esteemed House of Vasa = Étranger, bienvenue dans le royaume du Roi des Neiges ! Je suis Gustave II Adolphe, membre de la vénérable Dynastie Vasa. My friend, it is my belief that this settlement can benefit both our peoples. = Mon cher ami, je suis convaincu que cet accord sera bénéfique à nos deux peuples. -Oh, welcome! = Oh, bienvenue ! -Oh, it is you. = Oh, c'est vous. +Oh, welcome! = Ah, bienvenue ! +Oh, it is you. = Ah... ça n'est que vous. Nobel Prize = Prix Nobel Leif = Leif Ingegard = Ingegard diff --git a/android/assets/jsons/translations/Latin.properties b/android/assets/jsons/translations/Latin.properties index fd3df6f1de..8e15584863 100644 --- a/android/assets/jsons/translations/Latin.properties +++ b/android/assets/jsons/translations/Latin.properties @@ -182,60 +182,60 @@ Diplomacy = Externis rebus War = Bellum Peace = Pax # Requires translation! -Research Agreement = +Research Agreement = Concordia adsectationis # Requires translation! -Declare war = +Declare war = Bellum indice # Requires translation! -Declare war on [civName]? = +Declare war on [civName]? = Indicisne bellum contra [civName]? # Requires translation! -[civName] will also join them in the war = +[civName] will also join them in the war = [civName] quoque eorum in bellum copulaverit # Requires translation! -An unknown civilization will also join them in the war = +An unknown civilization will also join them in the war = Civilizatio incognita quoque eorum in bellum copulaverit # Requires translation! -This will cancel your defensive pact with [civName] = +This will cancel your defensive pact with [civName] = Hoc foedus defensivus tuus cum [civName] resciderit # Requires translation! -Go to on map = +Go to on map = I in tabula # Requires translation! -Let's begin! = +Let's begin! = Initiamus! # Requires translation! -[civName] has declared war on us! = +[civName] has declared war on us! = [civName] bellum contra nos indixit! [leaderName] of [nation] = [leaderName] de [nation] # Requires translation! -You'll pay for this! = +You'll pay for this! = Omnia debita solveris! # Requires translation! -Negotiate Peace = +Negotiate Peace = Pax Pacisce # Requires translation! -Peace with [civName]? = +Peace with [civName]? = Pax cum [civName]? # Requires translation! -Very well. = +Very well. = Perbene. # Requires translation! -Farewell. = +Farewell. = Vale. # Requires translation! -Sounds good! = +Sounds good! = Sonat bene! # Requires translation! -Not this time. = +Not this time. = Abdico. # Requires translation! -Excellent! = +Excellent! = Magnifice! # Requires translation! -How about something else... = +How about something else... = Propositionem aliam habeo... # Requires translation! -A pleasure to meet you. = +A pleasure to meet you. = Mihi pergratum est te convenire. # Requires translation! -Our relationship = +Our relationship = Affinitas nostra # Requires translation! We have encountered the City-State of [name]! = # Requires translation! -Declare Friendship ([numberOfTurns] turns) = +Declare Friendship ([numberOfTurns] turns) = Amicitia indice ([numberOfTurns] passus) # Requires translation! May our nations forever remain united! = # Requires translation! -Indeed! = +Indeed! = Equidem! # Requires translation! -Denounce [civName]? = +Denounce [civName]? = Criminasne [civName]? # Requires translation! -Denounce ([numberOfTurns] turns) = +Denounce ([numberOfTurns] turns) = Crimina ([numberOfTurns] passus) # Requires translation! -We will remember this. = +We will remember this. = Semper de hoc meminerimus. # Requires translation! [civName] has declared war on [targetCivName]! = @@ -264,35 +264,35 @@ They promised not to settle near us ([count] turns remaining) = [civName] has destroyed [cityState], whom you had pledged to protect! = # Requires translation! -Unforgivable = +Unforgivable = Pleni odii # Requires translation! -Afraid = +Afraid = Timidi # Requires translation! -Enemy = +Enemy = Hostiles # Requires translation! -Competitor = +Competitor = Aemuli # Requires translation! -Neutral = +Neutral = Medii # Requires translation! -Favorable = +Favorable = Faventes # Requires translation! -Friend = +Friend = Amici # Requires translation! -Ally = +Ally = Socii # Requires translation! -[questName] (+[influenceAmount] influence) = +[questName] (+[influenceAmount] influence) = [questName] (+[influenceAmount] influentia) # Requires translation! -[remainingTurns] turns remaining = +[remainingTurns] turns remaining = [remainingTurns] gressus reliqui # Requires translation! -Current leader is [civInfo] with [amount] [stat] generated. = +Current leader is [civInfo] with [amount] [stat] generated. = Nunc dux [civInfo] est cum [amount] [stat] generascentibus. # Requires translation! -Current leader is [civInfo] with [amount] Technologies discovered. = +Current leader is [civInfo] with [amount] Technologies discovered. = Nunc dux [civInfo] est cum [amount] technologiis inventis. # Requires translation! -Demands = +Demands = Postulata # Requires translation! -Please don't settle new cities near us. = +Please don't settle new cities near us. = Quaesimus, nolite oppida nova prope nos condere. # Requires translation! Very well, we shall look for new lands to settle. = # Requires translation! @@ -309,9 +309,9 @@ It's come to my attention that I may have attacked [civName], a city-state under I thought you might like to know that I've launched an invasion of one of your little pet states.\nThe lands of [civName] will make a fine addition to my own. = # Requires translation! -Return [unitName] to [civName]? = +Return [unitName] to [civName]? = Reddisne [unitName] [[civName]]? # Requires translation! -The [unitName] we liberated originally belonged to [civName]. They will be grateful if we return it to them. = +The [unitName] we liberated originally belonged to [civName]. They will be grateful if we return it to them. = Centuria [unitName] quae liberavimus primordialiter ad [civName] adpertinuit. Si eam eis reddiderimus, ad nos gratulabunt. # Requires translation! Enter the amount of gold = @@ -567,7 +567,7 @@ Game Options = Optiones ludum Civilizations = Nationes Map Type = Forma tabulæ Map file = Limo tabulæ -Max Turns = Passus maximus +Max Turns = Gressus maximus # Requires translation! Could not load map! = Generated = Generatus @@ -1838,11 +1838,11 @@ Confirm next turn = Adfirmo sit tempus Move automated units = # Requires translation! [currentPlayerCiv] ready? = -1 turn = 1 passus -[numberOfTurns] turns = [numberOfTurns] turni -Turn = Passus -turns = passus -turn = passus +1 turn = 1 gressus +[numberOfTurns] turns = [numberOfTurns] gressus +Turn = Gressus +turns = gressus +turn = gressus Next unit = Proxima unitas Fog of War = Nebula bellum Pick a policy = Delige consilium diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 27e5819e30..450adfc20e 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.8.21" const val appName = "Unciv" - const val appCodeNumber = 937 - const val appVersion = "4.9.2-patch5" + const val appCodeNumber = 938 + const val appVersion = "4.9.3" const val gdxVersion = "1.12.1" const val ktorVersion = "2.2.3" diff --git a/changelog.md b/changelog.md index dafad4261f..59c1f5548d 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,68 @@ +## 4.9.3 + +Resolves - Cities you haven't bombarded with will auto-bombard at turn end + +Resolves - Defeated (no units/cities) hotseat multiplayer no longer appears for turns ("player X ready") + +cleanup + +4.9.2-patch5 + +I think I found the conflict - checkout ref! + +Wait after PR merge, so the versioning can be done simply + +Wait after PR merge, so the versioning can be done simply + +ALL TOGETHER NOW + +4.9.2-patch4 + +Tag does not trigger rebuild - maybe now it will + +4.9.2-patch3 + +You know what let's just check out the second half + +damn wrong filename + +whoops + +Readymade didn't work, trying my own github script for PR merge + +Use manual access token to merge PR + +Try using git commit created by other people + +Added patch automation step! + +Added script to update versions on patch release + +Nicer command display + +4.9.2-patch2 + +4.9.2-patch1 + +By willjallen: +- Add queuing functionality +- Fix typo + +By tuvus: +- Initial AutoPlay implementation +- Fixed isGoodTileToExplore() to check if there is no enemy in range + +By dHannasch: +- Add IHasUniques.era() +- Wrap INonPerpetualConstruction.requiredTech into function + +By SomeTroglodyte: +- (CQ) Linting and comments on TileSetStrings and ImageAttempter +- Wesnoth map import polished up +- City sounds again + +Fix founding cities removing city center tile improvement - By SeventhM + ## 4.9.2 Console: diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 4524947c92..871c377b95 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -464,7 +464,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.9.2-patch5", 937) + val VERSION = Version("4.9.3", 938) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/938.txt b/fastlane/metadata/android/en-US/changelogs/938.txt new file mode 100644 index 0000000000..08e9491db9 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/938.txt @@ -0,0 +1,64 @@ + + +Resolves - Cities you haven't bombarded with will auto-bombard at turn end + +Resolves - Defeated (no units/cities) hotseat multiplayer no longer appears for turns ("player X ready") + +cleanup + +4.9.2-patch5 + +I think I found the conflict - checkout ref! + +Wait after PR merge, so the versioning can be done simply + +Wait after PR merge, so the versioning can be done simply + +ALL TOGETHER NOW + +4.9.2-patch4 + +Tag does not trigger rebuild - maybe now it will + +4.9.2-patch3 + +You know what let's just check out the second half + +damn wrong filename + +whoops + +Readymade didn't work, trying my own github script for PR merge + +Use manual access token to merge PR + +Try using git commit created by other people + +Added patch automation step! + +Added script to update versions on patch release + +Nicer command display + +4.9.2-patch2 + +4.9.2-patch1 + +By willjallen: +- Add queuing functionality +- Fix typo + +By tuvus: +- Initial AutoPlay implementation +- Fixed isGoodTileToExplore() to check if there is no enemy in range + +By dHannasch: +- Add IHasUniques.era() +- Wrap INonPerpetualConstruction.requiredTech into function + +By SomeTroglodyte: +- (CQ) Linting and comments on TileSetStrings and ImageAttempter +- Wesnoth map import polished up +- City sounds again + +Fix founding cities removing city center tile improvement - By SeventhM \ No newline at end of file