diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties
index 916386f80b..12c5286ef4 100644
--- a/android/assets/jsons/translations/Brazilian_Portuguese.properties
+++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties
@@ -961,7 +961,7 @@ Must be on [terrain] = Deve estar no [terrain]
 in this city = nesta cidade
 in all cities = em todas as cidades
 in capital = na capital
-in every coastal city = Em toda cidade na costa
+in all coastal cities = Em toda cidade na costa
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties
index a0567defe3..9e7fac2074 100644
--- a/android/assets/jsons/translations/Czech.properties
+++ b/android/assets/jsons/translations/Czech.properties
@@ -943,7 +943,7 @@ Must be on [terrain] = Musí být na políčku [terrain]
 in this city = v tomto městě
 in all cities = v každém městě
 in capital = v hlavním městě
-in every coastal city = v každém pobřežním městě
+in all coastal cities = v každém pobřežním městě
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties
index ae17386ba1..c9ba6a95df 100644
--- a/android/assets/jsons/translations/Dutch.properties
+++ b/android/assets/jsons/translations/Dutch.properties
@@ -978,7 +978,7 @@ in all cities =
  # Requires translation!
 in capital = 
  # Requires translation!
-in every coastal city = 
+in all coastal cities = 
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties
index 62eb9ef888..4d1b8e545e 100644
--- a/android/assets/jsons/translations/English.properties
+++ b/android/assets/jsons/translations/English.properties
@@ -1761,7 +1761,7 @@ in all cities =
  # Requires translation!
 in capital = 
  # Requires translation!
-in every coastal city = 
+in all coastal cities = 
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties
index 1716d54ba0..bb200e5c70 100644
--- a/android/assets/jsons/translations/Finnish.properties
+++ b/android/assets/jsons/translations/Finnish.properties
@@ -1037,7 +1037,7 @@ in all cities =
  # Requires translation!
 in capital = 
  # Requires translation!
-in every coastal city = 
+in all coastal cities = 
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties
index a3b12d4266..ec44d781e9 100644
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@@ -953,7 +953,7 @@ Must be on [terrain] = Doit être sur [terrain]
 in this city = dans cette ville
 in all cities = dans toutes les villes
 in capital = dans la capitale
-in every coastal city = dans toutes les villes cotières
+in all coastal cities = dans toutes les villes cotières
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index 4cae36b4ad..a94a48806e 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -943,7 +943,7 @@ Must be on [terrain] = Muss sich auf [terrain] befinden
 in this city = in dieser Stadt
 in all cities = in jeder Stadt
 in capital = in der Hauptstadt
-in every coastal city = in jeder Küstenstadt
+in all coastal cities = in jeder Küstenstadt
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties
index 7184b5c52f..f6af8f7765 100644
--- a/android/assets/jsons/translations/Hungarian.properties
+++ b/android/assets/jsons/translations/Hungarian.properties
@@ -973,7 +973,7 @@ in this city = ebben a városban
 in all cities = minden városban
 in capital = a fővárosban
  # Requires translation!
-in every coastal city = 
+in all coastal cities = 
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties
index 9c62ad4cce..da3b4a1f1c 100644
--- a/android/assets/jsons/translations/Indonesian.properties
+++ b/android/assets/jsons/translations/Indonesian.properties
@@ -943,7 +943,7 @@ Must be on [terrain] = Harus berada di [terrain]
 in this city = di kota ini
 in all cities = di semua kota
 in capital = di ibu kota
-in every coastal city = di setiap kota pesisir
+in all coastal cities = di setiap kota pesisir
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties
index d4316194b8..9c98e47064 100644
--- a/android/assets/jsons/translations/Italian.properties
+++ b/android/assets/jsons/translations/Italian.properties
@@ -943,7 +943,7 @@ Must be on [terrain] = Deve ritrovarsi su [terrain]
 in this city = in questa città
 in all cities = in tutte le città
 in capital = nella Capitale
