Update zh_CN.po

svn path=/trunk/; revision=6649

1 files changed, 230 insertions, 198 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index d6d7043c..cee6657d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,15 +2,15 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Wang Li <charles@linux.net.cn>, 2002
 # Funda Wang <fundawang@linux.net.cn>, 2003,2004
-# 甘露(Lu Gan) <rhythm.gan@gmail.com>, 2008
+# 甘露(Gan Lu) <rhythm.gan@gmail.com>, 2008, 2009
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gdm\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-26 03:30+0000\n"
-"PO-Revision-Date: 2008-08-02 16:18+0700\n"
-"Last-Translator: 甘露(Lu Gan) <rhythm.gan@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&amp;component=general\n"
+"POT-Creation-Date: 2008-12-03 05:31+0000\n"
+"PO-Revision-Date: 2009-01-05 22:57+0700\n"
+"Last-Translator: 甘露(Gan Lu) <rhythm.gan@gmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,24 +22,33 @@ msgstr ""
 msgid "/dev/urandom is not a character device"
 msgstr "/dev/urandom 不是字符设备"
 
-#: ../daemon/factory-slave-main.c:170 ../daemon/main.c:516
-#: ../daemon/product-slave-main.c:174 ../daemon/session-worker-main.c:137
-#: ../daemon/simple-slave-main.c:176 ../daemon/xdmcp-chooser-slave-main.c:176
+#: ../daemon/factory-slave-main.c:170
+#: ../daemon/main.c:516
+#: ../daemon/product-slave-main.c:174
+#: ../daemon/session-worker-main.c:137
+#: ../daemon/simple-slave-main.c:176
+#: ../daemon/xdmcp-chooser-slave-main.c:176
 msgid "Enable debugging code"
 msgstr "启用调试代码"
 
-#: ../daemon/factory-slave-main.c:171 ../daemon/product-slave-main.c:175
-#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:177
+#: ../daemon/factory-slave-main.c:171
+#: ../daemon/product-slave-main.c:175
+#: ../daemon/simple-slave-main.c:177
+#: ../daemon/xdmcp-chooser-slave-main.c:177
 msgid "Display ID"
 msgstr "显示 ID"
 
-#: ../daemon/factory-slave-main.c:171 ../daemon/product-slave-main.c:175
-#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:177
+#: ../daemon/factory-slave-main.c:171
+#: ../daemon/product-slave-main.c:175
+#: ../daemon/simple-slave-main.c:177
+#: ../daemon/xdmcp-chooser-slave-main.c:177
 msgid "id"
 msgstr "id"
 
-#: ../daemon/factory-slave-main.c:183 ../daemon/product-slave-main.c:187
-#: ../daemon/simple-slave-main.c:189 ../daemon/xdmcp-chooser-slave-main.c:189
+#: ../daemon/factory-slave-main.c:183
+#: ../daemon/product-slave-main.c:187
+#: ../daemon/simple-slave-main.c:189
+#: ../daemon/xdmcp-chooser-slave-main.c:189
 msgid "GNOME Display Manager Slave"
 msgstr "GNOME 从属显示管理器"
 
@@ -48,80 +57,82 @@ msgstr "GNOME 从属显示管理器"
 msgid "could not find user \"%s\" on system"
 msgstr "无法在系统中找到用户 \"%s\""
 
-#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:207
+#: ../daemon/gdm-factory-slave.c:203
+#: ../daemon/gdm-simple-slave.c:217
 msgid "Unable to initialize login system"
 msgstr "无法初始化登录系统"
 
-#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:240
+#: ../daemon/gdm-factory-slave.c:235
+#: ../daemon/gdm-simple-slave.c:253
 msgid "Unable to authenticate user"
 msgstr "无法验证用户"
 
-#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:286
+#: ../daemon/gdm-factory-slave.c:257
+#: ../daemon/gdm-simple-slave.c:307
 msgid "Unable to authorize user"
-msgstr "无法为用户授权"
+msgstr "无法授权给用户"
 
 #: ../daemon/gdm-factory-slave.c:281
 msgid "Unable to establish credentials"
 msgstr "无法建立信任证书"
 
