summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFunda Wang <fwang@src.gnome.org>2006-01-23 07:15:55 +0000
committerFunda Wang <fwang@src.gnome.org>2006-01-23 07:15:55 +0000
commit70572cd894c3c003102391ca937e6dd24267f3e6 (patch)
tree4c1b649ce557fae1d29d53148afb7abc58eaa839
parent5c04bb27a1ededa6dd4ff6eca621e56d699313d7 (diff)
downloadgdm-70572cd894c3c003102391ca937e6dd24267f3e6.tar.gz
Updated gdm translation.
-rw-r--r--po/ChangeLog4
-rw-r--r--po/zh_CN.po1148
2 files changed, 576 insertions, 576 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index a7df1116..7fd53cd3 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-23 Funda Wang <fundawang@linux.net.cn>
+
+ * zh_CN.po: Updated Simplified Chinese translation.
+
2006-01-22 Alexander Shopov <ash@contact.bg>
* bg.po: Updated Bulgarian translation by
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d450284a..f18ed1d1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gdm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-18 05:40+0100\n"
-"PO-Revision-Date: 2005-12-18 20:13+0800\n"
+"POT-Creation-Date: 2006-01-23 06:32+0100\n"
+"PO-Revision-Date: 2006-01-23 14:57+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
@@ -117,55 +117,55 @@ msgstr "GNOME"
msgid "This session logs you into GNOME"
msgstr "此会话使您登录到 GNOME"
-#: ../daemon/auth.c:56
+#: ../daemon/auth.c:57
#, c-format
msgid "%s: Could not write new authorization entry: %s"
msgstr "%s:无法写入新认证条目:%s"
-#: ../daemon/auth.c:59
+#: ../daemon/auth.c:60
#, c-format
msgid "%s: Could not write new authorization entry. Possibly out of diskspace"
msgstr "%s:无法写入新认证条目。硬盘空间可能已耗尽"
-#: ../daemon/auth.c:64
+#: ../daemon/auth.c:65
#, c-format
msgid ""
"GDM could not write a new authorization entry to disk. Possibly out of "
"diskspace.%s%s"
msgstr "GDM 无法将新认证条目写入文件。硬盘空间可能已耗尽。%s%s"
-#: ../daemon/auth.c:194
+#: ../daemon/auth.c:195
#, c-format
msgid "%s: Could not make new cookie file in %s"
msgstr "%s:无法在 %s 中创建新 cookie 文件"
-#: ../daemon/auth.c:218 ../daemon/auth.c:235 ../daemon/auth.c:875
+#: ../daemon/auth.c:219 ../daemon/auth.c:236 ../daemon/auth.c:876
#, c-format
msgid "%s: Cannot safely open %s"
msgstr "%s:无法安全打开 %s"
#. Really no need to clean up here - this process is a goner anyway
-#: ../daemon/auth.c:674 ../daemon/auth.c:716
+#: ../daemon/auth.c:675 ../daemon/auth.c:717
#, c-format
msgid "%s: Could not open cookie file %s"
msgstr "%s:无法打开 cookie 文件 %s"
-#: ../daemon/auth.c:695
+#: ../daemon/auth.c:696
#, c-format
msgid "%s: Could not lock cookie file %s"
msgstr "%s:无法锁定 cookie 文件 %s"
-#: ../daemon/auth.c:745 ../daemon/auth.c:767
+#: ../daemon/auth.c:746 ../daemon/auth.c:768
#, c-format
msgid "%s: Could not write cookie"
msgstr "%s:无法写入 cookie"
-#: ../daemon/auth.c:851
+#: ../daemon/auth.c:852
#, c-format
msgid "%s: Ignoring suspiciously looking cookie file %s"
msgstr "%s:忽略可疑 cookie 文件 %s"
-#: ../daemon/auth.c:894 ../daemon/gdm.c:1361 ../daemon/gdm.c:1725
+#: ../daemon/auth.c:895 ../daemon/gdm.c:1361 ../daemon/gdm.c:1725
#, c-format
msgid "Can't write to %s: %s"
msgstr "无法写入 %s:%s"
@@ -180,7 +180,7 @@ msgstr "无法写入 %s:%s"
#. * that should give people ample time to stop gdm if needed,
#. * or just wait for the stupid malicious user to get bored
#. * and go away
-#: ../daemon/display.c:110
+#: ../daemon/display.c:111
#, c-format
msgid ""
"The display server has been shut down about 6 times in the last 90 seconds. "
@@ -190,22 +190,22 @@ msgstr ""
"显示服务器在过去的 90 秒内关闭了六次,这可能意味着系统存在某种问题。我会在再"
"次显示 %s 前先等两分钟。"
-#: ../daemon/display.c:254
+#: ../daemon/display.c:255
#, c-format
msgid "%s: Cannot create pipe"
msgstr "%s:无法创建管道"
-#: ../daemon/display.c:330
+#: ../daemon/display.c:331
#, c-format
msgid "%s: Failed forking GDM slave process for %s"
msgstr "%s:为 %s 创建 GDM 从进程失败"
-#: ../daemon/errorgui.c:346
+#: ../daemon/errorgui.c:348
#, c-format
msgid "%s not a regular file!\n"
msgstr "%s 不是一个普通文件!\n"
-#: ../daemon/errorgui.c:363
+#: ../daemon/errorgui.c:365
msgid ""
"\n"
"... File too long to display ...\n"
@@ -213,54 +213,54 @@ msgstr ""
"\n"
"... 文件太长,显示不下 ...\n"
-#: ../daemon/errorgui.c:372
+#: ../daemon/errorgui.c:374
#, c-format
msgid "%s could not be opened"
msgstr "无法打开 %s"
-#: ../daemon/errorgui.c:484 ../daemon/errorgui.c:625 ../daemon/errorgui.c:733
-#: ../daemon/errorgui.c:851
+#: ../daemon/errorgui.c:488 ../daemon/errorgui.c:632 ../daemon/errorgui.c:743
+#: ../daemon/errorgui.c:864
#, c-format
msgid "%s: Cannot fork to display error/info box"
msgstr "%s:无法创建子进程以显示错误/信息对话框"
-#: ../daemon/filecheck.c:60
+#: ../daemon/filecheck.c:61
#, c-format
msgid "%s: Directory %s does not exist."
msgstr "%s:目录 %s 不存在。"
-#: ../daemon/filecheck.c:72 ../daemon/filecheck.c:114
-#: ../daemon/filecheck.c:177
+#: ../daemon/filecheck.c:73 ../daemon/filecheck.c:115
+#: ../daemon/filecheck.c:178
#, c-format
msgid "%s: %s is not owned by uid %d."
msgstr "%s:%s 不属于 uid %d。"
-#: ../daemon/filecheck.c:78 ../daemon/filecheck.c:121
+#: ../daemon/filecheck.c:79 ../daemon/filecheck.c:122
#, c-format
msgid "%s: %s is writable by group."
msgstr "%s:%s 对同组用户可写。"
-#: ../daemon/filecheck.c:84
+#: ../daemon/filecheck.c:85
#, c-format
msgid "%s: %s is writable by other."
msgstr "%s:%s 对其他用户可写。"
-#: ../daemon/filecheck.c:99 ../daemon/filecheck.c:165
+#: ../daemon/filecheck.c:100 ../daemon/filecheck.c:166
#, c-format
msgid "%s: %s does not exist but must exist."
msgstr "%s:%s 必须存在但它不存在。"
-#: ../daemon/filecheck.c:107 ../daemon/filecheck.c:171
+#: ../daemon/filecheck.c:108 ../daemon/filecheck.c:172
#, c-format
msgid "%s: %s is not a regular file."
msgstr "%s:%s 不是一个普通文件。"
-#: ../daemon/filecheck.c:128
+#: ../daemon/filecheck.c:129
#, c-format
msgid "%s: %s is writable by group/other."
msgstr "%s:%s 对同组用户和其它用户可写。"
-#: ../daemon/filecheck.c:135 ../daemon/filecheck.c:190
+#: ../daemon/filecheck.c:136 ../daemon/filecheck.c:191
#, c-format
msgid "%s: %s is bigger than sysadmin specified maximum file size."
msgstr "%s:%s 超过系统管理员指定的最大文件尺寸。"
@@ -304,7 +304,7 @@ msgid "%s: fork () failed!"
msgstr "%s:fork() 失败!"
#. should never happen
-#: ../daemon/gdm.c:221 ../daemon/slave.c:3324
+#: ../daemon/gdm.c:221 ../daemon/slave.c:3332
#, c-format
msgid "%s: setsid () failed: %s!"
msgstr "%s:setsid() 失败:%s!"
@@ -346,7 +346,7 @@ msgstr "主人正在挂起..."
#: ../daemon/gdm.c:622
#, c-format
-msgid "System is rebooting, please wait ..."
+msgid "System is restarting, please wait ..."
msgstr "正在重新启动系统,请稍候..."
#: ../daemon/gdm.c:624
@@ -364,23 +364,27 @@ msgid "%s: Halt failed: %s"
msgstr "%s:关机失败:%s"
#: ../daemon/gdm.c:657
-msgid "Master rebooting..."
-msgstr "主人正在重新启动..."
+msgid "Restarting computer..."
+msgstr "正在重启计算机..."
#: ../daemon/gdm.c:670
#, c-format
-msgid "%s: Reboot failed: %s"
-msgstr "%s:重新启动失败:%s!"
+msgid "%s: Restart failed: %s"
+msgstr "%s:重新启动失败:%s"
#: ../daemon/gdm.c:771
#, c-format
-msgid "Reboot or Halt request when there is no system menu from display %s"
-msgstr "在没有系统菜单时收到来自显示 %s 的重启或关机请求"
+msgid ""
+"Restart GDM, Restart machine, Suspend, or Halt request when there is no "
+"system menu from display %s"
+msgstr "显示 %s 没有系统菜单时重新启动 GDM、重新启动计算机、挂起或关机的请求"
#: ../daemon/gdm.c:780
#, c-format
-msgid "Restart, Reboot or Halt request from a non-static display %s"
-msgstr "从非静态显示 %s 发出的重新开始、重新启动或关机请求"
+msgid ""
+"Restart GDM, Restart machine, Suspend or Halt request from a non-static "
+"display %s"
+msgstr "从非静态显示 %s 发出的重新启动 GDM、重新启动计算机、挂起或关机请求"
#. Bury this display for good
#: ../daemon/gdm.c:846
@@ -409,11 +413,11 @@ msgstr "无法在后台创建子进程"
msgid "No console (static) servers to be run"
msgstr "没有要运行的控制台(静态)服务器"
-#: ../daemon/gdm.c:1237 ../gui/gdmsetup.c:6320
+#: ../daemon/gdm.c:1237
msgid "Alternative configuration file"
msgstr "备选配置文件"
-#: ../daemon/gdm.c:1237 ../gui/gdmsetup.c:6320
+#: ../daemon/gdm.c:1237
msgid "CONFIGFILE"
msgstr "配置文件"
@@ -434,7 +438,7 @@ msgstr "启动第一个 X 服务器,但却挂机了。目前尚未收到 GO
msgid "Can't open %s for writing"
msgstr "无法为写入打开 %s"
-#: ../daemon/gdm.c:1408 ../gui/gdmchooser.c:1934
+#: ../daemon/gdm.c:1408 ../gui/gdmchooser.c:1932
#, c-format
msgid ""
"Error on option %s: %s.\n"
@@ -451,14 +455,14 @@ msgstr "只有 root 需要运行 GDM\n"
#: ../daemon/gdm.c:1446 ../daemon/gdm.c:1450 ../daemon/gdm.c:1533
#: ../daemon/gdm.c:1537 ../daemon/gdm.c:1541 ../daemon/gdm.c:1545
#: ../daemon/gdm.c:1555 ../daemon/gdm.c:1561 ../daemon/gdm.c:1572
-#: ../daemon/misc.c:1770 ../daemon/misc.c:1774 ../daemon/misc.c:1778
-#: ../daemon/misc.c:1785 ../daemon/misc.c:1789 ../daemon/misc.c:1793
-#: ../daemon/server.c:521 ../daemon/server.c:534 ../daemon/slave.c:780
+#: ../daemon/misc.c:1771 ../daemon/misc.c:1775 ../daemon/misc.c:1779
+#: ../daemon/misc.c:1786 ../daemon/misc.c:1790 ../daemon/misc.c:1794
+#: ../daemon/server.c:522 ../daemon/server.c:535 ../daemon/slave.c:780
#: ../daemon/slave.c:794 ../daemon/slave.c:804 ../daemon/slave.c:814
-#: ../daemon/slave.c:826 ../gui/gdmchooser.c:1843 ../gui/gdmchooser.c:1846
-#: ../gui/gdmchooser.c:1849 ../gui/gdmlogin.c:3506 ../gui/gdmlogin.c:3516
-#: ../gui/gdmlogin.c:3521 ../gui/greeter/greeter.c:996
-#: ../gui/greeter/greeter.c:1004 ../gui/greeter/greeter.c:1007
+#: ../daemon/slave.c:826 ../gui/gdmchooser.c:1841 ../gui/gdmchooser.c:1844
+#: ../gui/gdmchooser.c:1847 ../gui/gdmlogin.c:3388 ../gui/gdmlogin.c:3398
+#: ../gui/gdmlogin.c:3403 ../gui/greeter/greeter.c:1003
+#: ../gui/greeter/greeter.c:1011 ../gui/greeter/greeter.c:1014
#, c-format
msgid "%s: Error setting up %s signal handler: %s"
msgstr "%s:设置 %s 信号处理器出错:%s"
@@ -476,9 +480,9 @@ msgstr "%s:设置 CHLD 信号处理器出错"
msgid "DYNAMIC request denied: Not authenticated"
msgstr "DYNAMIC 请求被禁止:未通过认证"
-#: ../daemon/gdm.c:2860 ../daemon/gdm.c:2878 ../daemon/gdm.c:3121
-#: ../daemon/gdm.c:3172 ../daemon/gdm.c:3224 ../daemon/gdm.c:3265
-#: ../daemon/gdm.c:3291
+#: ../daemon/gdm.c:2860 ../daemon/gdm.c:2878 ../daemon/gdm.c:3138
+#: ../daemon/gdm.c:3189 ../daemon/gdm.c:3241 ../daemon/gdm.c:3282
+#: ../daemon/gdm.c:3308
#, c-format
msgid "%s request denied: Not authenticated"
msgstr "%s 请求被禁止:未通过认证"
@@ -496,53 +500,63 @@ msgid ""
"standard server."
msgstr "请求的服务器 %s 不能被用于便捷服务器;使用标准服务器。"
-#: ../daemon/gdmconfig.c:538
+#: ../daemon/gdmconfig.c:542 ../daemon/gdmconfig.c:549
#, c-format
msgid "%s: No GDM configuration file: %s. Using defaults."
msgstr "%s:没有 GDM 配置文件:%s。使用默认值。"
-#: ../daemon/gdmconfig.c:784
+#: ../daemon/gdmconfig.c:845
#, c-format
msgid "%s: BaseXsession empty; using %s/gdm/Xsession"
msgstr "%s:BaseXsession 为空;使用 %s/gdm/Xsession"
-#: ../daemon/gdmconfig.c:817
+#: ../daemon/gdmconfig.c:878
#, c-format
msgid "%s: Standard X server not found; trying alternatives"
msgstr "%s:找不到标准 X 服务器;正在尝试替代服务器"
-#: ../daemon/gdmconfig.c:876
+#: ../daemon/gdmconfig.c:937
#, c-format
msgid "%s: No greeter specified."
msgstr "%s:未指定欢迎程序。"
-#: ../daemon/gdmconfig.c:878
+#: ../daemon/gdmconfig.c:939
#, c-format
msgid "%s: No remote greeter specified."
msgstr "%s:未指定远程欢迎程序。"
-#: ../daemon/gdmconfig.c:880
+#: ../daemon/gdmconfig.c:941
#, c-format
msgid "%s: No sessions directory specified."
msgstr "%s:未指定会话目录。"
-#: ../daemon/gdmconfig.c:961
+#: ../daemon/gdmconfig.c:1025
#, c-format
msgid "%s: XDMCP was enabled while there is no XDMCP support; turning it off"
msgstr "%s:XDMCP 在 XDMCP 不存在的时候被启用;正在关闭"
-#: ../daemon/gdmconfig.c:1020
+#: ../daemon/gdmconfig.c:1086
#, c-format
msgid "%s: TimedLoginDelay is less than 5, defaulting to 5."
msgstr "%s:TimedLoginDelay 小于 5,所以我就使用 5。"
-#: ../daemon/gdmconfig.c:1228
+#: ../daemon/gdmconfig.c:1322
+#, c-format
+msgid "%s: Priority out of bounds; changed to %d"
+msgstr "%s:优先级超出范围;更改为 %d"
+
+#: ../daemon/gdmconfig.c:1328
+#, c-format
+msgid "%s: Empty server command; using standard command."
+msgstr "%s:服务器命令为空;使用标准命令。"
+
+#: ../daemon/gdmconfig.c:1527
#, c-format
msgid ""
"%s: Logdir %s does not exist or isn't a directory. Using ServAuthDir %s."
msgstr "%s:日志目录 %s 不存在或者不是目录。使用 ServAuthDir %s。"
-#: ../daemon/gdmconfig.c:1244
+#: ../daemon/gdmconfig.c:1543
#, c-format
msgid ""
"Server Authorization directory (daemon/ServAuthDir) is set to %s but this "
@@ -551,12 +565,12 @@ msgstr ""
"服务器认证目录 (daemon/ServAuthDir) 被设置为 %s 但它并不存在。请更正 GDM 配置"
"并重新启动 GDM。"
-#: ../daemon/gdmconfig.c:1253
+#: ../daemon/gdmconfig.c:1552
#, c-format
msgid "%s: Authdir %s does not exist. Aborting."
msgstr "%s:认证目录 %s 不存在。中止。"
-#: ../daemon/gdmconfig.c:1258
+#: ../daemon/gdmconfig.c:1557
#, c-format
msgid ""
"Server Authorization directory (daemon/ServAuthDir) is set to %s but this is "
@@ -565,34 +579,24 @@ msgstr ""
"服务器认证目录 (daemon/ServAuthDir) 被设置为 %s 但它不是一个目录。请更正 GDM "
"配置并重新启动 GDM。"
-#: ../daemon/gdmconfig.c:1267
+#: ../daemon/gdmconfig.c:1566
#, c-format
msgid "%s: Authdir %s is not a directory. Aborting."
msgstr "%s:认证目录 %s 不是目录。中止。"
-#: ../daemon/gdmconfig.c:1392
-#, c-format
-msgid "%s: Empty server command; using standard command."
-msgstr "%s:服务器命令为空;使用标准命令。"
-
-#: ../daemon/gdmconfig.c:1434
-#, c-format
-msgid "%s: Display number %d in use! Defaulting to %d"
-msgstr "%s:显示编号 %d 正在使用!我将使用 %d"
-
-#: ../daemon/gdmconfig.c:1451
+#: ../daemon/gdmconfig.c:1639
#, c-format
msgid "%s: Invalid server line in config file. Ignoring!"
msgstr "%s:配置文件中出现非法服务器行。忽略!"
-#: ../daemon/gdmconfig.c:1462 ../daemon/gdmconfig.c:1500
+#: ../daemon/gdmconfig.c:1762 ../daemon/gdmconfig.c:1800
#, c-format
msgid "%s: XDMCP disabled and no static servers defined. Aborting!"
msgstr "%s:已禁用 XDMCP,而且未定义本地服务器。中止!"
#. start
#. server uid
-#: ../daemon/gdmconfig.c:1480
+#: ../daemon/gdmconfig.c:1780
#, c-format
msgid ""
"%s: XDMCP disabled and no static servers defined. Adding %s on :%d to allow "
@@ -600,7 +604,7 @@ msgid ""
msgstr ""
"%1$s:已禁用 XDMCP,而且未定义本地服务器。为 :%3$d 添加 %2$s 以进行配置!"
-#: ../daemon/gdmconfig.c:1492
+#: ../daemon/gdmconfig.c:1792
msgid ""
"XDMCP is disabled and GDM cannot find any static server to start. "
"Aborting! Please correct the configuration and restart GDM."
@@ -608,19 +612,19 @@ msgstr ""
"XDMCP 已被禁用,而且 GDM 找不到要启动的任何本地服务器。中止!请更正配置并重新"
"启动 GDM。"
-#: ../daemon/gdmconfig.c:1517
+#: ../daemon/gdmconfig.c:1817
#, c-format
msgid ""
"The GDM user '%s' does not exist. Please correct GDM configuration and "
"restart GDM."
msgstr "GDM 用户“%s”不存在。请更正 GDM 配置并重新启动 GDM。"
-#: ../daemon/gdmconfig.c:1525
+#: ../daemon/gdmconfig.c:1825
#, c-format
msgid "%s: Can't find the GDM user '%s'. Aborting!"
msgstr "%s:找不到 GDM 用户 (%s)。中止!"
-#: ../daemon/gdmconfig.c:1531
+#: ../daemon/gdmconfig.c:1831
msgid ""
"The GDM user is set to be root, but this is not allowed since it can pose a "
"security risk. Please correct GDM configuration and restart GDM."
@@ -628,24 +632,24 @@ msgstr ""
"GDM 用户被设置为 root,但由于这会导致安全问题所以是不允许的。请更正 GDM 配置"
"并重新启动 GDM。"
-#: ../daemon/gdmconfig.c:1540
+#: ../daemon/gdmconfig.c:1840
#, c-format
msgid "%s: The GDM user should not be root. Aborting!"
msgstr "%s:GDM 用户不能为 root 。中止!"
-#: ../daemon/gdmconfig.c:1546
+#: ../daemon/gdmconfig.c:1846
#, c-format
msgid ""
"The GDM group '%s' does not exist. Please correct GDM configuration and "
"restart GDM."
msgstr "GDM 组“%s”不存在。请更正 GDM 配置并重新启动 GDM。"
-#: ../daemon/gdmconfig.c:1553
+#: ../daemon/gdmconfig.c:1853
#, c-format
msgid "%s: Can't find the GDM group '%s'. Aborting!"
msgstr "%s:找不到 GDM 组“%s”。中止!"
-#: ../daemon/gdmconfig.c:1559
+#: ../daemon/gdmconfig.c:1859
msgid ""
"The GDM group is set to be root, but this is not allowed since it can pose a "
"security risk. Please correct GDM configuration and restart GDM."
@@ -653,36 +657,36 @@ msgstr ""
"GDM 组被设置为 root,但由于这会导致安全问题所以是不允许的。请更正 GDM 配置并"
"重新启动 GDM。"
-#: ../daemon/gdmconfig.c:1568
+#: ../daemon/gdmconfig.c:1868
#, c-format
msgid "%s: The GDM group should not be root. Aborting!"
msgstr "%s:GDM 组不能为 root。中止!"
-#: ../daemon/gdmconfig.c:1577
+#: ../daemon/gdmconfig.c:1877
#, c-format
msgid "%s: Greeter not found or can't be executed by the GDM user"
msgstr "%s:GDM 用户找不到或无法执行欢迎程序"
-#: ../daemon/gdmconfig.c:1583
+#: ../daemon/gdmconfig.c:1883
#, c-format
msgid "%s: Remote greeter not found or can't be executed by the GDM user"
msgstr "%s:找不到远程欢迎程序或 GDM 用户无法执行远程欢迎程序"
-#: ../daemon/gdmconfig.c:1591
+#: ../daemon/gdmconfig.c:1891
#, c-format
msgid "%s: Chooser not found or it can't be executed by the GDM user"
msgstr "%s:GDM 用户找不到或无法执行选择程序"
-#: ../daemon/gdmconfig.c:1600
+#: ../daemon/gdmconfig.c:1900
msgid "No daemon/ServAuthDir specified in the GDM configuration file"
msgstr "在 GDM 配置文件中未指定 daemon/ServAuthDir"
-#: ../daemon/gdmconfig.c:1602
+#: ../daemon/gdmconfig.c:1902
#, c-format
msgid "%s: No daemon/ServAuthDir specified."
msgstr "%s:未指定 daemon/ServAuthDir。"
-#: ../daemon/gdmconfig.c:1625
+#: ../daemon/gdmconfig.c:1925
#, c-format
msgid ""
"Server Authorization directory (daemon/ServAuthDir) is set to %s but is not "
@@ -692,12 +696,12 @@ msgstr ""
"服务器认证目录 (daemon/ServAuthDir) 被设置为 %s 但它并不属于用户 %s 和组 %s。"
"请更正所有权或更正 GDM 配置并重新启动 GDM。"
-#: ../daemon/gdmconfig.c:1635
+#: ../daemon/gdmconfig.c:1935
#, c-format
msgid "%s: Authdir %s is not owned by user %s, group %s. Aborting."
msgstr "%s:认证目录 %s 不属于用户 %s,组 %s。中止。"
-#: ../daemon/gdmconfig.c:1640
+#: ../daemon/gdmconfig.c:1940
#, c-format
msgid ""
"Server Authorization directory (daemon/ServAuthDir) is set to %s but has the "
@@ -707,37 +711,37 @@ msgstr ""
"服务器认证目录 (daemon/ServAuthDir) 被设置为 %s 但权限不正确:它的权限应为 %"
"o。请更正权限或更正 GDm 配置并重新启动 GDM。"
-#: ../daemon/gdmconfig.c:1652
+#: ../daemon/gdmconfig.c:1952
#, c-format
msgid "%s: Authdir %s has wrong permissions %o. Should be %o. Aborting."
msgstr "%s:认证目录 %s 的权限 %o 是错误的。应为 %o。中止。"
#. Translators, don't translate the 'y' and 'n'
-#: ../daemon/misc.c:744
+#: ../daemon/misc.c:745
msgid "y = Yes or n = No? >"
msgstr "y = 是 或 n = 否?>"
-#: ../daemon/misc.c:1124
+#: ../daemon/misc.c:1125
#, c-format
msgid "%s: Cannot get local addresses!"
msgstr "%s:无法获取本地地址!"
-#: ../daemon/misc.c:1278
+#: ../daemon/misc.c:1279
#, c-format
msgid "Could not setgid %d. Aborting."
msgstr "无法调用 setgid %d。中止。"
-#: ../daemon/misc.c:1283
+#: ../daemon/misc.c:1284
#, c-format
msgid "initgroups () failed for %s. Aborting."
msgstr "initgroups() 执行 %s 失败。中止。"
-#: ../daemon/misc.c:1528 ../daemon/misc.c:1542
+#: ../daemon/misc.c:1529 ../daemon/misc.c:1543
#, c-format
msgid "%s: Error setting signal %d to %s"
msgstr "%s:将信号 %d 设置为 %s 出错"
-#: ../daemon/misc.c:2442
+#: ../daemon/misc.c:2443
#, c-format
msgid ""
"Last login:\n"
@@ -746,11 +750,11 @@ msgstr ""
"上次登录:\n"
"%s"
-#: ../daemon/server.c:150
+#: ../daemon/server.c:151
msgid "Can not start fallback console"
msgstr "无法启动回调控制台"
-#: ../daemon/server.c:340
+#: ../daemon/server.c:341
#, c-format
msgid ""
"There already appears to be an X server running on display %s. Should "
@@ -760,7 +764,7 @@ msgstr ""
"好像已经有一个 X 服务器运行在显示 %s 上。我是否该尝试其它显示编号?如果您回答"
"否,我就再次尝试在 %s 上启动服务器。%s"
-#: ../daemon/server.c:348
+#: ../daemon/server.c:349
msgid ""
" (You can change consoles by pressing Ctrl-Alt plus a function key, such as "
"Ctrl-Alt-F7 to go to console 7. X servers usually run on consoles 7 and "
@@ -769,93 +773,98 @@ msgstr ""
" (您可以通过按 Ctrl-Alt 和一个功能键来切换到控制台,例如 Ctrl-Alt-F7 将切换"
"到控制台 7。X 服务器通常运行在 7 号或更高号码的控制台上。)"
-#: ../daemon/server.c:394
+#: ../daemon/server.c:395
#, c-format
msgid "Display '%s' cannot be opened by Xnest"
msgstr "Xnest 无法打开显示“%s”"
-#: ../daemon/server.c:425
+#: ../daemon/server.c:426
#, c-format
msgid "Display %s is busy. There is another X server running already."
msgstr "显示 %s 正忙。已有另外一个 X 服务器运行于其上。"
-#: ../daemon/server.c:509
+#: ../daemon/server.c:510
#, c-format
msgid "%s: Error opening a pipe: %s"
msgstr "%s:打开管道错误:%s"
-#: ../daemon/server.c:697
+#: ../daemon/server.c:698
#, c-format
msgid "%s: failed to connect to parent display '%s'"
msgstr "%s:连接到父显示“%s”失败"
#. Send X too busy
-#: ../daemon/server.c:837
+#: ../daemon/server.c:838
#, c-format
msgid "%s: Cannot find a free display number"
msgstr "%s:找不到空闲的显示编号"
-#: ../daemon/server.c:864
+#: ../daemon/server.c:865
#, c-format
msgid "%s: Display %s busy. Trying another display number."
msgstr "%s:显示 %s 正忙。正在尝试其它显示编号。"
-#: ../daemon/server.c:975
+#: ../daemon/server.c:976
#, c-format
msgid "Invalid server command '%s'"
msgstr "非法服务器命令“%s”"
-#: ../daemon/server.c:980
+#: ../daemon/server.c:981
#, c-format
msgid "Server name '%s' not found; using standard server"
msgstr "找不到服务器名“%s”;使用标准服务器"
-#: ../daemon/server.c:1157
+#: ../daemon/server.c:1160
#, c-format
msgid "%s: Could not open logfile for display %s!"
msgstr "%s:无法打开日志文件显示 %s!"
-#: ../daemon/server.c:1169 ../daemon/server.c:1175 ../daemon/server.c:1180
+#: ../daemon/server.c:1172 ../daemon/server.c:1178 ../daemon/server.c:1183
#, c-format
msgid "%s: Error setting %s to %s"
msgstr "%s:将 %s 设置为 %s 出错"
-#: ../daemon/server.c:1226
+#: ../daemon/server.c:1229
#, c-format
msgid "%s: Empty server command for display %s"
msgstr "%s:显示 %s 的空服务器命令"
-#: ../daemon/server.c:1240
+#: ../daemon/server.c:1239
+#, c-format
+msgid "%s: Server priority couldn't be set to %d: %s"
+msgstr "%s:服务器优先级无法设定为 %d:%s"
+
+#: ../daemon/server.c:1251
#, c-format
msgid "%s: Server was to be spawned by uid %d but that user doesn't exist"
msgstr "%s:服务器是由 uid %d 启动的但那个用户不存在"
-#: ../daemon/server.c:1255 ../daemon/slave.c:2449 ../daemon/slave.c:2920
+#: ../daemon/server.c:1266 ../daemon/slave.c:2450 ../daemon/slave.c:2921
#, c-format
msgid "%s: Couldn't set groupid to %d"
msgstr "%s:无法将组 ID 设置为 %d"
-#: ../daemon/server.c:1261 ../daemon/slave.c:2455 ../daemon/slave.c:2926
+#: ../daemon/server.c:1272 ../daemon/slave.c:2456 ../daemon/slave.c:2927
#, c-format
msgid "%s: initgroups () failed for %s"
msgstr "%s:initgroups() 执行 %s 失败"
-#: ../daemon/server.c:1267 ../daemon/slave.c:2460 ../daemon/slave.c:2931
+#: ../daemon/server.c:1278 ../daemon/slave.c:2461 ../daemon/slave.c:2932
#, c-format
msgid "%s: Couldn't set userid to %d"
msgstr "%s:无法将用户 ID 设置为 %d"
-#: ../daemon/server.c:1274
+#: ../daemon/server.c:1285
#, c-format
msgid "%s: Couldn't set groupid to 0"
msgstr "%s:无法将组 ID 设置为 0"
-#: ../daemon/server.c:1301
+#: ../daemon/server.c:1312
#, c-format
msgid "%s: Xserver not found: %s"
msgstr "%s:找不到 Xserver:%s"
-#: ../daemon/server.c:1309
+#: ../daemon/server.c:1320
#, c-format
msgid "%s: Can't fork Xserver process!"
msgstr "%s:无法创建 gdmgreeter 进程"
@@ -911,17 +920,17 @@ msgstr ""
"禁用。请在问题更正\n"
"以后重新启动 GDM。"
-#: ../daemon/slave.c:1543
+#: ../daemon/slave.c:1545
#, c-format
msgid "%s: cannot fork"
msgstr "%s:无法创建子进程"
-#: ../daemon/slave.c:1590
+#: ../daemon/slave.c:1592
#, c-format
msgid "%s: cannot open display %s"
msgstr "%s:无法打开显示 %s"
-#: ../daemon/slave.c:1741
+#: ../daemon/slave.c:1743
msgid ""
"Could not execute the configuration application. Make sure its path is set "
"correctly in the configuration file. Attempting to start it from the "
@@ -930,28 +939,28 @@ msgstr ""
"无法执行配置应用程序。请确认在配置文件中正确地设置了它的路径。我将试图从默认"
"位置启动它。"
-#: ../daemon/slave.c:1755
+#: ../daemon/slave.c:1757
msgid ""
"Could not execute the configuration application. Make sure its path is set "
"correctly in the configuration file."
msgstr "无法执行配置应用程序。请确认在配置文件中为它设置了正确的路径。"
-#: ../daemon/slave.c:1919
+#: ../daemon/slave.c:1921
msgid "You must authenticate as root to run configuration."
msgstr "要运行配置,您必须以 root 身份登录。"
-#: ../daemon/slave.c:2051 ../daemon/slave.c:2075
+#: ../daemon/slave.c:2053 ../daemon/slave.c:2076
msgid ""
"Login sound requested on non-local display or the play software cannot be "
"run or the sound does not exist."
msgstr "在非本地显示中请求登录声音,或者是无法运行播放软件,或者是声音不存在。"
-#: ../daemon/slave.c:2403 ../daemon/slave.c:2408
+#: ../daemon/slave.c:2404 ../daemon/slave.c:2409
#, c-format
msgid "%s: Can't init pipe to gdmgreeter"
msgstr "%s:无法初始化到 gdmgreeter 的管道"
-#: ../daemon/slave.c:2540
+#: ../daemon/slave.c:2541
msgid ""
"No servers were defined in the configuration file and XDMCP was disabled. "
"This can only be a configuration error. GDM has started a single server for "
@@ -962,7 +971,7 @@ msgstr ""
"为您启动了单用户服务器。您应当登录并更正配置。请注意自动和计时登录目前已被禁"
"用了。"
-#: ../daemon/slave.c:2554
+#: ../daemon/slave.c:2555
msgid ""
"Could not start the regular X server (your graphical environment) and so "
"this is a failsafe X server. You should log in and properly configure the X "
@@ -971,14 +980,14 @@ msgstr ""
"我无法启动普通 X 服务器(您的图形环境),因而这是个安全模式下 X 服务器。您应该"
"登录并正确地配置 X 服务器。"
-#: ../daemon/slave.c:2563
+#: ../daemon/slave.c:2564
#, c-format
msgid ""
"The specified display number was busy, so this server was started on display "
"%s."
msgstr "指定的显示编号正忙,所以该服务器是在显示 %s 上启动的。"
-#: ../daemon/slave.c:2583
+#: ../daemon/slave.c:2584
msgid ""
"The greeter application appears to be crashing.\n"
"Attempting to use a different one."
@@ -987,17 +996,17 @@ msgstr ""
"我将试图使用不同的欢迎程序。"
#. Something went wrong
-#: ../daemon/slave.c:2606
+#: ../daemon/slave.c:2607
#, c-format
msgid "%s: Cannot start greeter with gtk modules: %s. Trying without modules"
msgstr "%s:无法以 gtk 模块启动欢迎程序:%s。尝试不带模块启动"
-#: ../daemon/slave.c:2613
+#: ../daemon/slave.c:2614
#, c-format
msgid "%s: Cannot start greeter trying default: %s"
msgstr "%s:无法启动欢迎程序,正在尝试默认值:%s"
-#: ../daemon/slave.c:2625
+#: ../daemon/slave.c:2626
msgid ""
"Cannot start the greeter application; you will not be able to log in. This "
"display will be disabled. Try logging in by other means and editing the "
@@ -1007,113 +1016,114 @@ msgstr ""
"辑配置文件"
#. If no greeter we really have to disable the display
-#: ../daemon/slave.c:2632
+#: ../daemon/slave.c:2633
#, c-format
msgid "%s: Error starting greeter on display %s"
msgstr "%s:在显示 %s 上启动欢迎程序出错"
-#: ../daemon/slave.c:2636
+#: ../daemon/slave.c:2637
#, c-format
msgid "%s: Can't fork gdmgreeter process"
msgstr "%s:无法创建 gdmgreeter 进程"
-#: ../daemon/slave.c:2708
+#: ../daemon/slave.c:2709
#, c-format
msgid "%s: Can't open fifo!"
msgstr "%s:无法打开 fifo!"
-#: ../daemon/slave.c:2880
+#: ../daemon/slave.c:2881
#, c-format
msgid "%s: Can't init pipe to gdmchooser"
msgstr "%s:无法初始化到 gdmgreeter 的管道"
-#: ../daemon/slave.c:2985
+#: ../daemon/slave.c:2986
msgid ""
"Cannot start the chooser application. You will probably not be able to log "
"in. Please contact the system administrator."
msgstr "无法启动选择应用程序。您可能无法登录。请联系系统管理员。"
-#: ../daemon/slave.c:2989
+#: ../daemon/slave.c:2990
#, c-format
msgid "%s: Error starting chooser on display %s"
msgstr "%s:在显示 %s 上启动欢迎程序出错"
-#: ../daemon/slave.c:2992
+#: ../daemon/slave.c:2993
#, c-format
msgid "%s: Can't fork gdmchooser process"
msgstr "%s:无法创建 gdmgreeter 进程"
-#: ../daemon/slave.c:3225
+#: ../daemon/slave.c:3226
#, c-format
msgid "%s: Could not open ~/.xsession-errors"
msgstr "%s:无法打开 ~/.xsession-errors"
-#: ../daemon/slave.c:3377
+#: ../daemon/slave.c:3385
#, c-format
msgid "%s: Execution of PreSession script returned > 0. Aborting."
msgstr "%s:执行会话前脚本的返回值大于 0。中止。"
-#: ../daemon/slave.c:3421
+#: ../daemon/slave.c:3429
#, c-format
msgid "Language %s does not exist; using %s"
msgstr "语言 %s 不存在;使用 %s"
-#: ../daemon/slave.c:3422
+#: ../daemon/slave.c:3430
msgid "System default"
msgstr "系统默认"
-#: ../daemon/slave.c:3439
+#: ../daemon/slave.c:3447
#, c-format
msgid "%s: Could not setup environment for %s. Aborting."
msgstr "%s:无法为 %s 设置环境。中止。"
-#: ../daemon/slave.c:3486
+#: ../daemon/slave.c:3494
#, c-format
msgid "%s: setusercontext () failed for %s. Aborting."
msgstr "%s:对 %s 调用 setusercontext() 失败。中止。"
-#: ../daemon/slave.c:3492
+#: ../daemon/slave.c:3500
#, c-format
msgid "%s: Could not become %s. Aborting."
msgstr "%s:无法成为 %s。中止。"
-#: ../daemon/slave.c:3526
+#: ../daemon/slave.c:3536
#, c-format
-msgid "%s: No Exec line in the session file: %s. Starting failsafe GNOME"
-msgstr "%s:会话文件中没有执行行:%s。使用安全模式 GNOME"
-
-#: ../daemon/slave.c:3532
msgid ""
-"The session you selected does not look valid. Running the GNOME failsafe "
-"session instead."
-msgstr "您选中的会话好像无效。我将为您运行 GNOME 安全模式会话。"
+"No Exec line in the session file: %s. Running the GNOME failsafe session "
+"instead"
+msgstr "会话文件中未找到 Exec 行:%s。将为您尝试 GNOME 安全模式会话"
-#: ../daemon/slave.c:3548
+#: ../daemon/slave.c:3539
+#, c-format
+msgid "%s: %s"
+msgstr "%s:%s"
+
+#: ../daemon/slave.c:3559
#, c-format
msgid ""
"%s: Cannot find or run the base Xsession script. Running the GNOME failsafe "
"session instead."
msgstr "%s:找不到或无法运行基本会话脚本。将为您尝试 GNOME 安全模式会话。"
-#: ../daemon/slave.c:3554
+#: ../daemon/slave.c:3565
msgid ""
"Cannot find or run the base session script. Running the GNOME failsafe "
"session instead."
msgstr "找不到或无法运行基本会话脚本。将为您尝试 GNOME 安全模式会话。"
#. yaikes
-#: ../daemon/slave.c:3569
+#: ../daemon/slave.c:3580
#, c-format
msgid "%s: gnome-session not found for a failsafe GNOME session; trying xterm"
msgstr "%s:无法为安全模式 GNOME 会话找到 gnome-session ;尝试 xterm"
-#: ../daemon/slave.c:3574
+#: ../daemon/slave.c:3585
msgid ""
"Could not find the GNOME installation. Running the \"Failsafe xterm\" "
"session instead."
msgstr "找不到 GNOME 的安装。将尝试运行“安全模式 xterm”会话。"
-#: ../daemon/slave.c:3582
+#: ../daemon/slave.c:3593
msgid ""
"This is the Failsafe GNOME session. You will be logged into the 'Default' "
"session of GNOME without the startup scripts being run. This should be used "
@@ -1122,11 +1132,11 @@ msgstr ""
"这是安全模式 Gnome 会话。您将登录到没有启动脚本的“默认”Gnome 会话。这仅仅是用"
"于修正您安装中的问题的。"
-#: ../daemon/slave.c:3597
+#: ../daemon/slave.c:3608
msgid "Cannot find \"xterm\" to start a failsafe session."
msgstr "找不到“xterm”以启动一个安全模式会话。"
-#: ../daemon/slave.c:3610
+#: ../daemon/slave.c:3621
msgid ""
"This is the Failsafe xterm session. You will be logged into a terminal "
"console so that you may fix your system if you cannot log in any other way. "
@@ -1135,41 +1145,41 @@ msgstr ""
"这是安全模式 xterm 会话。您将登录到终端控制台,以便在您无法以其它方式登录的情"
"况下修正您的系统。要退出终端模拟器,在窗口中输入“exit”并回车。"
-#: ../daemon/slave.c:3637
+#: ../daemon/slave.c:3648
#, c-format
msgid "%s: User not allowed to log in"
msgstr "%s:不允许用户登录"
-#: ../daemon/slave.c:3640
+#: ../daemon/slave.c:3651
msgid "The system administrator has disabled your account."
msgstr "系统管理员已经禁用您的帐号。"
-#: ../daemon/slave.c:3671
+#: ../daemon/slave.c:3682
msgid "Error! Unable to set executable context."
msgstr "出错!无法设置可执行环境。"
#. will go to .xsession-errors
-#: ../daemon/slave.c:3679 ../daemon/slave.c:3684
+#: ../daemon/slave.c:3690 ../daemon/slave.c:3695
#, c-format
msgid "%s: Could not exec %s %s %s"
msgstr "%s:无法执行 %s %s %s"
#. we can't really be any more specific
-#: ../daemon/slave.c:3695
+#: ../daemon/slave.c:3706
msgid "Cannot start the session due to some internal error."
msgstr "由于某些内部错误,无法启动会话。"
-#: ../daemon/slave.c:3749
+#: ../daemon/slave.c:3760
#, c-format
msgid "%s: User passed auth but getpwnam (%s) failed!"
msgstr "%s:用户通过了认证但 getpwnam(%s) 失败!"
-#: ../daemon/slave.c:3762
+#: ../daemon/slave.c:3773
#, c-format
msgid "%s: Execution of PostLogin script returned > 0. Aborting."
msgstr "%s:执行会话前脚本的返回值大于 0。中止。"
-#: ../daemon/slave.c:3784
+#: ../daemon/slave.c:3795
#, c-format
msgid ""
"Your home directory is listed as:\n"
@@ -1185,12 +1195,12 @@ msgstr ""
"\n"
"除非您以安全模式会话登录,看起来并不是所有程序都能工作。"
-#: ../daemon/slave.c:3796
+#: ../daemon/slave.c:3807
#, c-format
msgid "%s: Home directory for %s: '%s' does not exist!"
msgstr "%s:%s 的主目录不存在:“%s”不存在!"
-#: ../daemon/slave.c:3845
+#: ../daemon/slave.c:3856
msgid ""
"User's $HOME/.dmrc file is being ignored. This prevents the default session "
"and language from being saved. File should be owned by user and have 644 "
@@ -1201,7 +1211,7 @@ msgstr ""
"有,并且权限设置为 644。用户的 $HOME 目录应由用户自己所有,别的用户也无法写"
"入。"
-#: ../daemon/slave.c:3974
+#: ../daemon/slave.c:3985
msgid ""
"GDM could not write to your authorization file. This could mean that you "
"are out of disk space or that your home directory could not be opened for "
@@ -1211,12 +1221,12 @@ msgstr ""
"GDM 无法写入您的认证文件。这可能意味着您的硬盘没有空间,或者您的主目录无法以"
"写方式打开。在这两种情况下都不可能登录。请与您的系统管理员联系"
-#: ../daemon/slave.c:4050
+#: ../daemon/slave.c:4061
#, c-format
msgid "%s: Error forking user session"
msgstr "%s:创建用户会话出错"
-#: ../daemon/slave.c:4131
+#: ../daemon/slave.c:4142
msgid ""
"Your session only lasted less than 10 seconds. If you have not logged out "
"yourself, this could mean that there is some installation problem or that "
@@ -1227,52 +1237,52 @@ msgstr ""
"者您的磁盘空间已耗尽。可以试试以某个安全模式会话登录,以便查看是否可以解决此"
"问题。"
-#: ../daemon/slave.c:4139
+#: ../daemon/slave.c:4150
msgid "View details (~/.xsession-errors file)"
msgstr "查看细节 (~/.xsession-errors 文件)"
-#: ../daemon/slave.c:4303
-msgid "GDM detected a shutdown or reboot in progress."
+#: ../daemon/slave.c:4314
+msgid "GDM detected a halt or restart in progress."
msgstr "GDM 检测到正在执行关机或重新启动。"
-#: ../daemon/slave.c:4397
+#: ../daemon/slave.c:4408
#, c-format
msgid "Ping to %s failed; whacking display!"
msgstr "Ping %s 失败;启动显示!"
-#: ../daemon/slave.c:4676
+#: ../daemon/slave.c:4687
#, c-format
msgid "%s: Fatal X error - Restarting %s"
msgstr "%s:致命的 X 错误 - 正在重新启动 %s"
-#: ../daemon/slave.c:4745
+#: ../daemon/slave.c:4756
msgid ""
"Login sound requested on non-local display or the play software cannot be "
"run or the sound does not exist"
msgstr "在非本地显示中请求声音,或者是无法运行播放软件,或者是声音不存在"
-#: ../daemon/slave.c:5102
+#: ../daemon/slave.c:5113
#, c-format
msgid "%s: Failed starting: %s"
msgstr "%s:启动失败:%s"
-#: ../daemon/slave.c:5109 ../daemon/slave.c:5248
+#: ../daemon/slave.c:5120 ../daemon/slave.c:5259
#, c-format
msgid "%s: Can't fork script process!"
msgstr "%s:无法创建脚本进程!"
-#: ../daemon/slave.c:5203
+#: ../daemon/slave.c:5214
#, c-format
msgid "%s: Failed creating pipe"
msgstr "%s:创建管道失败"
-#: ../daemon/slave.c:5242
+#: ../daemon/slave.c:5253
#, c-format
msgid "%s: Failed executing: %s"
msgstr "%s:执行失败:%s"
-#: ../daemon/verify-crypt.c:67 ../daemon/verify-pam.c:1119
-#: ../daemon/verify-shadow.c:68
+#: ../daemon/verify-crypt.c:68 ../daemon/verify-pam.c:1119
+#: ../daemon/verify-shadow.c:69
msgid ""
"\n"
"Incorrect username or password. Letters must be typed in the correct case."
@@ -1280,57 +1290,58 @@ msgstr ""
"\n"
"用户名或密码不正确。字母必须以正确的大小写输入。"
-#: ../daemon/verify-crypt.c:72 ../daemon/verify-pam.c:1129
-#: ../daemon/verify-shadow.c:73
-msgid "Please make sure the Caps Lock key is not enabled."
-msgstr "请确认 Caps Lock 将没有开启。"
+#: ../daemon/verify-crypt.c:73 ../daemon/verify-pam.c:1129
+#: ../daemon/verify-shadow.c:74 ../gui/greeter/greeter_parser.c:1101
+msgid "Caps Lock is on."
+msgstr "Caps Lock 为开。"
-#: ../daemon/verify-crypt.c:119 ../daemon/verify-pam.c:525
-#: ../daemon/verify-shadow.c:118 ../gui/gdmlogin.c:2887
+#: ../daemon/verify-crypt.c:118 ../daemon/verify-pam.c:525
+#: ../daemon/verify-shadow.c:117 ../gui/gdmlogin.c:2773
msgid "Please enter your username"
msgstr "请输入您的用户名"
#. login: is whacked always translate to Username:
-#: ../daemon/verify-crypt.c:120 ../daemon/verify-pam.c:425
+#: ../daemon/verify-crypt.c:119 ../daemon/verify-pam.c:425
#: ../daemon/verify-pam.c:426 ../daemon/verify-pam.c:427
#: ../daemon/verify-pam.c:512 ../daemon/verify-pam.c:854
-#: ../daemon/verify-shadow.c:119 ../gui/gdmlogin.c:1099 ../gui/gdmlogin.c:1113
-#: ../gui/gdmlogin.c:1727 ../gui/gdmlogin.c:2207 ../gui/greeter/greeter.c:169
-#: ../gui/greeter/greeter_parser.c:1124
+#: ../daemon/verify-shadow.c:118 ../gui/gdmlogin.c:996 ../gui/gdmlogin.c:1010
+#: ../gui/gdmlogin.c:1624 ../gui/gdmlogin.c:2104 ../gui/greeter/greeter.c:172
+#: ../gui/greeter/greeter_parser.c:1120
msgid "Username:"
msgstr "用户名:"
-#: ../daemon/verify-crypt.c:158 ../daemon/verify-pam.c:428
+#: ../daemon/verify-crypt.c:157 ../daemon/verify-pam.c:428
#: ../daemon/verify-pam.c:429 ../daemon/verify-pam.c:573
-#: ../daemon/verify-shadow.c:176 ../gui/gdmlogin.c:1762
+#: ../daemon/verify-shadow.c:175 ../gui/gdmlogin.c:1659
+#: ../gui/greeter/greeter.c:190
msgid "Password:"
msgstr "密码:"
-#: ../daemon/verify-crypt.c:176 ../daemon/verify-crypt.c:190
-#: ../daemon/verify-shadow.c:194 ../daemon/verify-shadow.c:208
+#: ../daemon/verify-crypt.c:175 ../daemon/verify-crypt.c:189
+#: ../daemon/verify-shadow.c:193 ../daemon/verify-shadow.c:207
#, c-format
msgid "Couldn't authenticate user \"%s\""
msgstr "无法认证用户“%s”"
-#: ../daemon/verify-crypt.c:203 ../daemon/verify-pam.c:965
-#: ../daemon/verify-shadow.c:221
+#: ../daemon/verify-crypt.c:202 ../daemon/verify-pam.c:965
+#: ../daemon/verify-shadow.c:220
#, c-format
msgid "Root login disallowed on display '%s'"
msgstr "显示“%s”禁止 root 登录"
-#: ../daemon/verify-crypt.c:205 ../daemon/verify-shadow.c:223
+#: ../daemon/verify-crypt.c:204 ../daemon/verify-shadow.c:222
msgid "The system administrator is not allowed to login from this screen"
msgstr "不允许从该屏幕登录系统管理员"
-#: ../daemon/verify-crypt.c:221 ../daemon/verify-crypt.c:245
-#: ../daemon/verify-shadow.c:239 ../daemon/verify-shadow.c:263
+#: ../daemon/verify-crypt.c:220 ../daemon/verify-crypt.c:244
+#: ../daemon/verify-shadow.c:238 ../daemon/verify-shadow.c:262
#, c-format
msgid "User %s not allowed to log in"
msgstr "不允许用户 %s 登录"
-#: ../daemon/verify-crypt.c:223 ../daemon/verify-crypt.c:247
-#: ../daemon/verify-pam.c:1011 ../daemon/verify-pam.c:1294
-#: ../daemon/verify-shadow.c:241 ../daemon/verify-shadow.c:265
+#: ../daemon/verify-crypt.c:222 ../daemon/verify-crypt.c:246
+#: ../daemon/verify-pam.c:1011 ../daemon/verify-pam.c:1292
+#: ../daemon/verify-shadow.c:240 ../daemon/verify-shadow.c:264
msgid ""
"\n"
"The system administrator has disabled your account."
@@ -1338,16 +1349,16 @@ msgstr ""
"\n"
"系统管理员已经禁用您的帐号。"
-#: ../daemon/verify-crypt.c:270 ../daemon/verify-crypt.c:408
-#: ../daemon/verify-pam.c:1029 ../daemon/verify-pam.c:1311
-#: ../daemon/verify-shadow.c:288 ../daemon/verify-shadow.c:426
+#: ../daemon/verify-crypt.c:269 ../daemon/verify-crypt.c:407
+#: ../daemon/verify-pam.c:1029 ../daemon/verify-pam.c:1309
+#: ../daemon/verify-shadow.c:287 ../daemon/verify-shadow.c:425
#, c-format
msgid "Cannot set user group for %s"
msgstr "无法为 %s 设置用户组"
-#: ../daemon/verify-crypt.c:272 ../daemon/verify-crypt.c:411
-#: ../daemon/verify-pam.c:1031 ../daemon/verify-pam.c:1314
-#: ../daemon/verify-shadow.c:290 ../daemon/verify-shadow.c:429
+#: ../daemon/verify-crypt.c:271 ../daemon/verify-crypt.c:410
+#: ../daemon/verify-pam.c:1031 ../daemon/verify-pam.c:1312
+#: ../daemon/verify-shadow.c:289 ../daemon/verify-shadow.c:428
msgid ""
"\n"
"Cannot set your user group; you will not be able to log in. Please contact "
@@ -1356,13 +1367,13 @@ msgstr ""
"\n"
"无法设置您的用户组;您将无法登录,请联系您的系统管理员。"
-#: ../daemon/verify-crypt.c:283 ../daemon/verify-crypt.c:356
-#: ../daemon/verify-shadow.c:301 ../daemon/verify-shadow.c:375
+#: ../daemon/verify-crypt.c:282 ../daemon/verify-crypt.c:355
+#: ../daemon/verify-shadow.c:300 ../daemon/verify-shadow.c:374
#, c-format
msgid "Password of %s has expired"
msgstr "%s 的密码已过期"
-#: ../daemon/verify-crypt.c:285 ../daemon/verify-shadow.c:303
+#: ../daemon/verify-crypt.c:284 ../daemon/verify-shadow.c:302
msgid ""
"You are required to change your password.\n"
"Please choose a new one."
@@ -1370,7 +1381,7 @@ msgstr ""
"您需要更改您的密码。\n"
"请选择一个新密码。"
-#: ../daemon/verify-crypt.c:296 ../daemon/verify-shadow.c:314
+#: ../daemon/verify-crypt.c:295 ../daemon/verify-shadow.c:313
msgid ""
"\n"
"Cannot change your password; you will not be able to log in. Please try "
@@ -1379,8 +1390,8 @@ msgstr ""
"\n"
"无法更改您的密码;您将无法登录。请稍候再试一次,或联系您的系统管理员。"
-#: ../daemon/verify-crypt.c:339 ../daemon/verify-crypt.c:347
-#: ../daemon/verify-shadow.c:358 ../daemon/verify-shadow.c:366
+#: ../daemon/verify-crypt.c:338 ../daemon/verify-crypt.c:346
+#: ../daemon/verify-shadow.c:357 ../daemon/verify-shadow.c:365
msgid ""
"Your password has been changed but you may have to change it again. Please "
"try again later or contact your system administrator."
@@ -1388,7 +1399,7 @@ msgstr ""
"您的密码已经更改,但是可能需要再次更改。请稍候再试一次,或联系您的系统管理"
"员。"
-#: ../daemon/verify-crypt.c:358 ../daemon/verify-shadow.c:377
+#: ../daemon/verify-crypt.c:357 ../daemon/verify-shadow.c:376
msgid ""
"Your password has expired.\n"
"Only a system administrator can now change it"
@@ -1396,11 +1407,11 @@ msgstr ""
"您的密码已经过期。\n"
"现在只有系统管理员可以更改"
-#: ../daemon/verify-crypt.c:365 ../daemon/verify-shadow.c:384
+#: ../daemon/verify-crypt.c:364 ../daemon/verify-shadow.c:383
msgid "Internal error on passwdexpired"
msgstr "密码过期的内部错误"
-#: ../daemon/verify-crypt.c:367 ../daemon/verify-shadow.c:386
+#: ../daemon/verify-crypt.c:366 ../daemon/verify-shadow.c:385
msgid ""
"An internal error occurred. You will not be able to log in.\n"
"Please try again later or contact your system administrator."
@@ -1408,7 +1419,7 @@ msgstr ""
"发生了内部错误,您将无法登录。\n"
"请稍候再试一次,或联系您的系统管理员。"
-#: ../daemon/verify-crypt.c:403 ../daemon/verify-shadow.c:421
+#: ../daemon/verify-crypt.c:402 ../daemon/verify-shadow.c:420
#, c-format
msgid "Cannot get passwd structure for %s"
msgstr "无法为 %s 获取 passwd 结构"
@@ -1494,7 +1505,7 @@ msgstr "无法设置 PAM_RHOST=%s"
#. pretty much look as such, it shouldn't really
#. happen
#: ../daemon/verify-pam.c:915 ../daemon/verify-pam.c:933
-#: ../daemon/verify-pam.c:1233 ../daemon/verify-pam.c:1245
+#: ../daemon/verify-pam.c:1231 ../daemon/verify-pam.c:1243
msgid "Couldn't authenticate user"
msgstr "无法认证用户"
@@ -1506,12 +1517,12 @@ msgstr ""
"\n"
"不允许从该屏幕登录系统管理员"
-#: ../daemon/verify-pam.c:992 ../daemon/verify-pam.c:1275
+#: ../daemon/verify-pam.c:992 ../daemon/verify-pam.c:1273
#, c-format
msgid "Authentication token change failed for user %s"
msgstr "用户 %s 的认证标记修改失败"
-#: ../daemon/verify-pam.c:994 ../daemon/verify-pam.c:1278
+#: ../daemon/verify-pam.c:994 ../daemon/verify-pam.c:1276
msgid ""
"\n"
"The change of the authentication token failed. Please try again later or "
@@ -1520,12 +1531,12 @@ msgstr ""
"\n"
"修改认证标记失败。请稍后再试或与系统管理员联系。"
-#: ../daemon/verify-pam.c:1009 ../daemon/verify-pam.c:1291
+#: ../daemon/verify-pam.c:1009 ../daemon/verify-pam.c:1289
#, c-format
msgid "User %s no longer permitted to access the system"
msgstr "用户 %s 不再被允许访问系统"
-#: ../daemon/verify-pam.c:1015 ../daemon/verify-pam.c:1297
+#: ../daemon/verify-pam.c:1015 ../daemon/verify-pam.c:1295
#, c-format
msgid "User %s not permitted to gain access at this time"
msgstr "此时不允许用户 %s 获得访问权"
@@ -1538,17 +1549,17 @@ msgstr ""
"\n"
"系统管理员已经暂时地收回了对系统的访问权。"
-#: ../daemon/verify-pam.c:1022 ../daemon/verify-pam.c:1304
+#: ../daemon/verify-pam.c:1022 ../daemon/verify-pam.c:1302
#, c-format
msgid "Couldn't set acct. mgmt for %s"
msgstr "无法设置 %s 的帐号管理"
-#: ../daemon/verify-pam.c:1055 ../daemon/verify-pam.c:1338
+#: ../daemon/verify-pam.c:1055 ../daemon/verify-pam.c:1336
#, c-format
msgid "Couldn't set credentials for %s"
msgstr "无法为 %s 设置证书"
-#: ../daemon/verify-pam.c:1069 ../daemon/verify-pam.c:1354
+#: ../daemon/verify-pam.c:1069 ../daemon/verify-pam.c:1352
#, c-format
msgid "Couldn't open session for %s"
msgstr "无法为 %s 打开会话"
@@ -1561,16 +1572,16 @@ msgstr ""
"\n"
"认证失败。请检查字母大小写是否正确。"
-#: ../daemon/verify-pam.c:1139 ../daemon/verify-pam.c:1236
-#: ../daemon/verify-pam.c:1248
+#: ../daemon/verify-pam.c:1137 ../daemon/verify-pam.c:1234
+#: ../daemon/verify-pam.c:1246
msgid "Authentication failed"
msgstr "认证失败"
-#: ../daemon/verify-pam.c:1212
+#: ../daemon/verify-pam.c:1210
msgid "Automatic login"
msgstr "自动登录"
-#: ../daemon/verify-pam.c:1300
+#: ../daemon/verify-pam.c:1298
msgid ""
"\n"
"The system administrator has disabled your access to the system temporarily."
@@ -1578,7 +1589,7 @@ msgstr ""
"\n"
"系统管理员已暂时地禁止您对系统的访问。"
-#: ../daemon/verify-pam.c:1521 ../daemon/verify-pam.c:1523
+#: ../daemon/verify-pam.c:1519 ../daemon/verify-pam.c:1521
msgid "Can't find PAM configuration for GDM."
msgstr "无法为 GDM 找到 PAM 配置。"
@@ -1733,98 +1744,98 @@ msgstr ""
msgid "%s: No XDMCP support"
msgstr "%s:不支持 XDMCP"
-#: ../gui/gdmXnestchooser.c:167 ../gui/gdmXnestchooser.c:174
+#: ../gui/gdmXnestchooser.c:168 ../gui/gdmXnestchooser.c:175
msgid "Xnest command line"
msgstr "Xnest 命令行"
-#: ../gui/gdmXnestchooser.c:167 ../gui/gdmXnestchooser.c:174
+#: ../gui/gdmXnestchooser.c:168 ../gui/gdmXnestchooser.c:175
msgid "STRING"
msgstr "字符串"
-#: ../gui/gdmXnestchooser.c:168 ../gui/gdmXnestchooser.c:175
+#: ../gui/gdmXnestchooser.c:169 ../gui/gdmXnestchooser.c:176
msgid "Extra options for Xnest"
msgstr "Xnest 的更多选项"
-#: ../gui/gdmXnestchooser.c:168 ../gui/gdmXnestchooser.c:175
+#: ../gui/gdmXnestchooser.c:169 ../gui/gdmXnestchooser.c:176
msgid "OPTIONS"
msgstr "选项"
-#: ../gui/gdmXnestchooser.c:169 ../gui/gdmXnestchooser.c:179
+#: ../gui/gdmXnestchooser.c:170 ../gui/gdmXnestchooser.c:180
msgid "Run in background"
msgstr "在后台中运行"
-#: ../gui/gdmXnestchooser.c:176
+#: ../gui/gdmXnestchooser.c:177
msgid "Just run Xnest, no query (no chooser)"
msgstr "仅仅运行 Xnest,而不必查询 (无选择程序)"
-#: ../gui/gdmXnestchooser.c:177
+#: ../gui/gdmXnestchooser.c:178
msgid "Do direct query instead of indirect (chooser)"
msgstr "进行直接查询而不是间接查询 (选择程序)"
-#: ../gui/gdmXnestchooser.c:178
+#: ../gui/gdmXnestchooser.c:179
msgid "Run broadcast instead of indirect (chooser)"
msgstr "进行广播而不是间接查询 (选择程序)"
-#: ../gui/gdmXnestchooser.c:180
+#: ../gui/gdmXnestchooser.c:181
msgid "Don't check for running GDM"
msgstr "不要检查运行中的 GDM"
-#: ../gui/gdmXnestchooser.c:509
+#: ../gui/gdmXnestchooser.c:510
msgid "Xnest doesn't exist."
msgstr "Xnest 不存在。"
-#: ../gui/gdmXnestchooser.c:510
+#: ../gui/gdmXnestchooser.c:511
msgid "Please ask your system administrator to install it."
msgstr "请要求您的系统管理员安装它。"
-#: ../gui/gdmXnestchooser.c:535
+#: ../gui/gdmXnestchooser.c:536
msgid "Indirect XDMCP is not enabled"
msgstr "未启用间接 XDMCP"
-#: ../gui/gdmXnestchooser.c:536 ../gui/gdmXnestchooser.c:554
+#: ../gui/gdmXnestchooser.c:537 ../gui/gdmXnestchooser.c:555
msgid "Please ask your system administrator to enable this feature."
msgstr "请要求您的系统管理员启用此特性。"
-#: ../gui/gdmXnestchooser.c:553
+#: ../gui/gdmXnestchooser.c:554
msgid "XDMCP is not enabled"
msgstr "XDMCP 未启用"
-#: ../gui/gdmXnestchooser.c:585
+#: ../gui/gdmXnestchooser.c:586
msgid "GDM is not running"
msgstr "GDM 未在运行中"
-#: ../gui/gdmXnestchooser.c:586
+#: ../gui/gdmXnestchooser.c:587
msgid "Please ask your system administrator to start it."
msgstr "请要求您的系统管理员启动它。"
-#: ../gui/gdmXnestchooser.c:602
+#: ../gui/gdmXnestchooser.c:603
msgid "Could not find a free display number"
msgstr "找不到空闲的显示编号"
-#: ../gui/gdmchooser.c:85
+#: ../gui/gdmchooser.c:83
msgid "Please wait: scanning local network..."
msgstr "请稍候:正在扫描局域网..."
-#: ../gui/gdmchooser.c:86
+#: ../gui/gdmchooser.c:84
msgid "No serving hosts were found."
msgstr "找不到正在服务的主机。"
-#: ../gui/gdmchooser.c:87
+#: ../gui/gdmchooser.c:85
msgid "Choose a ho_st to connect to:"
msgstr "选择要连接的主机(_S):"
-#: ../gui/gdmchooser.c:623
+#: ../gui/gdmchooser.c:621
#, c-format
msgid ""
"The host \"%s\" is not willing to support a login session right now. Please "
"try again later."
msgstr "主机“%s”现在不愿意支持登录会话。请稍候再试。"
-#: ../gui/gdmchooser.c:633
+#: ../gui/gdmchooser.c:631
msgid "Cannot connect to remote server"
msgstr "无法连接到远程服务器"
-#: ../gui/gdmchooser.c:1255
+#: ../gui/gdmchooser.c:1253
#, c-format
msgid ""
"Did not receive any response from host \"%s\" in %d seconds. Perhaps the "
@@ -1834,20 +1845,20 @@ msgstr ""
"未在 %2$d 秒内从主机“%1$s”收到任何响应。可能主机未打开,或者现在不愿意支持登"
"录会话。请稍候再试。"
-#: ../gui/gdmchooser.c:1268
+#: ../gui/gdmchooser.c:1266
msgid "Did not receive response from server"
msgstr "未从服务器接收响应"
-#: ../gui/gdmchooser.c:1370
+#: ../gui/gdmchooser.c:1368
#, c-format
msgid "Cannot find the host \"%s\". Perhaps you have mistyped it."
msgstr "我找不到主机“%s”。可能您打错了。"
-#: ../gui/gdmchooser.c:1379
+#: ../gui/gdmchooser.c:1377
msgid "Cannot find host"
msgstr "找不到主机"
-#: ../gui/gdmchooser.c:1617
+#: ../gui/gdmchooser.c:1615
msgid ""
"The main area of this application shows the hosts on the local network that "
"have \"XDMCP\" enabled. This allows users to login remotely to other "
@@ -1862,45 +1873,41 @@ msgstr ""
"您可以点击“刷新”重新扫描网络以便找到新主机。当您选择了一个主机,点击“连接”以"
"打开到该计算机的会话。"
-#: ../gui/gdmchooser.c:1667
+#: ../gui/gdmchooser.c:1665
#, c-format
msgid "Can't open default host icon: %s"
msgstr "无法打开默认主机图标:%s"
-#: ../gui/gdmchooser.c:1857 ../gui/gdmlogin.c:3531
-#: ../gui/greeter/greeter.c:1015 ../gui/greeter/greeter.c:1022
+#: ../gui/gdmchooser.c:1855 ../gui/gdmlogin.c:3413
+#: ../gui/greeter/greeter.c:1022 ../gui/greeter/greeter.c:1029
msgid "Could not set signal mask!"
msgstr "无法设置信号屏蔽!"
-#: ../gui/gdmchooser.c:1863
+#: ../gui/gdmchooser.c:1861
msgid "Socket for xdm communication"
msgstr "进行 xdm 通讯的套接字"
-#: ../gui/gdmchooser.c:1863
+#: ../gui/gdmchooser.c:1861
msgid "SOCKET"
msgstr "SOCKET"
-#: ../gui/gdmchooser.c:1866
+#: ../gui/gdmchooser.c:1864
msgid "Client address to return in response to xdm"
msgstr "响应 xdm 时返回的客户端地址"
-#: ../gui/gdmchooser.c:1866
+#: ../gui/gdmchooser.c:1864
msgid "ADDRESS"
msgstr "地址"
-#: ../gui/gdmchooser.c:1869
+#: ../gui/gdmchooser.c:1867
msgid "Connection type to return in response to xdm"
msgstr "响应 xdm 时返回的连接类型"
-#: ../gui/gdmchooser.c:1869
+#: ../gui/gdmchooser.c:1867
msgid "TYPE"
msgstr "类型"
-#: ../gui/gdmchooser.c:1945 ../gui/gdmflexiserver.c:738 ../gui/gdmsetup.c:6392
-msgid "Could not access GDM configuration file.\n"
-msgstr "无法访问 GDM 配置文件。\n"
-
-#: ../gui/gdmchooser.c:1995
+#: ../gui/gdmchooser.c:1987
#, c-format
msgid ""
"The chooser version (%s) does not match the daemon version (%s). You have "
@@ -1909,7 +1916,7 @@ msgstr ""
"选择程序版本(%s)与守护程序版本(%s)不匹配。您可能刚刚升级 GDM。请重启 GDM 守护"
"程序或重新启动计算机。"
-#: ../gui/gdmchooser.c:2005
+#: ../gui/gdmchooser.c:1997
msgid "Cannot run chooser"
msgstr "无法运行选择程序"
@@ -1954,11 +1961,11 @@ msgstr "状态"
msgid "_Add"
msgstr "添加(_A)"
-#: ../gui/gdmcomm.c:416
+#: ../gui/gdmcomm.c:424
msgid "GDM (The GNOME Display Manager) is not running."
msgstr "GDM(GNOME 显示管理器)未运行。"
-#: ../gui/gdmcomm.c:418
+#: ../gui/gdmcomm.c:426
msgid ""
"You might in fact be using a different display manager, such as KDM (KDE "
"Display Manager) or xdm. If you still wish to use this feature, either start "
@@ -1967,42 +1974,42 @@ msgstr ""
"您可能正在使用不同的显示管理器,比如 KDM(KDE 显示管理器)或 XDM。如果您仍然想"
"要使用此特性,请您自己启动 GDM,或者要求您的系统管理员启动它。"
-#: ../gui/gdmcomm.c:442 ../gui/gdmflexiserver.c:782
+#: ../gui/gdmcomm.c:450 ../gui/gdmflexiserver.c:774
msgid "Cannot communicate with GDM (The GNOME Display Manager)"
msgstr "无法与 GDM(GNOME 显示器管理器)通讯"
-#: ../gui/gdmcomm.c:444 ../gui/gdmflexiserver.c:784
+#: ../gui/gdmcomm.c:452 ../gui/gdmflexiserver.c:776
msgid "Perhaps you have an old version of GDM running."
msgstr "可能您正在运行老版本的 gdm。"
-#: ../gui/gdmcomm.c:461 ../gui/gdmcomm.c:464
+#: ../gui/gdmcomm.c:469 ../gui/gdmcomm.c:472
msgid "Cannot communicate with GDM. Perhaps you have an old version running."
msgstr "无法与 GDM 通讯。可能您正在运行老版本的 GDM。"
-#: ../gui/gdmcomm.c:467
+#: ../gui/gdmcomm.c:475
msgid "The allowed limit of flexible X servers reached."
msgstr "已达到允许的便捷 X 服务器个数上限。"
-#: ../gui/gdmcomm.c:469
+#: ../gui/gdmcomm.c:477
msgid "There were errors trying to start the X server."
msgstr "试图启动 X 服务器时出错。"
-#: ../gui/gdmcomm.c:471
+#: ../gui/gdmcomm.c:479
msgid "The X server failed. Perhaps it is not configured well."
msgstr "X 服务器失败。可能没有配置好。"
-#: ../gui/gdmcomm.c:474
+#: ../gui/gdmcomm.c:482
msgid "Too many X sessions running."
msgstr "运行中的 X 会话太多。"
-#: ../gui/gdmcomm.c:476
+#: ../gui/gdmcomm.c:484
msgid ""
"The nested X server (Xnest) cannot connect to your current X server. You "
"may be missing an X authorization file."
msgstr ""
"嵌入 X 服务器 (Xnest) 无法连接到您当前的 X 服务器。您可能缺少 X 认证文件。"
-#: ../gui/gdmcomm.c:481
+#: ../gui/gdmcomm.c:489
msgid ""
"The nested X server (Xnest) is not available, or GDM is badly configured.\n"
"Please install the Xnest package in order to use the nested login."
@@ -2010,40 +2017,40 @@ msgstr ""
"嵌入 X 服务器 (Xnest) 不可用,或者错误地配置了 GDM。\n"
"请安装 Xnest 包以便使用嵌套登录。"
-#: ../gui/gdmcomm.c:486
+#: ../gui/gdmcomm.c:494
msgid "The X server is not available. GDM may be misconfigured."
msgstr "X 服务器不可用。GDM 可能配置错误。"
-#: ../gui/gdmcomm.c:489
+#: ../gui/gdmcomm.c:497
msgid ""
"Trying to set an unknown logout action, or trying to set a logout action "
"which is not available."
msgstr "试图设置位置的注销动作,或者试图设置不可用的注销动作。"
-#: ../gui/gdmcomm.c:492
+#: ../gui/gdmcomm.c:500
msgid "Virtual terminals not supported."
msgstr "不支持虚拟终端。"
-#: ../gui/gdmcomm.c:494
+#: ../gui/gdmcomm.c:502
msgid "Trying to change to an invalid virtual terminal number."
msgstr "试图更改为无效的虚拟终端编号。"
-#: ../gui/gdmcomm.c:496
+#: ../gui/gdmcomm.c:504
msgid "Trying to update an unsupported configuration key."
msgstr "试图更新不支持的配置键。"
-#: ../gui/gdmcomm.c:498
+#: ../gui/gdmcomm.c:506
msgid ""
"You do not seem to have the authentication needed for this operation. "
"Perhaps your .Xauthority file is not set up correctly."
msgstr ""
"您可能不具有该操作所必须的认证权限。可能您的 .Xauthority 文件的设置不正确。"
-#: ../gui/gdmcomm.c:502
+#: ../gui/gdmcomm.c:510
msgid "Too many messages were sent to GDM and it hung up on us."
msgstr "发送给 GDM 的消息太多,系统挂起。"
-#: ../gui/gdmcomm.c:505
+#: ../gui/gdmcomm.c:513
msgid "Unknown error occurred."
msgstr "发生未知错误。"
@@ -2052,10 +2059,30 @@ msgstr "发生未知错误。"
#. Translators: Translate this to '12-hour', or
#. '24-hour'. Meaning of the translation is the
#. default time format in your locale.
-#: ../gui/gdmcommon.c:298
+#: ../gui/gdmcommon.c:301
msgid "24-hour"
msgstr "24-hour"
+#: ../gui/gdmcommon.c:446
+msgid "%a %b %d, %H:%M"
+msgstr "%-m月%-d日%A,%H:%M"
+
+#. Translators: You should translate time part as
+#. %H:%M if your language does not have AM and PM
+#. equivalent. Note: %l is a strftime option for
+#. 12-hour clock format
+#: ../gui/gdmcommon.c:452
+msgid "%a %b %d, %l:%M %p"
+msgstr "%-m月%-d日%A,%H:%M"
+
+#: ../gui/gdmcommon.c:560
+msgid " seconds"
+msgstr " 秒"
+
+#: ../gui/gdmcommon.c:562
+msgid " second"
+msgstr " 秒"
+
#: ../gui/gdmflexiserver-xnest.desktop.in.h:1
msgid "Log in as another user inside a nested window"
msgstr "在嵌套的窗口中以其它用户登录"
@@ -2082,7 +2109,7 @@ msgstr "在虚拟终端 %2$d 上显示 %1$s"
msgid "Nested display %s on virtual terminal %d"
msgstr "在虚拟终端 %2$d 上嵌套显示 %1$s"
-#: ../gui/gdmflexiserver.c:250 ../gui/gdmlogin.c:2735
+#: ../gui/gdmflexiserver.c:250 ../gui/gdmlogin.c:2621
#: ../gui/greeter/greeter_item_ulist.c:245
msgid "Username"
msgstr "用户名"
@@ -2151,23 +2178,23 @@ msgstr "在运行 --command 前进行认证"
msgid "Start new flexible session; do not show popup"
msgstr "启动新的便捷会话;不显示弹出窗口"
-#: ../gui/gdmflexiserver.c:809
+#: ../gui/gdmflexiserver.c:800
msgid "You do not seem to have the authentication needed for this operation"
msgstr "您似乎不具有该操作所必须的认证权限。"
-#: ../gui/gdmflexiserver.c:812
+#: ../gui/gdmflexiserver.c:803
msgid "Perhaps your .Xauthority file is not set up correctly."
msgstr "可能您的 .Xauthority 文件的设置不正确。"
-#: ../gui/gdmflexiserver.c:836
+#: ../gui/gdmflexiserver.c:826
msgid "You do not seem to be logged in on the console"
msgstr "您似乎不能从控制台登录。"
-#: ../gui/gdmflexiserver.c:838
+#: ../gui/gdmflexiserver.c:828
msgid "Starting a new login only works correctly on the console."
msgstr "启动一个新的登录只能在控制台上正常工作。"
-#: ../gui/gdmflexiserver.c:884
+#: ../gui/gdmflexiserver.c:871
msgid "Cannot start new display"
msgstr "无法启动新显示"
@@ -2641,60 +2668,45 @@ msgstr "A-M"
msgid "N-Z"
msgstr "N-Z"
-#: ../gui/gdmlogin.c:351
+#: ../gui/gdmlogin.c:350
#, c-format
msgid "Cannot run command '%s': %s."
msgstr "无法运行命令“%s”:%s。"
-#: ../gui/gdmlogin.c:359
+#: ../gui/gdmlogin.c:358
msgid "Cannot start background application"
msgstr "无法启动背景应用程序"
-#: ../gui/gdmlogin.c:434
-#, c-format
-msgid "User %s will login in %d seconds"
-msgstr "用户 %s 将在 %d 秒后登录"
-
-#: ../gui/gdmlogin.c:438 ../gui/greeter/greeter_parser.c:1106
-#, c-format
-msgid "User %s will login in %d second"
-msgid_plural "User %s will login in %d seconds"
-msgstr[0] "用户 %s 将在 %d 秒后登录"
-
-#: ../gui/gdmlogin.c:665
-#, c-format
-msgid "%s: String too long!"
-msgstr "%s:字符串太长!"
+#: ../gui/gdmlogin.c:432 ../gui/greeter/greeter_parser.c:1106
+msgid "User %u will login in %t"
+msgstr "用户 %u 将在 %t 秒后登录"
-#: ../gui/gdmlogin.c:667
-#, c-format
-msgid "%sWelcome to %s%s"
-msgstr "%s欢迎来到 %s%s"
-
-#: ../gui/gdmlogin.c:752 ../gui/greeter/greeter_system.c:63
+#: ../gui/gdmlogin.c:649 ../gui/greeter/greeter_system.c:67
msgid "Are you sure you want to restart the computer?"
msgstr "您确定想要重新启动计算机吗?"
-#: ../gui/gdmlogin.c:753 ../gui/gdmlogin.c:2608
+#: ../gui/gdmlogin.c:650 ../gui/gdmlogin.c:2494
+#: ../gui/greeter/greeter_parser.c:1086 ../gui/greeter/greeter_system.c:68
+#: ../gui/greeter/greeter_system.c:187
msgid "_Restart"
msgstr "重新启动(_R)"
-#: ../gui/gdmlogin.c:765 ../gui/greeter/greeter_system.c:75
-msgid "Are you sure you want to shut down the computer?"
+#: ../gui/gdmlogin.c:662 ../gui/greeter/greeter_system.c:79
+msgid "Are you sure you want to Shut Down the computer?"
msgstr "您确定想要关闭计算机吗?"
-#: ../gui/gdmlogin.c:766 ../gui/gdmlogin.c:2618
-#: ../gui/greeter/greeter_parser.c:1076 ../gui/greeter/greeter_system.c:76
-#: ../gui/greeter/greeter_system.c:203
+#: ../gui/gdmlogin.c:663 ../gui/gdmlogin.c:2504
+#: ../gui/greeter/greeter_parser.c:1076 ../gui/greeter/greeter_system.c:80
+#: ../gui/greeter/greeter_system.c:199
msgid "Shut _Down"
msgstr "关机(_D)"
-#: ../gui/gdmlogin.c:786 ../gui/greeter/greeter_system.c:86
+#: ../gui/gdmlogin.c:683 ../gui/greeter/greeter_system.c:90
msgid "Are you sure you want to suspend the computer?"
msgstr "您确定想要挂起计算机吗?"
-#: ../gui/gdmlogin.c:787 ../gui/gdmlogin.c:2628
-#: ../gui/greeter/greeter_system.c:87
+#: ../gui/gdmlogin.c:684 ../gui/gdmlogin.c:2514
+#: ../gui/greeter/greeter_system.c:91
msgid "_Suspend"
msgstr "挂起(_S)"
@@ -2702,47 +2714,47 @@ msgstr "挂起(_S)"
#. no_group
#. untranslated
#. markup
-#: ../gui/gdmlogin.c:870 ../gui/gdmlogin.c:899 ../gui/gdmlogin.c:982
+#: ../gui/gdmlogin.c:767 ../gui/gdmlogin.c:796 ../gui/gdmlogin.c:879
#: ../gui/greeter/greeter_action_language.c:158
-#: ../gui/greeter/greeter_session.c:120 ../gui/greeter/greeter_session.c:150
+#: ../gui/greeter/greeter_session.c:119 ../gui/greeter/greeter_session.c:149
#, c-format
msgid "Do you wish to make %s the default for future sessions?"
msgstr "您是否希望使 %s 成为以后会话的默认设置?"
-#: ../gui/gdmlogin.c:873 ../gui/greeter/greeter_session.c:123
+#: ../gui/gdmlogin.c:770 ../gui/greeter/greeter_session.c:122
#, c-format
msgid "Your preferred session type %s is not installed on this computer."
msgstr "您首选的会话类型 %s 在此计算机上没有安装。"
-#: ../gui/gdmlogin.c:878 ../gui/gdmlogin.c:909 ../gui/gdmlogin.c:989
+#: ../gui/gdmlogin.c:775 ../gui/gdmlogin.c:806 ../gui/gdmlogin.c:886
#: ../gui/greeter/greeter_action_language.c:165
-#: ../gui/greeter/greeter_session.c:126 ../gui/greeter/greeter_session.c:158
+#: ../gui/greeter/greeter_session.c:125 ../gui/greeter/greeter_session.c:157
msgid "Make _Default"
msgstr "成为默认(_D)"
-#: ../gui/gdmlogin.c:878 ../gui/greeter/greeter_session.c:126
+#: ../gui/gdmlogin.c:775 ../gui/greeter/greeter_session.c:125
msgid "Just _Log In"
msgstr "只是登录(_L)"
-#: ../gui/gdmlogin.c:903 ../gui/gdmlogin.c:984
+#: ../gui/gdmlogin.c:800 ../gui/gdmlogin.c:881
#: ../gui/greeter/greeter_action_language.c:160
-#: ../gui/greeter/greeter_session.c:153
+#: ../gui/greeter/greeter_session.c:152
#, c-format
msgid "You have chosen %s for this session, but your default setting is %s."
msgstr "您已为该会话选择了 %s,但默认的设置为 %s。"
-#: ../gui/gdmlogin.c:909 ../gui/gdmlogin.c:989
+#: ../gui/gdmlogin.c:806 ../gui/gdmlogin.c:886
#: ../gui/greeter/greeter_action_language.c:165
-#: ../gui/greeter/greeter_session.c:158
+#: ../gui/greeter/greeter_session.c:157
msgid "Just For _This Session"
msgstr "只对此会话(_T)"
-#: ../gui/gdmlogin.c:920
+#: ../gui/gdmlogin.c:817
#, c-format
msgid "You have chosen %s for this session."
msgstr "您为此会话选择了 %s。"
-#: ../gui/gdmlogin.c:923
+#: ../gui/gdmlogin.c:820
#, c-format
msgid ""
"If you wish to make %s the default for future sessions, run the 'switchdesk' "
@@ -2751,24 +2763,24 @@ msgstr ""
"如果您希望使 %s 成为未来会话的默认值,请运行工具“switchdesk”(从主菜单选择 系"
"统工具->桌面切换工具)。"
-#: ../gui/gdmlogin.c:964 ../gui/gdmlogin.c:973
+#: ../gui/gdmlogin.c:861 ../gui/gdmlogin.c:870
#: ../gui/greeter/greeter_action_language.c:73
#: ../gui/greeter/greeter_action_language.c:142
#: ../gui/greeter/greeter_action_language.c:150
msgid "System Default"
msgstr "系统默认"
-#: ../gui/gdmlogin.c:1100 ../gui/gdmlogin.c:1114 ../gui/gdmlogin.c:1731
-#: ../gui/gdmlogin.c:2208 ../gui/gdmlogin.c:2840
+#: ../gui/gdmlogin.c:997 ../gui/gdmlogin.c:1011 ../gui/gdmlogin.c:1628
+#: ../gui/gdmlogin.c:2105 ../gui/gdmlogin.c:2726
msgid "_Username:"
msgstr "用户名(_U):"
-#: ../gui/gdmlogin.c:1188
+#: ../gui/gdmlogin.c:1085
#, c-format
msgid "%s session selected"
msgstr "选择了 %s 会话"
-#: ../gui/gdmlogin.c:1209 ../gui/gdmlogin.c:1327
+#: ../gui/gdmlogin.c:1106 ../gui/gdmlogin.c:1224
msgid "_Last"
msgstr "上次(_L)"
@@ -2776,92 +2788,80 @@ msgstr "上次(_L)"
#. no_group
#. untranslated
#. makrup
-#: ../gui/gdmlogin.c:1292
+#: ../gui/gdmlogin.c:1189
#, c-format
msgid "%s language selected"
msgstr "选择了 %s 语言"
-#: ../gui/gdmlogin.c:1338
+#: ../gui/gdmlogin.c:1235
msgid "_System Default"
msgstr "系统默认(_S)"
-#: ../gui/gdmlogin.c:1370
+#: ../gui/gdmlogin.c:1267
msgid "_Other"
msgstr "其它(_O)"
-#: ../gui/gdmlogin.c:1763
+#: ../gui/gdmlogin.c:1660
msgid "_Password:"
msgstr "密码(_P):"
#. translators: This is a nice and evil eggie text, translate
#. * to your favourite currency
-#: ../gui/gdmlogin.c:1994 ../gui/greeter/greeter.c:332
+#: ../gui/gdmlogin.c:1891 ../gui/greeter/greeter.c:338
msgid "Please insert 25 cents to log in."
msgstr "芝麻,开门。"
-#: ../gui/gdmlogin.c:2328
+#: ../gui/gdmlogin.c:2225
msgid "GNOME Desktop Manager"
msgstr "GNOME 桌面管理器"
-#: ../gui/gdmlogin.c:2353 ../gui/greeter/greeter_item.c:162
-msgid "%a %b %d, %H:%M"
-msgstr "%-m月%-d日%A,%H:%M"
-
-#. Translators: You should translate time part as
-#. %H:%M if your language does not have AM and PM
-#. equivalent. Note: %l is a strftime option for
-#. 12-hour clock format
-#: ../gui/gdmlogin.c:2359 ../gui/greeter/greeter_item.c:171
-msgid "%a %b %d, %l:%M %p"
-msgstr "%-m月%-d日%A,%H:%M"
-
-#: ../gui/gdmlogin.c:2408
+#: ../gui/gdmlogin.c:2291
msgid "Finger"
msgstr "Finger"
-#: ../gui/gdmlogin.c:2523
+#: ../gui/gdmlogin.c:2409
msgid "GDM Login"
msgstr "GDM 登录"
-#: ../gui/gdmlogin.c:2566 ../gui/greeter/greeter_parser.c:1056
+#: ../gui/gdmlogin.c:2452 ../gui/greeter/greeter_parser.c:1056
msgid "_Session"
msgstr "会话(_S)"
-#: ../gui/gdmlogin.c:2573 ../gui/greeter/greeter_parser.c:1051
+#: ../gui/gdmlogin.c:2459 ../gui/greeter/greeter_parser.c:1051
msgid "_Language"
msgstr "语言(_L)"
-#: ../gui/gdmlogin.c:2587 ../gui/greeter/greeter_system.c:150
+#: ../gui/gdmlogin.c:2473 ../gui/greeter/greeter_system.c:153
msgid "_XDMCP Chooser..."
msgstr "_XDMCP 选择程序..."
-#: ../gui/gdmlogin.c:2598 ../gui/greeter/greeter_system.c:165
+#: ../gui/gdmlogin.c:2484 ../gui/greeter/greeter_system.c:168
msgid "_Configure Login Manager..."
msgstr "配置登录管理器(_C)..."
-#: ../gui/gdmlogin.c:2638 ../gui/greeter/greeter_parser.c:1061
+#: ../gui/gdmlogin.c:2524 ../gui/greeter/greeter_parser.c:1061
msgid "_Actions"
msgstr "行动(_A)"
-#: ../gui/gdmlogin.c:2647
+#: ../gui/gdmlogin.c:2533
msgid "_Theme"
msgstr "主题(_T)"
-#: ../gui/gdmlogin.c:2658 ../gui/greeter/greeter_canvas_item.c:165
+#: ../gui/gdmlogin.c:2544 ../gui/greeter/greeter_canvas_item.c:165
#: ../gui/greeter/greeter_parser.c:1071
msgid "_Quit"
msgstr "退出(_Q)"
-#: ../gui/gdmlogin.c:2660 ../gui/greeter/greeter_canvas_item.c:167
+#: ../gui/gdmlogin.c:2546 ../gui/greeter/greeter_canvas_item.c:167
#: ../gui/greeter/greeter_parser.c:1066
msgid "D_isconnect"
msgstr "断开连接(_I)"
-#: ../gui/gdmlogin.c:2728 ../gui/greeter/greeter_item_ulist.c:239
+#: ../gui/gdmlogin.c:2614 ../gui/greeter/greeter_item_ulist.c:239
msgid "Icon"
msgstr "图标"
-#: ../gui/gdmlogin.c:3349 ../gui/gdmlogin.c:3383 ../gui/greeter/greeter.c:569
+#: ../gui/gdmlogin.c:3231 ../gui/gdmlogin.c:3265 ../gui/greeter/greeter.c:575
#, c-format
msgid ""
"The greeter version (%s) does not match the daemon version. You have "
@@ -2870,17 +2870,17 @@ msgstr ""
"欢迎程序版本(%s)与守护程序版本不匹配。您可能刚刚升级 GDM。请重新启动 GDM 守护"
"程序或重新启动计算机。"
-#: ../gui/gdmlogin.c:3359 ../gui/gdmlogin.c:3393 ../gui/gdmlogin.c:3441
-#: ../gui/greeter/greeter.c:579 ../gui/greeter/greeter.c:614
-#: ../gui/greeter/greeter.c:663
+#: ../gui/gdmlogin.c:3241 ../gui/gdmlogin.c:3275 ../gui/gdmlogin.c:3323
+#: ../gui/greeter/greeter.c:585 ../gui/greeter/greeter.c:620
+#: ../gui/greeter/greeter.c:669
msgid "Cannot start the greeter"
msgstr "无法启动欢迎程序"
-#: ../gui/gdmlogin.c:3398 ../gui/greeter/greeter.c:668
+#: ../gui/gdmlogin.c:3280
msgid "Restart"
msgstr "重新启动"
-#: ../gui/gdmlogin.c:3431 ../gui/greeter/greeter.c:653
+#: ../gui/gdmlogin.c:3313 ../gui/greeter/greeter.c:659
#, c-format
msgid ""
"The greeter version (%s) does not match the daemon version (%s). You have "
@@ -2889,24 +2889,24 @@ msgstr ""
"欢迎程序版本(%s)与守护程序版本(%s)不匹配。您可能刚刚升级 GDM。请重新启动 GDM "
"守护程序或重新启动计算机。"
-#: ../gui/gdmlogin.c:3446
+#: ../gui/gdmlogin.c:3328 ../gui/greeter/greeter.c:674
msgid "Restart GDM"
msgstr "重新启动 GDM"
-#: ../gui/gdmlogin.c:3448
+#: ../gui/gdmlogin.c:3330
msgid "Restart computer"
msgstr "重启计算机"
-#: ../gui/gdmlogin.c:3483
+#: ../gui/gdmlogin.c:3365
#, c-format
msgid "Can't open DefaultImage: %s. Suspending face browser!"
msgstr "无法打开默认图像:%s。暂时中止人像浏览器!"
-#: ../gui/gdmlogin.c:3645 ../gui/greeter/greeter.c:1235
+#: ../gui/gdmlogin.c:3528 ../gui/greeter/greeter.c:1255
msgid "Session directory is missing"
msgstr "会话目录为空"
-#: ../gui/gdmlogin.c:3646
+#: ../gui/gdmlogin.c:3529
msgid ""
"Your session directory is missing or empty! There are two available "
"sessions you can use, but you should log in and correct the GDM "
@@ -2915,11 +2915,11 @@ msgstr ""
"您的会话目录不存在或为空!您现在可以使用两个会话,但您应该登录并修正 GDM 配"
"置。"
-#: ../gui/gdmlogin.c:3669 ../gui/greeter/greeter.c:1260
+#: ../gui/gdmlogin.c:3552 ../gui/greeter/greeter.c:1280
msgid "Configuration is not correct"
msgstr "配置不正确"
-#: ../gui/gdmlogin.c:3670 ../gui/greeter/greeter.c:1261
+#: ../gui/gdmlogin.c:3553 ../gui/greeter/greeter.c:1281
msgid ""
"The configuration file contains an invalid command line for the login "
"dialog, so running the default command. Please fix your configuration."
@@ -2939,13 +2939,13 @@ msgstr "无法打开文件"
msgid "Select User Image"
msgstr "选择用户图像"
-#: ../gui/gdmphotosetup.c:272 ../gui/gdmsetup.c:5549 ../gui/gdmsetup.c:5618
-#: ../gui/gdmsetup.c:5842 ../gui/gdmsetup.c:5911
+#: ../gui/gdmphotosetup.c:272 ../gui/gdmsetup.c:5582 ../gui/gdmsetup.c:5704
+#: ../gui/gdmsetup.c:5857 ../gui/gdmsetup.c:5979
msgid "Images"
msgstr "图像"
-#: ../gui/gdmphotosetup.c:277 ../gui/gdmsetup.c:2997 ../gui/gdmsetup.c:5554
-#: ../gui/gdmsetup.c:5623 ../gui/gdmsetup.c:5847 ../gui/gdmsetup.c:5916
+#: ../gui/gdmphotosetup.c:277 ../gui/gdmsetup.c:3046 ../gui/gdmsetup.c:5587
+#: ../gui/gdmsetup.c:5709 ../gui/gdmsetup.c:5862 ../gui/gdmsetup.c:5984
msgid "All Files"
msgstr "全部文件"
@@ -3005,134 +3005,134 @@ msgstr "会话目录中什么也没找到。"
msgid "No default session link found. Using Failsafe GNOME.\n"
msgstr "未找到默认会话链接。使用安全模式 GNOME。\n"
-#: ../gui/gdmsetup.c:262
+#: ../gui/gdmsetup.c:260
msgid ""
"An error occurred while trying to contact the login screens. Not all "
"updates may have taken effect."
msgstr "试图和登录屏幕交互时出错。不是所有的更新都生效了。"
-#: ../gui/gdmsetup.c:694 ../gui/gdmsetup.c:712 ../gui/gdmsetup.c:837
-#: ../gui/gdmsetup.c:1087
+#: ../gui/gdmsetup.c:801 ../gui/gdmsetup.c:819 ../gui/gdmsetup.c:974
+#: ../gui/gdmsetup.c:1220
msgid "Themed"
msgstr "主题"
-#: ../gui/gdmsetup.c:697 ../gui/gdmsetup.c:728
+#: ../gui/gdmsetup.c:804 ../gui/gdmsetup.c:835
msgid "Plain"
msgstr "简洁"
-#: ../gui/gdmsetup.c:698 ../gui/gdmsetup.c:729
+#: ../gui/gdmsetup.c:805 ../gui/gdmsetup.c:836
msgid "Plain with face browser"
msgstr "带头像浏览器的简洁主题"
-#: ../gui/gdmsetup.c:1446
+#: ../gui/gdmsetup.c:1571
msgid "Autologin or timed login to the root account is not allowed."
msgstr "不允许自动登录或计时登录到 root 账户。"
-#: ../gui/gdmsetup.c:1676
+#: ../gui/gdmsetup.c:1792
#, c-format
msgid "The \"%s\" user already exists in the include list."
msgstr "“%s”用户已经位于包含列表中。"
-#: ../gui/gdmsetup.c:1686 ../gui/gdmsetup.c:1716 ../gui/gdmsetup.c:1753
+#: ../gui/gdmsetup.c:1802 ../gui/gdmsetup.c:1832 ../gui/gdmsetup.c:1869
msgid "Cannot add user"
msgstr "无法添加用户"
-#: ../gui/gdmsetup.c:1706
+#: ../gui/gdmsetup.c:1822
#, c-format
msgid "The \"%s\" user already exists in the exclude list."
msgstr "“%s”用户已经位于排除列表中。"
-#: ../gui/gdmsetup.c:1743
+#: ../gui/gdmsetup.c:1859
#, c-format
msgid "The \"%s\" user does not exist."
msgstr "“%s”用户不存在。"
-#: ../gui/gdmsetup.c:2992 ../gui/gdmsetup.glade.h:74
+#: ../gui/gdmsetup.c:3041 ../gui/gdmsetup.glade.h:73
msgid "Sounds"
msgstr "声音"
-#: ../gui/gdmsetup.c:3205 ../gui/gdmsetup.c:3263
+#: ../gui/gdmsetup.c:3245 ../gui/gdmsetup.c:3303
msgid "None"
msgstr "无"
-#: ../gui/gdmsetup.c:3705
+#: ../gui/gdmsetup.c:3736
msgid "Archive is not of a subdirectory"
msgstr "归档内容不是子目录"
-#: ../gui/gdmsetup.c:3713
+#: ../gui/gdmsetup.c:3744
msgid "Archive is not of a single subdirectory"
msgstr "归档内容不是单个子目录"
-#: ../gui/gdmsetup.c:3737 ../gui/gdmsetup.c:3815
+#: ../gui/gdmsetup.c:3768 ../gui/gdmsetup.c:3846
msgid "File not a tar.gz or tar archive"
msgstr "文件不是 tar.gz 也不是 tar 归档"
-#: ../gui/gdmsetup.c:3739
+#: ../gui/gdmsetup.c:3770
msgid "Archive does not include a GdmGreeterTheme.info file"
msgstr "归档未包含 GdmGreeterTheme.info 文件"
-#: ../gui/gdmsetup.c:3761
+#: ../gui/gdmsetup.c:3792
msgid "File does not exist"
msgstr "文件不存在"
-#: ../gui/gdmsetup.c:3881
+#: ../gui/gdmsetup.c:3912
#, c-format
msgid "%s"
msgstr "%s"
-#: ../gui/gdmsetup.c:3888
+#: ../gui/gdmsetup.c:3919
msgid "Not a theme archive"
msgstr "不是主题归档"
#. FIXME: if exists already perhaps we could also have an
#. * option to change the dir name
-#: ../gui/gdmsetup.c:3910
+#: ../gui/gdmsetup.c:3941
#, c-format
msgid ""
"Theme directory '%s' seems to be already installed. Install again anyway?"
msgstr "主题目录“%s”似乎已安装过了.强行重新安装?"
-#: ../gui/gdmsetup.c:4002
+#: ../gui/gdmsetup.c:4033
msgid "Some error occurred when installing the theme"
msgstr "安装主题时出现错误"
-#: ../gui/gdmsetup.c:4058
+#: ../gui/gdmsetup.c:4089
msgid "No file selected"
msgstr "没有选择文件"
-#: ../gui/gdmsetup.c:4079
+#: ../gui/gdmsetup.c:4110
msgid "Select Theme Archive"
msgstr "选择主题归档"
-#: ../gui/gdmsetup.c:4083 ../gui/gdmsetup.c:5007
+#: ../gui/gdmsetup.c:4114 ../gui/gdmsetup.c:5103
msgid "_Install"
msgstr "安装(_I)"
-#: ../gui/gdmsetup.c:4174
+#: ../gui/gdmsetup.c:4205
#, c-format
msgid "Remove the \"%s\" theme?"
msgstr "删除“%s”主题吗?"
-#: ../gui/gdmsetup.c:4183
+#: ../gui/gdmsetup.c:4214
msgid "If you choose to remove the theme, it will be permanently lost."
msgstr "如果您选择删除主题,该主题将永久丢失。"
-#: ../gui/gdmsetup.c:4191
+#: ../gui/gdmsetup.c:4222
msgid "_Remove Theme"
msgstr "删除主题(_R)"
-#: ../gui/gdmsetup.c:4996
+#: ../gui/gdmsetup.c:5092
#, c-format
msgid "Install the theme from '%s'?"
msgstr "从“%s”中安装主题吗?"
-#: ../gui/gdmsetup.c:4997
+#: ../gui/gdmsetup.c:5093
#, c-format
msgid "Select install to add the theme from the file '%s'."
msgstr "选择安装可添加文件“%s”中的主题。"
#. This is the temporary help dialog
-#: ../gui/gdmsetup.c:5224
+#: ../gui/gdmsetup.c:5354
#, c-format
msgid ""
"This configuration window changes settings for the GDM daemon, which is the "
@@ -3152,20 +3152,24 @@ msgstr ""
"s。\n"
"要获得完整文档,请参看分类“桌面”下的 GNOME 帮助浏览器。"
-#: ../gui/gdmsetup.c:6338
+#: ../gui/gdmsetup.c:6400
msgid "Apply the changes to users before closing?"
msgstr "在关闭前将更改应用到用户吗?"
-#: ../gui/gdmsetup.c:6339
+#: ../gui/gdmsetup.c:6401
msgid ""
"If you don't apply, the changes made on the Users tab will be disregarded."
msgstr "如果您不应用的话,用户标签中所做的更改将被丢弃。"
-#: ../gui/gdmsetup.c:6342
+#: ../gui/gdmsetup.c:6404
msgid "Close _without Applying"
msgstr "关闭而不应用(_W)"
-#: ../gui/gdmsetup.c:6439
+#: ../gui/gdmsetup.c:6452
+msgid "Could not access GDM configuration file.\n"
+msgstr "无法访问 GDM 配置文件。\n"
+
+#: ../gui/gdmsetup.c:6496
msgid "You must be the root user to configure GDM."
msgstr "只有 root 才能配置 GDM。"
@@ -3178,7 +3182,7 @@ msgstr "配置登录窗口(GNOME 显示管理器)"
msgid "Login Window"
msgstr "登录窗口"
-#: ../gui/gdmsetup.desktop.in.h:3 ../gui/gdmsetup.glade.h:40
+#: ../gui/gdmsetup.desktop.in.h:3 ../gui/gdmsetup.glade.h:39
msgid "Login Window Preferences"
msgstr "登录窗口首选项"
@@ -3206,7 +3210,8 @@ msgid ""
"restarting. Changes to these settings will not take effect until GDM is "
"restarted."
msgstr ""
-"<b>警告:</b>不正确的设置将使得 X 无法重新启动。对这些设置的更改将直到 GDM 重新启动后才会生效。"
+"<b>警告:</b>不正确的设置将使得 X 无法重新启动。对这些设置的更改将直到 GDM 重"
+"新启动后才会生效。"
#: ../gui/gdmsetup.glade.h:6
msgid "A_llow remote system administrator login"
@@ -3241,156 +3246,152 @@ msgid "Background"
msgstr "背景"
#: ../gui/gdmsetup.glade.h:14
-msgid "Background co_lor:"
-msgstr "背景颜色(_L):"
-
-#: ../gui/gdmsetup.glade.h:15
msgid "C_ommand:"
msgstr "命令(_O):"
-#: ../gui/gdmsetup.glade.h:16
+#: ../gui/gdmsetup.glade.h:15
msgid "C_ustom:"
msgstr "自定义(_U):"
-#: ../gui/gdmsetup.glade.h:17
+#: ../gui/gdmsetup.glade.h:16
msgid "Co_lor:"
msgstr "颜色(_L):"
-#: ../gui/gdmsetup.glade.h:18
+#: ../gui/gdmsetup.glade.h:17
msgid "Color depth:"
msgstr "颜色深度:"
-#: ../gui/gdmsetup.glade.h:19
+#: ../gui/gdmsetup.glade.h:18
msgid "Configure _X Server..."
msgstr "配置 _X 服务器..."
-#: ../gui/gdmsetup.glade.h:20
+#: ../gui/gdmsetup.glade.h:19
msgid "Configure _XDMCP..."
msgstr "配置 _XDMCP..."
-#: ../gui/gdmsetup.glade.h:21
+#: ../gui/gdmsetup.glade.h:20
msgid "Copyright:"
msgstr "版权:"
-#: ../gui/gdmsetup.glade.h:22
+#: ../gui/gdmsetup.glade.h:21
msgid "Disables X forwarding, but does not affect XDMCP."
msgstr "禁用 X 转发,但不影响 XDMCP。"
-#: ../gui/gdmsetup.glade.h:23
+#: ../gui/gdmsetup.glade.h:22
msgid "Displays per _host:"
msgstr "每主机显示数(_H):"
-#: ../gui/gdmsetup.glade.h:24
+#: ../gui/gdmsetup.glade.h:23
msgid "Do not show image for _remote logins"
msgstr "远程登录不显示图像(_R)"
-#: ../gui/gdmsetup.glade.h:25
+#: ../gui/gdmsetup.glade.h:24
msgid "E_nable debug messages to system log"
msgstr "启用系统日志的调试信息(_N)"
-#: ../gui/gdmsetup.glade.h:26
+#: ../gui/gdmsetup.glade.h:25
msgid "E_xclude:"
msgstr "排除(_X):"
-#: ../gui/gdmsetup.glade.h:27
+#: ../gui/gdmsetup.glade.h:26
msgid "Enable _Timed Login"
msgstr "启用计时登录(_T)"
-#: ../gui/gdmsetup.glade.h:28
+#: ../gui/gdmsetup.glade.h:27
msgid "Example: /usr/X11R6/bin/X"
msgstr "示例:/usr/X11R6/bin/X"
-#: ../gui/gdmsetup.glade.h:29
+#: ../gui/gdmsetup.glade.h:28
msgid ""
"Greeter\n"
"Chooser"
msgstr "欢迎程序选择"
-#: ../gui/gdmsetup.glade.h:31
+#: ../gui/gdmsetup.glade.h:30
msgid "Honor _indirect requests"
msgstr "遵从非直接请求(_I)"
-#: ../gui/gdmsetup.glade.h:32
+#: ../gui/gdmsetup.glade.h:31
msgid "I_mage:"
msgstr "图像(_M):"
-#: ../gui/gdmsetup.glade.h:33
+#: ../gui/gdmsetup.glade.h:32
msgid "I_nclude:"
msgstr "包含(_N):"
-#: ../gui/gdmsetup.glade.h:34
+#: ../gui/gdmsetup.glade.h:33
msgid "Includ_e Hostname Chooser (XDMCP) menu item"
msgstr "包含主机名选择器(XDMCP)菜单项(_E)"
-#: ../gui/gdmsetup.glade.h:35
+#: ../gui/gdmsetup.glade.h:34
msgid "Include Con_figure menu item"
msgstr "调用配置菜单项(_F)"
-#: ../gui/gdmsetup.glade.h:36
+#: ../gui/gdmsetup.glade.h:35
msgid "L_ogin retry delay:"
msgstr "登录重试延迟(_O):"
-#: ../gui/gdmsetup.glade.h:37
+#: ../gui/gdmsetup.glade.h:36
msgid "La_unch:"
msgstr "调用(_U):"
-#: ../gui/gdmsetup.glade.h:38
+#: ../gui/gdmsetup.glade.h:37
msgid "Listen on _UDP port: "
msgstr "监听 _UDP 端口:"
-#: ../gui/gdmsetup.glade.h:39
+#: ../gui/gdmsetup.glade.h:38
msgid "Local"
msgstr "本地"
-#: ../gui/gdmsetup.glade.h:41
+#: ../gui/gdmsetup.glade.h:40
msgid "Login _failed:"
msgstr "登录失败(_F):"
-#: ../gui/gdmsetup.glade.h:42
+#: ../gui/gdmsetup.glade.h:41
msgid "Login _successful:"
msgstr "登录成功(_S):"
-#: ../gui/gdmsetup.glade.h:43
+#: ../gui/gdmsetup.glade.h:42
msgid "Logo"
msgstr "徽标"
-#: ../gui/gdmsetup.glade.h:44
+#: ../gui/gdmsetup.glade.h:43
msgid "Maximum _pending requests:"
msgstr "最大阻塞请求数(_P):"
-#: ../gui/gdmsetup.glade.h:45
+#: ../gui/gdmsetup.glade.h:44
msgid "Maximum _remote sessions:"
msgstr "最大远程会话数(_R):"
-#: ../gui/gdmsetup.glade.h:46
+#: ../gui/gdmsetup.glade.h:45
msgid "Maximum _wait time:"
msgstr "最大等待时间(_W):"
-#: ../gui/gdmsetup.glade.h:47
+#: ../gui/gdmsetup.glade.h:46
msgid "Maximum indirect w_ait time:"
msgstr "最大间接等待时间(_A):"
-#: ../gui/gdmsetup.glade.h:48
+#: ../gui/gdmsetup.glade.h:47
msgid "Maximum p_ending indirect requests:"
msgstr "最大阻塞间接请求数(_E):"
-#: ../gui/gdmsetup.glade.h:49
+#: ../gui/gdmsetup.glade.h:48
msgid "Menu Bar"
msgstr "菜单栏"
-#: ../gui/gdmsetup.glade.h:50
+#: ../gui/gdmsetup.glade.h:49
msgid "Op_tions:\t"
msgstr "选项(_T):\t"
-#: ../gui/gdmsetup.glade.h:51
+#: ../gui/gdmsetup.glade.h:50
msgid "Pick Background Color"
msgstr "拾取背景颜色"
-#: ../gui/gdmsetup.glade.h:52
+#: ../gui/gdmsetup.glade.h:51
msgid "Pin_g interval:"
msgstr "Ping 间隔(_G):"
-#: ../gui/gdmsetup.glade.h:53
+#: ../gui/gdmsetup.glade.h:52
msgid ""
"Plain\n"
"Plain with face browser\n"
@@ -3400,19 +3401,19 @@ msgstr ""
"带头像浏览器的简洁主题\n"
"主题"
-#: ../gui/gdmsetup.glade.h:56
+#: ../gui/gdmsetup.glade.h:55
msgid "Re_move Server"
msgstr "远程服务器(_M)"
-#: ../gui/gdmsetup.glade.h:57
+#: ../gui/gdmsetup.glade.h:56
msgid "Refresh rate:"
msgstr "刷新率:"
-#: ../gui/gdmsetup.glade.h:58
+#: ../gui/gdmsetup.glade.h:57
msgid "Remote"
msgstr "远程"
-#: ../gui/gdmsetup.glade.h:59
+#: ../gui/gdmsetup.glade.h:58
msgid ""
"Remote login disabled\n"
"Same as Local"
@@ -3420,31 +3421,31 @@ msgstr ""
"禁止远程登录\n"
"与本地相同"
-#: ../gui/gdmsetup.glade.h:61
+#: ../gui/gdmsetup.glade.h:60
msgid "Resolution:"
msgstr "分辨率:"
-#: ../gui/gdmsetup.glade.h:62
+#: ../gui/gdmsetup.glade.h:61
msgid "Sc_ale to fit screen"
msgstr "所放到屏幕大小(_A)"
-#: ../gui/gdmsetup.glade.h:63
+#: ../gui/gdmsetup.glade.h:62
msgid "Security"
msgstr "安全"
-#: ../gui/gdmsetup.glade.h:64
+#: ../gui/gdmsetup.glade.h:63
msgid "Select Background Image"
msgstr "选择背景图像"
-#: ../gui/gdmsetup.glade.h:65
+#: ../gui/gdmsetup.glade.h:64
msgid "Select Logo Image"
msgstr "选择标志图像"
-#: ../gui/gdmsetup.glade.h:66
+#: ../gui/gdmsetup.glade.h:65
msgid "Select Sound File"
msgstr "选择声音文件"
-#: ../gui/gdmsetup.glade.h:67
+#: ../gui/gdmsetup.glade.h:66
msgid ""
"Selected only\n"
"Random from selected\n"
@@ -3452,58 +3453,62 @@ msgstr ""
"仅有选中\n"
"随机挑选\n"
-#: ../gui/gdmsetup.glade.h:70
+#: ../gui/gdmsetup.glade.h:69
msgid "Server Settings"
msgstr "服务器设置"
-#: ../gui/gdmsetup.glade.h:71
+#: ../gui/gdmsetup.glade.h:70
msgid "Server _name:"
msgstr "服务器名称(_N):"
-#: ../gui/gdmsetup.glade.h:72
+#: ../gui/gdmsetup.glade.h:71
msgid "Servers To Start"
msgstr "要启动的服务器"
-#: ../gui/gdmsetup.glade.h:73
+#: ../gui/gdmsetup.glade.h:72
msgid "Sho_w Actions menu"
msgstr "显示动作菜单(_W)"
-#: ../gui/gdmsetup.glade.h:75
+#: ../gui/gdmsetup.glade.h:74
msgid "Themes"
msgstr "主题"
-#: ../gui/gdmsetup.glade.h:76
+#: ../gui/gdmsetup.glade.h:75
msgid "U_ser:"
msgstr "用户(_S):"
-#: ../gui/gdmsetup.glade.h:77
+#: ../gui/gdmsetup.glade.h:76
msgid "Users"
msgstr "用户"
-#: ../gui/gdmsetup.glade.h:78
+#: ../gui/gdmsetup.glade.h:77
msgid "Welcome Message"
msgstr "欢迎消息"
-#: ../gui/gdmsetup.glade.h:79
+#: ../gui/gdmsetup.glade.h:78
msgid "X Server Login Window Preferences"
msgstr "X 服务器登录窗口首选项"
-#: ../gui/gdmsetup.glade.h:80
+#: ../gui/gdmsetup.glade.h:79
msgid "XDMCP Login Window Preferences"
msgstr "XDMCP 登录窗口首选项"
-#: ../gui/gdmsetup.glade.h:81
+#: ../gui/gdmsetup.glade.h:80
msgid "_Add/Modify..."
msgstr "添加/修改(_A)..."
-#: ../gui/gdmsetup.glade.h:82
+#: ../gui/gdmsetup.glade.h:81
msgid "_Allow local system administrator login"
msgstr "允许本地系统管理员登录(_A)"
-#: ../gui/gdmsetup.glade.h:83
+#: ../gui/gdmsetup.glade.h:82
msgid "_Allow users to change fonts and colors of plain greeter"
msgstr "允许用户更改简洁欢迎程序的字体和颜色(_A)"
+#: ../gui/gdmsetup.glade.h:83
+msgid "_Background color:"
+msgstr "背景颜色(_B):"
+
#: ../gui/gdmsetup.glade.h:85
#, no-c-format
msgid "_Default: \"Welcome to %n\""
@@ -3589,7 +3594,7 @@ msgstr "秒"
msgid "Too many users to list here..."
msgstr "要在此列出的用户太多..."
-#: ../gui/greeter/greeter.c:604
+#: ../gui/greeter/greeter.c:610
#, c-format
msgid ""
"The greeter version (%s) does not match the daemon version. You have "
@@ -3598,32 +3603,32 @@ msgstr ""
"欢迎程序版本(%s)与守护程序版本不匹配。您可能刚刚升级 GDM。请重新启动 GDM 守护"
"程序或重新启动计算机。"
-#: ../gui/greeter/greeter.c:619 ../gui/greeter/greeter.c:670
-msgid "Reboot"
-msgstr "重启"
+#: ../gui/greeter/greeter.c:625 ../gui/greeter/greeter.c:676
+msgid "Restart Machine"
+msgstr "重新启动计算机"
-#: ../gui/greeter/greeter.c:1079
+#: ../gui/greeter/greeter.c:1099
#, c-format
msgid "There was an error loading the theme %s"
msgstr "装入主题 %s 出错"
-#: ../gui/greeter/greeter.c:1131
+#: ../gui/greeter/greeter.c:1151
msgid "The greeter theme is corrupt"
msgstr "欢迎程序主题损坏"
-#: ../gui/greeter/greeter.c:1132
+#: ../gui/greeter/greeter.c:1152
msgid ""
"The theme does not contain definition for the username/password entry "
"element."
msgstr "主题不包含用户名/密码输入项元素的定义"
-#: ../gui/greeter/greeter.c:1165
+#: ../gui/greeter/greeter.c:1185
msgid ""
"There was an error loading the theme, and the default theme could not be "
"loaded. Attempting to start the standard greeter"
msgstr "装入主题时出错,而默认主题也无法装入。我将试图启动标准欢迎程序"
-#: ../gui/greeter/greeter.c:1187
+#: ../gui/greeter/greeter.c:1207
msgid ""
"The GTK+ greeter could not be started. This display will abort and you may "
"have to login another way and fix the installation of GDM"
@@ -3631,7 +3636,7 @@ msgstr ""
"GTK+ 欢迎程序无法启动。将终止该显示,而您可能只好通过其它方式登录并修正 GDM "
"的安装了"
-#: ../gui/greeter/greeter.c:1236
+#: ../gui/greeter/greeter.c:1256
msgid ""
"Your session directory is missing or empty! There are two available "
"sessions you can use, but you should log in and correct the gdm "
@@ -3681,15 +3686,10 @@ msgstr "已登入"
msgid "Theme broken: must have pam-message label!"
msgstr "主题损坏:必须有 pam 消息标签!"
-#: ../gui/greeter/greeter_parser.c:1081 ../gui/greeter/greeter_system.c:216
+#: ../gui/greeter/greeter_parser.c:1081 ../gui/greeter/greeter_system.c:212
msgid "Sus_pend"
msgstr "挂起(_S)"
-#: ../gui/greeter/greeter_parser.c:1086 ../gui/greeter/greeter_system.c:64
-#: ../gui/greeter/greeter_system.c:191
-msgid "_Reboot"
-msgstr "重启(_R)"
-
#: ../gui/greeter/greeter_parser.c:1091
msgid "_XDMCP Chooser"
msgstr "_XDMCP 选择程序"
@@ -3698,24 +3698,20 @@ msgstr "_XDMCP 选择程序"
msgid "_Configure"
msgstr "配置(_C)"
-#: ../gui/greeter/greeter_parser.c:1101
-msgid "You've got capslock on!"
-msgstr "您的 Caps Lock 打开了!"
-
-#: ../gui/greeter/greeter_parser.c:1129
+#: ../gui/greeter/greeter_parser.c:1125
msgid "_OK"
msgstr "确定(_O)"
-#: ../gui/greeter/greeter_parser.c:1134
+#: ../gui/greeter/greeter_parser.c:1130
msgid "_Cancel"
msgstr "取消(_C)"
-#: ../gui/greeter/greeter_session.c:171
+#: ../gui/greeter/greeter_session.c:170
#, c-format
msgid "You have chosen %s for this session"
msgstr "您为此会话选择了 %s"
-#: ../gui/greeter/greeter_session.c:174
+#: ../gui/greeter/greeter_session.c:173
#, c-format
msgid ""
"If you wish to make %s the default for future sessions, run the 'switchdesk' "
@@ -3724,70 +3720,70 @@ msgstr ""
"如果您希望使 %s 成为未来会话的默认值,请运行工具“switchdesk”(从面板菜单选取系"
"统->桌面切换工具)。"
-#: ../gui/greeter/greeter_session.c:227
+#: ../gui/greeter/greeter_session.c:226
msgid "Change _Session"
msgstr "更改会话(_S)"
-#: ../gui/greeter/greeter_session.c:249
+#: ../gui/greeter/greeter_session.c:248
msgid "Sessions"
msgstr "会话"
-#: ../gui/greeter/greeter_session.c:269
+#: ../gui/greeter/greeter_session.c:268
msgid "_Last session"
msgstr "上次会话(_L)"
-#: ../gui/greeter/greeter_session.c:275
+#: ../gui/greeter/greeter_session.c:274
msgid "Log in using the session that you have used last time you logged in"
msgstr "使用您上次登录的会话登录"
-#: ../gui/greeter/greeter_system.c:157 ../gui/greeter/greeter_system.c:368
+#: ../gui/greeter/greeter_system.c:160 ../gui/greeter/greeter_system.c:356
msgid ""
"Run an XDMCP chooser which will allow you to log into available remote "
"computers, if there are any."
msgstr "运行 XDMCP 选择程序将允许您登录到可用的远程计算机,如果有的话。"
-#: ../gui/greeter/greeter_system.c:172 ../gui/greeter/greeter_system.c:388
+#: ../gui/greeter/greeter_system.c:175 ../gui/greeter/greeter_system.c:376
msgid ""
"Configure GDM (this login manager). This will require the root password."
msgstr "配置 GDM (该登录管理器)。这将需要 root 密码。"
-#: ../gui/greeter/greeter_system.c:198 ../gui/greeter/greeter_system.c:334
-msgid "Reboot your computer"
+#: ../gui/greeter/greeter_system.c:194 ../gui/greeter/greeter_system.c:322
+msgid "Restart your computer"
msgstr "重新启动您的计算机"
-#: ../gui/greeter/greeter_system.c:210
-msgid "Shut down the system so that you may safely turn off the computer."
+#: ../gui/greeter/greeter_system.c:206
+msgid "Shut Down the system so that you may safely turn off the computer."
msgstr "关闭您的计算机,以便您可以安全的切断电源。"
-#: ../gui/greeter/greeter_system.c:223 ../gui/greeter/greeter_system.c:351
+#: ../gui/greeter/greeter_system.c:219 ../gui/greeter/greeter_system.c:339
msgid "Suspend your computer"
msgstr "挂起您的计算机"
-#: ../gui/greeter/greeter_system.c:284
+#: ../gui/greeter/greeter_system.c:279
msgid "Choose an Action"
msgstr "选择动作"
-#: ../gui/greeter/greeter_system.c:313
+#: ../gui/greeter/greeter_system.c:301
msgid "Shut _down the computer"
msgstr "关闭计算机(_D)"
-#: ../gui/greeter/greeter_system.c:316
-msgid "Shut down your computer so that you may turn it off."
+#: ../gui/greeter/greeter_system.c:304
+msgid "Shut Down your computer so that you may turn it off."
msgstr "关闭您的计算机以便您可以切断电源。"
-#: ../gui/greeter/greeter_system.c:331
-msgid "_Reboot the computer"
+#: ../gui/greeter/greeter_system.c:319
+msgid "_Restart the computer"
msgstr "重启计算机(_R)"
-#: ../gui/greeter/greeter_system.c:348
+#: ../gui/greeter/greeter_system.c:336
msgid "Sus_pend the computer"
msgstr "挂起计算机(_P)"
-#: ../gui/greeter/greeter_system.c:365
+#: ../gui/greeter/greeter_system.c:353
msgid "Run _XDMCP chooser"
msgstr "运行 _XDMCP 选择器"
-#: ../gui/greeter/greeter_system.c:385
+#: ../gui/greeter/greeter_system.c:373
msgid "Confi_gure the login manager"
msgstr "配置登录管理器(_G)"
@@ -3833,7 +3829,7 @@ msgstr "GNOME 艺术的圆环变种"
msgid "Happy GNOME"
msgstr "欢乐 GNOME"
-#: ../gui/modules/dwellmouselistener.c:655
+#: ../gui/modules/dwellmouselistener.c:656
#: ../gui/modules/keymouselistener.c:926
#, c-format
msgid ""
@@ -3848,55 +3844,55 @@ msgstr ""
msgid "Cannot open gestures file: %s"
msgstr "无法打开手势文件:%s"
-#: ../utils/gdm-dmx-reconnect-proxy.c:38
+#: ../utils/gdm-dmx-reconnect-proxy.c:37
msgid "DMX display to migrate to"
msgstr "要迁移到的 DMX 显示"
-#: ../utils/gdm-dmx-reconnect-proxy.c:39 ../utils/gdm-dmx-reconnect-proxy.c:44
+#: ../utils/gdm-dmx-reconnect-proxy.c:38 ../utils/gdm-dmx-reconnect-proxy.c:43
msgid "DISPLAY"
msgstr "显示"
-#: ../utils/gdm-dmx-reconnect-proxy.c:43
+#: ../utils/gdm-dmx-reconnect-proxy.c:42
msgid "Backend display name"
msgstr "后端显示名称"
-#: ../utils/gdm-dmx-reconnect-proxy.c:48
+#: ../utils/gdm-dmx-reconnect-proxy.c:47
msgid "Xauthority file for destination display"
msgstr "目的显示的 Xauthority 文件"
-#: ../utils/gdm-dmx-reconnect-proxy.c:49 ../utils/gdm-dmx-reconnect-proxy.c:54
+#: ../utils/gdm-dmx-reconnect-proxy.c:48 ../utils/gdm-dmx-reconnect-proxy.c:53
msgid "AUTHFILE"
msgstr "验证文件"
-#: ../utils/gdm-dmx-reconnect-proxy.c:53
+#: ../utils/gdm-dmx-reconnect-proxy.c:52
msgid "Xauthority file for backend display"
msgstr "后端显示的 Xauthority 文件"
-#: ../utils/gdm-dmx-reconnect-proxy.c:71
+#: ../utils/gdm-dmx-reconnect-proxy.c:70
#, c-format
msgid "Failed to open display \"%s\"\n"
msgstr "打开显示“%s”失败\n"
-#: ../utils/gdm-dmx-reconnect-proxy.c:75
+#: ../utils/gdm-dmx-reconnect-proxy.c:74
#, c-format
msgid "DMX extension not present on \"%s\"\n"
msgstr "“%s”上没有 DMX 扩展\n"
-#: ../utils/gdm-dmx-reconnect-proxy.c:98
+#: ../utils/gdm-dmx-reconnect-proxy.c:97
msgid "- migrate a backend display from one DMX display to another"
msgstr "- 将后端显示从一个 DMX 显示迁移到另外一个显示"
-#: ../utils/gdm-dmx-reconnect-proxy.c:104
+#: ../utils/gdm-dmx-reconnect-proxy.c:103
#, c-format
msgid "You must specify a destination DMX display using %s\n"
msgstr "您必须使用 %s 指定目的 DMX 显示\n"
-#: ../utils/gdm-dmx-reconnect-proxy.c:109
+#: ../utils/gdm-dmx-reconnect-proxy.c:108
#, c-format
msgid "You must specify a backend display by using %s\n"
msgstr "您必须使用 %s 指定后端显示\n"
-#: ../utils/gdm-dmx-reconnect-proxy.c:124
+#: ../utils/gdm-dmx-reconnect-proxy.c:123
#, c-format
msgid "DMXAddScreen \"%s\" failed on \"%s\"\n"
msgstr "在“%2$s”上执行 DMXAddScreen“%1$s”失败\n"
@@ -3911,14 +3907,14 @@ msgstr "gdmaskpass 只能以 root 身份运行\n"
msgid "Authentication failure!\n"
msgstr "认证失败!\n"
-#: ../vicious-extensions/glade-helper.c:85
-#: ../vicious-extensions/glade-helper.c:117
-#: ../vicious-extensions/glade-helper.c:139
-#: ../vicious-extensions/glade-helper.c:159
+#: ../vicious-extensions/glade-helper.c:84
+#: ../vicious-extensions/glade-helper.c:116
+#: ../vicious-extensions/glade-helper.c:138
+#: ../vicious-extensions/glade-helper.c:158
msgid "(memory buffer)"
msgstr "(内存缓冲区)"
-#: ../vicious-extensions/glade-helper.c:191
+#: ../vicious-extensions/glade-helper.c:190
#, c-format
msgid ""
"An error occurred while loading user interface element %s%s from file %s. "
@@ -3928,13 +3924,13 @@ msgstr ""
"从文件 %3$s 中装入用户界面元素 %1$s%2$s 时出现错误。glade 界面描述可能已毁"
"坏。%4$s 无法继续并将立即退出。您应该检查您安装的 %5$s 或重新安装 %6$s。"
-#: ../vicious-extensions/glade-helper.c:209
-#: ../vicious-extensions/glade-helper.c:277
-#: ../vicious-extensions/glade-helper.c:319
+#: ../vicious-extensions/glade-helper.c:208
+#: ../vicious-extensions/glade-helper.c:276
+#: ../vicious-extensions/glade-helper.c:318
msgid "Cannot load user interface"
msgstr "无法装入用户界面"
-#: ../vicious-extensions/glade-helper.c:215
+#: ../vicious-extensions/glade-helper.c:214
#, c-format
msgid ""
"Glade file is on crack! Make sure the correct file is installed!\n"
@@ -3943,7 +3939,7 @@ msgstr ""
"Glade 文件已毁坏!确认安装了正确的文件!\n"
"文件:%s 构件:%s"
-#: ../vicious-extensions/glade-helper.c:247
+#: ../vicious-extensions/glade-helper.c:246
#, c-format
msgid ""
"An error occurred while loading the user interface element %s%s from file %"
@@ -3960,7 +3956,7 @@ msgstr[0] ""
"$d 列。Glade 界面描述可能已经毁坏。%5$s 无法继续并将立即退出。您应该检查您安"
"装的 %6$s 或重新安装 %7$s。"
-#: ../vicious-extensions/glade-helper.c:283
+#: ../vicious-extensions/glade-helper.c:282
#, c-format
msgid ""
"Glade file is on crack! Make sure the correct file is installed!\n"
@@ -3969,7 +3965,7 @@ msgstr ""
"Glade 文件已毁坏!请确认安装了正确的文件!\n"
"文件:%s 构件:%s 需要 clist 列:%d"
-#: ../vicious-extensions/glade-helper.c:303
+#: ../vicious-extensions/glade-helper.c:302
#, c-format
msgid ""
"An error occurred while loading the user interface from file %s. Possibly "
@@ -3979,12 +3975,12 @@ msgstr ""
"从文件 %s 中装入用户界面时出现错误。可能找不到 glade 界面描述。%s 无法继续并"
"将立即退出。您应该检查您安装的 %s 或重新安装 %s。"
-#: ../vicious-extensions/glade-helper.c:322
+#: ../vicious-extensions/glade-helper.c:321
#, c-format
msgid "No interface could be loaded. This is BAD! (file: %s)"
msgstr "没有可以装入的界面。糟糕!(文件:%s)"
-#: ../vicious-extensions/ve-nongnome.c:134
+#: ../vicious-extensions/ve-nongnome.c:135
msgid "Too many alias levels for a locale; may indicate a loop"
msgstr "一个语系的别名级别太多;可能有无穷循环"