Merge translation files from master branch.

1 files changed, 27 insertions, 14 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmsmserver.po b/tde-i18n-zh_CN/messages/tdebase/kcmsmserver.po
index 58cd5b53d66..a7214fd5bf2 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmsmserver.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmsmserver.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmsmserer\n"
-"POT-Creation-Date: 2024-03-03 18:16+0000\n"
+"POT-Creation-Date: 2024-03-25 18:17+0000\n"
 "PO-Revision-Date: 2004-01-05 00:34+0800\n"
 "Last-Translator: Wang Hui <wanghuilux@yeah.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -109,12 +109,25 @@ msgid ""
 "Check this option if you want to see a dialog box showing the logout status."
 msgstr "如果您想会话管理器显示注销确认窗口，请选用此选项。"
 
-#: smserverconfigdlg.ui:114
+#: smserverconfigdlg.ui:112
+#, no-c-format
+msgid "Use &alternative shutdown dialog layout"
+msgstr ""
+
+#: smserverconfigdlg.ui:115
+#, no-c-format
+msgid ""
+"Check this option if you want to use an alternative shutdown dialog, where "
+"buttons are arranged in rows rathen then columns. This layout is popular in "
+"Ubuntu and therefore it is also known as 'Ubuntu style' shutdown dialog."
+msgstr ""
+
+#: smserverconfigdlg.ui:125
 #, no-c-format
 msgid "On Login"
 msgstr "登录时"
 
-#: smserverconfigdlg.ui:117
+#: smserverconfigdlg.ui:128
 #, no-c-format
 msgid ""
 "<ul>\n"
@@ -135,59 +148,59 @@ msgstr ""
 "<li><b>启动空会话：</b>什么也不保存。下次启动时将会出现空桌面。</li>\n"
 "</ul>"
 
-#: smserverconfigdlg.ui:132
+#: smserverconfigdlg.ui:143
 #, no-c-format
 msgid "Restore &previous session"
 msgstr "恢复上一次会话(&P)"
 
-#: smserverconfigdlg.ui:140
+#: smserverconfigdlg.ui:151
 #, no-c-format
 msgid "Restore &manually saved session"
 msgstr "恢复手动保存的会话(&M)"
 
-#: smserverconfigdlg.ui:148
+#: smserverconfigdlg.ui:159
 #, no-c-format
 msgid "Start with an empty &session"
 msgstr "以空会话启动(&S)"
 
-#: smserverconfigdlg.ui:158
+#: smserverconfigdlg.ui:169
 #, no-c-format
 msgid "Default Shutdown Option"
 msgstr "默认关机选项"
 
-#: smserverconfigdlg.ui:161
+#: smserverconfigdlg.ui:172
 #, no-c-format
 msgid ""
 "Here you can choose what should happen by default when you log out. This "
 "only has meaning, if you logged in through TDM."
 msgstr "在此你可以选择退出时的默认行为。这仅在通过TDM退出时有意义。"
 
-#: smserverconfigdlg.ui:172
+#: smserverconfigdlg.ui:183
 #, no-c-format
 msgid "&End current session"
 msgstr "结束当前会话(&E)"
 
-#: smserverconfigdlg.ui:180
+#: smserverconfigdlg.ui:191
 #, no-c-format
 msgid "&Turn off computer"
 msgstr "关闭计算机(&T)"
 
-#: smserverconfigdlg.ui:188
+#: smserverconfigdlg.ui:199
 #, no-c-format
 msgid "&Restart computer"
 msgstr "重启计算机(&R)"
 
-#: smserverconfigdlg.ui:198
+#: smserverconfigdlg.ui:209
 #, no-c-format
 msgid "Advanced"
 msgstr "高级"
 
-#: smserverconfigdlg.ui:209
+#: smserverconfigdlg.ui:220
 #, no-c-format
 msgid "Applications to be e&xcluded from sessions:"
 msgstr "要从会话中排除的应用程序(&X)："
 
-#: smserverconfigdlg.ui:220
+#: smserverconfigdlg.ui:231
 #, no-c-format
 msgid ""
 "Here you can enter a comma-separated list of applications that should not be "