Automated l10n update (.po files)

1 files changed, 240 insertions, 183 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkwm.po b/tde-i18n-zh_CN/messages/tdebase/kcmkwm.po
index beb2188c64e..38542354059 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkwm.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkwm.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkwm\n"
-"POT-Creation-Date: 2006-04-11 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-08-01 07:26+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -64,12 +65,13 @@ msgid "(c) 1997 - 2002 KWin and KControl Authors"
 msgstr "(c) 1997 - 2002 KWin 和 KControl 作者"
 
 #: main.cpp:190
+#, fuzzy
 msgid ""
 "<h1>Window Behavior</h1> Here you can customize the way windows behave when "
 "being moved, resized or clicked on. You can also specify a focus policy as well "
 "as a placement policy for new windows. "
 "<p>Please note that this configuration will not take effect if you do not use "
-"KWin as your window manager. If you do use a different window manager, please "
+"TWin as your window manager. If you do use a different window manager, please "
 "refer to its documentation for how to customize window behavior."
 msgstr ""
 "<h1>窗口行为</h1>您可以在这里自定义窗口移动、改变大小或被点击时的行为。您可以指定焦点策略和新窗口的放置策略。"
@@ -394,31 +396,31 @@ msgstr "激活、放在前面并移动"
 msgid "Resize"
 msgstr "更改大小"
 
-#: windows.cpp:122
+#: windows.cpp:125
 msgid "Focus"
 msgstr "焦点"
 
-#: windows.cpp:129
+#: windows.cpp:132
 msgid "&Policy:"
 msgstr "策略(&P)："
 
-#: windows.cpp:132
+#: windows.cpp:135
 msgid "Click to Focus"
 msgstr "点击获取焦点"
 
-#: windows.cpp:133
+#: windows.cpp:136
 msgid "Focus Follows Mouse"
 msgstr "焦点跟随鼠标"
 
-#: windows.cpp:134
+#: windows.cpp:137
 msgid "Focus Under Mouse"
 msgstr "焦点置于鼠标下"
 
-#: windows.cpp:135
+#: windows.cpp:138
 msgid "Focus Strictly Under Mouse"
 msgstr "焦点严格置于鼠标下"
 
-#: windows.cpp:140
+#: windows.cpp:143
 msgid ""
 "The focus policy is used to determine the active window, i.e. the window you "
 "can work in. "
@@ -447,66 +449,159 @@ msgstr ""
 "<li><em>焦点严格置于鼠标下：</em> 这比“焦点置于鼠标下”还差。只有鼠标下的窗口才激活。如果鼠标没有指到任何窗口，则没有窗口拥有焦点。</ul>"
 "注意“焦点置于鼠标下”和“焦点严格置于鼠标下”将可能会导致某些特性在 TDE 模式下工作不正常，如 Alt+Tab 窗口浏览对话框。"
 
-#: windows.cpp:165
+#: windows.cpp:168
 msgid "Auto &raise"
 msgstr "自动放置在前(&R)"
 
-#: windows.cpp:170 windows.cpp:183 windows.cpp:546
+#: windows.cpp:173 windows.cpp:186 windows.cpp:645
 msgid "Dela&y:"
 msgstr "延时(&Y)："
 
-#: windows.cpp:173 windows.cpp:186 windows.cpp:549 windows.cpp:577
+#: windows.cpp:176 windows.cpp:189 windows.cpp:648 windows.cpp:676
 msgid " msec"
 msgstr " 毫秒"
 
-#: windows.cpp:178
+#: windows.cpp:181
 msgid "Delay focus"
 msgstr "延迟聚焦"
 
-#: windows.cpp:189
-msgid "C&lick raise active window"
+#: windows.cpp:192
+#, fuzzy
+msgid "Click &raises active window"
 msgstr "点击升起激活窗口(&L)"
 