-#: ../daemon/gdm-factory-slave.c:662 ../daemon/gdm-product-slave.c:449
-#: ../daemon/gdm-simple-slave.c:1048
-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 服务器 (您的图形界面)。请与您的系统管理员联系或检"
-"查您的系统日志(syslog)以便进行诊断。此时该显示将被禁用。请在问题更正以后重新"
-"启动 GDM。"
+#: ../daemon/gdm-factory-slave.c:662
+#: ../daemon/gdm-product-slave.c:449
+#: ../daemon/gdm-simple-slave.c:1097
+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 服务器 (您的图形界面)。请与您的系统管理员联系或检查您的系统日志(syslog)以便进行诊断。此时该显示将被禁用。请在问题更正以后重新启动 GDM。"
 
-#: ../daemon/gdm-server.c:244
+#: ../daemon/gdm-server.c:246
 #, c-format
 msgid "%s: failed to connect to parent display '%s'"
 msgstr "%s：无法连接到主显示 “%s” "
 
-#: ../daemon/gdm-server.c:362
+#: ../daemon/gdm-server.c:361
 #, c-format
 msgid "Server was to be spawned by user %s but that user doesn't exist"
 msgstr "服务器是以用户 %s 身份衍生的，但此用户不存在"
 
-#: ../daemon/gdm-server.c:373 ../daemon/gdm-welcome-session.c:415
+#: ../daemon/gdm-server.c:372
+#: ../daemon/gdm-welcome-session.c:444
 #, c-format
 msgid "Couldn't set groupid to %d"
 msgstr "无法将组 ID 设置为 %d"
 
-#: ../daemon/gdm-server.c:379 ../daemon/gdm-welcome-session.c:421
+#: ../daemon/gdm-server.c:378
+#: ../daemon/gdm-welcome-session.c:450
 #, c-format
 msgid "initgroups () failed for %s"
 msgstr "initgroups() 执行 %s 失败"
 
-#: ../daemon/gdm-server.c:385 ../daemon/gdm-welcome-session.c:427
+#: ../daemon/gdm-server.c:384
+#: ../daemon/gdm-welcome-session.c:456
 #, c-format
 msgid "Couldn't set userid to %d"
 msgstr "无法将用户 ID 设置为 %d"
 
-#: ../daemon/gdm-server.c:393 ../daemon/gdm-welcome-session.c:435
+#: ../daemon/gdm-server.c:392
+#: ../daemon/gdm-welcome-session.c:464
 msgid "Couldn't set groupid to 0"
 msgstr "无法将组 ID 设置为 0"
 
-#: ../daemon/gdm-server.c:428
+#: ../daemon/gdm-server.c:431
 #, c-format
 msgid "%s: Could not open logfile for display %s!"
 msgstr "%s：无法打开日志文件显示 %s！"
 
-#: ../daemon/gdm-server.c:439 ../daemon/gdm-server.c:445
-#: ../daemon/gdm-server.c:451
+#: ../daemon/gdm-server.c:442
+#: ../daemon/gdm-server.c:448
+#: ../daemon/gdm-server.c:454
 #, c-format
 msgid "%s: Error setting %s to %s"
 msgstr "%s：将 %s 设置为 %s 出错"
 
-#: ../daemon/gdm-server.c:466
+#: ../daemon/gdm-server.c:469
 #, c-format
 msgid "%s: Server priority couldn't be set to %d: %s"
 msgstr "%s：服务器优先级无法设定为 %d：%s"
 
-#: ../daemon/gdm-server.c:618
+#: ../daemon/gdm-server.c:621
 #, c-format
 msgid "%s: Empty server command for display %s"
 msgstr "%s：显示画面 %s 的服务器命令为空"
@@ -150,7 +161,8 @@ msgstr "显示设备"
 msgid "The display device"
 msgstr "显示设备"
 
-#: ../daemon/gdm-session-direct.c:1574 ../daemon/gdm-session-direct.c:1592
+#: ../daemon/gdm-session-direct.c:1574
+#: ../daemon/gdm-session-direct.c:1592
 #, c-format
 msgid "worker exited with status %d"
 msgstr "工作程序以状态 %d 退出"