-in every coastal city = in ogni città costiera
+in all coastal cities = in ogni città costiera
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties
index f981525e23..920e99a8aa 100644
--- a/android/assets/jsons/translations/Japanese.properties
+++ b/android/assets/jsons/translations/Japanese.properties
@@ -960,7 +960,7 @@ Must be on [terrain] = [terrain]の上になければならない
 in this city = この都市で
 in all cities = 全ての都市で
 in capital = 首都で
-in every coastal city = 全ての沿岸都市で
+in all coastal cities = 全ての沿岸都市で
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties
index 134fa04382..d9376d9f43 100644
--- a/android/assets/jsons/translations/Korean.properties
+++ b/android/assets/jsons/translations/Korean.properties
@@ -963,7 +963,7 @@ Must be on [terrain] = 도시가 [terrain] 위에 있어야 함
 in this city = 이 도시에
 in all cities = 모든 도시에
 in capital = 수도에
-in every coastal city = 연안에 위치한 모든 도시에
+in all coastal cities = 연안에 위치한 모든 도시에
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties
index f686f6118e..4028a13725 100644
--- a/android/assets/jsons/translations/Lithuanian.properties
+++ b/android/assets/jsons/translations/Lithuanian.properties
@@ -1083,7 +1083,7 @@ in all cities =
  # Requires translation!
 in capital = 
  # Requires translation!
-in every coastal city = 
+in all coastal cities = 
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties
index 175784bc1f..3d83184081 100644
--- a/android/assets/jsons/translations/Malay.properties
+++ b/android/assets/jsons/translations/Malay.properties
@@ -1601,7 +1601,7 @@ in all cities =
  # Requires translation!
 in capital = 
  # Requires translation!
-in every coastal city = 
+in all coastal cities = 
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
index 93e4fe9d37..b0622c8ce5 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
@@ -1044,7 +1044,7 @@ in all cities =
  # Requires translation!
 in capital = 
  # Requires translation!
-in every coastal city = 
+in all coastal cities = 
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
index e1740b4e19..0aca66beac 100644
--- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
+++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties
@@ -1041,7 +1041,7 @@ in all cities =
  # Requires translation!
 in capital = 
  # Requires translation!
-in every coastal city = 
+in all coastal cities = 
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties
index df0875b527..bab467014a 100644
--- a/android/assets/jsons/translations/Polish.properties
+++ b/android/assets/jsons/translations/Polish.properties
@@ -982,7 +982,7 @@ in this city = w tym mieście
 in all cities = w każdym mieście
 in capital = w stolicy
  # Requires translation!
-in every coastal city = 
+in all coastal cities = 
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties
index a2a4904699..1262995b05 100644
--- a/android/assets/jsons/translations/Portuguese.properties
+++ b/android/assets/jsons/translations/Portuguese.properties
@@ -1028,7 +1028,7 @@ in all cities =
  # Requires translation!
 in capital = 
  # Requires translation!
-in every coastal city = 
+in all coastal cities = 
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties
index c4ea3cbf08..aff43af4db 100644
--- a/android/assets/jsons/translations/Romanian.properties
+++ b/android/assets/jsons/translations/Romanian.properties
@@ -1132,7 +1132,7 @@ in all cities =
  # Requires translation!
 in capital = 
  # Requires translation!
