Merge translation files from master branch.

4 files changed, 114 insertions, 73 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkeys.po b/tde-i18n-zh_CN/messages/tdebase/kcmkeys.po
index 9e98cfbc4c4..1ffb3078292 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkeys.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkeys.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkeys\n"
-"POT-Creation-Date: 2023-07-13 20:16+0000\n"
+"POT-Creation-Date: 2024-08-01 20:11+0000\n"
 "PO-Revision-Date: 2004-06-22 12:41+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -121,7 +121,7 @@ msgstr ""
 msgid "&Save Scheme..."
 msgstr "保存按键方案"
 
-#: keyconfig.cpp:128 shortcuts.cpp:170
+#: keyconfig.cpp:128 shortcuts.cpp:171
 msgid ""
 "Click here to add a new key bindings scheme. You will be prompted for a name."
 msgstr "单击以添加新的按键绑定方案。您会被提示输入名字。"
@@ -150,7 +150,7 @@ msgid ""
 "modifier configuration defaults, then this option should be unchecked."
 msgstr ""
 
-#: main.cpp:54
+#: main.cpp:55
 msgid ""
 "<h1>Keyboard Shortcuts</h1> Using shortcuts you can configure certain "
 "actions to be triggered when you press a key or a combination of keys, e.g. "
@@ -169,15 +169,15 @@ msgstr ""
 "大化窗口。在“应用程序快捷键”标签中，您将发现应用程序典型使用的关联，比如复制"
 "和粘贴。"
 
-#: main.cpp:77
+#: main.cpp:78
 msgid "Shortcut Schemes"
 msgstr "快捷键方案"
 
-#: main.cpp:81
+#: main.cpp:82
 msgid "Command Shortcuts"
 msgstr "命令快捷键"
 
-#: main.cpp:86
+#: main.cpp:87
 msgid "Modifier Keys"
 msgstr "修饰键"
 
@@ -199,7 +199,7 @@ msgid ""
 "Ctrl"
 msgstr "Ctrl"
 
-#: modifiers.cpp:195 modifiers.cpp:291 shortcuts.cpp:338
+#: modifiers.cpp:195 modifiers.cpp:291 shortcuts.cpp:339
 msgid "Win"
 msgstr "Win"
 
@@ -256,7 +256,7 @@ msgid ""
 "or 'Meta' keys properly configured as modifier keys."
 msgstr "假如您的X键盘布局以“Super”或者“Meta”键作为修饰键按键，您只能激活此项。"
 
-#: shortcuts.cpp:96
+#: shortcuts.cpp:97
 msgid ""
 "<h1>Key Bindings</h1> Using key bindings you can configure certain actions "
 "to be triggered when you press a key or a combination of keys, e.g. Ctrl+C "
@@ -275,7 +275,7 @@ msgstr ""
 "大化窗口。在“应用程序快捷键”里，您将找到在应用程序里使用的典型绑定，比如“复"
 "制”和“粘贴”。"
 
-#: shortcuts.cpp:157
+#: shortcuts.cpp:158
 msgid ""
 "Click here to remove the selected key bindings scheme. You cannot remove the "
 "standard system-wide schemes 'Current scheme' and 'TDE default'."
@@ -283,60 +283,60 @@ msgstr ""
 "单击此处删除选中的按键绑定方案。您无法删除标准的系统级方案“当前方案”和“TDE 默"
 "认方案”。"
 
-#: shortcuts.cpp:163
+#: shortcuts.cpp:164
 msgid "New scheme"
 msgstr "新方案"
 
-#: shortcuts.cpp:168
+#: shortcuts.cpp:169
 msgid "&Save..."
 msgstr "保存(&S)..."
 
-#: shortcuts.cpp:195
+#: shortcuts.cpp:196
 msgid "Use Win key as modifier (uncheck to bind Win key to Menu)"
 msgstr ""
 
-#: shortcuts.cpp:201
+#: shortcuts.cpp:202
 msgid "&Global Shortcuts"
 msgstr "全局快捷键(&G)"
 
-#: shortcuts.cpp:206
+#: shortcuts.cpp:207
 msgid "Shortcut Se&quences"
 msgstr "快捷键序列(&Q)"
 
-#: shortcuts.cpp:211
+#: shortcuts.cpp:212
 msgid "App&lication Shortcuts"
 msgstr "应用程序快捷键(&L)"
 
