Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version rollout #9781

Merged
merged 10 commits into from
Jul 10, 2023
Original file line number Diff line number Diff line change
Expand Up @@ -1027,8 +1027,7 @@ due to adopting [policy] = devido à adoção de(a) [policy]
due to discovering [naturalWonder] = devido a descobrir o(a) [naturalWonder]
due to entering the [eraName] = devido a entrar no(a) [eraName]
due to constructing [buildingName] = devido à construção de(a) [buildingName]
# Requires translation!
due to gaining a [unitName] =
due to gaining a [unitName] = devido a ganhar um(a) [unitName]
due to founding a city = devido à fundação de uma cidade
due to discovering a Natural Wonder = devido à descoberta de uma Maravilha Natural
due to our [unitName] defeating a [otherUnitName] = devido ao nosso [unitName] derrotar um [otherUnitName]
Expand Down Expand Up @@ -2429,8 +2428,7 @@ You returned captured units to us = Você retornou uma unidade capturada para n

#################### Lines from key bindings #######################

# Requires translation!
Main Menu =
Main Menu = Menu principal
World Screen = Tela do Mundo
Map Panning = Panorâmica do mapa
Unit Actions = Ações da Unidade
Expand Down
3 changes: 1 addition & 2 deletions android/assets/jsons/translations/Catalan.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1027,8 +1027,7 @@ due to adopting [policy] = perquè s’ha adoptat la política [policy]
due to discovering [naturalWonder] = perquè s’ha descobert [naturalWonder]
due to entering the [eraName] = perquè s’ha entrat a l’[eraName]
due to constructing [buildingName] = perquè s’ha construït [buildingName]
# Requires translation!
due to gaining a [unitName] =
due to gaining a [unitName] = perquè s’ha obtingut un unitat «[unitName]»
due to founding a city = perquè s’ha fundat una ciutat
due to discovering a Natural Wonder = perquè s’ha descobert una meravella natural
due to our [unitName] defeating a [otherUnitName] = perquè la nostra unitat [unitName] ha derrotat a [otherUnitName]
Expand Down
1,079 changes: 511 additions & 568 deletions android/assets/jsons/translations/Dutch.properties

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions android/assets/jsons/translations/French.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ due to discovering [naturalWonder] = grâce à la découverte de [naturalWonder]
due to entering the [eraName] = grâce à l'entrée dans [eraName]
due to constructing [buildingName] = grâce à la construction de [buildingName]
# Requires translation!
due to gaining a [unitName] =
due to gaining a [unitName] = pour avoir gagné un(e) [unitName]
due to founding a city = pour avoir fondé une ville
due to discovering a Natural Wonder = grâce à la découverte d'une Merveille Naturelle
due to our [unitName] defeating a [otherUnitName] = car notre [unitName] a vaincu un(e) [otherUnitName]
Expand Down Expand Up @@ -2430,7 +2430,7 @@ You returned captured units to us = Vous nous avez rendu des unités capturées
#################### Lines from key bindings #######################

# Requires translation!
Main Menu =
Main Menu = Menu principal
World Screen = Écran de jeu
Map Panning = Défilement de la carte
Unit Actions = Actions des unités
Expand Down
5 changes: 2 additions & 3 deletions android/assets/jsons/translations/German.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ due to discovering [naturalWonder] = Durch die Entdeckung von [naturalWonder],
due to entering the [eraName] = Durch den Eintritt in [eraName],
due to constructing [buildingName] = Durch den Bau von [buildingName],
# Requires translation!
due to gaining a [unitName] =
due to gaining a [unitName] = Durch den Erhalt von [unitName],
due to founding a city = Durch die Gründung einer Stadt,
due to discovering a Natural Wonder = Durch die Entdeckung eines Naturwunders,
due to our [unitName] defeating a [otherUnitName] = Weil unsere [unitName] Einheit eine [otherUnitName] Einheit besiegt hat,
Expand Down Expand Up @@ -2438,8 +2438,7 @@ You returned captured units to us = Ihr habt uns gefangene Einheiten zurückgege

#################### Lines from key bindings #######################

# Requires translation!
Main Menu =
Main Menu = Hauptmenü
World Screen = Weltansicht
Map Panning = Karte verschieben
Unit Actions = Einheiten-Aktionen
Expand Down
6 changes: 2 additions & 4 deletions android/assets/jsons/translations/Italian.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1033,8 +1033,7 @@ due to adopting [policy] = per aver adottato [policy]
due to discovering [naturalWonder] = per aver scoperto [naturalWonder]
due to entering the [eraName] = per essere entrato nell'[eraName]
due to constructing [buildingName] = per aver costruito [buildingName]
# Requires translation!
due to gaining a [unitName] =
due to gaining a [unitName] = per aver reclutato [unitName]
due to founding a city = per aver fondato una città
due to discovering a Natural Wonder = per aver scoperto una Meraviglia naturale
due to our [unitName] defeating a [otherUnitName] = poiché [unitName] ha sconfitto l'unità nemica [otherUnitName]
Expand Down Expand Up @@ -2440,8 +2439,7 @@ You returned captured units to us = Ci hai restituito un'unità.

