Merge translation files from master branch.

2 files changed, 51 insertions, 51 deletions

diff --git a/tde-i18n-en_GB/messages/tdeadmin/knetworkconf.po b/tde-i18n-en_GB/messages/tdeadmin/knetworkconf.po
index b7bc2e9f396..5916b69c2e1 100644
--- a/tde-i18n-en_GB/messages/tdeadmin/knetworkconf.po
+++ b/tde-i18n-en_GB/messages/tdeadmin/knetworkconf.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knetworkconf\n"
-"POT-Creation-Date: 2022-09-22 18:23+0000\n"
+"POT-Creation-Date: 2023-06-09 18:17+0000\n"
 "PO-Revision-Date: 2006-11-24 00:36+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
@@ -45,7 +45,7 @@ msgid "Forget changes"
 msgstr "Forget changes"
 
 #: knetworkconf/kadddevicecontainer.cpp:129
-#: knetworkconf/kadddnsserverdlg.ui.h:42 knetworkconf/kaddknownhostdlg.ui.h:25
+#: knetworkconf/kadddnsserverdlg.ui.h:41 knetworkconf/kaddknownhostdlg.ui.h:24
 msgid "The format of the specified IP address is not valid."
 msgstr "The format of the specified IP address is not valid."
 
@@ -53,8 +53,8 @@ msgstr "The format of the specified IP address is not valid."
 #: knetworkconf/kadddevicecontainer.cpp:132
 #: knetworkconf/kadddevicecontainer.cpp:135
 #: knetworkconf/kadddevicecontainer.cpp:138
-#: knetworkconf/kadddnsserverdlg.ui.h:42 knetworkconf/kaddknownhostdlg.ui.h:25
-#: knetworkconf/knetworkconf.cpp:591
+#: knetworkconf/kadddnsserverdlg.ui.h:41 knetworkconf/kaddknownhostdlg.ui.h:24
+#: knetworkconf/knetworkconf.cpp:590
 msgid "Invalid IP Address"
 msgstr "Invalid IP Address"
 
@@ -70,63 +70,63 @@ msgstr "The format of the specified broadcast is not valid."
 msgid "The format of the specified Gateway is not valid."
 msgstr "The format of the specified Gateway is not valid."
 
-#: knetworkconf/kadddevicecontainer.cpp:174
+#: knetworkconf/kadddevicecontainer.cpp:167
 msgid "Basic Settings"
 msgstr "Basic Settings"
 
-#: knetworkconf/kadddevicecontainer.cpp:179
+#: knetworkconf/kadddevicecontainer.cpp:172
 msgid "Advanced Settings"
 msgstr "Advanced Settings"
 
-#: knetworkconf/kadddnsserverdlg.ui.h:54
+#: knetworkconf/kadddnsserverdlg.ui.h:53
 msgid "You have to type an alias first."
 msgstr "You have to type an alias first."
 
-#: knetworkconf/kadddnsserverdlg.ui.h:54
+#: knetworkconf/kadddnsserverdlg.ui.h:53
 msgid "Invalid Text"
 msgstr "Invalid Text"
 
-#: knetworkconf/kaddknownhostdlg.ui.h:29
+#: knetworkconf/kaddknownhostdlg.ui.h:28
 msgid "You must add at least one alias for the specified IP address."
 msgstr "You must add at least one alias for the specified IP address."
 
-#: knetworkconf/kaddknownhostdlg.ui.h:29
+#: knetworkconf/kaddknownhostdlg.ui.h:28
 msgid "Insufficient Aliases"
 msgstr "Insufficient Aliases"
 
-#: knetworkconf/kaddknownhostdlg.ui.h:63
+#: knetworkconf/kaddknownhostdlg.ui.h:52
 msgid "Edit Alias"
 msgstr "Edit Alias"
 
-#: knetworkconf/kaddknownhostdlg.ui.h:64 knetworkconf/kaddknownhostdlg.ui.h:92
+#: knetworkconf/kaddknownhostdlg.ui.h:53 knetworkconf/kaddknownhostdlg.ui.h:81
 msgid "Alias:"
 msgstr "Alias:"
 
-#: knetworkconf/kaddknownhostdlg.ui.h:91
+#: knetworkconf/kaddknownhostdlg.ui.h:80
 msgid "Add New Alias"
 msgstr "Add New Alias"
 
-#: knetworkconf/knetworkconf.cpp:67
+#: knetworkconf/knetworkconf.cpp:66
 msgid "Could not load network configuration information."
 msgstr "Could not load network configuration information."
 
-#: knetworkconf/knetworkconf.cpp:68
+#: knetworkconf/knetworkconf.cpp:67
 msgid "Error Reading Configuration File"
 msgstr "Error Reading Configuration File"
 
