From aa944bad87d79c7b0743033edc1ae24592f40f17 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Tue, 26 Jan 2021 22:46:47 +0200 Subject: [PATCH] 3.12.10 --- .../Brazilian_Portuguese.properties | 3 +- .../jsons/translations/Czech.properties | 3 +- .../jsons/translations/Dutch.properties | 3 +- .../jsons/translations/English.properties | 2 +- .../jsons/translations/Finnish.properties | 3 +- .../jsons/translations/French.properties | 3 +- .../jsons/translations/German.properties | 3 +- .../jsons/translations/Hungarian.properties | 2 +- .../jsons/translations/Indonesian.properties | 3 +- .../jsons/translations/Italian.properties | 3 +- .../jsons/translations/Japanese.properties | 8 ++-- .../jsons/translations/Korean.properties | 3 +- .../jsons/translations/Lithuanian.properties | 2 +- .../jsons/translations/Malay.properties | 2 +- .../Persian_(Pinglish-DIN).properties | 2 +- .../Persian_(Pinglish-UN).properties | 2 +- .../jsons/translations/Polish.properties | 3 +- .../jsons/translations/Portuguese.properties | 3 +- .../jsons/translations/Romanian.properties | 3 +- .../jsons/translations/Russian.properties | 3 +- .../Simplified_Chinese.properties | 43 ++----------------- .../jsons/translations/Spanish.properties | 17 +------- .../Traditional_Chinese.properties | 3 +- .../jsons/translations/Turkish.properties | 5 ++- .../jsons/translations/Ukrainian.properties | 3 +- .../completionPercentages.properties | 6 +-- buildSrc/src/main/kotlin/BuildConfig.kt | 4 +- changelog.md | 16 +++++++ 28 files changed, 70 insertions(+), 86 deletions(-) diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index fb7ce4757b..34939d3f88 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -1111,7 +1111,8 @@ Observatory = Observatório Opera House = Casa de Ópera 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = 'Eu vivo e amo à luz peculiar de Deus.' - Michelangelo Buonarroti -Culture in all cities increased by 25% = Cultura em todas as cidades incrementada em 25% + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = Capela Sistina Bank = Banco diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index dbdbf720fb..db3fbd5cde 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -1111,7 +1111,8 @@ Observatory = Observatoř Opera House = Operní dům 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = 'Žiji a miluji v zvláštním božím světle.' - Michelangelo Buonarroti -Culture in all cities increased by 25% = Kultura ve všech městech vzroste o 25% + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = Sixtinská kaple Bank = Banka diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index d7f107049d..f3086b3bd9 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -1643,7 +1643,8 @@ Opera House = # Requires translation! 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = -Culture in all cities increased by 25% = Cultuur word in alle steden verhoogd met 25% + # Requires translation! ++[amount]% [stat] in all cities = # Requires translation! Sistine Chapel = diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index f49b3f7514..9a3ce8f5d3 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -2032,7 +2032,7 @@ Opera House = # Requires translation! 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = # Requires translation! -Culture in all cities increased by 25% = ++[amount]% [stat] in all cities = # Requires translation! Sistine Chapel = diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index 958f11571d..fbeafc6ef7 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -1251,7 +1251,8 @@ Opera House = Oopperatalo # Requires translation! 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = -Culture in all cities increased by 25% = Kulttuurintuotanto joka kaupungissa kasvaa %25 + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = Sistuksen Kappeli Bank = Pankki diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 9b19fa4dc9..8dca780747 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -1222,7 +1222,8 @@ Observatory = Observatoire Opera House = Opéra 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = 'Je vis et j'aime dans la lumière particulière de Dieu' - Michelangelo Buonarroti -Culture in all cities increased by 25% = La culture dans toutes les villes augmente de 25% + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = Chapelle Sixtine Bank = Banque diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index a214c5f631..b723ddd9da 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -1118,7 +1118,8 @@ Observatory = Observatorium Opera House = Opernhaus 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = 'Ich lebe und liebe in Gottes merkwürdigem Licht.' - Michelangelo Buonarroti -Culture in all cities increased by 25% = Kultur wird in allen Städten um 25% erhöht + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = Sixtinische Kapelle Bank = Bank diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 9f97db458d..d06147fc87 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -1140,7 +1140,7 @@ Opera House = Operaház 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = 'Isten különös fényében élek és szeretek.' - Michelangelo Buonarroti # Requires translation! -Culture in all cities increased by 25% = ++[amount]% [stat] in all cities = Sistine Chapel = Sixtus-kápolna Bank = Bank diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index c8c8594ea0..51e3485cc7 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -1112,7 +1112,8 @@ Observatory = Observatorium Opera House = Gedung Opera 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = 'Aku hidup dan mencintai di dalam cahaya Tuhan yang istimewa.' - Michelangelo Buonarroti -Culture in all cities increased by 25% = Budaya di semua kota meningkat sebanyak 25% + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = Kapel Sistina Bank = Bank diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index c6a9750059..56837e4e92 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -1110,7 +1110,8 @@ Observatory = Osservatorio Opera House = Teatro dell'opera 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = 'Vivo e amo sotto la peculiare luce di Dio.' - Michelangelo Buonarroti -Culture in all cities increased by 25% = +25% cultura in ogni città + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = Cappella Sistina Bank = Banca diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 973c19bb01..6ad0aba715 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -323,7 +323,6 @@ Upload map = マップをアップロード Could not upload map! = マップをアップロードできませんでした！ Map uploaded successfully! = マップをアップロードしました！ Saving... = セーブ中 - # Requires translation! Overwrite existing file? = ファイルを上書きしますか? It looks like your saved game can't be loaded! = セーブしたゲームを読み込めません If you could copy your game data ("Copy saved game to clipboard" - = ゲームデータをコピーすれば(「セーブー」=>「クリップボードにコピー」 @@ -1111,7 +1110,8 @@ Observatory = 天文台 Opera House = オペラハウス 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = 「私は神の特別な光のなかで生き、そして愛す」 - ミケランジェロ・ブオナローティ -Culture in all cities increased by 25% = 全都市の文化力+25% + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = システィーナ礼拝堂 Bank = 銀行 @@ -1419,7 +1419,8 @@ Xikang = 西康 Egypt = エジプト Ramesses II = ラムセス２世 You are but a pest on this Earth, prepare to be eliminated! = 貴様は世界にとって害虫でしかない。駆除される覚悟をしろ。 -You are a fool who evokes pity. You have brought my hostility upon yourself and your repulsive civilization! =無様な愚か者め。貴様と貴様の忌まわしい文明は、余の気に障るのだ。 + # Requires translation! +You are a fool who evokes pity. You have brought my hostility upon yourself and your repulsive civilization! = Strike me down and my soul will torment yours forever, you have won nothing. = 余を倒せば、余の魂がお前を呪う。貴様は勝ってなどない。 Greetings, I am Ramesses the god. I am the living embodiment of Egypt, mother and father of all civilizations. = ごきげんよう。余は神なるラメセスである。余はエジプトの化身であり、全ての文明の母であり父である。 Generous Egypt makes you this offer. = 寛大なエジプトはそなたにこの申し出をする。 @@ -3339,7 +3340,6 @@ May withdraw before melee ([amount]%) = 白兵戦の前に撤退することが Can build improvements on tiles = タイルにタイル施設を建設できる。 Excess Food converted to Production when under construction = 余った食料は建設中に生産量へと転換される - # Requires translation! Requires at least [amount] population = 最低でも人口が[amount]必要 Founds a new city = 新しい都市を開設できる diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 879591706c..efc4ee54f1 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -1114,7 +1114,8 @@ Observatory = 천문대 Opera House = 오페라 극장 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = '나는 신의 경이로운 빛 속에서 살며 사랑한다.' - 미켈란젤로 부오나로티 -Culture in all cities increased by 25% = 모든 도시의 문화 +25% + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = 시스티나 성당 Bank = 은행 diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index 01ca4081b8..d398d074c5 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -1353,7 +1353,7 @@ Opera House = # Requires translation! 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = # Requires translation! -Culture in all cities increased by 25% = ++[amount]% [stat] in all cities = # Requires translation! Sistine Chapel = diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 8bfa0db9f9..a34dfc7c72 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -1881,7 +1881,7 @@ Opera House = Rumah Opera # Requires translation! 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = # Requires translation! -Culture in all cities increased by 25% = ++[amount]% [stat] in all cities = # Requires translation! Sistine Chapel = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index a78e544e3f..5e5f0c2f4a 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -1287,7 +1287,7 @@ Opera House = # Requires translation! 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = # Requires translation! -Culture in all cities increased by 25% = ++[amount]% [stat] in all cities = # Requires translation! Sistine Chapel = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index c035a7451d..592c167c0e 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -1284,7 +1284,7 @@ Opera House = # Requires translation! 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = # Requires translation! -Culture in all cities increased by 25% = ++[amount]% [stat] in all cities = # Requires translation! Sistine Chapel = diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index b35aa2f6ed..2c65a58d10 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -1147,7 +1147,8 @@ Observatory = Obserwatorium Opera House = Opera 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = 'Żyję i kocham w bożym blasku.' – Michał Anioł Buonarroti -Culture in all cities increased by 25% = Kultura we wszystkich miastach wzrasta o 25% + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = Kaplica Sykstyńska Bank = Bank diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 58ef938a97..aa94b8f604 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -1315,7 +1315,8 @@ Observatory = Observatório Opera House = Casa de Ópera 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = 'Eu vivo e amo à luz peculiar de Deus.' - Michelangelo Buonarroti -Culture in all cities increased by 25% = Cultura em todas as cidades incrementada em 25% + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = Capela Sistina Bank = Banco diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index ea14659a84..d3ce10d2be 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -1328,7 +1328,8 @@ Observatory = Observator Opera House = Operă 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = 'Trăiesc și iubesc în lumina lui Dumnezeu.' - Michelangelo Buonarroti -Culture in all cities increased by 25% = Cultura în toate orașele crescută cu 25% + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = Capela Sixtină Bank = Bancă diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 66a5ca66d0..e1de9a2c4d 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -1114,7 +1114,8 @@ Observatory = Обсерватория Opera House = Оперный театр 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = 'Я живу и люблю в особом свете Господа.' - Микеланджело Буонаротти -Culture in all cities increased by 25% = Увеличивает на 25% прирост культуры во всех городах + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = Сикстинская капелла Bank = Банк diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 668f228e07..314e3f5dd3 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -40,8 +40,8 @@ Requires a [buildingName] in this city = 需要城市建有[buildingName] Consumes 1 [resource] = 需要资源：[resource] Required tech: [requiredTech] = 需要科技：[requiredTech] Requires [PolicyOrNationalWonder] = 需要[PolicyOrNationalWonder] -Requires at least [amount] population = 至少需要[amount]个人口 Cannot be purchased = 无法通过购买获得 + Current construction = 当前项目 Construction queue = 等待中的项目 Pick a construction = 请选择一个单位/建筑 @@ -323,7 +323,6 @@ Upload map = 上传地图 Could not upload map! = 无法上传地图！ Map uploaded successfully! = 地图上传成功！ Saving... = 正在保存...... -# Requires translation! Overwrite existing file? = 是否覆盖现有文件？ It looks like your saved game can't be loaded! = 无法加载这个游戏存档！ If you could copy your game data ("Copy saved game to clipboard" - = 你可以将你的游戏存档发送给我(点击“复制游戏存档到剪贴板”按钮 - @@ -358,7 +357,6 @@ Show pixel units = 显示像素单位 Show pixel improvements = 显示像素设施 Enable nuclear weapons = 允许使用核武器 Fontset = 字体设置 - # Requires translation! Show tile yields = 显示平铺产量 Continuous rendering = 连续渲染 When disabled, saves battery life but certain animations will be suspended = 禁用时将关闭部分动画以省电 @@ -577,7 +575,6 @@ The city will not produce anything. = 城市将不会建造/组建任何项目 Worked by [cityName] = 被[cityName]开发 Lock = 锁定 Unlock = 解锁 - # Requires translation! Move to city = 移动到城市 # Technology UI @@ -607,7 +604,6 @@ Captured! = 可以俘虏！ defence vs ranged = 对远程攻击防御 [percentage] to unit defence = [percentage]单位防御力 Attacker Bonus = 主动攻击加成 - # Requires translation! Defender Bonus = 防御者奖励 Landing = 登陆作战 Flanking = 侧翼夹击 @@ -636,8 +632,6 @@ Occupied City = 吞并的城市 Buildings = 建筑 # For the "when constructing [military units]" translation - # Requires translation! -Military = 军事单位 military = 军事 military units = 军事单位 melee units = 近战单位 @@ -859,7 +853,6 @@ Civilian = 平民单位 land units = 陆军单位 water units = 海军单位 air units = 空军单位 - # Requires translation! Barbarian = 蛮族单位 WaterCivilian = 海上平民单位 Melee = 近战单位 @@ -877,11 +870,8 @@ WaterAircraftCarrier = 海军航母单位 Composite Bowman = 复合弓兵 Foreign Land = 境外 - # Requires translation! Friendly Land = 友好的领土 - # Requires translation! Air = 空中 - # Requires translation! Wounded = 受伤 Marine = 海军陆战队 Mobile SAM = 防空导弹车 @@ -942,7 +932,6 @@ Must be on [terrain] = 城市必须位于[terrain]之上 in this city = 在此城市 in every city = 在每座城市 in capital = 在首都 - # Requires translation! in every coastal city = 在每座沿海城市 @@ -978,7 +967,6 @@ Floating Gardens = 水上园圃 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.' - Robert Louis Stevenson = “森林在世人心中享有崇高的地位，并非仅仅因为它的美丽，还有一些微妙的东西，例如古老树木所散发出来的独特气息，能够如此奇妙地让疲惫的精神重新振奋起来。”——罗伯特·路易斯·斯蒂文森（英国作家） +[amount]% growth in all cities = 所有城市+[amount]%食物积累速率 - # Requires translation! +[amount]% Production when constructing [unitType] units = 建造[unitType]时的+[amount]%产量 Temple of Artemis = 阿尔忒弥斯神庙 @@ -1033,7 +1021,6 @@ Terracotta Army = 兵马俑 Temple = 神庙 - # Requires translation! Doubles Gold given to enemy if city is captured = 如果城市被攻占，给予敌人的金币加倍 Burial Tomb = 陵墓 @@ -1123,7 +1110,8 @@ Observatory = 天文台 Opera House = 歌剧院 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = “我在上帝的圣光之下爱与生活。”——米开朗基罗·博纳洛第 -Culture in all cities increased by 25% = 所有城市的文化产出+25% + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = 西斯廷教堂 Bank = 银行 @@ -1144,7 +1132,6 @@ Free Great Person = 免费的伟人 Leaning Tower of Pisa = 比萨斜塔 'Bushido is realized in the presence of death. This means choosing death whenever there is a choice between life and death. There is no other reasoning.' - Yamamoto Tsunetomo = “所谓武士道，就是看透死亡。于生死两难之际，应果断选择死，而不需要任何原因。”——山本常朝（日本江户时代武士） - # Requires translation! +[amount]% combat bonus for units fighting in [param] = 在[param]中战斗的单位的+[amount]%战斗加成 Himeji Castle = 姬路城 @@ -1898,7 +1885,6 @@ What now? = 现在要干什么？ So, out with it! = 所以，滚出这里！ Furor Teutonicus = 条顿狂热 67% chance to earn 25 Gold and recruit a Barbarian unit from a conquered encampment = 击败蛮族营地中的蛮族单位有67%几率得到25金钱并使其加入 - # Requires translation! -[amount]% [param] unit maintenance costs = -[amount]% [param] 单位维护费 Berlin = 柏林 Hamburg = 汉堡 @@ -2010,7 +1996,6 @@ Welcome to the palace of Choson, stranger. I am the learned King Sejong, who loo We have many things to discuss and have much to benefit from each other. = 我们有很多事情需要讨论，还可以从中受益。 Oh, it's you = 哦，是你。 Scholars of the Jade Hall = 集贤殿学士 - # Requires translation! Receive a tech boost when scientific buildings/wonders are built in capital = 在首都建造科学建筑/奇迹时获得科技推动 Seoul = 首尔 Busan = 釜山 @@ -2171,7 +2156,6 @@ Welcome, friend! = 你好！朋友！ Wayfinding = 海路探寻 +1 Sight when embarked = 单位处于船运状态时+1视野 Can embark and move over Coasts and Oceans immediately = 单位初始就拥有船运能力，可进入海滨和海洋地块 - # Requires translation! +[amount]% Strength if within [amount2] tiles of a [tileImprovement] = 如果在[tileImprovement]的[amount2]格内，则+[amount]％强度 Honolulu = 火奴鲁鲁 Samoa = 萨摩亚 @@ -2400,7 +2384,6 @@ What do I see before me? Another beating heart for my sacrificial fire. = 将跳 Accept this agreement or suffer the consequences. = 接受这个协议否则后果自负。 Welcome, friend. = 欢迎您，我最尊贵的朋友！ Sacrificial Captives = 人牲献祭 - # Requires translation! Earn [amount]% of [param] opponent's [param2] as [stat] for kills = 获得[param]对手[param2]的[amount]%作为击杀[stat] Tenochtitlan = 特诺奇提特兰 Teotihuacan = 特奥蒂瓦坎 @@ -2749,7 +2732,6 @@ Tile yield from Great Improvements +100% = 建有伟人设施的地块产出+100 Freedom = 自由政策 Populism = 民粹主义 - # Requires translation! [param] units deal +[amount]% damage = [param]单位造成+[amount]%伤害 Militarism = 军国主义 Gold cost of purchasing units -33% = 购买单位时的金钱花费-33% @@ -2757,7 +2739,6 @@ Fascism = 法西斯 Quantity of strategic resources produced by the empire increased by 100% = 帝国战略资源产出+100% Police State = 极权国家 Total War = 全面战争 - # Requires translation! New [param] units start with [amount] Experience = 新的[param]从[amount]经验开始 Autocracy Complete = 完整的独裁政策 +20% attack bonus to all Military Units for 30 turns = 所有军事单位主动攻击时战斗力+20%，效果持续30回合 @@ -2771,9 +2752,7 @@ Autocracy = 独裁政策 Route = 修路 Build a road to connect your capital to our city. = 如果你能建造我们首都之间的道路，将极大的有利于我们的文明。 - # Requires translation! Clear Barbarian Camp = 清除蛮族营地 - # Requires translation! We feel threatened by a Barbarian Camp near our city. Please take care of it. = 我们城市附近的一个蛮人营地对我们的城市构成了威胁，请处理好它 Connect Resource = 连接资源 @@ -2782,19 +2761,13 @@ In order to make our civilizations stronger, connect [param] to your trade netwo Construct Wonder = 建造奇观 We recommend you to start building [param] to show the whole world your civilization strength. = 如果你能建造[param]，我们的学者和艺术家将因你的成就而感到惊叹。 - # Requires translation! Acquire Great Person = 获得伟人 - # Requires translation! Great People can change the course of a Civilization! You will be rewarded for acquiring a new [param]. = 伟人可以改变文明的进程！ 您将获得新的[param]奖励。 - # Requires translation! Find Player = 查找玩家 - # Requires translation! You have yet to discover where [param] set up their cities. You will be rewarded for finding their territories. = 您尚未发现[param]在哪里建立他们的城市。 找到他们的领地将给您奖励。 - # Requires translation! Find Natural Wonder = 寻找自然奇观 - # Requires translation! Send your best explorers on a quest to discover Natural Wonders. Nobody knows the location of [param] yet. = 派遣你最好的探险家去探索自然奇观。还没有人知道[param]的位置。 @@ -2970,7 +2943,6 @@ Nuclear Fission = 核裂变 Rocketry = 火箭 'A good rule for rocket experimenters to follow is this: always assume that it will explode.' - Astronautics Magazine, 1937 = “火箭研究人员要遵守的最好规矩就是：永远要假定它会爆炸。”——航天学杂志，1937 Computers = 电子计算机 -+10% science and production in all cities = 所有城市+10%的科研和产能产出 'Computers are like Old Testament gods: lots of rules and no mercy.' - Joseph Campbell = “计算机就如同旧约中的上帝：诸多戒命且没有怜悯。”——约瑟夫·坎贝尔（美国学者） Future era = 未来时代 @@ -3085,7 +3057,6 @@ Gives a defensive bonus of [amount]% = 提供[amount]%防御力加成 Can be built outside your borders = 可在境外建造 Fort = 堡垒 - # Requires translation! Costs [amount] gold per turn when in your territory = 在您的领土内每回合花费[amount]金币 Road = 道路 @@ -3267,14 +3238,13 @@ Coastal Raider II = 海掠II级 Coastal Raider III = 海掠III级 Wolfpack I = 狼群I级 - # Requires translation! +[amount]% Strength when attacking = 攻击时获得+ [amount]％战斗力加成 + Wolfpack II = 狼群II级 Wolfpack III = 狼群III级 Armor Plating I = 船体装甲I级 - # Requires translation! +[amount]% Strength when defending = 防御时获得+ [amount]％战斗力加成 Armor Plating II = 船体装甲II级 @@ -3368,9 +3338,7 @@ May withdraw before melee ([amount]%) = 可以在近战前撤退（[amount]%） Can build improvements on tiles = 可以在地块上建造设施 - # Requires translation! Excess Food converted to Production when under construction = 过剩的食物在建设中转化为生产力 - # Requires translation! Requires at least [amount] population = 至少需要[amount]个人口 Founds a new city = 建立一座城市，组建此单位时城市的食物积累停止 @@ -3558,11 +3526,8 @@ Panzer = “虎II”坦克 Anti-Tank Gun = 反坦克炮 - # Requires translation! Unable to capture cities = 无法占领城市 - # Requires translation! All tiles cost 1 movement = 所有地块消耗一移动力 - # Requires translation! Can pass through impassable tiles = 可以穿过无法通行的地块 Rocket Artillery = 火箭炮 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 1072564b9d..65b0a67c24 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -323,7 +323,6 @@ Upload map = Subir mapa Could not upload map! = ¡No se pudo subir el mapa! Map uploaded successfully! = ¡Se ha subido el mapa correctamente! Saving... = Guardando... - # Requires translation! Overwrite existing file? = ¿Sobreescribir archivo guardado? It looks like your saved game can't be loaded! = ¡Parece que tu juego guardado no se puede cargar! If you could copy your game data ("Copy saved game to clipboard" - = Si pudieras copiar los datos de tu juego ("Copiar juego guardado en el portapapeles" - @@ -358,7 +357,6 @@ Show pixel units = Mostrar sprites de las unidades Show pixel improvements = Mostrar sprites de las mejoras Enable nuclear weapons = Permitir armas nucleares Fontset = Fuente - # Requires translation! Show tile yields = Mostrar recursos en casillas Continuous rendering = Renderizado Continuo When disabled, saves battery life but certain animations will be suspended = Cuando está deshabilitado, ahorra batería pero ciertas animaciones serán suspendidas @@ -577,7 +575,6 @@ The city will not produce anything. = La ciudad no producirá nada. Worked by [cityName] = Trabajado por [cityName] Lock = Bloqueado Unlock = Desbloqueado - # Requires translation! Move to city = Mover hacia ciudad # Technology UI @@ -935,7 +932,6 @@ Must be on [terrain] = Debe estar en [terrain] in this city = en esta ciudad in every city = en cada ciudad in capital = en capital - # Requires translation! in every coastal city = en cada ciudad costera @@ -971,7 +967,6 @@ Floating Gardens = Jardines flotantes 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.' - Robert Louis Stevenson = "No es tanto por su belleza que el bosque reclama el corazón de los hombres, sino por ese algo sutil, esa calidad del aire, esa emanación de árboles viejos, que tan maravillosamente cambia y renueva un espíritu cansado". - Robert Louis Stevenson +[amount]% growth in all cities = +[amount]% de crecimiento en todas las ciudades - # Requires translation! +[amount]% Production when constructing [unitType] units = +[amount]% de Producción cuando construyes unidades [unitType] Temple of Artemis = Templo de artemisa @@ -1026,7 +1021,6 @@ Terracotta Army = Ejército de terracota Temple = Templo - # Requires translation! Doubles Gold given to enemy if city is captured = Dobla la cantidad de oro otorgado al enemigo si la ciudad es capturada Burial Tomb = Tumba @@ -1116,7 +1110,8 @@ Observatory = Observatorio Opera House = Teatro de la Ópera 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = 'Vivo y amo en la peculiar luz de Dios.' - Miguel Ángel Buonarroti -Culture in all cities increased by 25% = Cultura en todas las ciudades incrementada 25% + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = Capilla Sixtina Bank = Banco @@ -1890,7 +1885,6 @@ What now? = ¿Ahora qué? So, out with it! = Entonces, ¡Cuéntame! Furor Teutonicus = Furia Teutónica 67% chance to earn 25 Gold and recruit a Barbarian unit from a conquered encampment = 67% de probabilidad de ganar 25 de oro y reclutar una unidad bárbara de un campamento conquistado - # Requires translation! -[amount]% [param] unit maintenance costs = -[amount]% [param] de costos de mantenimiento en unidades Berlin = Berlín Hamburg = Hamburgo @@ -2002,7 +1996,6 @@ Welcome to the palace of Choson, stranger. I am the learned King Sejong, who loo We have many things to discuss and have much to benefit from each other. = Tenemos muchas cosas que discutir y mucho que ofrecer el uno al otro. Oh, it's you = Oh, eres tú Scholars of the Jade Hall = Eruditos del Salón de Jade - # Requires translation! Receive a tech boost when scientific buildings/wonders are built in capital = Recibe un aumento tecnológico cuando edificios/maravillas tecnológicas son construidas en la capital Seoul = Seúl Busan = Busan @@ -3064,7 +3057,6 @@ Gives a defensive bonus of [amount]% = Otorga una bonificación defensiva del [a Can be built outside your borders = Puede construirse fuera de sus fronteras Fort = Fuerte - # Requires translation! Costs [amount] gold per turn when in your territory = Cuesta [amount] de oro por turno si está en tu territorio Road = Carretera @@ -3346,9 +3338,7 @@ May withdraw before melee ([amount]%) = Puede retirarse antes del cuerpo a cuerp Can build improvements on tiles = Puede construir mejoras en casillas - # Requires translation! Excess Food converted to Production when under construction = El exceso de Alimento es convertido en Producción mientras se construye - # Requires translation! Requires at least [amount] population = Requiere al menos [amount] de población Founds a new city = Funda una nueva ciudad @@ -3536,11 +3526,8 @@ Panzer = Panzer Anti-Tank Gun = Anti-Tanque - # Requires translation! Unable to capture cities = Incapaz de capturar ciudades - # Requires translation! All tiles cost 1 movement = Todos los casilleros cuestan 1 movimiento - # Requires translation! Can pass through impassable tiles = Puede pasar por casilleros infranqueables Rocket Artillery = Artilleria de misiles diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index e6ac192312..fd4ada0be6 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -1185,7 +1185,8 @@ Observatory = 天文台 Opera House = 歌劇院 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = “我在上帝的聖光之下愛與生活。”——米開朗基羅·博納洛第 -Culture in all cities increased by 25% = 所有城市的文化產出+25% + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = 西斯廷教堂 Bank = 銀行 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index e2e5650e70..1f5ac49e48 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -853,7 +853,6 @@ AI unit maintenance modifier = # Requires translation! AI unhappiness modifier = - # Requires translation! Turns until barbarians enter player tiles = Barbarlar oyuncu bölgesine girene kadar geçen tur Gold reward for clearing barbarian camps = Barbar kamplarını temizleyince verilen Altın ödülü @@ -1183,7 +1182,8 @@ Observatory = Gözlemevi Opera House = Opera Binası 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = 'Tanrı'nın kendine özgü ışığında yaşıyorum ve seviyorum.' - Michelangelo Buonarroti -Culture in all cities increased by 25% = Tüm şehirlerde kültür 25% artar + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = Sistine Şapeli Bank = Banka @@ -4437,3 +4437,4 @@ Certain tiles have terrain features - like Flood plains or Forests - on top of # Requires translation! Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = + diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 9c9a96354d..139be0a512 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -1111,7 +1111,8 @@ Observatory = Обсерваторія Opera House = Оперний театр 'I live and love in God's peculiar light.' - Michelangelo Buonarroti = «Живу і кохаю під особливим божим осяянням» — Мікеланджело Буонарроті. -Culture in all cities increased by 25% = +25% культури в усіх містах + # Requires translation! ++[amount]% [stat] in all cities = Sistine Chapel = Сікстинська капела Bank = Банк diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 8e4e22a742..96a44e1bdf 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -2,7 +2,7 @@ Persian_(Pinglish-UN) = 25 Italian = 99 Russian = 99 German = 99 -Turkish = 71 +Turkish = 74 Ukrainian = 99 French = 90 Portuguese = 46 @@ -16,10 +16,10 @@ Polish = 96 Lithuanian = 24 Romanian = 40 Korean = 99 -Simplified_Chinese = 98 +Simplified_Chinese = 99 Persian_(Pinglish-DIN) = 25 Japanese = 99 English = 1 Czech = 77 Hungarian = 75 -Dutch = 18 +Dutch = 17 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index a223cd303c..a1309ddf18 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 = 523 - const val appVersion = "3.12.9-patch2" + const val appCodeNumber = 524 + const val appVersion = "3.12.10" const val gdxVersion = "1.9.12" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index b2f5b51548..8f8fb687ad 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,19 @@ +## 3.12.10 + +Solved ANRs when loading large maps in map editor + +Mitigated some concurrency related crashes + +Resolved #3436 - parametrized "+[]% [] in all cities" + +Smoother map panning + +Multiple game support for TurnChecker - By GGGuenni + +Avoid overflow of the health bar in the overkill situation - By JackRainy + +Translation updates + ## 3.12.9 Solved common ANR in city screen