Mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-20 19:56:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #3681 - translation fix, "in every city" -> "in all cities"

Browse Source
This commit is contained in:
Yair Morgenstern 2021-03-11 21:08:48 +02:00
parent 1286fc1dff
commit 972bf2ba1c
29 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/translations/Brazilian_Portuguese.properties
View File

@ -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

2
android/assets/jsons/translations/Czech.properties
View File

@ -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ě

2
android/assets/jsons/translations/Dutch.properties
View File

@ -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!

2
android/assets/jsons/translations/English.properties
View File

@ -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!

2
android/assets/jsons/translations/Finnish.properties
View File

@ -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!

2
android/assets/jsons/translations/French.properties
View File

@ -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

2
android/assets/jsons/translations/German.properties
View File

@ -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

2
android/assets/jsons/translations/Hungarian.properties
View File

@ -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 =

2
android/assets/jsons/translations/Indonesian.properties
View File

@ -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

2
android/assets/jsons/translations/Italian.properties
View File

@ -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

2
android/assets/jsons/translations/Japanese.properties
View File

@ -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 = 全ての沿岸都市で

2
android/assets/jsons/translations/Korean.properties
View File

@ -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 = 연안에 위치한 모든 도시에

2
android/assets/jsons/translations/Lithuanian.properties
View File

@ -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!

2
android/assets/jsons/translations/Malay.properties
View File

@ -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!

2
android/assets/jsons/translations/Persian_(Pinglish-DIN).properties
View File

@ -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!

2
android/assets/jsons/translations/Persian_(Pinglish-UN).properties
View File

@ -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!

2
android/assets/jsons/translations/Polish.properties
View File

@ -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 =

2
android/assets/jsons/translations/Portuguese.properties
View File

@ -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!

2
android/assets/jsons/translations/Romanian.properties
View File

@ -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!

2
android/assets/jsons/translations/Russian.properties
View File

@ -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 = в каждом прибрежном городе

2
android/assets/jsons/translations/Simplified_Chinese.properties
View File

@ -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 = 每座海滨城市

2
android/assets/jsons/translations/Spanish.properties
View File

@ -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

2
android/assets/jsons/translations/Thai.properties
View File

@ -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 = ความเป็นพลเมือง

2
android/assets/jsons/translations/Traditional_Chinese.properties
View File

@ -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 = 每座海濱城市

2
android/assets/jsons/translations/Turkish.properties
View File

@ -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

2
android/assets/jsons/translations/Ukrainian.properties
View File

@ -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 = в кожному прибережному місті

2
android/assets/jsons/translations/template.properties
View File

@ -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 =

2
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -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()

21
core/src/com/unciv/ui/saves/LoadGameScreen.kt
View File

@ -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() {
}
}
}
}