diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties
index 20b5c6ca6367c..bd3c3dcfdc227 100644
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@@ -924,8 +924,7 @@ An unknown civilization has completed [construction]! = Uma civilização descon
 The city of [cityname] has started constructing [construction]! = A cidade de [cityname] começou a construir [construction]!
 [civilization] has started constructing [construction]! = A [civilization] começou a construir [construction]!
 An unknown civilization has started constructing [construction]! = Uma civilização desconhecida começou a construir [construction]!
- # Requires translation!
-[cityName] has started working on [construction] = 
+[cityName] has started working on [construction] = [cityName] começou a trabalhar em [construction]
 [cityName] has expanded its borders! = [cityName] expandiu suas fronteiras!
 Your Golden Age has ended. = Sua Era de Ouro terminou.
 [cityName] has been razed to the ground! = [cityName] foi queimada ás cinzas!
@@ -2450,8 +2449,7 @@ upon ending a turn in a [tileFilter] tile = ao terminar um turno em um painel [t
 upon discovering a [tileFilter] tile = ao descobrir um painel [tileFilter]
 hidden from users = escondido dos usuários
 for every [countable] = para cada [countable]
- # Requires translation!
-for every [amount] [countable] = 
+for every [amount] [countable] = para cada [amount] [countable]
 Comment [comment] = [comment]
 Diplomatic relationships cannot change = As relações diplomáticas não podem mudar
 Can convert gold to science with sliders = Pode converter ouro em ciência com sliders
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index 42aac2a3cca43..8881baf8250f3 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -925,7 +925,7 @@ The city of [cityname] has started constructing [construction]! = La ville de [c
 [civilization] has started constructing [construction]! = [civilization] a commencé à construire [construction] !
 An unknown civilization has started constructing [construction]! = Une civilisation inconnue a commencé à construire [construction] !
  # Requires translation!
-[cityName] has started working on [construction] = 
+[cityName] has started working on [construction] = [cityName] a débuté la production de [construction]
 [cityName] has expanded its borders! = [cityName] a étendu ses frontières !
 Your Golden Age has ended. = Votre Âge d'Or a pris fin.
 [cityName] has been razed to the ground! = [cityName] a été rasée !
@@ -2451,7 +2451,7 @@ upon discovering a [tileFilter] tile = en découvrant une case [tileFilter]
 hidden from users = Caché aux joueurs
 for every [countable] = pour chaque [countable]
  # Requires translation!
-for every [amount] [countable] = 
+for every [amount] [countable] = tous les [amount] [countable]
 Comment [comment] = [comment]
 Diplomatic relationships cannot change = Les relations diplomatiques ne peuvent pas changer
 Can convert gold to science with sliders = Possibilité de convertir l'Or en Science via un slider
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index ec6b0cd4338bc..4450d14ee3cea 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -924,8 +924,7 @@ An unknown civilization has completed [construction]! = Eine unbekannte Zivilisa
 The city of [cityname] has started constructing [construction]! = Die Stadt [cityname] hat den Bau von [construction] begonnen!
 [civilization] has started constructing [construction]! = [civilization] hat den Bau von [construction] begonnen!
 An unknown civilization has started constructing [construction]! = Eine unbekannte Zivilisation hat den Bau von [construction] begonnen!
- # Requires translation!
-[cityName] has started working on [construction] = 
+[cityName] has started working on [construction] = [cityName] hat mit den Arbeiten an [construction] begonnen
 [cityName] has expanded its borders! = [cityName] hat seine Grenzen erweitert!
 Your Golden Age has ended. = Euer Goldenes Zeitalter ist vorbei.
 [cityName] has been razed to the ground! = [cityName] wurde dem Erdboden gleich gemacht!
@@ -2450,9 +2449,8 @@ upon ending a turn in a [tileFilter] tile = bei Beendigung einer Runde auf einem
 upon discovering a [tileFilter] tile = bei Entdeckung eines [tileFilter] Feldes
 hidden from users = vor dem Benutzer versteckt
 for every [countable] = für jede [countable]
- # Requires translation!
-for every [amount] [countable] = 
-Comment [comment] = [comment]
+for every [amount] [countable] = für jede [amount] [countable]
+Comment [comment] = Kommentar [comment]
 Diplomatic relationships cannot change = Diplomatische Beziehungen können sich nicht ändern
 Can convert gold to science with sliders = Kann Gold in Wissenschaft mit Schiebereglern umwandeln
 Allow City States to spawn with additional units = Erlauben, dass Stadtstaaten mit zusätzlichen Einheiten spawnen können
diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties
index 2abcbaa6f47fc..2819cd9d23126 100644
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@@ -776,7 +776,7 @@ Show zoom buttons in world screen = Tampilkan tombol perbesaran di layar dunia
 Experimental Demographics scoreboard = Papan skor Demografik Eksperimental
 Never close popups by clicking outside = Jangan tutup popup dengan mengeklik layar di luar popup
 
-Size of Unitset art in Civilopedia = Ukuran gambar Setunit di Civilopedia
+Size of Unitset art in Civilopedia = Ukuran gambar Set unit di Civilopedia
 
 ### Visual Hints subgroup
 
@@ -925,7 +925,7 @@ The city of [cityname] has started constructing [construction]! = Kota [cityname
 [civilization] has started constructing [construction]! = [civilization] telah memulai pembangunan [construction]!
 An unknown civilization has started constructing [construction]! = Peradaban tak dikenal telah memulai pembangunan [construction]!
  # Requires translation!
-[cityName] has started working on [construction] = 
+[cityName] has started working on [construction] = [cityName] mulai membangun [construction]
 [cityName] has expanded its borders! = [cityName] telah memperluas perbatasannya!
 Your Golden Age has ended. = Masa Kejayaanmu sudah berakhir.
 [cityName] has been razed to the ground! = [cityName] telah dibumihanguskan!
@@ -2451,7 +2451,7 @@ upon discovering a [tileFilter] tile = saat menemukan daerah [tileFilter]
 hidden from users = disembunyikan dari pengguna
 for every [countable] = untuk setiap [countable]
  # Requires translation!
-for every [amount] [countable] = 
+for every [amount] [countable] = untuk setiap [amount] [countable]
 Comment [comment] = [comment]
 Diplomatic relationships cannot change = Hubungan diplomatik tidak dapat diubah
 Can convert gold to science with sliders = Dapat mengubah emas menjadi ilmu pengetahuan dengan penggeser
@@ -6702,12 +6702,12 @@ Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barri
 
 Keyboard = Papan Tombol
 If you have a keyboard, some shortcut keys become available. Unit command or improvement picker keys, for example, are shown directly in their corresponding buttons. = Jika kamu memakai papan tombol, beberapa tombol pintasan dapat digunakan. Misalnya, tombol perintah untuk unit atau pemilih peningkatan, ditunjukkan langsung melalui tombolnya yang sesuai.
-On the world screen the hotkeys are as follows: = Di layar dunia, hotkey-nya adalah sebagai berikut:
+On the world screen the hotkeys are as follows: = Di layar dunia, tombol panasnya adalah sebagai berikut:
 Space or 'N' - Next unit or turn\n'E' - Empire overview (last viewed page)\n'+', '-' - Zoom in / out\nHome - center on capital or open its city screen if already centered = Spasi atau 'N' - Unit atau giliran selanjutnya\n'E' - Gambaran kekaisaran (halaman terakhir yang dilihat)\n'+', '-' - Perbesar/Perkecil\nBeranda - memperlihatkan ibu kota atau membuka layar kotanya jika sudah diperlihatkan
 F1 - Open Civilopedia\nF2 - Empire overview Trades\nF3 - Empire overview Units\nF4 - Empire overview Diplomacy\nF5 - Social policies\nF6 - Technologies\nF7 - Empire overview Cities\nF8 - Victory Progress\nF9 - Empire overview Stats\nF10 - Empire overview Resources\nF11 - Quicksave\nF12 - Quickload = F1 - Buka Civilopedia\nF2 - Gambaran Perdagangan Kekaisaran\nF3 - Gambaran Unit Kekaisaran\nF4 - Gambaran Diplomasi Kekaisaran\nF5 - Kebijakan Sosial\nF6 - Teknologi\nF7 - Gambaran Kota-kota Kekaisaran\nF8 - Progres Kemenangan\nF9 - Gambaran Statistik Kekaisaran\nF10 - Gambaran Sumber Daya Kekaisaran\nF11 - Simpan kilat\nF12 - Muat kilat
 Ctrl-R - Toggle tile resource display\nCtrl-Y - Toggle tile yield display\nCtrl-O - Game options\nCtrl-S - Save game\nCtrl-L - Load game\nCtrl-U - Toggle UI (World Screen only) = Ctrl-R - Ubah tampilan sumber daya daerah\nCtrl-Y - Ubah tampilan penghasilan daerah\nCtrl-O - Opsi permainan\nCtrl-S - Simpan permainan\nCtrl-L - Muat permainan\nCtrl-U - Ubah UI (Layar Dunia saja)
  # Requires translation!
-All of these can be reassigned. = 
+All of these can be reassigned. = Semua ini bisa disusun ulang.
 
 This is where you spend most of your time playing Unciv. See the world, control your units, access other screens from here. = Di sinilah tempat di mana kamu akan menghabiskan sebagian besar waktumu saat bermain Unciv. Lihatlah dunia, perintahkan unitmu, dan akses layer-layar lainnya dari sini.
 ①: The menu button - civilopedia, save, load, options... = ①: Tombol menu - civilopedia, simpan, muat, opsi...
diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties
index 8ee27954b21db..76303d1cb6450 100644
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@@ -76,7 +76,7 @@ Hydro Plant = Elektrownia Wodna
 # City naming when list exhausted
 
  # Requires translation!
-New [cityName] = 
+New [cityName] = Nowe [cityName]
  # Requires translation!
 Neo [cityName] = 
  # Requires translation!
@@ -84,7 +84,7 @@ Nova [cityName] =
  # Requires translation!
 Altera [cityName] = 
  # Requires translation!
-New [civName]\n(formerly known as [cityName]) = 
+New [civName]\n(formerly known as [cityName]) = Nowe [civName]\n(niegdyś znane pod nazwą [cityName])
 
 # Diplomacy,Trade,Nations
 
@@ -161,20 +161,20 @@ We will remember this. = Zapamiętamy to!
 
 [civName] has declared war on [targetCivName]! = Cywilizacja [civName] wypowiedziała wojnę cywilizacji [targetCivName]!
  # Requires translation!
-[civName] has joined [allyCivName] in the war against us! = 
+[civName] has joined [allyCivName] in the war against us! = Cywilizacja [civName] przyłączyła się do cywilizacji [allyCivName] w wojnie przeciwko nam!
  # Requires translation!
-We have joined [allyCivName] in the war against [enemyCivName]! = 
+We have joined [allyCivName] in the war against [enemyCivName]! = Przyłączyliśmy się do cywilizacji [allyCivName] w wojnie przeciwko cywilizacji [enemyCivName]!
  # Requires translation!
-[civName] has joined [allyCivName] in the war against [enemyCivName]! = 
+[civName] has joined [allyCivName] in the war against [enemyCivName]! = Cywilizacja [civName] przyłączyła się do cywilizacji [allyCivName] w wojnie przeciwko cywilizacji [enemyCivName]!
  # Requires translation!
-[civName] has joined us in the war against [enemyCivName]! = 
+[civName] has joined us in the war against [enemyCivName]! = Cywilizacja [civName] przyłączyła się do nas w wojnie przeciwko cywilizacji [enemyCivName]!
 
  # Requires translation!
-[civName] cancelled their Defensive Pact with [otherCivName]! = 
+[civName] cancelled their Defensive Pact with [otherCivName]! = Cywilizacja [civName] odwołała swój Pakt Defensywny z cywilizacją [otherCivName]! 
  # Requires translation!
-[civName] cancelled their Defensive Pact with us! = 
+[civName] cancelled their Defensive Pact with us! = Cywilizacja [civName] odwołała Pakt Defensywny z nami!
  # Requires translation!
-We have cancelled our Defensive Pact with [civName]! = 
+We have cancelled our Defensive Pact with [civName]! = Odwołaliśmy nasz Pakt Defensywny z cywilizacją [civName]!
 
 [civName] and [targetCivName] have signed a Peace Treaty! = [civName] oraz [targetCivName] podpisują Traktat Pokojowy! 
 [civName] and [targetCivName] have signed the Declaration of Friendship! = [civName] oraz [targetCivName] podpisują Deklarację Przyjaźni! 
@@ -937,7 +937,7 @@ The city of [cityname] has started constructing [construction]! = Miasto [cityna
 [civilization] has started constructing [construction]! = Cywilizacja [civilization] rozpoczęła budowę [construction]!
 An unknown civilization has started constructing [construction]! = Nieznana cywilizacja rozpoczęła budowę [construction]!
  # Requires translation!
-[cityName] has started working on [construction] = 
+[cityName] has started working on [construction] = [cityName] zaczyna budować [construction]
 [cityName] has expanded its borders! = [cityName] poszerza granice!
 Your Golden Age has ended. = Koniec Złotej Ery!
 [cityName] has been razed to the ground! = Miasto [cityName] zostało zrównane z ziemią!
@@ -1123,7 +1123,7 @@ Next unit = Następna jednostka
 Fog of War = Mgła wojny
 Pick a policy = Wybierz ustrój
  # Requires translation!
-Move Spies = 
+Move Spies = Przemieść Szpiegów
 Movement = Ruch
 Strength = †Siła bojowa
 Ranged strength = Zasięg ostrzału
@@ -1563,7 +1563,7 @@ Sign Declaration of Friendship ([30] turns) = Podpisz Deklarację Przyjaźni ([3
 We are not interested. = Nie jesteśmy zainteresowani.
 We have signed a Declaration of Friendship with [otherCiv]! =  Podpisaliśmy Deklarację Przyjaźni z cywilizacją [otherCiv]!
  # Requires translation!
-[civName] and [otherCivName] have signed a Defensive Pact! = 
+[civName] and [otherCivName] have signed a Defensive Pact! = Cywilizacja [civName] i cywilizacja [otherCivName] podpisali Pakt Defensywny!
 [otherCiv] has denied our Declaration of Friendship! = Cywilizacja [otherCiv] odrzuciła naszą Deklarację Przyjaźni!
 
 Basics = Podstawy
@@ -1787,29 +1787,29 @@ Your spy [spyName] stole the Technology [techName] from [cityName]! = Twój szpi
 Your spy [spyName] was killed trying to steal Technology in [cityName]! = Twój szpieg [spyName] próbujący skraść Technologię w [cityName] został zabity!
 
 # Rigging elections
-Your spy successfully rigged the election in [cityName]! = Twojemu szpiegowi udało się sfałszować wybory w [cityName]!
+Your spy successfully rigged the election in [cityName]! = Twojemu szpiegowi udało się sfałszować wybory w mieście [cityName]!
  # Requires translation!
-Your spy lost the election in [cityStateName] to [civName]! = 
+Your spy lost the election in [cityStateName] to [civName]! = Twój szpieg przegrał wybory w [cityStateName] na rzecz cywilizacji [civName]! 
  # Requires translation!
-The election in [cityStateName] were rigged by [civName]! = 
+The election in [cityStateName] were rigged by [civName]! = Wybory w [cityStateName] zostały sfałszowane przez cywilizację [civName]!
  # Requires translation!
-Your spy lost the election in [cityName]! = 
+Your spy lost the election in [cityName]! = Twój szpieg przegrał wybory w mieście [cityName]!
 
 # City-Ctate Coups
  # Requires translation!
-Stage Coup = 
+Stage Coup = Przeprowadź Rewolucję
  # Requires translation!
-Your spy [spyName] successfully staged a coup in [cityName]! = 
+Your spy [spyName] successfully staged a coup in [cityName]! = Twojemu szpiegowi [spyName] udało się przeprowadzić rewolucję w mieście [cityName]!
  # Requires translation!
-A spy from [civName] successfully staged a coup in our former ally [cityStateName]! = 
+A spy from [civName] successfully staged a coup in our former ally [cityStateName]! = Szpiegowi cywilizacji [civName] udało się przeprowadzić rewolucję w naszym byłym sojuszniczym miastem [cityStateName]!
  # Requires translation!
-A spy from [civName] successfully staged a coup in [cityStateName]! = 
+A spy from [civName] successfully staged a coup in [cityStateName]! = Cywilizacji [civName] udało się przeprowadzić rewolucję w mieście [cityStateName]!
  # Requires translation!
-A spy from [civName] failed to stage a coup in our ally [cityStateName] and was killed! = 
+A spy from [civName] failed to stage a coup in our ally [cityStateName] and was killed! = Cywilizacji [civName] nie udało się przeprowadzić rewolucji w naszym sojuszniczym mieście [cityStateName], a ich szpieg został zabity!
  # Requires translation!
-Our spy [spyName] failed to stage a coup in [cityStateName] and was killed! = 
+Our spy [spyName] failed to stage a coup in [cityStateName] and was killed! = Naszemu szpiegowi [spyName] nie udało się przeprowadzić rewolucji w [cityStateName] przez co został zabity!
  # Requires translation!
-Do you want to stage a coup in [civName] with a [percent]% chance of success? = 
+Do you want to stage a coup in [civName] with a [percent]% chance of success? = Czy na pewno chcesz przeprowadzić rewolucję w [civName] z [percent]% powodzenia?
 
 # Spy fleeing city
 After the city of [cityName] was destroyed, your spy [spyName] has fled back to our hideout. = Po tym jak miasto [cityName] zostało zniszczone twój szpieg [spyName] uciekł z powrotem do naszego ukrycia. 
@@ -1921,9 +1921,9 @@ Status ￬ = Stan ￬
 
 Scenarios = Scenariusze
  # Requires translation!
-Error loading scenario: = 
+Error loading scenario: = Błąd w ładowaniu scenariusza:
  # Requires translation!
-Choose scenario = 
+Choose scenario = Wybierz scenariusz
 
 # Uniques that are relevant to more than one type of game object
 
@@ -2115,7 +2115,7 @@ May not generate great prophet equivalents naturally = Wielki Prorok nie będzie
 [relativeAmount]% spy effectiveness [cityFilter] = [relativeAmount]% skuteczności szpiega [cityFilter]
 [relativeAmount]% enemy spy effectiveness [cityFilter] = [relativeAmount]% skuteczności wrogiego szpiega [cityFilter]
  # Requires translation!
-New spies start with [amount] level(s) = 
+New spies start with [amount] level(s) = Nowi szpiedzy zaczynają z [amount] poziomami
 Starting tech = Technologia początkowa
 Starts with [tech] = Na start otrzymuje technologię [tech]
 Starts with [policy] adopted = Rozpoczyna z przyjętą polityką: [policy]
@@ -2338,9 +2338,9 @@ starting from the [era] = poczynając od → [era]
 if starting in the [era] = jeśli zaczyna się w [era]
 on [speed] game speed = grając na szybkości gry [speed]
  # Requires translation!
-when [victoryType] Victory is enabled = 
+when [victoryType] Victory is enabled = gdy Zwycięstwo [victoryType] jest włączone
  # Requires translation!
-when [victoryType] Victory is disabled = 
+when [victoryType] Victory is disabled = gdy Zwycięstwo [victoryType] jest wyłączone
 if no other Civilization has researched this = kiedy żadna inna Cywilizacja jeszcze tego nie odkryła
 after discovering [tech] = po odkryciu → [tech]
 before discovering [tech] = przed odkryciem → [tech]
@@ -2421,7 +2421,7 @@ Discover [tech] = Odkrywa [tech]
 Adopt [policy] = Przyjmuje [policy]
 Remove [policy] = Zrezygnuj z ustroju [policy]
  # Requires translation!
-Remove [policy] and refund [amount]% of its cost = 
+Remove [policy] and refund [amount]% of its cost = Zrezygnuj z ustroju społecznego [policy] i otrzymaj z powrotem [amount]% jego kosztu
 Free Technology = Otrzymasz 1 darmową technologię
 [positiveAmount] Free Technologies = [positiveAmount] darmowe technologie
 [positiveAmount] free random researchable Tech(s) from the [era] = [positiveAmount] bezpłatnych losowych technologii z: [era]
@@ -2480,9 +2480,9 @@ upon ending a turn in a [tileFilter] tile = po zakończeniu tury na polu [tileFi
 upon discovering a [tileFilter] tile = po odkryciu pola [tileFilter]
 hidden from users = Ukryte przed graczami 
  # Requires translation!
-for every [countable] = 
+for every [countable] = na każdy [countable]
  # Requires translation!
-for every [amount] [countable] = 
+for every [amount] [countable] = na każde [amount] [countable]
 Comment [comment] = [comment]
 Diplomatic relationships cannot change = Relacje dyplomatyczne nie zmieniają się 
 Can convert gold to science with sliders = Może zamieniać złoto na naukę suwakiem
@@ -2657,9 +2657,9 @@ Observing City = Obserwuje miasto
 Stealing Tech = Kradnie Technologię 
 Rigging Elections = Fałszuje Wybory
  # Requires translation!
-Coup = 
+Coup = Rewolucja
  # Requires translation!
-Counter-intelligence = 
+Counter-intelligence = Kontrwywiad
 Dead = Nie żyje
 
 
@@ -2684,7 +2684,7 @@ You attacked City-States that were under our protection! = Zaatakowałeś Wolne
 You demanded tribute from City-States that were under our protection! = Zażądałeś daniny od Wolnego Miasta, które jest pod naszą ochroną!
 You sided with a City-State over us = Trzymasz stronę Wolnego Miasta, a nie naszą!
  # Requires translation!
-You spied on us! = 
+You spied on us! = Szpiegowaliście nas!
 Years of peace have strengthened our relations. = Lata pokoju wzmocniły nasze relacje
 Our mutual military struggle brings us closer together. = Walka przeciw wspólnemu wrogowi zbliżyła nas do siebie
 We applaud your liberation of conquered cities! = Doceniamy, że wyzwalacie podbite miasta
@@ -6741,7 +6741,7 @@ Space or 'N' - Next unit or turn\n'E' - Empire overview (last viewed page)\n'+',
 F1 - Open Civilopedia\nF2 - Empire overview Trades\nF3 - Empire overview Units\nF4 - Empire overview Diplomacy\nF5 - Social policies\nF6 - Technologies\nF7 - Empire overview Cities\nF8 - Victory Progress\nF9 - Empire overview Stats\nF10 - Empire overview Resources\nF11 - Quicksave\nF12 - Quickload = F1 – Civilopedia\nF2 – Przegląd imperium: Handel\nF3 – Przegląd imperium: Jednostki\nF4 – Przegląd imperium: Dyplomacja\nF5 – Polityka społeczna\nF6 – Technologia\nF7 – Przegląd imperium: Miasta\nF8 – Postęp zwycięstwa\nF9 – Przegląd imperium: Statystyki\nF10 – Przegląd imperium: Zasoby\nF11 – Szybki zapis\nF12 – Szybkie wczytywanie
 Ctrl-R - Toggle tile resource display\nCtrl-Y - Toggle tile yield display\nCtrl-O - Game options\nCtrl-S - Save game\nCtrl-L - Load game\nCtrl-U - Toggle UI (World Screen only) = Ctrl-R - Przełącz widoczność zasobów pól\nCtrl-Y - Przełącz widoczność dochodów z pól\nCtrl-O - Ustawienia gry\nCtrl-S - Zapisz grę\nCtrl-L - Wczytaj grę\nCtrl-U - Przełącz UI (tylko na Ekranie Świata) 
  # Requires translation!
-All of these can be reassigned. = 
+All of these can be reassigned. = Wszystkie wymienione powyżej mogą zostać ponownie przypisane.
 
 This is where you spend most of your time playing Unciv. See the world, control your units, access other screens from here. = Tutaj spędzisz większość czasu podczas twojej przygody z Unciv. Możesz przeglądać mapę świata, kontrolować swoje jednostki oraz przejść do szczegółowych informacji o cywilizacji.
 ①: The menu button - civilopedia, save, load, options... = ①: Przycisk menu – Civilopedia, Zapisz, Wczytaj, Opcje...
@@ -6863,27 +6863,27 @@ City Blockade = Blokada Miasta
 One of your cities is under a naval blockade! When all adjacent water tiles of a coastal city are blocked - city loses harbor connection to all other cities, including capital. Make sure to de-blockade cities by deploying friendly military naval units to fight off invaders. = Jedno z twoich miast jest morsko zablokowane! Gdy wszystkie przylegające wodne pola zostaną zablokowane - miasto traci połączenie portowe do wszystkich innych miast, uwzględniając stolicę. Przerwij wrogą blokadę twoich miast przez rozmieszczenie przyjaznych jednostek militarnych morskich aby zwalczyć najeźdźców.
 
  # Requires translation!
-Spies! = 
+Spies! = Szpiedzy!
  # Requires translation!
-The first time a civ reaches the Renaissance era each nation gets one spy. Every time a civ reaches an era afterwards they get one more spy. = 
+The first time a civ reaches the Renaissance era each nation gets one spy. Every time a civ reaches an era afterwards they get one more spy. = Gdy dowolna cywilizacja wejdzie w epokę Renesansu każdy dostaje jednego, pierwszego szpiega. Za każdym razem gdy dowolne cywilizacje wchodzić będą w następne ery wszystkim przydzielani będą dodatkowi szpiedzy. 
  # Requires translation!
-Spies can be sent out to foreign cities to steal technology, rigging elections or stage coups. Place them in your own cities to do counter-intelligence work. = 
+Spies can be sent out to foreign cities to steal technology, rigging elections or stage coups. Place them in your own cities to do counter-intelligence work. = Szpiedzy mogą zostać wysłani do obych miast w celu skradzenia technologii, sfałszowania wyborów lub przeprowadzenia rewolucji. Przemieść ich do jednego ze swoich miast, a podejmą działania kontrwywiadowcze.
  # Requires translation!
-Only one spy per civ is allowed in each city. Spies that are not in any city are on vacation in your spy hideout. = 
+Only one spy per civ is allowed in each city. Spies that are not in any city are on vacation in your spy hideout. = Tylko jeden szpieg może znajdować się w każdym mieście. Szpiedzy niebędący w żadnym mieście czekają na rozkaz w twojej kryjówce.
  # Requires translation!
-Spies set up in cities of major civilizations will try to steal technology at a rate which is based off of the science production in the city. Succeeding to steal technology will level up your spy. Failing to succeed will level up the defending spy if it is present. = 
+Spies set up in cities of major civilizations will try to steal technology at a rate which is based off of the science production in the city. Succeeding to steal technology will level up your spy. Failing to succeed will level up the defending spy if it is present. = Szpiedzy znajdujący się w miastach innych cywilizacji będą próbować skraść technologię w tempie wyznaczonym przez naukę produkowaną przez dane miasto. Powodzenie w skradzeniu technologii da twojemu szpiegowi jeden poziom wyżej. Niepowodzenie natomiast da ten poziom szpiegowi prowadzącemu kontrwywiad w tym mieście, jeśli takowy jest.
  # Requires translation!
-Spies set in city-states will try to rigg the elections in order to gain influence and reduce the influence of other civilizations. Only one spy partaking in rigging the election can win. = 
+Spies set in city-states will try to rigg the elections in order to gain influence and reduce the influence of other civilizations. Only one spy partaking in rigging the election can win. = Szpiedzy znajdujący się w Wolnych Miastach próbować będą sfałszowanie wyborów, aby zwiększyć twoją liczbę Punktów Wpływu kosztem Punktów Wpływu innych cywilizacji. Tylko jeden szpieg próbujący sfałszować wybory w danym mieście może wygrać.
  # Requires translation!
-A spy that is rigging an election in a city-state may also stage a coup. The likelihood of success for the coup depends on your relative influence to the current ally of the city-state, your spy level, and the level of the spy that the current ally has in the city-state if present. Succeeding a coup will make you their new ally and reduce the influence of all other civs. Failing a coup will kill your spy and level up the defending spy if present. = 
+A spy that is rigging an election in a city-state may also stage a coup. The likelihood of success for the coup depends on your relative influence to the current ally of the city-state, your spy level, and the level of the spy that the current ally has in the city-state if present. Succeeding a coup will make you their new ally and reduce the influence of all other civs. Failing a coup will kill your spy and level up the defending spy if present. = Szpieg próbujący sfałszować wybory w Wolnym Mieście może również przeprowadzić rewolucję. Prawdopodobieństwo powodzenia zależy od twoich Punktów Wpływu względem aktualnego sojusznika tego miasta, poziomu twojego szpiega i poziomu szpiega obcej cywilizacji (będącej w sojuszu z tym miastem) znajdującego się w tym Wolnym Mieście.
  # Requires translation!
-Spies that are set up in your own cities will be conducting counter-intelligence. They reduce the success chance of other spies trying to steal your technology. = 
+Spies that are set up in your own cities will be conducting counter-intelligence. They reduce the success chance of other spies trying to steal your technology. = Szpiedzy znajdujący się w twoich miastach będą przeprowadzać kontrwywiad. Obniżą oni szanse powodzenia w skradzeniu twoich technologii obcym cywilizacjom.
  # Requires translation!
-Spies at a higher rank have a higher chance of success. The max rank a spy can reach is rank 3. After a spy is killed it will revive after a certain amount of turns back at rank 1. = 
+Spies at a higher rank have a higher chance of success. The max rank a spy can reach is rank 3. After a spy is killed it will revive after a certain amount of turns back at rank 1. = Szpiedzy na wyższych poziomach mają wyższe szanse na powodzenie. Najwyższym poziomem który mogą osiągnąć jest 3. Po zabiciu szpiega powróci on zawsze z poziomem 1.
  # Requires translation!
-Building buildings like the constabulary and police station will reduce the technology steal rate of spies in that city. = 
+Building buildings like the constabulary and police station will reduce the technology steal rate of spies in that city. = Wybudowanie budynków takich jak policja czy posterunek policji zmniejszy szybkość w jakiej technologie mogą być wykradzione przez obcych szpiegów w danym mieście.
  # Requires translation!
-Espionage is available using the Gods and Kings ruleset. To enable it in a new game click advanced settings, then click on the Enable Espionage option. = 
+Espionage is available using the Gods and Kings ruleset. To enable it in a new game click advanced settings, then click on the Enable Espionage option. = Szpiegostwo jest dostępne w zasadach gry "Bogowie i Królowie". Aby szpiedzy pojawili się w nowej grze należy kliknąć w "Opcje Zaawansowane", a następnie w "Włącz Szpiegów".
 
 Keyboard Bindings = Skróty klawiszowe
 Limitations = Ograniczenia 
diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties
index 96ad295b4d1e1..98e63e2f8d1d7 100644
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@@ -925,7 +925,7 @@ The city of [cityname] has started constructing [construction]! = ¡La ciudad de
 [civilization] has started constructing [construction]! = ¡[civilization] ha empezado a construir [construction]!
 An unknown civilization has started constructing [construction]! = ¡Una civilización desconocida ha empezado a construir [construction]!
  # Requires translation!
-[cityName] has started working on [construction] = 
+[cityName] has started working on [construction] = [cityName] ha comenzado a construír [construction]
 [cityName] has expanded its borders! = ¡[cityName] ha expandido sus fronteras!
 Your Golden Age has ended. = Tu Edad de Oro ha terminado.
 [cityName] has been razed to the ground! = ¡[cityName] ha sido arrasada hasta los cimientos!
@@ -2451,7 +2451,7 @@ upon discovering a [tileFilter] tile = al descubrir una casilla de [tileFilter]
 hidden from users = oculto al jugador
 for every [countable] = por cada [countable]
  # Requires translation!
-for every [amount] [countable] = 
+for every [amount] [countable] = por cada [amount] [countable]
 Comment [comment] = Comentario: [comment]
 Diplomatic relationships cannot change = No se pueden cambiar las relaciones diplomáticas
 Can convert gold to science with sliders = Se puede convertir Oro a Ciencia con un deslizador
@@ -6226,9 +6226,9 @@ I have heard that you adept at certain kinds of ... interactions. Show me. = He
 Hello again. = Hola de nuevo.
 Patriarchate of Constantinople = Patriarcado de Constantinopla
  # Requires translation!
-Magnificent Empress Theodora, beloved of Byzantium and of Rome, your people salute you! With your beauty and intelligence, you rose up from actress and courtesan to the rank of the most powerful woman in the Roman Empire, as wife of Justinian I. In the late 520's AD, you helped your husband engage in spiritual and legal reforms, promugalting numerous laws to improve women's status and treatment in the empire. You also made of Constantinople the jewel of the Eastern Roman Empire with the restoration and construction of many aqueducts, bridges, and churches, its beauty culminating with the creation of the Hagia Sophia, one of the most splendid pieces of architecture in the world. = 
+Magnificent Empress Theodora, beloved of Byzantium and of Rome, your people salute you! With your beauty and intelligence, you rose up from actress and courtesan to the rank of the most powerful woman in the Roman Empire, as wife of Justinian I. In the late 520's AD, you helped your husband engage in spiritual and legal reforms, promugalting numerous laws to improve women's status and treatment in the empire. You also made of Constantinople the jewel of the Eastern Roman Empire with the restoration and construction of many aqueducts, bridges, and churches, its beauty culminating with the creation of the Hagia Sophia, one of the most splendid pieces of architecture in the world. = Magnífica emperatriz Teodora, amada de Bizancio y de Roma, ¡tu pueblo te saluda! Con tu belleza e inteligencia, ascendiste de actriz y cortesana al rango de la mujer más poderosa del Imperio Romano, como esposa de Justiniano I. A finales del 520 d.C., ayudaste a tu marido a emprender reformas espirituales y legales, promulgando numerosas leyes para mejorar la condición y el trato de la mujer en el imperio. También hiciste de Constantinopla la joya del Imperio Romano de Oriente con la restauración y construcción de numerosos acueductos, puentes e iglesias, cuya belleza culminó con la creación de Santa Sofía, una de las piezas arquitectónicas más espléndidas del mundo.
  # Requires translation!
-Beautiful Empress,the Byzantine Empire's magnificence is intact in all memories, and ready to reborn as the new jewel of humankind. Will your new empire shine through the ages of history? = 
+Beautiful Empress,the Byzantine Empire's magnificence is intact in all memories, and ready to reborn as the new jewel of humankind. Will your new empire shine through the ages of history? = Hermosa emperatriz, la magnificencia del Imperio Bizantino está intacta en todos los recuerdos, y lista para renacer como la nueva joya de la humanidad. ¿Resplandecerá tu nuevo imperio a través de los siglos de la historia?
 Basil = Basil
 Nikophoros = Nikophoros
 Demetrios = Demetrios
diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties
index a457b0e03db74..67c6a95a632d3 100644
--- a/android/assets/jsons/translations/Ukrainian.properties
+++ b/android/assets/jsons/translations/Ukrainian.properties
@@ -925,7 +925,7 @@ The city of [cityname] has started constructing [construction]! = Місто [ci
 [civilization] has started constructing [construction]! = Нація [civilization] почала будувати [construction]!
 An unknown civilization has started constructing [construction]! = Невідома цивілізація почала будувати [construction]!
  # Requires translation!
-[cityName] has started working on [construction] = 
+[cityName] has started working on [construction] = В місті [cityName] почалося будівництво споруди [construction]
 [cityName] has expanded its borders! = Місто [cityName] розширило межі!
 Your Golden Age has ended. = Ваша Золота доба завершилася.
 [cityName] has been razed to the ground! = Місто [cityName] зруйновано вщент!
@@ -2449,9 +2449,9 @@ upon losing at least [amount] HP in a single attack = при втраті при
 upon ending a turn in a [tileFilter] tile = при закінченні ходу в клітинках типу [tileFilter]
 upon discovering a [tileFilter] tile = при знаходженні клітинки типу [tileFilter]
 hidden from users = приховано від користувачів
-for every [countable] =  для кожного [countable]
+for every [countable] = для кожного [countable]
  # Requires translation!
-for every [amount] [countable] = 
+for every [amount] [countable] = на кожні [amount] [countable]
 Comment [comment] = Коментар [comment]
 Diplomatic relationships cannot change = Дипломатичні стосунки неможливо змінити
 Can convert gold to science with sliders = Можна конвертувати ¤Золото в ⍾Науку за допомогою бігунків
@@ -3950,7 +3950,7 @@ Come, let our people feast together! = Вперед, нехай наші люд
 Welcome, friend! = Вітаю, друже!!
 Wayfinding = Пошук шляху
  # Requires translation!
-Aloha to Kamehameha the Great, who the heavens allowed to unite your people! O great King, under your reign, the Big Island of Hawai'i became one in 1791 AD, and many other islands joined your vision of union in 1810. As the first King of Hawai'i, law and taxation systems were stabilized, and you promoted the Kanawai Mamalahoe, an edict to protect civilian people in times of war. Unification and sovereignty of all the islands continued thanks to your fair laws and deeds, even after you joined your ancestors in paradise in 1819. = 
+Aloha to Kamehameha the Great, who the heavens allowed to unite your people! O great King, under your reign, the Big Island of Hawai'i became one in 1791 AD, and many other islands joined your vision of union in 1810. As the first King of Hawai'i, law and taxation systems were stabilized, and you promoted the Kanawai Mamalahoe, an edict to protect civilian people in times of war. Unification and sovereignty of all the islands continued thanks to your fair laws and deeds, even after you joined your ancestors in paradise in 1819. = Алоха Камегамега Великий, якому небеса дозволили об'єднати свій народ! Великий королю, під твоїм правлінням Великий острів Гаваї став таким у 1791 році, й багато інших островів доєднались до твого бачення союзу в 1810 році. У якості першого короля Гаваї ти стабілізував законодавчу та податкову системи, і впровадив Закон про Зламане Весло - указ, покликаний захистити мирних мешканців у часи війни. Об'єднаність та сувернітет усіх островів тривав дякуючи твоїм справедливим законам та мудрим вчинкам, навіть після твого возз'єднання із пращурами у 1819 році.
 Wise and benevolent King, will you unite your people once again by wearing the bright mantle of the Lion of the Pacific? Will your new empire shine through the ages of history? = Мудрий та великодушний Королю, чи об'єднаєш ти свій народ знову одягнувши яскраву мантію океанського Лева? Чи засяє твоя нова імперія крізь епохи?
 Honolulu = Гонолулу
 Samoa = Самоа
@@ -6884,7 +6884,7 @@ Right-click or long press a construction item to open a popup menu with addition
 The "Disable" option moves an item to a separated "Disabled" tab, preventing its automatic queueing by the "Auto-assign city production" option. To move a disabled item back to its initial place, enter again the popup menu, and choose "Enable". = Опція "Вимкнути" переміщує елемент в окрему вкладку "Вимкнуті", що запобігає додаванню його в чергу опцією "Авто-призначення виробництва в місті". Щоб повернути вимкнений елемент назад, зайдіть в вспилваюче меню знову, і оберіть "Ввімкнути".
 Disabled items are set globally and persistent: they are not reset in a new game, or by restarting Unciv. = Вимкнені елементи глобально зберігаються: вони не скидаються при запуску нової гри або при перезапуску Unciv.
 Show Great Person Points breakdown = Показати розподіл очок Видатних осіб
-In the right sidepanel, click a Great People row to display the details of Great Person Points (GPP) accumulated each turn by the current city, for this type of Great People. = На правій бічній панелі, натисніть на рядок Видатних осіб, щоб побачити подробиці щодо очок Видатних осіб що накопичуються кожного ходу поточним містом, обраним типом Видатних осіб.
+In the right sidepanel, click a Great People row to display the details of Great Person Points (GPP) accumulated each turn by the current city, for this type of Great People. = На правій бічній панелі, натисніть на рядок Видатних осіб, щоб побачити подробиці щодо очок Видатних осіб, що накопичуються кожного ходу у поточному місті обраним типом Видатних осіб.
 Click any of the Great People icons to display all GPP accumulated each turn by the current city, for all types of Great People. = Натисніть на будь-яку іконку Видатної особи щоб побачити всі очки Видатних осіб накопичених щоходу поточним містом, обраним типом Видатних осіб.
 Tech screen = Технології
 Queue multiple technologies in different branches = Додавати в чергу декілька технологій одночасно в різних галузях
@@ -6901,4 +6901,3 @@ 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/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index 506d236d0c1f0..018d8e6ae07fd 100644
--- a/buildSrc/src/main/kotlin/BuildConfig.kt
+++ b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -4,8 +4,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.8.21"
     const val appName = "Unciv"
-    const val appCodeNumber = 1001
-    const val appVersion = "4.11.16"
+    const val appCodeNumber = 1002
+    const val appVersion = "4.11.17"
 
     const val gdxVersion = "1.12.1"
     const val ktorVersion = "2.2.3"
diff --git a/changelog.md b/changelog.md
index edef561ca35bd..1af04d6cabe48 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,28 @@
+## 4.11.17
+
+Deprecated old uniques
+
+Resolved  - Unavailable techs work well with tech picker screen
+
+Added ruleset check for resource uniques with resource conditionals
+
+minor docs and city resource conditional test
+
+Better location for resource tests
+
+Unify "get stat for conditional state" logic
+
+By tuvus:
+- Spy max rank can be modded 
+- Added an option to disable move by long press 
+- Fixed spy steal tech timer 
+
+By SomeTroglodyte:
+- Console: Improve `civ activatetrigger` command 
+- UI candy: WLTK fireworks 
+- A ModOptions unique allowing a mod to control which map gets preselected 
+- Sortable unit overview 
+
 ## 4.11.16
 
 AI no longer trusts you on resource trades if you cut deals short
diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt
index b7c2d0257fa87..12941e4399a6d 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.16", 1001)
+        val VERSION = Version("4.11.17", 1002)
         //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/1002.txt b/fastlane/metadata/android/en-US/changelogs/1002.txt
new file mode 100644
index 0000000000000..52934c775b6b7
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/1002.txt
@@ -0,0 +1,24 @@
+
+
+Deprecated old uniques
+
+Resolved  - Unavailable techs work well with tech picker screen
+
+Added ruleset check for resource uniques with resource conditionals
+
+minor docs and city resource conditional test
+
+Better location for resource tests
+
+Unify "get stat for conditional state" logic
+
+By tuvus:
+- Spy max rank can be modded 
+- Added an option to disable move by long press 
+- Fixed spy steal tech timer 
+
+By SomeTroglodyte:
+- Console: Improve `civ activatetrigger` command 
+- UI candy: WLTK fireworks 
+- A ModOptions unique allowing a mod to control which map gets preselected 
+- Sortable unit overview 
\ No newline at end of file