[metacity] Update zh_CN translation

[YunQiang Su <yqsu src gnome org>]

commit e18f850c461bd4081df91751e74fe401b6d80f31
Author: Dz Chen <wsxy162 gmail com>
Date:   Sat Mar 24 22:06:46 2018 +0800

    Update zh_CN translation

 po/zh_CN.po | 2300 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1222 insertions(+), 1078 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a11c17e..70a59c9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,1651 +10,1806 @@
 # Jessica Ban <bancage gmail com>, 2010.
 # Lele Long <schemacs gmail com>, 2011.
 # YunQiang Su <wzssyqa gmail com>, 2012.
+# Dingzhong Chen <wsxy162 gmail com>, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
 "product=metacity&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-12-19 15:23+0000\n"
-"PO-Revision-Date: 2014-01-12 19:50+0800\n"
-"Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"POT-Creation-Date: 2018-03-11 14:19+0000\n"
+"PO-Revision-Date: 2018-03-24 22:05+0800\n"
+"Last-Translator: Dingzhong Chen <wsxy162 gmail com>\n"
+"Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.0.6\n"
 
-#: ../src/50-metacity-navigation.xml.in.h:1
+#. Translators: This is the title used on dialog boxes
+#: data/applications/metacity.desktop.in:4 src/core/util.c:435
+msgid "Metacity"
+msgstr "Metacity"
+
+#. TRANSLATORS: Don't translate this text (this is icon name)
+#: data/applications/metacity.desktop.in:7
+msgid "preferences-system-windows"
+msgstr "preferences-system-windows"
+
+#: data/keybindings/50-metacity-navigation.xml:6
 msgid "Navigation"
 msgstr "导航"
 
-#: ../src/50-metacity-navigation.xml.in.h:2
+#: data/keybindings/50-metacity-navigation.xml:9
 msgid "Move window to workspace 1"
 msgstr "将窗口移到工作区 1"
 
-#: ../src/50-metacity-navigation.xml.in.h:3
+#: data/keybindings/50-metacity-navigation.xml:12
 msgid "Move window to workspace 2"
 msgstr "将窗口移到工作区 2"
 
-#: ../src/50-metacity-navigation.xml.in.h:4
+#: data/keybindings/50-metacity-navigation.xml:15
 msgid "Move window to workspace 3"
 msgstr "将窗口移到工作区 3"
 
-#: ../src/50-metacity-navigation.xml.in.h:5
+#: data/keybindings/50-metacity-navigation.xml:18
 msgid "Move window to workspace 4"
 msgstr "将窗口移到工作区 4"
 
-#: ../src/50-metacity-navigation.xml.in.h:6
+#: data/keybindings/50-metacity-navigation.xml:21
 msgid "Move window one workspace to the left"
 msgstr "将窗口左移一个工作区"
 
-#: ../src/50-metacity-navigation.xml.in.h:7
+#: data/keybindings/50-metacity-navigation.xml:24
 msgid "Move window one workspace to the right"
 msgstr "将窗口右移一个工作区"
 
-#: ../src/50-metacity-navigation.xml.in.h:8
+#: data/keybindings/50-metacity-navigation.xml:27
 msgid "Move window one workspace up"
 msgstr "将窗口上移一个工作区"
 
-#: ../src/50-metacity-navigation.xml.in.h:9
+#: data/keybindings/50-metacity-navigation.xml:30
 msgid "Move window one workspace down"
 msgstr "将窗口下移一个工作区"
 
-#: ../src/50-metacity-navigation.xml.in.h:10
-#| msgid "Switch windows directly"
+#: data/keybindings/50-metacity-navigation.xml:33
 msgid "Switch windows"
 msgstr "切换窗口"
 
-#: ../src/50-metacity-navigation.xml.in.h:11
+#: data/keybindings/50-metacity-navigation.xml:36
 msgid "Switch applications"
 msgstr "切换应用程序"
 
-#: ../src/50-metacity-navigation.xml.in.h:12
+#: data/keybindings/50-metacity-navigation.xml:39
 msgid "Switch windows of an application"
 msgstr "在应用程序的窗口之间切换窗口"
 
-#: ../src/50-metacity-navigation.xml.in.h:13
+#: data/keybindings/50-metacity-navigation.xml:42
 msgid "Switch system controls"
 msgstr "切换系统控制"
 
-#: ../src/50-metacity-navigation.xml.in.h:14
+#: data/keybindings/50-metacity-navigation.xml:45
 msgid "Switch windows directly"
 msgstr "直接切换窗口"
 
-#: ../src/50-metacity-navigation.xml.in.h:15
+#: data/keybindings/50-metacity-navigation.xml:48
 msgid "Switch windows of an app directly"
 msgstr "在应用程序窗口间直接移动焦点"
 
-#: ../src/50-metacity-navigation.xml.in.h:16
+#: data/keybindings/50-metacity-navigation.xml:51
 msgid "Switch system controls directly"
 msgstr "直接切换系统控制"
 
-#: ../src/50-metacity-navigation.xml.in.h:17
+#: data/keybindings/50-metacity-navigation.xml:54
 msgid "Hide all normal windows"
 msgstr "隐藏所有正常窗口"
 
-#: ../src/50-metacity-navigation.xml.in.h:18
+#: data/keybindings/50-metacity-navigation.xml:57
 msgid "Switch to workspace 1"
 msgstr "切换到工作区 1"
 
-#: ../src/50-metacity-navigation.xml.in.h:19
+#: data/keybindings/50-metacity-navigation.xml:60
 msgid "Switch to workspace 2"
 msgstr "切换到工作区 2"
 
-#: ../src/50-metacity-navigation.xml.in.h:20
+#: data/keybindings/50-metacity-navigation.xml:63
 msgid "Switch to workspace 3"
 msgstr "切换到工作区 3"
 
-#: ../src/50-metacity-navigation.xml.in.h:21
+#: data/keybindings/50-metacity-navigation.xml:66
 msgid "Switch to workspace 4"
 msgstr "切换到工作区 4"
 
-#: ../src/50-metacity-navigation.xml.in.h:22
+#: data/keybindings/50-metacity-navigation.xml:69
 msgid "Move to workspace left"
 msgstr "移动到左侧工作区"
 
-#: ../src/50-metacity-navigation.xml.in.h:23
+#: data/keybindings/50-metacity-navigation.xml:72
 msgid "Move to workspace right"
 msgstr "移动到右侧工作区"
 
-#: ../src/50-metacity-navigation.xml.in.h:24
+#: data/keybindings/50-metacity-navigation.xml:75
 msgid "Move to workspace above"
 msgstr "移动到上层工作区"
 
-#: ../src/50-metacity-navigation.xml.in.h:25
+#: data/keybindings/50-metacity-navigation.xml:78
 msgid "Move to workspace below"
 msgstr "移动到下层工作区"
 
-#: ../src/50-metacity-system.xml.in.h:1
+#: data/keybindings/50-metacity-system.xml:6
 msgid "System"
 msgstr "系统"
 
-#: ../src/50-metacity-system.xml.in.h:2
+#: data/keybindings/50-metacity-system.xml:9
 msgid "Show the run command prompt"
 msgstr "显示运行命令提示符"
 
-#: ../src/50-metacity-system.xml.in.h:3
-msgid "Show the activities overview"
-msgstr "显示活动大纲"
+#: data/keybindings/50-metacity-system.xml:12
+msgid "Show the applications menu"
+msgstr "显示应用程序菜单"
 
-#: ../src/50-metacity-windows.xml.in.h:1
+#: data/keybindings/50-metacity-windows.xml:6
 msgid "Windows"
 msgstr "窗口"
 
-#: ../src/50-metacity-windows.xml.in.h:2
+#: data/keybindings/50-metacity-windows.xml:9
 msgid "Activate the window menu"
 msgstr "激活窗口菜单"
 
-#: ../src/50-metacity-windows.xml.in.h:3
+#: data/keybindings/50-metacity-windows.xml:12
 msgid "Toggle fullscreen mode"
 msgstr "切换全屏模式"
 
-#: ../src/50-metacity-windows.xml.in.h:4
+#: data/keybindings/50-metacity-windows.xml:15
 msgid "Toggle maximization state"
 msgstr "切换最大化状态"
 
-#: ../src/50-metacity-windows.xml.in.h:5
+#: data/keybindings/50-metacity-windows.xml:18
 msgid "Maximize window"
 msgstr "最大化窗口"
 
-#: ../src/50-metacity-windows.xml.in.h:6
+#: data/keybindings/50-metacity-windows.xml:21
 msgid "Restore window"
 msgstr "恢复窗口"
 
-#: ../src/50-metacity-windows.xml.in.h:7
+#: data/keybindings/50-metacity-windows.xml:24
 msgid "Toggle shaded state"
 msgstr "切换卷起状态"
 
-#: ../src/50-metacity-windows.xml.in.h:8
+#: data/keybindings/50-metacity-windows.xml:27
 msgid "Close window"
 msgstr "关闭窗口"
 
-#: ../src/50-metacity-windows.xml.in.h:9
+#: data/keybindings/50-metacity-windows.xml:30
 msgid "Minimize window"
 msgstr "最小化窗口"
 
-#: ../src/50-metacity-windows.xml.in.h:10
+#: data/keybindings/50-metacity-windows.xml:33
 msgid "Move window"
 msgstr "移动窗口"
 
-#: ../src/50-metacity-windows.xml.in.h:11
+#: data/keybindings/50-metacity-windows.xml:36
 msgid "Resize window"
 msgstr "改变窗口大小"
 
-#: ../src/50-metacity-windows.xml.in.h:12
+#: data/keybindings/50-metacity-windows.xml:39
 msgid "Toggle window on all workspaces or one"
 msgstr "在位于所有或仅一个工作区的窗口间切换"
 
-#: ../src/50-metacity-windows.xml.in.h:13
+#: data/keybindings/50-metacity-windows.xml:42
 msgid "Raise window if covered, otherwise lower it"
 msgstr "如果窗口被其他窗口遮盖，则提升它，否则降低它"
 
-#: ../src/50-metacity-windows.xml.in.h:14
+#: data/keybindings/50-metacity-windows.xml:45
 msgid "Raise window above other windows"
 msgstr "将窗口提升到其它窗口之上"
 
-#: ../src/50-metacity-windows.xml.in.h:15
+#: data/keybindings/50-metacity-windows.xml:48
 msgid "Lower window below other windows"
 msgstr "将窗口降低到其它窗口之下"
 
-#: ../src/50-metacity-windows.xml.in.h:16
+#: data/keybindings/50-metacity-windows.xml:51
 msgid "Maximize window vertically"
 msgstr "垂直最大化窗口"
 
-#: ../src/50-metacity-windows.xml.in.h:17
+#: data/keybindings/50-metacity-windows.xml:54
 msgid "Maximize window horizontally"
 msgstr "水平最大化窗口"
 
-#: ../src/core/bell.c:296
-msgid "Bell event"
-msgstr "响铃事件"
-
-#: ../src/core/core.c:206
-#, c-format
-msgid "Unknown window information request: %d"
-msgstr "未知的窗口信息请求：%d"
-
-#. Translators: %s is a window title
-#: ../src/core/delete.c:96
-#, c-format
-msgid "<tt>%s</tt> is not responding."
-msgstr "<tt>%s<tt> 未响应。"
-
-#: ../src/core/delete.c:101
-msgid ""
-"You may choose to wait a short while for it to continue or force the "
-"application to quit entirely."
-msgstr "您可以选择稍等一会儿然后继续，或者强制退出该应用程序。"
-
-#: ../src/core/delete.c:110
-msgid "_Wait"
-msgstr "等待(_W)"
-
-#: ../src/core/delete.c:110
-msgid "_Force Quit"
-msgstr "强制退出(_F)"
-
-#: ../src/core/delete.c:208
-#, c-format
-msgid "Failed to get hostname: %s\n"
-msgstr "无法获取主机名：%s\n"
-
-#: ../src/core/display.c:263
-#, c-format
-msgid "Missing %s extension required for compositing"
-msgstr "缺少复合效果所需的 %s 扩展"
-
-#: ../src/core/display.c:341
-#, c-format
-msgid "Failed to open X Window System display '%s'\n"
-msgstr "无法打开 X Window System 显示“%s”\n"
+#: data/keybindings/50-metacity-windows.xml:58
+msgid "View split on left"
+msgstr "分屏到左侧"
 
-#: ../src/core/errors.c:272
-#, c-format
-msgid ""
-"Lost connection to the display '%s';\n"
-"most likely the X server was shut down or you killed/destroyed\n"
-"the window manager.\n"
-msgstr ""
-"丢失到显示“%s”的连接；\n"
-"可能是 X 服务器已关闭或者您杀死/摧毁了\n"
-"窗口管理器。\n"
+#: data/keybindings/50-metacity-windows.xml:62
+msgid "View split on right"
+msgstr "分屏到右侧"
 
-#: ../src/core/errors.c:279
-#, c-format
-msgid "Fatal IO error %d (%s) on display '%s'.\n"
-msgstr "严重的 IO 错误 %d (%s) 出现在显示“%s”上。\n"
+#: data/schemas/org.gnome.metacity.gschema.xml:14
+msgid "Show window content thumbnail in Alt-Tab"
+msgstr "在 Alt-Tab 中显示窗口内容缩略图"
 
-#: ../src/core/keybindings.c:729
-#, c-format
+#: data/schemas/org.gnome.metacity.gschema.xml:15
 msgid ""
-"Some other program is already using the key %s with modifiers %x as a "
-"binding\n"
-msgstr "某个其它程序已经将按键 %s 和修饰键 %x 配合使用作为一种组合\n"
-
-#: ../src/core/main.c:131
-#, c-format
-msgid ""
-"metacity %s\n"
-"Copyright (C) 2001-%s Havoc Pennington, Red Hat, Inc., and others\n"
-"This is free software; see the source for copying conditions.\n"
-"There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
-"PARTICULAR PURPOSE.\n"
+"If set to true, Metacity will show window content thumbnails in the Alt-Tab "
+"window instead of only icons."
 msgstr ""
