Update Simplified Chinese translations.

1 files changed, 282 insertions, 274 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 95e1e2ce..3e8cf4bc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,14 +5,15 @@
 # 甘露(Gan Lu) <rhythm.gan@gmail.com>, 2008, 2009
 # Tao Wei <weitao1979@gmail.com>, 2009.
 # Aron Xu <happyaron.xu@gmail.com>, 2010.
+# Fan Qijiang <fqj1994@linux.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gdm master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 17:34+0800\n"
-"PO-Revision-Date: 2010-04-12 18:00+0800\n"
-"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n"
+"POT-Creation-Date: 2010-06-28 17:15+0000\n"
+"PO-Revision-Date: 2010-07-13 17:00+0800\n"
+"Last-Translator: Eleanor Chen <chenyueg@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,18 +25,24 @@ msgstr ""
 msgid "/dev/urandom is not a character device"
 msgstr "/dev/urandom 不是字符设备"
 
-#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181
-#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183
+#: ../daemon/factory-slave-main.c:178
+#: ../daemon/product-slave-main.c:182
+#: ../daemon/simple-slave-main.c:182
+#: ../daemon/xdmcp-chooser-slave-main.c:184
 msgid "Display ID"
 msgstr "显示 ID"
 
-#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181
-#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183
+#: ../daemon/factory-slave-main.c:178
+#: ../daemon/product-slave-main.c:182
+#: ../daemon/simple-slave-main.c:182
+#: ../daemon/xdmcp-chooser-slave-main.c:184
 msgid "ID"
 msgstr "ID"
 
-#: ../daemon/factory-slave-main.c:189 ../daemon/product-slave-main.c:193
-#: ../daemon/simple-slave-main.c:195 ../daemon/xdmcp-chooser-slave-main.c:195
+#: ../daemon/factory-slave-main.c:190
+#: ../daemon/product-slave-main.c:194
+#: ../daemon/simple-slave-main.c:194
+#: ../daemon/xdmcp-chooser-slave-main.c:196
 msgid "GNOME Display Manager Slave"
 msgstr "GNOME 从属显示管理器"
 
@@ -44,83 +51,85 @@ msgstr "GNOME 从属显示管理器"
 msgid "could not find user \"%s\" on system"
 msgstr "无法在系统中找到用户 \"%s\""
 
-#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:225
+#: ../daemon/gdm-factory-slave.c:203
+#: ../daemon/gdm-simple-slave.c:258
 msgid "Unable to initialize login system"
 msgstr "无法初始化登录系统"
 
-#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:261
+#: ../daemon/gdm-factory-slave.c:235
+#: ../daemon/gdm-simple-slave.c:294
 msgid "Unable to authenticate user"
 msgstr "无法验证用户"
 
-#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:315
+#: ../daemon/gdm-factory-slave.c:257
+#: ../daemon/gdm-simple-slave.c:351
 msgid "Unable to authorize user"
 msgstr "无法授权给用户"
 
-#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:443
+#: ../daemon/gdm-factory-slave.c:279
+#: ../daemon/gdm-simple-slave.c:480
 msgid "Unable to establish credentials"
 msgstr "无法建立信任证书"
 
-#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:473
+#: ../daemon/gdm-factory-slave.c:302
+#: ../daemon/gdm-simple-slave.c:510
 msgid "Unable to open session"
 msgstr "无法打开会话"
 
-#: ../daemon/gdm-factory-slave.c:683 ../daemon/gdm-product-slave.c:449
-#: ../daemon/gdm-simple-slave.c:1151
-msgid ""
-"Could not start the X server (your graphical environment) due to some "
-"internal error. Please contact your system administrator or check your "
-"syslog to diagnose. In the meantime this display will be disabled.  Please "
-"restart GDM when the problem is corrected."
-msgstr ""
-"由于一些内部错误无法启动 X 服务器(您的图形界面)。请与您的系统管理员联系或检查"
-"您的系统日志以便进行诊断。此时该显示将被禁用。请在问题更正以后重新启动 GDM。"
+#: ../daemon/gdm-factory-slave.c:689
+#: ../daemon/gdm-product-slave.c:449
+#: ../daemon/gdm-simple-slave.c:1196
+msgid "Could not start the X server (your graphical environment) due to an internal error. Please contact your system administrator or check your syslog to diagnose. In the meantime this display will be disabled.  Please restart GDM when the problem is corrected."
+msgstr "由于一个内部错误无法启动 X 服务器(您的图形界面)。请与您的系统管理员联系或检查您的系统日志以便进行诊断。此时该显示将被禁用。请在问题更正以后重新启动 GDM。"
 
-#: ../daemon/gdm-server.c:246
+#: ../daemon/gdm-server.c:250
 #, c-format
 msgid "%s: failed to connect to parent display '%s'"
 msgstr "%s：无法连接到父显示“%s”"
 
-#: ../daemon/gdm-server.c:361
+#: ../daemon/gdm-server.c:365
 #, c-format
 msgid "Server was to be spawned by user %s but that user doesn't exist"
 msgstr "服务器是以用户 %s 身份创建的，但此用户不存在"
 
