From ada00e510f28dd5d6e818c55d166d085e881459f Mon Sep 17 00:00:00 2001 From: Forgon2100 Date: Thu, 1 Nov 2018 10:20:33 +0000 Subject: [PATCH 1/2] Change string " " into an untranslatable message As a paragraph separator for campaign mission briefings, this text should not be translatable. Fixes #345 --- data/base/messages/strings/cam1strings.txt | 10 +++++----- data/base/messages/strings/cam2strings.txt | 2 +- data/base/messages/strings/cam3strings.txt | 2 +- po/ca_ES.po | 10 ---------- po/cs.po | 10 ---------- po/da.po | 10 ---------- po/de.po | 10 ---------- po/el.po | 10 ---------- po/en_GB.po | 10 ---------- po/eo.po | 10 ---------- po/es.po | 10 ---------- po/et_EE.po | 10 ---------- po/fi.po | 10 ---------- po/fr.po | 10 ---------- po/fy.po | 10 ---------- po/ga.po | 10 ---------- po/hr.po | 10 ---------- po/hu.po | 10 ---------- po/id.po | 10 ---------- po/it.po | 10 ---------- po/ko.po | 10 ---------- po/la.po | 10 ---------- po/lt.po | 10 ---------- po/nb.po | 10 ---------- po/nl.po | 10 ---------- po/pl.po | 10 ---------- po/pt.po | 10 ---------- po/pt_BR.po | 10 ---------- po/ro.po | 10 ---------- po/ru.po | 10 ---------- po/sk.po | 10 ---------- po/sl.po | 10 ---------- po/tr.po | 10 ---------- po/uk_UA.po | 10 ---------- po/zh_CN.po | 10 ---------- po/zh_TW.po | 10 ---------- 36 files changed, 7 insertions(+), 337 deletions(-) diff --git a/data/base/messages/strings/cam1strings.txt b/data/base/messages/strings/cam1strings.txt index 01d3ad8c015..7ee593fff5e 100644 --- a/data/base/messages/strings/cam1strings.txt +++ b/data/base/messages/strings/cam1strings.txt @@ -59,7 +59,7 @@ CAM1D_MSG3 _("This is our chance to defeat the New Paradigm and destroy their /* New Paradigm - incoming transmission */ -NP_MSG2 _(" ") +NP_MSG2 " " /* Cam 1B Player Ident Congrats */ P1B_MSG1 _("ALPHA BASE MISSION: Power Surge Detected") @@ -69,7 +69,7 @@ P1B_MSG3 _("We now have a further task for you.") /* Cam 1.1 Player Ident Congrats */ P1-1_MSG1 _("ALPHA BASE MISSION: Locate and Recover Artifacts") P1-1_MSG2 _("The first two zones are now secure.") -P1-1_MSG3 _(" ") +P1-1_MSG3 " " /* Project Team updates */ P1-3A_MSG1 _("PROJECT TEAM UPDATES") @@ -87,7 +87,7 @@ GAMMA_MSG3 _("We've discovered no artifacts and encountered no hostiles.") /* Map1c mission brief - intelligence report */ CAM1C_MSG4 _("ALPHA BASE INTELLIGENCE REPORT: Enemy Attack") CAM1C_MSG5 _("We are detecting an enemy attack force at this location.") -CAM1C_MSG6 _(" ") +CAM1C_MSG6 " " /* Map1c project update - enemy attack */ CAM1C_MSG7 _("PRIMARY OBJECTIVE") @@ -113,7 +113,7 @@ SUP_MSG3 _("Establish a forward base then continue the search for the synaptic /* Submap1_4 Player ident */ SUB1_4A_MSG4 _("INCOMING TRANSMISSION") SUB1_4A_MSG5 _("Decoding in progress.....") -SUB1_4A_MSG6 _(" ") +SUB1_4A_MSG6 " " /* Submap 1_4b - Destroy Enemy Base */ SUB1_4B_MSG2 _("Commander.") @@ -151,7 +151,7 @@ CAM1OUT_MSG1 _("Congratulations on defeating the New Paradigm, this sector is CAM1OUT_MSG2 _("The Nexus Intruder Program was in the New Paradigm system.") CAM1OUT_MSG3 _("We recorded two conversations with it, extracts follow...") -CAM1OUT_MSG4 _(" ") +CAM1OUT_MSG4 " " CAM1OUT_MSG5 _("We'll keep you informed of further developments") CAM1OUT_MSG6 _("Commander you are to assist Team Beta") diff --git a/data/base/messages/strings/cam2strings.txt b/data/base/messages/strings/cam2strings.txt index 48f8a464e17..b429ceda9c8 100644 --- a/data/base/messages/strings/cam2strings.txt +++ b/data/base/messages/strings/cam2strings.txt @@ -105,7 +105,7 @@ CAM2_5_MSG6 _("Do not allow the Collective to bring the reactor on-line.") /* Cam2DI Capture NASDA central - briefing */ CAM2_DI_MSG3 _("BETA BASE MISSION: Capture NASDA Central") CAM2_DI_MSG4 _("Capture NASDA central before NEXUS and the Collective can use it.") -CAM2_DI_MSG5 _(" ") +CAM2_DI_MSG5 " " /* Cam2_6 part2 Satellite Uplink - player ident*/ CAM2_6_MSG _("TRANSPORT MISSION: Satellite Uplink Site") diff --git a/data/base/messages/strings/cam3strings.txt b/data/base/messages/strings/cam3strings.txt index 44636bcbb16..2011213474b 100644 --- a/data/base/messages/strings/cam3strings.txt +++ b/data/base/messages/strings/cam3strings.txt @@ -153,7 +153,7 @@ CAM3A_D2_MSG6 _("Assign this task to a research facility.") CAM3A_D2_MSG7 _("NEXUS forces detected at these locations.") /* Cam3A-D2 NEXUS Counter-attacks - player ident part 3 restored */ -CAM3A_D2_MSG8 _(" ") +CAM3A_D2_MSG8 " " CAM3A_D2_MSG9 _("NEXUS has been eradicated from all Project systems.") CAM3A_D2_MSG10 _("We are attempting to access the missile control codes.") diff --git a/po/ca_ES.po b/po/ca_ES.po index 160c7bf4e4f..ed2caab2411 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -191,16 +191,6 @@ msgstr "Estem detectant forces enemigues en aquestes localitzacions." msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "És la nostra oportunitat d'eliminar el Nou Paradigma i destruir la seva base." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Us felicitem Comandant" diff --git a/po/cs.po b/po/cs.po index 00b1378b6e7..ebaf8b046d2 100644 --- a/po/cs.po +++ b/po/cs.po @@ -193,16 +193,6 @@ msgstr "" msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "" -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "" diff --git a/po/da.po b/po/da.po index feb3d4db190..7636a359548 100644 --- a/po/da.po +++ b/po/da.po @@ -194,16 +194,6 @@ msgstr "" msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "" -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "" diff --git a/po/de.po b/po/de.po index 2a7e6fe4bb9..809c0160f4d 100644 --- a/po/de.po +++ b/po/de.po @@ -201,16 +201,6 @@ msgstr "Wir orten feindliche Truppen an diesen Positionen." msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "Das ist unsere Chance das New Paradigm zu besiegen und ihre Basis zu zerstören." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Glückwunsch, Commander." diff --git a/po/el.po b/po/el.po index 21fc7d6eda7..043bf23b2c2 100644 --- a/po/el.po +++ b/po/el.po @@ -192,16 +192,6 @@ msgstr "Εντοπίζουμε εχθρικές δυνάμεις σε αυτές msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "Αυτή είναι η ευκαιρία μας, να νικήσουμε το Νέο Παράδειγμα, και να καταστρέψουμε τη βάση τους." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Συγχαρητήρια Διοικητή." diff --git a/po/en_GB.po b/po/en_GB.po index 785613312d0..695b09ad53c 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -193,16 +193,6 @@ msgstr "We are detecting enemy forces at these locations." msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "This is our chance to defeat the New Paradigm and destroy their base." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Congratulations Commander." diff --git a/po/eo.po b/po/eo.po index 3ad9cd76c4f..ca40604770c 100644 --- a/po/eo.po +++ b/po/eo.po @@ -190,16 +190,6 @@ msgstr "" msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "" -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr "" - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "" diff --git a/po/es.po b/po/es.po index 63857e611df..177efeea5c1 100644 --- a/po/es.po +++ b/po/es.po @@ -197,16 +197,6 @@ msgstr "Estamos detectando fuerzas enemigas en estos lugares." msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "Es nuestra oportunidad de defender el Nuevo Paradigma y destruir su base." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Enhorabuena, Comandante." diff --git a/po/et_EE.po b/po/et_EE.po index db1c6fd3d1c..dfe7b88f80d 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -193,16 +193,6 @@ msgstr "Me tuvastasime vaenlase väed nendes asukohtades." msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "See on meie võimalus lüüa Uus Paradigmid ja hävitada nende baas." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Õnnitlused Komandör." diff --git a/po/fi.po b/po/fi.po index 27bbace9842..cbb9b47249c 100644 --- a/po/fi.po +++ b/po/fi.po @@ -193,16 +193,6 @@ msgstr "" msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "" -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr "" - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "" diff --git a/po/fr.po b/po/fr.po index 23669361a8c..5217f5c8a6b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -189,16 +189,6 @@ msgstr "Nous détectons des forces ennemies dans les alentours." msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "Voilà notre chance de renverser le Nouveau Paradigme et de détruire leur base." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr "" - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Nos félicitations, Commandant !" diff --git a/po/fy.po b/po/fy.po index 522ce8bc136..c371b0fdd44 100644 --- a/po/fy.po +++ b/po/fy.po @@ -193,16 +193,6 @@ msgstr "" msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "" -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr "" - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "" diff --git a/po/ga.po b/po/ga.po index 8a7d4c516cd..db2935bd78d 100644 --- a/po/ga.po +++ b/po/ga.po @@ -193,16 +193,6 @@ msgstr "" msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "" -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr "" - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "" diff --git a/po/hr.po b/po/hr.po index 35bd0d3254a..faceaa82e2d 100644 --- a/po/hr.po +++ b/po/hr.po @@ -185,16 +185,6 @@ msgstr "" msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "" -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "" diff --git a/po/hu.po b/po/hu.po index c7633488e3e..4b638ba26b1 100644 --- a/po/hu.po +++ b/po/hu.po @@ -195,16 +195,6 @@ msgstr "Ellenséges erőket észleltünk ezen a helyszínen." msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "Ez a mi lehetőségünk, elpusztítani az Új Paradigmát és lerombolni a bázisát." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Gratulálunk parancsnok." diff --git a/po/id.po b/po/id.po index dc4aef1dddd..3fffea91ab2 100644 --- a/po/id.po +++ b/po/id.po @@ -191,16 +191,6 @@ msgstr "" msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "" -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr "" - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "" diff --git a/po/it.po b/po/it.po index 0a2564ecada..cf3e21db8ec 100644 --- a/po/it.po +++ b/po/it.po @@ -198,16 +198,6 @@ msgstr "Stiamo localizzando forze nemiche in queste posizioni." msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "Questa è la nostra chance per sconfiggere il New Paradigm e distruggere la loro base." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Congratulazioni Comandante." diff --git a/po/ko.po b/po/ko.po index 94c42af95eb..69427b1174a 100644 --- a/po/ko.po +++ b/po/ko.po @@ -192,16 +192,6 @@ msgstr "우리가 이 위치들에 적군을 감지하고 있습니다" msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "이것은 우리가 뉴 패러다임을 물리치고 그들의 기지를 파괴할 기회입니다." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "축하합니다 사령관님." diff --git a/po/la.po b/po/la.po index 8a3828d6bb7..8662d101852 100644 --- a/po/la.po +++ b/po/la.po @@ -193,16 +193,6 @@ msgstr "" msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "" -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "" diff --git a/po/lt.po b/po/lt.po index 2a319003de6..c3b9c161d96 100644 --- a/po/lt.po +++ b/po/lt.po @@ -193,16 +193,6 @@ msgstr "" msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "" -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "" diff --git a/po/nb.po b/po/nb.po index 5c619d128b8..72753cc0072 100644 --- a/po/nb.po +++ b/po/nb.po @@ -194,16 +194,6 @@ msgstr "" msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "" -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "" diff --git a/po/nl.po b/po/nl.po index 49b460f6a08..46dd1cc1bb8 100644 --- a/po/nl.po +++ b/po/nl.po @@ -185,16 +185,6 @@ msgstr "Wij detecteren vijandelijke krachten op deze locaties." msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "Dit is onze kans om de basis van de New Paradigm te verslaan." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Gefeliciteerd Commandant." diff --git a/po/pl.po b/po/pl.po index d9de6ed4282..a64fa5a4edc 100644 --- a/po/pl.po +++ b/po/pl.po @@ -195,16 +195,6 @@ msgstr "Wykryto siły wroga na tych lokacjach." msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "To nasza szansa na pokonanie New Paragidm i zniszczenie ich bazy." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Gratulacje dowódco." diff --git a/po/pt.po b/po/pt.po index 049641a4f1e..2ac178f2c98 100644 --- a/po/pt.po +++ b/po/pt.po @@ -193,16 +193,6 @@ msgstr "Estamos a detectar forças inimigas nestas localizações." msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "Esta é a nossa hipótese de derrotar o Novo Paradigma e destruir a base deles." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Parabéns Comandante." diff --git a/po/pt_BR.po b/po/pt_BR.po index 5ecb2a775ea..604706d1d26 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -189,16 +189,6 @@ msgstr "Estamos detectando forças inimigas nessas localidades." msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "Essa é nossa chance de derrotar o Novo Paradigma e destruir sua base." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Parabéns, Comandante." diff --git a/po/ro.po b/po/ro.po index de42e669a59..5731cb123a2 100644 --- a/po/ro.po +++ b/po/ro.po @@ -193,16 +193,6 @@ msgstr "Detectăm forțe inamice la această locație." msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "Aceasta esteșansa noastră să învingem Noua Paradigmă și să le distrugem baza." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Felicitări, comandante." diff --git a/po/ru.po b/po/ru.po index 588e9e43006..db66519fb86 100644 --- a/po/ru.po +++ b/po/ru.po @@ -198,16 +198,6 @@ msgstr "Мы обнаружили вражеские войска в этом р msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "Это наш шанс разгромить Новую Парадигму и уничтожить их базу." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Поздравляем, Командующий." diff --git a/po/sk.po b/po/sk.po index dc3436fb8f9..52b90e6d378 100644 --- a/po/sk.po +++ b/po/sk.po @@ -196,16 +196,6 @@ msgstr "" msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "" -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "" diff --git a/po/sl.po b/po/sl.po index 9860df7371a..d59c82d534c 100644 --- a/po/sl.po +++ b/po/sl.po @@ -191,16 +191,6 @@ msgstr "Na teh položajih zaznavamo sovražne posadke." msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "To je naša priložnost, da premagamo Novo Paradigmo in uničimo njihovo bazo." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Čestitke, poveljnik." diff --git a/po/tr.po b/po/tr.po index 15dff9ac07e..df2a9e84396 100644 --- a/po/tr.po +++ b/po/tr.po @@ -196,16 +196,6 @@ msgstr "Bu bölgelerde düşman birlikleri tespit ettik." msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "Bu Yeni Paradigmayı yenip üslerini yok etmek için bir şans." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Tebrikler Komutan." diff --git a/po/uk_UA.po b/po/uk_UA.po index ab97f945d29..e82fba43150 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -187,16 +187,6 @@ msgstr "Ми фіксуємо ворожі сили на цих територі msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "Це наш шанс завдати поразки Новій Парадігмі та знищити їх базу." -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "Вітаємо, Командире." diff --git a/po/zh_CN.po b/po/zh_CN.po index a5bea2fe672..1bb0c719123 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -195,16 +195,6 @@ msgstr "我们在这个区域侦测到了敌军" msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "这是我们打败New Paradigm并摧毁他们基地的最好机会!" -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "恭喜你,指挥官!" diff --git a/po/zh_TW.po b/po/zh_TW.po index e5849f0a99f..486dc269c2d 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -196,16 +196,6 @@ msgstr "我們在這個區域偵測到了敵軍" msgid "This is our chance to defeat the New Paradigm and destroy their base." msgstr "這是我們打敗New Paradigm並摧毀他們基地的最好機會!" -#: data/base/messages/strings/cam1strings.txt:62 -#: data/base/messages/strings/cam1strings.txt:72 -#: data/base/messages/strings/cam1strings.txt:90 -#: data/base/messages/strings/cam1strings.txt:116 -#: data/base/messages/strings/cam1strings.txt:154 -#: data/base/messages/strings/cam2strings.txt:108 -#: data/base/messages/strings/cam3strings.txt:156 -msgid " " -msgstr " " - #: data/base/messages/strings/cam1strings.txt:66 msgid "Congratulations Commander." msgstr "恭喜你,指揮官!" From bd0514fd6ff84f76ea9c0633523b68b45a9c90ca Mon Sep 17 00:00:00 2001 From: Forgon2100 Date: Tue, 1 Jan 2019 14:18:21 +0000 Subject: [PATCH 2/2] Add placeholder for "AUDIO / ZOOM OPTIONS" message * add support for optional delimiter "\n" to show message on two lines so that it can be translated correctly within a 640x480 pixel window (that is, the minium screen resolution) * only process the first delimiter, ignoring all others that may follow * note that the messages's translation must not begin or end with "\n" (otherwise msgfmt will terminate with a fatal error) Refs ticket:4629 Fixes #345 --- src/frontend.cpp | 16 ++++++++++++++-- src/frontend.h | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/frontend.cpp b/src/frontend.cpp index a3260ed0c60..ec203314ed9 100644 --- a/src/frontend.cpp +++ b/src/frontend.cpp @@ -921,8 +921,20 @@ static bool startAudioAndZoomOptionsMenu() addMultiBut(psWScreen, FRONTEND_BOTFORM, FRONTEND_QUIT, 10, 10, 30, 29, P_("menu", "Return"), IMAGE_RETURN, IMAGE_RETURN_HI, IMAGE_RETURN_HI); //add some text down the side of the form - addSideText(FRONTEND_SIDETEXT, FRONTEND_SIDEX, FRONTEND_SIDEY, _("AUDIO / ZOOM OPTIONS")); - + // TRANSLATORS: "AUDIO" options determine the volume of game sounds. + // "OPTIONS" means "SETTINGS". + // To break this message into two lines, you can use the delimiter "\n", + // e.g. "AUDIO / ZOOM\nOPTIONS" would show "OPTIONS" in a second line. + WzString messageString = WzString::fromUtf8(_("AUDIO / ZOOM OPTIONS")); + std::vector messageStringLines = messageString.split("\n"); + addSideText(FRONTEND_SIDETEXT, FRONTEND_SIDEX, FRONTEND_SIDEY, messageStringLines[0].toUtf8().c_str()); + // show a second sidetext line if the translation requires it + if (messageStringLines.size() > 1) + { + messageString.remove(0, messageStringLines[0].length() + 1); + addSideText(FRONTEND_MULTILINE_SIDETEXT, FRONTEND_SIDEX + 22, \ + FRONTEND_SIDEY, messageString.toUtf8().c_str()); + } return true; } diff --git a/src/frontend.h b/src/frontend.h index bf75eda7892..d8c8703c557 100644 --- a/src/frontend.h +++ b/src/frontend.h @@ -159,6 +159,7 @@ enum FRONTEND_BOTFORM, FRONTEND_LOGO, FRONTEND_SIDETEXT, // sideways text + FRONTEND_MULTILINE_SIDETEXT, // sideways text FRONTEND_SIDETEXT1, // sideways text FRONTEND_SIDETEXT2, // sideways text FRONTEND_SIDETEXT3, // sideways text