-"metacity %s\n"
-"版权所有 (C) 2001-%s Havoc Pennington, Red Hat, Inc., 以及其他人\n"
-"这是自由软件：版权条款请参见源码.\n"
-"不存在任何保证：即使是对适销性或者适合某种特定目的也不作保证。\n"
-
-#: ../src/core/main.c:269
-msgid "Disable connection to session manager"
-msgstr "禁止连接到会话管理器"
-
-#: ../src/core/main.c:275
-msgid "Replace the running window manager with Metacity"
-msgstr "将运行中的窗口管理器替换为 Metacity"
-
-#: ../src/core/main.c:281
-msgid "Specify session management ID"
-msgstr "指定会话管理 ID"
-
-#: ../src/core/main.c:286
-msgid "X Display to use"
-msgstr "要使用的 X 显示"
-
-#: ../src/core/main.c:292
-msgid "Initialize session from savefile"
-msgstr "从保存文件中初始化会话"
+"如果设置为 true，Metacity 将在 Alt-Tab 中显示窗口内容缩略图而不是只显示图标。"
 
-#: ../src/core/main.c:298
-msgid "Print version"
-msgstr "打印版本"
-
-#: ../src/core/main.c:304
-msgid "Make X calls synchronous"
-msgstr "使 X 调用同步"
-
-#: ../src/core/main.c:310
-msgid "Turn compositing on"
-msgstr "打开复合效果"
-
-#: ../src/core/main.c:316
-msgid "Turn compositing off"
-msgstr "关闭复合效果"
-
-#: ../src/core/main.c:322
-msgid ""
-"Don't make fullscreen windows that are maximized and have no decorations"
-msgstr "不要将已最大化的窗口全屏，不要做任何装饰"
-
-#: ../src/core/main.c:527
-#, c-format
-msgid "Failed to scan themes directory: %s\n"
-msgstr "扫描主题目录失败：%s\n"
-
-#: ../src/core/main.c:543
-#, c-format
-msgid ""
-"Could not find a theme! Be sure %s exists and contains the usual themes.\n"
-msgstr "无法找到主题！请确认 %s 存在并且含有正常的主题。\n"
-
-#: ../src/core/main.c:602
-#, c-format
-msgid "Failed to restart: %s\n"
-msgstr "无法重启动：%s\n"
-
-#: ../src/core/prefs.c:880
-msgid ""
-"Workarounds for broken applications disabled. Some applications may not "
-"behave properly.\n"
-msgstr "有缺陷的应用程序的工作区已禁用。某些应用程序可能无法正常运行。\n"
-
-#: ../src/core/prefs.c:949
-#, c-format
-msgid "Could not parse font description \"%s\" from GSettings key %s\n"
-msgstr "无法解析字体说明“%s”(来自 GSettings 键 %s)\n"
-
-#: ../src/core/prefs.c:1015
-#, c-format
-msgid ""
-"\"%s\" found in configuration database is not a valid value for mouse button "
-"modifier\n"
-msgstr "在配置数据库中找到的“%s”不是鼠标按钮修饰键的有效值\n"
-
-#: ../src/core/prefs.c:1494
-#, c-format
-msgid ""
-"\"%s\" found in configuration database is not a valid value for keybinding "
-"\"%s\"\n"
-msgstr "在配置数据库中找到的“%s”不是按键组合“%s”的有效值\n"
-
-#: ../src/core/prefs.c:1601
-#, c-format
-msgid "Workspace %d"
-msgstr "工作区 %d"
-
-#: ../src/core/screen.c:364
-#, c-format
-msgid "Screen %d on display '%s' is invalid\n"
-msgstr "显示“%2$s”上的屏幕 %1$d 无效\n"
-
-#: ../src/core/screen.c:380
-#, c-format
-msgid ""
-"Screen %d on display \"%s\" already has a window manager; try using the --"
-"replace option to replace the current window manager.\n"
-msgstr ""
-"显示“%2$s”上的屏幕 %1$d 已经有一个窗口管理器；请尝试使用 --replace 选项替换当"
-"前的窗口管理器。\n"
-
-#: ../src/core/screen.c:407
-#, c-format
-msgid ""
-"Could not acquire window manager selection on screen %d display \"%s\"\n"
-msgstr "无法获得显示“%2$s”上的屏幕 %1$d 的窗口管理器选定项\n"
-
-#: ../src/core/screen.c:465
-#, c-format
-msgid "Screen %d on display \"%s\" already has a window manager\n"
-msgstr "在显示 \"%2$s\" 上的 %1$d 屏幕已经有一个窗口管理器\n"
-
-#: ../src/core/screen.c:675
-#, c-format
-msgid "Could not release screen %d on display \"%s\"\n"
-msgstr "无法释放显示“%2$s”上的屏幕 %1$d\n"
-
-#: ../src/core/session.c:842 ../src/core/session.c:849
-#, c-format
-msgid "Could not create directory '%s': %s\n"
-msgstr "无法创建目录“%s”：%s\n"
-
-#: ../src/core/session.c:859
-#, c-format
-msgid "Could not open session file '%s' for writing: %s\n"
-msgstr "无法打开会话文件“%s”进行写入：%s\n"
-
-#: ../src/core/session.c:1000
-#, c-format
-msgid "Error writing session file '%s': %s\n"
-msgstr "写入会话文件“%s”时出错：%s\n"
-
-#: ../src/core/session.c:1005
-#, c-format
-msgid "Error closing session file '%s': %s\n"
-msgstr "关闭会话文件“%s”时出错：%s\n"
-
-#: ../src/core/session.c:1135
-#, c-format
-msgid "Failed to parse saved session file: %s\n"
-msgstr "无法解析保存的会话文件：%s\n"
-
-#: ../src/core/session.c:1184
-#, c-format
-msgid "<metacity_session> attribute seen but we already have the session ID"
-msgstr "<metacity_session> 属性已看到，但我们已经拥有该会话 ID"
-
-#: ../src/core/session.c:1197 ../src/core/session.c:1272
-#: ../src/core/session.c:1304 ../src/core/session.c:1376
-#: ../src/core/session.c:1436
-#, c-format
-msgid "Unknown attribute %s on <%s> element"
-msgstr "<%2$s> 元素上未知的属性 %1$s"
-
-#: ../src/core/session.c:1214
-#, c-format
-msgid "nested <window> tag"
-msgstr "嵌套 <window> 标记"
-
-#: ../src/core/session.c:1456
-#, c-format
-msgid "Unknown element %s"
-msgstr "未知的元素 %s"
-
-#: ../src/core/session.c:1808
-msgid ""
-"These windows do not support &quot;save current setup&quot; and will have to "
-"be restarted manually next time you log in."
-msgstr ""
-"这些窗口不支持&quot;保存当前设置&quot;，您在下次登录时，必须手动重启动它们。"
-
-#: ../src/core/util.c:101
-#, c-format
-msgid "Failed to open debug log: %s\n"
-msgstr "无法打开调试日志：%s\n"
-
-#: ../src/core/util.c:111
-#, c-format
-msgid "Failed to fdopen() log file %s: %s\n"
-msgstr "无法对日志文件 %s 进行 fdopen() 操作：%s\n"
-
-#: ../src/core/util.c:117
-#, c-format
-msgid "Opened log file %s\n"
-msgstr "打开的日志文件 %s\n"
-
-#: ../src/core/util.c:136 ../src/tools/metacity-message.c:208
-#, c-format
-msgid "Metacity was compiled without support for verbose mode\n"
-msgstr "Metacity 编译的时候没有加入详细模式的支持\n"
-
-#: ../src/core/util.c:236
-msgid "Window manager: "
-msgstr "窗口管理器："
-
-#: ../src/core/util.c:388
-msgid "Bug in window manager: "
-msgstr "窗口管理器中的错误："
-
-#: ../src/core/util.c:421
-msgid "Window manager warning: "
-msgstr "窗口管理器警告："
+#: data/schemas/org.gnome.metacity.gschema.xml:23
+msgid "Compositing Manager"
+msgstr "复合管理器"
 
-#: ../src/core/util.c:449
-msgid "Window manager error: "
-msgstr "窗口管理器错误："
+#: data/schemas/org.gnome.metacity.gschema.xml:24
+msgid "Determines whether Metacity is a compositing manager."
+msgstr "决定 Metacity 是否是复合管理器。"
 
-#. Translators: This is the title used on dialog boxes
-#: ../src/core/util.c:570 ../src/metacity.desktop.in.h:1
-#: ../src/metacity-wm.desktop.in.h:1
-msgid "Metacity"
-msgstr "Metacity"
+#: data/schemas/org.gnome.metacity.gschema.xml:31
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr "启用边缘平铺当拖放窗口到屏幕边缘"
 
-#. first time through
-#: ../src/core/window.c:5704
-#, c-format
+#: data/schemas/org.gnome.metacity.gschema.xml:32
 msgid ""
-"Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
-"window as specified in the ICCCM.\n"
+"If enabled, dropping windows on vertical screen edges maximizes them "
+"vertically and resizes them horizontally to cover half of the available "
+"area. Dropping windows on the top screen edge maximizes them completely."
 msgstr ""
-"窗口 %s 在它自身上设置 SM_CLIENT_ID，而不是按照 ICCCM 规定的那样，设置在 "
-"WM_CLIENT_LEADER 窗口上。\n"
-
-#. We ignore mwm_has_resize_func because WM_NORMAL_HINTS is the
-#. * authoritative source for that info. Some apps such as mplayer or
-#. * xine disable resize via MWM but not WM_NORMAL_HINTS, but that
-#. * leads to e.g. us not fullscreening their windows.  Apps that set
-#. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
-#. * about these apps but make them work.
-#.
-#: ../src/core/window.c:6269
-#, c-format
-msgid ""
-"Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
-"%d x %d and max size %d x %d; this doesn't make much sense.\n"
-msgstr ""
-"窗口 %s 设置了一个 MWM 提示，表明它是不可改变大小的，但设置最小尺寸为 %d x "
-"%d，最大尺寸为 %d x %d；这没有任何意义。\n"
-
-#: ../src/core/window-props.c:244
-#, c-format
-msgid "Application set a bogus _NET_WM_PID %lu\n"
-msgstr "应用程序设置一个假的 _NET_WM_PID %lu\n"
-
-#. Translators: the title of a window from another machine
-#: ../src/core/window-props.c:388
-#, c-format
-msgid "%s (on %s)"
-msgstr "%s (于 %s)"
-
-#. Simple case-- don't bother to look it up.  It's root.
-#: ../src/core/window-props.c:420
-#, c-format
-msgid "%s (as superuser)"
-msgstr "%s (作为超级用户)"
-
-#. Translators: the title of a window owned by another user
-#. * on this machine
-#: ../src/core/window-props.c:438
-#, c-format
-msgid "%s (as %s)"
-msgstr "%s (于 %s)"
+"如果启用了，拖放窗口到垂直屏幕边缘会在垂直方向上最大化它们并且在水平方向上覆"
+"盖半个有效区域。拖放窗口到屏幕顶端边缘会完全最大化它们。"
 
-#. Translators: the title of a window owned by another user
-#. * on this machine, whose name we don't know
-#: ../src/core/window-props.c:444
-#, c-format
-msgid "%s (as another user)"
-msgstr "%s (作为其他用户)"
+#: data/schemas/org.gnome.metacity.gschema.xml:41
+msgid "Window placement behavior"
+msgstr "窗口布局行为"
 
-#: ../src/core/window-props.c:1430
-#, c-format
-msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
-msgstr "为 %2$s 指定了无效的 WM_TRANSIENT_FOR 窗口 0x%1$lx。\n"
-
-#: ../src/core/xprops.c:155
-#, c-format
+#: data/schemas/org.gnome.metacity.gschema.xml:42
 msgid ""
-"Window 0x%lx has property %s\n"
-"that was expected to have type %s format %d\n"
-"and actually has type %s format %d n_items %d.\n"
-"This is most likely an application bug, not a window manager bug.\n"
-"The window has title=\"%s\" class=\"%s\" name=\"%s\"\n"
+"Metacity's default window-placement behavior is smart (first-fit), similar "
+"to behaviors in some other window managers. It will try to tile windows so "
+"that they do not overlap. Set this option to \"smart\" for this behavior. "
+"This option can be set to \"center\" to place new windows in the centers of "
+"their workspaces, \"origin\" for the upper-left corners of the workspaces, "
+"or \"random\" to place new windows at random locations within their "
+"workspaces."
 msgstr ""
-"窗口 0x%lx 的属性 %s\n"
-"的期望类型为 %s、格式为 %d，\n"
-"而实际类型为 %s、格式为 %d、n_items 为 %d。\n"
-"这很可能是应用程序的错误，不是窗口管理器的错误。\n"
-"窗口的标题为“%s”，类别为“%s”，名称为“%s”\n"
-
-#: ../src/core/xprops.c:401
-#, c-format
-msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
-msgstr "窗口 0x%2$lx 上的属性 %1$s 包含无效的 UTF-8\n"
-
-#: ../src/core/xprops.c:484
-#, c-format
-msgid ""
-"Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
-msgstr "窗口 0x%2$lx 上的属性 %1$s 为列表中的条目 %3$d 包含无效的 UTF-8\n"
+"Metacity 的默认窗口布局行为是 smart (最先匹配)，类似于其它一些窗口管理器的行"
+"为。它会尝试平铺窗口以是他们不重叠。设置该选项为“smart”实现此行为。改选项也可"
+"设置为“center”来放置新窗口到它们工作区上的中心，“orgin”为工作区的左上角，或"
+"者“random”来放置新窗口到它们工作区上的随机位置。"
 
