Merge translation files from master branch.

2 files changed, 65 insertions, 65 deletions

diff --git a/tde-i18n-eu/messages/tdelibs/tdeio.po b/tde-i18n-eu/messages/tdelibs/tdeio.po
index 091fd0a2ea5..f6cfee807ca 100644
--- a/tde-i18n-eu/messages/tdelibs/tdeio.po
+++ b/tde-i18n-eu/messages/tdelibs/tdeio.po
@@ -6424,17 +6424,6 @@ msgstr ""
 #~ msgid "Unknown unmount error."
 #~ msgstr "Errore ezezaguna"
 
-#~ msgid ""
-#~ "You may perform a search on the Internet for a TDE program (called a "
-#~ "tdeioslave or ioslave) which supports this protocol. Places to search "
-#~ "include <a href=\"http://kde-apps.org/\">http://kde-apps.org/</a> and <a "
-#~ "href=\"http://freshmeat.net/\">http://freshmeat.net/</a>."
-#~ msgstr ""
-#~ "Protokoloa onartzen duen TDEren programa bat bila zenezake interneten, "
-#~ "tdeioslave edo ioslave izenekoa. Bilaketa lekuen artean <a href=\"http://"
-#~ "kde-apps.org/\">http://kde-apps.org/</a> eta <a href=\"http://freshmeat."
-#~ "net/\">http://freshmeat.net/</a> dituzu."
-
 #, fuzzy
 #~ msgid "Bookmarks"
 #~ msgstr "Laster-marka"
@@ -6481,3 +6470,14 @@ msgstr ""
 
 #~ msgid "Shared"
 #~ msgstr "Partekatuta"
+
+#~ msgid ""
+#~ "You may perform a search on the Internet for a TDE program (called a "
+#~ "tdeioslave or ioslave) which supports this protocol. Places to search "
+#~ "include <a href=\"http://kde-apps.org/\">http://kde-apps.org/</a> and <a "
+#~ "href=\"http://freshmeat.net/\">http://freshmeat.net/</a>."
+#~ msgstr ""
+#~ "Protokoloa onartzen duen TDEren programa bat bila zenezake interneten, "
+#~ "tdeioslave edo ioslave izenekoa. Bilaketa lekuen artean <a href=\"http://"
+#~ "kde-apps.org/\">http://kde-apps.org/</a> eta <a href=\"http://freshmeat."
+#~ "net/\">http://freshmeat.net/</a> dituzu."
diff --git a/tde-i18n-eu/messages/tdelibs/tdeprint.po b/tde-i18n-eu/messages/tdelibs/tdeprint.po
index 1ca552f486d..ed07d36f809 100644
--- a/tde-i18n-eu/messages/tdelibs/tdeprint.po
+++ b/tde-i18n-eu/messages/tdelibs/tdeprint.po
@@ -12,7 +12,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: 2006-01-21 18:19+0100\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -6612,59 +6612,6 @@ msgid "&PageMarks"
 msgstr "&Orri-markak"
 
 #, 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>Marjinak</b></p>  <p>Ezarpen hauek papereko inprimaketaren "
