Merge branch 'master' into next-unit-button-itanasi

android/assets/jsons/translations/Afrikaans.properties

@@ -3642,6 +3642,8 @@ Creates a [improvementName] improvement on a specific tile =
  # Requires translation!
 Founds a new city = 
  # Requires translation!
+Founds a new puppet city = 
+ # Requires translation!
 Can instantly construct a [improvementFilter] improvement = 
  # Requires translation!
 May create improvements on water resources = 
@@ -3992,6 +3994,8 @@ when not at war =
  # Requires translation!
 during a Golden Age = 
  # Requires translation!
+when not in a Golden Age = 
+ # Requires translation!
 during We Love The King Day = 
  # Requires translation!
 while the empire is happy = 

android/assets/jsons/translations/Bangla.properties

@@ -3147,6 +3147,8 @@ Creates a [improvementName] improvement on a specific tile =
  # Requires translation!
 Founds a new city = 
  # Requires translation!
+Founds a new puppet city = 
+ # Requires translation!
 Can instantly construct a [improvementFilter] improvement = 
  # Requires translation!
 May create improvements on water resources = 
@@ -3497,6 +3499,8 @@ when not at war =
  # Requires translation!
 during a Golden Age = 
  # Requires translation!
+when not in a Golden Age = 
+ # Requires translation!
 during We Love The King Day = 
  # Requires translation!
 while the empire is happy = 

android/assets/jsons/translations/Belarusian.properties

@@ -3301,6 +3301,8 @@ Creates a [improvementName] improvement on a specific tile =
  # Requires translation!
 Founds a new city = 
  # Requires translation!
+Founds a new puppet city = 
+ # Requires translation!
 Can instantly construct a [improvementFilter] improvement = 
  # Requires translation!
 May create improvements on water resources = 
@@ -3651,6 +3653,8 @@ when not at war =
  # Requires translation!
 during a Golden Age = 
  # Requires translation!
+when not in a Golden Age = 
+ # Requires translation!
 during We Love The King Day = 
  # Requires translation!
 while the empire is happy = 

android/assets/jsons/translations/Bosnian.properties

@@ -3876,6 +3876,8 @@ Creates a [improvementName] improvement on a specific tile =
  # Requires translation!
 Founds a new city = 
  # Requires translation!
+Founds a new puppet city = 
+ # Requires translation!
 Can instantly construct a [improvementFilter] improvement = 
  # Requires translation!
 May create improvements on water resources = 
@@ -4226,6 +4228,8 @@ when not at war =
  # Requires translation!
 during a Golden Age = 
  # Requires translation!
+when not in a Golden Age = 
+ # Requires translation!
 during We Love The King Day = 
  # Requires translation!
 while the empire is happy = 

android/assets/jsons/translations/Brazilian_Portuguese.properties

@@ -846,8 +846,7 @@ When disabled, saves battery life but certain animations will be suspended = Ao
 ## Gameplay tab
 Gameplay = Jogatina
 Check for idle units = Verificar unidades inativas
- # Requires translation!
-'Next unit' button cycles idle units = 
+'Next unit' button cycles idle units = O botão 'Próxima unidade' alterna as unidades ociosas
 Auto Unit Cycle = Ciclo Automático da Unidade
 Move units with a single tap = Mover unidades com apenas um toque
 Move units with a long tap = Mover unidades com um toque longo
@@ -888,8 +887,7 @@ Could not download music! = Não foi possível baixar a música!
 
 ## Advanced tab
 Advanced = Avançado
- # Requires translation!
-Number of autosave files stored = 
+Number of autosave files stored = Número de arquivos de salvamento automático armazenados
 Turns between autosaves = Turnos entre salvamentos automáticos
 
 
@@ -1174,10 +1172,8 @@ Turn = Turno
 turns = turnos
 turn = turno
 Next unit = Próxima unidade
- # Requires translation!
-[amount] units idle = 
- # Requires translation!
-[amount] units due = 
+[amount] units idle = [amount] unidades ociosas
+[amount] units due = [amount] unidades devidas
 Fog of War = Névoa de guerra
 Pick a policy = Escolha uma política
 Move Spies = Mover Espiões
