catch up with Debian unstable

1 files changed, 26 insertions, 15 deletions

diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index ca5e6d1a..46fad3e8 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -4,16 +4,17 @@
 # Copyright (C) 2007 Steve Langasek <vorlon@debian.org>
 # The translations (msgstr) are:
 # Copyright (C) 2007 Ming Hua <minghua-guest@users.alioth.debian.org>
+# Copyright (C) 2009 Deng Xiyue <manphiz-guest@users.alioth.debian.org>
 #
 # This file is distributed under the same license as the pam package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pam 0.99.7.1-5\n"
+"Project-Id-Version: pam\n"
 "Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-08-19 23:00-0700\n"
-"PO-Revision-Date: 2007-09-25 23:06-0500\n"
-"Last-Translator: Ming Hua <minghua-guest@users.alioth.debian.org>\n"
+"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"PO-Revision-Date: 2009-01-01 12:30+0800\n"
+"Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,17 +39,6 @@ msgstr ""
 "启动。请复查下面这个需要重新启动的服务所对应的 init.d script 列表，script 名"
 "称之间以半角空格分隔。如列表有误，请直接更正。"
 
-#. Type: string
-#. Description
-#: ../libpam0g.templates:1001
-msgid ""
-"Some other services such as xscreensaver, gnome-screensaver, and xlockmore "
-"cannot be restarted for you.  You will not be able to authenticate to these "
-"services until you restart them manually."
-msgstr ""
-"无法为您重新启动如 xscreensaver、gnome-screensaver 和 xclockmore 一类的服务。"
-"在您手动重新启动它们之前，将无法在这些服务中验证身份。"
-
 #. Type: error
 #. Description
 #: ../libpam0g.templates:2001
@@ -155,3 +145,24 @@ msgid ""
 "decline this option, you will need to manage your system's authentication "
 "configuration by hand."
 msgstr ""
+
+#. Type: error
+#. Description
+#: ../libpam-modules.templates:1001
+msgid "xscreensaver and xlockmore must be restarted before upgrading"
+msgstr "在升级前必须重新启动 xscreensaver 和 xlockmore"
+
+#. Type: error
+#. Description
+#: ../libpam-modules.templates:1001
+msgid ""
+"One or more running instances of xscreensaver or xlockmore have been "
+"detected on this system.  Because of incompatible library changes, the "
+"upgrade of the libpam-modules package will leave you unable to authenticate "
+"to these programs.  You should arrange for these programs to be restarted or "
+"stopped before continuing this upgrade, to avoid locking your users out of "
+"their current sessions."
+msgstr ""
+"检测到一个或多个 xscreensaver 或 xlockmore 运行实例。因为不兼容的库的变化，"
+"libpam-module 软件包的升级将使您无法向这些程序认证。您需要在继续此升级前安排"
+"这些程序重新启动或者停止运行，以避免将您的用户锁在他们的当前会话之外。"