diff --git a/.github/workflows/incrementVersionAndChangelog.mjs b/.github/workflows/incrementVersionAndChangelog.mjs index c10317d78d3e3..16caab84fa5e8 100644 --- a/.github/workflows/incrementVersionAndChangelog.mjs +++ b/.github/workflows/incrementVersionAndChangelog.mjs @@ -68,7 +68,7 @@ async function parseCommits() { for (const [author, commits] of Object.entries(ownerToCommits)) { if (commits.length === 1) { - commitSummary += "\n\n" + commits[0] + " - By " + author; + commitSummary += "\n\n" + commits[0] + "- By " + author; } else { commitSummary += "\n\nBy " + author + ":"; commits.forEach(commitMessage => { commitSummary += "\n- " + commitMessage }); diff --git a/android/assets/jsons/translations/Afrikaans.properties b/android/assets/jsons/translations/Afrikaans.properties index 79d2d66294d45..d341c085beab9 100644 --- a/android/assets/jsons/translations/Afrikaans.properties +++ b/android/assets/jsons/translations/Afrikaans.properties @@ -2530,6 +2530,8 @@ Remove your troops in our border immediately! = Sorry. = # Requires translation! Never! = + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = # Requires translation! Offer Declaration of Friendship ([30] turns) = diff --git a/android/assets/jsons/translations/Bangla.properties b/android/assets/jsons/translations/Bangla.properties index 213a02cdde7db..4ffb26238002d 100644 --- a/android/assets/jsons/translations/Bangla.properties +++ b/android/assets/jsons/translations/Bangla.properties @@ -2034,6 +2034,8 @@ Remove your troops in our border immediately! = Sorry. = # Requires translation! Never! = + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = # Requires translation! Offer Declaration of Friendship ([30] turns) = diff --git a/android/assets/jsons/translations/Belarusian.properties b/android/assets/jsons/translations/Belarusian.properties index 448a98f1aa71e..4eb1830bd090e 100644 --- a/android/assets/jsons/translations/Belarusian.properties +++ b/android/assets/jsons/translations/Belarusian.properties @@ -2221,6 +2221,8 @@ Remove your troops in our border immediately! = Sorry. = # Requires translation! Never! = + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = # Requires translation! Offer Declaration of Friendship ([30] turns) = diff --git a/android/assets/jsons/translations/Bosnian.properties b/android/assets/jsons/translations/Bosnian.properties index 81fc8aa0fd91a..c60d7b5188a7f 100644 --- a/android/assets/jsons/translations/Bosnian.properties +++ b/android/assets/jsons/translations/Bosnian.properties @@ -2764,6 +2764,8 @@ Remove your troops in our border immediately! = Sorry. = # Requires translation! Never! = + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = # Requires translation! Offer Declaration of Friendship ([30] turns) = diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index cdbf27c42fb22..eb5c8cadef1ed 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -1597,6 +1597,8 @@ Keep it = Manter Remove your troops in our border immediately! = Remova suas tropas de nosso território imediatamente! Sorry. = Desculpe. Never! = Nunca! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Oferecer a Declaração de Amizade ([30] turnos) My friend, shall we declare our friendship to the world? = Meu amigo, devemos declarar nossa amizade ao mundo? diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties index 15e4544cf4aba..1a4efddd1ff44 100644 --- a/android/assets/jsons/translations/Bulgarian.properties +++ b/android/assets/jsons/translations/Bulgarian.properties @@ -1931,6 +1931,8 @@ Keep it = Задръж го Remove your troops in our border immediately! = Махнете войските си от нашата територия незабавно! Sorry. = Съжалявам. Never! = Никога! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Предлагане на Декларация за Приятелство ([30] хода) My friend, shall we declare our friendship to the world? = Приятелю, да обявим ли дружбата си пред света? diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties index a52b841f934b5..1c87a600a9712 100644 --- a/android/assets/jsons/translations/Catalan.properties +++ b/android/assets/jsons/translations/Catalan.properties @@ -1597,6 +1597,8 @@ Keep it = Vull quedar-me-la Remove your troops in our border immediately! = Treieu immediatament les vostres tropes de la nostra frontera! Sorry. = Disculpeu-nos. Never! = Mai! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Ofereix una declaració d’amistat ([30] torns) My friend, shall we declare our friendship to the world? = Amic meu, voleu anunciar la nostra amistat al món? diff --git a/android/assets/jsons/translations/Croatian.properties b/android/assets/jsons/translations/Croatian.properties index a7673ddb95ef5..caf9b0177eecb 100644 --- a/android/assets/jsons/translations/Croatian.properties +++ b/android/assets/jsons/translations/Croatian.properties @@ -1597,6 +1597,8 @@ Keep it = Zadrži ga Remove your troops in our border immediately! = Smjesta ukloni svoje trupe s naše granice! Sorry. = Oprosti. Never! = Nikada! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Ponudi Deklaraciju o Prijateljstvu ([30] poteza) My friend, shall we declare our friendship to the world? = Prijatelju(ice) moj(a), hoćemo li objaviti naše prijateljstvo svijetu? diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 16d40f38462b0..ad0bcd62f3d21 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -1633,6 +1633,8 @@ Keep it = Nechme to tak Remove your troops in our border immediately! = Okamžitě odstraňte vaše jednotky z našeho území! Sorry. = Omlouváme se. Never! = Nikdy! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Nabídnout Vyhlášení přátelství ([30] turns) My friend, shall we declare our friendship to the world? = Můžeme oznámit světu naše přátelství? diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 279daf6ac056c..22fc0f9489cf9 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -1607,6 +1607,8 @@ Keep it = De stad is van mij Remove your troops in our border immediately! = Verwijder je troepen binnen onze grens meteen! Sorry. = Sorry. Never! = Nooit! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Bied een vriendschapsverkalring aan ([30] beurten) My friend, shall we declare our friendship to the world? = Mijn vriend, zullen we onze vriendschap verklaren aan de wereld? diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 622dfca5fe62b..672dc8edc0638 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -2955,6 +2955,8 @@ Remove your troops in our border immediately! = Sorry. = # Requires translation! Never! = + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = # Requires translation! Offer Declaration of Friendship ([30] turns) = diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties index cab1746adc828..96d6389648fd5 100644 --- a/android/assets/jsons/translations/Filipino.properties +++ b/android/assets/jsons/translations/Filipino.properties @@ -1612,6 +1612,8 @@ Keep it = Itago mo Remove your troops in our border immediately! = Alisin mo agad ang iyong mga tropa sa aking hangganan! Sorry. = Paumanhin. Never! = Hindi kailanman! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Mag-alok ng Deklarasyon ng Pagkakaibigan ([30] na tira) My friend, shall we declare our friendship to the world? = Aking kaibigan, ipahayag ba natin ang ating pagkakaibigan sa mundo? diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index f55881622dd6d..4a146e594e27d 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -2115,6 +2115,8 @@ Keep it = Remove your troops in our border immediately! = Poista joukkosi rajoiltamme välittömästi! Sorry. = Pahoitteluni. Never! = En ikinä! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Ehdota ystävyydenjulistusta ([30] vuoroa) My friend, shall we declare our friendship to the world? = Ystäväni, julistetaanko ystävyytemme koko maailmalle? diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 0834291d90346..8bc8c3d6c7eed 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -1597,6 +1597,8 @@ Keep it = Garder Remove your troops in our border immediately! = Retirez vos troupes de nos frontières immédiatement ! Sorry. = Toutes mes excuses. Never! = Jamais ! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Proposer une Déclaration d'Amitié ([30] tours) My friend, shall we declare our friendship to the world? = Cher ami, ne devrions-nous pas annoncer notre amitié au monde ? diff --git a/android/assets/jsons/translations/Galician.properties b/android/assets/jsons/translations/Galician.properties index 005d8629d0653..07e4d03506136 100644 --- a/android/assets/jsons/translations/Galician.properties +++ b/android/assets/jsons/translations/Galician.properties @@ -1606,6 +1606,8 @@ Keep it = Gárdao Remove your troops in our border immediately! = Saca as túas tropas das nosas fronteiras inmediatamente! Sorry. = Síntoo. Never! = Xamais! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Ofrecer Declaración de Amizade ([30] quendas) My friend, shall we declare our friendship to the world? = Amigo meu ¿deberiamos anunciar a nosa amizade ao mundo? diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index a18aecebb774a..17743977d73c1 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -1597,6 +1597,8 @@ Keep it = Behalten Remove your troops in our border immediately! = Entferne sofort deine Truppen aus unserem Gebiet! Sorry. = Entschuldigung. Never! = Niemals! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Freundschaftserklärung anbieten ([30] Runden) My friend, shall we declare our friendship to the world? = Mein Freund, sollen wir unsere Freundschaft der Welt kundtun? diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties index 22af61a2b6cad..1d8823d7d46c6 100644 --- a/android/assets/jsons/translations/Greek.properties +++ b/android/assets/jsons/translations/Greek.properties @@ -2615,6 +2615,8 @@ Keep it = Remove your troops in our border immediately! = Sorry. = συγνώμη. Never! = Ποτέ! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = # Requires translation! Offer Declaration of Friendship ([30] turns) = diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 40029f2cde8c3..39d0acb886118 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -1627,6 +1627,8 @@ Keep it = Megtartás Remove your troops in our border immediately! = Távolítsd el azonnal az egységeidet a területünkről! Sorry. = Sajnálom. Never! = Soha! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Barátság felajánlása ([30] körig) My friend, shall we declare our friendship to the world? = Barátom, kihirdethetjük barátságunkat a világ felé? diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index c69dfdba5ed0a..9d25a019d00cf 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -1597,6 +1597,8 @@ Keep it = Simpan Remove your troops in our border immediately! = Singkirkan pasukanmu dari perbatasan kami secepatnya! Sorry. = Maaf. Never! = Tidak akan pernah! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Tawarkan Deklarasi Pertemanan ([30] giliran) My friend, shall we declare our friendship to the world? = Temanku, maukah kau menyatakan pertemanan kita kepada dunia? diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index de6be6b09823b..cd7105aae631f 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -1603,6 +1603,8 @@ Keep it = Mantienila Remove your troops in our border immediately! = I vostri soldati sconfinano nelle vostre terre. Potete spostarli da un'altra parte, per favore? Sorry. = Siamo spiacenti. Never! = Scordatelo! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Offri Dichiarazione di Amicizia ([30] turni) My friend, shall we declare our friendship to the world? = Piantiamo i semi di una solida alleanza tramite una Dichiarazione di Amicizia. Che ne dici? diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 894bc154284a4..d10998681d920 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -1709,6 +1709,8 @@ Keep it = そのままにする Remove your troops in our border immediately! = あなたは我々の土地に不法侵入した Sorry. = すまない Never! = そんなことはない！ + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = 友好宣言（[30]ターン）を提案 My friend, shall we declare our friendship to the world? = 友よ、世界に向けて友好宣言しないか？ diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 64ed28f785826..ecc1804be8c74 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -1657,6 +1657,8 @@ Keep it = 해방하지 않음 Remove your troops in our border immediately! = 우리 영토에서 군대를 치워 주십시오! Sorry. = 미안하오. Never! = 싫소! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = 우호 선언 ([30] 턴 동안) My friend, shall we declare our friendship to the world? = 동지여, 우리의 유대를 세상에 알리지 않겠습니까? diff --git a/android/assets/jsons/translations/Latin.properties b/android/assets/jsons/translations/Latin.properties index 141733f0ee717..80ab460d95720 100644 --- a/android/assets/jsons/translations/Latin.properties +++ b/android/assets/jsons/translations/Latin.properties @@ -1779,6 +1779,8 @@ Keep it = Detineo id. Remove your troops in our border immediately! = Statim emove copias tuas ex finibus nostris! Sorry. = Me paenitet. Never! = Numquam faciam! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Offer prædicationem amicitiæ ([30] gressus) My friend, shall we declare our friendship to the world? = Mi amice, ad mundum prædicemusne amicitiam nostram? @@ -4712,7 +4714,6 @@ Germany = Germania Suleiman I = Suleimanus I # Requires translation! Your continued insolence and failure to recognize our preeminence leads us to war. = - # Requires translation! Good. The world shall witness the incontestable might of my armies and the glory of the Empire. = Bene est. Mundus conspiciat potentiam irrefragabilem mearum copiarum et gloriam Imperii. # Requires translation! Ruin! Ruin! Istanbul becomes Iram of the Pillars, remembered only by the melancholy poets. = @@ -4801,7 +4802,6 @@ Sejong = Jip-hyun-jun (Hall of Worthies) will no longer tolerate your irksome behavior. We will liberate the citizens under your oppression even with force, and enlighten them! = # Requires translation! Foolish, miserable wretch! You will be crushed by this country's magnificent scientific power! = - # Requires translation! Now the question is who will protect my people. A dark age has come. = Nunc quæstio est quis proteget populum meum. Sæculum obscurum appropinquavit. # Requires translation! Welcome to the palace of Choson, stranger. I am the learned King Sejong, who looks after his great people. = @@ -4880,7 +4880,6 @@ Hiawatha = You are a plague upon Mother Earth! Prepare for battle! = # Requires translation! You evil creature! My braves will slaughter you! = - # Requires translation! You have defeated us... but our spirits will never be vanquished! We shall return! = Vicisti nos... sed spiriti nostri numquam evincentur! Nos revertamur! # Requires translation! Greetings, stranger. I am Hiawatha, speaker for the Iroquois. We seek peace with all, but we do not shrink from war. = @@ -4962,7 +4961,6 @@ Your continue existence is an embarrassment to all leaders everywhere! You must Curse you! You are beneath me, son of a donkey driver! I will crush you! = # Requires translation! You mongrel! Cursed be you! The world will long lament your heinous crime! = - # Requires translation! Peace be on you! I am Darius, the great and outstanding king of kings of great Persia... but I suppose you knew that. = Pax tibi! Ego sum Darius rex regum magnus atque insignis magnæ Persiæ... sed censeo te scire. # Requires translation! In my endless magnanimity, I am making you this offer. You agree, of course? = @@ -5106,11 +5104,8 @@ Persia = Persia # Requires translation! Kamehameha I = - # Requires translation! The ancient fire flashing across the sky is what proclaimed that this day would come, though I had foolishly hoped for a different outcome. = Ignis antiquus trans cælum fulgens clamavit hunc diem venturum esse, etsi ego stulte sperabam effectum alium futurum esse. - # Requires translation! It is obvious now that I misjudged you and your true intentions. = Manifestum jam est quod ego errato censui te et tuam intentionem. - # Requires translation! The hard-shelled crab yields, and the lion lies down to sleep. Kanaloa comes for me now. = Cancer testaceus succumbit, et leo cubat ut dormiat. Kanaloa nunc ad me venit. # Requires translation! Aloha! Greetings and blessings upon you, friend. I am Kamehameha, Great King of this strand of islands. = @@ -5632,9 +5627,7 @@ Pachacuti = Resistance is futile! You cannot hope to stand against the mighty Incan empire. If you will not surrender immediately, then prepare for war! = Declare war on me?!? You can't, because I declare war on you first! = Bellum contra me indicere?!? Tu non potes, quia ego primitus indico bellum contra te! How did you darken the sun? I ruled with diligence and mercy—see that you do so as well. = Ut obscuravisti solem? Cum diligentia et clementia regebam—videam te ita facere. - # Requires translation! How are you? You stand before Pachacuti Inca Yupanqui. = Ut vales? Statis ante Pachacuti Inca Yupanqui. - # Requires translation! The Incan people offer this fair trade. = Populus Incarum offert hanc justam mercaturam. How are you doing? = Ut vales? What do you want now? = Quod vis jam? @@ -5727,7 +5720,6 @@ Loki must have stood by you, for a common man alone could not have defeated me.. Harald Bluetooth bids you welcome to his lands, a Viking unlike any the seas and lands have ever known! Hah, are you afraid? = # Requires translation! This is a fine deal! Even a drunk beggar would agree! = - # Requires translation! Hail to you. = Have. # Requires translation! Viking Fury = diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index 54014bc98bb65..a46cbe0670c49 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -1877,6 +1877,8 @@ Keep it = Pasilaikyti sau Remove your troops in our border immediately! = Nedelsiant pašalinkite savo karius nuo mūsų sienų! Sorry. = Atleiskite. Never! = Niekada! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Pasūlyti draugystę ([30] ėjimų) My friend, shall we declare our friendship to the world? = Siūlau deklaruoti mūsų draugystę visam pasauliui. Ką manote? diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 5b43e171e5905..29b8c877cdc3f 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -2057,6 +2057,8 @@ Keep it = Remove your troops in our border immediately! = Pindahkan askar kamu yang berada di sempadan kami dengan serta-merta! Sorry. = Maaf. Never! = Tidak! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Tawar Pengisytiharan Persahabatan ([30] giliran) My friend, shall we declare our friendship to the world? = Kawanku, apa kata kita mengisytiharkan persahabatan kita kepada seluruh dunia? diff --git a/android/assets/jsons/translations/Norwegian.properties b/android/assets/jsons/translations/Norwegian.properties index 0dbb9b9becce3..4819ae36fcba6 100644 --- a/android/assets/jsons/translations/Norwegian.properties +++ b/android/assets/jsons/translations/Norwegian.properties @@ -1912,6 +1912,8 @@ Keep it = Haldt på han Remove your troops in our border immediately! = Trekk troppane dine ut av grensene våre med éin gong! Sorry. = Orsak. Never! = Aldri! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Tilbyd Venskapsmelding ([30] turar) My friend, shall we declare our friendship to the world? = Min ven, skal me melda venskapet vårt til verda? diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index fa8aa7248b15f..08c713e65ae52 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -2438,6 +2438,8 @@ Keep it = Remove your troops in our border immediately! = Jame’iat be tadrij kāheš miyābad tā vağti ke šahr nābood šavad. Sorry. = Bebaḵšid. Never! = Hargez! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Pišnahād e Ezhārnāme ye Doosti dādan ([30] turns) My friend, shall we declare our friendship to the world? = Doost e man, Doosti e mān rā be jahān e’elām konim? diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index cca69ad4aade2..e3e6f40861395 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -2059,6 +2059,8 @@ Keep it = Negahash daar Remove your troops in our border immediately! = Jame’iat be tadrij kaahesh miyaabad taa vaghti ke shahr naabood shavad. Sorry. = Bebakhshid. Never! = Hargez! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Pishnahaad e Ezhaarnaame ye Doosti daadan ([30] turns) My friend, shall we declare our friendship to the world? = Doost e man, Doosti e maan raa be jahaan e’elaam konim? diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index dbb6ac4dd5b6c..cfd40b0805152 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -1604,6 +1604,8 @@ Keep it = Zatrzymaj to Remove your troops in our border immediately! = Natychmiast wycofaj swoje wojska poza nasze granice! Sorry. = OK, Przepraszamy... Never! = Nigdy! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Zaoferuj Deklarację Przyjaźni ([30]⏳ tur) My friend, shall we declare our friendship to the world? = Przyjacielu, czy powinniśmy ogłosić światu naszą Deklarację Przyjaźni? diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 5d52e40efea5b..b3d286427f4b8 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -1605,6 +1605,8 @@ Keep it = Manter Remove your troops in our border immediately! = Retira as tuas tropas da nossa fronteira imediatamente. Sorry. = Desculpa. Never! = Nunca! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Oferecer a Declaração de Amizade ([30] turnos) My friend, shall we declare our friendship to the world? = Meu amigo, devemos declarar nossa amizade ao mundo? diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 483861674ecc9..776dd86101076 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -1738,6 +1738,8 @@ Keep it = Păstrează-l Remove your troops in our border immediately! = Îndepărtează-ți trupele de la granița noastră imediat! Sorry. = Scuze. Never! = Niciodată! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Oferă Declarație de Prietenie ([30] de rânduri) My friend, shall we declare our friendship to the world? = Prietene, să ne declarăm prietenia lumii? diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 77faf12095dde..c966b5be5ba30 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -1597,6 +1597,8 @@ Keep it = Оставить Remove your troops in our border immediately! = Уберите свои войска из наших границ немедленно! Sorry. = Простите. Never! = Никогда! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Предложить Декларацию дружбы ([30] ходов) My friend, shall we declare our friendship to the world? = Предлагаю объявить о нашей дружбе всему миру. Что скажете? diff --git a/android/assets/jsons/translations/Rusyn.properties b/android/assets/jsons/translations/Rusyn.properties index 05ae9fc06a1a7..fa3bda1449eca 100644 --- a/android/assets/jsons/translations/Rusyn.properties +++ b/android/assets/jsons/translations/Rusyn.properties @@ -2586,6 +2586,8 @@ Keep it = Remove your troops in our border immediately! = Sorry. = Перебачте. Never! = Ніґда-шуга! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = # Requires translation! Offer Declaration of Friendship ([30] turns) = diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 5ee8541498446..f9b87ee65f01e 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -1597,6 +1597,8 @@ Keep it = 占领 Remove your troops in our border immediately! = 请停止这种无理而且野蛮的行径！马上让你的人滚出我的领土！ Sorry. = 十分抱歉，请您原谅我的鲁莽之举。 Never! = 哈哈不行！愤怒展现出了你的无能。 + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = 邀请联合发布友谊宣言（[30] 回合） My friend, shall we declare our friendship to the world? = 我的朋友，我们要向全世界宣布我们的友谊吗？ diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index b480c285623e7..762030644cda4 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -1597,6 +1597,8 @@ Keep it = Quedarmela Remove your troops in our border immediately! = ¡Saca tus tropas de nuestras fronteras inmediatamente! Sorry. = Lo siento. Never! = ¡Jamás! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Ofrecer Declaración de Amistad ([30] ⏳turnos) My friend, shall we declare our friendship to the world? = Amigo mío, ¿deberíamos anunciar nuestra amistad al mundo? diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index f3dedcd7e5dd8..fd80b8d48c625 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -1870,6 +1870,8 @@ Keep it = Behåll den Remove your troops in our border immediately! = Avlägsna dina trupper inom våra gränser omedelbart! Sorry. = Förlåt. Never! = Aldrig! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Erbjud Vänskapsförklaring ([30] drag) My friend, shall we declare our friendship to the world? = Min vän, ska vi förklara vår vänskap för världen? diff --git a/android/assets/jsons/translations/Thai.properties b/android/assets/jsons/translations/Thai.properties index a617684ad4ec1..14d56757ba7de 100644 --- a/android/assets/jsons/translations/Thai.properties +++ b/android/assets/jsons/translations/Thai.properties @@ -2767,6 +2767,8 @@ Remove your troops in our border immediately! = Sorry. = # Requires translation! Never! = + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = # Requires translation! Offer Declaration of Friendship ([30] turns) = diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 19fc8e99b0a05..4feb6ab58b28f 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -1613,6 +1613,8 @@ Keep it = 不歸還 Remove your troops in our border immediately! = 請停止這種無理而且野蠻的行為！馬上讓你的單位滾出我的領土！ Sorry. = 請您原諒我的魯莽。 Never! = 憤怒是無能的表現。 + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = 提出簽署友好聲明([30]回合) My friend, shall we declare our friendship to the world? = 我的朋友，我們要向世界宣布我們的友誼嗎？ diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 39bef80789ccb..453dacbe5c129 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -1645,6 +1645,8 @@ Keep it = Kalsın Remove your troops in our border immediately! = Sınırımızdaki birliklerinizi derhal kaldırın! Sorry. = Afedersiniz. Never! = Asla! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Dostluk Bildirgesi teklif et ([30] tur) My friend, shall we declare our friendship to the world? = Dostum, dostluğumuzu bütün dünyaya duyuracalım mı? diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 96a49bd61c368..9a6b65046a227 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -1599,6 +1599,8 @@ Keep it = Залишити собі Remove your troops in our border immediately! = Негайно приберіть свої війська від нашого кордону! Sorry. = Вибачте. Never! = Ніколи! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Запропонувати Декларацію дружби ([30]⏳) My friend, shall we declare our friendship to the world? = Мій друже, чи проголосимо ми нашу дружбу всьому Світові? diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties index 7015a3e067de5..3e09a256864e8 100644 --- a/android/assets/jsons/translations/Vietnamese.properties +++ b/android/assets/jsons/translations/Vietnamese.properties @@ -1609,6 +1609,8 @@ Keep it = Giữ nó Remove your troops in our border immediately! = Hãy rút quân của bạn ra khỏi biên giới chúng tôi ngay lập tức! Sorry. = Xin lỗi. Never! = Không bao giờ! + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = Offer Declaration of Friendship ([30] turns) = Đề nghị Tình hữu nghị ([30] lượt) My friend, shall we declare our friendship to the world? = Bạn của tôi, chúng ta có nên tuyên bố tình hữu nghị của ta đến thế giới không? diff --git a/android/assets/jsons/translations/Zulu.properties b/android/assets/jsons/translations/Zulu.properties index 56aeabf3dca1a..57cf3193c2679 100644 --- a/android/assets/jsons/translations/Zulu.properties +++ b/android/assets/jsons/translations/Zulu.properties @@ -2408,6 +2408,8 @@ Remove your troops in our border immediately! = Sorry. = # Requires translation! Never! = + # Requires translation! +Those lands were not yours to take. This has not gone unnoticed. = # Requires translation! Offer Declaration of Friendship ([30] turns) = diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index afe3ab9d8c74c..ad240a74d61c7 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -4,19 +4,19 @@ Belarusian = 13 Bosnian = 3 Brazilian_Portuguese = 99 Bulgarian = 47 -Catalan = 100 -Croatian = 100 +Catalan = 99 +Croatian = 99 Czech = 79 Dutch = 99 English = 0 Filipino = 88 Finnish = 36 -French = 100 +French = 99 Galician = 99 -German = 100 +German = 99 Greek = 13 Hungarian = 79 -Indonesian = 100 +Indonesian = 99 Italian = 99 Japanese = 81 Korean = 92 @@ -29,7 +29,7 @@ Persian_(Pinglish-UN) = 27 Polish = 99 Portuguese = 70 Romanian = 74 -Russian = 100 +Russian = 99 Rusyn = 61 Simplified_Chinese = 99 Spanish = 99 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 7671224461064..4fc87beed0339 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -5,7 +5,7 @@ object BuildConfig { const val kotlinVersion = "1.9.24" const val appName = "Unciv" const val appCodeNumber = 1088 - const val appVersion = "4.14.20" + const val appVersion = "4.15.0" const val gdxVersion = "1.12.1" const val ktorVersion = "2.3.12" diff --git a/changelog.md b/changelog.md index fa7fcd8f85220..1293cfc798742 100644 --- a/changelog.md +++ b/changelog.md @@ -1,24 +1,18 @@ -## 4.14.20 +## 4.15.0 -Resolved - "free building" unique respects civ replacement buildings - -Fix water adjacency test - -Larger 'per turn' text for gold and faith - -Resolved - Adjacency checks are only for adjacent tiles, and not also for this tile - -chore: Early exit moveToNewEra - -Resolved - disabled buttons no longer cause click-through - -Updated CityStateFunction.tk so that city states, will get angry at you, if you steal their lands - By Emandac - -Improved city screen queue - By sulai - -Allow for city level stockpiles to actually function - By SeventhM - -Edit Babylon's icon - By SpacedOutChicken +Modding: +- "Costs [amount] [stockpiledResource]" works for improvements +- "free building" unique respects replacement buildings +- Adjacency checks do not check the current tile +- Allow city level stockpiles - By SeventhM + +UI: +- Larger 'per turn' text for gold and faith +- disabled buttons no longer cause click-through +- Improved city screen queue - By sulai +- Edit Babylon's icon - By SpacedOutChicken + +City states will get angry at you if you steal their lands - By Emandac ## 4.14.19 diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index e3ed5e0ef72a2..bf7074f426c20 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.20", 1088) + val VERSION = Version("4.15.0", 1088) //endregion /** Global reference to the one Gdx.Game instance created by the platform launchers - do not use without checking [isCurrentInitialized] first. */ diff --git a/core/src/com/unciv/logic/map/tile/TileImprovementFunctions.kt b/core/src/com/unciv/logic/map/tile/TileImprovementFunctions.kt index 2adf6a1674b64..d31fd12392618 100644 --- a/core/src/com/unciv/logic/map/tile/TileImprovementFunctions.kt +++ b/core/src/com/unciv/logic/map/tile/TileImprovementFunctions.kt @@ -255,8 +255,10 @@ class TileImprovementFunctions(val tile: Tile) { ) { val stateForConditionals = StateForConditionals(civ, unit = unit, tile = tile) - for (unique in improvement.getMatchingUniques(UniqueType.CostsResources, stateForConditionals)) - civ.gainStockpiledResource(unique.params[1], -unique.params[0].toInt()) + for (unique in improvement.getMatchingUniques(UniqueType.CostsResources, stateForConditionals)) { + val resource = tile.ruleset.tileResources[unique.params[1]] ?: continue + civ.gainStockpiledResource(resource, -unique.params[0].toInt()) + } for (unique in improvement.uniqueObjects.filter { !it.hasTriggerConditional() && it.conditionalsApply(stateForConditionals) }) diff --git a/fastlane/metadata/android/en-US/changelogs/1088.txt b/fastlane/metadata/android/en-US/changelogs/1088.txt index 06727440219ac..3fd1cef84ffcf 100644 --- a/fastlane/metadata/android/en-US/changelogs/1088.txt +++ b/fastlane/metadata/android/en-US/changelogs/1088.txt @@ -1,21 +1,13 @@ - - -Resolved - "free building" unique respects civ replacement buildings - -Fix water adjacency test - -Larger 'per turn' text for gold and faith - -Resolved - Adjacency checks are only for adjacent tiles, and not also for this tile - -chore: Early exit moveToNewEra - -Resolved - disabled buttons no longer cause click-through - -Updated CityStateFunction.tk so that city states, will get angry at you, if you steal their lands - By Emandac - -Improved city screen queue - By sulai - -Allow for city level stockpiles to actually function - By SeventhM - -Edit Babylon's icon - By SpacedOutChicken \ No newline at end of file +Modding: +- "Costs [amount] [stockpiledResource]" works for improvements +- "free building" unique respects replacement buildings +- Adjacency checks do not check the current tile +- Allow city level stockpiles - By SeventhM + +UI: +- Larger 'per turn' text for gold and faith +- disabled buttons no longer cause click-through +- Improved city screen queue - By sulai +- Edit Babylon's icon - By SpacedOutChicken + +City states will get angry at you if you steal their lands - By Emandac \ No newline at end of file