From cf4419912dae8049530813a97f7cedf6cc409752 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 6 May 2023 21:25:13 +0300 Subject: [PATCH] 4.6.9 --- .../jsons/translations/Afrikaans.properties | 2 +- .../jsons/translations/Belarusian.properties | 2 +- .../Brazilian_Portuguese.properties | 3 ++- .../jsons/translations/Bulgarian.properties | 2 +- .../jsons/translations/Catalan.properties | 3 ++- .../jsons/translations/Czech.properties | 3 ++- .../jsons/translations/Dutch.properties | 3 ++- .../jsons/translations/English.properties | 2 +- .../jsons/translations/Filipino.properties | 3 ++- .../jsons/translations/Finnish.properties | 2 +- .../jsons/translations/French.properties | 3 ++- .../jsons/translations/German.properties | 3 ++- .../jsons/translations/Greek.properties | 2 +- .../jsons/translations/Hungarian.properties | 2 +- .../jsons/translations/Indonesian.properties | 3 ++- .../jsons/translations/Italian.properties | 3 ++- .../jsons/translations/Japanese.properties | 2 +- .../jsons/translations/Korean.properties | 3 ++- .../jsons/translations/Lithuanian.properties | 3 ++- .../jsons/translations/Malay.properties | 2 +- .../Persian_(Pinglish-DIN).properties | 2 +- .../Persian_(Pinglish-UN).properties | 2 +- .../jsons/translations/Polish.properties | 3 ++- .../jsons/translations/Portuguese.properties | 3 ++- .../jsons/translations/Romanian.properties | 3 ++- .../jsons/translations/Russian.properties | 3 ++- .../Simplified_Chinese.properties | 3 ++- .../jsons/translations/Spanish.properties | 3 ++- .../jsons/translations/Swedish.properties | 3 ++- .../Traditional_Chinese.properties | 3 ++- .../jsons/translations/Turkish.properties | 2 +- .../jsons/translations/Ukrainian.properties | 3 ++- .../jsons/translations/Vietnamese.properties | 3 ++- .../completionPercentages.properties | 16 ++++++------ changelog.md | 23 ++++++++--------- core/src/com/unciv/models/ruleset/Building.kt | 6 ++--- .../metadata/android/en-US/changelogs/859.txt | 25 ++++++++----------- 37 files changed, 84 insertions(+), 73 deletions(-) diff --git a/android/assets/jsons/translations/Afrikaans.properties b/android/assets/jsons/translations/Afrikaans.properties index fe3649a04d..04242fdea7 100644 --- a/android/assets/jsons/translations/Afrikaans.properties +++ b/android/assets/jsons/translations/Afrikaans.properties @@ -4316,7 +4316,7 @@ Windmill = # Requires translation! Kremlin = # Requires translation! -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = # Requires translation! Museum = diff --git a/android/assets/jsons/translations/Belarusian.properties b/android/assets/jsons/translations/Belarusian.properties index d16ad417e4..83a6afd181 100644 --- a/android/assets/jsons/translations/Belarusian.properties +++ b/android/assets/jsons/translations/Belarusian.properties @@ -4569,7 +4569,7 @@ Windmill = # Requires translation! Kremlin = # Requires translation! -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = # Requires translation! Museum = diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 8774a1cd8c..06ebb4fec9 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -2552,7 +2552,8 @@ Porcelain Tower = Torre de Porcelana Windmill = Moinho de vento Kremlin = Kremlin -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = 'A Lei é uma fortaleza em uma colina que os exércitos não podem tomar ou as inundações levam.' - O Profeta Maomé + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Museu diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties index b5418f26fe..e915df98c9 100644 --- a/android/assets/jsons/translations/Bulgarian.properties +++ b/android/assets/jsons/translations/Bulgarian.properties @@ -3584,7 +3584,7 @@ Windmill = Вятърна Мелница Kremlin = Кремъл # Requires translation! -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Музей diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties index 46cbc872c9..42da1883b2 100644 --- a/android/assets/jsons/translations/Catalan.properties +++ b/android/assets/jsons/translations/Catalan.properties @@ -2552,7 +2552,8 @@ Porcelain Tower = Torre de Porcellana Windmill = Molí de vent Kremlin = El Kremlin -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = «La llei és una fortalesa en un turó que les inundacions no poden endur-se ni els exèrcits poden conquerir.» ‒ El profeta Mohammed + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Museu diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index eda5cd0de9..c225457ae0 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -2900,7 +2900,8 @@ Porcelain Tower = Porcelánová pagoda Windmill = Větrný mlýn Kremlin = Kreml -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = 'Zákon je pevnost na kopci, kterou nezničí armády ani povodeň neodplaví.' - Prorok Mohamed + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Muzeum diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index ca13de9a81..e847ba8cd0 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -2772,7 +2772,8 @@ Porcelain Tower = Porceleinen Toren Windmill = Windmolen Kremlin = Kremlin -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = 'De Wet is een vesting op een heuvel die legers niet kunnen innemen of overstromingen kunnen wegspoelen' - De Profeet Mohammed + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Museum diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 171648ba81..f0a1d7bf01 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -4692,7 +4692,7 @@ Windmill = # Requires translation! Kremlin = # Requires translation! -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = # Requires translation! Museum = diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties index 771ecd1569..d95aa9a611 100644 --- a/android/assets/jsons/translations/Filipino.properties +++ b/android/assets/jsons/translations/Filipino.properties @@ -2593,7 +2593,8 @@ Porcelain Tower = Tore ng Porselana Windmill = Windmill Kremlin = Kremlin -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = 'Ang Batas ay isang kuta sa isang burol na hindi maaagaw ng mga hukbo o maaanod ng baha.' - Ang Propeta Muhammad + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Museo diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index a5266dc9cc..213e002dd3 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -3746,7 +3746,7 @@ Windmill = Tuulimylly # Requires translation! Kremlin = # Requires translation! -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Museo diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 21ec23c291..515461548f 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -2552,7 +2552,8 @@ Porcelain Tower = Tour de Porcelaine Windmill = Moulin à Vent Kremlin = Kremlin -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = 'La Loi est une forteresse bâtie sur une colline que ni les armées ni les inondations ne peuvent atteindre.' - Prophète Mahomet + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Musée diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 941401cf19..bda5862925 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -2552,7 +2552,8 @@ Porcelain Tower = Porzellanturm Windmill = Windmühle Kremlin = Kreml -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = 'Das Gesetz ist eine Festung auf einem Hügel, die weder von Armeen eingenommen noch von Fluten weggespült werden kann.' - The Prophet Muhammed + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Museum diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties index dec89fa0aa..46d188fea5 100644 --- a/android/assets/jsons/translations/Greek.properties +++ b/android/assets/jsons/translations/Greek.properties @@ -4232,7 +4232,7 @@ Windmill = Ανεμόμυλος Kremlin = Κρεμλίνο # Requires translation! -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Μουσείο diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 6a7461fa72..2cba8f6604 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -2576,7 +2576,7 @@ Windmill = Szélmalom Kremlin = Kreml # Requires translation! -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Múzeum diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index c786a17572..2feba85a96 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -2552,7 +2552,8 @@ Porcelain Tower = Menara Porselen Windmill = Kincir Angin Kremlin = Kremlin -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = 'Hukum adalah benteng di bukit yang tidak dapat direbut pasukan maupun disapu banjir.' - Nabi Muhammad + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Museum diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 5c82c14b73..33b27a56b0 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -2563,7 +2563,8 @@ Porcelain Tower = Torre di Porcellana Windmill = Mulino a vento Kremlin = Cremlino -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = 'La Legge è una fortezza su una collina che gli eserciti non possono catturare e le inondazioni non possono spazzare via.' - Il profeta Maometto + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Museo diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 052b953db4..f033f3ba11 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -3039,7 +3039,7 @@ Windmill = 風車 Kremlin = クレムリン宮殿 # Requires translation! -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = 博物館 diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 632dfef22b..5298d124cc 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -2662,7 +2662,8 @@ Porcelain Tower = 대보은사 Windmill = 풍차 Kremlin = 크렘린 궁전 -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = '법이란 군대에 빼앗기지도 않고 홍수에 휩쓸리지도 않는 언덕 위의 요새다.' - 선지자 무함마드 + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = 박물관 diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index 93d639d99a..6291e6cac5 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -2757,7 +2757,8 @@ Porcelain Tower = Kinų Porceliano Pagoda Windmill = Vandens malūnas Kremlin = Kremliaus Tvirtovė -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = 'Kaip Įstatymas duotas per Mozę, taip tiesa ir malonė atėjo per Jėzų Kristų.' - Jono 1:17 + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Muziejus diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 689a450e9f..9867c5a1ed 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -3769,7 +3769,7 @@ Windmill = Kremlin = Kremlin # Requires translation! -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Muzium diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index af64f3c4bb..71184a6859 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -4036,7 +4036,7 @@ Windmill = # Requires translation! Kremlin = # Requires translation! -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = # Requires translation! Museum = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index 66374363b0..127f274b77 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -3961,7 +3961,7 @@ Windmill = # Requires translation! Kremlin = # Requires translation! -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = # Requires translation! Museum = diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index b5a69415cd..e00a4bfa9f 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -2560,7 +2560,8 @@ Porcelain Tower = Porcelanowa Wieża Windmill = Wiatrak Kremlin = Kreml -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = „Prawo jest fortecą na wzgórzu, której armie nie mogą zdobyć ani zmyć powodzi.”\n\n– Mahomet + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Muzeum diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 242bd7672f..0e67c2e821 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -2929,7 +2929,8 @@ Porcelain Tower = Torre de Porcelana Windmill = Moínho de vento Kremlin = Kremlin -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = 'A Lei é uma fortaleza em uma colina que os exércitos não podem tomar ou as enchentes não podem lavar.' - O Profeta Muhammed + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Museu diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 16fb1cc7bf..35575f8ad8 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -3068,7 +3068,8 @@ Porcelain Tower = Turnul de Porțelan Windmill = Moară de vant Kremlin = Kremlin -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = „Legea este o fortăreață pe un deal pe care armatele nu o pot lua sau inundațiile o pot spăla”. - Profetul Muhammed + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Muzeu diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index e93682b690..9258e215bb 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -2579,7 +2579,8 @@ Porcelain Tower = Фарфоровая пагода Windmill = Ветряная мельница Kremlin = Кремль -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = 'Закон - это крепость на холме, которую не подточат воды, не возьмут осаждающие.' - пророк Мухаммед + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Музей diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index a982511e12..fdf2f58638 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -2552,7 +2552,8 @@ Porcelain Tower = 大报恩寺塔 Windmill = 风车 Kremlin = 克里姆林宫 -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = “法律是山上的堡垒，军队无法攻占，洪水也无法冲走。” —— 先知穆罕默德 + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = 博物馆 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 256eacd91c..1239a927ab 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -2552,7 +2552,8 @@ Porcelain Tower = Torre de Porcelana Windmill = Molino de viento Kremlin = Kremlin -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = "La ley es una fortaleza en una colina que los ejercitos no pueden tomar ni inundar." - El profeta Muhammed + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Museo diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index 0e324a0904..e7585524cd 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -2796,7 +2796,8 @@ Porcelain Tower = Porslinspagoden Windmill = Väderkvarn Kremlin = Kreml -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = 'Lagen är en fästning på en kulle som inga arméer kan inta eller översvämningar skölja undan.' - Profeten Mohammed + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Museum diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index b68eb2a07d..ed534bb92e 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -2662,7 +2662,8 @@ Porcelain Tower = 大報恩寺塔 Windmill = 風車 Kremlin = 克里姆林宮 -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = “法律是山上的堡壘；軍隊無法攻佔，洪水無法沖走。” —— 先知穆罕默德 + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = 博物館 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 621525595f..45d44c9af1 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -3230,7 +3230,7 @@ Windmill = Yeldeğirmeni Kremlin = Kremlin Sarayı # Requires translation! -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Müze diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index bea359d413..7aa53a06ce 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -2552,7 +2552,8 @@ Porcelain Tower = Порцелянова пагода Windmill = Вітряк Kremlin = Кремль -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = "Закон - це фортеця на пагорбі, яку не може захопити жодна армія, не змиє жодна повінь." — Пророк Мухамед + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Музей diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties index 8e6e28895a..d36245d191 100644 --- a/android/assets/jsons/translations/Vietnamese.properties +++ b/android/assets/jsons/translations/Vietnamese.properties @@ -2752,7 +2752,8 @@ Porcelain Tower = Tháp sứ Windmill = Cối xay gió Kremlin = Điện Kremlin -'The Law is a fortress on a hill that armies cannot take or floods wash away.' - The Prophet Muhammed = 'Luật pháp là một pháo đài trên đồi mà quân đội không thể chiếm được hoặc lũ lụt cuốn trôi.' - Nhà tiên tri Muhammed + # Requires translation! +'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = Museum = Bảo tàng diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 8bafd5834c..4696d5801e 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -3,24 +3,24 @@ Italian = 99 Russian = 99 Belarusian = 2 Afrikaans = 7 -German = 100 +German = 99 Swedish = 87 Turkish = 70 -Ukrainian = 100 +Ukrainian = 99 Filipino = 96 -French = 100 +French = 99 Portuguese = 64 -Indonesian = 100 -Catalan = 100 +Indonesian = 99 +Catalan = 99 Finnish = 37 -Spanish = 100 +Spanish = 99 Malay = 23 -Brazilian_Portuguese = 100 +Brazilian_Portuguese = 99 Traditional_Chinese = 97 Polish = 99 Lithuanian = 95 Romanian = 73 -Simplified_Chinese = 100 +Simplified_Chinese = 99 Bulgarian = 43 Korean = 97 Persian_(Pinglish-DIN) = 13 diff --git a/changelog.md b/changelog.md index 13d6b3fe43..10facbc031 100644 --- a/changelog.md +++ b/changelog.md @@ -1,29 +1,26 @@ ## 4.6.9 -Resolved - Hide buildings requiring multiple cities in one city challenge +Hide buildings requiring multiple cities in one city challenge -Resolved - Added Policy icons and solved 'icons from Image' reflection :) +Added Policy icons in text -Resolved - Show Strategic resources you have by trade even if you have not researched tech for it yet +Show Strategic resources you have by trade even if you have not researched tech for it yet -Resolved - New Kremlin quote +Solved "get vanilla ruleset" errors after downloading mods -Resolved - solved "get vanilla ruleset" errors after downloading mods +Scale down unit overlays on zoom in to allow selecting bombard target above city -Resolve - scale down unit overlays on zoom in to allow selecting bombard target above city - -Probably resolved - AI 'found religion' crash +Solved AI 'found religion' crash AbsoluteUnits - Hussar, Cossack, Panzer - By letstalkaboutdune Close the friend selection popup in NewGameScreen by click outside or ESC/BACK key - By CrsiX By SomeTroglodyte: -- Fix memory leak from repeatedly resetting the font -- Slimming a locally built jar -- Limit saved window size to available desktop -- Show a preview of custom maps on new game screen -- Allow closing a Popup by clicking outside its area +- Fix memory leak from repeatedly resetting the font +- Limit saved window size to available desktop +- Show a preview of custom maps on new game screen +- Allow closing a Popup by clicking outside its area ## 4.6.8 diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt index 89e6705321..5f4f0a1f06 100644 --- a/core/src/com/unciv/models/ruleset/Building.kt +++ b/core/src/com/unciv/models/ruleset/Building.kt @@ -461,11 +461,9 @@ class Building : RulesetStatsObject(), INonPerpetualConstruction { && cityConstructions.city.civ.gameInfo.gameParameters.oneCityChallenge) return false // You will never be able to get more cities, this building is effectively disabled - return rejectionReasons.none { !it.shouldShow } - || ( - canBePurchasedWithAnyStat(cityConstructions.city) + if (rejectionReasons.none { !it.shouldShow }) return true + return canBePurchasedWithAnyStat(cityConstructions.city) && rejectionReasons.all { it.type == RejectionReasonType.Unbuildable } - ) } override fun getRejectionReasons(cityConstructions: CityConstructions): Sequence = sequence { diff --git a/fastlane/metadata/android/en-US/changelogs/859.txt b/fastlane/metadata/android/en-US/changelogs/859.txt index dd023b130a..e197d5d781 100644 --- a/fastlane/metadata/android/en-US/changelogs/859.txt +++ b/fastlane/metadata/android/en-US/changelogs/859.txt @@ -1,26 +1,21 @@ +Hide buildings requiring multiple cities in one city challenge +Added Policy icons in text -Resolved - Hide buildings requiring multiple cities in one city challenge +Show Strategic resources you have by trade even if you have not researched tech for it yet -Resolved - Added Policy icons and solved 'icons from Image' reflection :) +Solved "get vanilla ruleset" errors after downloading mods -Resolved - Show Strategic resources you have by trade even if you have not researched tech for it yet +Scale down unit overlays on zoom in to allow selecting bombard target above city -Resolved - New Kremlin quote - -Resolved - solved "get vanilla ruleset" errors after downloading mods - -Resolve - scale down unit overlays on zoom in to allow selecting bombard target above city - -Probably resolved - AI 'found religion' crash +Solved AI 'found religion' crash AbsoluteUnits - Hussar, Cossack, Panzer - By letstalkaboutdune Close the friend selection popup in NewGameScreen by click outside or ESC/BACK key - By CrsiX By SomeTroglodyte: -- Fix memory leak from repeatedly resetting the font -- Slimming a locally built jar -- Limit saved window size to available desktop -- Show a preview of custom maps on new game screen -- Allow closing a Popup by clicking outside its area \ No newline at end of file +- Fix memory leak from repeatedly resetting the font +- Limit saved window size to available desktop +- Show a preview of custom maps on new game screen +- Allow closing a Popup by clicking outside its area \ No newline at end of file