r19033 by jghali - #12210: Add support of PDF/X-1a to 1.4.x

scribus-commit scribus-commit at lists.scribus.net
Tue Apr 15 20:37:31 UTC 2014


Author: jghali
Date: Tue Apr 15 20:37:31 2014
New Revision: 19033

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19033
Log:
#12210: Add support of PDF/X-1a to 1.4.x

Modified:
    branches/Version14x/Scribus/resources/translations/po/scribus.af.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.ar.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.bg.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.br.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.ca.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.cs_CZ.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.cy.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.da_DK.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.de.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.de_1901.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.de_CH.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.el.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.en_AU.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.en_GB.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.en_US.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.es_ES.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.et.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.eu.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.fi.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.fr.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.gl.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.hu.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.id.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.it.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.ja.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.ko.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.lt_LT.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.nb_NO.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.nl.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.pl_PL.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.pt.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.pt_BR.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.ru.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.sa.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.sk_SK.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.sl.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.sq.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.sr.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.sv.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.th_TH.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.tr.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.uk.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.zh_CN.ts
    branches/Version14x/Scribus/resources/translations/po/scribus.zh_TW.ts
    branches/Version14x/Scribus/scribus/commonstrings.cpp
    branches/Version14x/Scribus/scribus/commonstrings.h
    branches/Version14x/Scribus/scribus/pdflib_core.cpp
    branches/Version14x/Scribus/scribus/pdflib_core.h
    branches/Version14x/Scribus/scribus/pdfoptions.h
    branches/Version14x/Scribus/scribus/pdfoptionsio.cpp
    branches/Version14x/Scribus/scribus/pdfopts.cpp
    branches/Version14x/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp
    branches/Version14x/Scribus/scribus/prefsmanager.cpp
    branches/Version14x/Scribus/scribus/tabpdfoptions.cpp

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.af.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.af.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.af.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.af.ts Tue Apr 15 20:37:31 2014
@@ -14257,7 +14257,7 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14738,8 +14738,8 @@
         <translation type="obsolete">&Kleur</translation>
     </message>
     <message>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="obsolete">PDF/X-3 uitvoer doel</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="obsolete">PDF/X uitvoer doel</translation>
     </message>
     <message>
         <source>&Info String:</source>
@@ -14994,9 +14994,9 @@
         <translation type="obsolete">Uitvoerprofiel vir drukwerk. Indien moontlik, probeer leiding by u drukker te kry.</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Verpligte string vir PDF/X-3, anders voldoen PDF nie aan PDF/X-3 standaard nie. Ons beveel die dokument titel aan.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Verpligte string vir PDF/X, anders voldoen PDF nie aan PDF/X standaard nie. Ons beveel die dokument titel aan.</translation>
     </message>
     <message>
         <source>Distance for bleed from the top of the physical page</source>
@@ -32358,8 +32358,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="unfinished">PDF/X-3 uitvoer doel</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="unfinished">PDF/X uitvoer doel</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -32605,9 +32605,9 @@
         <translation type="unfinished">Uitvoerprofiel vir drukwerk. Indien moontlik, probeer leiding by u drukker te kry.</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Verpligte string vir PDF/X-3, anders voldoen PDF nie aan PDF/X-3 standaard nie. Ons beveel die dokument titel aan.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Verpligte string vir PDF/X, anders voldoen PDF nie aan PDF/X standaard nie. Ons beveel die dokument titel aan.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="995"/>
@@ -32736,7 +32736,7 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.ar.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.ar.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.ar.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.ar.ts Tue Apr 15 20:37:31 2014
@@ -11894,7 +11894,7 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -25237,7 +25237,7 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
+        <source>PDF/X Output Intent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -25437,7 +25437,7 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.bg.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.bg.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.bg.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.bg.ts Tue Apr 15 20:37:31 2014
@@ -12006,7 +12006,7 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -25758,7 +25758,7 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
+        <source>PDF/X Output Intent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -26128,7 +26128,7 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.br.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.br.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.br.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.br.ts Tue Apr 15 20:37:31 2014
@@ -11501,8 +11501,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation type="unfinished">Diweredekaet e vo an afell 'enrollañ' mar klaskit ezporzhiañ e mentrezh PDF/X-3et gant hedad stlennoù an ivinell PDF/X-3 goullo.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation type="unfinished">Diweredekaet e vo an afell 'enrollañ' mar klaskit ezporzhiañ e mentrezh PDF/X et gant hedad stlennoù an ivinell PDF/X goullo.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -24471,8 +24471,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="unfinished">Ec'hank PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="unfinished">Ec'hank PDF/X</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -24681,8 +24681,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="unfinished">Hedad ret evit PDF/X-3 a-hend-all ne vo ket sur ar genfurmded PDF/X-3. Ober gant titl an teul zo erbedet.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="unfinished">Hedad ret evit PDF/X a-hend-all ne vo ket sur ar genfurmded PDF/X. Ober gant titl an teul zo erbedet.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="995"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.ca.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.ca.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.ca.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.ca.ts Tue Apr 15 20:37:31 2014
@@ -21654,8 +21654,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>El botó de desar es desactivarà si estas triant d'exportar a un PDF/X-3 i la cadena d'informació dels tabuladors PDF/X-3 es perd.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>El botó de desar es desactivarà si estas triant d'exportar a un PDF/X i la cadena d'informació dels tabuladors PDF/X es perd.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -22135,8 +22135,8 @@
         <translation type="obsolete">C&olor</translation>
     </message>
     <message>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="obsolete">Sortida a PDF/X-3 </translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="obsolete">Sortida a PDF/X </translation>
     </message>
     <message>
         <source>&Info String:</source>
@@ -22396,10 +22396,10 @@
         <translation type="obsolete">Perfil de sortida per impressió. Si pots, demana consells al teu impressor sobre la tria de perfils.</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Cadena obligatòria per PDF/X3 o el PDF fallarà.
-Ajustos PDF/X-3. Recomanem fer servir el títol del document.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Cadena obligatòria per PDF/ o el PDF fallarà.
+Ajustos PDF/X. Recomanem fer servir el títol del document.</translation>
     </message>
     <message>
         <source>Distance for bleed from the top of the physical page</source>
@@ -42023,8 +42023,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>Sortida a PDF/X-3 </translation>
+        <source>PDF/X Output Intent</source>
+        <translation>Sortida a PDF/X </translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -42289,10 +42289,10 @@
         <translation>Perfil de sortida per impressió. Si pots, demana consells al teu impressor sobre la tria de perfils.</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Cadena obligatòria per PDF/X3 o el PDF fallarà.
-Ajustos PDF/X-3. Recomanem fer servir el títol del document.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Cadena obligatòria per PDF/X o el PDF fallarà.
+Ajustos PDF/X. Recomanem fer servir el títol del document.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="995"/>
@@ -42424,8 +42424,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Cadena obligatòria pels PDF/X-3 per poder complir els requeriments. Es recomana fer servir el títol del document.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Cadena obligatòria pels PDF/X per poder complir els requeriments. Es recomana fer servir el títol del document.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="548"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.cs_CZ.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.cs_CZ.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.cs_CZ.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.cs_CZ.ts Tue Apr 15 20:37:31 2014
@@ -18309,8 +18309,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Tlačítko pro uložení bude zakázané, pokud se pokusíte exportovat PDF/X-3 a bude chybět informační řetězec z karty PDF/X-3.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Tlačítko pro uložení bude zakázané, pokud se pokusíte exportovat PDF/X a bude chybět informační řetězec z karty PDF/X.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -33060,8 +33060,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>Výstup do PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>Výstup do PDF/X</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -33307,8 +33307,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Povinný řetězec pro PDF/X-3 - jinak se PDF nebude shodovat s formátem PDF/X-3. Doporučujeme, abyste použili název dokumentu.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Povinný řetězec pro PDF/X - jinak se PDF nebude shodovat s formátem PDF/X. Doporučujeme, abyste použili název dokumentu.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="548"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.cy.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.cy.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.cy.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.cy.ts Tue Apr 15 20:37:31 2014
@@ -14384,7 +14384,7 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14637,8 +14637,8 @@
         <translation type="obsolete">Peidio â defnyddio proffilau ICC caeth</translation>
     </message>
     <message>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="obsolete">Bwriad Allbwn PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="obsolete">Bwriad Allbwn PDF/X</translation>
     </message>
     <message>
         <source>Trim Box</source>
@@ -14890,10 +14890,10 @@
         <translation type="obsolete">Proffil allbwn ar gyfer argraffu.  Os bosibl, gofynnwch i'ch argraffydd am ei gyngor ynglyn â dewis proffil.</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Llinyn gorfodol ar gyfer PDF/X-3, neu fydd y PDF yn methu
-cydymffurfiad PDF/X-3.  Argymhellir defnyddio teitl y ddogfen.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Llinyn gorfodol ar gyfer PDF/X, neu fydd y PDF yn methu
+cydymffurfiad PDF/X.  Argymhellir defnyddio teitl y ddogfen.</translation>
     </message>
     <message>
         <source>Distance for bleed from the top of the physical page</source>
@@ -32374,8 +32374,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="unfinished">Bwriad Allbwn PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="unfinished">Bwriad Allbwn PDF/X</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -32635,10 +32635,10 @@
         <translation type="unfinished">Proffil allbwn ar gyfer argraffu.  Os bosibl, gofynnwch i'ch argraffydd am ei gyngor ynglyn â dewis proffil.</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Llinyn gorfodol ar gyfer PDF/X-3, neu fydd y PDF yn methu
