summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO25
-rw-r--r--debian/changelog34
-rw-r--r--debian/libpam-cracklib.postinst2
-rw-r--r--debian/libpam-modules.postrm7
-rw-r--r--debian/libpam-runtime.postinst2
-rw-r--r--debian/libpam-runtime.templates4
-rwxr-xr-xdebian/local/pam-auth-update3
-rw-r--r--debian/patches-applied/027_pam_limits_better_init_allow_explicit_root120
-rw-r--r--debian/patches-applied/dont_freeze_password_chain117
-rw-r--r--debian/patches-applied/series1
-rw-r--r--debian/po/bg.po10
-rw-r--r--debian/po/cs.po10
-rw-r--r--debian/po/de.po10
-rw-r--r--debian/po/es.po10
-rw-r--r--debian/po/eu.po10
-rw-r--r--debian/po/fi.po10
-rw-r--r--debian/po/fr.po10
-rw-r--r--debian/po/gl.po10
-rw-r--r--debian/po/it.po10
-rw-r--r--debian/po/ja.po10
-rw-r--r--debian/po/nl.po10
-rw-r--r--debian/po/pt.po10
-rw-r--r--debian/po/pt_BR.po10
-rw-r--r--debian/po/ro.po10
-rw-r--r--debian/po/ru.po10
-rw-r--r--debian/po/sk.po10
-rw-r--r--debian/po/sv.po10
-rw-r--r--debian/po/templates.pot10
-rw-r--r--debian/po/tr.po10
-rw-r--r--debian/po/vi.po47
-rw-r--r--debian/po/zh_CN.po10
31 files changed, 386 insertions, 176 deletions
diff --git a/TODO b/TODO
new file mode 100644
index 00000000..df748cba
--- /dev/null
+++ b/TODO
@@ -0,0 +1,25 @@
+-----------------------------------
+
+when calling the helper: call setuid(0) unconditionally? (saves us a
+syscall)
+
+'nullok' is totally redundant in the passwd phase, and I never noticed
+this :(
+
+refactor passverify.c a bit more, helper_log_err() is used in places it
+doesn't need to be
+
+longstanding goofiness (duplication) in the shadow verification code:
+
+ if ((curdays - spent->sp_lstchg > spent->sp_max)
+ && (curdays - spent->sp_lstchg > spent->sp_inact)
+ && (curdays - spent->sp_lstchg > spent->sp_max + spent->sp_inact)
+
+
+sepermit README.xml listed as 'entity pamaccess'?
+sepermit example is SHIT!
+
+go over all the XML and fix the English :P
+
+unix_update should eventually support suid root operation as well,
+maybe?
diff --git a/debian/changelog b/debian/changelog
index 9c384356..ee1638a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,37 @@
+pam (1.0.1-7) UNRELEASED; urgency=low
+
+ * 027_pam_limits_better_init_allow_explicit_root:
+ - fix the patch so that our limit resets are actually *applied*,
+ which has apparently been broken for who knows how long!
+ - shadow the finite kernel defaults for RLIMIT_SIGPENDING and
+ RLIMIT_MSGQUEUE as well, so that the preceding change doesn't
+ suddenly expose systems to DoS or other issues.
+ - include documentation in the patch, giving examples of how to set
+ limits for root. Thanks to Jonathan Marsden.
+ * pam-auth-update: swap out known md5sums from intrepid pre-release
+ versions with the md5sums from the released intrepid version
+ * pam-auth-update: set the umask, so we don't accidentally mark
+ /etc/pam.d/common-* unreadable. Thanks to Martin Krafft for catching.
+ Closes: #518042.
+
+ -- Steve Langasek <vorlon@debian.org> Mon, 02 Mar 2009 01:07:43 -0800
+
+pam (1.0.1-6) unstable; urgency=low
+
+ * Updated debconf translations:
+ - Vietnamese, thanks to Clytie Siddall <clytie@riverland.net.au>
+ * New patch dont_freeze_password_chain, cherry-picked from upstream:
+ don't always follow the same path through the password stack on
+ the PAM_UPDATE_AUTHTOK pass as was used in the PAM_PRELIM_CHECK
+ pass; this Linux-PAM deviation from the original PAM spec causes a
+ number of problems, in particular causing wrong return values when
+ using the refactored pam-auth-update stack. LP: #303515, #305882.
+ * debian/local/pam-auth-update (et al): new interface for managing
+ /etc/pam.d/common-*, using drop-in config snippets provided by module
+ packages.
+
+ -- Steve Langasek <vorlon@debian.org> Sat, 28 Feb 2009 13:36:57 -0800
+
pam (1.0.1-5) unstable; urgency=low
* Build-conflict with libxcrypt-dev, which otherwise pulls libxcrypt in as
diff --git a/debian/libpam-cracklib.postinst b/debian/libpam-cracklib.postinst
index 637d38f2..cf52f262 100644
--- a/debian/libpam-cracklib.postinst
+++ b/debian/libpam-cracklib.postinst
@@ -2,7 +2,7 @@
set -e
-if dpkg --compare-versions "$2" lt 1.0.1-5; then
+if dpkg --compare-versions "$2" lt 1.0.1-6; then
pam-auth-update --package
fi
diff --git a/debian/libpam-modules.postrm b/debian/libpam-modules.postrm
new file mode 100644
index 00000000..20fdf998
--- /dev/null
+++ b/debian/libpam-modules.postrm
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "purge" ]; then
+ rm -f /etc/environment
+fi
diff --git a/debian/libpam-runtime.postinst b/debian/libpam-runtime.postinst
index e684db9a..f5d28a34 100644
--- a/debian/libpam-runtime.postinst
+++ b/debian/libpam-runtime.postinst
@@ -4,7 +4,7 @@
# -- only create on package install.
force=
-if [ -z "$2" ] || dpkg --compare-versions "$2" lt 1.0.1-5
+if [ -z "$2" ] || dpkg --compare-versions "$2" lt 1.0.1-6
then
force=--force
for configfile in common-auth common-account common-session \
diff --git a/debian/libpam-runtime.templates b/debian/libpam-runtime.templates
index d2b876bd..a5f879db 100644
--- a/debian/libpam-runtime.templates
+++ b/debian/libpam-runtime.templates
@@ -14,6 +14,10 @@ _Description: PAM profiles to enable:
Template: libpam-runtime/conflicts
Type: error
+#flag:translate!:3
+#flag:comment:2
+# This paragraph is followed by a (currently) non-translatable list of
+# PAM profile names.
_Description: Incompatible PAM profiles selected.
The following PAM profiles cannot be used together:
.
diff --git a/debian/local/pam-auth-update b/debian/local/pam-auth-update
index bc42f21b..42690850 100755
--- a/debian/local/pam-auth-update
+++ b/debian/local/pam-auth-update
@@ -45,12 +45,13 @@ my %md5sums = (
'account' => ['3c0c362eaf3421848b679d63fd48c3fa'],
'password' => [
'4bd7610f2e85f8ddaef79c7db7cb49eb',
+ '9ba753d0824276b44bcadfee1f87b6bc',
'3532cbabf533d59f0b64218ad82f1446',
],
'session' => [
'240fb92986c885b327cdb21dd641da8c',
'1bd2f3e86f552c57f5ee013b93ffca2b',
- '1a1bda3d417991dd366984ca7382f787',
+ '4a25673e8b36f1805219027d3be02cd2',
],
);
diff --git a/debian/patches-applied/027_pam_limits_better_init_allow_explicit_root b/debian/patches-applied/027_pam_limits_better_init_allow_explicit_root
index f89bd256..b061152f 100644
--- a/debian/patches-applied/027_pam_limits_better_init_allow_explicit_root
+++ b/debian/patches-applied/027_pam_limits_better_init_allow_explicit_root
@@ -20,10 +20,14 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
for(i = 0; i < RLIM_NLIMITS; i++) {
int r = getrlimit(i, &pl->limits[i].limit);
if (r == -1) {
-@@ -242,6 +244,41 @@
+@@ -240,8 +242,53 @@
+ }
+ } else {
pl->limits[i].supported = 1;
- pl->limits[i].src_soft = LIMITS_DEF_NONE;
- pl->limits[i].src_hard = LIMITS_DEF_NONE;
+- pl->limits[i].src_soft = LIMITS_DEF_NONE;
+- pl->limits[i].src_hard = LIMITS_DEF_NONE;
++ pl->limits[i].src_soft = LIMITS_DEF_ALL;
++ pl->limits[i].src_hard = LIMITS_DEF_ALL;
+ switch(i) {
+ case RLIMIT_CPU:
+ case RLIMIT_FSIZE:
@@ -37,15 +41,21 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
+#ifdef RLIMIT_LOCKS
+ case RLIMIT_LOCKS:
+#endif
++ pl->limits[i].limit.rlim_cur = RLIM_INFINITY;
++ pl->limits[i].limit.rlim_max = RLIM_INFINITY;
++ break;
+#ifdef RLIMIT_SIGPENDING
+ case RLIMIT_SIGPENDING:
++ pl->limits[i].limit.rlim_cur = 16382;
++ pl->limits[i].limit.rlim_max = 16382;
++ break;
+#endif
+#ifdef RLIMIT_MSGQUEUE
+ case RLIMIT_MSGQUEUE:
-+#endif
-+ pl->limits[i].limit.rlim_cur = RLIM_INFINITY;
-+ pl->limits[i].limit.rlim_max = RLIM_INFINITY;
++ pl->limits[i].limit.rlim_cur = 819200;
++ pl->limits[i].limit.rlim_max = 819200;
+ break;
++#endif
+ case RLIMIT_CORE:
+ pl->limits[i].limit.rlim_cur = 0;
+ pl->limits[i].limit.rlim_max = RLIM_INFINITY;
@@ -58,11 +68,15 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
+ pl->limits[i].limit.rlim_cur = 1024;
+ pl->limits[i].limit.rlim_max = 1024;
+ break;
++ default:
++ pl->limits[i].src_soft = LIMITS_DEF_NONE;
++ pl->limits[i].src_hard = LIMITS_DEF_NONE;
++ break;
+ }
}
}
-@@ -524,7 +561,7 @@
+@@ -524,7 +571,7 @@
if (strcmp(uname, domain) == 0) /* this user have a limit */
process_limit(pamh, LIMITS_DEF_USER, ltype, item, value, ctrl, pl);
@@ -71,7 +85,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
if (ctrl & PAM_DEBUG_ARG) {
pam_syslog(pamh, LOG_DEBUG,
"checking if %s is in group %s",
-@@ -533,7 +570,7 @@
+@@ -533,7 +580,7 @@
if (pam_modutil_user_in_group_nam_nam(pamh, uname, domain+1))
process_limit(pamh, LIMITS_DEF_GROUP, ltype, item, value, ctrl,
pl);
@@ -80,7 +94,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
if (ctrl & PAM_DEBUG_ARG) {
pam_syslog(pamh, LOG_DEBUG,
"checking if %s is in group %s",
-@@ -547,7 +584,7 @@
+@@ -547,7 +594,7 @@
process_limit(pamh, LIMITS_DEF_ALLGROUP, ltype, item, value, ctrl,
pl);
}
@@ -89,7 +103,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
process_limit(pamh, LIMITS_DEF_DEFAULT, ltype, item, value, ctrl,
pl);
} else if (i == 2 && ltype[0] == '-') { /* Probably a no-limit line */
-@@ -582,6 +619,12 @@
+@@ -582,6 +629,12 @@
int status;
int retval = LIMITED_OK;
@@ -102,7 +116,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
for (i=0, status=LIMITED_OK; i<RLIM_NLIMITS; i++) {
if (!pl->limits[i].supported) {
/* skip it if its not known to the system */
-@@ -675,6 +718,8 @@
+@@ -675,6 +728,8 @@
return PAM_ABORT;
}
@@ -111,3 +125,87 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
retval = parse_config_file(pamh, pwd->pw_name, ctrl, pl);
if (retval == PAM_IGNORE) {
D(("the configuration file ('%s') has an applicable '<domain> -' entry", CONF_FILE));
+Index: pam.deb/modules/pam_limits/limits.conf
+===================================================================
+--- pam.deb.orig/modules/pam_limits/limits.conf
++++ pam.deb/modules/pam_limits/limits.conf
+@@ -11,6 +11,9 @@
+ # - the wildcard *, for default entry
+ # - the wildcard %, can be also used with %group syntax,
+ # for maxlogin limit
++# - NOTE: group and wildcard limits are not applied to root.
++# To apply a limit to the root user, <domain> must be
++# the literal username root.
+ #
+ #<type> can have the two values:
+ # - "soft" for enforcing the soft limits
+@@ -41,6 +44,7 @@
+ #
+
+ #* soft core 0
++#root hard core 100000
+ #* hard rss 10000
+ #@student hard nproc 20
+ #@faculty soft nproc 20
+Index: pam.deb/modules/pam_limits/limits.conf.5.xml
+===================================================================
+--- pam.deb.orig/modules/pam_limits/limits.conf.5.xml
++++ pam.deb/modules/pam_limits/limits.conf.5.xml
+@@ -57,6 +57,11 @@
+ </para>
+ </listitem>
+ </itemizedlist>
++ <para>
++ <emphasis remap='B'>NOTE:</emphasis> group and wildcard limits are not
++ applied to the root user. To set a limit for the root user, this field
++ must contain the literal username <emphasis remap='B'>root</emphasis>.
++ </para>
+ </listitem>
+ </varlistentry>
+
+@@ -266,6 +271,7 @@
+ </para>
+ <programlisting>
+ * soft core 0
++root hard core 100000
+ * hard rss 10000
+ @student hard nproc 20
+ @faculty soft nproc 20
+Index: pam.deb/modules/pam_limits/limits.conf.5
+===================================================================
+--- pam.deb.orig/modules/pam_limits/limits.conf.5
++++ pam.deb/modules/pam_limits/limits.conf.5
+@@ -1,11 +1,11 @@
+ .\" Title: limits.conf
+ .\" Author:
+ .\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
+-.\" Date: 07/27/2008
++.\" Date: 11/09/2008
+ .\" Manual: Linux-PAM Manual
+ .\" Source: Linux-PAM Manual
+ .\"
+-.TH "LIMITS\&.CONF" "5" "07/27/2008" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "LIMITS\&.CONF" "5" "11/09/2008" "Linux-PAM Manual" "Linux\-PAM Manual"
+ .\" disable hyphenation
+ .nh
+ .\" disable justification (adjust text to left margin only)
+@@ -48,6 +48,11 @@
+ \fI%group\fR
+ syntax\&.
+ .RE
++.IP "" 4
++
++\fBNOTE:\fR
++group and wildcard limits are not applied to the root user\&. To set a limit for the root user, this field must contain the literal username
++\fBroot\fR\&.
+ .RE
+ .PP
+ \fB<type>\fR
+@@ -204,6 +209,7 @@
+ .RS 4
+ .nf
+ * soft core 0
++root hard core 100000
+ * hard rss 10000
+ @student hard nproc 20
+ @faculty soft nproc 20
diff --git a/debian/patches-applied/dont_freeze_password_chain b/debian/patches-applied/dont_freeze_password_chain
new file mode 100644
index 00000000..799d0a0e
--- /dev/null
+++ b/debian/patches-applied/dont_freeze_password_chain
@@ -0,0 +1,117 @@
+Don't freeze the chain for chauthtok.
+
+bugzilla.novell.com#470337, LP: #303515.
+
+Author: Thorsten Kukuk <kukuk@thkukuk.de>
+
+Upstream status: cherry-picked from upstream.
+
+=== modified file 'doc/man/pam_sm_chauthtok.3.xml'
+--- doc/man/pam_sm_chauthtok.3.xml 2006-06-28 14:22:40 +0000
++++ doc/man/pam_sm_chauthtok.3.xml 2009-02-18 00:34:47 +0000
+@@ -40,7 +40,7 @@
+ </citerefentry> interface.
+ </para>
+ <para>
+- This function is used to (re-)set the authentication token of the user.
++ This function is used to (re-)set the authentication token of the user.
+ </para>
+ <para>
+ Valid flags, which may be logically OR'd with
+@@ -60,10 +60,10 @@
+ <listitem>
+ <para>
+ This argument indicates to the module that the users
+- authentication token (password) should only be changed if
+- it has expired. This flag is optional and
+- <emphasis>must</emphasis> be combined with one of the
+- following two flags. Note, however, the following two options
++ authentication token (password) should only be changed if
++ it has expired. This flag is optional and
++ <emphasis>must</emphasis> be combined with one of the
++ following two flags. Note, however, the following two options
+ are <emphasis>mutually exclusive</emphasis>.
+ </para>
+ </listitem>
+@@ -72,15 +72,20 @@
+ <term>PAM_PRELIM_CHECK</term>
+ <listitem>
+ <para>
+- This indicates that the modules are being probed as to
+- their ready status for altering the user's authentication
+- token. If the module requires access to another system over
+- some network it should attempt to verify it can connect to
+- this system on receiving this flag. If a module cannot establish
+- it is ready to update the user's authentication token it should
++ This indicates that the modules are being probed as to
++ their ready status for altering the user's authentication
++ token. If the module requires access to another system over
++ some network it should attempt to verify it can connect to
++ this system on receiving this flag. If a module cannot establish
++ it is ready to update the user's authentication token it should
+ return <emphasis remap='B'>PAM_TRY_AGAIN</emphasis>, this
+ information will be passed back to the application.
+ </para>
++ <para>
++ If the control value <emphasis>sufficient</emphasis> is used in
++ the password stack, the <emphasis>PAM_PRELIM_CHECK</emphasis> section
++ of the modules following that control value is not always executed.
++ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+@@ -89,18 +94,18 @@
+ <para>
+ This informs the module that this is the call it should change
+ the authorization tokens. If the flag is logically OR'd with
+- <emphasis remap='B'>PAM_CHANGE_EXPIRED_AUTHTOK</emphasis>, the
++ <emphasis remap='B'>PAM_CHANGE_EXPIRED_AUTHTOK</emphasis>, the
+ token is only changed if it has actually expired.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <para>
+- The PAM library calls this function twice in succession. The first
+- time with <emphasis remap='B'>PAM_PRELIM_CHECK</emphasis> and then,
+- if the module does not return
++ The PAM library calls this function twice in succession. The first
++ time with <emphasis remap='B'>PAM_PRELIM_CHECK</emphasis> and then,
++ if the module does not return
+ <emphasis remap='B'>PAM_TRY_AGAIN</emphasis>, subsequently with
+- <emphasis remap='B'>PAM_UPDATE_AUTHTOK</emphasis>. It is only on
++ <emphasis remap='B'>PAM_UPDATE_AUTHTOK</emphasis>. It is only on
+ the second call that the authorization token is (possibly) changed.
+ </para>
+ </refsect1>
+
+=== modified file 'libpam/pam_dispatch.c'
+--- libpam/pam_dispatch.c 2008-12-03 22:16:33 +0000
++++ libpam/pam_dispatch.c 2009-02-18 00:34:47 +0000
+@@ -132,11 +132,10 @@
+ }
+
+ /*
+- * use_cached_chain is how we ensure that the setcred/close_session
+- * and chauthtok(2) modules are called in the same order as they did
+- * when they were invoked as auth/open_session/chauthtok(1). This
+- * feature was added in 0.75 to make the behavior of pam_setcred
+- * sane. It was debugged by release 0.76.
++ * use_cached_chain is how we ensure that the setcred and
++ * close_session modules are called in the same order as they did
++ * when they were invoked as auth/open_session. This feature was
++ * added in 0.75 to make the behavior of pam_setcred sane.
+ */
+ if (use_cached_chain != _PAM_PLEASE_FREEZE) {
+
+@@ -358,9 +357,6 @@
+ break;
+ case PAM_CHAUTHTOK:
+ h = pamh->handlers.conf.chauthtok;
+- if (flags & PAM_UPDATE_AUTHTOK) {
+- use_cached_chain = _PAM_MUST_BE_FROZEN;
+- }
+ break;
+ default:
+ pam_syslog(pamh, LOG_ERR, "undefined fn choice; %d", choice);
+
diff --git a/debian/patches-applied/series b/debian/patches-applied/series
index 8035591b..a1e163ed 100644
--- a/debian/patches-applied/series
+++ b/debian/patches-applied/series
@@ -21,3 +21,4 @@ pam_env_ignore_garbage.patch -p2
pam.d-manpage-section
pam_unix-chkpwd-wait
autoconf.patch
+dont_freeze_password_chain -p0
diff --git a/debian/po/bg.po b/debian/po/bg.po
index e3fbe78f..df7c7147 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: bg\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: 2009-01-02 00:17+0200\n"
"Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -109,6 +109,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -116,12 +118,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 8105ba3a..f9250abf 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: 2009-01-03 16:49+0100\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -112,6 +112,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -119,12 +121,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/de.po b/debian/po/de.po
index 690e9466..b51dca76 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam 1.0.1-5\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: 2009-01-03 09:17+0100\n"
"Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -114,6 +114,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -121,12 +123,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/es.po b/debian/po/es.po
index 2b722ea1..052d4588 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -35,7 +35,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam 0.79-4\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: 2009-01-01 12:22+0100\n"
"Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -144,6 +144,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -151,12 +153,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 7bddf40d..47e04e4d 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam_1.0.1-5_eu\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: 2009-01-02 12:30+0100\n"
"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
"Language-Team: Basque <itzulpena@euskalgnu.org>\n"
@@ -118,6 +118,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -125,12 +127,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/fi.po b/debian/po/fi.po
index d85a32d8..dc44ba05 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam 0.99.7.1-4\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: 2009-01-01 12:27+0200\n"
"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -113,6 +113,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -120,12 +122,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 11b73a4d..260c9bf0 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: 2007-10-03 12:07+0200\n"
"Last-Translator: Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -115,6 +115,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -122,12 +124,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 1263a390..58a95076 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: 2009-01-01 12:30+0100\n"
"Last-Translator: Marce Villarino <mvillarino@users.sourceforge.net>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
@@ -114,6 +114,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -121,12 +123,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/it.po b/debian/po/it.po
index b80c4ed0..59b307f7 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam 0.99.7.1-5\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: 2009-01-01 02:41+0100\n"
"Last-Translator: David Paleino <d.paleino@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -112,6 +112,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -119,12 +121,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 07dbe490..5f37b09b 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam 1.0.1-5\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: 2009-01-01 19:09+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -111,6 +111,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -118,12 +120,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 7a4320ce..92530eca 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: 2007-10-26 19:55+0100\n"
"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -114,6 +114,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -121,12 +123,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/pt.po b/debian/po/pt.po
index b31846d2..fc797ee7 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam 1.0.1-5\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: 2009-01-01 02:01+0000\n"
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -114,6 +114,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -121,12 +123,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 2e53782d..d0507c97 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam_0.99.7.1-5\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: 2007-09-26 15:53-0300\n"
"Last-Translator: Eder L. Marques <frolic@debian-ce.org>\n"
"Language-Team: l10n Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -115,6 +115,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -122,12 +124,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/ro.po b/debian/po/ro.po
index de01ab2c..b1298924 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: templates\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: 2008-07-21 10:28+0300\n"
"Last-Translator: Igor Stirbu <igor.stirbu@gmail.com>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -117,6 +117,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -124,12 +126,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 70b69a56..83a29b6c 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam 1.0.1-5\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: 2009-01-01 13:11+0300\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -114,6 +114,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -121,12 +123,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/sk.po b/debian/po/sk.po
index d1acc598..36c72035 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: \n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -111,6 +111,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -118,12 +120,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/sv.po b/debian/po/sv.po
index d18616ce..3aa7e22c 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam 0.99.7.1-5\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: 2009-01-01 10:59+0100\n"
"Last-Translator: Martin Bagge <brother@bsnet.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -112,6 +112,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -119,12 +121,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index a4a5c9ca..7256a047 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -102,6 +102,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -109,12 +111,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/tr.po b/debian/po/tr.po
index de95af3a..5bc11b00 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam 0.99.7.1-5\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
"PO-Revision-Date: 2009-01-01 19:20+0200\n"
"Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
"Language-Team: Debian L10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -116,6 +116,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -123,12 +125,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 7a0006d0..52a3c0fd 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,26 +1,26 @@
# Vietnamese translation for PAM.
-# Copyright © 2007 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2007
+# Copyright © 2009 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2007-2009.
#
msgid ""
msgstr ""
-"Project-Id-Version: pam 0.99.7.1-5\n"
+"Project-Id-Version: pam 1.0.1-5\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
-"PO-Revision-Date: 2007-09-28 23:58+0930\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\n"
+"PO-Revision-Date: 2009-01-26 23:08+1030\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.7b1\n"
+"X-Generator: LocFactoryEditor 1.8\n"
#. Type: string
#. Description
#: ../libpam0g.templates:1001
msgid "Services to restart for PAM library upgrade:"
-msgstr "Dịch vụ cần khởi chạy lại khi nâng cấp thư viện PAM:"
+msgstr "Dịch vụ cần khởi chạy lại để nâng cấp thư viện PAM:"
#. Type: string
#. Description
@@ -31,10 +31,11 @@ msgid ""
"list of init.d scripts for services to be restarted now, and correct it if "
"needed."
msgstr ""
-"Phần lớn dịch vụ sử dụng PAM cũng cần phải được khởi chạy lại để sử dụng các "
-"mô-đun được xây dựng cho phân vùng libpam mới này. Hãy xem lại danh sách "
-"định giới bằng dấu cách theo đây hiển thị các dịch vụ cần khởi chạy lại ngay "
-"bây giờ, và sửa chữa nếu cần thiết."
+"Phần lớn dịch vụ sử dụng PAM thì cũng cần phải được khởi chạy lại để sử dụng "
+"những mô-đun được xây dựng cho phiên bản libpam mới này. Hãy xem lại danh "
+"sách định giới bằng dấu cách theo đây hiển thị những văn lệnh khởi động "
+"(init.d) cho dịch vụ cần khởi chạy lại ngay bây giờ, và sửa chữa nếu cần "
+"thiết."
#. Type: error
#. Description
@@ -52,9 +53,9 @@ msgid ""
"services by hand before further X logins will be possible."
msgstr ""
"Trình quản lý trình bày kdm, wdm, hay xdm cần thiết được khởi chạy lại để sử "
-"dụng phiên bản mới của thư viện libpam, nhưng việc khởi chạy lại dịch vụ này "
-"sẽ cũng chấm dứt phiên chạy X đang hoạt động. Vì vậy bạn cần phải tự khởi "
-"chạy trình quản lý trình bày để có khả năng sử dụng nó lại."
+"dụng phiên bản mới của thư viện libpam, nhưng việc khởi chạy lại sẽ cũng "
+"chấm dứt một số buổi hợp đang nhập X đang chạy. Sau đó thì bạn cần phải tự "
+"khởi chạy lại những dịch vụ này để đăng nhập lại vào X."
#. Type: error
#. Description
@@ -77,7 +78,7 @@ msgid ""
"You will need to start these manually by running '/etc/init.d/<service> "
"start'."
msgstr ""
-"Bạn cần phải tự khởi chạy lại chúng bằng cách chạy lệnh « /etc/init.d/"
+"Bạn cần phải tự khởi chạy lại chúng bằng cách chạy câu lệnh « /etc/init.d/"
"<tên_dịch_vụ> start »."
#. Type: multiselect
@@ -113,6 +114,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -120,12 +123,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""
@@ -150,7 +147,7 @@ msgstr ""
#. Description
#: ../libpam-modules.templates:1001
msgid "xscreensaver and xlockmore must be restarted before upgrading"
-msgstr ""
+msgstr "xscreensaver và xlockmore phải được khởi chạy lại trước khi nâng cấp"
#. Type: error
#. Description
@@ -163,3 +160,9 @@ msgid ""
"stopped before continuing this upgrade, to avoid locking your users out of "
"their current sessions."
msgstr ""
+"Một hai nhiều tiến trình xscreensaver hay xlockmore được phát hiện trên hệ "
+"thống này. Do thay đổi thư viện không tương thích, việc nâng cấp gói libpam-"
+"modules sẽ để lại trường hợp người dùng không thể xác thực với những chương "
+"trình này. Vì thế bạn nên khởi chạy lại hoặc ngừng chạy những chương trình "
+"này trước khi tiếp tục tiến trình nâng cấp, để tránh chặn người dùng đăng "
+"nhập vào buổi hợp đang chạy."
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index 46fad3e8..9982b927 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pam\n"
"Report-Msgid-Bugs-To: pam@packages.debian.org\n"
-"POT-Creation-Date: 2008-12-28 01:17-0600\n"
+"POT-Creation-Date: 2009-02-28 13:06-0800\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"
@@ -113,6 +113,8 @@ msgstr ""
#. Type: error
#. Description
+#. This paragraph is followed by a (currently) non-translatable list of
+#. PAM profile names.
#: ../libpam-runtime.templates:2001
msgid "The following PAM profiles cannot be used together:"
msgstr ""
@@ -120,12 +122,6 @@ msgstr ""
#. Type: error
#. Description
#: ../libpam-runtime.templates:2001
-msgid "${conflicts}"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../libpam-runtime.templates:2001
msgid "Please select a different set of modules to enable."
msgstr ""