@@ -205,7 +217,8 @@ msgstr "将显示字符串通知验证系统时出错 - %s"
 msgid "error informing authentication system of display xauth credentials - %s"
 msgstr "将显示 xauth 证书通知验证系统时发生错误 - %s"
 
-#: ../daemon/gdm-session-worker.c:1433 ../daemon/gdm-session-worker.c:1451
+#: ../daemon/gdm-session-worker.c:1433
+#: ../daemon/gdm-session-worker.c:1451
 #, c-format
 msgid "no user account available"
 msgstr "无可用用户帐户"
@@ -214,16 +227,16 @@ msgstr "无可用用户帐户"
 msgid "Unable to change to user"
 msgstr "无法切换到用户"
 
-#: ../daemon/gdm-simple-slave.c:387
+#: ../daemon/gdm-simple-slave.c:426
 msgid "Unable establish credentials"
 msgstr "无法建立信任连接"
 
-#: ../daemon/gdm-welcome-session.c:397
+#: ../daemon/gdm-welcome-session.c:426
 #, c-format
 msgid "User %s doesn't exist"
 msgstr "用户 %s 不存在。"
 
-#: ../daemon/gdm-welcome-session.c:404
+#: ../daemon/gdm-welcome-session.c:433
 #, c-format
 msgid "Group %s doesn't exist"
 msgstr "组 %s 不存在。"
@@ -271,101 +284,102 @@ msgstr "%s：无法从包中分解出认证表"
 msgid "%s: Error in checksum"
 msgstr "%s：校验和错误"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2120
+#: ../daemon/gdm-xdmcp-display-factory.c:2127
 #, c-format
 msgid "%s: Got REQUEST from banned host %s"
 msgstr "%s：从禁止的主机获得 REQUEST %s"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2130
-#: ../daemon/gdm-xdmcp-display-factory.c:2485
-#: ../daemon/gdm-xdmcp-display-factory.c:2737
+#: ../daemon/gdm-xdmcp-display-factory.c:2137
+#: ../daemon/gdm-xdmcp-display-factory.c:2492
+#: ../daemon/gdm-xdmcp-display-factory.c:2744
 #, c-format
 msgid "%s: Could not read Display Number"
 msgstr "%s：无法读取显示编号"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2137
+#: ../daemon/gdm-xdmcp-display-factory.c:2144
 #, c-format
 msgid "%s: Could not read Connection Type"
 msgstr "%s：无法读取连接类型"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2144
+#: ../daemon/gdm-xdmcp-display-factory.c:2151
 #, c-format
 msgid "%s: Could not read Client Address"
 msgstr "%s：无法读取客户端地址"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2152
+#: ../daemon/gdm-xdmcp-display-factory.c:2159
 #, c-format
 msgid "%s: Could not read Authentication Names"
 msgstr "%s：无法读取认证名"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2161
+#: ../daemon/gdm-xdmcp-display-factory.c:2168
 #, c-format
 msgid "%s: Could not read Authentication Data"
 msgstr "%s：无法读取认证数据"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2171
+#: ../daemon/gdm-xdmcp-display-factory.c:2178
 #, c-format
 msgid "%s: Could not read Authorization List"
 msgstr "%s：无法读取认证表"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2190
+#: ../daemon/gdm-xdmcp-display-factory.c:2197
 #, c-format
 msgid "%s: Could not read Manufacturer ID"
 msgstr "%s：无法读取制造商 ID"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2217
+#: ../daemon/gdm-xdmcp-display-factory.c:2224
 #, c-format
 msgid "%s: Failed checksum from %s"
 msgstr "%s：%s 校验和校验失败"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2469
+#: ../daemon/gdm-xdmcp-display-factory.c:2476
 #, c-format
 msgid "%s: Got Manage from banned host %s"
 msgstr "%s：从禁止的主机 %s 获得 Manage"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2478
-#: ../daemon/gdm-xdmcp-display-factory.c:2744
+#: ../daemon/gdm-xdmcp-display-factory.c:2485
+#: ../daemon/gdm-xdmcp-display-factory.c:2751
 #, c-format
 msgid "%s: Could not read Session ID"
 msgstr "%s：无法读取会话 ID"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2492
