diff --git a/android/Images.Flags/FlagIcons/Galician.png b/android/Images.Flags/FlagIcons/Galician.png new file mode 100644 index 0000000000..c8cbb1417a Binary files /dev/null and b/android/Images.Flags/FlagIcons/Galician.png differ diff --git a/android/assets/Flags.atlas b/android/assets/Flags.atlas index 039ee9543b..78dcfd84e4 100644 --- a/android/assets/Flags.atlas +++ b/android/assets/Flags.atlas @@ -95,199 +95,206 @@ FlagIcons/French orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/German +FlagIcons/Galician rotate: false xy: 548, 140 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Greek +FlagIcons/German rotate: false xy: 684, 276 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Hungarian +FlagIcons/Greek rotate: false xy: 548, 4 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Indonesian +FlagIcons/Hungarian rotate: false xy: 684, 140 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Italian +FlagIcons/Indonesian rotate: false xy: 820, 276 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Japanese +FlagIcons/Italian rotate: false xy: 684, 4 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Korean +FlagIcons/Japanese rotate: false xy: 820, 140 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Latin - rotate: false - xy: 1636, 32 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -FlagIcons/Lithuanian +FlagIcons/Korean rotate: false xy: 956, 276 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Macedonian +FlagIcons/Latin + rotate: false + xy: 1772, 168 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +FlagIcons/Lithuanian rotate: false xy: 820, 4 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Malay +FlagIcons/Macedonian rotate: false xy: 956, 140 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Norwegian +FlagIcons/Malay rotate: false xy: 1092, 276 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 +FlagIcons/Norwegian + rotate: false + xy: 956, 4 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 FlagIcons/Persian_(Pinglish-DIN) - rotate: false - xy: 956, 4 - size: 128, 128 - orig: 128, 128 - offset: 0, 0 - index: -1 -FlagIcons/Persian_(Pinglish-UN) - rotate: false - xy: 956, 4 - size: 128, 128 - orig: 128, 128 - offset: 0, 0 - index: -1 -FlagIcons/Polish rotate: false xy: 1092, 140 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Portuguese +FlagIcons/Persian_(Pinglish-UN) + rotate: false + xy: 1092, 140 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 +FlagIcons/Polish rotate: false xy: 1228, 276 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Romanian +FlagIcons/Portuguese rotate: false xy: 1092, 4 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Russian +FlagIcons/Romanian rotate: false xy: 1228, 140 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Rusyn +FlagIcons/Russian rotate: false xy: 1364, 276 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Simplified_Chinese +FlagIcons/Rusyn rotate: false xy: 1228, 4 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Spanish +FlagIcons/Simplified_Chinese rotate: false xy: 1364, 140 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Swedish +FlagIcons/Spanish rotate: false xy: 1500, 276 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Thai +FlagIcons/Swedish rotate: false xy: 1364, 4 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Traditional_Chinese +FlagIcons/Thai rotate: false xy: 1500, 140 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Turkish +FlagIcons/Traditional_Chinese rotate: false xy: 1636, 276 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Ukrainian +FlagIcons/Turkish rotate: false xy: 1500, 4 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Vietnamese +FlagIcons/Ukrainian rotate: false xy: 1636, 140 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -FlagIcons/Zulu +FlagIcons/Vietnamese rotate: false xy: 1772, 276 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 +FlagIcons/Zulu + rotate: false + xy: 1636, 4 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 diff --git a/android/assets/Flags.png b/android/assets/Flags.png index 0f011b45b3..4979bcd43b 100644 Binary files a/android/assets/Flags.png and b/android/assets/Flags.png differ diff --git a/core/src/com/unciv/models/metadata/GameSettings.kt b/core/src/com/unciv/models/metadata/GameSettings.kt index 634f3c64cb..2e80e25eef 100644 --- a/core/src/com/unciv/models/metadata/GameSettings.kt +++ b/core/src/com/unciv/models/metadata/GameSettings.kt @@ -262,7 +262,7 @@ class GameSettings { /** Map Unciv language key to Java locale, for the purpose of getting a Collator for sorting. * - Effect depends on the Java libraries and may not always conform to expectations. * If in doubt, debug and see what Locale instance you get and compare its properties with `Locale.getDefault()`. - * (`Collator.getInstance(LocaleCode.*.run { Locale(language, country) }) to Collator.getInstance())`, drill to both `rules`, compare hashes - if equal and other properties equal, then Java doesn't know your Language)) + * (`Collator.getInstance(LocaleCode.*.run { Locale(language, country) }) to Collator.getInstance()`, drill to both `rules`, compare hashes - if equal and other properties equal, then Java doesn't know your Language)) * @property name same as translation file name with ' ', '_', '-', '(', ')' removed * @property language ISO 639-1 code for the language * @property country ISO 3166 code for the nation this is predominantly spoken in diff --git a/docs/Credits.md b/docs/Credits.md index c5dcb50cd4..5cf1cd9d3b 100644 --- a/docs/Credits.md +++ b/docs/Credits.md @@ -9,6 +9,7 @@ Flag Icons made by [Freepik](https://www.flaticon.com/authors/freepik) from [www - [Rusyn flag] gimped from the wikipedia flag [Flag of Pannonian Rusyns](https://en.wikipedia.org/wiki/File:Flag_of_Rusyns_in_Serbia.svg) (CC-BY-SA 4.0) - [Latin flag] made from [wikipedia entry for SPQR](https://en.wikipedia.org/wiki/SPQR#/media/File:Roman_SPQR_banner.svg), Creative Commons Attribution 3.0 Unported - [Zulu flag] made from [wikipedia entry for the Z flag](https://en.wikipedia.org/wiki/Z_flag#/media/File:ICS_Zulu.svg): public domain +- [Galician flag] made from [wikipedia asset for the civil flag of Galicia](https://en.wikipedia.org/wiki/File:Flag_of_Galicia_(civil).svg): public domain New Unciv logo made by u-ndefined on Discord