diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index e0d0f0cd94..758319d0bf 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -75,8 +75,8 @@ Hydro Plant = Centrale Hydroélectrique # Diplomacy,Trade,Nations -Requires [buildingName] to be built in the city = Nécessite de construire un(e) [buildingName] dans la ville -Requires [buildingName] to be built in all cities = Nécessite de construire un(e) [buildingName] dans toutes les villes +Requires [buildingName] to be built in the city = Nécessite [buildingName] dans la ville +Requires [buildingName] to be built in all cities = Nécessite [buildingName] dans toutes les villes Provides a free [buildingName] in the city = Fournit un(e) [buildingName] gratuit(e) dans la ville Requires worked [resource] near city = Nécessite l'exploitation de [resource] près de la ville Requires at least one of the following resources worked near the city: = Nécessite qu'au moins une des ressources suivantes soit exploitée près de la ville : @@ -681,7 +681,7 @@ Display = Affichage ### Screen subgroup # Requires translation! -Screen = +Screen = Écran Screen Mode = Mode d'affichage Windowed = Fenêtré Fullscreen = Plein écran @@ -706,18 +706,18 @@ UI Skin = Style de l'interface ### UI subgroup # Requires translation! -UI = +UI = Interface # Requires translation! -Notifications on world screen = +Notifications on world screen = Affichage des notifications sur la carte # Requires translation! -Disabled = +Disabled = Désactivé # Requires translation! -Hidden = +Hidden = Caché # Requires translation! -Visible = +Visible = Visible # Requires translation! -Permanent = +Permanent = Permanent Minimap size = Taille de la minicarte @@ -732,13 +732,13 @@ Experimental Demographics scoreboard = Tableau comparatif des scores ### Visual Hints subgroup # Requires translation! -Visual Hints = +Visual Hints = Visuels Show worked tiles = Afficher les cases exploitées Show resources and improvements = Afficher les ressources et les aménagements Show tile yields = Afficher les rendements des cases Show unit movement arrows = Afficher les flèches de déplacement des unités # Requires translation! -Show suggested city locations for units that can found cities = +Show suggested city locations for units that can found cities = Afficher les suggestions d'emplacement d'une ville avant de la fonder Show pixel units = Afficher les unités en pixel-art Show pixel improvements = Afficher les aménagements en pixel-art Unit icon opacity = Opacité de l'icône des unités @@ -1083,7 +1083,7 @@ Wait = Attendre Are you sure you want to pillage this [improvement]? = Voulez-vous vraiment piller ce(tte) [improvement] ? We have looted [amount] from a [improvement] = Nous avons récupéré [amount] dans un(e) [improvement] We have looted [amount] from a [improvement] which has been sent to [cityName] = Nous avons récupéré [amount] dans un(e) [improvement] qui ont été envoyés à [cityName] -An enemy [unitName] has pillaged our [improvement] = Un(e) [unitName] ennemi(e) a pillé notre [improvement] +An enemy [unitName] has pillaged our [improvement] = [unitName] ennemi(e) a pillé notre [improvement] Create [improvement] = Bâtir [improvement] Start Golden Age = Démarrer un Âge d'Or Trigger unique = Déclencher unique @@ -1389,14 +1389,14 @@ One more turn...! = Encore un tour...! Destroy [civName] = Détruire [civName] Capture [cityName] = Conquérir [cityName] # Requires translation! -Destroy ? * [civName] = +Destroy ? * [civName] = Détruire ? * [civName] # Requires translation! -Capture ? * [cityName] = +Capture ? * [cityName] = Conquérir ? * [cityName] Our status = Notre situation Global status = Situation globale Rankings = Classements # Requires translation! -Charts = +Charts = Courbes Demographics = Comparatif Demographic = Statistiques Rank = Rang @@ -1619,7 +1619,7 @@ Religions to be founded: [amount] = Religions encore à fonder : [amount] Available religion symbols = Symboles disponibles de religion Number of civilizations * [amount] + [amount2] = Nombre de civilisations * [amount] + [amount2] # Requires translation! -Estimated Number of civilizations * [amount] + [amount2] = +Estimated Number of civilizations * [amount] + [amount2] = Nombre estimé de civilisations * [amount] + [amount2] Religions already founded = Religions déjà fondées Available founder beliefs = Croyances de Fondateur disponibles Available follower beliefs = Croyances de Fidèle disponibles @@ -2140,9 +2140,9 @@ when above [amount] [resource] = quand à plus de [amount] [resource] when below [amount] [resource] = quand à moins de [amount] [resource] in this city = dans cette ville # Requires translation! -in other cities = -in cities with a [buildingFilter] = dans les villes avec un(e) [buildingFilter] -in cities without a [buildingFilter] = dans les villes sans un(e) [buildingFilter] +in other cities = dans les autres villes +in cities with a [buildingFilter] = dans les villes avec [buildingFilter] +in cities without a [buildingFilter] = dans les villes sans [buildingFilter] in cities with at least [amount] [populationFilter] = dans les villes avec au moins [amount] en [populationFilter] with a garrison = avec une garnison for [mapUnitFilter] units = pour les unités [mapUnitFilter] diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 10a6c0d900..3482711fcc 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -680,8 +680,7 @@ Display = 显示 ### Screen subgroup - # Requires translation! -Screen = +Screen = 屏幕 Screen Mode = 屏幕模式 Windowed = 视窗 Fullscreen = 全屏 @@ -705,19 +704,13 @@ UI Skin = UI界面皮肤 ### UI subgroup - # Requires translation! -UI = +UI = 界面 - # Requires translation! -Notifications on world screen = - # Requires translation! -Disabled = - # Requires translation! -Hidden = - # Requires translation! -Visible = - # Requires translation! -Permanent = +Notifications on world screen = 世界屏幕上的通知 +Disabled = 已关闭 +Hidden = 已隐藏 +Visible = 已显示 +Permanent = 永久 Minimap size = 小地图大小 @@ -731,14 +724,12 @@ Experimental Demographics scoreboard = 启用实验性统计记分板 ### Visual Hints subgroup - # Requires translation! -Visual Hints = +Visual Hints = 视觉提示 Show worked tiles = 显示工作地块 Show resources and improvements = 显示资源与设施 Show tile yields = 显示地块产出 Show unit movement arrows = 显示单位移动箭头 - # Requires translation! -Show suggested city locations for units that can found cities = +Show suggested city locations for units that can found cities = 为能找到城市的单位显示建议的城市位置 Show pixel units = 显示像素单位 Show pixel improvements = 显示像素设施 Unit icon opacity = 单位图标不透明度 @@ -1388,15 +1379,12 @@ You have been defeated. Your civilization has been overwhelmed by its many foes. One more turn...! = 再来一回合...! Destroy [civName] = 毁灭[civName]文明 Capture [cityName] = 占领[cityName] - # Requires translation! -Destroy ? * [civName] = - # Requires translation! -Capture ? * [cityName] = +Destroy ? * [civName] = 要毁灭[civName]文明吗? +Capture ? * [cityName] = 要占领[cityName]吗? Our status = 我们的进度 Global status = 全球进度 Rankings = 排名 - # Requires translation! -Charts = +Charts = 图表 Demographics = 统计数据 Demographic = 统计数据 Rank = 排名 @@ -1618,8 +1606,7 @@ Minimal Faith required for\nthe next [Great Prophet]: = 产生下一位[Great Pr Religions to be founded: [amount] = 待建立的宗教: [amount] Available religion symbols = 可用的宗教符号 Number of civilizations * [amount] + [amount2] = 文明数量 * [amount] + [amount2] - # Requires translation! -Estimated Number of civilizations * [amount] + [amount2] = +Estimated Number of civilizations * [amount] + [amount2] = 估计的文明数量 * [amount] + [amount2] Religions already founded = 已建立的宗教 Available founder beliefs = 可用的创始人信仰 Available follower beliefs = 可用的追随者信仰 @@ -2138,12 +2125,11 @@ with [resource] = 拥有[resource]的 without [resource] = 未拥有[resource]的 when above [amount] [resource] = 当[resource]超过[amount]时 when below [amount] [resource] = 当[resource]低于[amount]时 -in this city = 所在城市 - # Requires translation! -in other cities = +in this city = 在这个城市中 +in other cities = 在其他城市中 in cities with a [buildingFilter] = 在建有[buildingFilter]的城市中 in cities without a [buildingFilter] = 在未建造[buildingFilter]的城市中 -in cities with at least [amount] [populationFilter] = 在至少有 [amount] [populationFilter] 的城市 +in cities with at least [amount] [populationFilter] = 在至少有 [amount] [populationFilter] 的城市中 with a garrison = 如果城市有军队驻扎 for [mapUnitFilter] units = [mapUnitFilter]单位 for units with [promotion] = 对于拥有[promotion]的单位 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index d1edba568a..4bf5e3e0df 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.8.0" const val appName = "Unciv" - const val appCodeNumber = 849 - const val appVersion = "4.6.2" + const val appCodeNumber = 850 + const val appVersion = "4.6.3" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 32bdabc476..9c5e79f365 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,15 @@ +## 4.6.3 + +Aircraft attack/move range colors entire tile + +By WhoIsJohannes: +- Show garrison in city screen, so that it's easier to decide whether one should produce a military unit. +- Great people automation +- Order defeated civs after alive civs even if the alive civs score is negative (e.g. for happiness) +- Fix golden age length action text + +Notifications can be "selected" - By SomeTroglodyte + ## 4.6.2 Added "in this city", "in other cities" conditionals for city-based uniques diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 5526243efc..070c751aeb 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.2", 849) + val VERSION = Version("4.6.3", 850) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/850.txt b/fastlane/metadata/android/en-US/changelogs/850.txt new file mode 100644 index 0000000000..97e138326c --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/850.txt @@ -0,0 +1,11 @@ + + +Aircraft attack/move range colors entire tile + +By WhoIsJohannes: +- Show garrison in city screen, so that it's easier to decide whether one should produce a military unit. +- Great people automation +- Order defeated civs after alive civs even if the alive civs score is negative (e.g. for happiness) +- Fix golden age length action text + +Notifications can be "selected" - By SomeTroglodyte \ No newline at end of file