update zh_CN translation

1 files changed, 144 insertions, 134 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1c6a0410..02de6acf 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -17,78 +17,122 @@ msgstr ""
 "Project-Id-Version: gdm master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=gdm&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-11-22 20:44+0000\n"
-"PO-Revision-Date: 2013-11-30 22:31+0800\n"
-"Last-Translator: tuhaihe <1132321739qq@gmail.com>\n"
+"POT-Creation-Date: 2015-04-16 13:55+0000\n"
+"PO-Revision-Date: 2015-04-10 15:54+0800\n"
+"Last-Translator: osfans <waxaca@163.com>\n"
 "Language-Team: Chinese (simplified) <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: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.7.5\n"
 
-#: ../common/gdm-common.c:497
+#: ../common/gdm-common.c:311
 #, c-format
 msgid "/dev/urandom is not a character device"
 msgstr "/dev/urandom 不是字符设备"
 
+#: ../common/gdm-common.c:619 ../common/gdm-common.c:772
+#: ../libgdm/gdm-user-switching.c:344 ../libgdm/gdm-user-switching.c:514
+#, c-format
+msgid "Could not identify the current session."
+msgstr "无法识别当前会话。"
+
+#: ../common/gdm-common.c:626 ../libgdm/gdm-user-switching.c:351
+#, c-format
+msgid "User unable to switch sessions."
+msgstr "用户无法切换会话。"
+
+#: ../common/gdm-common.c:781 ../libgdm/gdm-user-switching.c:523
+#, c-format
+msgid "Could not identify the current seat."
+msgstr "无法识别当前位置。"
+
+#: ../common/gdm-common.c:791 ../libgdm/gdm-user-switching.c:533
+#, c-format
+msgid ""
+"The system is unable to determine whether to switch to an existing login "
+"screen or start up a new login screen."
+msgstr "系统无法确定是否应当切换到一个已经登录的屏幕还是启动一个新登录屏幕。"
+
+#: ../common/gdm-common.c:799 ../libgdm/gdm-user-switching.c:541
+#, c-format
+msgid "The system is unable to start up a new login screen."
+msgstr "系统无法启动新登录屏幕。"
+
 #: ../daemon/gdm-display-access-file.c:300
 #, c-format
 msgid "could not find user \"%s\" on system"
 msgstr "无法在系统中找到用户“%s”"
 
-#: ../daemon/gdm-display.c:1328 ../daemon/gdm-display.c:1362
-#, c-format
-msgid "No session available yet"
-msgstr "尚无可用会话"
+#: ../daemon/gdm-legacy-display.c:235
+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-manager.c:367 ../daemon/gdm-manager.c:412
+#: ../daemon/gdm-manager.c:1175
+msgid "No display available"
+msgstr "无可用的显示"
+
+#: ../daemon/gdm-manager.c:1242 ../daemon/gdm-manager.c:1498
 msgid "No session available"
 msgstr "无可用的会话"
 
-#: ../daemon/gdm-server.c:234
-#, c-format
-msgid "%s: failed to connect to parent display '%s'"
-msgstr "%s：无法连接到父显示屏“%s”"
+#: ../daemon/gdm-manager.c:1253
+msgid "Can only be called before user is logged in"
+msgstr "只能在用户登录前被调用"
 
-#: ../daemon/gdm-server.c:413
+#: ../daemon/gdm-manager.c:1263
+msgid "Caller not GDM"
+msgstr "调用者不是 GDM"
+
+#: ../daemon/gdm-manager.c:1273
+msgid "Unable to open private communication channel"
+msgstr "无法打开专用通信通道"
+
+#: ../daemon/gdm-server.c:437
 #, c-format
 msgid "Server was to be spawned by user %s but that user doesn't exist"
 msgstr "服务器是以用户 %s 身份创建的，但此用户不存在"
 
-#: ../daemon/gdm-server.c:424 ../daemon/gdm-server.c:444
+#: ../daemon/gdm-server.c:448 ../daemon/gdm-server.c:468
 #, c-format
 msgid "Couldn't set groupid to %d"
 msgstr "无法将组 ID 设置为 %d"
 
-#: ../daemon/gdm-server.c:430
+#: ../daemon/gdm-server.c:454
 #, c-format
 msgid "initgroups () failed for %s"
 msgstr "initgroups() 执行 %s 失败"
 
-#: ../daemon/gdm-server.c:436
+#: ../daemon/gdm-server.c:460
 #, c-format
 msgid "Couldn't set userid to %d"
 msgstr "无法将用户 ID 设置为 %d"
 