-#: windows.cpp:196
+#: windows.cpp:199
+#, fuzzy
+msgid "Focus stealing prevention &level:"
+msgstr "避免抢占焦点的程度："
+
+#: windows.cpp:202
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"None"
+msgstr "无"
+
+#: windows.cpp:203
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"Low"
+msgstr "低"
+
+#: windows.cpp:204
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"Normal"
+msgstr "普通"
+
+#: windows.cpp:205
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"High"
+msgstr "高"
+
+#: windows.cpp:206
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"Extreme"
+msgstr "终极"
+
+#: windows.cpp:209
+#, fuzzy
+msgid ""
+"<p>This option specifies how much TWin will try to prevent unwanted focus "
+"stealing caused by unexpected activation of new windows. (Note: This feature "
+"does not work with the Focus Under Mouse or Focus Strictly Under Mouse focus "
+"policies.)"
+"<ul>"
+"<li><em>None:</em> Prevention is turned off and new windows always become "
+"activated.</li>"
+"<li><em>Low:</em> Prevention is enabled; when some window does not have support "
+"for the underlying mechanism and TWin cannot reliably decide whether to "
+"activate the window or not, it will be activated. This setting may have both "
+"worse and better results than normal level, depending on the applications.</li>"
+"<li><em>Normal:</em> Prevention is enabled.</li>"
+"<li><em>High:</em> New windows get activated only if no window is currently "
+"active or if they belong to the currently active application. This setting is "
+"probably not really usable when not using mouse focus policy.</li>"
+"<li><em>Extreme:</em> All windows must be explicitly activated by the user.</li>"
+"</ul></p>"
+"<p>Windows that are prevented from stealing focus are marked as demanding "
+"attention, which by default means their taskbar entry will be highlighted. This "
+"can be changed in the Notifications control module.</p>"
+msgstr ""
+"<p>此选项指定了 KWin 应该如何因新窗口的无意激活而导致焦点被抢。(请注意：此特性与“焦点置于鼠标下”和“焦点严格置于鼠标下”策略不兼容。)"
+"<ul>"
+"<li><em>无：</em>不进行避免，新窗口总是被激活。</li>"
+"<li><em>低：</em>启用避免；如果某些窗口不支持后台规则，且 KWin "
+"无法可靠的确定是否要激活该窗口，则会激活该窗口。这一设置可能比普通级别的效果更差或更好，这取决于具体的应用程序。</li>"
+"<li><em>普通：</em>启用避免；默认设置。</li>"
+"<li><em>高：</em>仅当没有激活窗口或新窗口属于当前应用程序时，才会激活新窗口。如果不使用鼠标聚焦策略的话，这一设置可能不怎么常用。</li>"
+"<li><em>终极：</em>全部窗口都必须由用户显式激活。</li></ul></p>"
+"<p>标为避免获取焦点的窗口引起注意的默认方式是突出显示其任务栏项。您可以在通知控制模块中更改。</p>"
+
+#: windows.cpp:231
 msgid ""
 "When this option is enabled, a window in the background will automatically come "
 "to the front when the mouse pointer has been over it for some time."
 msgstr "这个选项启用时，当鼠标光标移动到窗口上一段时间后，在后面背景里的窗口将自动出现在最前面。"
 
-#: windows.cpp:198
+#: windows.cpp:233
 msgid ""
 "This is the delay after which the window that the mouse pointer is over will "
 "automatically come to the front."
 msgstr "当鼠标移动到窗口上后，延迟这么长时间窗口就会自动出现在最前面。"
 
-#: windows.cpp:202
+#: windows.cpp:237
 msgid ""
 "When this option is enabled, the active window will be brought to the front "
 "when you click somewhere into the window contents. To change it for inactive "
 "windows, you need to change the settings in the Actions tab."
 msgstr "这个选项启用时，当您点击活动窗口中的内容时，该窗口将会被带到顶层。要更改非活动窗口的特性，您需要在动作标签中更改设置。"
 
-#: windows.cpp:207
+#: windows.cpp:242
 msgid ""
 "When this option is enabled, there will be a delay after which the window the "
 "mouse pointer is over will become active (receive focus)."
 msgstr "启用此选项时，当鼠标移动到窗口上后，延迟一段时间后窗口就会自动出现在最前面(接受焦点)。"
 
-#: windows.cpp:209
+#: windows.cpp:244
 msgid ""
 "This is the delay after which the window the mouse pointer is over will "
 "automatically receive focus."
 msgstr "当鼠标移动到窗口上后，延迟这么长时间窗口就会自动出现在最前面。"
 
-#: windows.cpp:214
+#: windows.cpp:247
+msgid "S&eparate screen focus"
+msgstr ""
+
+#: windows.cpp:249
+msgid ""
+"When this option is enabled, focus operations are limited only to the active "
+"Xinerama screen"
+msgstr ""
+
+#: windows.cpp:252
+#, fuzzy
+msgid "Active &mouse screen"
+msgstr "激活并放在前面"
+
+#: windows.cpp:254
+msgid ""
+"When this option is enabled, active Xinerama screen (where for example new "
+"windows appear) is the screen with the mouse pointer. When disabled, the active "
+"Xinerama screen is the screen with the focused window. This option is by "
+"default disabled for Click to focus and enabled for other focus policies."
+msgstr ""
+
+#: windows.cpp:270
 msgid "Navigation"
 msgstr "导航"
 