-#: ../src/org.gnome.metacity.gschema.xml.in.h:1
-msgid "Compositing Manager"
-msgstr "复合管理器"
-
-#: ../src/org.gnome.metacity.gschema.xml.in.h:2
-msgid "Determines whether Metacity is a compositing manager."
-msgstr "决定 Metacity 是否是复合管理器。"
-
-#: ../src/org.gnome.metacity.gschema.xml.in.h:3
+#: data/schemas/org.gnome.metacity.gschema.xml:57
 msgid "If true, trade off usability for less resource usage"
 msgstr "如果为 true，则以可用性为代价而降低资源占用"
 
-#: ../src/org.gnome.metacity.gschema.xml.in.h:4
+#: data/schemas/org.gnome.metacity.gschema.xml:58
 msgid ""
-"If true, metacity will give the user less feedback by using wireframes, "
+"If true, Metacity will give the user less feedback by using wireframes, "
 "avoiding animations, or other means. This is a significant reduction in "
 "usability for many users, but may allow legacy applications to continue "
 "working, and may also be a useful tradeoff for terminal servers. However, "
 "the wireframe feature is disabled when accessibility is on."
 msgstr ""
-"如果为 true，metacity 将会给用户提供较少的反馈，方法是使用线框、避免动画或者"
+"如果为 true，Metacity 将会给用户提供较少的反馈，方法是使用线框、避免动画或者"
 "其它途径。这对许多用户来说，可用性大打折扣，但是这将允许较早的应用程序和终端"
 "服务器能够顺利运行。此外，如果开启了辅助功能，系统会自动禁用线框特性。"
 
-#: ../src/tools/metacity-message.c:178
-#, c-format
-msgid "Usage: %s\n"
-msgstr "用法：%s\n"
-
-#: ../src/ui/frames.c:1114
-msgid "Close Window"
-msgstr "关闭窗口"
-
-#: ../src/ui/frames.c:1117
-msgid "Window Menu"
-msgstr "窗口菜单"
+#: data/schemas/org.gnome.metacity.theme.gschema.xml:11
+msgid "Theme Name"
+msgstr "主题名称"
 
-#: ../src/ui/frames.c:1120
-msgid "Minimize Window"
-msgstr "最小化窗口"
-
-#: ../src/ui/frames.c:1123
-msgid "Maximize Window"
-msgstr "最大化窗口"
-
-#: ../src/ui/frames.c:1126
-msgid "Restore Window"
-msgstr "恢复窗口"
-
-#: ../src/ui/frames.c:1129
-msgid "Roll Up Window"
-msgstr "卷起窗口"
-
-#: ../src/ui/frames.c:1132
-msgid "Unroll Window"
-msgstr "展开窗口"
-
-#: ../src/ui/frames.c:1135
-msgid "Keep Window On Top"
-msgstr "窗口常居顶端"
-
-#: ../src/ui/frames.c:1138
-msgid "Remove Window From Top"
-msgstr "取消窗口常居顶端"
-
-#: ../src/ui/frames.c:1141
-msgid "Always On Visible Workspace"
-msgstr "总在可见工作区"
-
-#: ../src/ui/frames.c:1144
-msgid "Put Window On Only One Workspace"
-msgstr "只将窗口放在一个工作区"
-
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:70
-msgid "Mi_nimize"
-msgstr "最小化(_N)"
-
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:72
-msgid "Ma_ximize"
-msgstr "最大化(_X)"
-
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:74
-msgid "Unma_ximize"
-msgstr "取消最大化(_X)"
-
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:76
-msgid "Roll _Up"
-msgstr "卷起(_U)"
-
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:78
-msgid "_Unroll"
-msgstr "展开(_U)"
-
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:80
-msgid "_Move"
-msgstr "移动(_M)"
-
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:82
-msgid "_Resize"
-msgstr "改变大小(_R)"
-
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:84
-msgid "Move Titlebar On_screen"
-msgstr "将标题栏上移动到屏幕上(_S)"
-
-#. separator
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:87 ../src/ui/menu.c:89
-msgid "Always on _Top"
-msgstr "常居顶端(_T)"
-
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:91
-msgid "_Always on Visible Workspace"
-msgstr "总在可见工作区(_A)"
+#: data/schemas/org.gnome.metacity.theme.gschema.xml:12
+msgid ""
+"This setting is only used if Metacity is selected as the theme type. You "
+"MUST provide a valid Metacity theme name, otherwise Metacity will fall back "
+"to the default GTK+ theme - Adwaita."
+msgstr ""
+"该设置只在选择 Metacity 作为主题类型时使用。你必须提供一个有效的 Metacity 主"
+"题名称，否则 Metacity 将回退为默认的 GTK+ 主题 - Adwaita。"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:93
-msgid "_Only on This Workspace"
-msgstr "只在此工作区(_O)"
+#: data/schemas/org.gnome.metacity.theme.gschema.xml:21
+msgid "Theme Type"
+msgstr "主题类型"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:95
-msgid "Move to Workspace _Left"
-msgstr "移动到左侧工作区(_L)"
-
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:97
-msgid "Move to Workspace R_ight"
-msgstr "移动到右侧工作区(_I)"
+#: data/schemas/org.gnome.metacity.theme.gschema.xml:22
+msgid ""
+"Metacity supports two theme types - GTK+ (gtk.css) and Metacity (metacity-"
+"theme-x.xml). GTK+ theme: all data is loaded from CSS. This is the same "
+"theme that is used by Mutter for server-side decorations and by GTK+ for "
+"client-side decorations. Metacity theme: data is loaded from metacity-theme-"
+"x.xml and CSS. When using this theme type you MUST provide a valid theme "
+"name."
+msgstr ""
+"Metacity 支持两种主题类型—GTK+ (gtk.css) 和 Metacity (metacity-theme-x.xml)。"
+"GTK+ 主题：全部数据从 CSS 加载。这也是相同的主题为 Mutter 在服务器端装饰和 "
+"GTK+ 在客户端装饰所使用。Metacity 主题：数据从 metacity-theme-x.xml 和 CSS 加"
+"载。当使用该主题类型时你必须提供一个有效的主题名称。"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:99
-msgid "Move to Workspace _Up"
-msgstr "移动到上侧工作区(_U)"
+#: data/ui/theme-viewer-window.ui:86
+msgid "Reload"
+msgstr "重新加载"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:101
-msgid "Move to Workspace _Down"
-msgstr "移动到下侧工作区(_D)"
+#: data/ui/theme-viewer-window.ui:122
+msgid "Dark Theme:"
+msgstr "黑色主题："
 
-#. separator
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/ui/menu.c:105
-msgid "_Close"
-msgstr "关闭(_C)"
+#: data/ui/theme-viewer-window.ui:161
+msgid "Frame Type:"
+msgstr "框架类型："
 
-#: ../src/ui/menu.c:205
-#, c-format
-msgid "Workspace %d%n"
-msgstr "工作区 %d%n"
+#: data/ui/theme-viewer-window.ui:175
+msgid "Normal"
+msgstr "一般"
 
-#: ../src/ui/menu.c:215
-#, c-format
-msgid "Workspace 1_0"
-msgstr "工作区 1_0"
+#: data/ui/theme-viewer-window.ui:176
+msgid "Dialog"
+msgstr "对话框"
 
-#: ../src/ui/menu.c:217
-#, c-format
-msgid "Workspace %s%d"
-msgstr "工作区 %s%d"
+#: data/ui/theme-viewer-window.ui:177
+msgid "Modal Dialog"
+msgstr "模态对话框"
 
-#: ../src/ui/menu.c:398
-msgid "Move to Another _Workspace"
-msgstr "移动到另外的工作区(_W)"
+#: data/ui/theme-viewer-window.ui:178
+msgid "Utility"
+msgstr "工具"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the shift key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/ui/metaaccellabel.c:80
-msgid "Shift"
-msgstr "Shift"
+#: data/ui/theme-viewer-window.ui:179
+msgid "Menu"
+msgstr "菜单"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the control key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/ui/metaaccellabel.c:86
-msgid "Ctrl"
-msgstr "Ctrl"
+#: data/ui/theme-viewer-window.ui:180
+msgid "Border"
+msgstr "边框"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the alt key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/ui/metaaccellabel.c:92
-msgid "Alt"
-msgstr "Alt"
+#: data/ui/theme-viewer-window.ui:181
+msgid "Attached"
+msgstr "附件"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the meta key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/ui/metaaccellabel.c:98
-msgid "Meta"
-msgstr "Meta"
+#: data/ui/theme-viewer-window.ui:209
+msgid "Frame Flags:"
+msgstr "框架标志："
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the super key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/ui/metaaccellabel.c:104
-msgid "Super"
-msgstr "Super"
+#: data/ui/theme-viewer-window.ui:224
+msgid "Has Focus"
+msgstr "获得焦点"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the hyper key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/ui/metaaccellabel.c:110
-msgid "Hyper"
-msgstr "Hyper"
+#: data/ui/theme-viewer-window.ui:239
+msgid "Shaded"
+msgstr "阴影"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the mod2 key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/ui/metaaccellabel.c:116
-msgid "Mod2"
-msgstr "Mod2"
+#: data/ui/theme-viewer-window.ui:253
+msgid "Maximized"
+msgstr "最大化"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the mod3 key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/ui/metaaccellabel.c:122
-msgid "Mod3"
-msgstr "Mod3"
+#: data/ui/theme-viewer-window.ui:267
+msgid "Fullscreen"
+msgstr "全屏"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the mod4 key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/ui/metaaccellabel.c:128
-msgid "Mod4"
-msgstr "Mod4"
+#: data/ui/theme-viewer-window.ui:281
+msgid "Tiled"
+msgstr "平铺"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the mod5 key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/ui/metaaccellabel.c:134
-msgid "Mod5"
-msgstr "Mod5"
+#: data/ui/theme-viewer-window.ui:321
+msgid "Button Layout:"
+msgstr "按钮布局："
 
-#. Translators: This represents the size of a window.  The first number is
-#. * the width of the window and the second is the height.
-#.
-#: ../src/ui/resizepopup.c:113
-#, c-format
-msgid "%d x %d"
-msgstr "%d x %d"
+#: data/ui/theme-viewer-window.ui:360
+msgid "Composited:"
+msgstr "复合："
 
-#: ../src/ui/theme.c:255
-msgid "top"
-msgstr "上"
+#: data/ui/theme-viewer-window.ui:400
+msgid "Scale:"
+msgstr "比例："
 
-#: ../src/ui/theme.c:257
-msgid "bottom"
-msgstr "下"
+#: data/ui/theme-viewer-window.ui:468 theme-viewer/theme-viewer-window.c:636
+msgid "Choose Theme"
+msgstr "选择主题"
 
-#: ../src/ui/theme.c:259
-msgid "left"
-msgstr "左"
+#: data/ui/theme-viewer-window.ui:508
+msgid "Preview"
+msgstr "预览"
 
-#: ../src/ui/theme.c:261
-msgid "right"
-msgstr "右"
+#: data/ui/theme-viewer-window.ui:597 theme-viewer/theme-viewer-window.c:252
+msgid "Run"
+msgstr "运行"
 
-#: ../src/ui/theme.c:288
-#, c-format
-msgid "frame geometry does not specify \"%s\" dimension"
-msgstr "框架几何布局没有指定“%s”尺寸"
+#: data/ui/theme-viewer-window.ui:619
+msgid "Benchmark"
+msgstr "基准"
 
-#: ../src/ui/theme.c:307
-#, c-format
-msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
-msgstr "框架几何布局没有指定“%s”尺寸(该尺寸是为边框“%s”指定的)"
+#: data/ui/theme-viewer-window.ui:652 theme-viewer/theme-viewer-window.c:982
+msgid "Metacity Theme Viewer"
+msgstr "Metacity 主题查看器"
 
-#: ../src/ui/theme.c:344
+#: libmetacity/meta-color-spec.c:246
 #, c-format
-msgid "Button aspect ratio %g is not reasonable"
-msgstr "按钮长宽比 %g 不合理"
+msgid ""
+"GTK custom color specification must have color name and fallback in "
+"parentheses, e.g. gtk:custom(foo,bar); could not parse '%s'"
+msgstr ""
+"GTK 自定义颜色规范必须包含颜色名称和备用于括号中，例如 gtk:custom(foo,bar)；"
+"无法解析“%s”"
 
-#: ../src/ui/theme.c:356
+#: libmetacity/meta-color-spec.c:260
 #, c-format
-msgid "Frame geometry does not specify size of buttons"
-msgstr "框架几何布局没有指定按钮大小"
+msgid ""
+"Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
+"_ are valid"
+msgstr ""
+"无效字符“%c”存在于 gtk:custom 的 color_name 参数，只有 A-Za-z0-9-_ 是有效的"
 
-#: ../src/ui/theme.c:1058
+#: libmetacity/meta-color-spec.c:273
 #, c-format
-msgid "Gradients should have at least two colors"
-msgstr "渐变应至少有两种颜色"
+msgid ""
+"Gtk:custom format is 'gtk:custom(color_name,fallback)', '%s' does not fit "
+"the format"
+msgstr "Gtk:custom 格式为“gtk:custom(color_name,fallback)”，“%s”不符合该格式"
 
-#: ../src/ui/theme.c:1184
+#: libmetacity/meta-color-spec.c:306
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
-"where NORMAL is the state; could not parse \"%s\""
+"where NORMAL is the state; could not parse '%s'"
 msgstr ""
 "GTK 颜色规范必须将状态包含在方括号中，例如 gtk:fg[NORMAL]其中 NORMAL 是状态；"
 "无法解析“%s”"
 
-#: ../src/ui/theme.c:1198
+#: libmetacity/meta-color-spec.c:319
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
-"fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
+"fg[NORMAL] where NORMAL is the state; could not parse '%s'"
 msgstr ""
 "GTK 颜色规范必须在状态后有一个闭方括号，例如 gtk:fg[NORMAL]，其中 NORMAL 是状"
 "态；无法解析“%s”"
 
-#: ../src/ui/theme.c:1209
+#: libmetacity/meta-color-spec.c:328
 #, c-format