-#~ "marjinak kontrolatzen dute. Orrien diseinua aplikazio barnean sortzen "
-#~ "bada eta aplikazioek PostScript-ak bidaltzen badizkiote TDEPrint-i "
-#~ "ezarpen hauek ez dute eraginik izango (adibidez, KOffice edo OpenOffice."
-#~ "org).</p><p>TDEko aplikazioetatik inprimatzean, (adibidez KMail eta "
-#~ "Konqueror) edo kprinter-en bidez ASCII testua inprimatzean zure marjinen "
-#~ "ezarpenak hemen hauta ditzakezu.</p><p>Marjinak banaka ezarri daitezke "
-#~ "paperaren ertz bakoitzerako. Beheko konbinazio-koadroan neurtzeko "
-#~ "unitateak pixel, milimetro, zentimetro edo hazbete artean aldat dezakezu. "
-#~ "</p>  <p>Sagua erabil dezakezu nahi duzun marjin bat hartu eta  posizio "
-#~ "batera arrastatzeko (ikusi aurrebista eskuineko aldean).</"
-#~ "p><hr><p><em><b>Argibidea erabiltzaile aurreratuentzat:</b> TDEPrint-en "
-#~ "interfazeko elementu hau CUPS komando-lerroko lanen aukeren "
-#~ "parametroekindator bat:</em><pre>     -o page-top=...      # adibidez: "
-#~ "\"72\"<br>     -o page-bottom=...   # adibidez: \"24\"<br>     -o page-"
-#~ "left=...     # adibidez: \"36\"<br>     -o page-right=...    # adibidez: "
-#~ "\"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> <b>Uneko orrialdea</b><p>Hautatu <em>\"Unekoa\"</em> TDEren "
-#~ "aplikazioan ikus daitekeen uneko orrialdea inprimatzeko.</p> <p><b>Oharra:"
-#~ "</b> eremu hau desgaiturik dago TDErenak ez diren aplikazioetatik "
-#~ "inprimatzen baduzu (Mozillatik, edo OpenOffice.org-etik, adibidez), "
-#~ "hauetan TDEPrint-ek ez baitu unean zer orrialde ikusten ari zaren "
-#~ "ezagutzeko modurik.</p></qt>"
-
-#, fuzzy
 #~ msgid "Orientation"
 #~ msgstr "&Orientazioa"
 
@@ -6728,3 +6675,56 @@ msgstr "&Orri-markak"
 
 #~ msgid "Documentation"
 #~ msgstr "Dokumentazioa"
+
+#, 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>Marjinak</b></p>  <p>Ezarpen hauek papereko inprimaketaren "
+#~ "marjinak kontrolatzen dute. Orrien diseinua aplikazio barnean sortzen "
+#~ "bada eta aplikazioek PostScript-ak bidaltzen badizkiote TDEPrint-i "
+#~ "ezarpen hauek ez dute eraginik izango (adibidez, KOffice edo OpenOffice."
+#~ "org).</p><p>TDEko aplikazioetatik inprimatzean, (adibidez KMail eta "
+#~ "Konqueror) edo kprinter-en bidez ASCII testua inprimatzean zure marjinen "
+#~ "ezarpenak hemen hauta ditzakezu.</p><p>Marjinak banaka ezarri daitezke "
+#~ "paperaren ertz bakoitzerako. Beheko konbinazio-koadroan neurtzeko "
+#~ "unitateak pixel, milimetro, zentimetro edo hazbete artean aldat dezakezu. "
+#~ "</p>  <p>Sagua erabil dezakezu nahi duzun marjin bat hartu eta  posizio "
+#~ "batera arrastatzeko (ikusi aurrebista eskuineko aldean).</"
+#~ "p><hr><p><em><b>Argibidea erabiltzaile aurreratuentzat:</b> TDEPrint-en "
+#~ "interfazeko elementu hau CUPS komando-lerroko lanen aukeren "
+#~ "parametroekindator bat:</em><pre>     -o page-top=...      # adibidez: "
+#~ "\"72\"<br>     -o page-bottom=...   # adibidez: \"24\"<br>     -o page-"
+#~ "left=...     # adibidez: \"36\"<br>     -o page-right=...    # adibidez: "
+#~ "\"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> <b>Uneko orrialdea</b><p>Hautatu <em>\"Unekoa\"</em> TDEren "
+#~ "aplikazioan ikus daitekeen uneko orrialdea inprimatzeko.</p> <p><b>Oharra:"
+#~ "</b> eremu hau desgaiturik dago TDErenak ez diren aplikazioetatik "
+#~ "inprimatzen baduzu (Mozillatik, edo OpenOffice.org-etik, adibidez), "
+#~ "hauetan TDEPrint-ek ez baitu unean zer orrialde ikusten ari zaren "
+#~ "ezagutzeko modurik.</p></qt>"