@@ -2206,6 +2202,8 @@ Connects trade routes over water = Conecta rotas comerciais marítimas
 Automatically built in all cities where it is buildable = Construído automaticamente em todas as cidades onde é edificável
 Creates a [improvementName] improvement on a specific tile = Cria uma melhoria [improvementName] em um painel específico
 Founds a new city = Estabelecer uma nova cidade
+ # Requires translation!
+Founds a new puppet city = 
 Can instantly construct a [improvementFilter] improvement = Pode construir instantaneamente uma melhoria [improvementFilter]
 May create improvements on water resources = Pode criar melhorias em recursos aquáticos
 Can build [improvementFilter/terrainFilter] improvements on tiles = Pode construir melhorias [improvementFilter/terrainFilter] em painéis
@@ -2381,6 +2379,8 @@ for [civFilter] Civilizations = para [civFilter] Civilizações
 when at war = quando em guerra
 when not at war = quando não está em guerra
 during a Golden Age = durante uma Era de Ouro
+ # Requires translation!
+when not in a Golden Age = 
 during We Love The King Day = durante o dia de Nós Amamos o Rei
 while the empire is happy = enquanto o império está feliz
 when between [amount] and [amount2] Happiness = quando entre [amount] e [amount2] de Felicidade
@@ -2843,10 +2843,8 @@ Open AutoPlay menu = Abrir Menu do AutoPlay
 Empire Overview = Visão Geral do Império
 Music Player = Reprodutor de Música
 Developer Console = Console do desenvolvedor
- # Requires translation!
-Idle Prev = 
- # Requires translation!
-Idle Next = 
+Idle Prev = Anterior ocioso
+Idle Next = Próximo ocioso
 Empire Overview Trades = Visão Geral do Império Negociações
 Empire Overview Units = Visão Geral do Império Unidades
 Empire Overview Politics = Visão Geral do Império Política

android/assets/jsons/translations/Bulgarian.properties

@@ -2946,6 +2946,8 @@ Creates a [improvementName] improvement on a specific tile =
  # Requires translation!
 Founds a new city = 
  # Requires translation!
+Founds a new puppet city = 
+ # Requires translation!
 Can instantly construct a [improvementFilter] improvement = 
  # Requires translation!
 May create improvements on water resources = 
@@ -3293,6 +3295,8 @@ when not at war =
  # Requires translation!
 during a Golden Age = 
  # Requires translation!
+when not in a Golden Age = 
+ # Requires translation!
 during We Love The King Day = 
  # Requires translation!
 while the empire is happy = 

android/assets/jsons/translations/Catalan.properties

@@ -846,8 +846,7 @@ When disabled, saves battery life but certain animations will be suspended = Qua
 ## Gameplay tab
 Gameplay = Jugabilitat
 Check for idle units = Comprova les unitats aturades
- # Requires translation!
-'Next unit' button cycles idle units = 
+'Next unit' button cycles idle units = El botó d’«Unitat següent» passa a la següent unitat aturada
 Auto Unit Cycle = Fes el cicle d’unitats automàticament
 Move units with a single tap = Mou les unitats tocant-les una sola vegada
 Move units with a long tap = Mou les unitats amb un toc llarg
@@ -888,8 +887,7 @@ Could not download music! = La música no s’ha pogut descarregar
 
 ## Advanced tab
 Advanced = Avançat
- # Requires translation!
-Number of autosave files stored = 
+Number of autosave files stored = Nombre de fitxers de desades automàtiques emmagatzemats
 Turns between autosaves = Torns entre desades automàtiques
 
 
@@ -1174,10 +1172,8 @@ Turn = Torn
 turns = torns
 turn = torn
 Next unit = Següent unitat
- # Requires translation!
-[amount] units idle = 
- # Requires translation!
-[amount] units due = 
+[amount] units idle = [amount] unitats aturades
+[amount] units due = [amount] unitats programades
 Fog of War = Boira de guerra
 Pick a policy = Tria una política
 Move Spies = Mou espies
@@ -2206,6 +2202,8 @@ Connects trade routes over water = Crea rutes comercials a través de l’aigua
 Automatically built in all cities where it is buildable = Es construeix automàticament en totes les ciutats on es pugui construir.
 Creates a [improvementName] improvement on a specific tile = Crea una millora [improvementName] en una casella específica.
 Founds a new city = Funda una ciutat nova
