Skip to content

Commit

Permalink
4.14.15
Browse files Browse the repository at this point in the history
  • Loading branch information
yairm210 committed Dec 14, 2024
1 parent effddc0 commit 6f535f5
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 354 deletions.
275 changes: 3 additions & 272 deletions android/assets/jsons/translations/Croatian.properties

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions android/assets/jsons/translations/Dutch.properties
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,13 @@ Hydro Plant = Waterkrachtcentrale
# City naming when list exhausted
# Requires translation!
New [cityName] = Nieuw [cityName]
# Requires translation!
Neo [cityName] =
# Requires translation!
Nova [cityName] =
# Requires translation!
Altera [cityName] =
# Requires translation!
New [civName]\n(formerly known as [cityName]) = Nieuw [civName]\n(voorheen bekend als [cityName])
# Diplomacy,Trade,Nations
Expand Down Expand Up @@ -217,9 +215,7 @@ Ally = Bondgenoot
[questName] (+[influenceAmount] influence) = [questName] (+[influenceAmount] invloed)
[remainingTurns] turns remaining = [remainingTurns] beurten over
# Requires translation!
Current leader(s): [leaders] = Huidige koploper(s): [leaders]
# Requires translation!
Current leader(s): [leaders], you: [yourScore] = Huidige koploper(s): [leaders], jij: [yourScore]
# In the two templates above, 'leaders' will be one or more of the following, and 'yourScore' one:
# Requires translation!
Expand Down Expand Up @@ -411,7 +407,6 @@ Archipelago = Archipel
Inner Sea = Binnenzee
Perlin = Perlin
# Requires translation!
Select players from starting locations = Selecteer spelers met vaste startlocaties
Random number of Civilizations = Willekeurig aantal Beschavingen
Min number of Civilizations = Minimaal aantal Beschavingen
Expand Down Expand Up @@ -1735,7 +1730,6 @@ Start year: [comment] = Beginjaar: [comment]
Pillaging this improvement yields [stats] = Deze verbetering plunderen levert [stats] op
Pillaging this improvement yields approximately [stats] = Deze verbetering plunderen levert ongeveer [stats] op
Needs removal of terrain features to be built = Terreinkenmerken moeten verwijderd worden om te bouwen
# Requires translation!
Air Intercept Range: [amount] = Lucht-onderscheppingsbereik: [amount]
Unit type = Eenheidstype
Units: = Eenheden
Expand Down Expand Up @@ -1766,7 +1760,6 @@ Adopt free policy = Neem gratis beleidsvoorstel aan
Unlocked at = Ontgrendeld bij
Gain 2 free technologies = Krijg 2 gratis technologiën
All policies adopted = Alle aanvaarde beleidsvoorstellen
# Requires translation!
[branchName] branch = [branchName] beleidsterrein
Policy branch: [branchName] = Beleidsterrein: [branchName]
Are you sure you want to adopt [branchName]? = Weet je zeker dat je [branchName] wilt aannemen?
Expand Down Expand Up @@ -5601,7 +5594,6 @@ You have achieved victory through mastery of Science! You have conquered the mys
Complete 5 policy branches and\nbuild the Utopia Project to win! = Voltooi 5 beleidsgroepen en\nbouw het Utopia Project om te winnen!
You have achieved victory through the awesome power of your Culture. Your civilization's greatness - the magnificence of its monuments and the power of its artists - have astounded the world! Poets will honor you as long as beauty brings gladness to a weary heart. = Je hebt een overwinning bekomen dankzij de fantastische kracht van je cultuur. Jouw beschaving's grootheid - de grootsheid van zijn monumenten en de kracht van zijn artiesten - heeft de wereld met verstomming geslagen. Poëten zullen je eren, zolang schoonheid blijdschap geeft aan een vermoeid hart.

# Requires translation!
Capture all enemy Capitals\nto win! = Verover alle vijandige Hoofdsteden\nom te winnen!
The world has been convulsed by war. Many great and powerful civilizations have fallen, but you have survived - and emerged victorious! The world will long remember your glorious triumph! = De wereld is verscheurd door oorlog. Vele grote en krachtige beschavingen zijn gevallen, maar jij hebt overleefd - en kwam als overwinnaar tevoorschijn! De wereld zal lang je glorieuze triomf herinneren.

Expand Down Expand Up @@ -5777,7 +5769,6 @@ Coffee House = Koffiehuis
Police Station = Politiebureau


# Requires translation!
National Intelligence Agency = Nationale Inlichtingendienst


