Merge translation files from master branch.

2 files changed, 63 insertions, 63 deletions

diff --git a/tde-i18n-sl/messages/tdelibs/tdeio.po b/tde-i18n-sl/messages/tdelibs/tdeio.po
index f95a1b19ffd..3c4d53b60fd 100644
--- a/tde-i18n-sl/messages/tdelibs/tdeio.po
+++ b/tde-i18n-sl/messages/tdelibs/tdeio.po
@@ -6434,17 +6434,6 @@ msgstr ""
 #~ msgid "Unknown unmount error."
 #~ msgstr "Neznana napaka"
 
-#~ 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 ""
-#~ "Na internetu lahko poiščete program za TDE (imenovan tdeioslave ali "
-#~ "ioslave), ki podpira ta protokol. Med drugim lahko iščete na <a href="
-#~ "\"http://kde-apps.org/\">http://kde-apps.org/</a> in <a href=\"http://"
-#~ "freshmeat.net/\">http://freshmeat.net/</a>."
-
 #, fuzzy
 #~ msgid "Bookmarks"
 #~ msgstr "Zaznamek"
@@ -6491,3 +6480,14 @@ msgstr ""
 
 #~ msgid "Shared"
 #~ msgstr "V souporabi"
+
+#~ 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 ""
+#~ "Na internetu lahko poiščete program za TDE (imenovan tdeioslave ali "
+#~ "ioslave), ki podpira ta protokol. Med drugim lahko iščete na <a href="
+#~ "\"http://kde-apps.org/\">http://kde-apps.org/</a> in <a href=\"http://"
+#~ "freshmeat.net/\">http://freshmeat.net/</a>."
diff --git a/tde-i18n-sl/messages/tdelibs/tdeprint.po b/tde-i18n-sl/messages/tdelibs/tdeprint.po
index f5916459542..62055fdf0a7 100644
--- a/tde-i18n-sl/messages/tdelibs/tdeprint.po
+++ b/tde-i18n-sl/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: 2007-01-07 01:15+0100\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -6545,57 +6545,6 @@ msgid "&PageMarks"
 msgstr "&Zaznamki strani"
 
 #, 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>Robovi</b></p>  <p>Te nastavitve nadzorujejo robove izpisa "
-#~ "na papirju. Niso veljavne za opravila, ki izhahajo iz programov, ki "
-#~ "robove strani določajo notranje in pošljejo PostScript do TDEPrint (kot "
-#~ "sta KOffice ali OpenOffice.org). </p>  <p>Ko pa tiskate iz programov za "
-#~ "TDE, kot sta KMail in Konqueror, ali pa tiskate besedilo ASCII preko "
-#~ "kprinterja, lahko tukaj izberete željene nastavitve robov.</p>  "
-#~ "<p>Raobovi se lahko nastavijo posebej za vsak rob papirja. Spustno polje "
-#~ "na dnu vam omogoča izbirati merske enote med pikami, milimetri, "
-#~ "centimetri in palci.</p>  <p>Lahko celo uporabite miško, s katero primete "
-#~ "in povlečete rob to željenega položaja (na desni strani vidite ogledno "
-#~ "sliko). </p>  <hr>  <p><em><b>Dodaten namig za napredne uporabnike:</b> "
-#~ "ta element grafičnega vmesnika TDEPrint se ujema z parametrom opravila "
-#~ "ukazne vrstice CUPS:</em>   <pre>     -o page-top=...      # primer: "
-#~ "\"72\"  <br>     -o page-bottom=...   # primer: \"24\"  <br>     -o page-"
-#~ "left=...     # primer: \"36\"  <br>     -o page-right=...    # primer: "
-#~ "\"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>Trenutna stran:</b> Izberite <em>»Trenutno«</em>, če želite "
-#~ "natisniti stran, ki je trenutno vidna v vašem programu za TDE.</p> "
-#~ "<p><b>Vedite:</b> to polje je onemogočeno, če tiskate iz ne-TDE "
-#~ "programov, kot so Mozilla ali OpenOffice.org, ker TDEPrint tukaj ne more "
-#~ "ugotoviti, katero stran trenutno gledate.</p></qt>"
-
-#, fuzzy
 #~ msgid "Orientation"
 #~ msgstr "&Usmeritev"
 
@@ -6659,3 +6608,54 @@ msgstr "&Zaznamki strani"
 
 #~ msgid "Documentation"
 #~ msgstr "Dokumentacija"
+
+#, 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>Robovi</b></p>  <p>Te nastavitve nadzorujejo robove izpisa "
+#~ "na papirju. Niso veljavne za opravila, ki izhahajo iz programov, ki "
+#~ "robove strani določajo notranje in pošljejo PostScript do TDEPrint (kot "
+#~ "sta KOffice ali OpenOffice.org). </p>  <p>Ko pa tiskate iz programov za "
+#~ "TDE, kot sta KMail in Konqueror, ali pa tiskate besedilo ASCII preko "
+#~ "kprinterja, lahko tukaj izberete željene nastavitve robov.</p>  "
+#~ "<p>Raobovi se lahko nastavijo posebej za vsak rob papirja. Spustno polje "
+#~ "na dnu vam omogoča izbirati merske enote med pikami, milimetri, "
+#~ "centimetri in palci.</p>  <p>Lahko celo uporabite miško, s katero primete "
+#~ "in povlečete rob to željenega položaja (na desni strani vidite ogledno "
+#~ "sliko). </p>  <hr>  <p><em><b>Dodaten namig za napredne uporabnike:</b> "
+#~ "ta element grafičnega vmesnika TDEPrint se ujema z parametrom opravila "
+#~ "ukazne vrstice CUPS:</em>   <pre>     -o page-top=...      # primer: "
+#~ "\"72\"  <br>     -o page-bottom=...   # primer: \"24\"  <br>     -o page-"
+#~ "left=...     # primer: \"36\"  <br>     -o page-right=...    # primer: "
+#~ "\"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>Trenutna stran:</b> Izberite <em>»Trenutno«</em>, če želite "
+#~ "natisniti stran, ki je trenutno vidna v vašem programu za TDE.</p> "
+#~ "<p><b>Vedite:</b> to polje je onemogočeno, če tiskate iz ne-TDE "
+#~ "programov, kot so Mozilla ali OpenOffice.org, ker TDEPrint tukaj ne more "
+#~ "ugotoviti, katero stran trenutno gledate.</p></qt>"