-msgid "Did not understand state \"%s\" in color specification"
+msgid "Did not understand state '%s' in color specification"
 msgstr "不理解颜色规范中的状态“%s”"
 
-#: ../src/ui/theme.c:1222
+#: libmetacity/meta-color-spec.c:340
 #, c-format
-msgid "Did not understand color component \"%s\" in color specification"
+msgid "Did not understand color component '%s' in color specification"
 msgstr "不理解颜色规范中的颜色组成部分“%s”"
 
-#: ../src/ui/theme.c:1252
+#: libmetacity/meta-color-spec.c:366
 #, c-format
 msgid ""
-"Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
-"format"
+"Blend format is 'blend/bg_color/fg_color/alpha', '%s' does not fit the format"
 msgstr "混合格式为“blend/bg_color/fg_color/alpha”，“%s”不符合该格式"
 
-#: ../src/ui/theme.c:1263
+#: libmetacity/meta-color-spec.c:376
 #, c-format
-msgid "Could not parse alpha value \"%s\" in blended color"
+msgid "Could not parse alpha value '%s' in blended color"
 msgstr "无法解析混合色中的 Alpha 值“%s”"
 
-#: ../src/ui/theme.c:1273
+#: libmetacity/meta-color-spec.c:385
 #, c-format
-msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
+msgid "Alpha value '%s' in blended color is not between 0.0 and 1.0"
 msgstr "混合色中的 Alpha 值“%s”不在 0.0 到 1.0 之间"
 
-#: ../src/ui/theme.c:1320
+#: libmetacity/meta-color-spec.c:428
 #, c-format
-msgid ""
-"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgid "Shade format is 'shade/base_color/factor', '%s' does not fit the format"
 msgstr "阴影格式为“shade/base_color/factor”，“%s”不符合该格式"
 
-#: ../src/ui/theme.c:1331
+#: libmetacity/meta-color-spec.c:438
 #, c-format
-msgid "Could not parse shade factor \"%s\" in shaded color"
+msgid "Could not parse shade factor '%s' in shaded color"
 msgstr "无法解析阴影色中的阴影因子“%s”"
 
-#: ../src/ui/theme.c:1341
+#: libmetacity/meta-color-spec.c:447
 #, c-format
-msgid "Shade factor \"%s\" in shaded color is negative"
+msgid "Shade factor '%s' in shaded color is negative"
 msgstr "阴影色中的阴影因子“%s”为负数"
 
-#: ../src/ui/theme.c:1370
+#: libmetacity/meta-color-spec.c:473
 #, c-format
-msgid "Could not parse color \"%s\""
+msgid "Could not parse color '%s'"
 msgstr "无法解析颜色“%s”"
 
-#: ../src/ui/theme.c:1624
+#: libmetacity/meta-draw-spec.c:201
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "坐标表达式包含不允许的字符“%s”"
 
-#: ../src/ui/theme.c:1651
+#: libmetacity/meta-draw-spec.c:228
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "坐标表达式包含无法解析的浮点数“%s”"
 
-#: ../src/ui/theme.c:1665
+#: libmetacity/meta-draw-spec.c:241
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "坐标表达式包含无法解析的整数“%s”"
 
-#: ../src/ui/theme.c:1787
+#: libmetacity/meta-draw-spec.c:368
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr "坐标表达式在该文本开始处包含未知的运算符：“%s”"
 
-#: ../src/ui/theme.c:1844
-#, c-format
+#: libmetacity/meta-draw-spec.c:424
 msgid "Coordinate expression was empty or not understood"
 msgstr "坐标表达式为空或无法理解"
 
-#: ../src/ui/theme.c:1955 ../src/ui/theme.c:1965 ../src/ui/theme.c:1999
+#: libmetacity/meta-draw-spec.c:586
 #, c-format
+msgid "Coordinate expression had unknown variable or constant '%s'"
+msgstr "坐标表达式有未知的变量或常数“%s”"
+
+#: libmetacity/meta-draw-spec.c:631 libmetacity/meta-draw-spec.c:641
+#: libmetacity/meta-draw-spec.c:676 libmetacity/meta-draw-spec.c:686
 msgid "Coordinate expression results in division by zero"
 msgstr "坐标表达式用零做除数"
 
-#: ../src/ui/theme.c:2007
-#, c-format
-msgid ""
-"Coordinate expression tries to use mod operator on a floating-point number"
-msgstr "坐标表达式试图对浮点数使用 mod 运算符"
-
-#: ../src/ui/theme.c:2063
+#: libmetacity/meta-draw-spec.c:775
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "坐标表达式的运算符“%s”应该是一个操作数"
 
-#: ../src/ui/theme.c:2072
-#, c-format
+#: libmetacity/meta-draw-spec.c:784
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "坐标表达式的某个操作数应该是运算符"
 
-#: ../src/ui/theme.c:2080
-#, c-format
+#: libmetacity/meta-draw-spec.c:792
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "坐标表达式以运算符结尾，而不是以操作数结尾"
 
-#: ../src/ui/theme.c:2090
+#: libmetacity/meta-draw-spec.c:802
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr "坐标表达式的运算符“%c”后面跟着运算符“%c”，之间没有操作数"
 
-#: ../src/ui/theme.c:2237 ../src/ui/theme.c:2278
-#, c-format
-msgid "Coordinate expression had unknown variable or constant \"%s\""
-msgstr "坐标表达式有未知的变量或常数“%s”"
-
-#: ../src/ui/theme.c:2332
-#, c-format
+#: libmetacity/meta-draw-spec.c:934
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "坐标表达式溢出了其缓冲区。"
 
-#: ../src/ui/theme.c:2361
-#, c-format
+#: libmetacity/meta-draw-spec.c:964
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "坐标表达式有一个闭括号，而没有开括号"
 
-#: ../src/ui/theme.c:2425
-#, c-format
+#: libmetacity/meta-draw-spec.c:1037
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "坐标表达式有一个开括号，而没有闭括号"
 
-#: ../src/ui/theme.c:2436
-#, c-format
+#: libmetacity/meta-draw-spec.c:1047
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "坐标表达式似乎没有任何运算符或操作数"
 
-#: ../src/ui/theme.c:2640 ../src/ui/theme.c:2660 ../src/ui/theme.c:2680
+#: libmetacity/meta-draw-spec.c:1239 libmetacity/meta-draw-spec.c:1259
+#: libmetacity/meta-draw-spec.c:1279
 #, c-format
-msgid "Theme contained an expression that resulted in an error: %s\n"
-msgstr "主题包含的一个表达式产生错误：%s\n"
+msgid "Theme contained an expression that resulted in an error: %s"
+msgstr "主题包含的一个表达式产生错误：%s"
 
-#: ../src/ui/theme.c:4315
-#, c-format
-msgid ""
-"<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
-"specified for this frame style"
-msgstr ""
-"必须为该框架风格指定<button function=\"%s\" state=\"%s\" draw_ops=\"whatever"
-"\"/>"
+#: libmetacity/meta-frame-layout.c:47
+msgid "top"
+msgstr "上"
+
+#: libmetacity/meta-frame-layout.c:49
+msgid "bottom"
+msgstr "下"
+
+#: libmetacity/meta-frame-layout.c:51
+msgid "left"
+msgstr "左"
 
-#: ../src/ui/theme.c:4827 ../src/ui/theme.c:4852
+#: libmetacity/meta-frame-layout.c:53
+msgid "right"
+msgstr "右"
+
+#: libmetacity/meta-frame-layout.c:78
 #, c-format
-msgid ""
-"Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
-msgstr ""
-"缺少 <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
+msgid "frame geometry does not specify '%s' dimension"
+msgstr "框架几何布局没有指定“%s”尺寸"
 
-#: ../src/ui/theme.c:4896
+#: libmetacity/meta-frame-layout.c:97
 #, c-format
-msgid "Failed to load theme \"%s\": %s\n"
-msgstr "无法载入主题“%s”：%s\n"
+msgid "frame geometry does not specify dimension '%s' for border '%s'"
+msgstr "框架几何布局没有指定“%s”尺寸（该尺寸是为边框“%s”指定的）"
 
-#: ../src/ui/theme.c:5026 ../src/ui/theme.c:5033 ../src/ui/theme.c:5040
-#: ../src/ui/theme.c:5047 ../src/ui/theme.c:5054
+#: libmetacity/meta-frame-layout.c:233
 #, c-format
-msgid "No <%s> set for theme \"%s\""
-msgstr "没有为主题“%2$s”设置 <%1$s>"
+msgid "Button aspect ratio %g is not reasonable"
+msgstr "按钮长宽比 %g 不合理"
 
-#: ../src/ui/theme.c:5062
+#: libmetacity/meta-frame-layout.c:251
+msgid "Frame geometry does not specify size of buttons"
+msgstr "框架几何布局没有指定按钮大小"
+
+#. Translators: This error occurs when a <frame> tag is missing
+#. * in theme XML.  The "<frame ...>" is intended as a noun phrase,
+#. * and the "missing" qualifies it.  You should translate "whatever".
+#.
+#: libmetacity/meta-frame-style.c:144 libmetacity/meta-frame-style.c:469
 #, c-format
-msgid ""
-"No frame style set for window type \"%s\" in theme \"%s\", add a <window "
-"type=\"%s\" style_set=\"whatever\"/> element"
+msgid "Missing <frame state='%s' resize='%s' focus='%s' style='whatever' />"
 msgstr ""
-"没有为窗口类型“%s”(在主题“%s”中)设置框架风格，请添加一个 <window type=\"%s\" "
-"style_set=\"whatever\"/> 元素"
+"缺少 <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 
-#: ../src/ui/theme.c:5505 ../src/ui/theme.c:5567 ../src/ui/theme.c:5630
+#: libmetacity/meta-frame-style.c:326
 #, c-format
 msgid ""
-"User-defined constants must begin with a capital letter; \"%s\" does not"
-msgstr "用户定义的常数必须以大写字母开头；而“%s”却不必"
+"<button function='%s' state='%s' draw_ops='whatever'/> must be specified for "
+"this frame style"
+msgstr ""
+"必须为该框架风格指定<button function=\"%s\" state=\"%s\" draw_ops=\"whatever"
+"\"/>"
+
+#: libmetacity/meta-gradient-spec.c:182
+msgid "Gradients should have at least two colors"
+msgstr "渐变应至少有两种颜色"
 
-#: ../src/ui/theme.c:5513 ../src/ui/theme.c:5575 ../src/ui/theme.c:5638
+#: libmetacity/meta-theme-impl.c:41
 #, c-format
-msgid "Constant \"%s\" has already been defined"
-msgstr "常数“%s”已被定义"
+msgid "MetaThemeImplClass::load not implemented for '%s'"
+msgstr "MetaThemeImplClass::load 未实现于“%s”"
 
 #. Translators: This means that an attribute which should have been found
 #. * on an XML element was not in fact found.
 #.
-#: ../src/ui/theme-parser.c:202
+#: libmetacity/meta-theme-metacity.c:51
 #, c-format
-msgid "No \"%s\" attribute on element <%s>"
+msgid "No '%s' attribute on element <%s>"
 msgstr "元素 <%2$s> 上没有“%1$s”属性"
 
-#: ../src/ui/theme-parser.c:231 ../src/ui/theme-parser.c:249
+#: libmetacity/meta-theme-metacity.c:305 libmetacity/meta-theme-metacity.c:324
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "行 %d 字符 %d：%s"
 
-#: ../src/ui/theme-parser.c:413
+#: libmetacity/meta-theme-metacity.c:364
 #, c-format
-msgid "Attribute \"%s\" repeated twice on the same <%s> element"
-msgstr "属性“%s”在同一个 <%s> 元素上重复了两次"
-
-#: ../src/ui/theme-parser.c:437 ../src/ui/theme-parser.c:480
-#, c-format
-msgid "Attribute \"%s\" is invalid on <%s> element in this context"
-msgstr "在该上下文中，属性“%s”对 <%s> 元素无效"
-
-#: ../src/ui/theme-parser.c:522
-#, c-format
-msgid "Could not parse \"%s\" as an integer"
+msgid "Could not parse '%s' as an integer"
 msgstr "无法将“%s” 解析为整数"
 
-#: ../src/ui/theme-parser.c:531 ../src/ui/theme-parser.c:586
+#: libmetacity/meta-theme-metacity.c:372 libmetacity/meta-theme-metacity.c:589
 #, c-format
-msgid "Did not understand trailing characters \"%s\" in string \"%s\""
-msgstr "不理解结尾字符“%1$s”(位于字符串“%2$s”中)"
+msgid "Did not understand trailing characters '%s' in string '%s'"
+msgstr "不理解结尾字符“%1$s”（位于字符串“%2$s”中）"
 
-#: ../src/ui/theme-parser.c:541
+#: libmetacity/meta-theme-metacity.c:381
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr "整数 %ld 必须是正数"
 
-#: ../src/ui/theme-parser.c:549
+#: libmetacity/meta-theme-metacity.c:388
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr "整数 %ld 过大，当前最大值为 %d"
 
-#: ../src/ui/theme-parser.c:577 ../src/ui/theme-parser.c:693
+#: libmetacity/meta-theme-metacity.c:490
 #, c-format
-msgid "Could not parse \"%s\" as a floating point number"
-msgstr "无法将“%s”解析为浮点数"
+msgid "Attribute '%s' repeated twice on the same <%s> element"
+msgstr "属性“%s”在同一个 <%s> 元素上重复了两次"
 
-#: ../src/ui/theme-parser.c:608 ../src/ui/theme-parser.c:636
+#: libmetacity/meta-theme-metacity.c:512 libmetacity/meta-theme-metacity.c:556
 #, c-format
-msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
-msgstr "布尔值必须为“真”或“假”，不能为“%s”"
+msgid "Attribute '%s' is invalid on <%s> element in this context"
+msgstr "在该上下文中，属性“%s”对 <%s> 元素无效"
 
