diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 5a910cde1a..0888cb550b 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -163,6 +163,8 @@ Introduction to [nation] = Introdução para [nation] Declare war on [nation] = Declaração de guerra contra [nation] Luxury resources = Recursos de luxo Strategic resources = Recursos estratégicos + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -561,6 +563,8 @@ Load game = Carregar partida Main menu = Menu principal Resume = Retomar Cannot resume game! = Não pode retomar o jogo! + # Requires translation! +Not enough memory on phone to load game! = Quickstart = Início rápido Victory status = Status da vitória Social policies = Políticas sociais diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 0bbae64cf1..32e9fb5837 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -164,6 +164,8 @@ Introduction to [nation] = Seznámení s národem [nation] Declare war on [nation] = Vyhlášení války národu [nation] Luxury resources = Luxusní suroviny Strategic resources = Strategické suroviny + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -574,6 +576,8 @@ Resume = # Requires translation! Cannot resume game! = # Requires translation! +Not enough memory on phone to load game! = + # Requires translation! Quickstart = Victory status = Cesta k vítězství Social policies = Sociální politika diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 6b79ec6e1c..6e9cb0146d 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -239,6 +239,8 @@ Declare war on [nation] = Luxury resources = # Requires translation! Strategic resources = + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -876,6 +878,8 @@ Resume = # Requires translation! Cannot resume game! = # Requires translation! +Not enough memory on phone to load game! = + # Requires translation! Quickstart = Victory status = Overwinning Status Social policies = Sociaal beleid diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 69fcc4b785..669525788a 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -302,6 +302,8 @@ Declare war on [nation] = Luxury resources = # Requires translation! Strategic resources = + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -1037,6 +1039,8 @@ Resume = # Requires translation! Cannot resume game! = # Requires translation! +Not enough memory on phone to load game! = + # Requires translation! Quickstart = # Requires translation! Victory status = diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 9ca4365a78..1232d42012 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -163,6 +163,8 @@ Introduction to [nation] = Présentation à [nation] Declare war on [nation] = Déclarer la guerre à [nation] Luxury resources = Ressources de luxe Strategic resources = Ressources stratégiques + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -564,6 +566,8 @@ Load game = Charger une partie Main menu = Menu principal Resume = Continuer la partie Cannot resume game! = Impossible de reprendre cette partie ! + # Requires translation! +Not enough memory on phone to load game! = Quickstart = Démarrage rapide Victory status = Conditions de victoire Social policies = Doctrines diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index a0b580a9b0..caa359124d 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -163,6 +163,8 @@ Introduction to [nation] = Vorstellung der Nation [nation] Declare war on [nation] = [nation] den Krieg erklären Luxury resources = Luxusartikel Strategic resources = Strategische Ressourcen + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -564,6 +566,8 @@ Load game = Spiel laden Main menu = Hauptmenü Resume = Fortsetzen Cannot resume game! = Fortsetzen nicht möglich! + # Requires translation! +Not enough memory on phone to load game! = Quickstart = Schnellstart Victory status = Siegesstatus Social policies = Sozialpolitiken diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 5b31fff41c..71a596c7b1 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -163,6 +163,8 @@ Introduction to [nation] = Perkenalan ke [nation] Declare war on [nation] = Nyatakan perang pada [nation] Luxury resources = Sumber daya tersier Strategic resources = Sumber daya strategis + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -560,6 +562,8 @@ Load game = Muat permainan Main menu = Menu utama Resume = Lanjut Cannot resume game! = Tidak bisa melanjutkan permainan! + # Requires translation! +Not enough memory on phone to load game! = Quickstart = Mulai kilat Victory status = Status kemenangan Social policies = Kebijakan sosial diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index e2add8314d..344af7e17d 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -163,6 +163,8 @@ Introduction to [nation] = Introduci a [nation] Declare war on [nation] = Dichiara guerra a [nation] Luxury resources = Risorse di lusso Strategic resources = Risorse strategiche + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -560,6 +562,8 @@ Load game = Carica partita Main menu = Menu principale Resume = Riprendi partita Cannot resume game! = Impossibile continuare partita! + # Requires translation! +Not enough memory on phone to load game! = Quickstart = Avvio rapido Victory status = Condizioni di vittoria Social policies = Politiche sociali diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index aeeda5b7e3..4fa3740c98 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -163,6 +163,8 @@ Introduction to [nation] = [nation]の紹介 Declare war on [nation] = [nation]に対し宣戦布告 Luxury resources = 高級資源 Strategic resources = 戦略資源 + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -560,6 +562,8 @@ Load game = ロード Main menu = メインメニュー Resume = 再開 Cannot resume game! = ゲームを再開できません + # Requires translation! +Not enough memory on phone to load game! = Quickstart = クイックスタート Victory status = 勝利条件 Social policies = 社会制度 diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 8c07537c8a..ce1d27bb31 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -163,6 +163,8 @@ Introduction to [nation] = [nation]에 대한 소개 Declare war on [nation] = [nation]에 전쟁 선포 Luxury resources = 사치 자원 Strategic resources = 전략 자원 + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -560,6 +562,8 @@ Load game = 게임 불러오기 Main menu = 주 메뉴 Resume = 이어하기 Cannot resume game! = 게임을 이어할 수 없습니다! + # Requires translation! +Not enough memory on phone to load game! = Quickstart = 빠른 시작 Victory status = 승리 조건 확인 Social policies = 사회 정책 diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index 1b366bbce0..b624159b23 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -165,6 +165,8 @@ Introduction to [nation] = Įvadas į [nation] Declare war on [nation] = Paskelbti karą [nation] Luxury resources = Prabangos ištekliai Strategic resources = Strateginiai ištekliai + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -568,6 +570,8 @@ Load game = Užkrauti žaidimą Main menu = Pagrindinis meniu Resume = Tęsti Cannot resume game! = Neįmanoma atnaujinti žaidimo! + # Requires translation! +Not enough memory on phone to load game! = Quickstart = Greita pradžia Victory status = Pergalės statusas Social policies = Socialinė politika diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index ef707750c7..3c384874bf 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -254,6 +254,8 @@ Declare war on [nation] = Luxury resources = # Requires translation! Strategic resources = + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -991,6 +993,8 @@ Resume = # Requires translation! Cannot resume game! = # Requires translation! +Not enough memory on phone to load game! = + # Requires translation! Quickstart = # Requires translation! Victory status = diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index c3274e9adb..86ca3ffdc1 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -163,6 +163,8 @@ Introduction to [nation] = Przedstawienie narodu [nation] Declare war on [nation] = Wypowiedz wojnę z [nation] Luxury resources = Zasoby luksusowe Strategic resources = Zasoby strategiczne + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -563,6 +565,8 @@ Load game = Wczytaj grę Main menu = Menu główne Resume = Wznów Cannot resume game! = Nie można wznowić gry! + # Requires translation! +Not enough memory on phone to load game! = Quickstart = Szybki start Victory status = Status zwycięstwa Social policies = Ustroje społeczne diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index efb232af13..e088399cc7 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -163,6 +163,8 @@ Introduction to [nation] = Introdução a [nation] Declare war on [nation] = Declaração de guerra contra a(o) [nation] Luxury resources = Recursos luxuosos Strategic resources = Recursos estratégicos + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -566,6 +568,8 @@ Load game = Carregar partida Main menu = Menu principal Resume = Retomar Cannot resume game! = Não pode retomar o jogo! + # Requires translation! +Not enough memory on phone to load game! = Quickstart = Inicio rápido Victory status = Status da vitória Social policies = Políticas sociais diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 6a27a2dd2c..86af0f4b44 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -163,6 +163,8 @@ Introduction to [nation] = Introducere cu [nation] Declare war on [nation] = Declară război contra [nation] Luxury resources = Resurse de lux Strategic resources = Resurse strategice + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -564,6 +566,8 @@ Load game = Incarcă joc Main menu = Meniu principal Resume = Continuă Cannot resume game! = Nu s-a putut continua jocul! + # Requires translation! +Not enough memory on phone to load game! = Quickstart = Început rapid Victory status = Statut victorie Social policies = Politici sociale diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 216b8e2d69..964ac01769 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -163,6 +163,8 @@ Introduction to [nation] = Представиться державе [nation] Declare war on [nation] = Объявить войну: [nation] Luxury resources = Редкие ресурсы Strategic resources = Стратегические ресуры + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -560,6 +562,8 @@ Load game = Загрузить игру Main menu = Главное меню Resume = Продолжить Cannot resume game! = Невозможно продолжить игру! + # Requires translation! +Not enough memory on phone to load game! = Quickstart = Быстрый старт Victory status = Статус победы Social policies = Общественные институты diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 560b2b6da0..3c4dced177 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -163,6 +163,8 @@ Introduction to [nation] = 介绍认识[nation] Declare war on [nation] = 宣战[nation] Luxury resources = 奢侈资源 Strategic resources = 战略资源 + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -565,6 +567,8 @@ Load game = 读取游戏 Main menu = 主菜单 Resume = 继续 Cannot resume game! = 不能继续游戏! + # Requires translation! +Not enough memory on phone to load game! = Quickstart = 快速开始 Victory status = 胜利进度 Social policies = 社会政策 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 76d85a4d2a..a01849aadf 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -163,6 +163,8 @@ Introduction to [nation] = Presentarse a [nation] Declare war on [nation] = Declarar la guerra a [nation] Luxury resources = Recursos de lujo Strategic resources = Recursos estratégicos + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -560,6 +562,8 @@ Load game = Cargar partida Main menu = Menu principal Resume = Resumen Cannot resume game! = No se puede obtener un resumen del juego + # Requires translation! +Not enough memory on phone to load game! = Quickstart = Inicio rápido Victory status = Estado de victoria Social policies = Políticas sociales diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 76dde347e7..456931dfbe 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -163,6 +163,8 @@ Introduction to [nation] = 介紹認識[nation] Declare war on [nation] = 向[nation]宣戰 Luxury resources = 奢侈資源 Strategic resources = 戰略資源 + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -566,6 +568,8 @@ Load game = 讀取遊戲 Main menu = 主選單 Resume = 繼續遊戲 Cannot resume game! = 無法繼續遊戲! + # Requires translation! +Not enough memory on phone to load game! = Quickstart = 快速開始 Victory status = 勝利進度 Social policies = 社會政策 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index ba77b9c516..3bbfedbca6 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -163,6 +163,8 @@ Introduction to [nation] = [nation] ile tanıştırma Declare war on [nation] = [nation] devletine savaş ilan et Luxury resources = Lüks kaynaklar Strategic resources = Taktiksel kaynaklar + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -578,6 +580,8 @@ Load game = Oyunu yükle Main menu = Ana Menü Resume = Devam et Cannot resume game! = Oyuna devam edilemiyor! + # Requires translation! +Not enough memory on phone to load game! = Quickstart = Hızlı başlangıç Victory status = Zafer durumu Social policies = Sosyal politikalar diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 95e228c97c..4e311a586d 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -163,6 +163,8 @@ Introduction to [nation] = Познайомити з [nation] Declare war on [nation] = Оголосити війну [nation] Luxury resources = Ресурси розкоші Strategic resources = Стратегічні ресурси + # Requires translation! +Owned: [amountOwned] = # Nation picker @@ -560,6 +562,8 @@ Load game = Завантажити гру Main menu = Головне меню Resume = Повернутись до гри Cannot resume game! = Неможливо відновити гру! + # Requires translation! +Not enough memory on phone to load game! = Quickstart = Швидкий старт Victory status = Статус перемоги Social policies = Соціальні інститути diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index aae34db54a..ff425e2913 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -5,7 +5,7 @@ Polish = 96 Russian = 99 Lithuanian = 26 Romanian = 46 -Korean = 100 +Korean = 99 Simplified_Chinese = 88 German = 98 Japanese = 99 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 32fdcb4724..352252b754 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.3.71" const val appName = "Unciv" - const val appCodeNumber = 442 - const val appVersion = "3.9.6" + const val appCodeNumber = 443 + const val appVersion = "3.9.7" const val gdxVersion = "1.9.10" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index f2262d7776..8289300dd5 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,15 @@ +## 3.9.7 + +Resolved #2749 - show current improvement and remaining time to build in improvement picker screen + +Resolved #2112 - Show current resource amounts on incoming trade requests + +Hopefully mitigated some very odd multiplayer-checker-related crashes + +Fixed natural wonders not being considered 'impassible' for certain things (e.g. ancient ruins spawn) + +Translation updates + ## 3.9.6 Resolved #2761 - Tutorial titles are auto-added to the translation files