-#: knetworkconf/knetworkconf.cpp:119 knetworkconf/knetworkconf.cpp:757
+#: knetworkconf/knetworkconf.cpp:118 knetworkconf/knetworkconf.cpp:756
 msgid "Enabled"
 msgstr "Enabled"
 
-#: knetworkconf/knetworkconf.cpp:129 knetworkconf/knetworkconf.cpp:771
+#: knetworkconf/knetworkconf.cpp:128 knetworkconf/knetworkconf.cpp:770
 msgid "Disabled"
 msgstr "Disabled"
 
-#: knetworkconf/knetworkconf.cpp:138 knetworkconf/knetworkconf.cpp:305
+#: knetworkconf/knetworkconf.cpp:137 knetworkconf/knetworkconf.cpp:304
 msgid "Manual"
 msgstr "Manual"
 
-#: knetworkconf/knetworkconf.cpp:159
+#: knetworkconf/knetworkconf.cpp:158
 msgid ""
 "The new configuration has not been saved.\n"
 "Do you want to apply changes before quitting?"
@@ -134,41 +134,41 @@ msgstr ""
 "The new configuration has not been saved.\n"
 "Do you want to apply changes before quitting?"
 
-#: knetworkconf/knetworkconf.cpp:160 knetworkconf/knetworkconf.cpp:832
-#: knetworkconf/knetworkconf.cpp:851
+#: knetworkconf/knetworkconf.cpp:159 knetworkconf/knetworkconf.cpp:817
+#: knetworkconf/knetworkconf.cpp:836
 msgid "New Configuration Not Saved"
 msgstr "New Configuration Not Saved"
 
-#: knetworkconf/knetworkconf.cpp:207
+#: knetworkconf/knetworkconf.cpp:206
 msgid "Edit Server"
 msgstr "Edit Server"
 
-#: knetworkconf/knetworkconf.cpp:234
+#: knetworkconf/knetworkconf.cpp:233
 #, c-format
 msgid "Configure Device %1"
 msgstr "Configure Device %1"
 
-#: knetworkconf/knetworkconf.cpp:443
+#: knetworkconf/knetworkconf.cpp:442
 msgid "Could not open file '/etc/resolv.conf' for reading."
 msgstr "Could not open file '/etc/resolv.conf' for reading."
 
-#: knetworkconf/knetworkconf.cpp:444
+#: knetworkconf/knetworkconf.cpp:443
 msgid "Error Loading Config Files"
 msgstr "Error Loading Config Files"
 
-#: knetworkconf/knetworkconf.cpp:591
+#: knetworkconf/knetworkconf.cpp:590
 msgid "The default Gateway IP address is invalid."
 msgstr "The default Gateway IP address is invalid."
 
-#: knetworkconf/knetworkconf.cpp:682
+#: knetworkconf/knetworkconf.cpp:681
 msgid "Enabling interface <b>%1</b>"
 msgstr "Enabling interface <b>%1</b>"
 
-#: knetworkconf/knetworkconf.cpp:684
+#: knetworkconf/knetworkconf.cpp:683
 msgid "Disabling interface <b>%1</b>"
 msgstr "Disabling interface <b>%1</b>"
 
-#: knetworkconf/knetworkconf.cpp:718
+#: knetworkconf/knetworkconf.cpp:717
 msgid ""
 "Could not launch backend to change network device state. You will have to do "
 "it manually."
@@ -176,7 +176,7 @@ msgstr ""
 "Could not launch backend to change network device state. You will have to do "
 "it manually."
 
-#: knetworkconf/knetworkconf.cpp:739
+#: knetworkconf/knetworkconf.cpp:738
 msgid ""
 "There was an error changing the device's state. You will have to do it "
 "manually."
@@ -184,11 +184,11 @@ msgstr ""
 "There was an error changing the device's state. You will have to do it "
 "manually."
 
-#: knetworkconf/knetworkconf.cpp:740
+#: knetworkconf/knetworkconf.cpp:739
 msgid "Could Not Change Device State"
 msgstr "Could Not Change Device State"
 
-#: knetworkconf/knetworkconf.cpp:831 knetworkconf/knetworkconf.cpp:850
+#: knetworkconf/knetworkconf.cpp:816 knetworkconf/knetworkconf.cpp:835
 msgid ""
 "The new configuration has not been saved.\n"
 "Apply changes?"
@@ -196,32 +196,32 @@ msgstr ""
 "The new configuration has not been saved.\n"
 "Apply changes?"
 
