Merge translation files from master branch.

1 files changed, 47 insertions, 47 deletions

diff --git a/tde-i18n-nb/messages/tdebase/ktip.po b/tde-i18n-nb/messages/tdebase/ktip.po
index 2b809894da4..ac827f25f6a 100644
--- a/tde-i18n-nb/messages/tdebase/ktip.po
+++ b/tde-i18n-nb/messages/tdebase/ktip.po
@@ -1808,53 +1808,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 ha TDEs utskriftsegenskaper på ikke-TDE-programmer?</p>\n"
-#~ "<p> Bruk <strong>kprinter</strong> som «utskriftskommando».\n"
-#~ "Dette virker for Netscape, Mozilla, Galeon, gv, Acrobate Reader, \n"
-#~ " StarOffice, OpenOffice, GNOME programmer og mye mer …</p>\n"
-#~ "<center>\n"
-#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
-#~ "<p align=\"right\"><em>Skrevet av 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>\n"
-#~ "Du kan la TDE skru på eller av <b>NumLock</b> ved oppstart.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Åpne Kontrollpanelet, velg «Perifere enheter – Tastatur»\n"
-#~ "og kryss av for ditt valg.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "<hr><br><br>\n"
-#~ "<i>Dette er det siste tipset i tipsdatabasen. Trykk «Neste» for å komme \n"
-#~ "tilbake til det første tipset.</i>\n"
-#~ "</p>\n"
-
 #~ msgid ""
 #~ "<P>\n"
 #~ "There is a lot of information about TDE on the\n"
@@ -1963,3 +1916,50 @@ msgstr ""
 #~ "<p>\n"
 #~ "Du kan bla gjennom de virtuelle skrivebordene ved å holde Ctrl-tasten\n"
 #~ "nede og trykke Tab eller Shift-Tab.</p>\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 ha TDEs utskriftsegenskaper på ikke-TDE-programmer?</p>\n"
+#~ "<p> Bruk <strong>kprinter</strong> som «utskriftskommando».\n"
+#~ "Dette virker for Netscape, Mozilla, Galeon, gv, Acrobate Reader, \n"
+#~ " StarOffice, OpenOffice, GNOME programmer og mye mer …</p>\n"
+#~ "<center>\n"
+#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
+#~ "<p align=\"right\"><em>Skrevet av 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>\n"
+#~ "Du kan la TDE skru på eller av <b>NumLock</b> ved oppstart.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Åpne Kontrollpanelet, velg «Perifere enheter – Tastatur»\n"
+#~ "og kryss av for ditt valg.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "<hr><br><br>\n"
+#~ "<i>Dette er det siste tipset i tipsdatabasen. Trykk «Neste» for å komme \n"
+#~ "tilbake til det første tipset.</i>\n"
+#~ "</p>\n"