Merge translation files from master branch.

3 files changed, 58 insertions, 56 deletions

diff --git a/tde-i18n-en_GB/messages/tdebase/kdcop.po b/tde-i18n-en_GB/messages/tdebase/kdcop.po
index 13d79a90a0b..8555730baab 100644
--- a/tde-i18n-en_GB/messages/tdebase/kdcop.po
+++ b/tde-i18n-en_GB/messages/tdebase/kdcop.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdcop\n"
-"POT-Creation-Date: 2020-05-11 13:04+0200\n"
+"POT-Creation-Date: 2020-05-28 02:58+0200\n"
 "PO-Revision-Date: 2005-03-17 12:55+0000\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -44,78 +44,78 @@ msgstr "%1 (default)"
 msgid "Welcome to the TDE DCOP browser"
 msgstr "Welcome to the TDE DCOP browser"
 
-#: kdcopwindow.cpp:294
+#: kdcopwindow.cpp:295
 msgid "Application"
 msgstr "Application"
 
-#: kdcopwindow.cpp:316
+#: kdcopwindow.cpp:317
 msgid "&Execute"
 msgstr "&Execute"
 
-#: kdcopwindow.cpp:326
+#: kdcopwindow.cpp:327
 msgid "Execute the selected DCOP call."
 msgstr "Execute the selected DCOP call."
 
-#: kdcopwindow.cpp:328
+#: kdcopwindow.cpp:329
 msgid "Language Mode"
 msgstr "Language Mode"
 
-#: kdcopwindow.cpp:336
+#: kdcopwindow.cpp:337
 msgid "Set the current language export."
 msgstr "Set the current language export."
 
-#: kdcopwindow.cpp:355
+#: kdcopwindow.cpp:356
 msgid "DCOP Browser"
 msgstr "DCOP Browser"
 
-#: kdcopwindow.cpp:402
+#: kdcopwindow.cpp:403
 msgid "No parameters found."
 msgstr "No parameters found."
 
-#: kdcopwindow.cpp:402
+#: kdcopwindow.cpp:403
 msgid "DCOP Browser Error"
 msgstr "DCOP Browser Error"
 
-#: kdcopwindow.cpp:418
+#: kdcopwindow.cpp:419
 #, c-format
 msgid "Call Function %1"
 msgstr "Call Function %1"
 
-#: kdcopwindow.cpp:422
+#: kdcopwindow.cpp:423
 msgid "Name"
 msgstr "Name"
 
-#: kdcopwindow.cpp:423
+#: kdcopwindow.cpp:424
 msgid "Type"
 msgstr "Type"
 
-#: kdcopwindow.cpp:424
+#: kdcopwindow.cpp:425
 msgid "Value"
 msgstr "Value"
 
-#: kdcopwindow.cpp:631
+#: kdcopwindow.cpp:632
 msgid "X"
 msgstr "X"
 
-#: kdcopwindow.cpp:632
+#: kdcopwindow.cpp:633
 msgid "Y"
 msgstr "Y"
 
-#: kdcopwindow.cpp:662 kdcopwindow.cpp:789
+#: kdcopwindow.cpp:663 kdcopwindow.cpp:790
 #, c-format
 msgid "Cannot handle datatype %1"
 msgstr "Cannot handle datatype %1"
 
-#: kdcopwindow.cpp:824
+#: kdcopwindow.cpp:825
 msgid "DCOP call failed"
 msgstr "DCOP call failed"
 
-#: kdcopwindow.cpp:826
+#: kdcopwindow.cpp:827
 #, c-format
 msgid "<p>DCOP call failed.</p>%1"
 msgstr "<p>DCOP call failed.</p>%1"
 
-#: kdcopwindow.cpp:837
+#: kdcopwindow.cpp:838
 msgid ""
 "<p>Application is still registered with DCOP; I do not know why this call "
 "failed.</p>"
@@ -123,28 +123,28 @@ msgstr ""
 "<p>Application is still registered with DCOP; I do not know why this call "
 "failed.</p>"
 
