Merge translation files from master branch.

2 files changed, 51 insertions, 51 deletions

diff --git a/tde-i18n-zh_CN/messages/tdeadmin/knetworkconf.po b/tde-i18n-zh_CN/messages/tdeadmin/knetworkconf.po
index 95cd46d8eeb..7e6c0962fc1 100644
--- a/tde-i18n-zh_CN/messages/tdeadmin/knetworkconf.po
+++ b/tde-i18n-zh_CN/messages/tdeadmin/knetworkconf.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: knetworkconf\n"
 "Report-Msgid-Bugs-To: \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-05-04 19:05+0800\n"
 "Last-Translator: Zhang Le <robert@thizgroup.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -46,7 +46,7 @@ msgid "Forget changes"
 msgstr "放弃更改"
 
 #: 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 "指定 IP 地址的格式无效。"
 
@@ -54,8 +54,8 @@ msgstr "指定 IP 地址的格式无效。"
 #: 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 "无效的 IP 地址"
 
@@ -71,63 +71,63 @@ msgstr "指定的广播地址的格式无效。"
 msgid "The format of the specified Gateway is not valid."
 msgstr "指定的网关的格式无效。"
 
-#: knetworkconf/kadddevicecontainer.cpp:174
+#: knetworkconf/kadddevicecontainer.cpp:167
 msgid "Basic Settings"
 msgstr "基此设置"
 
-#: knetworkconf/kadddevicecontainer.cpp:179
+#: knetworkconf/kadddevicecontainer.cpp:172
 msgid "Advanced Settings"
 msgstr "高级设置"
 
-#: knetworkconf/kadddnsserverdlg.ui.h:54
+#: knetworkconf/kadddnsserverdlg.ui.h:53
 msgid "You have to type an alias first."
 msgstr "您必须先输入一个别名。"
 
-#: knetworkconf/kadddnsserverdlg.ui.h:54
+#: knetworkconf/kadddnsserverdlg.ui.h:53
 msgid "Invalid Text"
 msgstr "无效文字"
 
-#: knetworkconf/kaddknownhostdlg.ui.h:29
+#: knetworkconf/kaddknownhostdlg.ui.h:28
 msgid "You must add at least one alias for the specified IP address."
 msgstr "您必须为指定的 IP 地址至少添加一个别名。"
 
-#: knetworkconf/kaddknownhostdlg.ui.h:29
+#: knetworkconf/kaddknownhostdlg.ui.h:28
 msgid "Insufficient Aliases"
 msgstr "别名不足"
 
-#: knetworkconf/kaddknownhostdlg.ui.h:63
+#: knetworkconf/kaddknownhostdlg.ui.h:52
 msgid "Edit Alias"
 msgstr "编辑别名"
 
-#: knetworkconf/kaddknownhostdlg.ui.h:64 knetworkconf/kaddknownhostdlg.ui.h:92
+#: knetworkconf/kaddknownhostdlg.ui.h:53 knetworkconf/kaddknownhostdlg.ui.h:81
 msgid "Alias:"
 msgstr "别名："
 
-#: knetworkconf/kaddknownhostdlg.ui.h:91
+#: knetworkconf/kaddknownhostdlg.ui.h:80
 msgid "Add New Alias"
 msgstr "添加新别名"
 
-#: knetworkconf/knetworkconf.cpp:67
+#: knetworkconf/knetworkconf.cpp:66
 msgid "Could not load network configuration information."
 msgstr "无法装入网络配置信息。"
 
-#: knetworkconf/knetworkconf.cpp:68
+#: knetworkconf/knetworkconf.cpp:67
 msgid "Error Reading Configuration File"
 msgstr "读取配置文件时出错"
 
-#: knetworkconf/knetworkconf.cpp:119 knetworkconf/knetworkconf.cpp:757
+#: knetworkconf/knetworkconf.cpp:118 knetworkconf/knetworkconf.cpp:756
 msgid "Enabled"
 msgstr "已启用"
 
-#: knetworkconf/knetworkconf.cpp:129 knetworkconf/knetworkconf.cpp:771
+#: knetworkconf/knetworkconf.cpp:128 knetworkconf/knetworkconf.cpp:770
 msgid "Disabled"
 msgstr "已禁用"
 
-#: knetworkconf/knetworkconf.cpp:138 knetworkconf/knetworkconf.cpp:305
+#: knetworkconf/knetworkconf.cpp:137 knetworkconf/knetworkconf.cpp:304
 msgid "Manual"
 msgstr "手动"
 
-#: 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?"
@@ -135,57 +135,57 @@ msgstr ""
 "新配置尚未保存。\n"
 "您想在退出前应用更改吗？"
 
-#: 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 "新配置尚未保存"
 
-#: knetworkconf/knetworkconf.cpp:207
+#: knetworkconf/knetworkconf.cpp:206
 msgid "Edit Server"
 msgstr "编辑服务器"
 
-#: knetworkconf/knetworkconf.cpp:234
+#: knetworkconf/knetworkconf.cpp:233
 #, c-format
 msgid "Configure Device %1"
 msgstr "配置设备 %1"
 
-#: knetworkconf/knetworkconf.cpp:443
+#: knetworkconf/knetworkconf.cpp:442
 msgid "Could not open file '/etc/resolv.conf' for reading."
 msgstr "无法打开文件“/etc/resolv.conf”进行读取。"
 
