From 9dfd82e002cd3518eba6d3a97b7d27c1ab8235e9 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 15 Jun 2024 22:47:04 +0300 Subject: [PATCH] 4.12.0 --- .../jsons/translations/French.properties | 32 ------------------ .../jsons/translations/Indonesian.properties | 31 ----------------- .../jsons/translations/Ukrainian.properties | 33 +------------------ .../completionPercentages.properties | 6 ++-- buildSrc/src/main/kotlin/BuildConfig.kt | 2 +- changelog.md | 27 +++++---------- core/src/com/unciv/UncivGame.kt | 2 +- .../android/en-US/changelogs/1007.txt | 27 +++++---------- 8 files changed, 23 insertions(+), 137 deletions(-) diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 4968f0a5cb..a2df963441 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -1095,7 +1095,6 @@ due to our [unitName] defeating a [otherUnitName] = car notre [unitName] a vainc due to our [unitName] being defeated by a [otherUnitName] = car notre [unitName] a été vaincu(e) par un(e) [otherUnitName] due to our [unitName] losing [amount] HP = car notre [unitName] a perdu [amount] PV due to our [unitName] being promoted = car notre [unitName] a été promu(e) - # Requires translation! due to expending our [unitName] = pour avoir consommé notre [unitName] from the ruins = en explorant des ruines @@ -2444,7 +2443,6 @@ upon founding a Pantheon = en fondant un Panthéon upon founding a Religion = en fondant une Religion upon enhancing a Religion = en renforçant une Religion upon defeating a [mapUnitFilter] unit = en vainquant une unité [mapUnitFilter] - # Requires translation! upon expending a [mapUnitFilter] unit = en consommant une unité [mapUnitFilter] upon being defeated = en étant vaincu(e) upon being promoted = en étant promu(e) @@ -2616,7 +2614,6 @@ Speed = Vitesse Tutorial = Tutoriel CityState = Cité-État ModOptions = Options Mod - # Requires translation! Event = Événement Conditional = Conditionnel TriggerCondition = DéclencherCondition @@ -5647,76 +5644,47 @@ Marine = Fusilier Marin #################### Lines from Events from Civ V - Gods & Kings #################### - # Requires translation! Move a unit! = Déplacer une unité ! - # Requires translation! Click on a unit → Click on a destination → Click the arrow popup. = Cliquez sur une unité → Cliquez sur une destination → Cliquez sur la bulle fléchée. - # Requires translation! Found a city! = Fonder une ville ! - # Requires translation! Select the Settler → Click on 'Found city'. = Sélectionnez le Colon → Cliquez sur 'Fonder une ville'. - # Requires translation! Enter the city screen! = Afficher l'écran de ville ! - # Requires translation! Click the city button twice. = Cliquez sur la ville deux fois. - # Requires translation! Pick a technology to research! = Choisir une technologie à rechercher ! - # Requires translation! Click on the tech button → select technology → click 'Research' (bottom right). = Cliquez sur le bouton Technologies → Choisissez une technologie → Cliquez sur 'Rechercher' (en bas à droite). - # Requires translation! Pick a construction! = Choisir une construction ! - # Requires translation! Enter city screen → Click on a unit or building → click 'add to queue'. = Entrez dans la ville → Cliquez sur une unité ou un bâtiment → Cliquez sur 'Ajouter à la file'. - # Requires translation! Pass a turn! = Passer un tour ! - # Requires translation! Cycle through units with 'Next unit' → Click 'Next turn'. = Parcourez les unités avec 'Unité suivante' → Cliquez sur 'Tour suivant'. - # Requires translation! Reassign worked tiles! = Réassigner les cases exploitées ! - # Requires translation! Enter city screen → click the assigned tile to unassign → click an unassigned tile to assign population. = Entrez dans la ville → Cliquez sur une case exploitée pour la libérer → Cliquez sur une case libre pour lui affecter un citoyen. - # Requires translation! Got it = Compris - # Requires translation! Meet another civilization! = Rencontrer une autre civilisation ! - # Requires translation! Explore the map until you encounter another civilization! = Explorez la carte jusqu'à rencontrer une autre civilisation ! - # Requires translation! Open the options dialog! = Ouvrir le menu des options ! - # Requires translation! Click the menu button (top left) → click 'Options'. = Cliquez sur le bouton Menu (en haut à gauche) → Cliquez sur 'Options'. - # Requires translation! Construct an improvement! = Construire un aménagement ! - # Requires translation! Construct a Worker unit →> Move it to a Plains or Grassland tile → Click 'Construct improvement' → Choose the farm → Leave the worker there until it's finished. = Produisez un Ouvrier → Déplacez-le sur une case Plaine ou Prairie → Cliquez sur 'Bâtir un aménagement' → Choisissez la Ferme → Laissez l'ouvrier sur place jusqu'à complétion. - # Requires translation! Create a trade route! = Créer une route commerciale ! - # Requires translation! Construct roads between your capital and another city. Or, automate your worker and let him get to that eventually. = Construisez une route entre votre capitale et une autre ville. Ou automatisez votre ouvrier et laissez-le faire. - # Requires translation! Conquer a city! = Conquérir une ville ! - # Requires translation! Bring an enemy city down to low health → Enter the city with a melee unit. = Attaquez une ville ennemie pour suffisamment l'affaiblir → Pénétrez dans la ville avec une unité de combat rapproché. - # Requires translation! Move an air unit! = Déplacer une unité aérienne ! - # Requires translation! Select an air unit →> select another city within range → Move the unit to the other city. = Sélectionnez une unité aérienne → Sélectionnez une autre ville à portée → Déplacez l'unité vers l'autre ville. - # Requires translation! See your stats breakdown! = Consulter vos statistiques en détail ! - # Requires translation! Enter the Overview screen (top right corner) → Click on 'Stats'. = Affichez la Vue d'ensemble (coin supérieur droit) → Cliquez sur 'Statistiques'. diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 2ebaea587a..4bddf6a1e5 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -1095,7 +1095,6 @@ due to our [unitName] defeating a [otherUnitName] = karena [unitName] kita menga due to our [unitName] being defeated by a [otherUnitName] = karena [unitName] kita dikalahkan oleh [otherUnitName] due to our [unitName] losing [amount] HP = karena [unitName] kita kehilangan [amount] HP due to our [unitName] being promoted = karena [unitName] kita dipromosikan - # Requires translation! due to expending our [unitName] = karena menggunakan [unitName] kita from the ruins = dari reruntuhan @@ -2444,7 +2443,6 @@ upon founding a Pantheon = saat mendirikan Panteon upon founding a Religion = saat mendirikan Agama upon enhancing a Religion = saat memperkuat Agama upon defeating a [mapUnitFilter] unit = saat mengalahkan unit [mapUnitFilter] - # Requires translation! upon expending a [mapUnitFilter] unit = saat menggunakan unit [mapUnitFilter] upon being defeated = saat dikalahkan upon being promoted = saat dipromosikan @@ -5647,76 +5645,47 @@ Marine = Marinir #################### Lines from Events from Civ V - Gods & Kings #################### - # Requires translation! Move a unit! = Gerakkan unit! - # Requires translation! Click on a unit → Click on a destination → Click the arrow popup. = Klik pada unit → Klik pada tujuan → Klik popup panah. - # Requires translation! Found a city! = Dirikan kota! - # Requires translation! Select the Settler → Click on 'Found city'. = Pilih Pemukim → Klik pada 'Dirikan kota'. - # Requires translation! Enter the city screen! = Masuk layar kota! - # Requires translation! Click the city button twice. = Klik tombol kota dua kali. - # Requires translation! Pick a technology to research! = Pilih teknologi untuk diteliti! - # Requires translation! Click on the tech button → select technology → click 'Research' (bottom right). = Klik pada tombol teknologi → pilih teknologi → Klik 'Teliti' (kanan bawah). - # Requires translation! Pick a construction! = Pilih konstruksi! - # Requires translation! Enter city screen → Click on a unit or building → click 'add to queue'. = Masuk layar kota → Klik pada unit atau bangunan → klik 'tambahkan ke antrean'. - # Requires translation! Pass a turn! = Lewati giliran! - # Requires translation! Cycle through units with 'Next unit' → Click 'Next turn'. = Lewati unit dengan 'Unit selanjutnya' → Klik 'Giliran selanjutnya'. - # Requires translation! Reassign worked tiles! = Menugaskan kembali daerah yang dikerjakan! - # Requires translation! Enter city screen → click the assigned tile to unassign → click an unassigned tile to assign population. = Masuk layar kota → klik daerah yang ditugaskan menjadi tidak ditugaskan → klik daerah yang tidak ditugaskan untuk menugaskan populasi. - # Requires translation! Got it = Mengerti - # Requires translation! Meet another civilization! = Temui peradaban lain! - # Requires translation! Explore the map until you encounter another civilization! = Jelajahi peta sampai kamu bertemu dengan peradaban lain. - # Requires translation! Open the options dialog! = Buka dialog opsi! - # Requires translation! Click the menu button (top left) → click 'Options'. = Klik tombol menu (kiri atas) → klik 'Opsi'. - # Requires translation! Construct an improvement! = Bangun peningkatan! - # Requires translation! Construct a Worker unit →> Move it to a Plains or Grassland tile → Click 'Construct improvement' → Choose the farm → Leave the worker there until it's finished. = Buat unit Pekerja → Gerakkan itu ke daerah Dataran atau Padang Rumput → Klik 'Bangun peningkatan' → Pilih pertanian → Tinggalkan pekerja di sana sampai peningkatan sudah dibangun. - # Requires translation! Create a trade route! = Buat rute perdagangan! - # Requires translation! Construct roads between your capital and another city. Or, automate your worker and let him get to that eventually. = Bangunlah jalan di antara ibu kota dan kotamu yang lain. Atau, otomatisasi pekerjamu dan biarkan dia membangunnya. - # Requires translation! Conquer a city! = Kuasai kota! - # Requires translation! Bring an enemy city down to low health → Enter the city with a melee unit. = Turunkan kota musuh hingga kesehatannya rendah → Masuki kota dengan unit jarak dekat. - # Requires translation! Move an air unit! = Gerakkan unit udara! - # Requires translation! Select an air unit →> select another city within range → Move the unit to the other city. = Pilih unit udara → pilih kota lain dalam jangkauan → Gerakkan unitnya ke kota lain. - # Requires translation! See your stats breakdown! = Lihat perincian statistikmu! - # Requires translation! Enter the Overview screen (top right corner) → Click on 'Stats'. = Masuk layar Selengkapnya (ujung kanan atas) → Klik pada 'Statistik'. diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index f73d4f6f89..7854340faf 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -1095,7 +1095,6 @@ due to our [unitName] defeating a [otherUnitName] = завдяки перемо due to our [unitName] being defeated by a [otherUnitName] = через поразку нашого підрозділу [unitName] перед підрозділом [otherUnitName] due to our [unitName] losing [amount] HP = через втрату нашим підрозділом [unitName] [amount] ОЗ due to our [unitName] being promoted = завдяки підвищенню нашого підрозділу [unitName] - # Requires translation! due to expending our [unitName] = через витрату нашого підрозділу [unitName] from the ruins = з руїн @@ -2444,7 +2443,6 @@ upon founding a Pantheon = заснувавши Пантеон upon founding a Religion = заснувавши Релігію upon enhancing a Religion = покращивши Релігію upon defeating a [mapUnitFilter] unit = при перемозі над підрозділом типу [mapUnitFilter] - # Requires translation! upon expending a [mapUnitFilter] unit = при витраті підрозділу [mapUnitFilter] upon being defeated = при поразці upon being promoted = при підвищенні @@ -2616,7 +2614,6 @@ Speed = Швидкість Tutorial = Навчання CityState = Місто-Держава ModOptions = Опції модифікації - # Requires translation! Event = Подія Conditional = Умовний TriggerCondition = Умова тригера @@ -5647,76 +5644,47 @@ Marine = Морська піхота #################### Lines from Events from Civ V - Gods & Kings #################### - # Requires translation! Move a unit! = Перемістіть підрозділ! - # Requires translation! Click on a unit → Click on a destination → Click the arrow popup. = Натисніть на підрозділ → Натисніть на клітинку призначення → Натисніть на спливаючу стрілочку. - # Requires translation! Found a city! = Заснуйте місто! - # Requires translation! Select the Settler → Click on 'Found city'. = Оберіть Поселенця → Натисніть "Заснувати місто". - # Requires translation! Enter the city screen! = Відкрийте екран міста! - # Requires translation! Click the city button twice. = Двічі натисніть кнопку міста. - # Requires translation! Pick a technology to research! = Оберіть технологію для дослідження! - # Requires translation! Click on the tech button → select technology → click 'Research' (bottom right). = Натисніть на кнопку технології → оберіть технологію → натисніть кнопку Дослідити (знизу справа). - # Requires translation! Pick a construction! = Оберіть споруду! - # Requires translation! Enter city screen → Click on a unit or building → click 'add to queue'. = Відкрийте екран міста → Натисніть на підрозділ або будівлю → Натисніть "Додати в чергу". - # Requires translation! Pass a turn! = Пропустіть хід! - # Requires translation! Cycle through units with 'Next unit' → Click 'Next turn'. = Перебирайте підрозділи за допомогою "Наступний підрозділ" → Натисніть "Наступний хід". - # Requires translation! Reassign worked tiles! = Переназначте оброблювані клітинки! - # Requires translation! Enter city screen → click the assigned tile to unassign → click an unassigned tile to assign population. = Відкрийте екран міста → натисніть на клітинку, що вже має призначеного міщанина, щоб зняти його → натисніть на іншу вільну клітинку, щоб призначити туди міщанина. - # Requires translation! Got it = Зрозуміло - # Requires translation! Meet another civilization! = Зустріньте іншу цивілізацію! - # Requires translation! Explore the map until you encounter another civilization! = Досліджуйте мапу доки не зустрінете іншу цивілізацію! - # Requires translation! Open the options dialog! = Відкрийте вікно налаштувань! - # Requires translation! Click the menu button (top left) → click 'Options'. = Натисніть кнопку меню (зверху зліва) → натисніть "Налаштування". - # Requires translation! Construct an improvement! = Створіть покращення клітинки! - # Requires translation! Construct a Worker unit →> Move it to a Plains or Grassland tile → Click 'Construct improvement' → Choose the farm → Leave the worker there until it's finished. = Збудуйте підрозділ Робітник → Перемістіть його на клітинку типу Рівнина або Луг → Натисніть "Покращити" → Оберіть ферму → Залиште робітника доки він не закінчить будівництво. - # Requires translation! Create a trade route! = Прокладіть торгівельний шлях! - # Requires translation! Construct roads between your capital and another city. Or, automate your worker and let him get to that eventually. = Збудуйте дороги між вашою столицею та іншим містом. Або автоматизуйте вашого робітника і він згодом зробить це сам. - # Requires translation! Conquer a city! = Захопіть місто! - # Requires translation! Bring an enemy city down to low health → Enter the city with a melee unit. = Знизьте здоров'я ворожого міста до низького рівня → Увійдіть в це місто підрозділом ближнього бою. - # Requires translation! Move an air unit! = Перемістіть повітряний підрозділ! - # Requires translation! Select an air unit →> select another city within range → Move the unit to the other city. = Оберіть повітряний підрозділ → оберіть інше місто в межах радіусу досягнення → перемістіть підрозділ в це місто. - # Requires translation! See your stats breakdown! = Подивіться вашу статистику! - # Requires translation! Enter the Overview screen (top right corner) → Click on 'Stats'. = Відкрийте екран Огляд (верхній правий кут) → Натисніть "Статистика". @@ -6981,3 +6949,4 @@ Miscellaneous = Різне External links = Зовнішні посилання External links support right-click or long press to copy the link to the clipboard instead of launching the browser. = Зовнішні посилання підтримують правий клік або довге натиснення для копіювання посилання в буфер обміну замість відкриття браузера. Example: The 'Open Github page' button on the Mod management screen. = Приклад: кнопка 'Відкрити сторінку Github' на екрані керування Модами. + diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index fdaac954b1..26ccf94dab 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -1,7 +1,7 @@ Afrikaans = 8 Belarusian = 13 Bosnian = 3 -Brazilian_Portuguese = 99 +Brazilian_Portuguese = 100 Bulgarian = 41 Catalan = 99 Czech = 78 @@ -9,7 +9,7 @@ Dutch = 95 English = 0 Filipino = 89 Finnish = 37 -French = 99 +French = 100 German = 99 Greek = 13 Hungarian = 81 @@ -33,6 +33,6 @@ Spanish = 98 Swedish = 79 Traditional_Chinese = 91 Turkish = 98 -Ukrainian = 99 +Ukrainian = 100 Vietnamese = 97 Zulu = 9 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 58e49abe75..f42c6b2190 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -5,7 +5,7 @@ object BuildConfig { const val kotlinVersion = "1.8.21" const val appName = "Unciv" const val appCodeNumber = 1007 - const val appVersion = "4.11.20" + const val appVersion = "4.12.0" const val gdxVersion = "1.12.1" const val ktorVersion = "2.2.3" diff --git a/changelog.md b/changelog.md index 41caf830b5..f04dba8898 100644 --- a/changelog.md +++ b/changelog.md @@ -1,26 +1,17 @@ -## 4.11.20 +## 4.12.0 -Adds unique IDs to units - -Fix tests - -rename: changeImprovement -> setImprovement - -4.11.19-patch1 +Fixed spy automation crash By tuvus: -- Personality implementation -- Renamed getDistanceToTilesWithinTurn to getDistanceToTilesAtLocation -- AI is more likely to sign Defensive pacts -- Giving the AI good trades is stored as credit -- Fix election crash +- Personality implementation +- AI is more likely to sign Defensive pacts +- Giving the AI good trades is stored as credit +- Fix election crash By SomeTroglodyte: -- Fix map editor can't place improvements -- Streamline and thereby reduce size of the save game json -- Improvement queue - -Use Temurin API to get latest temurin releases - By touhidurrr +- Map editor can place improvements again +- Reduce size of the save game json +- Improvement queue ## 4.11.19 diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index a220ceda86..cd40e5d426 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -484,7 +484,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.11.20", 1007) + val VERSION = Version("4.12.0", 1007) //endregion /** Global reference to the one Gdx.Game instance created by the platform launchers - do not use without checking [isCurrentInitialized] first. */ diff --git a/fastlane/metadata/android/en-US/changelogs/1007.txt b/fastlane/metadata/android/en-US/changelogs/1007.txt index d3326c2e85..a207f29265 100644 --- a/fastlane/metadata/android/en-US/changelogs/1007.txt +++ b/fastlane/metadata/android/en-US/changelogs/1007.txt @@ -1,23 +1,12 @@ - - -Adds unique IDs to units - -Fix tests - -rename: changeImprovement -> setImprovement - -4.11.19-patch1 +Fixed spy automation crash By tuvus: -- Personality implementation -- Renamed getDistanceToTilesWithinTurn to getDistanceToTilesAtLocation -- AI is more likely to sign Defensive pacts -- Giving the AI good trades is stored as credit -- Fix election crash +- Personality implementation +- AI is more likely to sign Defensive pacts +- Giving the AI good trades is stored as credit +- Fix election crash By SomeTroglodyte: -- Fix map editor can't place improvements -- Streamline and thereby reduce size of the save game json -- Improvement queue - -Use Temurin API to get latest temurin releases - By touhidurrr \ No newline at end of file +- Map editor can place improvements again +- Reduce size of the save game json +- Improvement queue \ No newline at end of file