-#: ../src/ui/theme-parser.c:663
+#: libmetacity/meta-theme-metacity.c:581 libmetacity/meta-theme-metacity.c:619
 #, c-format
-msgid "Angle must be between 0.0 and 360.0, was %g\n"
-msgstr "角度值必须界于 0.0 到 360.0 之间，现在是 %g\n"
+msgid "Could not parse '%s' as a floating point number"
+msgstr "无法将“%s”解析为浮点数"
 
-#: ../src/ui/theme-parser.c:726
+#: libmetacity/meta-theme-metacity.c:651
 #, c-format
-msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
-msgstr "Alpha 值必须界于 0.0(不可见)到 1.0(完全不透明)之间，现在是 %g\n"
+msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g"
+msgstr "Alpha 值必须界于 0.0（不可见）到 1.0（完全不透明）之间，现在是 %g"
 
-#: ../src/ui/theme-parser.c:791
+#: libmetacity/meta-theme-metacity.c:697
 #, c-format
 msgid ""
-"Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
-"large,x-large,xx-large)\n"
+"Invalid title scale '%s' (must be one of xx-small,x-small,small,medium,large,"
+"x-large,xx-large)\n"
 msgstr ""
-"无效的标题比例“%s”(必须是 xx-small、x-small、small、medium、large、x-large、"
-"xx-large 中的一个)\n"
+"无效的标题比例“%s”（必须是 xx-small、x-small、small、medium、large、x-large、"
+"xx-large 中的一个）\n"
+
+#: libmetacity/meta-theme-metacity.c:726 libmetacity/meta-theme-metacity.c:754
+#, c-format
+msgid "Boolean values must be 'true' or 'false' not '%s'"
+msgstr "布尔值必须为“true”或“false”，不能为“%s”"
+
+#: libmetacity/meta-theme-metacity.c:783 libmetacity/meta-theme-metacity.c:820
+#: libmetacity/meta-theme-metacity.c:858
+#, c-format
+msgid "User-defined constants must begin with a capital letter; '%s' does not"
+msgstr "用户定义的常数必须以大写字母开头；而“%s”却不必"
+
+#: libmetacity/meta-theme-metacity.c:792 libmetacity/meta-theme-metacity.c:829
+#: libmetacity/meta-theme-metacity.c:867
+#, c-format
+msgid "Constant '%s' has already been defined"
+msgstr "常数“%s”已被定义"
 
-#: ../src/ui/theme-parser.c:947 ../src/ui/theme-parser.c:1010
-#: ../src/ui/theme-parser.c:1044 ../src/ui/theme-parser.c:1147
+#: libmetacity/meta-theme-metacity.c:1074
+#: libmetacity/meta-theme-metacity.c:1171
+#: libmetacity/meta-theme-metacity.c:1273
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr "再次使用了 <%s> 名称“%s”"
 
-#: ../src/ui/theme-parser.c:959 ../src/ui/theme-parser.c:1056
-#: ../src/ui/theme-parser.c:1159
+#: libmetacity/meta-theme-metacity.c:1086
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr "<%s> 父级“%s”尚未定义"
 
-#: ../src/ui/theme-parser.c:1069
+#: libmetacity/meta-theme-metacity.c:1137
 #, c-format
-msgid "<%s> geometry \"%s\" has not been defined"
+msgid "<%s> name '%s' used a second time"
+msgstr "再次使用了 <%s> 名称“%s”"
+
+#: libmetacity/meta-theme-metacity.c:1183
+#: libmetacity/meta-theme-metacity.c:1285
+#, c-format
+msgid "<%s> parent '%s' has not been defined"
+msgstr "<%s> 父级“%s”尚未定义"
+
+#: libmetacity/meta-theme-metacity.c:1196
+#, c-format
+msgid "<%s> geometry '%s' has not been defined"
 msgstr "<%s> 几何布局“%s”尚未定义"
 
-#: ../src/ui/theme-parser.c:1082
+#: libmetacity/meta-theme-metacity.c:1209
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr "<%s> 必须指定一个几何布局或者一个带有几何布局的父级"
 
-#: ../src/ui/theme-parser.c:1124
+#: libmetacity/meta-theme-metacity.c:1250
 msgid "You must specify a background for an alpha value to be meaningful"
 msgstr "要让 alpha 值有意义，您必须指定背景"
 
-#: ../src/ui/theme-parser.c:1191
+#: libmetacity/meta-theme-metacity.c:1318
 #, c-format
-msgid "Unknown type \"%s\" on <%s> element"
+msgid "Unknown type '%s' on <%s> element"
 msgstr "未知的类型“%s”在元素 <%s> 上"
 
-#: ../src/ui/theme-parser.c:1202
+#: libmetacity/meta-theme-metacity.c:1327
 #, c-format
-msgid "Unknown style_set \"%s\" on <%s> element"
+msgid "Unknown style_set '%s' on <%s> element"
 msgstr "未知的 style_set“%s”在元素 <%s> 上"
 
-#: ../src/ui/theme-parser.c:1210
+#: libmetacity/meta-theme-metacity.c:1335
 #, c-format
-msgid "Window type \"%s\" has already been assigned a style set"
+msgid "Window type '%s' has already been assigned a style set"
 msgstr "已经为窗口类型“%s”指定了一种风格设置"
 
-#: ../src/ui/theme-parser.c:1240 ../src/ui/theme-parser.c:1304
-#: ../src/ui/theme-parser.c:1530 ../src/ui/theme-parser.c:2751
-#: ../src/ui/theme-parser.c:2797 ../src/ui/theme-parser.c:2945
-#: ../src/ui/theme-parser.c:3137 ../src/ui/theme-parser.c:3175
-#: ../src/ui/theme-parser.c:3213 ../src/ui/theme-parser.c:3251
+#: libmetacity/meta-theme-metacity.c:1364
+#: libmetacity/meta-theme-metacity.c:1428
+#: libmetacity/meta-theme-metacity.c:1654
+#: libmetacity/meta-theme-metacity.c:2808
+#: libmetacity/meta-theme-metacity.c:2854
+#: libmetacity/meta-theme-metacity.c:3094
+#: libmetacity/meta-theme-metacity.c:3130
+#: libmetacity/meta-theme-metacity.c:3166
+#: libmetacity/meta-theme-metacity.c:3202
+#: libmetacity/meta-theme-metacity.c:3499
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "不允许元素 <%s> 在 <%s> 下方"
 
-#: ../src/ui/theme-parser.c:1354 ../src/ui/theme-parser.c:1368
-#: ../src/ui/theme-parser.c:1413
+#: libmetacity/meta-theme-metacity.c:1464
+#: libmetacity/meta-theme-metacity.c:1590
+#: libmetacity/meta-theme-metacity.c:1604
 msgid ""
-"Cannot specify both \"button_width\"/\"button_height\" and \"aspect_ratio\" "
-"for buttons"
+"Cannot specify both 'button_width'/'button_height' and 'aspect_ratio' for "
+"buttons"
 msgstr "不能同时指定按钮的“button_width”、“button_height”和“aspect_ratio”"
 
-#: ../src/ui/theme-parser.c:1377
+#: libmetacity/meta-theme-metacity.c:1473
 #, c-format
-msgid "Distance \"%s\" is unknown"
-msgstr "距离“%s”未知"
-
-#: ../src/ui/theme-parser.c:1422
-#, c-format
-msgid "Aspect ratio \"%s\" is unknown"
+msgid "Aspect ratio '%s' is unknown"
 msgstr "长宽比“%s”未知"
 
-#: ../src/ui/theme-parser.c:1484
+#: libmetacity/meta-theme-metacity.c:1535
 #, c-format
-msgid "Border \"%s\" is unknown"
+msgid "Border '%s' is unknown"
 msgstr "边框“%s”未知"
 
-#: ../src/ui/theme-parser.c:1795
+#: libmetacity/meta-theme-metacity.c:1613
+#, c-format
+msgid "Distance '%s' is unknown"
+msgstr "距离“%s”未知"
+
+#: libmetacity/meta-theme-metacity.c:1824
+#, c-format
+msgid "Angle must be between 0.0 and 360.0, was %g\n"
+msgstr "角度值必须界于 0.0 到 360.0 之间，现在是 %g\n"
+
+#: libmetacity/meta-theme-metacity.c:2013
 #, c-format
 msgid "No \"start_angle\" or \"from\" attribute on element <%s>"
 msgstr "元素 <%s> 上没有“start_angle”或“from”属性"
 
-#: ../src/ui/theme-parser.c:1802
+#: libmetacity/meta-theme-metacity.c:2020
 #, c-format
 msgid "No \"extent_angle\" or \"to\" attribute on element <%s>"
 msgstr "元素 <%s> 上没有“extent_angle”或“to”属性"
 
-#: ../src/ui/theme-parser.c:2042
+#: libmetacity/meta-theme-metacity.c:2206
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr "不理解梯度类型的值“%s”"
 
-#: ../src/ui/theme-parser.c:2120 ../src/ui/theme-parser.c:2495
+#: libmetacity/meta-theme-metacity.c:2271
+#: libmetacity/meta-theme-metacity.c:2593
 #, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
-msgstr "不理解填充类型“%s”(用于 <%s> 元素)"
+msgstr "不理解填充类型“%s”（用于 <%s> 元素）"
 
-#: ../src/ui/theme-parser.c:2287 ../src/ui/theme-parser.c:2370
-#: ../src/ui/theme-parser.c:2433
+#: libmetacity/meta-theme-metacity.c:2424
+#: libmetacity/meta-theme-metacity.c:2493
+#: libmetacity/meta-theme-metacity.c:2544
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
-msgstr "不理解状态“%s”(用于 <%s> 元素)"
+msgstr "不理解状态“%s”（用于 <%s> 元素）"
 
-#: ../src/ui/theme-parser.c:2297 ../src/ui/theme-parser.c:2380
+#: libmetacity/meta-theme-metacity.c:2434
+#: libmetacity/meta-theme-metacity.c:2503
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
-msgstr "不理解阴影“%s”(用于 <%s> 元素)"
+msgstr "不理解阴影“%s”（用于 <%s> 元素）"
 
-#: ../src/ui/theme-parser.c:2307
+#: libmetacity/meta-theme-metacity.c:2444
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
-msgstr "不理解箭头“%s”(用于 <%s> 元素)"
+msgstr "不理解箭头“%s”（用于 <%s> 元素）"
 
-#: ../src/ui/theme-parser.c:2607 ../src/ui/theme-parser.c:2703
+#: libmetacity/meta-theme-metacity.c:2693
+#: libmetacity/meta-theme-metacity.c:2760
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr "尚未定义名为“%s”的 <draw_ops>"
 
-#: ../src/ui/theme-parser.c:2619 ../src/ui/theme-parser.c:2715
+#: libmetacity/meta-theme-metacity.c:2705
+#: libmetacity/meta-theme-metacity.c:2772
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr "此处包括 draw_ops“%s”将创建一个循环引用"
 
-#: ../src/ui/theme-parser.c:2830
+#: libmetacity/meta-theme-metacity.c:2981
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr "框架段的位置“%s”未知"
 
-#: ../src/ui/theme-parser.c:2838
+#: libmetacity/meta-theme-metacity.c:2989
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr "在位置 %s 处已经有一段框架风格"
 
-#: ../src/ui/theme-parser.c:2855 ../src/ui/theme-parser.c:2930
+#: libmetacity/meta-theme-metacity.c:3005
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr "尚未定义名为“%s”的 <draw_ops>"
 
-#: ../src/ui/theme-parser.c:2884
+#: libmetacity/meta-theme-metacity.c:3036
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr "按钮的函数“%s”未知"
 
-#: ../src/ui/theme-parser.c:2893
+#: libmetacity/meta-theme-metacity.c:3047
 #, c-format
-msgid "Button function \"%s\" does not exist in this version (%d, need %d)"
-msgstr "按钮函数“%s”在此版本(%d，需要的是 %d)中不存在"
+msgid "Button function '%s' does not exist in this version (%d, need %d)"
+msgstr "按钮函数“%s”在此版本（%d，需要的是 %d）中不存在"
 
-#: ../src/ui/theme-parser.c:2905
+#: libmetacity/meta-theme-metacity.c:3056
 #, c-format
-msgid "Unknown state \"%s\" for button"
+msgid "Unknown state '%s' for button"
 msgstr "按钮的状态“%s”未知"
 
-#: ../src/ui/theme-parser.c:2913
+#: libmetacity/meta-theme-metacity.c:3063
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr "框架风格已经有一个函数为 %s、状态为 %s 的按钮"
 
-#: ../src/ui/theme-parser.c:2984
+#: libmetacity/meta-theme-metacity.c:3080
 #, c-format
-msgid "\"%s\" is not a valid value for focus attribute"
+msgid "No <draw_ops> with the name '%s' has been defined"
+msgstr "尚未定义名为“%s”的 <draw_ops>"
+
+#: libmetacity/meta-theme-metacity.c:3114
+msgid ""
+"Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
+"attribute and also a <draw_ops> element, or specified two elements)"
+msgstr ""
+"一个 <piece> 元素不能有两个 draw_ops（主题指定了一个 draw_ops属性和一个 "
+"<draw_ops> 元素，或者指定了两个元素）"
+
+#: libmetacity/meta-theme-metacity.c:3150
+msgid ""
+"Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
+"attribute and also a <draw_ops> element, or specified two elements)"
+msgstr ""
+"一个 <button> 元素不能有两个 draw_ops（主题指定了一个 draw_ops属性和一个 "
+"<draw_ops> 元素，或者指定了两个元素）"
+
+#: libmetacity/meta-theme-metacity.c:3186
+msgid ""
+"Can't have a two draw_ops for a <menu_icon> element (theme specified a "
+"draw_ops attribute and also a <draw_ops> element, or specified two elements)"
+msgstr ""
+"一个 <menu_icon> 元素不能有两个 draw_ops（主题指定了一个draw_ops 属性和一个 "
+"<draw_ops> 元素，或者指定了两个元素）"
+
+#: libmetacity/meta-theme-metacity.c:3290
+#, c-format
+msgid "'%s' is not a valid value for focus attribute"
 msgstr "“%s”不是 focus 属性的有效值"
 