-cydymffurfiad PDF/X-3.  Argymhellir defnyddio teitl y ddogfen.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Llinyn gorfodol ar gyfer PDF/X, neu fydd y PDF yn methu
+cydymffurfiad PDF/X.  Argymhellir defnyddio teitl y ddogfen.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="995"/>
@@ -32767,7 +32767,7 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.da_DK.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.da_DK.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.da_DK.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.da_DK.ts Tue Apr 15 20:37:31 2014
@@ -20376,8 +20376,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Gem-knappen bliver deaktiveret, hvis du prøver at eksportere PDF/X-3 og info-strengen mangler på PDF/X-3 fanebladet.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Gem-knappen bliver deaktiveret, hvis du prøver at eksportere PDF/X og info-strengen mangler på PDF/X fanebladet.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -35647,8 +35647,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>Hensigt med PDF/X-3 udskrift</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>Hensigt med PDF/X udskrift</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -35878,8 +35878,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Obligatorisk streng for PDF/X-3. Skal udfyldes for at overholde reglerne for PDF/X-3. Vi anbefaler at bruge titlen på dokumentet. </translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Obligatorisk streng for PDF/X. Skal udfyldes for at overholde reglerne for PDF/X. Vi anbefaler at bruge titlen på dokumentet. </translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="341"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.de.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.de.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.de.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.de.ts Tue Apr 15 20:37:31 2014
@@ -20618,8 +20618,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Sie können die PDF-Datei erst speichern, wenn Sie einen Infotext im PDF/X-3-Register angegeben haben.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Sie können die PDF-Datei erst speichern, wenn Sie einen Infotext im PDF/X-Register angegeben haben.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -36271,8 +36271,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>PDF/X-3 Ausgabebedingung</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>PDF/X Ausgabebedingung</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -36501,8 +36501,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Vorgeschriebener Text für PDF/X-3, ohne den die Datei nicht der PDF/X-3-Spezifikation entspricht. Wir empfehlen, den Titel des Dokumentes zu verwenden.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Vorgeschriebener Text für PDF/X, ohne den die Datei nicht der PDF/X-Spezifikation entspricht. Wir empfehlen, den Titel des Dokumentes zu verwenden.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="986"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.de_1901.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.de_1901.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.de_1901.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.de_1901.ts Tue Apr 15 20:37:31 2014
@@ -20615,8 +20615,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Sie können die PDF-Datei erst speichern, wenn Sie einen Infotext im PDF/X-3-Register angegeben haben.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Sie können die PDF-Datei erst speichern, wenn Sie einen Infotext im PDF/X-Register angegeben haben.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -36267,8 +36267,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>PDF/X-3 Ausgabebedingung</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>PDF/X Ausgabebedingung</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -36497,8 +36497,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Vorgeschriebener Text für PDF/X-3, ohne den die Datei nicht der PDF/X-3-Spezifikation entspricht. Wir empfehlen, den Titel des Dokumentes zu verwenden.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Vorgeschriebener Text für PDF/X, ohne den die Datei nicht der PDF/X-Spezifikation entspricht. Wir empfehlen, den Titel des Dokumentes zu verwenden.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="986"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.de_CH.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.de_CH.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.de_CH.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.de_CH.ts Tue Apr 15 20:37:31 2014
@@ -20615,8 +20615,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Sie können die PDF-Datei erst speichern, wenn Sie einen Infotext im PDF/X-3-Register angegeben haben.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Sie können die PDF-Datei erst speichern, wenn Sie einen Infotext im PDF/X-Register angegeben haben.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -36267,8 +36267,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>PDF/X-3 Ausgabebedingung</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>PDF/X Ausgabebedingung</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -36497,8 +36497,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Vorgeschriebener Text für PDF/X-3, ohne den die Datei nicht der PDF/X-3-Spezifikation entspricht. Wir empfehlen, den Titel des Dokumentes zu verwenden.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Vorgeschriebener Text für PDF/X, ohne den die Datei nicht der PDF/X-Spezifikation entspricht. Wir empfehlen, den Titel des Dokumentes zu verwenden.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="986"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.el.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.el.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.el.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.el.ts Tue Apr 15 20:37:31 2014
@@ -11417,8 +11417,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation type="unfinished">Το κοÏ
μπί αποθήκεÏ
σης θα απενεργοποιηθεί αν προσπαθείτε την εξαγωγή σε PDF/X-3 και η σÏ
μβολοσειρά πληροφοριών λείπει από την καρτέλα PDF/X-3.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation type="unfinished">Το κοÏ
μπί αποθήκεÏ
σης θα απενεργοποιηθεί αν προσπαθείτε την εξαγωγή σε PDF/X και η σÏ
μβολοσειρά πληροφοριών λείπει από την καρτέλα PDF/X.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -24308,8 +24308,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="unfinished">Ένταση αποτύπωσης PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="unfinished">Ένταση αποτύπωσης PDF/X</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -24518,8 +24518,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="unfinished">Η Ï
ποχρεωτική σÏ
μβολοσειρά για PDF/X-3 ή PDF θα αποτύχει στον έλεγχο σÏ
μβατότητας με το PDF/X-3. ΣÏ
στήνεται η χρήση τοÏ
 τίτλοÏ
 τοÏ
 εγγράφοÏ
.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="unfinished">Η Ï
ποχρεωτική σÏ
μβολοσειρά για PDF/X ή PDF θα αποτύχει στον έλεγχο σÏ
μβατότητας με το PDF/X. ΣÏ
στήνεται η χρήση τοÏ
 τίτλοÏ
 τοÏ
 εγγράφοÏ
.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="995"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.en_AU.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.en_AU.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.en_AU.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.en_AU.ts Tue Apr 15 20:37:31 2014
@@ -18628,8 +18628,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -32642,8 +32642,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>PDF/X-3 Output Intent</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>PDF/X Output Intent</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -32882,8 +32882,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="548"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.en_GB.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.en_GB.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.en_GB.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.en_GB.ts Tue Apr 15 20:37:31 2014
@@ -18628,8 +18628,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -32642,8 +32642,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>PDF/X-3 Output Intent</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>PDF/X Output Intent</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -32882,8 +32882,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="548"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.en_US.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.en_US.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.en_US.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.en_US.ts Tue Apr 15 20:37:31 2014
@@ -11405,7 +11405,7 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -24256,7 +24256,7 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
+        <source>PDF/X Output Intent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -24466,7 +24466,7 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.es_ES.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.es_ES.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.es_ES.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.es_ES.ts Tue Apr 15 20:37:31 2014
@@ -16562,8 +16562,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>El botón salvar será desactivado si intentas exportar PDF/X-3 y la cadenada de información está vacía en la pestaña PDFX/X-3.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>El botón salvar será desactivado si intentas exportar PDF/X y la cadenada de información está vacía en la pestaña PDFX/X.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -30096,8 +30096,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>Prueba de salida de PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>Prueba de salida de PDF/X</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -30336,8 +30336,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Cadena mandatoria para PDF/X-3 o el PDF fallará en la compatibilidad con PDF/X-3. Recomendamos usar el título del documento.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Cadena mandatoria para PDF/X o el PDF fallará en la compatibilidad con PDF/X. Recomendamos usar el título del documento.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="548"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.et.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.et.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.et.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.et.ts Tue Apr 15 20:37:31 2014
@@ -14515,8 +14515,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Salvestamisnupp ei ole aktiivne, kui püüad eksportida PDF/X-3 ning PDF/X-3 kaardil puudub infostring.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Salvestamisnupp ei ole aktiivne, kui püüad eksportida PDF/X ning PDF/X kaardil puudub infostring.</translation>
     </message>
     <message>
         <source>Save as</source>
@@ -30616,8 +30616,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>PDF/X-3 väljundviis</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>PDF/X väljundviis</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -30845,8 +30845,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>PDF/X-3 kohustuslik string, mille puudumisel PDF/X-3 ei vasta nõuetele. Soovitatav on kasutada siin dokumendi pealkirja.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>PDF/X kohustuslik string, mille puudumisel PDF/X ei vasta nõuetele. Soovitatav on kasutada siin dokumendi pealkirja.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="995"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.eu.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.eu.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.eu.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.eu.ts Tue Apr 15 20:37:31 2014
@@ -19164,8 +19164,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Gorde botoia desgaitu egingo da PDF/X-3 formatura esportatzen saiatzean, eta informazioaren katea galdu egingo da PDF/X-3 fitxatik.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Gorde botoia desgaitu egingo da PDF/X formatura esportatzen saiatzean, eta informazioaren katea galdu egingo da PDF/X fitxatik.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -34777,8 +34777,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>PDF/X-3 irteera</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>PDF/X irteera</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -35043,8 +35043,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>PDF/X-3 moduaren derrigorrezko katea, bestela PDFak huts egingo du PDF/X-3 betetzean. Dokumentuaren titulua erabiltzea gomendatzen dugu.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>PDF/X moduaren derrigorrezko katea, bestela PDFak huts egingo du PDF/X betetzean. Dokumentuaren titulua erabiltzea gomendatzen dugu.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="548"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.fi.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.fi.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.fi.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.fi.ts Tue Apr 15 20:37:31 2014
@@ -16991,8 +16991,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Tallenna-painike ei ole käytössä, jos yrität tallentaa PDF/X-3 -muodossa ja infotekstiä ei ole annettu PDF/X-3 -välilehdellä.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Tallenna-painike ei ole käytössä, jos yrität tallentaa PDF/X -muodossa ja infotekstiä ei ole annettu PDF/X -välilehdellä.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -30112,8 +30112,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>PDF/X-3 tuloste</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>PDF/X tuloste</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -30342,8 +30342,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Pakollinen merkkijono PDF/X-3 -tiedostolle. Ilman tätä PDF-tiedosto ei ole PDF/X-3 -yhteensopiva. Suosituksemme on käyttää asiakirjan otsikkoa.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Pakollinen merkkijono PDF/X -tiedostolle. Ilman tätä PDF-tiedosto ei ole PDF/X -yhteensopiva. Suosituksemme on käyttää asiakirjan otsikkoa.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="341"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.fr.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.fr.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.fr.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.fr.ts Tue Apr 15 20:37:31 2014
@@ -16365,8 +16365,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Le bouton "enregistrer" sera désactivé si vous tentez d'exporter au format PDF/X-3 et que la chaîne d'information de l'onglet PDF/X-3 est vide.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Le bouton "enregistrer" sera désactivé si vous tentez d'exporter au format PDF/X et que la chaîne d'information de l'onglet PDF/X est vide.</translation>
     </message>
     <message>
         <source>Save as</source>