-#: shortcuts.cpp:272
+#: shortcuts.cpp:273
 msgid "User-Defined Scheme"
 msgstr "用户定义方案"
 
-#: shortcuts.cpp:273
+#: shortcuts.cpp:274
 msgid "Current Scheme"
 msgstr "当前方案"
 
-#: shortcuts.cpp:316
+#: shortcuts.cpp:317
 msgid ""
 "Your current changes will be lost if you load another scheme before saving "
 "this one."
 msgstr "在保存之前您装载另外一个方案的话，您当前的改变 将丢失。"
 
-#: shortcuts.cpp:336
+#: shortcuts.cpp:337
 msgid ""
 "This scheme requires the \"%1\" modifier key, which is not available on your "
 "keyboard layout. Do you wish to view it anyway?"
 msgstr ""
 "此方案需要修饰键“%1”，但该键在您的键盘布局上是没有用的。您确实想查看它吗？"
 
-#: shortcuts.cpp:365 shortcuts.cpp:398
+#: shortcuts.cpp:366 shortcuts.cpp:399
 msgid "Save Key Scheme"
 msgstr "保存按键方案"
 
-#: shortcuts.cpp:366
+#: shortcuts.cpp:367
 msgid "Enter a name for the key scheme:"
 msgstr "为按键方案输入一个名称："
 
-#: shortcuts.cpp:396
+#: shortcuts.cpp:397
 msgid ""
 "A key scheme with the name '%1' already exists;\n"
 "do you want to overwrite it?\n"
@@ -344,7 +344,7 @@ msgstr ""
 "名为“%1”的键盘方案已经存在；\n"
 "您要覆盖它吗？\n"
 
-#: shortcuts.cpp:399
+#: shortcuts.cpp:400
 msgid "Overwrite"
 msgstr "覆盖"
 
@@ -905,6 +905,23 @@ msgstr "不加确认关机"
 msgid "Reboot without Confirmation"
 msgstr "不加确认重新启动"
 
+#: ../../kdesktop/kdesktopbindings.cpp:62
+msgid "Freeze"
+msgstr ""
+
+#: ../../kdesktop/kdesktopbindings.cpp:65
+msgid "Suspend"
+msgstr ""
+
+#: ../../kdesktop/kdesktopbindings.cpp:68
+#, fuzzy
+msgid "Hibernate"
+msgstr "备选"
+
+#: ../../kdesktop/kdesktopbindings.cpp:71
+msgid "Hybrid Suspend"
+msgstr ""
+
 #: ../../klipper/klipperbindings.cpp:28
 msgid "Clipboard"
 msgstr "剪贴板"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kdesktop.po b/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
index b65da3691e1..4efd398dd26 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2021-07-07 18:17+0000\n"
+"POT-Creation-Date: 2024-08-01 18:11+0000\n"
 "PO-Revision-Date: 2023-08-04 09:16+0000\n"
 "Last-Translator: Wantao Liu <vantao@aosc.io>\n"
 "Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
@@ -138,6 +138,22 @@ msgstr "关机时无需确认"
 msgid "Reboot without Confirmation"
 msgstr "重新启动时无需确认"
 
+#: kdesktopbindings.cpp:62
+msgid "Freeze"
+msgstr ""
+
+#: kdesktopbindings.cpp:65
+msgid "Suspend"
+msgstr ""
+
+#: kdesktopbindings.cpp:68
+msgid "Hibernate"
+msgstr ""
+
+#: kdesktopbindings.cpp:71
+msgid "Hybrid Suspend"
+msgstr ""
+
 #: kdiconview.cpp:443
 msgid "&Rename"
 msgstr "重命名(&R)"
diff --git a/tde-i18n-zh_CN/messages/tdebase/knetattach.po b/tde-i18n-zh_CN/messages/tdebase/knetattach.po
index 0113b868e2d..b745a39ab03 100644
--- a/tde-i18n-zh_CN/messages/tdebase/knetattach.po
+++ b/tde-i18n-zh_CN/messages/tdebase/knetattach.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knetattach\n"
-"POT-Creation-Date: 2020-05-11 04:02+0200\n"
+"POT-Creation-Date: 2024-08-01 20:11+0000\n"
 "PO-Revision-Date: 2005-02-12 17:15+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -25,7 +25,7 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: knetattach.ui.h:18 knetattach.ui.h:282