-#: ../daemon/gdm-server.c:372 ../daemon/gdm-welcome-session.c:554
+#: ../daemon/gdm-server.c:376
+#: ../daemon/gdm-server.c:396
+#: ../daemon/gdm-welcome-session.c:598
+#: ../daemon/gdm-welcome-session.c:618
 #, c-format
 msgid "Couldn't set groupid to %d"
 msgstr "无法将组 ID 设置为 %d"
 
-#: ../daemon/gdm-server.c:378 ../daemon/gdm-welcome-session.c:560
+#: ../daemon/gdm-server.c:382
+#: ../daemon/gdm-welcome-session.c:604
 #, c-format
 msgid "initgroups () failed for %s"
 msgstr "initgroups() 执行 %s 失败"
 
-#: ../daemon/gdm-server.c:384 ../daemon/gdm-welcome-session.c:566
+#: ../daemon/gdm-server.c:388
+#: ../daemon/gdm-welcome-session.c:610
 #, c-format
 msgid "Couldn't set userid to %d"
 msgstr "无法将用户 ID 设置为 %d"
 
-#: ../daemon/gdm-server.c:392 ../daemon/gdm-welcome-session.c:574
-msgid "Couldn't set groupid to 0"
-msgstr "无法将组 ID 设置为 0"
-
-#: ../daemon/gdm-server.c:431
+#: ../daemon/gdm-server.c:435
 #, c-format
-msgid "%s: Could not open logfile for display %s!"
+msgid "%s: Could not open log file for display %s!"
 msgstr "%s：无法打开日志文件显示 %s！"
 
-#: ../daemon/gdm-server.c:442 ../daemon/gdm-server.c:448
-#: ../daemon/gdm-server.c:454
+#: ../daemon/gdm-server.c:446
+#: ../daemon/gdm-server.c:452
+#: ../daemon/gdm-server.c:458
 #, c-format
 msgid "%s: Error setting %s to %s"
 msgstr "%s：将 %s 设置为 %s 出错"
 
-#: ../daemon/gdm-server.c:469
+#: ../daemon/gdm-server.c:478
 #, c-format
 msgid "%s: Server priority couldn't be set to %d: %s"
 msgstr "%s：服务器优先级无法设定为 %d：%s"
 
-#: ../daemon/gdm-server.c:621
+#: ../daemon/gdm-server.c:631
 #, c-format
 msgid "%s: Empty server command for display %s"
 msgstr "%s：显示画面 %s 的服务器命令为空"
@@ -149,215 +158,217 @@ msgstr "显示设备"
 msgid "The display device"
 msgstr "显示设备"
 
-#: ../daemon/gdm-session-worker.c:1298
+#: ../daemon/gdm-session-worker.c:1309
 #, c-format
-msgid "error initiating conversation with authentication system - %s"
-msgstr "初始化与验证系统的会话出错 - %s"
+msgid "error initiating conversation with authentication system: %s"
+msgstr "初始化与验证系统的会话出错:%s"
 
-#: ../daemon/gdm-session-worker.c:1299
+#: ../daemon/gdm-session-worker.c:1310
 msgid "general failure"
 msgstr "一般性错误"
 
-#: ../daemon/gdm-session-worker.c:1300
+#: ../daemon/gdm-session-worker.c:1311
 msgid "out of memory"
 msgstr "内存耗尽"
 
-#: ../daemon/gdm-session-worker.c:1301
+#: ../daemon/gdm-session-worker.c:1312
 msgid "application programmer error"
 msgstr "应用程序编程错误"
 
-#: ../daemon/gdm-session-worker.c:1302
+#: ../daemon/gdm-session-worker.c:1313
 msgid "unknown error"
 msgstr "未知错误"
 
-#: ../daemon/gdm-session-worker.c:1309
+#: ../daemon/gdm-session-worker.c:1320
 msgid "Username:"
 msgstr "用户名："
 
-#: ../daemon/gdm-session-worker.c:1315
+#: ../daemon/gdm-session-worker.c:1326
 #, c-format
-msgid "error informing authentication system of preferred username prompt - %s"
-msgstr "将首选用户名提示符通知验证系统时出错 - %s"
+msgid "error informing authentication system of preferred username prompt: %s"
+msgstr "将首选用户名提示符通知验证系统时出错:%s"
 
-#: ../daemon/gdm-session-worker.c:1329
+#: ../daemon/gdm-session-worker.c:1340
 #, c-format
-msgid "error informing authentication system of user's hostname - %s"
-msgstr "将用户主机名通知验证系统时出错 - %s"
+msgid "error informing authentication system of user's hostname: %s"
+msgstr "将用户主机名通知验证系统时出错:%s"
 
-#: ../daemon/gdm-session-worker.c:1344
+#: ../daemon/gdm-session-worker.c:1355
 #, c-format
-msgid "error informing authentication system of user's console - %s"
-msgstr "将用户终端通知验证系统时出错 - %s"
+msgid "error informing authentication system of user's console: %s"
+msgstr "将用户终端通知验证系统时出错:%s"
 
-#: ../daemon/gdm-session-worker.c:1357
+#: ../daemon/gdm-session-worker.c:1368
 #, c-format
-msgid "error informing authentication system of display string - %s"
-msgstr "将显示字符串通知验证系统时出错 - %s"
+msgid "error informing authentication system of display string: %s"
+msgstr "将显示字符串通知验证系统时出错:%s"
 
