Skip to content

Commit 6a8ce41

Browse files
yairm210OuazLesiakower
authored
Version rollout (yairm210#10611)
* Bump version and create initial changelog entry * Update French.properties (yairm210#10604) * Update Latin.properties + question (yairm210#10589) * Update Latin.properties * Update Latin.properties * Update Latin.properties * Update Latin.properties * Add a space at the end * Replaced "passus" with "gressus". * Added relationship translations * Update Latin.properties * Update Latin.properties * Fixed an error * Corrected an error * Corrected an error 2 --------- Co-authored-by: yairm210 <yairm210@users.noreply.github.com> Co-authored-by: Ouaz <Ouaz@users.noreply.github.com> Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
1 parent 57fd00a commit 6a8ce41

File tree

6 files changed

+191
-62
lines changed

6 files changed

+191
-62
lines changed

android/assets/jsons/translations/French.properties

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2872,7 +2872,7 @@ It is over. Perhaps now I shall have peace, at last. = C'est terminé. Peut-êtr
28722872
Are you real or a phantom? = Êtes-vous un fantôme, ou fait de chair et de sang ?
28732873
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.
28742874
Greetings. = Salutations.
2875-
What do YOU want?! = Et VOUS, que voulez-vous ?
2875+
What do YOU want?! = Encore vous ?!
28762876
Ingenuity = Ingéniosité
28772877
Babylon = Babylone
28782878
Akkad = Akkad
@@ -2974,7 +2974,7 @@ You have proven to be a cunning and competent adversary. I congratulate you on y
29742974
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.
29752975
My friend, do you think you can accept this request? = Mon ami, pensez-vous que vous pouvez accepter cette demande ?
29762976
How are you today? = Comment allez-vous aujourd'hui ?
2977-
Oh. It's you? = Oh ! C'est vous ?
2977+
Oh. It's you? = Oh... C'est vous ?
29782978
Art of War = L'Art de la Guerre
29792979
Beijing = Pékin
29802980
Shanghai = Shanghaï
@@ -3025,8 +3025,8 @@ You are a fool who evokes pity. You have brought my hostility upon yourself and
30253025
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é.
30263026
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.
30273027
Generous Egypt makes you this offer. = La généreuse Égypte vous fait cette offre.
3028-
Good day. = Belle journée.
3029-
Oh, it's you. = Oh ! C'est vous.
3028+
Good day. = Salutations.
3029+
Oh, it's you. = Ah, c'est vous.
30303030
Monument Builders = Bâtisseurs de Monuments
30313031
Thebes = Thèbes
30323032
Memphis = Memphis
@@ -3084,7 +3084,7 @@ We shall never surrender. = Nous ne nous rendrons jamais.
30843084
You have triumphed over us. The day is yours. = Vous avez triomphé de nous. Ce jour est vôtre.
30853085
We are pleased to meet you. = Nous sommes heureux de vous rencontrer.
30863086
Would you be interested in a trade agreement with England? = Seriez-vous intéressé par un accord commercial avec l'Angleterre ?
3087-
Hello, again. = Bonjour... à nouveau.
3087+
Hello, again. = Et bonjour.
30883088
Oh, it's you! = Oh ! C'est vous !
30893089
Sun Never Sets = Le Soleil ne se Couche Jamais
30903090
London = Londres
@@ -3476,8 +3476,8 @@ Corrupted villain! We will bring you into the ground! = Vil personnage ! Je vous
34763476
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.
34773477
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.
34783478
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.
3479-
What now? = Quoi encore ?
3480-
So, out with it! = Bien, finissons-en !
3479+
What now? = C'est à quel sujet ?
3480+
So, out with it! = Bien, faites vite !
34813481
Furor Teutonicus = Furor Teutonicus
34823482
Berlin = Berlin
34833483
Hamburg = Hambourg
@@ -3665,7 +3665,7 @@ Curse you! You are beneath me, son of a donkey driver! I will crush you! = Soyez
36653665
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 !
36663666
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à.
36673667
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 ?
3668-
Good day to you! = Belle journée à vous !
3668+
Good day to you! = Bienvenue à vous !
36693669
Ahh... you... = Ah... Vous...
36703670
Achaemenid Legacy = Héritage Achéménide
36713671
Persepolis = Persépolis
@@ -4006,7 +4006,7 @@ How did you darken the sun? I ruled with diligence and mercy—see that you do s
40064006
How are you? You stand before Pachacuti Inca Yupanqui. = Comment allez-vous ? Vous vous tenez devant Pachacutec Inca Yupanqui.
40074007
The Incan people offer this fair trade. = Le peuple Inca vous offre cette échange équitable.
40084008
How are you doing? = Comment allez-vous ?
4009-
What do you want now? = Que voulez-vous, à présent ?
4009+
What do you want now? = Que voulez-vous encore ?
40104010
Great Andean Road = Le Chemin de l'Inca
40114011
Cuzco = Cuzco
40124012
Tiwanaku = Tiwanaku
@@ -5693,7 +5693,7 @@ Now what is this?! You ask me to add your riches to my great avails. The invitat
56935693
My people will mourn me not with tears, but with human blood. = Mon peuple ne versera pas de larmes, mais fera couler le sang.
56945694
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.
56955695
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.
5696-
Good day to you. = Bonne journée à toi.
5696+
Good day to you. = Bienvenue à toi.
56975697
Scourge of God = Fléau de Dieu
56985698
Balamber = Balamber
56995699
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
57675767
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.
57685768
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.
57695769
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.
5770-
Oh, welcome! = Oh, bienvenue !
5771-
Oh, it is you. = Oh, c'est vous.
5770+
Oh, welcome! = Ah, bienvenue !
5771+
Oh, it is you. = Ah... ça n'est que vous.
57725772
Nobel Prize = Prix Nobel
57735773
Leif = Leif
57745774
Ingegard = Ingegard

android/assets/jsons/translations/Latin.properties

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -182,60 +182,60 @@ Diplomacy = Externis rebus
182182
War = Bellum
183183
Peace = Pax
184184
# Requires translation!
185-
Research Agreement =
185+
Research Agreement = Concordia adsectationis
186186
# Requires translation!
187-
Declare war =
187+
Declare war = Bellum indice
188188
# Requires translation!
189-
Declare war on [civName]? =
189+
Declare war on [civName]? = Indicisne bellum contra [civName]?
190190
# Requires translation!
191-
[civName] will also join them in the war =
191+
[civName] will also join them in the war = [civName] quoque eorum in bellum copulaverit
192192
# Requires translation!
193-
An unknown civilization will also join them in the war =
193+
An unknown civilization will also join them in the war = Civilizatio incognita quoque eorum in bellum copulaverit
194194
# Requires translation!
195-
This will cancel your defensive pact with [civName] =
195+
This will cancel your defensive pact with [civName] = Hoc foedus defensivus tuus cum [civName] resciderit
196196
# Requires translation!
197-
Go to on map =
197+
Go to on map = I in tabula
198198
# Requires translation!
199-
Let's begin! =
199+
Let's begin! = Initiamus!
200200
# Requires translation!
201-
[civName] has declared war on us! =
201+
[civName] has declared war on us! = [civName] bellum contra nos indixit!
202202
[leaderName] of [nation] = [leaderName] de [nation]
203203
# Requires translation!
204-
You'll pay for this! =
204+
You'll pay for this! = Omnia debita solveris!
205205
# Requires translation!
206-
Negotiate Peace =
206+
Negotiate Peace = Pax Pacisce
207207
# Requires translation!
208-
Peace with [civName]? =
208+
Peace with [civName]? = Pax cum [civName]?
209209
# Requires translation!
210-
Very well. =
210+
Very well. = Perbene.
211211
# Requires translation!
212-
Farewell. =
212+
Farewell. = Vale.
213213
# Requires translation!
214-
Sounds good! =
214+
Sounds good! = Sonat bene!
215215
# Requires translation!
216-
Not this time. =
216+
Not this time. = Abdico.
217217
# Requires translation!
218-
Excellent! =
218+
Excellent! = Magnifice!
219219
# Requires translation!
220-
How about something else... =
220+
How about something else... = Propositionem aliam habeo...
221221
# Requires translation!
222-
A pleasure to meet you. =
222+
A pleasure to meet you. = Mihi pergratum est te convenire.
223223
# Requires translation!
224-
Our relationship =
224+
Our relationship = Affinitas nostra
225225
# Requires translation!
226226
We have encountered the City-State of [name]! =
227227
# Requires translation!
228-
Declare Friendship ([numberOfTurns] turns) =
228+
Declare Friendship ([numberOfTurns] turns) = Amicitia indice ([numberOfTurns] passus)
229229
# Requires translation!
230230
May our nations forever remain united! =
231231
# Requires translation!
232-
Indeed! =
232+
Indeed! = Equidem!
233233
# Requires translation!
234-
Denounce [civName]? =
234+
Denounce [civName]? = Criminasne [civName]?
235235
# Requires translation!
236-
Denounce ([numberOfTurns] turns) =
236+
Denounce ([numberOfTurns] turns) = Crimina ([numberOfTurns] passus)
237237
# Requires translation!
238-
We will remember this. =
238+
We will remember this. = Semper de hoc meminerimus.
239239
240240
# Requires translation!
241241
[civName] has declared war on [targetCivName]! =
@@ -264,35 +264,35 @@ They promised not to settle near us ([count] turns remaining) =
264264
[civName] has destroyed [cityState], whom you had pledged to protect! =
265265
266266
# Requires translation!
267-
Unforgivable =
267+
Unforgivable = Pleni odii
268268
# Requires translation!
269-
Afraid =
269+
Afraid = Timidi
270270
# Requires translation!
271-
Enemy =
271+
Enemy = Hostiles
272272
# Requires translation!
273-
Competitor =
273+
Competitor = Aemuli
274274
# Requires translation!
275-
Neutral =
275+
Neutral = Medii
276276
# Requires translation!
277-
Favorable =
277+
Favorable = Faventes
278278
# Requires translation!
279-
Friend =
279+
Friend = Amici
280280
# Requires translation!
281-
Ally =
281+
Ally = Socii
282282
283283
# Requires translation!
284-
[questName] (+[influenceAmount] influence) =
284+
[questName] (+[influenceAmount] influence) = [questName] (+[influenceAmount] influentia)
285285
# Requires translation!
286-
[remainingTurns] turns remaining =
286+
[remainingTurns] turns remaining = [remainingTurns] gressus reliqui
287287
# Requires translation!
288-
Current leader is [civInfo] with [amount] [stat] generated. =
288+
Current leader is [civInfo] with [amount] [stat] generated. = Nunc dux [civInfo] est cum [amount] [stat] generascentibus.
289289
# Requires translation!
290-
Current leader is [civInfo] with [amount] Technologies discovered. =
290+
Current leader is [civInfo] with [amount] Technologies discovered. = Nunc dux [civInfo] est cum [amount] technologiis inventis.
291291
292292
# Requires translation!
293-
Demands =
293+
Demands = Postulata
294294
# Requires translation!
295-
Please don't settle new cities near us. =
295+
Please don't settle new cities near us. = Quaesimus, nolite oppida nova prope nos condere.
296296
# Requires translation!
297297
Very well, we shall look for new lands to settle. =
298298
# Requires translation!
@@ -309,9 +309,9 @@ It's come to my attention that I may have attacked [civName], a city-state under
309309
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. =
310310
311311
# Requires translation!
312-
Return [unitName] to [civName]? =
312+
Return [unitName] to [civName]? = Reddisne [unitName] [[civName]]?
313313
# Requires translation!
314-
The [unitName] we liberated originally belonged to [civName]. They will be grateful if we return it to them. =
314+
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.
315315
316316
# Requires translation!
317317
Enter the amount of gold =
@@ -567,7 +567,7 @@ Game Options = Optiones ludum
567567
Civilizations = Nationes
568568
Map Type = Forma tabulæ
569569
Map file = Limo tabulæ
570-
Max Turns = Passus maximus
570+
Max Turns = Gressus maximus
571571
# Requires translation!
572572
Could not load map! =
573573
Generated = Generatus
@@ -1838,11 +1838,11 @@ Confirm next turn = Adfirmo sit tempus
18381838
Move automated units =
18391839
# Requires translation!
18401840
[currentPlayerCiv] ready? =
1841-
1 turn = 1 passus
1842-
[numberOfTurns] turns = [numberOfTurns] turni
1843-
Turn = Passus
1844-
turns = passus
1845-
turn = passus
1841+
1 turn = 1 gressus
1842+
[numberOfTurns] turns = [numberOfTurns] gressus
1843+
Turn = Gressus
1844+
turns = gressus
1845+
turn = gressus
18461846
Next unit = Proxima unitas
18471847
Fog of War = Nebula bellum
18481848
Pick a policy = Delige consilium

buildSrc/src/main/kotlin/BuildConfig.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ package com.unciv.build
44
object BuildConfig {
55
const val kotlinVersion = "1.8.21"
66
const val appName = "Unciv"
7-
const val appCodeNumber = 937
8-
const val appVersion = "4.9.2-patch5"
7+
const val appCodeNumber = 938
8+
const val appVersion = "4.9.3"
99

1010
const val gdxVersion = "1.12.1"
1111
const val ktorVersion = "2.2.3"

changelog.md

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,68 @@
1+
## 4.9.3
2+
3+
Resolves - Cities you haven't bombarded with will auto-bombard at turn end
4+
5+
Resolves - Defeated (no units/cities) hotseat multiplayer no longer appears for turns ("player X ready")
6+
7+
cleanup
8+
9+
4.9.2-patch5
10+
11+
I think I found the conflict - checkout ref!
12+
13+
Wait after PR merge, so the versioning can be done simply
14+
15+
Wait after PR merge, so the versioning can be done simply
16+
17+
ALL TOGETHER NOW
18+
19+
4.9.2-patch4
20+
21+
Tag does not trigger rebuild - maybe now it will
22+
23+
4.9.2-patch3
24+
25+
You know what let's just check out the second half
26+
27+
damn wrong filename
28+
29+
whoops
30+
31+
Readymade didn't work, trying my own github script for PR merge
32+
33+
Use manual access token to merge PR
34+
35+
Try using git commit created by other people
36+
37+
Added patch automation step!
38+
39+
Added script to update versions on patch release
40+
41+
Nicer command display
42+
43+
4.9.2-patch2
44+
45+
4.9.2-patch1
46+
47+
By willjallen:
48+
- Add queuing functionality
49+
- Fix typo
50+
51+
By tuvus:
52+
- Initial AutoPlay implementation
53+
- Fixed isGoodTileToExplore() to check if there is no enemy in range
54+
55+
By dHannasch:
56+
- Add IHasUniques.era()
57+
- Wrap INonPerpetualConstruction.requiredTech into function
58+
59+
By SomeTroglodyte:
60+
- (CQ) Linting and comments on TileSetStrings and ImageAttempter
61+
- Wesnoth map import polished up
62+
- City sounds again
63+
64+
Fix founding cities removing city center tile improvement - By SeventhM
65+
166
## 4.9.2
267

368
Console:

core/src/com/unciv/UncivGame.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
464464

465465
companion object {
466466
//region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT
467-
val VERSION = Version("4.9.2-patch5", 937)
467+
val VERSION = Version("4.9.3", 938)
468468
//endregion
469469

470470
lateinit var Current: UncivGame

0 commit comments

Comments
 (0)