From 972bf2ba1c9fab700f9210eb4ef74759934b2ff3 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 11 Mar 2021 21:08:48 +0200 Subject: [PATCH] Resolved #3681 - translation fix, "in every city" -> "in all cities" --- .../Brazilian_Portuguese.properties | 2 +- .../jsons/translations/Czech.properties | 2 +- .../jsons/translations/Dutch.properties | 2 +- .../jsons/translations/English.properties | 2 +- .../jsons/translations/Finnish.properties | 2 +- .../jsons/translations/French.properties | 2 +- .../jsons/translations/German.properties | 2 +- .../jsons/translations/Hungarian.properties | 2 +- .../jsons/translations/Indonesian.properties | 2 +- .../jsons/translations/Italian.properties | 2 +- .../jsons/translations/Japanese.properties | 2 +- .../jsons/translations/Korean.properties | 2 +- .../jsons/translations/Lithuanian.properties | 2 +- .../jsons/translations/Malay.properties | 2 +- .../Persian_(Pinglish-DIN).properties | 2 +- .../Persian_(Pinglish-UN).properties | 2 +- .../jsons/translations/Polish.properties | 2 +- .../jsons/translations/Portuguese.properties | 2 +- .../jsons/translations/Romanian.properties | 2 +- .../jsons/translations/Russian.properties | 2 +- .../Simplified_Chinese.properties | 2 +- .../jsons/translations/Spanish.properties | 2 +- .../assets/jsons/translations/Thai.properties | 2 +- .../Traditional_Chinese.properties | 2 +- .../jsons/translations/Turkish.properties | 2 +- .../jsons/translations/Ukrainian.properties | 2 +- .../jsons/translations/template.properties | 2 +- core/src/com/unciv/logic/map/TileInfo.kt | 2 +- core/src/com/unciv/ui/saves/LoadGameScreen.kt | 21 ++++++++++--------- 29 files changed, 39 insertions(+), 38 deletions(-) diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 469b371b23..916386f80b 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -959,7 +959,7 @@ Must be on [terrain] = Deve estar no [terrain] # City filters in this city = nesta cidade -in every city = em todas as cidades +in all cities = em todas as cidades in capital = na capital in every coastal city = Em toda cidade na costa diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 70c64e2cac..f7c136bf49 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] # City filters in this city = v tomto městě -in every city = v každém 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ě diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 6cc613ec44..ae17386ba1 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -974,7 +974,7 @@ Must be on [terrain] = # Requires translation! in this city = # Requires translation! -in every city = +in all cities = # Requires translation! in capital = # Requires translation! diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 0ea4d4a248..62eb9ef888 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -1757,7 +1757,7 @@ Must be on [terrain] = # Requires translation! in this city = # Requires translation! -in every city = +in all cities = # Requires translation! in capital = # Requires translation! diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index a8f6a766e0..1716d54ba0 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -1033,7 +1033,7 @@ Must be on [terrain] = # Requires translation! in this city = # Requires translation! -in every city = +in all cities = # Requires translation! in capital = # Requires translation! diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 361f74d200..a3b12d4266 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -951,7 +951,7 @@ Must be on [terrain] = Doit être sur [terrain] # City filters in this city = dans cette ville -in every city = dans toutes les villes +in all cities = dans toutes les villes in capital = dans la capitale in every coastal city = dans toutes les villes cotières diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index cd71e48ae4..bd8c44d86c 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -941,7 +941,7 @@ Must be on [terrain] = Muss sich auf [terrain] befinden # City filters in this city = in dieser Stadt -in every city = in jeder Stadt +in all cities = in jeder Stadt in capital = in der Hauptstadt in every coastal city = in jeder Küstenstadt diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 87481ad550..7184b5c52f 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -970,7 +970,7 @@ Must be on [terrain] = Egy [terrain] kell ez alatt lenni # City filters in this city = ebben a városban -in every city = minden városban +in all cities = minden városban in capital = a fővárosban # Requires translation! in every coastal city = diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index dd5a3288e7..9062354b4b 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -958,7 +958,7 @@ Must be on [terrain] = Harus berada di [terrain] # City filters in this city = di kota ini -in every city = di semua kota +in all cities = di semua kota in capital = di ibu kota in every coastal city = di setiap kota pesisir diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 7ae7a7084a..d4316194b8 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -941,7 +941,7 @@ Must be on [terrain] = Deve ritrovarsi su [terrain] # City filters in this city = in questa città -in every city = in tutte le città +in all cities = in tutte le città in capital = nella Capitale in every coastal city = in ogni città costiera diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index be90b82c2b..f981525e23 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -958,7 +958,7 @@ Must be on [terrain] = [terrain]の上になければならない # City filters in this city = この都市で -in every city = 全ての都市で +in all cities = 全ての都市で in capital = 首都で in every coastal city = 全ての沿岸都市で diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index d83df737c9..134fa04382 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -961,7 +961,7 @@ Must be on [terrain] = 도시가 [terrain] 위에 있어야 함 # City filters in this city = 이 도시에 -in every city = 모든 도시에 +in all cities = 모든 도시에 in capital = 수도에 in every coastal city = 연안에 위치한 모든 도시에 diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index cc5ec76ab6..f686f6118e 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -1079,7 +1079,7 @@ Must be on [terrain] = # Requires translation! in this city = # Requires translation! -in every city = +in all cities = # Requires translation! in capital = # Requires translation! diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index f4ed9cd43f..175784bc1f 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -1597,7 +1597,7 @@ Must be on [terrain] = # Requires translation! in this city = # Requires translation! -in every city = +in all cities = # Requires translation! in capital = # Requires translation! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index feb3b3dec4..93e4fe9d37 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -1040,7 +1040,7 @@ Must be on [terrain] = # Requires translation! in this city = # Requires translation! -in every city = +in all cities = # Requires translation! in capital = # Requires translation! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index 55c94ab671..e1740b4e19 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -1037,7 +1037,7 @@ Must be on [terrain] = # Requires translation! in this city = # Requires translation! -in every city = +in all cities = # Requires translation! in capital = # Requires translation! diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index abb36fbac5..df0875b527 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -979,7 +979,7 @@ Must be on [terrain] = Musi być na [terrain] # City filters in this city = w tym mieście -in every city = w każdym mieście +in all cities = w każdym mieście in capital = w stolicy # Requires translation! in every coastal city = diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index da289e593a..a2a4904699 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -1024,7 +1024,7 @@ Must be on [terrain] = # Requires translation! in this city = # Requires translation! -in every city = +in all cities = # Requires translation! in capital = # Requires translation! diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 99de5107e2..c4ea3cbf08 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -1128,7 +1128,7 @@ Must be on [terrain] = # Requires translation! in this city = # Requires translation! -in every city = +in all cities = # Requires translation! in capital = # Requires translation! diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index bd3ba23b6a..6ae090c00b 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -962,7 +962,7 @@ Must be on [terrain] = Должен находиться на клетке [terr # City filters in this city = в этом городе -in every city = в каждом городе +in all cities = в каждом городе in capital = в столице in every coastal city = в каждом прибрежном городе diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index c8cae1b213..80d44263f7 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -942,7 +942,7 @@ Must be on [terrain] = 城市必须位于[terrain]之上 # City filters in this city = 所在城市 -in every city = 每座城市 +in all cities = 每座城市 in capital = 首都 in every coastal city = 每座海滨城市 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 74f3996b7d..48678bcd83 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -958,7 +958,7 @@ Must be on [terrain] = Debe estar en [terrain] # City filters in this city = en esta ciudad -in every city = en cada ciudad +in all cities = en cada ciudad in capital = en capital in every coastal city = en cada ciudad costera diff --git a/android/assets/jsons/translations/Thai.properties b/android/assets/jsons/translations/Thai.properties index 7ec441c9cc..9ba06ebde6 100644 --- a/android/assets/jsons/translations/Thai.properties +++ b/android/assets/jsons/translations/Thai.properties @@ -868,7 +868,7 @@ Tradition Complete = ขนบประเพณีสมบูรณ์ +15% growth and +2 food in all cities = +15% การเจริญเติบโต และ +2 อาหารในทุกๆเมือง Liberty = เสรีภาพ -+1 culture in every city = +1 ประเพณีในทุกๆเมือง ++1 culture in all cities = +1 ประเพณีในทุกๆเมือง Collective Rule = กฎส่วนรวม Training of settlers increased +50% in capital, receive a new settler near the capital = การฝึกผู้บุกเบิก +50% ในเมืองหลวง, รับผู้บุกเบิกใหม่ใกล้ๆกับเมืองหลวงเลย Citizenship = ความเป็นพลเมือง diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 7eeae0fcdb..65d465d498 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -942,7 +942,7 @@ Must be on [terrain] = 城市必須位於[terrain]之上 # City filters in this city = 所在城市 -in every city = 每座城市 +in all cities = 每座城市 in capital = 首都 in every coastal city = 每座海濱城市 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 4a401b753b..f7b563dbb7 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ı # City filters in this city = bu şehirde -in every city = her şehirde +in all cities = her şehirde in capital = başkentte in every coastal city = her kıyı şehrinde diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 1dddfc7fc6..a3340cdd11 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -944,7 +944,7 @@ Must be on [terrain] = Має бути на місцевості типу «[ter # City filters in this city = в цьому місті -in every city = в кожному місті +in all cities = в кожному місті in capital = в столиці in every coastal city = в кожному прибережному місті diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index d221179cda..c036dd915f 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -943,7 +943,7 @@ Must be on [terrain] = # City filters in this city = -in every city = +in all cities = in capital = in every coastal city = diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index 8ae1484971..1afc20ebfb 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -361,7 +361,7 @@ open class TileInfo { } } - fun matchesUniqueFilter(filter: String, civInfo: CivilizationInfo?=null): Boolean { + fun cimatchesUniqueFilter(filter: String, civInfo: CivilizationInfo?=null): Boolean { return filter == baseTerrain || filter == Constants.hill && isHill() || filter == "River" && isAdjacentToRiver() diff --git a/core/src/com/unciv/ui/saves/LoadGameScreen.kt b/core/src/com/unciv/ui/saves/LoadGameScreen.kt index 407681ab86..e4d8514ecb 100644 --- a/core/src/com/unciv/ui/saves/LoadGameScreen.kt +++ b/core/src/com/unciv/ui/saves/LoadGameScreen.kt @@ -21,7 +21,7 @@ import kotlin.concurrent.thread import com.unciv.ui.utils.AutoScrollPane as ScrollPane class LoadGameScreen(previousScreen:CameraStageBaseScreen) : PickerScreen() { - lateinit var selectedSave:String + lateinit var selectedSave: String private val copySavedGameToClipboardButton = "Copy saved game to clipboard".toTextButton() private val saveTable = Table() private val deleteSaveButton = "Delete save".toTextButton() @@ -31,7 +31,7 @@ class LoadGameScreen(previousScreen:CameraStageBaseScreen) : PickerScreen() { setDefaultCloseAction(previousScreen) resetWindowState() - topTable.add(ScrollPane(saveTable)).height(stage.height*2/3) + topTable.add(ScrollPane(saveTable)).height(stage.height * 2 / 3) val rightSideTable = getRightSideTable() @@ -81,7 +81,7 @@ class LoadGameScreen(previousScreen:CameraStageBaseScreen) : PickerScreen() { UncivGame.Current.loadGame(loadedGame) } catch (ex: Exception) { var text = "Could not load game from clipboard!".tr() - if (ex is UncivShowableException) text += "\n"+ex.message + if (ex is UncivShowableException) text += "\n" + ex.message errorLabel.setText(text) ex.printStackTrace() @@ -121,8 +121,8 @@ class LoadGameScreen(previousScreen:CameraStageBaseScreen) : PickerScreen() { showAutosavesCheckbox.isChecked = false showAutosavesCheckbox.onChange { - updateLoadableGames(showAutosavesCheckbox.isChecked) - } + updateLoadableGames(showAutosavesCheckbox.isChecked) + } rightSideTable.add(showAutosavesCheckbox).row() return rightSideTable } @@ -136,11 +136,11 @@ class LoadGameScreen(previousScreen:CameraStageBaseScreen) : PickerScreen() { descriptionLabel.setText("") } - private fun updateLoadableGames(showAutosaves:Boolean) { + private fun updateLoadableGames(showAutosaves: Boolean) { saveTable.clear() - val loadImage =ImageGetter.getImage("OtherIcons/Load") - loadImage.setSize(50f,50f) // So the origin sets correctly + val loadImage = ImageGetter.getImage("OtherIcons/Load") + loadImage.setSize(50f, 50f) // So the origin sets correctly loadImage.setOrigin(Align.center) loadImage.addAction(Actions.rotateBy(360f, 2f)) saveTable.add(loadImage).size(50f) @@ -176,6 +176,8 @@ class LoadGameScreen(previousScreen:CameraStageBaseScreen) : PickerScreen() { val playerCivNames = game.civilizations.filter { it.isPlayerCivilization() }.joinToString { it.civName.tr() } textToSet += "\n" + playerCivNames + ", " + game.difficulty.tr() + ", ${Fonts.turn}" + game.turns + if (game.gameParameters.mods.isNotEmpty()) + textToSet += "\n {Mods:} ".tr() + game.gameParameters.mods.joinToString() } catch (ex: Exception) { textToSet += "\n{Could not load game}!".tr() } @@ -190,5 +192,4 @@ class LoadGameScreen(previousScreen:CameraStageBaseScreen) : PickerScreen() { } } -} - +} \ No newline at end of file