From eb7a0640196a8f0b47fc62fe57a0d4e7431e678b Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 22 Nov 2020 22:48:38 +0200 Subject: [PATCH] Resolved #3335 - Removed all unecessary spaces and colons --- .../jsons/translations/Brazilian_Portuguese.properties | 8 ++++---- android/assets/jsons/translations/Czech.properties | 8 ++++---- android/assets/jsons/translations/Dutch.properties | 8 ++++---- android/assets/jsons/translations/English.properties | 8 ++++---- android/assets/jsons/translations/Finnish.properties | 8 ++++---- android/assets/jsons/translations/French.properties | 8 ++++---- android/assets/jsons/translations/German.properties | 8 ++++---- android/assets/jsons/translations/Hungarian.properties | 8 ++++---- android/assets/jsons/translations/Indonesian.properties | 8 ++++---- android/assets/jsons/translations/Italian.properties | 8 ++++---- android/assets/jsons/translations/Japanese.properties | 8 ++++---- android/assets/jsons/translations/Korean.properties | 8 ++++---- android/assets/jsons/translations/Lithuanian.properties | 8 ++++---- android/assets/jsons/translations/Malay.properties | 8 ++++---- .../jsons/translations/Persian_(Pinglish-DIN).properties | 8 ++++---- .../jsons/translations/Persian_(Pinglish-UN).properties | 8 ++++---- android/assets/jsons/translations/Polish.properties | 8 ++++---- android/assets/jsons/translations/Portuguese.properties | 8 ++++---- android/assets/jsons/translations/Romanian.properties | 8 ++++---- android/assets/jsons/translations/Russian.properties | 8 ++++---- .../jsons/translations/Simplified_Chinese.properties | 8 ++++---- android/assets/jsons/translations/Spanish.properties | 8 ++++---- android/assets/jsons/translations/Thai.properties | 4 ++-- .../jsons/translations/Traditional_Chinese.properties | 8 ++++---- android/assets/jsons/translations/Turkish.properties | 8 ++++---- android/assets/jsons/translations/Ukrainian.properties | 8 ++++---- android/assets/jsons/translations/Vietnamese.properties | 6 +++--- android/assets/jsons/translations/template.properties | 8 ++++---- core/src/com/unciv/models/ruleset/tile/TileResource.kt | 6 +++--- core/src/com/unciv/ui/trade/DiplomacyScreen.kt | 4 ++-- 30 files changed, 114 insertions(+), 114 deletions(-) diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 80d359f8aa..5185dc15af 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -69,7 +69,7 @@ Not this time. = Dessa vez não. Excellent! = Excelente! How about something else... = Que tal outra coisa... A pleasure to meet you. = É um prazer conhecê-lo. -Our relationship: = Nossa relação: +Our relationship = Nossa relação We have encountered the City-State of [name]! = Nós encontramos a Cidade-Estado de [name]! Declare Friendship ([numberOfTurns] turns) = Declarar Amizade ([numberOfTurns] turnos) May our nations forever remain united! = Que nossas nações se mantenham unidas para sempre! @@ -749,9 +749,9 @@ Occurs on [listOfTerrains] = Ocorre em [listOfTerrains] Placed on [terrainType] = Colocado em [terrainType] Can be found on = Pode ser encontrado em Improved by [improvement] = Melhorado por [improvement] -Bonus stats for improvement: = Bônus de estatísticas por melhoria: -Buildings that consume this resource: = Construções que consomem esse recurso: -Units that consume this resource: = Unidades que consomem esse recurso: +Bonus stats for improvement = Bônus de estatísticas por melhoria +Buildings that consume this resource = Construções que consomem esse recurso +Units that consume this resource = Unidades que consomem esse recurso Can be built on = Pode ser construído em Defence bonus = Bônus de defesa Movement cost = Custo de movimento diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 2ab02878ab..2c80bfca9f 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -69,7 +69,7 @@ Not this time. = Z toho nic nebude. Excellent! = Skvěle! How about something else... = Co třeba zkusit něco jiného... A pleasure to meet you. = Rádi vás poznáváme. -Our relationship: = Náš vzájemný vztah: +Our relationship = Náš vzájemný vztah We have encountered the City-State of [name]! = Poprvé jsme se setkali s městským státem [name]! Declare Friendship ([numberOfTurns] turns) = Deklarace přátelství ([numberOfTurns] kol) May our nations forever remain united! = Nechť naše národy zůstanou navždy sjednoceny! @@ -742,9 +742,9 @@ Occurs on [listOfTerrains] = Nalézá se na [listOfTerrains] Placed on [terrainType] = Umístěn na [terrainType] Can be found on = Může se objevit na Improved by [improvement] = Vylepšeno díky [improvement] -Bonus stats for improvement: = Bonusové statistiky pro vylepšení: -Buildings that consume this resource: = Budovy spotřebovávající tuto surovinu: -Units that consume this resource: = Jednotky spotřebovávající tuto surovinu: +Bonus stats for improvement = Bonusové statistiky pro vylepšení +Buildings that consume this resource = Budovy spotřebovávající tuto surovinu +Units that consume this resource = Jednotky spotřebovávající tuto surovinu Can be built on = Může být vybudováno na Defence bonus = Obranný bonus Movement cost = Náročnost pohybu diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 4fdfa56737..4dcaf89ed0 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -75,7 +75,7 @@ Excellent! = Uitstekend! How about something else... = # Requires translation! A pleasure to meet you. = -Our relationship: = Onze relatie: +Our relationship = Onze relatie # Requires translation! We have encountered the City-State of [name]! = # Requires translation! @@ -1037,11 +1037,11 @@ Can be found on = # Requires translation! Improved by [improvement] = # Requires translation! -Bonus stats for improvement: = +Bonus stats for improvement = # Requires translation! -Buildings that consume this resource: = +Buildings that consume this resource = # Requires translation! -Units that consume this resource: = +Units that consume this resource = # Requires translation! Can be built on = # Requires translation! diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index ee98df1014..9fd7503c48 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -128,7 +128,7 @@ How about something else... = # Requires translation! A pleasure to meet you. = # Requires translation! -Our relationship: = +Our relationship = # Requires translation! We have encountered the City-State of [name]! = # Requires translation! @@ -1401,11 +1401,11 @@ Can be found on = # Requires translation! Improved by [improvement] = # Requires translation! -Bonus stats for improvement: = +Bonus stats for improvement = # Requires translation! -Buildings that consume this resource: = +Buildings that consume this resource = # Requires translation! -Units that consume this resource: = +Units that consume this resource = # Requires translation! Can be built on = # Requires translation! diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index 3d5eb63d94..7da06f552f 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -73,7 +73,7 @@ Not this time. = Ei tällä kertaa. Excellent! = Loistavaa! How about something else... = Entäpä jotain muuta... A pleasure to meet you. = Ilo tavata teidät. -Our relationship: = Suhteemme: +Our relationship = Suhteemme We have encountered the City-State of [name]! = Olemme tavanneet kaupunkivaltion [name]! Declare Friendship ([numberOfTurns] turns) = Tee ystävyydenjulistus ([numberOfTurns] vuoroksi) May our nations forever remain united! = Olkoot kansamme ikuisesti yhdessä! @@ -785,9 +785,9 @@ Occurs on [listOfTerrains] = Esiintyy: [listOfTerrains] Placed on [terrainType] = Sijoitettu maastoon [terrainType] Can be found on = Voidaan löytää: Improved by [improvement] = Parannettu parannuksella [improvement] -Bonus stats for improvement: = Bonukset parannukselle: -Buildings that consume this resource: = Rakennukset jotka kuluttavat tätä resurssia: -Units that consume this resource: = Yksiköt jotka kuluttavat tätä resurssia: +Bonus stats for improvement = Bonukset parannukselle +Buildings that consume this resource = Rakennukset jotka kuluttavat tätä resurssia +Units that consume this resource = Yksiköt jotka kuluttavat tätä resurssia Can be built on = Voidaan rakentaa: Defence bonus = Puolustusbonus Movement cost = Liikkumisen hinta diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 449ba7a000..d475f9b331 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -71,7 +71,7 @@ Not this time. = Pas cette fois. Excellent! = Excellent ! How about something else... = Pourquoi pas autre chose... A pleasure to meet you. = Un plaisir de vous rencontrer -Our relationship: = Notre relation: +Our relationship = Notre relation We have encountered the City-State of [name]! = Nous avons rencontré la cité-état de [name] ! Declare Friendship ([numberOfTurns] turns) = Déclaration d'amitié ([numberOfTurns] tours) May our nations forever remain united! = Puissent nos nations rester unies pour toujours ! @@ -775,9 +775,9 @@ Occurs on [listOfTerrains] = Possible sur [listOfTerrains] Placed on [terrainType] = Placé en [terrainType] Can be found on = Peut être trouvé sur Improved by [improvement] = Amélioré par [improvement] -Bonus stats for improvement: = Bonus de case aménagée: -Buildings that consume this resource: = Bâtiments consommant cette ressource : -Units that consume this resource: = Unités consommant cette ressource : +Bonus stats for improvement = Bonus de case aménagée +Buildings that consume this resource = Bâtiments consommant cette ressource +Units that consume this resource = Unités consommant cette ressource Can be built on = Peut être construit sur Defence bonus = Bonus de défense Movement cost = Coût de mouvement diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index b185e32e3c..2f7b33ee76 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -69,7 +69,7 @@ Not this time. = Vielleicht ein anderes Mal. Excellent! = Hervorragend! How about something else... = Wie wäre es mit etwas anderem... A pleasure to meet you. = Eine Freude, Euch kennen zu lernen. -Our relationship: = Unsere Beziehung: +Our relationship = Unsere Beziehung We have encountered the City-State of [name]! = Wir haben den Stadtstaat [name] entdeckt! Declare Friendship ([numberOfTurns] turns) = Freundschaft erklären ([numberOfTurns] Runden) May our nations forever remain united! = Mögen unsere Nationen auf immer in Freundschaft vereint sein! @@ -742,9 +742,9 @@ Occurs on [listOfTerrains] = Kommt vor in [listOfTerrains] Placed on [terrainType] = Platziert auf [terrainType] Can be found on = Kann gefunden werden in Improved by [improvement] = Wird verbessert durch [improvement] -Bonus stats for improvement: = Boni für Verbesserung: -Buildings that consume this resource: = Gebäude welche diese Ressource brauchen: -Units that consume this resource: = Einheiten welche diese Ressource brauchen: +Bonus stats for improvement = Boni für Verbesserung +Buildings that consume this resource = Gebäude welche diese Ressource brauchen +Units that consume this resource = Einheiten welche diese Ressource brauchen Can be built on = Kann gebaut werden auf Defence bonus = Verteidigungsbonus Movement cost = Bewegungskosten diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 81c27524c4..b026967675 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -69,7 +69,7 @@ Not this time. = Most nem. Excellent! = Kiváló How about something else... = Mi lenne ha... A pleasure to meet you. = Örülök, hogy találkoztunk! -Our relationship: = Kapcsolatunk: +Our relationship = Kapcsolatunk We have encountered the City-State of [name]! = Találkoztunk [name] városállamával! Declare Friendship ([numberOfTurns] turns) = Barátság kihirdetése ([numberOfTurns] kör) May our nations forever remain united! = Nemzeteink maradjanak örökre egységben! @@ -744,9 +744,9 @@ Occurs on [listOfTerrains] = [listOfTerrains] terepeken fordulhat elő Placed on [terrainType] = [terrainType] terepen helyezkedik el Can be found on = Megtalálható Improved by [improvement] = [improvement] által fejlesztve -Bonus stats for improvement: = Bónusz fejlesztésre: -Buildings that consume this resource: = Épületek amit ezt az alapanyagot használják -Units that consume this resource: = Egységek amik ezt az alapanyagot használják +Bonus stats for improvement = Bónusz fejlesztésre +Buildings that consume this resource = Épületek amit ezt az alapanyagot használják +Units that consume this resource = Egységek amik ezt az alapanyagot használják Can be built on = Építhető Defence bonus = Védelmi bónusz Movement cost = Mozgási költség diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 38a113b857..d04cb3bd0c 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -69,7 +69,7 @@ Not this time. = Tidak kali ini. Excellent! = Bagus! How about something else... = Bagaimana kalau yang lain... A pleasure to meet you. = Sebuah kehormatan untuk bertemu denganmu. -Our relationship: = Hubungan kita: +Our relationship = Hubungan kita We have encountered the City-State of [name]! = Kita telah bertemu dengan Negara Kota [name]! Declare Friendship ([numberOfTurns] turns) = Nyatakan Pertemanan ([numberOfTurns] giliran) May our nations forever remain united! = Semoga bangsa kita selamanya bersatu! @@ -740,9 +740,9 @@ Occurs on [listOfTerrains] = Terjadi pada [listOfTerrains] Placed on [terrainType] = Ditempatkan pada [terrainType] Can be found on = Dapat ditemukan di Improved by [improvement] = Ditingkatkan dengan [improvement] -Bonus stats for improvement: = Bonus stats untuk peningkatan: -Buildings that consume this resource: = Bangunan yang menggunakan sumber daya ini: -Units that consume this resource: = Unit yang menggunakan sumber daya ini: +Bonus stats for improvement = Bonus stats untuk peningkatan +Buildings that consume this resource = Bangunan yang menggunakan sumber daya ini +Units that consume this resource = Unit yang menggunakan sumber daya ini Can be built on = Dapat dibangun di Defence bonus = Bonus pertahanan Movement cost = Biaya pergerakan diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 6baec24298..e96fb4fdfb 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -69,7 +69,7 @@ Not this time. = Questo mai! Excellent! = Eccellente! How about something else... = Che ne dici di questa offerta? A pleasure to meet you. = Siamo lieti di fare la vostra conoscenza. -Our relationship: = I nostri rapporti: +Our relationship = I nostri rapporti We have encountered the City-State of [name]! = Abbiamo incontrato la Citta-Stato di [name]! Declare Friendship ([numberOfTurns] turns) = Dichiarazione di Amicizia ([numberOfTurns] turni) May our nations forever remain united! = Possano le nostre nazioni rimanere per sempre unite! @@ -740,9 +740,9 @@ Occurs on [listOfTerrains] = Si può trovare su [listOfTerrains] Placed on [terrainType] = Si trova su [terrainType] Can be found on = Può trovarsi su Improved by [improvement] = Può essere migliorato/a da [improvement] -Bonus stats for improvement: = Bonus per miglioramento: -Buildings that consume this resource: = Edifici che consumano questa risorsa: -Units that consume this resource: = Unità che consumano questa risorsa: +Bonus stats for improvement = Bonus per miglioramento +Buildings that consume this resource = Edifici che consumano questa risorsa +Units that consume this resource = Unità che consumano questa risorsa Can be built on = Può essere costruito/a su: Defence bonus = Bonus di Difesa Movement cost = Costi di movimento diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 975b55b768..abce5ff41b 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -69,7 +69,7 @@ Not this time. = 拒否する Excellent! = 最高だ How about something else... = 取引内容の変更をしたい A pleasure to meet you. = お会いできて光栄です -Our relationship: = 自文明との関係: +Our relationship = 自文明との関係 We have encountered the City-State of [name]! = 都市国家[name]に遭遇しました！ Declare Friendship ([numberOfTurns] turns) = 友好宣言([numberOfTurns]ターン) May our nations forever remain united! = 我々の国が永遠に団結し続けますように @@ -740,9 +740,9 @@ Occurs on [listOfTerrains] = [listOfTerrains]で発生 Placed on [terrainType] = [terrainType]に配置 Can be found on = 入手可能条件： Improved by [improvement] = [improvement]で改善 -Bonus stats for improvement: = タイル施設によるボーナス統計： -Buildings that consume this resource: = この資源を消費する建物： -Units that consume this resource: = この資源を消費するユニット： +Bonus stats for improvement = タイル施設によるボーナス統計： +Buildings that consume this resource = この資源を消費する建物： +Units that consume this resource = この資源を消費するユニット： Can be built on = 建設可能タイル: Defence bonus = 防衛ボーナス Movement cost = 移動コスト diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index b2cac646ae..cb5ae8c30f 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -69,7 +69,7 @@ Not this time. = 이건 무리입니다. Excellent! = 훌륭하군요! How about something else... = 이런 건 어떠신지요... A pleasure to meet you. = 만나게 되어 영광입니다. -Our relationship: = 현재 관계 : +Our relationship = 현재 관계 We have encountered the City-State of [name]! = 도시 국가 [name]와(과) 만났습니다! Declare Friendship ([numberOfTurns] turns) = 우호 관계 선언 ([numberOfTurns] 턴 동안) May our nations forever remain united! = 우리 두 국가가 언제나 힘을 합쳐 나가길! @@ -744,9 +744,9 @@ Occurs on [listOfTerrains] = [listOfTerrains]에서 생길 수 있음 Placed on [terrainType] = [terrainType] 위에 위치 Can be found on = 발견 가능한 지형 : Improved by [improvement] = [improvement](으)로 개발 가능 -Bonus stats for improvement: = 개발할 경우 추가로 -Buildings that consume this resource: = 이 자원을 소모하는 건물: -Units that consume this resource: = 이 자원을 소모하는 유닛: +Bonus stats for improvement = 개발할 경우 추가로 +Buildings that consume this resource = 이 자원을 소모하는 건물 +Units that consume this resource = 이 자원을 소모하는 유닛 Can be built on = 개발 가능한 지형 : Defence bonus = 방어력 추가 Movement cost = 이동 비용 diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index fe1facf439..f6478e42de 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -74,7 +74,7 @@ Not this time. = Ne šį kart. Excellent! = Puikiai! How about something else... = O kaip kažkas kitas ... A pleasure to meet you. = Malonu susitikti. -Our relationship: = Mūsų santykiai: +Our relationship = Mūsų santykiai We have encountered the City-State of [name]! = Mes susidūrėme su miesto vardu [name]! Declare Friendship ([numberOfTurns] turns) = Skelbti draugystę ([numberOfTurns] virsta) May our nations forever remain united! = Tegul mūsų tautos amžiams išliks vieningos! @@ -806,9 +806,9 @@ Occurs on [listOfTerrains] = Įvyksta [listOfTerrains] Placed on [terrainType] = Padėta ant [terrainType] Can be found on = Galima rasti Improved by [improvement] = Patobulinta [improvement] -Bonus stats for improvement: = Premijų statistika už tobulinimą: -Buildings that consume this resource: = Pastatai, kurie naudoja šį išteklius: -Units that consume this resource: = Vienetai, kurie naudoja šį išteklius: +Bonus stats for improvement = Premijų statistika už tobulinimą +Buildings that consume this resource = Pastatai, kurie naudoja šį išteklius +Units that consume this resource = Vienetai, kurie naudoja šį išteklius Can be built on = Galima pastatyti Defence bonus = Gynybos premija Movement cost = Judėjimo kaina diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index aa3aa1f313..65c995d418 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -112,7 +112,7 @@ Not this time. = Bukan sekarang Excellent! = Bagus! How about something else... = Mungkin benda lain A pleasure to meet you. = Selamat berkenalan -Our relationship: = Hubungan kita +Our relationship = Hubungan kita # Requires translation! We have encountered the City-State of [name]! = Declare Friendship ([numberOfTurns] turns) = Isytihar Persahabatan ([numberOfTurns] pusingan) @@ -1288,11 +1288,11 @@ Can be found on = # Requires translation! Improved by [improvement] = # Requires translation! -Bonus stats for improvement: = +Bonus stats for improvement = # Requires translation! -Buildings that consume this resource: = +Buildings that consume this resource = # Requires translation! -Units that consume this resource: = +Units that consume this resource = # Requires translation! Can be built on = # Requires translation! diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index 2cad468922..9500d48e8b 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -70,7 +70,7 @@ Not this time. = In dafe’e na. Excellent! = Ālie! How about something else... = Yek čiz e dige četore... A pleasure to meet you. = Az molāğāt bā šomā ḵošbaḵtam. -Our relationship: = Ravābet e ma: +Our relationship = Ravābet e ma We have encountered the City-State of [name]! = Mā be Šahrestān e [name] barḵord kardim! Declare Friendship ([numberOfTurns] turns) = E’elām doosti ([numberOfTurns] nobat) May our nations forever remain united! = Bāšad ke dolat hāye mā barāye hamiše mottahed bemānand! @@ -790,9 +790,9 @@ Occurs on [listOfTerrains] = Rooye [listOfTerrains] etefāğ mioftad Placed on [terrainType] = Ğarār gerefte rooye [terrainType] Can be found on = Peydā mišavad rooye Improved by [improvement] = Behbood-sāḵte šode bā [improvement] -Bonus stats for improvement: = Ḵavās ezāfe šode beḵāter e behbood-sāzi -Buildings that consume this resource: = Sāḵtemān hāyi ke in manba rā masraf mikonand: -Units that consume this resource: = Niroo hāyi ke in manba rā masraf mikonand: +Bonus stats for improvement = Ḵavās ezāfe šode beḵāter e behbood-sāzi +Buildings that consume this resource = Sāḵtemān hāyi ke in manba rā masraf mikonand +Units that consume this resource = Niroo hāyi ke in manba rā masraf mikonand Can be built on = Mitavānad sāḵte šavad rooye Defence bonus = Emtiāz e defāi Movement cost = Hazine ye harekat diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index 494329f76e..8d5b55c537 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -70,7 +70,7 @@ Not this time. = In dafe’e na. Excellent! = Aalie! How about something else... = Yek chiz e dige chetore... A pleasure to meet you. = Az molaaghaat baa shomaa khoshbakhtam. -Our relationship: = Ravaabet e ma: +Our relationship = Ravaabet e ma We have encountered the City-State of [name]! = Maa be Shahrestaan e [name] barkhord kardim! Declare Friendship ([numberOfTurns] turns) = E’elaam doosti ([numberOfTurns] nobat) May our nations forever remain united! = Baashad ke dolat haaye maa baraaye hamishe mottahed bemaanand! @@ -787,9 +787,9 @@ Occurs on [listOfTerrains] = Rooye [listOfTerrains] etefaagh mioftad Placed on [terrainType] = Gharaar gerefte rooye [terrainType] Can be found on = Peydaa mishavad rooye Improved by [improvement] = Behbood-saakhte shode baa [improvement] -Bonus stats for improvement: = Khavaas ezaafe shode bekhaater e behbood-saazi -Buildings that consume this resource: = Saakhtemaan haayi ke in manba raa masraf mikonand: -Units that consume this resource: = Niroo haayi ke in manba raa masraf mikonand: +Bonus stats for improvement = Khavaas ezaafe shode bekhaater e behbood-saazi +Buildings that consume this resource = Saakhtemaan haayi ke in manba raa masraf mikonand +Units that consume this resource = Niroo haayi ke in manba raa masraf mikonand Can be built on = Mitavaanad saakhte shavad rooye Defence bonus = Emtiaaz e defaai Movement cost = Hazine ye harekat diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 8658811fbd..41c390d51f 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -73,7 +73,7 @@ Not this time. = Nie tym razem. Excellent! = Wyśmienicie! How about something else... = Co powiesz na... A pleasure to meet you. = Miło cię spotkać. -Our relationship: = Nasze relacje: +Our relationship = Nasze relacje We have encountered the City-State of [name]! = Spotkaliśmy Państwo-Miasto [name]! Declare Friendship ([numberOfTurns] turns) = Deklaracja przyjaźni ([numberOfTurns] tur) May our nations forever remain united! = Oby nasze narody na zawsze pozostały zjednoczone! @@ -781,9 +781,9 @@ Occurs on [listOfTerrains] = Występuje na [listOfTerrains] Placed on [terrainType] = Umieszczone na [terrainType] Can be found on = Może zostać znaleziony na Improved by [improvement] = Ulepszane przez [improvement] -Bonus stats for improvement: = Dodatkowe statystyki po ulepszeniu -Buildings that consume this resource: = Budynki pochłaniające ten surowiec: -Units that consume this resource: = Jednostki wymagające tego surowca: +Bonus stats for improvement = Dodatkowe statystyki po ulepszeniu +Buildings that consume this resource = Budynki pochłaniające ten surowiec +Units that consume this resource = Jednostki wymagające tego surowca Can be built on = Może być zbudowany na Defence bonus = Premia do obrony Movement cost = Koszt ruchu diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index ba0c880d59..079c23a67c 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -73,7 +73,7 @@ Not this time. = Dessa vez não. Excellent! = Excelente! How about something else... = Porque não algo mais... A pleasure to meet you. = É um prazer conhece-lo. -Our relationship: = Nossa relação: +Our relationship = Nossa relação We have encountered the City-State of [name]! = Nós encontramos a cidade-estado de [name] Declare Friendship ([numberOfTurns] turns) = Declarar amizade ([numberOfTurns] turnos) May our nations forever remain united! = Que nossas nações se mantenho unidas para sempre! @@ -838,9 +838,9 @@ Occurs on [listOfTerrains] = Ocorre em [listOfTerrains] Placed on [terrainType] = Colocado em [terrainType] Can be found on = Pode ser encontrado em Improved by [improvement] = Melhorado por [improvement] -Bonus stats for improvement: = Bonus de estatisticas por melhoria: -Buildings that consume this resource: = Construções que consomem esse recurso: -Units that consume this resource: = Unidades que consomem esse recurso: +Bonus stats for improvement = Bonus de estatisticas por melhoria +Buildings that consume this resource = Construções que consomem esse recurso +Units that consume this resource = Unidades que consomem esse recurso Can be built on = Pode ser construido em Defence bonus = Bonus de defesa Movement cost = Custo de movimento diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index c6fcfb8ddc..9afad62db7 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -73,7 +73,7 @@ Not this time. = Nu de această dată. Excellent! = Excelent! How about something else... = Ce ai zice despre altceva... A pleasure to meet you. = Încântat de cunoștință. -Our relationship: = Relația noastră: +Our relationship = Relația noastră We have encountered the City-State of [name]! = Am întalnit Orașul-Stat al [name]! Declare Friendship ([numberOfTurns] turns) = Declară prietenia ([numberOfTurns] ture) May our nations forever remain united! = Fie ca națiunile noastre să rămână pentru totdeauna unite! @@ -831,11 +831,11 @@ Can be found on = Se poate găsi pe # Requires translation! Improved by [improvement] = # Requires translation! -Bonus stats for improvement: = +Bonus stats for improvement = # Requires translation! -Buildings that consume this resource: = +Buildings that consume this resource = # Requires translation! -Units that consume this resource: = +Units that consume this resource = Can be built on = Se poate construi pe Defence bonus = Bonus de apărare Movement cost = Cost de deplasare diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 8215169a50..0336c2c392 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -69,7 +69,7 @@ Not this time. = Не в этот раз. Excellent! = Превосходно! How about something else... = Как насчет другого... A pleasure to meet you. = Рады видеть вас. -Our relationship: = Наши отношения: +Our relationship = Наши отношения We have encountered the City-State of [name]! = Мы обнаружили город-государство [name]! Declare Friendship ([numberOfTurns] turns) = Объявить о дружбе ([numberOfTurns] ходов) May our nations forever remain united! = Да будут наши державы навеки едины! @@ -744,9 +744,9 @@ Occurs on [listOfTerrains] = Появляется на: [listOfTerrains] Placed on [terrainType] = Появляется вместо: [terrainType] Can be found on = Может быть найден на клетках: Improved by [improvement] = Улучшение: [improvement] -Bonus stats for improvement: = Бонусы за улучшение: -Buildings that consume this resource: = Здания, которые потребляют этот ресурс: -Units that consume this resource: = Юниты, которые потребляют этот ресурс: +Bonus stats for improvement = Бонусы за улучшение +Buildings that consume this resource = Здания, которые потребляют этот ресурс +Units that consume this resource = Юниты, которые потребляют этот ресурс Can be built on = Можно строить на: Defence bonus = Бонус к защите Movement cost = Стоимость передвижения diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 5e6c623171..2afa38f3ae 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -69,7 +69,7 @@ Not this time. = 这次不行，我只和有诚意的人交易。 Excellent! = 真是荣幸之至！互相尊重、平等互利是建立友好关系的第一步。 How about something else... = 谈判桌上的尔虞我诈才是我的兴趣所在。 A pleasure to meet you. = 很高兴见到你。 -Our relationship: = 我们的关系： +Our relationship = 我们的关系： We have encountered the City-State of [name]! = 我们遇到了城邦[name]！ Declare Friendship ([numberOfTurns] turns) = 宣布相互友善([numberOfTurns]回合) May our nations forever remain united! = 我们两个文明将永远肝胆相照、休戚与共地站在一起！ @@ -742,9 +742,9 @@ Occurs on [listOfTerrains] = 可能出现在以下地形：[listOfTerrains] Placed on [terrainType] = 可出现在[terrainType]之上 Can be found on = 可能发现该资源的地形地貌： Improved by [improvement] = 开发该资源所需设施：[improvement] -Bonus stats for improvement: = 开发该资源后设施所获奖励效果： -Buildings that consume this resource: = 消耗该资源的建筑： -Units that consume this resource: = 消耗该资源的单位： +Bonus stats for improvement = 开发该资源后设施所获奖励效果： +Buildings that consume this resource = 消耗该资源的建筑： +Units that consume this resource = 消耗该资源的单位： Can be built on = 可以建造于： Defence bonus = 防御力加成 Movement cost = 移动力消耗 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index d3f9e0070e..2dbcbcb23e 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -69,7 +69,7 @@ Not this time. = No por ahora. Excellent! = ¡Excelente! How about something else... = ¿Qué tal algo diferente...? A pleasure to meet you. = Es un placer conocerte. -Our relationship: = Nuestra relación: +Our relationship = Nuestra relación We have encountered the City-State of [name]! = ¡Hemos descubierto la ciudad-estado de [name]! Declare Friendship ([numberOfTurns] turns) = Declarar amistad ([numberOfTurns] turnos)] May our nations forever remain united! = ¡Así se mantengan nuestras naciones unidas para siempre! @@ -740,9 +740,9 @@ Occurs on [listOfTerrains] = Ocurre en [listOfTerrains] Placed on [terrainType] = Colocado en [terrainType] Can be found on = Se puede encontrar en Improved by [improvement] = Mejorado por [improvement] -Bonus stats for improvement: = Bonus de atributos por mejora: -Buildings that consume this resource: = Edificios que consumen este recurso: -Units that consume this resource: = Unidades que consumen este recurso: +Bonus stats for improvement = Bonus de atributos por mejora +Buildings that consume this resource = Edificios que consumen este recurso +Units that consume this resource = Unidades que consumen este recurso Can be built on = Se puede construir en Defence bonus = Bonus de defensa Movement cost = Coste de movimiento diff --git a/android/assets/jsons/translations/Thai.properties b/android/assets/jsons/translations/Thai.properties index a884489dec..41838b8de1 100644 --- a/android/assets/jsons/translations/Thai.properties +++ b/android/assets/jsons/translations/Thai.properties @@ -305,7 +305,7 @@ Not this time. = ไม่ใช่ตอนนี้สิ Excellent! = ยอดเยี่ยม How about something else... = งั้นเอาเป็นอย่างนี้ดีไหม... A pleasure to meet you. = ยินดีที่ได้พบท่าน -Our relationship: = ค่าความสัมพันธของเรา: +Our relationship = ค่าความสัมพันธของเรา We have encountered the City-State of [name]! = พวกเราเจอเข้าให้กับเมือง [name]! Declare Friendship ([numberOfTurns] turns) = ประกาศสัมพันธไมตรี ([numberOfTurns] เทิร์น) May our nations forever remain united! = ขอให้ชนชาติของพวกเราจะต้องรวมกันเป็นหนึ่งตลอดไป! @@ -820,7 +820,7 @@ Obsolete with [obsoleteTech] = ล้าสมัยกับ [obsoleteTech] Occurs on [listOfTerrains] = เกิดขึ้นบน [listOfTerrains] Can be found on = สามารถถูกพบได้บน Improved by [improvement] = ปรับปรุงโดย [improvement] -Bonus stats for improvement: = แต้มโบนัสสำหรับการปรับปรุง +Bonus stats for improvement = แต้มโบนัสสำหรับการปรับปรุง Can be built on = สามารถสร้างได้บน Defence bonus = โบนัสการป้องกัน Movement cost = ค่าการเคลื่อนย้าย diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 763a47c20f..dacecbf671 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -73,7 +73,7 @@ Not this time. = 這次不行，我只和有誠意的人交易。 Excellent! = 真是榮幸之至！互相尊重、平等互利是建立友好關係的第一步。 How about something else... = 談判桌上的爾虞我詐才是我的興趣所在。 A pleasure to meet you. = 很高興見到你。 -Our relationship: = 我們的關係： +Our relationship = 我們的關係： We have encountered the City-State of [name]! = 我們遇到了城邦[name]！ Declare Friendship ([numberOfTurns] turns) = 宣佈相互友善([numberOfTurns]回合) May our nations forever remain united! = 我們兩個文明將永遠肝膽相照、休戚與共地站在一起！ @@ -770,9 +770,9 @@ Occurs on [listOfTerrains] = 可能出現在以下地形：[listOfTerrains] Placed on [terrainType] = 出現在[terrainType]之上 Can be found on = 可能發現該資源的地形地貌： Improved by [improvement] = 開發該資源所需設施：[improvement] -Bonus stats for improvement: = 開發該資源後設施所獲獎勵效果： -Buildings that consume this resource: = 消耗該資源的建築： -Units that consume this resource: = 消耗該資源的單位： +Bonus stats for improvement = 開發該資源後設施所獲獎勵效果： +Buildings that consume this resource = 消耗該資源的建築： +Units that consume this resource = 消耗該資源的單位： Can be built on = 可以建造於： Defence bonus = 防禦力加成 Movement cost = 移動力消耗 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 84f567184d..c6699ffb8f 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -73,7 +73,7 @@ Not this time. = Bu defa olmaz. Excellent! = Mükemmel! How about something else... = Başka bir şeye ne dersin... A pleasure to meet you. = Tanıştığımıza memnun oldum. -Our relationship: = İlişkimiz: +Our relationship = İlişkimiz We have encountered the City-State of [name]! = [name] Şehir Devleti ile karşılaştık! Declare Friendship ([numberOfTurns] turns) = Arkadaşlık Bildir ([numberOfTurns] tur) May our nations forever remain united! = Milletlerimiz sonsuza kadar birlik içinde olsun! @@ -783,9 +783,9 @@ Occurs on [listOfTerrains] = [listOfTerrains] arazilerinde oluşur Placed on [terrainType] = [terrainType] üstüne yerleştirildi Can be found on = Şurada bulunabilir Improved by [improvement] = [improvement] ile geliştirildi -Bonus stats for improvement: = Geliştirme için bonus istatistikleri: -Buildings that consume this resource: = Bu kaynağı kullanan binalar -Units that consume this resource: = Bu kaynağı kullanan birlikler +Bonus stats for improvement = Geliştirme için bonus istatistikleri +Buildings that consume this resource = Bu kaynağı kullanan binalar +Units that consume this resource = Bu kaynağı kullanan birlikler Can be built on = Üzerine inşa edilebilir Defence bonus = Savunma bonusu Movement cost = Hareket maliyeti diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 537ddf07d4..178ab4f407 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -69,7 +69,7 @@ Not this time. = Не цього разу. Excellent! = Чудово! How about something else... = Як щодо іншого… A pleasure to meet you. = Приємно зустріти вас. -Our relationship: = Наші відносини: +Our relationship = Наші відносини We have encountered the City-State of [name]! = Ми зіткнулися з містом-державою [name]! Declare Friendship ([numberOfTurns] turns) = Заявити про дружбу (Ходів: [numberOfTurns]) May our nations forever remain united! = Нехай наші народи назавжди залишаються об’єднаними! @@ -750,9 +750,9 @@ Occurs on [listOfTerrains] = Зустрічається на таких місц Placed on [terrainType] = Є клітиною типу «[terrainType]» Can be found on = Можна знайти в таких місцевостях: Improved by [improvement] = Забезпечується вдосконаленням «[improvement]» -Bonus stats for improvement: = Бонусні характеристики за удосконалення: -Buildings that consume this resource: = Будівлі, що потребують цей ресурс: -Units that consume this resource: = Підрозділи, що потребують цей ресурс: +Bonus stats for improvement = Бонусні характеристики за удосконалення +Buildings that consume this resource = Будівлі, що потребують цей ресурс +Units that consume this resource = Підрозділи, що потребують цей ресурс Can be built on = Може бути побудований на клітинах такого типу: Defence bonus = Бонус до захисту Movement cost = Вартість руху diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties index f111510a21..d05a6b1bd1 100644 --- a/android/assets/jsons/translations/Vietnamese.properties +++ b/android/assets/jsons/translations/Vietnamese.properties @@ -795,9 +795,9 @@ Occurs on [listOfTerrains] = Placed on [terrainType] = Can be found on = Improved by [improvement] = -Bonus stats for improvement: = -Buildings that consume this resource: = -Units that consume this resource: = +Bonus stats for improvement = +Buildings that consume this resource = +Units that consume this resource = Can be built on = Defence bonus = Movement cost = diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index 357306255d..ae4d270590 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -69,7 +69,7 @@ Not this time. = Excellent! = How about something else... = A pleasure to meet you. = -Our relationship: = +Our relationship = We have encountered the City-State of [name]! = Declare Friendship ([numberOfTurns] turns) = May our nations forever remain united! = @@ -740,9 +740,9 @@ Occurs on [listOfTerrains] = Placed on [terrainType] = Can be found on = Improved by [improvement] = -Bonus stats for improvement: = -Buildings that consume this resource: = -Units that consume this resource: = +Bonus stats for improvement = +Buildings that consume this resource = +Units that consume this resource = Can be built on = Defence bonus = Movement cost = diff --git a/core/src/com/unciv/models/ruleset/tile/TileResource.kt b/core/src/com/unciv/models/ruleset/tile/TileResource.kt index 7df347c9dd..4ac1c53b62 100644 --- a/core/src/com/unciv/models/ruleset/tile/TileResource.kt +++ b/core/src/com/unciv/models/ruleset/tile/TileResource.kt @@ -30,16 +30,16 @@ class TileResource : NamedStats() { stringBuilder.appendln("Can be found on ".tr() + terrainsCanBeBuiltOnString.joinToString(", ")) stringBuilder.appendln() stringBuilder.appendln("Improved by [$improvement]".tr()) - stringBuilder.appendln("Bonus stats for improvement: ".tr() + "$improvementStats".tr()) + stringBuilder.appendln("{Bonus stats for improvement}: ".tr() + "$improvementStats".tr()) val buildingsThatConsumeThis = ruleset.buildings.values.filter { it.requiredResource==name } if(buildingsThatConsumeThis.isNotEmpty()) - stringBuilder.appendln("Buildings that consume this resource: ".tr() + stringBuilder.appendln("{Buildings that consume this resource}: ".tr() + buildingsThatConsumeThis.joinToString { it.name.tr() }) val unitsThatConsumeThis = ruleset.units.values.filter { it.requiredResource==name } if(unitsThatConsumeThis.isNotEmpty()) - stringBuilder.appendln("Units that consume this resource: ".tr() + stringBuilder.appendln("{Units that consume this resource}: ".tr() + unitsThatConsumeThis.joinToString { it.name.tr() }) if(unique!=null) stringBuilder.appendln(unique!!.tr()) diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index 53810fe480..03a13f8760 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -380,10 +380,10 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() { fun getRelationshipTable(otherCivDiplomacyManager: DiplomacyManager): Table { val relationshipTable = Table() - val opinionOfUs = if(otherCivDiplomacyManager.civInfo.isCityState()) otherCivDiplomacyManager.influence.toInt() + val opinionOfUs = if (otherCivDiplomacyManager.civInfo.isCityState()) otherCivDiplomacyManager.influence.toInt() else otherCivDiplomacyManager.opinionOfOtherCiv().toInt() - relationshipTable.add("Our relationship: ".toLabel()) + relationshipTable.add("{Our relationship}: ".toLabel()) val relationshipLevel = otherCivDiplomacyManager.relationshipLevel() val relationshipText = relationshipLevel.name.tr() + " ($opinionOfUs)" val relationshipColor = when (relationshipLevel) {