From 8dde23aa38cdee724a7f043d9bd3f774c0ec17d1 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 21 Oct 2020 19:01:07 +0300 Subject: [PATCH] 3.11.6 --- .../Brazilian_Portuguese.properties | 6 +++--- .../assets/jsons/translations/Czech.properties | 7 ++++--- .../assets/jsons/translations/Dutch.properties | 8 +++----- .../jsons/translations/English.properties | 8 +++----- .../jsons/translations/Finnish.properties | 8 +++----- .../jsons/translations/French.properties | 7 +++---- .../jsons/translations/German.properties | 7 ++++--- .../jsons/translations/Hungarian.properties | 8 +++----- .../jsons/translations/Indonesian.properties | 16 ++++------------ .../jsons/translations/Italian.properties | 7 ++++--- .../jsons/translations/Japanese.properties | 7 ++++--- .../jsons/translations/Korean.properties | 7 +++---- .../jsons/translations/Lithuanian.properties | 8 +++----- .../assets/jsons/translations/Malay.properties | 8 +++----- .../Persian_(Pinglish-DIN).properties | 8 +++----- .../Persian_(Pinglish-UN).properties | 15 +++------------ .../jsons/translations/Polish.properties | 7 +++---- .../jsons/translations/Portuguese.properties | 7 +++---- .../jsons/translations/Romanian.properties | 7 +++---- .../jsons/translations/Russian.properties | 7 ++++--- .../translations/Simplified_Chinese.properties | 7 ++++--- .../jsons/translations/Spanish.properties | 7 ++++--- .../Traditional_Chinese.properties | 6 +++--- .../jsons/translations/Turkish.properties | 7 +++---- .../jsons/translations/Ukrainian.properties | 7 ++++--- .../completionPercentages.properties | 8 ++++---- buildSrc/src/main/kotlin/BuildConfig.kt | 4 ++-- changelog.md | 18 ++++++++++++++++++ .../ui/overviewscreen/EmpireOverviewScreen.kt | 14 +++++++------- 29 files changed, 115 insertions(+), 126 deletions(-) diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index d323baacbd..5c3f7fcfe7 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -854,6 +854,8 @@ Civilian = Cidadão land units = Unidades terrestres water units = Unidades marítimas air units = Unidades aéreas + # Requires translation! +Barbarian = WaterCivilian = Cidadão marítimo Melee = Corpo a corpo WaterMelee = Corpo a corpo marítimo @@ -2944,7 +2946,7 @@ Welcome, friend. = # Requires translation! Sacrificial Captives = # Requires translation! -Gains culture from each enemy unit killed = +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = # Requires translation! Tenochtitlan = # Requires translation! @@ -3307,10 +3309,8 @@ Military Caste = Casta Militar [stats] in all cities with a garrison = [stats] em todas as cidades com unidades protetoras Professional Army = Exército Profissional Honor Complete = Honra Completa -Gain gold for each unit killed = Ganhe ouro por cada unidade morta Honor = Honra +25% bonus vs Barbarians = +25% de bônus contra Bárbaros -Gain Culture when you kill a barbarian unit = Ganhe Cultura ao matar uma unidade bárbara Notified of new Barbarian encampments = Notificado de novos acampamentos bárbaros Organized Religion = Religião Organizada diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 5c029561ba..cb835ab8bf 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -860,6 +860,8 @@ Civilian = Civilista land units = Pozemní jednotky water units = Námořní jednotky air units = Vzdušné jednotky + # Requires translation! +Barbarian = WaterCivilian = Vodní civilista Melee = Boj zblízka WaterMelee = Námořní boj zblízka @@ -2984,7 +2986,8 @@ What do I see before me? Another beating heart for my sacrificial fire. = Co vid Accept this agreement or suffer the consequences. = Přijměte tuto dohodu nebo ponesete následky. Welcome, friend. = Vítej, příteli. Sacrificial Captives = Obětování zajatců -Gains culture from each enemy unit killed = Získ kultury za každou zabitou nepřátelskou jednotku + # Requires translation! +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = Tenochtitlan = Tenochtitlán Teotihuacan = Teotihuacán # Requires translation! @@ -3445,10 +3448,8 @@ Military Caste = Vojenská třída [stats] in all cities with a garrison = [stats] v každém městě s vojenskou posádkou Professional Army = Profesionální armáda Honor Complete = Kompletní Čest -Gain gold for each unit killed = Zlato za každou zabitou jednotku Honor = Čest +25% bonus vs Barbarians = +25% bonus proti Barbarům -Gain Culture when you kill a barbarian unit = Kulturní body za každého zabitého Barbara Notified of new Barbarian encampments = Upozornění na nový Barbarský tábor Organized Religion = Organizovaná víra diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 893c83773e..922c44e43c 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -1224,6 +1224,8 @@ water units = # Requires translation! air units = # Requires translation! +Barbarian = + # Requires translation! WaterCivilian = Melee = Melee # Requires translation! @@ -4089,7 +4091,7 @@ Welcome, friend. = # Requires translation! Sacrificial Captives = # Requires translation! -Gains culture from each enemy unit killed = +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = # Requires translation! Tenochtitlan = # Requires translation! @@ -4635,14 +4637,10 @@ Professional Army = # Requires translation! Honor Complete = # Requires translation! -Gain gold for each unit killed = - # Requires translation! Honor = # Requires translation! +25% bonus vs Barbarians = # Requires translation! -Gain Culture when you kill a barbarian unit = - # Requires translation! Notified of new Barbarian encampments = # Requires translation! diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 0d72de7df9..c041ad693e 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -1595,6 +1595,8 @@ land units = water units = # Requires translation! air units = + # Requires translation! +Barbarian = WaterCivilian = Water Civilian # Requires translation! Melee = @@ -4483,7 +4485,7 @@ Welcome, friend. = # Requires translation! Sacrificial Captives = # Requires translation! -Gains culture from each enemy unit killed = +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = # Requires translation! Tenochtitlan = # Requires translation! @@ -5030,14 +5032,10 @@ Professional Army = # Requires translation! Honor Complete = # Requires translation! -Gain gold for each unit killed = - # Requires translation! Honor = # Requires translation! +25% bonus vs Barbarians = # Requires translation! -Gain Culture when you kill a barbarian unit = - # Requires translation! Notified of new Barbarian encampments = # Requires translation! diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index b3de544f4d..9c4295ae49 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -906,6 +906,8 @@ Civilian = Siviilit land units = maayksiköt water units = laivaston yksiköt air units = lentoyksiköt + # Requires translation! +Barbarian = WaterCivilian = Siviililaivat Melee = Lähitaistelu WaterMelee = Vesilähitaistelu @@ -2834,7 +2836,7 @@ Welcome, friend. = # Requires translation! Sacrificial Captives = # Requires translation! -Gains culture from each enemy unit killed = +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = # Requires translation! Tenochtitlan = # Requires translation! @@ -3354,14 +3356,10 @@ Military Caste = Sotilaskasti # Requires translation! Professional Army = Honor Complete = Kunnia valmis - # Requires translation! -Gain gold for each unit killed = Honor = Kunnia # Requires translation! +25% bonus vs Barbarians = # Requires translation! -Gain Culture when you kill a barbarian unit = - # Requires translation! Notified of new Barbarian encampments = Organized Religion = Järjestäytynyt Uskonto diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 9b011360e9..c0f9f64ae8 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -913,6 +913,8 @@ Civilian = Civil land units = unités terrestres water units = unités maritimes air units = unités aériennes + # Requires translation! +Barbarian = WaterCivilian = Civil marin Melee = Mêlée WaterMelee = Navire de combat rapproché @@ -2519,7 +2521,7 @@ Welcome, friend. = # Requires translation! Sacrificial Captives = # Requires translation! -Gains culture from each enemy unit killed = +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = # Requires translation! Tenochtitlan = # Requires translation! @@ -2864,13 +2866,10 @@ Military Caste = Caste militaire [stats] in all cities with a garrison = Professional Army = Armée de métier Honor Complete = Honneur complété -Gain gold for each unit killed = Gain d'or à chaque unité tuée Honor = Honneur # Requires translation! +25% bonus vs Barbarians = # Requires translation! -Gain Culture when you kill a barbarian unit = - # Requires translation! Notified of new Barbarian encampments = Organized Religion = Religion organisée diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 1f3d07664b..8c187ccf94 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -854,6 +854,8 @@ Civilian = Zivilist land units = Landeinheiten water units = Wassereinheiten air units = Lufteinheiten + # Requires translation! +Barbarian = WaterCivilian = Wasser-Zivilist Melee = Nahkampf WaterMelee = Wassernahkampf @@ -2381,7 +2383,8 @@ What do I see before me? Another beating heart for my sacrificial fire. = Was se Accept this agreement or suffer the consequences. = Akzeptiert diese Vereinbarung oder erleidet die Konsequenzen. Welcome, friend. = Willkommen, Freund. Sacrificial Captives = Geopferte Gefangene -Gains culture from each enemy unit killed = Gewinnt Kultur für jede getötete feindliche Einheit + # Requires translation! +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = Tenochtitlan = Tenochtitlan Teotihuacan = Teotihuacan Tlatelolco = Tlatelolco @@ -2673,10 +2676,8 @@ Military Caste = Militarisierte Burg [stats] in all cities with a garrison = [stats] in allen Städten mit einer Garnison Professional Army = Berufsarmee Honor Complete = Ehre vollständig -Gain gold for each unit killed = Jede zerstörte Einheit gibt Gold Honor = Ehre +25% bonus vs Barbarians = +25% Bonus gegen Barbaren -Gain Culture when you kill a barbarian unit = Erhalte Kultur, wenn eine barbarische Einheit getötet wird Notified of new Barbarian encampments = Benachrichtigungen über neue Barbarenlager Organized Religion = Organisierte Religion diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 208b05d470..9ba50bed4d 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -854,6 +854,8 @@ Civilian = Polgár land units = földi egységek water units = vízi egységek air units = légi egységek + # Requires translation! +Barbarian = WaterCivilian = Vízi polgár Melee = Közelharci WaterMelee = Vízi közelharci @@ -2860,7 +2862,7 @@ Welcome, friend. = # Requires translation! Sacrificial Captives = # Requires translation! -Gains culture from each enemy unit killed = +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = Tenochtitlan = Tenocstitlan Teotihuacan = Teotihuacan Tlatelolco = Tlatelolco @@ -3269,14 +3271,10 @@ Military Caste = Katonai kaszt [stats] in all cities with a garrison = Professional Army = Hivatásos hadsereg Honor Complete = Becsület befejezve - # Requires translation! -Gain gold for each unit killed = Honor = Becsület # Requires translation! +25% bonus vs Barbarians = # Requires translation! -Gain Culture when you kill a barbarian unit = - # Requires translation! Notified of new Barbarian encampments = Organized Religion = Szervezett vallás diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 5f551f20e3..59a83a3f06 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -138,13 +138,9 @@ Maritime = Maritim Mercantile = Pedagang Militaristic = Militeristik Type: = Jenis: - # Requires translation! Friendly = Bersahabat - # Requires translation! Hostile = Bermusuhan - # Requires translation! Irrational = Irasional - # Requires translation! Personality: = Sifat Influence: = Pengaruh: Reach 30 for friendship. = Capai 30 untuk persahabatan. @@ -603,7 +599,6 @@ Captured! = Tertangkap! defence vs ranged = pertahanan vs unit jarak jauh [percentage] to unit defence = [percentage] untuk pertahanan unit Attacker Bonus = Bonus Penyerang - # Requires translation! Defender Bonus = Bonus Bertahan Landing = Mendarat Flanking = Mengapit @@ -632,7 +627,6 @@ Occupied City = Kota yang Diduduki Buildings = Bangunan # For the "when constructing [military units]" translation - # Requires translation! military = militer military units = unit militer melee units = unit jarak dekat @@ -854,6 +848,8 @@ Civilian = Penduduk land units = unit darat water units = unit laut air units = unit udara + # Requires translation! +Barbarian = WaterCivilian = PendudukAir Melee = Gulat WaterMelee = GulatAir @@ -2381,7 +2377,8 @@ What do I see before me? Another beating heart for my sacrificial fire. = Apa ya Accept this agreement or suffer the consequences. = Terimalah persetujuan ini atau lihatlah akibatnya. Welcome, friend. = Selamat datang, teman. Sacrificial Captives = Tawanan Pengorbanan -Gains culture from each enemy unit killed = Menerima budaya untuk setiap unit musuh yang dibunuh + # Requires translation! +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = Tenochtitlan = Tenochtitlan Teotihuacan = Teotihuacan Tlatelolco = Tlatelolco @@ -2673,10 +2670,8 @@ Military Caste = Kasta Militer [stats] in all cities with a garrison = [stats] di semua kota dengan garnisun Professional Army = Prajurit Profesional Honor Complete = Kehormatan Lengkap -Gain gold for each unit killed = Mendapatkan emas untuk setiap unit yang berhasil dibunuh. Honor = Kehormatan +25% bonus vs Barbarians = +25% bonus vs Orang Barbar -Gain Culture when you kill a barbarian unit = Menerima Budaya ketika membunuh unit orang barbar Notified of new Barbarian encampments = Diberi tahu ketika muncul perkemahan orang Barbar baru Organized Religion = Agama Terorganisasi @@ -2738,7 +2733,6 @@ Fascism = Fasisme Quantity of strategic resources produced by the empire increased by 100% = Jumlah sumber daya strategis yang dihasilkan oleh negera naik 100%. Police State = Negara Kepolisian Total War = Perang Total - # Requires translation! New [param] units start with [amount] Experience = Unit [param] baru dimulai dengan [amount] pengalaman Autocracy Complete = Otokrasi Lengkap +20% attack bonus to all Military Units for 30 turns = +20% bonus serangan untuk semua unit militer selama 30 giliran @@ -3238,7 +3232,6 @@ Coastal Raider II = Penjarah Pesisir II Coastal Raider III = Penjarah Pesisir III Wolfpack I = Kawanan Serigala I - # Requires translation! +[amount]% Strength when attacking = +[amount]% Kekuatan saat menyerang Wolfpack II = Kawanan Serigala II @@ -3246,7 +3239,6 @@ Wolfpack II = Kawanan Serigala II Wolfpack III = Kawanan Serigala III Armor Plating I = Pelapisan Baja I - # Requires translation! +[amount]% Strength when defending = +[amount]% Kekuatan saat bertahan Armor Plating II = Pelapisan Baja II diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 31cfaa04d8..41134c51ce 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -848,6 +848,8 @@ Civilian = unità civile land units = unità terrestri water units = unità anfibie air units = unità aeree + # Requires translation! +Barbarian = WaterCivilian = unità marittima civile Melee = unità da mischia WaterMelee = marittima da mischia @@ -2375,7 +2377,8 @@ What do I see before me? Another beating heart for my sacrificial fire. = Alt! C Accept this agreement or suffer the consequences. = Accetta questo scambio, o pagane le conseguenze. Welcome, friend. = Benvenuto, amico. Sacrificial Captives = Vittime sacrificali -Gains culture from each enemy unit killed = Ottieni cultura ad ogni unità nemica uccisa + # Requires translation! +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = Tenochtitlan = Tenochtitlan Teotihuacan = Teotihuacan Tlatelolco = Tlatelolco @@ -2667,10 +2670,8 @@ Military Caste = Casta Militare [stats] in all cities with a garrison = [stats] in tutte le Città con una guarnigione Professional Army = Esercito professionale Honor Complete = Onore Completo -Gain gold for each unit killed = Ottieni Oro ogni volta che elimini un'unità nemica Honor = Onore +25% bonus vs Barbarians = +25% Forza contro i Barbari -Gain Culture when you kill a barbarian unit = Ottieni cultura quando uccidi un'unità barbarica Notified of new Barbarian encampments = Sarai notificato dei nuovi accampamenti barbari Organized Religion = Religione Organizzata diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 13d1fe7dbf..f18ca170bf 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -848,6 +848,8 @@ Civilian = 市民ユニット land units = 陸上ユニット water units = 海上ユニット air units = 航空ユニット + # Requires translation! +Barbarian = WaterCivilian = 民間船 Melee = 戦闘ユニット WaterMelee = 海軍ユニット @@ -2375,7 +2377,8 @@ What do I see before me? Another beating heart for my sacrificial fire. = 我の Accept this agreement or suffer the consequences. = この提案をの、後々に苦しむぞ Welcome, friend. = ようこそ、我が友よ Sacrificial Captives = 捕虜の生贄 -Gains culture from each enemy unit killed = 敵ユニットを倒すごとに文化力を得る + # Requires translation! +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = Tenochtitlan = テノチティタラン Teotihuacan = テオティワカン Tlatelolco = トラテロルコ @@ -2667,10 +2670,8 @@ Military Caste = 戦士階級 [stats] in all cities with a garrison = 駐留兵のあるすべての都市:[stats] Professional Army = 軍隊の常備 Honor Complete = 名誉コンプリート -Gain gold for each unit killed = 敵ユニットを倒すたびにゴールドが手に入る。 Honor = 名誉 +25% bonus vs Barbarians = 対蛮族のボーナス+25% -Gain Culture when you kill a barbarian unit = 蛮族を倒すたびに文化力を得る Notified of new Barbarian encampments = 新たな蛮族の野営地が出現すると通知 Organized Religion = 宗教の組織化 diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index b3dfc0fc72..c327fcf396 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -903,6 +903,8 @@ Civilian = 민간 유닛 land units = 지상 유닛 water units = 해상 유닛 air units = 공중 유닛 + # Requires translation! +Barbarian = WaterCivilian = 해상 민간 유닛 Melee = 근접 유닛 WaterMelee = 해상 근접 유닛 @@ -2480,7 +2482,7 @@ Welcome, friend. = # Requires translation! Sacrificial Captives = # Requires translation! -Gains culture from each enemy unit killed = +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = # Requires translation! Tenochtitlan = # Requires translation! @@ -2810,13 +2812,10 @@ Military Caste = 군사 신분제 [stats] in all cities with a garrison = 유닛이 주둔한 도시에 [stats] Professional Army = 상비군 Honor Complete = 명예 정책 완성 -Gain gold for each unit killed = 처치한 적 유닛의 전투력만큼의 금 획득 Honor = 명예 # Requires translation! +25% bonus vs Barbarians = # Requires translation! -Gain Culture when you kill a barbarian unit = - # Requires translation! Notified of new Barbarian encampments = Organized Religion = 종교 체제 diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index d6b4a046d7..a64b9eb4a8 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -949,6 +949,8 @@ Civilian = Civilis land units = žemės vienetų water units = vandens vienetai air units = oro vienetai + # Requires translation! +Barbarian = WaterCivilian = WaterCivilian Melee = Melee WaterMelee = WaterMelee @@ -3778,7 +3780,7 @@ Welcome, friend. = # Requires translation! Sacrificial Captives = # Requires translation! -Gains culture from each enemy unit killed = +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = # Requires translation! Tenochtitlan = # Requires translation! @@ -4323,14 +4325,10 @@ Professional Army = # Requires translation! Honor Complete = # Requires translation! -Gain gold for each unit killed = - # Requires translation! Honor = # Requires translation! +25% bonus vs Barbarians = # Requires translation! -Gain Culture when you kill a barbarian unit = - # Requires translation! Notified of new Barbarian encampments = # Requires translation! diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 723b2a40de..660dae2cf9 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -1476,6 +1476,8 @@ water units = # Requires translation! air units = # Requires translation! +Barbarian = + # Requires translation! WaterCivilian = # Requires translation! Melee = @@ -4281,7 +4283,7 @@ Welcome, friend. = # Requires translation! Sacrificial Captives = # Requires translation! -Gains culture from each enemy unit killed = +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = # Requires translation! Tenochtitlan = # Requires translation! @@ -4818,14 +4820,10 @@ Professional Army = # Requires translation! Honor Complete = # Requires translation! -Gain gold for each unit killed = - # Requires translation! Honor = # Requires translation! +25% bonus vs Barbarians = # Requires translation! -Gain Culture when you kill a barbarian unit = - # Requires translation! Notified of new Barbarian encampments = # Requires translation! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index d5aaf03721..ed13d28bc5 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -910,6 +910,8 @@ Civilian = Šahrvand land units = Niroo hāye zamini water units = Niroo hāye daryāi air units = Niroo hāye havāi + # Requires translation! +Barbarian = WaterCivilian = Šahrvand Melee = Nazdik-bord WaterMelee = Nazdik-bord @@ -3709,7 +3711,7 @@ Welcome, friend. = # Requires translation! Sacrificial Captives = # Requires translation! -Gains culture from each enemy unit killed = +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = # Requires translation! Tenochtitlan = # Requires translation! @@ -4254,14 +4256,10 @@ Professional Army = # Requires translation! Honor Complete = # Requires translation! -Gain gold for each unit killed = - # Requires translation! Honor = # Requires translation! +25% bonus vs Barbarians = # Requires translation! -Gain Culture when you kill a barbarian unit = - # Requires translation! Notified of new Barbarian encampments = # Requires translation! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index 9e5082d34f..e6eb818895 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -27,7 +27,6 @@ Get [unitName] = Hydro Plant = Niroogaah e Aabi +1 population in each city = +1 jame’iat dar har shahr - # Requires translation! [buildingName] obsoleted = [buildingName] mansookh shode ast # Diplomacy,Trade,Nations @@ -41,9 +40,7 @@ Requires a [buildingName] in all cities = Niaaz daarad ke yek [buildingName] dar Requires a [buildingName] in this city = Niaaz daarad ke yek [buildingName] dar in shahr baashad Consumes 1 [resource] = 1 [resource] masraf mikonad Required tech: [requiredTech] = Teknoloji mored e niaaz: [requiredTech] - # Requires translation! Requires [PolicyOrNationalWonder] = Be [PolicyOrNationalWonder] niaaz ast - # Requires translation! Cannot be purchased = Nemitavaan kharidari kard Current construction = Saakht-o-saaz e dar haal e haazer @@ -78,7 +75,6 @@ We have encountered the City-State of [name]! = Maa be Shahrestaan e [name] bark Declare Friendship ([numberOfTurns] turns) = E’elaam doosti ([numberOfTurns] nobat) May our nations forever remain united! = Baashad ke dolat haaye maa baraaye hamishe mottahed bemaanand! Indeed! = Albate! - # Requires translation! Denounce [civName]? = Tamaddone [civName] raa dar jaame’e ye jahaani mahkoom mikonid? Denounce ([numberOfTurns] turns) = Dar jaame’e ye jahaani mahkoom kardan ([numberOfTurns] turns) We will remember this. = Maa inraa be yaad khaahim daasht. @@ -145,9 +141,7 @@ Maritime = Daryaai Mercantile = Baazargaani Militaristic = Nezaami Type: = noe’e: - # Requires translation! Friendly = Doost o baraadar - # Requires translation! Hostile = Motekhasem # Requires translation! Irrational = @@ -371,7 +365,6 @@ Move units with a single tap = Harekat daadan e niroo haa baa yek kilik Show tutorials = Neshaan daadan e raahnamaai Auto-assign city production = Entekhaab e khodkaar e saakht-o-saaz baraaye shahr Auto-build roads = saakht e khodkaar jaadde - # Requires translation! Automated workers replace improvements = Kaargaraan be soorat e khodkar behbood-saazi haa raa jaaigozin konand Show minimap = Neshaan daadan e minimap Show pixel units = Neshaan daadan e tasviri e niroo haa @@ -914,6 +907,8 @@ Civilian = Shahrvand land units = Niroo haaye zamini water units = Niroo haaye daryaai air units = Niroo haaye havaai + # Requires translation! +Barbarian = WaterCivilian = Shahrvand Melee = Nazdik-bord WaterMelee = Nazdik-bord @@ -3713,7 +3708,7 @@ Welcome, friend. = # Requires translation! Sacrificial Captives = # Requires translation! -Gains culture from each enemy unit killed = +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = # Requires translation! Tenochtitlan = # Requires translation! @@ -4258,14 +4253,10 @@ Professional Army = # Requires translation! Honor Complete = # Requires translation! -Gain gold for each unit killed = - # Requires translation! Honor = # Requires translation! +25% bonus vs Barbarians = # Requires translation! -Gain Culture when you kill a barbarian unit = - # Requires translation! Notified of new Barbarian encampments = # Requires translation! diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 787faa80f3..3d0c911234 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -901,6 +901,8 @@ Civilian = cywilna land units = jednostka lądowa water units = jednostka wodna air units = jednostka powietrzna + # Requires translation! +Barbarian = WaterCivilian = wodna cywilna Melee = Walcząca w zwarciu WaterMelee = Wodna walcząca w zwarciu @@ -2478,7 +2480,7 @@ Welcome, friend. = # Requires translation! Sacrificial Captives = # Requires translation! -Gains culture from each enemy unit killed = +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = # Requires translation! Tenochtitlan = # Requires translation! @@ -2808,13 +2810,10 @@ Military Caste = Kasta Wojskowa [stats] in all cities with a garrison = Każde miasto z garnizonem zyskuje [stats] Professional Army = Armia Zawodowa Honor Complete = Ukończony Honor -Gain gold for each unit killed = Zyskaj złoto za każdą pokonaną jednostkę Honor = Honor # Requires translation! +25% bonus vs Barbarians = # Requires translation! -Gain Culture when you kill a barbarian unit = - # Requires translation! Notified of new Barbarian encampments = Organized Religion = Hierarchia Kościelna diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 919bd719af..4739f489e4 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -986,6 +986,8 @@ Civilian = Cidadão land units = Unidades terrestres water units = Unidades marinhas air units = Unidades aéreas + # Requires translation! +Barbarian = WaterCivilian = Cidadão marítimo Melee = Corpo a corpo WaterMelee = Corpo a corpo marítimo @@ -3591,7 +3593,7 @@ Welcome, friend. = # Requires translation! Sacrificial Captives = # Requires translation! -Gains culture from each enemy unit killed = +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = # Requires translation! Tenochtitlan = # Requires translation! @@ -4109,13 +4111,10 @@ Military Caste = Casta Militar [stats] in all cities with a garrison = Professional Army = Exército Profissional Honor Complete = Honra Completa -Gain gold for each unit killed = Ganhe ouro por cada unidade morta Honor = Honra # Requires translation! +25% bonus vs Barbarians = # Requires translation! -Gain Culture when you kill a barbarian unit = - # Requires translation! Notified of new Barbarian encampments = Organized Religion = Religião Organizada diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 8dcd549055..6f04f53459 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -980,6 +980,8 @@ land units = unități terestre water units = unități acvatice air units = unități aeriene # Requires translation! +Barbarian = + # Requires translation! WaterCivilian = Melee = Luptător de contact # Requires translation! @@ -3651,7 +3653,7 @@ Welcome, friend. = # Requires translation! Sacrificial Captives = # Requires translation! -Gains culture from each enemy unit killed = +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = # Requires translation! Tenochtitlan = # Requires translation! @@ -4169,13 +4171,10 @@ Military Caste = Castă militară [stats] in all cities with a garrison = Professional Army = Armată profesionistă Honor Complete = Onoare realizată -Gain gold for each unit killed = Obține aur pentru fiecare unitate ucisă Honor = Onoare # Requires translation! +25% bonus vs Barbarians = # Requires translation! -Gain Culture when you kill a barbarian unit = - # Requires translation! Notified of new Barbarian encampments = Organized Religion = Religie organizată diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 821c7e4887..e033d00cc0 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -854,6 +854,8 @@ Civilian = Мирный житель land units = Наземные юниты water units = Морские юниты air units = Воздушные юниты + # Requires translation! +Barbarian = WaterCivilian = Мирный морской юнит Melee = Юнит ближнего боя WaterMelee = Морской юнит ближнего боя @@ -2382,7 +2384,8 @@ What do I see before me? Another beating heart for my sacrificial fire. = Что Accept this agreement or suffer the consequences. = Прими это соглашение или пожалеешь о последствиях. Welcome, friend. = Добро пожаловать, мой друг. Sacrificial Captives = Жертвоприношения -Gains culture from each enemy unit killed = Дает культуру за каждого убитого врага + # Requires translation! +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = Tenochtitlan = Теночтитлана Teotihuacan = Теотихуакан Tlatelolco = Тлателолко @@ -2674,10 +2677,8 @@ Military Caste = Военная каста [stats] in all cities with a garrison = [stats] в каждом городе с гарнизоном Professional Army = Профессиональная армия Honor Complete = Честь завершена -Gain gold for each unit killed = Получение золота за каждого убитого юнита Honor = Честь +25% bonus vs Barbarians = +25% в сражениях с варварами -Gain Culture when you kill a barbarian unit = За уничтожение варваров империя получает очки культуры Notified of new Barbarian encampments = Вы будете получать извещение всякий раз, когда варвары будут ставить новый лагерь Organized Religion = Организованная религия diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index e556026580..076ebaaaa8 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -854,6 +854,8 @@ Civilian = 平民单位 land units = 陆军单位 water units = 海军单位 air units = 空军单位 + # Requires translation! +Barbarian = WaterCivilian = 海上平民单位 Melee = 近战单位 WaterMelee = 海军近战单位 @@ -2386,7 +2388,8 @@ What do I see before me? Another beating heart for my sacrificial fire. = 将跳 Accept this agreement or suffer the consequences. = 接受这个协议否则后果自负。 Welcome, friend. = 欢迎您，我最尊贵的朋友！ Sacrificial Captives = 人牲献祭 -Gains culture from each enemy unit killed = 消灭敌方单位可获得文化奖励 + # Requires translation! +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = Tenochtitlan = 特诺奇提特兰 Teotihuacan = 特奥蒂瓦坎 Tlatelolco = 特拉特洛尔科 @@ -2678,10 +2681,8 @@ Military Caste = 军人阶层 [stats] in all cities with a garrison = 每座有驻军的城市[stats] Professional Army = 职业军队 Honor Complete = 完整的荣誉政策 -Gain gold for each unit killed = 杀死敌方单位时获得金钱 Honor = 荣誉政策 +25% bonus vs Barbarians = 所有军事单位对蛮族的战斗力+25% -Gain Culture when you kill a barbarian unit = 杀死蛮族单位时可获得文化奖励 Notified of new Barbarian encampments = 新的蛮族营地出现时将会通知 Organized Religion = 教会组织 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 90060e6906..6d1a286baf 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -859,6 +859,8 @@ Civilian = Civil land units = unidades terrestres water units = unidades navales air units = unidades aéreas + # Requires translation! +Barbarian = WaterCivilian = Naval civil Melee = Cuerpo a cuerpo WaterMelee = Naval cuerpo a cuerpo @@ -2391,7 +2393,8 @@ What do I see before me? Another beating heart for my sacrificial fire. = ¿Qué Accept this agreement or suffer the consequences. = Acepta este acuerdo o sufre las consecuencias. Welcome, friend. = Bienvenido, amigo. Sacrificial Captives = Cautivos de sacrificio -Gains culture from each enemy unit killed = Obtiene cultura de cada unidad enemiga muerta + # Requires translation! +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = Tenochtitlan = Tenochtitlan Teotihuacan = Teotihuacan Tlatelolco = Tlatelolco @@ -2683,10 +2686,8 @@ Military Caste = Casta militar [stats] in all cities with a garrison = [stats] en todas las ciudades con guarnición Professional Army = Ejercito profesional Honor Complete = Honor completado -Gain gold for each unit killed = Ganas oro cada vez que destruyas una unidad enemiga Honor = Honor +25% bonus vs Barbarians = +25% de bonificación contra bárbaros -Gain Culture when you kill a barbarian unit = Gana cultura cuando matas a una unidad bárbara Notified of new Barbarian encampments = Notificado de nuevos campamentos bárbaros Organized Religion = Religión Organizada diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 0937725879..ebe94010bf 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -885,6 +885,8 @@ Civilian = 平民單位 land units = 陸軍單位 water units = 海軍單位 air units = 空軍單位 + # Requires translation! +Barbarian = WaterCivilian = 海上平民單位 Melee = 近戰單位 WaterMelee = 海軍近戰單位 @@ -2453,7 +2455,7 @@ Welcome, friend. = # Requires translation! Sacrificial Captives = # Requires translation! -Gains culture from each enemy unit killed = +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = # Requires translation! Tenochtitlan = # Requires translation! @@ -2782,10 +2784,8 @@ Military Caste = 軍人階層 [stats] in all cities with a garrison = 每座有駐軍的城市[stats] Professional Army = 職業軍隊 Honor Complete = 完整的榮譽政策 -Gain gold for each unit killed = 殺死敵方單位時獲得金錢 Honor = 榮譽政策 +25% bonus vs Barbarians = 所有軍事單位對蠻族的戰鬥力+25% -Gain Culture when you kill a barbarian unit = 殺死蠻族單位時可獲得文化獎勵 Notified of new Barbarian encampments = 新的蠻族營地出現時將會通知 Organized Religion = 教會組織 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 82b6d76519..47f5d26c07 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -913,6 +913,8 @@ Civilian = Sivil land units = kara birlikleri water units = deniz birlikleri air units = hava birlikleri + # Requires translation! +Barbarian = WaterCivilian = DenizSivil Melee = Yakın dövüş WaterMelee = DenizYakınDövüş @@ -2928,7 +2930,7 @@ Welcome, friend. = # Requires translation! Sacrificial Captives = # Requires translation! -Gains culture from each enemy unit killed = +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = # Requires translation! Tenochtitlan = # Requires translation! @@ -3405,13 +3407,10 @@ Military Caste = Askeri Kast [stats] in all cities with a garrison = Professional Army = Düzenli Ordu Honor Complete = Onur Tamamlandı -Gain gold for each unit killed = Öldürülen her birim için altın kazanın Honor = Onur # Requires translation! +25% bonus vs Barbarians = # Requires translation! -Gain Culture when you kill a barbarian unit = - # Requires translation! Notified of new Barbarian encampments = Organized Religion = Düzenli Din diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index e535ee8885..227c20ca61 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -855,6 +855,8 @@ Civilian = Цивільний land units = Наземні підрозділи water units = Водні підрозділи air units = Повітряні підрозділи + # Requires translation! +Barbarian = WaterCivilian = Морський цивільний Melee = Ближній бій WaterMelee = Морський ближній бій @@ -2387,7 +2389,8 @@ What do I see before me? Another beating heart for my sacrificial fire. = Що Accept this agreement or suffer the consequences. = Прийміть цю угоду або зазнайте наслідків. Welcome, friend. = Ласково прошу, друже. Sacrificial Captives = Жертвоприношення полонених -Gains culture from each enemy unit killed = Дає культуру за кожний убитий підрозділ + # Requires translation! +Earn [amount]% of [param] opponent's [param2] as [stat] for kills = Tenochtitlan = Теночтітлан Teotihuacan = Теотіуакан Tlatelolco = Тлалелолько @@ -2679,10 +2682,8 @@ Military Caste = Воєнна каста [stats] in all cities with a garrison = [stats] в усіх містах з гарнізоном Professional Army = Професійна армія Honor Complete = Честь завершена -Gain gold for each unit killed = Отримайте золото за кожний вбитий підрозділ Honor = Честь +25% bonus vs Barbarians = +25% бонус проти варварів -Gain Culture when you kill a barbarian unit = За кожний убитий підрозділ варварів ви отримуватимете очки культури Notified of new Barbarian encampments = Ви отримуватимете повідомлення при виникненні нових варварських таборів Organized Religion = Організована релігія diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 8dc7225135..9b0606a30c 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -1,9 +1,9 @@ -Persian_(Pinglish-UN) = 25 -Italian = 100 +Persian_(Pinglish-UN) = 26 +Italian = 99 Russian = 99 German = 99 Turkish = 71 -Ukrainian = 99 +Ukrainian = 98 French = 91 Portuguese = 46 Indonesian = 99 @@ -18,7 +18,7 @@ Romanian = 40 Korean = 93 Simplified_Chinese = 99 Persian_(Pinglish-DIN) = 25 -Japanese = 100 +Japanese = 99 English = 1 Czech = 73 Hungarian = 76 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index a5d6ede368..041b5d8023 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.3.71" const val appName = "Unciv" - const val appCodeNumber = 488 - const val appVersion = "3.11.5" + const val appCodeNumber = 489 + const val appVersion = "3.11.6" const val gdxVersion = "1.9.10" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index bbb6adb3c8..d782befe67 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,21 @@ +## 3.11.6 + +Added "locate mod errors" button in the options menu for discovering broken links in base ruleset mods + +Resolved another crash caused by incorrect ruleset mod definitions + +Checking something that might solve the Mystery of the Disappearing C's + +Added culture and science colors to resources + +Split civilopedia "buildings" category into "buildings" and "wonders" + +Resolved #3274 - empty maps start with ocean tiles + +Consolidated unit kill bonus uniques - By givehub99 + +Translation updates + ## 3.11.5 Performance improvements for main screen rendering - should be much less laggy now diff --git a/core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt b/core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt index b5a9cd2e40..23cfcf91cf 100644 --- a/core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt +++ b/core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt @@ -30,7 +30,7 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa init { onBackButtonClicked { game.setWorldScreen() } - val clicks = HashMap Unit>() + val clicks = HashMap Unit>() val setCityInfoButton = "Cities".toTextButton() val setCities = { @@ -43,8 +43,8 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa topTable.add(setCityInfoButton) val setStatsInfoButton = "Stats".toTextButton() - clicks["Stats"] = {setStats()} - setStatsInfoButton.onClick{setStats()} + clicks["Stats"] = { setStats() } + setStatsInfoButton.onClick { setStats() } topTable.add(setStatsInfoButton) val setCurrentTradesButton = "Trades".toTextButton() @@ -60,7 +60,7 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa val setUnitsButton = "Units".toTextButton() setUnitsButton.onClick { centerTable.clear() - centerTable.add(ScrollPane(getUnitTable()).apply { setOverscroll(false,false) }).height(stage.height * 0.8f) + centerTable.add(ScrollPane(getUnitTable()).apply { setOverscroll(false, false) }).height(stage.height * 0.8f) centerTable.pack() } topTable.add(setUnitsButton) @@ -321,7 +321,7 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa private fun getUnitTable(): Table { - val table=Table(skin).apply { defaults().pad(5f) } + val table = Table(skin).apply { defaults().pad(5f) } table.add("Name".tr()) table.add("Action".tr()) table.add(Fonts.strength.toString()) @@ -333,8 +333,8 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa table.row() table.addSeparator() - for(unit in viewingPlayer.getCivUnits().sortedWith(compareBy({it.name},{!it.due}, - {it.currentMovement<0.1f},{abs(it.currentTile.position.x)+abs(it.currentTile.position.y)}))) { + for (unit in viewingPlayer.getCivUnits().sortedWith(compareBy({ it.name }, { !it.due }, + { it.currentMovement < 0.1f }, { abs(it.currentTile.position.x) + abs(it.currentTile.position.y) }))) { val baseUnit = unit.baseUnit() val button = unit.name.toTextButton() button.onClick {