diff --git a/android/assets/jsons/Civ V - Vanilla/Buildings.json b/android/assets/jsons/Civ V - Vanilla/Buildings.json index d7ab287a34..d72db36534 100644 --- a/android/assets/jsons/Civ V - Vanilla/Buildings.json +++ b/android/assets/jsons/Civ V - Vanilla/Buildings.json @@ -536,7 +536,7 @@ "hurryCostModifier": 25, "percentStatBonus": {"science": 50}, "requiredBuilding": "Library", - "uniques": ["Must be next to mountain"], + "uniques": ["Must be next to [Mountain]"], "requiredTech": "Astronomy" }, { @@ -864,7 +864,7 @@ "maintenance": 3, "cannotBeBuiltWith": "Nuclear Plant", "requiredTech": "Ecology", - "uniques": ["Must be next to desert"] + "uniques": ["Must be next to [Desert]"] }, { "name": "Sydney Opera House", diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 9996588888..5620779d19 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -94,6 +94,8 @@ You declared war on us! = Você declarou guerra contra nós! Your warmongering ways are unacceptable to us. = Seu belicismo é inaceitável para nós. You have captured our cities! = Você capturou nossas cidades! We applaud your liberation of our conquered cities! = Nós apreciamos a libertação de nossas cidades conquistadas! + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = Anos de paz fortaleceram nossas relações. Our mutual military struggle brings us closer together. = Nossas lutas mutuas nos fazem mais próximos. We have signed a public declaration of friendship = Assinamos uma declaração pública de amizade @@ -247,8 +249,8 @@ Great Andean Road = Grande Estrada Andina +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = +1 de Movimento para todas unidades embarcadas, as unidades pagam apenas 1 ponto de movimento para embarcar e desembarcar. Unidades corpo a corpo não pagam custo de movimento para pilhar. Viking Fury = Fúria Viking -Sacrificial Captives = Sacrifício de prisioneiros Gain Culture for the empire from each enemy unit killed = Ganhe cultura para o império por cada unidade inimiga morta +Sacrificial Captives = Sacrifício de prisioneiros # New game screen @@ -625,6 +627,8 @@ The city will not produce anything. = A cidade não vai produzir nada. Worked by [cityName] = Trabalhado por [cityName] # Requires translation! Lock = + # Requires translation! +Unlock = # Technology UI @@ -1076,7 +1080,8 @@ Notre Dame = Notre Dame Armory = Arsenal -Must be next to mountain = Necessário que esteja próximo a montanha + # Requires translation! +Must be next to [terrain] = Observatory = Observatório Opera House = Casa de Ópera @@ -1179,7 +1184,6 @@ Medical Lab = Laboratório médico Nuclear Plant = Planta Nuclear -Must be next to desert = Nescessário que esteja proximo ao deserto Solar Plant = Planta Solar 'Those who lose dreaming are lost.' - Australian Aboriginal saying = 'Aqueles que perderam seus sonhos estão perdidos.' - Ditado abrorigéne Australiano diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index ddadf47f19..6b8f577cf9 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -94,6 +94,8 @@ You declared war on us! = Vyhlásili jste nám válku! Your warmongering ways are unacceptable to us. = Vaše chování je pro nás nepřijatelné. You have captured our cities! = Obsadili jste naše města! We applaud your liberation of our conquered cities! = Oslavujeme osvobození našich měst! + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = Roky míru posílily naše vzájemné vztahy. Our mutual military struggle brings us closer together. = Naše společné válečné tažení nás sblížilo. We have signed a public declaration of friendship = Podepsali jsme veřejnou deklaraci přátelství @@ -249,10 +251,10 @@ Great Andean Road = Velká Andská cesta +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = Viking Fury = Vikingská zuřivost - # Requires translation! -Sacrificial Captives = # Requires translation! Gain Culture for the empire from each enemy unit killed = + # Requires translation! +Sacrificial Captives = # New game screen @@ -641,6 +643,8 @@ The city will not produce anything. = Město nebude nic vyrábět. Worked by [cityName] = # Requires translation! Lock = + # Requires translation! +Unlock = # Technology UI @@ -1123,7 +1127,8 @@ Notre Dame = Katedrála Notre-Dame Armory = Zbrojnice -Must be next to mountain = Musí být vedle hor + # Requires translation! +Must be next to [terrain] = Observatory = Observatoř Opera House = Operní dům @@ -1226,7 +1231,6 @@ Medical Lab = Lékařská laboratoř Nuclear Plant = Jaderná elektrárna -Must be next to desert = Musí být vedle pouště Solar Plant = Solární elektrárna 'Those who lose dreaming are lost.' - Australian Aboriginal saying = Ti, kteří ztratili sny, jsou ztraceni - Australské domorodé přísloví diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index db876eabb4..2382651093 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -127,6 +127,8 @@ You have captured our cities! = # Requires translation! We applaud your liberation of our conquered cities! = # Requires translation! +We applaud your liberation of conquered cities! = + # Requires translation! Years of peace have strengthened our relations. = # Requires translation! Our mutual military struggle brings us closer together. = @@ -375,10 +377,10 @@ Great Andean Road = # Requires translation! Viking Fury = - # Requires translation! -Sacrificial Captives = # Requires translation! Gain Culture for the empire from each enemy unit killed = + # Requires translation! +Sacrificial Captives = # New game screen @@ -972,6 +974,8 @@ The city will not produce anything. = Worked by [cityName] = # Requires translation! Lock = + # Requires translation! +Unlock = # Technology UI @@ -1711,7 +1715,7 @@ Notre Dame = Armory = # Requires translation! -Must be next to mountain = +Must be next to [terrain] = # Requires translation! Observatory = @@ -1877,7 +1881,6 @@ Medical Lab = # Requires translation! Nuclear Plant = -Must be next to desert = Moet aan een woestijn grenzen # Requires translation! Solar Plant = diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 989d55e905..27f4606df7 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -173,6 +173,8 @@ You have captured our cities! = # Requires translation! We applaud your liberation of our conquered cities! = # Requires translation! +We applaud your liberation of conquered cities! = + # Requires translation! Years of peace have strengthened our relations. = # Requires translation! Our mutual military struggle brings us closer together. = @@ -438,10 +440,10 @@ Great Andean Road = # Requires translation! Viking Fury = - # Requires translation! -Sacrificial Captives = # Requires translation! Gain Culture for the empire from each enemy unit killed = + # Requires translation! +Sacrificial Captives = # New game screen @@ -1157,6 +1159,8 @@ The city will not produce anything. = Worked by [cityName] = # Requires translation! Lock = + # Requires translation! +Unlock = # Technology UI @@ -1949,7 +1953,7 @@ Notre Dame = Armory = # Requires translation! -Must be next to mountain = +Must be next to [terrain] = # Requires translation! Observatory = @@ -2119,8 +2123,6 @@ Medical Lab = # Requires translation! Nuclear Plant = - # Requires translation! -Must be next to desert = # Requires translation! Solar Plant = diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index fdebb65260..866925abe2 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -94,6 +94,8 @@ You declared war on us! = Vous nous avez déclaré la guerre ! Your warmongering ways are unacceptable to us. = Votre bellicisme est inacceptable pour nous. You have captured our cities! = Vous avez capturé nos villes ! We applaud your liberation of our conquered cities! = Nous applaudissons la libération de nos cités conquises ! + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = Les années de paix ont renforcé notre relation. Our mutual military struggle brings us closer together. = Nos problèmes militaires communs nous ont rapprochés. We have signed a public declaration of friendship = Nous avons publiquement signé une déclaration d'amitié @@ -247,10 +249,10 @@ Great Andean Road = Grande route des Andes +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = +1 Mouvement pour les unités embarquées, les unités n'utilisent qu'un point de mouvement pour embarquer et débarquer. Les unités de mélée n'utilisent pas de mouvement pour piller. Viking Fury = Fureur viking - # Requires translation! -Sacrificial Captives = # Requires translation! Gain Culture for the empire from each enemy unit killed = + # Requires translation! +Sacrificial Captives = # New game screen @@ -631,6 +633,8 @@ The city will not produce anything. = La cité ne produira plus rien Worked by [cityName] = # Requires translation! Lock = + # Requires translation! +Unlock = # Technology UI @@ -1107,7 +1111,8 @@ Notre Dame = Notre-Dame Armory = Arsenal -Must be next to mountain = Doit être à côté d'une montagne + # Requires translation! +Must be next to [terrain] = Observatory = Observatoire Opera House = Opéra @@ -1210,7 +1215,6 @@ Medical Lab = Laboratoire médical Nuclear Plant = Centrale nucléaire -Must be next to desert = Doit être à côté d'un désert Solar Plant = Centrale solaire 'Those who lose dreaming are lost.' - Australian Aboriginal saying = 'Ceux qui perdent leurs rêves sont perdus.' - Dicton aborigène australien diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index b912cdb48b..9606500ffd 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -94,6 +94,8 @@ You declared war on us! = Sie haben uns den Krieg erklärt! Your warmongering ways are unacceptable to us. = Ihr kriegerisches Verhalten ist für uns inakzeptabel. You have captured our cities! = Sie haben unsere Städte erobert! We applaud your liberation of our conquered cities! = Wir begrüßen Ihre Befreiung unserer eroberten Städte! + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = Die Jahre des Friedens haben unsere Beziehung gestärkt. Our mutual military struggle brings us closer together. = Unser gemeinsamer militärischer Kampf bringt uns näher zusammen. We have signed a public declaration of friendship = Wir haben eine öffentliche Freundschaftserklärung unterzeichnet. @@ -246,8 +248,8 @@ Great Andean Road = Die Große Andenstraße +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = +1 Bewegungspunkt für alle eingeschifften Einheiten, einschiffen und an Land gehen kosten nur 1 Bewegungspunkt. Nahkampfeinheiten benötigen keinen Bewegungspunkt zum Plündern. Viking Fury = Wikinger-Raserei -Sacrificial Captives = Gefangenen-Opfer Gain Culture for the empire from each enemy unit killed = Erhalte Kutur - für das Imperium - für jede getötete feindliche Einheit +Sacrificial Captives = Gefangenen-Opfer # New game screen @@ -623,6 +625,8 @@ The city will not produce anything. = Die Stadt produziert nichts. Worked by [cityName] = Bewirtschaftet von [cityName] # Requires translation! Lock = + # Requires translation! +Unlock = # Technology UI @@ -1074,7 +1078,8 @@ Notre Dame = Notre-Dame Armory = Waffenkammer -Must be next to mountain = Muss an einen Berg grenzen + # Requires translation! +Must be next to [terrain] = Observatory = Observatorium Opera House = Opernhaus @@ -1177,7 +1182,6 @@ Medical Lab = Medizinisches Labor Nuclear Plant = Atomkraftwerk -Must be next to desert = Muss an eine Wüste grenzen Solar Plant = Solarkraftwerk 'Those who lose dreaming are lost.' - Australian Aboriginal saying = 'Jene, die ihre Träume verlieren, sind verloren.' - Sprichwort der australischen Ureinwohner diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index c5e2c2da67..52524532fe 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -94,6 +94,8 @@ You declared war on us! = Kamu menyatakan perang pada kami! Your warmongering ways are unacceptable to us. = Cara kamu berperang tidak kami setujui! You have captured our cities! = Kamu telah menguasai kota kami! We applaud your liberation of our conquered cities! = Kami menghargai kemerdekaan yang kamu berikan kepada kota kami! + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = Perdamaian selama bertahun-tahun memperkuat hubungan kita. Our mutual military struggle brings us closer together. = Perjuangan bersama militer kita membuat kita semakin dekat. We have signed a public declaration of friendship = Kita telah menandatangani deklarasi pertemanan secara publik. @@ -246,8 +248,8 @@ Great Andean Road = Jalan Andes Raya +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = +1 Pergerakan untuk semua unit yang melaut, unit hanya memerlukan 1 pergerakan untuk melaut dan mendarat. Unit jarak dekat tidak menghabiskan pergerakan untuk menjarah. Viking Fury = Kemarahan Viking -Sacrificial Captives = Pengorbanan Tawanan Gain Culture for the empire from each enemy unit killed = Mendapat Budaya untuk kerajaan dari setiap unit musuh yang terbunuh. +Sacrificial Captives = Pengorbanan Tawanan # New game screen @@ -622,6 +624,8 @@ Convert production to science at a rate of [rate] to 1 = Konversi produksi ke il The city will not produce anything. = Kota ini tidak akan memproduksi apapun. Worked by [cityName] = Digarap oleh [cityName] Lock = Kunci + # Requires translation! +Unlock = # Technology UI @@ -1070,7 +1074,8 @@ Notre Dame = Notre Dame Armory = Gudang Senjata -Must be next to mountain = Harus di dekat gunung + # Requires translation! +Must be next to [terrain] = Observatory = Observatorium Opera House = Gedung Opera @@ -1173,7 +1178,6 @@ Medical Lab = Lab Medis Nuclear Plant = PLTN -Must be next to desert = Harus terletak di areal gurun Solar Plant = Panel Surya 'Those who lose dreaming are lost.' - Australian Aboriginal saying = 'Mereka yang menghilangkan impian tersesat kehilangan arah.' - pepatah orang Aborigin Australia diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index ead2628bf3..d08ad53a02 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -94,6 +94,8 @@ You declared war on us! = Ci hai dichiarato guerra! Your warmongering ways are unacceptable to us. = Non accettiamo i tuoi metodi da guerrafondaio! You have captured our cities! = Hai preso una delle nostre città! We applaud your liberation of our conquered cities! = Siamo lieti che i tuoi eserciti abbiano liberato alcune nostre città! + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = Gli anni di pace hanno rafforzato i nostri rapporti. Our mutual military struggle brings us closer together. = I nostri nemici in comune ci hanno tenuti insieme. We have signed a public declaration of friendship = Abbiamo segnato una dichiarazione pubblica d'amicizia! @@ -246,8 +248,8 @@ Great Andean Road = Grande strada delle Ande +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = +1 Movimento per le unità imbarcate, che pagano un solo punto Movimento per imbarcarsi e sbarcare. Le unità da mischia possono saccheggiare le caselle senza spendere punti Movimento. Viking Fury = Furia vichinga -Sacrificial Captives = Vittime sacrificali Gain Culture for the empire from each enemy unit killed = Ottieni cultura per ogni unità nemica da te uccisa. +Sacrificial Captives = Vittime sacrificali # New game screen @@ -622,6 +624,8 @@ Convert production to science at a rate of [rate] to 1 = Converte la Produzione The city will not produce anything. = La città non produrrà nulla Worked by [cityName] = Sfruttata da [cityName] Lock = Blocca + # Requires translation! +Unlock = # Technology UI @@ -1070,7 +1074,8 @@ Notre Dame = Notre Dame Armory = Armeria -Must be next to mountain = Deve rasentare Montagna + # Requires translation! +Must be next to [terrain] = Observatory = Osservatorio Opera House = Teatro dell'opera @@ -1173,7 +1178,6 @@ Medical Lab = Laboratorio medico Nuclear Plant = Centrale nucleare -Must be next to desert = Deve rasentare Deserto Solar Plant = Centrale ad energia solare 'Those who lose dreaming are lost.' - Australian Aboriginal saying = 'Quelli che perdono i sogni sono perduti.' - Massima degli aborigeni australiani diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 9d654f1914..284a15007f 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -94,6 +94,8 @@ You declared war on us! = 宣戦布告 Your warmongering ways are unacceptable to us. = 戦好きな考え You have captured our cities! = 我々の都市の占領 We applaud your liberation of our conquered cities! = 占領された都市の解放 + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = 長年の平和 Our mutual military struggle brings us closer together. = 軍事協力 We have signed a public declaration of friendship = 友好宣言に署名 @@ -246,8 +248,8 @@ Great Andean Road = アンデスの大道 +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = 出航時に移動+1が付与され、海から陸に上がる時に消費する移動ポイントが1に。白兵ユニットが移動ポイントを消費せずに略奪を行えるようになる。 Viking Fury = ヴァイキングの怒り -Sacrificial Captives = 捕虜の生贄 Gain Culture for the empire from each enemy unit killed = 敵ユニットを倒すごとに文化力を獲得する。 +Sacrificial Captives = 捕虜の生贄 # New game screen @@ -622,6 +624,8 @@ Convert production to science at a rate of [rate] to 1 = 生産力を[rate]対1 The city will not produce anything. = 都市は何も生産しません Worked by [cityName] = [cityName]で勤務 Lock = ロック + # Requires translation! +Unlock = # Technology UI @@ -1070,7 +1074,8 @@ Notre Dame = ノートルダム大聖堂 Armory = 武器庫 -Must be next to mountain = 山の隣で建設可能 + # Requires translation! +Must be next to [terrain] = Observatory = 天文台 Opera House = オペラハウス @@ -1173,7 +1178,6 @@ Medical Lab = 医学研究所 Nuclear Plant = 原子力発電所 -Must be next to desert = 砂漠か、砂漠の隣で建設可能 Solar Plant = 太陽熱発電 'Those who lose dreaming are lost.' - Australian Aboriginal saying = 「夢を失ったものは敗者である」 - オーストラリア先住民の言葉 diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 4da803f168..b17578951b 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -94,6 +94,8 @@ You declared war on us! = 우리는 지금 전쟁 중일 텐데! 무엇을 말 Your warmongering ways are unacceptable to us. = 당신이 하는 전쟁광적 행동은 절대 용납할 수 없소. You have captured our cities! = 감히 우리의 도시까지 점령하다니! We applaud your liberation of our conquered cities! = 정복한 도시를 해방한 것에 대해 찬사를 보냅니다. + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = 오래전부터 지속된 평화가 더 강한 관계를 만드는군요. Our mutual military struggle brings us closer together. = 공동의 적에 맞선다는 사실이 우리의 관계를 더 강하게 하는군요. We have signed a public declaration of friendship = 오셨군요. 이렇게 우호 관계를 선언해주는 벗을 만나기란 어렵지요. @@ -246,8 +248,8 @@ Great Andean Road = 위대한 안데스의 길 +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = 모든 승선 유닛 행동력 +1. 승하선시 행동력 1만 소모. 근접 유닛 약탈시 행동력 소모 없음 Viking Fury = 바이킹의 분노 -Sacrificial Captives = 포로 공양 Gain Culture for the empire from each enemy unit killed = 적 유닛 처치시 문화 획득 +Sacrificial Captives = 포로 공양 # New game screen @@ -622,6 +624,8 @@ Convert production to science at a rate of [rate] to 1 = 생산력의 1/[rate] The city will not produce anything. = 도시가 아무 것도 생산하지 않음 Worked by [cityName] = [cityname]에서 작업중 Lock = 잠금 + # Requires translation! +Unlock = # Technology UI @@ -1070,7 +1074,8 @@ Notre Dame = 노트르담 대성당 Armory = 무기고 -Must be next to mountain = 도시가 산 옆에 있어야 함 + # Requires translation! +Must be next to [terrain] = Observatory = 천문대 Opera House = 오페라 극장 @@ -1173,7 +1178,6 @@ Medical Lab = 의학 연구소 Nuclear Plant = 원자력 발전소 -Must be next to desert = 도시가 사막 옆에 있어야 함 Solar Plant = 태양열 발전소 'Those who lose dreaming are lost.' - Australian Aboriginal saying = '꿈을 잃어버리면 길도 잃는다.' - 호주 원주민 속담 diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index a85ea86960..5142e05a88 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -96,6 +96,8 @@ You declared war on us! = Jūs paskelbėte mums karą! Your warmongering ways are unacceptable to us. = Jums nepriimtini jūsų būdai, kuriais vadovaujatės. You have captured our cities! = Jūs užfiksavote mūsų miestus! We applaud your liberation of our conquered cities! = Mes sveikiname jūsų užkariautų miestų išsivadavimą! + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = Taikos metai sustiprino mūsų santykius. Our mutual military struggle brings us closer together. = Mūsų tarpusavio karinė kova mus suartina. We have signed a public declaration of friendship = Mes pasirašėme viešą draugystės deklaraciją @@ -252,10 +254,10 @@ Great Andean Road = Didysis Andų kelias +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = +1 Judėjimas į visus įlaipintus vienetus, vienetai moka tik 1 judėjimo tašką įlaipinimo ir išlaipinimo metu. Melee vienetai nemoka judėjimo išlaidų. Viking Fury = Vikingų įniršis - # Requires translation! -Sacrificial Captives = # Requires translation! Gain Culture for the empire from each enemy unit killed = + # Requires translation! +Sacrificial Captives = # New game screen @@ -635,6 +637,8 @@ The city will not produce anything. = Miestas nieko negamins. Worked by [cityName] = Dirbo [cityName] # Requires translation! Lock = + # Requires translation! +Unlock = # Technology UI @@ -1218,7 +1222,7 @@ Notre Dame = Armory = # Requires translation! -Must be next to mountain = +Must be next to [terrain] = # Requires translation! Observatory = @@ -1389,8 +1393,6 @@ Medical Lab = # Requires translation! Nuclear Plant = - # Requires translation! -Must be next to desert = # Requires translation! Solar Plant = diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 45fadfb4b8..2c7be2fe0d 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -140,6 +140,8 @@ Your warmongering ways are unacceptable to us. = You have captured our cities! = Kamu tawan bandar kami # Requires translation! We applaud your liberation of our conquered cities! = + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = Keamanan bertahun-tahun telah menguatkan hubungan kita. # Requires translation! Our mutual military struggle brings us closer together. = @@ -390,10 +392,10 @@ Great Andean Road = # Requires translation! Viking Fury = - # Requires translation! -Sacrificial Captives = # Requires translation! Gain Culture for the empire from each enemy unit killed = + # Requires translation! +Sacrificial Captives = # New game screen @@ -1111,6 +1113,8 @@ The city will not produce anything. = Worked by [cityName] = # Requires translation! Lock = + # Requires translation! +Unlock = # Technology UI @@ -1882,7 +1886,7 @@ Notre Dame = Armory = # Requires translation! -Must be next to mountain = +Must be next to [terrain] = # Requires translation! Observatory = @@ -2036,8 +2040,6 @@ Medical Lab = Nuclear Plant = Penjana Nuklear - # Requires translation! -Must be next to desert = # Requires translation! Solar Plant = diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 2b983ee202..8d3f54e8e1 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -94,6 +94,8 @@ You declared war on us! = Wypowiedziałeś z nami wojnę! Your warmongering ways are unacceptable to us. = Wasze podżeganie jest dla nas nie do przyjęcia. You have captured our cities! = Przejąłeś nasze miasta! We applaud your liberation of our conquered cities! = Dziękujemy ci za wyzwolenie naszych utraconych miast! + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = Lata pokoju wzmocniły nasze relacje. Our mutual military struggle brings us closer together. = Nasza wspólna walka zbliża nas do siebie. We have signed a public declaration of friendship = Podpisaliśmy deklarację o przyjaźni @@ -247,10 +249,10 @@ Great Andean Road = Wielka Andyjska Droga +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = +1 do Ruchu dla wszystkich jednostek które są na pokładzie, jednostki płacą tylko 1 punkt ruchu przy wchodzeniu na pokład oraz wychodzeniu z pokładu. Viking Fury = Furia Wikingów - # Requires translation! -Sacrificial Captives = # Requires translation! Gain Culture for the empire from each enemy unit killed = + # Requires translation! +Sacrificial Captives = # New game screen @@ -629,6 +631,8 @@ The city will not produce anything. = Miasto niczego nie produkuje Worked by [cityName] = # Requires translation! Lock = + # Requires translation! +Unlock = # Technology UI @@ -1103,7 +1107,8 @@ Notre Dame = Notre Dame Armory = Zbrojownia -Must be next to mountain = Musi być przy górze + # Requires translation! +Must be next to [terrain] = Observatory = Obserwatorium Opera House = Opera @@ -1206,7 +1211,6 @@ Medical Lab = Laboratorium medyczne Nuclear Plant = Elektrownia atomowa -Must be next to desert = Musi być obok pustyni Solar Plant = Elektrownia słoneczna 'Those who lose dreaming are lost.' - Australian Aboriginal saying = 'Ci, którzy zgubią marzenia, sami są zgubieni.' - przysłowie Aborygenów diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index d050d5eeda..ecda9a508e 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -94,6 +94,8 @@ You declared war on us! = Você declarou guerra contra nós! Your warmongering ways are unacceptable to us. = Seus costumes de guerra são inaceitáveis para nós. You have captured our cities! = Você capturou nossas(nossa) cidades(cidade)! We applaud your liberation of our conquered cities! = Nós apreciamos sua libertação de nossas cidades conquistadas! + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = Anos de paz fortaleceram nossas relações. Our mutual military struggle brings us closer together. = Nossas lutas mutuas nos fazem mais próximos. We have signed a public declaration of friendship = Assinamos uma declaração pública de amizade @@ -247,10 +249,10 @@ Great Andean Road = Grande Estrada Andina +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = +1 Movimento para todas unidades embarcadas, as unidades pagam apenas 1 ponto de movimento para embarcar e desembarcar. Unidades corpo a corpo não pagam custo de movimento para pilhar. Viking Fury = Fúria Viking - # Requires translation! -Sacrificial Captives = # Requires translation! Gain Culture for the empire from each enemy unit killed = + # Requires translation! +Sacrificial Captives = # New game screen @@ -635,6 +637,8 @@ The city will not produce anything. = A cidade não vai produzir nada. Worked by [cityName] = # Requires translation! Lock = + # Requires translation! +Unlock = # Technology UI @@ -1163,7 +1167,8 @@ Notre Dame = Notre Dame Armory = Arsenal -Must be next to mountain = Necessário que esteja próximo a montanha + # Requires translation! +Must be next to [terrain] = Observatory = Observatório Opera House = Casa de Ópera @@ -1269,7 +1274,6 @@ Medical Lab = Laboratório médico Nuclear Plant = Planta Nuclear -Must be next to desert = Nescessário que esteja proximo ao deserto Solar Plant = Planta Solar 'Those who lose dreaming are lost.' - Australian Aboriginal saying = 'Aqueles que perderam seus sonhos estão perdidos.' - Ditado abrorigéne Australiano diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 53c73f4c24..f39bebf7b9 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -94,6 +94,8 @@ You declared war on us! = Ne-ai declarat război! Your warmongering ways are unacceptable to us. = Căile tale ațâțătoare la război sunt inacceptabile pentru noi. You have captured our cities! = Ne-ai capturat orașele! We applaud your liberation of our conquered cities! = Aplaudăm liberarea orașelor noastre cucerite! + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = Anii de pace ne-au întărit relațiile. Our mutual military struggle brings us closer together. = Efortul nostru militar comun ne apropie. We have signed a public declaration of friendship = Am semnat o declarație publică de prietenie! @@ -247,10 +249,10 @@ Great Andean Road = Marele Drum Andin +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = +1 Mișcare la toate unitățile îmbarcate, unitățile plătesc doar 1 punct de mișcare pentru a se îmbarca și debarca. Unitățile de contact nu plătesc nici un cost de mișcare pentru a prăda. Viking Fury = Furia Vikingă - # Requires translation! -Sacrificial Captives = # Requires translation! Gain Culture for the empire from each enemy unit killed = + # Requires translation! +Sacrificial Captives = # New game screen @@ -631,6 +633,8 @@ The city will not produce anything. = Acest oraș nu va produce nimic Worked by [cityName] = # Requires translation! Lock = + # Requires translation! +Unlock = # Technology UI @@ -1174,7 +1178,8 @@ Notre Dame = Notre Dame Armory = Depozit de arme -Must be next to mountain = Trebuie să fie lângă munte + # Requires translation! +Must be next to [terrain] = Observatory = Observator Opera House = Operă @@ -1287,7 +1292,6 @@ Medical Lab = Laborator medical Nuclear Plant = Centrală nucleară -Must be next to desert = Trebuie să fie lângă deșert Solar Plant = Centrală solară 'Those who lose dreaming are lost.' - Australian Aboriginal saying = 'Cei ce pierd visele sunt pierduți' - Zicală aborigenă australiană diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 7defe17ef0..c176adbf2b 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -94,6 +94,8 @@ You declared war on us! = Вы объявляли нам войну! Your warmongering ways are unacceptable to us. = Ваша воинственность для нас неприемлема. You have captured our cities! = Вы захватили наши города! We applaud your liberation of our conquered cities! = Мы благодарны вам за освобождение наших захваченных городов! + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = Годы мира укрепили наши отношения Our mutual military struggle brings us closer together. = Наши совместные боевые действия сблизили нас We have signed a public declaration of friendship = Мы подписали публичную декларацию дружбы @@ -246,8 +248,8 @@ Great Andean Road = Дороги инков +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = +1 очко передвижения всем юнитам на борту, посадка на борт и высадка на берег тратят 1 очко передвижения. Юниты ближнего боя не тратят очки передвижения на грабеж. Viking Fury = Ярость викинга -Sacrificial Captives = Жертвоприношение пленных Gain Culture for the empire from each enemy unit killed = За каждого убитого вражеского юнита империя получает очки культуры +Sacrificial Captives = Жертвоприношение пленных # New game screen @@ -622,6 +624,8 @@ Convert production to science at a rate of [rate] to 1 = Обмен произв The city will not produce anything. = Город ничего не будет производить. Worked by [cityName] = Обрабатывается в г. [cityName] Lock = Блокировать + # Requires translation! +Unlock = # Technology UI @@ -1070,7 +1074,8 @@ Notre Dame = Нотр-Дам Armory = Оружейная -Must be next to mountain = Рядом с центром города должна быть гора + # Requires translation! +Must be next to [terrain] = Observatory = Обсерватория Opera House = Оперный театр @@ -1173,7 +1178,6 @@ Medical Lab = Медицинская лаборатория Nuclear Plant = АЭС -Must be next to desert = Город должен находиться рядом с пустыней Solar Plant = Солнечные электростанции 'Those who lose dreaming are lost.' - Australian Aboriginal saying = 'У кого погибли мечты, тот и сам погиб.' - пословица австралийских аборигенов diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index a29fa1b0e1..9fd315b1f1 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -94,6 +94,8 @@ You declared war on us! = 不知死活的蠢货！你竟敢向我们宣战！ Your warmongering ways are unacceptable to us. = 你的穷兵黩武行径是我们无法容忍的！ You have captured our cities! = 多行不义必自毙！你竟敢占领我们的城市！ We applaud your liberation of our conquered cities! = 你解放我们被占领城市的行为让我们欢呼雀跃！ + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = 多年的和平时光让我们更加珍视彼此的关系。 Our mutual military struggle brings us closer together. = 并肩对抗共同敌人的战斗拉近了彼此的距离。 We have signed a public declaration of friendship = 我们签署了一份公开的友谊宣言！ @@ -246,8 +248,8 @@ Great Andean Road = 山地路网 +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = 海运单位+1移动力且在登陆时只消耗1移动力，近战单位在劫掠时不消耗移动力 Viking Fury = 维京狂暴 -Sacrificial Captives = 人牲献祭 Gain Culture for the empire from each enemy unit killed = 消灭敌方单位可获得文化奖励 +Sacrificial Captives = 人牲献祭 # New game screen @@ -623,6 +625,8 @@ The city will not produce anything. = 城市将不会建造/组建任何项目 Worked by [cityName] = 被[cityName]开发 # Requires translation! Lock = + # Requires translation! +Unlock = # Technology UI @@ -1074,7 +1078,8 @@ Notre Dame = 巴黎圣母院 Armory = 军械所 -Must be next to mountain = 城市必须紧邻山脉 + # Requires translation! +Must be next to [terrain] = Observatory = 天文台 Opera House = 歌剧院 @@ -1177,7 +1182,6 @@ Medical Lab = 医学实验室 Nuclear Plant = 核电站 -Must be next to desert = 城市必须紧邻沙漠 Solar Plant = 太阳能电站 'Those who lose dreaming are lost.' - Australian Aboriginal saying = “没有梦想的人，人生也是迷茫的。”——澳大利亚土著谚语 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index e10e6c80f7..1a701ddc6d 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -94,6 +94,8 @@ You declared war on us! = ¡Nos has declarado la guerra! Your warmongering ways are unacceptable to us. = ¡Tus tendencias bélicas son inadmisibles! You have captured our cities! = ¡Has capturado nuestras ciudades! We applaud your liberation of our conquered cities! = ¡Aplaudimos que hayas liberado nuestras ciudades conquistadas! + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = Años de paz han fortalecido nuestras relaciones. Our mutual military struggle brings us closer together. = Colaborar en nuestro conflicto bélico nos ha unido. We have signed a public declaration of friendship = Hemos firmado una declaración pública de amistad @@ -247,8 +249,8 @@ Great Andean Road = Gran Ruta de los Andes +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = +1 de movimiento para todas las unidades embarcadas, las unidades solo pagan 1 punto de movimiento por embarcar y desembarcar. Las unidades cuerpo a cuerpo no pagan puntos de movimiento por saquear. Viking Fury = Furia Vikinga -Sacrificial Captives = Sacrificio de cautivos Gain Culture for the empire from each enemy unit killed = Obtienes cultura por cada unidad enemiga muerta. +Sacrificial Captives = Sacrificio de cautivos # New game screen @@ -625,6 +627,8 @@ The city will not produce anything. = La ciudad no producirá nada. Worked by [cityName] = Trabajado por [cityName] # Requires translation! Lock = + # Requires translation! +Unlock = # Technology UI @@ -1076,7 +1080,8 @@ Notre Dame = Notre Dame Armory = Armería -Must be next to mountain = Debe estar próximo a una montaña + # Requires translation! +Must be next to [terrain] = Observatory = Observatorio Opera House = Teatro de la Ópera @@ -1179,7 +1184,6 @@ Medical Lab = Laboratorio médico Nuclear Plant = Central nuclear -Must be next to desert = Debe estar próximo a un desierto Solar Plant = Planta Solar 'Those who lose dreaming are lost.' - Australian Aboriginal saying = 'Los que pierden sus sueños están perdidos.' - Proverbio de los aborígenes australianos diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 80523a7218..887bf17ec5 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -94,6 +94,8 @@ You declared war on us! = 不知死活的蠢貨！你竟敢向我們宣戰！ Your warmongering ways are unacceptable to us. = 你的窮兵黷武行竟是我們無法容忍的！ You have captured our cities! = 多行不義必自斃！你竟敢佔領我們的城市！ We applaud your liberation of our conquered cities! = 你解放我們被佔領城市的行為讓我們歡呼雀躍！ + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = 多年的和平時光讓我們更加珍視彼此的關係。 Our mutual military struggle brings us closer together. = 並肩對抗共同敵人的戰鬥拉近了我們彼此的距離。 We have signed a public declaration of friendship = 我們之間簽署了一份公開的友誼宣言！ @@ -247,8 +249,8 @@ Great Andean Road = 山地路網 +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = 海運單位+1移動力且在登陸時只消耗1移動力，近戰單位在劫掠時不消耗移動力 Viking Fury = 維京狂暴 -Sacrificial Captives = 人牲獻祭 Gain Culture for the empire from each enemy unit killed = 消滅敵方單位可獲得文化獎勵 +Sacrificial Captives = 人牲獻祭 # New game screen @@ -625,6 +627,8 @@ The city will not produce anything. = 城市將不會建造/訓練任何項目 Worked by [cityName] = 被[cityName]開發 # Requires translation! Lock = + # Requires translation! +Unlock = # Technology UI @@ -1095,7 +1099,8 @@ Notre Dame = 巴黎聖母院 Armory = 軍械所 -Must be next to mountain = 城市必須緊鄰山脈 + # Requires translation! +Must be next to [terrain] = Observatory = 天文台 Opera House = 歌劇院 @@ -1198,7 +1203,6 @@ Medical Lab = 醫學實驗室 Nuclear Plant = 核電廠 -Must be next to desert = 城市必須緊鄰沙漠 Solar Plant = 太陽能電廠 'Those who lose dreaming are lost.' - Australian Aboriginal saying = “沒有夢想的人，人生也是迷茫的。”——澳大利亞土著諺語 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index b35e5645b8..a8fde6b521 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -94,6 +94,8 @@ You declared war on us! = Bize savaş açtın! Your warmongering ways are unacceptable to us. = Savaş yanlısı davranışlarınız bizim için kabul edilemez. You have captured our cities! = Şehirlerimizi ele geçirdiniz We applaud your liberation of our conquered cities! = Bizim fethedilmiş şehirlerimizi kurtarışınızı alkışlıyoruz! + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = Yıllarca süren barış ilişkilerimizi güçlendirdi. Our mutual military struggle brings us closer together. = Karşılıklı askeri mücadelemiz bizi bir araya getiriyor. We have signed a public declaration of friendship = Herkese açık bir dostluk beyanı imzaladık @@ -250,10 +252,10 @@ Great Andean Road = Büyük Andean Yolu +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = Viking Fury = Viking Hırsı - # Requires translation! -Sacrificial Captives = # Requires translation! Gain Culture for the empire from each enemy unit killed = + # Requires translation! +Sacrificial Captives = # New game screen @@ -646,6 +648,8 @@ The city will not produce anything. = Şehir hiçbir şey üretmeyecek Worked by [cityName] = # Requires translation! Lock = + # Requires translation! +Unlock = # Technology UI @@ -1126,7 +1130,8 @@ Notre Dame = Notre Dame Armory = Cephanelik -Must be next to mountain = Dağın yanında olmalı + # Requires translation! +Must be next to [terrain] = Observatory = Gözlemevi Opera House = Opera Binası @@ -1230,7 +1235,6 @@ Medical Lab = Tıbbi Laboratuvar Nuclear Plant = Nükleer Santral -Must be next to desert = Çölün yanında olmalı Solar Plant = Güneş Paneli 'Those who lose dreaming are lost.' - Australian Aboriginal saying = 'Rüyalarını kaybedenler kaybolur.' - Avustralya Aborijin atasözü diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 3844615291..800f5686d4 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -94,6 +94,8 @@ You declared war on us! = Ви оголосили нам війну! Your warmongering ways are unacceptable to us. = Ваші войовничі способи неприйнятні для нас. You have captured our cities! = Ви захопили наші міста! We applaud your liberation of our conquered cities! = Ми плескаємо в долоні вашому звільненню наших завойованих міст! + # Requires translation! +We applaud your liberation of conquered cities! = Years of peace have strengthened our relations. = Роки миру зміцнили наші відносини. Our mutual military struggle brings us closer together. = Наша взаємна військова боротьба зближує нас. We have signed a public declaration of friendship = Ми підписали публічну декларацію про дружбу @@ -246,8 +248,8 @@ Great Andean Road = Великий Шлях Андів +1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage. = +1 рух для всіх підрозділів на борту. Підрозділи витрачають лише 1 рух для загрузки та вигрузки на борт. Ближньобійні підрозділи руйнують покращення, не витрачаючи очків руху. Viking Fury = Лють вікінгів -Sacrificial Captives = Жертвоприношення Gain Culture for the empire from each enemy unit killed = За кожний убитий підрозділ противника ви отримуватимете очки культури +Sacrificial Captives = Жертвоприношення # New game screen @@ -623,6 +625,8 @@ The city will not produce anything. = Місто не буде нічого ви Worked by [cityName] = Працівник міста [cityName] # Requires translation! Lock = + # Requires translation! +Unlock = # Technology UI @@ -1074,7 +1078,8 @@ Notre Dame = Собор Паризької Богоматері Armory = Зброярня -Must be next to mountain = Має бути біля гори + # Requires translation! +Must be next to [terrain] = Observatory = Обсерваторія Opera House = Оперний театр @@ -1177,7 +1182,6 @@ Medical Lab = Медична лабораторія Nuclear Plant = Ядерна електростанція -Must be next to desert = Має бути біля пустелі Solar Plant = Сонячна електростанція 'Those who lose dreaming are lost.' - Australian Aboriginal saying = «Хто не мріє, той не живе» — приказка австралійських аборигенів diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index c74f675331..2131d2c94a 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -1,20 +1,20 @@ Brazilian_Portuguese = 72 Traditional_Chinese = 63 -Italian = 100 +Italian = 99 Polish = 96 -Russian = 100 +Russian = 99 Lithuanian = 26 Romanian = 46 -Korean = 100 -Simplified_Chinese = 94 +Korean = 99 +Simplified_Chinese = 93 German = 99 -Japanese = 100 +Japanese = 99 Turkish = 75 English = 1 Ukrainian = 99 French = 98 Portuguese = 52 -Indonesian = 100 +Indonesian = 99 Czech = 62 Spanish = 99 Malay = 6 diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt index e64df3c084..27c81c0708 100644 --- a/core/src/com/unciv/models/ruleset/Building.kt +++ b/core/src/com/unciv/models/ruleset/Building.kt @@ -7,6 +7,8 @@ import com.unciv.logic.civilization.CivilizationInfo import com.unciv.models.stats.NamedStats import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats +import com.unciv.models.translations.equalsPlaceholderText +import com.unciv.models.translations.getPlaceholderParameters import com.unciv.models.translations.tr import kotlin.math.pow @@ -243,13 +245,11 @@ class Building : NamedStats(), IConstruction{ if (uniques.contains("Unbuildable")) return "Unbuildable" val cityCenter = construction.cityInfo.getCenterTile() - if ("Must be next to desert" in uniques - && !cityCenter.getTilesInDistance(1).any { it.baseTerrain == Constants.desert }) - return "Must be next to desert" - if ("Must be next to mountain" in uniques - && !cityCenter.neighbors.any { it.baseTerrain == Constants.mountain }) - return "Must be next to mountain" + for(unique in uniques) + if(unique.equalsPlaceholderText("Must be next to []") + && !cityCenter.getTilesInDistance(1).any { it.baseTerrain == unique.getPlaceholderParameters()[0] }) + return unique if ("Must be next to river" in uniques && !cityCenter.isAdjacentToRiver()) return "Must be next to river" diff --git a/core/src/com/unciv/models/translations/TranslationFileWriter.kt b/core/src/com/unciv/models/translations/TranslationFileWriter.kt index a135d07694..1dc1fe018e 100644 --- a/core/src/com/unciv/models/translations/TranslationFileWriter.kt +++ b/core/src/com/unciv/models/translations/TranslationFileWriter.kt @@ -196,8 +196,17 @@ object TranslationFileWriter { val parameters = string.getPlaceholderParameters() var stringToTranslate = string - if (parameters.size == 1 && parameters[0].toIntOrNull() != null) - stringToTranslate = string.replace(parameters[0], "amount") + if (parameters.any()){ + for(parameter in parameters) { + val parameterName = when{ + parameter.toIntOrNull() != null -> "amount" + RulesetCache.getBaseRuleset().terrains.containsKey(parameter) -> "terrain" + else -> "param" + } + stringToTranslate = string.replace(parameters[0], parameterName) + } + } + else { // substitute the regex for "Bonus/Penalty vs ..." val match = Regex(BattleDamage.BONUS_VS_UNIT_TYPE).matchEntire(string)