Merge translation files from master branch.

1 files changed, 48 insertions, 48 deletions

diff --git a/tde-i18n-ca/messages/tdebase/ktip.po b/tde-i18n-ca/messages/tdebase/ktip.po
index 56508e106f1..affe8a035ed 100644
--- a/tde-i18n-ca/messages/tdebase/ktip.po
+++ b/tde-i18n-ca/messages/tdebase/ktip.po
@@ -1919,54 +1919,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>Voleu la potència de la impressió TDE a les aplicacions no TDE?  </p>\n"
-#~ "<p>Llavors useu <strong>'kprinter'</strong> com a \"ordre d'impressió\".\n"
-#~ "Funciona amb Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n"
-#~ "StarOffice, OpenOffice, qualsevol aplicació GNOME i moltes més...</p>\n"
-#~ "<center>\n"
-#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
-#~ "<p align=\"right\"><em>Contribució de 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"
-#~ "Podeu fer que el TDE engegui o aturi el <b>BloqNum</b> a l'engegar.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Obriu el Centre de Control, seleccioneu Perifèrics -> Teclat i trieu la\n"
-#~ "vostra opció.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "<hr><br><br>\n"
-#~ "<i>Aquest és el darrer consell de la base de dades. En clicar \"Següent\" "
-#~ "anireu enrere\n"
-#~ "fins al primer consell.</i>\n"
-#~ "</p>\n"
-
 #~ msgid ""
 #~ "<P>\n"
 #~ "There is a lot of information about TDE on the\n"
@@ -2069,3 +2021,51 @@ msgstr ""
 #~ "o mesos de desenvolupament intensiu abans del següent lliurament.</"
 #~ "p><br>\n"
 #~ "<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>Voleu la potència de la impressió TDE a les aplicacions no TDE?  </p>\n"
+#~ "<p>Llavors useu <strong>'kprinter'</strong> com a \"ordre d'impressió\".\n"
+#~ "Funciona amb Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n"
+#~ "StarOffice, OpenOffice, qualsevol aplicació GNOME i moltes més...</p>\n"
+#~ "<center>\n"
+#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
+#~ "<p align=\"right\"><em>Contribució de 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"
+#~ "Podeu fer que el TDE engegui o aturi el <b>BloqNum</b> a l'engegar.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Obriu el Centre de Control, seleccioneu Perifèrics -> Teclat i trieu la\n"
+#~ "vostra opció.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "<hr><br><br>\n"
+#~ "<i>Aquest és el darrer consell de la base de dades. En clicar \"Següent\" "
+#~ "anireu enrere\n"
+#~ "fins al primer consell.</i>\n"
+#~ "</p>\n"