diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 2cb2d1ee1e..2bd31d8d5f 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -1411,7 +1411,6 @@ What would you like to do with the city of [cityName]? = Quelle est votre décis Annex = Annexer Annexed cities become part of your regular empire. = Les villes annexées sont intégrées à votre empire. Their citizens generate 2x the unhappiness, unless you build a courthouse. = Leurs citoyens génèrent un mécontentement x2, à moins de construire un tribunal. - # Requires translation! Your civilization may not annex this city. = Votre civilisation ne peut pas annexer cette ville. Puppet = Fantochiser Puppeted cities do not increase your tech or policy cost. = Les villes fantoches n'augmentent pas vos coûts en technologies ou doctrines. @@ -1422,7 +1421,6 @@ Liberate (city returns to [originalOwner]) = Libérer (rendre la ville à [origi Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Libérer une ville la restitue à son propriétaire initial, ce qui améliore grandement votre relation avec ce dernier ! Raze = Raser Razing the city annexes it, and starts burning the city to the ground. = Raser une ville l'annexe, puis la détruit progressivement. - # Requires translation! Razing the city puppets it, and starts burning the city to the ground. = Raser une ville la fantochise, puis la détruit progressivement. The population will gradually dwindle until the city is destroyed. = La population de la ville diminuera progressivement jusqu'à destruction complète. Original capitals and holy cities cannot be razed. = Les capitales d'origine et les villes saintes ne peuvent pas être rasées. @@ -1898,7 +1896,6 @@ Land units may cross [terrainName] tiles after the first [baseUnitFilter] is ear Gain [amount] Influence with a [baseUnitFilter] gift to a City-State = Gagne [amount] Influence en offrant un(e) [baseUnitFilter] à une Cité-État [relativeAmount]% Faith cost of generating Great Prophet equivalents = [relativeAmount]% coût en Foi pour générer l'équivalent de Grand Prophète Resting point for Influence with City-States following this religion [amount] = Point d'équilibre de l'Influence pour les Cités-États pratiquant cette religion [amount] - # Requires translation! May not annex cities = Ne peut pas annexer les villes Provides a sum of gold each time you spend a Great Person = Donne de l'Or à chaque fois qu'un Personnage Illustre est consommé [stats] whenever a Great Person is expended = [stats] pour chaque Personnage Illustre consommé diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index ca6243efab..7e145f4250 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -1414,7 +1414,6 @@ What would you like to do with the city of [cityName]? = Co planujesz zrobić z Annex = Przyłącz (aneksja) Annexed cities become part of your regular empire. = Przyłączone miasta stają się częścią twego imperium. Their citizens generate 2x the unhappiness, unless you build a courthouse. = Ich obywatele generują podwójne niezadowolenie, chyba że wybudujesz Sąd. - # Requires translation! Your civilization may not annex this city. = Twoja cywilizacja nie może zaanektować tego miasta. Puppet = Uczyń Marionetką Puppeted cities do not increase your tech or policy cost. = Miasta marionetkowe nie zwiększają kosztów technologii ani kosztów ustrojów społecznych. @@ -1425,7 +1424,6 @@ Liberate (city returns to [originalOwner]) = Wyzwól (miasto powróci do [origin Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Wyzwolone miasto wróci do swojego pierwotnego właściciela. Zapewni ci to ogromny wzrost wpływów! Raze = Wyburz Razing the city annexes it, and starts burning the city to the ground. = Spowoduje to zajęcie miasta i jego powolne wyburzanie. - # Requires translation! Razing the city puppets it, and starts burning the city to the ground. = Wyburzanie miasta czyni je marionetką i jednocześnie zaczyna je niszczyć. The population will gradually dwindle until the city is destroyed. = Populacja miasta będzie stopniowo malała aż do zera. Original capitals and holy cities cannot be razed. = Stolice innych cywilizacji i Święte Miasta nie mogą zostać zniszczone. @@ -1903,7 +1901,6 @@ Land units may cross [terrainName] tiles after the first [baseUnitFilter] is ear Gain [amount] Influence with a [baseUnitFilter] gift to a City-State = [baseUnitFilter] podarowany Wolnemu Miastu przyniesie [amount] Punktów Wpływu [relativeAmount]% Faith cost of generating Great Prophet equivalents = [relativeAmount]% mniej kosztów ☮Wiary przy generowaniu Wielkiego Proroka Resting point for Influence with City-States following this religion [amount] = Bazowy Punkt Wpływów na Wolne Miasta wyznające tę religię [amount] - # Requires translation! May not annex cities = Nie można zaanektować miast Provides a sum of gold each time you spend a Great Person = Zawsze gdy Wielki Człowiek zakończy swoją misję otrzymasz pewną sumę Złota¤ [stats] whenever a Great Person is expended = Zawsze gdy Wielki Człowiek zakończy swoją misję otrzymasz [stats] diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 4696d5801e..c06d38b1a6 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -3,19 +3,19 @@ Italian = 99 Russian = 99 Belarusian = 2 Afrikaans = 7 -German = 99 +German = 100 Swedish = 87 Turkish = 70 Ukrainian = 99 Filipino = 96 -French = 99 +French = 100 Portuguese = 64 Indonesian = 99 Catalan = 99 Finnish = 37 Spanish = 99 Malay = 23 -Brazilian_Portuguese = 99 +Brazilian_Portuguese = 100 Traditional_Chinese = 97 Polish = 99 Lithuanian = 95 diff --git a/changelog.md b/changelog.md index 1b30c68007..3de62ad11e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,18 +1,12 @@ ## 4.6.12 -Display map ruleset when picking map, don't show unloadable maps +Animate battle damage numbers - By SomeTroglodyte -Allow mods to contain a "preview.png" file for visual indication +When picking custom map: Display map ruleset, don't show unloadable maps -Multi-server preparations: Save server info in game, save server functionality in specific class +Modding: Allow mods to contain a "preview.png" file for visual indication -4.6.11-patch1 - -Convert 'camps' vectorhashmap to 'encampments' arraylist - -By SomeTroglodyte: -- Animate battle damage numbers -- Combat java.util.star-import +Multi-server preparations :) ## 4.6.11 diff --git a/core/src/com/unciv/ui/screens/newgamescreen/MapFileSelectTable.kt b/core/src/com/unciv/ui/screens/newgamescreen/MapFileSelectTable.kt index c5b36b1c19..57f9cf8a26 100644 --- a/core/src/com/unciv/ui/screens/newgamescreen/MapFileSelectTable.kt +++ b/core/src/com/unciv/ui/screens/newgamescreen/MapFileSelectTable.kt @@ -32,7 +32,7 @@ class MapFileSelectTable( // The SelectBox auto displays the text a object.toString(), which on the FileHandle itself includes the folder path. // So we wrap it in another object with a custom toString() private class MapWrapper(val fileHandle: FileHandle, val mapParameters: MapParameters) { - override fun toString(): String = mapParameters.baseRuleset + " - "+ fileHandle.name() + override fun toString(): String = mapParameters.baseRuleset + " | "+ fileHandle.name() } private val mapWrappers= ArrayList() @@ -41,7 +41,6 @@ class MapFileSelectTable( init { defaults().pad(5f, 10f) // Must stay same as in MapParametersTable val mapFileLabel = "{Map file}:".toLabel() - setDebug(true) add(mapFileLabel).left() add(mapFileSelectBox) // because SOME people gotta give the hugest names to their maps diff --git a/fastlane/metadata/android/en-US/changelogs/867.txt b/fastlane/metadata/android/en-US/changelogs/867.txt index a82ce67d3a..ae64fd27a5 100644 --- a/fastlane/metadata/android/en-US/changelogs/867.txt +++ b/fastlane/metadata/android/en-US/changelogs/867.txt @@ -1,15 +1,7 @@ +Animate battle damage numbers - By SomeTroglodyte +When picking custom map: Display map ruleset, don't show unloadable maps -Display map ruleset when picking map, don't show unloadable maps +Modding: Allow mods to contain a "preview.png" file for visual indication -Allow mods to contain a "preview.png" file for visual indication - -Multi-server preparations: Save server info in game, save server functionality in specific class - -4.6.11-patch1 - -Convert 'camps' vectorhashmap to 'encampments' arraylist - -By SomeTroglodyte: -- Animate battle damage numbers -- Combat java.util.star-import \ No newline at end of file +Multi-server preparations :) \ No newline at end of file