From f7ff1bd267c8e3c1ef87da8eb5259b37a878b335 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 9 Oct 2020 14:39:41 +0300 Subject: [PATCH] Translation generation can handle multiple parameters of the same type --- .../translations/Brazilian_Portuguese.properties | 14 ++++++++++++-- android/assets/jsons/translations/Czech.properties | 14 ++++++++++++-- android/assets/jsons/translations/Dutch.properties | 13 +++++++++++-- .../assets/jsons/translations/English.properties | 13 +++++++++++-- .../assets/jsons/translations/Finnish.properties | 14 ++++++++++++-- .../assets/jsons/translations/French.properties | 14 ++++++++++++-- .../assets/jsons/translations/German.properties | 14 ++++++++++++-- .../assets/jsons/translations/Hungarian.properties | 14 ++++++++++++-- .../jsons/translations/Indonesian.properties | 14 ++++++++++++-- .../assets/jsons/translations/Italian.properties | 14 ++++++++++++-- .../assets/jsons/translations/Japanese.properties | 14 ++++++++++++-- .../assets/jsons/translations/Korean.properties | 14 ++++++++++++-- .../jsons/translations/Lithuanian.properties | 13 +++++++++++-- android/assets/jsons/translations/Malay.properties | 13 +++++++++++-- .../translations/Persian_(Pinglish-DIN).properties | 13 +++++++++++-- .../translations/Persian_(Pinglish-UN).properties | 13 +++++++++++-- .../assets/jsons/translations/Polish.properties | 14 ++++++++++++-- .../jsons/translations/Portuguese.properties | 14 ++++++++++++-- .../assets/jsons/translations/Romanian.properties | 14 ++++++++++++-- .../assets/jsons/translations/Russian.properties | 14 ++++++++++++-- .../translations/Simplified_Chinese.properties | 14 ++++++++++++-- .../assets/jsons/translations/Spanish.properties | 14 ++++++++++++-- .../translations/Traditional_Chinese.properties | 14 ++++++++++++-- .../assets/jsons/translations/Turkish.properties | 14 ++++++++++++-- .../assets/jsons/translations/Ukrainian.properties | 14 ++++++++++++-- .../translations/completionPercentages.properties | 10 +++++----- .../models/translations/TranslationFileWriter.kt | 11 ++++++++++- 27 files changed, 309 insertions(+), 56 deletions(-) diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index f4fd2855bd..5c4302a012 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -860,6 +860,10 @@ Composite Bowman = Arqueiro Composto Foreign Land = Terra Estrangeira # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Náutico Mobile SAM = Veículo Lançador de Mísseis Paratrooper = Forças Especiais @@ -2561,7 +2565,7 @@ Wayfinding = Orientação +1 Sight when embarked = +1 Visão enquanto estiver embarcado Can embark and move over Coasts and Oceans immediately = Consegue embarcar e mover sobre Costas e Oceanos imediatamente # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = Honolulu = Honolulu Samoa = Samoa # Requires translation! @@ -3349,7 +3353,8 @@ Tile yield from Great Improvements +100% = Ganho obtido por Grandes Melhorias +1 Freedom = Liberdade Populism = Populismo -Wounded military units deal +25% damage = +25% dano para unidades militares feridas + # Requires translation! +[param] units deal +[amount]% damage = Militarism = Militarismo Gold cost of purchasing units -33% = -33% custo de comprar unidades Fascism = Fascismo @@ -3371,6 +3376,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 9a3ae4db57..3829d635a2 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -866,6 +866,10 @@ Composite Bowman = Kompozitní lučištník Foreign Land = Cizí země # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Námořní pěchota Mobile SAM = Mobilní SAM Paratrooper = Výsadkář @@ -2549,7 +2553,7 @@ Wayfinding = Hledání cest +1 Sight when embarked = +1 dohled při nalodění Can embark and move over Coasts and Oceans immediately = Může se okamžitě přesunovat mezi pevninou a oceánem # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = Honolulu = Honolulu # Requires translation! Samoa = @@ -3487,7 +3491,8 @@ Tile yield from Great Improvements +100% = Zisk z políček od Velkých vylepše Freedom = Svoboda Populism = Populismus -Wounded military units deal +25% damage = Zraněné vojenské jednotky způsobí 25% poškození více + # Requires translation! +[param] units deal +[amount]% damage = Militarism = Militarismus Gold cost of purchasing units -33% = Cena za nákup jednotek se snižuje o 33% Fascism = Fašismus @@ -3509,6 +3514,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index b601d40148..034b2a30f3 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -1239,6 +1239,10 @@ Foreign Land = # Requires translation! Friendly Land = # Requires translation! +Air = + # Requires translation! +Wounded = + # Requires translation! Marine = # Requires translation! Mobile SAM = @@ -3620,7 +3624,7 @@ Wayfinding = # Requires translation! Can embark and move over Coasts and Oceans immediately = # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = # Requires translation! Honolulu = # Requires translation! @@ -4727,7 +4731,7 @@ Freedom = # Requires translation! Populism = # Requires translation! -Wounded military units deal +25% damage = +[param] units deal +[amount]% damage = # Requires translation! Militarism = # Requires translation! @@ -4760,6 +4764,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index a08bcce29c..9b37b5981e 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -1611,6 +1611,10 @@ Foreign Land = # Requires translation! Friendly Land = # Requires translation! +Air = + # Requires translation! +Wounded = + # Requires translation! Marine = # Requires translation! Mobile SAM = @@ -4014,7 +4018,7 @@ Wayfinding = # Requires translation! Can embark and move over Coasts and Oceans immediately = # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = # Requires translation! Honolulu = # Requires translation! @@ -5125,7 +5129,7 @@ Freedom = # Requires translation! Populism = # Requires translation! -Wounded military units deal +25% damage = +[param] units deal +[amount]% damage = # Requires translation! Militarism = # Requires translation! @@ -5159,6 +5163,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index f879f9691c..bff7c45e83 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -912,6 +912,10 @@ Composite Bowman = Yhdistelmäjousi Foreign Land = Vierailla Mailla # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Rannikkojääkäri Mobile SAM = Ilmatorjuntaohjusjärjestelmä Paratrooper = Laskuvarjojääkäri @@ -2391,7 +2395,7 @@ Wayfinding = Suunnistus +1 Sight when embarked = +1 Näkökyky kuivan maan yksiköille vesillä. Can embark and move over Coasts and Oceans immediately = Kuivan maan yksiköt voivat siirtyä vesille ja liikkua Rantavesissä ja Merellä heti # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = Honolulu = Honolulu # Requires translation! Samoa = @@ -3431,7 +3435,8 @@ Tile yield from Great Improvements +100% = Freedom = Vapaus Populism = Populismi -Wounded military units deal +25% damage = Haavoittuneet sotilasyksiköt tekevät 25% enemmän vahinkoa + # Requires translation! +[param] units deal +[amount]% damage = Militarism = Militarismi # Requires translation! Gold cost of purchasing units -33% = @@ -3463,6 +3468,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 4f9dac0996..aef728e1bc 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -951,6 +951,10 @@ Composite Bowman = Archer composite Foreign Land = Terre étrangère # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Fusilier marin Mobile SAM = Lance-missiles SAM mobile Paratrooper = Parachutiste @@ -2299,7 +2303,7 @@ Wayfinding = Orientation # Requires translation! Can embark and move over Coasts and Oceans immediately = # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = Honolulu = Honolulu Samoa = Samoa Tonga = Tonga @@ -2962,7 +2966,8 @@ Tile yield from Great Improvements +100% = Freedom = Liberté Populism = Populisme -Wounded military units deal +25% damage = Les unités militaires blessés infligent +25% dégâts + # Requires translation! +[param] units deal +[amount]% damage = Militarism = Militarisme Gold cost of purchasing units -33% = Le coût d'achat des unités militaires est réduit de 33% Fascism = fascisme @@ -2986,6 +2991,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index fdb12650a0..688fca7098 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -860,6 +860,10 @@ Composite Bowman = Kompositbogenschütze Foreign Land = Fremdes Land # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Marine Mobile SAM = Mobile Flugabwehrrakete Paratrooper = Fallschirmjäger @@ -2141,7 +2145,7 @@ Wayfinding = Pfadfinder +1 Sight when embarked = +1 Sicht, wenn eingeschifft Can embark and move over Coasts and Oceans immediately = Kann sich sofort einschiffen und über Küsten und Ozean bewegen # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = Honolulu = Honolulu Samoa = Samoa Tonga = Tonga @@ -2720,7 +2724,8 @@ Tile yield from Great Improvements +100% = Kachelerträge von Großen Modernisie Freedom = Freiheit Populism = Populismus -Wounded military units deal +25% damage = Verwundete Militäreinheiten haben +25% Schaden + # Requires translation! +[param] units deal +[amount]% damage = Militarism = Militarismus Gold cost of purchasing units -33% = -33% Goldkosten für das Kaufen von Einheiten Fascism = Faschismus @@ -2740,6 +2745,11 @@ Autocracy = Autokratie Route = Strecke Build a road to connect your capital to our city. = Baut eine Straße, um Eure Hauptstadt mit unserer Stadt zu verbinden. + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + Connect Resource = Ressource anschließen In order to make our civilizations stronger, connect [param] to your trade network. = Um unsere Zivilisationen zu stärken, verbindet [param] mit Eurem Handelsnetzwerk. diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 5b64a13656..1693d767ff 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -869,6 +869,10 @@ Composite Bowman = Kompozit íjász Foreign Land = Idegen föld # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Tengerészgyalogos Mobile SAM = Mobilizált légvédelemi rakéta Paratrooper = Ejtőernyős @@ -2484,7 +2488,7 @@ Wayfinding = # Requires translation! Can embark and move over Coasts and Oceans immediately = # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = Honolulu = Honolulu Samoa = Szamoa Tonga = Tonga @@ -3368,7 +3372,8 @@ Tile yield from Great Improvements +100% = Freedom = Függetlenség Populism = Populizmus -Wounded military units deal +25% damage = Sérült egységek +25% sérülést okoznak + # Requires translation! +[param] units deal +[amount]% damage = Militarism = Militarizmus Gold cost of purchasing units -33% = -33% aranyba kerül az egységek megvétele Fascism = Fasizmus @@ -3390,6 +3395,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 4c7e494bfb..52c43e4309 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -865,6 +865,10 @@ Composite Bowman = Pemanah Paduan Foreign Land = Tanah Asing # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Marinir Mobile SAM = Mobile SAM Paratrooper = Penerjun Payung @@ -2146,7 +2150,7 @@ Wayfinding = Pencari Jalan +1 Sight when embarked = +1 Penglihatan ketika melaut. Can embark and move over Coasts and Oceans immediately = Langsung dapat melaut dan bergerak sepanjang Pesisir dan Samudra. # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = Honolulu = Honolulu Samoa = Samoa Tonga = Tonga @@ -2726,7 +2730,8 @@ Tile yield from Great Improvements +100% = Hasil dari daerah yang dibangun impro Freedom = Kebebasan Populism = Populisme -Wounded military units deal +25% damage = Unit militer yang terluka menghasilkan +25% kerusakan. + # Requires translation! +[param] units deal +[amount]% damage = Militarism = Miltarisme Gold cost of purchasing units -33% = Biaya emas untuk membeli unit -33%. Fascism = Fasisme @@ -2748,6 +2753,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 507f4baebd..3f2c9f7543 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -860,6 +860,10 @@ Composite Bowman = Arciere composito Foreign Land = Terra Straniera # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Marine Mobile SAM = SAM mobile Paratrooper = Paracadutista @@ -2141,7 +2145,7 @@ Wayfinding = Orientamento +1 Sight when embarked = +1 Visione per le unità imbarcate Can embark and move over Coasts and Oceans immediately = Puoi muoverti e imbarcarti nelle Coste e negli Oceani fin da subito # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = Honolulu = Honolulu Samoa = Samoa Tonga = Tonga @@ -2720,7 +2724,8 @@ Tile yield from Great Improvements +100% = Doppia resa (+100%) dai miglioramenti Freedom = Uguaglianza Populism = Populismo -Wounded military units deal +25% damage = +25% danno per le unità militari ferite + # Requires translation! +[param] units deal +[amount]% damage = Militarism = Militarismo Gold cost of purchasing units -33% = -33% costi d'acquisto in Oro per le unità Fascism = Fascismo @@ -2740,6 +2745,11 @@ Autocracy = Autocrazia Route = Itinerario Build a road to connect your capital to our city. = Gradiremmo che tu costruissi una strada che colleghi la nostra città alla tua capitale. + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + Connect Resource = Collega risorsa In order to make our civilizations stronger, connect [param] to your trade network. = Ti chiediamo di collegare la nostra risorsa di [param] alla tua rete commerciale. In questo modo, i nostri legami e i nostri commerci diverranno più forti. diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 08d3ff20cd..8adb79fc3e 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -867,6 +867,10 @@ Composite Bowman = 戦闘弓射手 Foreign Land = 異国の地 # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = 海兵隊 Mobile SAM = 移動式SAM Paratrooper = 空挺部隊 @@ -2154,7 +2158,7 @@ Wayfinding = ウェイファインディング +1 Sight when embarked = 乗船時に視界+1 Can embark and move over Coasts and Oceans immediately = 乗船時に最初から外海の上を移動できる # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = Honolulu = ホノルル Samoa = サモア Tonga = トンガ @@ -2734,7 +2738,8 @@ Tile yield from Great Improvements +100% = 偉人建造物によるタイルの Freedom = 自由 Populism = ポピュリズム -Wounded military units deal +25% damage = 負傷した軍事ユニットの戦闘力+25% + # Requires translation! +[param] units deal +[amount]% damage = Militarism = 軍事主義 Gold cost of purchasing units -33% = ユニット購入時の価格-33% Fascism = ファシズム @@ -2756,6 +2761,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index e64ffaf42f..4b7a16f04a 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -909,6 +909,10 @@ Composite Bowman = 합성궁병 Foreign Land = 우호적 영토 아님 # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = 해병대 Mobile SAM = 이동식 SAM 발사대 Paratrooper = 공수부대 @@ -2225,7 +2229,7 @@ Wayfinding = 활로 개척 +1 Sight when embarked = 승선시 시야 +1 Can embark and move over Coasts and Oceans immediately = 시작 직후 연안, 대양 타일로 승선, 이동 가능 # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = Honolulu = 호놀룰루 Samoa = 사모아 Tonga = 통가 @@ -2858,7 +2862,8 @@ Tile yield from Great Improvements +100% = 위인 시설의 산출량 +100% Freedom = 평등 Populism = 포퓰리즘 -Wounded military units deal +25% damage = 부상당한 군사 유닛이 주는 피해 +25% + # Requires translation! +[param] units deal +[amount]% damage = Militarism = 군국주의 Gold cost of purchasing units -33% = 유닛을 금으로 구매하는 비용 -33% Fascism = 파시즘 @@ -2881,6 +2886,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index d8b9833a36..afd0857188 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -955,6 +955,10 @@ Composite Bowman = Kompozitinis Bowmanas Foreign Land = Svetima žemė # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Jūrų Mobile SAM = Mobilusis SAM Paratrooper = Desantininkas @@ -3313,7 +3317,7 @@ Wayfinding = Kelio aptikimas # Requires translation! Can embark and move over Coasts and Oceans immediately = # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = # Requires translation! Honolulu = # Requires translation! @@ -4418,7 +4422,7 @@ Freedom = # Requires translation! Populism = # Requires translation! -Wounded military units deal +25% damage = +[param] units deal +[amount]% damage = # Requires translation! Militarism = # Requires translation! @@ -4452,6 +4456,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 572cf8f31e..dd9d8b44ac 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -1492,6 +1492,10 @@ Composite Bowman = Foreign Land = # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Marin # Requires translation! Mobile SAM = @@ -3814,7 +3818,7 @@ Wayfinding = # Requires translation! Can embark and move over Coasts and Oceans immediately = # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = # Requires translation! Honolulu = # Requires translation! @@ -4904,7 +4908,7 @@ Freedom = # Requires translation! Populism = # Requires translation! -Wounded military units deal +25% damage = +[param] units deal +[amount]% damage = # Requires translation! Militarism = # Requires translation! @@ -4937,6 +4941,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index c76d6727cb..2e6d305f98 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -916,6 +916,10 @@ Composite Bowman = Kamāndār e morakkab Foreign Land = Zamin e ḵāreji # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Daryāi Mobile SAM = Moošak e zamin-be-havā ye moteharrek Paratrooper = Čatrbāz @@ -3245,7 +3249,7 @@ Wayfinding = Masiryābi # Requires translation! Can embark and move over Coasts and Oceans immediately = # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = # Requires translation! Honolulu = # Requires translation! @@ -4349,7 +4353,7 @@ Freedom = # Requires translation! Populism = # Requires translation! -Wounded military units deal +25% damage = +[param] units deal +[amount]% damage = # Requires translation! Militarism = # Requires translation! @@ -4383,6 +4387,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index 961697cd11..177dd22633 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -920,6 +920,10 @@ Composite Bowman = Kamaandaar e morakkab Foreign Land = Zamin e khaareji # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Daryaai Mobile SAM = Mooshak e zamin-be-havaa ye moteharrek Paratrooper = Chatrbaaz @@ -3249,7 +3253,7 @@ Wayfinding = Masiryaabi # Requires translation! Can embark and move over Coasts and Oceans immediately = # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = # Requires translation! Honolulu = # Requires translation! @@ -4353,7 +4357,7 @@ Freedom = # Requires translation! Populism = # Requires translation! -Wounded military units deal +25% damage = +[param] units deal +[amount]% damage = # Requires translation! Militarism = # Requires translation! @@ -4387,6 +4391,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 6ef7ff4527..6bb20529b0 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -907,6 +907,10 @@ Composite Bowman = Łucznik z Łukiem Kompozytowym Foreign Land = Obce Terytorium # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Piechota Morska Mobile SAM = Wyrzutnie SAM Paratrooper = Spadochroniarz @@ -2223,7 +2227,7 @@ Wayfinding = Astronawigacja +1 Sight when embarked = +1 do zasięgu wzroku jednostek zaokrętowanych Can embark and move over Coasts and Oceans immediately = Może się zaokrętować i natychmiast wypłynąć na wybrzeża i ocean. # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = Honolulu = Honolulu Samoa = Samoa Tonga = Tonga @@ -2856,7 +2860,8 @@ Tile yield from Great Improvements +100% = Dochody z pól ulepszeń wielkich lud Freedom = Swobody Populism = Populizm -Wounded military units deal +25% damage = Zranione jednostki zadają obrażenia o 25% większe + # Requires translation! +[param] units deal +[amount]% damage = Militarism = Militaryzm Gold cost of purchasing units -33% = Koszt w złocie za zakup jednostek maleje o 33% Fascism = Faszyzm @@ -2879,6 +2884,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 986055af07..5d934b9365 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -993,6 +993,10 @@ Composite Bowman = Arqueiro Composto Foreign Land = Terra estrangeira # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Náutico Mobile SAM = Veículo LM Paratrooper = Forças Especiais @@ -3130,7 +3134,7 @@ Wayfinding = Orientação # Requires translation! Can embark and move over Coasts and Oceans immediately = # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = # Requires translation! Honolulu = # Requires translation! @@ -4165,7 +4169,8 @@ Tile yield from Great Improvements +100% = Freedom = Liberdade Populism = Populismo -Wounded military units deal +25% damage = +25% dano para unidades militares feridas + # Requires translation! +[param] units deal +[amount]% damage = Militarism = Militarismo Gold cost of purchasing units -33% = -33% custo de comprar unidades Fascism = Fascismo @@ -4189,6 +4194,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index f5d78e5962..fc67cb0098 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -991,6 +991,10 @@ Composite Bowman = Arcaș cu arc compozit Foreign Land = # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Pușcaș marin Mobile SAM = Tanc antiaerian Paratrooper = Parașutist @@ -3197,7 +3201,7 @@ Wayfinding = Orientare # Requires translation! Can embark and move over Coasts and Oceans immediately = # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = # Requires translation! Honolulu = # Requires translation! @@ -4225,7 +4229,8 @@ Tile yield from Great Improvements +100% = Freedom = Libertate Populism = Populism -Wounded military units deal +25% damage = Unitățile militare rănite fac distrugeri +25% + # Requires translation! +[param] units deal +[amount]% damage = Militarism = Militarism Gold cost of purchasing units -33% = Costul cumpărării de unități -33% Fascism = Fascism @@ -4251,6 +4256,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 52deb77665..45d5c480be 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -881,6 +881,10 @@ Composite Bowman = Лучник (составной лук) Foreign Land = Чужая земля # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Морской пехотинец Mobile SAM = Мобильный ЗРК Paratrooper = Парашютист @@ -2192,7 +2196,7 @@ Wayfinding = Поиск пути +1 Sight when embarked = +1 к Обзору при погружении на корабль Can embark and move over Coasts and Oceans immediately = Сразу может погружаться на корабль, а также плавать по побережьям и океанам # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = Honolulu = Гонолулу Samoa = Самоа Tonga = Тонга @@ -2818,7 +2822,8 @@ Tile yield from Great Improvements +100% = Удваивается доход к Freedom = Свобода Populism = Популизм -Wounded military units deal +25% damage = Раненые юниты наносят на 25% больше урона + # Requires translation! +[param] units deal +[amount]% damage = Militarism = Милитаризм Gold cost of purchasing units -33% = Стоимость покупки юнитов снижается на 33% Fascism = Фашизм @@ -2840,6 +2845,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index de61dfb0aa..8741c1adf3 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -860,6 +860,10 @@ Composite Bowman = 复合弓兵 Foreign Land = 境外 # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = 海军陆战队 Mobile SAM = 防空导弹车 Paratrooper = 伞兵 @@ -2141,7 +2145,7 @@ Wayfinding = 海路探寻 +1 Sight when embarked = 单位处于船运状态时+1视野 Can embark and move over Coasts and Oceans immediately = 单位初始就拥有船运能力，可进入海滨和海洋地块 # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = Honolulu = 火奴鲁鲁 Samoa = 萨摩亚 Tonga = 汤加 @@ -2720,7 +2724,8 @@ Tile yield from Great Improvements +100% = 建有伟人设施的地块产出+100 Freedom = 自由政策 Populism = 民粹主义 -Wounded military units deal +25% damage = 受伤单位给予敌方造成的伤害+25% + # Requires translation! +[param] units deal +[amount]% damage = Militarism = 军国主义 Gold cost of purchasing units -33% = 购买单位时的金钱花费-33% Fascism = 法西斯 @@ -2740,6 +2745,11 @@ Autocracy = 独裁政策 Route = 修路 Build a road to connect your capital to our city. = 如果你能建造我们首都之间的道路，将极大的有利于我们的文明。 + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + Connect Resource = 连接资源 In order to make our civilizations stronger, connect [param] to your trade network. = 如果我们能找到[param]并将其连接到贸易网络，我们的商人将会十分高兴。 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index a4dd0fdac7..84bff3a5c1 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -865,6 +865,10 @@ Composite Bowman = Arquero Compuesto Foreign Land = Tierra extranjera # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Marine Mobile SAM = Vehículo SAM Paratrooper = Fuerzas Especiales @@ -2146,7 +2150,7 @@ Wayfinding = Orientación +1 Sight when embarked = +1 vista al embarcar Can embark and move over Coasts and Oceans immediately = Puede embarcarse y moverse sobre costas y océanos inmediatamente. # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = Honolulu = Honolulu Samoa = Samoa Tonga = Tonfa @@ -2725,7 +2729,8 @@ Tile yield from Great Improvements +100% = Rendimiento de casillas de grandes me Freedom = Libertad Populism = Populismo -Wounded military units deal +25% damage = Las unidades militares hacen un +25% de daño cuando estan heridas + # Requires translation! +[param] units deal +[amount]% damage = Militarism = Militarismo Gold cost of purchasing units -33% = Coste de comprar oro reducido a -33% Fascism = Facismo @@ -2747,6 +2752,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index c7fd00e534..7fa7a1b176 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -891,6 +891,10 @@ Composite Bowman = 複合弓兵 Foreign Land = 境外 # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = 海軍陸戰隊 Mobile SAM = 防空導彈車 Paratrooper = 傘兵 @@ -2198,7 +2202,7 @@ Wayfinding = 海路探尋 +1 Sight when embarked = 單位處於船運狀態時+1視野 Can embark and move over Coasts and Oceans immediately = 單位初始就擁有船運能力，可進入海濱和海洋地塊 # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = Honolulu = 火奴魯魯 Samoa = 薩摩亞 Tonga = 湯加 @@ -2824,7 +2828,8 @@ Tile yield from Great Improvements +100% = 建有偉人設施的地塊產出+100 Freedom = 自由政策 Populism = 民粹主義 -Wounded military units deal +25% damage = 受傷單位給予敵方造成的傷害+25% + # Requires translation! +[param] units deal +[amount]% damage = Militarism = 軍國主義 Gold cost of purchasing units -33% = 購買單位時的金錢花費-33% Fascism = 法西斯 @@ -2846,6 +2851,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 50a1f62471..9b5d9b123d 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -919,6 +919,10 @@ Composite Bowman = Karma Okçular Foreign Land = Yabancı ülke # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Bahriyeler Mobile SAM = Mobil SAM Paratrooper = Paraşütçü Asker @@ -2485,7 +2489,7 @@ Wayfinding = Yolbulucuk # Requires translation! Can embark and move over Coasts and Oceans immediately = # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = # Requires translation! Honolulu = Samoa = Samoa @@ -3460,7 +3464,8 @@ Tile yield from Great Improvements +100% = Freedom = Özgürlük Populism = Popülizm -Wounded military units deal +25% damage = Yaralı askeri birimler +25% hasar verir + # Requires translation! +[param] units deal +[amount]% damage = Militarism = Askri Zihniyet Gold cost of purchasing units -33% = Birimleri satın alma maliyeti -33% Fascism = Faşizm @@ -3484,6 +3489,11 @@ Route = # Requires translation! Build a road to connect your capital to our city. = + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 7a5e673fa2..2c229ea419 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -861,6 +861,10 @@ Composite Bowman = Складний лук Foreign Land = Ворожа територія # Requires translation! Friendly Land = + # Requires translation! +Air = + # Requires translation! +Wounded = Marine = Морська піхота Mobile SAM = Мобільна зенітна ракета Paratrooper = Десантник @@ -2142,7 +2146,7 @@ Wayfinding = Пошук шляху +1 Sight when embarked = +1 огляд, коли сухопутні підрозділи на воді Can embark and move over Coasts and Oceans immediately = Можна одразу сісти на корабель та рухатися узбережжями та океанами # Requires translation! -+[amount]% Strength if within [amount] tiles of a [tileImprovement] = ++[amount]% Strength if within [amount2] tiles of a [tileImprovement] = Honolulu = Гонолулу Samoa = Самоа Tonga = Тонґа @@ -2721,7 +2725,8 @@ Tile yield from Great Improvements +100% = Збільшує урожайніст Freedom = Свобода Populism = Популізм -Wounded military units deal +25% damage = Поранені військові частини завдають +25% шкоди + # Requires translation! +[param] units deal +[amount]% damage = Militarism = Мілітаризм Gold cost of purchasing units -33% = Ціна купівлі підрозділів -33% Fascism = Фашизм @@ -2741,6 +2746,11 @@ Autocracy = Автократія Route = Маршрут Build a road to connect your capital to our city. = Побудуйте дорогу, що з'єднає вашу столицю з нашим містом. + # Requires translation! +Clear Barbarian Camp = + # Requires translation! +We feel threatened by a Barbarian Camp near our city. Please take care of it. = + # Requires translation! Connect Resource = # Requires translation! diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index ec779a2786..4efc96d7b3 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -2,22 +2,22 @@ Persian_(Pinglish-UN) = 25 Italian = 99 Russian = 95 German = 99 -Turkish = 72 +Turkish = 71 Ukrainian = 99 French = 90 Portuguese = 46 Indonesian = 99 -Finnish = 61 +Finnish = 60 Spanish = 99 Malay = 11 Brazilian_Portuguese = 78 Traditional_Chinese = 95 Polish = 94 Lithuanian = 24 -Romanian = 41 -Korean = 94 +Romanian = 40 +Korean = 93 Simplified_Chinese = 99 -Persian_(Pinglish-DIN) = 26 +Persian_(Pinglish-DIN) = 25 Japanese = 98 English = 1 Czech = 73 diff --git a/core/src/com/unciv/models/translations/TranslationFileWriter.kt b/core/src/com/unciv/models/translations/TranslationFileWriter.kt index 91d6d7bd1f..3596ac31ea 100644 --- a/core/src/com/unciv/models/translations/TranslationFileWriter.kt +++ b/core/src/com/unciv/models/translations/TranslationFileWriter.kt @@ -199,9 +199,11 @@ object TranslationFileWriter { val parameters = string.getPlaceholderParameters() var stringToTranslate = string + + val existingParameterNames = HashSet() if (parameters.any()){ for(parameter in parameters) { - val parameterName = when { + var parameterName = when { parameter.toIntOrNull() != null -> "amount" Stat.values().any { it.name == parameter } -> "stat" RulesetCache.getBaseRuleset().terrains.containsKey(parameter) -> "terrain" @@ -217,6 +219,13 @@ object TranslationFileWriter { Stats.isStats(parameter) -> "stats" else -> "param" } + if (parameterName in existingParameterNames) { + var i = 2 + while (parameterName + i in existingParameterNames) i++ + parameterName = parameterName + i + } + existingParameterNames += parameterName + stringToTranslate = stringToTranslate.replace(parameter, parameterName) } }