Merge translation files from master branch.

1 files changed, 22 insertions, 22 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/twin.po b/tde-i18n-zh_CN/messages/tdebase/twin.po
index 0ea99ac83c4..a921371e963 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-01-23 23:17+0100\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,7 +38,7 @@ msgstr "窗口“%1”请求注意。"
 msgid "Suspended"
 msgstr ""
 
-#: killer/killer.cpp:49 main.cpp:318 resumer/resumer.cpp:48
+#: killer/killer.cpp:49 main.cpp:319 resumer/resumer.cpp:48
 msgid "TWin"
 msgstr ""
 
@@ -134,19 +134,19 @@ msgstr "默认的装饰插件损坏，无法被载入。"
 msgid "The library %1 is not a TWin plugin."
 msgstr "库 %1 不是 KWin 插件。"
 
-#: main.cpp:63
+#: main.cpp:64
 #, fuzzy
 msgid ""
 "[twin] it looks like there's already a window manager running. twin not "
 "started.\n"
 msgstr "twin：看起来已经有一个窗口管理器在运行。twin 没有起动。\n"
 
-#: main.cpp:78
+#: main.cpp:79
 #, fuzzy
 msgid "[twin] failure during initialization; aborting"
 msgstr "twin：在初始化时失败；中止"
 
-#: main.cpp:137 main.cpp:143 main.cpp:149
+#: main.cpp:138 main.cpp:144 main.cpp:150
 #, fuzzy
 msgid ""
 "[twin] unable to claim manager selection, another wm running? (try using --"
@@ -155,28 +155,28 @@ msgstr ""
 "twin：无法声明窗口管理器选择，是否正在运行另外一种窗口管理器？(试着使用 --"
 "replace)\n"
 
-#: main.cpp:236
+#: main.cpp:237
 msgid "TDE window manager"
 msgstr "TDE 窗口管理器"
 
-#: main.cpp:240
+#: main.cpp:241
 msgid "Disable configuration options"
 msgstr "禁用配置选项"
 
-#: main.cpp:241
+#: main.cpp:242
 msgid "Replace already-running ICCCM2.0-compliant window manager"
 msgstr "替换已经运行的 ICCCM2.0 兼容的窗口管理器"
 
-#: main.cpp:242
+#: main.cpp:243
 msgid "Do not start composition manager"
 msgstr ""
 
-#: main.cpp:320
+#: main.cpp:321
 #, fuzzy
 msgid "(c) 1999-2005, The KDE Developers"
 msgstr "(C) 1999-2005，TDE 开发者"
 
-#: main.cpp:324
+#: main.cpp:325
 msgid "Maintainer"
 msgstr "维护者"
 
@@ -213,7 +213,7 @@ msgstr ""
 msgid "Keep Suspended"
 msgstr ""
 
-#: tabbox.cpp:52
+#: tabbox.cpp:53
 msgid "*** No Windows ***"
 msgstr "*** 没有窗口 ***"
 
@@ -787,12 +787,12 @@ msgstr "到桌面(&D)"
 msgid "&All Desktops"
 msgstr "全部桌面(&A)"
 
-#: workspace.cpp:1201 workspace.cpp:1221
+#: workspace.cpp:1203 workspace.cpp:1223
 #, c-format
 msgid "Desktop %1"
 msgstr "桌面 %1"
 
-#: workspace.cpp:2773
+#: workspace.cpp:2775
 msgid ""
 "You have selected to show a window without its border.\n"
 "Without the border, you will not be able to enable the border again using "
@@ -803,7 +803,7 @@ msgstr ""
 "没有边框的话，您就无法使用鼠标再次启用边框：请使用快捷键 %1 激活窗口的操作菜"
 "单来完成这一任务。"
 
-#: workspace.cpp:2785
+#: workspace.cpp:2787
 msgid ""
 "You have selected to show a window in fullscreen mode.\n"
 "If the application itself does not have an option to turn the fullscreen "
@@ -814,17 +814,17 @@ msgstr ""
 "如果应用程序自身没有提供退出全屏模式的选项，您就无法使用鼠标退出全屏模式：请"
 "使用快捷键 %1 激活窗口的操作菜单来完成这一任务。"
 
-#: workspace.cpp:2924
+#: workspace.cpp:2926
 msgid ""
 "The Composite Manager crashed twice within a minute and is therefore "
 "disabled for this session."
 msgstr "复合管理器在一分钟之内崩溃了两次，因此本次会话中该特性将被禁用。"
 
-#: workspace.cpp:2925 workspace.cpp:2948 workspace.cpp:2987
+#: workspace.cpp:2927 workspace.cpp:2950 workspace.cpp:2989
 msgid "Composite Manager Failure"
 msgstr "复合管理器失败"
 
-#: workspace.cpp:2966
+#: workspace.cpp:2968
 #, fuzzy
 msgid ""
 "<qt><b>The TDE composition manager failed to open the display</b><br>There "
@@ -833,7 +833,7 @@ msgstr ""
 "<qt><b>kompmgr 打开显示失败</b><br>可能在您的 ~/.xcompmgrrc 中有无效的显示"
 "项。</qt>"
 
-#: workspace.cpp:2968
+#: workspace.cpp:2970
 #, fuzzy
 msgid ""
 "<qt><b>The TDE composition manager cannot find the Xrender extension</"
@@ -843,7 +843,7 @@ msgstr ""
 "<qt><b>kompmgr 找不到 Xrender 扩展</b><br>您可能正在使用 XOrg 的早期版本或缩"
 "水版本。<br>请从 www.freedesktop.org 获取 XOrg &ge; 6.8。<br></qt>"
 
-#: workspace.cpp:2970
+#: workspace.cpp:2972
 msgid ""
 "<qt><b>Composite extension not found</b><br>You <i>must</i> use XOrg &ge; "
 "6.8 for translucency and shadows to work.<br>Additionally, you need to add a "
@@ -854,7 +854,7 @@ msgstr ""
 "影。<br>此外，您必须在您的 X 配置文件中添加新的一节：<br><i>Section "
 "\"Extensions\"<br>Option \"Composite\" \"Enable\"<br>EndSection</i></qt>"
 
-#: workspace.cpp:2975
+#: workspace.cpp:2977
 msgid ""
 "<qt><b>Damage extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 "
 "for translucency and shadows to work.</qt>"
@@ -862,7 +862,7 @@ msgstr ""
 "<qt><b>损坏扩展未找到</b><br>您<i>必须</i>使用 XOrg &ge; 6.8 获得透明效果及阴"
 "影。</qt>"
 
-#: workspace.cpp:2977
+#: workspace.cpp:2979
 msgid ""
 "<qt><b>XFixes extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 "
 "for translucency and shadows to work.</qt>"