From 0a3f1c638415c4cc01a248a119c3ad45eee2d59c Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 18 Dec 2022 19:36:04 +0200 Subject: [PATCH] Version rollout (#8172) * Bump version and create initial changelog entry * Update Traditional_Chinese.properties (#8171) * Update French.properties (#8160) * Update Korean.properties (#8157) * Update Korean.properties * Update Korean.properties * Update Korean.properties * Update Simplified_Chinese.properties (#8156) * Update Italian.properties (#8155) Co-authored-by: yairm210 Co-authored-by: nacro711072 Co-authored-by: Ouaz Co-authored-by: Yattong the Mackerel Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com> Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com> --- .../jsons/translations/French.properties | 12 ++--- .../jsons/translations/Italian.properties | 15 ++---- .../jsons/translations/Korean.properties | 10 ++-- .../Simplified_Chinese.properties | 27 ++++------ .../Traditional_Chinese.properties | 53 +++++++------------ buildSrc/src/main/kotlin/BuildConfig.kt | 4 +- changelog.md | 28 ++++++++++ core/src/com/unciv/UncivGame.kt | 2 +- .../metadata/android/en-US/changelogs/779.txt | 27 ++++++++++ 9 files changed, 101 insertions(+), 77 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/779.txt diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index e562808a91..2383d2bb4d 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -351,9 +351,9 @@ Default = Défaut Pangaea = Pangée Smoothed Random = Aléatoire lissé # Requires translation! -Two Continents = +Two Continents = Deux continents # Requires translation! -Three Continents = +Three Continents = Trois continents Four Corners = Quatre coins Archipelago = Archipel Inner Sea = Mer intérieure @@ -379,7 +379,7 @@ Time = Temps Map Shape = Forme de la carte Hexagonal = Hexagonale # Requires translation! -Flat Earth Hexagonal = +Flat Earth Hexagonal = Hexagonale (Terre Plate) Rectangular = Rectangulaire Height = Hauteur Width = Largeur @@ -693,14 +693,14 @@ Show worked tiles = Afficher les cases exploitées Show resources and improvements = Afficher les ressources et les aménagements Check for idle units = Vérifier les unités inactives # Requires translation! -Auto Unit Cycle = +Auto Unit Cycle = Passer automatiquement à l'unité suivante Move units with a single tap = Déplacer les unités d'un seul clic Show tutorials = Afficher les tutoriels Auto-assign city production = Production automatique des villes Auto-build roads = Construction automatique des routes Automated workers replace improvements = Les ouvriers automatisés remplacent les aménagements # Requires translation! -Automated units move on turn start = +Automated units move on turn start = Les unités automatisées se déplacent au début du tour Minimap size = Taille de la minicarte off = off Show pixel units = Afficher les unités en pixel-art @@ -902,7 +902,7 @@ Waiting for [civName]... = En attente de [civName]... in = dans Next turn = Tour suivant Confirm next turn = Passer au tour suivant ? -Move automated units = Effectuer les actions planifiées +Move automated units = Déplacer les unités automatisées [currentPlayerCiv] ready? = [currentPlayerCiv] prêt(e) ? 1 turn = 1 tour [numberOfTurns] turns = [numberOfTurns] tours diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index c2cc6d554b..ab99bee56d 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -353,10 +353,8 @@ Map Generation Type = Tipo generazione mappa Default = Default Pangaea = Pangea Smoothed Random = Casuale piatta - # Requires translation! -Two Continents = - # Requires translation! -Three Continents = +Two Continents = Due continenti +Three Continents = Tre continenti Four Corners = Quattro angoli Archipelago = Arcipelago Inner Sea = Mare interno @@ -381,8 +379,7 @@ Time = A tempo Map Shape = Forma della mappa Hexagonal = Esagonale - # Requires translation! -Flat Earth Hexagonal = +Flat Earth Hexagonal = Terra piatta esagonale Rectangular = Rettangolare Height = Altezza Width = Larghezza @@ -696,15 +693,13 @@ Hide = Nascondi Show worked tiles = Mostra caselle sfruttate Show resources and improvements = Mostra risorse e miglioramenti Check for idle units = Controlla unità inutilizzate - # Requires translation! -Auto Unit Cycle = +Auto Unit Cycle = Auto-cicla unità Move units with a single tap = Muovi unità con un solo tocco Show tutorials = Mostra tutorial Auto-assign city production = Autoassegna produzione città Auto-build roads = Costruzione strade automatica Automated workers replace improvements = I lavoratori automatizzati rimpiazzano i miglioramenti - # Requires translation! -Automated units move on turn start = +Automated units move on turn start = Le unità automatizzate si muovono a inizio turno Minimap size = Grandezza minimappa off = Disattiva Show pixel units = Mostra unità pixel diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 314cc193e6..7a43af8da6 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -377,7 +377,7 @@ Time = 시간 Map Shape = 지도 모양 Hexagonal = 육각형 # Requires translation! -Flat Earth Hexagonal = +Flat Earth Hexagonal = 육각 평면설지구 Rectangular = 사각형 Height = 높이 Width = 너비 @@ -691,14 +691,14 @@ Show worked tiles = 시민 배치 보기 Show resources and improvements = 자원/시설 아이콘 보기 Check for idle units = 턴 넘기기 전에 미행동 유닛 보기 # Requires translation! -Auto Unit Cycle = +Auto Unit Cycle = '다음 유닛' 버튼 자동 Move units with a single tap = 탭 한 번에 유닛 이동 Show tutorials = 튜토리얼 보기 Auto-assign city production = 도시 생산 선택 자동 Auto-build roads = 도로 건설 자동 Automated workers replace improvements = 시설 대체 자동 # Requires translation! -Automated units move on turn start = +Automated units move on turn start = 턴 시작할 때 자동화한 유닛 움직임 Minimap size = 미니맵 크기 off = 끄기 Show pixel units = 유닛 그래픽 보기 @@ -4354,7 +4354,7 @@ Invisible to non-adjacent units = 인접한 유닛이 없으면 보이지 않음 Can see invisible [mapUnitFilter] units = [mapUnitFilter] 유닛 탐지 가능 -Aircraft = 항공 유닛 +Aircraft = 항공기 Can see over obstacles = 시야가 지형을 무시함 Can perform Air Sweep = 대공 무력화 가능 @@ -4393,7 +4393,7 @@ Requires at least [amount] population = 인구 [amount] 이상부터 생산 가 May upgrade to [baseUnitFilter] through ruins-like effects = 고대 유적 등을 통해서 [baseUnitFilter](으)로 업그레이드 가능 -This is your basic, club-swinging fighter. = 이것은 방망이를 휘두르는 가장 기초적인 전투 유닛입니다. +This is your basic, club-swinging fighter. = 곤봉을 휘두르는 가장 기초적인 전투 유닛입니다. Maori Warrior = 마오리 전사 diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index e278505c4b..a440985f51 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -350,10 +350,8 @@ Map Generation Type = 生成地图类型 Default = 预设 Pangaea = 盘古大陆 Smoothed Random = 平滑随机 - # Requires translation! -Two Continents = - # Requires translation! -Three Continents = +Two Continents = 两个大洲 +Three Continents = 三个大洲 Four Corners = 四岛 Archipelago = 群岛 Inner Sea = 内海 @@ -378,8 +376,7 @@ Time = 时间 Map Shape = 地图形状 Hexagonal = 六边形 - # Requires translation! -Flat Earth Hexagonal = +Flat Earth Hexagonal = 扁平地球六边形 Rectangular = 四边形 Height = 高度 Width = 宽度 @@ -692,15 +689,13 @@ Hide = 隐藏 Show worked tiles = 显示工作地块 Show resources and improvements = 显示资源与设施 Check for idle units = 回合结束前查看闲置单位 - # Requires translation! -Auto Unit Cycle = +Auto Unit Cycle = 自动循环单位 Move units with a single tap = 点击目标地块立即移动 Show tutorials = 显示教程 Auto-assign city production = 自动分配城市产能 Auto-build roads = 自动建造道(铁)路 Automated workers replace improvements = 工人自动更换设施 - # Requires translation! -Automated units move on turn start = +Automated units move on turn start = 每回合开始时自动移动单位 Minimap size = 小地图大小 off = 关闭 Show pixel units = 显示像素单位 @@ -822,8 +817,7 @@ We have captured a barbarian encampment and recovered [goldAmount] gold! = 我 An enemy [unitType] has joined us! = 一个敌方[unitType]加入了我们! After an unknown civilization entered the [eraName], we have recruited [spyName] as a spy! = 在一个未知的文明进入[eraName]之后,我们招募到了间谍[spyName]! We have recruited [spyName] as a spy! = 我们培养了一位名为[spyName]的间谍! - # Requires translation! -[unitName] can be promoted! = +[unitName] can be promoted! = [unitName]可晋升了! # This might be needed for a rewrite of Germany's unique - see #7376 A barbarian [unitType] has joined us! = 一个蛮族[unitType]投靠了我们! @@ -1340,8 +1334,7 @@ Defence bonus = 防御力加成 Movement cost = 移动力消耗 for = ,当建造在拥有下列资源的地块上时: Missing translations: = 未翻译的词条: - # Requires translation! -Screen Size = +Screen Size = 屏幕尺寸 Tileset = 地块材质 Unitset = 单位材质 UI Skin = UI界面皮肤 @@ -1538,8 +1531,7 @@ Update [modName] = 更新 [modName] Could not download mod list = 无法下载模组列表 Download mod from URL = 从网络地址获取模组 Please enter the mod repository -or- archive zip url: = 请输入模组仓库 -或- zip 压缩包网址: - # Requires translation! -Paste from clipboard = +Paste from clipboard = 从剪切板粘贴 Download = 下载 Done! = 完成! Delete [modName] = 删除模组:[modName] @@ -3141,8 +3133,7 @@ Las Palmas = 拉斯帕尔马斯 Tenerife = 特内里费岛 Spain = 西班牙 100 Gold for discovering a Natural Wonder (bonus enhanced to 500 Gold if first to discover it) = 每发现一座自然奇观+100金钱(若为第一个发现该自然奇观的文明,奖励则增加至500金钱) - # Requires translation! -[stats] for every known Natural Wonder = +[stats] for every known Natural Wonder = 每个已知的自然奇观[stats] [relativeAmount]% Yield from every [tileFilter/buildingFilter] = [relativeAmount]%来自每个[tileFilter/buildingFilter]的产出 Askia = 阿斯基亚 diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 52eb2b02dc..1af0b561d7 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -350,10 +350,8 @@ Map Generation Type = 生成地圖類型 Default = 預設 Pangaea = 盤古大陸 Smoothed Random = 隨機 - # Requires translation! -Two Continents = - # Requires translation! -Three Continents = +Two Continents = 兩島 +Three Continents = 三島 Four Corners = 四島 Archipelago = 群島 Inner Sea = 內海 @@ -378,8 +376,7 @@ Time = 時間 Map Shape = 地圖形狀 Hexagonal = 六邊形 - # Requires translation! -Flat Earth Hexagonal = +Flat Earth Hexagonal = 地球平面六邊形 Rectangular = 長方形 Height = 高度 Width = 寬度 @@ -699,8 +696,7 @@ Show tutorials = 顯示教學 Auto-assign city production = 自動分配城市產能 Auto-build roads = 自動建造道(鐵)路 Automated workers replace improvements = 工人自動更換設施 - # Requires translation! -Automated units move on turn start = +Automated units move on turn start = 回合開始時,移動自動行動單位 Minimap size = 小地圖大小 off = 關 Show pixel units = 顯示像素單位 @@ -822,8 +818,7 @@ We have captured a barbarian encampment and recovered [goldAmount] gold! = 我 An enemy [unitType] has joined us! = 敵方[unitType]加入了我們! After an unknown civilization entered the [eraName], we have recruited [spyName] as a spy! = 在未知的文明進入了[eraName]後,我們招募了[spyName]作為間諜! We have recruited [spyName] as a spy! = 我們招募了[spyName]作為間諜! - # Requires translation! -[unitName] can be promoted! = +[unitName] can be promoted! = [unitName]可以晉升 # This might be needed for a rewrite of Germany's unique - see #7376 A barbarian [unitType] has joined us! = 蠻族的[unitType]加入了我們! @@ -1341,11 +1336,9 @@ Defence bonus = 防禦力加成 Movement cost = 移動力消耗 for = ,當建造在擁有下列資源的地區上時: Missing translations: = 未翻譯的字串: - # Requires translation! -Screen Size = -Tileset = 地區設定 - # Requires translation! -Unitset = +Screen Size = 視窗大小 +Tileset = 地塊集設定 +Unitset = 單位集設定 UI Skin = 使用者介面樣式 Create = 創建 Language = 語言設定 @@ -1540,8 +1533,7 @@ Update [modName] = 更新模組:[modName] Could not download mod list = 無法下載模組列表 Download mod from URL = 從網絡地址獲取模組 Please enter the mod repository -or- archive zip url: = 請輸入模組來源 -或- 壓縮檔的網址 - # Requires translation! -Paste from clipboard = +Paste from clipboard = 從剪貼簿貼上 Download = 下載 Done! = 完成! Delete [modName] = 刪除模組:[modName] @@ -3143,8 +3135,7 @@ Las Palmas = 拉斯帕爾馬斯 Tenerife = 特內里費島 Spain = 西班牙 100 Gold for discovering a Natural Wonder (bonus enhanced to 500 Gold if first to discover it) = 每發現一座自然奇觀+100金錢(若為第一個發現該自然奇觀的文明,獎勵則增加至500金錢) - # Requires translation! -[stats] for every known Natural Wonder = +[stats] for every known Natural Wonder = 每個已知的自然奇觀[stats] [relativeAmount]% Yield from every [tileFilter/buildingFilter] = [relativeAmount]%來自每個[tileFilter/buildingFilter]的產出 Askia = 阿斯基亞 @@ -5363,16 +5354,11 @@ Austria = 奧地利 Can spend Gold to annex or puppet a City-State that has been your ally for [amount] turns. = 可以花費金錢來吞併或傀儡一座已結盟[amount]個回合的城邦。 Dido = 狄多 - # Requires translation! -Tell me, do you all know how numerous my armies, elephants and the gdadons are? No? Today, you shall find out! = - # Requires translation! -Fate is against you. You earned the animosity of Carthage in your exploration. Your days are numbered. = - # Requires translation! -The fates became to hate me. This is it? You wouldn't destroy us so without their help. = - # Requires translation! -The Phoenicians welcome you to this most pleasant kingdom. I am Dido, the queen of Carthage and all that belongs to it. = - # Requires translation! -I just had the marvelous idea, and I think you'll appreciate it too. = +Tell me, do you all know how numerous my armies, elephants and the gdadons are? No? Today, you shall find out! = 你們都知道我有多少軍隊、大象、格達頓?不知道?那今天你將會了解! +Fate is against you. You earned the animosity of Carthage in your exploration. Your days are numbered. = 命運總是與你作對。你的試探激起了迦太基的敵意,你的日子將所剩無幾。 +The fates became to hate me. This is it? You wouldn't destroy us so without their help. = 我被命運所厭惡。難道就這樣結束了?沒有他們的幫助,你不可能摧毀我們。 +The Phoenicians welcome you to this most pleasant kingdom. I am Dido, the queen of Carthage and all that belongs to it. = 腓尼基人歡迎你來到這最愉快的王國。我是迦太基的擁有者,女王狄多。 +I just had the marvelous idea, and I think you'll appreciate it too. = 我有一個奇妙的點子,我想你也會贊同它。 What is it now? = 現在是什麼? Phoenician Heritage = 腓尼基遺產 Hamilcar = 哈米爾卡 @@ -5380,8 +5366,7 @@ Mago = 馬戈 Baalhaan = 巴爾漢 Sophoniba = 索福尼巴 Yzebel = 伊澤貝爾 - # Requires translation! -Similce = +Similce = 西米爾斯 Kandaulo = 坎道洛 Zinnridi = 津里迪 Gisgo = 吉斯戈 @@ -5432,8 +5417,7 @@ Basil = 羅賽爾 Nikophoros = 尼科弗羅斯 Demetrios = 德米特里奧斯 Philippos = 飛利浦 - # Requires translation! -Theophylaktos = +Theophylaktos = 狄奧菲拉托斯 Simonis = 西蒙尼斯 Zoe = 佐伊 Ioanno = 約阿諾 @@ -5492,8 +5476,7 @@ Deirdre = 迪爾德麗 Mr. Quinn = 奎因先生 Éadaoin = 埃達因 Alwyn = 阿爾文 - # Requires translation! -Col Ceathar = +Col Ceathar = 切薩上校 Cardiff = 卡地夫 Truro = 特魯羅 Douglas = 道格拉斯 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 64102a148f..6cbf16b9a8 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.7.21" const val appName = "Unciv" - const val appCodeNumber = 778 - const val appVersion = "4.3.9-patch1" + const val appCodeNumber = 779 + const val appVersion = "4.3.10" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index e3a4dbb7b6..39111e4b9e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,31 @@ +## 4.3.10 + +Better unit action icons + +Solved temporary unique parsing error + +4.3.9-patch1 + +Handle mods with nations but no major civs + +Fixed global resource unique + +bugfix: players can no longer get citystate nations when selecting mod + +Thin lines around construction images + +UI improvements - added thin lines around circle icons, cleaner politics table + +By vegeta1k95: +- Rework of City Screen: new current buildings list + misc changes +- Construction table: ordering change (Civ 5) + add/remove on double-click +- Fix bug, where units do not reveal tiles () + +By alexban011: +- fixed global politics screen from revealing unknown civs and CityStates +- added mod topics to wiki +- fixed issue + ## 4.3.9 Modding: Can provide resources as a global unique diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 317b5daaff..4b11997b34 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -470,7 +470,7 @@ class UncivGame(parameters: UncivGameParameters) : Game() { companion object { //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT - val VERSION = Version("4.3.9", 777) + val VERSION = Version("4.3.10", 779) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/779.txt b/fastlane/metadata/android/en-US/changelogs/779.txt new file mode 100644 index 0000000000..c0455873df --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/779.txt @@ -0,0 +1,27 @@ + + +Better unit action icons + +Solved temporary unique parsing error + +4.3.9-patch1 + +Handle mods with nations but no major civs + +Fixed global resource unique + +bugfix: players can no longer get citystate nations when selecting mod + +Thin lines around construction images + +UI improvements - added thin lines around circle icons, cleaner politics table + +By vegeta1k95: +- Rework of City Screen: new current buildings list + misc changes +- Construction table: ordering change (Civ 5) + add/remove on double-click +- Fix bug, where units do not reveal tiles () + +By alexban011: +- fixed global politics screen from revealing unknown civs and CityStates +- added mod topics to wiki +- fixed issue \ No newline at end of file