+#: knetattach.ui.h:18 knetattach.ui.h:289
 msgid "Save && C&onnect"
 msgstr "保存并连接(&O)"
 
@@ -64,11 +64,11 @@ msgstr ""
 "输入此 <i>Microsoft Windows 网络驱动器</i>的名称以及服务器地址、端口及要使用"
 "的文件夹路径，然后按<b>保存并连接</b>按钮。"
 
-#: knetattach.ui.h:161
+#: knetattach.ui.h:168
 msgid "Unable to connect to server.  Please check your settings and try again."
 msgstr "无法连接到服务器。请检查您的设置，然后再试一次。"
 
-#: knetattach.ui.h:284
+#: knetattach.ui.h:291
 msgid "C&onnect"
 msgstr "连接(&O)"
 
@@ -96,42 +96,47 @@ msgstr "添加网络文件夹"
 
 #: knetattach.ui:59
 #, no-c-format
-msgid "&Recent connection:"
-msgstr "最近的连接(&R)："
-
-#: knetattach.ui:67
-#, no-c-format
 msgid "&WebFolder (webdav)"
 msgstr "&Web 文件夹(webdav)"
 
-#: knetattach.ui:78
-#, no-c-format
-msgid "&Secure shell (ssh)"
-msgstr "安全 &Shell(ssh)"
-
-#: knetattach.ui:111
+#: knetattach.ui:70
 #, no-c-format
 msgid "FT&P"
 msgstr "FT&P"
 
-#: knetattach.ui:119
+#: knetattach.ui:78
 #, no-c-format
 msgid "&Microsoft® Windows® network drive"
 msgstr "&Microsoft(R) Windows(R) 网络驱动器"
 
-#: knetattach.ui:146
+#: knetattach.ui:86
+#, fuzzy, no-c-format
+msgid "&Secure shell (via SFTP)"
+msgstr "安全 &Shell(ssh)"
+
+#: knetattach.ui:97
+#, fuzzy, no-c-format
+msgid "&Secure shell (via FISH)"
+msgstr "安全 &Shell(ssh)"
+
+#: knetattach.ui:108
+#, no-c-format
+msgid "&Recent connection:"
+msgstr "最近的连接(&R)："
+
+#: knetattach.ui:157
 #, no-c-format
 msgid ""
 "Select the type of network folder you wish to connect to and press the Next "
 "button."
 msgstr "选择您想要连接的网络文件夹类型，然后按下一步按钮。"
 
-#: knetattach.ui:176
+#: knetattach.ui:187
 #, no-c-format
 msgid "Network Folder Information"
 msgstr "网络文件夹信息"
 
-#: knetattach.ui:187
+#: knetattach.ui:198
 #, no-c-format
 msgid ""
 "Enter a name for this <i>%1</i> as well as the server address, port and "
@@ -140,37 +145,40 @@ msgstr ""
 "输入此<i>%1</i>的名称以及服务器地址、端口及要使用的文件夹路径，然后按下一步按"
 "钮。"
 
-#: knetattach.ui:215
+#: knetattach.ui:226
 #, no-c-format
 msgid "&Name:"
 msgstr "名称(&N)："
 
-#: knetattach.ui:255
+#: knetattach.ui:266
 #, no-c-format
 msgid "&User:"
 msgstr "用户(&U)："
 
-#: knetattach.ui:266
+#: knetattach.ui:277
 #, no-c-format
 msgid "Se&rver:"
 msgstr "服务器(&R)："
 
-#: knetattach.ui:277
+#: knetattach.ui:288
 #, no-c-format
 msgid "&Port:"
 msgstr "端口(&P)："
 
-#: knetattach.ui:314
+#: knetattach.ui:325
 #, no-c-format
 msgid "&Folder:"
 msgstr "文件夹(&F)："
 
-#: knetattach.ui:342
+#: knetattach.ui:353
 #, no-c-format
 msgid "Cr&eate an icon for this remote folder"
 msgstr "为此远程文件夹创建图标(&E)"
 
-#: knetattach.ui:353
+#: knetattach.ui:364
 #, no-c-format
 msgid "&Use encryption"
 msgstr "使用加密(&U)"
