From 35e2465f8a14bcbeef6faabb1a0e35bb467eab9b Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 24 Oct 2020 22:56:07 +0300 Subject: [PATCH] 3.11.7 --- .../translations/Brazilian_Portuguese.properties | 2 ++ android/assets/jsons/translations/Czech.properties | 2 ++ android/assets/jsons/translations/Dutch.properties | 2 ++ android/assets/jsons/translations/English.properties | 2 ++ android/assets/jsons/translations/Finnish.properties | 2 ++ android/assets/jsons/translations/French.properties | 2 ++ android/assets/jsons/translations/German.properties | 2 ++ .../assets/jsons/translations/Hungarian.properties | 2 ++ .../assets/jsons/translations/Indonesian.properties | 2 ++ android/assets/jsons/translations/Italian.properties | 2 ++ .../assets/jsons/translations/Japanese.properties | 2 ++ android/assets/jsons/translations/Korean.properties | 2 ++ .../assets/jsons/translations/Lithuanian.properties | 2 ++ android/assets/jsons/translations/Malay.properties | 2 ++ .../translations/Persian_(Pinglish-DIN).properties | 2 ++ .../translations/Persian_(Pinglish-UN).properties | 2 ++ android/assets/jsons/translations/Polish.properties | 2 ++ .../assets/jsons/translations/Portuguese.properties | 2 ++ .../assets/jsons/translations/Romanian.properties | 2 ++ android/assets/jsons/translations/Russian.properties | 2 ++ .../jsons/translations/Simplified_Chinese.properties | 2 ++ android/assets/jsons/translations/Spanish.properties | 2 ++ .../translations/Traditional_Chinese.properties | 2 ++ android/assets/jsons/translations/Turkish.properties | 2 ++ .../assets/jsons/translations/Ukrainian.properties | 2 ++ buildSrc/src/main/kotlin/BuildConfig.kt | 4 ++-- changelog.md | 12 ++++++++++++ 27 files changed, 64 insertions(+), 2 deletions(-) diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 5c3f7fcfe7..69df6848f3 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -450,6 +450,8 @@ Our proposed trade request is no longer relevant! = Nosso pedido de troca propos Clearing a [forest] has created [amount] Production for [cityName] = A limpeza da [forest] gerou [amount] de Produção para [cityName] [civName] assigned you a new quest: [questName]. = [civName] lhe deu uma nova missão: [questName]. [civName] rewarded you with [influence] influence for completing the [questName] quest. = [civName] lhe recompensou com [influence] de influência por completar a missão [questName]. + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index cb835ab8bf..c5168acb62 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -455,6 +455,8 @@ Clearing a [forest] has created [amount] Production for [cityName] = Vyčištěn [civName] assigned you a new quest: [questName]. = # Requires translation! [civName] rewarded you with [influence] influence for completing the [questName] quest. = + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 922c44e43c..d813881179 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -564,6 +564,8 @@ Clearing a [forest] has created [amount] Production for [cityName] = [civName] assigned you a new quest: [questName]. = # Requires translation! [civName] rewarded you with [influence] influence for completing the [questName] quest. = + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index c041ad693e..8af93e3563 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -839,6 +839,8 @@ Clearing a [forest] has created [amount] Production for [cityName] = [civName] assigned you a new quest: [questName]. = # Requires translation! [civName] rewarded you with [influence] influence for completing the [questName] quest. = + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index 9c4295ae49..f0f94e84a2 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -470,6 +470,8 @@ Clearing a [forest] has created [amount] Production for [cityName] = [civName] assigned you a new quest: [questName]. = # Requires translation! [civName] rewarded you with [influence] influence for completing the [questName] quest. = + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index c0f9f64ae8..e3a8611a5b 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -463,6 +463,8 @@ Our proposed trade request is no longer relevant! = Notre offre commerciale n'es Clearing a [forest] has created [amount] Production for [cityName] = [civName] assigned you a new quest: [questName]. = [civName] vous assigne une nouvelle quête : [questName]. [civName] rewarded you with [influence] influence for completing the [questName] quest. = [civName] vous récompense de [influence] influence pour avoir completé la quête [questName]. + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 8c187ccf94..38c31a3d51 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -450,6 +450,8 @@ Our proposed trade request is no longer relevant! = Unsere vorgeschlagene Handel Clearing a [forest] has created [amount] Production for [cityName] = Die Rodung eines [forest] ergab [amount] Produktion für [cityName] [civName] assigned you a new quest: [questName]. = [civName] hat Euch eine neue Aufgabe gegeben: [questName]. [civName] rewarded you with [influence] influence for completing the [questName] quest. = [civName] hat Euch mit [influence] Einfluß fürs Abschließen der Aufgabe [questName] belohnt. + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 9ba50bed4d..3cb9ef1696 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -450,6 +450,8 @@ Our proposed trade request is no longer relevant! = A felajánlott kereskedelmi Clearing a [forest] has created [amount] Production for [cityName] = Az [forest] megtisztítása [amount] termelékenységet biztosított [cityName] számára [civName] assigned you a new quest: [questName]. = [civName] adott neked egy új feladatot: [questName]. [civName] rewarded you with [influence] influence for completing the [questName] quest. = [civName] megjutalmazott téged [influence] befolyással a [questName] feladat teljesítése miatt. + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index b37e511d2f..0e9c977d7a 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -446,6 +446,8 @@ Our proposed trade request is no longer relevant! = Penawaran perdagangan kita t Clearing a [forest] has created [amount] Production for [cityName] = Penebangan [forest] telah menghasilkan [amount] Produksi untuk [cityName] [civName] assigned you a new quest: [questName]. = [civName] memberikan misi: [questName]. [civName] rewarded you with [influence] influence for completing the [questName] quest. = [civName] memberikan hadiah [influence] pengaruh karena telah sukses menjalankan misi [questName]. + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 029451b5cf..f4752c4cd0 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -446,6 +446,8 @@ Our proposed trade request is no longer relevant! = La nostra richiesta commerci Clearing a [forest] has created [amount] Production for [cityName] = Ripulire una [forest] ha contribuito [amount] Produzione per [cityName] [civName] assigned you a new quest: [questName]. = [civName] ti ha assegnato una nuova missione: [questName]. [civName] rewarded you with [influence] influence for completing the [questName] quest. = [civName] ti ha ricompensato con [influence] Influenza per aver completato la missione [questName]. + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index f18ca170bf..c203fc5b24 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -446,6 +446,8 @@ Our proposed trade request is no longer relevant! = 提案された取引の申 Clearing a [forest] has created [amount] Production for [cityName] = [forest]をクリアにしたことにより、[cityName]に[amount]つの生産キューを生成しました [civName] assigned you a new quest: [questName]. = [civName]はあなたに新たなクエストを与えました: [questName] [civName] rewarded you with [influence] influence for completing the [questName] quest. = [civName]の[questName]を完了させ、影響力を[influence]獲得 + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index c327fcf396..1b7947dd35 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -471,6 +471,8 @@ Clearing a [forest] has created [amount] Production for [cityName] = [civName] assigned you a new quest: [questName]. = # Requires translation! [civName] rewarded you with [influence] influence for completing the [questName] quest. = + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index a64b9eb4a8..fb35f0d1e7 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -477,6 +477,8 @@ Clearing a [forest] has created [amount] Production for [cityName] = [civName] assigned you a new quest: [questName]. = # Requires translation! [civName] rewarded you with [influence] influence for completing the [questName] quest. = + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 660dae2cf9..2a3a655f47 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -756,6 +756,8 @@ Clearing a [forest] has created [amount] Production for [cityName] = [civName] assigned you a new quest: [questName]. = # Requires translation! [civName] rewarded you with [influence] influence for completing the [questName] quest. = + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index ed13d28bc5..5d9b25bec4 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -468,6 +468,8 @@ Clearing a [forest] has created [amount] Production for [cityName] = [civName] assigned you a new quest: [questName]. = # Requires translation! [civName] rewarded you with [influence] influence for completing the [questName] quest. = + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index e6eb818895..7be201b97f 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -465,6 +465,8 @@ Clearing a [forest] has created [amount] Production for [cityName] = [civName] assigned you a new quest: [questName]. = # Requires translation! [civName] rewarded you with [influence] influence for completing the [questName] quest. = + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 3d0c911234..adacbbfcd4 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -469,6 +469,8 @@ Clearing a [forest] has created [amount] Production for [cityName] = [civName] assigned you a new quest: [questName]. = # Requires translation! [civName] rewarded you with [influence] influence for completing the [questName] quest. = + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 4739f489e4..0849742c00 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -476,6 +476,8 @@ Clearing a [forest] has created [amount] Production for [cityName] = [civName] assigned you a new quest: [questName]. = # Requires translation! [civName] rewarded you with [influence] influence for completing the [questName] quest. = + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 6f04f53459..66bd7febca 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -476,6 +476,8 @@ Clearing a [forest] has created [amount] Production for [cityName] = [civName] assigned you a new quest: [questName]. = # Requires translation! [civName] rewarded you with [influence] influence for completing the [questName] quest. = + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index e033d00cc0..b57a2f7a98 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -450,6 +450,8 @@ Our proposed trade request is no longer relevant! = Наше торговое п Clearing a [forest] has created [amount] Production for [cityName] = Вырубка [forest] принесла [amount] продукции г. [cityName] [civName] assigned you a new quest: [questName]. = [civName] выдала вам новое задание: [questName] [civName] rewarded you with [influence] influence for completing the [questName] quest. = [civName] наградила вас [influence] влияния за выполнение [questName]. + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 076ebaaaa8..49c7db2d74 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -450,6 +450,8 @@ Our proposed trade request is no longer relevant! = 我们的贸易項目已失 Clearing a [forest] has created [amount] Production for [cityName] = 砍伐[forest]为[cityName]增加了[amount]产能 [civName] assigned you a new quest: [questName]. = [civName]给了你一个新任务：[questName]。 [civName] rewarded you with [influence] influence for completing the [questName] quest. = [civName]因为你完成了[questName]任务而获得了[influence]影响力奖励。 + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 6d1a286baf..6e74a63376 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -455,6 +455,8 @@ Clearing a [forest] has created [amount] Production for [cityName] = La tala de [civName] assigned you a new quest: [questName]. = # Requires translation! [civName] rewarded you with [influence] influence for completing the [questName] quest. = + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index ebe94010bf..76373bf59d 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -469,6 +469,8 @@ Clearing a [forest] has created [amount] Production for [cityName] = [civName] assigned you a new quest: [questName]. = # Requires translation! [civName] rewarded you with [influence] influence for completing the [questName] quest. = + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 47f5d26c07..e41ec5b084 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -470,6 +470,8 @@ Clearing a [forest] has created [amount] Production for [cityName] = [civName] assigned you a new quest: [questName]. = # Requires translation! [civName] rewarded you with [influence] influence for completing the [questName] quest. = + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 227c20ca61..2b1db0e9b6 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -451,6 +451,8 @@ Our proposed trade request is no longer relevant! = Наша торгівель Clearing a [forest] has created [amount] Production for [cityName] = Вирубаний [forest] забезпечив бонус [amount] виробництва у місті [cityName] [civName] assigned you a new quest: [questName]. = [civName] призначає вам нове завдання: [questName]. [civName] rewarded you with [influence] influence for completing the [questName] quest. = [civName] надає вам [influence] впливу за виконання завдання: [questName]. + # Requires translation! +The resistance in [cityName] has ended! = # World Screen UI diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 041b5d8023..d2943fc4f6 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 = 489 - const val appVersion = "3.11.6" + const val appCodeNumber = 490 + const val appVersion = "3.11.7" const val gdxVersion = "1.9.10" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index d782befe67..aaf64746d7 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,15 @@ +## 3.11.7 + +Resolved #3285 - added a notification when cities are no longer in resistance + +More tile variants are enabled (e.g. "baseTile+resource+improvement") + +Fixed some more silly bugs caused by badly configured mods + +New snow-versions of existing tiles :) + +Can no longer start a new game with an incorrectly defined mod! :) + ## 3.11.6 Added "locate mod errors" button in the options menu for discovering broken links in base ruleset mods