Merge translation files from master branch.

1 files changed, 52 insertions, 38 deletions

diff --git a/tde-i18n-nn/messages/tdelibs/tdeprint.po b/tde-i18n-nn/messages/tdelibs/tdeprint.po
index 457efede551..64018a81c6c 100644
--- a/tde-i18n-nn/messages/tdelibs/tdeprint.po
+++ b/tde-i18n-nn/messages/tdelibs/tdeprint.po
@@ -5,7 +5,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-08-09 17:23+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
@@ -1387,19 +1387,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 ""
 
 #: cups/kptextpage.cpp:134
@@ -1708,9 +1708,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>Denne sida:</b> Vel <em>«Denne»</em> viss du vil skriva ut den sida "
 "som no vert vist i TDE-applikasjonen din.</p> <p><b>Merk:</b> dette feltet "
@@ -1718,7 +1718,7 @@ msgstr ""
 "OpenOffice.org, fordi då har ikkje TDEPrint høve til å finna ut kva side du "
 "ser på no.</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"
@@ -1734,7 +1734,7 @@ msgstr ""
 "b> <em>«4,6,10-13,17,20,23-25»</em> skriv ut sidene4, 6, 10, 11, 12, 13, 17, "
 "20, 23, 24 og 25 av dokumentet.</p></qt>"
 
-#: kpcopiespage.cpp:74
+#: kpcopiespage.cpp:75
 #, fuzzy
 msgid ""
 " <qt><b>Page Set:</b> <p>Choose <em>\"All Pages\"</em>, <em>\"Even Pages\"</"
@@ -1765,7 +1765,7 @@ msgstr ""
 "skrivaren, og andre gongen vel du det motsette. Avhengig av skrivarmodellen "
 "kan det vera nødvendig å skriva ein av jobbane «Baklengs».</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, "
@@ -1778,7 +1778,7 @@ msgid ""
 "Collate=...           # example:  \"true\" or \"false\"  </pre> </p> .</qt>"
 msgstr ""
 
-#: kpcopiespage.cpp:115
+#: kpcopiespage.cpp:116
 #, fuzzy
 msgid ""
 " <qt><b>Number of Copies:</b> Determine the number of requested copies here. "
@@ -1792,7 +1792,7 @@ msgstr ""
 "<qt>Set tal på utskrifter du vil ha her. Du kan auka eller minska talet ved "
 "å trykkja på opp/nedpilene. Du kan også tasta inntalet direkte i boksen.</qt>"
 
-#: kpcopiespage.cpp:128
+#: kpcopiespage.cpp:129
 #, fuzzy
 msgid ""
 " <qt><b>Collate Copies</b> <p>If the <em>\"Collate\"</em> checkbox is "
@@ -1811,7 +1811,7 @@ msgstr ""
 "eksemplar aveit dokument med fleire sider skrive ut i rekkjefølgja «1-1-1-…, "
 "2-2-2-…,3-3-3-…»</p></qt>"
 
-#: kpcopiespage.cpp:142
+#: kpcopiespage.cpp:143
 #, fuzzy
 msgid ""
 " <qt><b>Reverse Order</b> <p> If the <em>\"Reverse\"</em> checkbox is "
@@ -1833,64 +1833,64 @@ msgstr ""
 "krysset for «Samla», vil sidene i et dokument bli skrive ut i rekkjefølgja "
 "«…-3-3-3, ....-2-2-2, …-1-1-1».</p></qt>"
 
-#: kpcopiespage.cpp:163
+#: kpcopiespage.cpp:164
 msgid "C&opies"
 msgstr "K&opiar"
 
-#: kpcopiespage.cpp:167
+#: kpcopiespage.cpp:168
 msgid "Page Selection"
 msgstr "Sideval"
 
-#: kpcopiespage.cpp:169
+#: kpcopiespage.cpp:170
 msgid "&All"
 msgstr "&Alle"
 
-#: kpcopiespage.cpp:171
+#: kpcopiespage.cpp:172
 msgid "Cu&rrent"
 msgstr "&Denne"
 
-#: kpcopiespage.cpp:173
+#: kpcopiespage.cpp:174
 msgid "Ran&ge"
 msgstr "Om&råde"
 
-#: 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>Skriv sider eller grupper av sider delt med komma (1,2-5,8).</p>"
 
-#: kpcopiespage.cpp:182
+#: kpcopiespage.cpp:183
 msgid "Output Settings"
 msgstr "Utskriftsinnstillingar"
 
-#: kpcopiespage.cpp:184
+#: kpcopiespage.cpp:185
 msgid "Co&llate"
 msgstr "&Sorter"
 
-#: kpcopiespage.cpp:186
+#: kpcopiespage.cpp:187
 msgid "Re&verse"
 msgstr "Om&vendt"
 
-#: kpcopiespage.cpp:191
+#: kpcopiespage.cpp:192
 msgid "Cop&ies:"
 msgstr "Kop&iar:"
 
-#: kpcopiespage.cpp:198
+#: kpcopiespage.cpp:199
 msgid "All Pages"
 msgstr "Alle sider"
 
-#: kpcopiespage.cpp:199
+#: kpcopiespage.cpp:200
 msgid "Odd Pages"
 msgstr "Oddetalssider"
 
-#: kpcopiespage.cpp:200
+#: kpcopiespage.cpp:201
 msgid "Even Pages"
 msgstr "Partalssider"
 
-#: kpcopiespage.cpp:202
+#: kpcopiespage.cpp:203
 msgid "Page &set:"
 msgstr "&Sidesett:"
 
-#: kpcopiespage.cpp:257
+#: kpcopiespage.cpp:258
 msgid "Pages"
 msgstr "Sider"
 
@@ -5904,6 +5904,20 @@ msgid "&PageMarks"
 msgstr "&Sidemerke"
 
 #, 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>Denne sida:</b> Vel <em>«Denne»</em> viss du vil skriva ut den "
+#~ "sida som no vert vist i TDE-applikasjonen din.</p> <p><b>Merk:</b> dette "
+#~ "feltet er slått av viss du skriv ut frå ikkje-TDE applikasjonar som "
+#~ "Mozilla eller OpenOffice.org, fordi då har ikkje TDEPrint høve til å "
+#~ "finna ut kva side du ser på no.</p></qt>"
+
+#, fuzzy
 #~ msgid "Orientation"
 #~ msgstr "&Retning"