-#: windows.cpp:218
+#: windows.cpp:274
 msgid "Show window list while switching windows"
 msgstr "切换窗口时显示窗口列表"
 
-#: windows.cpp:221
+#: windows.cpp:277
 msgid ""
 "Hold down the Alt key and press the Tab key repeatedly to walk through the "
 "windows on the current desktop (the Alt+Tab combination can be reconfigured).\n"
@@ -524,173 +619,107 @@ msgstr ""
 "\n"
 "否则，焦点将转移到新选中的窗口，而不显示弹出部件。此外，先前激活的窗口将会被自动推到最后。"
 
-#: windows.cpp:233
+#: windows.cpp:289
 msgid "&Traverse windows on all desktops"
 msgstr "遍历所有桌面上的窗口(&T)"
 
-#: windows.cpp:236
+#: windows.cpp:292
 msgid ""
 "Leave this option disabled if you want to limit walking through windows to the "
 "current desktop."
 msgstr "如果您希望仅限于遍历当前桌面上的窗口，请禁用该选项。"
 
-#: windows.cpp:240
+#: windows.cpp:296
 msgid "Desktop navi&gation wraps around"
 msgstr "桌面导航时自动卷绕(&G)"
 
-#: windows.cpp:243
+#: windows.cpp:299
 msgid ""
 "Enable this option if you want keyboard or active desktop border navigation "
 "beyond the edge of a desktop to take you to the opposite edge of the new "
 "desktop."
 msgstr "如果您希望用键盘或者鼠标切换桌面时，每当越过边界上的桌面就卷绕到对边上的桌面时，请启用这个选项。"
 
-#: windows.cpp:247
-msgid "Popup desktop name on desktop &switch"
+#: windows.cpp:303
+#, fuzzy
+msgid "Popup &desktop name on desktop switch"
 msgstr "桌面切换时弹出桌面名字(&S)"
 
-#: windows.cpp:250
+#: windows.cpp:306
 msgid ""
 "Enable this option if you wish to see the current desktop name popup whenever "
 "the current desktop is changed."
 msgstr "如果您希望在当前桌面改变后看到桌面的名字弹出来，请启用这个选项。"
 
-#: windows.cpp:535
+#: windows.cpp:634
 msgid "Shading"
 msgstr "卷起"
 
-#: windows.cpp:537
+#: windows.cpp:636
 msgid "Anima&te"
 msgstr "动画(&T)"
 
-#: windows.cpp:538
+#: windows.cpp:637
 msgid ""
 "Animate the action of reducing the window to its titlebar (shading) as well as "
 "the expansion of a shaded window"
 msgstr "动画显示窗口卷成标题栏和展开恢复成窗口的过程。"
 
-#: windows.cpp:541
+#: windows.cpp:640
 msgid "&Enable hover"
 msgstr "悬停展开(&E)"
 
-#: windows.cpp:551
+#: windows.cpp:650
 msgid ""
 "If Shade Hover is enabled, a shaded window will un-shade automatically when the "
 "mouse pointer has been over the title bar for some time."
 msgstr "如果悬停展开被启用，当鼠标指针在标题栏上停留一段时间后，卷起的窗口将自动展开。"
 
-#: windows.cpp:554
+#: windows.cpp:653
 msgid ""
 "Sets the time in milliseconds before the window unshades when the mouse pointer "
 "goes over the shaded window."
 msgstr "设置鼠标指针在卷起的窗口上停留多少毫秒后窗口自动展开。"
 
-#: windows.cpp:565
+#: windows.cpp:664
 msgid "Active Desktop Borders"
 msgstr "活动桌面边界"
 
-#: windows.cpp:568
+#: windows.cpp:667
 msgid ""
 "If this option is enabled, moving the mouse to a screen border will change your "
 "desktop. This is e.g. useful if you want to drag windows from one desktop to "
 "the other."
 msgstr "这个选项启用时，鼠标移动到屏幕边界将改变您的当前桌面。当您想把窗口拖拽到其它桌面时这特别有用。"
 
