Translation writer now takes from all base ruleset, and doesn't add duplicate keys - we're ready to start actual work on G&K!

android/assets/jsons/translations/Brazilian_Portuguese.properties

@@ -820,7 +820,6 @@ Gold reward for clearing barbarian camps = Recompensa em ouro por limpar os acam
 
 # Other civilopedia things
 Nations = Nações
-Promotions = Promoções
 Available for [unitTypes] = Disponível para [unitTypes]
 Free promotion: = Promoção grátis
 Free promotions: = Promoções grátis
@@ -905,7 +904,7 @@ Doing this will reset your current user ID to the clipboard contents - are you s
 ID successfully set! = ID definido com sucesso!
 Invalid ID! = ID inválido!
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
 Indicates the capital city = Indica a Capital
 Palace = Palácio
@@ -1202,7 +1201,7 @@ SS Engine = Motor principal da nave espacia
 SS Stasis Chamber = Câmara  de biostase de Nave Espacial
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Colonizador
 
@@ -1221,7 +1220,7 @@ Immortal = Imortal
 Deity = Divindade
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -3314,7 +3313,7 @@ Congratulations, conquerer. This tribe serves you now. = Parabéns, conquistador
 Barbarians = Bárbaros
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
 Aristocracy = Aristocracia
 +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = +15 de produção ao construir maravilhas, +1 felicidade a cada 10 em uma cidade
@@ -3356,7 +3355,6 @@ Military units gain 50% more Experience from combat = +50% experiencia em batalh
 Military Caste = Casta Militar
 Each city with a garrison increases happiness by 1 and culture by 2 = +1 felicidade e +2 cultara por cidade com guarda
 Professional Army = Exército Profissional
-Gold cost of upgrading military units reduced by 33% = -33% custo de Ouro para melhora de unidades militares
 Honor Complete = Honra Completa
 Gain gold for each unit killed = Ganhe ouro por cada unidade morta
 Honor = Honra
@@ -3403,7 +3401,6 @@ Free Thought = Pensamento Livre
 Sovereignty = Soberania
 +15% science while empire is happy = +15% ciência enquanto império está feliz
 Scientific Revolution = Revolução Ciêntifica
-Science gained from research agreements +50% = Pontos de pesquisa recebidos de acordos de pesquisa +50%
 Rationalism Complete = Racionalismo Completo
 +1 gold from all science buildings = +1 de ouro de todos os edifícios de ciência
 Renaissance era = Renascimento
@@ -3442,9 +3439,8 @@ Autocracy = Autocracia
 -33% unit upkeep costs = -33% Manutenção de unidades
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = Antiguidade
 Agriculture = Agricultura
 Starting tech = Tecnologia inicial
 'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster = 'Onde o cultivo começa, outras artes seguem. Os fazendeiros portanto são os fundadores da civilização humana.' Daniel Webster
@@ -3473,7 +3469,6 @@ Masonry = Alvenaria
 Bronze Working = Trabalho com bronze
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = 'Aqui Heitor entrou, com uma lança de onze côvados de comprimento em sua mão; o bronze aponta brilhante em sua frente, e foi preso ao cabo da lança por um anel de ouro.' - Homero
 
-Classical era = Antiguidade Clássica
 Optics = Óptica
 Enables embarkation for land units = Permite o embarque de unidades terrestres
 'He made an instrument to know if the moon shine at full or no.' - Samuel Butler = 'Ele fez um instrumento para saber se a lua brilha cheia ou não.' - Samuel Butler
@@ -3494,7 +3489,6 @@ Roads connect tiles across rivers = Estradas connectam painéis através dos rio
 Iron Working = Trabalho com ferro
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Não espere o aço ficar quente para bater, mas faça-o quente batendo.' - William Butler Yeats
 
-Medieval era = Idade Média
 Theology = Teologia
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = 'Tres coisas são necessárias para a salvação do homem: saber em que ele deve acreditar; saber o que ele deve desejar; e saber o que ele deve fazer' -  S. Tomás de Aquino
 Civil Service = Serviço civil
@@ -3522,7 +3516,6 @@ Physics = Física
 Steel = Aço
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 'John Henry disse ao seu capitão, / 'Um homem não é nada mas um homem, / E antes que eu permita que sua broca a vapor me vença, / Eu morrerei com o martelo em minha mão.'' - Anônimo: A balada de John Henry, o Homem Movido a Aço
 
-Renaissance era = Renascimento
 Astronomy = Astronomia
 Increases embarked movement +1 = Aumenta movimento enquanto embarcado em +1
 Enables embarked units to enter ocean tiles = Permite que unidades embarcadas entrem em hexágonos oceânicos
@@ -3547,7 +3540,6 @@ Metallurgy = Metalurgia
 Chemistry = Química
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = 'Para onde quer que olhemos, o trabalho do químico elevou o nível de nossa civilização e aumentou a capacidade produtiva da nação.' - Calvin Coolidge
 
-Industrial era = Revolução Industrial
 Archaeology = Arqueologia
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = 'Quem não se lembra do passado é condenado a repeti-lo.' - George Santayana
 Scientific Theory = Teoria científica
@@ -3632,7 +3624,7 @@ Who knows what the future holds? = Quem sabe o que o futuro reserva?
 'I think we agree, the past is over.' - George W. Bush = 'Acho que concordamos, o passado acabou.' - George W. Bush
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = Oceano
 
@@ -3697,7 +3689,7 @@ Cerro de Potosi =
 Barringer Crater = Cratera de Barringer
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = Fazenda
 
@@ -3724,8 +3716,6 @@ Fort = Forte
 
 Road = Estrada
 
-Railroad = Ferrovia
-
 Remove Forest = Cortar floresta
 
 Remove Jungle = Cortar selva
@@ -3768,7 +3758,7 @@ City ruins = Ruínas da cidade
 Barbarian encampment = Acampamento bárbaro
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = Gado
 
@@ -3828,7 +3818,7 @@ Whales = Baleias
 Pearls = Pérolas
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
 Heal Instantly = Cura Instantânea
 Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion = Cure essa unidade por 50 de Vida; Fazendo isto irá consumir sua oportunidade de escolher uma Promoção
@@ -3993,12 +3983,11 @@ Slinger Withdraw = Retirada de Lançador
 May withdraw before melee (133%) = Pode se retirar antes do corpo a corpo (133%)
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
 Worker = Trabalhador
 Can build improvements on tiles = Pode construir melhorias em terrenos
 
-Settler = Colonizador
 Founds a new city = Estabelecer uma nova cidade
 
 Scout = Batedor
@@ -4032,7 +4021,6 @@ War Chariot = Carruagem de guerra
 War Elephant = Elefante de guerra
 
 Spearman = Lanceiro
-Bonus vs [unitType] = Bônus contra [unitType]
 
 Hoplite = Hoplita
 
@@ -4101,7 +4089,6 @@ Keshik = Keshik
 
 Caravel = Caravela
 May withdraw before melee = Pode se retirar antes do corpo a corpo
-+1 Visibility Range = +1 de alcance do campo de visão
 
 Turtle Ship = Navio Tartaruga
 
@@ -4113,7 +4100,6 @@ Musketeer = Mosqueteiro
 
 Janissary = Janisário
 Heals [amount] damage if it kills a unit = Cura [amount] de dano se destruir uma unidade
-Bonus as Attacker [amount]% = [amount]% de bônus como atacante
 
 Minuteman = Mílicia
 
@@ -4150,7 +4136,6 @@ Cavalry = Cavalaria
 Cossack = Cossaco
 
 Artillery = Artilharia
-Ranged attacks may be performed over obstacles = Ataques à distância podem ser executados sobre obstáculos
 
 Ironclad = Navio revestido de ferro
 Double movement in coast = Movimento em dobro nos litorais
@@ -4225,7 +4210,50 @@ Khan = Cã
 Heal adjacent units for an additional 15 HP per turn = Cura unidades adjacentes por um adiconal de 15 HP por rodada
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = Introdução
 Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own! = Bem-vindo ao Unciv!\nPela razão de ser um jogo complexo, existem tarefas básicas para ajudar você a se familiarizar com o jogo.\nIsto é completamente opcional, e você pode explorar o jogo do seu jeito!
@@ -4248,7 +4276,6 @@ Once a city has gathered enough Culture, it will expand into a neighboring tile.
 Each additional tile will require more culture, but generally your first cities will eventually expand to a wide tile range. = Cada painel adicional exigirá mais cultura, mas geralmente suas primeiras cidades se expandirão para uma ampla variedade de painéis.
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = Embora sua cidade continue sempre se expandindo, seus cidadãos só podem trabalhar a 3 painéis do centro da cidade. \nIsso deve ser levado em consideração ao se colocar novas cidades.
 
-Happiness = Felicidade
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = À medida que as cidades crescem em tamanho e influência, você precisa lidar com um mecanismo de felicidade que não está mais vinculado a cada cidade. \nEm vez disso, todo o seu império compartilha o mesmo nível de satisfação. \nComo as cidades crescem em população, você encontrará que é cada vez mais difícil manter seu império feliz.
 In addition, you can’t even build any city improvements that increase happiness until you’ve done the appropriate research.\nIf your empire’s happiness ever goes below zero the growth rate of your cities will be hurt.\nIf your empire becomes severely unhappy (as indicated by the smiley-face icon at the top of the interface)\n  your armies will have a big penalty slapped on to their overall combat effectiveness. = Além disso, você não pode nem construir melhorias na cidade que aumentem a felicidade até fazer a pesquisa apropriada. \nSe a felicidade de seu império ficar abaixo de zero, a taxa de crescimento de suas cidades será prejudicada. \nSe seu império se tornar severamente infeliz (como indicado pelo ícone de rosto sorridente na parte superior da interface) \n seus exércitos terão uma grande penalidade aplicada à eficácia geral do combate.
 This means that it is very difficult to expand quickly in Unciv.\nIt isn’t impossible, but as a new player you probably shouldn’t do it.\nSo what should you do? Chill out, scout, and improve the land that you do have by building Workers.\nOnly build new cities once you have found a spot that you believe is appropriate. = Isso significa que é muito difícil expandir rapidamente no Unciv. \nNão é impossível, mas como novo jogador, você provavelmente não deve fazê-lo. \nO que você deve fazer? Relaxe, explore e melhore a terra que você possui construindo Trabalhadores. \nConstrua novas cidades depois de encontrar um local que considere apropriado.
@@ -4258,7 +4285,6 @@ It seems that your citizens are unhappy!\nWhile unhappy, cities  will grow at 1/
 Unhappiness has two main causes: Population and cities\n  Each city causes 3 unhappiness, and each population, 1 = A infelicidade tem duas causas principais: População e cidades\n Cada cidade causa 3 infelicidade e cada população, 1
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = Existem duas maneiras principais de combater a infelicidade:\n construindo edifícios de felicidade para sua população\n ou melhorando os recursos de luxo dentro de suas fronteiras
 
-Golden Age = Idade de Ouro
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = Você entrou na era de ouro! \nOs pontos da era de ouro são acumulados a cada turno pela felicidade total\n de sua civilização \nQuando na era de ouro, a geração de cultura e produção aumenta +20%,\n e cada painel já fornecendo pelo menos um de ouro fornecerá um de ouro extra.
 
 Roads and Railroads = Estradas e Ferrovias
@@ -4289,7 +4315,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
 
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = Você encontrou outra civilização!\nOutras civilizações começam pacificamente e você pode negociar com elas,\n mas elas podem optar por declarar guerra a você mais tarde
 
-Apollo Program = Programa Apollo
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = Depois de concluir o Programa Apollo, você poderá começar a construir partes da nave espacial em suas cidades\n (com as tecnologias relevantes) para obter uma vitória científica!
 
 Injured Units = Unidades Feridas
@@ -4328,7 +4353,6 @@ Research Agreements = Acordos de Pesquisa
 In research agreements, you and another civilization decide to jointly research technology.\nAt the end of the agreement, you will both receive a 'lump sum' of Science, which will go towards one of your unresearched technologies. = Em acordos de pesquisa, você e outra civilização decidem pesquisar em conjunto tecnologia.\nAo fim do acordo, ambos vocês irão receber um 'montante único' de ciência, o qual será direcionado a uma de suas tecnologia ainda não pesquisada.
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = A quantidade de Ciência que você recebe no fim depende na ciência gerada por suas cidades e das cidades das outras civilizações durante o acordo - quanto mais. melhor! 
 
-City-States = Cidades-Estado
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = Nem todas as nações estão disputando com você pela vitória.\nCidades-estado são nações que não podem ganhar, não conquistam outras cidades e não podem negociar comércio.
 Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = Ao contrário, relações diplomáticas com cidades-estado são determinadas por Influência - a medida de 'quanto que a Cidade-estado gosta de você'.\nInfluência pode ser aumentada por atacar seus inimigos, liberar sua cidade, e dando a elas quantias de ouro.
 Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = Certos bonus são fornecidos quando você se encontra acima de 30 de influência.\nQuando você tem mais que 60 de Influência, e você tem a aior influência de todas as civilizações, você é considerado seus 'Aliado', e ganha ainda mais bonus e acesso aos recursos de Luxo e Estratégia em suas terras.
@@ -4341,6 +4365,5 @@ Great Improvements also provide any strategic resources that are under them, so
 Removing Terrain Features = Removendo as características do terreno
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = Certos painéis têm características do terreno - como planícies alagadas ou florestas - em cima delas. Algumas dessas camadas, como Selva, Pântano e Floresta, podem ser removidas pelos trabalhadores. \nRemover o recurso de terreno não remove nenhum recurso do painel e geralmente é necessário para trabalhar com esses recursos.
 
-Natural Wonders = Maravilhas da Natureza
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = Maravilhas Naturais, como o Monte Fuji, a Rochedo de Gibraltar e a Grande Barreira de Coral, são únicas, características intransponíveis de terreno, obras primas da Mãe Natureza, as quais possuem qualidades excepcionais que as fazem muito diferentes dos terrenos comuns.\nEles beneficiam lhe fornecendo grandes quantias de Cultura, Ciência, Ouro ou Produção se trabalhadas por suas Cidades, sendo o motivo pelo qual você tenha que trazê-las ao seu empério assim que possível. 
 

android/assets/jsons/translations/Czech.properties

@@ -862,7 +862,6 @@ Gold reward for clearing barbarian camps =
 
 # Other civilopedia things
 Nations = Národy
-Promotions = Povýšení
 Available for [unitTypes] = K dispozici pro [unitTypes]
 Free promotion: = Povýšení zdarma:
 Free promotions: = Povýšení zdarma: 
@@ -952,7 +951,7 @@ ID successfully set! =
  # Requires translation!
 Invalid ID! = 
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
 Indicates the capital city = Označuje hlavní město
 Palace = Palác
@@ -1249,7 +1248,7 @@ SS Engine = SS Motor
 SS Stasis Chamber = SS Stázová komora
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Osadník
 
@@ -1268,7 +1267,7 @@ Immortal = Polobůh
 Deity = Bůh
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -3564,7 +3563,7 @@ Congratulations, conquerer. This tribe serves you now. = Gratulujeme, dobyvateli
 Barbarians = Barbaři
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
 Aristocracy = Aristokracie
 +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = +15% produkce při stavbě Divu, +1 spokojenost za každých 10 obyvatel ve městě
@@ -3606,7 +3605,6 @@ Military units gain 50% more Experience from combat = Vojenské jednotky získá
 Military Caste = Vojenská třída
 Each city with a garrison increases happiness by 1 and culture by 2 = Každé město vojenskou posádku zvyšuje spokojenost o 1 a kulturu o 2 
 Professional Army = Profesionální armáda
-Gold cost of upgrading military units reduced by 33% = Cena vylepšení vojenských jednotek snížena o 33%
 Honor Complete = Kompletní Čest
 Gain gold for each unit killed = Obdržíte zlato za každou zabitou jednotku
 Honor = Čest
@@ -3653,7 +3651,6 @@ Free Thought = Volnomyšlenkářství
 Sovereignty = Svrchovanost lidu
 +15% science while empire is happy = +15% výzkumu, pokud jsou obyvatelé vaší říše spokojení
 Scientific Revolution = Vědecká revoluce
-Science gained from research agreements +50% = Výzkum z vědeckých dohod +50%
 Rationalism Complete = Kompletní Racionalismus
 +1 gold from all science buildings = +1 zlato ze všech vědeckých budov
 Renaissance era = Renesanční éra
@@ -3692,9 +3689,8 @@ Autocracy = Autokracie
 -33% unit upkeep costs = -33% nákladů na údržbu jednotek
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = Starověká éra
 Agriculture = Zemědělství
  # Requires translation!
 Starting tech = 
@@ -3724,7 +3720,6 @@ Masonry = Zdivo
 Bronze Working = Zpracování bronzu
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = 'Zde vstoupil Hektor s kopím jedenáct loktů dlouhým v ruce; bronzový hrot před ním se leskl a byl připevněn na špici oštěpu kroužkem ze zlata' - Homér
 
-Classical era = Klasická starověká éra
 Optics = Optika
 Enables embarkation for land units = Zpřístupní možnost nalodění se pozemním jednotkám
 'He made an instrument to know if the moon shine at full or no.' - Samuel Butler = 'Vyrobil nástroj aby poznal, jestli můsíc svítí úplně či nikoliv.' - Samuel Butler
@@ -3746,7 +3741,6 @@ Roads connect tiles across rivers =
 Iron Working = Zpracování železa
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Nečekejte s útokem, dokud se nerozžhaví železo, ale rozžhavte ho údery.' - William Butler Yeats
 
-Medieval era = Středověká éra
 Theology = Teologie
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = 'Pro spásu duše jsou nezbytné tři věci: vědět čemu věřit; vědět co si přát; a vědet co mám dělat.' - Tomáš Akvinský
 Civil Service = Státní služba
@@ -3774,7 +3768,6 @@ Physics = Fyzika
 Steel = Ocel
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 'John Henry řekl svému kapitánovi: Člověk nic neznamená, ale muž, a před tím než mě nahradí váš parní stroj, tak zemřu s kladivem v ruce.' - Autor neznámy
 
-Renaissance era = Renesanční éra
 Astronomy = Astronomie
 Increases embarked movement +1 = Zvyšuje rychlost naloděných jednotek o +1
 Enables embarked units to enter ocean tiles = Umožňuje naloděným jednotkám vyplout na oceán
@@ -3799,7 +3792,6 @@ Metallurgy = Hutnictví
 Chemistry = Chemie
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = 'Kamkoli se podíváme, práce chemiků zvýšila úroveň naší civilizace a zvýšila výrobní kapacitu národa.' - Calvin Coolidge
 
-Industrial era = Industriální éra
 Archaeology = Archeologie
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = 'Ti, kteří si nepamatují svoji minulost, jsou odsouzeni si ji zopakovat.' - George Santayana
 Scientific Theory = Vědecká teorie
@@ -3883,7 +3875,7 @@ Who knows what the future holds? = Kdo ví, co nám přinese budoucnost?
 'I think we agree, the past is over.' - George W. Bush = 'Myslím, že jsme se shodli, že minulost je za námi.' - George W. Bush
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = Oceán
 
@@ -3944,7 +3936,7 @@ Cerro de Potosi = Cerro de Potosí
 Barringer Crater = Barringerův kráter
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = Farma
 
@@ -3971,8 +3963,6 @@ Fort = Opevnění
 
 Road = Cesta
 
-Railroad = Železnice
-
 Remove Forest = Vykácet les
 
 Remove Jungle = Vykácet džungli
@@ -4017,7 +4007,7 @@ City ruins = Zřiceniny města
 Barbarian encampment = Barbarský tábor
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = Dobytek
 
@@ -4077,7 +4067,7 @@ Whales = Velryby
 Pearls = Perly
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
 Heal Instantly = Okamžité léčení
 Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion = Vyléčí tuto jednotku o 50 zdraví, ale přijdete o možnost povýšení
@@ -4242,12 +4232,11 @@ Slinger Withdraw = Ústup prakovníka
 May withdraw before melee (133%) = Může ustoupit před bojem zblízka (133%)
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
 Worker = Dělník
 Can build improvements on tiles = Na políčku lze vybudovat vylepšení
 
-Settler = Osadník
 Founds a new city = Založit nové město
 
 Scout = Zvěd
@@ -4281,7 +4270,6 @@ War Chariot = Válečný vůz
 War Elephant = Válečný slon
 
 Spearman = Kopiník
-Bonus vs [unitType] = Výhoda proti [unitType]
 
 Hoplite = Hoplita
 
@@ -4351,7 +4339,6 @@ Keshik = Keshik
 
 Caravel = Karavela
 May withdraw before melee = Může ustoupit před bojem zblízka
-+1 Visibility Range = +1 dohled
 
 Turtle Ship = Želví loď
 
@@ -4363,7 +4350,6 @@ Musketeer = Mušketýr
 
 Janissary = Janičář
 Heals [amount] damage if it kills a unit = Léčí [amount] zranění pokud zabije jednotku
-Bonus as Attacker [amount]% = Bonus když útočí [amount]%
 
 Minuteman = Minutemen
 
@@ -4400,7 +4386,6 @@ Cavalry = Kavalérie
 Cossack = Kozák
 
 Artillery = Dělostřelectvo
-Ranged attacks may be performed over obstacles = Útoky na dálku lze provádět i přes překážky
 
 Ironclad = Obrněná loď
 Double movement in coast = Dvojnásobný pohyb na pobřeží
@@ -4475,7 +4460,50 @@ Khan = Chán
 Heal adjacent units for an additional 15 HP per turn = Léčí sousední jednotky o dalšich 15 zdraví za kolo
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = Úvod
 Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own! = Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own!
@@ -4500,7 +4528,6 @@ Once a city has gathered enough Culture, it will expand into a neighboring tile.
 Each additional tile will require more culture, but generally your first cities will eventually expand to a wide tile range. = Každé další políčko vžaduje více kulturních bodů, ale vaše první města se většinou rozrostou daleko.
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = Ačkoliv město může rozrůstat bez omezení, jeho obyvatelé mohou pracovat do vzdálenosti 3 políček od středu města. To byste měli zohlednit při umísťování nových měst.
 
-Happiness = Spokojenost
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = Jak města rostou a vzkvétají, budeme se muset vypořádat s mechanismem Spokojenosti,\n  který již není nadále vypočítáván individuálně pro každé město.\nMísto toho sdílí celá říše společnou úroveň spokojenosti\nS přibývajícím počtem obyvatel zjistíme, že je stále obtížnější udržet populaci naší říše spokojenou.
 In addition, you can’t even build any city improvements that increase happiness until you’ve done the appropriate research.\nIf your empire’s happiness ever goes below zero the growth rate of your cities will be hurt.\nIf your empire becomes severely unhappy (as indicated by the smiley-face icon at the top of the interface)\n  your armies will have a big penalty slapped on to their overall combat effectiveness. = Aby toho nebylo málo, tak budovy zlepšující spokojenost obyvatel nelze stavět bez dokončení příslušného výzkumu.\nV případě že spokojenost v naší říši klesne pod nulu, tak se ve všech městech významně zpomalí přírůstek nových obyvatel.\nPokud bude naše říše velmi nespokojená (jak ukazuje ikona smajlíku v horní liště)\n  celá naše armáda (bojové jednotky) obdrží významnou penalizaci a dojde k výraznému oslabení v boji.
 This means that it is very difficult to expand quickly in Unciv.\nIt isn’t impossible, but as a new player you probably shouldn’t do it.\nSo what should you do? Chill out, scout, and improve the land that you do have by building Workers.\nOnly build new cities once you have found a spot that you believe is appropriate. = To znamená, že ve hře UnCiv je poměrně obtížné rychle expandovat.\nNikdo netvrdí, že je to nemožné, ale novým hráčům se doporučuje nedělat to.\nTakže co bychom měli dělat? Uklidnit se, vyslat průzkumníky a vylepšovat námi ovládané území pomocí Dělníků.\nNové města budujme až poté, co pro ně najdeme vhodné místo.
@@ -4510,7 +4537,6 @@ It seems that your citizens are unhappy!\nWhile unhappy, cities  will grow at 1/
 Unhappiness has two main causes: Population and cities\n  Each city causes 3 unhappiness, and each population, 1 = Nespokojenost má dva hlavní důvody: Populaci (počet obyvatel) a města\n  Každé město přidává 3 body nespokojenosti a každý obyvatel 1 bod nespokojenosti
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = Existují dva účinné způsoby jak bojovat proti nespokojenosti:\n  výstavbou budov, které zvyšují spokojenost obyvatel\n  nebo vylepšením Luxusních surovin, které se nachází na území našich měst.
 
-Golden Age = Zlatý věk
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = Vstoupili jsme do Zlatého věku!\nZlatý věk představují body, které se získávají každé kolo jako celková Spokojenost celé naší civilizace\nVe zlatém věku je produkce a počet generovaných kulturních bodů zvýšený o +20%,\n  na víc každé políčko, ze kterého získáváme alespoň jedno zlato nám poskytne další jedno extra zlato navíc.
 
 Roads and Railroads = Cesty a železnice
@@ -4543,7 +4569,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
 
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = Setkali jsme se s jinou civilizací!\nOstatní civilizace začínají vyjednávat mírumilovně a lze s nimi obchodovat,\n  v budoucnu ovšem můžou změnit svůj názor a klidně nám vyhlásí válku.
 
-Apollo Program = Program Apollo
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = Ve chvíli kdy jsme dokončili Apollo Program, můžeme začít ve městech stavět části vesmírné lodi (SS z anglického SpaceShip),\n  samozřejmě s použitím vyzkoumaných relevantních technologií, a dosáhnout tak vítězství Vědeckou cestou!
 
 Injured Units = Zraněné jednotky
@@ -4586,7 +4611,6 @@ Research Agreements =
 In research agreements, you and another civilization decide to jointly research technology.\nAt the end of the agreement, you will both receive a 'lump sum' of Science, which will go towards one of your unresearched technologies. = Výzkumnou dohodou se vy a jiná civilizace rozhodnete spolupracovat na výzkumu technologií. \nPo uplynutí dohody oba obdržíte 'jednorázový obnos' bodů výzkumu, který bude aplikován na jednu z nevyzkoumaných technologií.
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = Množství bodů výzkumu, ktere obdržíte po uplynutí dohody, je závislé na množství výzkumu poskytovaném vašimi městy a městy druhé civilizace po dobu trvání dohody - čím více, tím lépe!
 
-City-States = Městské státy
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = Ne všechny národy soupeří o vítezství.\nMěstské státy jsou národy, které nemohou zvítězit, nemohou dobývat jiná města a nelze s nimi s obchodovat.
 Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = Místo toho jsou diplomatické vztahy s městskými státy určené vlivem - měřítkem toho, jak moc vás má městský stát v oblibě.\nVliv může být zvýšen útokem na jejich nepřítele, osvobozením jejich měst či věnováním obnosu zlata.
 Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = Po dosažení či překonání hranice 30 vlivu obržíte různé bonusy.\nPo dosažení hranice 60 vlivu a pokud máte vůči nim nejvyšší vliv ze všech civilizací, jste považováni za 'spojence' a získáte další bonusy a přístup k Luxusním a Strategickým surovinám na jejich území.
@@ -4605,6 +4629,5 @@ Removing Terrain Features =
  # Requires translation!
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = 
 
-Natural Wonders = Přírodní divy
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = Přírodní divy jako je hora Fuji, Gibraltarské skály nebo Velký bariérový útes jsou jedinečná neprůchozí terénní pole, mistrovská díla matky Přírody s výjimečnými vlastnostmi, které je činí velmi odlišnými od běžných terénů.\nPoskytují větší množství kultury, výzkumu, zlata či produkce, pokud jsou využívána městskými dělníky. Proto byste je meli co nejdříve zahrnout do své říše.
 

android/assets/jsons/translations/Dutch.properties

@@ -1327,8 +1327,6 @@ Gold reward for clearing barbarian camps =
  # Requires translation!
 Nations = 
  # Requires translation!
-Promotions = 
- # Requires translation!
 Available for [unitTypes] = 
  # Requires translation!
 Free promotion: = 
@@ -1460,7 +1458,7 @@ ID successfully set! =
  # Requires translation!
 Invalid ID! = 
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
  # Requires translation!
 Indicates the capital city = 
@@ -1917,7 +1915,7 @@ SS Engine =
 SS Stasis Chamber = 
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
  # Requires translation!
 Settler = 
@@ -1944,7 +1942,7 @@ Immortal =
 Deity = 
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -4438,7 +4436,7 @@ Congratulations, conquerer. This tribe serves you now. =
 Barbarians = 
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
  # Requires translation!
 Aristocracy = 
@@ -4518,8 +4516,6 @@ Each city with a garrison increases happiness by 1 and culture by 2 =
  # Requires translation!
 Professional Army = 
  # Requires translation!
-Gold cost of upgrading military units reduced by 33% = 
- # Requires translation!
 Honor Complete = 
  # Requires translation!
 Gain gold for each unit killed = 
@@ -4607,8 +4603,6 @@ Sovereignty =
  # Requires translation!
 Scientific Revolution = 
  # Requires translation!
-Science gained from research agreements +50% = 
- # Requires translation!
 Rationalism Complete = 
  # Requires translation!
 +1 gold from all science buildings = 
@@ -4678,9 +4672,8 @@ Autocracy =
 -33% unit upkeep costs = 
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = Oude
 Agriculture = Agricultuur
  # Requires translation!
 Starting tech = 
@@ -4722,7 +4715,6 @@ Bronze Working = Brons Bewerking
  # Requires translation!
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = 
 
-Classical era = Klasieke
 Optics = Optica
  # Requires translation!
 Enables embarkation for land units = 
@@ -4753,7 +4745,6 @@ Iron Working = Ijzer Bewerking
  # Requires translation!
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 
 
-Medieval era = Middeleeuwse
 Theology = Theologie
  # Requires translation!
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = 
@@ -4796,7 +4787,6 @@ Steel = Staal
  # Requires translation!
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 
 
-Renaissance era = Renaissance
 Astronomy = Astronomie
  # Requires translation!
 Increases embarked movement +1 = 
@@ -4833,7 +4823,6 @@ Chemistry = Chemie
  # Requires translation!
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = 
 
-Industrial era = Industrieele
 Archaeology = Archeologie
  # Requires translation!
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = 
@@ -4958,7 +4947,7 @@ Who knows what the future holds? = Wie weet wat de toekomst inhoud?
 'I think we agree, the past is over.' - George W. Bush = 
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = Oceaan
 
@@ -5035,7 +5024,7 @@ Cerro de Potosi =
 Barringer Crater = 
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = Boerderij
 
@@ -5065,8 +5054,6 @@ Fort =
 
 Road = Weg
 
-Railroad = Spoorweg
-
  # Requires translation!
 Remove Forest = 
 
@@ -5127,7 +5114,7 @@ City ruins = Ruïnes van de stad
 Barbarian encampment = 
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = Rundvee
 
@@ -5190,7 +5177,7 @@ Whales = Walvissen
 Pearls = Parels
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
  # Requires translation!
 Heal Instantly = 
@@ -5444,14 +5431,12 @@ Slinger Withdraw =
 May withdraw before melee (133%) = 
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
  # Requires translation!
 Worker = 
 Can build improvements on tiles = Kan verbeteringen op velden bouwen
 
- # Requires translation!
-Settler = 
 Founds a new city = Sticht een nieuwe stad
 
  # Requires translation!
@@ -5501,7 +5486,6 @@ War Elephant =
 
  # Requires translation!
 Spearman = 
-Bonus vs [unitType] = Voordeel tegen [unitType]
 
  # Requires translation!
 Hoplite = 
@@ -5607,8 +5591,6 @@ Keshik =
 Caravel = 
  # Requires translation!
 May withdraw before melee = 
- # Requires translation!
-+1 Visibility Range = 
 
  # Requires translation!
 Turtle Ship = 
@@ -5626,8 +5608,6 @@ Musketeer =
 Janissary = 
  # Requires translation!
 Heals [amount] damage if it kills a unit = 
- # Requires translation!
-Bonus as Attacker [amount]% = 
 
  # Requires translation!
 Minuteman = 
