From d7bac9ed3e97c88b71b02fa437192ef10d8c57c7 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 24 Jul 2020 00:34:39 +0300 Subject: [PATCH] Genericified 'free [unit] appears] --- android/assets/jsons/Civ V - Vanilla/Buildings.json | 4 ++-- .../jsons/translations/Brazilian_Portuguese.properties | 4 ++-- android/assets/jsons/translations/Czech.properties | 4 ++-- android/assets/jsons/translations/Dutch.properties | 4 +--- android/assets/jsons/translations/English.properties | 4 +--- android/assets/jsons/translations/French.properties | 4 ++-- android/assets/jsons/translations/German.properties | 4 ++-- android/assets/jsons/translations/Indonesian.properties | 4 ++-- android/assets/jsons/translations/Italian.properties | 4 ++-- android/assets/jsons/translations/Japanese.properties | 4 ++-- android/assets/jsons/translations/Korean.properties | 4 ++-- android/assets/jsons/translations/Lithuanian.properties | 4 +--- android/assets/jsons/translations/Malay.properties | 4 +--- android/assets/jsons/translations/Polish.properties | 4 ++-- android/assets/jsons/translations/Portuguese.properties | 4 ++-- android/assets/jsons/translations/Romanian.properties | 4 ++-- android/assets/jsons/translations/Russian.properties | 4 ++-- .../jsons/translations/Simplified_Chinese.properties | 4 ++-- android/assets/jsons/translations/Spanish.properties | 4 ++-- .../jsons/translations/Traditional_Chinese.properties | 4 ++-- android/assets/jsons/translations/Turkish.properties | 4 ++-- android/assets/jsons/translations/Ukrainian.properties | 4 ++-- .../jsons/translations/completionPercentages.properties | 2 +- core/src/com/unciv/models/ruleset/Building.kt | 7 ++++--- .../com/unciv/models/translations/TranslationFileWriter.kt | 1 + 25 files changed, 46 insertions(+), 52 deletions(-) diff --git a/android/assets/jsons/Civ V - Vanilla/Buildings.json b/android/assets/jsons/Civ V - Vanilla/Buildings.json index d72db365..e927088e 100644 --- a/android/assets/jsons/Civ V - Vanilla/Buildings.json +++ b/android/assets/jsons/Civ V - Vanilla/Buildings.json @@ -676,7 +676,7 @@ "culture": 1, "greatPersonPoints": {"science": 2}, "isWonder": true, - "uniques": ["Free great scientist appears","Science gained from research agreements +50%"], + "uniques": ["Free [Great Scientist] appears","Science gained from research agreements +50%"], "requiredTech": "Architecture", "quote": "'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" }, @@ -728,7 +728,7 @@ "xpForNewUnits": 15, "greatPersonPoints": {"science": 2}, "isWonder": true, - "uniques": ["Free Great General appears near the Capital"], + "uniques": ["Free [Great General] appears"], "requiredTech": "Military Science", "quote": "'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace" }, diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 5620779d..4eb2b754 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -1128,7 +1128,8 @@ Empire enters golden age = Império entra em uma idade dourada Taj Mahal = 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 = 'As coisas sempre parecem mais justas quando nos lembramos delas, e é dessa torre inacessível do passado que a saudade se inclina e acena.' - James Russel Lowell -Free great scientist appears = Aparece um Grande Cientista grátis + # Requires translation! +Free [unit] appears = Science gained from research agreements +50% = Pontos de pesquisa recebidos de acordos de pesquisa +50% Porcelain Tower = Torre de Porcelana @@ -1142,7 +1143,6 @@ Factory = Fábrica Military Academy = Academia militar 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = 'A Morte pálida bate igualmente na porta do homem pobre e nos pálacios dos reis.' - Horace -Free Great General appears near the Capital = Grande general de graça aparece próximo a capital Brandenburg Gate = Portão de Branbenburgo Hospital = Hospital diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 6b8f577c..0b101935 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -1175,7 +1175,8 @@ Empire enters golden age = Říše vstoupí do zlatého věku Taj Mahal = Tádž 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 = 'Věci se vždy zdají lepší, když se na ně podíváme zpět, a to z té nepřístupné věže minulosti, která nás láká a vábí.' - James Russell Lowell -Free great scientist appears = Velký vědec zdarma + # Requires translation! +Free [unit] appears = Science gained from research agreements +50% = Výzkum z vědeckých dohod +50% Porcelain Tower = Porcelánová pagoda @@ -1189,7 +1190,6 @@ Factory = Továrna Military Academy = Vojenská akademie 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = 'Bledá smrt klepe u vrat chudáka stejně jako na královský palác.' - Horatius -Free Great General appears near the Capital = Velký generál zdarma poblíž hlavního města Brandenburg Gate = Brandenburgská brána Hospital = Nemocnice diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 23826510..69b96934 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -1791,7 +1791,7 @@ Taj Mahal = # Requires translation! '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 = # Requires translation! -Free great scientist appears = +Free [unit] appears = # Requires translation! Science gained from research agreements +50% = # Requires translation! @@ -1814,8 +1814,6 @@ Military Academy = # Requires translation! 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = # Requires translation! -Free Great General appears near the Capital = - # Requires translation! Brandenburg Gate = # Requires translation! diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 27f4606d..c5fe597f 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -2031,7 +2031,7 @@ Taj Mahal = # Requires translation! '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 = # Requires translation! -Free great scientist appears = +Free [unit] appears = # Requires translation! Science gained from research agreements +50% = # Requires translation! @@ -2054,8 +2054,6 @@ Military Academy = # Requires translation! 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = # Requires translation! -Free Great General appears near the Capital = - # Requires translation! Brandenburg Gate = # Requires translation! diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 866925ab..f083f93c 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -1159,7 +1159,8 @@ Empire enters golden age = Déclenche un Âge d'Or Taj Mahal = 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 = 'Les choses semblent toujours plus juste quand nous les observons à posteriori, c'est de cette tour inaccessible du passé que Longing se penche et fait signe.' - James Russell Lowell -Free great scientist appears = Un scientifique illustre gratuit apparaît + # Requires translation! +Free [unit] appears = Science gained from research agreements +50% = +50% pour la Science gagnée par les accords de recherche Porcelain Tower = Tour de Porcelaine @@ -1173,7 +1174,6 @@ Factory = Usine Military Academy = Académie militaire 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = 'La mort pâle frappe de la même manière la porte du pauvre et le palais des rois.' - Horace -Free Great General appears near the Capital = Un général illustre gratuit apparaît près de la Capitale Brandenburg Gate = Porte de Brandebourg Hospital = Hôpital diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 9606500f..383d4d49 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -1126,7 +1126,8 @@ Empire enters golden age = Es beginnt ein Goldenes Zeitalter Taj Mahal = 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 = 'Die Dinge erscheinen immer schöner, wenn wir auf sie zurückblicken, und aus diesem unzugänglichen Turm die Vergangenheit Sehnsüchtig lehnt und winkt.' - James Russell Lowell -Free great scientist appears = Eine kostenlose Große Wissenschaftlerin erscheint + # Requires translation! +Free [unit] appears = Science gained from research agreements +50% = Erhaltene Wissenschaft aus Forschungsabkommen +50% Porcelain Tower = Porzellanturm @@ -1140,7 +1141,6 @@ Factory = Fabrik Military Academy = Militärakademie 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = 'Der blasse Tod schlägt gleichermaßen am Tor des Armen und an den Palästen der Könige.' - Horace -Free Great General appears near the Capital = Kostenloser neuer General erscheint nahe der Hauptstadt Brandenburg Gate = Brandenburger Tor Hospital = Krankenhaus diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 52524532..002f9972 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -1122,7 +1122,8 @@ Empire enters golden age = Kerajaan memasuki masa kejayaan Taj Mahal = 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 = 'Suatu hal selalu lebih adil ketika kita merenungkannya, dan di luar menara masa lalu yang tidak bisa diakses itulah kerinduan bersandar dan memberikan isyarat.' - James Russell Lowell -Free great scientist appears = Ilmuwan hebat gratis muncul + # Requires translation! +Free [unit] appears = Science gained from research agreements +50% = Ilmu Pengetahuan yang didapat dari persetujuan riset +50%. Porcelain Tower = Menara Porselen @@ -1136,7 +1137,6 @@ Factory = Pabrik Military Academy = Akademi Militer 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = 'Kematiaan Pucat mengetuk pada gerbang orang miskin dan istana orang kaya.' - Horace -Free Great General appears near the Capital = Jendral Hebat gratis muncul di ibu kota Brandenburg Gate = Gerbang Brandenburg Hospital = Rumah Sakit diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index d08ad53a..84ac2423 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -1122,7 +1122,8 @@ Empire enters golden age = L'impero entra nell'Età dell'Oro Taj Mahal = 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 = 'Le cose sembrano sempre più belle quando ci voltiamo indietro per guardarle, ed è dall'inaccessibile torre del passato che la nostalgia si protende e chiama.' - James Russel Lowell -Free great scientist appears = Appare un Grande Scienziato + # Requires translation! +Free [unit] appears = Science gained from research agreements +50% = +50% Scienza dagli Accordi di Ricerca Porcelain Tower = Torre di Porcellana @@ -1136,7 +1137,6 @@ Factory = Fabbrica Military Academy = Accademia militare 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = 'La pallida morte batte ugualmente alla porta del povero e al palazzo del re.' - Orazio -Free Great General appears near the Capital = Appare un Grande Generale vicino alla Capitale Brandenburg Gate = Porta di Brandeburgo Hospital = Ospedale diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 284a1500..5fd1509c 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -1122,7 +1122,8 @@ 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 = 「物事は何でも、振り返ればより良く見える。もう手の届くことのない過去の塔から、追懐の情が身を乗りだして手招きをするのだ。」 - ジェームズ・ラッセル・ローウェル -Free great scientist appears = 建設された都市の近くに大科学者が出現 + # Requires translation! +Free [unit] appears = Science gained from research agreements +50% = 研究協定による科学力が50%上昇 Porcelain Tower = 南京の陶塔 @@ -1136,7 +1137,6 @@ Factory = 工場 Military Academy = 士官学校 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = 「蒼白い顔した死神は、乞食の門も王の宮殿も平等に敲く」 - ホラティウス -Free Great General appears near the Capital = 大将が都市近郊に出現 Brandenburg Gate = ブランデンブルク門 Hospital = 病院 diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index b1757895..43f1a538 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -1122,7 +1122,8 @@ 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 = '만사는 지나고 나서 돌아보면 더 좋아보이며, 바로 그 다가갈 수 없는 과거의 탑으로부터 동경은 몸을 내밀어 우리를 부른다.' - 제임스 러셀 로웰 -Free great scientist appears = 위대한 과학자 1명이 무료로 출현 + # Requires translation! +Free [unit] appears = Science gained from research agreements +50% = 연구 협약으로 얻는 과학 +50% Porcelain Tower = 대보은사 @@ -1136,7 +1137,6 @@ Factory = 공장 Military Academy = 사관 학교 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = '창백한 죽음은 가난한 자의 문과 왕의 궁전을 똑같이 두드린다.' - 호라티우스 -Free Great General appears near the Capital = 수도에 위대한 장군 1명이 무료로 출현 Brandenburg Gate = 브란덴부르크 문 Hospital = 병원 diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index 5142e05a..2c520f3c 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -1301,7 +1301,7 @@ Taj Mahal = # Requires translation! '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 = # Requires translation! -Free great scientist appears = +Free [unit] appears = # Requires translation! Science gained from research agreements +50% = # Requires translation! @@ -1324,8 +1324,6 @@ Military Academy = # Requires translation! 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = # Requires translation! -Free Great General appears near the Capital = - # Requires translation! Brandenburg Gate = # Requires translation! diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 2c7be2fe..2208c31e 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -1961,7 +1961,7 @@ Taj Mahal = # Requires translation! '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 = # Requires translation! -Free great scientist appears = +Free [unit] appears = # Requires translation! Science gained from research agreements +50% = # Requires translation! @@ -1981,8 +1981,6 @@ Military Academy = Akedemi Tentera # Requires translation! 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = # Requires translation! -Free Great General appears near the Capital = - # Requires translation! Brandenburg Gate = Hospital = Hospital diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 8d3f54e8..fb492c9a 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -1155,7 +1155,8 @@ Empire enters golden age = Imperium wkroczyło w złotą erę Taj Mahal = Tadź 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 = 'Kiedy patrzymy w przeszłość, wszystko wydaje się piękniejsze i właśnie w tej niedostępnej wieży przeszłości rodzi się Tęsknota.' - James Russell Lowell -Free great scientist appears = Pojawia się darmowy Wielki Naukowiec + # Requires translation! +Free [unit] appears = Science gained from research agreements +50% = +50% nauki za umowy naukowe Porcelain Tower = Porcelanowa Wieża @@ -1169,7 +1170,6 @@ Factory = Fabryka Military Academy = Akademia wojskowa 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = 'Blada Śmierć puka zarówno do drzwi biedaka, jak i do pałaców królów.' - Horacy -Free Great General appears near the Capital = Pojawia się Darmowy Wielski Generał w pobliżu Stolicy. Brandenburg Gate = Brama Brandenburska Hospital = Szpital diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index ecda9a50..95f5a740 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -1216,7 +1216,8 @@ Empire enters golden age = Império entra em uma idade dourada Taj Mahal = 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 = 'As coisas sempre parecem mais justas quando nos lembramos delas, e é dessa torre inacessível do passado que a saudade se inclina e acena.' - James Russel Lowell -Free great scientist appears = Aparece um Grande Cientista grátis + # Requires translation! +Free [unit] appears = # Requires translation! Science gained from research agreements +50% = Porcelain Tower = Torre de Porcelana @@ -1231,7 +1232,6 @@ Factory = Fábrica Military Academy = Academia militar 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = 'A Morte pálida bate igualmente na porta do homem pobre e nos pálacios dos reis.' - Horace -Free Great General appears near the Capital = Grande general de graça aparece próximo a capital Brandenburg Gate = Portão de Branbenburgo Hospital = Hospital diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index f39bebf7..06d7e753 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -1232,7 +1232,8 @@ Taj Mahal = Taj Mahal # Requires translation! '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 = -Free great scientist appears = Apare un mare om de știință gratuit + # Requires translation! +Free [unit] appears = # Requires translation! Science gained from research agreements +50% = Porcelain Tower = Turnul de Porțelan @@ -1247,7 +1248,6 @@ Factory = Uzină Military Academy = Academie militară 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = 'Moartea bate în mod egal la poarta săracului și la palatele regilor' - Horațiu -Free Great General appears near the Capital = Marele general gratuit apare în apropierea capitalei Brandenburg Gate = Poarta Brandenburg Hospital = Spital diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index c176adbf..b60f2fe5 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -1122,7 +1122,8 @@ 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 = 'Многое начинает казаться лучше, когда остается в прошлом - и из этой неприступной башни Прошлого нас зовет и манит рукою Тоска.' - Джеймс Расселл Лоуэлл -Free great scientist appears = Появляется бесплатный Великий Ученый + # Requires translation! +Free [unit] appears = Science gained from research agreements +50% = +50% к науке от договора об исследовании Porcelain Tower = Фарфоровая башня @@ -1136,7 +1137,6 @@ Factory = Завод Military Academy = Военная академия 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = 'Смерть одинаково трепещет как над бедняцкой хижиной, так и над дворцами королей' - Гораций -Free Great General appears near the Capital = Рядом со столицей появляется Великий генерал Brandenburg Gate = Бранденбургские врата Hospital = Больница diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 9fd315b1..3e8d7a89 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -1126,7 +1126,8 @@ 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 = “我们所失去的总是要在回望之时才更知道它的美好，而那曾经不可一世的高塔如今是多么的渴望能够有所依靠。”——詹姆斯·罗素·洛威尔（美国诗人） -Free great scientist appears = 免费的大科学家出现 + # Requires translation! +Free [unit] appears = Science gained from research agreements +50% = 科研协定产出的科研+50% Porcelain Tower = 大报恩寺塔 @@ -1140,7 +1141,6 @@ Factory = 工厂 Military Academy = 军事学院 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = “苍白的死神平等地叩响穷人房舍的小门和国王宫殿的大门。”——昆图斯·贺拉斯·弗拉库斯 -Free Great General appears near the Capital = 免费的大軍事家出现在首都附近 Brandenburg Gate = 勃兰登堡门 Hospital = 医院 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 1a701ddc..83905fc4 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -1128,7 +1128,8 @@ Empire enters golden age = El imperio comienza una Edad Dorada Taj Mahal = 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 = 'Las cosas parecen más justas cuando volvemos la vista atrás para verlas, y es por esa inaccesible torre del pasado que el anhelo se asoma y nos llama con la mano.' - James Russell Lowell -Free great scientist appears = Aparece un Gran Científico gratis + # Requires translation! +Free [unit] appears = Science gained from research agreements +50% = Ciencia obtenida de acuerdos de investigación +50% Porcelain Tower = Torre de Porcelana @@ -1142,7 +1143,6 @@ Factory = Fábrica Military Academy = Academia militar 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = 'La pálida muerte llama por igual a la puerta del pobre y a los palacios de los reyes.' - Horacio -Free Great General appears near the Capital = Gran general aparece cerca de la capital gratuitamente Brandenburg Gate = Puerta de Brandemburgo Hospital = Hospital diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 887bf17e..6bf735d7 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -1147,7 +1147,8 @@ 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 = “我們所失去的總是要在回望之時才更知道它的美好，而那曾經不可一世的高塔如今是多麼的可望能夠有所依靠。”——詹姆斯·羅素·洛威爾（美國詩人） -Free great scientist appears = 免費的大科學家出現 + # Requires translation! +Free [unit] appears = Science gained from research agreements +50% = 科研協定產出的科研+50% Porcelain Tower = 大報恩寺塔 @@ -1161,7 +1162,6 @@ Factory = 工廠 Military Academy = 軍事學院 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = “蒼白的死神平等地叩響窮人房舍的小門和國王宮殿的大門。”——昆圖斯·賀拉斯·弗拉庫斯 -Free Great General appears near the Capital = 免費的大軍事家出現在首都附近 Brandenburg Gate = 勃蘭登堡門 Hospital = 醫院 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index a8fde6b5..4ea25039 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -1179,7 +1179,8 @@ Empire enters golden age = İmparatorluk altın çağa girer Taj Mahal = Taç 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 = “Onlara baktığımızda işler her zaman daha adil gözüküyor ve Longing'in eğildiği ve çıldırdığı geçmişin erişilemeyen kulesinin dışında.” - James Russell Lowell -Free great scientist appears = Ücretsiz büyük bilim adamı ortaya çıkar + # Requires translation! +Free [unit] appears = Science gained from research agreements +50% = Araştırma anlaşmalarından elde edilen bilim +50% Porcelain Tower = Porselen Kule @@ -1193,7 +1194,6 @@ Factory = Fabrika Military Academy = Harp Akademisi 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = 'Soluk Ölüm, fakir adamın kapısında ve kralların saraylarında eşit şekilde ölüm dağıtıyor.' - Horace -Free Great General appears near the Capital = Ücretsiz Büyük General Başkent yakınında ortaya çıkar Brandenburg Gate = Brandenburg Kapısı Hospital = Hastane diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 800f5686..aa8676cf 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -1126,7 +1126,8 @@ 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 = «Речі завжди здаються справедливішими, коли ми дивимось на них з тієї неприступної вежі минулого, де туга сховалася і манить» — Джеймс Расселл Ловелл. -Free great scientist appears = Безкоштовно з’являється видатний науковець + # Requires translation! +Free [unit] appears = Science gained from research agreements +50% = +50% науки з угоди про дослідження Porcelain Tower = Порцелянова пагода @@ -1140,7 +1141,6 @@ Factory = Фабрика Military Academy = Військова академія 'Pale Death beats equally at the poor man's gate and at the palaces of kings.' - Horace = «Смерть приходить однаково до хиж бідняків і королівських палаців» — Горацій. -Free Great General appears near the Capital = біля столиці безкоштовно з’являється видатний генерал Brandenburg Gate = Бранденбурські ворота Hospital = Шпиталь diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 2131d2c9..88cbe8a1 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -15,7 +15,7 @@ Ukrainian = 99 French = 98 Portuguese = 52 Indonesian = 99 -Czech = 62 +Czech = 61 Spanish = 99 Malay = 6 Dutch = 13 diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt index 27c81c07..89fe51ef 100644 --- a/core/src/com/unciv/models/ruleset/Building.kt +++ b/core/src/com/unciv/models/ruleset/Building.kt @@ -366,13 +366,14 @@ class Building : NamedStats(), IConstruction{ } if ("Empire enters golden age" in uniques) civInfo.goldenAges.enterGoldenAge() - if ("Free Great Artist Appears" in uniques) civInfo.addGreatPerson("Great Artist", cityConstructions.cityInfo) + for(unique in uniques) if(unique.equalsPlaceholderText("Free [] appears")){ + val unitName = unique.getPlaceholderParameters()[0] + civInfo.addGreatPerson(unitName, cityConstructions.cityInfo) + } if ("2 free Great Artists appear" in uniques) { civInfo.addGreatPerson("Great Artist", cityConstructions.cityInfo) civInfo.addGreatPerson("Great Artist", cityConstructions.cityInfo) } - if ("Free Great General appears near the Capital" in uniques) civInfo.addGreatPerson("Great General", civInfo.getCapital()) - if ("Free great scientist appears" in uniques) civInfo.addGreatPerson("Great Scientist", cityConstructions.cityInfo) if ("2 free great scientists appear" in uniques) { civInfo.addGreatPerson("Great Scientist", cityConstructions.cityInfo) civInfo.addGreatPerson("Great Scientist", cityConstructions.cityInfo) diff --git a/core/src/com/unciv/models/translations/TranslationFileWriter.kt b/core/src/com/unciv/models/translations/TranslationFileWriter.kt index 1dc1fe01..35d17905 100644 --- a/core/src/com/unciv/models/translations/TranslationFileWriter.kt +++ b/core/src/com/unciv/models/translations/TranslationFileWriter.kt @@ -201,6 +201,7 @@ object TranslationFileWriter { val parameterName = when{ parameter.toIntOrNull() != null -> "amount" RulesetCache.getBaseRuleset().terrains.containsKey(parameter) -> "terrain" + RulesetCache.getBaseRuleset().units.containsKey(parameter) -> "unit" else -> "param" } stringToTranslate = string.replace(parameters[0], parameterName)