Version rollout (#9440)

* Bump version and create initial changelog entry

* Update German translation (#9437)

* Update Spanish.properties (#9434)

* Update Brazilian_Portuguese.properties (#9433)

* Update French.properties (#9426)

* Update Italian.properties (#9422)

* Update Japanese.properties (#9346)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

*Add translations
*Add city names

* Update Japanese.properties

*Add new translations
*Fixed some translations regarding tile improvements that I have translated previously

* Update Japanese.properties

*Add translation for City-Nations messages, ruin-regarding messages, and more.

* Update Japanese.properties

Add translations for 
*Sweden, Austria, and some city-states
*Multiplayer Game notifications
*Tile Improvements
*Civilopedia explanations

* Update Japanese.properties

Add translations for
*Religion beliefs
*Civilopedia descriptions
*Victory status
*and more

* Update Japanese.properties

* Edit details

* Update Japanese.properties

*add new branches

* Update Japanese.properties

Fix wrong placeholders

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: namazulake <130637228+namazulake@users.noreply.github.com>

android/assets/jsons/translations/Brazilian_Portuguese.properties

@@ -574,12 +574,9 @@ You have to write an ID for your friend! = Você deve escrever um ID de jogador
 You cannot add your own player ID in your friend list! = Você não pode adicionar seu próprio ID de jogador na sua lista de amigos!
 To add a friend, ask him to send you his player ID.\nClick the 'Add friend' button.\nInsert his player ID and a name for him.\nThen click the 'Add friend' button again.\n\nAfter that you will see him in your friends list.\n\nA new button will appear when creating a new\nmultiplayer game, which allows you to select your friend. = Para adicionar um amigo, peça-lhe que lhe envie o seu ID de jogador.\nClique no botão 'Adicionar amigo'.\nInsira o seu ID de jogador e um nome para ele.\nEm seguida, clique no botão 'Adicionar amigo' novamente.\n\nDepois disso você o verá em sua lista de amigos.\n\nUm novo botão aparecerá ao criar um novo\njogo multijogador, que permite selecionar seu amigo.
 Please input Player ID! = Por favor, insira o ID do jogador!
- # Requires translation!
+The number of players will be adjusted = O número de jogadores será ajustado
-The number of players will be adjusted = 
+These [numberOfPlayers] players will be adjusted = Estes [numberOfPlayers] jogadores serão ajustados
- # Requires translation!
+[numberOfExplicitPlayersText] to [playerRange] actual players by adding random AI's or by randomly omitting AI's. = [numberOfExplicitPlayersText] para [playerRange] jogadores reais adicionando IAs aleatórios ou omitindo IAs aleatoriamente.
-These [numberOfPlayers] players will be adjusted = 
- # Requires translation!
-[numberOfExplicitPlayersText] to [playerRange] actual players by adding random AI's or by randomly omitting AI's. = 
 Set current user = Definir usuário atual
 Player ID from clipboard = ID de jogador da área de transferência
 Player ID from friends list = ID do jogador da lista de amigos

android/assets/jsons/translations/French.properties

@@ -575,11 +575,11 @@ You cannot add your own player ID in your friend list! = Vous ne pouvez pas ajou
 To add a friend, ask him to send you his player ID.\nClick the 'Add friend' button.\nInsert his player ID and a name for him.\nThen click the 'Add friend' button again.\n\nAfter that you will see him in your friends list.\n\nA new button will appear when creating a new\nmultiplayer game, which allows you to select your friend. = Pour ajouter un ami, obtenez son ID de joueur.\nCliquez sur le bouton 'Ajouter un ami'.\nEntrez l'ID de joueur et le nom de votre ami.\nPuis cliquez à nouveau sur le bouton 'Ajouter un ami'.\n\nVotre ami apparaîtra alors dans votre liste d'amis.\n\nUn nouveau bouton sera disponible lors de la création d'une nouvelle partie multijoueur, permettant de sélectionner directement votre ami pour l'ajouter à la partie.
 Please input Player ID! = ID de joueur requis !
  # Requires translation!
-The number of players will be adjusted = 
+The number of players will be adjusted = Le nombre de joueurs sera ajusté
  # Requires translation!
-These [numberOfPlayers] players will be adjusted = 
+These [numberOfPlayers] players will be adjusted = Ces [numberOfPlayers] joueurs seront ajustés
  # Requires translation!
-[numberOfExplicitPlayersText] to [playerRange] actual players by adding random AI's or by randomly omitting AI's. = 
+[numberOfExplicitPlayersText] to [playerRange] actual players by adding random AI's or by randomly omitting AI's. = [numberOfExplicitPlayersText] à [playerRange] joueurs effectifs en ajoutant des IA aléatoires ou en retirant au hasard des IA.
 Set current user = Définir l'utilisateur actuel
 Player ID from clipboard = ID de joueur depuis le presse-papier
 Player ID from friends list = ID de joueur depuis la liste d'amis

android/assets/jsons/translations/German.properties

@@ -574,12 +574,9 @@ You have to write an ID for your friend! = Bitte gib die Spieler-ID deines Freun
 You cannot add your own player ID in your friend list! = Du kannst deine eigene Spieler-ID nicht in deiner Freundesliste hinzufügen!
 To add a friend, ask him to send you his player ID.\nClick the 'Add friend' button.\nInsert his player ID and a name for him.\nThen click the 'Add friend' button again.\n\nAfter that you will see him in your friends list.\n\nA new button will appear when creating a new\nmultiplayer game, which allows you to select your friend. = Um einen Freund hinzuzufügen, bitte ihn, dir seine Spieler-ID zu schicken.\nKlicke auf 'Freund hinzufügen'.\nGib seine Spieler-ID und einen Namen für ihn ein.\nKlicke anschließend erneut auf 'Freund hinzufügen'.\n\nDanach siehst du ihn in deiner Freundesliste.\n\nBeim Erstellen eines neuen Mehrspieler-Spiels\nerscheint eine neue Schaltfläche, mit der du deinen Freund auswählen können.
 Please input Player ID! = Bitte Spieler-ID eingeben!
- # Requires translation!
+The number of players will be adjusted = Anpassung der Anzahl der Spieler
-The number of players will be adjusted = 
+These [numberOfPlayers] players will be adjusted = Anpassung dieser [numberOfPlayers] Spieler
- # Requires translation!
+[numberOfExplicitPlayersText] to [playerRange] actual players by adding random AI's or by randomly omitting AI's. = [numberOfExplicitPlayersText] zu [playerRange] tatsächliche Spieler durch Hinzufügen oder Weglassen von zufälligen KIs.
-These [numberOfPlayers] players will be adjusted = 
- # Requires translation!
-[numberOfExplicitPlayersText] to [playerRange] actual players by adding random AI's or by randomly omitting AI's. = 
 Set current user = Aktuellen Spieler eintragen
 Player ID from clipboard = Spieler-ID aus Zwischenablage
 Player ID from friends list = Spieler-ID aus Freundesliste

android/assets/jsons/translations/Italian.properties

@@ -578,12 +578,9 @@ You have to write an ID for your friend! = Devi scrivere un ID per il tuo amico!
 You cannot add your own player ID in your friend list! = Non puoi aggiungere il tuo stesso ID nella tua lista amici!
 To add a friend, ask him to send you his player ID.\nClick the 'Add friend' button.\nInsert his player ID and a name for him.\nThen click the 'Add friend' button again.\n\nAfter that you will see him in your friends list.\n\nA new button will appear when creating a new\nmultiplayer game, which allows you to select your friend. = Per aggiungere un amico, chiedigli di mandarti il suo ID giocatore.\nClicca su 'Aggiungi amico', poi inserisci il nome e l'ID dell'amico.\nVedrai il nome nella tua lista amici, e apparirà un tasto dove potrai creare una nuova partita multigiocatore, il che ti permette di selezionare il tuo amico.
 Please input Player ID! = Immetti ID giocatore!
- # Requires translation!
+The number of players will be adjusted = Il numero dei giocatori verrà modificato
-The number of players will be adjusted = 
+These [numberOfPlayers] players will be adjusted = Questi [numberOfPlayers] giocatori verranno modificati
- # Requires translation!
+[numberOfExplicitPlayersText] to [playerRange] actual players by adding random AI's or by randomly omitting AI's. = [numberOfExplicitPlayersText] a [playerRange] giocatori attuali aggiungendo IA casuali o escludendo casualmente IA.
-These [numberOfPlayers] players will be adjusted = 
- # Requires translation!
-[numberOfExplicitPlayersText] to [playerRange] actual players by adding random AI's or by randomly omitting AI's. = 
 Set current user = Imposta utente attuale
 Player ID from clipboard = Copia ID giocatore dagli appunti
 Player ID from friends list = ID giocatore dalla lista amici
@@ -1460,7 +1457,7 @@ Tutorials = Tutorial
 Cost = Costo
 May contain [listOfResources] = Può contenere [listOfResources]
 May contain: = Può contenere:
-Can upgrade from [unit] = Può aggiornarsi a [unit]
+Can upgrade from [unit] = Aggiornamento da [unit]
 Can upgrade from: = Aggiornabile da:
 Upgrades to [upgradedUnit] = Aggiorna a [upgradedUnit]
 Obsolete with [obsoleteTech] = Diventa obsoleta con [obsoleteTech]
@@ -4053,7 +4050,7 @@ Legalism = Legalismo
 Oligarchy = Oligarchia
 Landed Elite = Nobiltà terriera
 Monarchy = Monarchia
-Tradition Complete = Tradizionalismo Completo
+Tradition Complete = Tradizionalismo completo
 Tradition = Tradizionalismo
 
 Collective Rule = Governo collettivo
@@ -4061,7 +4058,7 @@ Citizenship = Cittadinanza
 Republic = Repubblica
 Representation = Rappresentanza
 Meritocracy = Meritocrazia
-Liberty Complete = Libertà Completa
+Liberty Complete = Libertà completa
 Liberty = Libertà
 
 Warrior Code = Codice guerriero
@@ -4069,7 +4066,7 @@ Discipline = Disciplina
 Military Tradition = Tradizione militare
 Military Caste = Casta Militare
 Professional Army = Esercito professionale
-Honor Complete = Onore Completo
+Honor Complete = Onore completo
 Honor = Onore
 
 Organized Religion = Religione Organizzata
@@ -4077,7 +4074,7 @@ Mandate Of Heaven = Mandato del Cielo
 Theocracy = Teocrazia
 Reformation = Riforma
 Free Religion = Tolleranza Religiosa
-Piety Complete = Devozione Completa
+Piety Complete = Devozione completa
 Piety = Devozione
 
 Philantropy = Filantropia
@@ -4093,7 +4090,7 @@ Trade Unions = File di carri
 Merchant Navy = Flotta mercantile
 Mercantilism = Mercantilismo
 Protectionism = Protezionismo
-Commerce Complete = Commercio Completo
+Commerce Complete = Commercio completo
 Commerce = Commercio
 
 Secularism = Secolarismo
@@ -4101,7 +4098,7 @@ Humanism = Umanesimo
 Free Thought = Libertà di pensiero
 Sovereignty = Sovranità
 Scientific Revolution = Rivoluzione Scientifica
-Rationalism Complete = Razionalismo Completo
+Rationalism Complete = Razionalismo completo
 Rationalism = Razionalismo
 
 Constitution = Costituzione
@@ -4109,7 +4106,7 @@ Universal Suffrage = Suffragio Universale
 Civil Society = Società civile
 Free Speech = Libertà di parola
 Democracy = Democrazia
-Freedom Complete = Uguaglianza Completa
+Freedom Complete = Uguaglianza completa
 Freedom = Uguaglianza
 
 Populism = Populismo
@@ -4117,7 +4114,7 @@ Militarism = Militarismo
 Fascism = Fascismo
 Police State = Stato di polizia
 Total War = Guerra Totale
-Autocracy Complete = Autocrazia Completa
+Autocracy Complete = Autocrazia completa
 Autocracy = Autocrazia
 
 United Front = Fronte unito
@@ -5076,7 +5073,7 @@ Oral Tradition = Tradizione orale
 
 Religious Idols = Idoli religiosi
 
-Religious Settlements = Insediamenti Religiosi
+Religious Settlements = Insediamenti religiosi
 
 Sacred Path = Cammino sacro
 

android/assets/jsons/translations/Spanish.properties

@@ -575,11 +575,11 @@ You cannot add your own player ID in your friend list! = ¡No puedes añadir tu
 To add a friend, ask him to send you his player ID.\nClick the 'Add friend' button.\nInsert his player ID and a name for him.\nThen click the 'Add friend' button again.\n\nAfter that you will see him in your friends list.\n\nA new button will appear when creating a new\nmultiplayer game, which allows you to select your friend. = Para añadir a un amigo, pídale que le envíe su ID de jugador.\nHaga clic en en el botón 'Añadir amigo'.\nInserta su ID de jugador y un nombre para él.\nEntonces haga clic en el botón 'Añadir amigo' otra vez.\n\nDespués de eso lo verás en su lista de amigos.\n\nUn nuevo botón aparecerá cuando cree un nuevo\njuego multijugador, que le permitirá seleccionar a su amigo.
 Please input Player ID! = ¡Por favor, inserte ID de jugador!
  # Requires translation!
-The number of players will be adjusted = 
+The number of players will be adjusted = El número de jugadores será ajustado
  # Requires translation!
-These [numberOfPlayers] players will be adjusted = 
+These [numberOfPlayers] players will be adjusted = Estos [numberOfPlayers] jugadores serán ajustados
  # Requires translation!
-[numberOfExplicitPlayersText] to [playerRange] actual players by adding random AI's or by randomly omitting AI's. = 
+[numberOfExplicitPlayersText] to [playerRange] actual players by adding random AI's or by randomly omitting AI's. = De [numberOfExplicitPlayersText] a [playerRange] jugadores actuales al sumar u omitir IAs aleatorias.
 Set current user = Asignar usuario actual
 Player ID from clipboard = ID de jugador desde el portapapeles
 Player ID from friends list = ID de jugador de lista de amigos

buildSrc/src/main/kotlin/BuildConfig.kt

@@ -4,8 +4,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.8.21"
     const val appName = "Unciv"
-    const val appCodeNumber = 869
+    const val appCodeNumber = 870
-    const val appVersion = "4.6.13"
+    const val appVersion = "4.6.14"
 
     const val gdxVersion = "1.11.0"
     const val roboVMVersion = "2.3.1"

changelog.md

@@ -1,3 +1,22 @@
+## 4.6.14
+
+Resolve  - city-state-owned great merchants can no longer 'conduct trade mission' on their own tiles
+
+Resolve  - don't crash for ByteBuffer byte errors
+
+Game saves are regular json, not minimalized json 
+
+AI civilian improvement: Don't freeze when enemy is near, keep working in tiles where he can't reach
+
+Units that can enter foreign lands without open borders are not expelled on open borders end
+
+Population icon gets locked with doubleclick, clicks cycle between assigned and unassigned 
+
+By SomeTroglodyte:
+- Fix ConcurrentModificationException when puppeting a city 
+- Next-Turn Progressbar 
+- Resolve To-do in Unit upgrade resource requirements 
+
 ## 4.6.13
 
 Failure to get mod preview image no longer causes crash

core/src/com/unciv/UncivGame.kt

@@ -531,7 +531,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.6.13", 869)
+        val VERSION = Version("4.6.14", 870)
         //endregion
 
         lateinit var Current: UncivGame

fastlane/metadata/android/en-US/changelogs/870.txt

@@ -0,0 +1,18 @@
+
+
+Resolve  - city-state-owned great merchants can no longer 'conduct trade mission' on their own tiles
+
+Resolve  - don't crash for ByteBuffer byte errors
+
+Game saves are regular json, not minimalized json 
+
+AI civilian improvement: Don't freeze when enemy is near, keep working in tiles where he can't reach
+
+Units that can enter foreign lands without open borders are not expelled on open borders end
+
+Population icon gets locked with doubleclick, clicks cycle between assigned and unassigned 
+
+By SomeTroglodyte:
+- Fix ConcurrentModificationException when puppeting a city 
+- Next-Turn Progressbar 
+- Resolve To-do in Unit upgrade resource requirements