-#: windows.cpp:571
+#: windows.cpp:670
 msgid "D&isabled"
 msgstr "无效(&I)"
 
-#: windows.cpp:572
+#: windows.cpp:671
 msgid "Only &when moving windows"
 msgstr "只在移动窗口时切换桌面(&W)"
 
-#: windows.cpp:573
+#: windows.cpp:672
 msgid "A&lways enabled"
 msgstr "总是有效(&L)"
 
-#: windows.cpp:578
+#: windows.cpp:677
 msgid "Desktop &switch delay:"
 msgstr "桌面切换延时(&S)："
 
-#: windows.cpp:579
+#: windows.cpp:678
 msgid ""
 "Here you can set a delay for switching desktops using the active borders "
 "feature. Desktops will be switched after the mouse has been pushed against a "
 "screen border for the specified number of milliseconds."
 msgstr "这里您可以设置用活动桌面边界切换桌面的延时。当鼠标被推到屏幕边界一定时间(毫秒)后，桌面将自动切换。"
 
-#: windows.cpp:592
-msgid "Focus stealing prevention level:"
-msgstr "避免抢占焦点的程度："
-
-#: windows.cpp:594
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"None"
-msgstr "无"
-
-#: windows.cpp:595
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"Low"
-msgstr "低"
-
-#: windows.cpp:596
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"Normal"
-msgstr "普通"
-
-#: windows.cpp:597
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"High"
-msgstr "高"
-
-#: windows.cpp:598
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"Extreme"
-msgstr "终极"
-
-#: windows.cpp:602
-msgid ""
-"<p>This option specifies how much KWin will try to prevent unwanted focus "
-"stealing caused by unexpected activation of new windows. (Note: This feature "
-"does not work with the Focus Under Mouse or Focus Strictly Under Mouse focus "
-"policies.)"
-"<ul>"
-"<li><em>None:</em> Prevention is turned off and new windows always become "
-"activated.</li>"
-"<li><em>Low:</em> Prevention is enabled; when some window does not have support "
-"for the underlying mechanism and KWin cannot reliably decide whether to "
-"activate the window or not, it will be activated. This setting may have both "
-"worse and better results than normal level, depending on the applications.</li>"
-"<li><em>Normal:</em> Prevention is enabled.</li>"
-"<li><em>High:</em> New windows get activated only if no window is currently "
-"active or if they belong to the currently active application. This setting is "
-"probably not really usable when not using mouse focus policy.</li>"
-"<li><em>Extreme:</em> All windows must be explicitly activated by the user.</li>"
-"</ul></p>"
-"<p>Windows that are prevented from stealing focus are marked as demanding "
-"attention, which by default means their taskbar entry will be highlighted. This "
-"can be changed in the Notifications control module.</p>"
-msgstr ""
-"<p>此选项指定了 KWin 应该如何因新窗口的无意激活而导致焦点被抢。(请注意：此特性与“焦点置于鼠标下”和“焦点严格置于鼠标下”策略不兼容。)"
-"<ul>"
-"<li><em>无：</em>不进行避免，新窗口总是被激活。</li>"
-"<li><em>低：</em>启用避免；如果某些窗口不支持后台规则，且 KWin "
-"无法可靠的确定是否要激活该窗口，则会激活该窗口。这一设置可能比普通级别的效果更差或更好，这取决于具体的应用程序。</li>"
-"<li><em>普通：</em>启用避免；默认设置。</li>"
-"<li><em>高：</em>仅当没有激活窗口或新窗口属于当前应用程序时，才会激活新窗口。如果不使用鼠标聚焦策略的话，这一设置可能不怎么常用。</li>"
-"<li><em>终极：</em>全部窗口都必须由用户显式激活。</li></ul></p>"
-"<p>标为避免获取焦点的窗口引起注意的默认方式是突出显示其任务栏项。您可以在通知控制模块中更改。</p>"
-
-#: windows.cpp:625
+#: windows.cpp:690
 msgid "Hide utility windows for inactive applications"
 msgstr "隐藏非活动应用程序的工具窗口"
 
-#: windows.cpp:627
+#: windows.cpp:692
 msgid ""
 "When turned on, utility windows (tool windows, torn-off menus,...) of inactive "
 "applications will be hidden and will be shown only when the application becomes "