@@ -5685,8 +5665,6 @@ Cossack =
 
  # Requires translation!
 Artillery = 
- # Requires translation!
-Ranged attacks may be performed over obstacles = 
 
  # Requires translation!
 Ironclad = 
@@ -5806,7 +5784,50 @@ Khan =
 Heal adjacent units for an additional 15 HP per turn = 
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
  # Requires translation!
 Introduction = 
@@ -5845,7 +5866,6 @@ Each additional tile will require more culture, but generally your first cities
  # Requires translation!
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = 
 
-Happiness = Blijheid
  # Requires translation!
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = 
  # Requires translation!
@@ -5862,8 +5882,6 @@ Unhappiness has two main causes: Population and cities\n  Each city causes 3 unh
  # Requires translation!
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = 
 
- # Requires translation!
-Golden Age = 
  # Requires translation!
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = 
 
@@ -5914,8 +5932,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
  # Requires translation!
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = 
 
- # Requires translation!
-Apollo Program = 
  # Requires translation!
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = 
 
@@ -5981,8 +5997,6 @@ In research agreements, you and another civilization decide to jointly research
  # Requires translation!
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = 
 
- # Requires translation!
-City-States = 
  # Requires translation!
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = 
  # Requires translation!
@@ -6004,8 +6018,6 @@ Removing Terrain Features =
  # Requires translation!
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = 
 
- # Requires translation!
-Natural Wonders = 
  # Requires translation!
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = 
 

android/assets/jsons/translations/English.properties

@@ -1531,8 +1531,6 @@ Gold reward for clearing barbarian camps =
  # Requires translation!
 Nations = 
  # Requires translation!
-Promotions = 
- # Requires translation!
 Available for [unitTypes] = 
  # Requires translation!
 Free promotion: = 
@@ -1672,7 +1670,7 @@ ID successfully set! =
  # Requires translation!
 Invalid ID! = 
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
  # Requires translation!
 Indicates the capital city = 
@@ -2163,7 +2161,7 @@ SS Engine =
 SS Stasis Chamber = 
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
  # Requires translation!
 Settler = 
@@ -2190,7 +2188,7 @@ Immortal =
 Deity = 
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -4685,7 +4683,7 @@ Congratulations, conquerer. This tribe serves you now. =
 Barbarians = 
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
  # Requires translation!
 Aristocracy = 
@@ -4766,8 +4764,6 @@ Each city with a garrison increases happiness by 1 and culture by 2 =
  # Requires translation!
 Professional Army = 
  # Requires translation!
-Gold cost of upgrading military units reduced by 33% = 
- # Requires translation!
 Honor Complete = 
  # Requires translation!
 Gain gold for each unit killed = 
@@ -4857,8 +4853,6 @@ Sovereignty =
  # Requires translation!
 Scientific Revolution = 
  # Requires translation!
-Science gained from research agreements +50% = 
- # Requires translation!
 Rationalism Complete = 
  # Requires translation!
 +1 gold from all science buildings = 
@@ -4930,10 +4924,8 @@ Autocracy =
 -33% unit upkeep costs = 
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
- # Requires translation!
-Ancient era = 
  # Requires translation!
 Agriculture = 
  # Requires translation!
@@ -4987,8 +4979,6 @@ Bronze Working =
  # Requires translation!
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = 
 
- # Requires translation!
-Classical era = 
  # Requires translation!
 Optics = 
  # Requires translation!
@@ -5027,8 +5017,6 @@ Iron Working =
  # Requires translation!
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 
 
- # Requires translation!
-Medieval era = 
  # Requires translation!
 Theology = 
  # Requires translation!
@@ -5081,8 +5069,6 @@ Steel =
  # Requires translation!
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 
 
- # Requires translation!
-Renaissance era = 
  # Requires translation!
 Astronomy = 
  # Requires translation!
@@ -5129,8 +5115,6 @@ Chemistry =
  # Requires translation!
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = 
 
- # Requires translation!
-Industrial era = 
  # Requires translation!
 Archaeology = 
  # Requires translation!
@@ -5287,7 +5271,7 @@ Who knows what the future holds? =
 'I think we agree, the past is over.' - George W. Bush = 
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
  # Requires translation!
 Ocean = 
@@ -5378,7 +5362,7 @@ Cerro de Potosi =
 Barringer Crater = 
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
  # Requires translation!
 Farm = 
@@ -5418,9 +5402,6 @@ Fort =
  # Requires translation!
 Road = 
 
- # Requires translation!
-Railroad = 
-
  # Requires translation!
 Remove Forest = 
 
@@ -5487,7 +5468,7 @@ City ruins =
 Barbarian encampment = 
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
  # Requires translation!
 Cattle = 
@@ -5576,7 +5557,7 @@ Whales =
 Pearls = 
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
  # Requires translation!
 Heal Instantly = 
@@ -5825,15 +5806,13 @@ Slinger Withdraw =
 May withdraw before melee (133%) = 
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
  # Requires translation!
 Worker = 
  # Requires translation!
 Can build improvements on tiles = 
 
- # Requires translation!
-Settler = 
  # Requires translation!
 Founds a new city = 
 
@@ -5887,8 +5866,6 @@ War Elephant =
 
  # Requires translation!
 Spearman = 
- # Requires translation!
-Bonus vs [unitType] = 
 
  # Requires translation!
 Hoplite = 
@@ -5998,8 +5975,6 @@ Keshik =
 Caravel = 
  # Requires translation!
 May withdraw before melee = 
- # Requires translation!
-+1 Visibility Range = 
 
  # Requires translation!
 Turtle Ship = 
@@ -6017,8 +5992,6 @@ Musketeer =
 Janissary = 
  # Requires translation!
 Heals [amount] damage if it kills a unit = 
- # Requires translation!
-Bonus as Attacker [amount]% = 
 
  # Requires translation!
 Minuteman = 
@@ -6075,8 +6048,6 @@ Cossack =
 
  # Requires translation!
 Artillery = 
- # Requires translation!
-Ranged attacks may be performed over obstacles = 
 
  # Requires translation!
 Ironclad = 
@@ -6196,7 +6167,50 @@ Khan =
 Heal adjacent units for an additional 15 HP per turn = 
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
  # Requires translation!
 Introduction = 
@@ -6226,8 +6240,6 @@ Each additional tile will require more culture, but generally your first cities
  # Requires translation!
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = 
 
- # Requires translation!
-Happiness = 
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy.
 In addition, you can’t even build any city improvements that increase happiness until you’ve done the appropriate research.\nIf your empire’s happiness ever goes below zero the growth rate of your cities will be hurt.\nIf your empire becomes severely unhappy (as indicated by the smiley-face icon at the top of the interface)\n  your armies will have a big penalty slapped on to their overall combat effectiveness. = In addition, you can’t even build any city improvements that increase happiness until you’ve done the appropriate research.\nIf your empire’s happiness ever goes below zero the growth rate of your cities will be hurt.\nIf your empire becomes severely unhappy (as indicated by the smiley-face icon at the top of the interface)\n  your armies will have a big penalty slapped on to their overall combat effectiveness.
 This means that it is very difficult to expand quickly in Unciv.\nIt isn’t impossible, but as a new player you probably shouldn’t do it.\nSo what should you do? Chill out, scout, and improve the land that you do have by building Workers.\nOnly build new cities once you have found a spot that you believe is appropriate. = This means that it is very difficult to expand quickly in Unciv.\nIt isn’t impossible, but as a new player you probably shouldn’t do it.\nSo what should you do? Chill out, scout, and improve the land that you do have by building Workers.\nOnly build new cities once you have found a spot that you believe is appropriate.
@@ -6238,8 +6250,6 @@ It seems that your citizens are unhappy!\nWhile unhappy, cities  will grow at 1/
 Unhappiness has two main causes: Population and cities\n  Each city causes 3 unhappiness, and each population, 1 = Unhappiness has two main causes: Population and cities\n  Each city causes 3 unhappiness, and each population, 1
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders
 
- # Requires translation!
-Golden Age = 
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold.
 
  # Requires translation!
@@ -6278,8 +6288,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
 
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on
 
- # Requires translation!
-Apollo Program = 
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory!
 
  # Requires translation!
@@ -6335,8 +6343,6 @@ In research agreements, you and another civilization decide to jointly research
  # Requires translation!
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = 
 
- # Requires translation!
-City-States = 
  # Requires translation!
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = 
  # Requires translation!
@@ -6358,8 +6364,6 @@ Removing Terrain Features =
  # Requires translation!
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = 
 
- # Requires translation!
-Natural Wonders = 
  # Requires translation!
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = 
 

android/assets/jsons/translations/French.properties

@@ -846,7 +846,6 @@ Gold reward for clearing barbarian camps =
 
 # Other civilopedia things
 Nations = Nations
-Promotions = Promotions
 Available for [unitTypes] = Disponible pour [unitTypes]
 Free promotion: = Promotion gratuite:
 Free promotions: = Promotions gratuites:
@@ -936,7 +935,7 @@ ID successfully set! =
  # Requires translation!
 Invalid ID! = 
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
 Indicates the capital city = Indique la capitale
 Palace = Palais
@@ -1233,7 +1232,7 @@ SS Engine = Moteur (Vaisseau Spatial)
 SS Stasis Chamber = Module de biostase (Vaisseau Spatial)
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Colon
 
@@ -1252,7 +1251,7 @@ Immortal = Immortel
 Deity = Divinité
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -2529,7 +2528,7 @@ Congratulations, conquerer. This tribe serves you now. = Félicitations, conqué
 Barbarians = Barbares
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
 Aristocracy = Aristocratie
 +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = +15% production lors de la construction de merveilles, +1 de bonheur pour chaque tranche de 10 citoyens dans chaque ville
@@ -2571,7 +2570,6 @@ Military units gain 50% more Experience from combat = Expérience gagnée en com
 Military Caste = Caste militaire
 Each city with a garrison increases happiness by 1 and culture by 2 = Dans chaque ville possédant une garnison, +1 Bonheur et +2 Culture
 Professional Army = Armée de métier
-Gold cost of upgrading military units reduced by 33% = Le coût en or de l'amélioration des unités militaires est réduit de 33%
 Honor Complete = Honneur complété
 Gain gold for each unit killed = Gain d'or à chaque unité tuée
 Honor = Honneur
@@ -2618,7 +2616,6 @@ Free Thought = Liberté de pensée
 Sovereignty = Souveraineté
 +15% science while empire is happy = +15% science tant que l'empire est heureux
 Scientific Revolution = Révolution scientifique
-Science gained from research agreements +50% = +50% pour la Science gagnée par les accords de recherche
 Rationalism Complete = Rationalisme complet
 +1 gold from all science buildings = Les bâtiments scientifiques rapportent +1 or
 Renaissance era = Renaissance
@@ -2657,9 +2654,8 @@ Autocracy = Autocratie
 -33% unit upkeep costs = -33% de coût de maintenance des unités
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = Antiquité
 Agriculture = Agriculture
 Starting tech = Technologie initiale
 'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster = 'Là où débute le travail du sol, d'autres arts suivent. Les agriculteurs sont donc les fondateurs de la civilisation humaine' - Daniel Webster
@@ -2688,7 +2684,6 @@ Masonry = Maçonnerie
 Bronze Working = Travail du bronze
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = 'Là Hector entra, avec une lance de onze pieds de long en main ; la pointe de bronze, fixée à la hampe par un anneau d'or,  étincelait devant lui.' - Homère
 
-Classical era = Âge classique
 Optics = Optique
 Enables embarkation for land units = Permet d'embarquer les unités terrestres
 'He made an instrument to know if the moon shine at full or no.' - Samuel Butler = 'Il a fabriqué un instrument pour savoir si c'est la pleine lune ou non.' - Samuel Butler
@@ -2710,7 +2705,6 @@ Roads connect tiles across rivers =
 Iron Working = Travail du fer
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'N'attendez pas que le fer soit chaud pour le frapper, mais frapper le pour qu'il soit chaud.' - William Butler Yeats
 
-Medieval era = Moyen-Âge
 Theology = Théologie
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = 'Trois choses sont nécessaires au salut de l'homme: savoir ce qu'il doit croire; savoir ce qu'il doit désirer; et savoir ce qu'il doit faire.'- St. Thomas d'Aquin
 Civil Service = Administration
@@ -2738,7 +2732,6 @@ Physics = Physique
 Steel = Acier
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 'John Henry dit à son capitaine, / 'Un homme n'est rien d'autre qu'un homme, / Et avant que je laisse votre foreuse à vapeur m'abattre, / Je mourrai avec le marteau à la main.' - Anonyme : La ballade de John Henry, l'homme au marteau
 
-Renaissance era = Renaissance
 Astronomy = Astronomie
 Increases embarked movement +1 = Déplacement +1 pour les unités embarquées
 Enables embarked units to enter ocean tiles = Permet aux unités embarquées de traverser les cases d'océan
@@ -2763,7 +2756,6 @@ Metallurgy = Métallurgie
 Chemistry = Chimie
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = 'Où que nous regardions, le travail du chimiste a fait progresser le niveau de notre civilisation et a augmenté la capacité de production de la nation.' - Calvin Coolidge
 
-Industrial era = Ère industrielle
 Archaeology = Archéologie
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = 'Ceux qui ne peuvent se souvenir du passé sont condamnés à le répéter.' - George Santayana
 Scientific Theory = Théorie scientifique
@@ -2847,7 +2839,7 @@ Who knows what the future holds? = Qui sait ce que l'avenir réserve?
 'I think we agree, the past is over.' - George W. Bush = 'Je pense que nous sommes d'accord, le passé est terminé.' - George W. Bush
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = Océan
 
@@ -2908,7 +2900,7 @@ Cerro de Potosi = Cerro de Potosi
 Barringer Crater = Cratère de Barringer
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = Ferme
 
@@ -2935,8 +2927,6 @@ Fort = Fort
 
 Road = Route
 
-Railroad = Chemin de fer
-
 Remove Forest = Défricher la forêt
 
 Remove Jungle = Défricher la jungle
@@ -2980,7 +2970,7 @@ City ruins = Ruines
 Barbarian encampment = Camp barbare
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = Bétail
 
@@ -3040,7 +3030,7 @@ Whales = Baleines
 Pearls = Perles
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
 Heal Instantly = Soin instantané
 Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion = Soigne cette unité de 50 PV, coûte une promotion
@@ -3205,12 +3195,11 @@ Slinger Withdraw = Retraite du frondeur
 May withdraw before melee (133%) = Peut fuir le combat en mêlée (133%)
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
 Worker = Ouvrier
 Can build improvements on tiles = Construit des aménagements sur les cases
 
-Settler = Colon
 Founds a new city = Fonde une nouvelle ville
 
 Scout = Éclaireur
@@ -3244,7 +3233,6 @@ War Chariot = Char de guerre
 War Elephant = Éléphant de guerre
 
 Spearman = Lancier
-Bonus vs [unitType] = Bonus contre [unitType]
 
 Hoplite = Hoplite
 
@@ -3313,7 +3301,6 @@ Keshik = Keshig
 
 Caravel = Caravelle
 May withdraw before melee = Capable de fuite du combat rapproché
-+1 Visibility Range = Champ de vision +1
 
 Turtle Ship = Bateau-tortue
 
@@ -3325,7 +3312,6 @@ Musketeer = Mousquetaire
 
 Janissary = Janissaire
 Heals [amount] damage if it kills a unit = Se soigne de [amount] dégâts s'il tue une unité
-Bonus as Attacker [amount]% = Bonus en tant qu'attaquant +[amount]%
 
 Minuteman = Minuteman
 
@@ -3362,7 +3348,6 @@ Cavalry = Cavalerie
 Cossack = Cosaque
 
 Artillery = Artillerie
-Ranged attacks may be performed over obstacles = Les attaques à distances ignorent les obstacles
 
 Ironclad = Cuirassé
 Double movement in coast = Double mouvement le long des côtes
@@ -3437,7 +3422,50 @@ Khan = Khan
 Heal adjacent units for an additional 15 HP per turn = Soigne les unités adjacentes de 15 PV supplémentaires par tour
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = Introduction
 Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own! = Bienvenue sur Unciv ! Comme il s'agit d'un jeu complexe, voici quelques tâches basiques pour vous aider à vous familiariser avec le jeu.\n Elles sont complètement optionnelles et vous êtes libre de découvrir le jeu par vous-même !
@@ -3460,7 +3488,6 @@ Once a city has gathered enough Culture, it will expand into a neighboring tile.
 Each additional tile will require more culture, but generally your first cities will eventually expand to a wide tile range. = Chaque case d'expansion supplémentaire coûtera plus cher, vos premières cités arriveront à s'étendre plus loin avec le temps.
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = Bien que votre cité s'étende en permanence, ses citoyens ne peuvent exploiter les ressources que dans un rayon de 3 cases autour de votre centre-ville. Tenez-en compte en fondant vos villes !
 
-Happiness = Bonheur
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = Portez attention au bonheur dans votre civilisation. Celui-ci est comptabilisé pour tout votre empire, pas par ville. Plus votre empire croîtra, plus il vous sera difficile de le garder heureux.
 In addition, you can’t even build any city improvements that increase happiness until you’ve done the appropriate research.\nIf your empire’s happiness ever goes below zero the growth rate of your cities will be hurt.\nIf your empire becomes severely unhappy (as indicated by the smiley-face icon at the top of the interface)\n  your armies will have a big penalty slapped on to their overall combat effectiveness. = De plus, les aménagements de ville augmentant le bonheur ne sont disponibles qu'après avoir découvert la technologie adéquate. Si votre bonheur passe sous zéro, le rythme de croissance de vos villes en sera affecté. Si votre empire devient très malheureux (cf. l'icône de smiley au sommet de l'interface), vos armées souffriront de sévères malus au combat.
 This means that it is very difficult to expand quickly in Unciv.\nIt isn’t impossible, but as a new player you probably shouldn’t do it.\nSo what should you do? Chill out, scout, and improve the land that you do have by building Workers.\nOnly build new cities once you have found a spot that you believe is appropriate. = Cela implique qu'il est difficile de s'étendre vite dans Unciv. Même si ce n'est pas impossible pour un joueur expérimenté, en tant que débutant privilégiez plutôt les éclaireurs puis l'aménagement par des ouvriers de vos villes existantes. Ne fondez une ville que quand un emplacement vous semble particulièrement intéressant.
@@ -3470,7 +3497,6 @@ It seems that your citizens are unhappy!\nWhile unhappy, cities  will grow at 1/
 Unhappiness has two main causes: Population and cities\n  Each city causes 3 unhappiness, and each population, 1 = Le malheur peut provenir de deux choses : la population et les villes.\n Chaque ville coûte 3 de bonheur, et chaque habitants en coûte 1.
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = Il y a deux moyens de lutter contre le malheur :\n  en construisant certains batiments\n  ou en ayant des ressources de luxe sur votre territoire.
 
-Golden Age = Âge d'or
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = Vous êtes entré dans un Age d'or !\n Les points d'Age d'or se gagnent grâce au bonheur de vos citoyens :\n 1 point de bonheur excédentaire
 
 Roads and Railroads = Routes et chemin de fer
@@ -3503,7 +3529,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
 
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = Vous avez rencontré une autre civilisation !\n Lorsque vous les rencontrez, les autres civilisations sont pacifiques\n et vous pouvez échanger avec elles, mais elles pourront vous déclarer la guerre si l'envie leur prend.
 
-Apollo Program = Programme Apollo
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = Vous avez complété le programmme Apollo !\n Vous pouvez désormais produire des parties de vaisseau spatial\n (si vous avez les technologies nécessaires) et faire une victoire scientifique !
 
 Injured Units = Unités blessées
@@ -3542,7 +3567,6 @@ Research Agreements = Accords de recherche
 In research agreements, you and another civilization decide to jointly research technology.\nAt the end of the agreement, you will both receive a 'lump sum' of Science, which will go towards one of your unresearched technologies. = Un Accord de recherche joint les forces scientifiques de vos deux nations, vous apportant à son terme une grande quantité de Science, attribuée à l'une de vos technologies non-recherchées.
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = Cette quantité de Science dépendra de votre propre génération de science durant le temps de l'accord, ainsi que de celle de votre partenaire.
 
-City-States = Cité-État
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = Il existe des nations qui ne participent pas à la course à la victoire finale.\nLes Cités-États ne peuvent gagner, conquérir de villes ou effectuer d'accords commerciaux.
 Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = À la place, vos relations diplomatiques seront déterminées par votre Influence, qui augmentera en attaquant les ennemis de la Cité-État, la libérant ou leur envoyant de l'argent.
 Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = Vous recevrez un bonus, dépendant du type de Cité-État, en dépassant les 30 Influence. Passé 60 Influence, la civilisation avec le plus d'Influence deviendra alliée de la Cité-État, profitant de ses ressources de luxe et stratégiques ainsi que d'autres bonus.
@@ -3561,6 +3585,5 @@ Removing Terrain Features =
  # Requires translation!
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = 
 
-Natural Wonders = Merveilles naturelles
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = Les merveilles naturelles, comme le Mont Fuji, le Rocher de Gibraltar ou la Grande Barrière de Corail sont des cases de terrains infranchissables, uniques, des chefs-d’œuvre de Mère Nature avec d'exceptionnelles qualités les rendant bien différent des terrains habituels.\nExploitez-les pour bénéficier de leurs énormes apports en Culture, Science, Or, ou Production - ne laissez pas vos ennemis s'en emparer avant vous !
 

android/assets/jsons/translations/German.properties

@@ -818,7 +818,6 @@ Gold reward for clearing barbarian camps = Gold-Belohnung für das Räumen von B
 
 # Other civilopedia things
 Nations = Nationen
-Promotions = Beförderungen
 Available for [unitTypes] = Verfügbar für [unitTypes]
 Free promotion: = Freie Beförderung:
 Free promotions: = Freie Beförderungen:
@@ -903,7 +902,7 @@ Doing this will reset your current user ID to the clipboard contents - are you s
 ID successfully set! = Spieler-ID erfolgreich gesetzt!
 Invalid ID! = Ungültige Spieler-ID!
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
 Indicates the capital city = Gibt die Hauptstadt an
 Palace = Palast
@@ -1200,7 +1199,7 @@ SS Engine = Raumschiff Triebwerke
 SS Stasis Chamber = Raumschiff Stasis-Kammer
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Siedler
 
@@ -1219,7 +1218,7 @@ Immortal = Unsterbliche(r)
 Deity = Gottheit
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -2496,7 +2495,7 @@ Congratulations, conquerer. This tribe serves you now. = Glückwunsch, Eroberer.
 Barbarians = Barbaren
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
 Aristocracy = Aristokratie
 +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = +15% Produktion beim Errichten von Wundern; +1 Zufriedenheit für jeden 10. Einwohner in einer Stadt
@@ -2538,7 +2537,6 @@ Military units gain 50% more Experience from combat = Militäreinheiten erhalten
 Military Caste = Militarisierte Burg
 Each city with a garrison increases happiness by 1 and culture by 2 = Jede besetzte Stadt erhöht die Zufriedenheit um 1 und die Kultur um 2
 Professional Army = Berufsarmee
-Gold cost of upgrading military units reduced by 33% = Goldkosten für die Verbesserung von Militäreinheiten ist um 33% reduziert
 Honor Complete = Ehre vollständig
 Gain gold for each unit killed = Jede zerstörte Einheit gibt Gold
 Honor = Ehre
@@ -2585,7 +2583,6 @@ Free Thought = Freies Denken
 Sovereignty = Souveränität
 +15% science while empire is happy = +15% Wissenschaft solange das Reich zufrieden ist
 Scientific Revolution = Wissenschaftsrevolution
-Science gained from research agreements +50% = Erhaltene Wissenschaft aus Forschungsabkommen +50%
 Rationalism Complete = Rationalismus vollständig
 +1 gold from all science buildings = +1 Gold von allen Wissenschaftsgebäuden
 Renaissance era = Renaissance
@@ -2624,9 +2621,8 @@ Autocracy = Autokratie
 -33% unit upkeep costs = -33% Unterhaltskosten für Einheiten
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = Altertum
 Agriculture = Landwirtschaft
 Starting tech = Start-Technologie
 'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster = 'Wo die Bodenbearbeitung beginnt, folgen andere Künste. Die Bauern sind somit die Begründer der menschlichen Zivilisation.' - Daniel Webster
@@ -2655,7 +2651,6 @@ Masonry = Mauerarbeiten
 Bronze Working = Bronzebearbeitung
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = 'Hier trat Hector mit einem elf Ellen langen Speer in der Hand ein; die bronzene Spitze schimmerte vor ihm und war mit einem goldenen Ring am Schaft des Speeres befestigt.' - Homer
 
-Classical era = Klassik
 Optics = Optik
 Enables embarkation for land units = Ermöglicht das Einbooten von Landeinheiten
 'He made an instrument to know if the moon shine at full or no.' - Samuel Butler = 'Er baute ein Instrument, um zu wissen, ob der Mond bei Volllicht leuchtet oder nicht.' - Samuel Butler
@@ -2676,7 +2671,6 @@ Roads connect tiles across rivers = Straßen verbinden Felder über Flüsse - Br
 Iron Working = Eisenbearbeitung
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Warten nicht, bis das Bügeleisen heiß ist, sondern mach es durch Schläge heiß.' - William Butler Yeats
 
-Medieval era = Mittelalter
 Theology = Theologie
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = 'Für die Erlösung des Menschen sind drei Dinge notwendig: zu wissen, was er glauben soll; zu wissen, was er sich wünschen soll; und zu wissen, was er tun soll.' - Thomas von Aquin
 Civil Service = Öffentlicher Dienst
@@ -2704,7 +2698,6 @@ Physics = Physik
 Steel = Stahl
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 'John Henry sprach zum Vorarbeiter: "Ein Mensch ist nur ein Mensch; Bevor mich dieser Dampfhammer besiegt; sterb ich mit meinem Hammer in der Hand."' - Anonym: Das Lied von John Henry, dem Gleisarbeiter 
 
-Renaissance era = Renaissance
 Astronomy = Astronomie
 Increases embarked movement +1 = +1 für Bewegungen eingebooteter Einheiten
 Enables embarked units to enter ocean tiles = Erlaubt es, eingebooteten Einheiten Ozeanfelder zu überqueren
@@ -2729,7 +2722,6 @@ Metallurgy = Metallhüttenkunde
 Chemistry = Chemie
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = 'Wohin wir auch schauen, die Arbeit des Chemikers hat das Niveau unserer Zivilisation angehoben und die Produktionskapazität der Nation erhöht.' - Calvin Coolidge
 
-Industrial era = Industrielle Revolution
 Archaeology = Archäologie
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = 'Diejenigen, die sich nicht an die Vergangenheit erinnern können, sind dazu verurteilt, sie zu wiederholen.' - George Santayana
 Scientific Theory = Wissenschaftliche Theorie
@@ -2813,7 +2805,7 @@ Who knows what the future holds? = Wer weiß was die Zukunft für uns bereithäl
 'I think we agree, the past is over.' - George W. Bush = 'Ich denke, wir sind uns einig, dass die Vergangenheit vorbei ist.' - George W. Bush
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = Ozean
 
@@ -2874,7 +2866,7 @@ Cerro de Potosi = Cerro de Potosí
 Barringer Crater = Barringer-Krater
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = Farm
 
@@ -2901,8 +2893,6 @@ Fort = Festung
 
 Road = Straße
 
-Railroad = Schienen
-
 Remove Forest = Wald abholzen
 
 Remove Jungle = Dschungel abholzen
@@ -2945,7 +2935,7 @@ City ruins = Stadtruinen
 Barbarian encampment = Barbarenlager
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = Rinder
 
@@ -3005,7 +2995,7 @@ Whales = Wale
 Pearls = Perlen
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
 Heal Instantly = Sofortige Heilung
 Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion = Heile diese Einheit um 50 LP; Dies verbraucht die Gelegenheit eine Beförderung zu wählen.
@@ -3170,12 +3160,11 @@ Slinger Withdraw = Schleuderer-Rückzug
 May withdraw before melee (133%) = Kann sich vor dem Nahkampf zurückziehen (133%)
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
 Worker = Arbeiter
 Can build improvements on tiles = Kann Verbesserungen auf Feldern bauen
 
-Settler = Siedler
 Founds a new city = Gründet eine neue Stadt
 
 Scout = Kundschafter/Späher
@@ -3209,7 +3198,6 @@ War Chariot = Streitwagen
 War Elephant = Kriegselefant
 
 Spearman = Speerkrieger
-Bonus vs [unitType] = Im Vorteil gegen [unitType]
 
 Hoplite = Hoplit
 
@@ -3278,7 +3266,6 @@ Keshik = Kheshig
 
 Caravel = Karavelle
 May withdraw before melee = Kann sich vor Nahkampf zurückziehen
-+1 Visibility Range = +1 Sichtweite
 
 Turtle Ship = Schildkrötenboot
 
@@ -3290,7 +3277,6 @@ Musketeer = Musketier
 
 Janissary = Janitschar
 Heals [amount] damage if it kills a unit = Heilt [amount] Schaden beim Töten einer Einheit
-Bonus as Attacker [amount]% = Bonus für Angriff [amount]%
 
 Minuteman = Minuteman
 
@@ -3327,7 +3313,6 @@ Cavalry = Kavallerie
 Cossack = Kosak
 
 Artillery = Artillerie
-Ranged attacks may be performed over obstacles = Fernangriffe können über Hindernisse hinweg ausgeführt werden
 
 Ironclad = Panzerschiff
 Double movement in coast = Doppelte Bewegungsgeschwindigkeit an der Küste
@@ -3402,7 +3387,50 @@ Khan = Khan
 Heal adjacent units for an additional 15 HP per turn = Heile angrenzende Einheiten für 15 zusätzliche HP pro Runde
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = Einführung
 Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own! = Willkommen zu Unciv!\n Weil es ein komplexes Spiel ist, gibt es Einführungsaufgaben, welche dich mit dem Spiel vertraut machen.\nDiese sind optional, und du bist eingeladen das Spiel selbst zu erkunden!
@@ -3425,7 +3453,6 @@ Once a city has gathered enough Culture, it will expand into a neighboring tile.
 Each additional tile will require more culture, but generally your first cities will eventually expand to a wide tile range. = Jedes Weitere Feld kostet mehr Kultur,\n aber meistens wird deine 1. Stadt ein großes Gebiet einnehmen.
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = Auch wenn deine Stadt sich immer weiter ausbreitet, können deine Einwohner nur bis zu 3 Felder vom Stadtzentrum entfernt arbeiten.\n Dies sollte beim siedeln beachtet werden.
 
-Happiness = Zufriedenheit
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = Sobald die Städte und ihr Einfluss größer wird, musst du mit der Glücklichkeitsmechanik umgehen, welche nicht mehr alle Städte einzelnd betrachtet.\nStattdessen ist das Level der Glücklichkeit überall in deiner Zivilation gleich.\nWenn die Städte wachsen wird es immer schwieriger alle glücklich zu machen. 
 In addition, you can’t even build any city improvements that increase happiness until you’ve done the appropriate research.\nIf your empire’s happiness ever goes below zero the growth rate of your cities will be hurt.\nIf your empire becomes severely unhappy (as indicated by the smiley-face icon at the top of the interface)\n  your armies will have a big penalty slapped on to their overall combat effectiveness. = Erschwerend kommt hinzu, daß Du erst die nötigen Technologien erforschen mußt, die den Bau von Gebäuden erlauben, welche\n die Zufriedenheit erhöhen. Sollte das Niveau der Zufriedenheit unter Null sinken, gibt es immer\n mehr Nachteile, so sinkt die Wachstumsrate der Bevölkerung und Deine Armeen bekommen ein ordentlichen\n Abzug auf ihre Kampfstärke aufgebrummt. Also achte auf den gelben oder roten Smiley ganz oben auf dem Bildschirm!
 This means that it is very difficult to expand quickly in Unciv.\nIt isn’t impossible, but as a new player you probably shouldn’t do it.\nSo what should you do? Chill out, scout, and improve the land that you do have by building Workers.\nOnly build new cities once you have found a spot that you believe is appropriate. = Das bedeutet, daß es in Unciv ziemlich schwierig ist, schnell zu expandieren.\nEs ist nicht unmöglich, aber als Frischling solltest du dich wahrscheinlich ein wenig zurückhalten.\nBleib entspannt, erkunde die Landschaft und verbessere Dein Gebiet indem du Arbeiter baust.\nBaue die nächste Stadt erst, wenn Du einen wirklich guten Platz gefunden hast.