-#: ../src/ui/theme-parser.c:2993
+#: libmetacity/meta-theme-metacity.c:3299
 #, c-format
-msgid "\"%s\" is not a valid value for state attribute"
+msgid "'%s' is not a valid value for state attribute"
 msgstr "“%s”不是 state 属性的有效值"
 
-#: ../src/ui/theme-parser.c:3003
+#: libmetacity/meta-theme-metacity.c:3308
 #, c-format
-msgid "A style called \"%s\" has not been defined"
+msgid "A style called '%s' has not been defined"
 msgstr "尚未定义名为“%s”的风格"
 
-#: ../src/ui/theme-parser.c:3024 ../src/ui/theme-parser.c:3047
+#: libmetacity/meta-theme-metacity.c:3326
+#: libmetacity/meta-theme-metacity.c:3349
 #, c-format
-msgid "\"%s\" is not a valid value for resize attribute"
+msgid "'%s' is not a valid value for resize attribute"
 msgstr "“%s”不是 resize 属性的有效值"
 
-#: ../src/ui/theme-parser.c:3058
+#: libmetacity/meta-theme-metacity.c:3360
 #, c-format
 msgid ""
-"Should not have \"resize\" attribute on <%s> element for maximized/shaded "
+"Should not have 'resize' attribute on <%s> element for maximized/shaded "
 "states"
 msgstr "状态为 maximized/shaded 的 <%s> 元素不应有“resize”属性"
 
-#: ../src/ui/theme-parser.c:3072
+#: libmetacity/meta-theme-metacity.c:3381
 #, c-format
-msgid ""
-"Should not have \"resize\" attribute on <%s> element for maximized states"
+msgid "Should not have 'resize' attribute on <%s> element for maximized states"
 msgstr "状态为 maximized 的 <%s> 元素不应有“resize”属性"
 
-#: ../src/ui/theme-parser.c:3086 ../src/ui/theme-parser.c:3108
+#: libmetacity/meta-theme-metacity.c:3396
+#: libmetacity/meta-theme-metacity.c:3444
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr "已经为 state 属性 %s、resize 属性 %s、focus 属性 %s 指定了风格"
 
-#: ../src/ui/theme-parser.c:3097 ../src/ui/theme-parser.c:3119
+#: libmetacity/meta-theme-metacity.c:3408
+#: libmetacity/meta-theme-metacity.c:3420
+#: libmetacity/meta-theme-metacity.c:3432
+#: libmetacity/meta-theme-metacity.c:3456
+#: libmetacity/meta-theme-metacity.c:3468
+#: libmetacity/meta-theme-metacity.c:3480
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr "已经为 state 属性 %s、focus 属性 %s 指定了风格"
 
-#: ../src/ui/theme-parser.c:3158
-msgid ""
-"Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
-"attribute and also a <draw_ops> element, or specified two elements)"
-msgstr ""
-"一个 <piece> 元素不能有两个 draw_ops(主题指定了一个 draw_ops属性和一个 "
-"<draw_ops> 元素，或者指定了两个元素)"
+#: libmetacity/meta-theme-metacity.c:3546
+#, c-format
+msgid "Bad version specification '%s'"
+msgstr "损坏的版本规范“%s”"
 
-#: ../src/ui/theme-parser.c:3196
+#: libmetacity/meta-theme-metacity.c:3617
 msgid ""
-"Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
-"attribute and also a <draw_ops> element, or specified two elements)"
+"'version' attribute cannot be used in metacity-theme-1.xml or metacity-"
+"theme-2.xml"
 msgstr ""
-"一个 <button> 元素不能有两个 draw_ops(主题指定了一个 draw_ops属性和一个 "
-"<draw_ops> 元素，或者指定了两个元素)"
+"“version”属性无法被用在 metacity-theme-1.xml 或者 metacity-theme-2.xml 里面"
 
-#: ../src/ui/theme-parser.c:3234
-msgid ""
-"Can't have a two draw_ops for a <menu_icon> element (theme specified a "
-"draw_ops attribute and also a <draw_ops> element, or specified two elements)"
-msgstr ""
-"一个 <menu_icon> 元素不能有两个 draw_ops(主题指定了一个draw_ops 属性和一个 "
-"<draw_ops> 元素，或者指定了两个元素)"
+#: libmetacity/meta-theme-metacity.c:3640
+#, c-format
+msgid "Theme requires version %s but latest supported theme version is %d.%d"
+msgstr "主题需要版本 %s 但是最新支持的主题版本为 %d.%d"
 
-#: ../src/ui/theme-parser.c:3282
+#: libmetacity/meta-theme-metacity.c:3664
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr "主题中最外面的元素必须是 <metacity_theme>，而不能是 <%s>"
 
-#: ../src/ui/theme-parser.c:3302
+#: libmetacity/meta-theme-metacity.c:3684
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
 msgstr "name/author/date/description 元素中不允许有元素 <%s>"
 
-#: ../src/ui/theme-parser.c:3307
+#: libmetacity/meta-theme-metacity.c:3690
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr "<constant> 元素中不允许有元素 <%s>"
 
-#: ../src/ui/theme-parser.c:3319
+#: libmetacity/meta-theme-metacity.c:3703
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr "distance/border/aspect_ratio 元素中不允许有元素 <%s>"
 
-#: ../src/ui/theme-parser.c:3341
+#: libmetacity/meta-theme-metacity.c:3726
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr "draw operation 元素中不允许有元素 <%s>"
 
-#: ../src/ui/theme-parser.c:3351 ../src/ui/theme-parser.c:3381
-#: ../src/ui/theme-parser.c:3386 ../src/ui/theme-parser.c:3391
+#: libmetacity/meta-theme-metacity.c:3737
+#: libmetacity/meta-theme-metacity.c:3768
+#: libmetacity/meta-theme-metacity.c:3774
+#: libmetacity/meta-theme-metacity.c:3780
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "元素 <%s> 不允许出现在 <%s> 元素内"
 
-#: ../src/ui/theme-parser.c:3613
+#. Translators: This error means that a necessary XML tag (whose name
+#. * is given in angle brackets) was not found in a given theme (whose
+#. * name is given second, in quotation marks).
+#.
+#: libmetacity/meta-theme-metacity.c:3834
+#: libmetacity/meta-theme-metacity.c:3842
+#: libmetacity/meta-theme-metacity.c:3850
+#: libmetacity/meta-theme-metacity.c:3858
+#: libmetacity/meta-theme-metacity.c:3867
+#, c-format
+msgid "No <%s> set for theme '%s'"
+msgstr "没有为主题“%2$s”设置 <%1$s>"
+
+#: libmetacity/meta-theme-metacity.c:3878
+#, c-format
+msgid ""
+"No frame style set for window type '%s' in theme '%s', add a <window "
+"type='%s' style_set='whatever' /> element"
+msgstr ""
+"没有为窗口类型“%s”（在主题“%s”中）设置框架风格，请添加一个 <window type=\"%s"
+"\" style_set=\"whatever\"/> 元素"
+
+#: libmetacity/meta-theme-metacity.c:4141
 msgid "No draw_ops provided for frame piece"
 msgstr "没有为框架段提供 draw_ops"
 
-#: ../src/ui/theme-parser.c:3628
+#: libmetacity/meta-theme-metacity.c:4157
 msgid "No draw_ops provided for button"
 msgstr "没有为按钮提供 draw_ops"
 
-#: ../src/ui/theme-parser.c:3680
-#, c-format
-msgid "No text is allowed inside element <%s>"
-msgstr "元素 <%s> 中不允许有文本"
-
-#: ../src/ui/theme-parser.c:3735 ../src/ui/theme-parser.c:3747
-#: ../src/ui/theme-parser.c:3759 ../src/ui/theme-parser.c:3771
-#: ../src/ui/theme-parser.c:3783
+#: libmetacity/meta-theme-metacity.c:4272
+#: libmetacity/meta-theme-metacity.c:4283
+#: libmetacity/meta-theme-metacity.c:4294
+#: libmetacity/meta-theme-metacity.c:4305
+#: libmetacity/meta-theme-metacity.c:4316
 #, c-format
 msgid "<%s> specified twice for this theme"
 msgstr "为此主题指定了两次<%s>"
 
-#: ../src/ui/theme-parser.c:4051
+#: libmetacity/meta-theme-metacity.c:4355
 #, c-format
-msgid "Failed to find a valid file for theme %s\n"
-msgstr "找不到主题 %s 的有效文件\n"
+msgid "No text is allowed inside element <%s>"
+msgstr "元素 <%s> 中不允许有文本"
 
-#: ../src/ui/theme-parser.c:4107
+#: libmetacity/meta-theme-metacity.c:4621
 #, c-format
-msgid "Theme file %s did not contain a root <metacity_theme> element"
-msgstr "主题文件 %s 不包含根 <metacity_theme> 元素"
+msgid "Failed to find a valid file for theme '%s'"
+msgstr "找不到主题“%s”的有效文件"
 
-#: ../src/ui/theme-viewer.c:99
-msgid "_Windows"
-msgstr "窗口(_W)"
+#: src/core/bell.c:279
+msgid "Bell event"
+msgstr "响铃事件"
 
-#: ../src/ui/theme-viewer.c:100
-msgid "_Dialog"
-msgstr "对话框(_D)"
+#. Translators: %s is a window title
+#: src/core/delete.c:94
+#, c-format
+msgid "<tt>%s</tt> is not responding."
+msgstr "<tt>%s<tt> 未响应。"
 
-#: ../src/ui/theme-viewer.c:101
-msgid "_Modal dialog"
-msgstr "模态对话框(_M)"
+#: src/core/delete.c:99
+msgid ""
+"You may choose to wait a short while for it to continue or force the "
+"application to quit entirely."
+msgstr "您可以选择稍等一会儿然后继续，或者强制退出该应用程序。"
 
-#: ../src/ui/theme-viewer.c:102
-msgid "_Utility"
-msgstr "工具(_U)"
+#: src/core/delete.c:108
+msgid "_Wait"
+msgstr "等待(_W)"
 
-#: ../src/ui/theme-viewer.c:103
-msgid "_Splashscreen"
-msgstr "启动屏幕(_S)"
+#: src/core/delete.c:108
+msgid "_Force Quit"
+msgstr "强制退出(_F)"
 
-#: ../src/ui/theme-viewer.c:104
-msgid "_Top dock"
-msgstr "上侧停靠(_T)"
+#: src/core/main.c:101
+#, c-format
+msgid ""
+"metacity %s\n"
+"Copyright (C) 2001-%s Havoc Pennington, Red Hat, Inc., and others\n"
+"This is free software; see the source for copying conditions.\n"
+"There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
+"PARTICULAR PURPOSE.\n"
+msgstr ""
+"metacity %s\n"
+"Copyright (C) 2001-%s Havoc Pennington, Red Hat, Inc., 以及其他人\n"
+"这是自由软件；版权条款请参见源码.\n"
+"不作任何保证；即使是对适销性或者适合某种特定目的也不作保证。\n"
 
-#: ../src/ui/theme-viewer.c:105
-msgid "_Bottom dock"
-msgstr "下侧停靠(_B)"
+#: src/core/main.c:215
+msgid "Disable connection to session manager"
+msgstr "禁止连接到会话管理器"
 
-#: ../src/ui/theme-viewer.c:106
-msgid "_Left dock"
-msgstr "左侧停靠(_L)"
+#: src/core/main.c:221
+msgid "Replace the running window manager with Metacity"
+msgstr "将运行中的窗口管理器替换为 Metacity"
 
-#: ../src/ui/theme-viewer.c:107
-msgid "_Right dock"
-msgstr "右侧停靠(_R)"
+#: src/core/main.c:227
+msgid "Specify session management ID"
+msgstr "指定会话管理 ID"
 
-#: ../src/ui/theme-viewer.c:108
-msgid "_All docks"
-msgstr "全部停靠(_A)"
+#: src/core/main.c:232
+msgid "X Display to use"
+msgstr "要使用的 X 显示"
 
-#: ../src/ui/theme-viewer.c:109
-msgid "Des_ktop"
-msgstr "桌面(_K)"
+#: src/core/main.c:238
+msgid "Initialize session from savefile"
+msgstr "从保存文件中初始化会话"
+
+#: src/core/main.c:244
+msgid "Print version"
+msgstr "打印版本"
 
-#: ../src/ui/theme-viewer.c:115
-msgid "Open another one of these windows"
-msgstr "打开这些窗口中的另外一个"
+#: src/core/main.c:250
+msgid "Make X calls synchronous"
+msgstr "使 X 调用同步"
 
-#: ../src/ui/theme-viewer.c:117
-msgid "This is a demo button with an 'open' icon"
-msgstr "这是一个演示按钮，带有“打开”图标"
+#: src/core/main.c:256
+msgid "Turn compositing on"
+msgstr "打开复合效果"
 
-#: ../src/ui/theme-viewer.c:119
-msgid "This is a demo button with a 'quit' icon"
-msgstr "这是一个演示按钮，带有“退出”图标"
+#: src/core/main.c:262
+msgid "Turn compositing off"
+msgstr "关闭复合效果"
 
-#: ../src/ui/theme-viewer.c:253
-msgid "This is a sample message in a sample dialog"
-msgstr "这是示例对话框中的示例消息"
+#: src/core/main.c:268
+msgid ""
+"Don't make fullscreen windows that are maximized and have no decorations"
+msgstr "不要将已最大化的窗口全屏，不要做任何装饰"
 
-#: ../src/ui/theme-viewer.c:336
+#: src/core/prefs.c:1524
 #, c-format
-msgid "Fake menu item %d\n"
-msgstr "虚假菜单项 %d\n"
+msgid "Workspace %d"
+msgstr "工作区 %d"
 