-#: ../daemon/gdm-session-worker.c:1372
+#: ../daemon/gdm-session-worker.c:1383
 #, c-format
-msgid "error informing authentication system of display xauth credentials - %s"
-msgstr "将显示 xauth 证书通知验证系统时发生错误 - %s"
+msgid "error informing authentication system of display xauth credentials: %s"
+msgstr "将显示 xauth 证书通知验证系统时发生错误:%s"
 
-#: ../daemon/gdm-session-worker.c:1661 ../daemon/gdm-session-worker.c:1680
+#: ../daemon/gdm-session-worker.c:1675
+#: ../daemon/gdm-session-worker.c:1692
 #, c-format
 msgid "no user account available"
 msgstr "无可用用户帐户"
 
-#: ../daemon/gdm-session-worker.c:1707
+#: ../daemon/gdm-session-worker.c:1719
 msgid "Unable to change to user"
 msgstr "无法切换到用户"
 
-#: ../daemon/gdm-welcome-session.c:532
+#: ../daemon/gdm-welcome-session.c:548
 #, c-format
 msgid "User %s doesn't exist"
 msgstr "用户 %s 不存在。"
 
-#: ../daemon/gdm-welcome-session.c:539
+#: ../daemon/gdm-welcome-session.c:555
 #, c-format
 msgid "Group %s doesn't exist"
 msgstr "组 %s 不存在。"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:596
+#: ../daemon/gdm-xdmcp-display-factory.c:604
 msgid "Could not create socket!"
 msgstr "无法创建套接字！"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:865
+#: ../daemon/gdm-xdmcp-display-factory.c:873
 #, c-format
 msgid "Denied XDMCP query from host %s"
 msgstr "从主机 %s 发出的 XDMCP 查询被拒绝"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1023
-#: ../daemon/gdm-xdmcp-display-factory.c:1247
+#: ../daemon/gdm-xdmcp-display-factory.c:1031
+#: ../daemon/gdm-xdmcp-display-factory.c:1255
 msgid "Could not extract authlist from packet"
 msgstr "无法从包中解出认证表"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1036
-#: ../daemon/gdm-xdmcp-display-factory.c:1262
+#: ../daemon/gdm-xdmcp-display-factory.c:1044
+#: ../daemon/gdm-xdmcp-display-factory.c:1270
 msgid "Error in checksum"
 msgstr "校验值错误"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1515
+#: ../daemon/gdm-xdmcp-display-factory.c:1523
 msgid "Bad address"
 msgstr "错误的地址"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1599
+#: ../daemon/gdm-xdmcp-display-factory.c:1607
 #, c-format
 msgid "%s: Could not read display address"
 msgstr "%s：无法读取显示地址"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1607
+#: ../daemon/gdm-xdmcp-display-factory.c:1615
 #, c-format
 msgid "%s: Could not read display port number"
 msgstr "%s：无法读取显示端口编号"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1616
+#: ../daemon/gdm-xdmcp-display-factory.c:1624
 #, c-format
 msgid "%s: Could not extract authlist from packet"
 msgstr "%s：无法从包中分解出认证表"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1636
+#: ../daemon/gdm-xdmcp-display-factory.c:1644
 #, c-format
 msgid "%s: Error in checksum"
 msgstr "%s：校验和错误"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2155
+#: ../daemon/gdm-xdmcp-display-factory.c:2200
 #, c-format
 msgid "%s: Got REQUEST from banned host %s"
 msgstr "%s：从禁止的主机获得 REQUEST %s"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2165
-#: ../daemon/gdm-xdmcp-display-factory.c:2521
-#: ../daemon/gdm-xdmcp-display-factory.c:2775
+#: ../daemon/gdm-xdmcp-display-factory.c:2210
+#: ../daemon/gdm-xdmcp-display-factory.c:2568
+#: ../daemon/gdm-xdmcp-display-factory.c:2822
 #, c-format
 msgid "%s: Could not read Display Number"
 msgstr "%s：无法读取显示编号"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2172
+#: ../daemon/gdm-xdmcp-display-factory.c:2217
 #, c-format
 msgid "%s: Could not read Connection Type"
 msgstr "%s：无法读取连接类型"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2179
+#: ../daemon/gdm-xdmcp-display-factory.c:2224
 #, c-format
 msgid "%s: Could not read Client Address"
 msgstr "%s：无法读取客户端地址"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2187
+#: ../daemon/gdm-xdmcp-display-factory.c:2232
 #, c-format
 msgid "%s: Could not read Authentication Names"
 msgstr "%s：无法读取认证名"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2196
+#: ../daemon/gdm-xdmcp-display-factory.c:2241
 #, c-format
 msgid "%s: Could not read Authentication Data"
 msgstr "%s：无法读取认证数据"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2206
+#: ../daemon/gdm-xdmcp-display-factory.c:2251
 #, c-format
 msgid "%s: Could not read Authorization List"
 msgstr "%s：无法读取认证表"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2225
+#: ../daemon/gdm-xdmcp-display-factory.c:2270
 #, c-format
 msgid "%s: Could not read Manufacturer ID"
 msgstr "%s：无法读取制造商 ID"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2252
+#: ../daemon/gdm-xdmcp-display-factory.c:2297
 #, c-format
 msgid "%s: Failed checksum from %s"
 msgstr "%s：%s 校验和校验失败"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2505