@@ -3435,7 +3462,6 @@ It seems that your citizens are unhappy!\nWhile unhappy, cities  will grow at 1/
 Unhappiness has two main causes: Population and cities\n  Each city causes 3 unhappiness, and each population, 1 = Unzufriedenhait hat zwei Hauptursachen: Bevölkerung und viele Städte.\nPro Stadt sind 3 Minuspunkte auszugleichen, pro Einwohner einer.
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = Um die Unzufriedenheit zu bekämpfen, gibt es hauptsächlich zwei Wege:\n  Glücklich machende Gebäude oder\n  mit einer Verbesserung zugänglich gemachte Luxus-Ressourcen innerhalb des Territoriums.
 
-Golden Age = Goldenes Zeitalter
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = Ein goldenes Zeitalter hat für dich begonnen!\nPunkte für goldene Zeitalter ist die Summe jede Runde der totalen Zufriedenheit.\ndeiner Zivilisation\nWenn du in einem goldenen Zeitalter bist, steigert sich die Produktion von Kultur und Produktion um 20%,\n und jedes Feld welches mindestens ein Gold produziert, produziert ein weiteres Gold.
 
 Roads and Railroads = Straßen und Bahnstrecken
@@ -3466,7 +3492,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
 
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = Du hast eine andere Zivilisation gefunden!\nAndere Zivilisationen starten friedlich, und du kannst mit ihnen handeln,\n  aber möglicherweise erklären sie dir später den Krieg.
 
-Apollo Program = Apollo Programm
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = Sobald Du das Apollo-Progamm vervollständigt hast, kannst du in deinen Städten\n mit dem Bau der Raumschiffteile beginnen - sofern die nötigen Technologien bereitstehen -\n... um den Wissenschaftssieg anzustreben!
 
 Injured Units = Verletzte Einheiten
@@ -3505,7 +3530,6 @@ Research Agreements = Forschungsabkommen
 In research agreements, you and another civilization decide to jointly research technology.\nAt the end of the agreement, you will both receive a 'lump sum' of Science, which will go towards one of your unresearched technologies. = In Forschungsabkommen vereinbarst Du mit einer anderen Zivilisation, gemeinsam\nTechnologie zu erforschen. Zum Abschluß des Abkommens erhalten beide Seiten eine\nPauschale an Wissenschafts-Punkten für eine der unerforschten Technologien.
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = Die Anzahl an Punkten, die ein Forschungsabkommen bringt, hängt von der Wissenschaft ab, die deine Städte und die deines Partners während der Laufzeit generieren - je mehr destso besser!
 
-City-States = Stadtstaat
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = Nicht alle Nationen nehmen am Wettrennen um den Sieg teil.\nStadt-Staaten können nicht gewinnen, sie gründen oder erobern keine Städte und man kann nicht auf dieselbe Weise mit ihnen Handel treiben wie mit anderen Nationen.
 Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = Stattdessen beruhen diplomatische Beziehungen zu Stadt-Staten auf 'Einfluß' - ein Maß, wie sehr sie Euch 'mögen'.\nEinfluß kann gewonnen werden durch kriegerische Handlungen gegen ihre Feinde, befreien ihrer besetzten Stadt, oder durch Bestechung mit Gold.
 Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = Stadt-Staaten belohnen hohen Einfluß ab 30 Punkten.\nWenn Dein Einfluß 60 Punkte oder mehr beträgt und größer ist als der aller Konkurrenten, dann wirst Du als Allierter eingestuft und erhälst neben höheren Belohnungen auch Zugang zu ihren Luxus- und Strategischen Ressourcen.
@@ -3518,6 +3542,5 @@ Great Improvements also provide any strategic resources that are under them, so
 Removing Terrain Features = Entfernen von Geländemerkmalen
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = Bestimmte Felder haben zusätzliche Geländemerkmale, sozusagen auf ihnen drauf.\n - wie z.B. überflutete Ebenen oder Wälder -\nEinige dieser Geländemerkmale, wie z.B. Dschungel, Sumpf und Wald, können von Arbeitern entfernt werden.\nDas Entfernen von Geländemerkmalen entfernt nicht die Ressource auf dem Feld und ist in der Regel nötig, um die Ressource zu bewirtschaften.
 
-Natural Wonders = Naturwunder
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = Naturwunder wie der Mount Fuji, der Felsen von Gibraltar oder das Große Barriere-Riff sind einzigartige Geländeformen, Meisterwerke der Mutter Natur, die außergewöhnliche Qualitäten besitzen, die sich komplett von gewöhnlichem Gelände unterscheiden.\n\nEinheiten können sie nicht betreten, aber Städte können sie bewirtschaften und besondere Erträge erlangen - was vielleicht Grund genug ist, sie bald unter Kontrolle Deines  Imperiums zu bringen.\n\nAllein ihre Entdeckung erhöht bereits die Zufriedenheit der Bevölkerung.
 

android/assets/jsons/translations/Indonesian.properties

@@ -818,7 +818,6 @@ Gold reward for clearing barbarian camps = Hadiah emas atas penumpasan kemah ora
 
 # Other civilopedia things
 Nations = Bangsa-bangsa
-Promotions = Promosi
 Available for [unitTypes] = Tersedia untuk [unitTypes]
 Free promotion: = Promosi gratis:
 Free promotions: = Promosi gratis: 
@@ -903,7 +902,7 @@ Doing this will reset your current user ID to the clipboard contents - are you s
 ID successfully set! = ID sukses diset!
 Invalid ID! = ID invalid!
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
 Indicates the capital city = Menandakan ibu kota
 Palace = Istana
@@ -1200,7 +1199,7 @@ SS Engine = Mesin PA
 SS Stasis Chamber = Ruang Stasis PA
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Penetap
 
@@ -1219,7 +1218,7 @@ Immortal = Abadi
 Deity = Dewa
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -2496,7 +2495,7 @@ Congratulations, conquerer. This tribe serves you now. = Selamat, penakluk. Suku
 Barbarians = Orang Barbar
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
 Aristocracy = Aristokrasi
 +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = +15% produksi ketika membangun keajaiban dunia, +1 kebahagiaan untuk setiap 10 penduduk di sebuah kota
@@ -2538,7 +2537,6 @@ Military units gain 50% more Experience from combat = Unit militer menerima 50%
 Military Caste = Kasta Militer
 Each city with a garrison increases happiness by 1 and culture by 2 = Setiap kota yang dikawal meningkatkan kebahagiaan sebesar 1 dan budaya sebesar 2
 Professional Army = Prajurit Profesional
-Gold cost of upgrading military units reduced by 33% = Jumlah emas untuk mengupgrade unit militer dikurangi sebanyak 33%.
 Honor Complete = Kehormatan Lengkap
 Gain gold for each unit killed = Mendapatkan emas untuk setiap unit yang berhasil dibunuh.
 Honor = Kehormatan
@@ -2585,7 +2583,6 @@ Free Thought = Kebebasan Berpikir
 Sovereignty = Kedaulatan
 +15% science while empire is happy = +15% ilmu pengetahuan ketika negara sedang bahagia
 Scientific Revolution = Revolusi Saintifik
-Science gained from research agreements +50% = Ilmu Pengetahuan yang didapat dari persetujuan riset +50%.
 Rationalism Complete = Rasionalisme Lengkap
 +1 gold from all science buildings = +1 emas dari semua bangunan ilmu pengetahuan
 Renaissance era = Era Pembaruan
@@ -2624,9 +2621,8 @@ Autocracy = Otokrasi
 -33% unit upkeep costs = -33% biaya pemeliharaan unit
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = Era Kuno
 Agriculture = Pertanian
 Starting tech = Teknologi mula-mula
 'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster = 'Di mana bajakan dimulai, di sana seni mengikuti. Maka, para petani adalah pendiri peradaban manusia.' - Daniel Webster
@@ -2655,7 +2651,6 @@ Masonry = Pertukangan Batu
 Bronze Working = Pertukangan Perunggu
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = 'Di sini Hector masuk, dengan tombak 11 hasta panjangnya di tangannya; ujung perunggunya berkilauan di depannya, dan dikencangkan ke batang tombaknya dengan sebuah cincin emas.' - Homer
 
-Classical era = Era Klasikal
 Optics = Optik
 Enables embarkation for land units = Memampukan unit darat untuk melaut
 'He made an instrument to know if the moon shine at full or no.' - Samuel Butler = 'Ia merancang sebuah benda untuk mengetahui jika bulan bersinar penuh atau tidak.' - Samuel Butler
@@ -2676,7 +2671,6 @@ Roads connect tiles across rivers = Pembangunan jalan menghubungkan daerah yang
 Iron Working = Pertukangan Besi
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Jangan menunggu untuk menempa hingga besinya panas, tetapi buatlah dia panas dengan menempanya.' - William Butler Yeats
 
-Medieval era = Era Pertengahan
 Theology = Keagamaan
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = 'Ada tiga hal yang dibutuhkan untuk keselamatan seseorang: mengetahui apa yang harus ia percayai; mengetahui apa yang harus ia tuju; dan mengetahui apa yang harus ia lakukan.' - St. Thomas Aquinas
 Civil Service = Pelayanan Publik
@@ -2704,7 +2698,6 @@ Physics = Fisika
 Steel = Baja
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 'John Henry berkata kepada kaptennya, / 'Manusia tidak lain dari manusia, / Dan sebelum aku membiarkan bor uapmu mengalahkan aku, / Aku akan mati dengan palu di tanganku.'' - Anonim: Balada John Henry, Pengemudi Baja
 
-Renaissance era = Era Pembaruan
 Astronomy = Astronomi
 Increases embarked movement +1 = +1 pergerakan saat melaut
 Enables embarked units to enter ocean tiles = Memampukan unit yang melaut untuk memasuki daerah samudra
@@ -2729,7 +2722,6 @@ Metallurgy = Metalurgi
 Chemistry = Kimia
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = 'Di mana-mana, hasil pekerjaan kimiawan telah menaikkan derajat peradaban kita dan telah meningkatkan kapasitas produksi bangsa.' - Calvin Coolidge
 
-Industrial era = Era Industri
 Archaeology = Arkeologi
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = 'Mereka yang tidak bisa mengingat masa lalu telah ditakdirkan untuk mengulanginya lagi.' - George Santayana
 Scientific Theory = Teori Ilmiah
@@ -2813,7 +2805,7 @@ Who knows what the future holds? = Siapa yang tahu apa yang ada di masa depan?
 'I think we agree, the past is over.' - George W. Bush = 'Kurasa kita setuju, masa lalu telah berakhir.' - George W. Bush
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = Samudra
 
@@ -2874,7 +2866,7 @@ Cerro de Potosi = Cerro de Potosi
 Barringer Crater = Kawah Barringer
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = Pertanian
 
@@ -2901,8 +2893,6 @@ Fort = Kubu Pertahanan
 
 Road = Jalan
 
-Railroad = Rel Kereta
-
 Remove Forest = Singkirkan Hutan
 
 Remove Jungle = Singkirkan Hutan Belantara
@@ -2945,7 +2935,7 @@ City ruins = Reruntuhan kota
 Barbarian encampment = Pekemahan orang barbar
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = Ternak
 
@@ -3005,7 +2995,7 @@ Whales = Paus
 Pearls = Mutiara
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
 Heal Instantly = Sembuhkan seketika
 Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion = Sembuhkan unit ini sebanyak 50 HP; Tetapi menghabiskan satu kesempatan untuk memilih Promosi
@@ -3170,12 +3160,11 @@ Slinger Withdraw = Penarikan Kembali Pengumban
 May withdraw before melee (133%) = Dapat mundur sebelum serangan jarak dekat (133%)
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
 Worker = Pekerja
 Can build improvements on tiles = Dapat membangun peningkatan pada daerah
 
-Settler = Penetap
 Founds a new city = Dirikan kota baru
 
 Scout = Pengintai
@@ -3209,7 +3198,6 @@ War Chariot = Kereta Perang
 War Elephant = Gajah Perang
 
 Spearman = Prajurit Bertombak
-Bonus vs [unitType] = Bonus vs [unitType]
 
 Hoplite = Hoplite
 
@@ -3278,7 +3266,6 @@ Keshik = Keshik
 
 Caravel = Karavel
 May withdraw before melee = Dapat mundur sebelum diserang jarak dekat
-+1 Visibility Range = +1 Jangkauan Penglihatan
 
 Turtle Ship = Kapal Kura-kura
 
@@ -3290,7 +3277,6 @@ Musketeer = Musketeer
 
 Janissary = Janissary
 Heals [amount] damage if it kills a unit = Sembuh [amount] darah jika membunuh unit
-Bonus as Attacker [amount]% = Bonus [amount]% sebagai penyerang 
 
 Minuteman = Minuteman
 
@@ -3327,7 +3313,6 @@ Cavalry = Kavaleri
 Cossack = Cossack
 
 Artillery = Artileri
-Ranged attacks may be performed over obstacles = Serangan berjarak mungkin dilakukan melalui halangan
 
 Ironclad = Ironclad
 Double movement in coast = Pergerakan 2x lebih cepat di pesisir
@@ -3402,7 +3387,50 @@ Khan = Khan
 Heal adjacent units for an additional 15 HP per turn = Menyembuhkan unit bersebelahan 15 HP tiap giliran
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = Perkenalan
 Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own! = Selamat datang di Unciv!\nKarena game ini cukup rumit, ada beberapa tugas sederhan untuk membuatmu lebih terbiasa dengan game ini.\nTugas ini opsional, dan kalian boleh mengeksplorasi game ini sendiri!
@@ -3425,7 +3453,6 @@ Once a city has gathered enough Culture, it will expand into a neighboring tile.
 Each additional tile will require more culture, but generally your first cities will eventually expand to a wide tile range. = Dengan semakin luasnya kota, dibutuhkan budaya yang lebih banyak juga untuk memperluas daerah, tetapi biasanya kota pertama nantinya akan berkembang lebih luas.
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = Meskipun kota akan berkembang selamanya, pendudukmu hanya bisa bekerja 3 daerah jauhnya dari pusat kota.\nHal ini harus diperhitungkan sebelum mendirikan kota-kota baru.
 
-Happiness = Kebahagiaan
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = Dengan bertumbuhnya luas dan pengaruh kota, kamu harus berurusan dengan mekanisme kebahagiaan yang tidak lagi berlaku dalam satu kota saja.\nAkan tetapi, seluruh peradabanmu berbagi level kepuasan yang sama.\nDengan bertumbuhnya populasi di kota-kotamu, kamu akan menemukan bahwa menjaga kebahagiaan peradabanmu semakin susah.
 In addition, you can’t even build any city improvements that increase happiness until you’ve done the appropriate research.\nIf your empire’s happiness ever goes below zero the growth rate of your cities will be hurt.\nIf your empire becomes severely unhappy (as indicated by the smiley-face icon at the top of the interface)\n  your armies will have a big penalty slapped on to their overall combat effectiveness. = Sebagai tambahan, kamu tidak bisa membangun improvisasi kota yang meningkatkan kebahagiaan sampai kamu selesai meriset teknologi yang diperlukan.\nJika kebahagiaan peradabanmu menyentuh angka di bawah nol, pertumbuhan penduduk kota-kotamu akan terdampak.\nJika peradabanmu menjadi sangat tidak bahagia (ditandai dengan ikon smiley-face di atas antarmuka)\n  pasukanmu akan mendapat penalti besar di efektivitas pertempuran secara keseluruhan.
 This means that it is very difficult to expand quickly in Unciv.\nIt isn’t impossible, but as a new player you probably shouldn’t do it.\nSo what should you do? Chill out, scout, and improve the land that you do have by building Workers.\nOnly build new cities once you have found a spot that you believe is appropriate. = Ini berarti sulit untuk berekspansi secara cepat di Unciv.\nBukan berarti tidak mungkin, tetapi sebagai pemain baru kamu sebaiknya jangan dulu.\nJadi apa yang harus dilakukan? Tenang, jelajahi dunia, dan bangun tanah yang kamu punya dengan membuat Pekerja.\nBangunlah kota baru hanya ketika kamu telah menemukan tempat yang kamu percaya pas untukmu.
@@ -3435,7 +3462,6 @@ It seems that your citizens are unhappy!\nWhile unhappy, cities  will grow at 1/
 Unhappiness has two main causes: Population and cities\n  Each city causes 3 unhappiness, and each population, 1 = Ada dua alasan untuk ketidakbahagiaan: Populasi dan kota\n  Setiap kota menghasilkan 3 ketidakbahagiaan, dan setiap populasi menghasilkan 1
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = Ada 2 cara utama untuk memerangi ketidakbahagiaan:\n  dengan membangun bangunan untuk kebahagiaan untuk populasimu\n  atau dengan menguasai sumber daya tersier di dalam negara.
 
-Golden Age = Masa Kejayaan
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = Kamu telah masuk masa kejayaan!\nPoin masa kejayaan diakumulasi setiap giliran dari total kebahagiaan \n  peradabanmu.\nKetika dalam masa kejayaan, penghasilan budaya dan produksi +20%,\n  dan setiap daerah yang sudah menyediakan sedikitnya satu emas akan memberikan satu emas ekstra.
 
 Roads and Railroads = Jalan dan Rel Kereta
@@ -3466,7 +3492,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
 
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = Kamu telah menjumpai peradaban lain!\nPeradaban lain mula-mula tetap berdamai denganmu dan kamu bisa bertukar barang dengan mereka,\n  tetapi mereka bisa memilih untuk menyatakan perang denganmu di kemudian hari.
 
-Apollo Program = Program Apollo
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = Ketika kamu menyelesaikan Program Apollo, kamu bisa membangun bagian pesawat angkasa di kotamu\n (dengan teknologi yang relevan) untuk memenangkan kemenangan ilmu pengetahuan!
 
 Injured Units = Unit Terluka
@@ -3505,7 +3530,6 @@ Research Agreements = Perjanjian Riset
 In research agreements, you and another civilization decide to jointly research technology.\nAt the end of the agreement, you will both receive a 'lump sum' of Science, which will go towards one of your unresearched technologies. = Dalam persetujuan riset, kamu dan peradaban lain bertekad untuk meriset teknologi bersama-sama.\nDi akhir proses, kalian akan menerima 'pembayaran sekaligus' Ilmu Pengetahuan yang akan menuju satu teknologi yang belum diriset.
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = Jumlah Ilmu Pengetahuan yang diterima di akhir tergantung ilmu pengetahuan yang dihasilkan kota-kotamu dan kota-kota peradaban lain ketika masa persetujuan masih berlaku - semakin banyak, semakin baik!
 
-City-States = Negara-Kota
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = Tidak semua bangsa bersaing denganmu untuk menang.\nNegara kota tidak bisa menang, tidak bisa menaklukkan kota lain dan tidak bisa diperjualbelikan.
 Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = Akan tetapi, relasi diplomatik dengan negara kota ditentukan dengan Pengaruh - sebuah meteran yang menunjukkan sejauh apa negara kota itu menyukai kamu.\nPengaruh dapat ditingkatkan dengan menyerang musuh mereka, memerdekakan kota mereka, dan memberikan mereka sejumlah emas.
 Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = Bonus tertentu diberikan ketika kamu memiliki pengaruh di atas 30.\nKetika kamu memiliki 60 Pengaruh dan kamu punya pengaruh terbesar dengan mereka di atas peradaban lain, kamu dianggap sebagai 'Sekutu' dan mendapat bonus lebih lanjut serta akses ke sumber daya Tersier dan Strategis yang berada di tanah mereka.
@@ -3518,6 +3542,5 @@ Great Improvements also provide any strategic resources that are under them, so
 Removing Terrain Features = Menyingkirkan Fitur-fitur di Suatu Daerah
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = Daerah tertentu memiliki fitur-fitur - seperti Dataran Banjir atau Hutan - di dalamnya. Beberapa daerah yang berlapis, seperti Hutan, Rawa, dan Hutan, dapat disingkirkan oleh para pekerja.\nMenyingkirkan fitur-fitur tersebut tidak menghilangkan sumber daya apapun di daerah itu, dan biasanya hal ini diperlukan untuk mengerjakan sumber daya tersebut.
 
-Natural Wonders = Keajaiban Alam
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = Keajaiban Alam, seperti Gn. Fuji, Batu Gibraltar, dan Karang Penghalang Besar merupakan hal istimewa, sebuah fitur yang tidak bisa dilewati, karya agung Tuhan, yang memiliki kualitas unik yang membuat mereka berbeda dari medan biasa.\nMereka memberi keuntungan dengan menghasilkan sejumlah Budaya, Ilmu Pengetahuan, Emas atau Produksi yang cukup besar jika dikerjakan oleh kota. Itulah mengapa kamu mungkin perlu untuk menguasai mereka dalam peradabanmu secepat mungkin.
 

android/assets/jsons/translations/Italian.properties

@@ -818,7 +818,6 @@ Gold reward for clearing barbarian camps = Oro dagli accampamenti barbari ripuli
 
 # Other civilopedia things
 Nations = Civiltà
-Promotions = Promozioni
 Available for [unitTypes] = Disponibile per [unitTypes]
 Free promotion: = Promozione gratuita:
 Free promotions: = Promozioni gratuite:
@@ -903,7 +902,7 @@ Doing this will reset your current user ID to the clipboard contents - are you s
 ID successfully set! = ID immesso con successo!
 Invalid ID! = ID non valido!
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
 Indicates the capital city = Indica la città capitale
 Palace = Palazzo
@@ -1200,7 +1199,7 @@ SS Engine = Motore dell'astronave
 SS Stasis Chamber = Camera di stasi dell'astronave
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Colono
 
@@ -1219,7 +1218,7 @@ Immortal = Immortale
 Deity = Divinità
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -2496,7 +2495,7 @@ Congratulations, conquerer. This tribe serves you now. = Congratulazioni, conqui
 Barbarians = Barbari
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
 Aristocracy = Aristocrazia
 +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = +15% Produzione quando costruisci una Meraviglia, e +1 Felicità ogni 10 cittadini in una città
@@ -2538,7 +2537,6 @@ Military units gain 50% more Experience from combat = +50% esperienza in battagl
 Military Caste = Casta Militare
 Each city with a garrison increases happiness by 1 and culture by 2 = +1 Felicità e +2 Cultura per ogni città con una guarnigione
 Professional Army = Esercito professionale
-Gold cost of upgrading military units reduced by 33% = -33% costi in Oro per aggiornare un'unità militare
 Honor Complete = Onore Completo
 Gain gold for each unit killed = Ottieni Oro ogni volta che elimini un'unità nemica
 Honor = Onore
@@ -2585,7 +2583,6 @@ Free Thought = Libertà di pensiero
 Sovereignty = Sovranità
 +15% science while empire is happy = +15% Scienza quando l'Impero è felice (ovvero la Felicità è al di sopra dello 0)
 Scientific Revolution = Rivoluzione Scientifica
-Science gained from research agreements +50% = +50% Scienza dagli Accordi di Ricerca
 Rationalism Complete = Razionalismo Completo
 +1 gold from all science buildings = +1 Oro per ogni edificio scientifico costruito
 Renaissance era = Rinascimentale
@@ -2624,9 +2621,8 @@ Autocracy = Autocrazia
 -33% unit upkeep costs = -33% mantenimento delle unità in Oro
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = Antica
 Agriculture = Agricoltura
 Starting tech = Tecnologia iniziale
 'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster = 'Dove arriva la coltivazione, seguono le altre arti. I contadini sono quindi i fondatori della civiltà umana.' - Daniel Webster
@@ -2655,7 +2651,6 @@ Masonry = Muratura
 Bronze Working = Lavorazione del bronzo
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = 'Ed ecco che entrò Ettore, impugnando una lancia lunga undici cubiti; la punta di bronzo brillava davanti a lui ed era fissata all'asta con un anello d'oro.' - Omero
 
-Classical era = Classica
 Optics = Ottica
 Enables embarkation for land units = Permette alle unità terrestri di imbarcarsi e attraversare le caselle acquatiche.
 'He made an instrument to know if the moon shine at full or no.' - Samuel Butler = 'Costruì uno strumento per sapere se la luna brilla in pieno oppure no.' - Samuel Butler
@@ -2676,7 +2671,6 @@ Roads connect tiles across rivers = Le strade diventano ponti sui fiumi
 Iron Working = Lavorazione del ferro
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Non aspettate che il ferro sia caldo prima di batterlo; rendetelo caldo con i vostri colpi.' - William Butler Yeats
 
-Medieval era = Medievale
 Theology = Teologia
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = 'Tre cose sono necessarie per la salvezza dell'uomo: sapere in cosa deve credere; sapere che cosa deve desiderare; sapere cosa deve fare.' - San Tommaso d'Aquino
 Civil Service = Pubblica amministrazione
@@ -2704,7 +2698,6 @@ Physics = Fisica
 Steel = Acciaio
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 'John Henry disse al cuo Capitano, 'Un uomo non è che un uomo, e prima che la tua perforatrice a vapore mi batta, morirò col martello in mano.' - Anonimo: La ballata di John Henry, l'uomo che batte l'acciaio
 
-Renaissance era = Rinascimentale
 Astronomy = Astronomia
 Increases embarked movement +1 = +1 movimento delle unità imbarcate
 Enables embarked units to enter ocean tiles = Permette alle unità di imbarcarsi nelle caselle oceaniche
@@ -2729,7 +2722,6 @@ Metallurgy = Metallurgia
 Chemistry = Chimica
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = 'Dovunque voltiamo gli occhi, il lavoro del chimico ha alzato il livello della nostra civiltà e incrementato la capacità produttiva della nazione.' - Calvin Coolidge
 
-Industrial era = Industriale
 Archaeology = Archeologia
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = 'Chi non ricorda il passato è condannato a riviverlo.' - George Santayana
 Scientific Theory = Teoria scientifica
@@ -2813,7 +2805,7 @@ Who knows what the future holds? = Chi sa cosa riservano i prossimi anni?
 'I think we agree, the past is over.' - George W. Bush = 'Penso che siamo tutti d'accordo che il passato è finito.' - George W.Bush
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = Oceano
 
@@ -2874,7 +2866,7 @@ Cerro de Potosi = Cerro Rico de Potosí
 Barringer Crater = Cratere di Barringer
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = Fattoria
 
@@ -2901,8 +2893,6 @@ Fort = Forte
 
 Road = Strada
 
-Railroad = Ferrovia
-
 Remove Forest = Rimuovi foresta
 
 Remove Jungle = Rimuovi giungla
@@ -2945,7 +2935,7 @@ City ruins = Rovine cittadine
 Barbarian encampment = Accampamento barbaro
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = Bestiame
 
@@ -3005,7 +2995,7 @@ Whales = Balene
 Pearls = Perle
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
 Heal Instantly = Cura istantanea
 Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion = Cura l'unità di 50 PF, rinunciando però all'opportunità di scegliere una promozione.
@@ -3170,12 +3160,11 @@ Slinger Withdraw = Ritirata Fromboliere
 May withdraw before melee (133%) = Può ritirarsi dal combattimento ravvicinato (133%)
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
 Worker = Lavoratore
 Can build improvements on tiles = Può costruire miglioramenti sulle caselle
 
-Settler = Colono
 Founds a new city = Può fondare una nuova città
 
 Scout = Scout
@@ -3209,7 +3198,6 @@ War Chariot = Carro da guerra
 War Elephant = Elefante da guerra
 
 Spearman = Lanciere
-Bonus vs [unitType] = Bonus contro [unitType]
 
 Hoplite = Oplita
 
@@ -3278,7 +3266,6 @@ Keshik = Keshik
 
 Caravel = Caravella
 May withdraw before melee = Può ritirarsi prima di uno scontro ravvicinato
-+1 Visibility Range = +1 raggio di Visione
 
 Turtle Ship = Nave tartaruga
 
@@ -3290,7 +3277,6 @@ Musketeer = Moschettiere
 
 Janissary = Giannizzero
 Heals [amount] damage if it kills a unit = Cura [amount] PF quando uccide un'unità nemica
-Bonus as Attacker [amount]% = [amount]% Bonus in attacco
 
 Minuteman = Minuteman
 
@@ -3327,7 +3313,6 @@ Cavalry = Cavalleria
 Cossack = Cosacco
 
 Artillery = Artiglieria
-Ranged attacks may be performed over obstacles = Permette di sparare a distanza superando gli ostacoli
 
 Ironclad = Ironclad
 Double movement in coast = Doppio movimento sulla costa
@@ -3402,7 +3387,50 @@ Khan = Khan
 Heal adjacent units for an additional 15 HP per turn = Cura le unità vicine di 15 HP al turno
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = Introduzione
 Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own! = Benvenuto/a su Unciv!\nLascia che ti avverta: questo è un gioco complesso, e quindi vi sono dei compiti base che ti aiuteranno a familiarizzare con il gioco e tutte le sue funzioni.\nSono completamente opzionali, e puoi anche esplorare il gioco da solo!
@@ -3425,7 +3453,6 @@ Once a city has gathered enough Culture, it will expand into a neighboring tile.
 Each additional tile will require more culture, but generally your first cities will eventually expand to a wide tile range. = Ogni cella aggiuntiva richiedera più Cultura, ma generalmente le tue prime città espanderanno i loro confini in maniera molto larga.
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = Le tue città possono espandersi per sempre, ma possono solo sfruttare fino a tre caselle a distanza dal loro centro. Ricordatelo sempre quando fondi nuove città.
 
-Happiness = Felicità
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = Col crescere delle Città in grandezza e influenza, crescerà anche il territorio a disposizione.\nDovrai però avere a che fare con una meccanica legata all'impero e non alle Città singole. Il tuo intero impero, infatti, condivide lo stesso livello di soddisfazione.\nAll'aumentare della popolazione troverai sempre più difficile mantenerne la felicità.
 In addition, you can’t even build any city improvements that increase happiness until you’ve done the appropriate research.\nIf your empire’s happiness ever goes below zero the growth rate of your cities will be hurt.\nIf your empire becomes severely unhappy (as indicated by the smiley-face icon at the top of the interface)\n  your armies will have a big penalty slapped on to their overall combat effectiveness. = Inoltre, per costruire degli edifici che incrementano la Felicità, dovrai ricercarne l'apposita tecnologia.\nControlla la tua Felicità (indicata da un sorriso nella barra superiore dell'interfaccia): se scende sotto lo zero, non solo la tua economia ne avrà da soffrire, ma i tuoi eserciti avranno una spiacevole penalità che li renderà meno efficaci in combattimento.
 This means that it is very difficult to expand quickly in Unciv.\nIt isn’t impossible, but as a new player you probably shouldn’t do it.\nSo what should you do? Chill out, scout, and improve the land that you do have by building Workers.\nOnly build new cities once you have found a spot that you believe is appropriate. = Questa è la ragione per cui è molto difficile espandersi rapidamente in Unciv. Non è certo impossibile, ma come neofita non ti è consigliato. Pertanto, basta fare con calma, esplorare, e migliorare i tuoi terreni utilizzando i Lavoratori. Se vuoi fondare nuove Città, fallo solo su punti che credi appropriati.
@@ -3435,7 +3462,6 @@ It seems that your citizens are unhappy!\nWhile unhappy, cities  will grow at 1/
 Unhappiness has two main causes: Population and cities\n  Each city causes 3 unhappiness, and each population, 1 = L'Infelicità è un effetto di due fattori: abitanti e Città.\nOgni città dona 3 punti infelicità, e ogni abitante ne dona 1.
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = Vi sono due modi per combattere l'Infelicità: o costruisci edifici che migliorano la felicità della tua popolazione, o sfrutti delle caselle contenenti risorse di lusso entro i tuoi confini.
 
