Merge translation files from master branch.

1 files changed, 54 insertions, 54 deletions

diff --git a/tde-i18n-fy/messages/tdelibs/tdeprint.po b/tde-i18n-fy/messages/tdelibs/tdeprint.po
index 07e0428c33f..b6f16c8d4ee 100644
--- a/tde-i18n-fy/messages/tdelibs/tdeprint.po
+++ b/tde-i18n-fy/messages/tdelibs/tdeprint.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeprint\n"
-"POT-Creation-Date: 2019-07-21 21:14+0200\n"
+"POT-Creation-Date: 2019-07-21 20:16+0200\n"
 "PO-Revision-Date: 2007-03-12 11:52+0100\n"
 "Last-Translator: Berend Ytsma <berendy@bigfoot.com>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -6609,59 +6609,6 @@ msgid "&PageMarks"
 msgstr "&Paginamarkearingen"
 
 #, fuzzy
-#~ msgid ""
-#~ " <qt>  <p><b>Margins</b></p>  <p>These settings control the margins of "
-#~ "printouts on the paper. They are not valid for  jobs originating from "
-#~ "applications which define their own page layout internally and  send "
-#~ "PostScript to TDEPrint (such as KOffice or OpenOffice.org). </p>  <p>When "
-#~ "printing from TDE applications, such as KMail and Konqueror, or printing "
-#~ "an ASCII text  file through kprinter, you can choose your preferred "
-#~ "margin settings here. </p>  <p>Margins may be set individually for each "
-#~ "edge of the paper. The combo box at the bottom lets you change  the units "
-#~ "of measurement between Pixels, Millimeters, Centimeters, and Inches. </"
-#~ "p>  <p>You can even use the mouse to grab one margin and drag it to the "
-#~ "intended position (see the  preview picture on the right side). </p>  "
-#~ "<hr>  <p><em><b>Additional hint for power users:</b> This TDEPrint GUI "
-#~ "element matches  with the CUPS commandline job option parameter:</em>  "
-#~ "<pre>     -o page-top=...      # example: \"72\"  <br>     -o page-"
-#~ "bottom=...   # example: \"24\"  <br>     -o page-left=...     # example: "
-#~ "\"36\"  <br>     -o page-right=...    # example: \"12\"  </pre> </p>  </"
-#~ "qt>"
-#~ msgstr ""
-#~ "<qt> <p><b>Marzjes</b></p> <p>Dizze ynstellings hawwe kontrôle op de "
-#~ "marzjes fan de printen. Se binne net jildich foar taken dy't fan tapasing "
-#~ "komme dy sels in side opmaak beskiede en in PostSkript nei TDEPrint "
-#~ "stjoere (lykas KOffice of OpenOffice.org).</p> <p>As jo fanút TDE "
-#~ "tapassings lykas KMail en Konqueror, of in ASCII-teksttriem mei kprinter "
-#~ "printsje, dan kinne jo hjir jo marzje ynstellings nei eigen kar ynstelle."
-#~ "</p> <p>Marzjes kinne individueal foar de râne fan eltse side fan it "
-#~ "papier ynsteld wurde. It karfak ûnderoan jout de moogliheid de "
-#~ "ôfmjittings te feroarjen yn piksels, millimeters, sentimeters en tommen.</"
-#~ "p> <p>Jo kinne sels de mûs brûke om in marzje nei de winske posysje te "
-#~ "slepen (sjoch de foarbyld ôfblydinge rjochts).</p> <hr> <p><em><b>Ekstra "
-#~ "oanwizing foar erfaren brûkers:</b> Dit elemint fan de grafyske omjouwing "
-#~ "fan TDEPrint komt oerien mei de CUPS kommandorigel-taakopsjeparameter:</"
-#~ "em> <pre>     -o page-top=...      # foarbyld: \"72\"  <br>     -o page-"
-#~ "bottom=...   # foarbyld: \"24\"  <br>     -o page-left=...     # "
-#~ "foarbyld: \"36\"  <br>     -o page-right=...    # foarbyld: \"12\"  </"
-#~ "pre> </p>  </qt>"
-
-#, fuzzy
-#~ msgid ""
-#~ " <qt><b>Current Page:</b> Select <em>\"Current\"</em> if you want  to "
-#~ "print the page currently visible in your TDE application.</p> <p><b>Note:"
-#~ "</b> this field is disabled if you print from non-TDE applications like "
-#~ "Mozilla or OpenOffice.org, since here TDEPrint has no means to determine "
-#~ "which document page you are currently viewing.</p></qt>"
-#~ msgstr ""
-#~ "<qt><p><b>Aktive side</b>: selektearje <em>\"Aktive\"</em> as jo allinne "
-#~ "de side printsje wolle dy't op it stuit te sjen is yn jo TDE-tapassing.</"
-#~ "p><p><b>Tink derom:</b> dizze opsje is net beskikber as jo printsje fanút "
-#~ "net-TDE-tapassingen lykas Mozilla of OpenOffice.org, trochdat TDE gjin "
-#~ "mooglikheid om te freegjen hokker side op it stuit te sjen is yn de "
-#~ "tapassings.</p></qt>"
-
-#, fuzzy
 #~ msgid "Orientation"
 #~ msgstr "&Oriïntaasje"
 