+#: ../daemon/gdm-xdmcp-display-factory.c:2552
 #, c-format
 msgid "%s: Got Manage from banned host %s"
 msgstr "%s：从禁止的主机 %s 获得 Manage"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2514
-#: ../daemon/gdm-xdmcp-display-factory.c:2782
+#: ../daemon/gdm-xdmcp-display-factory.c:2561
+#: ../daemon/gdm-xdmcp-display-factory.c:2829
 #, c-format
 msgid "%s: Could not read Session ID"
 msgstr "%s：无法读取会话 ID"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2528
+#: ../daemon/gdm-xdmcp-display-factory.c:2575
 #, c-format
 msgid "%s: Could not read Display Class"
 msgstr "%s：无法读取显示级别"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2634
-#: ../daemon/gdm-xdmcp-display-factory.c:2684
-#: ../daemon/gdm-xdmcp-display-factory.c:2690
+#: ../daemon/gdm-xdmcp-display-factory.c:2681
+#: ../daemon/gdm-xdmcp-display-factory.c:2731
+#: ../daemon/gdm-xdmcp-display-factory.c:2737
 #, c-format
 msgid "%s: Could not read address"
 msgstr "%s：无法读取地址"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2765
+#: ../daemon/gdm-xdmcp-display-factory.c:2812
 #, c-format
 msgid "%s: Got KEEPALIVE from banned host %s"
 msgstr "%s：从禁止的主机获得 KEEPALIVE %s"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2854
+#: ../daemon/gdm-xdmcp-display-factory.c:2902
 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!"
 msgstr "GdmXdmcpDisplayFactory：无法读取 XDMCP 头信息！"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2860
-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226
+#: ../daemon/gdm-xdmcp-display-factory.c:2908
+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227
 msgid "XMDCP: Incorrect XDMCP version!"
 msgstr "XMDCP：XDMCP 版本错误！"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2866
-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232
+#: ../daemon/gdm-xdmcp-display-factory.c:2914
+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233
 msgid "XMDCP: Unable to parse address"
 msgstr "XMDCP：无法解析地址"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:3311
+#: ../daemon/gdm-xdmcp-display-factory.c:3359
 #, c-format
 msgid "Could not get server hostname: %s!"
 msgstr "找不到服务器主机名：%s！"
 
-#: ../daemon/main.c:237 ../daemon/main.c:250
+#: ../daemon/main.c:237
+#: ../daemon/main.c:250
 #, c-format
-msgid "Cannot write PID file %s: possibly out of diskspace: %s"
+msgid "Cannot write PID file %s: possibly out of disk space: %s"
 msgstr "无法写入 PID 文件 %s：可能磁盘空间不够：%s"
 
 #: ../daemon/main.c:271
@@ -408,7 +419,7 @@ msgid "Make all warnings fatal"
 msgstr "置所有警告为致命错误"
 
 #: ../daemon/main.c:534
-msgid "Exit after a time - for debugging"
+msgid "Exit after a time (for debugging)"
 msgstr "一段时间后退出 - 调试时使用"
 
 #: ../daemon/main.c:535
@@ -420,20 +431,22 @@ msgid "GNOME Display Manager"
 msgstr "GNOME 显示管理器"
 
 #. make sure the pid file doesn't get wiped
-#: ../daemon/main.c:611
+#: ../daemon/main.c:616
 msgid "Only the root user can run GDM"
 msgstr "只有 root 用户才能运行 GDM"
 
-#: ../daemon/session-worker-main.c:156
+#. Translators: worker is a helper process that does the work
+#. of starting up a session
+#: ../daemon/session-worker-main.c:158
 msgid "GNOME Display Manager Session Worker"
 msgstr "GNOME 显示管理器会话工人进程"
 
 #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1
-msgid "AT SPI Registry Wrapper"
-msgstr "AT SPI 注册表包装器"
+msgid "AT-SPI Registry Wrapper"
+msgstr "AT-SPI 注册表包装器"
 
 #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1434
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632
 msgid "Login Window"
 msgstr "登录窗口"
 
@@ -458,11 +471,11 @@ msgid "Magnify parts of the screen"
 msgstr "放大屏幕的某一部分"
 
 #: ../data/greeter-autostart/gok.desktop.in.h:1
-msgid "GNOME Onscreen Keyboard"
+msgid "GNOME On-Screen Keyboard"
 msgstr "GNOME 屏幕键盘"
 
 #: ../data/greeter-autostart/gok.desktop.in.h:2
-msgid "Use an onscreen keyboard"
+msgid "Use an on-screen keyboard"
 msgstr "使用屏幕键盘"
 
 #: ../data/greeter-autostart/metacity.desktop.in.h:1
@@ -485,43 +498,43 @@ msgstr "PolicyKit 的认证代理"
 msgid "Select System"
 msgstr "选择系统"
 
-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:213
+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215
 msgid "XDMCP: Could not create XDMCP buffer!"
 msgstr "XDMCP：无法创建 XDMCP 缓冲区！"
 
-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220
+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221
 msgid "XDMCP: Could not read XDMCP header!"
 msgstr "XDMCP：无法读取 XDMCP 头信息！"
 
-#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:244
+#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250
 msgid "Value"
 msgstr "值"
 