-Golden Age = Età dell'Oro
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = Sei entrato in un'Età dell'Oro! Che fortuna!\nI punti Età dell'Oro si accumulano ad ogni turno dalla felicità totale della tua civiltà.\nDurante l'Età dell'Oro, generi il 20% in più di Cultura e Produzione, e ogni casella che frutta minimo un punto Oro ne frutta uno aggiuntivo.
 
 Roads and Railroads = Strade e ferrovie
@@ -3466,7 +3492,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
 
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = Hai incontrato un'altra civiltà!\nLe altre civiltà cominciamo come pacifiche, e tu potrai commerciare con loro, ma spesso possono anche dichiararti guerra!
 
-Apollo Program = Programma Apollo
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = Una volta completato il Programma Apollo, potrai iniziare a costruire le parti dell'astronave nelle tue città (con le apposite tecnologie) e cercare di ottenere una vittoria scientifica!
 
 Injured Units = Unità ferite
@@ -3505,7 +3530,6 @@ Research Agreements = Accordi di ricerca
 In research agreements, you and another civilization decide to jointly research technology.\nAt the end of the agreement, you will both receive a 'lump sum' of Science, which will go towards one of your unresearched technologies. = Negli accordi di ricerca, tu e un'altra civiltà ricercherete tecnologie in modo uniforme.\nAlla fine dell'accordo, riceverete entrambi una tantum di Scienza, che si sommerà a una delle tecnologie ancora non scoperte.
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = La quantità di Scienza che ricevi alla fine dipende da quella generata dalle città tue e dell'altra civiltà durante l'accordo. Più è alta, meglio è!
 
-City-States = Città-Stato
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = Non esistono solo grandi nazioni che contendono per la vittoria. Ci sono anche le Città-Stato.\nLe Città-Stato sono delle nazioni minori che si limitano a una sola città. Non possono conseguire alcun tipo di vittoria, non possono conquistare altre città e non possono condurre scambi commerciali.
 Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = I loro rapporti diplomatici sono invece determinati dall'Influenza, una barra che indica i rapporti che la Città-Stato ha con te.\nL'Influenza aumenta attaccando i loro nemici, liberando le loro città, e concedendole delle tantum in Oro, mentre diminuisce se attraversi i loro territori con un'Influenza al di sotto di 30.
 Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = I rapporti possono salire al livello di Amici se il loro livello d'Influenza è minimo 30, e a quel punto la Città-Stato ti darà benefici e ti lascerà attraversare il suo territorio senza conseguenze.\nAl livello almeno 60, se possiedi la maggior influenza rispetto a tutte le altre civiltà, sarai considerato Alleato della Città-Stato, che non solo ti darà bonus ancor maggiori, ma anche l'accesso alle risorse Strategiche e di Lusso nelle loro terre.
@@ -3518,6 +3542,5 @@ Great Improvements also provide any strategic resources that are under them, so
 Removing Terrain Features = Rimozione caratteristiche terrene
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = Alcune caselle sono costituite da caratteristiche terrene come pianure allagate o foreste. Alcune di queste caratteristiche, come le Giungle, le Paludi e le Foreste, possono essere rimosse dai lavoratori.\nRimuoverle non solo non comporterà la cancellazione delle risorse nella casella, ma solitamente è anche richiesto per poter sfruttare tali risorse.
 
-Natural Wonders = Meraviglie Naturali
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = Le Meraviglie Naturali, dei capolavori di Madre Natura come il Monte Fuji, la Rocca di Gibilterra e la Grande Barriera Corallina, sono caratteristiche terrene uniche e impassabili che possiedono qualità eccezionali che le rendono diverse dai soliti terreni.\nBeneficiano di grandi rese di Cultura, Scienza, Oro o Produzione se sfruttate dalle tue Città, e pertanto è una buona idea portarne quante più possibile nei tuoi confini.
 

android/assets/jsons/translations/Japanese.properties

@@ -818,7 +818,6 @@ Gold reward for clearing barbarian camps = 蛮族の陣営を制圧した際の
 
 # Other civilopedia things
 Nations = 文明
-Promotions = 昇進
 Available for [unitTypes] = [unitTypes]で利用可能
 Free promotion: = 無償昇進：
 Free promotions: = 無償昇進：
@@ -903,7 +902,7 @@ Doing this will reset your current user ID to the clipboard contents - are you s
 ID successfully set! = IDが設定されました！
 Invalid ID! = IDが無効です！
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
 Indicates the capital city = 首都を示します
 Palace = 宮殿
@@ -1200,7 +1199,7 @@ SS Engine = 宇宙船エンジン
 SS Stasis Chamber = 宇宙船冷凍睡眠室
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = 開拓者
 
@@ -1219,7 +1218,7 @@ Immortal = 不死者
 Deity = 創造主
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -2496,7 +2495,7 @@ Congratulations, conquerer. This tribe serves you now. = おめでとう、征
 Barbarians = 蛮族
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
 Aristocracy = 貴族制
 +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = 遺産建設時に生産力+15%。都市に市民が10人増えるごとに幸福度+1
@@ -2538,7 +2537,6 @@ Military units gain 50% more Experience from combat = 軍事ユニットが戦
 Military Caste = 戦士階級
 Each city with a garrison increases happiness by 1 and culture by 2 = ユニットが駐留している都市1つに、地方都市の幸福度+1、文化力+2
 Professional Army = 軍隊の常備
-Gold cost of upgrading military units reduced by 33% = 軍事ユニットのアップグレードに必要なゴールド-33%
 Honor Complete = 名誉コンプリート
 Gain gold for each unit killed = 敵ユニットを倒すたびにゴールドが手に入る。
 Honor = 名誉
@@ -2585,7 +2583,6 @@ Free Thought = 自由思想
 Sovereignty = 主権
 +15% science while empire is happy = 文明が幸福なとき科学力+15%
 Scientific Revolution = 科学革命
-Science gained from research agreements +50% = 研究協定による科学力が50%上昇
 Rationalism Complete = 合理主義コンプリート
 +1 gold from all science buildings = すべての科学施設からゴールド+1
 Renaissance era = ルネサンス
@@ -2624,9 +2621,8 @@ Autocracy = 独裁政治
 -33% unit upkeep costs = ユニット維持費-33%
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = 太古
 Agriculture = 農業 
 Starting tech = スタートアップ技術
 'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster = 「耕作地が開かれるところには技が生まれる。土を耕す者こそが人類文明の創始者なのだ」- ダニエル・ウェブスター
@@ -2655,7 +2651,6 @@ Masonry = 石工術
 Bronze Working = 青銅器
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = 「5メートルはあろうかという槍を手にヘクターが入ってきた。長い柄の先端に金のリングで固定された青銅の切っ先が彼の眼前できらりと光る」- ホメロス
 
-Classical era = 古典
 Optics = 光学
 Enables embarkation for land units = 地上ユニットの乗船が可能になる
 'He made an instrument to know if the moon shine at full or no.' - Samuel Butler = 「満月が光を放つか否かを知るための装置を彼は作り出した」- サミュエル・バトラー
@@ -2676,7 +2671,6 @@ Roads connect tiles across rivers = 道が川を越える
 Iron Working = 鉄器
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 「鉄は熱くなるまで打つのを待つのではなく、打って熱くせよ」- ウィリアム・バトラー・イェイツ
 
-Medieval era = 中世
 Theology = 神学
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = 「人間の救済のためには3つのことが必要である。何を信じるべきか、何を欲するべきか、そして何をすべきかを知ることだ。」- 聖トマス・アクィナス
 Civil Service = 官吏
@@ -2704,7 +2698,6 @@ Physics = 物理学
 Steel = 鉄鋼
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 「ジョン・ヘンリーは親方に向かって言った。 『人間には人間のやり方があるんだ。　蒸気ドリルに打ちのめされるくらいなら、ハンマーを握りしめたまま死んだ方がましだよ』」- 作者不詳『ジョン・ヘンリーのバラッド、鋼鉄の男』
 
-Renaissance era = ルネサンス
 Astronomy = 天文学
 Increases embarked movement +1 = 乗船ユニットの移動範囲+1
 Enables embarked units to enter ocean tiles = 乗船ユニットが外洋タイルへ進出できる
@@ -2729,7 +2722,6 @@ Metallurgy = 冶金
 Chemistry = 化学
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = 「我が文明の水準を押し上げ、国家の生産力を向上させているのは、かの化学者の業績に他ならない」- カルビン・クーリッジ
 
-Industrial era = 産業時代
 Archaeology = 考古学
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = 「過去を忘れる者は同じことを繰り返すよう運命づけられている。」- ジョージ・サンタヤーナ
 Scientific Theory = 科学理論
@@ -2813,7 +2805,7 @@ Who knows what the future holds? = 誰が未来を制するか、誰もわから
 'I think we agree, the past is over.' - George W. Bush = 「過去は終わったのだ」- ジョージ・W・ブッシュ
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = 外洋
 
@@ -2874,7 +2866,7 @@ Cerro de Potosi = ポトシ
 Barringer Crater = バリンジャー・クレーター
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = 農場
 
@@ -2901,8 +2893,6 @@ Fort = 要塞
 
 Road = 道路
 
-Railroad = 鉄道
-
 Remove Forest = 森林削除
 
 Remove Jungle = ジャングル削除
@@ -2945,7 +2935,7 @@ City ruins = 廃墟都市
 Barbarian encampment = 野営地
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = 牛
 
@@ -3005,7 +2995,7 @@ Whales = 鯨
 Pearls = 真珠
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
 Heal Instantly = 瞬時回復
 Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion = ユニットの体力を50回復する。ただし、他の昇進を選ぶ機会を見送ることになる。
@@ -3170,12 +3160,11 @@ Slinger Withdraw = 白兵攻撃不可
 May withdraw before melee (133%) = 白兵の攻撃前に撤退(133%)
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
 Worker = 労働者
 Can build improvements on tiles = タイルに資源活用施設を建設できる。
 
-Settler = 開拓者
 Founds a new city = 新しい都市を建設できる。
 
 Scout = 斥候
@@ -3209,7 +3198,6 @@ War Chariot = 重装チャリオット兵
 War Elephant = 軍用象
 
 Spearman = 槍兵
-Bonus vs [unitType] = ボーナスvs[unitType]
 
 Hoplite = 重装歩兵
 
@@ -3278,7 +3266,6 @@ Keshik = ケシク
 
 Caravel = キャラベル船
 May withdraw before melee = 交戦前に撤退することができる。
-+1 Visibility Range = 視野+1
 
 Turtle Ship = 亀甲船
 
@@ -3290,7 +3277,6 @@ Musketeer = 銃士隊
 
 Janissary = イェニチェリ
 Heals [amount] damage if it kills a unit = ユニットを倒すと[amount]回復する
-Bonus as Attacker [amount]% = 攻撃時に戦闘ボーナス[amount]%
 
 Minuteman = ミニットマン
 
@@ -3327,7 +3313,6 @@ Cavalry = 騎兵隊
 Cossack = コサック騎馬兵
 
 Artillery = 大砲
-Ranged attacks may be performed over obstacles = 障害物に対して遠隔攻撃が実行される可能性があります
 
 Ironclad = 装甲艦
 Double movement in coast = 近海タイルでの移動2倍
@@ -3402,7 +3387,50 @@ Khan = カン
 Heal adjacent units for an additional 15 HP per turn = 隣接するユニットが1ターンにつき15ポイント多く回復できる。
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = 紹介
 Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own! = Uncivへようこそ！\nこのゲームは非常に複雑であるため、慣れるのに役立つ情報があります。\n情報の観覧は自由ですので、自分でゲームを手探りするのも可能です。
@@ -3425,7 +3453,6 @@ Once a city has gathered enough Culture, it will expand into a neighboring tile.
 Each additional tile will require more culture, but generally your first cities will eventually expand to a wide tile range. = 文化圏を拡大していくごとに、必要な文化力が増えていきますが、初期段階に建設した都市は最終的に広い文化圏を得ます。
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = 都市は永遠に拡大し続けますが、住民は都市の中心から3タイル離れた場所でしか作業できません。\nこれを考えておかないと資源を取り損ないます。
 
-Happiness = 幸福度
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = 都市の規模と影響力が大きくなるにつれ、個々の都市の幸福度に気を配るのが難しくなります。\nその代わりに、文明全体に幸福度が同じレベルに共有されます。\n文明の幸福度は都市の人口が増えるにつれて、維持が難しくなっていきます。
 In addition, you can’t even build any city improvements that increase happiness until you’ve done the appropriate research.\nIf your empire’s happiness ever goes below zero the growth rate of your cities will be hurt.\nIf your empire becomes severely unhappy (as indicated by the smiley-face icon at the top of the interface)\n  your armies will have a big penalty slapped on to their overall combat effectiveness. = また、研究が終わるまでは、幸福度を上げるための都市改良もできません。\n文明の幸福度がゼロを下回ると、都市の成長率が低下してしまいます。文明の幸福度が不幸になると、軍隊は戦闘効果に大きなペナルティを受けることになります。
 This means that it is very difficult to expand quickly in Unciv.\nIt isn’t impossible, but as a new player you probably shouldn’t do it.\nSo what should you do? Chill out, scout, and improve the land that you do have by building Workers.\nOnly build new cities once you have found a spot that you believe is appropriate. = つまり、Uncivでは急拡大が非常に難しく危険です。\n不可能ではないのですが、初心者が急拡大を行うのはおすすめできません。
@@ -3435,7 +3462,6 @@ It seems that your citizens are unhappy!\nWhile unhappy, cities  will grow at 1/
 Unhappiness has two main causes: Population and cities\n  Each city causes 3 unhappiness, and each population, 1 = 不幸の原因は主に2つあります。\n個々の都市は不幸を3生み出し、人口は不幸を1生み出します。
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = 不幸の原因は主に2つあります。\n個々の都市は不幸を3生み出し、\n人口は不幸を1生み出します。
 
-Golden Age = 黄金時代
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = 黄金時代に突入しました！\n黄金時代のポイントは、あなたの文明の幸福度の合計によって毎ターン蓄積されます。\n黄金時代では、文化力と生産力が+20%増加し、\n少なくとも1つのゴールドを供給しているすべてのタイルは、追加でゴールドを提供します。
 
 Roads and Railroads = 道路と鉄道
@@ -3466,7 +3492,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
 
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = 別の文明に遭遇しました！\n平和的な手段を取り、取引をすることができますが、\n彼らは後で宣戦布告してくるかもしれません...
 
-Apollo Program = アポロ計画
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = アポロ計画を完了すると、都市で宇宙船の部品を生産し、科学勝利を収めることができます。
 
 Injured Units = 負傷ユニット
@@ -3505,7 +3530,6 @@ Research Agreements = 研究協定
 In research agreements, you and another civilization decide to jointly research technology.\nAt the end of the agreement, you will both receive a 'lump sum' of Science, which will go towards one of your unresearched technologies. = 研究協定では、あなたと他の文明が共同で技術を研究することを決めます。\n契約の終了時には、あなたと他の文明は科学の「一括払い」を受け取り、それはあなたの未研究の技術の一つに使われます。
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = 最後に受け取る科学の量は、契約期間中にあなたの都市と他の文明の都市で生成された科学に依存します。 - 多いほど良いです！
 
-City-States = 都市国家
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = 全ての文明が勝利を争っているわけではありません。都市国家は、勝てない、他の都市を征服できない、取引できない国です。
 Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = その代わりに、都市国家との外交関係は、「都市国家がどれだけあなたを気に入っているか」を表す「影響力」によって決定されます。\n影響力は、敵を攻撃したり、都市を解放したり、大金を与えたりすることで増加させることができます。
 Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = あなたが30以上の影響力を持っているときに特定のボーナスが与えられます。あなたが60以上の影響力を持ち、すべての文明の中で最高の影響力を持っているとき、あなたは「同盟国」とみなされ、さらにボーナスを得て、彼らの土地の高級資源と戦略資源を得ることができます。
@@ -3518,6 +3542,5 @@ Great Improvements also provide any strategic resources that are under them, so
 Removing Terrain Features = 地物を消去
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = タイルの中には、氾濫原や森林のような地形の特徴があるものがあります。ジャングル、氾濫原、森林のような地形特徴のいくつかは、労働者によって削除することができます。\n地形特徴を削除してもタイル内の資源は削除されません。通常、資源を確保するために必要となります。
 
-Natural Wonders = 自然遺産
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = 富士山、ジブラルタル岩、グレートバリアリーフなどの自然遺産は、通常の地形とは異なる特別な性質を持っています。\nこれらは、文化、科学、ゴールド、または生産物などの多額の資源をあなたの都市で使用することで恩恵を受けることができます。
 

android/assets/jsons/translations/Korean.properties

@@ -820,7 +820,6 @@ Gold reward for clearing barbarian camps = 야만인 주둔지를 점령했을
 
 # Other civilopedia things
 Nations = 국가
-Promotions = 승급
 Available for [unitTypes] = [unitTypes] 승급 가능
 Free promotion: = 기본 승급:
 Free promotions: = 기본 승급:
@@ -905,7 +904,7 @@ Doing this will reset your current user ID to the clipboard contents - are you s
 ID successfully set! = ID가 성공적으로 변경되었습니다!
 Invalid ID! = 잘못된 ID입니다!
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
 Indicates the capital city = 수도를 나타내는 건물
 Palace = 궁전
@@ -1202,7 +1201,7 @@ SS Engine = SS 엔진
 SS Stasis Chamber = SS 동면 장치
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = 개척자
 
@@ -1221,7 +1220,7 @@ Immortal = 불멸자
 Deity = 신
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -2498,7 +2497,7 @@ Congratulations, conquerer. This tribe serves you now. = 축하합니다, 정복
 Barbarians = 야만인
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
 Aristocracy = 귀족제
 +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = 불가사의 건설 시 생산력 +15%, 도시 시민 10명당 행복 +1
@@ -2540,7 +2539,6 @@ Military units gain 50% more Experience from combat = 군사 유닛이 전투에
 Military Caste = 군사 신분제
 Each city with a garrison increases happiness by 1 and culture by 2 = 유닛이 주둔한 도시의 행복 +1, 문화 +2
 Professional Army = 상비군
-Gold cost of upgrading military units reduced by 33% = 전투 유닛 업그레이드 비용 -33%
 Honor Complete = 명예 정책 완성
 Gain gold for each unit killed = 처치한 적 유닛의 전투력만큼의 금 획득
 Honor = 명예
@@ -2587,7 +2585,6 @@ Free Thought = 자유사상
 Sovereignty = 국민주권
 +15% science while empire is happy = 행복한 상태일 때 과학 +15%
 Scientific Revolution = 과학 혁명
-Science gained from research agreements +50% = 연구 협약으로 얻는 과학 +50%
 Rationalism Complete = 합리주의 정책 완성
 +1 gold from all science buildings = 모든 과학 건물에서 금 +1
 Renaissance era = 르네상스 시대
@@ -2626,9 +2623,8 @@ Autocracy = 독재
 -33% unit upkeep costs = 유닛 유지비 -33%
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = 고대 시대
 Agriculture = 농업
 Starting tech = 기술 개시
 'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster = '경작지가 생기는 곳에 다른 기술과 예술이 따라오기 마련이다. 따라서 농부야말로 바로 인간 문명의 선구자다.' - 데니얼 웹스터
@@ -2657,7 +2653,6 @@ Masonry = 석조 기술
 Bronze Working = 청동 기술
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = '헥토르가 19척의 창을 손에 쥐고 들어오네. 황금 고리로 창대에 고정한 청동의 창끝이 그의 앞에서 빛나네.' - 호메로스
 
-Classical era = 고전 시대
 Optics = 광학
 Enables embarkation for land units = 지상 유닛이 배로 승선할 수 있음
 'He made an instrument to know if the moon shine at full or no.' - Samuel Butler = '그는 달이 열심히 빛나는지 알 수 있는 도구를 만들었다.' - 새뮤얼 버틀러
@@ -2678,7 +2673,6 @@ Roads connect tiles across rivers = 강을 가로질러 도로를 건설할 수
 Iron Working = 철제 기술
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = '철이 달았을 때까지 기다렸다 치지 마라. 쳐서 달구라.' - 윌리엄 버틀러 예이츠
 
-Medieval era = 중세 시대
 Theology = 신학
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = '인간의 구원에는 세 가지가 필요하다. 믿을 것을 아는 것, 추구할 것을 아는 것, 해야 할 것을 아는 것이다.' - 성 토마스 아퀴나스
 Civil Service = 공공 행정
@@ -2706,7 +2700,6 @@ Physics = 물리학
 Steel = 강철
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = '존 헨리가 반장에게 말했네, '사람은 그냥 사람이죠, 반장님의 증기 드릴이 날 짓이기기 전에, 내 손에 망치를 쥐고 죽겠소.' - 강철말뚝박이 조 헨리의 발라드'
 
-Renaissance era = 르네상스 시대
 Astronomy = 천문학
 Increases embarked movement +1 = 해상에서의 이동력 +1
 Enables embarked units to enter ocean tiles = 승선한 유닛이 대양으로 이동할 수 있음
@@ -2731,7 +2724,6 @@ Metallurgy = 금속학
 Chemistry = 화학
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = '어떻게 보더라도, 화학자들의 공로로 우리 문명의 수준이 높아졌고 나라의 생산 역량이 증대된 것은 사실이다.' - 캘빈 쿨리지
 
-Industrial era = 산업 시대
 Archaeology = 고고학
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = '과거를 기억하지 않는 자는 과거를 반복할 수 밖에 없다.' - 조지 산타야나
 Scientific Theory = 과학 이론
@@ -2815,7 +2807,7 @@ Who knows what the future holds? = 미래에 무엇이 일어날지 그 누가
 'I think we agree, the past is over.' - George W. Bush = '적어도 이 사실에만큼은 우리 의견이 일치하리라 믿습니다. 과거는 지나갔다는 사실 말입니다.' - 조지 W. 부시
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = 대양
 
@@ -2876,7 +2868,7 @@ Cerro de Potosi = 세로리코 산
 Barringer Crater = 베린저 크레이터
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = 농장
 
@@ -2903,8 +2895,6 @@ Fort = 요새
 
 Road = 도로
 
-Railroad = 철도
-
 Remove Forest = 숲 제거
 
 Remove Jungle = 정글 제거
@@ -2947,7 +2937,7 @@ City ruins = 도시 폐허
 Barbarian encampment = 야만인 주둔지
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = 소
 
@@ -3007,7 +2997,7 @@ Whales = 고래
 Pearls = 진주
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
 Heal Instantly = 즉시 회복
 Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion = 승급 기회를 잃고 이 유닛의 체력을 50 HP만큼 즉시 회복
@@ -3172,12 +3162,11 @@ Slinger Withdraw = 무릿매 철수
 May withdraw before melee (133%) = 근접전 회피 가능(133%)
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
 Worker = 노동자
 Can build improvements on tiles = 타일 시설 건설 가능
 
-Settler = 개척자
 Founds a new city = 새로운 도시 건설
 
 Scout = 정찰병
@@ -3211,7 +3200,6 @@ War Chariot = 이륜전차
 War Elephant = 전투 코끼리
 
 Spearman = 창병
-Bonus vs [unitType] = [unitType]에 대항하여 전투력 보너스
 
 Hoplite = 호플리테스
 
@@ -3280,7 +3268,6 @@ Keshik = 케시크
 
 Caravel = 캐러벨
 May withdraw before melee = 근접전 회피 가능
-+1 Visibility Range = 시야 범위 +1
 
 Turtle Ship = 거북선
 
@@ -3292,7 +3279,6 @@ Musketeer = 총사대
 
 Janissary = 예니체리
 Heals [amount] damage if it kills a unit = 유닛 처치 시 체력 [amount] 회복
-Bonus as Attacker [amount]% = 공격할 때 전투력 +[amount]%
 
 Minuteman = 민병대
 
@@ -3329,7 +3315,6 @@ Cavalry = 기병대
 Cossack = 코사크
 
 Artillery = 야포
-Ranged attacks may be performed over obstacles = 장애물을 넘어 원거리 공격을 할 수 있음
 
 Ironclad = 철갑함
 Double movement in coast = 연안에서 행동력 두 배
@@ -3404,7 +3389,50 @@ Khan = 칸
 Heal adjacent units for an additional 15 HP per turn = 인접한 유닛들에게 매턴 15HP 추가 회복
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = 게임 소개
 Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own! = UnCiv에 오신 것을 환영합니다!\n이 게임은 다소 복잡하기 때문에 게임에 적응할 수 있도록 몇가지 기초적인 할일들을 준비했습니다.\n이 일을 꼭 하지 않아도 얼마든지 마음대로 게임을 둘러보실 수 있습니다!
@@ -3427,7 +3455,6 @@ Once a city has gathered enough Culture, it will expand into a neighboring tile.
 Each additional tile will require more culture, but generally your first cities will eventually expand to a wide tile range. = 한 타일씩 확장될 때마다 다음 확장에 더 많은 문화를 필요로 합니다.\n그러나 대체로 첫 도시는 최종적으로 넓은 타일 반경을 가지게 됩니다.
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = 도시는 도시 중심에서 최대 5타일 반경까지만 확장될 수 있고,\n시민들은 도시 중심에서 3타일 반경까지만 배치될 수 있습니다.\n새 도시를 세울 때 이 점을 염두에 두어야 합니다.
 
-Happiness = 행복도
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = 도시의 크기와 영향력이 증가하면 문명 전체의 '행복도'를 신경써야 합니다.\n'행복도'는 과학이나 금과 같이 문명 전체에서 공유되는 값입니다.\n도시의 인구 수가 증가할수록 국가를 행복한 상태로 유지하는 것이 어려워집니다.
 In addition, you can’t even build any city improvements that increase happiness until you’ve done the appropriate research.\nIf your empire’s happiness ever goes below zero the growth rate of your cities will be hurt.\nIf your empire becomes severely unhappy (as indicated by the smiley-face icon at the top of the interface)\n  your armies will have a big penalty slapped on to their overall combat effectiveness. = 행복도를 올려주는 건물은 해당하는 기술을 연구해야만 지을 수 있습니다.\n행복도가 마이너스로 떨어지면 '불행' 상태가 되어 모든 도시의 성장률이 크게 감소합니다.\n상단의 웃는 아이콘이 행복도를 나타냅니다.\n문명의 불행한 정도가 심해지면 군사 유닛들의 전투력도 크게 감소합니다.
 This means that it is very difficult to expand quickly in Unciv.\nIt isn’t impossible, but as a new player you probably shouldn’t do it.\nSo what should you do? Chill out, scout, and improve the land that you do have by building Workers.\nOnly build new cities once you have found a spot that you believe is appropriate. = 이렇게 행복도는 Unciv에서 도시를 마구 확장하는 것을 제한합니다.\n빠른 확장이 불가능하진 않지만, 초보자라면 무리한 확장은 피해야 합니다.\n그럼 뭘 해야 할까요? 주변을 정찰하고, 노동자를 지어 이미 가진 땅에 타일 시설을 건설하세요.\n적절한 장소를 찾았을 때에만 새로운 도시를 세우세요.
@@ -3437,7 +3464,6 @@ It seems that your citizens are unhappy!\nWhile unhappy, cities  will grow at 1/
 Unhappiness has two main causes: Population and cities\n  Each city causes 3 unhappiness, and each population, 1 = 불행의 원인에는 크게 '인구'와 '도시' 두 가지가 있습니다.\n도시 하나당 불행 -3, 시민 하나당 불행 -1이 생성됩니다.
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = 불행 상태에서 벗어나려면 어떻게 해야 할까요?\n우선 행복도를 올려주는 건물을 지을 수도 있고,\n노동자를 통해 국경 안에 있는 사치 자원을 개발할 수도 있습니다.
 
-Golden Age = 황금기
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = 문명이 황금기에 진입했습니다!\n매 턴마다의 행복도가 문명의 '황금기 점수'에 축적됩니다.\n황금기 점수가 일정 수치가 되면 '황금기'가 시작됩니다.\n황금기 동안에는 문화와 생산력이 20% 증가하고\n금을 하나 이상 생산하던 모든 타일에서 금 1을 추가로 생산합니다.
 
 Roads and Railroads = 도로와 철도
@@ -3468,7 +3494,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
 
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = 당신은 방금 다른 문명과 조우했습니다!\n타 문명과는 평화롭게 시작해 나중에 거래를 할 수도 있지만\n시간이 지나면서 전쟁을 선포하게 될 수도 있습니다.
 
-Apollo Program = 아폴로 프로그램
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = '아폴로 프로그램'을 완성하면 도시에서 우주선 부품을 건설할 수 있습니다.\n해당하는 연구를 마치고 모든 부품을 건설하면 과학 승리를 할 수 있습니다!
 
 Injured Units = 부상당한 유닛
@@ -3507,7 +3532,6 @@ Research Agreements = 연구 협약
 In research agreements, you and another civilization decide to jointly research technology.\nAt the end of the agreement, you will both receive a 'lump sum' of Science, which will go towards one of your unresearched technologies. = '연구 협약'은 당신의 문명과 다른 문명이 합동해서 기술 연구를 하는 것입니다.\n연구 협약이 끝나면 양측이 일시불 과학력을 얻으며 이는 미완료된 연구에 투입됩니다.
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = 연구 협약으로 받는 과학력은 협약 기간동안\n당신의 문명과 상대 문명이 생산한 과학력에 의해 결정됩니다.
 
-City-States = 도시 국가
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = 모든 국가가 승리를 놓고 당신과 경쟁하는 것은 아닙니다.\n'도시 국가'는 자기 혼자서는 문명과 거래할 수 없고,\n다른 도시를 점령하지 않고, 승리할 수도 없는 국가입니다.
 Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = 도시 국가와의 관계는 '영향력', 즉 '해당 도시국가가 당신을 얼마나 좋아하는지' 로 결정됩니다.\n영향력을 높이는 방법은 해당 도국의 적을 공격하거나, 도시를 해방시키거나, 일시불 금을 주는 방법이 있습니다.
 Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = 영향력이 30 이상이면 '우호적인 관계'가 되어 도국의 성향에 따른 보너스를 받을 수 있습니다.\n영향력이 60 이상이면서 해당 도국에 끼치는 영향력이 가장 높으면 '동맹 관계'가 되어\n성향별 보너스가 상승하거나 사치/전략 자원을 사용할 수 있습니다.
@@ -3520,6 +3544,5 @@ Great Improvements also provide any strategic resources that are under them, so
 Removing Terrain Features = 추가 지형
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = 어떤 타일은 그 위에 '추가 지형'를 가지고 있습니다.\n숲, 정글, 습지 등은 노동자를 사용하여 제거할 수 있습니다.\n추가 지형을 제거한다고 해서 해당 타일의 자원이 사라지지는 않습니다.\n오히려 자원을 개발하려면 추가 지형을 제거해야하는 경우가 더 많습니다.
 
-Natural Wonders = 자연 경관
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = 후지 산, 지브롤터 암벽, 대보초 등의 '자연 경관'은 어느 지형과도 다른 독특한 특성을 지닙니다.\n자연 경관은 맵에 하나씩밖에 없고, 유닛이 지나갈 수 없으며\n자연 경관에 인구를 할당하면 많은 양의 문화, 과학, 금 등을 얻을 수 있습니다.\n따라서 자연 경관을 최대한 빨리 영토에 편입하는 것이 중요하다고 할 수 있습니다.
 

android/assets/jsons/translations/Lithuanian.properties

@@ -853,7 +853,6 @@ Gold reward for clearing barbarian camps =
 
 # Other civilopedia things
 Nations = Tautos
-Promotions = Akcijos
 Available for [unitTypes] = Galima [unitTypes]
 Free promotion: = Nemokama reklama:
 Free promotions: = Nemokamos akcijos:
@@ -939,7 +938,7 @@ Doing this will reset your current user ID to the clipboard contents - are you s
 ID successfully set! = ID sėkmingai nustatytas!
 Invalid ID! = Neteisingas ID!
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
  # Requires translation!
 Indicates the capital city = 