-#: knetworkconf/kaddknownhostdlg.ui:16 knetworkconf/knetworkconf.cpp:868
+#: knetworkconf/kaddknownhostdlg.ui:16 knetworkconf/knetworkconf.cpp:853
 #, no-c-format
 msgid "Add New Static Host"
 msgstr "Add New Static Host"
 
-#: knetworkconf/knetworkconf.cpp:901
+#: knetworkconf/knetworkconf.cpp:886
 msgid "Edit Static Host"
 msgstr "Edit Static Host"
 
-#: knetworkconf/knetworkconf.cpp:1039
+#: knetworkconf/knetworkconf.cpp:1024
 msgid "Could not load the selected Network Profile."
 msgstr "Could not load the selected Network Profile."
 
-#: knetworkconf/knetworkconf.cpp:1040
+#: knetworkconf/knetworkconf.cpp:1025
 msgid "Error Reading Profile"
 msgstr "Error Reading Profile"
 
-#: knetworkconf/knetworkconf.cpp:1063
+#: knetworkconf/knetworkconf.cpp:1048
 msgid "Create New Network Profile"
 msgstr "Create New Network Profile"
 
-#: knetworkconf/knetworkconf.cpp:1064
+#: knetworkconf/knetworkconf.cpp:1049
 msgid "Name of new profile:"
 msgstr "Name of new profile:"
 
-#: knetworkconf/knetworkconf.cpp:1093
+#: knetworkconf/knetworkconf.cpp:1078
 msgid "There is already another profile with that name."
 msgstr "There is already another profile with that name."
 
@@ -954,7 +954,7 @@ msgstr "&Create New..."
 msgid "&Delete Selected"
 msgstr "&Delete Selected"
 
-#: knetworkconf/kreloadnetworkdlg.ui:111
+#: knetworkconf/kreloadnetworkdlg.ui:108
 #, no-c-format
 msgid ""
 "Please wait while the network is reloaded so\n"
diff --git a/tde-i18n-en_GB/messages/tdeadmin/kpackage.po b/tde-i18n-en_GB/messages/tdeadmin/kpackage.po
index 4e9bf35cd8b..a1eded23ec1 100644
--- a/tde-i18n-en_GB/messages/tdeadmin/kpackage.po
+++ b/tde-i18n-en_GB/messages/tdeadmin/kpackage.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpackage\n"
-"POT-Creation-Date: 2020-05-11 04:10+0200\n"
+"POT-Creation-Date: 2023-06-09 18:17+0000\n"
 "PO-Revision-Date: 2006-11-24 00:36+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
@@ -546,12 +546,12 @@ msgstr "Uninstall Marked"
 msgid "Install Marked"
 msgstr "Install Marked"
 
-#: managementWidget.cpp:193 pkgOptions.cpp:361 pkgOptions.cpp:363
+#: managementWidget.cpp:193 pkgOptions.cpp:359 pkgOptions.cpp:361
 msgid "Uninstall"
 msgstr "Uninstall"
 
-#: managementWidget.cpp:197 managementWidget.cpp:268 pkgOptions.cpp:346
-#: pkgOptions.cpp:348
+#: managementWidget.cpp:197 managementWidget.cpp:268 pkgOptions.cpp:344
+#: pkgOptions.cpp:346
 msgid "Install"
 msgstr "Install"
 
@@ -856,15 +856,15 @@ msgstr "Cannot read folder %1"
 msgid "Verifying"
 msgstr "Verifying"
 
-#: pkgOptions.cpp:98
+#: pkgOptions.cpp:96
 msgid "Keep this window"
 msgstr "Keep this window"
 
-#: pkgOptions.cpp:117
+#: pkgOptions.cpp:115
 msgid "PACKAGES"
 msgstr "PACKAGES"
 
-#: pkgOptions.cpp:205
+#: pkgOptions.cpp:203
 msgid ""
 "_n: %1: 1 %2 Package\n"
 "%1: %n %2 Packages"
@@ -872,20 +872,20 @@ msgstr ""
 "%1: 1 %2 Package\n"
 "%1: %n %2 Packages"
 
-#: pkgOptions.cpp:271
+#: pkgOptions.cpp:269
 msgid "Done"
 msgstr "Done"
 
-#: procbuf.cpp:121
+#: procbuf.cpp:119
 msgid "Kprocess Failure"
 msgstr "Kprocess Failure"
 
-#: procbuf.cpp:139
+#: procbuf.cpp:137
 #, c-format
 msgid "Timeout: %1"
 msgstr "Timeout: %1"
 
-#: procbuf.cpp:145
+#: procbuf.cpp:143
 #, c-format
 msgid "Kprocess error:%1"
 msgstr "Kprocess error:%1"