-#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:245
+#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251
 msgid "percentage of time complete"
 msgstr "完成时间的百分比"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1281
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1459
 msgid "Inactive Text"
 msgstr "非活动文本"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1282
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1460
 msgid "The text to use in the label if the user hasn't picked an item yet"
 msgstr "用户尚未选择任何条目前在标签中使用的文本"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1290
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1468
 msgid "Active Text"
 msgstr "活动文本"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1291
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1469
 msgid "The text to use in the label if the user has picked an item"
 msgstr "用户选择一个条目时在标签中使用的文本"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1300
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1478
 msgid "List Visible"
 msgstr "列表可见"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1301
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1479
 msgid "Whether the chooser list is visible"
 msgstr "选择器列表是否可见"
 
@@ -553,77 +566,93 @@ msgstr "%A %H:%M:%S"
 msgid "%a %l:%M %p"
 msgstr "%A %H:%M"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:278
-msgid "Automatically logging in..."
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:290
+msgid "Automatically logging in…"
 msgstr "正在自动登录..."
 
-#. need to wait for response from backend
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:570
-msgid "Cancelling..."
-msgstr "正在取消..."
-
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:870
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:576
 msgid "Select language and click Log In"
 msgstr "选择语言，单击“登录”"
 
+#. need to wait for response from backend
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:689
+msgid "Cancelling…"
+msgstr "正在取消..."
+
 #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1
 msgid "Computer Name"
 msgstr "计算机名"
 
 #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2
-msgid "Log In"
+msgid "Login"
 msgstr "登录"
 
 #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3
+msgid "Unlock"
+msgstr "解锁"
+
+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4
 msgid "Version"
 msgstr "版本"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:852
+#: ../gui/simple-greeter/gdm-greeter-panel.c:740
 msgid "Panel"
 msgstr "面板"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:923
-msgid "Shutdown Options..."
+#: ../gui/simple-greeter/gdm-greeter-panel.c:805
+msgid "Shutdown Options…"
 msgstr "关闭选项..."
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:945
+#: ../gui/simple-greeter/gdm-greeter-panel.c:827
 msgid "Suspend"
 msgstr "挂起"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:950
+#: ../gui/simple-greeter/gdm-greeter-panel.c:832
 msgid "Restart"
 msgstr "重新启动"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:954
+#: ../gui/simple-greeter/gdm-greeter-panel.c:836
 msgid "Shut Down"
 msgstr "关机"
 
+#: ../gui/simple-greeter/gdm-greeter-panel.c:1111
+msgctxt "customsession"
+msgid "Custom"
+msgstr "自定义"
+
+#: ../gui/simple-greeter/gdm-greeter-panel.c:1112
+msgid "Custom session"
+msgstr "自定义会话"
+
 #: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201
 msgid "Languages"
 msgstr "语言"
 
-#: ../gui/simple-greeter/gdm-language-chooser-widget.c:274
+#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276
 msgid "_Languages:"
 msgstr "语言(_L)："
 
-#: ../gui/simple-greeter/gdm-language-chooser-widget.c:275
-#: ../gui/simple-greeter/gdm-language-option-widget.c:274
+#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277
 msgid "_Language:"
 msgstr "语言(_L)："
 
 #. translators: This brings up a dialog
 #. * with a list of languages to choose from
 #.
-#: ../gui/simple-greeter/gdm-language-option-widget.c:243
+#: ../gui/simple-greeter/gdm-language-option-widget.c:231
 msgctxt "language"
-msgid "Other..."
+msgid "Other…"
 msgstr "其它..."
 
-#: ../gui/simple-greeter/gdm-language-option-widget.c:244
+#: ../gui/simple-greeter/gdm-language-option-widget.c:232
 msgid "Choose a language from the full list of available languages."
 msgstr "从可用语言的完全清单中选择某语言。"
 
-#: ../gui/simple-greeter/gdm-languages.c:698
+#: ../gui/simple-greeter/gdm-language-option-widget.c:262
+msgid "Language"
+msgstr "语言"
+
+#: ../gui/simple-greeter/gdm-languages.c:699
 msgid "Unspecified"
 msgstr "未指定"
 
@@ -631,45 +660,48 @@ msgstr "未指定"
 msgid "Keyboard layouts"
 msgstr "键盘布局"
 
-#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:200
-#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:201
-#: ../gui/simple-greeter/gdm-layout-option-widget.c:266
+#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202
+#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203
 msgid "_Keyboard:"
 msgstr "键盘(_K)："
 
 #. translators: This brings up a dialog of
 #. * available keyboard layouts
 #.
-#: ../gui/simple-greeter/gdm-layout-option-widget.c:235
+#: ../gui/simple-greeter/gdm-layout-option-widget.c:223
 msgctxt "keyboard"
-msgid "Other..."
+msgid "Other…"
 msgstr "其它..."
 
-#: ../gui/simple-greeter/gdm-layout-option-widget.c:236
+#: ../gui/simple-greeter/gdm-layout-option-widget.c:224
 msgid "Choose a keyboard layout from the full list of available layouts."
 msgstr "从可用布局的完全清单中选择某键盘布局"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:507
+#: ../gui/simple-greeter/gdm-layout-option-widget.c:254
+msgid "Keyboard"
+msgstr "键盘"
+
+#: ../gui/simple-greeter/gdm-option-widget.c:505
 msgid "Label Text"
 msgstr "标签文本"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:508