-#: ../daemon/gdm-server.c:483
+#: ../daemon/gdm-server.c:538
 #, c-format
 msgid "%s: Could not open log file for display %s!"
 msgstr "%s：无法打开显示屏 %s 的日志文件！"
 
-#: ../daemon/gdm-server.c:494 ../daemon/gdm-server.c:500
-#: ../daemon/gdm-server.c:506
+#: ../daemon/gdm-server.c:559 ../daemon/gdm-server.c:565
+#: ../daemon/gdm-server.c:571
 #, c-format
 msgid "%s: Error setting %s to %s"
 msgstr "%s：将 %s 设为 %s 出错"
 
-#: ../daemon/gdm-server.c:526
+#: ../daemon/gdm-server.c:591
 #, c-format
 msgid "%s: Server priority couldn't be set to %d: %s"
 msgstr "%s：服务器优先级无法设为 %d：%s"
 
-#: ../daemon/gdm-server.c:682
+#: ../daemon/gdm-server.c:743
 #, c-format
 msgid "%s: Empty server command for display %s"
 msgstr "%s：显示画面 %s 的服务器命令为空"
@@ -117,119 +161,106 @@ msgstr "显示设备"
 msgid "The display device"
 msgstr "显示设备"
 
-#: ../daemon/gdm-session.c:1161
+#: ../daemon/gdm-session.c:1184
 msgid "Could not create authentication helper process"
 msgstr "无法建立验证助手进程"
 
-#: ../daemon/gdm-session-worker.c:835
+#: ../daemon/gdm-session-worker.c:849
 msgid "Your account was given a time limit that's now passed."
 msgstr "你的帐号设有时间限制，已超过限定时间。"
 
-#: ../daemon/gdm-session-worker.c:842
+#: ../daemon/gdm-session-worker.c:856
 msgid "Sorry, that didn't work. Please try again."
 msgstr "抱歉，没有奏效，请再试一次。"
 
-#: ../daemon/gdm-session-worker.c:1074
+#: ../daemon/gdm-session-worker.c:1221
 msgid "Username:"
 msgstr "用户名："
 
-#: ../daemon/gdm-session-worker.c:1261
+#: ../daemon/gdm-session-worker.c:1355
 msgid "Your password has expired, please change it now."
 msgstr "你的密码已过期，请立即修改。"
 
-#: ../daemon/gdm-session-worker.c:1500 ../daemon/gdm-session-worker.c:1517
+#: ../daemon/gdm-session-worker.c:1594 ../daemon/gdm-session-worker.c:1611
 #, c-format
 msgid "no user account available"
 msgstr "无可用用户帐户"
 
-#: ../daemon/gdm-session-worker.c:1544
+#: ../daemon/gdm-session-worker.c:1638
 msgid "Unable to change to user"
 msgstr "无法切换到用户"
 
-#: ../daemon/gdm-simple-slave.c:1531
-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-wayland-session.c:377
+msgid "GNOME Display Manager Wayland Session Launcher"
+msgstr "GNOME 显示管理器 Wayland 会话启动器"
 
-#: ../daemon/gdm-simple-slave.c:1572
-#, c-format
-msgid "Can only be called before user is logged in"
-msgstr "只能在用户登录前被调用"
+#: ../daemon/gdm-xdmcp-display-factory.c:609
+msgid "Could not create socket!"
+msgstr "无法创建套接字！"
 
-#: ../daemon/gdm-simple-slave.c:1582
-#, c-format
-msgid "Caller not GDM"
-msgstr "调用者不是 GDM"
+#: ../daemon/gdm-x-session.c:678
+msgid "Run program through /etc/gdm/Xsession wrapper script"
+msgstr "通过 /etc/gdm/Xsession 包装脚本运行程序"
 
-#: ../daemon/gdm-simple-slave.c:1635
-msgid "User not logged in"
-msgstr "用户未登录"
+#: ../daemon/gdm-x-session.c:679
+msgid "Listen on TCP socket"
+msgstr "监听 TCP 套接字"
 
-#: ../daemon/gdm-xdmcp-chooser-slave.c:368
-#, c-format
-msgid "Currently, only one client can be connected at once"
-msgstr "当前，一次只能连接一个客户端"
-
-#: ../daemon/gdm-xdmcp-display-factory.c:604
-msgid "Could not create socket!"
-msgstr "无法创建套接字！"
+#: ../daemon/gdm-x-session.c:690
+msgid "GNOME Display Manager X Session Launcher"
+msgstr "GNOME 显示管理器 X 会话启动器"
 
 #: ../daemon/main.c:125 ../daemon/main.c:138
 #, c-format
 msgid "Cannot write PID file %s: possibly out of disk space: %s"
 msgstr "无法写入 PID 文件 %s：可能磁盘空间不够：%s"
 
