diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties index 6287a26a62..6cf613c08b 100644 --- a/android/assets/jsons/translations/Filipino.properties +++ b/android/assets/jsons/translations/Filipino.properties @@ -369,8 +369,7 @@ Strategic Balance = Balanse sa importanteng pagkukunan Legendary Start = Maalamat na Simula Advanced Settings = Mga komplikadong pagpipilian - # Requires translation! -RNG Seed = +RNG Seed = RNG Seed Map Elevation = Taas ng mapa Temperature extremeness = Agwat ng temperatura Resource richness = Dami ng pagkukunan @@ -402,8 +401,7 @@ Remove = Alisin Random = Random Human = Tao Hotseat = Hotseat - # Requires translation! -User ID = +User ID = ID ng Manlalaro Click to copy = I-Click para kopyahin @@ -562,43 +560,28 @@ Auto-assign city production = Kusang italaga ang produksyon sa lungsod Auto-build roads = Kusang gawin ang mga daan Automated workers replace improvements = Kusang gagawin ng mga manggagawa ang mga pagbubuti Show minimap = Ipakita ang maliit na mapa - # Requires translation! -off = +off = off Show pixel units = Ipakita ang mga disenyo ng mga yunit Show pixel improvements = Ipakita ang mga disenyo ng mga pagbubuti Enable nuclear weapons = Pahintulutan ang mga sandatang nuklear Show tile yields = Ipakita ang binibigay ng tile - # Requires translation! -Show unit movement arrows = - # Requires translation! -Continuous rendering = - # Requires translation! -When disabled, saves battery life but certain animations will be suspended = - # Requires translation! -Order trade offers by amount = - # Requires translation! -Check extension mods based on: = - # Requires translation! --none- = - # Requires translation! -Reload mods = - # Requires translation! -Checking mods for errors... = - # Requires translation! -No problems found. = - # Requires translation! -Autoupdate mod uniques = - # Requires translation! -Uniques updated! = +Show unit movement arrows = Ipakita ang mga arrow ng paggalaw ng unit +Continuous rendering = Tuloy-tuloy na pag-render +When disabled, saves battery life but certain animations will be suspended = Pag na-disable, humahaba ang buhay ng baterya pero ipagpapaliban ang ibang mga animasyon +Order trade offers by amount = Magbigay ng alok ayon sa dami +Check extension mods based on: = Siguraduhin ang mga mods pang-extension base sa: +-none- = -wala- +Reload mods = I-load ulit ang mods +Checking mods for errors... = Sinusuri ang mga mods para sa mga pagkakamali... +No problems found. = Walang nakitang problema. +Autoupdate mod uniques = I-update nang kusa ang mga katangi ng mod +Uniques updated! = Na-update na ang mga Katangi! # Requires translation! Show experimental world wrap for maps = - # Requires translation! -HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = - # Requires translation! -Enable portrait orientation = - # Requires translation! -Generate translation files = +HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = LUBHANG EKSPERIMENTAL - BINALAAN KA! +Enable portrait orientation = Gamitin ang nakatayo na oryentasyon +Generate translation files = Gumawa ng files para sa pagsasalin Translation files are generated successfully. = Ang mga files ng pagsasalin ay matagumpay na ginawa. # Requires translation! Please note that translations are a community-based work in progress and are INCOMPLETE! The percentage shown is how much of the language is translated in-game. If you want to help translating the game into your language, click here. = diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 73b5dc7ce7..d659dd4971 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -3293,7 +3293,7 @@ Theocracy = Théocratie Reformation = Réforme Free Religion = Tolérance Religieuse # Requires translation! -[amount] Free Social Policy = +[amount] Free Social Policy = [amount] Doctrine gratuite Piety Complete = Piété Complète Piety = Piété before adopting [policy] = avant d'adopter [policy] @@ -3366,7 +3366,7 @@ Socialism = Socialisme [amount]% maintenance cost for buildings [cityFilter] = [amount]% coût d'entretien pour les bâtiments [cityFilter] Communism = Communisme # Requires translation! -[amount]% [stat] when constructing [tileFilter] buildings [cityFilter] = +[amount]% [stat] when constructing [tileFilter] buildings [cityFilter] = [amount]% [stat] pendant la construction des bâtiments [tileFilter] [cityFilter] Order Complete = Ordre Complet Order = Ordre @@ -3413,7 +3413,7 @@ Contest Technologies = Compétition Technologique The civilization with the largest number of new Technologies researched will gain a reward. = La civilisation ayant le plus grand nombre de nouvelles Technologies recherchées gagnera une récompense. Invest = Investir -Our people are rejoicing thanks to a tourism boom. For a certain amount of time, any Gold donation will yield [50]% extra Influence. = Notre peuple se réjouit d'un tourisme en forte hausse. Pour un temps limité, toute donation d'Or rapportera [50]% d'Influence supplémentaire. +Our people are rejoicing thanks to a tourism boom. For a certain amount of time, any Gold donation will yield [50]% extra Influence. = Notre peuple se réjouit d'un tourisme florissant. Pour un temps limité, toute donation d'Or rapportera [50]% d'Influence supplémentaire. Bully City State = Intimider une Cité-État We are tired of the pretensions of [cityState]. If someone were to put them in their place by Demanding Tribute from them, they would be rewarded. = Nous sommes las des prétentions de [cityState]. Si quelqu'un pouvait les remettre à leur place en leur réclamant un Tribut, cela mériterait une récompense. diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 7dc7c3535c..c63009002c 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -3337,8 +3337,7 @@ Theocracy = Theokratie [amount]% [stat] from every [tileFilter/specialist/buildingName] = [amount]% [stat] von jedem [tileFilter/specialist/buildingName] Reformation = Reformation Free Religion = Religionsfreiheit - # Requires translation! -[amount] Free Social Policy = +[amount] Free Social Policy = [amount] freie Sozialpolitiken Piety Complete = Frömmigkeit vollständig Piety = Frömmigkeit before adopting [policy] = vor dem Verabschieden von [policy] @@ -3410,8 +3409,7 @@ Nationalism = Nationalismus Socialism = Sozialismus [amount]% maintenance cost for buildings [cityFilter] = [amount]% Wartungskosten für Gebäude [cityFilter] Communism = Kommunismus - # Requires translation! -[amount]% [stat] when constructing [tileFilter] buildings [cityFilter] = +[amount]% [stat] when constructing [tileFilter] buildings [cityFilter] = [amount]% [stat] während des Baus von [tileFilter] Gebäuden [cityFilter] Order Complete = Ordnung abgeschlossen Order = Ordnung diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 5f2603e011..b8d3b80bcb 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -3295,8 +3295,7 @@ Theocracy = Teocrazia [amount]% [stat] from every [tileFilter/specialist/buildingName] = [amount]% [stat] da ogni [tileFilter/specialist/buildingName] Reformation = Riforma Free Religion = Tolleranza Religiosa - # Requires translation! -[amount] Free Social Policy = +[amount] Free Social Policy = [amount] Politiche Sociali gratuite Piety Complete = Devozione Completa Piety = Devozione before adopting [policy] = prima di adottare [policy] @@ -3368,8 +3367,7 @@ Nationalism = Nazionalismo Socialism = Socialismo [amount]% maintenance cost for buildings [cityFilter] = [amount]% costi di mantenimento per gli edifici [cityFilter] Communism = Comunismo - # Requires translation! -[amount]% [stat] when constructing [tileFilter] buildings [cityFilter] = +[amount]% [stat] when constructing [tileFilter] buildings [cityFilter] = [amount]% [stat] quando costruisci edifici [tileFilter] [cityFilter] Order Complete = Ordine completo Order = Ordine diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 412bf94912..9f140f91cd 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -941,10 +941,8 @@ Total = 总计 Stats = 统计 Policies = 政策 Base happiness = 基础快乐 - # Requires translation! -Traded Luxuries = - # Requires translation! -City-State Luxuries = +Traded Luxuries = 交易来的奢侈品 +City-State Luxuries = 来自友好城邦的奢侈品 Occupied City = 吞并的城市 Buildings = 建筑 Wonders = 奇观 @@ -1408,8 +1406,7 @@ in cities following this religion = 在追随此宗教的城市 ######### Population Filters ########### - # Requires translation! -Unemployed = +Unemployed = 闲置的 Followers of the Majority Religion = 主流宗教信徒数量 Followers of this Religion = 宗教信徒数量 @@ -2790,8 +2787,7 @@ starting from the [era] = 从[era]开始 Enables embarkation for land units = 陆军单位拥有船运能力 Enables [mapUnitFilter] units to enter ocean tiles = 允许[mapUnitFilter]进入海洋 Normal vision when embarked = 下海时视野正常 - # Requires translation! -within [amount] tiles of a [tileFilter] = +within [amount] tiles of a [tileFilter] = 在[tileFilter][amount]格范围内 Ramkhamhaeng = 兰甘亨 You lowly, arrogant fool! I will make you regret of your insolence! = 你这个卑鄙自大的傻瓜!我会让你后悔你的傲慢! @@ -3138,8 +3134,7 @@ Haderslev = 哈德斯莱乌 Ringsted = 灵斯泰兹 Skrive = 斯克里夫 Denmark = 丹麦 - # Requires translation! -[amount] Movement point cost to disembark = +[amount] Movement point cost to disembark = 陆军单位在登陆时消耗[amount]移动力 No movement cost to pillage = 劫掠不消耗移动力 You leave us no choice. War it must be. = 你让我们别无选择。只有战争。 @@ -3269,7 +3264,7 @@ Landed Elite = 缙绅阶层 [amount]% growth [cityFilter] = [cityFilter][amount]%人口增长 Monarchy = 君主政体 Tradition Complete = 完整的传统政策 -Tradition = 传统 +Tradition = 传统政策 Collective Rule = 集体统治 Citizenship = 公民制度 @@ -3279,7 +3274,7 @@ Republic = 共和政体 Meritocracy = 精英政治 Liberty Complete = 完整的自主政策 Free Great Person = 免费的伟人 -Liberty = 自主 +Liberty = 自主政策 Warrior Code = 尚武精神 Discipline = 军事纪律 @@ -3289,7 +3284,7 @@ Military Tradition = 军事传统 Military Caste = 军人阶层 Professional Army = 职业军队 Honor Complete = 完整的荣誉政策 -Honor = 荣誉 +Honor = 荣誉政策 vs [mapUnitFilter] units = 对战[mapUnitFilter]单位 Notified of new Barbarian encampments = 会对新出现蛮族营地提醒 @@ -3300,10 +3295,9 @@ Theocracy = 神权政治 [amount]% [stat] from every [tileFilter/specialist/buildingName] = [amount]% [stat] 来自每个 [tileFilter/specialist/buildingName] Reformation = 宗教改革 Free Religion = 信仰自由 - # Requires translation! -[amount] Free Social Policy = +[amount] Free Social Policy = [amount]项免费社会制度 Piety Complete = 完整的虔信政策 -Piety = 虔诚 +Piety = 虔诚政策 before adopting [policy] = 在推行[policy]前 Philantropy = 慈善事业 @@ -3320,7 +3314,7 @@ Allied City-States will occasionally gift Great People = 缔结同盟的城邦 Patronage Complete = 完整的赞助政策 Influence of all other civilizations with all city-states degrades [amount]% faster = 其他文明对城邦的影响力下降速度+[amount]% Triggers the following global alert: [param] = 触发下列全局警报:[param] -Patronage = 赞助 +Patronage = 赞助政策 Naval Tradition = 海军传统 Trade Unions = 联合公会 @@ -3329,7 +3323,7 @@ Mercantilism = 重商主义 Protectionism = 贸易保护 [amount] Happiness from each type of luxury resource = [amount]幸福度来源于每一种奢侈品资源 Commerce Complete = 完整的商业政策 -Commerce = 商业 +Commerce = 商业政策 Secularism = 世俗主义 Humanism = 人文主义 @@ -3341,7 +3335,7 @@ Scientific Revolution = 科技革命 [amount] Free Technologies = [amount] 项免费科技 Rationalism Complete = 完整的理性政策 [stats] from all [buildingFilter] buildings = 所有[buildingFilter]建筑[stats] -Rationalism = 理性 +Rationalism = 理性政策 Constitution = 宪政主义 Universal Suffrage = 普选制度 @@ -3353,7 +3347,7 @@ Free Speech = 言论自由 Democracy = 民主主义 Freedom Complete = 完整的自由政策 [amount]% Yield from every [tileFilter] = [amount]%来自每个[tileFilter]的产出 -Freedom = 自由 +Freedom = 自由政策 Populism = 民粹主义 Militarism = 军国主义 @@ -3364,7 +3358,7 @@ Police State = 极权国家 Total War = 全面战争 Autocracy Complete = 完整的独裁政策 for [amount] turns = 需要[amount]回合 -Autocracy = 专制 +Autocracy = 独裁政策 United Front = 统一战线 Militaristic City-States grant units [amount] times as fast when you are at war with a common nation = 与共同的敌人交战时,军事型城邦提供单位的频率为通常的[amount]倍。 @@ -3373,10 +3367,9 @@ Nationalism = 民族主义 Socialism = 社会主义 [amount]% maintenance cost for buildings [cityFilter] = [amount]% 维护 [cityFilter] 建筑的费用 Communism = 共产主义 - # Requires translation! -[amount]% [stat] when constructing [tileFilter] buildings [cityFilter] = +[amount]% [stat] when constructing [tileFilter] buildings [cityFilter] = 在[cityFilter]中建造[tileFilter]的[stat][amount]% Order Complete = 完整的秩序政策 -Order = 命令 +Order = 秩序政策 #################### Lines from Quests from Civ V - Vanilla #################### @@ -4377,7 +4370,7 @@ Prevents spreading of religion to the city it is next to = 阻止紧邻城市的 SS Booster = 飞船助推器 Spaceship part = 太空飞船的部件 # Requires translation! -Can be added to [comment] in the Capital = +Can be added to [comment] in the Capital = 可以被加入在首都的[comment] SS Cockpit = 飞船驾驶舱 @@ -5401,7 +5394,7 @@ The religion a city follows depends on the total pressure each religion has with Followers are allocated in the same proportions as these pressures, and these followers can be viewed in the city screen. = 追随者的分配比例与这些压力相同,可以在城市屏幕上查看这些追随者。 You are allowed to check religious followers and pressures in cities you do not own by selecting them. = 你可以通过选择他国城市来查看他们的宗教状况。 # Requires translation! -In both places, a tap/click on the icon of a religion will show detailed information with its effects. = +In both places, a tap/click on the icon of a religion will show detailed information with its effects. = 你可以在概览界面来查看某一宗教的详细效果和其他信息。 Based on this, you can get a feel for which religions have a lot of pressure built up in the city, and which have almost none. = 基于此,你可以感受到哪些宗教在城市中有很大的压力,而哪些宗教几乎没有压力。 The city follows a religion if a majority of its population follows that religion, and will only then receive the effects of Follower and Pantheon beliefs of that religion. = 如果该城市的大多数人口信奉某一宗教,那么该城市就会信奉该宗教,并且只有到那时才会受到该宗教的追随者和万神殿信仰的影响。 @@ -5443,8 +5436,7 @@ This means exploration and trade is important to grow your cities! = 这意味 #################### Lines from Unique Types ####################### Nullifies [stat] [cityFilter] = 消除[cityFilter]的[stat] - # Requires translation! -Nullifies Growth [cityFilter] = +Nullifies Growth [cityFilter] = 停止[cityFilter]中的人口增长 Provides [stats] per turn = 每轮提供[stats] Provides [stats] [cityFilter] per turn = 提供[stats][cityFilter]每个回合 Provides [amount] Happiness = 提供[amount]快乐 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 8245cded7d..0b5c9eda6c 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.5.30" const val appName = "Unciv" - const val appCodeNumber = 698 - const val appVersion = "4.0.7" + const val appCodeNumber = 699 + const val appVersion = "4.0.8" const val gdxVersion = "1.10.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index f520ea13cc..8205b8476d 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,33 @@ +## 4.0.8 + +Added "Vegetation" unique so that vegetation spawn is not limited to just jungle and forest + +Unified unit type filters and removed unwanted ones + +TerrainFilter parameters accept any unique that exists in terrains. Unrecognized texts now throw errors. - see + +Resolved DamageUnitsPlunder's warnings for City parameter and warnings for "Aircraft" - see + +baseUnitFilter accepts all uniques that exist on units - see + +Re-added stat values to be a known part of buildingFilter - see + +Added very basic "flash red on attack" battle animations + +Resolved - Air units with no space in the city cannot be selected for construction + +Resolved - unpillagable improvements removed entirely on nuke + +AIs don't add double agreements to counteroffers + +Clearer "owned" resource + +Request for take-over: Rewritten Map Editor - By SomeTroglodyte + +By xlenstra: +- Made 'go to on map' translatable & fixed crash +- Fixed two small bugs + ## 4.0.7 Resolved problems in hosting Unciv server