Version rollout (#10143)

* Bump version and create initial changelog entry

* Update Catalan.properties (#10138)

* Update Russian.properties (#10136)

* Update Russian.properties

* Update Russian.properties

Corrections of aztecs cities

* Update Polish.properties (#10134)

* Update Dutch.properties (#10133)

* Update Brazilian_Portuguese.properties (#10132)

* Update Bulgarian.properties (#10131)

* Update Spanish.properties (#10129)

* Update Polish.properties (#10128)

* Update Italian.properties (#10123)

* Update French.properties (#10122)

* Update Russian.properties (#10120)

* Update German translation (#10118)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Anoant <143289571+Anoant@users.noreply.github.com>
Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com>
Co-authored-by: Lena Bullens <95299589+LenaBullens@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Dob <100198047+dobval@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: hotorcelexo <IgorPolyakov@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>

android/assets/jsons/translations/Brazilian_Portuguese.properties

@@ -1245,10 +1245,8 @@ Add to the top of the queue = Adicionar ao topo da fila
 Add to the queue in all cities = Adicione para a fila de todas as cidades
 Add or move to the top in all cities = Adicione ou mova ao topo em todas as cidades
 Remove from the queue in all cities = Retire da fila em todas as cidades
- # Requires translation!
+Disable = Desativar
-Disable = 
+Enable = Habilitar
- # Requires translation!
-Enable = 
 
 # Specialized Popups - Ask for text or numbers, file picker
 
@@ -2540,8 +2538,7 @@ Buildable Buildings = Edifícios Edificáveis
 Buildable Wonders = Maravilhas Edificáveis
 Buildable National Wonders = Maravilhas Nacionais Construíveis
 Other Constructions = Outras Construções
- # Requires translation!
+Disabled Constructions = Construções Desativadas
-Disabled Constructions = 
 Next City = Próxima Cidade
 Previous City = Cidade Anterior
 Show Stats = Mostrar estatísticas

android/assets/jsons/translations/Bulgarian.properties

@@ -119,12 +119,9 @@ Peace = Мир
 Research Agreement = Споразумение за научни изследвания
 Declare war = Обявяване на война
 Declare war on [civName]? = Обявявате ли война на [civName]?
- # Requires translation!
+[civName] will also join them in the war = [civName] също ще ги подкрепи във войната
-[civName] will also join them in the war = 
+An unknown civilization will also join them in the war = Неизвестна цивилизация също ще ги подкрепи във войната
- # Requires translation!
+This will cancel your defensive pact with [civName] = Това ще прекрати отбранителния пакт с/ъс [civName]
-An unknown civilization will also join them in the war = 
- # Requires translation!
-This will cancel your defensive pact with [civName] = 
 Go to on map = Отидете на картата
 Let's begin! = Да започваме!
 [civName] has declared war on us! = [civName] ни обяви война!
@@ -210,10 +207,8 @@ Gift Improvement = Подарете Подобрение
 [civName] is able to provide [unitName] once [techName] is researched. = [civName] може да осигурява [unitName], след като се овладее [techName].
 
 Diplomatic Marriage ([amount] Gold) = Дипломатически Брак ([amount] Злато)
- # Requires translation!
+We have married into the ruling family of [civName], bringing them under our control. = Сключихме брак с управляващия род на [civName], подлагайки ги под наш контрол.
-We have married into the ruling family of [civName], bringing them under our control. = 
+[civName] has married into the ruling family of [civName2], bringing them under their control. = [civName] сключи брак с управляващия род на [civName2], подлагайки ги под техен контрол.
- # Requires translation!
-[civName] has married into the ruling family of [civName2], bringing them under their control. = 
 You have broken your Pledge to Protect [civName]! = Вие отхвърлихте обещанието си да защитавате [civName]!
 City-States grow wary of your aggression. The resting point for Influence has decreased by [amount] for [civName]. = Градовете-държави стават предпазливи спрямо Вашата агресия. Минималните точки Влияние паднаха с [amount] за [civName].
 
@@ -246,8 +241,7 @@ Reach 30 for friendship. = Достигнете 30 за приятелство.
 Reach highest influence above 60 for alliance. = Достигнете влияние над 60 за съюз.
 When Friends: = Когато сте приятели:
 When Allies: = Когато сте съюзници:
- # Requires translation!
+The unique luxury is one of: = Уникалното богатство е едно от:
-The unique luxury is one of: = 
 Demand Tribute = Искане на данък
 Tribute Willingness = Желание за плащане на данък
 At least 0 to take gold, at least 30 and size 4 city for worker = Поне 0, за да вземете злато, поне 30 и град от размер 4 за работник
@@ -291,8 +285,7 @@ Keep going = Продължете
 There's nothing on the table = Предложението не ни удовлетворява
 Peace Treaty = Мирен Договор
 Agreements = Съглашения
- # Requires translation!
+Defensive Pact = Отбранителен Пакт 
-Defensive Pact = 
 Open Borders = Отворени граници
 Gold per turn = Злато на ход
 Cities = Градове
@@ -308,8 +301,7 @@ Non-existent city = Несъществуващ град
 # Unit differences
 
 [resourceName] not required = Не се изисква [resourceName]
- # Requires translation!
+Lost ability (vs [originalUnit]): [ability] = Изгубено умение (срещу [originalUnit]): [ability] 
-Lost ability (vs [originalUnit]): [ability] = 
 Upgrade all [count] [unit] ([cost] gold) = Подобрете всички [count] [unit] ([cost] злато)
 National ability = Способност на нацията
 [firstValue] vs [secondValue] = [firstValue] срещу [secondValue]
@@ -324,8 +316,7 @@ Promotions = Повишения
 Load copied data = Зареждане на копирани данни
 Reset to defaults = Връщане по подразбиране
 Select nations = Избиране на държави
- # Requires translation!
+Set available nations for random pool = Задай наличните нации за случаен набор
-Set available nations for random pool = 
 Available nations = Налични държави
 Banned nations = Забранени държави
 Are you sure you want to reset all game options to defaults? = Сигурни ли сте, че искате да върнете всички настройки по подразбиране?
@@ -339,8 +330,7 @@ Max Turns = Максимум ходове
 Could not load map! = Картата не може да бъде заредена!
 Generated = Генерирана
 Random Generated = Случайно Генерирана
- # Requires translation!
+Which options should be available to the random selection? = Кои опции трябва да са налични при случаен набор?
-Which options should be available to the random selection? = 
 Existing = Съществуваща
 Custom = Персонализирана
 Map Generation Type = Начин на Генериране на Карта

android/assets/jsons/translations/Catalan.properties

@@ -1245,10 +1245,8 @@ Add to the top of the queue = Afegeix al principi de la cua
 Add to the queue in all cities = Afegeix a la cua a totes les ciutats
 Add or move to the top in all cities = Afegeix o mou al principi a totes les ciutats
 Remove from the queue in all cities = Treu de la cua de totes les ciutats
- # Requires translation!
+Disable = Desactiva
-Disable = 
+Enable = Activa
- # Requires translation!
-Enable = 
 
 # Specialized Popups - Ask for text or numbers, file picker
 
@@ -2540,8 +2538,7 @@ Buildable Buildings = Edificis que es poden construir
 Buildable Wonders = Meravelles que es poden construir
 Buildable National Wonders = Meravelles nacionals que es poden construir
 Other Constructions = Altres construccions
- # Requires translation!
+Disabled Constructions = Construccions desactivades
-Disabled Constructions = 
 Next City = Ciutat següent
 Previous City = Ciutat anterior
 Show Stats = Mostra estadístiques

android/assets/jsons/translations/Dutch.properties

@@ -1245,10 +1245,8 @@ Add to the top of the queue = Voeg toe aan het begin van de wachtrij
 Add to the queue in all cities = Voeg toe aan de wachtrij in alle steden
 Add or move to the top in all cities = Voeg toe of verplaats naar het begin in alle steden
 Remove from the queue in all cities = Verwijder uit de wachtrij in alle steden
- # Requires translation!
+Disable = Schakel uit
-Disable = 
+Enable = Schakel in
- # Requires translation!
-Enable = 
 
 # Specialized Popups - Ask for text or numbers, file picker
 
@@ -1406,8 +1404,7 @@ Politics = Politiek
 Show global politics = Toon wereldpolitiek
 Show diagram = Toon diagram
 At war with [enemy] = In oorlog met [enemy]
- # Requires translation!
+Defensive pact with [civName] = Defensief verbond met [civName]
-Defensive pact with [civName] = 
 Friends with [civName] = Vrienden met [civName]
 an unknown civilization = een onbekende beschaving
 [numberOfTurns] Turns Left = [numberOfTurns] Beurten resterend
@@ -2541,8 +2538,7 @@ Buildable Buildings = Bouwbare Gebouwen
 Buildable Wonders = Bouwbare Wonders
 Buildable National Wonders = Bouwbare Nationale Wonders
 Other Constructions = Andere Constructies
- # Requires translation!
+Disabled Constructions = Uitgeschakelde Constructies
-Disabled Constructions = 
 Next City = Volgende Stad
 Previous City = Vorige Stad
 Show Stats = Toon statistieken

android/assets/jsons/translations/French.properties

@@ -1246,9 +1246,9 @@ Add to the queue in all cities = Ajouter à la file dans toutes les villes
 Add or move to the top in all cities = Ajouter/Déplacer en tête dans toutes les villes
 Remove from the queue in all cities = Retirer de la file dans toutes les villes
  # Requires translation!
-Disable = 
+Disable = Désactiver
  # Requires translation!
-Enable = 
+Enable = Autoriser
 
 # Specialized Popups - Ask for text or numbers, file picker
 
@@ -2541,7 +2541,7 @@ Buildable Wonders = Merveilles constructibles
 Buildable National Wonders = Merveilles Nationales constructibles
 Other Constructions = Autres constructions
  # Requires translation!
-Disabled Constructions = 
+Disabled Constructions = Constructions désactivées
 Next City = Ville suivante
 Previous City = Ville précédente
 Show Stats = Afficher les statistiques

android/assets/jsons/translations/German.properties

@@ -1245,10 +1245,8 @@ Add to the top of the queue = An den Anfang der Warteschlange hinzufügen
 Add to the queue in all cities = Zur Warteschlange in allen Städten hinzufügen
 Add or move to the top in all cities = In allen Städten hinzufügen oder an den Anfang verschieben
 Remove from the queue in all cities = In allen Städten aus der Warteschlange entfernen
- # Requires translation!
+Disable = Deaktivieren
-Disable = 
+Enable = Aktivieren
- # Requires translation!
-Enable = 
 
 # Specialized Popups - Ask for text or numbers, file picker
 
@@ -2540,8 +2538,7 @@ Buildable Buildings = Baubare Gebäude
 Buildable Wonders = Baubare Wunder
 Buildable National Wonders = Baubare Nationale Wunder
 Other Constructions = Andere Produktionen
- # Requires translation!
+Disabled Constructions = Deaktivierte Produktionen
-Disabled Constructions = 
 Next City = Nächste Stadt
 Previous City = Vorherige Stadt
 Show Stats = Zeige Statistiken

android/assets/jsons/translations/Italian.properties

@@ -1245,10 +1245,8 @@ Add to the top of the queue = Aggiungi in cima alla coda
 Add to the queue in all cities = Aggiungi in fondo alla coda
 Add or move to the top in all cities = Aggiungi o sposta in cima per tutte le città
 Remove from the queue in all cities = Aggiungi o sposta in cima per tutte le città
- # Requires translation!
+Disable = Disabilita
-Disable = 
+Enable = Abilita
- # Requires translation!
-Enable = 
 
 # Specialized Popups - Ask for text or numbers, file picker
 
@@ -2540,8 +2538,7 @@ Buildable Buildings = Edifici costruibili
 Buildable Wonders = Meraviglie costruibili
 Buildable National Wonders = Meraviglie Nazionali costruibili
 Other Constructions = Altre Costruzioni
- # Requires translation!
+Disabled Constructions = Costruzioni disabilitate
-Disabled Constructions = 
 Next City = Città successiva
 Previous City = Città precedente
 Show Stats = Mostra statistiche

android/assets/jsons/translations/Polish.properties

@@ -1071,7 +1071,7 @@ Range = Zasięg ruchu
 XP = PD
 Move unit = Przemieść jednostkę
 Stop movement = Zatrzymaj jednostkę
-Show unit destination = Pokazuj cel jednostki
+Show unit destination = Pokaż cel jednostki
 Swap units = Zamień jednostki
 Construct improvement = Zbuduj ulepszenie
 Automate = Automatyzuj
@@ -1246,9 +1246,9 @@ Add to the queue in all cities = Dodaj do kolejki we wszystkich miastach
 Add or move to the top in all cities = Dodaj lub przenieś na początek kolejki we wszystkich miastach
 Remove from the queue in all cities = Usuń z kolejki we wszystkich miastach
  # Requires translation!
-Disable = 
+Disable = Wyklucz z budowy 
  # Requires translation!
-Enable = 
+Enable = Anuluj wykluczenie z budowy
 
 # Specialized Popups - Ask for text or numbers, file picker
 
@@ -2541,7 +2541,7 @@ Buildable Wonders = Cuda
 Buildable National Wonders = Cuda Narodowe
 Other Constructions = Inne 
  # Requires translation!
-Disabled Constructions = 
+Disabled Constructions = Wykluczone z budowy 
 Next City = Następne Miasto
 Previous City = Poprzednie Miasto 
 Show Stats = Pokaż Statystyki
@@ -2562,7 +2562,7 @@ Monument = Pomnik
 
 Granary = Spichlerz
 
-Temple of Artemis = Świątyna Artemisa
+Temple of Artemis = Świątynia Artemidy
 'It is not so much for its beauty that the forest makes a claim upon men's hearts, as for that subtle something, that quality of air, that emanation from old trees, that so wonderfully changes and renews a weary spirit.' - Robert Louis Stevenson = „Nie tyle ze względu na swoje piękno las rości sobie prawo do ludzkich serc, ile o to subtelne coś, ta jakość powietrza, ta emanacja ze starych drzew, która tak cudownie zmienia i odnawia znużonego ducha.”\n\n– Robert Louis Stevenson
 
 The Great Lighthouse = Latarnia z Faros

android/assets/jsons/translations/Russian.properties

@@ -1246,9 +1246,9 @@ Add to the queue in all cities = Добавить в очередь для вс
 Add or move to the top in all cities = Добавить или переместить в начало для всех городов
 Remove from the queue in all cities = Убрать из очереди во всех городах
  # Requires translation!
-Disable = 
+Disable = Запретить
  # Requires translation!
-Enable = 
+Enable = Разрешить
 
 # Specialized Popups - Ask for text or numbers, file picker
 
@@ -1728,7 +1728,7 @@ Dogfighting III = Воздушный бой III
 Choose name for [unitName] = Выберите имя для [unitName]
 [unitFilter] units gain the [promotion] promotion = [unitFilter] юниты получают повышение [promotion]
 Requires = Требуется
-Path to [promotion] is ambiguous = Путь к [promotion] неопределен
+Path to [promotion] is ambiguous = Путь к [promotion] не определен
 
 # Multiplayer Turn Checker Service
 
@@ -2291,7 +2291,7 @@ upon declaring friendship = при объявлении дружбы
 upon declaring a defensive pact = при заключении оборонительного союза
 upon entering a Golden Age = при вступлении в золотой век
 upon conquering a city = при захвате города 
-upon founding a city = при основывании города
+upon founding a city = при основании города
 upon discovering a Natural Wonder = при нахождении чуда природы
 upon constructing [buildingFilter] = при строительстве [buildingFilter]
 upon constructing [buildingFilter] [cityFilter] = при строительстве [buildingFilter] в [cityFilter]
@@ -2541,7 +2541,7 @@ Buildable Wonders = Доступные для строительства чуд
 Buildable National Wonders = Доступные для строительства национальные чудеса
 Other Constructions = Другие проекты
  # Requires translation!
-Disabled Constructions = 
+Disabled Constructions = Запрещенные проекты
 Next City = Следующий город
 Previous City = Предыдущий город
 Show Stats = Показать статистику
@@ -3297,7 +3297,7 @@ Arabia = Аравия
 
 George Washington = Джордж Вашингтон
 Your wanton aggression leaves us no choice. Prepare for war! = Ваша бессмысленная агрессия не оставляет нам выбора. Готовьтесь к войне!
-You have mistaken our love of peace for weakness. You shall regret this! = Вы ошиблись, приняв наше миролюбие за слабость, и пожалете об этом!
+You have mistaken our love of peace for weakness. You shall regret this! = Вы ошиблись, приняв наше миролюбие за слабость, и пожалеете об этом!
 The day...is yours. I hope you will be merciful in your triumph. = Победа...за вами. Надеюсь, вы будете милосердны в дни своего триумфа.
 The people of the United States of America welcome you. = Соединенные Штаты Америки приветствуют вас!
 Is the following trade of interest to you? = Это предложение в ваших интересах?
@@ -3944,35 +3944,35 @@ Teotihuacan = Теотиуакан
 Tlatelolco = Тлателолько
 Texcoco = Тескоко
 Tlaxcala = Тласкала
-Calixtlahuaca = Калихтлахуака
+Calixtlahuaca = Каликстлауака
-Xochicalco = Ксочикалко
+Xochicalco = Шочикалько
 Tlacopan = Тлакопан
-Atzcapotzalco = Атцапотцалко
+Atzcapotzalco = Ацкапоцалько
-Tzintzuntzan = Тчинтчюнтзан
+Tzintzuntzan = Цинцунцан
-Malinalco = Малиналко
+Malinalco = Малиналько
 Tamuin = Тамуин
 Teayo = Теайо
 Cempoala = Кемпоала
-Chalco = Тчалко
+Chalco = Чалко
-Tlalmanalco = Тлалманалко
+Tlalmanalco = Тлальманалько
-Ixtapaluca = Ихтапалуку
+Ixtapaluca = Икстапалука
-Huexotla = Нуэхотла
+Huexotla = Уексотла
-Tepexpan = Тепехпан
+Tepexpan = Тепэкспан
-Tepetlaoxtoc = Тепетлаохток
+Tepetlaoxtoc = Тепетлаоксток
 Chiconautla = Чиконаутла
 Zitlaltepec = Зитлалтепек
 Coyotepec = Койотепек
-Tequixquiac = Текуихкуйак
+Tequixquiac = Текишкиак
-Jilotzingo = Джилотчинго
+Jilotzingo = Джилоцинго
-Tlapanaloya = Тлапаналойа
+Tlapanaloya = Тлапаналоя
-Tultitan = Тултитан
+Tultitan = Тультитан
 Ecatepec = Экатепек
 Coatepec = Коатепек
-Chalchiuites = Чалчуитес
+Chalchiuites = Чальчиуитес
-Chiauhita = Чиаухита
+Chiauhita = Чиауита
-Chapultepec = Чапултепек
+Chapultepec = Чапультепек
-Itzapalapa = Итцапалапа
+Itzapalapa = Истапалапа
-Ayotzinco = Ауотцинко
+Ayotzinco = Айоцинко
 Iztapam = Ицтапам
 Aztecs = Ацтеки
 
@@ -4664,7 +4664,7 @@ Holy site = Святыня
 
 Citadel = Крепость
 
-Moai = Статуя моаи
+Moai = Статуя Моаи
 
 Terrace farm = Террасная ферма
 
@@ -6061,7 +6061,7 @@ A sacrifice unlike all others must be made! = Жертва в отличие о
 Muahahahahahaha! = Муахахахахахаха!
 Today comes a great searing pain. With you comes the path to the black storm. = Сегодня идет сильная жгучая боль. С вами идет путь к черной буре.
 Greetings, wayward one. I am known as Pacal. = Привет, своенравный. Меня зовут Пакаль.
-Friend, I believe I may have found a way to save us all! Look, look and accept my offering! = Друг, я верю, что нашел путь спасти всех нас! Смотри, сморти и прими мое подношение!
+Friend, I believe I may have found a way to save us all! Look, look and accept my offering! = Друг, я верю, что нашел путь спасти всех нас! Смотри, смотри и прими мое подношение!
 A fine day, it helps you. = Хороший день, он помогает тебе.
 The Long Count = Длинный счет
 Camazotz = Камасоц

android/assets/jsons/translations/Spanish.properties

@@ -1246,9 +1246,9 @@ Add to the queue in all cities = Añadir a la lista en todas las ciudades
 Add or move to the top in all cities = Añadir o mover de primero en todas las ciudades
 Remove from the queue in all cities = Quitar de la lista en todas las ciudades
  # Requires translation!
-Disable = 
+Disable = Bloquear
  # Requires translation!
-Enable = 
+Enable = Desbloquear
 
 # Specialized Popups - Ask for text or numbers, file picker
 
@@ -2541,7 +2541,7 @@ Buildable Wonders = Maravillas Construibles
 Buildable National Wonders = Maravillas Nacionales Construibles
 Other Constructions = Otras Construcciones
  # Requires translation!
-Disabled Constructions = 
+Disabled Constructions = Construcciones bloqueadas
 Next City = Siguiente Ciudad
 Previous City = Ciudad Anterior
 Show Stats = Mostrar Estadísticas

buildSrc/src/main/kotlin/BuildConfig.kt

@@ -4,8 +4,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.8.21"
     const val appName = "Unciv"
-    const val appCodeNumber = 913
+    const val appCodeNumber = 914
-    const val appVersion = "4.8.5"
+    const val appVersion = "4.8.6"
 
     const val gdxVersion = "1.11.0"
     const val ktorVersion = "2.2.3"

changelog.md

@@ -1,3 +1,19 @@
+## 4.8.6
+
+docs: linting - List for victory illustrations to be shown as list
+
+AI diplomatic actions rework  - By tuvus
+
+By SomeTroglodyte:
+- Readability helpers for Map of Sets: add, contains 
+- Replace incorrect GraphicsEnvironment.maximumWindowBounds 
+- A "Status" column for City Overview 
+- Generic Widget/Provider framework for sortable grids 
+
+Remove Faith bonus from Vanilla Siam  - By SpacedOutChicken
+
+Unit tests for Battle.kt  - By Framonti
+
 ## 4.8.5
 
 Removed double notifications and processing of treaties when traded  - By tuvus

core/src/com/unciv/UncivGame.kt

@@ -536,7 +536,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.8.5", 913)
+        val VERSION = Version("4.8.6", 914)
         //endregion
 
         lateinit var Current: UncivGame

fastlane/metadata/android/en-US/changelogs/914.txt

@@ -0,0 +1,15 @@
+
+
+docs: linting - List for victory illustrations to be shown as list
+
+AI diplomatic actions rework  - By tuvus
+
+By SomeTroglodyte:
+- Readability helpers for Map of Sets: add, contains 
+- Replace incorrect GraphicsEnvironment.maximumWindowBounds 
+- A "Status" column for City Overview 
+- Generic Widget/Provider framework for sortable grids 
+
+Remove Faith bonus from Vanilla Siam  - By SpacedOutChicken
+
+Unit tests for Battle.kt  - By Framonti