+#: ../daemon/gdm-xdmcp-display-factory.c:2499
 #, c-format
 msgid "%s: Could not read Display Class"
 msgstr "%s：无法读取显示级别"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2597
-#: ../daemon/gdm-xdmcp-display-factory.c:2647
-#: ../daemon/gdm-xdmcp-display-factory.c:2653
+#: ../daemon/gdm-xdmcp-display-factory.c:2604
+#: ../daemon/gdm-xdmcp-display-factory.c:2654
+#: ../daemon/gdm-xdmcp-display-factory.c:2660
 #, c-format
 msgid "%s: Could not read address"
 msgstr "%s：无法读取地址"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2727
+#: ../daemon/gdm-xdmcp-display-factory.c:2734
 #, c-format
 msgid "%s: Got KEEPALIVE from banned host %s"
 msgstr "%s：从禁止的主机获得 KEEPALIVE %s"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2816
+#: ../daemon/gdm-xdmcp-display-factory.c:2823
 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!"
 msgstr "GdmXdmcpDisplayFactory：无法读取 XDMCP 头信息！"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2822
+#: ../daemon/gdm-xdmcp-display-factory.c:2829
 #: ../gui/simple-chooser/gdm-host-chooser-widget.c:226
 msgid "XMDCP: Incorrect XDMCP version!"
 msgstr "XMDCP：XDMCP 版本错误！"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2828
+#: ../daemon/gdm-xdmcp-display-factory.c:2835
 #: ../gui/simple-chooser/gdm-host-chooser-widget.c:232
 msgid "XMDCP: Unable to parse address"
 msgstr "XMDCP：无法解析地址"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:3226
+#: ../daemon/gdm-xdmcp-display-factory.c:3233
 #, 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"
 msgstr "无法写入 PID 文件 %s：可能磁盘空间不够：%s"
@@ -443,7 +457,7 @@ 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:1962
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1915
 msgid "Login Window"
 msgstr "登录窗口"
 
@@ -507,19 +521,19 @@ msgstr "值"
 msgid "percentage of time complete"
 msgstr "完成时间的百分比"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1235
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1306
 msgid "Inactive Text"
 msgstr "非活动文本"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1236
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1307
 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:1244
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1315
 msgid "Active Text"
 msgstr "活动文本"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1245
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1316
 msgid "The text to use in the label if the user has picked an item"
 msgstr "用户选择一个条目时在标签中使用的文本"
 
@@ -549,39 +563,32 @@ msgstr "%b%e日 星期%a"
 msgid "%1$s, %2$s"
 msgstr "%1$s, %2$s"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:181
-msgid "You have the Caps Lock key on."
-msgstr "Caps Lock 键打开着。"
-
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:326
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:288
 msgid "Automatically logging in..."
 msgstr "正在自动登录..."
 
 #. need to wait for response from backend
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:760
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:722
 msgid "Cancelling..."
 msgstr "正在取消..."
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1229
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1191
 msgid "Failed to restart computer"
 msgstr "重新启动计算机失败"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1232
-msgid ""
-"You are not allowed to restart the computer because multiple users are "
-"logged in"
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1194
+msgid "You are not allowed to restart the computer because multiple users are logged in"
 msgstr "因为多个用户已登录，系统不允许你重启动计算机"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1313
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1275
 msgid "Failed to stop computer"
 msgstr "关闭计算机失败"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1316
-msgid ""
-"You are not allowed to stop the computer because multiple users are logged in"
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1278
+msgid "You are not allowed to stop the computer because multiple users are logged in"
 msgstr "因为多个用户已登录，系统不允许你关闭计算机"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1400
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1362
 msgid "Select language and click Log In"
 msgstr "选择语言，单击“登录”"
 
@@ -617,7 +624,7 @@ msgstr "版本"
 msgid "page 5"
 msgstr "第5页"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:540
+#: ../gui/simple-greeter/gdm-greeter-panel.c:590
 msgid "Panel"
 msgstr "面板"
 