@@ -6725,3 +6672,56 @@ msgstr "&Paginamarkearingen"
 
 #~ msgid "Documentation"
 #~ msgstr "Dokumintaasje"
+
+#, fuzzy
+#~ msgid ""
+#~ " <qt>  <p><b>Margins</b></p>  <p>These settings control the margins of "
+#~ "printouts on the paper. They are not valid for  jobs originating from "
+#~ "applications which define their own page layout internally and  send "
+#~ "PostScript to TDEPrint (such as KOffice or OpenOffice.org). </p>  <p>When "
+#~ "printing from TDE applications, such as KMail and Konqueror, or printing "
+#~ "an ASCII text  file through kprinter, you can choose your preferred "
+#~ "margin settings here. </p>  <p>Margins may be set individually for each "
+#~ "edge of the paper. The combo box at the bottom lets you change  the units "
+#~ "of measurement between Pixels, Millimeters, Centimeters, and Inches. </"
+#~ "p>  <p>You can even use the mouse to grab one margin and drag it to the "
+#~ "intended position (see the  preview picture on the right side). </p>  "
+#~ "<hr>  <p><em><b>Additional hint for power users:</b> This TDEPrint GUI "
+#~ "element matches  with the CUPS commandline job option parameter:</em>  "
+#~ "<pre>     -o page-top=...      # example: \"72\"  <br>     -o page-"
+#~ "bottom=...   # example: \"24\"  <br>     -o page-left=...     # example: "
+#~ "\"36\"  <br>     -o page-right=...    # example: \"12\"  </pre> </p>  </"
+#~ "qt>"
+#~ msgstr ""
+#~ "<qt> <p><b>Marzjes</b></p> <p>Dizze ynstellings hawwe kontrôle op de "
+#~ "marzjes fan de printen. Se binne net jildich foar taken dy't fan tapasing "
+#~ "komme dy sels in side opmaak beskiede en in PostSkript nei TDEPrint "
+#~ "stjoere (lykas KOffice of OpenOffice.org).</p> <p>As jo fanút TDE "
+#~ "tapassings lykas KMail en Konqueror, of in ASCII-teksttriem mei kprinter "
+#~ "printsje, dan kinne jo hjir jo marzje ynstellings nei eigen kar ynstelle."
+#~ "</p> <p>Marzjes kinne individueal foar de râne fan eltse side fan it "
+#~ "papier ynsteld wurde. It karfak ûnderoan jout de moogliheid de "
+#~ "ôfmjittings te feroarjen yn piksels, millimeters, sentimeters en tommen.</"
+#~ "p> <p>Jo kinne sels de mûs brûke om in marzje nei de winske posysje te "
+#~ "slepen (sjoch de foarbyld ôfblydinge rjochts).</p> <hr> <p><em><b>Ekstra "
+#~ "oanwizing foar erfaren brûkers:</b> Dit elemint fan de grafyske omjouwing "
+#~ "fan TDEPrint komt oerien mei de CUPS kommandorigel-taakopsjeparameter:</"
+#~ "em> <pre>     -o page-top=...      # foarbyld: \"72\"  <br>     -o page-"
+#~ "bottom=...   # foarbyld: \"24\"  <br>     -o page-left=...     # "
+#~ "foarbyld: \"36\"  <br>     -o page-right=...    # foarbyld: \"12\"  </"
+#~ "pre> </p>  </qt>"
+
+#, fuzzy
+#~ msgid ""
+#~ " <qt><b>Current Page:</b> Select <em>\"Current\"</em> if you want  to "
+#~ "print the page currently visible in your TDE application.</p> <p><b>Note:"
+#~ "</b> this field is disabled if you print from non-TDE applications like "
+#~ "Mozilla or OpenOffice.org, since here TDEPrint has no means to determine "
+#~ "which document page you are currently viewing.</p></qt>"
+#~ msgstr ""
+#~ "<qt><p><b>Aktive side</b>: selektearje <em>\"Aktive\"</em> as jo allinne "
+#~ "de side printsje wolle dy't op it stuit te sjen is yn jo TDE-tapassing.</"
+#~ "p><p><b>Tink derom:</b> dizze opsje is net beskikber as jo printsje fanút "
+#~ "net-TDE-tapassingen lykas Mozilla of OpenOffice.org, trochdat TDE gjin "
+#~ "mooglikheid om te freegjen hokker side op it stuit te sjen is yn de "
+#~ "tapassings.</p></qt>"