Merge translation files from master branch.

1 files changed, 90 insertions, 38 deletions

diff --git a/tde-i18n-sr@Latn/messages/tdelibs/tdeprint.po b/tde-i18n-sr@Latn/messages/tdelibs/tdeprint.po
index f8ee125f61f..cc90ac47a40 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-01-13 18:46+0100\n"
+"POT-Creation-Date: 2019-07-21 21:14+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"
@@ -1615,19 +1615,19 @@ 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>"
+"PostScript to TDEPrint (such as KOffice, OpenOffice or LibreOffice). </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 "
@@ -2014,9 +2014,9 @@ msgstr ""
 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>"
+"field is disabled if you print from non-TDE applications like Firefox, "
+"PaleMoon, SeaMonkey or OpenOffice and LibreOffice, 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:</"
@@ -2024,7 +2024,7 @@ msgstr ""
 "Mozilla ili OpenOffice.org, pošto u tim slučajevima TDEPrint nema načina da "
 "odredi koju stranu dokumenta trenutno gledate.</p></qt>"
 
-#: kpcopiespage.cpp:60
+#: kpcopiespage.cpp:61
 msgid ""
 " <qt><b>Page Range:</b> Choose a \"Page Range\" to select a subset of the "
 "complete document pages to be printed. The format is <em>\"n,m,o-p,q,r,s-t, u"
@@ -2044,7 +2044,7 @@ msgstr ""
 "<pre>    -o page-ranges=...     # primer: „4,6,10-13,17,20,23-25“  </pre> </"
 "p> </qt>"
 
-#: kpcopiespage.cpp:74
+#: kpcopiespage.cpp:75
 msgid ""
 " <qt><b>Page Set:</b> <p>Choose <em>\"All Pages\"</em>, <em>\"Even Pages\"</"
 "em> or <em>\"Odd Pages\"</em> if you want to print a page selection matching "
@@ -2078,7 +2078,7 @@ msgstr ""
 "linije CUPS-a:</em>  <pre>    -o page-set=...        # primer: „odd“ ili "
 "„even“  </pre> </p>  </qt>"
 
-#: kpcopiespage.cpp:97
+#: kpcopiespage.cpp:98
 msgid ""
 " <qt><b>Output Settings:</b> Here you can determine the number of copies, "
 "the output order and the collate mode for the pages of your printjob. (Note, "
@@ -2100,7 +2100,7 @@ msgstr ""
 "outputorder=...       # example:  \"reverse\" <br>     -o "
 "Collate=...           # example:  \"true\" or \"false\"  </pre> </p> .</qt>"
 
-#: kpcopiespage.cpp:115
+#: kpcopiespage.cpp:116
 msgid ""
 " <qt><b>Number of Copies:</b> Determine the number of requested copies here. "
 "You can increase or decrease the number of printed copies by clicking on the "
@@ -2117,7 +2117,7 @@ msgstr ""
 "TDEPrint-a odgovara parametru opcije posla komandne linije CUPS-a:</em>  "
 "<pre>     -o copies=...            # primer: „5“ ili „42“  </pre> </p>  </qt>"
 
-#: kpcopiespage.cpp:128
+#: kpcopiespage.cpp:129
 msgid ""
 " <qt><b>Collate Copies</b> <p>If the <em>\"Collate\"</em> checkbox is "
 "enabled (default), the output order for multiple copies of a multi-page "
@@ -2138,7 +2138,7 @@ msgstr ""
 "em>  <pre>    -o Collate=...           # primer: „true“ ili „false“  </pre> "
 "</p>  </qt>"
 
-#: kpcopiespage.cpp:142
+#: kpcopiespage.cpp:143
 msgid ""
 " <qt><b>Reverse Order</b> <p> If the <em>\"Reverse\"</em> checkbox is "
 "enabled, the output order for multiple copies of a multi-page document will "
@@ -2163,66 +2163,66 @@ msgstr ""
 "linije CUPS-a:</em>  <pre>    -o outputorder=...       # primer:  „reverse“  "
 "</pre> </p>  </qt>"
 
-#: kpcopiespage.cpp:163
+#: kpcopiespage.cpp:164
 msgid "C&opies"
 msgstr "Br&oj kopija"
 
-#: kpcopiespage.cpp:167
+#: kpcopiespage.cpp:168
 msgid "Page Selection"
 msgstr "Izbor strana"
 
-#: kpcopiespage.cpp:169
+#: kpcopiespage.cpp:170
 msgid "&All"
 msgstr "&Sve"
 
-#: kpcopiespage.cpp:171
+#: kpcopiespage.cpp:172
 msgid "Cu&rrent"
 msgstr "T&renutna"
 
-#: kpcopiespage.cpp:173
+#: kpcopiespage.cpp:174
 msgid "Ran&ge"
 msgstr "Opse&g"
 
-#: kpcopiespage.cpp:178
+#: kpcopiespage.cpp:179
 msgid ""
 "<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>"
 msgstr ""
 "<p>Unesite brojeve ili opsege strana za štampanje razdvojene zarezima "
 "(1,2-5,8).</p>"
 
-#: kpcopiespage.cpp:182
+#: kpcopiespage.cpp:183
 msgid "Output Settings"
 msgstr "Postavke izlaza"
 
-#: kpcopiespage.cpp:184
+#: kpcopiespage.cpp:185
 msgid "Co&llate"
 msgstr "&Grupiši"
 
-#: kpcopiespage.cpp:186
+#: kpcopiespage.cpp:187
 msgid "Re&verse"
 msgstr "&Obrni"
 
-#: kpcopiespage.cpp:191
+#: kpcopiespage.cpp:192
 msgid "Cop&ies:"
 msgstr "&Kopija:"
 
-#: kpcopiespage.cpp:198
+#: kpcopiespage.cpp:199
 msgid "All Pages"
 msgstr "Sve strane"
 
-#: kpcopiespage.cpp:199
+#: kpcopiespage.cpp:200
 msgid "Odd Pages"
 msgstr "Neparne strane"
 
-#: kpcopiespage.cpp:200
+#: kpcopiespage.cpp:201
 msgid "Even Pages"
 msgstr "Parne strane"
 
-#: kpcopiespage.cpp:202
+#: kpcopiespage.cpp:203
 msgid "Page &set:"
 msgstr "Skup &strana:"
 
-#: kpcopiespage.cpp:257
+#: kpcopiespage.cpp:258
 msgid "Pages"
 msgstr "Strane"
 
@@ -6537,6 +6537,58 @@ 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"