@@ -630,26 +637,25 @@ msgid "_Languages:"
 msgstr "语言：(_L)"
 
 #: ../gui/simple-greeter/gdm-language-chooser-widget.c:273
-#: ../gui/simple-greeter/gdm-language-option-widget.c:255
+#: ../gui/simple-greeter/gdm-language-option-widget.c:259
 msgid "_Language:"
 msgstr "语言：(_L)"
 
-#: ../gui/simple-greeter/gdm-language-option-widget.c:224
+#: ../gui/simple-greeter/gdm-language-option-widget.c:228
 #: ../gui/simple-greeter/gdm-layout-option-widget.c:220
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:89
-#: ../gui/user-switch-applet/applet.c:996
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:131
 msgid "Other..."
 msgstr "其它..."
 
-#: ../gui/simple-greeter/gdm-language-option-widget.c:225
+#: ../gui/simple-greeter/gdm-language-option-widget.c:229
 msgid "Choose a language from the full list of available languages."
 msgstr "从可用语言的完全清单中选择某语言。"
 
-#: ../gui/simple-greeter/gdm-languages.c:587
+#: ../gui/simple-greeter/gdm-languages.c:610
 msgid "Unspecified"
 msgstr "未指定"
 
-#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:190
+#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191
 msgid "Keyboard layouts"
 msgstr "键盘布局"
 
@@ -663,35 +669,35 @@ msgstr "键盘(_K)"
 msgid "Choose a keyboard layout from the full list of available layouts."
 msgstr "从可用布局的完全清单中选择某键盘布局"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:493
+#: ../gui/simple-greeter/gdm-option-widget.c:494
 msgid "Label Text"
 msgstr "标签文本"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:494
+#: ../gui/simple-greeter/gdm-option-widget.c:495
 msgid "The text to use as a label"
 msgstr "该文本将用作一个标签"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:501
+#: ../gui/simple-greeter/gdm-option-widget.c:502
 msgid "Icon name"
 msgstr "图标名"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:502
+#: ../gui/simple-greeter/gdm-option-widget.c:503
 msgid "The icon to use with the label"
 msgstr "该标签所共用的图标"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:510
+#: ../gui/simple-greeter/gdm-option-widget.c:511
 msgid "Default Item"
 msgstr "默认项目"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:511
+#: ../gui/simple-greeter/gdm-option-widget.c:512
 msgid "The id of the default item"
 msgstr "默认项目的识别码"
 
-#: ../gui/simple-greeter/gdm-recent-option-widget.c:298
+#: ../gui/simple-greeter/gdm-recent-option-widget.c:310
 msgid "Max Item Count"
 msgstr "最大项目数"
 
-#: ../gui/simple-greeter/gdm-recent-option-widget.c:299
+#: ../gui/simple-greeter/gdm-recent-option-widget.c:311
 msgid "The maximum number of items to keep around in the list"
 msgstr "在清单中保存项目数量的最大值"
 
@@ -786,9 +792,7 @@ msgid "Set to True to enable the on-screen keyboard."
 msgstr "设置为“真(True)”以启用屏幕键盘。"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19
-msgid ""
-"Set to True to enable the plugin to manage the accessibility keyboard "
-"settings."
+msgid "Set to True to enable the plugin to manage the accessibility keyboard settings."
 msgstr "设置为“真(True)”以启用管理辅助功能键盘设置的插件。"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20
@@ -812,8 +816,7 @@ msgid "Set to True to enable the xsettings settings manager plugin."
 msgstr "设置为“真(true)”以启用 xsettings 设置管理器插件。"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25
-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 at the login window."
 msgstr "设置在登录窗口默认显示的键盘布局清单"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26
@@ -892,133 +895,133 @@ msgstr "管理器"
 msgid "The user manager object this user is controlled by."
 msgstr "控制此用户的用户管理器对象"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:90
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:132
 msgid "Choose a different account"
 msgstr "选择不同的帐户"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:102
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:144
 msgid "Guest"
 msgstr "来宾"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:103
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:145
 msgid "Login as a temporary guest"
 msgstr "作为临时来宾登录"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:115
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:157
 msgid "Automatic Login"
 msgstr "自动登录"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:116
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:158
 msgid "Automatically login to the system after selecting options"
 msgstr "选定选项后自动登录到系统"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:279
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:349
 #, c-format
 msgid "Log in as %s"
 msgstr "作为 %s 登录"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:600
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:694
 msgid "Currently logged in"
 msgstr "当前已登录"
 
