Merge translation files from master branch.

2 files changed, 53 insertions, 49 deletions

diff --git a/tde-i18n-nn/messages/tdebase/kasbarextension.po b/tde-i18n-nn/messages/tdebase/kasbarextension.po
index fe46418b776..b747fbc7a72 100644
--- a/tde-i18n-nn/messages/tdebase/kasbarextension.po
+++ b/tde-i18n-nn/messages/tdebase/kasbarextension.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kasbarextension\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-18 01:58+0200\n"
 "PO-Revision-Date: 2006-06-22 17:18+0200\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -390,25 +390,24 @@ msgid "Enable &progress indicator"
 msgstr "Vis &framdriftsvisar"
 
 #: kasprefsdlg.cpp:421
-msgid ""
-"Enables the display of a progress bar in the label of windows show are "
-"progress indicators."
+#, fuzzy
+msgid "Enables the display of a progress indicator in the label of windows."
 msgstr "Viser framdrifta som ei linje i vindaugsteksten."
 
-#: kasprefsdlg.cpp:426
+#: kasprefsdlg.cpp:425
 msgid "Enable &attention indicator"
 msgstr "Vis &varsel"
 
-#: kasprefsdlg.cpp:428
+#: kasprefsdlg.cpp:427
 msgid ""
 "Enables the display of an icon that indicates a window that needs attention."
 msgstr "Viser eit varselikon når eit vindauge krev merksemd."
 
-#: kasprefsdlg.cpp:432
+#: kasprefsdlg.cpp:431
 msgid "Enable frames for inactive items"
 msgstr "Vis rammer rundt inaktive element"
 
-#: kasprefsdlg.cpp:434
+#: kasprefsdlg.cpp:433
 msgid ""
 "Enables frames around inactive items, if you want the bar to disappear into "
 "the background you should probably uncheck this option."
@@ -416,7 +415,7 @@ msgstr ""
 "Viser rammer rundt inaktive element. Dersom du vil at oppgåvelinja skal gå i "
 "eitt med bakgrunnen, bør du truleg slå av dette valet."
 
-#: kasprefsdlg.cpp:445
+#: kasprefsdlg.cpp:444
 msgid ""
 "_n:  pixel\n"
 " pixels"
@@ -539,3 +538,8 @@ msgstr ""
 #: kastaskitem.cpp:504
 msgid "NET WM Specification Info"
 msgstr "NET WM-spesifikasjonsinfo"
+
+#~ msgid ""
+#~ "Enables the display of a progress bar in the label of windows show are "
+#~ "progress indicators."
+#~ msgstr "Viser framdrifta som ei linje i vindaugsteksten."
diff --git a/tde-i18n-nn/messages/tdebase/ktip.po b/tde-i18n-nn/messages/tdebase/ktip.po
index 4af6da6d50d..72ec634c36e 100644
--- a/tde-i18n-nn/messages/tdebase/ktip.po
+++ b/tde-i18n-nn/messages/tdebase/ktip.po
@@ -1564,46 +1564,6 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<p> Want TDE's printing power in non-TDE apps?  </p>\n"
-#~ "<p> Then use <strong>'tdeprinter'</strong> as \"print command\".\n"
-#~ "Works with Firefox, Seamonkey, PaleMoon, Chrome/Chromium, Epiphany, gv, "
-#~ "Acrobat Reader,\n"
-#~ "LibreOffice, OpenOffice, any GNOME application and many more...</p>\n"
-#~ "<center>\n"
-#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
-#~ "<p align=\"right\"><em>Contributed by Kurt Pfeifle</em></p>\n"
-#~ msgstr ""
-#~ "<p>Vil du dra nytte av utskriftsfunksjonane til TDE i ikkje-TDE-program?</"
-#~ "p><p>Då kan du bruka <strong>«kprinter»</strong> som «utskriftskommando». "
-#~ "Det fungerer med Netscape, Mozilla, Galeon, gv, Acrobat Reader, "
-#~ "StarOffice, OpenOffice, alle GNOME-program og mange fleire&nbsp;…</p> "
-#~ "<center>\n"
-#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
-#~ "<p align=\"right\"><em>Tips frå Kurt Pfeifle</em></p>\n"
-
-#~ msgid ""
-#~ "<p>\n"
-#~ "You can let TDE turn the <b>NumLock</b> ON or OFF at startup.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Open the Control Center, select Peripherals->Keyboard and make your\n"
-#~ " choice.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "<hr><br><br>\n"
-#~ "<i>This is the last tip in the tips database. Clicking \"Next\" will take "
-#~ "you back to\n"
-#~ " the first tip.</i>\n"
-#~ "</p>\n"
-#~ msgstr ""
-#~ "<p>Du kan la TDE slå <b>Num Lock</b> på eller av ved oppstarten.</p> "
-#~ "<p>Du finn innstillingane i Kontrollsenteret: <em>Tilleggseiningar – "
-#~ "Tastatur</em>.</p>\n"
-#~ "<p> <hr><br><br><i>Dette er det siste tipset. Når du trykkjer <em>Neste</"
-#~ "em> får du opp att det første tipset.</i></p>\n"
-
 #~ msgid ""
 #~ "<P>\n"
 #~ "There is a lot of information about TDE on the\n"
@@ -1692,3 +1652,43 @@ msgstr ""
 #~ "det truleg enno gå nokre veker eller månader med intens utvikling før "
 #~ "neste utgåve.</p>\n"
 #~ "<br><center><img src=\"hicolor/48x48/apps/konqueror.png\"></center>\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p> Want TDE's printing power in non-TDE apps?  </p>\n"
+#~ "<p> Then use <strong>'tdeprinter'</strong> as \"print command\".\n"
+#~ "Works with Firefox, Seamonkey, PaleMoon, Chrome/Chromium, Epiphany, gv, "
+#~ "Acrobat Reader,\n"
+#~ "LibreOffice, OpenOffice, any GNOME application and many more...</p>\n"
+#~ "<center>\n"
+#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
+#~ "<p align=\"right\"><em>Contributed by Kurt Pfeifle</em></p>\n"
+#~ msgstr ""
+#~ "<p>Vil du dra nytte av utskriftsfunksjonane til TDE i ikkje-TDE-program?</"
+#~ "p><p>Då kan du bruka <strong>«kprinter»</strong> som «utskriftskommando». "
+#~ "Det fungerer med Netscape, Mozilla, Galeon, gv, Acrobat Reader, "
+#~ "StarOffice, OpenOffice, alle GNOME-program og mange fleire&nbsp;…</p> "
+#~ "<center>\n"
+#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
+#~ "<p align=\"right\"><em>Tips frå Kurt Pfeifle</em></p>\n"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "You can let TDE turn the <b>NumLock</b> ON or OFF at startup.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Open the Control Center, select Peripherals->Keyboard and make your\n"
+#~ " choice.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "<hr><br><br>\n"
+#~ "<i>This is the last tip in the tips database. Clicking \"Next\" will take "
+#~ "you back to\n"
+#~ " the first tip.</i>\n"
+#~ "</p>\n"
+#~ msgstr ""
+#~ "<p>Du kan la TDE slå <b>Num Lock</b> på eller av ved oppstarten.</p> "
+#~ "<p>Du finn innstillingane i Kontrollsenteret: <em>Tilleggseiningar – "
+#~ "Tastatur</em>.</p>\n"
+#~ "<p> <hr><br><br><i>Dette er det siste tipset. Når du trykkjer <em>Neste</"
+#~ "em> får du opp att det første tipset.</i></p>\n"