@@ -31794,8 +31794,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>Sortie PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>Sortie PDF/X</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -31994,8 +31994,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Chaîne obligatoire pour PDF/X-3 sinon la conformité PDF/X-3 ne sera pas assurée. Il est recommandé d'utiliser le titre du document.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Chaîne obligatoire pour PDF/X sinon la conformité PDF/X ne sera pas assurée. Il est recommandé d'utiliser le titre du document.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="995"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.gl.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.gl.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.gl.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.gl.ts Tue Apr 15 20:37:31 2014
@@ -24515,8 +24515,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>O botón gardar desactivarase se tenta exportar PDF/X-3 e falta a cadea info da lapela PDF/X-3.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>O botón gardar desactivarase se tenta exportar PDF/X e falta a cadea info da lapela PDF/X.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -25282,10 +25282,10 @@
         <translation type="obsolete">Perfil de saída para a impresión. De ser posíbel, solicite orientación na imprenta sobre a selección de perfís.</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Cadea obrigatoria para PDF/X-3 ou o PDF fallará
-na conformidade con PDF/X-3. Recomendamos que use o título do documento.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Cadea obrigatoria para PDF/X ou o PDF fallará
+na conformidade con PDF/X. Recomendamos que use o título do documento.</translation>
     </message>
     <message>
         <source>Distance for bleed from the top of the physical page</source>
@@ -45646,8 +45646,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>Intención de saída PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>Intención de saída PDF/X</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -45911,10 +45911,10 @@
         <translation>Perfil de saída para a impresión. De ser posíbel, solicite orientación na imprenta sobre a selección de perfís.</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Cadea obrigatoria para PDF/X-3 ou o PDF fallará
-na conformidade con PDF/X-3. Recomendamos que use o título do documento.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Cadea obrigatoria para PDF/X ou o PDF fallará
+na conformidade con PDF/X. Recomendamos que use o título do documento.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="995"/>
@@ -46041,8 +46041,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Cadea obrigatoria para PDF/X-3 ou o PDF non será conforme con PDF/X-3. Recomendamos que utilice o título do documento.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Cadea obrigatoria para PDF/X ou o PDF non será conforme con PDF/X. Recomendamos que utilice o título do documento.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="548"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.hu.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.hu.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.hu.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.hu.ts Tue Apr 15 20:37:31 2014
@@ -11551,8 +11551,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>A Mentés gomb tiltva van, ha PDF/X-3 exportálásakor hiányzik az információs szöveg a PDF/X-3 lapon.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>A Mentés gomb tiltva van, ha PDF/X exportálásakor hiányzik az információs szöveg a PDF/X lapon.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -24966,8 +24966,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>A PDF/X-3 beállításai</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>A PDF/X beállításai</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="918"/>
@@ -25102,8 +25102,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Kötelező karakterlánc a PDF/X-3 számára, hiánya esetén a PDF/X-3 megfelelési vizsgálat sikertelen lesz. Javaslat: a dokumentum címe legyen.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Kötelező karakterlánc a PDF/X számára, hiánya esetén a PDF/X megfelelési vizsgálat sikertelen lesz. Javaslat: a dokumentum címe legyen.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1370"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.id.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.id.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.id.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.id.ts Tue Apr 15 20:37:31 2014
@@ -12270,7 +12270,7 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -26270,7 +26270,7 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
+        <source>PDF/X Output Intent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -26515,7 +26515,7 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.it.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.it.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.it.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.it.ts Tue Apr 15 20:37:31 2014
@@ -18609,8 +18609,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Il pulsante per il salvataggio viene disabilitato se si cerca di esportare in formato PDF/X-3 e manca la stringa informativa nella scheda PDF/X-3.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Il pulsante per il salvataggio viene disabilitato se si cerca di esportare in formato PDF/X e manca la stringa informativa nella scheda PDF/X.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -32650,7 +32650,7 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
+        <source>PDF/X Output Intent</source>
         <translation>Destinazione output PDF/X-3</translation>
     </message>
     <message>
@@ -32890,8 +32890,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Stringa obbligatoria per PDF/X-3 oppure il file PDF non sarà conforme al PDF/X-3. Si consiglia di usare il titolo del documento.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Stringa obbligatoria per PDF/X oppure il file PDF non sarà conforme al PDF/X. Si consiglia di usare il titolo del documento.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="548"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.ja.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.ja.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.ja.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.ja.ts Tue Apr 15 20:37:31 2014
@@ -11537,8 +11537,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>PDF/X-3タブから、PDF/X-3をエクスポートする際にæƒ
報が見つからない場合、保存ボタンが無効になります。</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>PDF/Xタブから、PDF/Xをエクスポートする際にæƒ
報が見つからない場合、保存ボタンが無効になります。</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -24564,8 +24564,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>PDF/X-3 出力インテント</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>PDF/X 出力インテント</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="862"/>
@@ -24749,8 +24749,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>PDF/X-3またはPDFでの強制的な文字列はPDF/X-3の整合性を損ないます。ドキュメントのタイトルを使用することをお薦めします。</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>PDF/XまたはPDFでの強制的な文字列はPDF/Xの整合性を損ないます。ドキュメントのタイトルを使用することをお薦めします。</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="995"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.ko.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.ko.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.ko.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.ko.ts Tue Apr 15 20:37:31 2014
@@ -11552,8 +11552,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>PDF/X-3내보내기를 시도하거나 the PDF/X-3 탭에서 정보 문자가 빠졌을 경우에는 저장 버튼은 사용할 수 없습니다.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>PDF/X내보내기를 시도하거나 the PDF/X 탭에서 정보 문자가 빠졌을 경우에는 저장 버튼은 사용할 수 없습니다.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -24598,8 +24598,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>PDF/X-3 출력용</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>PDF/X 출력용</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -24809,8 +24809,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>PDF/X-3 또는 PDF를 위한 필수 문자열은  PDF/X-3 적합성에 실패할 것ìž
니다. 문서의 제목을 사용하기를 추천합니다.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>PDF/X 또는 PDF를 위한 필수 문자열은  PDF/X 적합성에 실패할 것ìž
니다. 문서의 제목을 사용하기를 추천합니다.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="995"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.lt_LT.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.lt_LT.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.lt_LT.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.lt_LT.ts Tue Apr 15 20:37:31 2014
@@ -13190,8 +13190,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation type="unfinished">Įrašymo mygtukas bus neveiksnus, jei bandysite eksportuoti „PDF/X-3“ ir kortelės „PDF/X-3“ informacinė eilutė yra tuščia.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation type="unfinished">Įrašymo mygtukas bus neveiksnus, jei bandysite eksportuoti „PDF/X“ ir kortelės „PDF/X“ informacinė eilutė yra tuščia.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -19001,8 +19001,8 @@
         <translation type="obsolete">Naudoti dokumento užlaidas</translation>
     </message>
     <message>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="obsolete">PDF/X-3 skirtas išvedimas</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="obsolete">PDF/X skirtas išvedimas</translation>
     </message>
     <message>
         <source>Output Profile:</source>
@@ -32315,8 +32315,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="unfinished">PDF/X-3 skirtas išvedimas</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="unfinished">PDF/X skirtas išvedimas</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -32559,8 +32559,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="unfinished">Privaloma „PDF/X-3“ eilutÄ—; be jos PDF dokumentas neatitiks „PDF/X-3“ reikalavimų. Rekomenduojame naudoti dokumento pavadinimÄ
.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="unfinished">Privaloma „PDF/X“ eilutÄ—; be jos PDF dokumentas neatitiks „PDF/X“ reikalavimų. Rekomenduojame naudoti dokumento pavadinimÄ
.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="548"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.nb_NO.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.nb_NO.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.nb_NO.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.nb_NO.ts Tue Apr 15 20:37:31 2014
@@ -13040,8 +13040,8 @@
         <translation>Dette lar deg eksportere en side med sitt eget navn for hver side i dokumentet. Sidetallene legges til automatisk. Dette er mest nyttig hvis du vil trykke filene på et trykkeri.</translation>
     </message>
     <message>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Lagreknappen vil være utilgjengelig hvis du prøver å eksportere som PDF/X-3 og det mangler en informasjonsstreng på PDF/X-3-fanebladet.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Lagreknappen vil være utilgjengelig hvis du prøver å eksportere som PDF/X og det mangler en informasjonsstreng på PDF/X-fanebladet.</translation>
     </message>
     <message>
         <source>%1 does not exists and will be created, continue?</source>
@@ -13327,8 +13327,8 @@
         <translation type="obsolete">Ikke bruk innebygde ICC-profiler</translation>
     </message>
     <message>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="obsolete">Visning for PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="obsolete">Visning for PDF/X</translation>
     </message>
     <message>
         <source>Trim Box</source>
@@ -13549,10 +13549,10 @@
         <translation type="obsolete">Utgivelse profil for utskrift. hvis mulig, få noe rådgiving fra din skriver når du velger.</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Nødvendig tekstbit for PDF/X-3. Ellers vil PDF-fila ikke
