Version rollout (#6514)

* Bump version and create initial changelog entry * Update Spanish.properties (#6505) * Update French.properties (#6503) * Update German translation (#6501) Co-authored-by: yairm210 <yairm210@users.noreply.github.com> Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com> Co-authored-by: Ouaz <Ouaz@users.noreply.github.com> Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2025-07-04 15:27:50 +07:00 · 2022-04-09 22:37:23 +03:00
parent 1c13201a23
commit 5447f01f1d
5 changed files with 50 additions and 38 deletions
--- a/android/assets/jsons/translations/French.properties
+++ b/android/assets/jsons/translations/French.properties
@ -202,7 +202,7 @@ Relationship changes in another [turnsToRelationshipChange] turns = Les relation
 Protected by = Protégé par
 Revoke Protection = Annuler la protection
 # Requires translation!
-Revoke protection for [cityStateName]? = 
+Revoke protection for [cityStateName]? = Annuler la protection de [cityStateName] ?
 Pledge to protect = Promettre la protection
 Declare Protection of [cityStateName]? = Déclarer protéger [cityStateName] ?
 Build [improvementName] on [resourceName] (200 Gold) = Construire [improvementName] sur [resourceName] (200 Or)
@ -585,7 +585,7 @@ We have encountered [civName]! = Nous sommes entrés en contact avec [civName] !
 [cityStateName] has given us [stats] as we are the first major civ to meet them = [cityStateName] nous a donné [stats] car nous sommes la première civilisation majeure à les rencontrer.
 [cityStateName] has also given us [stats] = [cityStateName] nous a aussi donné [stats]
 # Requires translation!
-[cityStateName] gave us a [unitName] as a gift! = 
+[cityStateName] gave us a [unitName] as a gift! = [cityStateName] nous a offert un(e) [unitName] !
 Cannot provide unit upkeep for [unitName] - unit has been disbanded! = Impossible d'entretenir [unitName] - l'unité a été dissoute !
 [cityName] has grown! = [cityName] a gagné un citoyen !
 [cityName] is starving! = [cityName] est affamée !
@ -924,7 +924,7 @@ Your trade mission to [civName] has earned you [goldAmount] gold and [influenceA
 Hurry Wonder = Accélérer la Merveille
 Hurry Construction = Accélérer la construction
 # Requires translation!
-Hurry Construction (+[productionAmount]⚙) = 
+Hurry Construction (+[productionAmount]⚙) = Accélérer la construction (+[productionAmount]⚙)
 Spread Religion = Diffuser la Religion
 Spread [religionName] = Diffuser [religionName]
 Remove Heresy = Supprimer l'Hérésie
@ -943,9 +943,9 @@ Stats = Statistiques
 Policies = Doctrines
 Base happiness = Bonheur de base
 # Requires translation!
-Traded Luxuries = 
+Traded Luxuries = Ress. de luxe échangées
 # Requires translation!
-City-State Luxuries = 
+City-State Luxuries = Ress. de luxe (Cités-États)
 Occupied City = Ville occupée
 Buildings = Bâtiments
 Wonders = Merveilles
@ -974,7 +974,7 @@ Name = Nom
 Closest city = Ville la plus proche
 Action = Action
 # Requires translation!
-Upgrade = 
+Upgrade = Améliorer
 Defeated = Vaincu
 [numberOfCivs] Civilizations in the game = [numberOfCivs] Civilisations dans la partie
 Our Civilization: = Notre Civilisation :
@ -1176,7 +1176,7 @@ Granted by: = Attribué par :
 [bonus] with [tech] = [bonus] avec [tech]
 Difficulty levels = Niveaux de difficulté
 # Requires translation!
-The possible rewards are: = 
+The possible rewards are: = Les récompenses possibles sont :

 # Policies

@ -1206,7 +1206,7 @@ Majority Religion: [name] = Religion majoritaire : [name]
 + [amount] pressure = + [amount] emprise
 Holy city of: [religionName] = Ville sainte de : [religionName]
 # Requires translation!
-Followers = 
+Followers = Fidèles
 Pressure = Emprise

 # Religion overview screen
@ -1383,7 +1383,7 @@ Nuclear Weapon = Arme nucléaire
 City = Ville
 Barbarian = Barbare
 # Requires translation!
-Great Person = 
+Great Person = Personnage Illustre
 Air = Aérienne(s)
 land units = unités terrestres
 water units = unités navales
@ -1466,7 +1466,7 @@ enhancing = renforçant
 ######### Religious Action Filters ###########

 # Requires translation!
-Remove Foreign religions from your own cities = 
+Remove Foreign religions from your own cities = Supprimer les religions étrangères dans vos villes

 ######### Unique Specials ###########

@ -3142,7 +3142,7 @@ Ringsted = Ringsted
 Skrive = Skrive
 Denmark = Danemark
 # Requires translation!
-[amount] Movement point cost to disembark = 
+[amount] Movement point cost to disembark = [amount] point(s) de Mouvement pour débarquer
 No movement cost to pillage = Le pillage ne coûte pas de point de mouvement

 You leave us no choice. War it must be. = Vous ne nous laissez pas le choix. C'est donc la guerre.
@ -5460,11 +5460,11 @@ Requires a [buildingName] in at least [amount] cities = Nécessite un(e) [buildi
 Must not be next to [terrainFilter] = Ne doit pas être proche de [terrainFilter]
 No defensive terrain penalty = Aucune pénalité défensive de terrain
 # Requires translation!
-May attack when embarked = 
+May attack when embarked = Peut attaquer quand embarqué(e)
 No Sight = Pas de Vision
 [amount] XP gained from combat = [amount] XP gagné après combat
 # Requires translation!
-[amount] Movement point cost to embark = 
+[amount] Movement point cost to embark = [amount] point(s) de Mouvement pour embarquer
 Irremovable = Insupprimable
 by consuming this unit = en consommant cette unité
 when at war = quand en guerre
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@ -200,9 +200,8 @@ Give a Gift = Ein Geschenk übergeben
 Gift [giftAmount] gold (+[influenceAmount] influence) = Schenke [giftAmount] Gold (+[influenceAmount] Einfluss)
 Relationship changes in another [turnsToRelationshipChange] turns = Die Beziehung verändert sich in [turnsToRelationshipChange] Runden
 Protected by = Beschützt von
-Revoke Protection = Schutz aufheben
- # Requires translation!
-Revoke protection for [cityStateName]? = 
+Revoke Protection = Schutz widerrufen
+Revoke protection for [cityStateName]? = Schutz für [cityStateName] widerrufen?
 Pledge to protect = Schutz zusichern
 Declare Protection of [cityStateName]? = Schutz von [cityStateName] bekanntgeben?
 Build [improvementName] on [resourceName] (200 Gold) = Baue [improvementName] auf [resourceName] (200 Gold)
@ -3130,8 +3129,7 @@ Haderslev = Haderslev
 Ringsted = Ringsted
 Skrive = Skrive
 Denmark = Dänemark
- # Requires translation!
-[amount] Movement point cost to disembark = 
+[amount] Movement point cost to disembark = [amount] Bewegungskosten zum Ausschiffen
 No movement cost to pillage = Keine Bewegungskosten beim Plündern

 You leave us no choice. War it must be. = Ihr lasst uns keine Wahl. Krieg muss es sein.
@ -5448,12 +5446,10 @@ Can be purchased for [amount] [stat] [cityFilter] = Kann für [amount] [stat] [c
 Requires a [buildingName] in at least [amount] cities = Erfordert [buildingName] in mindestens [amount] Städten
 Must not be next to [terrainFilter] = Darf sich nicht neben [terrainFilter] befinden
 No defensive terrain penalty = Keinen Nachteil auf Verteidigungsgebiet
- # Requires translation!
-May attack when embarked = 
+May attack when embarked = Kann angreifen, wenn eingeschifft
 No Sight = Keine Sicht
 [amount] XP gained from combat = [amount] EP im Kampf gewonnen
- # Requires translation!
-[amount] Movement point cost to embark = 
+[amount] Movement point cost to embark = [amount] Bewegungskosten zum Einschiffen
 Irremovable = Nicht entfernbar
 by consuming this unit = durch Verbrauch dieser Einheit
 when at war = wenn im Krieg
--- a/android/assets/jsons/translations/Spanish.properties
+++ b/android/assets/jsons/translations/Spanish.properties
@ -202,7 +202,7 @@ Relationship changes in another [turnsToRelationshipChange] turns = La relación
 Protected by = Protegida por
 Revoke Protection = Revocar Protección
 # Requires translation!
-Revoke protection for [cityStateName]? = 
+Revoke protection for [cityStateName]? = ¿Retractar protección a [cityStateName]?
 Pledge to protect = Prometer Protección
 Declare Protection of [cityStateName]? = ¿Declarar Protección de [cityStateName]?
 Build [improvementName] on [resourceName] (200 Gold) = Construir [improvementName] en [resourceName] (200 Oro)
@ -585,7 +585,7 @@ We have encountered [civName]! = ¡Hemos encontrado a [civName]!
 [cityStateName] has given us [stats] as we are the first major civ to meet them = [cityStateName] nos ha dado [stats] por ser los primeros en conocerles
 [cityStateName] has also given us [stats] = [cityStateName] también nos dio [stats]
 # Requires translation!
-[cityStateName] gave us a [unitName] as a gift! = 
+[cityStateName] gave us a [unitName] as a gift! = ¡[cityStateName] nos ha dado un [unitName] como regalo!
 Cannot provide unit upkeep for [unitName] - unit has been disbanded! = No se puede mantener [unitName] - ¡unidad disuelta!
 [cityName] has grown! = ¡[cityName] ha crecido!
 [cityName] is starving! = ¡Hambruna en [cityName]!
@ -924,7 +924,7 @@ Your trade mission to [civName] has earned you [goldAmount] gold and [influenceA
 Hurry Wonder = Acelerar Maravilla
 Hurry Construction = Acelerar Construcción
 # Requires translation!
-Hurry Construction (+[productionAmount]⚙) = 
+Hurry Construction (+[productionAmount]⚙) = Acelerar Construcción (+[productionAmount]⚙)
 Spread Religion = Difundir Religión
 Spread [religionName] = Difundir [religionName]
 Remove Heresy = Eliminar Herejía
@ -943,9 +943,9 @@ Stats = Estadísticas
 Policies = Políticas
 Base happiness = Felicidad base
 # Requires translation!
-Traded Luxuries = 
+Traded Luxuries = Recursos de Lujo Comerciados
 # Requires translation!
-City-State Luxuries = 
+City-State Luxuries = Recursos de Lujo de Ciudades-Estado
 Occupied City = Ciudad ocupada
 Buildings = Edificios
 Wonders = Maravillas
@ -974,7 +974,7 @@ Name = Nombre
 Closest city = Ciudad más cercana
 Action = Acción
 # Requires translation!
-Upgrade = 
+Upgrade = Mejorar
 Defeated = Derrotado
 [numberOfCivs] Civilizations in the game = [numberOfCivs] Civilizaciones en el juego 
 Our Civilization: = Nuestra civilización
@ -1176,7 +1176,7 @@ Granted by: = Concedido por
 [bonus] with [tech] = [bonus] con [tech]
 Difficulty levels = Niveles de dificultad
 # Requires translation!
-The possible rewards are: = 
+The possible rewards are: = Las posibles recompensas son:

 # Policies

@ -1206,7 +1206,7 @@ Majority Religion: [name] = Religión Predominante: [name]
 + [amount] pressure = + [amount] presión
 Holy city of: [religionName] = Ciudad santa de: [religionName]
 # Requires translation!
-Followers = 
+Followers = Seguidores
 Pressure = Presión

 # Religion overview screen
@ -1383,7 +1383,7 @@ Nuclear Weapon = Arma nuclear
 City = Ciudad
 Barbarian = bárbaras
 # Requires translation!
-Great Person = 
+Great Person = Gran Personaje
 Air = Aérea
 land units = unidades terrestres
 water units = unidades navales
@ -1466,7 +1466,7 @@ enhancing = mejorar
 ######### Religious Action Filters ###########

 # Requires translation!
-Remove Foreign religions from your own cities = 
+Remove Foreign religions from your own cities = Quitar religiones externas de tus ciudades

 ######### Unique Specials ###########

@ -3140,7 +3140,7 @@ Ringsted = Ringsted
 Skrive = Skrive
 Denmark = Dinamarca
 # Requires translation!
-[amount] Movement point cost to disembark = 
+[amount] Movement point cost to disembark = Desembarcar cuesta [amount] puntos de movimiento
 No movement cost to pillage = Saquear no supone coste de movimiento

 You leave us no choice. War it must be. = No nos dejas elección. Será la guerra.
@ -5456,11 +5456,11 @@ Requires a [buildingName] in at least [amount] cities = requerir a [buildingName
 Must not be next to [terrainFilter] = no debe estar al lado [terrainFilter]
 No defensive terrain penalty = Sin penalización de terreno defensivo
 # Requires translation!
-May attack when embarked = 
+May attack when embarked = Puede atacar cuando está embarcado
 No Sight = Sin Visión
 [amount] XP gained from combat = [amount] XP obtenido del combate
 # Requires translation!
-[amount] Movement point cost to embark = 
+[amount] Movement point cost to embark = Embarcar cuesta [amount] puntos de movimiento
 Irremovable = Inremovible
 by consuming this unit = al consumar esta unidad
 when at war = si está en guerra
@ -5476,7 +5476,7 @@ for units with [promotion] = para unidades con [promotion]
 for units without [promotion] = para unidades sin [promotion]
 when above [amount] HP = cuando está por encima de [amount] HP
 when below [amount] HP = cuando está por debajo de [amount] HP
-with [amount] to [amount2] neighboring [tileFilter] tiles = con [amount] a [amount2] [tileFilter] fichas
+with [amount] to [amount2] neighboring [tileFilter] tiles = con [amount] a [amount2] casillas de [tileFilter] adyacentes
 in [tileFilter] [tileFilter2] tiles = en casillas [tileFilter] [tileFilter2]
 in tiles without [tileFilter] = en casillas sin [tileFilter]
 on water maps = en mapas de agua
--- a/buildSrc/src/main/kotlin/BuildConfig.kt
+++ b/buildSrc/src/main/kotlin/BuildConfig.kt
@ -3,8 +3,8 @@ package com.unciv.build
 object BuildConfig {
    const val kotlinVersion = "1.5.30"
    const val appName = "Unciv"
-    const val appCodeNumber = 695
-    const val appVersion = "4.0.4"
+    const val appCodeNumber = 696
+    const val appVersion = "4.0.5"

    const val gdxVersion = "1.10.0"
    const val roboVMVersion = "2.3.1"
--- a/changelog.md
+++ b/changelog.md
@ -1,3 +1,19 @@
+## 4.0.5
+
+Added borders to minimap 
+
+Resolved  - package reorg
+
+Cities that become capital no longer continue being razed
+
+By SomeTroglodyte:
+- Make Icons clickable in religions per city display 
+- Nicer NotificationScroll 
+
+Fixed a bug where crosshairs are everywhere with the 'attack when embarked' unique  - By xlenstra
+
+Fixed turn checker crashes   - By GGGuenni
+
 ## 4.0.4

 Caught bad URL parsing exceptions