Merge translation files from master branch.

1 files changed, 61 insertions, 78 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/twin.po b/tde-i18n-zh_CN/messages/tdebase/twin.po
index d41d4a45b15..669639a838b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/twin.po
+++ b/tde-i18n-zh_CN/messages/tdebase/twin.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2023-08-31 20:13+0000\n"
+"POT-Creation-Date: 2023-09-12 18:12+0000\n"
 "PO-Revision-Date: 2005-08-21 17:21+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -38,20 +38,20 @@ msgstr "窗口“%1”请求注意。"
 msgid "Suspended"
 msgstr ""
 
-#: killer/killer.cpp:49 main.cpp:314 resumer/resumer.cpp:48
+#: killer/killer.cpp:50 main.cpp:315 resumer/resumer.cpp:49
 msgid "TWin"
 msgstr ""
 
-#: killer/killer.cpp:50 resumer/resumer.cpp:49
+#: killer/killer.cpp:51 resumer/resumer.cpp:50
 #, fuzzy
 msgid "TWin helper utility"
 msgstr "KWin 助手工具"
 
-#: killer/killer.cpp:67 resumer/resumer.cpp:64
+#: killer/killer.cpp:68 resumer/resumer.cpp:65
 msgid "This helper utility is not supposed to be called directly."
 msgstr "这一助手工具不应直接调用。"
 
-#: killer/killer.cpp:71
+#: killer/killer.cpp:72
 msgid ""
 "<qt>Window with title \"<b>%2</b>\" is not responding. This window belongs "
 "to application <b>%1</b> (PID=%3, hostname=%4).<p>Do you wish to terminate "
@@ -61,79 +61,14 @@ msgstr ""
 "%4)。<p>您是否想要终止此应用程序？(此应用程序中所有未保存的数据都将丢失。)</"
 "qt>"
 
-#: killer/killer.cpp:76
+#: killer/killer.cpp:77
 msgid "Terminate"
 msgstr "中止"
 
-#: killer/killer.cpp:76
+#: killer/killer.cpp:77
 msgid "Keep Running"
 msgstr "保持运行"
 
-#: lib/kcommondecoration.cpp:270
-msgid ""
-"_: %1 is the name of window decoration style\n"
-"<center><b>%1 preview</b></center>"
-msgstr "<center><b>%1 预览</b></center>"
-
-#: lib/kcommondecoration.cpp:351
-msgid "Menu"
-msgstr "菜单"
-
-#: lib/kcommondecoration.cpp:366 lib/kcommondecoration.cpp:554
-msgid "Not on all desktops"
-msgstr "不在全部桌面"
-
-#: lib/kcommondecoration.cpp:366 lib/kcommondecoration.cpp:555
-msgid "On all desktops"
-msgstr "全部桌面"
-
-#: lib/kcommondecoration.cpp:389
-msgid "Minimize"
-msgstr "最小化"
-
-#: lib/kcommondecoration.cpp:401 lib/kcommondecoration.cpp:541
-msgid "Maximize"
-msgstr "最大化"
-
-#: lib/kcommondecoration.cpp:424 lib/kcommondecoration.cpp:597
-msgid "Do not keep above others"
-msgstr "不常居顶端"
-
-#: lib/kcommondecoration.cpp:424 lib/kcommondecoration.cpp:597
-#: lib/kcommondecoration.cpp:621
-msgid "Keep above others"
-msgstr "常居顶端"
-
-#: lib/kcommondecoration.cpp:437 lib/kcommondecoration.cpp:614
-msgid "Do not keep below others"
-msgstr "不常居底端"
-
-#: lib/kcommondecoration.cpp:437 lib/kcommondecoration.cpp:604
-#: lib/kcommondecoration.cpp:614
-msgid "Keep below others"
-msgstr "常居底端"
-
-#: lib/kcommondecoration.cpp:450 lib/kcommondecoration.cpp:566
-msgid "Unshade"
-msgstr "展开"
-
-#: lib/kcommondecoration.cpp:450 lib/kcommondecoration.cpp:567
-msgid "Shade"
-msgstr "卷起"
-
-#: lib/kdecoration_plugins_p.cpp:120
-msgid "No window decoration plugin library was found."
-msgstr "没有找到窗口装饰插件库。"
-
-#: lib/kdecoration_plugins_p.cpp:145
-msgid "The default decoration plugin is corrupt and could not be loaded."
-msgstr "默认的装饰插件损坏，无法被载入。"
-
-#: lib/kdecoration_plugins_p.cpp:159
-#, fuzzy
-msgid "The library %1 is not a TWin plugin."
-msgstr "库 %1 不是 KWin 插件。"
-
 #: main.cpp:63
 #, fuzzy
 msgid ""
