From ae4719c552113dda6d68eb077cac5c411e32e77c Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 28 May 2023 09:00:01 +0300 Subject: [PATCH] Version rollout (#9469) * Bump version and create initial changelog entry * Update Polish.properties (#9465) * Update Polish.properties * Update Polish.properties * Update Polish.properties * Update Italian.properties (#9464) * Update Italian.properties * Update Italian.properties * [Translation] Update Simplified Chinese translation (#9452) * update Simplified Chinese * update Simplified Chinese --------- Co-authored-by: yairm210 Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com> Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com> Co-authored-by: chr_56 <30681738+chr56@users.noreply.github.com> --- .../jsons/translations/Italian.properties | 26 +++++----- .../jsons/translations/Polish.properties | 13 +++-- .../Simplified_Chinese.properties | 48 ++++++++----------- buildSrc/src/main/kotlin/BuildConfig.kt | 4 +- changelog.md | 30 ++++++++++++ core/src/com/unciv/UncivGame.kt | 2 +- .../metadata/android/en-US/changelogs/872.txt | 29 +++++++++++ 7 files changed, 102 insertions(+), 50 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/872.txt diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index d2497ef183..b322fb86a4 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -2474,12 +2474,12 @@ Burial Tomb = Sepolcro Mud Pyramid Mosque = Moschea della piramide di fango -National College = College Nazionale +National College = College nazionale The Oracle = Oracolo 'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing' - Socrates = 'L'antico Oracolo ha detto che sono il più saggio di tutti i Greci. Questo perché io solo, di tutti i Greci, so di non sapere nulla.' - Socrate -National Epic = Epica Nazionale +National Epic = Epica nazionale Market = Mercato @@ -2489,7 +2489,7 @@ Mint = Zecca Aqueduct = Acquedotto -Heroic Epic = Epica Eroica +Heroic Epic = Epica eroica Colossus = Colosso 'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar = 'Già, lui cavalca questo stretto mondo ormai come un colosso; e noi, gli omuncoli, passiamo sotto le sue gambe enormi e ci scrutiamo intorno, per ritrovarci tutti quanti siamo come tanti sepolcri senza onore' - William Shakespeare: Giulio Cesare @@ -2507,14 +2507,14 @@ Angkor Wat = Angkor Wat Chichen Itza = Chichen Itza 'The katun is established at Chichen Itza. The settlement of the Itza shall take place there. The quetzal shall come, the green bird shall come. Ah Kantenal shall come. It is the word of God. The Itza shall come.' - The Books of Chilam Balam = 'Il katun è stabilito a Chichèn Itzà. L'insediamento degli Itzà avrà luogo. Arriverà il quetzal, arriverà l'uccello verde. Ah Kantenal arriverà. È la parola di Dio. Gli Itzà arriveranno.' - I libri di Chilam Balam -National Treasury = Tesoreria Nazionale +National Treasury = Tesoreria nazionale Machu Picchu = Machu Picchu 'Few romances can ever surpass that of the granite citadel on top of the beetling precipices of Machu Picchu, the crown of Inca Land.' - Hiram Bingham = 'Pochi racconti fantastici possono sorpassare quello della cittadella di granito sospesa in cima ai precipizi, Machi Picchu, la corona della terra degli Inca.' - Hiram Bingham Workshop = Bottega -Longhouse = Casa Lunga +Longhouse = Casa lunga Forge = Fucina @@ -4064,16 +4064,16 @@ Liberty = Libertà Warrior Code = Codice guerriero Discipline = Disciplina Military Tradition = Tradizione militare -Military Caste = Casta Militare +Military Caste = Casta militare Professional Army = Esercito professionale Honor Complete = Onore completo Honor = Onore -Organized Religion = Religione Organizzata +Organized Religion = Religione organizzata Mandate Of Heaven = Mandato del Cielo Theocracy = Teocrazia Reformation = Riforma -Free Religion = Tolleranza Religiosa +Free Religion = Tolleranza religiosa Piety Complete = Devozione completa Piety = Devozione @@ -4081,7 +4081,7 @@ Philantropy = Filantropia Aesthetics = Estetica Scholasticism = Scolasticismo Cultural Diplomacy = Diplomazia culturale -Educated Elite = Educazione d'Elite +Educated Elite = Educazione d'élite Patronage Complete = Mecenatismo completo Patronage = Mecenatismo @@ -4097,12 +4097,12 @@ Secularism = Secolarismo Humanism = Umanesimo Free Thought = Libertà di pensiero Sovereignty = Sovranità -Scientific Revolution = Rivoluzione Scientifica +Scientific Revolution = Rivoluzione scientifica Rationalism Complete = Razionalismo completo Rationalism = Razionalismo Constitution = Costituzione -Universal Suffrage = Suffragio Universale +Universal Suffrage = Suffragio universale Civil Society = Società civile Free Speech = Libertà di parola Democracy = Democrazia @@ -4824,7 +4824,7 @@ AtomicBomber = Bombardiere atomico This is your basic, club-swinging fighter. = Questo è il tuo combattente con mazza di tutti i giorni. -Maori Warrior = Guerriero Maori +Maori Warrior = Guerriero maori Jaguar = Guerriero giaguaro @@ -4869,7 +4869,7 @@ Swordsman = Spadaccino Legion = Legionario -Mohawk Warrior = Guerriero Mohawk +Mohawk Warrior = Guerriero mohawk Landsknecht = Lanzichenecco diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index a650505c90..4cae7da3af 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -169,7 +169,6 @@ Ally = Sojusz [remainingTurns] turns remaining = Pozostało [remainingTurns]⏳ tur Current leader is [civInfo] with [amount] [stat] generated. = Aktualny Lider: [civInfo] z wygenerowanymi [amount] punktami [stat]. Current leader is [civInfo] with [amount] Technologies discovered. = Aktualny Lider: [civInfo] z [amount] odkrytymi technologiami. - Demands = Żądania Please don't settle new cities near us. = Nie osiedlajcie się w pobliżu naszych ziem! Very well, we shall look for new lands to settle. = W porządku, poszukamy innego miejsca @@ -568,19 +567,19 @@ Select [thingToSelect] = Wybierz [thingToSelect] Friends list = Lista znajomych Add friend = Dodaj znajomego Edit friend = Edytuj znajomego -Friend name is already in your friends list! = Imię znajomego już jest na twojej Liście znajomych! -Player ID is already in your friends list! = ID gracza już jest na twojej Liście znajomych! +Friend name is already in your friends list! = Imię znajomego już jest na twojej liście znajomych! +Player ID is already in your friends list! = ID gracza już jest na twojej liście znajomych! You have to write a name for your friend! = Musisz wpisać imię dla twojego znajomego! You have to write an ID for your friend! = Musisz wpisać ID dla twojego znajomego! -You cannot add your own player ID in your friend list! = Nie możesz dodać swojego własnego ID do twojej Listy znajomych! +You cannot add your own player ID in your friend list! = Nie możesz dodać swojego własnego ID do twojej listy znajomych! To add a friend, ask him to send you his player ID.\nClick the 'Add friend' button.\nInsert his player ID and a name for him.\nThen click the 'Add friend' button again.\n\nAfter that you will see him in your friends list.\n\nA new button will appear when creating a new\nmultiplayer game, which allows you to select your friend. = Aby dodać znajomego, poproś go, aby wysłał ci swoje ID gracza.\nKliknij 'Dodaj znajomego'.\nWpisz jego numer ID i imię dla niego.\nNastępnie kliknij ponownie 'Dodaj znajomego'.\n\nTeraz widzisz go na swojej Liście znajomych.\n\nNowy przycisk pojawi się, kiedy utworzysz nową Grę Wieloosobową\nw której będzies mógł wybrać swojego znajomego. Please input Player ID! = Proszę wprowadzić ID Gracza! # Requires translation! -The number of players will be adjusted = +The number of players will be adjusted = Liczba graczy zostanie dostosowana # Requires translation! -These [numberOfPlayers] players will be adjusted = +These [numberOfPlayers] players will be adjusted = Tych [numberOfPlayers] graczy zostanie dostosowanych # Requires translation! -[numberOfExplicitPlayersText] to [playerRange] actual players by adding random AI's or by randomly omitting AI's. = +[numberOfExplicitPlayersText] to [playerRange] actual players by adding random AI's or by randomly omitting AI's. = Zmiana z [numberOfExplicitPlayersText] do [playerRange] graczy poprzez dodanie losowych AI lub ich losowe pominięcie. Set current user = Ustaw bieżącego użytkownika Player ID from clipboard = ID gracza ze schowka Player ID from friends list = ID gracza z Listy znajomych diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index d6db79ebf1..ddd7488517 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -574,12 +574,9 @@ You have to write an ID for your friend! = 您的好友必须有一个有效ID You cannot add your own player ID in your friend list! = 您不能做自己的好友！您是不是输入了自己的ID？ To add a friend, ask him to send you his player ID.\nClick the 'Add friend' button.\nInsert his player ID and a name for him.\nThen click the 'Add friend' button again.\n\nAfter that you will see him in your friends list.\n\nA new button will appear when creating a new\nmultiplayer game, which allows you to select your friend. = 要新增一个好友，请先让TA把TA的ID发送给您\n单击“新增好友信息”按钮，并填写好TA的名称和ID，您的好友列表就会新增一人。\n\n这样，在创建多人游戏时，您就可以直接选择好友加入，而不是辛辛苦苦地再次输入。 Please input Player ID! = 请输入玩家ID！ - # Requires translation! -The number of players will be adjusted = - # Requires translation! -These [numberOfPlayers] players will be adjusted = - # Requires translation! -[numberOfExplicitPlayersText] to [playerRange] actual players by adding random AI's or by randomly omitting AI's. = +The number of players will be adjusted = 玩家数量会被修改 +These [numberOfPlayers] players will be adjusted = [numberOfPlayers] 玩家数量会被修改 +[numberOfExplicitPlayersText] to [playerRange] actual players by adding random AI's or by randomly omitting AI's. = [numberOfExplicitPlayersText]到 [playerRange] 的实际玩家数量，将通过添加随机的AI或随机省略AI而被修改。 Set current user = 设定为当前玩家 Player ID from clipboard = 从剪贴板获取玩家 ID Player ID from friends list = 从好友列表复制玩家ID @@ -858,7 +855,7 @@ Work has started on [construction] = 开始建造 / 组建：[construction] [cityName] cannot continue work on [construction] = [cityName]无法继续建造 / 组建[construction] [cityName] has expanded its borders! = [cityName]的边界已扩张！ Your Golden Age has ended. = 你的黄金时代结束了 -[cityName] has been razed to the ground! = [cityName]已被夷为平地！ +[cityName] has been razed to the ground! = [cityName] 已被夷为平地！ We have conquered the city of [cityName]! = 我们已经占领城市[cityName]！ Your citizens are revolting due to very high unhappiness! = 您的居民正因高不满值而进行反叛！ An enemy [unit] has attacked [cityName] = 敌方的[unit]攻击了[cityName] @@ -1140,8 +1137,8 @@ While the rest of the world calls the current year [year], in the Maya Calendar # City screen Exit city = 离开城市界面 -Raze city = 摧毁城市 -Stop razing city = 停止摧毁城市 +Raze city = 拆除城市 +Stop razing city = 停止拆除城市 Buy for [amount] gold = 花费 [amount] 金钱购买 Buy = 购买 Currently you have [amount] [stat]. = 你目前有[amount][stat]。 @@ -1413,26 +1410,24 @@ Replay = 回放 # Capturing a city -What would you like to do with the city of [cityName]? = 你想对[cityName]做些什么呢？ +What would you like to do with the city of [cityName]? = 你想对城市 [cityName] 如何处置？ Annex = 吞并 -Annexed cities become part of your regular empire. = “吞并城市” 意味着该城市将成为您帝国直辖的一部分。 +Annexed cities become part of your regular empire. = “吞并城市” 即该城市将成为您帝国直辖的一部分。 Their citizens generate 2x the unhappiness, unless you build a courthouse. = 该城市人口导致的不满将是正常值的 2 倍，建造 “法庭” 可以使该值降低到正常值。 - # Requires translation! -Your civilization may not annex this city. = -Puppet = 傀儡城市 -Puppeted cities do not increase your tech or policy cost. = 傀儡城市 +Your civilization may not annex this city. = 你的文明可能不会吞并此城市。 +Puppet = 傀儡 +Puppeted cities do not increase your tech or policy cost. = “傀儡城市（无法推高你的科研或政策推行的成本） You have no control over the the production of puppeted cities. = 您无法控制已傀儡城市的产能分配。 Puppeted cities also generate 25% less Gold and Science. = 已傀儡城市的金钱和科研产出 -25%。 -A puppeted city can be annexed at any time. = 可以在任何时候选择吞并已傀儡城市。 -Liberate (city returns to [originalOwner]) = 解放（城市归还[originalOwner]） +A puppeted city can be annexed at any time. = 可以在任何时候选择吞并已傀儡的城市。 +Liberate (city returns to [originalOwner]) = 解放（将城市归还[originalOwner]） Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = “解放城市” 会将该城市归还给初始拥有者，这样做会极大增进两者的关系！ -Raze = 摧毁 -Razing the city annexes it, and starts burning the city to the ground. = “摧毁城市” 意味着吞并该城市，同时开始将该城市夷为平地。 - # Requires translation! -Razing the city puppets it, and starts burning the city to the ground. = +Raze = 拆除 +Razing the city annexes it, and starts burning the city to the ground. = “拆除城市” 即立即 吞并 该城市，同时开始将摧毁此城市。 +Razing the city puppets it, and starts burning the city to the ground. = “拆除城市” 即立即 傀儡 该城市，同时开始将摧毁此城市。 The population will gradually dwindle until the city is destroyed. = 城市人口将会持续地减少直至该城市被完全摧毁。 -Original capitals and holy cities cannot be razed. = 起始首都和圣城不能被摧毁。 -Destroy = 毁灭 +Original capitals and holy cities cannot be razed. = 起始首都和圣城不可被拆除。 +Destroy = 抹平 Destroying the city instantly razes the city to the ground. = 毁灭这座城市将会立刻把城市夷为平地。 Keep it = 占领 Remove your troops in our border immediately! = 请停止这种无理而且野蛮的行径！马上让你的人滚出我的领土！ @@ -1896,7 +1891,7 @@ May not generate great prophet equivalents naturally = 不能自然产生大先 When conquering an encampment, earn [amount] Gold and recruit a Barbarian unit = 从被占领的蛮族营地中俘获一个蛮族并获得[amount]金钱 When defeating a [mapUnitFilter] unit, earn [amount] Gold and recruit it = 在击败[mapUnitFilter]单位后，可以掠夺[amount]金钱并将其俘获 Receive triple Gold from Barbarian encampments and pillaging Cities = 摧毁蛮族营地及劫掠城市时获得三倍金钱 -Cities are razed [amount] times as fast = [amount]倍摧毁城市速度 +Cities are razed [amount] times as fast = [amount] 倍城市拆除速度 When declaring friendship, both parties gain a [relativeAmount]% boost to great person generation = 当宣布友谊宣言时，双方都获得 [relativeAmount]% 的伟人产生速率。 No Maintenance costs for improvements in [tileFilter] tiles = 在[tileFilter]地块的设施无维修费用 Influence of all other civilizations with all city-states degrades [relativeAmount]% faster = 其他文明对城邦的影响力下降速度+[relativeAmount]% @@ -1904,8 +1899,7 @@ Land units may cross [terrainName] tiles after the first [baseUnitFilter] is ear Gain [amount] Influence with a [baseUnitFilter] gift to a City-State = 向一个城邦送予一个[baseUnitFilter]礼物时 [amount] 影响力 [relativeAmount]% Faith cost of generating Great Prophet equivalents = 获得大先知必须的信仰[relativeAmount]% Resting point for Influence with City-States following this religion [amount] = 对信奉该宗教的城邦影响力点数[amount] - # Requires translation! -May not annex cities = +May not annex cities = 可能不会吞并城市 Provides a sum of gold each time you spend a Great Person = 每次消耗掉一位伟人时可获得金钱 [stats] whenever a Great Person is expended = 消耗伟人时[stats] Receive free [unit] when you discover [tech] = 研发[tech]科技后获得免费的[unit] @@ -6195,7 +6189,7 @@ Unlike Luxury Resources, each Strategic Resource on the map provides more than o The city can no longer put up any resistance!\nHowever, to conquer it, you must enter the city with a melee unit = 这座城市再也不能抵抗了!\n然而，要征服城市，请使用您的近战单位占领它。 After Conquering = 占领城市的处理 -When conquering a city, you can choose to liberate, annex, puppet, or raze the city. = 当征服了一座城市，您可以选择解放、吞并、傀儡、甚至摧毁它。 +When conquering a city, you can choose to liberate, annex, puppet, or raze the city. = 当你征服了一座城市，您可以选择解放、吞并、傀儡、甚至摧毁该城市。 \nLiberating the city will return it to its original owner, giving you a massive diplomatic boost with them!\n\nAnnexing the city will give you full control over it, but also increase the citizens' unhappiness to 2x!\nThis can be mitigated by building a courthouse in the city, returning the citizen's unhappiness to normal.\n\nPuppeting the city will mean that you have no control on the city's production.\nThe city will not increase your tech or policy cost.\nA puppeted city can be annexed at any time, but annexed cities cannot be returned to a puppeted state!\n\nRazing the city will lower its population by 1 each turn until the city is destroyed!\nYou cannot raze a city that is either the starting capital of a civilization or the holy city of a religion. = \n“解放城市”让它回归原来的文明，会使你与他们的外交关系得到巨大的提升！\n\n“吞并城市”将会给予您该城市的绝对控制权，但该城市人口产生的不满将是正常值的2倍。\n在城市内建造法庭可以使人口产生的不满降低到正常值。\n\n“傀儡城市”意味着您将无法控制该城市的产能，\n该城市将不会额外增加您研发科技和推行社会政策时的花费，但该城市人口产生的不满是正常值的1.5倍。\n可以在任何时候吞并已傀儡的城市，但已吞并的城市无法再变为傀儡状态。\n\n“摧毁城市”可以令城市人口每回合-1，人口为0时城市将完全被摧毁。\n你不能摧毁一个文明的原始首都或一个宗教的圣城。 You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminately, so don't let your \n civilian units go near them, and be careful of your scout! = 您遇到蛮族了！\n蛮族会不分青红皂白地攻击靠近它的每一个单位，\n所以请不要让您的移民等平民单位靠近他们，同时还要注意你的斥候！ diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 40419ef9a7..d69eab49da 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -4,8 +4,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.8.21" const val appName = "Unciv" - const val appCodeNumber = 871 - const val appVersion = "4.6.14-patch1" + const val appCodeNumber = 872 + const val appVersion = "4.6.15" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index eb59e294b6..c647155bd0 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,33 @@ +## 4.6.15 + +Modding: units can transform without limit on destination unit + +4.6.14-patch1 + +4.6.14-patch1 + +Resolve - update dockerfile + +Unpurchaseable units are properly unpurchaseable + +Migrated Linux JRE to latest Adoptium Temurin + +Resolved - Crop yield chart no longer displays score data + +Fixed policy branch finishers overriding branches - oops! + +Fixed softlock for mod policies overriding existing policy locations + +By SomeTroglodyte: +- Map editor update - concurrency, resource amounts, file double-click +- Fix UniqueType.RoadMaintenance being ignored +- Fix mouse wheel on NotificationsScroll +- Unit overview remembers scroll position after promoting + +By alexban011: +- feat: allow loading of games if there are no saved games +- docs: added documentation for running detekt + ## 4.6.14 By SomeTroglodyte: diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index ce59802445..1cecf6147b 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -531,7 +531,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci companion object { //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT - val VERSION = Version("4.6.14-patch1", 871) + val VERSION = Version("4.6.15", 872) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/872.txt b/fastlane/metadata/android/en-US/changelogs/872.txt new file mode 100644 index 0000000000..2b165aa0d2 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/872.txt @@ -0,0 +1,29 @@ + + +Modding: units can transform without limit on destination unit + +4.6.14-patch1 + +4.6.14-patch1 + +Resolve - update dockerfile + +Unpurchaseable units are properly unpurchaseable + +Migrated Linux JRE to latest Adoptium Temurin + +Resolved - Crop yield chart no longer displays score data + +Fixed policy branch finishers overriding branches - oops! + +Fixed softlock for mod policies overriding existing policy locations + +By SomeTroglodyte: +- Map editor update - concurrency, resource amounts, file double-click +- Fix UniqueType.RoadMaintenance being ignored +- Fix mouse wheel on NotificationsScroll +- Unit overview remembers scroll position after promoting + +By alexban011: +- feat: allow loading of games if there are no saved games +- docs: added documentation for running detekt \ No newline at end of file