@@ -1432,7 +1431,7 @@ SS Engine =
 SS Stasis Chamber = 
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
  # Requires translation!
 Settler = 
@@ -1459,7 +1458,7 @@ Immortal =
 Deity = 
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -3954,7 +3953,7 @@ Congratulations, conquerer. This tribe serves you now. =
 Barbarians = 
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
  # Requires translation!
 Aristocracy = 
@@ -4035,8 +4034,6 @@ Each city with a garrison increases happiness by 1 and culture by 2 =
  # Requires translation!
 Professional Army = 
  # Requires translation!
-Gold cost of upgrading military units reduced by 33% = 
- # Requires translation!
 Honor Complete = 
  # Requires translation!
 Gain gold for each unit killed = 
@@ -4126,8 +4123,6 @@ Sovereignty =
  # Requires translation!
 Scientific Revolution = 
  # Requires translation!
-Science gained from research agreements +50% = 
- # Requires translation!
 Rationalism Complete = 
  # Requires translation!
 +1 gold from all science buildings = 
@@ -4199,10 +4194,8 @@ Autocracy =
 -33% unit upkeep costs = 
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
- # Requires translation!
-Ancient era = 
  # Requires translation!
 Agriculture = 
  # Requires translation!
@@ -4256,8 +4249,6 @@ Bronze Working =
  # Requires translation!
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = 
 
- # Requires translation!
-Classical era = 
  # Requires translation!
 Optics = 
  # Requires translation!
@@ -4296,8 +4287,6 @@ Iron Working =
  # Requires translation!
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 
 
- # Requires translation!
-Medieval era = 
  # Requires translation!
 Theology = 
  # Requires translation!
@@ -4350,8 +4339,6 @@ Steel =
  # Requires translation!
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 
 
- # Requires translation!
-Renaissance era = 
  # Requires translation!
 Astronomy = 
  # Requires translation!
@@ -4398,8 +4385,6 @@ Chemistry =
  # Requires translation!
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = 
 
- # Requires translation!
-Industrial era = 
  # Requires translation!
 Archaeology = 
  # Requires translation!
@@ -4556,7 +4541,7 @@ Who knows what the future holds? =
 'I think we agree, the past is over.' - George W. Bush = 
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
  # Requires translation!
 Ocean = 
@@ -4647,7 +4632,7 @@ Cerro de Potosi =
 Barringer Crater = 
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
  # Requires translation!
 Farm = 
@@ -4687,9 +4672,6 @@ Fort =
  # Requires translation!
 Road = 
 
- # Requires translation!
-Railroad = 
-
  # Requires translation!
 Remove Forest = 
 
@@ -4756,7 +4738,7 @@ City ruins =
 Barbarian encampment = 
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
  # Requires translation!
 Cattle = 
@@ -4845,7 +4827,7 @@ Whales =
 Pearls = 
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
  # Requires translation!
 Heal Instantly = 
@@ -5102,15 +5084,13 @@ Slinger Withdraw =
 May withdraw before melee (133%) = 
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
  # Requires translation!
 Worker = 
  # Requires translation!
 Can build improvements on tiles = 
 
- # Requires translation!
-Settler = 
  # Requires translation!
 Founds a new city = 
 
@@ -5164,8 +5144,6 @@ War Elephant =
 
  # Requires translation!
 Spearman = 
- # Requires translation!
-Bonus vs [unitType] = 
 
  # Requires translation!
 Hoplite = 
@@ -5275,8 +5253,6 @@ Keshik =
 Caravel = 
  # Requires translation!
 May withdraw before melee = 
- # Requires translation!
-+1 Visibility Range = 
 
  # Requires translation!
 Turtle Ship = 
@@ -5294,8 +5270,6 @@ Musketeer =
 Janissary = 
  # Requires translation!
 Heals [amount] damage if it kills a unit = 
- # Requires translation!
-Bonus as Attacker [amount]% = 
 
  # Requires translation!
 Minuteman = 
@@ -5353,8 +5327,6 @@ Cossack =
 
  # Requires translation!
 Artillery = 
- # Requires translation!
-Ranged attacks may be performed over obstacles = 
 
  # Requires translation!
 Ironclad = 
@@ -5474,7 +5446,50 @@ Khan =
 Heal adjacent units for an additional 15 HP per turn = 
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = Įvadas
  # Requires translation!
@@ -5509,7 +5524,6 @@ Each additional tile will require more culture, but generally your first cities
  # Requires translation!
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = 
 
-Happiness = Laimė
  # Requires translation!
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = 
  # Requires translation!
@@ -5525,7 +5539,6 @@ Unhappiness has two main causes: Population and cities\n  Each city causes 3 unh
  # Requires translation!
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = 
 
-Golden Age = Auksinis amžius
  # Requires translation!
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = 
 
@@ -5570,8 +5583,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
  # Requires translation!
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = 
 
- # Requires translation!
-Apollo Program = 
  # Requires translation!
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = 
 
@@ -5627,7 +5638,6 @@ In research agreements, you and another civilization decide to jointly research
  # Requires translation!
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = 
 
-City-States = Miestas-valstybės
  # Requires translation!
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = 
  # Requires translation!
@@ -5649,7 +5659,6 @@ Removing Terrain Features =
  # Requires translation!
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = 
 
-Natural Wonders = Gamtos stebūklai
  # Requires translation!
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = 
 

android/assets/jsons/translations/Malay.properties

@@ -1485,8 +1485,6 @@ Gold reward for clearing barbarian camps =
  # Requires translation!
 Nations = 
  # Requires translation!
-Promotions = 
- # Requires translation!
 Available for [unitTypes] = 
  # Requires translation!
 Free promotion: = 
@@ -1629,7 +1627,7 @@ ID successfully set! =
  # Requires translation!
 Invalid ID! = 
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
  # Requires translation!
 Indicates the capital city = 
@@ -2077,7 +2075,7 @@ SS Engine =
 SS Stasis Chamber = 
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
  # Requires translation!
 Settler = 
@@ -2104,7 +2102,7 @@ Immortal =
 Deity = 
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -4587,7 +4585,7 @@ Congratulations, conquerer. This tribe serves you now. =
 Barbarians = 
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
  # Requires translation!
 Aristocracy = 
@@ -4667,8 +4665,6 @@ Each city with a garrison increases happiness by 1 and culture by 2 =
  # Requires translation!
 Professional Army = 
  # Requires translation!
-Gold cost of upgrading military units reduced by 33% = 
- # Requires translation!
 Honor Complete = 
  # Requires translation!
 Gain gold for each unit killed = 
@@ -4756,8 +4752,6 @@ Sovereignty =
  # Requires translation!
 Scientific Revolution = 
  # Requires translation!
-Science gained from research agreements +50% = 
- # Requires translation!
 Rationalism Complete = 
  # Requires translation!
 +1 gold from all science buildings = 
@@ -4827,9 +4821,8 @@ Autocracy =
 -33% unit upkeep costs = 
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = Era Purba
 Agriculture = Pertanian
  # Requires translation!
 Starting tech = 
@@ -4871,7 +4864,6 @@ Bronze Working = Pekerja Gangsa
  # Requires translation!
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = 
 
-Classical era = Era Klasik
 Optics = Optik
  # Requires translation!
 Enables embarkation for land units = 
@@ -4902,7 +4894,6 @@ Iron Working = Pekerja Besi
  # Requires translation!
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 
 
-Medieval era = Era Pertengahan
 Theology = Keagamaan
  # Requires translation!
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = 
@@ -4945,7 +4936,6 @@ Steel = Keluli
  # Requires translation!
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 
 
-Renaissance era = Era Pembaharuan
 Astronomy = Astronomi
  # Requires translation!
 Increases embarked movement +1 = 
@@ -4982,7 +4972,6 @@ Chemistry = Kimia
  # Requires translation!
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = 
 
-Industrial era = Era Industri
 Archaeology = Arkeologi
  # Requires translation!
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = 
@@ -5103,7 +5092,7 @@ Who knows what the future holds? =
 'I think we agree, the past is over.' - George W. Bush = 
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
  # Requires translation!
 Ocean = 
@@ -5194,7 +5183,7 @@ Cerro de Potosi =
 Barringer Crater = 
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
  # Requires translation!
 Farm = 
@@ -5234,9 +5223,6 @@ Fort =
  # Requires translation!
 Road = 
 
- # Requires translation!
-Railroad = 
-
  # Requires translation!
 Remove Forest = 
 
@@ -5303,7 +5289,7 @@ City ruins =
 Barbarian encampment = 
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
  # Requires translation!
 Cattle = 
@@ -5392,7 +5378,7 @@ Whales =
 Pearls = 
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
  # Requires translation!
 Heal Instantly = 
@@ -5649,15 +5635,13 @@ Slinger Withdraw =
 May withdraw before melee (133%) = 
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
  # Requires translation!
 Worker = 
  # Requires translation!
 Can build improvements on tiles = 
 
- # Requires translation!
-Settler = 
  # Requires translation!
 Founds a new city = 
 
@@ -5711,8 +5695,6 @@ War Elephant =
 
  # Requires translation!
 Spearman = 
- # Requires translation!
-Bonus vs [unitType] = 
 
  # Requires translation!
 Hoplite = 
@@ -5822,8 +5804,6 @@ Keshik =
 Caravel = 
  # Requires translation!
 May withdraw before melee = 
- # Requires translation!
-+1 Visibility Range = 
 
  # Requires translation!
 Turtle Ship = 
@@ -5841,8 +5821,6 @@ Musketeer =
 Janissary = 
  # Requires translation!
 Heals [amount] damage if it kills a unit = 
- # Requires translation!
-Bonus as Attacker [amount]% = 
 
  # Requires translation!
 Minuteman = 
@@ -5900,8 +5878,6 @@ Cossack =
 
  # Requires translation!
 Artillery = 
- # Requires translation!
-Ranged attacks may be performed over obstacles = 
 
  # Requires translation!
 Ironclad = 
@@ -6021,7 +5997,50 @@ Khan =
 Heal adjacent units for an additional 15 HP per turn = 
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
  # Requires translation!
 Introduction = 
@@ -6060,8 +6079,6 @@ Each additional tile will require more culture, but generally your first cities
  # Requires translation!
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = 
 
- # Requires translation!
-Happiness = 
  # Requires translation!
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = 
  # Requires translation!
@@ -6078,8 +6095,6 @@ Unhappiness has two main causes: Population and cities\n  Each city causes 3 unh
  # Requires translation!
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = 
 
- # Requires translation!
-Golden Age = 
  # Requires translation!
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = 
 
@@ -6130,7 +6145,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
  # Requires translation!
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = 
 
-Apollo Program = Program Apollo
  # Requires translation!
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = 
 
@@ -6196,8 +6210,6 @@ In research agreements, you and another civilization decide to jointly research
  # Requires translation!
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = 
 
- # Requires translation!
-City-States = 
  # Requires translation!
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = 
  # Requires translation!
@@ -6219,8 +6231,6 @@ Removing Terrain Features =
  # Requires translation!
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = 
 
- # Requires translation!
-Natural Wonders = 
  # Requires translation!
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = 
 

android/assets/jsons/translations/Polish.properties

@@ -844,7 +844,6 @@ Gold reward for clearing barbarian camps =
 
 # Other civilopedia things
 Nations = Kraje
-Promotions = Awanse
 Available for [unitTypes] = Dostępne dla jednostki [unitTypes]
 Free promotion: = Darmowy awans:
 Free promotions: = Darmowe awanse:
@@ -930,7 +929,7 @@ Doing this will reset your current user ID to the clipboard contents - are you s
 ID successfully set! = ID ustawione pomyślnie!
 Invalid ID! = Nieprawidłowe ID!
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
 Indicates the capital city = Wskazuje stolicę
 Palace = Pałac
@@ -1229,7 +1228,7 @@ SS Engine = Silnik SK
 SS Stasis Chamber = Komora statyczna SK
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Osadnik
 
@@ -1248,7 +1247,7 @@ Immortal = Nieśmiertelny
 Deity = Bóg
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -2575,7 +2574,7 @@ Congratulations, conquerer. This tribe serves you now. = Gratulacje, zdobywco. T
 Barbarians = Barbarzyńcy
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
 Aristocracy = Arystokracja
 +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = +15% produkcji w trakcie budowania cudów,, +1 do zadowolenia za każde 10 mieszkańców w mieście
@@ -2617,7 +2616,6 @@ Military units gain 50% more Experience from combat = Jednostki wojskowe zyskuj
 Military Caste = Kasta Wojskowa
 Each city with a garrison increases happiness by 1 and culture by 2 = Każde miasto z garnizonem zwiększa zadowolenie o 1, a kulturę o 2
 Professional Army = Profesjonalna armia
-Gold cost of upgrading military units reduced by 33% = Koszt ulepszenia jednostki bojowej zmniejszony o 33%
 Honor Complete = Pełen Honor
 Gain gold for each unit killed = Zyskaj złoto za każdą pokonaną jednostkę
 Honor = Honor
@@ -2664,7 +2662,6 @@ Free Thought = Wolnomyślicielstwo
 Sovereignty = Niezależność
 +15% science while empire is happy = +15% nauki gdy imperium jest zadowolone
 Scientific Revolution = Naukowa rewolucja
-Science gained from research agreements +50% = +50% nauki za umowy naukowe
 Rationalism Complete = Pełny Racjonalizm
 +1 gold from all science buildings = +1 do złota za wszystkie budynki naukowe
 Renaissance era = Renesans
@@ -2703,9 +2700,8 @@ Autocracy = Autokracja
 -33% unit upkeep costs = kosz utrzymania jednostki maleje o 33%
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = Starożytność
 Agriculture = Rolnictwo
 Starting tech = Początkowa technologia
 'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster = 'Gdzie pojawia się uprawa roli, inne sztuki podążają za nią. Dlatego to rolnicy są założycielami ludzkiej cywilizacji.' – Daniel Webster
@@ -2734,7 +2730,6 @@ Masonry = Murarstwo
 Bronze Working = Obróbka brązu
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = 'Hektor miał Trojan radę nad Skamandru rzeką; Zsiedli z wozów, słuchali słów z ust Pryjamida. Jedenastołokciowa w ręku jego dzida, Błyszczy się ostrze złotym objęte pierścieniem.' – Homer
 
-Classical era = Epoka klasyczna
 Optics = Optyka
 Enables embarkation for land units = Umożliwia jednostkom naziemnym wejść na pokład
 'He made an instrument to know if the moon shine at full or no.' - Samuel Butler = 'Stworzył instrument, by wiedzieć, czy księżyc jest w pełni, czy nie.' – Samuel Butler
@@ -2756,7 +2751,6 @@ Roads connect tiles across rivers =
 Iron Working = Obróbka żelaza
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Nie czekaj z kuciem, aż żelazo będzie gorące; uderzaj, by je rozgrzać.' – William Butler Yeats
 
-Medieval era = Średniowiecze
 Theology = Teologia
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = 'Do zbawienia człowieka niezbędne są trzy rzeczy: wiedza, w co wierzyć; wiedza, czego pożądać; i wiedza, co czynić.' – Święty Tomasz z Akwinu
 Civil Service = Służba cywilna
@@ -2784,7 +2778,6 @@ Physics = Fizyka
 Steel = Stal
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 'John Henry powiedział do kapitana: »Człowiek jest tylko człowiekiem, i zanim pozwolę, by pokonał mnie twój świder parowy, umrę z młotkiem w ręku«.' – Anonim, Ballada o Johnie Henrym, Człowieku ze Stali
 
-Renaissance era = Renesans
 Astronomy = Astronomia
 Increases embarked movement +1 = Zwiększa mobilność wchodzenia na pokład o 1
 Enables embarked units to enter ocean tiles = Umożliwia jednostkom z dostępem do wejścia na pokład wpłynąć na pola oceanu
@@ -2809,7 +2802,6 @@ Metallurgy = Metalurgia
 Chemistry = Chemia
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = 'Gdziekolwiek spojrzeć, praca chemika podniosła nasz poziom cywilizacyjny i zwiększyła możliwości produkcyjne narodu.' – Calvin Coolidge
 
-Industrial era = Epoka przemysłowa
 Archaeology = Archeologia
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = 'Ci, którzy nie pamiętają o przeszłości, są skazani na jej powtarzanie.' – George Santayana
 Scientific Theory = Teoria naukowa
@@ -2893,7 +2885,7 @@ Who knows what the future holds? = Kto wie, co kryje przyszłość?
 'I think we agree, the past is over.' - George W. Bush = 'Myślę, że się zgadzamy, przeszłość się skończyła.' - George W. Bush
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = Ocean
 
@@ -2954,7 +2946,7 @@ Cerro de Potosi = Cerro de Potosi
 Barringer Crater = Krater Barringera
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = Farma
 
@@ -2981,8 +2973,6 @@ Fort = Fort
 
 Road = Droga
 
-Railroad = Kolej
-
 Remove Forest = Usuń las
 
 Remove Jungle = Usuń dżunglę
@@ -3026,7 +3016,7 @@ City ruins = Ruiny miasta
 Barbarian encampment = Obóz barbarzyńców
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = Bydło
 
@@ -3086,7 +3076,7 @@ Whales = Wieloryby
 Pearls = Perły
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
 Heal Instantly = Natychmiastowe leczenie
 Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion = Ulecz jednostkę o 50 punktów zdrowia; Ta akcja spowoduje utracenie możliwości do wybrania awansu
@@ -3251,12 +3241,11 @@ Slinger Withdraw = Procarz wycofuje się
 May withdraw before melee (133%) = Może wycować się przed walczącymi w zwarciu (133%)
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
 Worker = Robotnik
 Can build improvements on tiles = Może budować ulepszenia na polach
 
-Settler = Osadnik
 Founds a new city = Zakłada nowe miasto
 
 Scout = Zwiadowca
@@ -3290,7 +3279,6 @@ War Chariot = Rydwan wojenny
 War Elephant = Słoń bojowy
 
 Spearman = Włócznik
-Bonus vs [unitType] = Bonus przeciwko [unitType]
 
 Hoplite = Hoplita
 
@@ -3359,7 +3347,6 @@ Keshik = Keshikowie
 
 Caravel = Karawela
 May withdraw before melee = Może wycować się przed walczącymi w zwarciu
-+1 Visibility Range = +1 do pola widzenia
 
 Turtle Ship = Geobukseon
 
@@ -3371,7 +3358,6 @@ Musketeer = Muszkieter
 
 Janissary = Janczar
 Heals [amount] damage if it kills a unit = Leczy [amount] obrażeń po zabiciu jednostki
-Bonus as Attacker [amount]% = Bonus jako atakujący [amount]%
 
 Minuteman = Milicja
 
@@ -3408,7 +3394,6 @@ Cavalry = Kawaleria
 Cossack = Kozak
 
 Artillery = Artyleria
-Ranged attacks may be performed over obstacles = Atak dystansowy może zostać przeprowadzony nad przeszkodą
 
 Ironclad = Pancernik
 Double movement in coast = Podwojony ruch na wybrzeżu
@@ -3483,7 +3468,50 @@ Khan = Chan
 Heal adjacent units for an additional 15 HP per turn = Leczy sąsiadujące jednostki 15 punktów zdrowia na turę
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = Wprowadzenie
 Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own! = Witaj w grze Unciv!\nPonieważ jest to złożona gra, podane będą zadania krok po kroku, które pomogą Ci zapoznać się z grą.\nSą one całkowicie opcjonalne, więc możesz odkrywać grę na własną ręke! (Wyłączane w Ustawieniach)
@@ -3509,7 +3537,6 @@ Each additional tile will require more culture, but generally your first cities
  # Requires translation!
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = 
 
-Happiness = Zadowolenie
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = Gdy Miasto rozrasta się i staje się bardziej wpływowe powinieneś zacząć zwracać uwagę na mechanikę Zadowolenia mieszkańców, która to\n wpływa na całe imperium, a nie na pojedyńcze Miasta.\nWraz z ekspansją miast utrzymanie Zadowolenia miast stanie się coraz trudniejsze.
 In addition, you can’t even build any city improvements that increase happiness until you’ve done the appropriate research.\nIf your empire’s happiness ever goes below zero the growth rate of your cities will be hurt.\nIf your empire becomes severely unhappy (as indicated by the smiley-face icon at the top of the interface)\n  your armies will have a big penalty slapped on to their overall combat effectiveness. = Ponad to nie możesz budować ulepszeń dla Miasta, które podnosi Zadowolenie, do czasu zakończenia odpowiednich badań.\nJeżeli Zadowolenie Twojego imperium kiedykolwiek spadnie poniżej zera tempo rozwoju miasta drastycznie zmaleje.\nJeżeli imperium będzie bardzo niezadowolone (znacznik znajduje się na górze interfejsu - to ta buźka)\n Twoje armie doświadczą spadku efektywności w walce.
 This means that it is very difficult to expand quickly in Unciv.\nIt isn’t impossible, but as a new player you probably shouldn’t do it.\nSo what should you do? Chill out, scout, and improve the land that you do have by building Workers.\nOnly build new cities once you have found a spot that you believe is appropriate. = Jak już widzisz trzeba cały czas balansować pomiędzy rozwojem i ekspansją a Zadowoleniem mieskańców.\nTo nie jest niemożliwe ale jako nowy gracz to nie jest dobry sposób na rozpoczęcie gry.\nPóki co zamiast martwić się zbytnio o Zadowolenie na spokojnie zwiedzaj okoliczne ziemie i ulepszaj\n je przy pomocy Budowniczych.\nCo do Miast to zakładaj je tylko wtedy, kiedy masz pewność że wybrałeś właściwe miejsce.
@@ -3519,7 +3546,6 @@ It seems that your citizens are unhappy!\nWhile unhappy, cities  will grow at 1/
 Unhappiness has two main causes: Population and cities\n  Each city causes 3 unhappiness, and each population, 1 = Niezadowolenie ma 2 przyczyny: Obywatele i Miasta.\n Każde miasto odbiera 3 Zadowolenia a każdy Obywatel 1.
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = Są 2 główne sposoby na radzenie sobie z Niezadowoleniem:\n - budowanie konstrukcji przynoszących Zadowolenie Obywatelom\n - pozyskanie lepszych Luksusowych Zasobów.
 
-Golden Age = Złota Era
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = Brawo !\nTwoje imperium wkroczyło w Złotą Erę!\nPunkty Złotej Ery gromadzone są co ture bazując na Zadowoleniu Twojej cywilizacji\nPodczas Złotej Ery ilość zdobywanej Kultury i Produkcj wzrasta o 20%,\n a każde pole które w tym momencie generuje co najmniej 1 Złoto, dodatkowo będzie dodawało jedno więcej.
 
 Roads and Railroads = Drogi i Tory
@@ -3555,7 +3581,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
 
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = Napotkałeś nową cywilizację!\nNowo poznane cywilizacje zawsze są na początku obojętne, więc to od Ciebie\n zależy czy wypowiesz im wojnę, czy będziesz z nimi handlował.
 
-Apollo Program = Program Apollo
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = Po ukończeniu programu Apollo możesz rozpocząć budowę części statku kosmicznego w swoich Miastach\n (mając odpowiednie technologie oczywiście) i tym samym osiągnąć Naukowe Zwycięstwo!
 
 Injured Units = Ranne Jednostki
@@ -3601,7 +3626,6 @@ In research agreements, you and another civilization decide to jointly research
  # Requires translation!
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = 
 
-City-States = Państwa miasta
  # Requires translation!
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = 
  # Requires translation!
@@ -3623,7 +3647,6 @@ Removing Terrain Features =
  # Requires translation!
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = 
 
-Natural Wonders = Cuda Naturalne
  # Requires translation!
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = 
 

android/assets/jsons/translations/Portuguese.properties

@@ -884,7 +884,6 @@ Gold reward for clearing barbarian camps =
 
 # Other civilopedia things
 Nations = Nações
-Promotions = Promoções
 Available for [unitTypes] = Disponível para [unitTypes]
  # Requires translation!
 Free promotion: = 
@@ -981,7 +980,7 @@ ID successfully set! =
  # Requires translation!
 Invalid ID! = 
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
 Indicates the capital city = Indica a Capital!
 Palace = Palácio
@@ -1292,7 +1291,7 @@ SS Engine = Motor principal da nave espacia
 SS Stasis Chamber = Câmara  de biostase de Nave Espacial
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Colonizador
 
@@ -1311,7 +1310,7 @@ Immortal = Imortal
 Deity = Divindade
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -3737,7 +3736,7 @@ Congratulations, conquerer. This tribe serves you now. =
 Barbarians = Bárbaros
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
 Aristocracy = Aristocracia
 +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = +15 de produção ao construir maravilhas, +1 felicidade a cada 10 em uma cidade
@@ -3779,7 +3778,6 @@ Military units gain 50% more Experience from combat = +50% experiencia em batalh
 Military Caste = Casta Militar
 Each city with a garrison increases happiness by 1 and culture by 2 = +1 felicidade e +2 cultara por cidade com guarda
 Professional Army = Exército Profissional
-Gold cost of upgrading military units reduced by 33% = -33% custo de ouro para melhora de unidades militares
 Honor Complete = Honra Completa
 Gain gold for each unit killed = Ganhe ouro por cada unidade morta
 Honor = Honra
@@ -3827,8 +3825,6 @@ Free Thought = Pensamento Livre
 Sovereignty = Soberania
 +15% science while empire is happy = +15% ciência enquanto império está feliz
 Scientific Revolution = Revolução Ciêntifica
- # Requires translation!
-Science gained from research agreements +50% = 
 Rationalism Complete = Racionalismo Completo
 +1 gold from all science buildings = +1 ouro de todos os edifícios de ciência
 Renaissance era = Renascimento
@@ -3868,9 +3864,8 @@ Autocracy = Autocracia
 -33% unit upkeep costs = -33% Manutenção de unidades
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = Antiguidade
 Agriculture = Agricultura
 Starting tech = Tecnologia inicial
 'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster = 'Onde o cultivo começa, outras artes seguem. Os fazendeiros portanto são os fundadores da civilização humana.' Daniel Webster
@@ -3899,7 +3894,6 @@ Masonry = Alvenaria
 Bronze Working = Trabalho com bronze
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = 'Aqui Heitor entrou, com uma lança de onze côvados de comprimento em sua mão; o bronze aponta brilhante em sua frente, e foi preso ao cabo da lança por um anel de ouro.' - Homero
 
-Classical era = Antiguidade Clássica
 Optics = Óptica
 Enables embarkation for land units = Permite o embarque de unidades terrestres
 'He made an instrument to know if the moon shine at full or no.' - Samuel Butler = 'Ele fez um instrumento para saber se a lua brilha cheia ou não.' - Samuel Butler
@@ -3921,7 +3915,6 @@ Roads connect tiles across rivers =
 Iron Working = Trabalho com ferro
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Não espere o aço ficar quente para bater, mas faça-o quente batendo.' - William Butler Yeats
 
-Medieval era = Idade Média
 Theology = Teologia
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = 'Tres coisas são necessárias para a salvação do homem: saber em que ele deve acreditar; saber o que ele deve desejar; e saber o que ele deve fazer' -  S. Tomás de Aquino
 Civil Service = Serviço civil
@@ -3949,7 +3942,6 @@ Physics = Física
 Steel = Aço
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 'John Henry disse ao seu capitão, / 'Um homem não é nada mas um homem, / E antes que eu permita que sua broca a vapor me vença, / Eu morrerei com o martelo em minha mão.'' - Anônimo: A balada de John Henry, o Homem Movido a Aço
 
-Renaissance era = Renascimento
 Astronomy = Astronomia
 Increases embarked movement +1 = Aumenta movimento enquanto embarcado em +1
 Enables embarked units to enter ocean tiles = Permite que unidades embarcadas entrem em hexágonos oceânicos
@@ -3984,7 +3976,6 @@ Chemistry = Química
  # Requires translation!
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = 
 
-Industrial era = Revolução Industrial
 Archaeology = Arqueologia
  # Requires translation!
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = 
@@ -4102,7 +4093,7 @@ Who knows what the future holds? = Quem sabe o que o futuro reserva?
 'I think we agree, the past is over.' - George W. Bush = 
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = Oceano
 
@@ -4172,7 +4163,7 @@ Cerro de Potosi =
 Barringer Crater = 
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = Fazenda
 
@@ -4200,8 +4191,6 @@ Fort =
 
 Road = Estrada
 
-Railroad = Ferrovia
-
 Remove Forest = Cortar floresta
 
 Remove Jungle = Cortar selva
@@ -4248,7 +4237,7 @@ City ruins = Ruínas da cidade
 Barbarian encampment = Acampamento bárbaro
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = Gado
 
@@ -4308,7 +4297,7 @@ Whales = Baleias
 Pearls = Pérolas
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
 Heal Instantly = Cura Instantânea
 Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion = Cure essa unidade por 50 de Vida; Fazendo isto irá consumir sua oportunidade de escolher uma Promoção
@@ -4473,12 +4462,11 @@ Slinger Withdraw = Retirada de Lançador
 May withdraw before melee (133%) = Pode se retirar antes do corpo a corpo (133%)
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
 Worker = Trabalhador
 Can build improvements on tiles = Pode construir melhorias em terrenos
 
-Settler = Colonizador
 Founds a new city = Estabelecer uma nova cidade
 
 Scout = Explorador
@@ -4512,7 +4500,6 @@ War Chariot = Carruagem de guerra
 War Elephant = Elefante de guerra
 
 Spearman = Lanceiro
-Bonus vs [unitType] = Bônus contra [unitType]
 
 Hoplite = Hoplita
 
@@ -4581,7 +4568,6 @@ Keshik = Keshik
 
 Caravel = Caravela
 May withdraw before melee = Pode se retirar antes do corpo a corpo
-+1 Visibility Range = +1 de alcance do campo de visão
 
 Turtle Ship = Navio Tartaruga
 
@@ -4593,7 +4579,6 @@ Musketeer = Mosqueteiro
 
 Janissary = Janisário
 Heals [amount] damage if it kills a unit = Cura [amount] de dano se destruir uma unidade
-Bonus as Attacker [amount]% = [amount]% de bônus como atacante
 
 Minuteman = Mílicia
 
@@ -4630,7 +4615,6 @@ Cavalry = Cavalaria
 Cossack = Cossaco
 
 Artillery = Artilharia
-Ranged attacks may be performed over obstacles = Ataques à distância podem ser executados sobre obstáculos
 
 Ironclad = Navio revestido de ferro
 Double movement in coast = Movimento em dobro nos litorais
@@ -4705,7 +4689,50 @@ Khan = Cã
 Heal adjacent units for an additional 15 HP per turn = Cura unidades adjacentes por um adiconal de 15 HP por rodada
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = Introdução
 Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own! = Bem-vindo ao Unciv!\nPela razão de ser um jogo complexo, existem tarefas básicas para ajudar você a se familiarizar com o jogo.\nIsto é completamente opcional, e você pode explorar o jogo do seu jeito!
@@ -4740,7 +4767,6 @@ Each additional tile will require more culture, but generally your first cities
  # Requires translation!
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = 
 
-Happiness = Felicidade
  # Requires translation!
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = 
  # Requires translation!
@@ -4756,7 +4782,6 @@ Unhappiness has two main causes: Population and cities\n  Each city causes 3 unh
  # Requires translation!
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = 
 
-Golden Age = Idade dourada
  # Requires translation!
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = 
 
@@ -4803,7 +4828,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
  # Requires translation!
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = 
 
-Apollo Program = Programa Apollo
  # Requires translation!
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = 
 
@@ -4857,7 +4881,6 @@ Research Agreements =
 In research agreements, you and another civilization decide to jointly research technology.\nAt the end of the agreement, you will both receive a 'lump sum' of Science, which will go towards one of your unresearched technologies. = Em acordos de pesquisa, você e outra civilização decidem pesquisar em conjunto tecnologia.\nAo fim do acordo, ambos vocês irão receber um 'montante único' de ciência, o qual será direcionado a uma de suas tecnologia ainda não pesquisada.
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = A quantidade de Ciência que você recebe no fim depende na ciência gerada por suas cidades e das cidades das outras civilizações durante o acordo - quanto mais. melhor! 
 
