Merge translation files from master branch.

2 files changed, 63 insertions, 57 deletions

diff --git a/tde-i18n-en_GB/messages/tdebase/kasbarextension.po b/tde-i18n-en_GB/messages/tdebase/kasbarextension.po
index 513deb1e4e6..3862377817c 100644
--- a/tde-i18n-en_GB/messages/tdebase/kasbarextension.po
+++ b/tde-i18n-en_GB/messages/tdebase/kasbarextension.po
@@ -6,7 +6,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: 2005-01-31 15:00+0000\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -393,28 +393,27 @@ msgid "Enable &progress indicator"
 msgstr "Enable &progress indicator"
 
 #: 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 ""
 "Enables the display of a progress bar in the label of windows show are "
 "progress indicators."
 
-#: kasprefsdlg.cpp:426
+#: kasprefsdlg.cpp:425
 msgid "Enable &attention indicator"
 msgstr "Enable &attention indicator"
 
-#: kasprefsdlg.cpp:428
+#: kasprefsdlg.cpp:427
 msgid ""
 "Enables the display of an icon that indicates a window that needs attention."
 msgstr ""
 "Enables the display of an icon that indicates a window that needs attention."
 
-#: kasprefsdlg.cpp:432
+#: kasprefsdlg.cpp:431
 msgid "Enable frames for inactive items"
 msgstr "Enable frames for inactive items"
 
-#: 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."
@@ -422,7 +421,7 @@ msgstr ""
 "Enables frames around inactive items, if you want the bar to disappear into "
 "the background you should probably untick this option."
 
-#: kasprefsdlg.cpp:445
+#: kasprefsdlg.cpp:444
 msgid ""
 "_n:  pixel\n"
 " pixels"
@@ -545,5 +544,12 @@ msgstr ""
 msgid "NET WM Specification Info"
 msgstr "NET WM Specification Info"
 
+#~ msgid ""
+#~ "Enables the display of a progress bar in the label of windows show are "
+#~ "progress indicators."
+#~ msgstr ""
+#~ "Enables the display of a progress bar in the label of windows show are "
+#~ "progress indicators."
+
 #~ msgid " Pixels"
 #~ msgstr " Pixels"
diff --git a/tde-i18n-en_GB/messages/tdebase/ktip.po b/tde-i18n-en_GB/messages/tdebase/ktip.po
index 4d8c4399aa6..9af559a874f 100644
--- a/tde-i18n-en_GB/messages/tdebase/ktip.po
+++ b/tde-i18n-en_GB/messages/tdebase/ktip.po
@@ -1861,54 +1861,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> Want TDE's printing power in non-TDE apps?  </p>\n"
-#~ "<p> Then use <strong>'kprinter'</strong> as \"print command\".\n"
-#~ "Works with Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n"
-#~ " StarOffice, OpenOffice.org, 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"
-
-#~ 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"
-#~ "You can let TDE turn the <b>NumLock</b> ON or OFF at startup.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Open the Control Centre, 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"
-
 #~ msgid ""
 #~ "<P>\n"
 #~ "There is a lot of information about TDE on the\n"
@@ -2010,3 +1962,51 @@ msgstr ""
 #~ "find old release schedules, there will probably be some weeks/months of\n"
 #~ "intensive development left before the next release.</p><br>\n"
 #~ "<center><img src=\"crystalsvg/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> Want TDE's printing power in non-TDE apps?  </p>\n"
+#~ "<p> Then use <strong>'kprinter'</strong> as \"print command\".\n"
+#~ "Works with Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n"
+#~ " StarOffice, OpenOffice.org, 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"
+
+#~ 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"
+#~ "You can let TDE turn the <b>NumLock</b> ON or OFF at startup.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Open the Control Centre, 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"