#################### Lines from key bindings #######################

# Requires translation!
Main Menu =
Main Menu = Menu principale
World Screen = Schermata mondiale
Map Panning = Panoramica mappa
Unit Actions = Azioni unit�
Expand Down
4 changes: 2 additions & 2 deletions android/assets/jsons/translations/Polish.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ due to discovering [naturalWonder] = wskutek odkrycia [naturalWonder]
due to entering the [eraName] = wskutek przejścia do [eraName]
due to constructing [buildingName] = wskutek wybudowania [buildingName]
# Requires translation!
due to gaining a [unitName] =
due to gaining a [unitName] = wskutek zdobycia [unitName]
due to founding a city = wskutek założenia miasta
due to discovering a Natural Wonder = wskutek odkrycia Cudu Natury
due to our [unitName] defeating a [otherUnitName] = wskutek pokonania przez naszą jednostkę [unitName] jednostki [otherUnitName]
Expand Down Expand Up @@ -2430,7 +2430,7 @@ You returned captured units to us = Zwróciłeś nam pojmane jednostki
#################### Lines from key bindings #######################

# Requires translation!
Main Menu =
Main Menu = Menu Główne
World Screen = Mapa Świata
Map Panning = Przesuwanie mapy
Unit Actions = Ruchy jednostek
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,7 @@ Our [interceptorName] ([amount] HP) intercepted and attacked an enemy [attackerN
Nothing tried to intercept our [attackerName] = 无人试图拦截我方[attackerName]
An enemy [unit] was spotted near our territory = 我们的领土附近发现了敌方的[unit]
An enemy [unit] was spotted in our territory = 我们的领土内发现了敌方的[unit]
An enemy [unit] has destroyed our tile improvement [improvement] = 敌方的[unit]摧毁了我们的[improvement]地块设施
Your city [cityName] can bombard the enemy! = 你的城市[cityName]可以轰击敌人!
[amount] of your cities can bombard the enemy! = 你有 [amount] 座城市可以轰击敌人!
[amount] enemy units were spotted near our territory = 我们的领土附近发现了 [amount] 个敌方单位
Expand Down Expand Up @@ -1027,8 +1028,7 @@ due to adopting [policy] = 由于推行了[policy],
due to discovering [naturalWonder] = 由于发现了[naturalWonder],
due to entering the [eraName] = 由于进入了[eraName],
due to constructing [buildingName] = 由于建造了[buildingName],
# Requires translation!
due to gaining a [unitName] =
due to gaining a [unitName] = 由于获得了单位[unitName],
due to founding a city = 由于建立了城市,
due to discovering a Natural Wonder = 由于发现了一个自然奇观,
due to our [unitName] defeating a [otherUnitName] = 由于[unitName]战胜了[otherUnitName]
Expand Down Expand Up @@ -2429,8 +2429,7 @@ You returned captured units to us = 你把我们被俘获的单位归还给了

#################### Lines from key bindings #######################

# Requires translation!
Main Menu =
Main Menu = 主菜单
World Screen = 世界地图界面
Map Panning = 地图平移
Unit Actions = 单位操作
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/BuildConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package com.unciv.build
object BuildConfig {
const val kotlinVersion = "1.8.21"
const val appName = "Unciv"
const val appCodeNumber = 889
const val appVersion = "4.7.7"
const val appCodeNumber = 890
const val appVersion = "4.7.8"

const val gdxVersion = "1.11.0"
const val ktorVersion = "2.2.3"
Expand Down
16 changes: 16 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
## 4.7.8

Change default fallback to HexaRealm instead - it's been ready for a while :)

City-level resources

Display resource uniques in civilopedia

Resolved - memory improvement, cache uniquemap for tiles with identical terrain

Little Diplomatic Victory makeover - By SomeTroglodyte

Added notification for destruction of tile improvements [via unit ability] - By random271

Fix docker image name - By haimlm

## 4.7.7

Fixed India's 'double unhappiness' unique
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/UncivGame.kt
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci

companion object {
//region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT
val VERSION = Version("4.7.7", 889)
val VERSION = Version("4.7.8", 890)
//endregion

lateinit var Current: UncivGame
Expand Down
15 changes: 15 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/890.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@


Change default fallback to HexaRealm instead - it's been ready for a while :)

City-level resources

Display resource uniques in civilopedia

Resolved - memory improvement, cache uniquemap for tiles with identical terrain

Little Diplomatic Victory makeover - By SomeTroglodyte

Added notification for destruction of tile improvements [via unit ability] - By random271

Fix docker image name - By haimlm