@@ -699,106 +728,106 @@ msgid ""
 msgstr ""
 "开启时，非活动应用程序的工具窗口(工具栏、私下的菜单)将被隐藏，而且仅当应用程序活动时才显示。请注意，要让此特性工作正常，应用程序必须将正确设定相应窗口的类型。"
 
-#: windows.cpp:780
+#: windows.cpp:834
 msgid "Windows"
 msgstr "窗口"
 
-#: windows.cpp:788
+#: windows.cpp:842
 msgid "Di&splay content in moving windows"
 msgstr "移动窗口时显示内容(&S)"
 
-#: windows.cpp:790
+#: windows.cpp:844
 msgid ""
 "Enable this option if you want a window's content to be fully shown while "
 "moving it, instead of just showing a window 'skeleton'. The result may not be "
 "satisfying on slow machines without graphic acceleration."
 msgstr "如果您希望移动窗口时显示它完整的内容，而不是仅显示一个“框架”，请启用这个选项。在没有图形加速的慢机器上，效果可能不令人满意。"
 
-#: windows.cpp:794
+#: windows.cpp:848
 msgid "Display content in &resizing windows"
 msgstr "改变窗口大小时显示内容(&R)"
 
-#: windows.cpp:796
+#: windows.cpp:850
 msgid ""
 "Enable this option if you want a window's content to be shown while resizing "
 "it, instead of just showing a window 'skeleton'. The result may not be "
 "satisfying on slow machines."
 msgstr "如果您希望改变窗口大小时显示窗口的内容，而不是仅显示一个“框架”，请启用这个选项。在慢速的机器上，效果可能不令人满意。"
 
-#: windows.cpp:800
+#: windows.cpp:854
 msgid "Display window &geometry when moving or resizing"
 msgstr "移动或者改变大小时显示窗口几何尺寸(&G)"
 
-#: windows.cpp:802
+#: windows.cpp:856
 msgid ""
 "Enable this option if you want a window's geometry to be displayed while it is "
 "being moved or resized. The window position relative to the top-left corner of "
 "the screen is displayed together with its size."
 msgstr "如果您要在移动或者改变大小时显示窗口几何尺寸，请启用此项。相对于屏幕左上角的窗口位置及其大小将会在移动时显示。"
 
-#: windows.cpp:812
+#: windows.cpp:866
 msgid "Animate minimi&ze and restore"
 msgstr "动画显示最小化和恢复(&Z)"
 
-#: windows.cpp:814
+#: windows.cpp:868
 msgid ""
 "Enable this option if you want an animation shown when windows are minimized or "
 "restored."
 msgstr "如果您希望最小化或恢复窗口时显示动画，请启用此选项。"
 
-#: windows.cpp:828
+#: windows.cpp:882
 msgid "Slow"
 msgstr "慢"
 
-#: windows.cpp:832
+#: windows.cpp:886
 msgid "Fast"
 msgstr "快"
 
-#: windows.cpp:836
+#: windows.cpp:890
 msgid ""
 "Here you can set the speed of the animation shown when windows are minimized "
 "and restored. "
 msgstr "您可以设置窗口最小化和恢复时的动画的速度。"
 
-#: windows.cpp:842
+#: windows.cpp:896
 msgid "Allow moving and resizing o&f maximized windows"
 msgstr "允许移动和改变最大化窗口的大小(&F)"
 
-#: windows.cpp:844
+#: windows.cpp:898
 msgid ""
 "When enabled, this feature activates the border of maximized windows and allows "
 "you to move or resize them, just like for normal windows"
 msgstr "启用时，该特性激活最大化窗口的边框，允许您移动或改变它们的大小，就象普通窗口一样。"
 
-#: windows.cpp:850
+#: windows.cpp:904
 msgid "&Placement:"
 msgstr "放置策略(&P)："
 
-#: windows.cpp:853
+#: windows.cpp:907
 msgid "Smart"
 msgstr "智能"
 
-#: windows.cpp:854
+#: windows.cpp:908
 msgid "Maximizing"
 msgstr "最大化"
 
-#: windows.cpp:855
+#: windows.cpp:909
 msgid "Cascade"
 msgstr "层叠"
 
-#: windows.cpp:856
+#: windows.cpp:910
 msgid "Random"
 msgstr "随机"
 
-#: windows.cpp:857
+#: windows.cpp:911
 msgid "Centered"
 msgstr "居中"
 
-#: windows.cpp:858
+#: windows.cpp:912
 msgid "Zero-Cornered"
 msgstr "边角"
 