-#: ../gui/user-switch-applet/applet.c:147
-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 ""
-"用户切换小程序是自由程序；你可以遵照自由软件基金会(Free Software Foundation)"
-"发布的 GNU (通用公共许可证) 条款；第二版，或(自由选择) 更高版本进行分发或修"
-"改；。"
+#: ../gui/user-switch-applet/applet.c:156
+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 "用户切换小程序是自由程序；你可以遵照自由软件基金会(Free Software Foundation)发布的 GNU (通用公共许可证) 条款；第二版，或(自由选择) 更高版本进行分发或修改；。"
 
-#: ../gui/user-switch-applet/applet.c:151
-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:160
+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:155
-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 通用公共许可证副本；如果没有，你可以写信"
-"给 \"\"the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
-"Boston, \"\"MA 02110-1301, USA \""
+#: ../gui/user-switch-applet/applet.c:164
+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 通用公共许可证副本；如果没有，你可以写信给 \"\"the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, \"\"MA 02110-1301, USA \""
 
-#: ../gui/user-switch-applet/applet.c:169
+#: ../gui/user-switch-applet/applet.c:178
 msgid "A menu to quickly switch between users."
 msgstr "一个用于在用户间快速切换的菜单"
 
-#: ../gui/user-switch-applet/applet.c:173
+#: ../gui/user-switch-applet/applet.c:182
 msgid "translator-credits"
 msgstr "翻译者荣誉榜"
 
-#: ../gui/user-switch-applet/applet.c:782
+#: ../gui/user-switch-applet/applet.c:635
+#: ../gui/user-switch-applet/applet.c:770
+#: ../gui/user-switch-applet/applet.c:809
 #, c-format
 msgid "Can't lock screen: %s"
 msgstr "无法锁定屏幕：%s"
 
-#: ../gui/user-switch-applet/applet.c:804
+#: ../gui/user-switch-applet/applet.c:657
 #, c-format
 msgid "Can't temporarily set screensaver to blank screen: %s"
 msgstr "无法临时设置屏保为空白屏幕：%s"
 
-#: ../gui/user-switch-applet/applet.c:1101
-msgid "Unknown"
-msgstr "未知的"
+#: ../gui/user-switch-applet/applet.c:868
+#, c-format
+msgid "Can't logout: %s"
+msgstr "无法注销：%s"
 
-#: ../gui/user-switch-applet/applet.c:1157
-msgid "User Switch Applet"
-msgstr "用户切换小程序"
+#: ../gui/user-switch-applet/applet.c:923
+msgid "Available"
+msgstr "可用"
 
-#: ../gui/user-switch-applet/applet.c:1181
-#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2
-msgid "User Switcher"
-msgstr "用户切换器"
+#: ../gui/user-switch-applet/applet.c:924
+msgid "Busy"
+msgstr "正忙"
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:338
-msgid "User"
-msgstr "用户"
+#: ../gui/user-switch-applet/applet.c:925
+msgid "Invisible"
+msgstr "隐身"
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:339
-msgid "The user this menu item represents."
-msgstr "该菜单项代表的用户"
+#: ../gui/user-switch-applet/applet.c:926
+msgid "Away"
+msgstr "离开"
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:346
-msgid "Icon Size"
-msgstr "图标大小"
+#: ../gui/user-switch-applet/applet.c:1023
+msgid "Account Information..."
+msgstr "账户信息..."
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:347
-msgid "The size of the icon to use."
-msgstr "将要使用的图标大小"
+#: ../gui/user-switch-applet/applet.c:1035
+msgid "System Preferences..."
+msgstr "系统首选项..."
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:353
-msgid "Indicator Size"
-msgstr "指示器大小"
+#: ../gui/user-switch-applet/applet.c:1051
+msgid "Lock Screen"
+msgstr "锁定屏幕"
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:354
-msgid "Size of check indicator"
-msgstr "检查指示器的大小"
+#: ../gui/user-switch-applet/applet.c:1062
+msgid "Switch User"
+msgstr "切换用户"
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:359
-msgid "Indicator Spacing"
-msgstr "指示器间距"
+#. Only show switch user if there are other users
+#: ../gui/user-switch-applet/applet.c:1073
+msgid "Quit..."
+msgstr "退出..."
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:360
-msgid "Space between the username and the indicator"
-msgstr "用户和指示器之间的间距"
+#: ../gui/user-switch-applet/applet.c:1176
+msgid "Unknown"
+msgstr "未知的"
+
+#: ../gui/user-switch-applet/applet.c:1233
+msgid "User Switch Applet"
+msgstr "用户切换小程序"
+
+#: ../gui/user-switch-applet/applet.c:1242
+msgid "Change account settings and status"
+msgstr "改变账户设置和状态"
+
+#: ../gui/user-switch-applet/gdm-entry-menu-item.c:204
+msgid "Status"
+msgstr "状态"
 
 #: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1
 msgid "A menu to quickly switch between users"
 msgstr "一个可在用户间快速切换的菜单"
 