-#: knetworkconf/knetworkconf.cpp:444
+#: knetworkconf/knetworkconf.cpp:443
 msgid "Error Loading Config Files"
 msgstr "装入配置文件时出错"
 
-#: knetworkconf/knetworkconf.cpp:591
+#: knetworkconf/knetworkconf.cpp:590
 msgid "The default Gateway IP address is invalid."
 msgstr "默认网关的 IP 地址无效。"
 
-#: knetworkconf/knetworkconf.cpp:682
+#: knetworkconf/knetworkconf.cpp:681
 msgid "Enabling interface <b>%1</b>"
 msgstr "启用接口 <b>%1</b>"
 
-#: knetworkconf/knetworkconf.cpp:684
+#: knetworkconf/knetworkconf.cpp:683
 msgid "Disabling interface <b>%1</b>"
 msgstr "禁用接口 <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."
 msgstr "无法启动后端来更改网络设备状态。您需要手动完成。"
 
-#: 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."
 msgstr "更改设备状态时出错。您需要手动完成。"
 
-#: knetworkconf/knetworkconf.cpp:740
+#: knetworkconf/knetworkconf.cpp:739
 msgid "Could Not Change Device State"
 msgstr "无法更改设备状态"
 
-#: 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?"
@@ -193,32 +193,32 @@ msgstr ""
 "新配置尚未保存。\n"
 "应用更改吗？"
 
-#: 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 "添加新静态主机"
 
-#: knetworkconf/knetworkconf.cpp:901
+#: knetworkconf/knetworkconf.cpp:886
 msgid "Edit Static Host"
 msgstr "编辑静态主机"
 
-#: knetworkconf/knetworkconf.cpp:1039
+#: knetworkconf/knetworkconf.cpp:1024
 msgid "Could not load the selected Network Profile."
 msgstr "无法装入选中的网络配置文件。"
 
-#: knetworkconf/knetworkconf.cpp:1040
+#: knetworkconf/knetworkconf.cpp:1025
 msgid "Error Reading Profile"
 msgstr "读取配置文件时出错"
 
-#: knetworkconf/knetworkconf.cpp:1063
+#: knetworkconf/knetworkconf.cpp:1048
 msgid "Create New Network Profile"
 msgstr "创建新网络配置文件"
 
-#: knetworkconf/knetworkconf.cpp:1064
+#: knetworkconf/knetworkconf.cpp:1049
 msgid "Name of new profile:"
 msgstr "新配置文件名称："
 
-#: knetworkconf/knetworkconf.cpp:1093
+#: knetworkconf/knetworkconf.cpp:1078
 msgid "There is already another profile with that name."
 msgstr "已经存在同名的配置文件。"
 
@@ -926,7 +926,7 @@ msgstr "创建(&C)..."
 msgid "&Delete Selected"
 msgstr "删除选中(&D)"
 
-#: 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-zh_CN/messages/tdeadmin/kpackage.po b/tde-i18n-zh_CN/messages/tdeadmin/kpackage.po
index 99dd9f0b157..df43a68111d 100644
--- a/tde-i18n-zh_CN/messages/tdeadmin/kpackage.po
+++ b/tde-i18n-zh_CN/messages/tdeadmin/kpackage.po
@@ -5,7 +5,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: 2005-10-05 22:36+0800\n"
 "Last-Translator: Wang Jian <lark@linux.ustc.edu.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -539,12 +539,12 @@ msgstr "卸载标记过的"
 msgid "Install Marked"
 msgstr "安装标记过的"
 
-#: managementWidget.cpp:193 pkgOptions.cpp:361 pkgOptions.cpp:363
+#: managementWidget.cpp:193 pkgOptions.cpp:359 pkgOptions.cpp:361
 msgid "Uninstall"
 msgstr "卸载"
 
-#: 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 "安装"
 
@@ -849,34 +849,34 @@ msgstr "无法读取文件夹 %1"
 msgid "Verifying"
 msgstr "正在检验"
 
-#: pkgOptions.cpp:98
+#: pkgOptions.cpp:96
 msgid "Keep this window"
 msgstr "保留本窗口"
 
-#: pkgOptions.cpp:117
+#: pkgOptions.cpp:115
 msgid "PACKAGES"
 msgstr "软件包"
 
-#: pkgOptions.cpp:205
+#: pkgOptions.cpp:203
 msgid ""
 "_n: %1: 1 %2 Package\n"
 "%1: %n %2 Packages"
 msgstr "%1：%n 个 %2 软件包"
 
-#: pkgOptions.cpp:271
+#: pkgOptions.cpp:269
 msgid "Done"
 msgstr "完成"
 
-#: procbuf.cpp:121
+#: procbuf.cpp:119
 msgid "Kprocess Failure"
 msgstr "Kprocess 失败"
 
-#: procbuf.cpp:139
+#: procbuf.cpp:137
 #, c-format
 msgid "Timeout: %1"
 msgstr "超时：%1"
 
-#: procbuf.cpp:145
+#: procbuf.cpp:143
 #, c-format
 msgid "Kprocess error:%1"
 msgstr "Kprocess 错误：%1"