@@ -171,12 +106,12 @@ msgstr "替换已经运行的 ICCCM2.0 兼容的窗口管理器"
 msgid "Do not start composition manager"
 msgstr ""
 
-#: main.cpp:316
+#: main.cpp:317
 #, fuzzy
 msgid "(c) 1999-2005, The KDE Developers"
 msgstr "(C) 1999-2005，TDE 开发者"
 
-#: main.cpp:320
+#: main.cpp:321
 msgid "Maintainer"
 msgstr "维护者"
 
@@ -194,22 +129,22 @@ msgstr ""
 "\n"
 "KWin 现在退出..."
 
-#: resumer/resumer.cpp:68
+#: resumer/resumer.cpp:69
 msgid ""
 "<qt>The application \"<b>%1</b>\" has been suspended.<p>Do you wish to "
 "resume this application?</qt>"
 msgstr ""
 
-#: resumer/resumer.cpp:71
+#: resumer/resumer.cpp:72
 #, fuzzy
 msgid "Resume suspended application?"
 msgstr "特殊应用程序设置(&S)..."
 
-#: resumer/resumer.cpp:71
+#: resumer/resumer.cpp:72
 msgid "Resume"
 msgstr ""
 
-#: resumer/resumer.cpp:71
+#: resumer/resumer.cpp:72
 msgid "Keep Suspended"
 msgstr ""
 
@@ -870,6 +805,54 @@ msgstr ""
 "<qt><b>XFixes 扩展未找到</b><br>您<i>必须</i>使用 XOrg &ge; 6.8 获得透明效果"
 "及阴影。</qt>"
 
+#~ msgid ""
+#~ "_: %1 is the name of window decoration style\n"
+#~ "<center><b>%1 preview</b></center>"
+#~ msgstr "<center><b>%1 预览</b></center>"
+
+#~ msgid "Menu"
+#~ msgstr "菜单"
+
+#~ msgid "Not on all desktops"
+#~ msgstr "不在全部桌面"
+
+#~ msgid "On all desktops"
+#~ msgstr "全部桌面"
+
+#~ msgid "Minimize"
+#~ msgstr "最小化"
+
+#~ msgid "Maximize"
+#~ msgstr "最大化"
+
+#~ msgid "Do not keep above others"
+#~ msgstr "不常居顶端"
+
+#~ msgid "Keep above others"
+#~ msgstr "常居顶端"
+
+#~ msgid "Do not keep below others"
+#~ msgstr "不常居底端"
+
+#~ msgid "Keep below others"
+#~ msgstr "常居底端"
+
+#~ msgid "Unshade"
+#~ msgstr "展开"
+
+#~ msgid "Shade"
+#~ msgstr "卷起"
+
+#~ msgid "No window decoration plugin library was found."
+#~ msgstr "没有找到窗口装饰插件库。"
+
+#~ msgid "The default decoration plugin is corrupt and could not be loaded."
+#~ msgstr "默认的装饰插件损坏，无法被载入。"
+
+#, fuzzy
+#~ msgid "The library %1 is not a TWin plugin."
+#~ msgstr "库 %1 不是 KWin 插件。"
+
 #~ msgid "KWin"
 #~ msgstr "KWin"