-#: windows.cpp:865
+#: windows.cpp:919
 msgid ""
 "The placement policy determines where a new window will appear on the desktop. "
 "<ul> "
@@ -821,58 +850,59 @@ msgstr ""
 "<li><em>居中</em> 将把窗口居中放置</li> "
 "<li><em>边角</em> 将把窗口放在左上角</li></ul>"
 
-#: windows.cpp:904
+#: windows.cpp:958
 msgid "Snap Zones"
 msgstr "吸引区"
 
-#: windows.cpp:908 windows.cpp:917
+#: windows.cpp:962 windows.cpp:971
 msgid "none"
 msgstr "无"
 
-#: windows.cpp:910
+#: windows.cpp:964
 msgid "&Border snap zone:"
 msgstr "边界吸引区(&B)："
 
-#: windows.cpp:912
+#: windows.cpp:966
 msgid ""
 "Here you can set the snap zone for screen borders, i.e. the 'strength' of the "
 "magnetic field which will make windows snap to the border when moved near it."
 msgstr "您可以设置屏幕边界的吸引区，即磁场的“吸引力”，它使窗口移近边界时被吸引到边界上。"
 
-#: windows.cpp:919
+#: windows.cpp:973
 msgid "&Window snap zone:"
 msgstr "窗口吸引区(&W)："
 
-#: windows.cpp:921
+#: windows.cpp:975
 msgid ""
 "Here you can set the snap zone for windows, i.e. the 'strength' of the magnetic "
 "field which will make windows snap to each other when they're moved near "
 "another window."
 msgstr "您可以设置窗口的吸引区，即磁场的“吸引力”，它使窗口移近另外的窗口时彼此吸引到一起。"
 
-#: windows.cpp:925
+#: windows.cpp:979
 msgid "Snap windows onl&y when overlapping"
 msgstr "仅在重叠时才吸引窗口(&Y)"
 
-#: windows.cpp:926
+#: windows.cpp:980
 msgid ""
 "Here you can set that windows will be only snapped if you try to overlap them, "
 "i.e. they will not be snapped if the windows comes only near another window or "
 "border."
 msgstr "您可以在这里设置窗口只在重叠时才将它们的边界吸引到一起。即，如果它们只是相互靠近或者靠近屏幕边沿但尚未重叠，则不相互吸引。"
 
-#: windows.cpp:1023 windows.cpp:1027
+#: windows.cpp:1077 windows.cpp:1081
 msgid ""
 "_n:  pixel\n"
 " pixels"
 msgstr " 像素"
 
-#: windows.cpp:1226
+#: windows.cpp:1280
+#, fuzzy
 msgid ""
 "<qt><b>It seems that alpha channel support is not available.</b>"
 "<br>"
 "<br>Please make sure you have <a href=\"http://www.freedesktop.org/\">"
-"Xorg &ge; 6.8</a>, and installed the kompmgr that came with twin."
+"Xorg &ge; 6.8</a>, and installed the composition manager that came with twin."
 "<br>Also, make sure you have the following entries in your XConfig (e.g. "
 "/etc/X11/xorg.conf):"
 "<br>"
@@ -901,107 +931,134 @@ msgstr ""
 "<br><i>Option     \"RenderAccel\" \"true\"</i>"
 "<br>In <i>Section \"Device\"</i></qt>"
 
-#: windows.cpp:1246
+#: windows.cpp:1300
 msgid "Apply translucency only to decoration"
 msgstr "透明度仅适用于装饰"
 
-#: windows.cpp:1254
+#: windows.cpp:1308
 msgid "Active windows:"
 msgstr "活动窗口："
 
-#: windows.cpp:1261
+#: windows.cpp:1315
 msgid "Inactive windows:"
 msgstr "非活动窗口："
 
-#: windows.cpp:1268
+#: windows.cpp:1322
 msgid "Moving windows:"
 msgstr "移动窗口："
 
-#: windows.cpp:1275
+#: windows.cpp:1329
 msgid "Dock windows:"
 msgstr "停靠窗口："
 
-#: windows.cpp:1284
+#: windows.cpp:1338
 msgid "Treat 'keep above' windows as active ones"
 msgstr "将“常居顶端”的窗口当作活动窗口"
 
-#: windows.cpp:1287
+#: windows.cpp:1341
 msgid "Disable ARGB windows (ignores window alpha maps, fixes gtk1 apps)"
 msgstr "禁止 ARGB 窗口(忽略窗口的 alpha 映射，适用于 gtk1 应用程序)"
 