-City-States = Cidades-Estados
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = Nem todas as nações estão disputando com você pela vitória.\nCidades-estado são nações que não podem ganhar, não conquistam outras cidades e não podem negociar comércio.
 Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = Ao contrário, relações diplomáticas com cidades-estado são determinadas por Influência - a medida de 'quanto que a Cidade-estado gosta de você'.\nInfluência pode ser aumentada por atacar seus inimigos, liberar sua cidade, e dando a elas quantias de ouro.
 Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = Certos bonus são fornecidos quando você se encontra acima de 30 de influência.\nQuando você tem mais que 60 de Influência, e você tem a aior influência de todas as civilizações, você é considerado seus 'Aliado', e ganha ainda mais bonus e acesso aos recursos de Luxo e Estratégia em suas terras.
@@ -4876,6 +4899,5 @@ Removing Terrain Features =
  # Requires translation!
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = 
 
-Natural Wonders = Maravilhas da Natureza
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = Maravilhas Naturais, como o Monte Fuji, a Rocha de Gibraltar e a Grande Barreira de Coral, são únicas, características intransponíveis de terreno, obras primas da Mãe Natureza, as quais possuem qualidades excepcionais que as fazem muito diferentes dos terrenos comuns.\nEles beneficiam lhe fornecendo grandes quantias de Cultura, Ciência, Ouro ou Produção se trabalhadas por suas Cidades, sendo o motivo pelo qual você tenha que trazê-las ao seu empério assim que possível. 
 

android/assets/jsons/translations/Romanian.properties

@@ -880,7 +880,6 @@ Gold reward for clearing barbarian camps =
 
 # Other civilopedia things
 Nations = Națiuni
-Promotions = Promoții
 Available for [unitTypes] = Valabil pentru [unitTypes]
 Free promotion: = Promoție gratis:
 Free promotions: = Promoții gratis:
@@ -986,7 +985,7 @@ ID successfully set! =
  # Requires translation!
 Invalid ID! = 
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
 Indicates the capital city = Stabilește orașul capitală
 Palace = Palat
@@ -1310,7 +1309,7 @@ SS Engine = Motor pentru nave spațiale
 SS Stasis Chamber = Cameră de biostază pentru nave spațiale
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Colonist
 
@@ -1329,7 +1328,7 @@ Immortal = Nemuritor
 Deity = Zeitate
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -3796,7 +3795,7 @@ Congratulations, conquerer. This tribe serves you now. =
 Barbarians = Barbari
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
 Aristocracy = Aristocrație
 +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = +15% producție la construcția de minuni, +1 fericire pentru fiecare 10 cetățeni ai unui oraș
@@ -3838,7 +3837,6 @@ Military units gain 50% more Experience from combat = Unitățile militare prime
 Military Caste = Castă militară
 Each city with a garrison increases happiness by 1 and culture by 2 = Fiecare oraș cu o garnizoană crește fericirea cu 1 și cultura cu 2
 Professional Army = Armată profesionistă
-Gold cost of upgrading military units reduced by 33% = Costurile în aur pentru dezvoltarea unităților militare reduse cu 33%
 Honor Complete = Onoare realizată
 Gain gold for each unit killed = Obține aur pentru fiecare unitate ucisă
 Honor = Onoare
@@ -3886,8 +3884,6 @@ Free Thought = Gândire liberă
 Sovereignty = Suveranitate
 +15% science while empire is happy = +15% știință cât timp imperiul este fericit
 Scientific Revolution = Revoluție științifică
- # Requires translation!
-Science gained from research agreements +50% = 
 Rationalism Complete = Raționalism realizat
 +1 gold from all science buildings = +1 aur de la toate clădirile științifice
 Renaissance era = Renaștere
@@ -3929,9 +3925,8 @@ Autocracy = Autocrație
 -33% unit upkeep costs = -33% la costurile de întreținere pentru unități
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = Antichitate
 Agriculture = Agricultură
  # Requires translation!
 Starting tech = 
@@ -3970,7 +3965,6 @@ Bronze Working = Prelucrarea bronzului
  # Requires translation!
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = 
 
-Classical era = Era clasică
 Optics = Optică
 Enables embarkation for land units = Permite îmbarcarea unităților terestre
  # Requires translation!
@@ -3997,7 +3991,6 @@ Iron Working = Prelucrarea fierului
  # Requires translation!
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 
 
-Medieval era = Evul mediu
 Theology = Teologie
  # Requires translation!
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = 
@@ -4035,7 +4028,6 @@ Steel = Oțel
  # Requires translation!
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 
 
-Renaissance era = Renaștere
 Astronomy = Astronomie
 Increases embarked movement +1 = Crește mișcarea ambarcațiunilor +1
 Enables embarked units to enter ocean tiles = Permite unităților îmbarcate să meargă în celulele ocean
@@ -4068,7 +4060,6 @@ Chemistry = Chimie
  # Requires translation!
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = 
 
-Industrial era = Epoca industrială
 Archaeology = Arheologie
  # Requires translation!
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = 
@@ -4187,7 +4178,7 @@ Who knows what the future holds? = Cine poate ști ce ne rezervă viitorul?
 'I think we agree, the past is over.' - George W. Bush = 'Cred că suntem de acord, trecutul s-a terminat.' - George W. Bush
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = Ocean
 
@@ -4254,7 +4245,7 @@ Cerro de Potosi = Cerro de Potosi
 Barringer Crater = Craterul Barringer
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = Fermă
 
@@ -4283,8 +4274,6 @@ Fort =
 
 Road = Drum
 
-Railroad = Cale ferată
-
 Remove Forest = Defrișează pădurea
 
 Remove Jungle = Defrișează jungla
@@ -4341,7 +4330,7 @@ City ruins = Oraș în ruină
 Barbarian encampment = 
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = Vite
 
@@ -4402,7 +4391,7 @@ Whales = Balene
 Pearls = Perle
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
 Heal Instantly = Vindecare instantanee
  # Requires translation!
@@ -4621,12 +4610,11 @@ Slinger Withdraw =
 May withdraw before melee (133%) = 
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
 Worker = Muncitor
 Can build improvements on tiles = Poate construi îmbunătățiri pe celule
 
-Settler = Colonist
 Founds a new city = Fondează un oraș nou
 
 Scout = Explorator
@@ -4660,7 +4648,6 @@ War Chariot = Războinic în car
 War Elephant = Elefant de război
 
 Spearman = Lăncier
-Bonus vs [unitType] = Bonus contra [unitType]
 
 Hoplite = Hoplit
 
@@ -4737,7 +4724,6 @@ Keshik =
 Caravel = Caravelă
  # Requires translation!
 May withdraw before melee = 
-+1 Visibility Range = +1 Rază Vizuală
 
  # Requires translation!
 Turtle Ship = 
@@ -4750,8 +4736,6 @@ Musketeer = Mușchetar
 
 Janissary = Ienicer
 Heals [amount] damage if it kills a unit = Vindecă [amount] din daune dacă omoară o unitate
- # Requires translation!
-Bonus as Attacker [amount]% = 
 
 Minuteman = Rezervist
 
@@ -4794,8 +4778,6 @@ Cavalry = Cavalerie
 Cossack = Cazac
 
 Artillery = Artilerie
- # Requires translation!
-Ranged attacks may be performed over obstacles = 
 
 Ironclad = Blindat
 Double movement in coast = Deplasare dublă pe țărm
@@ -4874,7 +4856,50 @@ Khan = Han
 Heal adjacent units for an additional 15 HP per turn = Vindecă unitățile adiacente cu 15 HP pe tură
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = Introducere
  # Requires translation!
@@ -4910,7 +4935,6 @@ Each additional tile will require more culture, but generally your first cities
  # Requires translation!
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = 
 
-Happiness = Fericire
  # Requires translation!
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = 
  # Requires translation!
@@ -4926,7 +4950,6 @@ Unhappiness has two main causes: Population and cities\n  Each city causes 3 unh
  # Requires translation!
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = 
 
-Golden Age = Epocă de Aur
  # Requires translation!
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = 
 
@@ -4972,7 +4995,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
  # Requires translation!
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = 
 
-Apollo Program = Programul Apollo
  # Requires translation!
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = 
 
@@ -5034,7 +5056,6 @@ In research agreements, you and another civilization decide to jointly research
  # Requires translation!
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = 
 
-City-States = Orașe-stat
  # Requires translation!
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = 
  # Requires translation!
@@ -5056,7 +5077,6 @@ Removing Terrain Features =
  # Requires translation!
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = 
 
-Natural Wonders = Minuni naturale
  # Requires translation!
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = 
 

android/assets/jsons/translations/Russian.properties

@@ -820,7 +820,6 @@ Gold reward for clearing barbarian camps = Золото за очищение л
 
 # Other civilopedia things
 Nations = Нации
-Promotions = Повышения
 Available for [unitTypes] = Могут получить юниты: [unitTypes]
 Free promotion: = Бесплатное повышение:
 Free promotions: = Бесплатные повышения:
@@ -905,7 +904,7 @@ Doing this will reset your current user ID to the clipboard contents - are you s
 ID successfully set! = ID успешно установлен!
 Invalid ID! = Неверный ID!
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
 Indicates the capital city = Может быть только в столице
 Palace = Дворец
@@ -1202,7 +1201,7 @@ SS Engine = Двигатель КК
 SS Stasis Chamber = Система анабиоза КК
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Поселенец
 
@@ -1221,7 +1220,7 @@ Immortal = Бессмертный
 Deity = Божество
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -2498,7 +2497,7 @@ Congratulations, conquerer. This tribe serves you now. = Поздравляем
 Barbarians = Варвары
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
 Aristocracy = Аристократия
 +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = +15% к производству при создании чудес, +1 Счастье за каждые 10 жителей в городе
@@ -2540,7 +2539,6 @@ Military units gain 50% more Experience from combat = Юниты получаю
 Military Caste = Военная каста
 Each city with a garrison increases happiness by 1 and culture by 2 = Каждый город с гарнизоном увеличивает Счастье на 1 и Культуру на 2
 Professional Army = Профессиональная армия
-Gold cost of upgrading military units reduced by 33% = -33% к стоимости улучшения юнита
 Honor Complete = Честь завершена
 Gain gold for each unit killed = Получение золота за каждого убитого юнита
 Honor = Честь
@@ -2587,7 +2585,6 @@ Free Thought = Свободомыслие
 Sovereignty = Суверенитет
 +15% science while empire is happy = +15% к росту науки, когда империя счастлива
 Scientific Revolution = Научная Революция
-Science gained from research agreements +50% = +50% к науке от договора об исследовании
 Rationalism Complete = Рационализм завершен
 +1 gold from all science buildings = +1 Золото от всех научных зданий
 Renaissance era = Новое время
@@ -2626,9 +2623,8 @@ Autocracy = Автократия
 -33% unit upkeep costs = -33% к стоимости содержания юнитов
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = Древнейший мир
 Agriculture = Земледелие
 Starting tech = Начальная технология
 'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster = 'Лишь на возделанной почве расцветают другие искусства. Поэтому фермеры — основатели цивилизации.' - Даниэль Уэбстер
@@ -2657,7 +2653,6 @@ Masonry = Каменная кладка
 Bronze Working = Обработка бронзы
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = 'В двери вступил божественный Гектор; в деснице держал он пику в одиннадцать локтей; далеко на древке сияло медное жало копья и кольцо вкруг него золотое.' - Гомер
 
-Classical era = Античность
 Optics = Оптика
 Enables embarkation for land units = Позволяет наземным единицам передвигаться по воде
 'He made an instrument to know if the moon shine at full or no.' - Samuel Butler = 'Он создал новый инструмент. Проверить, месяц есть иль нет.' - Сэмюэль Батлер
@@ -2678,7 +2673,6 @@ Roads connect tiles across rivers = На дорогах через реку по
 Iron Working = Обработка железа
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Не жди, пока железо станет горячим для ковки - но куй, и оно станет горячим.' - Уильям Батлер Йейтс
 
-Medieval era = Средневековье
 Theology = Богословие
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = 'Человеку для спасения нужно знать три вещи: чему он должен верить, чего желать и что делать.' - Фома Аквинский
 Civil Service = Госслужба
@@ -2706,7 +2700,6 @@ Physics = Физика
 Steel = Сталеварение
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 'Закали свои порывы, / Преврати порывы в сталь / И лети мечтой игривой / Ты в заоблачную даль.' - Сергей Есенин
 
-Renaissance era = Новое время
 Astronomy = Астрономия
 Increases embarked movement +1 = +1 к движению наземных единиц по воде
 Enables embarked units to enter ocean tiles = Позволяет наземным единицам выходить в океан
@@ -2731,7 +2724,6 @@ Metallurgy = Металлургия
 Chemistry = Химия
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = 'Куда ни посмотри, химия повсеместно повысила уровень цивилизации и продуктивную способность нации.' - Джон Калвин Кулидж
 
-Industrial era = Новейшее время
 Archaeology = Aрхеология
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = 'Те, кто не помнит своей истории, обречены повторять ее.'- Джордж Сантаяна
 Scientific Theory = Научная теория
@@ -2815,7 +2807,7 @@ Who knows what the future holds? = Кто знает, что ждет в буд
 'I think we agree, the past is over.' - George W. Bush = 'Думаю, мы все согласны, что прошлое закончилось.' - Линдон Джонсон
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = Океан
 
@@ -2876,7 +2868,7 @@ Cerro de Potosi = гора Серро-де-Потоси
 Barringer Crater = Аризонский кратер
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = Ферма
 
@@ -2903,8 +2895,6 @@ Fort = Форт
 
 Road = Дорога
 
-Railroad = Железная дорога
-
 Remove Forest = Вырубить лес
 
 Remove Jungle = Вырубить джунгли
@@ -2947,7 +2937,7 @@ City ruins = Руины города
 Barbarian encampment = Лагерь варваров
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = Скот
 
@@ -3007,7 +2997,7 @@ Whales = Киты
 Pearls = Жемчуг
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
 Heal Instantly = Мгновенное излечение
 Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion = Излечить юнит на 50 ОЗ. Данное действие заменяет возможность повышения.
@@ -3172,12 +3162,11 @@ Slinger Withdraw = Пращник
 May withdraw before melee (133%) = Может уклониться от атаки (133%)
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
 Worker = Рабочий
 Can build improvements on tiles = Может создавать улучшения на клетках
 
-Settler = Поселенец
 Founds a new city = Основывает новый город
 
 Scout = Разведчик
@@ -3211,7 +3200,6 @@ War Chariot = Боевая колесница
 War Elephant = Боевой слон
 
 Spearman = Копейщик
-Bonus vs [unitType] = Бонус против: [unitType]
 
 Hoplite = Гоплит
 
@@ -3280,7 +3268,6 @@ Keshik = Кешиктены
 
 Caravel = Каравелла
 May withdraw before melee = Может перемещаться перед атакой
-+1 Visibility Range = +1 к радиусу обзора
 
 Turtle Ship = Кобуксон
 
@@ -3292,7 +3279,6 @@ Musketeer = Мушкетер
 
 Janissary = Янычары
 Heals [amount] damage if it kills a unit = Восстаналивает [amount] здоровья при уничтожении юнита
-Bonus as Attacker [amount]% = Бонус при атаке +[amount]%
 
 Minuteman = Минитмэн
 
@@ -3329,7 +3315,6 @@ Cavalry = Кавалерия
 Cossack = Казаки
 
 Artillery = Артиллерия
-Ranged attacks may be performed over obstacles = Дальнобойные атаки могут выполняться над препятствиями
 
 Ironclad = Броненосец
 Double movement in coast = Двойное передвижение на побережье
@@ -3404,7 +3389,50 @@ Khan = Хан
 Heal adjacent units for an additional 15 HP per turn = Дополнительное лечение соседних юнитов на 15 HP каждый ход
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = Введение
 Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own! = Добро пожаловать в Unciv!\nПредлагаем вам пройти обучение, чтобы познакомиться с основными механиками игры.\nВы всегда можете отключить его в настройках и исследовать игру самостоятельно!
@@ -3427,7 +3455,6 @@ Once a city has gathered enough Culture, it will expand into a neighboring tile.
 Each additional tile will require more culture, but generally your first cities will eventually expand to a wide tile range. = Каждая новая клетка требует больше культуры, но со временем первые города захватывают широкую территорию.
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = Но хоть город и растет бесконечно, его жители могут обрабатывать клетки только в трех радиусах от центра.\nЭто нужно учитывать, закладывая новые города.
 
-Happiness = Счастье
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = С ростом городов наступает пора позаботиться о счастье.\nЭта механика больше не связана с отдельными городами, а распространяется на всю нацию.\nВы заметите, что чем больше население, тем труднее поддерживать империю счастливой.
 In addition, you can’t even build any city improvements that increase happiness until you’ve done the appropriate research.\nIf your empire’s happiness ever goes below zero the growth rate of your cities will be hurt.\nIf your empire becomes severely unhappy (as indicated by the smiley-face icon at the top of the interface)\n  your armies will have a big penalty slapped on to their overall combat effectiveness. = При этом построить здания и улучшения, увеличивающие счастье империи, можно только после исследования соответствующих технологий.\nЕсли счастье населения падает ниже нуля, то скорость роста городов снижается.\nЕсли империя становится крайне несчастливой (видно по иконке лица вверху экрана),\n то армия получает большой штраф к боевой мощи.
 This means that it is very difficult to expand quickly in Unciv.\nIt isn’t impossible, but as a new player you probably shouldn’t do it.\nSo what should you do? Chill out, scout, and improve the land that you do have by building Workers.\nOnly build new cities once you have found a spot that you believe is appropriate. = Это значит, что в Unciv сложно быстро захватить земли.\nЭто возможно, но новичкам, пожалуй, не следует этого делать.\nТогда что вам делать? Успокоиться, разведать территорию и с помощью Рабочих улучшать земли.\nЗакладывать новые города нужно только в тех местах, которые считаете подходящими.
@@ -3437,7 +3464,6 @@ It seems that your citizens are unhappy!\nWhile unhappy, cities  will grow at 1/
 Unhappiness has two main causes: Population and cities\n  Each city causes 3 unhappiness, and each population, 1 = У недовольства две главные причины: население и города.\nКаждый город увеличивает недовольство на 3, а житель на 1.
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = Есть два способа борьбы с недовольством:\n строительство зданий, увеличивающих счастье населения,\n или улучшение редких ресурсов внутри границ империи.
 
-Golden Age = Золотой век
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = Вы вошли в золотой век!\nОчки золотого века накапливаются за счет общего количества счастья\n вашей цивилизации.\nВо время золотого века выработка культуры и производства увеличивается на 20%,\n а каждая клетка, производящая хотя бы 1 Золото, дает дополнительное Золото.
 
 Roads and Railroads = Дороги и железнодорожные пути
@@ -3468,7 +3494,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
 
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = Вы встретили другую цивилизацию!\nДругие цивилизации начинают мирно, и с ними можно торговать,\n но позднее они могут объявить вам войну.
 
-Apollo Program = Программа Аполлон
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = Завершив Программу Аполлон, можно начать строить части космического корабля\n (с соответствующими технологиями), чтобы добиться научной победы.
 
 Injured Units = Поврежденные юниты
@@ -3507,7 +3532,6 @@ Research Agreements = Договор об исследованиях
 In research agreements, you and another civilization decide to jointly research technology.\nAt the end of the agreement, you will both receive a 'lump sum' of Science, which will go towards one of your unresearched technologies. = Заключая договор об исследованиях, вы предлагаете другой нации совместно изучать технологии.\nПри успешном выполнении договора обе стороны получают разовую ‘выплату’ науки, которая идет в копилку неисследованных технологий.
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = Количество науки, которое вы получите, зависит от общего научного вклада городов обеих сторон во время действия договора - чем больше, тем лучше!
 
-City-States = Города-государства
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = Не все нации борются за победу.\nГорода-государства - это нации, которые не стремятся к победе, не захватывают городов и не ведут торговлю.
 Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = Дипломатические отношения с городами-государствами меняются за счет Влияния - показателя того, насколько игрок им нравится.\nВлияние можно увеличить, атакуя их врагов, освобождая города и предоставляя золото.
 Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = При влиянии более 30 можно получить некоторые бонусы.\nЕсли влияние больше 60 и превосходит влияние остальных наций, вы становитесь ‘Союзником’ города-государства и получаете еще больше бонусов, а также доступ к редким и стратегическим ресурсам.
@@ -3522,6 +3546,5 @@ Great Improvements also provide any strategic resources that are under them, so
 Removing Terrain Features = 
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = Поверх некоторых клеток есть особый ландшафт - например, поймы или леса.\n Джунгли, леса и болота можно убрать с помощью рабочих.\nЭто не лишит клетку ресурсов и обычно требуется, чтобы эти ресурсы обработать.
 
-Natural Wonders = Чудеса природы
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = Чудеса природы, например Гора Фудзияма, Гибралтарская скала и Большой Барьерный Риф, - это непроходимые элементы местности, шедевры Матери-природы, которые обладают особыми свойствами и отличаются от обычного ландшафта.\nОни дают городам преимущество за счет большого количества Культуры, Науки, Золота или Производства, поэтому следует как можно быстрее включить их в свою империю.
 

android/assets/jsons/translations/Simplified_Chinese.properties

@@ -820,7 +820,6 @@ Gold reward for clearing barbarian camps = 清除蛮族营地金钱奖励
 
 # Other civilopedia things
 Nations = 文明
-Promotions = 晋升
 Available for [unitTypes] = 适用于：[unitTypes]
 Free promotion: = 免费获得的晋升项目：
 Free promotions: = 免费获得的晋升项目：
@@ -905,7 +904,7 @@ Doing this will reset your current user ID to the clipboard contents - are you s
 ID successfully set! = ID设置成功！
 Invalid ID! = 无效的ID！
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
 Indicates the capital city = 表示首都
 Palace = 宫殿
@@ -1202,7 +1201,7 @@ SS Engine = 飞船发动机
 SS Stasis Chamber = 飞船休眠舱
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = 移民
 
@@ -1221,7 +1220,7 @@ Immortal = 仙人
 Deity = 天神
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -2753,7 +2752,7 @@ Congratulations, conquerer. This tribe serves you now. = 恭喜你，征服者
 Barbarians = 蛮族
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
 Aristocracy = 贵族政治
 +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = 建造奇观时产能积累速率+15%，城市中每10市民+1快乐
@@ -2795,7 +2794,6 @@ Military units gain 50% more Experience from combat = 军事单位通过战斗
 Military Caste = 军人阶层
 Each city with a garrison increases happiness by 1 and culture by 2 = 每座有驻军的城市+1快乐和+2文化
 Professional Army = 职业军队
-Gold cost of upgrading military units reduced by 33% = 升级军事单位所需的金钱-33%
 Honor Complete = 完整的荣誉政策
 Gain gold for each unit killed = 杀死敌方单位时获得金钱
 Honor = 荣誉政策
@@ -2842,7 +2840,6 @@ Free Thought = 思想自由
 Sovereignty = 主权在民
 +15% science while empire is happy = 帝国处于快乐时科研产出+15%
 Scientific Revolution = 科技革命
-Science gained from research agreements +50% = 科研协定产出的科研+50%
 Rationalism Complete = 完整的理性政策
 +1 gold from all science buildings = 所有科研建筑+1金钱
 Renaissance era = 启蒙时代
@@ -2881,9 +2878,8 @@ Autocracy = 独裁政策
 -33% unit upkeep costs = 单位维护费-33%
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = 远古时代
 Agriculture = 农业
 Starting tech = 初始科技
 'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster = “只要人们开始耕作，其他艺术将随之而生。因此农夫是人类文明的奠基者。”——丹尼尔·韦伯斯特（美国政治家）
@@ -2912,7 +2908,6 @@ Masonry = 石工术
 Bronze Working = 青铜器
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = “赫克托耳手持十一肘的长矛走上战场；黄金圆环固定的青铜矛尖在他身前闪耀。”——荷马
 
-Classical era = 古典时代
 Optics = 光学
 Enables embarkation for land units = 陆军单位拥有船运能力
 'He made an instrument to know if the moon shine at full or no.' - Samuel Butler = “他制造了一种仪器来仔细观察月亮的光芒。”——塞缪尔·巴特勒（英国学者）
@@ -2933,7 +2928,6 @@ Roads connect tiles across rivers = 道(铁)路可跨河建造
 Iron Working = 铁器
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = “不要等铁变热才对其锻打；而要通过锻打而使其变热。”——威廉·巴特勒·叶芝
 
-Medieval era = 中古时代
 Theology = 神学
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = “有三点是自我救赎所必需的：知道自己应该信什么；知道自己应该要什么；知道自己应该做什么。”——圣托马斯·阿奎那
 Civil Service = 文官制度
@@ -2961,7 +2955,6 @@ Physics = 物理学
 Steel = 炼钢
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 他向队长立誓言：“硬汉虽说只是人，若要气钻胜过我，除非我死把锤扔。”——佚名：钢铁汉子约翰·亨利之歌（美国民谣）
 
-Renaissance era = 启蒙时代
 Astronomy = 天文学
 Increases embarked movement +1 = 陆军单位处于船运状态时的移动力+1
 Enables embarked units to enter ocean tiles = 拥有船运能力的单位能够进入海洋
@@ -2986,7 +2979,6 @@ Metallurgy = 冶金学
 Chemistry = 化学
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = “无论从哪方面看，化学家的工作都提高了我们文明的程度，增加了国家的生产力。”——卡尔文·柯立芝（美国第30任总统）
 
-Industrial era = 工业时代
 Archaeology = 考古学
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = “不能铭记历史的人注定要重蹈覆辙。”——乔治·桑塔亚那（西班牙哲学家）
 Scientific Theory = 科学理论
@@ -3070,7 +3062,7 @@ Who knows what the future holds? = 谁知道未来会怎样？
 'I think we agree, the past is over.' - George W. Bush = “我想我们都同意：过去已经结束了。”——乔治·沃克·布什
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = 海洋
 
@@ -3131,7 +3123,7 @@ Cerro de Potosi = 富饶山
 Barringer Crater = 巴林杰陨石坑
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = 农场
 
@@ -3158,8 +3150,6 @@ Fort = 堡垒
 
 Road = 道路
 
-Railroad = 铁路
-
 Remove Forest = 砍伐森林
 
 Remove Jungle = 砍伐丛林
@@ -3202,7 +3192,7 @@ City ruins = 城市废墟
 Barbarian encampment = 蛮族营地
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = 牛群
 
@@ -3262,7 +3252,7 @@ Whales = 鲸鱼
 Pearls = 珍珠
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
 Heal Instantly = 浴火重生
 Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion = 立即回复50生命值，同时放弃本次晋升机会
@@ -3427,12 +3417,11 @@ Slinger Withdraw = 抛石手撤退
 May withdraw before melee (133%) = 可以在肉搏前撤退（133%）
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
 Worker = 工人
 Can build improvements on tiles = 可以在地块上建造设施
 
-Settler = 移民
 Founds a new city = 建立一座城市，组建此单位时城市的食物积累停止
 
 Scout = 斥候
@@ -3466,7 +3455,6 @@ War Chariot = 埃及战车
 War Elephant = 印度战象
 
 Spearman = 枪兵
-Bonus vs [unitType] = 对战[unitType]时战斗力+
 
 Hoplite = 希腊重步兵
 
@@ -3535,7 +3523,6 @@ Keshik = 怯薛
 
 Caravel = 轻帆船
 May withdraw before melee = 可以在肉搏前撤退
-+1 Visibility Range = +1视野
 
 Turtle Ship = 龟船
 
@@ -3547,7 +3534,6 @@ Musketeer = 法国火枪手
 
 Janissary = 苏丹亲兵
 Heals [amount] damage if it kills a unit = 消灭敌方单位后回复[amount]生命值
-Bonus as Attacker [amount]% = 主动发起攻击时+[amount]%战斗力
 
 Minuteman = 快速民兵
 
@@ -3584,7 +3570,6 @@ Cavalry = 近代骑兵
 Cossack = 哥萨克骑兵
 
 Artillery = 火炮
-Ranged attacks may be performed over obstacles = 越过障碍进行远程攻击
 
 Ironclad = 铁甲舰
 Double movement in coast = 海滨移动时双倍移动力
@@ -3659,7 +3644,50 @@ Khan = 汗
 Heal adjacent units for an additional 15 HP per turn = 相邻的所有单位每回合额外回复15生命值
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = 游戏介绍
 Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own! = 您好，欢迎来到绚丽多彩的UnCiv游戏世界！\n文明游戏是复杂的，让我们通过一些简单的任务来熟悉它吧。\n这些任务是可选的，当然您也可以自己探索游戏世界！
@@ -3682,7 +3710,6 @@ Once a city has gathered enough Culture, it will expand into a neighboring tile.
 Each additional tile will require more culture, but generally your first cities will eventually expand to a wide tile range. = 每扩张一个地块都需要更多的文化，但一般来说，你的第一个城市最终会扩张到拥有一个广阔的领土范围。
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = 虽然你的城市将会永远扩张下去，但你的市民只能在距离城市中心3格内的地块上工作。\n在建立新城市时应考虑到这一点。
 
-Happiness = 快乐
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = 随着城市规模扩大，城市的可工作地块也会变得越来越多。\n这时，你将不得不面对游戏中关于“快乐”的机制。在游戏中，快乐的产出是所有城市总和计算，\n快乐的消耗则由城市数量和人口数量决定。\n随着城市数量的增加和城市人口的增长您将会很快发现：保持你的文明始终处于快乐是一件越来越难的事。
 In addition, you can’t even build any city improvements that increase happiness until you’ve done the appropriate research.\nIf your empire’s happiness ever goes below zero the growth rate of your cities will be hurt.\nIf your empire becomes severely unhappy (as indicated by the smiley-face icon at the top of the interface)\n  your armies will have a big penalty slapped on to their overall combat effectiveness. = 此外，在未研发相关科技前您将无法建造任何能增加快乐的建筑、奇观和开发可以增加快乐的奢侈资源。\n如果您的文明处于不满，将会极大地减慢城市发展速度。\n如果文明的不满状态非常严重(顶部信息栏用一个“哭脸”标示)，\n您的部队战斗力将会有极大的减成。
 This means that it is very difficult to expand quickly in Unciv.\nIt isn’t impossible, but as a new player you probably shouldn’t do it.\nSo what should you do? Chill out, scout, and improve the land that you do have by building Workers.\nOnly build new cities once you have found a spot that you believe is appropriate. = 这意味着在Unciv游戏中快速扩张是一件非常困难的事，新手们一定要十分慎重。\n那么究竟应该如何做呢？把目光聚焦在发展自己已有的城市上吧。\n通过组建工人建造设施、开发资源，同时不要放松对其他文明的侦查工作，\n只有当您在寻找到一个合适的位置后再来建立新的城市吧。
@@ -3692,7 +3719,6 @@ It seems that your citizens are unhappy!\nWhile unhappy, cities  will grow at 1/
 Unhappiness has two main causes: Population and cities\n  Each city causes 3 unhappiness, and each population, 1 = 产生不满的原因有两个:人口数和城市数，\n每座城市产生3点不满，每个市民产生1点不满。
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = 有两种方法可以减少不满:\n为您的市民建造提供快乐的建筑或奇观，\n或者开发奢侈资源。
 
-Golden Age = 黄金时代
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = 您的文明进入了一个黄金时代!\n您的快乐每个回合都会积累，\n当快乐积累到一定数值就会开启一个黄金时代。\n在黄金时代，文化和产能积累速率+20%，\n每个至少产出1金钱的地块将额外提供1金钱。
 
 Roads and Railroads = 道路与铁路
@@ -3723,7 +3749,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
 
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = 您遇到了另一个文明!\n其他文明一开始是和平的，您可以和他们进行贸易，\n但是他们以后可能会选择对您宣战。
 
-Apollo Program = 阿波罗计划
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = 当您完成了阿波罗计划，可以开始在您的城市中建造飞船部件(需要相应科技)，\n来通过太空竞赛赢得科技胜利！
 
 Injured Units = 受伤单位
