diff --git a/android/assets/jsons/Civ V - Vanilla/Units.json b/android/assets/jsons/Civ V - Vanilla/Units.json index b2184b18f8..2eed9ac7e7 100644 --- a/android/assets/jsons/Civ V - Vanilla/Units.json +++ b/android/assets/jsons/Civ V - Vanilla/Units.json @@ -552,7 +552,6 @@ "strength": 20, "cost": 120, "requiredTech": "Chivalry", - "obsoleteTech": "Military Science", "upgradesTo": "Cavalry", "requiredResource": "Horses", "uniques": ["Can move after attacking","No defensive terrain bonus","Penalty vs City 33%" ], diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 66117a6a7e..a2377a3c73 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -623,6 +623,8 @@ Convert production to gold at a rate of 4 to 1 = Converter produção em ouro a Convert production to science at a rate of [rate] to 1 = Coverter produção em ciência a uma taxa de [rate] para 1 The city will not produce anything. = A cidade não vai produzir nada. Worked by [cityName] = Trabalhado por [cityName] + # Requires translation! +Lock = # Technology UI @@ -655,6 +657,8 @@ Landing = Aterrissagem Flanking = Flanquear vs [unitType] = vs [unitType] Terrain = Terreno + # Requires translation! +Missing resource = Hurry Research = Apressar Pesquisa @@ -930,6 +934,11 @@ Paper Maker = Fabricador de papel Circus = Circo + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = Muralhas Walls of Babylon = Muralhas da Babilônia @@ -4186,9 +4195,6 @@ Heal adjacent units for an additional 15 HP per turn = Cura unidades adjacentes #################### 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 #################### diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 1642e3cf3d..4224444d32 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -639,6 +639,8 @@ Convert production to science at a rate of [rate] to 1 = Převést produkci na v The city will not produce anything. = Město nebude nic vyrábět. # Requires translation! Worked by [cityName] = + # Requires translation! +Lock = # Technology UI @@ -671,6 +673,8 @@ Landing = Přistání Flanking = Doprovod vs [unitType] = proti [unitType] Terrain = Terén + # Requires translation! +Missing resource = Hurry Research = Urychlit výzkum @@ -977,6 +981,11 @@ Paper Maker = Papírny Circus = Cirkus + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = Hradby Walls of Babylon = Babylonské hradby @@ -4471,9 +4480,6 @@ Heal adjacent units for an additional 15 HP per turn = Léčí sousední jednotk #################### 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 #################### diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 3c0a7db7c1..ac2524a50c 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -970,6 +970,8 @@ Convert production to science at a rate of [rate] to 1 = The city will not produce anything. = # Requires translation! Worked by [cityName] = + # Requires translation! +Lock = # Technology UI @@ -1014,6 +1016,8 @@ Flanking = vs [unitType] = # Requires translation! Terrain = + # Requires translation! +Missing resource = # Requires translation! @@ -1492,6 +1496,11 @@ Paper Maker = Papier Maker # Requires translation! Circus = + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = Muren Walls of Babylon = Muren van Babylon @@ -5795,9 +5804,6 @@ Heal adjacent units for an additional 15 HP per turn = #################### 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 #################### diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 7798e8d324..1371d04914 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -1155,6 +1155,8 @@ Convert production to science at a rate of [rate] to 1 = The city will not produce anything. = # Requires translation! Worked by [cityName] = + # Requires translation! +Lock = # Technology UI @@ -1216,6 +1218,8 @@ Flanking = vs [unitType] = # Requires translation! Terrain = + # Requires translation! +Missing resource = # Requires translation! @@ -1711,6 +1715,11 @@ Paper Maker = # Requires translation! Circus = + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + # Requires translation! Walls = @@ -6178,9 +6187,6 @@ Heal adjacent units for an additional 15 HP per turn = #################### 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 #################### diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 7d0ff9066f..ea3d801a82 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -629,6 +629,8 @@ Convert production to science at a rate of [rate] to 1 = Convertit la production The city will not produce anything. = La cité ne produira plus rien # Requires translation! Worked by [cityName] = + # Requires translation! +Lock = # Technology UI @@ -661,6 +663,8 @@ Landing = Atterrissage Flanking = Attaque de flanc vs [unitType] = vs [unitType] Terrain = Terrain + # Requires translation! +Missing resource = Hurry Research = Accélère la recherche scientifique en cours @@ -961,6 +965,11 @@ Paper Maker = Fabricant de papier Circus = Cirque + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = Murs Walls of Babylon = Murs de Babylone @@ -3433,9 +3442,6 @@ Heal adjacent units for an additional 15 HP per turn = Soigne les unités adjace #################### 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 #################### diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 0ee27936a7..92694316be 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -621,6 +621,8 @@ Convert production to gold at a rate of 4 to 1 = Konvertiert Produktion zu Gold Convert production to science at a rate of [rate] to 1 = Konvertiert Produktion zu Wissenschaft ([rate]:1) The city will not produce anything. = Die Stadt produziert nichts. Worked by [cityName] = Bewirtschaftet von [cityName] + # Requires translation! +Lock = # Technology UI @@ -653,6 +655,8 @@ Landing = Anlanden Flanking = Flankenangriff vs [unitType] = gegen [unitType] Terrain = Gelände + # Requires translation! +Missing resource = Hurry Research = Forschung beschleunigen @@ -928,6 +932,11 @@ Paper Maker = Papiermacher Circus = Zirkus + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = Mauern Walls of Babylon = Babylons Mauern @@ -3397,8 +3406,6 @@ Heal adjacent units for an additional 15 HP per turn = Heile angrenzende Einheit #################### Lines from Nations from Civ V - G&K #################### -Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = Warum kämpfen wir? weil Inanna danach verlangt. Werde nun Zeuge der Macht der Sumerer! - #################### Lines from Policies from Civ V - G&K #################### diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 0226471b5b..2edd73651e 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -621,6 +621,8 @@ Convert production to gold at a rate of 4 to 1 = Konversi produksi ke emas dalam Convert production to science at a rate of [rate] to 1 = Konversi produksi ke ilmu pengetahuan dalam perbandingan [rate] banding 1 The city will not produce anything. = Kota ini tidak akan memproduksi apapun. Worked by [cityName] = Digarap oleh [cityName] + # Requires translation! +Lock = # Technology UI @@ -653,6 +655,8 @@ Landing = Mendarat Flanking = Mengapit vs [unitType] = vs [unitType] Terrain = Medan + # Requires translation! +Missing resource = Hurry Research = Percepat Riset @@ -928,6 +932,11 @@ Paper Maker = Pembuat Kertas Circus = Sirkus + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = Tembok Walls of Babylon = Tembok Babel @@ -3397,8 +3406,6 @@ Heal adjacent units for an additional 15 HP per turn = Menyembuhkan unit bersebe #################### Lines from Nations from Civ V - G&K #################### -Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = Mengapa kami berperang? Karena Inanna menghendakinya. Sekarang, saksikanlah kekuatan bangsa Sumeria! - #################### Lines from Policies from Civ V - G&K #################### diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 63d505f39d..849f7d0de8 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -621,6 +621,8 @@ Convert production to gold at a rate of 4 to 1 = Converte la Produzione a Oro a Convert production to science at a rate of [rate] to 1 = Converte la Produzione a Scienza a un tasso di [rate] a 1 The city will not produce anything. = La città non produrrà nulla Worked by [cityName] = Sfruttata da [cityName] + # Requires translation! +Lock = # Technology UI @@ -653,6 +655,8 @@ Landing = Atterraggio Flanking = Attacco ai fianchi vs [unitType] = contro [unitType] Terrain = Terreno + # Requires translation! +Missing resource = Hurry Research = Accelera ricerca @@ -928,6 +932,11 @@ Paper Maker = Cartiera Circus = Circo + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = Mura Walls of Babylon = Mura di Babilonia @@ -3397,9 +3406,6 @@ Heal adjacent units for an additional 15 HP per turn = Cura le unità vicine di #################### 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 #################### diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 6561e82be5..30076cc2d5 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -621,6 +621,8 @@ Convert production to gold at a rate of 4 to 1 = 生産力を4対1の割合で Convert production to science at a rate of [rate] to 1 = 生産力を[rate]対1の割合で科学力に変換する The city will not produce anything. = 都市は何も生産しません Worked by [cityName] = [cityName]で勤務 + # Requires translation! +Lock = # Technology UI @@ -653,6 +655,8 @@ Landing = 着陸 Flanking = 離陸 vs [unitType] = vs [unitType] Terrain = 地形 + # Requires translation! +Missing resource = Hurry Research = 研究を開始 @@ -928,6 +932,11 @@ Paper Maker = 製紙工場 Circus = サーカス + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = 防壁 Walls of Babylon = バビロニアの城壁 @@ -3397,8 +3406,6 @@ Heal adjacent units for an additional 15 HP per turn = 隣接するユニット #################### Lines from Nations from Civ V - G&K #################### -Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = なぜ我々は戦う、イナンナが要求しているからだ。シュメール人の力を見ておくがいい！ - #################### Lines from Policies from Civ V - G&K #################### diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 44370ec0d2..0728e07850 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -621,6 +621,8 @@ Convert production to gold at a rate of 4 to 1 = 생산력의 1/4을 금으로 Convert production to science at a rate of [rate] to 1 = 생산력의 1/[rate]을 과학으로 변환 The city will not produce anything. = 도시가 아무 것도 생산하지 않음 Worked by [cityName] = [cityname]에서 작업중 + # Requires translation! +Lock = # Technology UI @@ -653,6 +655,8 @@ Landing = 상륙 Flanking = 측면 공격 vs [unitType] = vs [unitType] Terrain = 지형 + # Requires translation! +Missing resource = Hurry Research = 연구 가속 @@ -928,6 +932,11 @@ Paper Maker = 종이 공방 Circus = 서커스 + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = 성벽 Walls of Babylon = 바빌론 성벽 @@ -3397,8 +3406,6 @@ Heal adjacent units for an additional 15 HP per turn = 인접한 유닛들에게 #################### Lines from Nations from Civ V - G&K #################### -Why do we fight' Because Inanna demands it. Now, witness the power of the Sumerians! = 내가 왜 싸우냐고? 이난나가 요구하기 때문이다. 수메르의 힘을 똑똑히 봐라! - #################### Lines from Policies from Civ V - G&K #################### diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index 20fc565024..e3c8005eed 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -633,6 +633,8 @@ Convert production to gold at a rate of 4 to 1 = Gamybą paverskite auksu, kai k Convert production to science at a rate of [rate] to 1 = Gamybą paverskite mokslu [rate] iki 1 The city will not produce anything. = Miestas nieko negamins. Worked by [cityName] = Dirbo [cityName] + # Requires translation! +Lock = # Technology UI @@ -665,6 +667,8 @@ Landing = Iškrovimas Flanking = Šalutinis vs [unitType] = vs [unitType] Terrain = Reljefas + # Requires translation! +Missing resource = Hurry Research = Skubėti tyrimai @@ -979,6 +983,11 @@ Paper Maker = # Requires translation! Circus = + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + # Requires translation! Walls = @@ -5457,9 +5466,6 @@ Heal adjacent units for an additional 15 HP per turn = #################### 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 #################### diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index dbca87b06b..fef898a950 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -1109,6 +1109,8 @@ Convert production to science at a rate of [rate] to 1 = The city will not produce anything. = # Requires translation! Worked by [cityName] = + # Requires translation! +Lock = # Technology UI @@ -1170,6 +1172,8 @@ Flanking = vs [unitType] = # Requires translation! Terrain = + # Requires translation! +Missing resource = # Requires translation! @@ -1661,6 +1665,11 @@ Paper Maker = Pembuat kertas Circus = Sarkus + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = Dinding Walls of Babylon = Dinding Babylon @@ -6008,9 +6017,6 @@ Heal adjacent units for an additional 15 HP per turn = #################### 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 #################### diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 076cc60ee1..9894ea4091 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -627,6 +627,8 @@ Convert production to science at a rate of [rate] to 1 = Przetwarzanie produkcji The city will not produce anything. = Miasto niczego nie produkuje # Requires translation! Worked by [cityName] = + # Requires translation! +Lock = # Technology UI @@ -659,6 +661,8 @@ Landing = Lądowanie Flanking = Flankowanie vs [unitType] = kontra [unitType] Terrain = Teren + # Requires translation! +Missing resource = Hurry Research = Przyspiesz Badanie @@ -955,6 +959,11 @@ Paper Maker = Wytwórnia papieru Circus = Cyrk + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = Mury Walls of Babylon = Mury Babilonu @@ -3479,9 +3488,6 @@ Heal adjacent units for an additional 15 HP per turn = Leczy sąsiadujące jedno #################### 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 #################### diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index dd21b60a4a..1c96d1204a 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -633,6 +633,8 @@ Convert production to science at a rate of [rate] to 1 = Coverter produção em The city will not produce anything. = A cidade não vai produzir nada. # Requires translation! Worked by [cityName] = + # Requires translation! +Lock = # Technology UI @@ -669,6 +671,8 @@ Landing = Flanking = vs [unitType] = vs [unitType] Terrain = Terreno + # Requires translation! +Missing resource = Hurry Research = Apressar Pesquisa @@ -1006,6 +1010,11 @@ Paper Maker = Fabricador de papel Circus = Circo + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = Muralhas Walls of Babylon = Muralhas da Babilônia @@ -4700,9 +4709,6 @@ Heal adjacent units for an additional 15 HP per turn = Cura unidades adjacentes #################### 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 #################### diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 6a8b98ece4..3d56a37a65 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -629,6 +629,8 @@ Convert production to science at a rate of [rate] to 1 = Convertește producție The city will not produce anything. = Acest oraș nu va produce nimic # Requires translation! Worked by [cityName] = + # Requires translation! +Lock = # Technology UI @@ -661,6 +663,8 @@ Landing = Debarcare Flanking = Flancare vs [unitType] = vs [unitType] Terrain = Teren + # Requires translation! +Missing resource = Hurry Research = Grăbește cercetarea @@ -1011,6 +1015,11 @@ Paper Maker = Fabricant de hârtie Circus = Circ + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = Ziduri Walls of Babylon = Zidurile Babilonului @@ -4867,9 +4876,6 @@ Heal adjacent units for an additional 15 HP per turn = Vindecă unitățile adia #################### 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 #################### diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 30a4c42926..13557b63fb 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -623,6 +623,8 @@ Convert production to gold at a rate of 4 to 1 = Обмен производст Convert production to science at a rate of [rate] to 1 = Обмен производства на науку [rate] к 1 The city will not produce anything. = Город ничего не будет производить. Worked by [cityName] = Обрабатывается в г. [cityName] + # Requires translation! +Lock = # Technology UI @@ -655,6 +657,8 @@ Landing = Высадка Flanking = Атака с фланга vs [unitType] = против [unitType] Terrain = Местность + # Requires translation! +Missing resource = Hurry Research = Ускорить исследование @@ -930,6 +934,11 @@ Paper Maker = Бумажная мастерская Circus = Цирк + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = Стены Walls of Babylon = Стены Вавилона @@ -3400,9 +3409,6 @@ Heal adjacent units for an additional 15 HP per turn = Дополнительн #################### 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 #################### @@ -3536,13 +3542,11 @@ Not all nations are contending with you for victory.\nCity-states are nations th 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 и превосходит влияние остальных наций, вы становитесь ‘Союзником’ города-государства и получаете еще больше бонусов, а также доступ к редким и стратегическим ресурсам. - # Requires translation! Great People = Великие люди Certain buildings, and specialists in cities, generate Great Person points per turn.\nThere are several types of Great People, and their points accumulate separately.\nThe number of points per turn and accumulated points can be viewed in the Overview screen. = Некоторые здания и специалисты каждый ход генерируют в городах очки Великих людей.\nСуществует несколько типов Великих людей, и для каждого из них очки накапливаются отдельно.\nНа экране Обзора можно посмотреть количество накопленных очков и прибавку в ход. Once enough points have been accumulaated, a Great Person of that type will be created!\nEach Great Person can construct a certain Great Improvement which gives large yields over time, or immediately consumed to provide a certain bonus now. = Как только набралось достаточно очков определенного типа, появляется Великий человек!\nОн может построить улучшение, которое будет постоянно давать продукцию с клетки, или моментально предоставить определенный бонус. Great Improvements also provide any strategic resources that are under them, so you don't need to worry if resources are revealed underneath your improvements! = Улучшения Великих людей предоставляют стратегические ресурсы, на которых построены. Если вновь открытый ресурс оказался под улучшением, он автоматически добавляется в торговую сеть. - # Requires translation! 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Это не лишит клетку ресурсов и обычно требуется, чтобы эти ресурсы обработать. diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index af0496b25e..0b06d53c64 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -623,6 +623,8 @@ Convert production to gold at a rate of 4 to 1 = 按4:1的比例转化产能为 Convert production to science at a rate of [rate] to 1 = 按[rate]:1的比例转化产能为科研 The city will not produce anything. = 城市将不会建造/组建任何项目 Worked by [cityName] = 被[cityName]开发 + # Requires translation! +Lock = # Technology UI @@ -655,6 +657,8 @@ Landing = 登陆作战 Flanking = 侧翼夹击 vs [unitType] = 对战[unitType] Terrain = 地形修正 + # Requires translation! +Missing resource = Hurry Research = 加速科技研究 @@ -930,6 +934,11 @@ Paper Maker = 造纸坊 Circus = 马戏场 + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = 城墙 Walls of Babylon = 巴比伦城墙 @@ -3655,9 +3664,6 @@ Heal adjacent units for an additional 15 HP per turn = 相邻的所有单位每 #################### 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 #################### diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 4eadc04db1..5232b8e0d4 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -623,6 +623,8 @@ Convert production to gold at a rate of 4 to 1 = Convertir la producción en oro Convert production to science at a rate of [rate] to 1 = Convertir la producción en ciencia a una tasa de [rate] a 1 The city will not produce anything. = La ciudad no producirá nada. Worked by [cityName] = Trabajado por [cityName] + # Requires translation! +Lock = # Technology UI @@ -655,6 +657,8 @@ Landing = Desembarcando Flanking = Flanqueando vs [unitType] = vs [unitType] Terrain = Terreno + # Requires translation! +Missing resource = Hurry Research = Acelerar investigación @@ -930,6 +934,11 @@ Paper Maker = Papelera Circus = Circo + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = Muralla Walls of Babylon = Las murallas de Babilonia @@ -3400,9 +3409,6 @@ Heal adjacent units for an additional 15 HP per turn = Cura unidades adyacentes #################### 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 #################### diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 655640ef18..bf9f885881 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -623,6 +623,8 @@ Convert production to gold at a rate of 4 to 1 = 按4:1的比例轉化產能為 Convert production to science at a rate of [rate] to 1 = 按[rate]:1的比例轉化產能為科研 The city will not produce anything. = 城市將不會建造/訓練任何項目 Worked by [cityName] = 被[cityName]開發 + # Requires translation! +Lock = # Technology UI @@ -655,6 +657,8 @@ Landing = 登陸作戰 Flanking = 側翼夾擊 vs [unitType] = 對戰[unitType] Terrain = 地形修正 + # Requires translation! +Missing resource = Hurry Research = 加速科技研究 @@ -949,6 +953,11 @@ Paper Maker = 造紙坊 Circus = 馬戲團 + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = 城牆 Walls of Babylon = 巴比倫城牆 @@ -4419,9 +4428,6 @@ Heal adjacent units for an additional 15 HP per turn = 相鄰的所有單位每 #################### 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 #################### diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 60d412b426..ab48ebb123 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -644,6 +644,8 @@ Convert production to science at a rate of [rate] to 1 = Üretimi [rate]'e 1 ora The city will not produce anything. = Şehir hiçbir şey üretmeyecek # Requires translation! Worked by [cityName] = + # Requires translation! +Lock = # Technology UI @@ -676,6 +678,8 @@ Landing = İniş Flanking = Kuşatma vs [unitType] = vs [unitType] Terrain = Arazi + # Requires translation! +Missing resource = Hurry Research = Araştırma Hızlandırma @@ -977,6 +981,11 @@ Paper Maker = Kağıt Üreticisi Circus = Sirk + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = Surlar Walls of Babylon = Babil Surları @@ -4038,9 +4047,6 @@ Heal adjacent units for an additional 15 HP per turn = Bitişik birimlere iyile #################### 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 #################### diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 66b5ab24c3..49ebdddc5c 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -621,6 +621,8 @@ Convert production to gold at a rate of 4 to 1 = Конвертує виробн Convert production to science at a rate of [rate] to 1 = Конвертує виробництво в науку з курсом [rate] до 1 The city will not produce anything. = Місто не буде нічого виробляти. Worked by [cityName] = Працівник міста [cityName] + # Requires translation! +Lock = # Technology UI @@ -653,6 +655,8 @@ Landing = Висадка Flanking = Атака з флангу vs [unitType] = проти: [unitType] Terrain = Місцевість + # Requires translation! +Missing resource = Hurry Research = Завершити дослідження @@ -928,6 +932,11 @@ Paper Maker = Папірня Circus = Цирк + # Requires translation! +Must be next to river = + # Requires translation! +Water Mill = + Walls = Мури Walls of Babylon = Мури Вавилону @@ -3397,9 +3406,6 @@ Heal adjacent units for an additional 15 HP per turn = Сусідні підро #################### 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 #################### diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 050869bb90..681418d7a0 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -5,16 +5,16 @@ Polish = 96 Russian = 99 Lithuanian = 26 Romanian = 46 -Korean = 100 -Simplified_Chinese = 91 -German = 100 -Japanese = 100 +Korean = 99 +Simplified_Chinese = 90 +German = 99 +Japanese = 99 Turkish = 75 English = 1 Ukrainian = 99 French = 98 Portuguese = 52 -Indonesian = 100 +Indonesian = 99 Czech = 62 Spanish = 99 Malay = 6 diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 65cdf85bb5..881d72ccab 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -3,8 +3,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.3.71" const val appName = "Unciv" - const val appCodeNumber = 447 - const val appVersion = "3.9.11" + const val appCodeNumber = 448 + const val appVersion = "3.9.12" const val gdxVersion = "1.9.10" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 14d0c2fc69..79d38eec8c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,17 @@ +## 3.9.12 + +Added Water Mill building + +Add mod compatibility for extended map editor - By alkorolyov + +Main menu buttons no longer require scrolling + +By lishaoxia1985: +- Close button on map management screen no longer disappears when deleting all maps +- Scout obsoletes per Civ V + +Translation updates + ## 3.9.11 Better Civilopedia icons for buildings and units diff --git a/core/src/com/unciv/MainMenuScreen.kt b/core/src/com/unciv/MainMenuScreen.kt index 2e89ed9dd1..4cda734b07 100644 --- a/core/src/com/unciv/MainMenuScreen.kt +++ b/core/src/com/unciv/MainMenuScreen.kt @@ -97,9 +97,10 @@ class MainMenuScreen: CameraStageBaseScreen() { val mapEditorScreenTable = getTableBlock("Map editor", "OtherIcons/MapEditor") { openMapEditorPopup() } - table.add(mapEditorScreenTable) + table.add(mapEditorScreenTable).padBottom(0f) // set the same width for all buttons + table.cells.first().padTop(0f) table.pack() table.children.filterIsInstance().forEach { it.align(Align.left) @@ -109,7 +110,7 @@ class MainMenuScreen: CameraStageBaseScreen() { table.pack() val scroll = ScrollPane(table) - scroll.setSize(table.width, stage.height * 0.9f) + scroll.setSize(table.width, stage.height * 0.98f) scroll.center(stage) scroll.setOverscroll(false, false) stage.addActor(scroll)