+ # Requires translation!
+Founds a new puppet city = 
 Can instantly construct a [improvementFilter] improvement = Pot construir una millora de [improvementFilter] immediatament
 May create improvements on water resources = Crea millores en recursos aquàtics
 Can build [improvementFilter/terrainFilter] improvements on tiles = Pot construir millores de casella com ara [improvementFilter/terrainFilter].
@@ -2381,6 +2379,8 @@ for [civFilter] Civilizations = per a civilitzacions [civFilter]
 when at war = quan està en guerra
 when not at war = quan no està en guerra
 during a Golden Age = durant una edat d’or
+ # Requires translation!
+when not in a Golden Age = 
 during We Love The King Day = durant el Dia del Rei
 while the empire is happy = mentre l’imperi és feliç
 when between [amount] and [amount2] Happiness = quan té entre [amount] i [amount2] de felicitat
@@ -2843,10 +2843,8 @@ Open AutoPlay menu = Obre el menú d’AutoJoc
 Empire Overview = Vista general
 Music Player = Reproductor de música
 Developer Console = Consola de desenvolupament
- # Requires translation!
-Idle Prev = 
- # Requires translation!
-Idle Next = 
+Idle Prev = Anterior aturada
+Idle Next = Següent aturada
 Empire Overview Trades = Vista general ‒ Comerç
 Empire Overview Units = Vista general ‒ Unitats
 Empire Overview Politics = Vista general ‒ Política

android/assets/jsons/translations/Croatian.properties

@@ -846,8 +846,7 @@ When disabled, saves battery life but certain animations will be suspended = Kad
 ## Gameplay tab
 Gameplay = Igranje
 Check for idle units = Provjeri jedinice u stanju mirovanja
- # Requires translation!
-'Next unit' button cycles idle units = 
+'Next unit' button cycles idle units = Gumb 'Sljedeća jedinica' kruži kroz jedinice u stanju mirovanja
 Auto Unit Cycle = Automatsko Kruženje Kroz Jedinice
 Move units with a single tap = Pomiči jedinice jednim dodirom
 Move units with a long tap = Pomiči jedinice dugim dodirom
@@ -888,9 +887,8 @@ Could not download music! = Nije moguće preuzeti glazbu!
 
 ## Advanced tab
 Advanced = Napredno
- # Requires translation!
-Number of autosave files stored = 
-Turns between autosaves = Poteza između spremanja
+Number of autosave files stored = Broj pohranjenih datoteka za automatsko spremanje
+Turns between autosaves = Poteza između automatskih spremanja
 
 
 Screen orientation = Orijentacija zaslona
@@ -1174,10 +1172,8 @@ Turn = Potez
 turns = poteza
 turn = potez
 Next unit = Sljedeća jedinica
- # Requires translation!
-[amount] units idle = 
- # Requires translation!
-[amount] units due = 
+[amount] units idle = [amount] jedinica u stanju mirovanja
+[amount] units due = [amount] dospjelih jedinica
 Fog of War = Ratna Magla
 Pick a policy = Odaberi politiku
 Move Spies = Premjesti špijune
@@ -1680,8 +1676,8 @@ Player settings = Postavke igrača
 Extra happiness per luxury = Dodatno zadovoljstvo po luksuzu
 Research cost modifier = Modifikator cijene istraživanja
 Unit cost modifier = Modifikator cijene jedinica
-Building cost modifier = Modifikator cijene izgradnje
-Policy cost modifier = Modifikator cijene politike
+Building cost modifier = Modifikator cijene zgrada
+Policy cost modifier = Modifikator cijene politika
 Unhappiness modifier = Modifikator nezadovoljstva
 Bonus vs. Barbarians = Bonus protiv Barbara
 Barbarian spawning delay = Odgoda nastanka barbara
@@ -1690,7 +1686,7 @@ Bonus starting units = Bonus početnih jedinica
 AI settings = Postavke Umjetne Inteligencije
 AI city growth modifier = Modifikator rasta grada Umjetne Inteligencije
 AI unit cost modifier = Modifikator cijene jedinica Umjetne Inteligencije