Expand Down
25 changes: 0 additions & 25 deletions android/assets/jsons/translations/Latin.properties
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,6 @@ Marathon = Marathon

Starting Era = Aetas initialis
It looks like we can't make a map with the parameters you requested! = Videtur quod tabulam facere cum parametris, quæ velis, non possimus!
# Requires translation!
Maybe you put too many players into too small a map? = Fortasse imposuisti lusores nimis multos in tabulam nimis parvam?
No human players selected! = Nullus homo lusor electus est!
Invalid Player ID! = Identitas lusoris est irrita!
Expand Down Expand Up @@ -646,11 +645,8 @@ Tile Matching Criteria =
Complete match =
# Requires translation!
Except improvements =
# Requires translation!
Base and terrain features = Fundamentalis et adjuncta humi
# Requires translation!
Base terrain only = Sola forma humi fundamentalis
# Requires translation!
Land or water only = Sola terra vel aqua
# Requires translation!
Import a Wesnoth map =
Expand All @@ -666,21 +662,16 @@ Map saved successfully! = Tabulam servare successit!
# Requires translation!
Current map RNG seed: [amount] =
Map copy and paste = Tabulam duplicare et glutinare
# Requires translation!
Position: [param] = Positus: [param]
Starting location(s): [param] = Locus initialis / loci initiales: [param]
Continent: [param] ([amount] tiles) = Continens: [param] ([amount] tegulæ)
Resource abundance = Copia mercium
Change map to fit selected ruleset? = Muto·ne tabulam ut adaptetur regulis compactis electis?
Area: [amount] tiles, [amount2]% water, [amount3]% impassable, [amount4] continents/islands = Zona: [amount] tegulæ, [amount2] centesimæ aquæ, [amount3] centesimæ inviæ, [amount4] continentes/insulæ
# Requires translation!
Do you want to leave without saving the recent changes? = Visne exire etsi non servavimus mutatûs recentes?
Leave = Exeo
# Requires translation!
Do you want to load another map without saving the recent changes? = Visne inferre aliam tabulam etsi non servavimus mutatûs recentes?
# Requires translation!
River generation failed! = Non potui generare fluvios!
# Requires translation!
Please don't use step 'Landmass' with map type 'Empty', create a new empty map instead. = Ne utaris gressum 'terrae' cum genere tabulae 'nihili', sed crees tabulam inanem novam.
This map has errors: = Hæc tabula est cum erroribus:
# Requires translation!
Expand Down Expand Up @@ -834,7 +825,6 @@ Skip turn of current player =
# Requires translation!
Are you sure you want to skip the turn of the current player? =

# Requires translation!
Last refresh: [duration] ago = Renovatio postrema: [duration](is) ante
# Requires translation!
Current Turn: [civName] since [duration] ago =
Expand All @@ -848,30 +838,19 @@ Days = Dies
[amount] Days = [amount] dies
# Requires translation!
Server limit reached! Please wait for [time] seconds =
# Requires translation!
File could not be found on the multiplayer server = Documentum non potuit in machina serviente lusorum multorum inveniri
# Requires translation!
Unhandled problem, [errorMessage] =
# Requires translation!
Please enter your server password = Inseras verbum occultum tuum machinae servientis
# Requires translation!
Set password = Pone verbum occulendum
# Requires translation!
Password must be at least 6 characters long = Verbum occulendum necesse sit non paucioribus quam 6 litteris longum
# Requires translation!
Failed to set password! = Non potui ponere verbum occulendum!
# Requires translation!
Password set successfully for server [serverURL] = Verbum occulendum ponere successit pro machina serviente de [serverURL]
# Requires translation!
Password = Verbum occultum
# Requires translation!
Your userId is password secured = Identitas usoris tua est per verbum occultum facta secura
# Requires translation!
Set a password to secure your userId = Ponas verbum occulendum ut identitas usoris tua fiat secura
Authenticate = Auctorizo
# Requires translation!
This server does not support authentication = Haec machina serviens non potest juvare auctorizare
# Requires translation!
Authentication failed = Non potuimus auctorizare