-følge PDF/X3-conformance. Vi foreslår at du bruker dokumentets tittel.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Nødvendig tekstbit for PDF/X. Ellers vil PDF-fila ikke
+følge PDF/X-conformance. Vi foreslår at du bruker dokumentets tittel.</translation>
     </message>
     <message>
         <source>Distance for bleed from the top of the physical page</source>
@@ -29449,8 +29449,8 @@
         <translation>&Farge</translation>
     </message>
     <message>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>Tilpass visningen til PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>Tilpass visningen til PDF/X</translation>
     </message>
     <message>
         <source>&Info String:</source>
@@ -29647,8 +29647,8 @@
             </translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
         <translation type="obsolete">
             </translation>
     </message>
@@ -29756,9 +29756,9 @@
         <translation>Dette er en avansert innstilling som ikke er tilgjengelig som standard. Du bør bare bruke dette hvis trykkeriet ber spesielt om det og du vet nøyaktig hvilke innstillinger du trenger. Hvis du gjør det feil kan det hende pdf-fila ikke kan skrives ut på rett vis, eller at den ikke blir overførbar mellom ulike operativsystemer.</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Nødvendig tekstbit for PDF/X-3. Ellers vil PDF-fila ikke
-følge PDF/X3-standarden. Det kan være lurt å bruke tittelen på dokumentet.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Nødvendig tekstbit for PDF/X. Ellers vil PDF-fila ikke
+følge PDF/X-standarden. Det kan være lurt å bruke tittelen på dokumentet.</translation>
     </message>
     <message>
         <source>Display Settings</source>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.nl.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.nl.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.nl.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.nl.ts Tue Apr 15 20:37:31 2014
@@ -11632,8 +11632,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation type="unfinished">De knop Opslaan wordt uitgeschakeld bij export naar PDF/X3 als de info-string ontbreekt op de PDF/X3-tab.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation type="unfinished">De knop Opslaan wordt uitgeschakeld bij export naar PDF/X als de info-string ontbreekt op de PDF/X-tab.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -24599,8 +24599,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="unfinished">PDF/X3 Output-intentie</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="unfinished">PDF/X Output-intentie</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -24840,8 +24840,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Voorgeschreven regel voor PDF/X-3 bij niet invullen voldoet de PDF/X-3 niet aan de eisen. Wij adviseren de titel van het document te gebruiken.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Voorgeschreven regel voor PDF/X bij niet invullen voldoet de PDF/X niet aan de eisen. Wij adviseren de titel van het document te gebruiken.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="548"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.pl_PL.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.pl_PL.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.pl_PL.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.pl_PL.ts Tue Apr 15 20:37:31 2014
@@ -20052,8 +20052,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Przycisk "Zapisz" bÄ™dzie niedostÄ™pny, jeÅ›li eksportujesz do PDF/X-3 i nie zostaÅ‚ podany wymagany ciÄ
g znaków w zakładce "PDF/X-3".</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Przycisk "Zapisz" bÄ™dzie niedostÄ™pny, jeÅ›li eksportujesz do PDF/X i nie zostaÅ‚ podany wymagany ciÄ
g znaków w zakładce "PDF/X".</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -38575,8 +38575,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>Ustawienia dla pliku wyjściowego PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>Ustawienia dla pliku wyjściowego PDF/X</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -38818,9 +38818,9 @@
         <translation>Profil wyjściowy dla druku. Jeśli to możliwe, poproś drukarnię o poradę w sprawie wyboru właściwego profilu.</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Ten komentarz musi zostać podany dla zgodności ze standardem PDF/X-3.
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Ten komentarz musi zostać podany dla zgodności ze standardem PDF/X.
 Zalecane jest wpisanie tutaj tytułu dokumentu.</translation>
     </message>
     <message>
@@ -38972,8 +38972,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>CiÄ
g znaków konieczny przy eksporcie do PDF/X-3, inaczej tworzenie pliku PDF nie powiedzie się. Zalecamy podanie tutaj tytułu dokumentu. </translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>CiÄ
g znaków konieczny przy eksporcie do PDF/X, inaczej tworzenie pliku PDF nie powiedzie się. Zalecamy podanie tutaj tytułu dokumentu. </translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="548"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.pt.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.pt.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.pt.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.pt.ts Tue Apr 15 20:37:31 2014
@@ -4104,8 +4104,8 @@
         <translation type="obsolete">Miras de impressão</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Informação obrigatória para o PDF/X-3 ou o PDF terá problemascom a conformação PDF/X-3. Nós recomendamos o uso do título do seu documento.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Informação obrigatória para o PDF/X ou o PDF terá problemascom a conformação PDF/X. Nós recomendamos o uso do título do seu documento.</translation>
     </message>
     <message>
         <source>Left to Right</source>
@@ -8573,8 +8573,8 @@
         <translation type="obsolete">Filtros de texto</translation>
     </message>
     <message>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation type="obsolete">O botão salvar será desactivado se você estiver tentando exportar para PDF/X-3 e a string de informação não aparecerá na aba PDF/X-3.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation type="obsolete">O botão salvar será desactivado se você estiver tentando exportar para PDF/X e a string de informação não aparecerá na aba PDF/X.</translation>
     </message>
     <message>
         <source>Column gap out of bounds, must be positive.</source>
@@ -10108,8 +10108,8 @@
         <translation type="obsolete">&Qualidade:</translation>
     </message>
     <message>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="obsolete">Intenção de saída PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="obsolete">Intenção de saída PDF/X</translation>
     </message>
     <message>
         <source>Manage Page Properties...</source>
@@ -27133,8 +27133,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>O botão salvar será desactivado se você estiver tentando exportar para PDF/X-3 e a string de informação não aparecerá na aba PDF/X-3.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>O botão salvar será desactivado se você estiver tentando exportar para PDF/X e a string de informação não aparecerá na aba PDF/X.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -42430,8 +42430,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>Intenção de saída PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>Intenção de saída PDF/X</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -42664,8 +42664,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Informação obrigatória para o PDF/X-3 ou o PDF terá problemas com a conformidade PDF/X-3. Recomendamos o uso do título do seu documento.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Informação obrigatória para o PDF/X ou o PDF terá problemas com a conformidade PDF/X. Recomendamos o uso do título do seu documento.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="995"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.pt_BR.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.pt_BR.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.pt_BR.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.pt_BR.ts Tue Apr 15 20:37:31 2014
@@ -4104,8 +4104,8 @@
         <translation type="obsolete">Miras de impressão</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Informação obrigatória para o PDF/X-3 ou o PDF terá problemascom a conformação PDF/X-3. Nós recomendamos o uso do título do seu documento.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Informação obrigatória para o PDF/X ou o PDF terá problemascom a conformação PDF/X. Nós recomendamos o uso do título do seu documento.</translation>
     </message>
     <message>
         <source>Left to Right</source>
@@ -8573,8 +8573,8 @@
         <translation type="obsolete">Filtros de texto</translation>
     </message>
     <message>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation type="obsolete">O botão salvar será desactivado se você estiver tentando exportar para PDF/X-3 e a string de informação não aparecerá na aba PDF/X-3.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation type="obsolete">O botão salvar será desactivado se você estiver tentando exportar para PDF/X e a string de informação não aparecerá na aba PDF/X.</translation>
     </message>
     <message>
         <source>Column gap out of bounds, must be positive.</source>
@@ -10108,8 +10108,8 @@
         <translation type="obsolete">&Qualidade:</translation>
     </message>
     <message>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="obsolete">Intenção de saída PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="obsolete">Intenção de saída PDF/X</translation>
     </message>
     <message>
         <source>Manage Page Properties...</source>