-AI building cost modifier = Modifikator cijene izgradnje Umjetne Inteligencije
+AI building cost modifier = Modifikator cijene zgrada Umjetne Inteligencije
 AI wonder cost modifier = Modifikator cijene čuda Umjetne Inteligencije
 AI building maintenance modifier = Modifikator održavanja zgrada Umjetne Inteligencije
 AI unit maintenance modifier = Modifikator održavanja jedinica Umjetne Inteligencije
@@ -2206,6 +2202,8 @@ Connects trade routes over water = Povezuje trgovačke putove preko vode
 Automatically built in all cities where it is buildable = Automatski se gradi u svim gradovima u kojima se može graditi
 Creates a [improvementName] improvement on a specific tile = Stvara unaprjeđenje [improvementName] na određenom polju
 Founds a new city = Osniva novi grad
+ # Requires translation!
+Founds a new puppet city = 
 Can instantly construct a [improvementFilter] improvement = Može se instantno izgraditi unaprjeđenje [improvementFilter]
 May create improvements on water resources = Može stvoriti unaprjeđenja na resursima na vodi
 Can build [improvementFilter/terrainFilter] improvements on tiles = Može graditi [improvementFilter/terrainFilter] unaprjeđenja na poljima
@@ -2381,6 +2379,8 @@ for [civFilter] Civilizations = za [civFilter] Civilizacije
 when at war = kad je u ratu
 when not at war = kad nije u ratu
 during a Golden Age = u Zlatno Doba
+ # Requires translation!
+when not in a Golden Age = 
 during We Love The King Day = za vrijeme Volimo Kralja
 while the empire is happy = sve dok je carstvo zadovoljno
 when between [amount] and [amount2] Happiness = kada je između [amount] i [amount2] Zadovoljstva
@@ -2843,10 +2843,8 @@ Open AutoPlay menu = Otvori izbornik za Automatsku Igru
 Empire Overview = Pregled Carstva
 Music Player = Svirač Glazbe
 Developer Console = Konzola za Programere
- # Requires translation!
-Idle Prev = 
- # Requires translation!
-Idle Next = 
+Idle Prev = Prethodna u stanju mirovanja
+Idle Next = Sljedeća u stanju mirovanja
 Empire Overview Trades = Pregled Trgovine Carstva
 Empire Overview Units = Pregled Jedinica Carstva
 Empire Overview Politics = Pregled Politike Carstva
@@ -6908,7 +6906,7 @@ Once a certain tech is researched, your land units can embark, allowing them to
 Units are defenseless while embarked (cannot use modifiers), and have a fixed Defending Strength based on your tech Era, so be careful!\nRanged Units can't attack, Melee Units have a Strength penalty, and all have limited vision. = Jedinice su bespomoćne dok su ukrcane na brod (ne mogu koristiti modifikatore), i imaju fiksnu Snagu Obrane na temelju vaše tehnološke Ere, pa budite oprezni!\nDalekometne Jedinice ne mogu napadati, Jedinice za Blisku Borbu imaju penal na Snagu, i sve imaju ograničen vidokrug.
 
 Idle Units = Jedinice u Stanju Mirovanja
-If you don't want to move a unit this turn, you can skip it by clicking 'Next unit' again, or command the unit to 'Wait'.\nIf you won't be moving it for a while, you can have the unit enter Fortify or Sleep mode - \n  units in Fortify or Sleep are not considered idle units.\nIf you want to disable the 'Next unit' feature entirely, you can toggle it in Menu -> Check for idle units. = Ako ne želite pomicati jedinicu u ovom potezu, možete je preskočiti ponovnim klikom na 'Sljedeća jedinica' ili naredite jedinici da čeka s 'Čekaj'.\nAko je nećete pomicati neko vrijeme, možete je staviti u način rada Utvrdi se ili Spavaj - \n  jedinice u načinu rada Utvrdi se ili Spavaj ne smatraju se neaktivnim jedinicama.\nAko želite u potpunosti onemogućiti značajku 'Sljedeća jedinica', možete je uključiti/isključiti u Izbornik -> Provjeri jedinice u stanju mirovanja.
+If you don't want to move a unit this turn, you can skip it by clicking 'Next unit' again, or command the unit to 'Wait'.\nIf you won't be moving it for a while, you can have the unit enter Fortify or Sleep mode - \n  units in Fortify or Sleep are not considered idle units.\nIf you want to disable the 'Next unit' feature entirely, you can toggle it in Menu -> Check for idle units. = Ako ne želite pomicati jedinicu u ovom potezu, možete je preskočiti ponovnim klikom na 'Sljedeća jedinica' ili naredite jedinici da čeka s 'Čekaj'.\nAko je nećete pomicati neko vrijeme, možete je staviti u način rada Utvrdi se ili Spavaj - \n  jedinice u načinu rada Utvrdi se ili Spavaj ne smatraju se jedinicama u stanju mirovanja.\nAko želite u potpunosti onemogućiti značajku 'Sljedeća jedinica', možete je uključiti/isključiti u Izbornik -> Provjeri jedinice u stanju mirovanja.
 
 Contact Me = Kontaktirajte Me
 Hi there! If you've played this far, you've probably seen that the game is currently incomplete.\n Unciv is meant to be open-source and free, forever.\n That means no ads or any other nonsense. = Pozdrav! Ako ste igrali do sada, vjerojatno ste vidjeli da je igra trenutačno nedovršena.\n Unciv je namijenjen da bude otvorenog koda i besplatan, zauvijek.\n To znači da nema reklama ili bilo koje druge gluposti.