+
+#~ msgid "&Secure shell (ssh)"
+#~ msgstr "安全 &Shell(ssh)"
diff --git a/tde-i18n-zh_CN/messages/tdebase/ksmserver.po b/tde-i18n-zh_CN/messages/tdebase/ksmserver.po
index 5f30f1fd6e2..3dbdf4a839a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ksmserver.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ksmserver.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksmserver\n"
-"POT-Creation-Date: 2022-02-13 18:16+0000\n"
+"POT-Creation-Date: 2024-08-01 18:11+0000\n"
 "PO-Revision-Date: 2004-02-09 11:06+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -64,93 +64,93 @@ msgstr "TDE 会话管理器"
 msgid "Maintainer"
 msgstr "维护者"
 
-#: shutdown.cpp:277
+#: shutdown.cpp:245
 msgid "Notifying applications of logout request..."
 msgstr ""
 
-#: shutdown.cpp:513 shutdown.cpp:544
+#: shutdown.cpp:543 shutdown.cpp:574
 msgid "Skip Notification (%1)"
 msgstr ""
 
-#: shutdown.cpp:515
+#: shutdown.cpp:545
 msgid "Notifying remaining applications of logout request (%1/%2)..."
 msgstr ""
 
-#: shutdown.cpp:518
+#: shutdown.cpp:548
 msgid "Notifying remaining applications of logout request (%1/%2, %3)..."
 msgstr ""
 
-#: shutdown.cpp:525
+#: shutdown.cpp:555
 msgid "Ignore and Resume Logout"
 msgstr ""
 
-#: shutdown.cpp:533
+#: shutdown.cpp:563
 msgid "An application is requesting attention, logout paused..."
 msgstr ""
 
-#: shutdown.cpp:536
+#: shutdown.cpp:566
 msgid "%3 is requesting attention, logout paused..."
 msgstr ""
 
-#: shutdown.cpp:546
+#: shutdown.cpp:576
 msgid "Notifying applications of logout request (%1/%2)..."
 msgstr ""
 
-#: shutdown.cpp:549
+#: shutdown.cpp:579
 msgid "Notifying applications of logout request (%1/%2, %3)..."
 msgstr ""
 
-#: shutdown.cpp:639
+#: shutdown.cpp:669
 msgid "Logout canceled by '%1'"
 msgstr "“%1”取消了注销"
 
-#: shutdown.cpp:645
+#: shutdown.cpp:675
 #, fuzzy
 msgid "Logout canceled by user"
 msgstr "“%1”取消了注销"
 
-#: shutdown.cpp:704
+#: shutdown.cpp:734
 msgid "Forcing interacting application termination"
 msgstr ""
 
-#: shutdown.cpp:754
+#: shutdown.cpp:784
 msgid "Notifying remaining applications of logout request..."
 msgstr ""
 
-#: shutdown.cpp:784
+#: shutdown.cpp:814
 msgid "Synchronizing remote folders"
 msgstr ""
 
-#: shutdown.cpp:790 shutdowndlg.cpp:1245
+#: shutdown.cpp:820 shutdowndlg.cpp:1245
 msgid "Saving your settings..."
 msgstr ""
 
-#: shutdown.cpp:840 shutdown.cpp:914
+#: shutdown.cpp:870 shutdown.cpp:944
 msgid "Closing applications (%1/%2)..."
 msgstr ""
 
-#: shutdown.cpp:843 shutdown.cpp:917
+#: shutdown.cpp:873 shutdown.cpp:947
 msgid "Closing applications (%1/%2, %3)..."
 msgstr ""
 
-#: shutdown.cpp:925
+#: shutdown.cpp:955
 msgid "Terminating services..."
 msgstr ""
 
-#: shutdowndlg.cpp:738
+#: shutdowndlg.cpp:739
 msgid "End Session for \"%1\""
 msgstr "结束“%1”的会话"
 
-#: shutdowndlg.cpp:763
+#: shutdowndlg.cpp:764
 msgid "Log out"
 msgstr ""
 
-#: shutdowndlg.cpp:765 shutdowndlg.cpp:794
+#: shutdowndlg.cpp:766 shutdowndlg.cpp:795
 msgid ""
 "<qt><p>Log out of the current session to login as a different user.</p></qt>"
 msgstr ""
 
-#: shutdowndlg.cpp:793
+#: shutdowndlg.cpp:794
 msgid "&Log out"
 msgstr ""