diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 9ebd26f188..b91b3dfacb 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -6002,8 +6002,7 @@ What you don't see: The phone/tablet's back button will pop the question whether After building a shrine, your civilization will start generating ☮Faith. = Depois de construir um santuário, sua civilização começará a gerar Fé. When enough ☮Faith has been generated, you will be able to found a pantheon. = Quando o suficiente de Fé for gerado, você poderá fundar um panteão. - # Requires translation! -A pantheon will provide a small bonus for your civilization that will apply to all cities that have it as a majority religion. = +A pantheon will provide a small bonus for your civilization that will apply to all cities that have it as a majority religion. = Um panteão fornecerá um pequeno bônus para sua civilização que se aplicará a todas as cidades que o têm como religião majoritária. Each civilization can only choose a single pantheon belief, and each pantheon can only be chosen once. = Cada civilização sé pode escolher uma única crença no panteão, e cada panteão só pode ser escolhido uma vez. Generating more ☮Faith will allow you to found a religion. = Gerar mais Fé lhe permitirá fundar uma religião. diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties index b0b78f5fd2..ba27d2fdf7 100644 --- a/android/assets/jsons/translations/Catalan.properties +++ b/android/assets/jsons/translations/Catalan.properties @@ -345,15 +345,12 @@ Map file = Fitxer de mapa Max Turns = Límit de torns Could not load map! = No s’ha pogut carregar el mapa. Generated = Generat - # Requires translation! -Random Generated = - # Requires translation! -Which options should be available to the random selection? = +Random Generated = Generat a l’atzar +Which options should be available to the random selection? = Quines opcions han d’estar disponibles com a selecció aleatòria? Existing = Existent Custom = Personalitzat Map Generation Type = Tipus de generació del mapa - # Requires translation! -Enabled Map Generation Types = +Enabled Map Generation Types = Tipus de generació de mapes activats Default = Per defecte Pangaea = Pangea Smoothed Random = Suau aleatori @@ -384,8 +381,7 @@ Time = Per temps ? = ? Map Shape = Forma del mapa - # Requires translation! -Enabled Map Shapes = +Enabled Map Shapes = Formes del mapa activades Hexagonal = Hexagonal Flat Earth Hexagonal = Terra hexagonal pla Rectangular = Rectangular @@ -395,10 +391,8 @@ Radius = Radi Enable Espionage = Permet l’espionatge Resource Setting = Ajustament de recursos - # Requires translation! -Enabled Resource Settings = - # Requires translation! -Other Settings = +Enabled Resource Settings = Configuració de recursos activada +Other Settings = Altres opcions Sparse = Escassos Abundant = Abundants Strategic Balance = Balanç estratègic @@ -422,8 +416,7 @@ Open Documentation = Obre la documentació Don't show again = No mostris més World Size = Mida del món - # Requires translation! -Enabled World Sizes = +Enabled World Sizes = Mides del mapa activades Tiny = Diminut Small = Petit Medium = Mitjà @@ -531,8 +524,6 @@ Area: [amount] tiles, [amount2]% water, [amount3] continents/islands = Àrea: [a Do you want to leave without saving the recent changes? = Voleu sortir sense desar els últims canvis? Leave = Surt Do you want to load another map without saving the recent changes? = Voleu carregar un altre mapa sense desar els últims canvis? -Invalid map: Area ([area]) does not match saved dimensions ([dimensions]). = Mapa no vàlid: L’àrea ([area]) no concorda amb les dimensions desades ([dimensions]). -The dimensions have now been fixed for you. = s’han corregit les dimensions. River generation failed! = Ha fallat la generació de rius. Please don't use step 'Landmass' with map type 'Empty', create a new empty map instead. = No useu «Continents» amb el tipus de mapa «Buit»; millor creeu un mapa nou. This map has errors: = Aquest mapa té errors: @@ -699,12 +690,9 @@ Sound effects volume = Volum dels efectes de so Music volume = Volum de la música City ambient sound volume = Volum del so ambiental de les ciutats Pause between tracks = Pausa entre les pistes - # Requires translation! -Pause = - # Requires translation! -Music = - # Requires translation! -Skip = +Pause = Posa en pausa +Music = Música +Skip = Salta Currently playing: [title] = Ara es reprodueix: [title] Download music = Descarrega música Downloading... = Es descarrega... @@ -1077,8 +1065,7 @@ In resistance for another [numberOfTurns] turns = Queden [numberOfTurns] torns d We Love The King Day for another [numberOfTurns] turns = Queden [numberOfTurns] torns del Dia del Rei. Demanding [resource] = Es demana [resource]. Sell for [sellAmount] gold = Ven per [sellAmount] d’or - # Requires translation! -Sell = +Sell = Ven Are you sure you want to sell this [building]? = Esteu segur que voleu vendre aquest [building]? Free = De franc [greatPerson] points = Punts de [greatPerson] @@ -1453,8 +1440,7 @@ Completed = Completat On adoption = Quan s’adopta On completion = Quan es completa Cannot be adopted together with = Es pot adoptar junt amb - # Requires translation! -Cannot be adopted before = +Cannot be adopted before = No es pot adoptar abans de Adopt policy = Adopta una política Adopt free policy = Adopta una política de franc Unlocked at = Desblocat a @@ -1529,7 +1515,7 @@ Bonus when performing air sweep [bonusAmount]% = Bonificació del [bonusAmount] Dogfighting I = Combat aeri I Dogfighting II = Combat aeri II Dogfighting III = Combat aeri III -Choose name for [unitName] = Trieu un nom per a [unitName] +Choose name for [unitName] = Trieu un nom per a [unitName]: [unitFilter] units gain the [promotion] promotion = [unitFilter] unitats guanyen l’ascens de [promotion]. Requires = Necessita @@ -6014,8 +6000,7 @@ What you don't see: The phone/tablet's back button will pop the question whether After building a shrine, your civilization will start generating ☮Faith. = Després de construir un santuari, la civilització comença a generar fe (☮). When enough ☮Faith has been generated, you will be able to found a pantheon. = Quan s’ha generat suficient fe (☮), es pot fundar un panteó. - # Requires translation! -A pantheon will provide a small bonus for your civilization that will apply to all cities that have it as a majority religion. = +A pantheon will provide a small bonus for your civilization that will apply to all cities that have it as a majority religion. = Un panteó proporciona una petita bonificació per a la civilització i s’aplicarà a totes les ciutats que la tinguin com a religió majoritària. Each civilization can only choose a single pantheon belief, and each pantheon can only be chosen once. = Cada civilització només pot triar una creença de panteó i cada panteó es pot triar una sola vegada. Generating more ☮Faith will allow you to found a religion. = Si es genera més fe (☮), es pot fundar una religió. diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index ece1ef17a1..4e2c7f6df5 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -1468,7 +1468,7 @@ Reform Religion = Religion umgestalten Expand Pantheon = Pantheon erweitern Follow [belief] = An [belief] glauben Religions and Beliefs = Religionen und Glaubenssätze -Majority Religion: [name] = Hauptreligion: [name] +Majority Religion: [name] = Mehrheitsreligion: [name] + [amount] pressure = + [amount] Druck Holy City of: [religionName] = Heilige Stadt von: [religionName] Former Holy City of: [religionName] = Ehemalige heilige Stadt von: [religionName] @@ -1712,7 +1712,7 @@ in cities following this religion = in Städten, die dieser Religion folgen ######### Population Filters ########### Unemployed = Unbeschäftigt -Followers of the Majority Religion = Anhänger der Hauptreligion +Followers of the Majority Religion = Anhänger der Mehrheitsreligion Followers of this Religion = Anhänger dieser Religion ######### Terrain Filters ########### @@ -6002,8 +6002,7 @@ What you don't see: The phone/tablet's back button will pop the question whether After building a shrine, your civilization will start generating ☮Faith. = Nachdem du einen Schrein gebaut hast, wird deine Zivilisation anfangen, Glaube☮ zu erzeugen. When enough ☮Faith has been generated, you will be able to found a pantheon. = Wenn du genug Glaube☮ gesammelt hast, kannst du ein Pantheon gründen. - # Requires translation! -A pantheon will provide a small bonus for your civilization that will apply to all cities that have it as a majority religion. = +A pantheon will provide a small bonus for your civilization that will apply to all cities that have it as a majority religion. = Ein Pantheon bietet einen kleinen Bonus für deine Zivilisation, der für alle Städte gilt, die es als Mehrheitsreligion haben. Each civilization can only choose a single pantheon belief, and each pantheon can only be chosen once. = Jede Zivilisation kann nur einen einzigen Pantheon-Glaubenssatz wählen, und jedes Pantheon kann nur einmal gewählt werden. Generating more ☮Faith will allow you to found a religion. = Wenn du mehr Glaube erzeugst, kannst du eine Religion gründen. @@ -6039,7 +6038,7 @@ These two units can even enter tiles of civilizations with whom you don't have a But do take care, missionaries will lose 250 religious strength each turn they end while in foreign lands. = Aber Obacht: Missionare verlieren mit jeder Runde, die sie auf fremden Feldern beenden, 250 religiöse Kraft. This diminishes their effectiveness when spreading religion, and if their religious strength ever reaches 0, they have lost their faith and disappear. = Dies mindert ihre Wirksamkeit bei der Verbreitung der Religion, und wenn ihre religiöse Kraft jemals 0 erreicht, haben sie ihren Glauben verloren und verschwinden. When you do spread your religion, the religious strength of the unit is added as pressure for that religion. = Wenn du deine Religion verbreitest, wird die religiöse Stärke der Einheit als Druck für diese Religion hinzugefügt. -Cities also passively add pressure of their majority religion to nearby cities. = Die Städte üben auch passiv Druck durch ihre Hauptreligion auf die umliegenden Städte aus. +Cities also passively add pressure of their majority religion to nearby cities. = Die Städte üben auch passiv Druck durch ihre Mehrheitsreligion auf die umliegenden Städte aus. Each city provides +6 pressure per turn to all cities within 10 tiles, though the exact amount of pressure depends on the game speed. = Jede Stadt übt pro Zug +6 Druck auf alle Städte im Umkreis von 10 Feldern aus, wobei die genaue Höhe des Drucks von der Spielgeschwindigkeit abhängt. This pressure can also be seen in the city screen, and gives you an idea of how religions in your cities will evolve if you don't do anything. = Dieser Druck ist auch in der Stadtansicht zu sehen und gibt dir eine Vorstellung davon, wie sich die Religionen in deinen Städten entwickeln werden, wenn du nichts unternimmst. Holy cities also provide +30 pressure of the religion founded there to themselves, making it very difficult to effectively convert a holy city. = Heilige Städte gewähren auch +30 Druck der dort gegründeten Religion auf sich selbst, was es sehr schwierig macht, eine heilige Stadt effektiv zu bekehren. diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 83640b5abf..fe83a9cb46 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -6017,8 +6017,7 @@ What you don't see: The phone/tablet's back button will pop the question whether After building a shrine, your civilization will start generating ☮Faith. = Una volta costruito un santuario, la tua civiltà comincerà a generare Fede☮. When enough ☮Faith has been generated, you will be able to found a pantheon. = Una volta generata abbastanza Fede☮, potrai fondare un Pantheon. - # Requires translation! -A pantheon will provide a small bonus for your civilization that will apply to all cities that have it as a majority religion. = +A pantheon will provide a small bonus for your civilization that will apply to all cities that have it as a majority religion. = Un pantheon concede un piccolo bonus per la tua civiltà, bonus che si applica a tutte le città che lo possiedono come religione di maggioranza. Each civilization can only choose a single pantheon belief, and each pantheon can only be chosen once. = Ogni civiltà può scegliere una singola credenza di pantheon, e ogni Pantheon può essere scelto solo una volta. Generating more ☮Faith will allow you to found a religion. = Generare altra Fede ti permetterà di fondare una Religione. diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index b2a8d371f6..98b6f8d3b5 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -4361,7 +4361,7 @@ Pictish Courage = 용맹한 픽트족 Home Sweet Home = 즐거운 우리집 [relativeAmount]% Strength decreasing with distance from the capital = 수도 근처에서 전투력 [relativeAmount]%, 수도와 멀어질수록 감소함 -[unit] ability = [unit] ability +[unit] ability = [unit] 특성 Heals [amount] damage if it kills a unit = 유닛 처치시 [amount] HP 회복 @@ -4786,7 +4786,7 @@ Tithe = 십일조 World Church = 초교파교회 -Enhancer = 강화 교리 +Enhancer = 강화 Defender of the Faith = 신앙의 수호자 Holy Order = 종교 단체 @@ -6003,7 +6003,7 @@ What you don't see: The phone/tablet's back button will pop the question whether After building a shrine, your civilization will start generating ☮Faith. = 성소를 지으면 ☮신앙을 얻을 수 있습니다. When enough ☮Faith has been generated, you will be able to found a pantheon. = ☮신앙이 충분히 모이면 종교관을 세울 수 있습니다. # Requires translation! -A pantheon will provide a small bonus for your civilization that will apply to all cities that have it as a majority religion. = +A pantheon will provide a small bonus for your civilization that will apply to all cities that have it as a majority religion. = 종교관을 대중 종교로 믿는 내 문명의 모든 도시에는 소소한 보너스가 주어집니다. Each civilization can only choose a single pantheon belief, and each pantheon can only be chosen once. = 문명마다 하나의 종교관만 선택할 수 있고, 이미 선택된 종교관은 다른 문명이 선택할 수 없습니다. Generating more ☮Faith will allow you to found a religion. = ☮신앙을 더 생산하면 종교를 창시할 수 있습니다. diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index a2335c8d3c..4eab3133c5 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -6002,8 +6002,7 @@ What you don't see: The phone/tablet's back button will pop the question whether After building a shrine, your civilization will start generating ☮Faith. = 建造神殿后，你们的文明将开始产生信仰☮。 When enough ☮Faith has been generated, you will be able to found a pantheon. = 当你产生了足够的信仰☮时，您将能够创建万神殿。 - # Requires translation! -A pantheon will provide a small bonus for your civilization that will apply to all cities that have it as a majority religion. = +A pantheon will provide a small bonus for your civilization that will apply to all cities that have it as a majority religion. = 万神殿将为你的文明提供一些奖励；这将适用于所有以它为主要宗教的城市。 Each civilization can only choose a single pantheon belief, and each pantheon can only be chosen once. = 每个文明只能选择一个万神殿信仰，每个万神殿只能选择一次。 Generating more ☮Faith will allow you to found a religion. = 产生更多的信仰会让你创立一种宗教。 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 8c3cc325b8..98938bb99a 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 = 792 - const val appVersion = "4.3.18" + const val appCodeNumber = 793 + const val appVersion = "4.3.19" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 7c4230e00a..c95a48b3de 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,33 @@ +## 4.3.19 + +Better victory data @touhidurrr + +Resolve - Politics shortcut works + +Resolve - limit the number of workers an AI creates + +Performance improvement for automated units looking for cities to connect + +Resolve - include win/lose info in games, popup for multiplayer when someone else has won + +Fix "sell" containing square brackets + +Sleeping units wake if there's an enemy in 3-tile radius + +Fixed tests + +Updated Unciv Android icons + +Resolve - AI peace deals don't pay more gold than they have + +Resolve - Higher chance of starting bias for human players + +Resolve - You can use missionaries of foreign religions religions + +Resolve - Remove 'incorrect area' code for super-old maps + +Platform Graphical Asset Update - By letstalkaboutdune + ## 4.3.18 Units are not displaced to enemy land when kicked out of borders diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index ce3178faf6..645f2ce7d4 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.18", 792) + val VERSION = Version("4.3.19", 793) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/793.txt b/fastlane/metadata/android/en-US/changelogs/793.txt new file mode 100644 index 0000000000..2ccdf7a2a7 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/793.txt @@ -0,0 +1,29 @@ + + +Better victory data @touhidurrr + +Resolve - Politics shortcut works + +Resolve - limit the number of workers an AI creates + +Performance improvement for automated units looking for cities to connect + +Resolve - include win/lose info in games, popup for multiplayer when someone else has won + +Fix "sell" containing square brackets + +Sleeping units wake if there's an enemy in 3-tile radius + +Fixed tests + +Updated Unciv Android icons + +Resolve - AI peace deals don't pay more gold than they have + +Resolve - Higher chance of starting bias for human players + +Resolve - You can use missionaries of foreign religions religions + +Resolve - Remove 'incorrect area' code for super-old maps + +Platform Graphical Asset Update - By letstalkaboutdune \ No newline at end of file