android/assets/jsons/translations/Czech.properties

@@ -2341,6 +2341,8 @@ Automatically built in all cities where it is buildable = Automaticky postavené
 Creates a [improvementName] improvement on a specific tile = Vytvorí vylepšení [improvementName] na specifickém políčku
 Founds a new city = Zakládá nové město
  # Requires translation!
+Founds a new puppet city = 
+ # Requires translation!
 Can instantly construct a [improvementFilter] improvement = 
 May create improvements on water resources = Může vybudovat vylepšení na vodních políčkách se surovinami
 Can build [improvementFilter/terrainFilter] improvements on tiles = Může budovat [improvementFilter/terrainFilter] vylepšení políček
@@ -2580,6 +2582,8 @@ when at war = je-li ve válce
 when not at war = není-li ve válce
 during a Golden Age = během Zlatého věku
  # Requires translation!
+when not in a Golden Age = 
+ # Requires translation!
 during We Love The King Day = 
 while the empire is happy = je-li říše spokojená
 when between [amount] and [amount2] Happiness = při spokojenosti mezi [amount] a [amount2]

android/assets/jsons/translations/Dutch.properties

@@ -2206,6 +2206,8 @@ Connects trade routes over water = Verbindt handelsroutes over water
 Automatically built in all cities where it is buildable = Wordt automatisch gebouwd in alle steden waar dit mogelijk is
 Creates a [improvementName] improvement on a specific tile = Plaatst een [improvementName] verbetering op een specifieke tegel
 Founds a new city = Sticht een nieuwe stad
+ # Requires translation!
+Founds a new puppet city = 
 Can instantly construct a [improvementFilter] improvement = Kan onmiddelijk een [improvementFilter] verbetering bouwen
 May create improvements on water resources = Kan verbeteringen op watergrondstoffen maken
 Can build [improvementFilter/terrainFilter] improvements on tiles = Kan [improvementFilter/terrainFilter] verbeteringen bouwen op tegels
@@ -2381,6 +2383,8 @@ for [civFilter] Civilizations = voor [civFilter] Civilizatie
 when at war = Tijdens een oorlog
 when not at war = Tijdens vrede
 during a Golden Age = tijdens een Gouden Tijdperk
+ # Requires translation!
+when not in a Golden Age = 
 during We Love The King Day = tijdens Wij Houden Van De Koning Dag
 while the empire is happy = terwijl het rijk gelukkig is
 when between [amount] and [amount2] Happiness = wanneer tussen [amount] en [amount2] Geluk

android/assets/jsons/translations/English.properties

@@ -4068,6 +4068,8 @@ Creates a [improvementName] improvement on a specific tile =
  # Requires translation!
 Founds a new city = 
  # Requires translation!
+Founds a new puppet city = 
+ # Requires translation!
 Can instantly construct a [improvementFilter] improvement = 
  # Requires translation!
 May create improvements on water resources = 
@@ -4418,6 +4420,8 @@ when not at war =
  # Requires translation!
 during a Golden Age = 
  # Requires translation!
+when not in a Golden Age = 
+ # Requires translation!
 during We Love The King Day = 
  # Requires translation!
 while the empire is happy =