+#: ../gui/simple-greeter/gdm-option-widget.c:506
 msgid "The text to use as a label"
 msgstr "该文本将用作一个标签"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:515
+#: ../gui/simple-greeter/gdm-option-widget.c:513
 msgid "Icon name"
 msgstr "图标名"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:516
+#: ../gui/simple-greeter/gdm-option-widget.c:514
 msgid "The icon to use with the label"
 msgstr "该标签所共用的图标"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:524
+#: ../gui/simple-greeter/gdm-option-widget.c:522
 msgid "Default Item"
 msgstr "默认项目"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:525
+#: ../gui/simple-greeter/gdm-option-widget.c:523
 msgid "The ID of the default item"
 msgstr "默认项目的 ID"
 
@@ -683,7 +715,7 @@ msgstr "在清单中保存项目数量的最大值"
 
 #: ../gui/simple-greeter/gdm-remote-login-window.c:188
 #, c-format
-msgid "Remote Login (Connecting to %s...)"
+msgid "Remote Login (Connecting to %s…)"
 msgstr "远程登录(正在连接 %s...)"
 
 #: ../gui/simple-greeter/gdm-remote-login-window.c:202
@@ -696,8 +728,8 @@ msgid "Remote Login"
 msgstr "远程登录"
 
 #: ../gui/simple-greeter/gdm-session-option-widget.c:162
-msgid "_Sessions:"
-msgstr "会话(_S)："
+msgid "Session"
+msgstr "会话"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1
 msgid "Banner message text"
@@ -748,12 +780,11 @@ msgid "Recently selected languages"
 msgstr "最近选过的语言"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13
-msgid ""
-"Set to a list of keyboard layouts to be shown by default at the login window."
+msgid "Set to a list of keyboard layouts to be shown by default in the login window."
 msgstr "设置在登录窗口默认显示的键盘布局清单"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14
-msgid "Set to a list of languages to be shown by default at the login window."
+msgid "Set to a list of languages to be shown by default in the login window."
 msgstr "设置在登录窗口默认显示的语言清单"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15
@@ -769,39 +800,37 @@ msgid "Set to true to disable showing the restart buttons in the login window."
 msgstr "设置为真将禁止在登录窗口中显示重启动按钮"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18
+msgid "Set to true to enable the XRandR settings manager plugin."
+msgstr "设置为真以启用 XRandR 设置管理器插件。"
+
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19
 msgid "Set to true to enable the background settings manager plugin."
 msgstr "设置为真以启用背景设置管理器插件。"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20
 msgid "Set to true to enable the media-keys settings manager plugin."
 msgstr "设置为真以启用多媒体键管理器插件。"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21
 msgid "Set to true to enable the on-screen keyboard."
 msgstr "设置为真以启用屏幕键盘。"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21
-msgid ""
-"Set to true to enable the plugin to manage the accessibility keyboard "
-"settings."
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22
+msgid "Set to true to enable the plugin to manage the accessibility keyboard settings."
 msgstr "设置为真以启用管理辅助功能键盘设置的插件。"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23
 msgid "Set to true to enable the screen magnifier."
 msgstr "设置为真以启用屏幕放大镜。"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24
 msgid "Set to true to enable the screen reader."
 msgstr "设置为真以启用屏幕读取器。"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25
 msgid "Set to true to enable the sound settings manager plugin."
 msgstr "设置为真以启用声音设置管理器插件。"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25
-msgid "Set to true to enable the xrandr settings manager plugin."
-msgstr "设置为真以启用 xrandr 设置管理器插件。"
-
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26
 msgid "Set to true to enable the xsettings settings manager plugin."
 msgstr "设置为真以启用 xsettings 设置管理器插件。"
@@ -811,43 +840,41 @@ msgid "Set to true to show the banner message text."
 msgstr "设置为“真(true)”以显示横幅信息文字。"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28
-msgid "Set to true to use compiz as the window manager."
+msgid "Set to true to use Compiz as the window manager."
 msgstr "设置为“真(true)”以使用 compiz 作为窗口管理器。"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29
 #, fuzzy
-msgid ""
-"Text banner message to show on the login window when the user chooser is "
-"empty, instead of banner_message_text."
+msgid "Text banner message to show in the login window when the user chooser is empty, instead of banner_message_text."
 msgstr "显示在登录窗口的文本横幅信息。"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30
-msgid "Text banner message to show on the login window."
+msgid "Text banner message to show in the login window."
 msgstr "显示在登录窗口的文本横幅信息。"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31
+msgid "True if the XRandR settings manager plugin is enabled."
+msgstr "为真(true)表示 XRandR 设置管理器插件已启用。"
+
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32
 msgid "True if the background settings manager plugin is enabled."
 msgstr "为真(true)时表示背景设置管理器插件已启用。"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33
 msgid "True if the media-keys settings manager plugin is enabled."
 msgstr "为真(true)表示多媒体键设置管理器插件已启用。"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34
 msgid "True if the sound settings manager plugin is enabled."
 msgstr "为真(true)表示声音设置管理器插件已启用。"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34