@@ -3762,7 +3787,6 @@ Research Agreements = 科研协定
 In research agreements, you and another civilization decide to jointly research technology.\nAt the end of the agreement, you will both receive a 'lump sum' of Science, which will go towards one of your unresearched technologies. = 在科研协定中，你和另一个文明将共同研究科技。\n在协定结束时，你和另一个文明都将“一次性”获得大量的科研点数，这将用于你尚未研究的科技。
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = 科研协定的收益取决于协定期间科研产出总量较小的那个文明——因此，选择签订科研协定对象时请慎重！
 
-City-States = 城邦
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = 并不是所有文明都在和你争夺胜利。城邦是无法胜利的文明，他们不能征服其他城市，也不能进行贸易。
 Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = 相反，与城邦的外交关系取决于影响力——一个表示“城邦有多喜欢你”的数值。\n与他们的敌人战斗，解放他们的城市，或者给予他们一大笔金钱，都可以增加你对他们的影响力。
 Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = 当影响力超过30时，根据城邦类型的不同您会获得相应的奖励。\n当影响力超过60，并且在所有文明中您对他们的影响力最高时，您将被他们视为“盟友”，可获得更多的奖励效果，同时还可以使用他们领土上的奢侈资源和战略资源。
@@ -3775,6 +3799,5 @@ Great Improvements also provide any strategic resources that are under them, so
 Removing Terrain Features = 清除地貌
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = 某些地块还拥有地貌——比如冲积平原或森林。其中一些地貌(如丛林、沼泽和森林)可以由工人清除。\n清除地貌不会移除地块中的任何资源，相反的，有时只有这样做才能开发这些资源。
 
-Natural Wonders = 自然奇观
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = 富士山、直布罗陀巨岩和大堡礁等自然奇观，都是独特的、无法通行的地貌，是大自然母亲的杰作，具有不同于一般地形的非凡品质。\n开发它们会为你带来大量的文化、科研、金钱或产能收益，这就是为什么需要尽快将其纳入你的帝国的原因。
 

android/assets/jsons/translations/Spanish.properties

@@ -820,7 +820,6 @@ Gold reward for clearing barbarian camps = Recompensa de oro por despejar los ca
 
 # Other civilopedia things
 Nations = Naciones
-Promotions = Ascensos
 Available for [unitTypes] = Disponible para [unitTypes]
 Free promotion: = Ascenso libre:
 Free promotions: = Ascensos libres:
@@ -905,7 +904,7 @@ Doing this will reset your current user ID to the clipboard contents - are you s
 ID successfully set! = ID asignado con éxito 
 Invalid ID! = ID inválido 
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
 Indicates the capital city = Indica la capital
 Palace = Palacio
@@ -1202,7 +1201,7 @@ SS Engine = Motor (Nave espacial)
 SS Stasis Chamber = Cámara de estasis (Nave espacial)
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Colono
 
@@ -1221,7 +1220,7 @@ Immortal = Inmortal
 Deity = Deidad
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -2498,7 +2497,7 @@ Congratulations, conquerer. This tribe serves you now. = Enhorabuena conquistado
 Barbarians = Bárbaros
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
 Aristocracy = Aristocracia
 +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = +15% producción al construir maravillas, +1 felicidad cada 10 habitantes in una ciudad
@@ -2540,7 +2539,6 @@ Military units gain 50% more Experience from combat = Las unidades militares gan
 Military Caste = Casta militar
 Each city with a garrison increases happiness by 1 and culture by 2 = Cada ciudad con una guarnicion gana 1 de felicidad y 2 de cultura
 Professional Army = Ejercito profesional
-Gold cost of upgrading military units reduced by 33% = El coste de mejorar unidades con oro se reduce un 33%
 Honor Complete = Honor completado
 Gain gold for each unit killed = Ganas oro cada vez que destruyas una unidad enemiga
 Honor = Honor
@@ -2587,7 +2585,6 @@ Free Thought = Pensamiento Libre
 Sovereignty = Soberanía
 +15% science while empire is happy = +15% ciencia mientras el imperio esté feliz
 Scientific Revolution = Revolución Científica
-Science gained from research agreements +50% = Ciencia obtenida de acuerdos de investigación +50%
 Rationalism Complete = Racionalismo Completo
 +1 gold from all science buildings = +1 oro de todos los edificios de ciencia
 Renaissance era = Renacimiento
@@ -2626,9 +2623,8 @@ Autocracy = Autocracia
 -33% unit upkeep costs = Coste de mantenimiento de unidades reducido en 33%
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = Edad Antigua
 Agriculture = Agricultura
 Starting tech = Tecnología de inicio
 'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster = 'Donde la labranza comienza, otros tipos de arte le siguen, por lo tanto los granjeros son los fundadores de la civilización.' - Daniel Webster
@@ -2657,7 +2653,6 @@ Masonry = Albañilería
 Bronze Working = Trabajo del bronce
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = 'Aquí entra Hector, con una lanza 5 metros de largo en su mano; La punta de bronze brillo en frente de el, y fue abrochado al palo de la lanza por un anillo de oro.' - Homero
 
-Classical era = Edad Clásica
 Optics = Óptica
 Enables embarkation for land units = Habilita la embarcacion a las unidades de tierra
 'He made an instrument to know if the moon shine at full or no.' - Samuel Butler = 'El hizo un instrumento para saber si la luna brillaba o no' - Samuel Butler
@@ -2678,7 +2673,6 @@ Roads connect tiles across rivers = Las carreteras conectan casilla a través de
 Iron Working = Trabajo del hierro
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'No esperes a golpear el hierro cuando este caliente, si no que hazlo caliente por golpearlo.' - William Butler Yeats
 
-Medieval era = Edad Medieval
 Theology = Teología
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = 'Tres cosas son necesarias para la salvación del hombre; Saber que debería creer; Saber que debería desear; y saber que debería hacer.' - San Tomás de Aquinas
 Civil Service = Servicio civil
@@ -2706,7 +2700,6 @@ Physics = Física
 Steel = Acero
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = "John Henry le dijo a su capitán: Un hombre no es más que un hombre, y antes de dejar que vuestra perforadora a vapor me derrote, moriré con el martillo en la mano.' - 'The Ballad of John Henry, the Steel-Driving Man', balada tradicional estadounidense
 
-Renaissance era = Renacimiento
 Astronomy = Astronomía
 Increases embarked movement +1 = +1 a la velocidad de movimiento a las embarcaciones
 Enables embarked units to enter ocean tiles = Habilita a las unidades embarcadas a entrar en océanos
@@ -2731,7 +2724,6 @@ Metallurgy = Metalurgia
 Chemistry = Química
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = 'Donde sea que miremos, el trabajo del químico ha aumentado el nivel de nuestra civilización y ha aumentando la capacidad productiva de la nación.' - Calvin Coolidge
 
-Industrial era = Edad Industrial
 Archaeology = Arqueología
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana =  'Aquellos quienes no recuerdan el pasado están condenados a repetirla.' - George Santayana
 Scientific Theory = Teoría científica
@@ -2815,7 +2807,7 @@ Who knows what the future holds? = ¿Quién sabe qué nos depara el futuro?
 'I think we agree, the past is over.' - George W. Bush = 'Creo que concordamos, el pasado se termino.' - George W. Bush
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = Océano
 
@@ -2876,7 +2868,7 @@ Cerro de Potosi = Cerro de Potosí
 Barringer Crater = Cráter Barringer
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = Granja
 
@@ -2903,8 +2895,6 @@ Fort = Fuerte
 
 Road = Carretera
 
-Railroad = Línea de ferrocarril
-
 Remove Forest = Quitar bosque
 
 Remove Jungle = Quitar selva
@@ -2947,7 +2937,7 @@ City ruins = Ciudad en ruinas
 Barbarian encampment = Campamento bárbaro
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = Ganado
 
@@ -3007,7 +2997,7 @@ Whales = Ballenas
 Pearls = Perlas
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
 Heal Instantly = Curar al instante
 Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion = Cura 50PS a esta unidad; Hacer esto gastará esta oportunidad de escoger un ascenso
@@ -3172,12 +3162,11 @@ Slinger Withdraw = Retirar Hondero
 May withdraw before melee (133%) = Puede retirarse antes del combate cuerpo a cuerpo (133%)
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
 Worker = Trabajador
 Can build improvements on tiles = Puede construir mejoras en casillas
 
-Settler = Colono
 Founds a new city = Funda una nueva ciudad
 
 Scout = Explorador
@@ -3211,7 +3200,6 @@ War Chariot = Carruaje de guerra
 War Elephant = Elefante de guerra
 
 Spearman = Lancero
-Bonus vs [unitType] = Bonus contra [unitType]
 
 Hoplite = Hoplita
 
@@ -3280,7 +3268,6 @@ Keshik = Keshik
 
 Caravel = Caravela
 May withdraw before melee = Puede fuir del combate cuerpo a cuerpo
-+1 Visibility Range = +1 al rango de visibilidad
 
 Turtle Ship = Barco tortuga
 
@@ -3292,7 +3279,6 @@ Musketeer = Mosquetero Revolucionario
 
 Janissary = Jenízaro
 Heals [amount] damage if it kills a unit = Se cura [amount] de daño si mata a una unidad
-Bonus as Attacker [amount]% = Bonus al atacar [amount]%
 
 Minuteman = Milicia Revolucionaria
 
@@ -3329,7 +3315,6 @@ Cavalry = Cavallería
 Cossack = Cosaco
 
 Artillery = Artillería
-Ranged attacks may be performed over obstacles = Puede realizar ataques a distancia sobre obstáculos
 
 Ironclad = Buque a vapor
 Double movement in coast = Doble movimiento en costas
@@ -3404,7 +3389,50 @@ Khan = Khan
 Heal adjacent units for an additional 15 HP per turn = Cura unidades adyacentes por 15 PS adicionales por turno
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = Introducción
 Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own! = ¡Bienvenido a Unciv!\nDebido a que este es un juego complejo, hay tareas básicas para ayudarte a familiarizarte con el juego.\n¡Estas son completamente opcionales y puedes explorar el juego por tu cuenta!
@@ -3427,7 +3455,6 @@ Once a city has gathered enough Culture, it will expand into a neighboring tile.
 Each additional tile will require more culture, but generally your first cities will eventually expand to a wide tile range. = Cada parcela adicional requerirá más cultura, pero generalmente sus primeras ciudades eventualmente se expandirán a un amplio rango de parcelas.
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = Aunque su ciudad seguirá expandiéndose para siempre, sus ciudadanos solo pueden trabajar a 3 parcelas del centro de la ciudad.\nEsto debe tenerse en cuenta al colocar nuevas ciudades.
 
-Happiness = Felicidad
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = A medida que las ciudades crezcan en tamaño e influencia tendrás que lidiar con una mecánica de la felicidad que ya no está condicionada por cada ciudad individual.\nEn vez de eso tu imperio entero comparte el mismo nivel de satisfacción.\nCuanto más crezca la población más difícil será mantener al imperio feliz.
 In addition, you can’t even build any city improvements that increase happiness until you’ve done the appropriate research.\nIf your empire’s happiness ever goes below zero the growth rate of your cities will be hurt.\nIf your empire becomes severely unhappy (as indicated by the smiley-face icon at the top of the interface)\n  your armies will have a big penalty slapped on to their overall combat effectiveness. = Además, no podrás construir ninguna mejora que mejore la felicidad hasta que hayas hecho la investigación pertinente.\nSi la felicidad de tu imperio baja alguna vez del 0 el crecimiento de las ciudades se verá afectado.\nSi tu imperio se vuelve gravemente infeliz (indicado en la cara sonriente en la parte de arriba de la interfaz)\n tus ejércitos sufrirán una gran penalización reflejada en su efectividad de combate.
 This means that it is very difficult to expand quickly in Unciv.\nIt isn’t impossible, but as a new player you probably shouldn’t do it.\nSo what should you do? Chill out, scout, and improve the land that you do have by building Workers.\nOnly build new cities once you have found a spot that you believe is appropriate. = Esto significa que es muy difícil expandirse deprisa en Unciv.\nNo es imposible, pero un jugador nuevo no debería hacerlo.\nEntonces, ¿qué debería hacer? Relajarse, explorar y mejorar la tierra con los trabajadores.\nSolo se deberían construir ciudades cuando hayas encontrado un lugar que te parezca apropiado.
@@ -3437,7 +3464,6 @@ It seems that your citizens are unhappy!\nWhile unhappy, cities  will grow at 1/
 Unhappiness has two main causes: Population and cities\n  Each city causes 3 unhappiness, and each population, 1 = La infelicidad tiene dos causas principales: los ciudadanos y las ciudades\n Cada ciudad genera 3 de infelicidad y cada ciudadano 1.
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = Hay dos formas de combatir la infelicidad:\n Construyendo edificios que proporcionen felicidad a los ciudadanos\n o teniendo artículos de lujo mejorados dentro de tus fronteras.
 
-Golden Age = Edad dorada
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = ¡Has entrado en una edad de oro!\nLos puntos de la edad de oro se acumulan cada turno en la felicidad total \n de tu civilización\nCuando está activa la edad de oro la cultura y la producción mejorar un 20% más\n y cada casilla que produzca al menos uno de oro producirá uno extra.
 
 Roads and Railroads = Carreteras y ferrocarriles
@@ -3468,7 +3494,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
 
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = ¡Has encontrado otra civilización!\nOtras civilizaciones empiezan siendo pacíficas y podrás comerciar con ellos,\n pero podrían declararte la guerra más tarde
 
-Apollo Program = Programa Apolo
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = Una vez hayas completado el programa Apollo podrás empezar con la construcción de partes de la nave espacial en tu ciudades\n (con las tecnologías correspondientes) para ganar con una victoria científica.
 
 Injured Units = Unidades heridas
@@ -3507,7 +3532,6 @@ Research Agreements = Acuerdo de Investigación
 In research agreements, you and another civilization decide to jointly research technology.\nAt the end of the agreement, you will both receive a 'lump sum' of Science, which will go towards one of your unresearched technologies. = En los acuerdos tecnológicos, tu y otra civilización decidís investigar juntos.\nAl final del acuerdo ambos recibiréis una 'suma global' de ciencia que irá a una de las tecnologías que no hayas investigado.
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = La suma de ciencia que recibes al final depende de la ciencia generada por tus ciudades y por las ciudades de la otra civilización durante el acuerdo.
 
-City-States = Ciudades-estado
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = No todas las naciones rivalizan contigo por la victoria.\nLas ciudades-estado son naciones que no pueden ganar, conquistar otras ciudades y con las que no se puede comerciar.
 Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = En vez de eso las relaciones diplomáticas con las ciudades estado se ven determinadas por la Influencia (un medidor de cuandot le 'gustas' a la ciudad-estado).\nLa influencia puede aumentarse atacando a sus enemigos, liberando su ciudad y dándoles oro.
 Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = Algunos bonus se te proporcionan cuando tienes más de 30 de influencia.\nCuando tienes más de 60 y es más alta que la que tienen el resto de civilizaciones, se te considerará su 'Aliado' y ganarás más bonus y acceso a recursos de lujo y estratégicos en sus tierras.
@@ -3522,6 +3546,5 @@ Great Improvements also provide any strategic resources that are under them, so
 Removing Terrain Features = 
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = Algunos tipos de casillas tienen características de terreno, como los terrenos inundados o lso bosques. Algunas de estas características, como las junglas, los pantanos y los bosques; pueden ser eliminadas por los trabajadores.\nEliminando una característica de terreno no se eliminan los recursos que pueda tener, y normalmente es necesario para poder trabajarlos.
 
-Natural Wonders = Maravillas naturales
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = Las maravillas naturales, como el Monte Fuji, el Peñon de Gibraltar o la Gran Barrera de Coral, son únicos, infranqueables, obras de arte de la naturaleza que poseen propiedades excepcionales que los hacen muy diferentes del resto de terrenos.\nProporcionan grandes sumas de beneficios a la Cultura, Ciencia, Oro o Producción si son trabajadas por tus ciuades, es por lo que has de conseguirlas bajo tu imperio lo antes posible.
 

android/assets/jsons/translations/Traditional_Chinese.properties

@@ -839,7 +839,6 @@ Gold reward for clearing barbarian camps =
 
 # Other civilopedia things
 Nations = 文明
-Promotions = 晉升
 Available for [unitTypes] = 適用於：[unitTypes]
 Free promotion: = 免費獲得的晉升項目：
 Free promotions: = 免費獲得的晉升項目：
@@ -924,7 +923,7 @@ Doing this will reset your current user ID to the clipboard contents - are you s
 ID successfully set! = ID設置成功！
 Invalid ID! = 無效的ID！
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
 Indicates the capital city = 表示首都
 Palace = 宮殿
@@ -1221,7 +1220,7 @@ SS Engine = 飛船發動機
 SS Stasis Chamber = 飛船休眠艙
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = 移民
 
@@ -1240,7 +1239,7 @@ Immortal = 仙人
 Deity = 天神
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -3517,7 +3516,7 @@ Congratulations, conquerer. This tribe serves you now. = 恭喜你，徵服者
 Barbarians = 蠻族
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
 Aristocracy = 貴族政治
 +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = 建造奇觀時產能累積速率+15%，城市中每10市民+1快樂
@@ -3559,7 +3558,6 @@ Military units gain 50% more Experience from combat = 軍事單位透過戰鬥
 Military Caste = 軍人階層
 Each city with a garrison increases happiness by 1 and culture by 2 = 每座有駐軍的城市+1快樂和+2文化
 Professional Army = 職業軍隊
-Gold cost of upgrading military units reduced by 33% = 升級軍事單位所需金錢-33%
 Honor Complete = 完整的榮譽政策
 Gain gold for each unit killed = 殺死敵方單位時獲得金錢
 Honor = 榮譽政策
@@ -3606,7 +3604,6 @@ Free Thought = 思想自由
 Sovereignty = 主權在民
 +15% science while empire is happy = 帝國處於快樂時科研產出+15%
 Scientific Revolution = 科技革命
-Science gained from research agreements +50% = 科研協定產出的科研+50%
 Rationalism Complete = 完整的理性政策
 +1 gold from all science buildings = 所有科研建築+1金錢
 Renaissance era = 啟蒙時代
@@ -3645,9 +3642,8 @@ Autocracy = 獨裁政策
 -33% unit upkeep costs = 單位維護費-33%
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = 遠古時代
 Agriculture = 農業
 Starting tech = 初始科技
 'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster = “只要人們開始耕作，其他藝術將隨之而生。因此農夫是人類文明的奠基者。”——丹尼爾·偉伯斯特（美國政治家）
@@ -3676,7 +3672,6 @@ Masonry = 石工術
 Bronze Working = 青銅器
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = “赫克托耳手持十一肘的長矛走上戰場；黃金圓環固定的青銅茅尖在他身前閃耀。”——荷馬
 
-Classical era = 古典時代
 Optics = 光學
 Enables embarkation for land units = 陸軍單位擁有船運能力
 'He made an instrument to know if the moon shine at full or no.' - Samuel Butler = “他製造了一種儀器來仔細觀察月亮的光芒。”——賽繆爾·巴特勒（英國學者）
@@ -3697,7 +3692,6 @@ Roads connect tiles across rivers = 道(鐵)路可跨河建造
 Iron Working = 鐵器
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = “不要等鐵變熱才對其鍛打；而要通過鍛打而使其變熱。”——威廉·巴特勒·葉芝
 
-Medieval era = 中古時代
 Theology = 神學
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = “有三點是自我救贖所必須的：知道自己應該信什麼；知道自己應該要什麼；知道自己應該做什麼。”——聖湯碼士·阿奎那
 Civil Service = 文官制度
@@ -3725,7 +3719,6 @@ Physics = 物理學
 Steel = 煉鋼
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 他向隊長立誓：“硬漢雖說只是人，若要氣鑽勝過我，除非我死把槌扔。”——佚名：鋼鐵漢子約翰·亨利之歌（美國民謠）
 
-Renaissance era = 啟蒙時代
 Astronomy = 天文學
 Increases embarked movement +1 = 陸軍單位處於船運狀態時的移動力+1
 Enables embarked units to enter ocean tiles = 擁有船運能力的單位能夠進入海洋
@@ -3750,7 +3743,6 @@ Metallurgy = 冶金學
 Chemistry = 化學
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = “無論從哪方面看，化學家的工作都提高了我們文明的程度，增加了國家的生產力。”——卡爾文·柯立芝（美國第30任總統）
 
-Industrial era = 工業時代
 Archaeology = 考古學
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = “不能銘記歷史的人注定要重蹈覆轍。”——喬治·桑塔亞那（西班牙哲學家）
 Scientific Theory = 科學理論
@@ -3834,7 +3826,7 @@ Who knows what the future holds? = 誰知道未來會怎樣？
 'I think we agree, the past is over.' - George W. Bush = “我想我們都同意：過去已經結束了。”——喬治·沃克·布什
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = 海洋
 
@@ -3895,7 +3887,7 @@ Cerro de Potosi = 富饒山
 Barringer Crater = 巴林傑隕石坑
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = 農場
 
@@ -3922,8 +3914,6 @@ Fort = 堡壘
 
 Road = 道路
 
-Railroad = 鐵路
-
 Remove Forest = 砍伐森林
 
 Remove Jungle = 砍伐叢林
@@ -3966,7 +3956,7 @@ City ruins = 城市遺址
 Barbarian encampment = 蠻族營地
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = 牛群
 
@@ -4026,7 +4016,7 @@ Whales = 鯨魚
 Pearls = 珍珠
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
 Heal Instantly = 浴火重生
 Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion = 立即回復50生命值，同時放棄本次晉升機會
@@ -4191,12 +4181,11 @@ Slinger Withdraw = 擲石手撤退戰術
 May withdraw before melee (133%) = 此單位遭遇近戰時有機會撤退而避免傷害 (133% 機率)
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
 Worker = 工人
 Can build improvements on tiles = 可以在地區上建造設施
 
-Settler = 移民
 Founds a new city = 能建立一座城市，生產此單位時城市的食物停止累積
 
 Scout = 偵察兵
@@ -4230,7 +4219,6 @@ War Chariot = 埃及戰車
 War Elephant = 印度戰象
 
 Spearman = 槍兵
-Bonus vs [unitType] = 對戰[unitType]時戰鬥力+
 
 Hoplite = 希臘重步兵
 
@@ -4299,7 +4287,6 @@ Keshik = 怯薛
 
 Caravel = 輕帆船
 May withdraw before melee = 此單位遭遇近戰時有機會撤退而避免傷害
-+1 Visibility Range = +1視野
 
 Turtle Ship = 龜船
 
@@ -4311,7 +4298,6 @@ Musketeer = 法國火槍手
 
 Janissary = 蘇丹親兵
 Heals [amount] damage if it kills a unit = 消滅敵方單位後回復[amount]生命值
-Bonus as Attacker [amount]% = 主動發起攻擊時+[amount]%戰鬥力
 
 Minuteman = 快速民兵
 
@@ -4348,7 +4334,6 @@ Cavalry = 近代騎兵
 Cossack = 哥薩克騎兵
 
 Artillery = 火炮
-Ranged attacks may be performed over obstacles = 越過障礙進行遠程攻擊
 
 Ironclad = 鐵甲鑑
 Double movement in coast = 海濱移動時雙倍移動力
@@ -4423,7 +4408,50 @@ Khan = 汗
 Heal adjacent units for an additional 15 HP per turn = 相鄰的所有單位每回合額外回復15生命值
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = 遊戲介紹
 Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own! = 您好，歡迎來到絢麗多彩的UnCiv遊戲世界！\n文明遊戲是復雜的，讓我們通過一些簡單的任務來熟悉它吧。\n這些任務是可選的，當然您也可以自己探索遊戲世界！
@@ -4450,7 +4478,6 @@ Each additional tile will require more culture, but generally your first cities
  # Requires translation!
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = 
 
-Happiness = 快樂
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = 随着城市规模扩大，城市的可工作地块也会变得越来越多。\n这时，你将不得不面对游戏中关于“快乐”的机制。在游戏中，快乐的产出是所有城市总和计算，\n快乐的消耗则由城市数量和人口数量决定。\n随着城市数量的增加和城市人口的增长您将会很快发现：保持你的文明始终处于快乐是一件越来越难的事。
 In addition, you can’t even build any city improvements that increase happiness until you’ve done the appropriate research.\nIf your empire’s happiness ever goes below zero the growth rate of your cities will be hurt.\nIf your empire becomes severely unhappy (as indicated by the smiley-face icon at the top of the interface)\n  your armies will have a big penalty slapped on to their overall combat effectiveness. = 此外，在未研发相关科技前您将无法建造任何能增加快乐的建筑、奇观和开发可以增加快乐的奢侈资源。\n如果您的文明处于不满，将会极大地减慢城市发展速度。\n如果文明的不满状态非常严重(顶部信息栏用一个“哭脸”标示)，\n您的部队战斗力将会有极大的减成。
 This means that it is very difficult to expand quickly in Unciv.\nIt isn’t impossible, but as a new player you probably shouldn’t do it.\nSo what should you do? Chill out, scout, and improve the land that you do have by building Workers.\nOnly build new cities once you have found a spot that you believe is appropriate. = 这意味着在Unciv游戏中快速扩张是一件非常困难的事，新手们一定要十分慎重。\n那么究竟应该如何做呢？把目光聚焦在发展自己已有的城市上吧。\n通过组建工人建造设施、开发资源，同时不要放松对其他文明的侦查工作，\n只有当您在寻找到一个合适的位置后再来建立新的城市吧。
@@ -4460,7 +4487,6 @@ It seems that your citizens are unhappy!\nWhile unhappy, cities  will grow at 1/
 Unhappiness has two main causes: Population and cities\n  Each city causes 3 unhappiness, and each population, 1 = 产生不满的原因有两个:人口数和城市数，\n每座城市产生3点不满，每个市民产生1点不满。
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = 有两种方法可以减少不满:\n为您的市民建造提供快乐的建筑或奇观，\n或者开发奢侈资源。
 
-Golden Age = 黃金時代
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = 您的文明进入了一个黄金时代!\n您的快乐每个回合都会积累，\n当快乐积累到一定数值就会开启一个黄金时代。\n在黄金时代，文化和产能积累速率+20%，\n每个至少产出1金钱的地块将提供额外的金钱。
 
 Roads and Railroads = 道路與鐵路
@@ -4493,7 +4519,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
 
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = 您遇到了另一个文明!\n其他文明一开始是和平的，您可以和他们进行贸易，\n但是他们以后可能会选择对您宣战。
 
-Apollo Program = 阿波羅計畫
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = 您已经完成了阿波罗计划！\n现在可以开始在您的城市中建造飞船部件了，\n来通过太空竞赛赢得科技胜利吧！
 
 Injured Units = 受傷單位
@@ -4543,7 +4568,6 @@ In research agreements, you and another civilization decide to jointly research
  # Requires translation!
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = 
 
-City-States = 城邦
  # Requires translation!
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = 
  # Requires translation!
@@ -4565,7 +4589,6 @@ Removing Terrain Features =
  # Requires translation!
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = 
 
-Natural Wonders = 自然奇觀
  # Requires translation!
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = 
 

android/assets/jsons/translations/Turkish.properties

@@ -861,7 +861,6 @@ Gold reward for clearing barbarian camps =
 
 # Other civilopedia things
 Nations = Milletler
-Promotions = Terfiler
 Available for [unitTypes] = [unitTypes] için kullanılabilir
 Free promotion: = Ücretsiz promosyon
 Free promotions: = Ücretsiz promosyonlar
@@ -952,7 +951,7 @@ ID successfully set! =
  # Requires translation!
 Invalid ID! = 
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
 Indicates the capital city = Başkenti gösterir
 Palace = Saray
@@ -1253,7 +1252,7 @@ SS Engine = UG Motoru
 SS Stasis Chamber = UG Dolaşım Odası
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Yerleşmeci
 
@@ -1272,7 +1271,7 @@ Immortal = Ölümsüz
 Deity = Tanrı
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -3121,7 +3120,7 @@ Congratulations, conquerer. This tribe serves you now. = Tebrikler, fatih. Bu ka
 Barbarians = Barbarlar
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
 Aristocracy = Aristokrasi
 +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = Harikalar yaratırken +15% üretim, bir şehirdeki her 10 vatandaş için +1 mutluluk
@@ -3163,7 +3162,6 @@ Military units gain 50% more Experience from combat = Askeri birimler savaştan
 Military Caste = Askeri Kast
 Each city with a garrison increases happiness by 1 and culture by 2 = Garnizonlu her şehir mutluluğu 1, kültürü 2 artar
 Professional Army = Düzenli Ordu
-Gold cost of upgrading military units reduced by 33% = Askeri birlikleri iyileştirmenin altın maliyeti 33% azaldı
 Honor Complete = Onur Tamamlandı
 Gain gold for each unit killed = Öldürülen her birim için altın kazanın
 Honor = Onur
@@ -3210,7 +3208,6 @@ Free Thought = Serbest Düşünce
 Sovereignty = Egemenlik
 +15% science while empire is happy = İmparatorluk mutlu iken +15% bilim
 Scientific Revolution = Bilim Devrimi
-Science gained from research agreements +50% = Araştırma anlaşmalarından elde edilen bilim +50%
 Rationalism Complete = Akılcılık Tamamlandı
 +1 gold from all science buildings = Tüm bilim binalarından +1 altın
 Renaissance era = Rönesans dönemi
@@ -3249,9 +3246,8 @@ Autocracy = Otokrasi
 -33% unit upkeep costs = -33% birim bakım maliyeti
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = Eski Çağ
 Agriculture = Tarım
 Starting tech = Başlangıç teknolojisi
 'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster = 'Toprak işleme başladığında, diğer sanatlar da onu takip ediyor. Bu nedenle çiftçiler insan uygarlığının kurucularıdır.' - Daniel Webster
@@ -3280,7 +3276,6 @@ Masonry = Taş İşçiliği
 Bronze Working = Bronz İşleme
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = 'Hector burada, elinde on bir arşınlık mızrakla içeri girdi; bronz nokta önünde parıldadı ve bir altın yüzükle mızrak şaftına sabitlendi.' - Homer
 
-Classical era = Klasik dönem
 Optics = Optik
 Enables embarkation for land units = Kara birimleri için gemiye binmeyi mümkün kılar
 'He made an instrument to know if the moon shine at full or no.' - Samuel Butler = 'Ayın tamamen parlayıp parlamadığını bilmek için bir araç yaptı.' - Samuel Butler
@@ -3302,7 +3297,6 @@ Roads connect tiles across rivers =
 Iron Working = Demir İşleme
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = 'Demir sıcak olana kadar vurmayı beklemeyin, ancak vurarak ısınmasını sağlayın.' - William Butler Yeats
 
-Medieval era = Orta Çağ
 Theology = Teoloji
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = 'İnsanın kurtuluşu için üç şey gereklidir: neye inanması gerektiğini bilmek; ne arzu etmesi gerektiğini bilmek; ve ne yapması gerektiğini bilmek '- St. Thomas Aquinas
 Civil Service = Kamu Hizmeti
@@ -3330,7 +3324,6 @@ Physics = Fizik
 Steel = Çelik
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = 'John Henry Kaptanına,' Bir adam sadece bir adamdır 'dedi. / Ve buhar delicinin beni dövmesine izin vermeden önce, / elimdeki çekiçle öleceğim.' '- Anonim: Çelik Henry'nin Adamı John Henry'nin Ballad'ı
 
-Renaissance era = Rönesans dönemi
 Astronomy = Astronomi
 Increases embarked movement +1 = Denizde hareketi +1 arttırır 
 Enables embarked units to enter ocean tiles = Gemiye giren birimlerin okyanusa girmesini sağlar
@@ -3355,7 +3348,6 @@ Metallurgy = Metalurji
 Chemistry = Kimya
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = 'Nereye bakarsak bakalım, kimyagerin çalışması medeniyetimizin seviyesini yükseltti ve ulusun üretim kapasitesini artırdı.' - Calvin Coolidge
 