+#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2
+msgid "User Switcher"
+msgstr "用户切换器"
+
 #: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3
 msgid "User Switcher Applet Factory"
 msgstr "用户切换小程序工厂"
@@ -1035,37 +1038,66 @@ msgstr "关于(_A)"
 msgid "_Edit Users and Groups"
 msgstr "编辑用户和组(_E)"
 
-#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:4
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#: ../utils/gdmflexiserver.c:60 ../utils/gdmflexiserver.c:61
-#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:64
+#: ../utils/gdmflexiserver.c:61
+#: ../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:60
+#: ../utils/gdmflexiserver.c:61
 msgid "COMMAND"
 msgstr "命令"
 
-#: ../utils/gdmflexiserver.c:63 ../utils/gdm-screenshot.c:41
+#: ../utils/gdmflexiserver.c:64
+#: ../utils/gdm-screenshot.c:42
 msgid "Debugging output"
 msgstr "调试输出"
 
-#: ../utils/gdmflexiserver.c:67
+#: ../utils/gdmflexiserver.c:68
 msgid "Version of this application"
 msgstr "该应用程序版本"
 
-#: ../utils/gdmflexiserver.c:674
+#: ../utils/gdmflexiserver.c:675
 #, c-format
 msgid "Could not identify the current session."
 msgstr "无法识别当前进程"
 
-#: ../utils/gdmflexiserver.c:710 ../utils/gdm-screenshot.c:230
-msgid "Main Options"
-msgstr "主要选项"
+#. Option parsing
+#: ../utils/gdmflexiserver.c:711
+msgid "- New GDM login"
+msgstr "- 新 GDM 登录"
 
-#: ../utils/gdmflexiserver.c:759
+#: ../utils/gdmflexiserver.c:762
 msgid "Unable to start new display"
 msgstr "无法启动新显示"
+
+#. Option parsing
+#: ../utils/gdm-screenshot.c:231
+msgid "Take a picture of the screeen"
+msgstr "抓取本屏幕的一张图片"
+
+#~ msgid "You have the Caps Lock key on."
+#~ msgstr "Caps Lock 键打开着。"
+#~ msgid "User"
+#~ msgstr "用户"
+#~ msgid "The user this menu item represents."
+#~ msgstr "该菜单项代表的用户"
+#~ msgid "Icon Size"
+#~ msgstr "图标大小"
+#~ msgid "The size of the icon to use."
+#~ msgstr "将要使用的图标大小"
+#~ msgid "Indicator Size"
+#~ msgstr "指示器大小"
+#~ msgid "Size of check indicator"
+#~ msgstr "检查指示器的大小"
+#~ msgid "Indicator Spacing"
+#~ msgstr "指示器间距"
+#~ msgid "Space between the username and the indicator"
+#~ msgstr "用户和指示器之间的间距"
+#~ msgid "_Help"
+#~ msgstr "帮助(_H)"
+#~ msgid "Main Options"
+#~ msgstr "主要选项"
+