-#: ../src/ui/theme-viewer.c:370
-msgid "Border-only window"
-msgstr "只有边框的窗口"
+#: src/core/session.c:1210
+msgid "<metacity_session> attribute seen but we already have the session ID"
+msgstr "<metacity_session> 属性已看到，但我们已经拥有该会话 ID"
 
-#: ../src/ui/theme-viewer.c:372
-msgid "Bar"
-msgstr "栏"
+#: src/core/session.c:1223 src/core/session.c:1298 src/core/session.c:1330
+#: src/core/session.c:1402 src/core/session.c:1462
+#, c-format
+msgid "Unknown attribute %s on <%s> element"
+msgstr "<%2$s> 元素上未知的属性 %1$s"
 
-#: ../src/ui/theme-viewer.c:389
-msgid "Normal Application Window"
-msgstr "普通的应用程序窗口"
+#: src/core/session.c:1240
+msgid "nested <window> tag"
+msgstr "嵌套 <window> 标记"
 
-#: ../src/ui/theme-viewer.c:393
-msgid "Dialog Box"
-msgstr "对话框"
+#: src/core/session.c:1482
+#, c-format
+msgid "Unknown element %s"
+msgstr "未知的元素 %s"
 
-#: ../src/ui/theme-viewer.c:397
-msgid "Modal Dialog Box"
-msgstr "模态对话框"
+#: src/core/session.c:1838
+msgid ""
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
+msgstr ""
+"这些窗口不支持&quot;保存当前设置&quot;，您在下次登录时，必须手动重启动它们。"
 
-#: ../src/ui/theme-viewer.c:401
-msgid "Utility Palette"
-msgstr "工具盘"
+#: src/core/util.c:105
+#, c-format
+msgid "Opened log file %s\n"
+msgstr "打开的日志文件 %s\n"
 
-#: ../src/ui/theme-viewer.c:405
-msgid "Torn-off Menu"
-msgstr "撕下的菜单"
+#. Translators: the title of a window from another machine
+#: src/core/window-props.c:570
+#, c-format
+msgid "%s (on %s)"
+msgstr "%s（于 %s）"
 
-#: ../src/ui/theme-viewer.c:409
-msgid "Border"
-msgstr "边框"
+#. Simple case-- don't bother to look it up.  It's root.
+#: src/core/window-props.c:602
+#, c-format
+msgid "%s (as superuser)"
+msgstr "%s（以超级用户）"
 
-#: ../src/ui/theme-viewer.c:737
+#. Translators: the title of a window owned by another user
+#. * on this machine
+#: src/core/window-props.c:620
 #, c-format
-msgid "Button layout test %d"
-msgstr "按钮布局测试 %d"
+msgid "%s (as %s)"
+msgstr "%s（于 %s）"
 
-#: ../src/ui/theme-viewer.c:766
+#. Translators: the title of a window owned by another user
+#. * on this machine, whose name we don't know
+#: src/core/window-props.c:626
 #, c-format
-msgid "%g milliseconds to draw one window frame"
-msgstr "%g 毫秒用来绘制一个窗口框架"
+msgid "%s (as another user)"
+msgstr "%s（以另一用户）"
 
-#: ../src/ui/theme-viewer.c:810
+#: src/tools/metacity-message.c:174
 #, c-format
-msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
-msgstr "用法：metacity-theme-viewer [主题名称]\n"
+msgid "Usage: %s\n"
+msgstr "用法：%s\n"
+
+#: src/ui/frames.c:1315
+msgid "Close Window"
+msgstr "关闭窗口"
+
+#: src/ui/frames.c:1318
+msgid "Window Menu"
+msgstr "窗口菜单"
+
+#: src/ui/frames.c:1321
+msgid "Window App Menu"
+msgstr "窗口应用菜单"
+
+#: src/ui/frames.c:1324
+msgid "Minimize Window"
+msgstr "最小化窗口"
+
+#: src/ui/frames.c:1327
+msgid "Maximize Window"
+msgstr "最大化窗口"
+
+#: src/ui/frames.c:1330
+msgid "Restore Window"
+msgstr "恢复窗口"
+
+#: src/ui/frames.c:1333
+msgid "Roll Up Window"
+msgstr "卷起窗口"
+
+#: src/ui/frames.c:1336
+msgid "Unroll Window"
+msgstr "展开窗口"
+
+#: src/ui/frames.c:1339
+msgid "Keep Window On Top"
+msgstr "窗口常居顶端"
+
+#: src/ui/frames.c:1342
+msgid "Remove Window From Top"
+msgstr "取消窗口常居顶端"
+
+#: src/ui/frames.c:1345
+msgid "Always On Visible Workspace"
+msgstr "总在可见工作区"
+
+#: src/ui/frames.c:1348
+msgid "Put Window On Only One Workspace"
+msgstr "只将窗口放在一个工作区"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: src/ui/menu.c:65
+msgid "Mi_nimize"
+msgstr "最小化(_N)"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: src/ui/menu.c:67
+msgid "Ma_ximize"
+msgstr "最大化(_X)"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: src/ui/menu.c:69
+msgid "Unma_ximize"
+msgstr "取消最大化(_X)"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: src/ui/menu.c:71
+msgid "Roll _Up"
+msgstr "卷起(_U)"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: src/ui/menu.c:73
+msgid "_Unroll"
+msgstr "展开(_U)"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: src/ui/menu.c:75
+msgid "_Move"
+msgstr "移动(_M)"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: src/ui/menu.c:77
+msgid "_Resize"
+msgstr "改变大小(_R)"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: src/ui/menu.c:79
+msgid "Move Titlebar On_screen"
+msgstr "将标题栏上移动到屏幕上(_S)"
+
+#. separator
+#. Translators: Translate this string the same way as you do in libwnck!
+#: src/ui/menu.c:82 src/ui/menu.c:84
+msgid "Always on _Top"
+msgstr "常居顶端(_T)"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: src/ui/menu.c:86
+msgid "_Always on Visible Workspace"
+msgstr "总在可见工作区(_A)"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: src/ui/menu.c:88
+msgid "_Only on This Workspace"
+msgstr "只在此工作区(_O)"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: src/ui/menu.c:90
+msgid "Move to Workspace _Left"
+msgstr "移动到左侧工作区(_L)"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: src/ui/menu.c:92
+msgid "Move to Workspace R_ight"
+msgstr "移动到右侧工作区(_I)"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: src/ui/menu.c:94
+msgid "Move to Workspace _Up"
+msgstr "移动到上侧工作区(_U)"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: src/ui/menu.c:96
+msgid "Move to Workspace _Down"
+msgstr "移动到下侧工作区(_D)"
+
+#. separator
+#. Translators: Translate this string the same way as you do in libwnck!
+#: src/ui/menu.c:100
+msgid "_Close"
+msgstr "关闭(_C)"
 
-#: ../src/ui/theme-viewer.c:817
+#: src/ui/menu.c:174
 #, c-format
-msgid "Error loading theme: %s\n"
-msgstr "装入主题出错：%s\n"
+msgid "Workspace %d%n"
+msgstr "工作区 %d%n"
 
-#: ../src/ui/theme-viewer.c:823
+#: src/ui/menu.c:184
+msgid "Workspace 1_0"
+msgstr "工作区 1_0"
+
+#: src/ui/menu.c:186
 #, c-format
-msgid "Loaded theme \"%s\" in %g seconds\n"
-msgstr "在 %2$g 秒内装入主题“%1$s”\n"
+msgid "Workspace %s%d"
+msgstr "工作区 %s%d"
 
-#: ../src/ui/theme-viewer.c:866
-msgid "Normal Title Font"
-msgstr "普通标题字体"
+#: src/ui/menu.c:351
+msgid "Move to Another _Workspace"
+msgstr "移动到另外的工作区(_W)"
 
-#: ../src/ui/theme-viewer.c:872
-msgid "Small Title Font"
-msgstr "小标题字体"
+#. This is the text that should appear next to menu accelerators
+#. * that use the shift key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: src/ui/metaaccellabel.c:75
+msgid "Shift"
+msgstr "Shift"
 
-#: ../src/ui/theme-viewer.c:878
-msgid "Large Title Font"
-msgstr "大标题字体"
+#. This is the text that should appear next to menu accelerators
+#. * that use the control key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: src/ui/metaaccellabel.c:81
+msgid "Ctrl"
+msgstr "Ctrl"
 
-#: ../src/ui/theme-viewer.c:883
-msgid "Button Layouts"
-msgstr "按钮布局"
+#. This is the text that should appear next to menu accelerators
+#. * that use the alt key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: src/ui/metaaccellabel.c:87
+msgid "Alt"
+msgstr "Alt"
 
-#: ../src/ui/theme-viewer.c:888
-msgid "Benchmark"
-msgstr "基准"
+#. This is the text that should appear next to menu accelerators
+#. * that use the meta key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: src/ui/metaaccellabel.c:93
+msgid "Meta"
+msgstr "Meta"
 
-#: ../src/ui/theme-viewer.c:935
-msgid "Window Title Goes Here"
-msgstr "窗口标题在这里"
+#. This is the text that should appear next to menu accelerators
+#. * that use the super key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: src/ui/metaaccellabel.c:99
+msgid "Super"
+msgstr "Super"
 
-#: ../src/ui/theme-viewer.c:1039
-#, c-format
-msgid ""
-"Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
-"seconds wall clock time including X server resources (%g milliseconds per "
-"frame)\n"
-msgstr ""
-"在 %2$g 的客户端秒(每帧 %3$g 毫秒)和包括 X 服务器资源在内的 %4$g 秒时钟时间"
-"(每帧 %5$g 毫秒)内绘制 %1$d 帧\n"
+#. This is the text that should appear next to menu accelerators
+#. * that use the hyper key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: src/ui/metaaccellabel.c:105
+msgid "Hyper"
+msgstr "Hyper"
 
-#: ../src/ui/theme-viewer.c:1258
-msgid "position expression test returned TRUE but set error"
-msgstr "位置表达式测试返回了 TRUE 但设置错误"
+#. This is the text that should appear next to menu accelerators
+#. * that use the mod2 key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: src/ui/metaaccellabel.c:111
+msgid "Mod2"
+msgstr "Mod2"
 
-#: ../src/ui/theme-viewer.c:1260
-msgid "position expression test returned FALSE but didn't set error"
-msgstr "位置表达式测试返回了 FALSE 但并没有设置错误"
+#. This is the text that should appear next to menu accelerators
+#. * that use the mod3 key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: src/ui/metaaccellabel.c:117
+msgid "Mod3"
+msgstr "Mod3"
 
-#: ../src/ui/theme-viewer.c:1264
-msgid "Error was expected but none given"
-msgstr "期待错误但没有给出错误"
+#. This is the text that should appear next to menu accelerators
+#. * that use the mod4 key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: src/ui/metaaccellabel.c:123
+msgid "Mod4"
+msgstr "Mod4"
 
-#: ../src/ui/theme-viewer.c:1266
-#, c-format
-msgid "Error %d was expected but %d given"
-msgstr "期待错误 %d，但给出了 %d"
+#. This is the text that should appear next to menu accelerators
+#. * that use the mod5 key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: src/ui/metaaccellabel.c:129
+msgid "Mod5"
+msgstr "Mod5"
 
-#: ../src/ui/theme-viewer.c:1272
+#. Translators: This represents the size of a window.  The first number is
+#. * the width of the window and the second is the height.
+#.
+#: src/ui/resizepopup.c:86
 #, c-format
-msgid "Error not expected but one was returned: %s"
-msgstr "未期待错误，但返回了错误：%s"
+msgid "%d x %d"
+msgstr "%d x %d"
+
+#: src/ui/ui.c:871
+msgid "Falling back to default GTK+ theme - Adwaita"
+msgstr "回落到默认的 GTK+ 主题 - Adwaita"
+
+#: theme-viewer/theme-viewer-main.c:32
+msgid "Theme type to use (\"gtk\" or \"metacity\")"
+msgstr "要使用的主题类型（“gtk”或“metacity”）"
+
+#: theme-viewer/theme-viewer-main.c:32
+msgid "TYPE"
+msgstr "类型"
+
+#: theme-viewer/theme-viewer-main.c:36
+msgid "Theme name to use"
+msgstr "要使用的主题名称"
+
+#: theme-viewer/theme-viewer-main.c:36
+msgid "NAME"
+msgstr "名称"
 
-#: ../src/ui/theme-viewer.c:1276
+#: theme-viewer/theme-viewer-window.c:102
 #, c-format
-msgid "x value was %d, %d was expected"
-msgstr "x 值为 %d，但应该为 %d"
+msgid "Loaded <b>%s</b> theme <b>%s</b> in <b>%f</b> seconds."
+msgstr "载入 <b>%s</b> 主题 <b>%s</b> 用了 <b>%f</b> 秒。"
 
-#: ../src/ui/theme-viewer.c:1279
+#: theme-viewer/theme-viewer-window.c:132
 #, c-format
-msgid "y value was %d, %d was expected"
-msgstr "y 值为 %d，但应该为 %d "
+msgid ""
+"Got MetaFrameBorders in <b>%f</b> seconds (CSS loading, PangoFontDescription "
+"creation and title height calculation)."
+msgstr ""
+"获取 MetaFrameBorders 用了 <b>%f</b> 秒（CSS 加载， PangoFontDescription 创建"
+"和标题高度计算）。"
 
-#: ../src/ui/theme-viewer.c:1344
+#: theme-viewer/theme-viewer-window.c:207
 #, c-format
-msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
-msgstr "在 %2$g 秒内处理了 %1$d 个坐标表达式(平均 %3$g 秒)\n"
+msgid ""
+"Drew <b>%d</b> frames in <b>%f</b> client-side seconds (<b>%f</b> "
+"milliseconds per frame) and <b>%f</b> seconds wall clock time including X "
+"server resources (<b>%f</b> milliseconds per frame)."
+msgstr ""
+"绘画 <b>%d</b> 帧用了 <b>%f</b> 客户端秒（<b>%f</b> 毫秒每帧）和包括 X 服务器"
+"资源在内的 <b>%f</b> 秒挂钟时间（<b>%f</b> 毫秒每帧）。"
+
+#: theme-viewer/theme-viewer-window.c:244
+msgid "Run again"
+msgstr "再次运行"
+
+#~ msgid "Unknown window information request: %d"
+#~ msgstr "未知的窗口信息请求：%d"
+
+#~ msgid "Failed to get hostname: %s\n"
+#~ msgstr "无法获取主机名：%s\n"
+
+#~ msgid "Failed to open X Window System display '%s'\n"
+#~ msgstr "无法打开 X Window System 显示“%s”\n"
+
+#~ msgid ""
+#~ "Some other program is already using the key %s with modifiers %x as a "
+#~ "binding\n"
+#~ msgstr "某个其它程序已经将按键 %s 和修饰键 %x 配合使用作为一种组合\n"
+
+#~ msgid "Failed to restart: %s\n"
+#~ msgstr "无法重启动：%s\n"
+
+#~ msgid ""
+#~ "Workarounds for broken applications disabled. Some applications may not "
+#~ "behave properly.\n"
+#~ msgstr "有缺陷的应用程序的工作区已禁用。某些应用程序可能无法正常运行。\n"
+
+#~ msgid "Could not parse font description \"%s\" from GSettings key %s\n"
+#~ msgstr "无法解析字体说明“%s”(来自 GSettings 键 %s)\n"
+
+#~ msgid ""
+#~ "\"%s\" found in configuration database is not a valid value for mouse "
+#~ "button modifier\n"
+#~ msgstr "在配置数据库中找到的“%s”不是鼠标按钮修饰键的有效值\n"
+
+#~ msgid ""
+#~ "\"%s\" found in configuration database is not a valid value for "
+#~ "keybinding \"%s\"\n"
+#~ msgstr "在配置数据库中找到的“%s”不是按键组合“%s”的有效值\n"
+
+#~ msgid "Missing %s extension required for compositing\n"
+#~ msgstr "缺少复合效果所需的 %s 扩展\n"
+
+#~ msgid "Screen %d on display '%s' is invalid\n"
+#~ msgstr "显示“%2$s”上的屏幕 %1$d 无效\n"
+
+#~ msgid ""
+#~ "Screen %d on display \"%s\" already has a window manager; try using the --"
+#~ "replace option to replace the current window manager.\n"
+#~ msgstr ""
+#~ "显示“%2$s”上的屏幕 %1$d 已经有一个窗口管理器；请尝试使用 --replace 选项替"
+#~ "换当前的窗口管理器。\n"
+
+#~ msgid ""
+#~ "Could not acquire window manager selection on screen %d display \"%s\"\n"
+#~ msgstr "无法获得显示“%2$s”上的屏幕 %1$d 的窗口管理器选定项\n"
+
+#~ msgid "Screen %d on display \"%s\" already has a window manager\n"
+#~ msgstr "在显示 \"%2$s\" 上的 %1$d 屏幕已经有一个窗口管理器\n"
+
+#~ msgid "Could not release screen %d on display \"%s\"\n"
+#~ msgstr "无法释放显示“%2$s”上的屏幕 %1$d\n"
+
+#~ msgid "Could not create directory '%s': %s\n"
+#~ msgstr "无法创建目录“%s”：%s\n"
+
+#~ msgid "Could not open session file '%s' for writing: %s\n"
+#~ msgstr "无法打开会话文件“%s”进行写入：%s\n"
+
+#~ msgid "Error writing session file '%s': %s\n"
+#~ msgstr "写入会话文件“%s”时出错：%s\n"
+
+#~ msgid "Error closing session file '%s': %s\n"
+#~ msgstr "关闭会话文件“%s”时出错：%s\n"
+
+#~ msgid "Failed to parse saved session file: %s\n"
+#~ msgstr "无法解析保存的会话文件：%s\n"
+
+#~ msgid "Failed to open debug log: %s\n"
+#~ msgstr "无法打开调试日志：%s\n"
+
+#~ msgid "Failed to fdopen() log file %s: %s\n"
+#~ msgstr "无法对日志文件 %s 进行 fdopen() 操作：%s\n"
+
+#~ msgid "Metacity was compiled without support for verbose mode\n"
+#~ msgstr "Metacity 编译的时候没有加入详细模式的支持\n"
+
+#~ msgid "Window manager: "
+#~ msgstr "窗口管理器："
+
+#~ msgid "Bug in window manager: "
+#~ msgstr "窗口管理器中的错误："
+
+#~ msgid "Window manager warning: "
+#~ msgstr "窗口管理器警告："
+
+#~ msgid "Window manager error: "
+#~ msgstr "窗口管理器错误："
+
+#~ msgid ""
+#~ "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
+#~ "window as specified in the ICCCM.\n"
+#~ msgstr ""
+#~ "窗口 %s 在它自身上设置 SM_CLIENT_ID，而不是按照 ICCCM 规定的那样，设置在 "
+#~ "WM_CLIENT_LEADER 窗口上。\n"
+
+#~ msgid ""
+#~ "Window %s sets an MWM hint indicating it isn't resizable, but sets min "
+#~ "size %d x %d and max size %d x %d; this doesn't make much sense.\n"
+#~ msgstr ""
+#~ "窗口 %s 设置了一个 MWM 提示，表明它是不可改变大小的，但设置最小尺寸为 %d "
+#~ "x %d，最大尺寸为 %d x %d；这没有任何意义。\n"
+
+#~ msgid "Application set a bogus _NET_WM_PID %lu\n"
+#~ msgstr "应用程序设置一个假的 _NET_WM_PID %lu\n"
+
+#~ msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
+#~ msgstr "为 %2$s 指定了无效的 WM_TRANSIENT_FOR 窗口 0x%1$lx。\n"
+
+#~ msgid ""
+#~ "Window 0x%lx has property %s\n"
+#~ "that was expected to have type %s format %d\n"
+#~ "and actually has type %s format %d n_items %d.\n"
+#~ "This is most likely an application bug, not a window manager bug.\n"
+#~ "The window has title=\"%s\" class=\"%s\" name=\"%s\"\n"
+#~ msgstr ""
+#~ "窗口 0x%lx 的属性 %s\n"
+#~ "的期望类型为 %s、格式为 %d，\n"
+#~ "而实际类型为 %s、格式为 %d、n_items 为 %d。\n"
+#~ "这很可能是应用程序的错误，不是窗口管理器的错误。\n"
+#~ "窗口的标题为“%s”，类别为“%s”，名称为“%s”\n"
+
+#~ msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
+#~ msgstr "窗口 0x%2$lx 上的属性 %1$s 包含无效的 UTF-8\n"
+
+#~ msgid ""
+#~ "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the "
+#~ "list\n"
+#~ msgstr "窗口 0x%2$lx 上的属性 %1$s 为列表中的条目 %3$d 包含无效的 UTF-8\n"
+
+#~ msgid ""
+#~ "Coordinate expression tries to use mod operator on a floating-point number"
+#~ msgstr "坐标表达式试图对浮点数使用 mod 运算符"
+
+#~ msgid "Current theme"
+#~ msgstr "当前主题"
+
+#~ msgid ""
+#~ "The theme determines the appearance of window borders, titlebar, and so "
+#~ "forth."
+#~ msgstr "主题决定窗口边框、标题栏等的外观。"
+
+#~ msgid "Failed to load theme '%s': %s"
+#~ msgstr "无法载入主题“%s”：%s"
+
+#~ msgid "Failed to scan themes directory: %s\n"
+#~ msgstr "扫描主题目录失败：%s\n"
+
+#~ msgid ""
+#~ "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
+#~ msgstr "无法找到主题！请确认 %s 存在并且含有正常的主题。\n"
+
+#~ msgid "Show the activities overview"
+#~ msgstr "显示活动大纲"
+
+#~ msgid ""
+#~ "Lost connection to the display '%s';\n"
+#~ "most likely the X server was shut down or you killed/destroyed\n"
+#~ "the window manager.\n"
+#~ msgstr ""
+#~ "丢失到显示“%s”的连接；\n"
+#~ "可能是 X 服务器已关闭或者您杀死/摧毁了\n"
+#~ "窗口管理器。\n"
+
+#~ msgid "Fatal IO error %d (%s) on display '%s'.\n"
+#~ msgstr "严重的 IO 错误 %d (%s) 出现在显示“%s”上。\n"
+
+#~ msgid "Theme file %s did not contain a root <metacity_theme> element"
+#~ msgstr "主题文件 %s 不包含根 <metacity_theme> 元素"
+
+#~ msgid "_Windows"
+#~ msgstr "窗口(_W)"
+
+#~ msgid "_Top dock"
+#~ msgstr "上侧停靠(_T)"
+
+#~ msgid "_Bottom dock"
+#~ msgstr "下侧停靠(_B)"
+
+#~ msgid "_Left dock"
+#~ msgstr "左侧停靠(_L)"
+
+#~ msgid "_Right dock"
+#~ msgstr "右侧停靠(_R)"
+
+#~ msgid "_All docks"
+#~ msgstr "全部停靠(_A)"
+
+#~ msgid "Des_ktop"
+#~ msgstr "桌面(_K)"
+
+#~ msgid "Open another one of these windows"
+#~ msgstr "打开这些窗口中的另外一个"
+
+#~ msgid "This is a demo button with an 'open' icon"
+#~ msgstr "这是一个演示按钮，带有“打开”图标"
+
+#~ msgid "This is a demo button with a 'quit' icon"
+#~ msgstr "这是一个演示按钮，带有“退出”图标"
+
+#~ msgid "This is a sample message in a sample dialog"
+#~ msgstr "这是示例对话框中的示例消息"
+
+#~ msgid "Fake menu item %d\n"
+#~ msgstr "虚假菜单项 %d\n"
+
+#~ msgid "Border-only window"
+#~ msgstr "只有边框的窗口"
+
+#~ msgid "Bar"
+#~ msgstr "栏"
+
+#~ msgid "Normal Application Window"
+#~ msgstr "普通的应用程序窗口"
+
+#~ msgid "Dialog Box"
+#~ msgstr "对话框"
+
+#~ msgid "Modal Dialog Box"
+#~ msgstr "模态对话框"
+
+#~ msgid "Utility Palette"
+#~ msgstr "工具盘"
+
+#~ msgid "Torn-off Menu"
+#~ msgstr "撕下的菜单"
+
+#~ msgid "Button layout test %d"
+#~ msgstr "按钮布局测试 %d"
+
+#~ msgid "%g milliseconds to draw one window frame"
+#~ msgstr "%g 毫秒用来绘制一个窗口框架"
+
+#~ msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
+#~ msgstr "用法：metacity-theme-viewer [主题名称]\n"
+
+#~ msgid "Error loading theme: %s\n"
+#~ msgstr "装入主题出错：%s\n"
+
+#~ msgid "Normal Title Font"
+#~ msgstr "普通标题字体"
+
+#~ msgid "Small Title Font"
+#~ msgstr "小标题字体"
+
+#~ msgid "Large Title Font"
+#~ msgstr "大标题字体"
+
+#~ msgid "Window Title Goes Here"
+#~ msgstr "窗口标题在这里"
+
+#~ msgid "position expression test returned TRUE but set error"
+#~ msgstr "位置表达式测试返回了 TRUE 但设置错误"
+
+#~ msgid "position expression test returned FALSE but didn't set error"
+#~ msgstr "位置表达式测试返回了 FALSE 但并没有设置错误"
+
+#~ msgid "Error was expected but none given"
+#~ msgstr "期待错误但没有给出错误"
+
+#~ msgid "Error %d was expected but %d given"
+#~ msgstr "期待错误 %d，但给出了 %d"
+
+#~ msgid "Error not expected but one was returned: %s"
+#~ msgstr "未期待错误，但返回了错误：%s"
+
+#~ msgid "x value was %d, %d was expected"
+#~ msgstr "x 值为 %d，但应该为 %d"
+
+#~ msgid "y value was %d, %d was expected"
+#~ msgstr "y 值为 %d，但应该为 %d "
+
+#~ msgid ""
+#~ "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
+#~ msgstr "在 %2$g 秒内处理了 %1$d 个坐标表达式(平均 %3$g 秒)\n"
 
 #~ msgid "Launchers"
 #~ msgstr "启动器"
@@ -1893,9 +2048,6 @@ msgstr "在 %2$g 秒内处理了 %1$d 个坐标表达式(平均 %3$g 秒)\n"
 #~ msgid "Control how new windows get focus"
 #~ msgstr "控制新窗口如何获得窗口"
 
-#~ msgid "Current theme"
-#~ msgstr "当前主题"
-
 #~ msgid "Delay in milliseconds for the auto raise option"
 #~ msgstr "自动提升选项的几毫秒延迟"
 
@@ -2076,11 +2228,6 @@ msgstr "在 %2$g 秒内处理了 %1$d 个坐标表达式(平均 %3$g 秒)\n"
 #~ msgstr "屏幕抓图命令"
 
 #~ msgid ""
-#~ "The theme determines the appearance of window borders, titlebar, and so "
-#~ "forth."
-#~ msgstr "主题决定窗口边框、标题栏等的外观。"
-
-#~ msgid ""
 #~ "The time delay before raising a window if auto_raise is set to true. The "
 #~ "delay is given in thousandths of a second."
 #~ msgstr ""
@@ -2199,9 +2346,6 @@ msgstr "在 %2$g 秒内处理了 %1$d 个坐标表达式(平均 %3$g 秒)\n"
 #~ msgid "/Windows/Des_ktop"
 #~ msgstr "/窗口(W)/桌面(_K)"
 
-#~ msgid "Window Management"
-#~ msgstr "窗口管理"
-
 #~ msgid "Switch to workspace on the left of the current workspace"
 #~ msgstr "切换到当前工作区左侧的工作区"