-msgid "True if the xrandr settings manager plugin is enabled."
-msgstr "为真(true)表示 xrandr 设置管理器插件已启用。"
-
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35
 msgid "True if the xsettings settings manager plugin is enabled."
 msgstr "为真(true)时表示 xsettings 设置管理器插件已启用。"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36
-msgid "Use compiz as the window manager"
-msgstr "使用 compiz 作为窗口管理器"
+msgid "Use Compiz as the window manager"
+msgstr "使用 Compiz 作为窗口管理器"
 
 #: ../gui/simple-greeter/gdm-timer.c:149
 msgid "Duration"
@@ -873,153 +900,136 @@ msgstr "它正在运行中吗？"
 msgid "Whether the timer is currently ticking"
 msgstr "是否计时器正在运行"
 
-#: ../gui/simple-greeter/gdm-user.c:245
-msgid "Manager"
-msgstr "管理器"
-
-#: ../gui/simple-greeter/gdm-user.c:246
-msgid "The user manager object this user is controlled by."
-msgstr "控制此用户的用户管理器对象"
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:470
+#, c-format
+msgid "Log in as %s"
+msgstr "作为 %s 登录"
 
 #. translators: This option prompts
 #. * the user to type in a username
 #. * manually instead of choosing from
 #. * a list.
 #.
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:166
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:250
 msgctxt "user"
-msgid "Other..."
+msgid "Other…"
 msgstr "其他..."
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:167
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:251
 msgid "Choose a different account"
 msgstr "选择不同的帐户"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:179
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:265
 msgid "Guest"
 msgstr "来宾"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:180
-msgid "Login as a temporary guest"
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:266
+msgid "Log in as a temporary guest"
 msgstr "作为临时来宾登录"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:193
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:281
 msgid "Automatic Login"
 msgstr "自动登录"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194
-msgid "Automatically login to the system after selecting options"
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:282
+msgid "Automatically log into the system after selecting options"
 msgstr "选定选项后自动登录到系统"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:385
-#, c-format
-msgid "Log in as %s"
-msgstr "作为 %s 登录"
-
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:738
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:978
 msgid "Currently logged in"
 msgstr "当前已登录"
 
-#: ../gui/user-switch-applet/applet.c:164
-msgid ""
-"The User Switch Applet is free software; you can redistribute it and/or "
-"modify it under the terms of the GNU General Public License as published by "
-"the Free Software Foundation; either version 2 of the License, or (at your "
-"option) any later version."
-msgstr ""
+#: ../gui/user-switch-applet/applet.c:162
+msgid "The User Switch Applet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
+msgstr "用户切换小工具是自由软件；你可以遵照自由软件基金会出版的GNU通用公共许可证条款来修改和重新发布这一程序。你可以使用许可证的第二版，或者（根据你的选择）用任何更新的版本。"
 
-#: ../gui/user-switch-applet/applet.c:168
-msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
-msgstr ""
+#: ../gui/user-switch-applet/applet.c:166
+msgid "This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
+msgstr "发布这一程序是希望他有用，但没有任何担保。甚至没有任何适合特定目的的隐含担保。更多详情，请参阅GNU通用公共许可证。"
 
-#: ../gui/user-switch-applet/applet.c:172
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA "
-msgstr ""
+#: ../gui/user-switch-applet/applet.c:170
+msgid "You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA "
+msgstr "你应该和这个程序一起收到了GNU通用公共许可证的副本，如果没有，写信给Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
 
-#: ../gui/user-switch-applet/applet.c:186
+#: ../gui/user-switch-applet/applet.c:184
 msgid "A menu to quickly switch between users."
 msgstr "一个用于在用户间快速切换的菜单"
 
-#: ../gui/user-switch-applet/applet.c:190
+#: ../gui/user-switch-applet/applet.c:188
 msgid "translator-credits"
 msgstr ""
 "Wang Li <charles@linux.net.cn>, 2002\n"
 "Funda Wang <fundawang@linux.net.cn>, 2003, 2004\n"
 "甘露(Gan Lu) <rhythm.gan@gmail.com>, 2008, 2009\n"
 "Tao Wei <weitao1979@gmail.com>, 2009\n"
-"Aron Xu <happyaron.xu@gmail.com>, 2010"
+"Aron Xu <happyaron.xu@gmail.com>, 2010\n"
+"Fan Qijiang <fqj1994@linux.com>, 2010"
 
-#: ../gui/user-switch-applet/applet.c:649
-#: ../gui/user-switch-applet/applet.c:788
-#: ../gui/user-switch-applet/applet.c:827
+#: ../gui/user-switch-applet/applet.c:658
+#: ../gui/user-switch-applet/applet.c:787
+#: ../gui/user-switch-applet/applet.c:829
 #, c-format
 msgid "Can't lock screen: %s"
 msgstr "无法锁定屏幕：%s"
 
-#: ../gui/user-switch-applet/applet.c:671
+#: ../gui/user-switch-applet/applet.c:680
 #, c-format
 msgid "Can't temporarily set screensaver to blank screen: %s"
 msgstr "无法临时设置屏保为空白屏幕：%s"
 
-#: ../gui/user-switch-applet/applet.c:886
+#: ../gui/user-switch-applet/applet.c:888
 #, c-format
-msgid "Can't logout: %s"
+msgid "Can't log out: %s"
 msgstr "无法注销：%s"
 