-in every coastal city = 
+in all coastal cities = 
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties
index 6ae090c00b..965ef4d91b 100644
--- a/android/assets/jsons/translations/Russian.properties
+++ b/android/assets/jsons/translations/Russian.properties
@@ -964,7 +964,7 @@ Must be on [terrain] = Должен находиться на клетке [terr
 in this city = в этом городе
 in all cities = в каждом городе
 in capital = в столице
-in every coastal city = в каждом прибрежном городе
+in all coastal cities = в каждом прибрежном городе
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties
index 80d44263f7..21ce6a0711 100644
--- a/android/assets/jsons/translations/Simplified_Chinese.properties
+++ b/android/assets/jsons/translations/Simplified_Chinese.properties
@@ -944,7 +944,7 @@ Must be on [terrain] = 城市必须位于[terrain]之上
 in this city = 所在城市
 in all cities = 每座城市
 in capital = 首都
-in every coastal city = 每座海滨城市
+in all coastal cities = 每座海滨城市
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties
index 7f7d092410..53322eb910 100644
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@@ -943,7 +943,7 @@ Must be on [terrain] = Debe estar en [terrain]
 in this city = en esta ciudad
 in all cities = en cada ciudad
 in capital = en capital
-in every coastal city = en cada ciudad costera
+in all coastal cities = en cada ciudad costera
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties
index 65d465d498..1775c39766 100644
--- a/android/assets/jsons/translations/Traditional_Chinese.properties
+++ b/android/assets/jsons/translations/Traditional_Chinese.properties
@@ -944,7 +944,7 @@ Must be on [terrain] = 城市必須位於[terrain]之上
 in this city = 所在城市
 in all cities = 每座城市
 in capital = 首都
-in every coastal city = 每座海濱城市
+in all coastal cities = 每座海濱城市
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties
index 7d2e201c11..e664d8a4a0 100644
--- a/android/assets/jsons/translations/Turkish.properties
+++ b/android/assets/jsons/translations/Turkish.properties
@@ -943,7 +943,7 @@ Must be on [terrain] = [terrain] üzerinde olmalı
 in this city = bu şehirde
 in all cities = her şehirde
 in capital = başkentte
-in every coastal city = her kıyı şehrinde
+in all coastal cities = her kıyı şehrinde
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties
index a3340cdd11..3c4bb01044 100644
--- a/android/assets/jsons/translations/Ukrainian.properties
+++ b/android/assets/jsons/translations/Ukrainian.properties
@@ -946,7 +946,7 @@ Must be on [terrain] = Має бути на місцевості типу «[ter
 in this city = в цьому місті
 in all cities = в кожному місті
 in capital = в столиці
-in every coastal city = в кожному прибережному місті
+in all coastal cities = в кожному прибережному місті
 
 
 #################### Lines from Buildings from Civ V - Vanilla ####################
diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties
index c036dd915f..a089b1c937 100644
--- a/android/assets/jsons/translations/template.properties
+++ b/android/assets/jsons/translations/template.properties
@@ -944,6 +944,8 @@ Must be on [terrain] =
 # City filters
 in this city = 
 in all cities = 
+in all coastal cities = 
 in capital = 
-in every coastal city = 
-
+in all cities with a world wonder = 
+in all cities connected to capital = 
+in all cities with a garrison = 
diff --git a/core/src/com/unciv/models/translations/TranslationFileWriter.kt b/core/src/com/unciv/models/translations/TranslationFileWriter.kt
index eedca372e2..b2dcddfec6 100644
--- a/core/src/com/unciv/models/translations/TranslationFileWriter.kt
+++ b/core/src/com/unciv/models/translations/TranslationFileWriter.kt
@@ -207,7 +207,7 @@ object TranslationFileWriter {
                             RulesetCache.getBaseRuleset().buildings.containsKey(parameter)
                                     || parameter == "Wonders" -> "building"
 
-                            UnitType.values().any { it.name == parameter } || parameter=="Military" -> "unitType"
+                            UnitType.values().any { it.name == parameter } || parameter == "Military" -> "unitType"
                             Stats.isStats(parameter) -> "stats"
                             parameter == "in this city"
                                     || parameter == "in all cities"
@@ -215,6 +215,7 @@ object TranslationFileWriter {
                                     || parameter == "in capital"
                                     || parameter == "in all cities with a world wonder"
                                     || parameter == "in all cities connected to capital"
+                                    || parameter == "in all cities with a garrison"
                             -> "cityFilter"
                             else -> "param"
                         }