Merge translation files from master branch.

2 files changed, 63 insertions, 57 deletions

diff --git a/tde-i18n-ca/messages/tdebase/kasbarextension.po b/tde-i18n-ca/messages/tdebase/kasbarextension.po
index a9c4edae79d..9046fd392a4 100644
--- a/tde-i18n-ca/messages/tdebase/kasbarextension.po
+++ b/tde-i18n-ca/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-03-28 10:45+0200\n"
 "Last-Translator: Sebastià Pla i Sanz <sps@sastia.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -394,28 +394,27 @@ msgid "Enable &progress indicator"
 msgstr "Habilita l'indicador de &progrés"
 
 #: 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 ""
 "Habilita mostrar una barra de progrés a l'etiqueta de les finestres que són "
 "indicadors de progrés."
 
-#: kasprefsdlg.cpp:426
+#: kasprefsdlg.cpp:425
 msgid "Enable &attention indicator"
 msgstr "Habilita l'indicador d'&atenció"
 
-#: kasprefsdlg.cpp:428
+#: kasprefsdlg.cpp:427
 msgid ""
 "Enables the display of an icon that indicates a window that needs attention."
 msgstr ""
 "Habilita mostrar una icona que indica una finestra que necessita atenció."
 
-#: kasprefsdlg.cpp:432
+#: kasprefsdlg.cpp:431
 msgid "Enable frames for inactive items"
 msgstr "Habilita els marcs per als ítems inactius"
 
-#: 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."
@@ -423,7 +422,7 @@ msgstr ""
 "Habilita marcs al voltant dels ítems inactius, si voleu que la barra "
 "desaparegui al fons, probablement hauríeu de desmarcar aquesta opció."
 
-#: kasprefsdlg.cpp:445
+#: kasprefsdlg.cpp:444
 msgid ""
 "_n:  pixel\n"
 " pixels"
@@ -547,3 +546,10 @@ msgstr ""
 #: kastaskitem.cpp:504
 msgid "NET WM Specification Info"
 msgstr "Info. de l'especificació NET WM"
+
+#~ msgid ""
+#~ "Enables the display of a progress bar in the label of windows show are "
+#~ "progress indicators."
+#~ msgstr ""
+#~ "Habilita mostrar una barra de progrés a l'etiqueta de les finestres que "
+#~ "són indicadors de progrés."
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"