@@ -27148,8 +27148,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>O botão salvar será desactivado se você estiver tentando exportar para PDF/X-3 e a string de informação não aparecerá na aba PDF/X-3.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>O botão salvar será desactivado se você estiver tentando exportar para PDF/X e a string de informação não aparecerá na aba PDF/X.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -42447,8 +42447,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>Intenção de saída PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>Intenção de saída PDF/X</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -42681,8 +42681,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Informação obrigatória para o PDF/X-3 ou o PDF terá problemas com a conformidade PDF/X-3. Recomendamos o uso do título do seu documento.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Informação obrigatória para o PDF/X ou o PDF terá problemas com a conformidade PDF/X. Recomendamos o uso do título do seu documento.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="995"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.ru.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.ru.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.ru.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.ru.ts Tue Apr 15 20:37:31 2014
@@ -11646,8 +11646,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Кнопка «СоÑ
ранить» станет недоступной при попытке экспортировать в PDF/X-3 с отсутствующей инфострокой.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Кнопка «СоÑ
ранить» станет недоступной при попытке экспортировать в PDF/X с отсутствующей инфострокой.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -24550,8 +24550,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>Тип вывода в PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>Тип вывода в PDF/X</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -24804,8 +24804,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Обязательная строка для PDF/X-3 или PDF нарушит соответствие PDF/X-3. Рекомендуется использовать заголовок документа.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Обязательная строка для PDF/X или PDF нарушит соответствие PDF/X. Рекомендуется использовать заголовок документа.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="548"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.sa.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.sa.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.sa.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.sa.ts Tue Apr 15 20:37:31 2014
@@ -11497,8 +11497,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation type="unfinished">यदि त्वं PDF/X-3 निर्याणं कर्तुं यतसे, à¤
पि च, PDF/X-3 टैब् मध्ये सूचनाक्षरसमूहः à¤
नुपस्थितः, तर्हि सञ्चयपिञ्जः निष्प्रकारितः भविष्यति।</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation type="unfinished">यदि त्वं PDF/X निर्याणं कर्तुं यतसे, à¤
पि च, PDF/X टैब् मध्ये सूचनाक्षरसमूहः à¤
नुपस्थितः, तर्हि सञ्चयपिञ्जः निष्प्रकारितः भविष्यति।</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -24473,8 +24473,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="unfinished">PDF/X-3 औट्पुट् आशयः</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="unfinished">PDF/X औट्पुट् आशयः</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -24683,8 +24683,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="unfinished">PDF/X-3 कृते आवश्यकः à¤
क्षरसमूहः, à¤
थवा, PDF PDF/X-3 औचित्यं त्रुट्यति। त्वं लेख्यपत्रस्य शीर्षकम् उपयोजय इति वयम् उपदिशामः।</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="unfinished">PDF/X कृते आवश्यकः à¤
क्षरसमूहः, à¤
थवा, PDF PDF/X औचित्यं त्रुट्यति। त्वं लेख्यपत्रस्य शीर्षकम् उपयोजय इति वयम् उपदिशामः।</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="995"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.sk_SK.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.sk_SK.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.sk_SK.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.sk_SK.ts Tue Apr 15 20:37:31 2014
@@ -18625,8 +18625,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Tlačidlo pre uloženie bude zakázané, pokiaľ sa pokúsite exportovať PDF/X-3 a bude chýbať informačný reťazec z karty PDF/X-3.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Tlačidlo pre uloženie bude zakázané, pokiaľ sa pokúsite exportovať PDF/X a bude chýbať informačný reťazec z karty PDF/X.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -32621,8 +32621,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>Výstup do PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>Výstup do PDF/X</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -32861,8 +32861,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Povinný reťazec pre PDF/X-3 - inak PDF nebude spĺňať špecifikáciu PDF/X-3. Doporučujeme použiť názov dokumentu.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Povinný reťazec pre PDF/X - inak PDF nebude spĺňať špecifikáciu PDF/X. Doporučujeme použiť názov dokumentu.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="548"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.sl.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.sl.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.sl.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.sl.ts Tue Apr 15 20:37:31 2014
@@ -19444,8 +19444,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Gumb Shrani bo onemogočen, če poskušate izvoziti kot PDF/X-3 in manjkajo podatki v poljih zavihka PDF/X-3.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Gumb Shrani bo onemogočen, če poskušate izvoziti kot PDF/X in manjkajo podatki v poljih zavihka PDF/X.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -19711,9 +19711,9 @@
         <translation type="obsolete">Največja</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Ključna beseda za PDF/X-3, sicer izvoz ne uspe pravilno.
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Ključna beseda za PDF/X, sicer izvoz ne uspe pravilno.
 Predlagamo, da uporabite naslov dokumenta.</translation>
     </message>
     <message>
@@ -19877,8 +19877,8 @@
         <translation type="obsolete">Samodejno:</translation>
     </message>
     <message>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="obsolete">Namen upodobitve PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="obsolete">Namen upodobitve PDF/X</translation>
     </message>
     <message>
         <source>Effects</source>
@@ -39847,8 +39847,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>Namen upodobitve PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>Namen upodobitve PDF/X</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -40106,9 +40106,9 @@
         <translation>Izvozni profil za tiskanje. Če je mogoče, izberite profil v povezavi z vašim tiskalnikom.</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Ključna beseda za PDF/X-3, sicer izvoz ne uspe pravilno.
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Ključna beseda za PDF/X, sicer izvoz ne uspe pravilno.
 Predlagamo, da uporabite naslov dokumenta.</translation>
     </message>
     <message>
@@ -40304,8 +40304,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Obvezen niz za PDF/X-3, sicer izvoz ne bo v skladu s standardom PDF/X-3. Predlagamo, da uporabite naslov dokumenta.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Obvezen niz za PDF/X, sicer izvoz ne bo v skladu s standardom PDF/X. Predlagamo, da uporabite naslov dokumenta.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="548"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.sq.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.sq.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.sq.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.sq.ts Tue Apr 15 20:37:31 2014
@@ -4144,10 +4144,10 @@
         <translation type="obsolete">Profil burim i pamjes</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Vargu i detyrueshëm për PDF/X-3 ose PDF do të dalë
-përputhjes me PDF/X-3. Ju këshillojmë të përdorni titullin e dokumentit.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Vargu i detyrueshëm për PDF/X ose PDF do të dalë
+përputhjes me PDF/X. Ju këshillojmë të përdorni titullin e dokumentit.</translation>
     </message>
     <message>
         <source>Left to Right</source>
@@ -7230,7 +7230,7 @@
         <translation type="obsolete">&Cilësi:</translation>
     </message>
     <message>
-        <source>PDF/X-3 Output Intent</source>
+        <source>PDF/X Output Intent</source>
         <translation type="obsolete">Ruajtje përfundimesh e suksesshme</translation>
     </message>
     <message>
@@ -25630,7 +25630,7 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -26095,7 +26095,7 @@
         <translation type="obsolete">Ngj&yrë</translation>
     </message>
     <message>
-        <source>PDF/X-3 Output Intent</source>
+        <source>PDF/X Output Intent</source>
         <translation type="obsolete">Ruajtje përfundimesh e suksesshme</translation>
     </message>
     <message>
@@ -26339,10 +26339,10 @@
         <translation type="obsolete">Profil përfundimesh për shtypjen. Nëse mundet, merrni ca udhëzime prej shtypësit tuaj rreth përzgjedhjes së profilit.</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Vargu i detyrueshëm për PDF/X-3 ose PDF do të dalë jo në(new line)
-përputhje me PDF/X-3. Ju këshillojmë të përdorni titullin e dokumentit.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Vargu i detyrueshëm për PDF/X ose PDF do të dalë jo në(new line)
+përputhje me PDF/X. Ju këshillojmë të përdorni titullin e dokumentit.</translation>
     </message>
     <message>
         <source>Save as</source>
@@ -43936,7 +43936,7 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
+        <source>PDF/X Output Intent</source>
         <translation type="unfinished">Ruajtje përfundimesh e suksesshme</translation>
     </message>
     <message>
@@ -44218,7 +44218,7 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.sr.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.sr.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.sr.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.sr.ts Tue Apr 15 20:37:31 2014
@@ -13561,8 +13561,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Дугме за снимање неће бити доступно при покушају извоза PDF/X-3 ако  \"info string\" није попуњен у PDF/X-3 страници.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Дугме за снимање неће бити доступно при покушају извоза PDF/X ако  \"info string\" није попуњен у PDF/X страници.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -28157,8 +28157,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="unfinished">PDF/X-3 на излазу</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="unfinished">PDF/X на излазу</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -28402,7 +28402,7 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.sv.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.sv.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.sv.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.sv.ts Tue Apr 15 20:37:31 2014
@@ -16337,8 +16337,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Spara-knappen fungerar inte om du försöker exportera till PDF/X-3 och info-strängen saknas i PDF/X-3 fliken.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Spara-knappen fungerar inte om du försöker exportera till PDF/X och info-strängen saknas i PDF/X fliken.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -16818,8 +16818,8 @@
         <translation type="obsolete">Fä&rg</translation>
     </message>
     <message>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="obsolete">PDF/X-3 Utmatningsavsikt</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="obsolete">PDF/X Utmatningsavsikt</translation>
     </message>
     <message>
         <source>&Info String:</source>
@@ -17078,10 +17078,10 @@
         <translation type="obsolete">Utmatningsprofil för utskrift. Om möjligt bör du rådgöra med din tryckare för korrekt val av profil.</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Obligatorisk sträng för PDF/X-3 annars följer inte PDF-filen(new line)
-reglerna för PDF/X-3. Vi rekommenderar att du använder dokumentets titel.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Obligatorisk sträng för PDF/X annars följer inte PDF-filen(new line)
+reglerna för PDF/X. Vi rekommenderar att du använder dokumentets titel.</translation>
     </message>
     <message>
         <source>Distance for bleed from the top of the physical page</source>
@@ -35840,8 +35840,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>PDF/X-3 Utmatningsavsikt</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>PDF/X Utmatningsavsikt</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -36099,10 +36099,10 @@
         <translation>Utmatningsprofil för utskrift. Om möjligt bör du rådgöra med din tryckare för korrekt val av profil.</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Obligatorisk sträng för PDF/X-3 annars följer inte PDF-filen(new line)
-reglerna för PDF/X-3. Vi rekommenderar att du använder dokumentets titel.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Obligatorisk sträng för PDF/X annars följer inte PDF-filen(new line)
+reglerna för PDF/X. Vi rekommenderar att du använder dokumentets titel.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="995"/>
@@ -36235,7 +36235,7 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.th_TH.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.th_TH.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.th_TH.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.th_TH.ts Tue Apr 15 20:37:31 2014
@@ -18279,7 +18279,7 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -18532,8 +18532,8 @@
         <translation type="obsolete">Don't use embedded ICC profiles</translation>
     </message>
     <message>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="obsolete">PDF/X-3 Output Intent</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="obsolete">PDF/X Output Intent</translation>
     </message>
     <message>
         <source>Trim Box</source>
@@ -18796,10 +18796,10 @@
         <translation type="obsolete">Output profile for printing. If possible, get some guidance from your printer on profile selection.</translation>
     </message>
     <message>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="obsolete">Mandatory string for PDF/X-3 or the PDF will fail
-PDF/X-3 conformance. We recommend you use the title of the document.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="obsolete">Mandatory string for PDF/X or the PDF will fail
+PDF/X conformance. We recommend you use the title of the document.</translation>
     </message>
     <message>
         <source>Compression levels: Minimum (25%), Low (50%), Medium (75%), High (85%), Maximum (95%)</source>
