Merge translation files from master branch.

2 files changed, 67 insertions, 61 deletions

diff --git a/tde-i18n-af/messages/tdebase/kasbarextension.po b/tde-i18n-af/messages/tdebase/kasbarextension.po
index 488dae1ef75..8cbb1ce88a3 100644
--- a/tde-i18n-af/messages/tdebase/kasbarextension.po
+++ b/tde-i18n-af/messages/tdebase/kasbarextension.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kasbarextension stable\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-11-23 16:55+0200\n"
 "Last-Translator: Kobus <kabousv@therugby.co.za>\n"
 "Language-Team: AFRIKAANS <translate-discuss-af@lists.sourceforge.net>\n"
@@ -399,29 +399,28 @@ msgid "Enable &progress indicator"
 msgstr "Aktiveer vorderings aanduier"
 
 #: 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 ""
 "Aktiveer die vertoon van 'n vorderings balk in die etiket van die ikoon vir "
 "vensters bevat 'n vorderings aanduider."
 
-#: kasprefsdlg.cpp:426
+#: kasprefsdlg.cpp:425
 msgid "Enable &attention indicator"
 msgstr "Aktiveer aandag aanduier"
 
-#: kasprefsdlg.cpp:428
+#: kasprefsdlg.cpp:427
 msgid ""
 "Enables the display of an icon that indicates a window that needs attention."
 msgstr ""
 "Aktiveer die vertoon van 'n  ikoon wat aandui dat die vensters aandag nodig "
 "het."
 
-#: kasprefsdlg.cpp:432
+#: kasprefsdlg.cpp:431
 msgid "Enable frames for inactive items"
 msgstr "Skakel rame vir onaktiewe items aan"
 
-#: 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."
@@ -429,7 +428,7 @@ msgstr ""
 "Skakel rame aan rondom onaktiewe items, indien jy die balk wil laat verdwyn "
 "in die agtregrond moet jy hierdie keuse nie kies nie."
 
-#: kasprefsdlg.cpp:445
+#: kasprefsdlg.cpp:444
 msgid ""
 "_n:  pixel\n"
 " pixels"
@@ -552,5 +551,12 @@ msgstr ""
 msgid "NET WM Specification Info"
 msgstr "Net Wm Spesifikasie Inligting"
 
+#~ msgid ""
+#~ "Enables the display of a progress bar in the label of windows show are "
+#~ "progress indicators."
+#~ msgstr ""
+#~ "Aktiveer die vertoon van 'n vorderings balk in die etiket van die ikoon "
+#~ "vir vensters bevat 'n vorderings aanduider."
+
 #~ msgid " Pixels"
 #~ msgstr "Pixels"
diff --git a/tde-i18n-af/messages/tdebase/ktip.po b/tde-i18n-af/messages/tdebase/ktip.po
index 2c533d4568e..b3a5505d6cd 100644
--- a/tde-i18n-af/messages/tdebase/ktip.po
+++ b/tde-i18n-af/messages/tdebase/ktip.po
@@ -1912,58 +1912,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> Wil jy TDE se druk krag in nie-TDE programme gebruik?  </p>\n"
-#~ "<p> Gebruik dan <strong>'kprinter'</strong> as \"druk opdrag\".\n"
-#~ "Werk met Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n"
-#~ " StarOffice, OpenOffice.org, enige GNOME program en nog baie meer...</p>\n"
-#~ "<center>\n"
-#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
-#~ "<p align=\"right\"><em>Bygedra deur 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"
-#~ "Jy kan Kde die <b>Numlock</b> Aan of Af skakel by aansit.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Open die Beheer Sentrum  -> Randaparatuur -> Sleutelbord -> en maak jou\n"
-#~ " keuse.\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"
-#~ "<i>Dit is die laaste wenk in die databasis. Kliek \"Volgende\" om terug "
-#~ "te gaan na \n"
-#~ "die eerste wenk.</i>\n"
-#~ "</p>\n"
-
 #~ msgid ""
 #~ "<P>\n"
 #~ "There is a lot of information about TDE on the\n"
@@ -2069,3 +2017,55 @@ msgstr ""
 #~ "ontwikkeling\n"
 #~ "oor voor die volgende weergawe se vrystelling.</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> Wil jy TDE se druk krag in nie-TDE programme gebruik?  </p>\n"
+#~ "<p> Gebruik dan <strong>'kprinter'</strong> as \"druk opdrag\".\n"
+#~ "Werk met Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n"
+#~ " StarOffice, OpenOffice.org, enige GNOME program en nog baie meer...</p>\n"
+#~ "<center>\n"
+#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
+#~ "<p align=\"right\"><em>Bygedra deur 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"
+#~ "Jy kan Kde die <b>Numlock</b> Aan of Af skakel by aansit.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Open die Beheer Sentrum  -> Randaparatuur -> Sleutelbord -> en maak jou\n"
+#~ " keuse.\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"
+#~ "<i>Dit is die laaste wenk in die databasis. Kliek \"Volgende\" om terug "
+#~ "te gaan na \n"
+#~ "die eerste wenk.</i>\n"
+#~ "</p>\n"