-#: ../gui/user-switch-applet/applet.c:970
+#: ../gui/user-switch-applet/applet.c:972
 msgid "Available"
 msgstr "可用"
 
-#: ../gui/user-switch-applet/applet.c:971
+#: ../gui/user-switch-applet/applet.c:973
 msgid "Invisible"
 msgstr "隐身"
 
-#: ../gui/user-switch-applet/applet.c:972
+#: ../gui/user-switch-applet/applet.c:974
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../gui/user-switch-applet/applet.c:973
+#: ../gui/user-switch-applet/applet.c:975
 msgid "Away"
 msgstr "离开"
 
-#: ../gui/user-switch-applet/applet.c:1133
+#: ../gui/user-switch-applet/applet.c:1122
 msgid "Account Information"
 msgstr "账户信息"
 
-#: ../gui/user-switch-applet/applet.c:1145
+#: ../gui/user-switch-applet/applet.c:1134
 msgid "System Preferences"
 msgstr "系统首选项"
 
-#: ../gui/user-switch-applet/applet.c:1161
+#: ../gui/user-switch-applet/applet.c:1148
 msgid "Lock Screen"
 msgstr "锁定屏幕"
 
 #. Only show if not locked down
-#: ../gui/user-switch-applet/applet.c:1172
+#: ../gui/user-switch-applet/applet.c:1159
 msgid "Switch User"
 msgstr "切换用户"
 
 #. Only show switch user if there are other users
-#: ../gui/user-switch-applet/applet.c:1183
-msgid "Quit..."
+#: ../gui/user-switch-applet/applet.c:1170
+msgid "Quit…"
 msgstr "退出..."
 
-#: ../gui/user-switch-applet/applet.c:1304
+#: ../gui/user-switch-applet/applet.c:1276
 msgid "Unknown"
 msgstr "未知"
 
-#: ../gui/user-switch-applet/applet.c:1422
+#: ../gui/user-switch-applet/applet.c:1389
 msgid "User Switch Applet"
 msgstr "用户切换小程序"
 
-#: ../gui/user-switch-applet/applet.c:1436
+#: ../gui/user-switch-applet/applet.c:1404
 msgid "Change account settings and status"
 msgstr "改变账户设置和状态"
 
@@ -1055,12 +1065,15 @@ msgstr "只支持 VERSION 命令"
 msgid "COMMAND"
 msgstr "命令"
 
-#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63
-#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66
-msgid "Ignored - retained for compatibility"
+#: ../utils/gdmflexiserver.c:62
+#: ../utils/gdmflexiserver.c:63
+#: ../utils/gdmflexiserver.c:65
+#: ../utils/gdmflexiserver.c:66
+msgid "Ignored — retained for compatibility"
 msgstr "忽略 - 保持兼容性"
 
-#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43
+#: ../utils/gdmflexiserver.c:64
+#: ../utils/gdm-screenshot.c:43
 msgid "Debugging output"
 msgstr "调试输出"
 
@@ -1087,55 +1100,50 @@ msgid "Screenshot taken"
 msgstr "已经截屏"
 
 #. Option parsing
-#: ../utils/gdm-screenshot.c:281
+#: ../utils/gdm-screenshot.c:283
 msgid "Take a picture of the screen"
-msgstr "抓取屏幕的一张图片"
-
+msgstr "抓取屏幕的一张截图"
+
+#~ msgid "Manager"
+#~ msgstr "管理器"
+#~ msgid "The user manager object this user is controlled by."
+#~ msgstr "控制此用户的用户管理器对象"
+#~ msgid "Couldn't set groupid to 0"
+#~ msgstr "无法将组 ID 设置为 0"
+#~ msgid "Quit..."
+#~ msgstr "退出..."
 #~ msgid "%x"
 #~ msgstr "%x"
-
 #~ msgid "Authentication Dialog"
 #~ msgstr "认证对话框"
-
 #~ msgid "Enable debugging code"
 #~ msgstr "启用调试代码"
-
 #~ msgid "id"
 #~ msgstr "id"
-
 #~ msgid "worker exited with status %d"
 #~ msgstr "工作程序以状态 %d 退出"
-
 #~ msgid "Unable establish credentials"
 #~ msgstr "无法建立信任连接"
-
 #~ msgid "%a %b %e"
 #~ msgstr "%b%e日 星期%a"
-
 #~ msgid "%1$s, %2$s"
 #~ msgstr "%1$s, %2$s"
-
 #~ msgid "Failed to restart computer"
 #~ msgstr "重新启动计算机失败"
-
 #~ msgid ""
 #~ "You are not allowed to restart the computer because multiple users are "
 #~ "logged in"
 #~ msgstr "因为多个用户已登录，系统不允许你重启动计算机"
-
 #~ msgid "Failed to stop computer"
 #~ msgstr "关闭计算机失败"
-
 #~ msgid ""
 #~ "You are not allowed to stop the computer because multiple users are "
 #~ "logged in"
 #~ msgstr "因为多个用户已登录，系统不允许你关闭计算机"
-
 #~ msgid "page 5"
 #~ msgstr "第5页"
-
 #~ msgid "Enable debugging"
 #~ msgstr "启用调试"
-
 #~ msgid "Enable debugging mode for the greeter."
 #~ msgstr "为欢迎界面启用调试模式"
+