diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties index dd6634d9c1..7e3fbe6880 100644 --- a/android/assets/jsons/translations/Catalan.properties +++ b/android/assets/jsons/translations/Catalan.properties @@ -946,10 +946,8 @@ Add in capital = Afegeix a la capital Add to [comment] = Afegeix a [comment] Upgrade to [unitType] ([goldCost] gold) = Millora a [unitType] ([goldCost] d’or) Upgrade to [unitType]\n([goldCost] gold, [resources]) = Millora a [unitType]\n([goldCost] d’or i [resources]) - # Requires translation! -Transform to [unitType] = - # Requires translation! -Transform to [unitType]\n([resources]) = +Transform to [unitType] = Transforma a [unitType] +Transform to [unitType]\n([resources]) = Transforma a [unitType]\n([resources]) Found city = Funda una ciutat Promote = Ascendeix Health = Salut @@ -1334,8 +1332,7 @@ Can upgrade from [unit] = Pot millorar-se a partir de [unit]. Can upgrade from: = Pot millorar-se a partir de: Upgrades to [upgradedUnit] = Millora a [upgradedUnit]. Obsolete with [obsoleteTech] = Obsolet amb [obsoleteTech]. - # Requires translation! -Can Transform to [upgradedUnit] = +Can Transform to [upgradedUnit] = Es pot transformar a [upgradedUnit] Occurs on [listOfTerrains] = Apareix en [listOfTerrains]. Occurs on: = Apareix en: Placed on [terrainType] = Es situa a [terrainType]. @@ -4940,6 +4937,8 @@ Zhao = Zhao Wu = Wu Zhou = Zhou Sun = Sun +upon entering the [era] = quan s'entri a l’[era] +Gain [amount] [stat] = Guanya [amount] [stat] Refaat = Refaat Heba = Heba @@ -6106,8 +6105,7 @@ Destroys tile improvements when attacking = Destrueix les millores de la casella Cannot move = No es pot moure. [amount] Movement point cost to embark = [amount] de cost de punts de moviment per embarcar Can speed up the construction of a wonder = Pot accelerar la construcció d’una meravella. - # Requires translation! -Can transform to [unit] = +Can transform to [unit] = Es pot transformar a [unit] Costs [amount] gold per turn when in your territory = Costa [amount] d’or per torn quan està al vostre territori. by consuming this unit = per consumir aquesta unitat before [amount] turns = abans de [amount] torns @@ -6140,7 +6138,6 @@ Free [baseUnitFilter] found in the ruins = s’ha trobat un [baseUnitFilter] de [amount] population in a random city = [amount] de població en una ciutat aleatòria [amount] free random researchable Tech(s) from the [era] = [amount] tecnologies aleatòries de franc de l’[era] Gain a free [beliefType] belief = Obtén una creença [beliefType] -Gain [amount] [stat] = Guanya [amount] [stat] Gain [amount]-[amount2] [stat] = Guanya [amount]-[amount2] [stat] Gain enough Faith for a Pantheon = Guanya prou fe per un panteó Gain enough Faith for [amount]% of a Great Prophet = Guanya prou fe per [amount] % d’un gran profeta @@ -6149,6 +6146,17 @@ From a randomly chosen tile [amount] tiles away from the ruins, reveal tiles up This Unit gains [amount] XP = Aquesta unitat guanya [amount] d’experiència This Unit upgrades for free including special upgrades = Aquesta unitat millora de franc, incloses les millores especials. This Unit gains the [promotion] promotion = Aquesta unitat guanya l’ascens [promotion]. +upon discovering [tech] = quan es descobreix [tech] +upon adopting [policy] = quan s’adopta [policy] +upon declaring war with a major Civilization = quan es declara la guerra a una civilització gran +upon declaring friendship = quan es declara amistat +upon entering a Golden Age = quan comença una edat d’or +upon conquering a city = quan es conquereix una ciutat +upon constructing [buildingFilter] = quan es construeix [buildingFilter] +upon constructing [buildingFilter] [cityFilter] = quan es construeix [buildingFilter] [cityFilter] +upon founding a Pantheon = quan es funda un panteó +upon founding a Religion = quan es funda una religió +upon enhancing a Religion = quan es difon una religió Hidden after generating a Great Prophet = Amagat després de generar un gran profeta. Triggerable = Desencadenable Global = Global @@ -6170,6 +6178,7 @@ Tutorial = Tutorial CityState = Ciutat-estat ModOptions = Opcions del mod Conditional = Condicional +TriggerCondition = Condició de desencadenat EstablishNetwork = Estableix una xarxa StealingTech = Roba tecnologia RiggingElections = Prepara les eleccions diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index f3f4287c56..f04846b0d9 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -946,10 +946,8 @@ Add in capital = Hinzufügen in Hauptstadt Add to [comment] = Hinzufügen zu [comment] Upgrade to [unitType] ([goldCost] gold) = Zu [unitType] aufrüsten ([goldCost] Gold) Upgrade to [unitType]\n([goldCost] gold, [resources]) = Zu [unitType] aufrüsten\n([goldCost] Gold, [resources]) - # Requires translation! -Transform to [unitType] = - # Requires translation! -Transform to [unitType]\n([resources]) = +Transform to [unitType] = Umwandeln zu [unitType] +Transform to [unitType]\n([resources]) = Umwandeln zu [unitType]\n([resources]) Found city = Stadt gründen Promote = Befördern Health = Gesundheit @@ -1189,7 +1187,7 @@ Wonders = Wunder Notifications = Benachrichtigungen Base values = Grundwerte Bonuses = Boni -Final = Endwert +Final = Endwerte Other = Andere Population = Bevölkerung City-States = Stadtstaaten @@ -1334,8 +1332,7 @@ Can upgrade from [unit] = Kann von [unit] aufgerüstet werden Can upgrade from: = Aufrüstung von: Upgrades to [upgradedUnit] = Kann zu [upgradedUnit] aufrüsten Obsolete with [obsoleteTech] = Überflüssig mit [obsoleteTech] - # Requires translation! -Can Transform to [upgradedUnit] = +Can Transform to [upgradedUnit] = Kann zu [upgradedUnit] umgewandelt werden Occurs on [listOfTerrains] = Kommt vor in [listOfTerrains] Occurs on: = Kommt vor in: Placed on [terrainType] = Platziert auf [terrainType] @@ -6106,8 +6103,7 @@ Destroys tile improvements when attacking = Zerstört die Feldverbesserung bei e Cannot move = Kann nicht bewegt werden [amount] Movement point cost to embark = [amount] Bewegungskosten zum Einschiffen Can speed up the construction of a wonder = Kann den Bau eines Wunders beschleunigen - # Requires translation! -Can transform to [unit] = +Can transform to [unit] = Kann zu [unit] umgewandelt werden Costs [amount] gold per turn when in your territory = Kostet [amount] Gold pro Runde innerhalb des eigenen Territoriums by consuming this unit = durch Verbrauch dieser Einheit before [amount] turns = vor [amount] Runden diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index f9e7259d24..fc9a63253b 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -7,8 +7,7 @@ # If the first word in a sentence starts with a capital in your language, # put the english word 'true' behind the '=', otherwise 'false'. # Don't translate these words to your language, only put 'true' or 'false'. - # Requires translation! -StartWithCapitalLetter = +StartWithCapitalLetter = true # Fastlane @@ -16,13 +15,11 @@ StartWithCapitalLetter = # Documentation: https://f-droid.org/en/docs/Build_Metadata_Reference/#Summary # English to translate: https://github.com/yairm210/Unciv/blob/master/fastlane/metadata/android/en-US/short_description.txt - # Requires translation! -Fastlane_short_description = +Fastlane_short_description = 4X civilizációépítő játék # Documentation: https://f-droid.org/en/docs/Build_Metadata_Reference/#Description # English to translate: https://github.com/yairm210/Unciv/blob/master/fastlane/metadata/android/en-US/full_description.txt - # Requires translation! -Fastlane_full_description = +Fastlane_full_description = Minden idők leghíresebb civilizációépítő játékának feldolgozása - gyors, kis méretű, reklámmentes, örökre ingyenes!\n\nÉpítsd fel a saját civilizációdat, kutass új technológiák után, bővítsd a városaidat és győzd le az ellenfeleidet!\n\nKérésed van? Hibát találtál? Az alkalmazás fejlesztési listáját eléred a https://github.com/yairm210/Unciv/issues címen, minden kis segítséget megköszönök!\n\nKérdésed van? Mondani szeretnél valamit? Esetleg unatkozol? Csatlakozz hozzánk itt: https://discord.gg/bjrB4Xw.\n\nSegítenél lefordítani a játékot a saját nyelvedre? Küldj egy e-mailt nekem a yairm210@hotmail.com címre.\n\nPenge vagy Java-ban vagy Kotlinban? Csatlakozz hozzánk a https://github.com/yairm210/Unciv címen.\n\nA világ csak téged vár! Kiállja-e az idő próbáját a birodalom, amellyé a civilizációdat fejleszted?\n\nA 'teljes hálózati hozzáférés' engedély szükséges, hogy a felhasználó alkalmazásból indított letöltései és a többjátékos mód működjön. Minden más engedélyt a többjátékos mód körösszefoglalóit megvalósító API automatikusan beállít. A hálózati engedélyekre csak a modok böngészéséhez, letöltéséhez, zene letöltéséhez és a többjátékos játszmák fel- és letöltéséhez van szükség. Az Unciv semmilyen más internetes kommunikációt nem kezdeményez. # Starting from here normal translations start, as described in diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 8e0d19bad6..795650c3fc 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -951,10 +951,8 @@ Add in capital = Aggiungi alla capitale Add to [comment] = Aggiungi a [comment] Upgrade to [unitType] ([goldCost] gold) = Aggiorna a [unitType] ([goldCost] oro) Upgrade to [unitType]\n([goldCost] gold, [resources]) = Aggiorna a [unitType]\n([goldCost] oro, [resources]) - # Requires translation! -Transform to [unitType] = - # Requires translation! -Transform to [unitType]\n([resources]) = +Transform to [unitType] = Trasforma in [unitType] +Transform to [unitType]\n([resources]) = Trasforma in [unitType]\n([resources]) Found city = Fonda città Promote = Promuovi Health = Salute @@ -1339,8 +1337,7 @@ Can upgrade from [unit] = Può aggiornarsi a [unit] Can upgrade from: = Aggiornabile da: Upgrades to [upgradedUnit] = Aggiorna a [upgradedUnit] Obsolete with [obsoleteTech] = Diventa obsoleta con [obsoleteTech] - # Requires translation! -Can Transform to [upgradedUnit] = +Can Transform to [upgradedUnit] = Può trasformarsi in [upgradedUnit] Occurs on [listOfTerrains] = Si può trovare su [listOfTerrains] Occurs on: = Può trovarsi su: Placed on [terrainType] = Si trova su [terrainType] @@ -6121,8 +6118,7 @@ Destroys tile improvements when attacking = Distrugge i miglioramenti quando att Cannot move = Non può muoversi [amount] Movement point cost to embark = Lo sbarco costa [amount] punti movimento Can speed up the construction of a wonder = Può accelerare la costruzione di una meraviglia - # Requires translation! -Can transform to [unit] = +Can transform to [unit] = Può trasformarsi in [unit] Costs [amount] gold per turn when in your territory = Costa [amount] Oro al turno nel proprio territorio by consuming this unit = consumando questa unità before [amount] turns = entro [amount] turni diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 53eeac98e8..dd804ce2ee 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 = 798 - const val appVersion = "4.4.1" + const val appCodeNumber = 799 + const val appVersion = "4.4.2" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 89d8d1f440..99182e753a 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,47 @@ +## 4.4.2 + +Advanced game options hidden by default for faster initial game + +Fixed broken test, faster local tests + +Better docs for Trigger Conditions + +War -> war with major civ + +Trigger upon declaring friendship + +Added building trigger with city filter + +Added religion triggers + +Added trigger conditional for constructing building + +Added trigger conditional for capturing city + +Added trigger conditional for entering era + +Actually no + +Conditional triggers now work with timed uniques + +Added 'upon entering golden age' trigger + +Added 'upon adopting policy' trigger + +Added 'upon declaring war' trigger + +Added trigger conditions framework! + +old unique deprecation + +Great prophets do not spawn to pantheons that cannot become religions + +Reverted Himeji Castle change - see + +RTL language support in very first paragraph of translation docs, so as not to waste people's time + +Resolved - Fixed Reliquary belief + ## 4.4.1 New tile visibility framework! diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 9ba836a50c..894fdf3145 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.4.1", 798) + val VERSION = Version("4.4.2", 799) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/799.txt b/fastlane/metadata/android/en-US/changelogs/799.txt new file mode 100644 index 0000000000..3b9e2fb4c4 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/799.txt @@ -0,0 +1,43 @@ + + +Advanced game options hidden by default for faster initial game + +Fixed broken test, faster local tests + +Better docs for Trigger Conditions + +War -> war with major civ + +Trigger upon declaring friendship + +Added building trigger with city filter + +Added religion triggers + +Added trigger conditional for constructing building + +Added trigger conditional for capturing city + +Added trigger conditional for entering era + +Actually no + +Conditional triggers now work with timed uniques + +Added 'upon entering golden age' trigger + +Added 'upon adopting policy' trigger + +Added 'upon declaring war' trigger + +Added trigger conditions framework! + +old unique deprecation + +Great prophets do not spawn to pantheons that cannot become religions + +Reverted Himeji Castle change - see + +RTL language support in very first paragraph of translation docs, so as not to waste people's time + +Resolved - Fixed Reliquary belief \ No newline at end of file