# Save game menu
Expand Down Expand Up @@ -902,7 +881,6 @@ Delete save = Dele servatum
[saveFileName] deleted successfully. = [saveFileName](m/um) delere successit.
# Requires translation!
Insufficient permissions to delete [saveFileName]. =
# Requires translation!
Failed to delete [saveFileName]. = Non potui delere [saveFileName](m/um).
Saved at = Servatus in
Saving... = Noto...
Expand Down Expand Up @@ -2124,9 +2102,7 @@ Server address =
Check connection to server =
# Requires translation!
Awaiting response... =
# Requires translation!
Success! = Successit!
# Requires translation!
Failed! = Non potuimus facere!
# Requires translation!
Sound notification for when it's your turn in your currently open game: =
Expand All @@ -2137,7 +2113,6 @@ Notification [number] = Nuntium [number]
Chimes =
# Requires translation!
Choir =
# Requires translation!
[unit] Attack Sound = Vox oppugnationis de [unit]
# Mods
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ Bosnian = 3
Brazilian_Portuguese = 99
Bulgarian = 47
Catalan = 99
Croatian = 95
Croatian = 99
Czech = 79
Dutch = 95
Dutch = 96
English = 0
Filipino = 89
Finnish = 36
Expand Down
28 changes: 7 additions & 21 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,38 +1,24 @@
## 4.14.15

TileInfoTable improvements - see
UI improvements:

Changed Black in UI to Charcoal - see

More unit table improvements - see

Better icons in unit description table - see
- Tile Info Table
- Changed Black to Charcoal
- Unit description table

Fixed cities built on pillages roads colored red

fix: Scroll position indicators do not block minimap clicks

Fixed scroll position indicator

Fixed Thai diacritic support

Added "exit" button in world screen popup menu

Fixed AI religion belief assessment (far too much weight given to tiles)

default mirroring none

Added river mirroring

Simplified mirroring code in prep for rivers

Removed 'ignore touhidurr notifications'

Add Avg Victory Turns to Simulation - By itanasi
Fixed AI religion belief assessment

Increase starting Luxury amount to match Civ 5 - By SeventhM
Increase starting Luxury amount to match Civ 5 - By SeventhM

UI tweaks and fixes: dividers, checkbox-to-text spacing, multiplayer tab connection button - By Toxile
UI fixes: dividers, checkbox-to-text spacing, multiplayer tab connection button - By Toxile (new contributor!)

## 4.14.14

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ fun colorFromRGB(r: Int, g: Int, b: Int) = Color(r / 255f, g / 255f, b / 255f, 1
fun colorFromRGB(rgb: List<Int>) = colorFromRGB(rgb[0], rgb[1], rgb[2])
/** Linearly interpolates between this [Color] and [BLACK][ImageGetter.CHARCOAL] by [t] which is in the range [[0,1]].
* The result is returned as a new instance. */
fun Color.darken(t: Float): Color = Color(this).lerp(ImageGetter.CHARCOAL, t)
fun Color.darken(t: Float): Color = Color(this).lerp(Color.BLACK, t)
/** Linearly interpolates between this [Color] and [WHITE][Color.WHITE] by [t] which is in the range [[0,1]].
* The result is returned as a new instance. */
fun Color.brighten(t: Float): Color = Color(this).lerp(Color.WHITE, t)
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/ui/images/ImageGetter.kt
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import kotlin.math.sqrt
object ImageGetter {
const val whiteDotLocation = "OtherIcons/whiteDot"
const val circleLocation = "OtherIcons/Circle"
val CHARCOAL = Color(0x333333FF)
val CHARCOAL = Color(0x111111FF)

// We use texture atlases to minimize texture swapping - see https://yairm210.medium.com/the-libgdx-performance-guide-1d068a84e181
lateinit var atlas: TextureAtlas
Expand Down
30 changes: 7 additions & 23 deletions fastlane/metadata/android/en-US/changelogs/1083.txt
Original file line number Diff line number Diff line change
@@ -1,35 +1,19 @@
UI improvements:


TileInfoTable improvements - see

Changed Black in UI to Charcoal - see

More unit table improvements - see

Better icons in unit description table - see
- Tile Info Table
- Changed Black to Charcoal
- Unit description table

Fixed cities built on pillages roads colored red

fix: Scroll position indicators do not block minimap clicks

Fixed scroll position indicator

Fixed Thai diacritic support

Added "exit" button in world screen popup menu

Fixed AI religion belief assessment (far too much weight given to tiles)

default mirroring none

Added river mirroring

Simplified mirroring code in prep for rivers

Removed 'ignore touhidurr notifications'

Add Avg Victory Turns to Simulation - By itanasi
Fixed AI religion belief assessment

Increase starting Luxury amount to match Civ 5 - By SeventhM
Increase starting Luxury amount to match Civ 5 - By SeventhM

UI tweaks and fixes: dividers, checkbox-to-text spacing, multiplayer tab connection button - By Toxile
UI fixes: dividers, checkbox-to-text spacing, multiplayer tab connection button - By Toxile (new contributor!)

0 comments on commit 6f535f5

Please sign in to comment.