-#: windows.cpp:1291
+#: windows.cpp:1347
+msgid "Use OpenGL compositor (best performance)"
+msgstr ""
+
+#: windows.cpp:1354
 msgid "Opacity"
 msgstr "不透明度"
 
-#: windows.cpp:1297
-msgid "Use shadows"
-msgstr "使用阴影"
+#: windows.cpp:1360
+msgid ""
+"Use shadows (standard effects should be disabled in the Styles module if this "
+"is checked)"
+msgstr ""
 
-#: windows.cpp:1305
-msgid "Active window size:"
-msgstr "活动窗口大小："
+#: windows.cpp:1368
+#, fuzzy
+msgid "Base shadow radius:"
+msgstr "使用阴影"
 
-#: windows.cpp:1312
-msgid "Inactive window size:"
+#: windows.cpp:1375
+#, fuzzy
+msgid "Inactive window distance from background:"
 msgstr "非活动窗口大小："
 
-#: windows.cpp:1319
-msgid "Dock window size:"
-msgstr "停靠窗口大小："
+#: windows.cpp:1382
+msgid "Active window distance from background:"
+msgstr ""
 
-#: windows.cpp:1326
+#: windows.cpp:1389
+msgid "Dock distance from background:"
+msgstr ""
+
+#: windows.cpp:1396
+msgid "Menu distance from background:"
+msgstr ""
+
+#: windows.cpp:1409
 msgid "Vertical offset:"
 msgstr "垂直偏移："
 
-#: windows.cpp:1333
+#: windows.cpp:1416
 msgid "Horizontal offset:"
 msgstr "水平偏移："
 
-#: windows.cpp:1340
+#: windows.cpp:1423
 msgid "Shadow color:"
 msgstr "阴影颜色："
 
-#: windows.cpp:1346
+#: windows.cpp:1429
 msgid "Remove shadows on move"
 msgstr "移动时去掉阴影"
 
-#: windows.cpp:1348
+#: windows.cpp:1431
 msgid "Remove shadows on resize"
 msgstr "缩放时去掉阴影"
 
-#: windows.cpp:1351
+#: windows.cpp:1434
 msgid "Shadows"
 msgstr "阴影"
 
-#: windows.cpp:1356
+#: windows.cpp:1439
 msgid "Fade-in windows (including popups)"
 msgstr "淡入窗口(包括弹出窗口)"
 
-#: windows.cpp:1357
+#: windows.cpp:1440
+msgid ""
+"Fade-in menus (requires menu fade effect to be disabled in the Styles module)"
+msgstr ""
+
+#: windows.cpp:1441
 msgid "Fade between opacity changes"
 msgstr "不透明度更改时淡入淡出"
 
-#: windows.cpp:1360
+#: windows.cpp:1444
 msgid "Fade-in speed:"
 msgstr "淡入速度："
 
-#: windows.cpp:1363
+#: windows.cpp:1447
 msgid "Fade-out speed:"
 msgstr "淡出速度："
 
-#: windows.cpp:1370
+#: windows.cpp:1455
 msgid "Effects"
 msgstr "效果"
 
-#: windows.cpp:1372
-msgid "Use translucency/shadows"
-msgstr "使用透明/阴影"
+#: windows.cpp:1457
+msgid "Enable the Trinity window composition manager"
+msgstr ""
 
-#: windows.cpp:1624
-msgid ""
-"<qt>Translucency support is new and may cause problems"
-"<br> including crashes (sometimes the translucency engine, seldom even X).</qt>"
-msgstr "<qt>透明支持是新特性，可能造成各种问题，甚至崩溃(有时是透明引擎崩溃，少数情况下 X 也会崩溃)。</qt>"
+#~ msgid "Active window size:"
+#~ msgstr "活动窗口大小："
+
+#~ msgid "Dock window size:"
+#~ msgstr "停靠窗口大小："
+
+#~ msgid "Use translucency/shadows"
+#~ msgstr "使用透明/阴影"
+
+#~ msgid "<qt>Translucency support is new and may cause problems<br> including crashes (sometimes the translucency engine, seldom even X).</qt>"
+#~ msgstr "<qt>透明支持是新特性，可能造成各种问题，甚至崩溃(有时是透明引擎崩溃，少数情况下 X 也会崩溃)。</qt>"
 
 #~ msgid " pixels"
 #~ msgstr " 像素"