Merge translation files from master branch.

2 files changed, 64 insertions, 64 deletions

diff --git a/tde-i18n-sr@Latn/messages/tdelibs/tdeio.po b/tde-i18n-sr@Latn/messages/tdelibs/tdeio.po
index c2dae8ab41e..0a1c0fd9826 100644
--- a/tde-i18n-sr@Latn/messages/tdelibs/tdeio.po
+++ b/tde-i18n-sr@Latn/messages/tdelibs/tdeio.po
@@ -6439,17 +6439,6 @@ msgstr ""
 #~ msgid "Unknown unmount error."
 #~ msgstr "Nepoznata greška"
 
-#~ 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 ""
-#~ "Možete da potražite na Internetu TDE program (koji se zove tdeioslave ili "
-#~ "ioslave) koji podržava ovaj protokol. Mesta za pretragu uključuju <a href="
-#~ "\"http://kde-apps.org/\">http://kde-apps.org/</a> i <a href=\"http://"
-#~ "freshmeat.net/\">http://freshmeat.net/</a>."
-
 #, fuzzy
 #~ msgid "Bookmarks"
 #~ msgstr "Marker"
@@ -6496,3 +6485,14 @@ msgstr ""
 
 #~ msgid "Shared"
 #~ msgstr "Deljen"
+
+#~ 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 ""
+#~ "Možete da potražite na Internetu TDE program (koji se zove tdeioslave ili "
+#~ "ioslave) koji podržava ovaj protokol. Mesta za pretragu uključuju <a href="
+#~ "\"http://kde-apps.org/\">http://kde-apps.org/</a> i <a href=\"http://"
+#~ "freshmeat.net/\">http://freshmeat.net/</a>."
diff --git a/tde-i18n-sr@Latn/messages/tdelibs/tdeprint.po b/tde-i18n-sr@Latn/messages/tdelibs/tdeprint.po
index cc90ac47a40..4bce84bca24 100644
--- a/tde-i18n-sr@Latn/messages/tdelibs/tdeprint.po
+++ b/tde-i18n-sr@Latn/messages/tdelibs/tdeprint.po
@@ -8,7 +8,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-06 22:31+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -6537,58 +6537,6 @@ msgid "&PageMarks"
 msgstr "&Markeri strana"
 
 #, 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>Margine</b></p>  <p>Ove postavke kontrolišu margine otisaka "
-#~ "na papiru. Ne važe za poslove koji potiču od programa koji definišu "
-#~ "sopstveni raspored strane interno i šalju PostScript TDEPrint-u (kakvi su "
-#~ "KOffice ili OpenOffice.org). </p>  <p>Pri štampanju iz TDE programa, kao "
-#~ "što su KMail i Konqueror, ili štampanju ASCII tekstualnih fajlova kroz "
-#~ "kprinter, ovde možete izabrati poželjne postavke margina. </p>  "
-#~ "<p>Margine se mogu postaviti posebno za svaku ivicu papira. Kombo-kutija "
-#~ "na dnu omogućava vam da promenite jedinice mere između piksela, "
-#~ "milimetara, santimetara i inča. </p>  <p>Možete čak upotrebiti miš da "
-#~ "uhvatite jednu marginu i prevučete je na željeni položaj (pogledajte "
-#~ "sliku pregleda na desnoj strani). </p>  <hr>  <p><em><b>Dodatan savet za "
-#~ "napredne korisnike:</b> Ovaj element GUI-ja TDEPrint-a odgovara parametru "
-#~ "opcije posla komandne linije CUPS-a:</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>Tekuća strana:</b><p>Odaberite <em>„Tekuća“</em> ako želite da "
-#~ "štampate stranu trenutno vidljivu u nekom TDE programu.</p> "
-#~ "<p><b>Napomena:</b> Ovo polje je isključeno ako štampate iz ne-TDE "
-#~ "programa kao što su Mozilla ili OpenOffice.org, pošto u tim slučajevima "
-#~ "TDEPrint nema načina da odredi koju stranu dokumenta trenutno gledate.</"
-#~ "p></qt>"
-
-#, fuzzy
 #~ msgid "Orientation"
 #~ msgstr "&Orijentacija"
 
@@ -6652,3 +6600,55 @@ msgstr "&Markeri strana"
 
 #~ 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>Margine</b></p>  <p>Ove postavke kontrolišu margine otisaka "
+#~ "na papiru. Ne važe za poslove koji potiču od programa koji definišu "
+#~ "sopstveni raspored strane interno i šalju PostScript TDEPrint-u (kakvi su "
+#~ "KOffice ili OpenOffice.org). </p>  <p>Pri štampanju iz TDE programa, kao "
+#~ "što su KMail i Konqueror, ili štampanju ASCII tekstualnih fajlova kroz "
+#~ "kprinter, ovde možete izabrati poželjne postavke margina. </p>  "
+#~ "<p>Margine se mogu postaviti posebno za svaku ivicu papira. Kombo-kutija "
+#~ "na dnu omogućava vam da promenite jedinice mere između piksela, "
+#~ "milimetara, santimetara i inča. </p>  <p>Možete čak upotrebiti miš da "
+#~ "uhvatite jednu marginu i prevučete je na željeni položaj (pogledajte "
+#~ "sliku pregleda na desnoj strani). </p>  <hr>  <p><em><b>Dodatan savet za "
+#~ "napredne korisnike:</b> Ovaj element GUI-ja TDEPrint-a odgovara parametru "
+#~ "opcije posla komandne linije CUPS-a:</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>Tekuća strana:</b><p>Odaberite <em>„Tekuća“</em> ako želite da "
+#~ "štampate stranu trenutno vidljivu u nekom TDE programu.</p> "
+#~ "<p><b>Napomena:</b> Ovo polje je isključeno ako štampate iz ne-TDE "
+#~ "programa kao što su Mozilla ili OpenOffice.org, pošto u tim slučajevima "
+#~ "TDEPrint nema načina da odredi koju stranu dokumenta trenutno gledate.</"
+#~ "p></qt>"