-Industrial era = Endüstriyel dönem
 Archaeology = Arkeoloji
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = 'Geçmişi hatırlayamayanlar, onu tekrarlamaya mahkumdur.' - George Santayana
 Scientific Theory = Bilimsel Teori
@@ -3439,7 +3431,7 @@ Who knows what the future holds? = kim bilir gelecek ne gösterecek?
 'I think we agree, the past is over.' - George W. Bush = 'Sanırım katılıyorum, geçmiş bitti.' -George W. Bush
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = Okyanus
 
@@ -3500,7 +3492,7 @@ Cerro de Potosi = Cerro de Potosi
 Barringer Crater = Barringer Krateri
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = Çiftlik
 
@@ -3527,8 +3519,6 @@ Fort = Kale
 
 Road = Yol
 
-Railroad = Demiryolu 
-
 Remove Forest = Ormanı ortadan kaldır
 
 Remove Jungle = Sık ormanı ortadan kaldır
@@ -3576,7 +3566,7 @@ City ruins = Şehir Kalıntıları
 Barbarian encampment = Barbar Kampı
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = Büyükbaş
 
@@ -3636,7 +3626,7 @@ Whales = Balina
 Pearls = İnci
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
 Heal Instantly = Anında iyileştir
 Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion = Bu Birimi 50 HP iyileştir; Bunu yapmak, bir Terfi seçme fırsatını tüketecektir.
@@ -3803,12 +3793,11 @@ Slinger Withdraw =
 May withdraw before melee (133%) = 
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
 Worker = İşçi
 Can build improvements on tiles = Bölgelerde iyileştirmeler yapabilir
 
-Settler = Yerleşmeci
 Founds a new city = Yeni bir şehri kurar
 
 Scout = İzci
@@ -3842,7 +3831,6 @@ War Chariot = Savaş Arabası
 War Elephant = Savaş Fili
 
 Spearman = Mızrakçı
-Bonus vs [unitType] = [unitType]'e karşı bonus
 
 Hoplite = Hoplite
 
@@ -3915,7 +3903,6 @@ Keshik = Haşhaşi
 Caravel = Karavela
  # Requires translation!
 May withdraw before melee = 
-+1 Visibility Range = +1 Görüş Mesafesi
 
 Turtle Ship = Kaplumbağa Gemi
 
@@ -3927,7 +3914,6 @@ Musketeer = Silâhşör
 
 Janissary = Yeniçeri
 Heals [amount] damage if it kills a unit = Bir birimi öldürürse [amount] hasarı iyileştirir
-Bonus as Attacker [amount]% = Saldırgan Olarak Bonus [amount]%
 
 Minuteman = Gönüllü
 
@@ -3967,7 +3953,6 @@ Cavalry = Süvari
 Cossack = Kazak
 
 Artillery = Top 
-Ranged attacks may be performed over obstacles = Menzilli saldırılar engeller üzerinden yapılabilir
 
 Ironclad = Zırhlı
 Double movement in coast = Sahilde çift hareket 
@@ -4042,7 +4027,50 @@ Khan = Kağan
 Heal adjacent units for an additional 15 HP per turn = Bitişik birimlere iyileştirme başına 15 can ilave edin
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = Giriş
 Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own! = Unciv'e hoşgeldin! Bu karışık bir oyun olduğundan burada seni oyuna alıştıracak bazı basit görevler var. Bunlar tamamen opsiyonel, ve bu yüzden oyunu kendin keşfetmekte özgürsün!
@@ -4075,7 +4103,6 @@ Each additional tile will require more culture, but generally your first cities
  # Requires translation!
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = 
 
-Happiness = Mutluluk
  # Requires translation!
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = 
  # Requires translation!
@@ -4091,7 +4118,6 @@ Unhappiness has two main causes: Population and cities\n  Each city causes 3 unh
  # Requires translation!
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = 
 
-Golden Age = Altın Çağ
  # Requires translation!
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = 
 
@@ -4136,7 +4162,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
  # Requires translation!
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = 
 
-Apollo Program = Apollo Programı
  # Requires translation!
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = 
 
@@ -4193,7 +4218,6 @@ In research agreements, you and another civilization decide to jointly research
  # Requires translation!
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = 
 
-City-States = Şehir Devletleri
  # Requires translation!
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = 
  # Requires translation!
@@ -4215,7 +4239,6 @@ Removing Terrain Features =
  # Requires translation!
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = 
 
-Natural Wonders = Doğal Harikalar
  # Requires translation!
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = 
 

android/assets/jsons/translations/Ukrainian.properties

@@ -820,7 +820,6 @@ Gold reward for clearing barbarian camps = Отримуване золото з
 
 # Other civilopedia things
 Nations = Нації
-Promotions = Підвищення
 Available for [unitTypes] = Доступно для [unitTypes]
 Free promotion: = Безкоштовне підвищення:
 Free promotions: = Безкоштовні підвищення:
@@ -905,7 +904,7 @@ Doing this will reset your current user ID to the clipboard contents - are you s
 ID successfully set! = Ідентифікатор успішно встановлено!
 Invalid ID! = Ідентифікатор недійсний!
 
-#################### Lines from Buildings.json ####################
+#################### Lines from Buildings from Civ V - Vanilla ####################
 
 Indicates the capital city = Позначає столицю
 Palace = Палац
@@ -1202,7 +1201,7 @@ SS Engine = Ракетний двигун
 SS Stasis Chamber = Камера стазису
 
 
-#################### Lines from Difficulties.json ####################
+#################### Lines from Difficulties from Civ V - Vanilla ####################
 
 Settler = Поселенець
 
@@ -1221,7 +1220,7 @@ Immortal = Безсмертний
 Deity = Бог
 
 
-#################### Lines from Nations.json ####################
+#################### Lines from Nations from Civ V - Vanilla ####################
 
  # Requires translation!
 Spectator = 
@@ -2498,7 +2497,7 @@ Congratulations, conquerer. This tribe serves you now. = Вітаю, завой
 Barbarians = Варвари
 
 
-#################### Lines from Policies.json ####################
+#################### Lines from Policies from Civ V - Vanilla ####################
 
 Aristocracy = Аристокатія
 +15% production when constructing wonders, +1 happiness for every 10 citizens in a city = +15% Виробництва при будуванні див, +1 щастя за кожних 10 мешканців в місті
@@ -2540,7 +2539,6 @@ Military units gain 50% more Experience from combat = Військові під
 Military Caste = Воєнна каста
 Each city with a garrison increases happiness by 1 and culture by 2 = Кожне місто з гарнізоном збільшує щастя на 1 та культуру на 2 одиниці
 Professional Army = Професійна армія
-Gold cost of upgrading military units reduced by 33% = Ціна покращення військових підрозділів у золоті -33%
 Honor Complete = Честь завершена
 Gain gold for each unit killed = Отримайте золото за кожний вбитий підрозділ
 Honor = Честь
@@ -2587,7 +2585,6 @@ Free Thought = Вільнодумство
 Sovereignty = Державний суверенітет
 +15% science while empire is happy = +15% науки, коли імперія щаслива
 Scientific Revolution = Наукова революція
-Science gained from research agreements +50% = +50% науки з угоди про дослідження
 Rationalism Complete = Раціоналізм завершено
 +1 gold from all science buildings = +1 золото від усіх наукових будівель
 Renaissance era = Відродження
@@ -2626,9 +2623,8 @@ Autocracy = Автократія
 -33% unit upkeep costs = -33% витрат на утримання підрозділів
 
 
-#################### Lines from Techs.json ####################
+#################### Lines from Techs from Civ V - Vanilla ####################
 
-Ancient era = Доісторичність
 Agriculture = Рільництво
 Starting tech = Початкова технологія
 'Where tillage begins, other arts follow. The farmers therefore are the founders of human civilization.' - Daniel Webster = «Де починається обробіток ґрунту, там зʼявляються інші ремесла. Тому землероби є основоположниками людської цивілізації» — Деніел Вебстер.
@@ -2657,7 +2653,6 @@ Masonry = Мурування
 Bronze Working = Бронза
 'Here Hector entered, with a spear eleven cubits long in his hand; the bronze point gleamed in front of him, and was fastened to the shaft of the spear by a ring of gold.' - Homer = «Ввійшов туди Гектор, тримав у руці він Спис в одинадцять ліктів завдовжки, й блищало на ньому Мідяне вістря, й навкруг золоте обіймало окільце» — Гомер. Іліада.
 
-Classical era = Античність
 Optics = Оптика
 Enables embarkation for land units = Дозволяє посадку на судно наземним підрозділам
 'He made an instrument to know if the moon shine at full or no.' - Samuel Butler = «Зробив він інструмент, аби дізнатися, чи світить місяць вповні, а чи ні» — Семюель Батлер.
@@ -2678,7 +2673,6 @@ Roads connect tiles across rivers = Дороги з’єднують кліти
 Iron Working = Виплавка металів
 'Do not wait to strike til the iron is hot, but make it hot by striking.' - William Butler Yeats = «Не чекайте з ударами, до розігріву криці, тому зробіть її гарячою ударами» — Вільям Батлер Єтс.
 
-Medieval era = Середньовіччя
 Theology = Теологія
 'Three things are necessary for the salvation of man: to know what he ought to believe; to know what he ought to desire; and to know what he ought to do' - St. Thomas Aquinas = «Для порятунку людини необхідні три речі: знати, у що вірити; знати, чого бажати; і знати, що робити» — Святий Тома Аквінський.
 Civil Service = Державна служба
@@ -2706,7 +2700,6 @@ Physics = Фізика
 Steel = Сталь
 'John Henry said to his Captain, / 'A man ain't nothin' but a man, / And before I'll let your steam drill beat me down, / I'll die with the hammer in my hand.'' - Anonymous: The Ballad of John Henry, the Steel-Drivin' Man = «Джон Генрі сказав своєму капітану: «Людина усього лиш людина, і перш ніж я дозволю вашому паровому свердлу подолати мене, я помру з молотком у руці» — Анонім «Балада про Джона Генрі, чоловіка зі сталі».
 
-Renaissance era = Відродження
 Astronomy = Астрономія
 Increases embarked movement +1 = Рух підрозділів на борту +1 
 Enables embarked units to enter ocean tiles = Дозволяє підрозділам на борту потрапляти до океанських клітинок
@@ -2731,7 +2724,6 @@ Metallurgy = Металургія
 Chemistry = Хімія
 'Wherever we look, the work of the chemist has raised the level of our civilization and has increased the productive capacity of the nation.' - Calvin Coolidge = «Куди б ми не подивилися, робота хіміка підняла рівень нашої цивілізації та збільшила виробничу потужність нації» — Келвін Кулідж.
 
-Industrial era = Промислова ера
 Archaeology = Археологія
 'Those who cannot remember the past are condemned to repeat it.' - George Santayana = «Хто не пам’ятає минулого, приречений повторити його» — Джордж Сантаяна.
 Scientific Theory = Наукова теорія
@@ -2815,7 +2807,7 @@ Who knows what the future holds? = Хто знає, що ховає майбут
 'I think we agree, the past is over.' - George W. Bush = «Гадаю, ми згодні, що минуле минуло» — Джордж Буш.
 
 
-#################### Lines from Terrains.json ####################
+#################### Lines from Terrains from Civ V - Vanilla ####################
 
 Ocean = Океан
 
@@ -2876,7 +2868,7 @@ Cerro de Potosi = Серро-Ріко
 Barringer Crater = Аризонський кратер
 
 
-#################### Lines from TileImprovements.json ####################
+#################### Lines from TileImprovements from Civ V - Vanilla ####################
 
 Farm = Ферма
 
@@ -2903,8 +2895,6 @@ Fort = Форт
 
 Road = Дорога
 
-Railroad = Колія
-
 Remove Forest = Вирубати ліс
 
 Remove Jungle = Вирубати джунглі
@@ -2947,7 +2937,7 @@ City ruins = Руїни міста
 Barbarian encampment = Табір варварів
 
 
-#################### Lines from TileResources.json ####################
+#################### Lines from TileResources from Civ V - Vanilla ####################
 
 Cattle = Худоба
 
@@ -3007,7 +2997,7 @@ Whales = Кити
 Pearls = Перли
 
 
-#################### Lines from UnitPromotions.json ####################
+#################### Lines from UnitPromotions from Civ V - Vanilla ####################
 
 Heal Instantly = Миттєве лікування
 Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion = Підрозділ отримає здоровʼя +50. Втрачається можливість поліпшення
@@ -3172,12 +3162,11 @@ Slinger Withdraw = Відступ рогатника
 May withdraw before melee (133%) = Може втекти від ближньобійника (133%)
 
 
-#################### Lines from Units.json ####################
+#################### Lines from Units from Civ V - Vanilla ####################
 
 Worker = Робітник
 Can build improvements on tiles = Може вдосконалювати клітинки
 
-Settler = Поселенець
 Founds a new city = Може заснувати нове місто
 
 Scout = Розвідник
@@ -3211,7 +3200,6 @@ War Chariot = Бойова колісниця
 War Elephant = Бойовий слон
 
 Spearman = Списник
-Bonus vs [unitType] = Перевага проти: [unitType]
 
 Hoplite = Гопліт
 
@@ -3280,7 +3268,6 @@ Keshik = Кешик
 
 Caravel = Каравела
 May withdraw before melee = Може втекти від ближньобійника
-+1 Visibility Range = Дальність огляду +1
 
 Turtle Ship = Кобуксон
 
@@ -3292,7 +3279,6 @@ Musketeer = Мушкетер
 
 Janissary = Яничари
 Heals [amount] damage if it kills a unit = Відновлення [amount] пошкоджень при знищенні підрозділу
-Bonus as Attacker [amount]% = Перевага у нападі +[amount]%
 
 Minuteman = Ополченець
 
@@ -3329,7 +3315,6 @@ Cavalry = Кіннота
 Cossack = Козак
 
 Artillery = Артилерія
-Ranged attacks may be performed over obstacles = Можливий дальній бій понад перешкоди
 
 Ironclad = Панцерник
 Double movement in coast = Подвійний рух на узбережжі
@@ -3404,7 +3389,50 @@ Khan = Хан
 Heal adjacent units for an additional 15 HP per turn = Сусідні підрозділи отримують +15 додаткового здоровʼя кожен хід
 
 
-#################### Lines from Tutorials.json ####################
+#################### Lines from Buildings from Civ V - G&K ####################
+
+
+
+#################### Lines from Difficulties from Civ V - G&K ####################
+
+
+
+#################### Lines from Nations from Civ V - G&K ####################
+
+
+ # Requires translation!
+Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 
+
+
+#################### Lines from Policies from Civ V - G&K ####################
+
+
+
+#################### Lines from Techs from Civ V - G&K ####################
+
+
+
+#################### Lines from Terrains from Civ V - G&K ####################
+
+
+
+#################### Lines from TileImprovements from Civ V - G&K ####################
+
+
+
+#################### Lines from TileResources from Civ V - G&K ####################
+
+
+
+#################### Lines from UnitPromotions from Civ V - G&K ####################
+
+
+
+#################### Lines from Units from Civ V - G&K ####################
+
+
+
+#################### Lines from Tutorials ####################
 
 Introduction = Введення
 Welcome to Unciv!\nBecause this is a complex game, there are basic tasks to help familiarize you with the game.\nThese are completely optional, and you're welcome to explore the game on your own! = Ласкаво просимо до Unciv!\nОскільки це складна гра, є основні завдання, які допоможуть ознайомити вас з грою.\nВони абсолютно необов’язкові, і ви можете самостійно вивчити гру!
@@ -3427,7 +3455,6 @@ Once a city has gathered enough Culture, it will expand into a neighboring tile.
 Each additional tile will require more culture, but generally your first cities will eventually expand to a wide tile range. = Кожна додаткова клітинка вимагає більше очків культури, попри це ваші перші міста згодом розширяться на досить широкі відстані.
 Although your city will keep expanding forever, your citizens can only work 3 tiles away from city center.\nThis should be taken into account when placing new cities. = Навіть якщо ваше місто буде рости беззупинно, ваші городяне можуть працювати лише на відстані 3 клітинок від міського центру.\nЦе має бути вами враховано, коли розташовуєте нові міста.
 
-Happiness = Щастя
 As cities grow in size and influence, you have to deal with a happiness mechanic that is no longer tied to each individual city.\nInstead, your entire empire shares the same level of satisfaction.\nAs your cities grow in population you’ll find that it is more and more difficult to keep your empire happy. = У міру того, як міста зростають у чисельності населення та впливі, вам доведеться мати справу із механікою щастя, яка вже не прив’язана до кожного окремого міста.\nНатомість уся ваша імперія має однаковий рівень задоволення.\nПо мірі зростання чисельності ваших міст ви побачите, що підтримувати свою імперію все складніше і складніше.
 In addition, you can’t even build any city improvements that increase happiness until you’ve done the appropriate research.\nIf your empire’s happiness ever goes below zero the growth rate of your cities will be hurt.\nIf your empire becomes severely unhappy (as indicated by the smiley-face icon at the top of the interface)\n  your armies will have a big penalty slapped on to their overall combat effectiveness. = Окрім того, ви навіть не можете побудувати будь-які покращення міста, які збільшують щастя, поки ви не зробите відповідне дослідження.\nЯкщо щастя вашої імперії коли-небудь опуститься нижче нуля, темп зростання ваших міст буде знижено.\nЯкщо ваша імперія стає сильно нещасною (на що вказує значок обличчя у верхній частині інтерфейсу)\n  ваші армії матимуть велику штрафну санкцію у загальній ефективності бою
 This means that it is very difficult to expand quickly in Unciv.\nIt isn’t impossible, but as a new player you probably shouldn’t do it.\nSo what should you do? Chill out, scout, and improve the land that you do have by building Workers.\nOnly build new cities once you have found a spot that you believe is appropriate. = Це означає, що в Unciv швидко розширитись дуже важко.\nЦе не є неможливим, проте, як новий гравець, ви, мабуть, не повинні цього робити.\nТо що ж робити? Охолоньте, розвідайте та покращуйте землю, яку ви маєте, будуючи Робітників.\nБудуйте нові міста лише після того, як знайдете місце, яке вважаєте за потрібне.
@@ -3437,7 +3464,6 @@ It seems that your citizens are unhappy!\nWhile unhappy, cities  will grow at 1/
 Unhappiness has two main causes: Population and cities\n  Each city causes 3 unhappiness, and each population, 1 = Нещастя має дві основні причини: населення та міста\n  Кожне місто викликає 3 одиниці нещастя, а кожне населення — 1
 There are 2 main ways to combat unhappiness:\n  by building happiness buildings for your population\n  or by having improved luxury resources within your borders = Є два основні способи боротьби з нещастям:\n  будуючи будинки щастя для свого населення,\n  або покращувати ресурси розкоші у ваших межах.
 
-Golden Age = Золота доба
 You have entered a golden age!\nGolden age points are accumulated each turn by the total happiness \n  of your civilization\nWhen in a golden age, culture and production generation increases +20%,\n  and every tile already providing at least one gold will provide an extra gold. = Ви вступили до Золотої доби!\nОчки Золотої доби накопичуються на кожному кроці відповідно до загального щастя \n  вашої цивілізації\nПід час Золотої доби культура і виробництво збільшується на 20%,\n  і кожна клітина, яка вже виробляє хоча б 1 золото, надасть додаткове золото.
 
 Roads and Railroads = Дороги і колії
@@ -3468,7 +3494,6 @@ You have encountered a barbarian unit!\nBarbarians attack everyone indiscriminat
 
 You have encountered another civilization!\nOther civilizations start out peaceful, and you can trade with them,\n  but they may choose to declare war on you later on = Ви зіткнулися з іншою цивілізацією!\nНа початку гри всі цивілізаціїї у дружніх відносинах з вами, і ви можете торгувати з ними,\n  але згодом вони можуть оголосити вам війну
 
-Apollo Program = Програма Аполлон
 Once you have completed the Apollo Program, you can start constructing spaceship parts in your cities\n (with the relevant technologies) to win a scientific victory! = Як тільки ви завершите програму «Аполлон», ви можете розпочати проектування частин космічного корабля в ваших містах,\n (з відповідними технологіями) щоб здобути наукову перемогу!
 
 Injured Units = Пошкоджені підрозділи
@@ -3507,7 +3532,6 @@ Research Agreements = Угоди про дослідження
 In research agreements, you and another civilization decide to jointly research technology.\nAt the end of the agreement, you will both receive a 'lump sum' of Science, which will go towards one of your unresearched technologies. = В угодах про дослідження ви та інша цивілізація вирішили спільно дослідити технологію.\nПісля завершення угоди ви отримаєте «одноразову суму» науки, яка піде на користь одній з ваших невивчених технологій.
 The amount of Science you receive at the end is dependent on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = Кількість науки, яку ви отримаєте в кінці кінців, залежить від науки, створеної вашими містами та іншими цивілізаційними містами під час угоди — чим більше, тим краще!
 
-City-States = Міста-держави
 Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = Не всі країни змагаються з вами за перемогу.\nМіста-держиви — це країни, які не можуть перемогти, не завойовувати інші міста і не можуть торгувати з ними.
 Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = Натомість дипломатичні відносини з державами-містами визначаються Впливом — «наскільки містам-державам ви подобаєтеся».\nВплив можна збільшити шляхом атаки їхніх ворогів, звільнення їхнього міста чи просто пожертвуванням купи золота.
 Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = Певні бонуси надаються коли у вас є понад 30 од. Впливу.\nКоли ви маєте більше 60 од. впливу і найбільший вплив у цьому місті-державі серед інших цивілізацій, місто-держава буде вважати вас своїм «союзником» і ви будете отримувати подальші бонуси та доступ до стратегічних ресурсів та ресурсів розкоші на їхніх землях.
@@ -3522,6 +3546,5 @@ Great Improvements also provide any strategic resources that are under them, so
 Removing Terrain Features = 
 Certain tiles have terrain features - like Flood plains or Forests -  on top of them. Some of these layers, like Jungle, Marsh and Forest, can be removed by workers.\nRemoving the terrain feature does not remove any resources in the tile, and is usually required in order to work those resources. = Певні клітини мають особливості рельєфу. Деякі з цих «надбудов», як, наприклад, джунглі, болота та ліс, можуть бути видалені працівниками.\nПри видаленні «надбудови» жодний ресурс не вилучається з клітини, і зазвичай це потрібно для видобування цих ресурсів.
 
-Natural Wonders = Природні дива
 Natural Wonders, such as the Mt. Fuji, the Rock of Gibraltar and the Great Barrier Reef, are unique, impassable terrain features, masterpieces of mother Nature, which possess exceptional qualities that make them very different from the average terrain.\nThey benefit by giving you large sums of Culture, Science, Gold or Production if worked by your Cities, which is why you might need to bring them under your empire as soon as possible. = Природні дива, як от г. Фудзі, Гібралтарська скеля та Великий бар’єрний риф, є унікальними, непрохідними особливостями місцевості, шедеврами матінки природи, які володіють надзвичайними особливостями, що відрізняють їх від середньостатистичної місцевості.\nПриродні дива є корисними, бо вони надають величезну кількість культури, науки, золота чи виробництва, якщо вони працюють біля ваших міст, тому вам може знадобитися якнайшвидше захопити їх для своєї імперії.
 

android/assets/jsons/translations/completionPercentages.properties

@@ -13,9 +13,9 @@ Turkish = 75
 English = 1
 Ukrainian = 99
 French = 98
-Portuguese = 53
+Portuguese = 52
 Indonesian = 99
 Czech = 62
 Spanish = 99
 Malay = 6
-Dutch = 14
+Dutch = 13

android/assets/jsons/translations/template.properties

@@ -818,7 +818,6 @@ Gold reward for clearing barbarian camps =
 
 # Other civilopedia things
 Nations = 
-Promotions = 
 Available for [unitTypes] = 
 Free promotion: = 
 Free promotions: = 

core/src/com/unciv/models/translations/TranslationFileWriter.kt

@@ -6,6 +6,7 @@ import com.badlogic.gdx.utils.Array
 import com.unciv.JsonParser
 import com.unciv.logic.battle.BattleDamage
 import com.unciv.logic.map.MapUnit
+import com.unciv.models.metadata.BaseRuleset
 import com.unciv.models.ruleset.*
 import com.unciv.models.ruleset.tech.TechColumn
 import com.unciv.models.ruleset.tile.Terrain
@@ -39,37 +40,57 @@ object TranslationFileWriter {
             else Gdx.files.local(fileLocation)
 
     private fun generateTranslationFiles(translations: Translations, modFolder: FileHandle? = null): HashMap<String, Int> {
-        // read the template
-        val templateFile = getFileHandle(modFolder, templateFileLocation)
+
+        val fileNameToGeneratedStrings = LinkedHashMap<String, MutableSet<String>>()
         val linesFromTemplates = mutableListOf<String>()
-        if (templateFile.exists())
-            linesFromTemplates.addAll(templateFile.reader().readLines())
-        // read the JSON files
-        val generatedStrings = generateStringsFromJSONs(modFolder)
+
+        if(modFolder==null) { // base game
+            val templateFile = getFileHandle(modFolder, templateFileLocation) // read the template
+            if (templateFile.exists())
+                linesFromTemplates.addAll(templateFile.reader().readLines())
+
+            for (baseRuleset in BaseRuleset.values()) {
+                val generatedStringsFromBaseRuleset =
+                        generateStringsFromJSONs(Gdx.files.local("jsons/${baseRuleset.fullName}"))
+                for (entry in generatedStringsFromBaseRuleset)
+                    fileNameToGeneratedStrings[entry.key + " from " + baseRuleset.fullName] = entry.value
+            }
+
+            fileNameToGeneratedStrings["Tutorials"] = generateTutorialsStrings()
+        }
+        else fileNameToGeneratedStrings.putAll(generateStringsFromJSONs(modFolder))
+
         // Tutorials are a bit special
         if (modFolder == null)          // this is for base only, not mods
-            generatedStrings["Tutorials"] = generateTutorialsStrings()
 
-        for (key in generatedStrings.keys) {
-            linesFromTemplates.add("\n#################### Lines from $key.json ####################\n")
-            linesFromTemplates.addAll(generatedStrings.getValue(key))
+        for (key in fileNameToGeneratedStrings.keys) {
+            linesFromTemplates.add("\n#################### Lines from $key ####################\n")
+            linesFromTemplates.addAll(fileNameToGeneratedStrings.getValue(key))
         }
 
         var countOfTranslatableLines = 0
         val countOfTranslatedLines = HashMap<String, Int>()
+
         // iterate through all available languages
         for (language in translations.getLanguages()) {
             var translationsOfThisLanguage = 0
             val stringBuilder = StringBuilder()
 
+            // This is so we don't add the same keys twice if we have the same value in both Vanilla and G&K
+            val existingTranslationKeys = HashSet<String>()
+
             for (line in linesFromTemplates) {
-                if (line.contains(" = ")) {
-                    // count translatable lines only once (e.g. for English)
-                    if (language == "English") countOfTranslatableLines++
-                } else {
+                if(line.contains("G&K")) {
+                    val x = line.length
+                }
+
+                if (!line.contains(" = ")) {
                     // small hack to insert empty lines
-                    if (line.startsWith(specialNewLineCode))
-                        stringBuilder.appendln()
+                    if (line.startsWith(specialNewLineCode)) {
+                        if(!stringBuilder.endsWith("\r\n\r\n")) // don't double-add line breaks -
+                            // this stops lots of line breaks between removed translations in G&K
+                            stringBuilder.appendln()
+                    }
                     else // copy as-is
                         stringBuilder.appendln(line)
                     continue
@@ -79,6 +100,13 @@ object TranslationFileWriter {
                 val hashMapKey = if (translationKey.contains('['))
                             translationKey.replace(squareBraceRegex,"[]")
                         else translationKey
+
+                if(existingTranslationKeys.contains(hashMapKey)) continue // don't add it twice
+                existingTranslationKeys.add(hashMapKey)
+
+                // count translatable lines only once (e.g. for English)
+                if (language == "English") countOfTranslatableLines++
+
                 var translationValue = ""
 
                 val translationEntry = translations[hashMapKey]
@@ -136,25 +164,22 @@ object TranslationFileWriter {
 
     // used for unit test only
     fun getGeneratedStringsSize(): Int {
-        return generateStringsFromJSONs().values.sumBy { // exclude empty lines
+        return generateStringsFromJSONs(Gdx.files.local("jsons/Civ V - Vanilla")).values.sumBy { // exclude empty lines
             it.count{ line: String -> !line.startsWith(specialNewLineCode) } }
     }
 
-    private fun generateStringsFromJSONs(modFolder: FileHandle? = null): LinkedHashMap<String, MutableSet<String>> {
+    private fun generateStringsFromJSONs(jsonsFolder: FileHandle): LinkedHashMap<String, MutableSet<String>> {
 
         // Using LinkedHashMap (instead of HashMap) is important to maintain the order of sections in the translation file
         val generatedStrings = LinkedHashMap<String, MutableSet<String>>()
 
         var uniqueIndexOfNewLine = 0
         val jsonParser = JsonParser()
-        val folderHandler = if(modFolder!=null) getFileHandle(modFolder,"jsons")
-        else getFileHandle(modFolder, "jsons/Civ V - Vanilla")
-        val listOfJSONFiles = folderHandler
-                .list{file -> file.name.endsWith(".json", true)}
+        val listOfJSONFiles = jsonsFolder
+                .list { file -> file.name.endsWith(".json", true) }
                 .sortedBy { it.name() }       // generatedStrings maintains order, so let's feed it a predictable one
 
-        for (jsonFile in listOfJSONFiles)
-        {
+        for (jsonFile in listOfJSONFiles) {
             val filename = jsonFile.nameWithoutExtension()
 
             val javaClass = getJavaClassByName(filename)
@@ -179,9 +204,8 @@ object TranslationFileWriter {
                             || string.startsWith(UnitActions.CAN_UNDERTAKE)
                             || string.endsWith(MapUnit.CHANCE_TO_INTERCEPT_AIR_ATTACKS)
                             || Regex(BattleDamage.BONUS_AS_ATTACKER).matchEntire(string) != null
-                            || Regex(BattleDamage.HEAL_WHEN_KILL).matchEntire(string) != null ->
-                    {
-                        val updatedString = string.replace("\\[\\d+(?=])]".toRegex(),"[amount]")
+                            || Regex(BattleDamage.HEAL_WHEN_KILL).matchEntire(string) != null -> {
+                        val updatedString = string.replace("\\[\\d+(?=])]".toRegex(), "[amount]")
                         resultStrings!!.add("$updatedString = ")
                     }
                     else ->
@@ -190,10 +214,11 @@ object TranslationFileWriter {
             }
 
             fun serializeElement(element: Any) {
-                val allFields = (element.javaClass.declaredFields + element.javaClass.fields).
-                                    filter { it.type == String::class.java ||
-                                             it.type == java.util.ArrayList::class.java ||
-                                             it.type == java.util.HashSet::class.java }
+                val allFields = (element.javaClass.declaredFields + element.javaClass.fields).filter {
+                    it.type == String::class.java ||
+                            it.type == java.util.ArrayList::class.java ||
+                            it.type == java.util.HashSet::class.java
+                }
                 for (field in allFields) {
                     field.isAccessible = true
                     val fieldValue = field.get(element)

core/src/com/unciv/ui/worldscreen/WorldScreen.kt

@@ -224,12 +224,14 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
     }
 
     private fun loadLatestMultiplayerState(){
-        val loadingGamePopup = Popup(this)
-        loadingGamePopup.add("Loading latest game state...".tr())
 
         // Since we're on a background thread, all the UI calls in this func need to run from the
         // main thread which has a GL context
-        Gdx.app.postRunnable { loadingGamePopup.open() }
+        val loadingGamePopup = Popup(this)
+        Gdx.app.postRunnable {
+            loadingGamePopup.add("Loading latest game state...".tr())
+            loadingGamePopup.open()
+        }
 
         try {
             val latestGame = OnlineMultiplayer().tryDownloadGame(gameInfo.gameId)