@@ -36348,8 +36348,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="unfinished">PDF/X-3 Output Intent</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="unfinished">PDF/X Output Intent</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -36545,7 +36545,7 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.tr.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.tr.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.tr.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.tr.ts Tue Apr 15 20:37:31 2014
@@ -18921,7 +18921,7 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -34467,8 +34467,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation type="unfinished">PDF/X-3 Output Intent</translation>
+        <source>PDF/X Output Intent</source>
+        <translation type="unfinished">PDF/X Output Intent</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -34752,8 +34752,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>PDF X-3 için gereklidir; aksi takdirde PDF X-3 uygunluğu sağlanamaz. Belgenin başlığının seçilmesi tavsiye edilir.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>PDF X için gereklidir; aksi takdirde PDF X uygunluğu sağlanamaz. Belgenin başlığının seçilmesi tavsiye edilir.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="548"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.uk.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.uk.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.uk.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.uk.ts Tue Apr 15 20:37:31 2014
@@ -18952,8 +18952,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>Кнопка запису буде недоступна, якщо Ви намагаєтеся експортувати PDF/X-3 і інформаційний рядок відсутній з закладки PDF/X-3.</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>Кнопка запису буде недоступна, якщо Ви намагаєтеся експортувати PDF/X і інформаційний рядок відсутній з закладки PDF/X.</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -34476,8 +34476,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>Призначення виÑ
ідного документу PDF/X-3</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>Призначення виÑ
ідного документу PDF/X</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -34736,8 +34736,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>Обов'язкова установка для PDF/X-3. В іншому випадку PDF не відповідатиме вимогам PDF/X-3. Ми рекомендуємо використання заголовку документа.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>Обов'язкова установка для PDF/X. В іншому випадку PDF не відповідатиме вимогам PDF/X. Ми рекомендуємо використання заголовку документа.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="548"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.zh_CN.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.zh_CN.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.zh_CN.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.zh_CN.ts Tue Apr 15 20:37:31 2014
@@ -11481,8 +11481,8 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
-        <translation>保存按钮将被禁用因为你试图输出 PDF/X-3 和 PDF/X-3 标签中缺少信息字符串。</translation>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
+        <translation>保存按钮将被禁用因为你试图输出 PDF/X 和 PDF/X 标签中缺少信息字符串。</translation>
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="159"/>
@@ -24453,8 +24453,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>PDF/X-3 输出意向</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>PDF/X 输出意向</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="859"/>
@@ -24663,8 +24663,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation>PDF/X-3或 PDF 的命令字符串会引发 PDF/X-3相应错误。我们推荐你使用文档标题。</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation>PDF/X或 PDF 的命令字符串会引发 PDF/X相应错误。我们推荐你使用文档标题。</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="995"/>

Modified: branches/Version14x/Scribus/resources/translations/po/scribus.zh_TW.ts
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/resources/translations/po/scribus.zh_TW.ts
==============================================================================
--- branches/Version14x/Scribus/resources/translations/po/scribus.zh_TW.ts (original)
+++ branches/Version14x/Scribus/resources/translations/po/scribus.zh_TW.ts Tue Apr 15 20:37:31 2014
@@ -19189,7 +19189,7 @@
     </message>
     <message>
         <location filename="../../../scribus/pdfopts.cpp" line="129"/>
-        <source>The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.</source>
+        <source>The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -34590,8 +34590,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="1001"/>
-        <source>Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</source>
-        <translation type="unfinished">Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document.</translation>
+        <source>Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</source>
+        <translation type="unfinished">Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document.</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="379"/>
@@ -34724,8 +34724,8 @@
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="849"/>
-        <source>PDF/X-3 Output Intent</source>
-        <translation>PDF/X-3 輸出意圖</translation>
+        <source>PDF/X Output Intent</source>
+        <translation>PDF/X 輸出意圖</translation>
     </message>
     <message>
         <location filename="../../../scribus/tabpdfoptions.cpp" line="750"/>

Modified: branches/Version14x/Scribus/scribus/commonstrings.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/scribus/commonstrings.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/commonstrings.cpp (original)
+++ branches/Version14x/Scribus/scribus/commonstrings.cpp Tue Apr 15 20:37:31 2014
@@ -145,6 +145,7 @@
 QString CommonStrings::PDF_1_3      = "";
 QString CommonStrings::PDF_1_4      = "";
 QString CommonStrings::PDF_1_5      = "";
+QString CommonStrings::PDF_X1a      = "";
 QString CommonStrings::PDF_X3       = "";
 
 QString CommonStrings::PostScript1   = "";
@@ -382,6 +383,7 @@
 	CommonStrings::PDF_1_3      = "PDF 1.3";
 	CommonStrings::PDF_1_4      = "PDF 1.4";
 	CommonStrings::PDF_1_5      = "PDF 1.5";
+	CommonStrings::PDF_X1a      = "PDF/X-1a";
 	CommonStrings::PDF_X3       = "PDF/X-3";
 
 	CommonStrings::PostScript1   = "PostScript Level 1";

Modified: branches/Version14x/Scribus/scribus/commonstrings.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/scribus/commonstrings.h
==============================================================================
--- branches/Version14x/Scribus/scribus/commonstrings.h (original)
+++ branches/Version14x/Scribus/scribus/commonstrings.h Tue Apr 15 20:37:31 2014
@@ -234,6 +234,7 @@
 	static QString PDF_1_3;
 	static QString PDF_1_4;
 	static QString PDF_1_5;
+	static QString PDF_X1a;
 	static QString PDF_X3;
 
 	static QString PostScript1;

Modified: branches/Version14x/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/pdflib_core.cpp (original)
+++ branches/Version14x/Scribus/scribus/pdflib_core.cpp Tue Apr 15 20:37:31 2014
@@ -159,6 +159,24 @@
 	return QString::number(c, 'f', 5);
 };
 