-#: kdcopwindow.cpp:849
+#: kdcopwindow.cpp:850
 msgid "<p>The application appears to have unregistered with DCOP.</p>"
 msgstr "<p>The application appears to have unregistered with DCOP.</p>"
 
-#: kdcopwindow.cpp:865
+#: kdcopwindow.cpp:866
 msgid "DCOP call %1 executed"
 msgstr "DCOP call %1 executed"
 
-#: kdcopwindow.cpp:874
+#: kdcopwindow.cpp:875
 msgid "<strong>%1</strong>"
 msgstr "<strong>%1</strong>"
 
-#: kdcopwindow.cpp:881
+#: kdcopwindow.cpp:882
 #, c-format
 msgid "Unknown type %1."
 msgstr "Unknown type %1."
 
-#: kdcopwindow.cpp:887
+#: kdcopwindow.cpp:888
 msgid "No returned values"
 msgstr "No returned values"
 
-#: kdcopwindow.cpp:1092
+#: kdcopwindow.cpp:1093
 #, c-format
 msgid "Do not know how to demarshal %1"
 msgstr "Do not know how to demarshal %1"
diff --git a/tde-i18n-en_GB/messages/tdemultimedia/kmix.po b/tde-i18n-en_GB/messages/tdemultimedia/kmix.po
index 92560c22198..83b969a04d5 100644
--- a/tde-i18n-en_GB/messages/tdemultimedia/kmix.po
+++ b/tde-i18n-en_GB/messages/tdemultimedia/kmix.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmix\n"
-"POT-Creation-Date: 2020-05-11 04:03+0200\n"
+"POT-Creation-Date: 2020-05-28 02:59+0200\n"
 "PO-Revision-Date: 2006-12-08 13:57+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -53,7 +53,7 @@ msgstr "Configure &Global Shortcuts..."
 msgid "Hardware &Information"
 msgstr "Hardware &Information"
 
-#: kmix.cpp:120 kmixdockwidget.cpp:400
+#: kmix.cpp:120 kmixdockwidget.cpp:418
 msgid "Hide Mixer Window"
 msgstr "Hide Mixer Window"
 
@@ -149,19 +149,19 @@ msgstr "M&ute"
 msgid "Select Master Channel..."
 msgstr "Select Master Channel..."
 
-#: kmixdockwidget.cpp:183
+#: kmixdockwidget.cpp:201
 msgid "Mixer cannot be found"
 msgstr "Mixer cannot be found"
 
-#: kmixdockwidget.cpp:194
+#: kmixdockwidget.cpp:212
 msgid "Volume at %1%"
 msgstr "Volume at %1%"
 
-#: kmixdockwidget.cpp:196
+#: kmixdockwidget.cpp:214
 msgid " (Muted)"
 msgstr " (Muted)"
 
-#: kmixdockwidget.cpp:404
+#: kmixdockwidget.cpp:422
 msgid "Show Mixer Window"
 msgstr "Show Mixer Window"
 
@@ -634,11 +634,11 @@ msgstr ""
 "kmix: You do not have permission to access the mixer device.\n"
 "Ask your system administrator to fix /dev/audioctl to allow access."
 
-#: mixertoolbox.cpp:225
+#: mixertoolbox.cpp:237
 msgid "Sound drivers supported:"
 msgstr "Sound drivers supported:"
 
-#: mixertoolbox.cpp:226
+#: mixertoolbox.cpp:238
 msgid "Sound drivers used:"
 msgstr "Sound drivers used:"
 