-#: ../daemon/main.c:188
+#: ../daemon/main.c:182
 #, c-format
 msgid "Failed to create ran once marker dir %s: %s"
 msgstr "无法创建单次运行标记目录 %s：%s"
 
-#: ../daemon/main.c:194
+#: ../daemon/main.c:188
 #, c-format
 msgid "Failed to create LogDir %s: %s"
 msgstr "无法创建 LogDir %s: %s"
 
-#: ../daemon/main.c:229
+#: ../daemon/main.c:223
 #, c-format
 msgid "Can't find the GDM user '%s'. Aborting!"
 msgstr "找不到 GDM 用户“%s”。中止！"
 
-#: ../daemon/main.c:235
+#: ../daemon/main.c:229
 msgid "The GDM user should not be root. Aborting!"
 msgstr "GDM 用户不能为 root。中止！"
 
-#: ../daemon/main.c:241
+#: ../daemon/main.c:235
 #, c-format
 msgid "Can't find the GDM group '%s'. Aborting!"
 msgstr "找不到 GDM 组“%s”。中止！"
 
-#: ../daemon/main.c:247
+#: ../daemon/main.c:241
 msgid "The GDM group should not be root. Aborting!"
 msgstr "GDM 组不能为 root。中止！"
 
-#: ../daemon/main.c:321
+#: ../daemon/main.c:318
 msgid "Make all warnings fatal"
 msgstr "设置所有警告为致命错误"
 
-#: ../daemon/main.c:322
+#: ../daemon/main.c:319
 msgid "Exit after a time (for debugging)"
 msgstr "一段时间后退出(用于调试)"
 
-#: ../daemon/main.c:323
+#: ../daemon/main.c:320
 msgid "Print GDM version"
 msgstr "打印 GDM 版本"
 
-#: ../daemon/main.c:334
+#: ../daemon/main.c:333
 msgid "GNOME Display Manager"
 msgstr "GNOME 显示管理器"
 
 #. make sure the pid file doesn't get wiped
-#: ../daemon/main.c:382
+#: ../daemon/main.c:381
 msgid "Only the root user can run GDM"
 msgstr "只有 root 用户才能运行 GDM"
 
@@ -239,27 +270,13 @@ msgstr "只有 root 用户才能运行 GDM"
 msgid "GNOME Display Manager Session Worker"
 msgstr "GNOME 显示管理器会话工作进程"
 
-#: ../daemon/simple-slave-main.c:119 ../daemon/xdmcp-chooser-slave-main.c:118
-msgid "Display ID"
-msgstr "显示 ID"
-
-#: ../daemon/simple-slave-main.c:119 ../daemon/xdmcp-chooser-slave-main.c:118
-msgid "ID"
-msgstr "ID"
-
-#: ../daemon/simple-slave-main.c:127 ../daemon/xdmcp-chooser-slave-main.c:126
-msgid "GNOME Display Manager Slave"
-msgstr "GNOME 从属显示管理器"
-
-#: ../data/applications/gdm-simple-greeter.desktop.in.in.h:1
-msgid "Login Window"
-msgstr "登录窗口"
-
 #: ../data/applications/gnome-shell.desktop.in.h:1
+#: ../data/applications/gnome-shell-wayland.desktop.in.h:1
 msgid "GNOME Shell"
 msgstr "GNOME Shell"
 
 #: ../data/applications/gnome-shell.desktop.in.h:2
+#: ../data/applications/gnome-shell-wayland.desktop.in.h:2
 msgid "Window management and compositing"
 msgstr "窗口管理与混成"
 
@@ -359,44 +376,6 @@ msgid ""
 "giving up and going back to user selection."
 msgstr "放弃并返回用户选择界面前，允许某个用户尝试认证的次数。"
 
