diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index abbed36434..f4b17225b8 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -2239,7 +2239,7 @@ Our open borders have brought us closer together. = Nos accords de libre passage You fulfilled your promise to stop settling cities near us! = Vous avez tenu votre promesse de ne pas fonder de villes près de nous ! You gave us units! = Vous nous avez donné des unités ! # Requires translation! -We appreciate your gifts = +We appreciate your gifts = Nous apprécions vos présents You returned captured units to us = Vous nous avez rendu des unités capturées #################### Lines from Buildings from Civ V - Vanilla #################### diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 1fd5590285..e80dc0c59d 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -692,8 +692,7 @@ Automated workers replace improvements = Automatisierte Arbeiter ersetzen Verbes Automated units move on turn start = Automatisierte Einheiten bewegen sich bei Rundenstart Minimap size = Größe der Minimap off = aus - # Requires translation! -Map mouse auto-scroll = +Map mouse auto-scroll = Automatisches Maus-Scrollen zuweisen Show pixel units = Pixel-Einheiten anzeigen Show pixel improvements = Pixel-Verbesserungen anzeigen Enable Nuclear Weapons = Aktiviere Atomwaffen @@ -704,8 +703,7 @@ Enable display cutout (requires restart) = Aktiviere Bildschirmausschnitt (Neust Show tile yields = Felderträge anzeigen Show unit movement arrows = Bewegungspfeile für Einheiten anzeigen Continuous rendering = Kontinuierliches Rendern - # Requires translation! -Experimental rendering improvements = +Experimental rendering improvements = Experimentelle Render-Verbesserungen When disabled, saves battery life but certain animations will be suspended = Es spart Akku, wenn es deaktiviert ist, aber bestimmte Animationen werden nicht angezeigt. Order trade offers by amount = Handelsangebote nach Menge sortieren Ask for confirmation when pressing next turn = Bitte um Bestätigung für 'Nächste Runde' @@ -1208,10 +1206,8 @@ Maintenance = Wartung Transportation upkeep = Unterhalt für Transport Unit upkeep = Unterhalt für Einheiten Trades = Handel - # Requires translation! -Current trades = - # Requires translation! -Pending trades = +Current trades = Aktueller Handel +Pending trades = Ausstehender Handel Score = Punktestand Units = Einheiten Unit Supply = Einheitenversorgung @@ -1252,10 +1248,8 @@ WLTK+ = WLDK+ Number of your cities celebrating\n'We Love The King Day' thanks\nto access to this resource = Anzahl Deiner Städte, die den\n'Wir lieben den König'-Tag feiern,\ndank Zugang zu dieser Ressource. WLTK demand = Bedarf für WLDK-Tag WLTK- = WLDK- - # Requires translation! -Trade offer = - # Requires translation! -Resources we're offering in trades = +Trade offer = Handelsangebot +Resources we're offering in trades = Ressourcen, die wir für den Handel anbieten Number of your cities\ndemanding this resource for\n'We Love The King Day' = Anzahl Deiner Städte, die nach\ndieser Ressource verlangen, um\nden 'Wir lieben den König'-Tag\nfeiern zu können. Politics = Politiken Show global politics = Zeige globale Politiken @@ -1372,12 +1366,9 @@ Movement cost = Bewegungskosten for = für Missing translations: = Fehlende Übersetzungen: Screen Size = Bildschirmgröße - # Requires translation! -Screen Window = - # Requires translation! -Windowed = - # Requires translation! -Fullscreen = +Screen Window = Bildschirmfenster +Windowed = Fenster +Fullscreen = Vollbild Tileset = Feldgrafik-Satz Unitset = Einheitengrafik-Satz UI Skin = Aussehen der Benutzeroberfläche @@ -1614,8 +1605,7 @@ No description provided = Keine Beschreibung mitgeliefert [stargazers]✯ = [stargazers]✯ Author: [author] = Autor: [author] Size: [size] kB = Größe: [size] kB - # Requires translation! -Size: [size] MB = +Size: [size] MB = Größe: [size] MB The mod you selected is incompatible with the defined ruleset! = Die gewählte Modifikation ist inkompatibel! Sort and Filter = Sortieren und Filtern Enter search text = Suchtext eingeben @@ -2248,8 +2238,7 @@ You have denounced our enemies = Ihr habt unsere Feinde öffentlich angeprangert Our open borders have brought us closer together. = Unsere offenen Grenzen haben uns einander näher gebracht. You fulfilled your promise to stop settling cities near us! = Ihr habt euer Versprechen gehalten, keine neuen Städte in unserer Nähe zu gründen! You gave us units! = Ihr habt uns Einheiten geschenkt! - # Requires translation! -We appreciate your gifts = +We appreciate your gifts = Wir wissen eure Geschenke zu schätzen You returned captured units to us = Ihr habt uns gefangene Einheiten zurückgegeben #################### Lines from Buildings from Civ V - Vanilla #################### @@ -6230,15 +6219,10 @@ Your unit will always draw an Interception, if one can reach the target tile, ev If the Interceptor is not an Air Unit (eg Land or Sea), the Air Sweeping unit and Interceptor take no damage! = Handelt es sich bei der abfangenden Einheit nicht um eine Lufteinheit (z.B. See- oder Landeinheit), erleidet die Luftsäuberungs-Einheit und abfangende Einheit keinen Schaden! If the Interceptor is an Air Unit, the two units will damage each other in a straight fight with no Interception bonuses. And only the Attacking Air Sweep Unit gets any Air Sweep strength bonuses. = Wenn die abfangende Einheit eine Lufteinheit ist, werden sich die beiden Einheiten in einem direkten Kampf ohne Abfangbonus gegenseitig beschädigen. Und nur die Luftsäuberungs-Einheit erhält Stärkebonus für diese Aktion. - # Requires translation! -City Tile Blockade = - # Requires translation! -One of your tiles is blocked by an enemy: when an enemy unit stands on a tile you own, the tile will not produce yields and cannot be worked by a city this turn. City will reallocate population from a blocked tile automatically. = - # Requires translation! -Enemy military land units block tiles they are standing on. Enemy military naval units additionally block adjacent water tiles. To protect your tiles from blockade, place a friendly military unit on it or fight off invaders. = +City Tile Blockade = Blockade eines Stadtfeldes +One of your tiles is blocked by an enemy: when an enemy unit stands on a tile you own, the tile will not produce yields and cannot be worked by a city this turn. City will reallocate population from a blocked tile automatically. = Eines deiner Felder wird von einem Feind blockiert: Wenn eine feindliche Einheit auf einem deiner Felder steht, produziert das Feld keine Erträge und kann in diesem Zug nicht von einer Stadt bewirtschaftet werden. Die Stadt wird die Bevölkerung eines blockierten Feldes automatisch umverteilen. +Enemy military land units block tiles they are standing on. Enemy military naval units additionally block adjacent water tiles. To protect your tiles from blockade, place a friendly military unit on it or fight off invaders. = Feindliche militärische Landeinheiten blockieren Felder, auf denen sie stehen. Feindliche militärische Marineeinheiten blockieren zusätzlich angrenzende Wasserfelder. Um deine Felder vor der Blockade zu schützen, platziere eine befreundete Militäreinheit darauf oder wehre Eindringlinge ab. - # Requires translation! -City Blockade = - # Requires translation! -One of your cities is under a naval blockade! When all adjacent water tiles of a coastal city are blocked - city loses harbor connection to all other cities, including capital. Make sure to de-blockade cities by deploying friendly military naval units to fight off invaders. = +City Blockade = Blockade einer Stadt +One of your cities is under a naval blockade! When all adjacent water tiles of a coastal city are blocked - city loses harbor connection to all other cities, including capital. Make sure to de-blockade cities by deploying friendly military naval units to fight off invaders. = Eine deiner Städte steht unter einer Seeblockade! Wenn alle angrenzenden Wasserfelder einer Küstenstadt blockiert sind, verliert die Stadt die Hafenverbindung zu allen anderen Städten, einschließlich der Hauptstadt. Stelle sicher, dass du die Blockade aufhebst, indem du befreundete militärische Marineeinheiten einsetzt, um Eindringlinge abzuwehren. diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 21b7486b97..bc6fd2ee6a 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -696,8 +696,7 @@ Automated workers replace improvements = I lavoratori automatizzati rimpiazzano Automated units move on turn start = Le unità automatizzate si muovono a inizio turno Minimap size = Grandezza minimappa off = Disattiva - # Requires translation! -Map mouse auto-scroll = +Map mouse auto-scroll = Auto-scorrimento mappa col mouse Show pixel units = Mostra unità pixel Show pixel improvements = Mostra miglioramenti pixel Enable Nuclear Weapons = Abilita armi nucleari @@ -708,8 +707,7 @@ Enable display cutout (requires restart) = Abilita ritaglio diplay (richiede ria Show tile yields = Mostra rese delle celle Show unit movement arrows = Mostra frecce unità movimento Continuous rendering = Rendering continuo - # Requires translation! -Experimental rendering improvements = +Experimental rendering improvements = Miglioramenti sperimentali rendering When disabled, saves battery life but certain animations will be suspended = Se disattivo, riduce il consumo della batteria, ma sospende alcune animazioni Order trade offers by amount = Ordina offerte per quantità Ask for confirmation when pressing next turn = Chiedi conferma per fine turno @@ -1214,10 +1212,8 @@ Maintenance = Manutenzione Transportation upkeep = Mantenimento dei trasporti Unit upkeep = Mantenimento unità Trades = Commercio - # Requires translation! -Current trades = - # Requires translation! -Pending trades = +Current trades = Accordi attuali +Pending trades = Accordi in corso Score = Punteggio Units = Unità Unit Supply = Rifornimento unità @@ -1258,10 +1254,8 @@ WLTK+ = VIR Number of your cities celebrating\n'We Love The King Day' thanks\nto access to this resource = Numero di città che celebrano\nla giornata 'Viva il Re' grazie\nall'accesso a questa risorsa WLTK demand = Richiesta VIR WLTK- = VIR- - # Requires translation! -Trade offer = - # Requires translation! -Resources we're offering in trades = +Trade offer = Offerta commerciale +Resources we're offering in trades = Risorse che offriamo in commercio Number of your cities\ndemanding this resource for\n'We Love The King Day' = Numero di città che esigono\nquesta risorsa per la giornata\n'Viva il Re' Politics = Politica Show global politics = Mostra politiche globali @@ -1378,12 +1372,9 @@ Movement cost = Costi di movimento for = per Missing translations: = Traduzioni mancanti: Screen Size = Dimensioni schermo - # Requires translation! -Screen Window = - # Requires translation! -Windowed = - # Requires translation! -Fullscreen = +Screen Window = Finestra schermata +Windowed = A finestra +Fullscreen = Schermo intero Tileset = Set celle Unitset = Set unità UI Skin = Skin UI @@ -1620,8 +1611,7 @@ No description provided = Nessuna descrizione fornita [stargazers]✯ = [stargazers]✯ Author: [author] = Autore: [author] Size: [size] kB = Dimensioni: [size] kB - # Requires translation! -Size: [size] MB = +Size: [size] MB = Dimensioni: [size] MB The mod you selected is incompatible with the defined ruleset! = La mod selezionata è incompatibile col ruleset definito Sort and Filter = Ordina e filtra Enter search text = Digita testo ricerca @@ -2256,9 +2246,8 @@ You have denounced our enemies = Hai denunciato i nostri nemici! Our open borders have brought us closer together. = I nostri accordi di passaggio hanno avvicinato le nostre nazioni. You fulfilled your promise to stop settling cities near us! = Hai mantenuto la tua promessa di non fondare città nelle nostre vicinanze. You gave us units! = Ci hai dato delle unità in regalo! - # Requires translation! -We appreciate your gifts = -You returned captured units to us = Ci hai restituito un'unità +We appreciate your gifts = Apprezziamo i vostri doni. +You returned captured units to us = Ci hai restituito un'unità. #################### Lines from Buildings from Civ V - Vanilla #################### @@ -6247,15 +6236,10 @@ Your unit will always draw an Interception, if one can reach the target tile, ev If the Interceptor is not an Air Unit (eg Land or Sea), the Air Sweeping unit and Interceptor take no damage! = Se l'intercettatore è un'unità non aerea (es. terrestre o marittima), né l'unità perlustratrice né l'intercettatore subiranno danni. If the Interceptor is an Air Unit, the two units will damage each other in a straight fight with no Interception bonuses. And only the Attacking Air Sweep Unit gets any Air Sweep strength bonuses. = Se l'intercettatore è un'unità aerea, le due unità si danneggeranno l'un l'altra in un corpo a corpo senza bonus intercettazione, e solo il Perlustratore attaccante ottiene un bonus forza di Perlustrazione. - # Requires translation! -City Tile Blockade = - # Requires translation! -One of your tiles is blocked by an enemy: when an enemy unit stands on a tile you own, the tile will not produce yields and cannot be worked by a city this turn. City will reallocate population from a blocked tile automatically. = - # Requires translation! -Enemy military land units block tiles they are standing on. Enemy military naval units additionally block adjacent water tiles. To protect your tiles from blockade, place a friendly military unit on it or fight off invaders. = +City Tile Blockade = Blocco casella cittadina +One of your tiles is blocked by an enemy: when an enemy unit stands on a tile you own, the tile will not produce yields and cannot be worked by a city this turn. City will reallocate population from a blocked tile automatically. = Una delle tue caselle è bloccata da un nemico. Quando un'unità nemica si trova su una casella in tuo possesso, la casella perderà la produzione e lo sfruttamento delle risorse per quel turno, e la città dovrà spostare automaticamente l'abitante che la stava sfruttando in un'altra casella libera. +Enemy military land units block tiles they are standing on. Enemy military naval units additionally block adjacent water tiles. To protect your tiles from blockade, place a friendly military unit on it or fight off invaders. = Le unità terrestri nemiche bloccano le caselle su cui si ergono; di riflesso, le unità navali nemiche bloccano la produzione delle caselle acquatiche adiacenti. Per proteggere le tue caselle da un blocco, poni delle unità militari amiche su di esse e preparati a respingere gli invasori. - # Requires translation! -City Blockade = - # Requires translation! -One of your cities is under a naval blockade! When all adjacent water tiles of a coastal city are blocked - city loses harbor connection to all other cities, including capital. Make sure to de-blockade cities by deploying friendly military naval units to fight off invaders. = +City Blockade = Blocco navale cittadino +One of your cities is under a naval blockade! When all adjacent water tiles of a coastal city are blocked - city loses harbor connection to all other cities, including capital. Make sure to de-blockade cities by deploying friendly military naval units to fight off invaders. = Una delle tue città si trova sotto blocco navale! Quando tutte le caselle acquatiche di una città costiera sono bloccate, la città perde i collegamenti portuali a tutte le città, compresa la capitale. Proteggi le tue coste posizionando delle unità navali amiche utili per respingere gli invasori. diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 57927ff70a..22819601bf 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -99,6 +99,8 @@ Requires at least one of the following: = Вимагає хоча б одне з Requires all of the following: = Вимагає все з наступного: Leads to [techName] = Дозволяє дослідити технологію [techName] Leads to: = Дозволяє дослідити: +Enables: = Дозволяє створювати: +Disables: = Забороняє створювати: Current construction = Зараз створюється Construction queue = Черга на створення @@ -2239,7 +2241,7 @@ Our open borders have brought us closer together. = Наші відкриті к You fulfilled your promise to stop settling cities near us! = Ви виконали свою обіцянку припинити засновувати міста біля нас! You gave us units! = Ви надіслали нам підрозділи! # Requires translation! -We appreciate your gifts = +We appreciate your gifts = Ми вдячні за ваші подарунки You returned captured units to us = Ви повернули нам захоплені підрозділи #################### Lines from Buildings from Civ V - Vanilla #################### diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 6b90a16365..077e182590 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 = 816 - const val appVersion = "4.4.17" + const val appCodeNumber = 817 + const val appVersion = "4.4.18" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index cc6eabed47..f9be1fd351 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,28 @@ +## 4.4.18 + +Better error message for multiplayer games that get corrupted data from the server + +chore: more direct 'can change state' propagations + +Cleanup of policy screen + +Removed static references from policy buttons + +Civilopedia entry for policy links to units and buildings that it enables/disables + +Resolved - wonders with no tech requirement displayed in separate category + +Attacking of any sort prevents udo of unit move + +By vegeta1k95: +- Modding: allow mods to supply custom fonts +- Fix TextureArraySpriteBatch missing method issue +- UI Helper: GUI class + +By Gualdimar: +- Option to disable max zoom limit +- Slider tip permanent by default + ## 4.4.17 Added Undo button for unit moves! diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index ffff3ecbdf..161a5f2b2e 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -542,7 +542,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.17", 816) + val VERSION = Version("4.4.18", 817) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/817.txt b/fastlane/metadata/android/en-US/changelogs/817.txt new file mode 100644 index 0000000000..fc4addd7a3 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/817.txt @@ -0,0 +1,24 @@ + + +Better error message for multiplayer games that get corrupted data from the server + +chore: more direct 'can change state' propagations + +Cleanup of policy screen + +Removed static references from policy buttons + +Civilopedia entry for policy links to units and buildings that it enables/disables + +Resolved - wonders with no tech requirement displayed in separate category + +Attacking of any sort prevents udo of unit move + +By vegeta1k95: +- Modding: allow mods to supply custom fonts +- Fix TextureArraySpriteBatch missing method issue +- UI Helper: GUI class + +By Gualdimar: +- Option to disable max zoom limit +- Slider tip permanent by default \ No newline at end of file