+bool PDFLibCore::PDF_IsPDFX()
+{
+	if (Options.Version == PDFOptions::PDFVersion_X1a)
+		return true;
+	if (Options.Version == PDFOptions::PDFVersion_X3)
+		return true;
+	return false;
+}
+
+bool PDFLibCore::PDF_IsPDFX(PDFOptions::PDFVersion ver)
+{
+	if (ver == PDFOptions::PDFVersion_X1a)
+		return true;
+	if (ver == PDFOptions::PDFVersion_X3)
+		return true;
+	return false;
+}
+
 bool PDFLibCore::doExport(const QString& fn, const QString& nam, int Components,
 					  const std::vector<int> & pageNs, const QMap<int,QPixmap> & thumbs)
 {
@@ -239,7 +257,7 @@
 		ret = true;//Even when aborting we return true. Dont want that "couldnt write msg"
 		if (!abortExport)
 		{
-			if (doc.PDF_Options.Version == PDFOptions::PDFVersion_X3)
+			if (PDF_IsPDFX(doc.PDF_Options.Version))
 				ret = PDF_End_Doc(ScCore->PrinterProfiles[doc.PDF_Options.PrintProf], nam, Components);
 			else
 				ret = PDF_End_Doc();
@@ -740,6 +758,7 @@
 		ObjCounter = 9;
 	switch (Options.Version)
 	{
+		case PDFOptions::PDFVersion_X1a:
 		case PDFOptions::PDFVersion_X3:
 		case PDFOptions::PDFVersion_13:
 			PutDoc("%PDF-1.3\n");
@@ -751,14 +770,14 @@
 			PutDoc("%PDF-1.5\n");
 			break;
 	}
-	if (Options.Version == PDFOptions::PDFVersion_X3)
+	if ((Options.Version == PDFOptions::PDFVersion_X1a) || (Options.Version == PDFOptions::PDFVersion_X3))
 		ObjCounter++;
 	PutDoc("%\xc7\xec\x8f\xa2\n");
 	StartObj(1);
 	PutDoc("<<\n/Type /Catalog\n/Outlines 3 0 R\n/Pages 4 0 R\n/Dests 5 0 R\n/AcroForm 6 0 R\n/Names 7 0 R\n/Threads 8 0 R\n");
 	if ((Options.Version == PDFOptions::PDFVersion_15) && (Options.useLayers))
 		PutDoc("/OCProperties 9 0 R\n");
-	if (Options.Version == PDFOptions::PDFVersion_X3)
+	if ((Options.Version == PDFOptions::PDFVersion_X1a) || (Options.Version == PDFOptions::PDFVersion_X3))
 		PutDoc("/OutputIntents [ "+QString::number(ObjCounter-1)+" 0 R ]\n");
 	PutDoc("/PageLayout ");
 	switch (Options.PageLayout)
@@ -876,7 +895,7 @@
 	PutDoc("<<\n/Creator " + EncString("Scribus "+QString(VERSION), 2) + "\n");
 	PutDoc("/Producer " + EncString("Scribus PDF Library "+QString(VERSION), 2) + "\n");
 	QString docTitle = doc.documentInfo.getTitle();
-	if ((Options.Version == PDFOptions::PDFVersion_X3) && (docTitle.isEmpty()))
+	if ((PDF_IsPDFX()) && (docTitle.isEmpty()))
 		PutDoc("/Title " + EncStringUTF16(doc.DocName, 2) + "\n");
 	else
 		PutDoc("/Title " + EncStringUTF16(doc.documentInfo.getTitle(), 2) + "\n");
@@ -885,6 +904,11 @@
 	PutDoc("/Keywords " + EncStringUTF16(doc.documentInfo.getKeywords(), 2) + "\n");
 	PutDoc("/CreationDate " + EncString(Datum, 2) + "\n");
 	PutDoc("/ModDate " + EncString(Datum, 2) + "\n");
+	if (Options.Version == PDFOptions::PDFVersion_X1a)
+	{
+		PutDoc("/GTS_PDFXVersion (PDF/X-1:2001)\n");
+		PutDoc("/GTS_PDFXConformance (PDF/X-1a:2001)\n");
+	}
 	if (Options.Version == PDFOptions::PDFVersion_X3)
 		PutDoc("/GTS_PDFXVersion (PDF/X-3:2002)\n");
 	PutDoc("/Trapped /False\n>>\nendobj\n");
@@ -892,7 +916,7 @@
 		XRef.append(bytesWritten());
 	if ((Options.Version == PDFOptions::PDFVersion_15) && (Options.useLayers))
 		XRef.append(bytesWritten());
-	if (Options.Version == PDFOptions::PDFVersion_X3)
+	if ((Options.Version == PDFOptions::PDFVersion_X1a) || (Options.Version == PDFOptions::PDFVersion_X3))
 		XRef.append(bytesWritten());
 	if (Options.Encrypt)
 	{
@@ -1612,7 +1636,7 @@
 		Transpar[HTName] = writeGState("/HT "+QString::number(halftones)+" 0 R\n");
 		ResCount++;
 	}
-	if ((doc.HasCMS) && (Options.UseProfiles))
+	if ((doc.HasCMS) && (Options.UseProfiles) && (Options.Version != PDFOptions::PDFVersion_X1a))
 	{
 		uint iccProfileObject = newObject();
 		StartObj(iccProfileObject);
@@ -3327,10 +3351,8 @@
 			}
 			break;
 		case PageItem::TextFrame:
-//			qDebug() << "case TextFrame";
-			if ((ite->isAnnotation()) && (Options.Version != PDFOptions::PDFVersion_X3))
-			{
-//				qDebug() << "Annotation";
+			if ((ite->isAnnotation()) && (!PDF_IsPDFX()))
+			{
 				if (!PDF_Annotation(ite, PNr))
 					return false;
 				break;
@@ -7618,7 +7640,7 @@
 		PutDoc("]\n");
 		PutDoc(">>\nendobj\n");
 	}
-	if (Options.Version == PDFOptions::PDFVersion_X3)
+	if (PDF_IsPDFX())
 	{
 		StartObj(ObjCounter);
 		ObjCounter++;

Modified: branches/Version14x/Scribus/scribus/pdflib_core.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/scribus/pdflib_core.h
==============================================================================
--- branches/Version14x/Scribus/scribus/pdflib_core.h (original)
+++ branches/Version14x/Scribus/scribus/pdflib_core.h Tue Apr 15 20:37:31 2014
@@ -78,6 +78,9 @@
 		double origYsc;
 		QMap<int, ImageLoadRequest> RequestProps;
 	};
+
+	bool PDF_IsPDFX();
+	bool PDF_IsPDFX(PDFOptions::PDFVersion ver);
 	
 	bool PDF_Begin_Doc(const QString& fn, SCFonts &AllFonts, QMap<QString, QMap<uint, FPointArray> > DocFonts, BookMView* vi);
 	void PDF_Begin_Page(const Page* pag, QPixmap pm = 0);

Modified: branches/Version14x/Scribus/scribus/pdfoptions.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/scribus/pdfoptions.h
==============================================================================
--- branches/Version14x/Scribus/scribus/pdfoptions.h (original)
+++ branches/Version14x/Scribus/scribus/pdfoptions.h Tue Apr 15 20:37:31 2014
@@ -51,7 +51,8 @@
 		PDFVersion_13 = 13,
 		PDFVersion_14 = 14,
 		PDFVersion_15 = 15,
-		PDFVersion_X3 = 12,
+		PDFVersion_X1a = 11,
+		PDFVersion_X3 = 12
 	};
 
 	enum PDFPageLayout

Modified: branches/Version14x/Scribus/scribus/pdfoptionsio.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/scribus/pdfoptionsio.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/pdfoptionsio.cpp (original)
+++ branches/Version14x/Scribus/scribus/pdfoptionsio.cpp Tue Apr 15 20:37:31 2014
@@ -113,6 +113,9 @@
 	QString pdfVersString;
 	switch (m_opts->Version)
 	{
+		case PDFOptions::PDFVersion_X1a:
+			pdfVersString = "X1a";
+			break;
 		case PDFOptions::PDFVersion_X3:
 			pdfVersString = "X3";
 			break;
@@ -416,7 +419,12 @@
 	QString pdfVersString;
 	if (!readElem(m_root, "pdfVersion", &pdfVersString))
 		return false;
-	if (pdfVersString == "X3")
+	if (pdfVersString == "X1a")
+	{
+		m_opts->Version = PDFOptions::PDFVersion_X1a;
+		return true;
+	}
+	else if (pdfVersString == "X3")
 	{
 		m_opts->Version = PDFOptions::PDFVersion_X3;
 		return true;

Modified: branches/Version14x/Scribus/scribus/pdfopts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/scribus/pdfopts.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/pdfopts.cpp (original)
+++ branches/Version14x/Scribus/scribus/pdfopts.cpp Tue Apr 15 20:37:31 2014
@@ -126,7 +126,7 @@
 //	setMaximumSize( sizeHint() );
 //tooltips
 	multiFile->setToolTip( "<qt>" + tr( "This enables exporting one individually named PDF file for each page in the document. Page numbers are added automatically. This is most useful for imposing PDF for commercial printing.") + "</qt>" );
-	OK->setToolTip( "<qt>" + tr( "The save button will be disabled if you are trying to export PDF/X-3 and the info string is missing from the PDF/X-3 tab.") + "</qt>" );
+	OK->setToolTip( "<qt>" + tr( "The save button will be disabled if you are trying to export PDF/X and the info string is missing from the PDF/X tab.") + "</qt>" );
 	// signals and slots connections
 	connect( FileC, SIGNAL( clicked() ), this, SLOT( ChangeFile() ) );
 	connect( OK, SIGNAL( clicked() ), this, SLOT( DoExport() ) );
@@ -314,6 +314,8 @@
 	if (Options->PDFVersionCombo->currentIndex() == 2)
 		Opts.Version = PDFOptions::PDFVersion_15;
 	if (Options->PDFVersionCombo->currentIndex() == 3)
+		Opts.Version = PDFOptions::PDFVersion_X1a;
+	if (Options->PDFVersionCombo->currentIndex() == 4)
 		Opts.Version = PDFOptions::PDFVersion_X3;
 	if (Options->OutCombo->currentIndex() == 0)
 	{
@@ -339,13 +341,16 @@
 			{
 				Opts.UseProfiles = Options->EmbedProfs->isChecked();
 				Opts.UseProfiles2 = Options->EmbedProfs2->isChecked();
-				Opts.Intent = Options->IntendS->currentIndex();
-				Opts.Intent2 = Options->IntendI->currentIndex();
-				Opts.EmbeddedI = Options->NoEmbedded->isChecked();
-				Opts.SolidProf = Options->SolidPr->currentText();
-				Opts.ImageProf = Options->ImageP->currentText();
+				if (Opts.Version != PDFOptions::PDFVersion_X1a)
+				{
+					Opts.Intent = Options->IntendS->currentIndex();
+					Opts.Intent2 = Options->IntendI->currentIndex();
+					Opts.EmbeddedI = Options->NoEmbedded->isChecked();
+					Opts.SolidProf = Options->SolidPr->currentText();
+					Opts.ImageProf = Options->ImageP->currentText();
+				}
 				Opts.PrintProf = Options->PrintProfC->currentText();
-				if (Opts.Version == PDFOptions::PDFVersion_X3)
+				if ((Opts.Version == PDFOptions::PDFVersion_X1a) || (Opts.Version == PDFOptions::PDFVersion_X3))
 				{
 					ScColorProfile hIn = ScColorMgmtEngine::openProfileFromFile(appPrinterProfiles[Opts.PrintProf]);
 					cmsDescriptorName  = hIn.productDescription();

Modified: branches/Version14x/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp (original)
+++ branches/Version14x/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp Tue Apr 15 20:37:31 2014
@@ -1104,9 +1104,10 @@
 			ScCore->primaryMainWindow()->doc->PDF_Options.SolidProf = PyString_AsString(self->solidpr);
 			ScCore->primaryMainWindow()->doc->PDF_Options.ImageProf = PyString_AsString(self->imagepr);
 			ScCore->primaryMainWindow()->doc->PDF_Options.PrintProf = PyString_AsString(self->printprofc);
-			if (ScCore->primaryMainWindow()->doc->PDF_Options.Version == PDFOptions::PDFVersion_X3)
+			if (ScCore->primaryMainWindow()->doc->PDF_Options.Version == PDFOptions::PDFVersion_X1a ||
+				ScCore->primaryMainWindow()->doc->PDF_Options.Version == PDFOptions::PDFVersion_X3)
 			{
-// Where does compiler find cms function when I have not included header for it
+				// Where does compiler find cms function when I have not included header for it
 				ScColorProfile hIn;
 				hIn = ScColorMgmtEngine::openProfileFromFile(ScCore->PrinterProfiles[ScCore->primaryMainWindow()->doc->PDF_Options.PrintProf]);
 				nam = hIn.productDescription();

Modified: branches/Version14x/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/prefsmanager.cpp (original)
+++ branches/Version14x/Scribus/scribus/prefsmanager.cpp Tue Apr 15 20:37:31 2014
@@ -72,17 +72,17 @@
 
 PrefsManager* PrefsManager::instance()
 {
-    if (_instance == 0)
-        _instance = new PrefsManager();
-
-    return _instance;
+	if (_instance == 0)
+		_instance = new PrefsManager();
+
+	return _instance;
 }
 
 void PrefsManager::deleteInstance()
 {
-    if (_instance)
-        delete _instance;
-    _instance = 0;
+	if (_instance)
+		delete _instance;
+	_instance = 0;
 }
 
 
@@ -948,8 +948,8 @@
 		{
 			appPrefs.guiLanguage = userprefsContext->get("gui_language","");
 			appPrefs.mainWinState = QByteArray::fromBase64(userprefsContext->get("mainwinstate","").toAscii());
-            //continue here...
-            //Prefs."blah blah" =...
+			//continue here...
+			//Prefs."blah blah" =...
 		}
 		if (prefsFile->hasContext("print_options"))
 		{
@@ -1002,8 +1002,8 @@
 		{
 			userprefsContext->set("gui_language", appPrefs.guiLanguage);
 			userprefsContext->set("mainwinstate", QString::fromAscii(appPrefs.mainWinState.toBase64()));
-            //continue here...
-            //Prefs."blah blah" =...
+			//continue here...
+			//Prefs."blah blah" =...
 		}
 		prefsFile->write();
 	}
@@ -2434,7 +2434,8 @@
 		checkerSettings.checkTransparency = true;
 		checkerSettings.checkAnnotations = true;
 		checkerSettings.minResolution = 144.0;
-		cp->insert( CommonStrings::PDF_X3    , checkerSettings);
+		cp->insert( CommonStrings::PDF_X1a  , checkerSettings);
+		cp->insert( CommonStrings::PDF_X3   , checkerSettings);
 	}
 }
 

Modified: branches/Version14x/Scribus/scribus/tabpdfoptions.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19033&path=/branches/Version14x/Scribus/scribus/tabpdfoptions.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/tabpdfoptions.cpp (original)
+++ branches/Version14x/Scribus/scribus/tabpdfoptions.cpp Tue Apr 15 20:37:31 2014
@@ -321,7 +321,10 @@
 	PDFVersionCombo->addItem("PDF 1.5 (Acrobat 6)");
 	cms = doc ? (ScCore->haveCMS() && doc->HasCMS) : false;
 	if (cms && (!PDFXProfiles.isEmpty()))
+	{
+		PDFVersionCombo->addItem("PDF/X-1a");
 		PDFVersionCombo->addItem("PDF/X-3");
+	}
 	GroupBox1Layout->addWidget( PDFVersionCombo, 0, 1, 1, 2 );
 	TextLabel1x = new QLabel( tr( "&Binding:" ), GroupBox1 );
 	TextLabel1x->setAlignment(Qt::AlignVCenter | Qt::AlignLeft);
@@ -846,7 +849,7 @@
 	tabPDFXLayout->addWidget( BleedGroup );
 
 	X3Group = new QGroupBox( tabPDFX );
-	X3Group->setTitle( tr( "PDF/X-3 Output Intent" ) );
+	X3Group->setTitle( tr( "PDF/X Output Intent" ) );
 	X3GroupLayout = new QGridLayout( X3Group );
 	X3GroupLayout->setSpacing( 5 );
 	X3GroupLayout->setMargin( 10 );
@@ -998,7 +1001,7 @@
 	BleedRight->setToolTip( "<qt>" + tr( "Distance for bleed from the right of the physical page" )  + "</qt>");
 	docBleeds->setToolTip( "<qt>" + tr( "Use the existing bleed settings from the document preferences" ) + "</qt>" );
 	PrintProfC->setToolTip( "<qt>" + tr( "Output profile for printing. If possible, get some guidance from your printer on profile selection." ) + "</qt>" );
-	InfoString->setToolTip( "<qt>" + tr( "Mandatory string for PDF/X-3 or the PDF will fail PDF/X-3 conformance. We recommend you use the title of the document." ) + "</qt>" );
+	InfoString->setToolTip( "<qt>" + tr( "Mandatory string for PDF/X or the PDF will fail PDF/X conformance. We recommend you use the title of the document." ) + "</qt>" );
 }
 
 void TabPDFOptions::restoreDefaults(PDFOptions & Optionen,
@@ -1019,8 +1022,10 @@
 	bool cmsUse = mdoc ? (ScCore->haveCMS() && mdoc->HasCMS) : false;
 	if (cmsUse)
 	{
+		if (Opts.Version == PDFOptions::PDFVersion_X1a)
+			PDFVersionCombo->setCurrentIndex(3);
 		if (Opts.Version == PDFOptions::PDFVersion_X3)
-			PDFVersionCombo->setCurrentIndex(3);
+			PDFVersionCombo->setCurrentIndex(4);
 	}
 	else
 		PDFVersionCombo->setCurrentIndex(0);
@@ -1351,8 +1356,10 @@
 	docInfoMarks->setChecked(Opts.docInfoMarks);
 	if (!cmsUse)
 		X3Group->setEnabled(false);
-	if (cmsUse && (Opts.Version == 12) && (!PDFXProfiles.isEmpty()))
+	if (cmsUse && (Opts.Version == PDFOptions::PDFVersion_X1a) && (!PDFXProfiles.isEmpty()))
 		EnablePDFX(3);
+	else if (cmsUse && (Opts.Version == PDFOptions::PDFVersion_X3) && (!PDFXProfiles.isEmpty()))
+		EnablePDFX(4);
 	else
 		X3Group->setEnabled(false);
 	if (mdoc != 0  && exporting)
@@ -1454,6 +1461,8 @@
 	if (PDFVersionCombo->currentIndex() == 2)
 		pdfOptions.Version = PDFOptions::PDFVersion_15;
 	if (PDFVersionCombo->currentIndex() == 3)
+		pdfOptions.Version = PDFOptions::PDFVersion_X1a;
+	if (PDFVersionCombo->currentIndex() == 4)
 		pdfOptions.Version = PDFOptions::PDFVersion_X3;
 	if (OutCombo->currentIndex() == 0)
 	{
@@ -1565,6 +1574,8 @@
 	if (PDFVersionCombo->currentIndex() == 2)
 		doc->PDF_Options.Version = PDFOptions::PDFVersion_15;
 	if (PDFVersionCombo->currentIndex() == 3)
+		doc->PDF_Options.Version = PDFOptions::PDFVersion_X1a;
+	if (PDFVersionCombo->currentIndex() == 4)
 		doc->PDF_Options.Version = PDFOptions::PDFVersion_X3;
 	if (OutCombo->currentIndex() == 0)
 	{
@@ -1634,7 +1645,7 @@
 
 void TabPDFOptions::checkInfo()
 {
-	if ((PDFVersionCombo->currentIndex() == 3) && (InfoString->text().isEmpty()))
+	if ((PDFVersionCombo->currentIndex() >= 3) && (InfoString->text().isEmpty()))
 		emit noInfo();
 	else
 		emit hasInfo();
@@ -1657,9 +1668,12 @@
 	PDFVersionCombo->addItem("PDF 1.5 (Acrobat 6)");
 	cms=enable;
 	if (enable)
+	{
+		PDFVersionCombo->addItem("PDF/X-1a");
 		PDFVersionCombo->addItem("PDF/X-3");
+	}
 	else
-		a = qMin(a, 3);
+		a = qMin(a, 2);
 	PDFVersionCombo->setCurrentIndex(a);
 	EnablePr(1);
 	connect(PDFVersionCombo, SIGNAL(activated(int)), this, SLOT(EnablePDFX(int)));
@@ -1708,7 +1722,7 @@
 		}
 		connect(EffectType, SIGNAL(activated(int)), this, SLOT(SetEffOpts(int)));
 	}
-	if (a != 3)
+	if (a < 3)
 	{
 		X3Group->setEnabled(false);
 		setTabEnabled(indexOf(tabSecurity), true);
@@ -1729,8 +1743,19 @@
 	OutCombo->setCurrentIndex(1);
 	OutCombo->setEnabled(false);
 	EnablePr(1);
-	EmbedProfs2->setChecked(true);
-	EmbedProfs2->setEnabled(false);
+	if (a == 3) // X1, no profile embedding
+	{
+		EmbedProfs->setChecked(false);
+		EmbedProfs->setEnabled(false);
+		EmbedProfs2->setChecked(false);
+		EmbedProfs2->setEnabled(false);
+	}
+	if ((a == 4)) // X3, enforcing color profiles on images
+	{
+		EmbedProfs->setEnabled(true);
+		EmbedProfs2->setChecked(true);
+		EmbedProfs2->setEnabled(false);
+	}
 	if (doc != 0 && pdfExport)
 	{
 //		EmbedFonts->setChecked(true);
@@ -1793,7 +1818,14 @@
 void TabPDFOptions::EnablePr(int a)
 {
 	EnableLPI(a);
-	bool setter = a == 1 ? true : false;
+	bool setter = false;
+	if (a == 1)
+	{
+		if (PDFVersionCombo->currentIndex() == 3)
+			setter = false;
+		else
+			setter = true;
+	}
 	GroupBox9->setEnabled(setter);
 	ProfsGroup->setEnabled(setter);
 }
@@ -2230,7 +2262,7 @@
 {
 	if (c != NULL)
 	{
-		if ((PDFVersionCombo->currentIndex() != 3) && (c->flags() & Qt::ItemIsSelectable))
+		if ((PDFVersionCombo->currentIndex() < 3) && (c->flags() & Qt::ItemIsSelectable))
 			FromEmbed->setEnabled(true);
 		else
 			FromEmbed->setEnabled(false);
@@ -2247,7 +2279,7 @@
 {
 	if (c != NULL)
 	{
-		if (PDFVersionCombo->currentIndex() == 3)
+		if (PDFVersionCombo->currentIndex() == 4)
 		{
 			if ((AllFonts[c->text()].type() == ScFace::OTF) || (AllFonts[c->text()].subset()))
 				FromOutline->setEnabled(false);




More information about the scribus-commit mailing list