-#: ../gui/libgdm/gdm-user-switching.c:72
-msgid "Unable to create transient display: "
-msgstr "无法创建过渡显示界面："
-
-#: ../gui/libgdm/gdm-user-switching.c:183
-#: ../gui/libgdm/gdm-user-switching.c:395
-msgid "Unable to activate session: "
-msgstr "无法激活会话："
-
-#: ../gui/libgdm/gdm-user-switching.c:344
-#: ../gui/libgdm/gdm-user-switching.c:514 ../utils/gdmflexiserver.c:447
-#: ../utils/gdmflexiserver.c:600
-#, c-format
-msgid "Could not identify the current session."
-msgstr "无法识别当前会话。"
-
-#: ../gui/libgdm/gdm-user-switching.c:351 ../utils/gdmflexiserver.c:454
-#, c-format
-msgid "User unable to switch sessions."
-msgstr "用户无法切换会话。"
-
-#: ../gui/libgdm/gdm-user-switching.c:523 ../utils/gdmflexiserver.c:609
-#, c-format
-msgid "Could not identify the current seat."
-msgstr "无法识别当前位置。"
-
-#: ../gui/libgdm/gdm-user-switching.c:533 ../utils/gdmflexiserver.c:619
-#, c-format
-msgid ""
-"The system is unable to determine whether to switch to an existing login "
-"screen or start up a new login screen."
-msgstr "系统无法确定是否应当切换到一个已经登录的屏幕还是启动一个新登录屏幕。"
-
-#: ../gui/libgdm/gdm-user-switching.c:541 ../utils/gdmflexiserver.c:627
-#, c-format
-msgid "The system is unable to start up a new login screen."
-msgstr "系统无法启动新登录屏幕。"
-
 #: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147
 msgid "Select System"
 msgstr "选择系统"
@@ -417,36 +396,40 @@ msgstr "XMDCP：XDMCP 版本错误！"
 msgid "XDMCP: Unable to parse address"
 msgstr "XMDCP：无法解析地址"
 
-#: ../utils/gdmflexiserver.c:65
+#: ../libgdm/gdm-user-switching.c:72
+msgid "Unable to create transient display: "
+msgstr "无法创建过渡显示界面："
+
+#: ../libgdm/gdm-user-switching.c:183 ../libgdm/gdm-user-switching.c:395
+msgid "Unable to activate session: "
+msgstr "无法激活会话："
+
+#: ../utils/gdmflexiserver.c:45
 msgid "Only the VERSION command is supported"
 msgstr "只支持 VERSION 命令"
 
-#: ../utils/gdmflexiserver.c:65
+#: ../utils/gdmflexiserver.c:45
 msgid "COMMAND"
 msgstr "命令"
 
-#: ../utils/gdmflexiserver.c:66 ../utils/gdmflexiserver.c:67
-#: ../utils/gdmflexiserver.c:69 ../utils/gdmflexiserver.c:70
+#: ../utils/gdmflexiserver.c:46 ../utils/gdmflexiserver.c:47
+#: ../utils/gdmflexiserver.c:49 ../utils/gdmflexiserver.c:50
 msgid "Ignored — retained for compatibility"
 msgstr "忽略 - 保持兼容性"
 
-#: ../utils/gdmflexiserver.c:68 ../utils/gdm-screenshot.c:43
+#: ../utils/gdmflexiserver.c:48 ../utils/gdm-screenshot.c:43
 msgid "Debugging output"
 msgstr "调试输出"
 
-#: ../utils/gdmflexiserver.c:72
+#: ../utils/gdmflexiserver.c:52
 msgid "Version of this application"
 msgstr "该应用程序版本"
 
 #. Option parsing
-#: ../utils/gdmflexiserver.c:693
+#: ../utils/gdmflexiserver.c:137
 msgid "- New GDM login"
 msgstr "- 新 GDM 登录"
 
-#: ../utils/gdmflexiserver.c:749
-msgid "Unable to start new display"
-msgstr "无法启动新显示会话"
-
 #: ../utils/gdm-screenshot.c:212
 msgid "Screenshot taken"
 msgstr "已经截屏"
@@ -456,6 +439,33 @@ msgstr "已经截屏"
 msgid "Take a picture of the screen"
 msgstr "截取屏幕"
 
+#~ msgid "No session available yet"
+#~ msgstr "尚无可用会话"
+
+#~ msgid "%s: failed to connect to parent display '%s'"
+#~ msgstr "%s：无法连接到父显示屏“%s”"
+
+#~ msgid "User not logged in"
+#~ msgstr "用户未登录"
+
+#~ msgid "Currently, only one client can be connected at once"
+#~ msgstr "当前，一次只能连接一个客户端"
+
+#~ msgid "Display ID"
+#~ msgstr "显示 ID"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "GNOME Display Manager Slave"
+#~ msgstr "GNOME 从属显示管理器"
+
+#~ msgid "Login Window"
+#~ msgstr "登录窗口"
+
+#~ msgid "Unable to start new display"
+#~ msgstr "无法启动新显示会话"
+
 #~ msgid "Unable to look up UID of user %s"
 #~ msgstr "无法查询用户 %s 的 UID"