diff --git a/tde-i18n-en_GB/messages/tdeutils/kcmlaptop.po b/tde-i18n-en_GB/messages/tdeutils/kcmlaptop.po
index f09cb28f63d..8d79dbc4803 100644
--- a/tde-i18n-en_GB/messages/tdeutils/kcmlaptop.po
+++ b/tde-i18n-en_GB/messages/tdeutils/kcmlaptop.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmlaptop\n"
-"POT-Creation-Date: 2020-05-11 04:05+0200\n"
+"POT-Creation-Date: 2020-05-28 01:29+0200\n"
 "PO-Revision-Date: 2006-12-08 13:58+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -164,7 +164,26 @@ msgstr "This button can be used to enable the ACPI helper application"
 msgid "Version: %1"
 msgstr "Version: %1"
 
-#: acpi.cpp:172 apm.cpp:194
+#: acpi.cpp:170 apm.cpp:192
+msgid ""
+"The %1 application does not seem to have the same size or checksum as when "
+"it was compiled we do NOT recommend you proceed with making it setuid-root "
+"without further investigation"
+msgstr ""
+"The %1 application does not seem to have the same size or checksum as when "
+"it was compiled we do NOT recommend you proceed with making it setuid-root "
+"without further investigation"
+
+#: acpi.cpp:173 acpi.cpp:185 acpi.cpp:197 apm.cpp:174 apm.cpp:195 apm.cpp:207
+#: apm.cpp:219 sony.cpp:115 sony.cpp:127
+msgid "KLaptopDaemon"
+msgstr "KLaptopDaemon"
+
+#: acpi.cpp:173 apm.cpp:195
+msgid "Run Nevertheless"
+msgstr "Run Nevertheless"
+
+#: acpi.cpp:183 apm.cpp:205
 msgid ""
 "You will need to supply a root password to allow the privileges of the "
 "klaptop_acpi_helper to change."
@@ -172,12 +191,7 @@ msgstr ""
 "You will need to supply a root password to allow the privileges of the "
 "klaptop_acpi_helper to change."
 
-#: acpi.cpp:174 acpi.cpp:186 apm.cpp:174 apm.cpp:196 apm.cpp:208 sony.cpp:115
-#: sony.cpp:127
-msgid "KLaptopDaemon"
-msgstr "KLaptopDaemon"
-
-#: acpi.cpp:185
+#: acpi.cpp:196
 msgid ""
 "The ACPI helper cannot be enabled because tdesu cannot be found.  Please "
 "make sure that it is installed correctly."
@@ -185,7 +199,7 @@ msgstr ""
 "The ACPI helper cannot be enabled because tdesu cannot be found.  Please "
 "make sure that it is installed correctly."
 
-#: acpi.cpp:268
+#: acpi.cpp:279
 msgid ""
 "<h1>ACPI Setup</h1>This module allows you to configure ACPI for your system"
 msgstr ""
@@ -289,7 +303,7 @@ msgstr ""
 "%1 cannot be enabled because tdesu cannot be found.  Please make sure that "
 "it is installed correctly."
 
-#: apm.cpp:207
+#: apm.cpp:218
 msgid ""
 "The Software Suspend helper cannot be enabled because tdesu cannot be "
 "found.  Please make sure that it is installed correctly."
@@ -297,7 +311,7 @@ msgstr ""
 "The Software Suspend helper cannot be enabled because tdesu cannot be "
 "found.  Please make sure that it is installed correctly."
 
-#: apm.cpp:271
+#: apm.cpp:282
 msgid ""
 "<h1>APM Setup</h1>This module allows you to configure APM for your system"
 msgstr ""
@@ -1045,15 +1059,3 @@ msgid ""
 msgstr ""
 "<h1>Low battery Warning</h1>This module allows you to set an alarm in case "
 "your battery's charge is about to run out."
-
-#~ msgid ""
-#~ "The %1 application does not seem to have the same size or checksum as "
-#~ "when it was compiled we do NOT recommend you proceed with making it "
-#~ "setuid-root without further investigation"
-#~ msgstr ""
-#~ "The %1 application does not seem to have the same size or checksum as "
-#~ "when it was compiled we do NOT recommend you proceed with making it "
-#~ "setuid-root without further investigation"
-
-#~ msgid "Run Nevertheless"
-#~ msgstr "Run Nevertheless"