From ca58cf16944a9aacc440a66ea3be8d61352d13f4 Mon Sep 17 00:00:00 2001 From: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com> Date: Sun, 27 Jun 2021 20:22:47 +0200 Subject: [PATCH] Translation template fixes (#4287) * Translation template fixes * Translation template fixes - patch * Translation template fixes - another --- .../translations/Brazilian_Portuguese.properties | 2 +- .../jsons/translations/Bulgarian.properties | 2 +- .../assets/jsons/translations/Czech.properties | 2 +- .../assets/jsons/translations/Dutch.properties | 2 +- .../assets/jsons/translations/English.properties | 2 +- .../assets/jsons/translations/Finnish.properties | 2 +- .../assets/jsons/translations/French.properties | 2 +- .../assets/jsons/translations/German.properties | 15 +++++++++++++-- .../jsons/translations/Hungarian.properties | 2 +- .../jsons/translations/Indonesian.properties | 2 +- .../assets/jsons/translations/Italian.properties | 2 +- .../assets/jsons/translations/Japanese.properties | 2 +- .../assets/jsons/translations/Korean.properties | 2 +- .../jsons/translations/Lithuanian.properties | 2 +- .../assets/jsons/translations/Malay.properties | 2 +- .../Persian_(Pinglish-DIN).properties | 2 +- .../translations/Persian_(Pinglish-UN).properties | 2 +- .../assets/jsons/translations/Polish.properties | 2 +- .../jsons/translations/Portuguese.properties | 2 +- .../assets/jsons/translations/Romanian.properties | 2 +- .../assets/jsons/translations/Russian.properties | 2 +- .../translations/Simplified_Chinese.properties | 2 +- .../assets/jsons/translations/Spanish.properties | 2 +- .../assets/jsons/translations/Swedish.properties | 2 +- .../translations/Traditional_Chinese.properties | 2 +- .../assets/jsons/translations/Turkish.properties | 4 ++-- .../jsons/translations/Ukrainian.properties | 2 +- .../jsons/translations/Vietnamese.properties | 2 +- .../assets/jsons/translations/template.properties | 13 ++++++++++++- core/src/com/unciv/ui/saves/SaveGameScreen.kt | 2 +- .../unciv/ui/worldscreen/mainmenu/OptionsPopup.kt | 8 ++++---- 31 files changed, 58 insertions(+), 36 deletions(-) rename Fixed last merge (Turkish) => android/assets/jsons/translations/Turkish.properties (99%) diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 29dde7cea4..3e3858fd6a 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -513,7 +513,7 @@ Your relationship with [cityStateName] is about to degrade = Seu relacionamento Your relationship with [cityStateName] degraded = Seu relacionamento com [cityStateName] se degradou A new barbarian encampment has spawned! = Um novo acampamento bárbaro apareceu! Received [goldAmount] Gold for capturing [cityName] = Recebeu [goldAmount] de Ouro por capturar [cityName] -Our proposed trade request is no longer relevant! = Nosso pedido de troca proposto não é mais relevante! +Our proposed trade is no longer relevant! = Nosso pedido de troca proposto não é mais relevante! [defender] could not withdraw from a [attacker] - blocked. = O [defender] não pôde se retirar de um(a) [attacker] - bloqueado. [defender] withdrew from a [attacker] = O [defender] se retirou de um(a) [attacker] [building] has provided [amount] Gold! = [building] forneceu [amount] de Ouro! diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties index 6c3dfe293c..5ddad5a562 100644 --- a/android/assets/jsons/translations/Bulgarian.properties +++ b/android/assets/jsons/translations/Bulgarian.properties @@ -505,7 +505,7 @@ Your relationship with [cityStateName] is about to degrade = Взаимотно Your relationship with [cityStateName] degraded = Взаимотношенията Ви с [cityStateName] се влошиха A new barbarian encampment has spawned! = Появи се нов варварски лагер! Received [goldAmount] Gold for capturing [cityName] = Получено [goldAmount] злато за завладяването на [cityName] -Our proposed trade request is no longer relevant! = Нашето предложение за търговия вече не е стойностно! +Our proposed trade is no longer relevant! = Нашето предложение за търговия вече не е стойностно! [defender] could not withdraw from a [attacker] - blocked. = [defender] не можа да избяга от [attacker] - блокиран. [defender] withdrew from a [attacker] = [defender] избяга от [attacker] [building] has provided [amount] Gold! = [building] добави [amount] злато! diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 15e01e0f14..59aec4120a 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -473,7 +473,7 @@ Your relationship with [cityStateName] is about to degrade = Vaše vztahy s [cit Your relationship with [cityStateName] degraded = Vaše vztahy s [cityStateName] se zhoršily A new barbarian encampment has spawned! = Objeven nový tábor barbarů! Received [goldAmount] Gold for capturing [cityName] = Získali jsme [goldAmount] Zlata při obsazení [cityName] -Our proposed trade request is no longer relevant! = Naše obchodní nabídka již není relevantni! +Our proposed trade is no longer relevant! = Naše obchodní nabídka již není relevantni! [defender] could not withdraw from a [attacker] - blocked. = Jednotka [defender] nemohla ustoupit před jednotkou [attacker] - zablokována. [defender] withdrew from a [attacker] = Jednotka [defender] ustoupila před jednotkou [attacker] [building] has provided [amount] Gold! = Budova [building] poskytla [amount] zlata! diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 82703c254a..ba3687bf4f 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -498,7 +498,7 @@ Your relationship with [cityStateName] is about to degrade = Je relatie met [cit Your relationship with [cityStateName] degraded = Je relatie met [cityStateName] is verslechterd A new barbarian encampment has spawned! = Er is een nieuw barbarenkamp verschenen! Received [goldAmount] Gold for capturing [cityName] = [goldAmount] goud gekregen voor het veroveren van [cityName] -Our proposed trade request is no longer relevant! = Ons handelsvoorstel is niet langer relevant! +Our proposed trade is no longer relevant! = Ons handelsvoorstel is niet langer relevant! [defender] could not withdraw from a [attacker] - blocked. = [defender] kan niet terugtrekken van een [attacker] - geblokkeerd. [defender] withdrew from a [attacker] = [defender] trok zich terug van een [attacker] [building] has provided [amount] Gold! = [building] heeft [amount] goud opgeleverd! diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 6c61391c76..51dfb89891 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -891,7 +891,7 @@ A new barbarian encampment has spawned! = # Requires translation! Received [goldAmount] Gold for capturing [cityName] = # Requires translation! -Our proposed trade request is no longer relevant! = +Our proposed trade is no longer relevant! = # Requires translation! [defender] could not withdraw from a [attacker] - blocked. = # Requires translation! diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index 66d3358e41..f7c8d98cc4 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -529,7 +529,7 @@ Your relationship with [cityStateName] is about to degrade = Suhteesi Kaupunkiva Your relationship with [cityStateName] degraded = Suhteesi Kaupunkivaltion [cityStateName] kanssa aleni A new barbarian encampment has spawned! = Uusi barbaarileiri on syntynyt! Received [goldAmount] Gold for capturing [cityName] = Vastaanotimme [goldAmount] Kultaa vallattuamme kaupungin [cityName] -Our proposed trade request is no longer relevant! = Ehdottamallamme kauppasopimuksella ei ole enää merkitystä! +Our proposed trade is no longer relevant! = Ehdottamallamme kauppasopimuksella ei ole enää merkitystä! [defender] could not withdraw from a [attacker] - blocked. = [defender] ei voinut vetäytyä yksikön [attacker] hyökkäykseltä - estetty. [defender] withdrew from a [attacker] = [defender] vetäytyi yksikön [attacker] hyökkäykseltä [building] has provided [amount] Gold! = [building] toimitti [amount] Kultaa! diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 6520d588a8..611cf93954 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -484,7 +484,7 @@ Your relationship with [cityStateName] is about to degrade = Notre relation avec Your relationship with [cityStateName] degraded = Notre relation avec [cityStateName] s'est dégradée A new barbarian encampment has spawned! = Un nouveau campement barbare est apparu ! Received [goldAmount] Gold for capturing [cityName] = Vous recevez [goldAmount] Or pour la capture de [cityName] -Our proposed trade request is no longer relevant! = Notre offre commerciale n'est plus pertinente ! +Our proposed trade is no longer relevant! = Notre offre commerciale n'est plus pertinente ! [defender] could not withdraw from a [attacker] - blocked. = Bloqué, [defender] n'a pas pu se retirer face à [attacker]. [defender] withdrew from a [attacker] = [defender] a battu en retraite devant [attacker] [building] has provided [amount] Gold! = [building] vous a donné [amount] Or ! diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 94369e69af..0551fb70a7 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -35,6 +35,7 @@ Requires [buildingName] to be built in all cities = Benötigt den Bau von [build Provides a free [buildingName] in the city = Stellt das Gebäude [buildingName] in der Stadt kostenlos bereit Requires worked [resource] near city = Benötigt eine Bewirtschaftung von [resource] in der Nähe der Stadt Wonder is being built elsewhere = Das Wunder wird woanders gebaut +National Wonder is being built elsewhere = Das Nationale Wunder wird woanders gebaut Requires a [buildingName] in all cities = Benötigt das Gebäude [buildingName] in allen Städten Requires a [buildingName] in this city = Benötigt das Gebäude [buildingName] in dieser Stadt Consumes 1 [resource] = Verbraucht 1 [resource] @@ -244,7 +245,9 @@ Biome areas extension = Biombereichausdehnung Water level = Wasser-Niveau Reset to default = Auf Standard zurücksetzen +Show experimental world wrap for maps = 'World Wrap'-Option für neue Karten anbieten HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = WARNUNG: HOCHGRADIG EXPERIMENTELL! +Enable portrait orientation = Hochkant-Orientierung zulassen Online Multiplayer = Online Mehrspieler World Size = Kartengröße @@ -350,6 +353,10 @@ If you could copy your game data ("Copy saved game to clipboard" - = Wenn du de paste into an email to yairm210@hotmail.com) = und in eine E-Mail an mich (yairm210@hotmail.com) einfügst, I could maybe help you figure out what went wrong, since this isn't supposed to happen! = dann kann ich dir eventuell helfen den Grund zu finden - das sollte nicht passieren! Missing mods: [mods] = Fehlende Modifikation(en): [mods] +Load from custom location = Laden von externem Speicherort +Could not load game from custom location! = Laden von externem Speicherort fehlgeschlagen! +Save to custom location = Speichern in externem Speicherort +Could not save game to custom location! = Speichern in externem Speicherort fehlgeschlagen! # Options @@ -473,7 +480,7 @@ Your relationship with [cityStateName] is about to degrade = Eure Beziehung zu [ Your relationship with [cityStateName] degraded = Eure Beziehung zu [cityStateName] hat sich verschlechtert A new barbarian encampment has spawned! = Ein neues Barbarenlager ist erschienen! Received [goldAmount] Gold for capturing [cityName] = [goldAmount] Gold für die Eroberung von [cityName] erhalten -Our proposed trade request is no longer relevant! = Unsere vorgeschlagene Handelsanfrage ist nicht mehr relevant! +Our proposed trade is no longer relevant! = Unsere vorgeschlagene Handelsanfrage ist nicht mehr relevant! [defender] could not withdraw from a [attacker] - blocked. = Rückzug von [defender] vor [attacker] wurde blockiert. [defender] withdrew from a [attacker] = [defender] hat sich vor [attacker] zurückgezogen [building] has provided [amount] Gold! = [building] hat [amount] Gold bereitgestellt. @@ -801,6 +808,7 @@ Units that consume this resource = Einheiten welche diese Ressource brauchen Can be built on = Kann gebaut werden auf Defence bonus = Verteidigungsbonus Movement cost = Bewegungskosten +Open terrain = Offenes Gelände Rough Terrain = Unwegsames Gelände for = für Missing translations: = Fehlende Übersetzungen: @@ -976,6 +984,7 @@ Download = Herunterladen Done! = Abgeschlossen! Delete [modName] = Lösche [modName] Are you SURE you want to delete this mod? = SICHER, dass diese Modifikation gelöscht werden soll? +[mod] was deleted. = [mod] gelöscht. Updated = Aktualisiert Current mods = Installierte Modifikationen Downloadable mods = Verfügbare Modifikationen @@ -989,6 +998,8 @@ Could not download mod = Konnte Modifikation nicht herunterladen Online query result is incomplete = Online-Abfrage war unvollständig No description provided = Keine Beschreibung mitgeliefert [stargazers]✯ = [stargazers]✯ +Author: [author] = Autor: [author] +Size: [size] kB = Größe: [size] kB # Uniques that are relevant to more than one type of game object @@ -3635,7 +3646,7 @@ Persian Immortal = Persischer Unsterblicher +10 HP when healing = +10 Lebenspunkte beim Heilen Horseman = Reiter -Penalty vs City 33% = Nachteil gegen Stadt 33% +Penalty vs [City] = Nachteil gegen [City] Can move after attacking = Kann sich nach dem Angriff bewegen Companion Cavalry = Begleitkavallerie diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index ec55f191b4..b863f1addc 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -511,7 +511,7 @@ Your relationship with [cityStateName] is about to degrade = Romló félben van Your relationship with [cityStateName] degraded = Leromlott a kapcsolatunk [cityStateName] városállammal A new barbarian encampment has spawned! = Új barbár tábor tűnt fel! Received [goldAmount] Gold for capturing [cityName] = [cityName] elfoglalásáért [goldAmount] aranyat kaptál -Our proposed trade request is no longer relevant! = A felajánlott kereskedelmi kérésünk már nem releváns! +Our proposed trade is no longer relevant! = A felajánlott kereskedelmi kérésünk már nem releváns! [defender] could not withdraw from a [attacker] - blocked. = [defender] nem tud elmenekülni [attacker] karmaiból - meggátolva. [defender] withdrew from a [attacker] = [defender] elmenekült [attacker] elől [building] has provided [amount] Gold! = [building] épület [amount] aranyat hozott számodra diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index c7374b10d6..66c4ff520c 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -488,7 +488,7 @@ Your relationship with [cityStateName] is about to degrade = Hubungan Anda denga Your relationship with [cityStateName] degraded = Hubungan Anda dengan Kota Negara [cityStateName] telah pudar A new barbarian encampment has spawned! = Sebuah perkemahan orang barbar telah muncul! Received [goldAmount] Gold for capturing [cityName] = Menerima [goldAmount] Emas karena menguasai [cityName] -Our proposed trade request is no longer relevant! = Penawaran perdagangan kita tidak lagi relevan! +Our proposed trade is no longer relevant! = Penawaran perdagangan kita tidak lagi relevan! [defender] could not withdraw from a [attacker] - blocked. = [defender] tidak bisa mundur dari [attacker] - diblok. [defender] withdrew from a [attacker] = [defender] mundur dari [attacker] [building] has provided [amount] Gold! = [building] telah menyediakan [amount] Emas! diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 6a0bfce9cf..94869eb760 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -474,7 +474,7 @@ Your relationship with [cityStateName] is about to degrade = Stai perdendo il co Your relationship with [cityStateName] degraded = Non sei più amico di [cityStateName]! A new barbarian encampment has spawned! = È sorto un nuovo accampamento barbaro! Received [goldAmount] Gold for capturing [cityName] = Hai ottenuto [goldAmount] Oro per la conquista di [cityName]! -Our proposed trade request is no longer relevant! = La nostra richiesta commerciale non è più rilevante! +Our proposed trade is no longer relevant! = La nostra richiesta commerciale non è più rilevante! [defender] could not withdraw from a [attacker] - blocked. = [defender] non è risucito a ritirarsi dall'unità nemica [attacker] [defender] withdrew from a [attacker] = [defender] si è ritirato dall'attacco dell'unità nemica [attacker] [building] has provided [amount] Gold! = [building] ti ha donato [amount] Oro! diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index cb0d31f1ca..571b5760c3 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -502,7 +502,7 @@ Your relationship with [cityStateName] is about to degrade = [cityStateName]と Your relationship with [cityStateName] degraded = [cityStateName]との関係が低下した A new barbarian encampment has spawned! = 新しい蛮族の野営地が出現した！ Received [goldAmount] Gold for capturing [cityName] = [cityName]を獲得して[goldAmount]ゴールドを受け取った -Our proposed trade request is no longer relevant! = 提案された取引の申込みはもはや関係ありません +Our proposed trade is no longer relevant! = 提案された取引の申込みはもはや関係ありません [defender] could not withdraw from a [attacker] - blocked. = [defender]は[attacker]から撤退できない-邪魔をされた [defender] withdrew from a [attacker] = [defender]が[attacker]から撤退した [building] has provided [amount] Gold! = [building]が[amount]ゴールドを提供した diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 4fa61c028d..6f6aee14b5 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -475,7 +475,7 @@ Your relationship with [cityStateName] is about to degrade = [cityStateName] 도 Your relationship with [cityStateName] degraded = [cityStateName] 도시국가와의 관계가 악화되었습니다 A new barbarian encampment has spawned! = 새 야만인 주둔지가 만들어졌습니다! Received [goldAmount] Gold for capturing [cityName] = [cityName]을(를) 점령하여 [goldAmount]골드를 얻었습니다 -Our proposed trade request is no longer relevant! = 우리가 제안한 거래가 유효하지 않습니다! +Our proposed trade is no longer relevant! = 우리가 제안한 거래가 유효하지 않습니다! [defender] could not withdraw from a [attacker] - blocked. = [defender]이(가) [attacker]에게서 철수하지 못했습니다! [defender] withdrew from a [attacker] = [defender]이(가) [attacker]에게서 철수했습니다 [building] has provided [amount] Gold! = [building]이(가) [amount]골드를 제공했습니다! diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index 30f1c52475..6f1e806823 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -536,7 +536,7 @@ Your relationship with [cityStateName] is about to degrade = Jūsų santykiai su Your relationship with [cityStateName] degraded = Jūsų santykiai su [cityStateName] pablogėjo A new barbarian encampment has spawned! = Atsirado nauja barbarų stovyklavietė! Received [goldAmount] Gold for capturing [cityName] = Gautas [goldAmount] auksas už [cityName] fiksavimą -Our proposed trade request is no longer relevant! = Mūsų siūlomas prekybos prašymas nebeaktualus! +Our proposed trade is no longer relevant! = Mūsų siūlomas prekybos prašymas nebeaktualus! [defender] could not withdraw from a [attacker] - blocked. = [defender] negalėjo pasitraukti iš [attacker] - užblokuotas. [defender] withdrew from a [attacker] = [defender] pasitraukė iš [attacker] [building] has provided [amount] Gold! = [building] davė [amount] aukso! diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 738958cc94..2a91f9cf1e 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -662,7 +662,7 @@ A new barbarian encampment has spawned! = # Requires translation! Received [goldAmount] Gold for capturing [cityName] = # Requires translation! -Our proposed trade request is no longer relevant! = +Our proposed trade is no longer relevant! = # Requires translation! [defender] could not withdraw from a [attacker] - blocked. = # Requires translation! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index 4c035fb487..4d09aaeafd 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -527,7 +527,7 @@ Your relationship with [cityStateName] is about to degrade = Ravābet e šomā b Your relationship with [cityStateName] degraded = Ravābet e šomā bā [cityStateName] tazalzol peydā kard A new barbarian encampment has spawned! = Yek ordoogāh e Barbari jadid be vojood āmad! Received [goldAmount] Gold for capturing [cityName] = [goldAmount] Talā barāye tasḵir e [cityName] daryāft šod -Our proposed trade request is no longer relevant! = Darḵāst e tejāri pišnahādi ye mā digar monāseb nist! +Our proposed trade is no longer relevant! = Darḵāst e tejāri pišnahādi ye mā digar monāseb nist! [defender] could not withdraw from a [attacker] - blocked. = [defender] natavānest az yek [attacker] ağab-nešini konad – masir masdood ast. [defender] withdrew from a [attacker] = [defender] az yek [attacker] ağab-nešini kard [building] has provided [amount] Gold! = [building], [amount] Talā erā’e dāde ast! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index aef3a6fb4c..723a0a228d 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -524,7 +524,7 @@ Your relationship with [cityStateName] is about to degrade = Ravaabet e shomaa b Your relationship with [cityStateName] degraded = Ravaabet e shomaa baa [cityStateName] tazalzol peydaa kard A new barbarian encampment has spawned! = Yek ordoogaah e Barbari jadid be vojood aamad! Received [goldAmount] Gold for capturing [cityName] = [goldAmount] Talaa baraaye taskhir e [cityName] daryaaft shod -Our proposed trade request is no longer relevant! = Darkhaast e tejaari pishnahaadi ye maa digar monaaseb nist! +Our proposed trade is no longer relevant! = Darkhaast e tejaari pishnahaadi ye maa digar monaaseb nist! [defender] could not withdraw from a [attacker] - blocked. = [defender] natavaanest az yek [attacker] aghab-neshini konad – masir masdood ast. [defender] withdrew from a [attacker] = [defender] az yek [attacker] aghab-neshini kard [building] has provided [amount] Gold! = [building], [amount] Talaa eraa’e daade ast! diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index acba0debbb..9fea938100 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -504,7 +504,7 @@ Your relationship with [cityStateName] is about to degrade = Twoja relacje z [ci Your relationship with [cityStateName] degraded = Twoje relacje z [cityStateName] uległy pogorszeniu. A new barbarian encampment has spawned! = Pojawiło się nowe obozowisko barbarzyńców! Received [goldAmount] Gold for capturing [cityName] = Otrzymano [goldAmount] złota za zdobycie miasta [cityName] -Our proposed trade request is no longer relevant! = Nasza oferta handlowa nie jest już ważna! +Our proposed trade is no longer relevant! = Nasza oferta handlowa nie jest już ważna! [defender] could not withdraw from a [attacker] - blocked. = [defender] nie mógł wycofać się przed [attacker] - zablokowano. [defender] withdrew from a [attacker] = [defender] wycofał się przed [attacker] [building] has provided [amount] Gold! = [building] zepewniło nam [amount] Złota! diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index e1e4e2e086..240c53f0c2 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -507,7 +507,7 @@ Your relationship with [cityStateName] is about to degrade = Seu relacionamento Your relationship with [cityStateName] degraded = Seu relacionamento com [cityStateName] se degradou A new barbarian encampment has spawned! = Um novo acampamento bárbaro apareceu! Received [goldAmount] Gold for capturing [cityName] = Recebeu [goldAmount] Gold por capturar [cityName] -Our proposed trade request is no longer relevant! = Nosso pedido de troca proposto não é mais relevante! +Our proposed trade is no longer relevant! = Nosso pedido de troca proposto não é mais relevante! [defender] could not withdraw from a [attacker] - blocked. = O [defender] não pôde se retirar de um [attacker] - bloqueado. [defender] withdrew from a [attacker] = O [defender] se retirou de um [attacker] [building] has provided [amount] Gold! = [building] providenciou [amount] de Ouro! diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 19456c8322..374d4e9f5c 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -535,7 +535,7 @@ Your relationship with [cityStateName] is about to degrade = Relația cu [citySt Your relationship with [cityStateName] degraded = Relația cu [cityStateName] s-a degradat A new barbarian encampment has spawned! = A apărut o nouă tabără de barbari! Received [goldAmount] Gold for capturing [cityName] = Ai primit [goldAmount] aur pentru că ai capturat [cityName] -Our proposed trade request is no longer relevant! = Comerțul propus de noi nu mai este relevant. +Our proposed trade is no longer relevant! = Comerțul propus de noi nu mai este relevant. [defender] could not withdraw from a [attacker] - blocked. = [defender]-ul nu s-a putut retrage din fața unui [attacker] - blocat. [defender] withdrew from a [attacker] = [defender]-ul s-a retras din fața unui [attacker] [building] has provided [amount] Gold! = [building] a generat [amount] Aur! diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 4e0c4d7665..205b342397 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -473,7 +473,7 @@ Your relationship with [cityStateName] is about to degrade = Ваши отнош Your relationship with [cityStateName] degraded = Ваши отношения с городом-государством [cityStateName] ухудшились A new barbarian encampment has spawned! = Появился новый лагерь варваров! Received [goldAmount] Gold for capturing [cityName] = Получено [goldAmount] золота за захват города [cityName] -Our proposed trade request is no longer relevant! = Наше торговое предложение больше не актуально! +Our proposed trade is no longer relevant! = Наше торговое предложение больше не актуально! [defender] could not withdraw from a [attacker] - blocked. = [defender] не может уклониться от атаки юнита [attacker] - заблокирован. [defender] withdrew from a [attacker] = [defender] уклоняется от атаки юнита [attacker] [building] has provided [amount] Gold! = [building] приносит нам золото: [amount]! diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 896ddd2725..4bd714706d 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -495,7 +495,7 @@ Your relationship with [cityStateName] is about to degrade = 你和[cityStateNam Your relationship with [cityStateName] degraded = 你和[cityStateName]外交关系降级了 A new barbarian encampment has spawned! = 侦测到新的蛮族营地出现！ Received [goldAmount] Gold for capturing [cityName] = 我们在占领[cityName]时获得 [goldAmount] 金钱 -Our proposed trade request is no longer relevant! = 我们的贸易項目已失效！ +Our proposed trade is no longer relevant! = 我们的贸易項目已失效！ [defender] could not withdraw from a [attacker] - blocked. = [defender]被截断去路而无法从[attacker]的攻势中撤退 [defender] withdrew from a [attacker] = [defender]从[attacker]的攻势中撤退 [building] has provided [amount] Gold! = [building]提供了 [amount] 金钱！ diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index c78d56a630..97e75257c6 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -473,7 +473,7 @@ Your relationship with [cityStateName] is about to degrade = Tus relaciones con Your relationship with [cityStateName] degraded = Tus relaciones con [cityStateName] han empeorado A new barbarian encampment has spawned! = ¡Ha aparecido un nuevo campamento bárbaro! Received [goldAmount] Gold for capturing [cityName] = Se ha recibido [goldAmount] de oro por capturar [cityName] -Our proposed trade request is no longer relevant! = ¡Nuestra solicitud comercial propuesta ya no es relevante! +Our proposed trade is no longer relevant! = ¡Nuestra solicitud comercial propuesta ya no es relevante! [defender] could not withdraw from a [attacker] - blocked. = [defender] no pudo retirarse de un [attacker] - bloqueado. [defender] withdrew from a [attacker] = [defender] se retiró de un [attacker] [building] has provided [amount] Gold! = ¡[building] ha proporcionado [amount] de oro! diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index d73a007402..490a9bddb8 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -477,7 +477,7 @@ Your relationship with [cityStateName] is about to degrade = Ditt förhållande Your relationship with [cityStateName] degraded = Ditt förhållande med [cityStateName] försämrades A new barbarian encampment has spawned! = Ett nytt barbarläger har alstrats! Received [goldAmount] Gold for capturing [cityName] = Fick [goldAmount] Guld för erövrandet av [cityName] -Our proposed trade request is no longer relevant! = Vårt föreslagna handelserbjudande är inte längre relevant! +Our proposed trade is no longer relevant! = Vårt föreslagna handelserbjudande är inte längre relevant! [defender] could not withdraw from a [attacker] - blocked. = [defender] kunde inte dra sig från en [attacker] [defender] withdrew from a [attacker] = [defender] drog sig ifrån en [attacker] [building] has provided [amount] Gold! = [building] har bidragit med [amount] Guld! diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 427d651f63..6cd609d6bb 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -502,7 +502,7 @@ Your relationship with [cityStateName] is about to degrade = 我們與[cityState Your relationship with [cityStateName] degraded = 我們與[cityStateName]的外交關係降級了 A new barbarian encampment has spawned! = 偵測到新的蠻族營地出現！ Received [goldAmount] Gold for capturing [cityName] = 我們在佔領[cityName]時獲得[goldAmount]金錢 -Our proposed trade request is no longer relevant! = 我們的貿易項目已失效！ +Our proposed trade is no longer relevant! = 我們的貿易項目已失效！ [defender] could not withdraw from a [attacker] - blocked. = [defender]被截斷去路而無法從[attacker]的攻勢中撤退 [defender] withdrew from a [attacker] = [defender]從[attacker]的攻勢中撤退 [building] has provided [amount] Gold! = [building]提供了[amount]金錢！ diff --git a/Fixed last merge (Turkish) b/android/assets/jsons/translations/Turkish.properties similarity index 99% rename from Fixed last merge (Turkish) rename to android/assets/jsons/translations/Turkish.properties index f0bb56e6cc..a00161b305 100644 --- a/Fixed last merge (Turkish) +++ b/android/assets/jsons/translations/Turkish.properties @@ -459,7 +459,7 @@ You and [name] are no longer allies! = Siz ve [name] artık müttefik değilsini [civName] has accepted your trade request = [civName] ticaret talebinizi kabul etti [civName] has denied your trade request = [civName] ticaret talebinizi reddetti [tradeOffer] from [otherCivName] has ended = [otherCivName] medeniyetinden gelen [tradeOffer] sona erdi -[tradeOffer] to [otherCivName] has ended = [otherCivName] uygarlığına giden [tradeoffer] teklifimiz sona erdi +[tradeOffer] to [otherCivName] has ended = [otherCivName] uygarlığına giden [tradeOffer] teklifimiz sona erdi One of our trades with [nation] has ended = [nation] ile yaptığımız ticaretlerden biri sona erdi One of our trades with [nation] has been cut short = [nation] ile yaptığımız ticaretlerden biri kısa kesildi [nation] agreed to stop settling cities near us! = [nation] yakınımızdaki şehirlere yerleşmeyi durdurmayı kabul etti! @@ -472,7 +472,7 @@ Your relationship with [cityStateName] is about to degrade = [cityStateName] ile Your relationship with [cityStateName] degraded = [cityStateName] ile ilişkiniz düştü A new barbarian encampment has spawned! = Yeni bir barbar kampı ortaya çıktı! Received [goldAmount] Gold for capturing [cityName] = [cityName] ele geçirildiği için [goldAmount] Altın alındı -Our proposed trade request is no longer relevant! = Teklif edilen ticaret talebimiz artık geçerli değil! +Our proposed trade is no longer relevant! = Teklif edilen ticaret talebimiz artık geçerli değil! [defender] could not withdraw from a [attacker] - blocked. = [defender], ona saldıran [attacker] biriminden kaçamadı. [defender] withdrew from a [attacker] = [defender], ona saldıran [attacker] biriminden kaçtı [building] has provided [amount] Gold! = [building] [amount] Altın getirdi! diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 2c7fef56e0..d0542411ad 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -504,7 +504,7 @@ Your relationship with [cityStateName] is about to degrade = Ваші стосу Your relationship with [cityStateName] degraded = Ваші стосунки з [cityStateName] погіршилися A new barbarian encampment has spawned! = З’явився новий варварський табір! Received [goldAmount] Gold for capturing [cityName] = Отримано [goldAmount] золота за захоплення міста [cityName] -Our proposed trade request is no longer relevant! = Наша торгівельна пропозиція більше не дійсна! +Our proposed trade is no longer relevant! = Наша торгівельна пропозиція більше не дійсна! [defender] could not withdraw from a [attacker] - blocked. = [defender] не зміг втекти від [attacker], бо був заблокований. [defender] withdrew from a [attacker] = [defender] втік від [attacker] [building] has provided [amount] Gold! = [building] приносить [amount] золота! diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties index 3a7ecde1b3..6bb684c1ec 100644 --- a/android/assets/jsons/translations/Vietnamese.properties +++ b/android/assets/jsons/translations/Vietnamese.properties @@ -490,7 +490,7 @@ Your relationship with [cityStateName] is about to degrade = Mối quan hệ v Your relationship with [cityStateName] degraded = Mối quan hệ với [cityStateName] đã giảm A new barbarian encampment has spawned! = Một trại người man rợn đã xuất hiện! Received [goldAmount] Gold for capturing [cityName] = Nhận [goldAmount] Vàng cho việc chiếm đóng [cityName] -Our proposed trade request is no longer relevant! = Yêu cầu giao dịch của ta không còn phù hợp! +Our proposed trade is no longer relevant! = Yêu cầu giao dịch của ta không còn phù hợp! [defender] could not withdraw from a [attacker] - blocked. = [defender] không thể rút lui [attacker] - đã chặn. [defender] withdrew from a [attacker] = [defender] đã rút lui [attacker] [building] has provided [amount] Gold! = [building] đã cung cấp [amount] Vàng! diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index c51bfcda12..3271375822 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -35,6 +35,7 @@ Requires [buildingName] to be built in all cities = Provides a free [buildingName] in the city = Requires worked [resource] near city = Wonder is being built elsewhere = +National Wonder is being built elsewhere = Requires a [buildingName] in all cities = Requires a [buildingName] in this city = Consumes 1 [resource] = @@ -245,7 +246,9 @@ Biome areas extension = Water level = Reset to default = +Show experimental world wrap for maps = HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = +Enable portrait orientation = Online Multiplayer = World Size = @@ -351,6 +354,10 @@ If you could copy your game data ("Copy saved game to clipboard" - = paste into an email to yairm210@hotmail.com) = I could maybe help you figure out what went wrong, since this isn't supposed to happen! = Missing mods: [mods] = +Load from custom location = +Could not load game from custom location! = +Save to custom location = +Could not save game to custom location! = # Options @@ -473,7 +480,7 @@ Your relationship with [cityStateName] is about to degrade = Your relationship with [cityStateName] degraded = A new barbarian encampment has spawned! = Received [goldAmount] Gold for capturing [cityName] = -Our proposed trade request is no longer relevant! = +Our proposed trade is no longer relevant! = [defender] could not withdraw from a [attacker] - blocked. = [defender] withdrew from a [attacker] = [building] has provided [amount] Gold! = @@ -801,6 +808,7 @@ Units that consume this resource = Can be built on = Defence bonus = Movement cost = +Open terrain = Rough Terrain = for = Missing translations: = @@ -977,6 +985,7 @@ Download = Done! = Delete [modName] = Are you SURE you want to delete this mod? = +[mod] was deleted. = Updated = Current mods = Downloadable mods = @@ -990,6 +999,8 @@ Could not download mod = Online query result is incomplete = No description provided = [stargazers]✯ = +Author: [author] = +Size: [size] kB = # Uniques that are relevant to more than one type of game object diff --git a/core/src/com/unciv/ui/saves/SaveGameScreen.kt b/core/src/com/unciv/ui/saves/SaveGameScreen.kt index e4c4029aa0..128c531587 100644 --- a/core/src/com/unciv/ui/saves/SaveGameScreen.kt +++ b/core/src/com/unciv/ui/saves/SaveGameScreen.kt @@ -57,7 +57,7 @@ class SaveGameScreen(val gameInfo: GameInfo) : PickerScreen(disableScroll = true if (e == null) { Gdx.app.postRunnable { game.setWorldScreen() } } else if (e !is CancellationException) { - errorLabel.setText("Could not save game to custom location".tr()) + errorLabel.setText("Could not save game to custom location!".tr()) e.printStackTrace() } saveToCustomLocation.enable() diff --git a/core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt b/core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt index bec622bbe2..6810221145 100644 --- a/core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt +++ b/core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt @@ -134,10 +134,10 @@ class OptionsPopup(val previousScreen:CameraStageBaseScreen) : Popup(previousScr addHeader("Other options") - addYesNoRow("Show experimental world wrap for maps\n" - +"HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED!".tr(), - settings.showExperimentalWorldWrap) - { settings.showExperimentalWorldWrap = it } + addYesNoRow("{Show experimental world wrap for maps}\n{HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED!}".tr(), + settings.showExperimentalWorldWrap) { + settings.showExperimentalWorldWrap = it + } if (previousScreen.game.limitOrientationsHelper != null) { addYesNoRow("Enable portrait orientation", settings.allowAndroidPortrait) {