From 6b73a3e9d7fb8819f1761688db9d7500118c1967 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 14 Jul 2021 22:34:11 +0300 Subject: [PATCH] 3.15.12 --- .../Brazilian_Portuguese.properties | 14 +++++++++++++- .../jsons/translations/Bulgarian.properties | 13 ++++++++++++- .../assets/jsons/translations/Czech.properties | 14 +++++++++++++- .../assets/jsons/translations/Dutch.properties | 11 ++++++++++- .../jsons/translations/English.properties | 13 ++++++++++++- .../jsons/translations/Finnish.properties | 13 ++++++++++++- .../assets/jsons/translations/French.properties | 14 +++++++++++++- .../assets/jsons/translations/German.properties | 15 +++++++++++++-- .../jsons/translations/Hungarian.properties | 13 ++++++++++++- .../jsons/translations/Indonesian.properties | 14 +++++++++++++- .../jsons/translations/Italian.properties | 14 +++++++++++++- .../jsons/translations/Japanese.properties | 14 +++++++++++++- .../assets/jsons/translations/Korean.properties | 17 +++++++++++++++-- .../jsons/translations/Lithuanian.properties | 13 ++++++++++++- .../assets/jsons/translations/Malay.properties | 13 ++++++++++++- .../Persian_(Pinglish-DIN).properties | 13 ++++++++++++- .../Persian_(Pinglish-UN).properties | 13 ++++++++++++- .../assets/jsons/translations/Polish.properties | 14 +++++++++++++- .../jsons/translations/Portuguese.properties | 13 ++++++++++++- .../jsons/translations/Romanian.properties | 13 ++++++++++++- .../jsons/translations/Russian.properties | 13 +++++++++++-- .../translations/Simplified_Chinese.properties | 14 +++++++++++++- .../jsons/translations/Spanish.properties | 14 +++++++++++++- .../jsons/translations/Swedish.properties | 15 +++++++++++++-- .../translations/Traditional_Chinese.properties | 14 +++++++++++++- .../jsons/translations/Turkish.properties | 14 +++++++++++++- .../jsons/translations/Ukrainian.properties | 14 +++++++++++++- .../completionPercentages.properties | 8 ++++---- buildSrc/src/main/kotlin/BuildConfig.kt | 4 ++-- changelog.md | 15 +++++++++++++++ .../com/unciv/logic/city/PopulationManager.kt | 5 ----- .../unciv/logic/civilization/ReligionManager.kt | 3 +-- .../com/unciv/logic/civilization/TechManager.kt | 8 ++------ 33 files changed, 362 insertions(+), 50 deletions(-) diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 9ce9128549..b8d8541a63 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -743,6 +743,8 @@ Hurry Wonder = Adiantar a contrução da Maravilha Spread Religion = # Requires translation! Spread [religionName] = + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Seus cidadãos estão felizes com seu governo há tanto tempo que o império entra na Era de Ouro! You have entered the [newEra]! = Você entrou na [newEra]! [civName] has entered the [eraName]! = [civName] entrou na [eraName]! @@ -986,6 +988,13 @@ Unlocked at = Desbloqueado em Gain 2 free technologies = Ganhe 2 tecnologias gratuitamente All policies adopted = Todas as políticas adotadas +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Inacessível @@ -1290,7 +1299,8 @@ Mint = Casa da moeda # Requires translation! Petra = -[amount]% of food is carried over after population increases = [amount]% de comida é transportada após o aumento da população + # Requires translation! +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = Aqueduto 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = 'A Arte da guerra ensina não na probabilidade de o inimigo não atacar, mas no fato de termos tornado nossa posição inatacável.' - Sun Tzu @@ -4878,6 +4888,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = Great General = Grande General diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties index 822a1aeaf6..584f7b7cfb 100644 --- a/android/assets/jsons/translations/Bulgarian.properties +++ b/android/assets/jsons/translations/Bulgarian.properties @@ -734,6 +734,8 @@ Hurry Wonder = Забързване на Чудо Spread Religion = # Requires translation! Spread [religionName] = + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Гражданите са доволни от вашето управление много дълго и империята влиза в Златна Ера! You have entered the [newEra]! = Навлязохте в [newEra]! [civName] has entered the [eraName]! = [civName] навлезе в [eraName]! @@ -986,6 +988,13 @@ Gain 2 free technologies = Получи 2 безплатни технологи # Requires translation! All policies adopted = +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Непроходим @@ -1385,7 +1394,7 @@ Mint = Petra = # Requires translation! -[amount]% of food is carried over after population increases = +[amount]% of food is carried over [cityFilter] after population increases = # Requires translation! Aqueduct = @@ -6309,6 +6318,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = # Requires translation! diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 2577c82251..dc03d1cbb6 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -684,6 +684,8 @@ Hurry Wonder = Uspíšit stavbu Divu Spread Religion = # Requires translation! Spread [religionName] = + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Naši občané jsou spokojeni s vaší vládou po dlouhou dobu díky čemuž říše vstoupila do Zlatého věku! You have entered the [newEra]! = Vstoupili jsme do éry [newEra]! [civName] has entered the [eraName]! = Civilizace [civName] vstoupila do éry [eraName]! @@ -906,6 +908,13 @@ Unlocked at = Odemkne se po Gain 2 free technologies = Získáte 2 technologie zdarma All policies adopted = Všechny politiky přijaty +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Nepřístupné @@ -1170,7 +1179,8 @@ Mint = Mincovna [stats] once [tech] is discovered = [stats] po objevu technologie [tech] Petra = Petra -[amount]% of food is carried over after population increases = [amount]% jídla je zachováno poté, co se populace rozroste + # Requires translation! +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = Akvadukt 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = 'Umění války nás učí nespoléhat na pravděpodobnost, že nepřítel nezaútočí, ale spíše na skutečnost, že je naše pozice nepřekonatelná.' - Sun Tzu @@ -3972,6 +3982,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = Great General = Velký generál diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index cca7e5e13c..6bb916d124 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -963,6 +963,13 @@ Unlocked at = Ontgrendeld bij Gain 2 free technologies = Krijg 2 gratis technologiën All policies adopted = Alle aanvaarde beleidsvoorstellen +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Onbegaanbaar @@ -1294,7 +1301,7 @@ Mint = Petra = # Requires translation! -[amount]% of food is carried over after population increases = +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = Aquaduct # Requires translation! @@ -5667,6 +5674,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = # Requires translation! diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index b8b0d419df..911b47c0b5 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -1287,6 +1287,8 @@ Spread Religion = # Requires translation! Spread [religionName] = # Requires translation! +Found a Religion = + # Requires translation! Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = # Requires translation! You have entered the [newEra]! = @@ -1704,6 +1706,13 @@ Gain 2 free technologies = # Requires translation! All policies adopted = +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains # Requires translation! @@ -2140,7 +2149,7 @@ Mint = Petra = # Requires translation! -[amount]% of food is carried over after population increases = +[amount]% of food is carried over [cityFilter] after population increases = # Requires translation! Aqueduct = @@ -7100,6 +7109,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = # Requires translation! diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index 108f7ee8a3..56f84ade8b 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -771,6 +771,8 @@ Hurry Wonder = Hoputa Ihme Spread Religion = # Requires translation! Spread [religionName] = + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Kansalaisesi ovat olleet tyytyväisiä johtamiseesi pitkään ja valtakuntasi siirtyy Kultakaudelle! You have entered the [newEra]! = Olet edennyt aikaan [newEra]! [civName] has entered the [eraName]! = [civName] on edennyt aikaan [eraName]! @@ -1031,6 +1033,13 @@ Gain 2 free technologies = Saat kaksi ilmaista teknologiaa # Requires translation! All policies adopted = +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Läpikulkematon @@ -1385,7 +1394,7 @@ Mint = Rahapaja Petra = # Requires translation! -[amount]% of food is carried over after population increases = +[amount]% of food is carried over [cityFilter] after population increases = # Requires translation! Aqueduct = @@ -5317,6 +5326,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = # Requires translation! diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index b64b1cb397..6f05b25970 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -711,6 +711,8 @@ Hurry Wonder = Accélère la construction de la merveille Spread Religion = # Requires translation! Spread [religionName] = + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Vos citoyens sont heureux de votre gouvernance depuis si longtemps que votre empire débute un Âge d'Or ! You have entered the [newEra]! = Vous êtes entré dans l'ère [newEra] ! [civName] has entered the [eraName]! = [civName] entre en [eraName] ! @@ -939,6 +941,13 @@ Unlocked at = Débloqué à Gain 2 free technologies = 2 technologies gratuites All policies adopted = Toutes les doctrines sont débloqués +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Impraticable @@ -1218,7 +1227,8 @@ Mint = Hôtel de la monnaie # Requires translation! Petra = -[amount]% of food is carried over after population increases = [amount]% de la nourriture est gardée après que la population est augmentée + # Requires translation! +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = Aqueduc 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = 'L'art de la guerre nous apprend de ne pas compter la probabilité qu'un ennemi ne passe pas à l'attaque, mais plutôt sur le fait que notre position est insaisissable.' - Sun Tzu @@ -4220,6 +4230,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = Great General = Général illustre diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 098849e79b..8bddc4f798 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -678,6 +678,8 @@ Your trade mission to [civName] has earned you [goldAmount] gold and [influenceA Hurry Wonder = Wunder beschleunigen Spread Religion = Religion verbreiten Spread [religionName] = [religionName] verbreiten + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Deine Bürger sind so zufrieden mit deiner Herrschaft, dass dein Reich in ein Goldenes Zeitalter eintritt! You have entered the [newEra]! = Zeitalter [newEra] ist eingeläutet! [civName] has entered the [eraName]! = [civName] hat das Zeitalter [eraName] erreicht! @@ -900,6 +902,13 @@ Unlocked at = Freigeschaltet bei Gain 2 free technologies = 2 kostenlose Technologien All policies adopted = Alle Politiken sind bereits verabschiedet +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Unpassierbar @@ -1157,7 +1166,8 @@ Mint = Prägeanstalt [stats] once [tech] is discovered = [stats] sobald [tech] entdeckt wird Petra = Petra -[amount]% of food is carried over after population increases = [amount]% der Nahrung wird übertragen, wenn ein neuer Einwohner geboren wird + # Requires translation! +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = Aquädukt 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = 'Die Kunst des Krieges lehrt uns, uns nicht auf die Wahrscheinlichkeit zu verlassen, dass der Feind nicht angreift, sondern auf die Tatsache, dass wir unsere Position unangreifbar gemacht haben.' - Sun Tzu @@ -3785,7 +3795,6 @@ Double movement in coast = Doppelte Bewegungsgeschwindigkeit an der Küste Artillery = Artillerie Can enter ice tiles = Kann Eis befahren - # Requires translation! Can only attack [param] tiles = Kann nur [param] Felder angreifen Invisible to others = Unsichtbar für andere Can attack submarines = Kann U-Boote angreifen @@ -3883,6 +3892,8 @@ Can speed up construction of a wonder = Kann die Produktion eines Wunders beschl Great Prophet = Großer Prophet Can spread religion [amount] times = Kann [amount] mal Religion verbreiten + # Requires translation! +May found a religion = Can construct [tileImprovement] if it hasn't spread religion yet = Kann [tileImprovement] bauen, wenn er noch keine Religion verbreitet hat Great General = Großer General diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 67651b019a..a1676813eb 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -743,6 +743,8 @@ Hurry Wonder = Csoda felgyorsítása Spread Religion = # Requires translation! Spread [religionName] = + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = A polgáraid olyan hosszú ideje boldogok uralkodásod alatt, hogy a birodalmad Aranykorba lép! You have entered the [newEra]! = [newEra] korba léptél! [civName] has entered the [eraName]! = [civName] [eraName] korba lépett! @@ -986,6 +988,13 @@ Unlocked at = Feloldva Gain 2 free technologies = 2 ingyen technológiát kapsz All policies adopted = Minden társadalompolitika adaptálva +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Járhatatlan @@ -1301,7 +1310,7 @@ Mint = Pénzverde Petra = # Requires translation! -[amount]% of food is carried over after population increases = +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = Vízvezeték 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = 'A háború művészete megtanít arra, hogy ne abban bízzunk, hogy az ellenség nem fog támadni, hanem a tényben, hogy a pozíciónk egyszerűen megtámadhatatlan.' - Sun Tzu @@ -4910,6 +4919,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = Great General = Híres Tábornok diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 59fc37f48e..6c1a46b6ca 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -678,6 +678,8 @@ Your trade mission to [civName] has earned you [goldAmount] gold and [influenceA Hurry Wonder = Percepat Keajaiban Dunia Spread Religion = Sebarkan Agama Spread [religionName] = Sebarkan [religionName] + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Penduduk Anda sudah sangat bahagia dengan pemerintahan Anda sampai peradaban Anda memasuki Masa Keemasan! You have entered the [newEra]! = Anda telah memasuki [newEra]! [civName] has entered the [eraName]! = [civName] telah memasuki [eraName]! @@ -900,6 +902,13 @@ Unlocked at = Terbuka di Gain 2 free technologies = Mendapatkan 2 teknologi gratis All policies adopted = Semua kebijakan telah diterapkan +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Tidak Dapat Dilewati @@ -1157,7 +1166,8 @@ Mint = Percetakan Uang Logam [stats] once [tech] is discovered = [stats] ketika [tech] ditemukan Petra = Petra -[amount]% of food is carried over after population increases = [amount]% makanan dibawa setelah penambahan populasi + # Requires translation! +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = Saluran Air 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = 'Seni perang mengajarkan kita untuk tidak bergantung pada adanya kemungkinan musuh tidak menyerang, tetapi untuk bergantung pada fakta bahwa kita telah membuat posisi kita tak dapat diserang' - Sun Tzu @@ -3883,6 +3893,8 @@ Can speed up construction of a wonder = Dapat mempercepat kontruksi sebuah keaja Great Prophet = Nabi Besar Can spread religion [amount] times = Dapat menyebarkan agama [amount] kali + # Requires translation! +May found a religion = Can construct [tileImprovement] if it hasn't spread religion yet = Dapat membangun [tileImprovement] jika beliau belum pernah menyebarkan agama Great General = Jenderal Hebat diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 36a16a7220..0c0ff71369 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -678,6 +678,8 @@ Your trade mission to [civName] has earned you [goldAmount] gold and [influenceA Hurry Wonder = Accellera Meraviglia Spread Religion = Diffondi religione Spread [religionName] = Diffondi [religionName] + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = I tuoi cittadini sono da tempo contenti del tuo governo! Il tuo impero è entrato in un'Età dell'Oro! You have entered the [newEra]! = Benvenuto nell'Era [newEra]! [civName] has entered the [eraName]! = [civName] ha raggiunto l'Era [eraName]! @@ -900,6 +902,13 @@ Unlocked at = Richiede Gain 2 free technologies = Consente di scoprire due Tecnologie gratuite All policies adopted = Tutte le politiche adottate +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Inaccessibile @@ -1157,7 +1166,8 @@ Mint = Zecca [stats] once [tech] is discovered = [stats] quando scopri [tech] Petra = Petra -[amount]% of food is carried over after population increases = Il [amount]% del cibo viene immagazzinato ad ogni nuovo cittadino nato + # Requires translation! +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = Acquedotto 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = 'L'arte della guerra ci insegna a non affidarci alla possibilità che il nemico... non ci attacchi, ma piuttosto alla certezza di aver reso la nostra posizione inattaccabile.' - Sun Tzu @@ -3882,6 +3892,8 @@ Can speed up construction of a wonder = Può accelerare la costruzione di una Me Great Prophet = Grande Profeta Can spread religion [amount] times = Può diffondere la religione [amount] volte + # Requires translation! +May found a religion = Can construct [tileImprovement] if it hasn't spread religion yet = Può costruire [tileImprovement] se ancora non ha diffuso una religione Great General = Grande Generale diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 459f0ff588..7e5cded64e 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -730,6 +730,8 @@ Hurry Wonder = 遺産の建造を急ぐ Spread Religion = # Requires translation! Spread [religionName] = + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = おめでとう！市民があなたの統治に長らく満足してきたため、文明は黄金時代に入った! You have entered the [newEra]! = [newEra]に入りました [civName] has entered the [eraName]! = [civName]が[eraName]に入りました @@ -966,6 +968,13 @@ Unlocked at = アンロック: Gain 2 free technologies = 提供されたテクノロジーを2つ獲得 All policies adopted = 採択された社会制度 +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = 無敵 @@ -1258,7 +1267,8 @@ Mint = 造幣所 # Requires translation! Petra = -[amount]% of food is carried over after population increases = 人口の増加後に、食料を[amount]%持ち越す + # Requires translation! +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = 用水路 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = 「用兵の法は、其の来たらざらるを恃むこと無く、其の攻めざるを恃むこと無く、吾が攻むべからざる所あるを恃むなり」 - 孫子 @@ -4222,6 +4232,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = Great General = 大将軍 diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index c030d937bd..32f4dffeab 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -678,6 +678,8 @@ Your trade mission to [civName] has earned you [goldAmount] gold and [influenceA Hurry Wonder = 불가사의 건축 가속 Spread Religion = 종교 전파 Spread [religionName] = [religionName] 전파 + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = 시민들이 당신의 통치에 행복해하여 국가에 황금기가 시작됩니다! You have entered the [newEra]! = [newEra]에 온 것을 환영합니다! [civName] has entered the [eraName]! = [civName]이(가) [eraName]에 들어갔습니다. @@ -900,6 +902,13 @@ Unlocked at = 등장 시대: Gain 2 free technologies = 무료 기술 2개 획득 All policies adopted = 모든 정책 채택됨 +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = 통행 불가 @@ -1157,7 +1166,8 @@ Mint = 조폐국 [stats] once [tech] is discovered = [tech] 연구 시 [stats] Petra = 페트라 -[amount]% of food is carried over after population increases = 새로운 시민이 증가한 이후 [amount]%의 식량이 다음 시민 증가에 이월됨 + # Requires translation! +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = 송수로 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = '병법은 적군이 쳐들어오지 않기를 바라는 것이 아니라, 적군이 우리를 공격할 엄두가 나지 않을 방비 태세에 의지해야 하는 것이다.' - 손자 @@ -1254,7 +1264,8 @@ Seaport = 항구 Hermitage = 에르미타주 박물관 'The Taj Mahal rises above the banks of the river like a solitary tear suspended on the cheek of time.' - Rabindranath Tagore = '타지마할은, 시간의 뺨에 흐르는 눈물 한 방울과도 같이 강둑 위로 솟아있다.' - 라빈드라나트 타고르 -Empire aas golden age = 황금기를 시작시킴 + # Requires translation! +Empire enters golden age = Taj Mahal = 타지마할 'Things always seem fairer when we look back at them, and it is out of that inaccessible tower of the past that Longing leans and beckons.' - James Russell Lowell = '만사는 지나고 나서 돌아보면 더 좋아보이며, 바로 그 다가갈 수 없는 과거의 탑으로부터 동경은 몸을 내밀어 우리를 부른다.' - 제임스 러셀 로웰 @@ -3882,6 +3893,8 @@ Can speed up construction of a wonder = 불가사의 건설 가속화 가능 Great Prophet = 위대한 선지자 Can spread religion [amount] times = 종교 전파 [amount]회 가능 + # Requires translation! +May found a religion = Can construct [tileImprovement] if it hasn't spread religion yet = 종교 전파를 한번도 하지 않았다면 [tileImprovement] 시설 건설 가능 Great General = 위대한 장군 diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index 19b5e0eba7..52787821c6 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -788,6 +788,8 @@ Hurry Wonder = Skubėk stebuklas Spread Religion = # Requires translation! Spread [religionName] = + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Jūsų piliečiai taip ilgai džiaugėsi jūsų taisykle, kad imperija atėjo į aukso amžių! You have entered the [newEra]! = Jūs įėjote į [newEra]! [civName] has entered the [eraName]! = [civName] pateko į [eraName]! @@ -1074,6 +1076,13 @@ Gain 2 free technologies = Gaukite 2 nemokamas technologijas # Requires translation! All policies adopted = +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Neįveikiama @@ -1472,7 +1481,7 @@ Mint = Petra = # Requires translation! -[amount]% of food is carried over after population increases = +[amount]% of food is carried over [cityFilter] after population increases = # Requires translation! Aqueduct = @@ -6407,6 +6416,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = # Requires translation! diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index c54265d1cb..38c8631152 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -960,6 +960,8 @@ Spread Religion = # Requires translation! Spread [religionName] = # Requires translation! +Found a Religion = + # Requires translation! Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = # Requires translation! You have entered the [newEra]! = @@ -1305,6 +1307,13 @@ Gain 2 free technologies = # Requires translation! All policies adopted = +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains # Requires translation! @@ -1712,7 +1721,7 @@ Mint = Petra = # Requires translation! -[amount]% of food is carried over after population increases = +[amount]% of food is carried over [cityFilter] after population increases = # Requires translation! Aqueduct = @@ -6471,6 +6480,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = # Requires translation! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index 4625648c70..6846b7d0d0 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -773,6 +773,8 @@ Hurry Wonder = Sorat baḵšidan be Ojoobe Spread Religion = # Requires translation! Spread [religionName] = + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Šahrvandān e šomā be haddi az hokoomat e šomā rāzi and ke vared e yek Asr e Talāi šodid! You have entered the [newEra]! = Šomā vāred e [newEra] šodid! [civName] has entered the [eraName]! = [civName] vāred e [eraName] šod! @@ -1035,6 +1037,13 @@ Gain 2 free technologies = 2 teknoloji e rāygān begirid # Requires translation! All policies adopted = +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Ğeyr e ğābel e oboor @@ -1409,7 +1418,7 @@ Mint = Petra = # Requires translation! -[amount]% of food is carried over after population increases = +[amount]% of food is carried over [cityFilter] after population increases = # Requires translation! Aqueduct = @@ -6340,6 +6349,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = # Requires translation! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index 18a6f10aff..0f938574b3 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -770,6 +770,8 @@ Hurry Wonder = Sorat bakhshidan be Ojoobe Spread Religion = # Requires translation! Spread [religionName] = + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Shahrvandaan e shomaa be haddi az hokoomat e shomaa raazi and ke vared e yek Asr e Talaai shodid! You have entered the [newEra]! = Shomaa vaared e [newEra] shodid! [civName] has entered the [eraName]! = [civName] vaared e [eraName] shod! @@ -1032,6 +1034,13 @@ Gain 2 free technologies = 2 teknoloji e raaygaan begirid # Requires translation! All policies adopted = +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Gheyr e ghaabel e oboor @@ -1406,7 +1415,7 @@ Mint = Petra = # Requires translation! -[amount]% of food is carried over after population increases = +[amount]% of food is carried over [cityFilter] after population increases = # Requires translation! Aqueduct = @@ -6337,6 +6346,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = # Requires translation! diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index c0e0f2389a..5904967712 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -732,6 +732,8 @@ Hurry Wonder = Przyśpiesz Budowę Cudu Spread Religion = # Requires translation! Spread [religionName] = + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Twoi obywatele byli zadowoleni z twoich rządów tak długo, że imperium wkroczyło w Złotą Erę! You have entered the [newEra]! = Wkraczasz do nowej ery: [newEra]! [civName] has entered the [eraName]! = Cywilizacja [civName] wkracza do nowej ery: [eraName]! @@ -969,6 +971,13 @@ Unlocked at = Odblokowane przy Gain 2 free technologies = Zyskaj 2 darmowe technologie All policies adopted = Wszyskite ustroje zaadaptowane +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Nie do przejścia @@ -1263,7 +1272,8 @@ Mint = Mennica # Requires translation! Petra = -[amount]% of food is carried over after population increases = [amount]% jedzenia jest przekazane po wzroście populacji + # Requires translation! +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = Akwedukt 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = 'Sztuka wojny uczy nas nie polegać na prawdopodobieństwie tego, iż wróg nie zaatakuje, a na tym, że nasze pozycje są niedostępne.' – Sun Zi @@ -4263,6 +4273,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = Great General = Wielki Generał diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 4c7210dfe3..7c5eba69cc 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -731,6 +731,8 @@ Hurry Wonder = Apressar a contrução da Maravilha Spread Religion = Espalha a religião # Requires translation! Spread [religionName] = + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Seus cidadãos estão felizes com seu governo há tanto tempo que o império entra na Era de Ouro! You have entered the [newEra]! = Entraste na [newEra]! [civName] has entered the [eraName]! = [civName] entrou na [eraName]! @@ -994,6 +996,13 @@ Gain 2 free technologies = Ganhe 2 tecnologias grátis # Requires translation! All policies adopted = +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Inacessível @@ -1301,7 +1310,7 @@ Mint = Casa da moeda Petra = # Requires translation! -[amount]% of food is carried over after population increases = +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = Aqueduto 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = 'A Arte da guerra ensina não na probabilidade de o inimigo não atacar, mas no fato de termos tornado nossa posição inatacável.' - Sun Tzu @@ -5352,6 +5361,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = Great General = Grande General diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index ef61499531..b972e42525 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -786,6 +786,8 @@ Hurry Wonder = Grăbește minune Spread Religion = # Requires translation! Spread [religionName] = + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Cetățenii au fost fericiți cu conducerea dumneavoastră pentru o perioadă atât de lungă încât imperiul a intrat într-o Epocă de Aur! You have entered the [newEra]! = Ai intrat în epoca [newEra]! [civName] has entered the [eraName]! = [civName] a intrat în [eraName]! @@ -1104,6 +1106,13 @@ Gain 2 free technologies = Obține 2 tehnologii gratuite # Requires translation! All policies adopted = +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Inaccesibil @@ -1473,7 +1482,7 @@ Mint = Fabrică de bani Petra = # Requires translation! -[amount]% of food is carried over after population increases = +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = Apeduct # Requires translation! @@ -5935,6 +5944,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = Great General = Mare General diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index e0b0938ff6..17e43ff312 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -678,6 +678,8 @@ Your trade mission to [civName] has earned you [goldAmount] gold and [influenceA Hurry Wonder = Ускорить Постройку Чуда Spread Religion = Распостранить Религию Spread [religionName] = Распостранить [religionName] + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Граждане настолько счастливы, что ваша империя вступает в золотой век! You have entered the [newEra]! = Вы вошли в эпоху [newEra]! [civName] has entered the [eraName]! = [civName] входит в эпоху [eraName]! @@ -900,6 +902,13 @@ Unlocked at = Становится доступным в эпоху Gain 2 free technologies = Дает 2 бесплатные технологии All policies adopted = Все общественные институты приняты +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Непроходимо @@ -1014,7 +1023,6 @@ Downloaded! = Установлено! Could not download mod = Произошла ошибка при скачивании мода Online query result is incomplete = Результат онлайн запроса неполный No description provided = Описания нет - # Requires translation! [stargazers]✯ = [stargazers]✯ Author: [author] = Автор: [author] Size: [size] kB = Размер: [size] Кб @@ -1158,7 +1166,6 @@ Mint = Монетный Двор [stats] once [tech] is discovered = [stats] при открытии [tech] Petra = Петра - # Requires translation! [amount]% of food is carried over [cityFilter] after population increases = Сберегает [amount]% еды [cityFilter] при появлении нового жителя Aqueduct = Акведук @@ -3884,6 +3891,8 @@ Can speed up construction of a wonder = Может ускорить строит Great Prophet = Великий Пророк Can spread religion [amount] times = Может распостранить религию [amount] раз(а) + # Requires translation! +May found a religion = Can construct [tileImprovement] if it hasn't spread religion yet = Может создать [tileImprovement] если ещё не распостранял религию Great General = Великий Полководец diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 57e438f2d6..46efacae99 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -678,6 +678,8 @@ Your trade mission to [civName] has earned you [goldAmount] gold and [influenceA Hurry Wonder = 加速奇观建造 Spread Religion = 传播宗教 Spread [religionName] = 宗教[religionName] + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = 人民为您英明领导下取得的丰功伟绩欢欣鼓舞，您的帝国进入了黄金时代！ You have entered the [newEra]! = 您已进入了[newEra]！ [civName] has entered the [eraName]! = [civName]已经进入了[eraName]！ @@ -900,6 +902,13 @@ Unlocked at = 解锁时代： Gain 2 free technologies = 获得 2 项免费科技 All policies adopted = 所有政策皆已推行 +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = 不能通行 @@ -1157,7 +1166,8 @@ Mint = 铸币厂 [stats] once [tech] is discovered = 研发[tech]科技后[stats] Petra = 佩特拉 -[amount]% of food is carried over after population increases = 城市人口增长后保留 [amount]% 食物储备以加速成长 + # Requires translation! +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = 引水渠 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = “故用兵之法：无恃其不来，恃吾有以待也。无恃其不攻，恃吾有所不可攻也。” —— 孙子 @@ -3883,6 +3893,8 @@ Can speed up construction of a wonder = 可以加快一座奇观的建造速度 Great Prophet = 大先知 Can spread religion [amount] times = 可以传播宗教 [amount] 次 + # Requires translation! +May found a religion = Can construct [tileImprovement] if it hasn't spread religion yet = 如果尚未传播宗教，则可建造[tileImprovement] Great General = 大军事家 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index b55f16e442..62a4f0b889 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -684,6 +684,8 @@ Hurry Wonder = Acelerar Maravilla Spread Religion = # Requires translation! Spread [religionName] = + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = ¡Tus ciudadanos han estado contentos con tu gobierno durante tanto tiempo que el imperio ha entrado en una Edad de Oro! You have entered the [newEra]! = ¡Has entrado en la [newEra]! [civName] has entered the [eraName]! = ¡[civName] ha alcanzado [eraName]! @@ -906,6 +908,13 @@ Unlocked at = Desbloqueado en Gain 2 free technologies = Ganas 2 tecnologías gratuitas All policies adopted = Todas las políticas adoptadas +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Infranqueable @@ -1166,7 +1175,8 @@ Mint = Casa de la moneda [stats] once [tech] is discovered = [stats] una vez que se descubre [tech] Petra = Petra -[amount]% of food is carried over after population increases = [amount]% de los alimentos se transfiere después de que aumenta la población + # Requires translation! +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = Acueducto 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = 'El arte de la guerra nos enseña en no depender en la probabilidad de que el enemigo ataque, pero mas en el hecho de que nosotros hayamos hecho nuestra posición asaltable.' - Sun Tzu @@ -3898,6 +3908,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = Great General = Gran General diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index 67f810c66e..89c7148b19 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -678,6 +678,8 @@ Your trade mission to [civName] has earned you [goldAmount] gold and [influenceA Hurry Wonder = Skynda på Underverk Spread Religion = Sprid Religion Spread [religionName] = Sprid [religionName] + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Dina medborgare har varit lyckliga under ditt styre så länge att riket går in i en Guldålder! You have entered the [newEra]! = Du har gått in i [newEra]! [civName] has entered the [eraName]! = [civName] har gått in i [eraName]! @@ -900,6 +902,13 @@ Unlocked at = Görs tillgänglig vid Gain 2 free technologies = Få 2 gratis teknologier All policies adopted = Alla policyer anammade +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Oframkomlig @@ -1157,7 +1166,8 @@ Mint = Myntslageri [stats] once [tech] is discovered = [stats] när [tech] upptäcks Petra = Petra -[amount]% of food is carried over after population increases = [amount]% mat lämnas kvar efter befolkningstillväxt + # Requires translation! +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = Akvedukt 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = 'Krikgskonsten lär oss att inte lita på sannolikheten att fienden inte anfaller, utan snarare på det faktum att vi gjort vår ställning ointagbar.' - Sun Zi @@ -3785,7 +3795,6 @@ Double movement in coast = Dubbel förflyttning vid kusten Artillery = Artilleri Can enter ice tiles = Kan gå in i isrutor - # Requires translation! Can only attack [param] tiles = Kan endast anfalla [param]-rutor Invisible to others = Osynlig för andra Can attack submarines = Kan anfalla ubåtar @@ -3883,6 +3892,8 @@ Can speed up construction of a wonder = Kan snabba på bygget av ett Underverk Great Prophet = Stor Profet Can spread religion [amount] times = Kan sprida religion [amount] gånger + # Requires translation! +May found a religion = Can construct [tileImprovement] if it hasn't spread religion yet = Kan bygga [tileImprovement] om den inte spridit religion än Great General = Stor General diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 74e62e3d25..212c0c260b 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -728,6 +728,8 @@ Hurry Wonder = 加速奇觀建造 Spread Religion = # Requires translation! Spread [religionName] = + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = 人民為您英明領導下取得的豐功偉業歡欣鼓舞，您的帝國進入了黃金時代！ You have entered the [newEra]! = 您已進入了[newEra]！ [civName] has entered the [eraName]! = [civName]已進入[eraName]！ @@ -965,6 +967,13 @@ Unlocked at = 解鎖時代： Gain 2 free technologies = 獲得2項免費科技 All policies adopted = 所有政策皆已推行 +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = 不能通行 @@ -1258,7 +1267,8 @@ Mint = 鑄幣廠 # Requires translation! Petra = -[amount]% of food is carried over after population increases = 城市人口增長後保留[amount]%食物儲備以加速成長 + # Requires translation! +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = 引水渠 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = “故用兵之法：無恃其不來，是吾有以待也。無恃其不攻，恃吾有所不可攻也。”——孫子 @@ -4224,6 +4234,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = Great General = 大軍事家 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 2d9148f75f..c2250af80c 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -696,6 +696,8 @@ Hurry Wonder = Harikayı Hızlandır Spread Religion = # Requires translation! Spread [religionName] = + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Vatandaşlarınız, imparatorluğu Altın Çağ'a taşıyacak kadar uzun süredir yönetiminizden memnun kalmışlar! You have entered the [newEra]! = [newEra]'a girdiniz! [civName] has entered the [eraName]! = [civName] [eraName]'a girdi! @@ -923,6 +925,13 @@ Unlocked at = Şurada kilidi açıldı Gain 2 free technologies = 2 ücretsiz teknoloji kazanın All policies adopted = Bütün politikalar kabul edildi +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Birliklerce Geçilemez @@ -1199,7 +1208,8 @@ Mint = Darphane [stats] once [tech] is discovered = [tech] araştırıldığında [stats] Petra = Petra -[amount]% of food is carried over after population increases = Gıda %[amount] oranında nüfus artışından sonra korunur + # Requires translation! +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = Su Kemeri 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = 'Savaş sanatı bize düşmanın saldırmama ihtimaline değil, konumumuzu saldırgan hale getirebilme yeteneğine güvenmemizi öğretiyor.' - Sun Tzu @@ -4151,6 +4161,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = Great General = Harika General diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index fcd888f2f6..522d65436e 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -684,6 +684,8 @@ Hurry Wonder = Завершити будування дива Spread Religion = # Requires translation! Spread [religionName] = + # Requires translation! +Found a Religion = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Ваші громадяни були задоволені вашим правлінням так довго, що в імперії розпочалась Золота доба! You have entered the [newEra]! = Ви увійшли до епохи [newEra]! [civName] has entered the [eraName]! = Нація [civName] увійшла в епоху [eraName]! @@ -907,6 +909,13 @@ Unlocked at = Розблокується у Gain 2 free technologies = Отримати 2 безкоштовні технології All policies adopted = Усі інститути прийняті +# Religions + + # Requires translation! +Choose an Icon and name for your Religion = + # Requires translation! +Found [religionName] = + # Terrains Impassable = Непрохідні @@ -1168,7 +1177,8 @@ Mint = Монетний двір [stats] once [tech] is discovered = [stats] як тільки дослідиться [tech] Petra = Петра -[amount]% of food is carried over after population increases = [amount]% їжі залишається після народження нового громадянина + # Requires translation! +[amount]% of food is carried over [cityFilter] after population increases = Aqueduct = Акведук 'The art of war teaches us to rely not on the likelihood of the enemy's not attacking, but rather on the fact that we have made our position unassailable.' - Sun Tzu = «Мистецтво війни вчить нас не покладатися на вірогідність, що ворог не нападе, а більше на створення неприступної позиції» — Су Цзи. @@ -3972,6 +3982,8 @@ Great Prophet = # Requires translation! Can spread religion [amount] times = # Requires translation! +May found a religion = + # Requires translation! Can construct [tileImprovement] if it hasn't spread religion yet = Great General = Видатний генерал diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 494f473b3f..18b8c2c756 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -3,15 +3,15 @@ Italian = 99 Russian = 99 German = 99 Swedish = 99 -Turkish = 90 +Turkish = 89 Ukrainian = 96 French = 88 -Portuguese = 52 +Portuguese = 54 Indonesian = 99 Finnish = 53 Malay = 19 Spanish = 99 -Brazilian_Portuguese = 69 +Brazilian_Portuguese = 68 Traditional_Chinese = 88 Polish = 87 Lithuanian = 21 @@ -19,7 +19,7 @@ Romanian = 35 Simplified_Chinese = 99 Bulgarian = 24 Korean = 99 -Persian_(Pinglish-DIN) = 23 +Persian_(Pinglish-DIN) = 22 Japanese = 88 English = 1 Czech = 97 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index fdf9891ed5..2c5ed228ce 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.4.30" const val appName = "Unciv" - const val appCodeNumber = 592 - const val appVersion = "3.15.11" + const val appCodeNumber = 593 + const val appVersion = "3.15.12" const val gdxVersion = "1.10.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 6129d74f7d..2ebfe2cfb6 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,18 @@ +## 3.15.12 + +By xlenstra: +- Founding Religions +- Updated the tile choosing algorithm for city expansion +- Disabled city state diplomacy buttons when it is not your turn +- Fixed bug where great prophets could be given when religion was disabled +- Fixed bug where effects of all aquaducts nationwide stacked in each city + +Wonder build screens redux - By SimonCeder + +By SomeTroglodyte: +- Better Slider UI +- 'Swap units' sound replaced + ## 3.15.11 Civs with no cities can no longer pick policies diff --git a/core/src/com/unciv/logic/city/PopulationManager.kt b/core/src/com/unciv/logic/city/PopulationManager.kt index fa226b187e..4bf6ee7aa2 100644 --- a/core/src/com/unciv/logic/city/PopulationManager.kt +++ b/core/src/com/unciv/logic/city/PopulationManager.kt @@ -63,11 +63,6 @@ class PopulationManager { .getMatchingUniques("[]% of food is carried over [] after population increases") .filter { cityInfo.matchesFilter(it.params[1]) } .sumBy { it.params[0].toInt() } - // Deprecated since 3.15.11 - percentOfFoodCarriedOver += cityInfo - .getLocalMatchingUniques("[]% of food is carried over after population increases") - .sumBy { it.params[0].toInt() } - // // Try to avoid runaway food gain in mods, just in case if (percentOfFoodCarriedOver > 95) percentOfFoodCarriedOver = 95 foodStored += (getFoodToNextPopulation() * percentOfFoodCarriedOver / 100f).toInt() diff --git a/core/src/com/unciv/logic/civilization/ReligionManager.kt b/core/src/com/unciv/logic/civilization/ReligionManager.kt index bf97582139..14ab1331b2 100644 --- a/core/src/com/unciv/logic/civilization/ReligionManager.kt +++ b/core/src/com/unciv/logic/civilization/ReligionManager.kt @@ -1,6 +1,5 @@ package com.unciv.logic.civilization -import com.unciv.logic.city.CityInfo import com.unciv.logic.map.MapUnit import com.unciv.models.Religion import com.unciv.models.ruleset.Belief @@ -21,7 +20,7 @@ class ReligionManager { // It just stops growing. Your new religion will then have to spread out from your holy city // and convert these cities. This means, that civilizations can have multiple active religions // in some cases. We only save one of them in this class to reduce the amount of logic necessary. - // But the other one should still be _somehwere_. So our only option is to have the GameInfo + // But the other one should still be _somewhere_. So our only option is to have the GameInfo // contain the master list, and the ReligionManagers retrieve it from there every time the game loads. private var greatProphetsEarned = 0 diff --git a/core/src/com/unciv/logic/civilization/TechManager.kt b/core/src/com/unciv/logic/civilization/TechManager.kt index 301f824b0b..c307c47295 100644 --- a/core/src/com/unciv/logic/civilization/TechManager.kt +++ b/core/src/com/unciv/logic/civilization/TechManager.kt @@ -6,8 +6,8 @@ import com.unciv.logic.map.RoadStatus import com.unciv.logic.map.TileInfo import com.unciv.models.ruleset.Unique import com.unciv.models.ruleset.UniqueTriggerActivation -import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.ruleset.tech.Technology +import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.ui.utils.withItem import java.util.* import kotlin.collections.ArrayList @@ -182,11 +182,7 @@ class TechManager { private fun scienceFromResearchAgreements(): Int { // https://forums.civfanatics.com/resources/research-agreements-bnw.25568/ var researchAgreementModifier = 0.5f - // Deprecated since 3.15.0 - for (unique in civInfo.getMatchingUniques("Science gained from research agreements +50%")) - researchAgreementModifier += 0.25f - // - for (unique in civInfo.getMatchingUniques("Science gained from research agreements +[]%")) { + for (unique in civInfo.getMatchingUniques("Science gained from research agreements []%")) { researchAgreementModifier += unique.params[0].toFloat() / 200f } return (scienceFromResearchAgreements / 3 * researchAgreementModifier).toInt()