lists.arthurdejong.org
RSS feed

nss-pam-ldapd commit: r2095 - in debian/nss-pam-ldapd/trunk/debian: . po

[Date Prev][Date Next] [Thread Prev][Thread Next]

nss-pam-ldapd commit: r2095 - in debian/nss-pam-ldapd/trunk/debian: . po



Author: arthur
Date: Fri Jun 20 22:41:20 2014
New Revision: 2095
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?revision=2095&view=revision

Log:
provide a debconf prompt for tls_cacertfile if TLS is enabled and reqcert is 
configured

Modified:
   debian/nss-pam-ldapd/trunk/debian/changelog
   debian/nss-pam-ldapd/trunk/debian/nslcd.config
   debian/nss-pam-ldapd/trunk/debian/nslcd.postinst
   debian/nss-pam-ldapd/trunk/debian/nslcd.templates
   debian/nss-pam-ldapd/trunk/debian/po/ca.po
   debian/nss-pam-ldapd/trunk/debian/po/cs.po
   debian/nss-pam-ldapd/trunk/debian/po/da.po
   debian/nss-pam-ldapd/trunk/debian/po/de.po
   debian/nss-pam-ldapd/trunk/debian/po/es.po
   debian/nss-pam-ldapd/trunk/debian/po/fi.po
   debian/nss-pam-ldapd/trunk/debian/po/fr.po
   debian/nss-pam-ldapd/trunk/debian/po/gl.po
   debian/nss-pam-ldapd/trunk/debian/po/it.po
   debian/nss-pam-ldapd/trunk/debian/po/ja.po
   debian/nss-pam-ldapd/trunk/debian/po/nb.po
   debian/nss-pam-ldapd/trunk/debian/po/nl.po
   debian/nss-pam-ldapd/trunk/debian/po/pl.po
   debian/nss-pam-ldapd/trunk/debian/po/pt.po
   debian/nss-pam-ldapd/trunk/debian/po/pt_BR.po
   debian/nss-pam-ldapd/trunk/debian/po/ru.po
   debian/nss-pam-ldapd/trunk/debian/po/sk.po
   debian/nss-pam-ldapd/trunk/debian/po/sv.po
   debian/nss-pam-ldapd/trunk/debian/po/templates.pot
   debian/nss-pam-ldapd/trunk/debian/po/tr.po
   debian/nss-pam-ldapd/trunk/debian/po/vi.po
   debian/nss-pam-ldapd/trunk/debian/po/zh_CN.po

Modified: debian/nss-pam-ldapd/trunk/debian/changelog
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/changelog Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/changelog Fri Jun 20 22:41:20 2014        
(r2095)
@@ -6,8 +6,10 @@
     - French by Christian Perrier (closes: #751100)
   * for new installs add tls_cacertfile /etc/ssl/certs/ca-certificates.crt to
     nslcd.conf (closes: #750949)
+  * provide a debconf prompt for tls_cacertfile if TLS is enabled and reqcert
+    is configured (closes: #750949)
 
- -- Arthur de Jong <adejong@debian.org>  Fri, 20 Jun 2014 20:04:36 +0200
+ -- Arthur de Jong <adejong@debian.org>  Fri, 20 Jun 2014 20:51:23 +0200
 
 nss-pam-ldapd (0.9.4-1) unstable; urgency=medium
 

Modified: debian/nss-pam-ldapd/trunk/debian/nslcd.config
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/nslcd.config      Fri Jun 20 20:50:26 
2014        (r2094)
+++ debian/nss-pam-ldapd/trunk/debian/nslcd.config      Fri Jun 20 22:41:20 
2014        (r2095)
@@ -182,6 +182,8 @@
   read_config nslcd/ldap-sasl-authzid sasl_authzid
   read_config nslcd/ldap-sasl-secprops sasl_secprops
   read_config nslcd/ldap-sasl-krb5-ccname krb5_ccname
+  read_config nslcd/ldap-cacertfile tls_cacert
+  read_config nslcd/ldap-cacertfile tls_cacertfile
   # check ssl option
   db_get nslcd/ldap-starttls
   if [ -z "$RET" ] || [ "$force" = "force" ]
@@ -366,6 +368,27 @@
     fi
     # ask the question, go to the next question or back
     # (we go back to authtype because the previous questions were optional)
+    state="cacertfile"
+    db_go || state="authtype"
+    ;;
+  cacertfile)
+    # check if ldaps:// URL's are used
+    db_get nslcd/ldap-uris
+    uris="$RET"
+    # check if StartTLS is used
+    db_get nslcd/ldap-starttls
+    starttls="$RET"
+    # check if reqcert is set to something else than never
+    db_get nslcd/ldap-reqcert
+    reqcert="$RET"
+
+    if ( (echo "$uris" | grep -q 'ldaps://') || [ "$starttls" = "true" ] ) \
+       && [ "$reqcert" != "" ] && [ "$reqcert" != "never" ]
+    then
+      db_input medium nslcd/ldap-cacertfile || true
+    fi
+    # ask the question, go to the next question or back
+    # (we go back to authtype because the previous questions were optional)
     state="done"
     db_go || state="authtype"
     ;;

Modified: debian/nss-pam-ldapd/trunk/debian/nslcd.postinst
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/nslcd.postinst    Fri Jun 20 20:50:26 
2014        (r2094)
+++ debian/nss-pam-ldapd/trunk/debian/nslcd.postinst    Fri Jun 20 22:41:20 
2014        (r2095)
@@ -213,6 +213,12 @@
     echo "Renaming reconnect_maxsleeptime to reconnect_retrytime in 
$CONFFILE..." >&2
     sed -i 's/^reconnect_maxsleeptime[[:space:]]/reconnect_retrytime /' 
"$CONFFILE"
   fi
+  # rename tls_cacert to tls_cacertfile
+  if grep -qi '^tls_cacert[[:space:]]' $CONFFILE
+  then
+    echo "Renaming tls_cacert to tls_cacertfile in $CONFFILE..." >&2
+    sed -i 's/^tls_cacert[[:space:]]/tls_cacertfile /' "$CONFFILE"
+  fi
   # comment out mapping of uniqueMember to member which is now used by default
   if grep -qi 
'^map[[:space:]]*group[[:space:]]*uniqueMember[[:space:]]*member[[:space:]]*$' 
$CONFFILE
   then
@@ -260,6 +266,7 @@
     cfg_disable sasl_mech sasl_realm sasl_authcid sasl_authzid sasl_secprops 
krb5_ccname
   esac
   update_config nslcd/ldap-reqcert tls_reqcert
+  update_config nslcd/ldap-cacertfile tls_cacertfile
   # remove password from database
   db_set nslcd/ldap-bindpw ""
   # set ssl option

Modified: debian/nss-pam-ldapd/trunk/debian/nslcd.templates
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/nslcd.templates   Fri Jun 20 20:50:26 
2014        (r2094)
+++ debian/nss-pam-ldapd/trunk/debian/nslcd.templates   Fri Jun 20 22:41:20 
2014        (r2095)
@@ -121,9 +121,13 @@
   * try: a certificate will be requested and checked, but if no
          certificate is provided, it is ignored;
   * demand: a certificate will be requested, required, and checked.
- .
- If certificate checking is enabled, at least one of the tls_cacertdir or
- tls_cacertfile options must be put in /etc/nslcd.conf.
+
+Template: nslcd/ldap-cacertfile
+Type: string
+Default: /etc/ssl/certs/ca-certificates.crt
+_Description: Certificate authority certificate:
+ When certificate checking is enabled this file contains the X.509
+ certificate that is used to check the certificate provided by the server.
 
 Template: nslcd/disable-screensaver
 Type: error

Modified: debian/nss-pam-ldapd/trunk/debian/po/ca.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/ca.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/ca.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.7.9\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2010-08-24 09:14+0100\n"
 "Last-Translator: Agustí Grau <fletxa@gmail.com>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -395,26 +395,29 @@
 "          es proporciona serà ignorat;\n"
 " * demanda: el certiicat serà demanat, requerit i comprovat."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Si la comprovació de certificats està habilitada, s'haura d'habilitar en el "
-"fitxer /etc/nslcd.conf com a mínim una opció de tls_cacertdir o "
-"tls_cacertfile."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr "S'ha de reiniciar l'xscreensaver i l'xlockmore abans d'actualitzar"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 #, fuzzy
 #| msgid ""
 #| "One or more running instances of xscreensaver or xlockmore have been "
@@ -441,7 +444,7 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr ""
 "Voleu que es reiniciïn els serveis sense demanar confirmació durant les "
@@ -449,7 +452,7 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -469,7 +472,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for PAM library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -478,7 +481,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Running services and programs that are using NSS need to be restarted, "
@@ -502,7 +505,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for PAM upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -512,7 +515,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the PAM library upgrade:"
@@ -523,7 +526,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -533,13 +536,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "Cal reiniciar manualment el gestor de pantalla"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 #, fuzzy
 #| msgid ""
 #| "The wdm and xdm display managers require a restart for the new version of "
@@ -635,6 +638,14 @@
 "entrades automàticament. Assegureu-vos de revisar els canvis al fitxer /etc/"
 "nsswitch.conf si escolliu eliminar les entrades ara."
 
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Si la comprovació de certificats està habilitada, s'haura d'habilitar en "
+#~ "el fitxer /etc/nslcd.conf com a mínim una opció de tls_cacertdir o "
+#~ "tls_cacertfile."
+
 #~ msgid "Enable shadow lookups through NSS?"
 #~ msgstr "Habilitar les cerques shadow a través de NSS?"
 

Modified: debian/nss-pam-ldapd/trunk/debian/po/cs.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/cs.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/cs.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.8.13-2\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2013-06-22 08:22+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -376,26 +376,30 @@
 "               nebude certifikát obdržen, bude to ignorováno;\n"
 " * vyžadováno: certifikát je povinný a bude zkontrolován."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Je-li zapnuta kontrola certifikátů, musí být v /etc/nslcd.conf povolena "
-"minimálně jedna z voleb tls_cacertdir a tls_cacertfile."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr ""
 "Programy xscreensaver a xlockmore musí být před aktualizací restartovány"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 #, fuzzy
 #| msgid ""
 #| "One or more running instances of xscreensaver or xlockmore have been "
@@ -421,13 +425,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr "Restartovat služby při aktualizaci balíku bez ptaní?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -446,7 +450,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for PAM library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -454,7 +458,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Running services and programs that are using NSS need to be restarted, "
@@ -478,7 +482,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for PAM upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -486,7 +490,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the PAM library upgrade:"
@@ -496,7 +500,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -505,13 +509,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "Správce displeje se musí restartovat ručně"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 #, fuzzy
 #| msgid ""
 #| "The wdm and xdm display managers require a restart for the new version of "
@@ -603,6 +607,13 @@
 "automaticky. Zvolíte-li automatické odstranění, rozhodně si provedené změny "
 "v /etc/nsswitch.conf prohlédněte."
 
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Je-li zapnuta kontrola certifikátů, musí být v /etc/nslcd.conf povolena "
+#~ "minimálně jedna z voleb tls_cacertdir a tls_cacertfile."
+
 #~ msgid "Enable shadow lookups through NSS?"
 #~ msgstr "Povolit vyhledávání v shadow pomocí NSS?"
 

Modified: debian/nss-pam-ldapd/trunk/debian/po/da.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/da.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/da.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.8.13-2\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2013-06-15 23:51+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -395,25 +395,29 @@
 " * kræv: Der vil blive spurgt efter et certifikat, det er krævet og det\n"
 "         kontrolleres."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Hvis certifikattjek er aktiveret skal mindst en af tilvalgene tls_cacertdir "
-"eller tls_cacertfile være placeret i /etc/nslcd.conf."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr "xscreensaver og xlockmore skal genstartes før opgradering"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 #, fuzzy
 #| msgid ""
 #| "One or more running instances of xscreensaver or xlockmore have been "
@@ -439,13 +443,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr "Genstart tjenester under pakkeopgraderinger uden at spørge?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -465,7 +469,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for PAM library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -473,7 +477,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Running services and programs that are using NSS need to be restarted, "
@@ -496,7 +500,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for PAM upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -505,7 +509,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the PAM library upgrade:"
@@ -515,7 +519,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -524,13 +528,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "Visningshåndtering skal genstartes manuelt"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 #, fuzzy
 #| msgid ""
 #| "The wdm and xdm display managers require a restart for the new version of "
@@ -620,3 +624,10 @@
 "Du kan redigere /etc/nsswitch.conf i hånden eller vælge at fjerne punkterne "
 "automatisk nu. Sørg for at gennemse ændringer til /etc/nsswitch.conf hvis du "
 "vælger at fjerne indlæggene nu."
+
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Hvis certifikattjek er aktiveret skal mindst en af tilvalgene "
+#~ "tls_cacertdir eller tls_cacertfile være placeret i /etc/nslcd.conf."

Modified: debian/nss-pam-ldapd/trunk/debian/po/de.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/de.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/de.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.8.13-2\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2013-06-15 23:17+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -402,26 +402,29 @@
 " * anfordern: ein Zertifikat wird angefordert, ist erforderlich\n"
 "              und wird überprüft"
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Wenn die Zertifikat-Überprüfung eingeschaltet ist, muss mindestens eine der "
-"Optionen »tls_cacertdir« oder »tls_cacertfile« in die Datei /etc/nslcd.conf "
-"eingetragen werden."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr "Xscreensaver und Xlockmore müssen vor dem Upgrade neu gestartet werden"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 #, fuzzy
 #| msgid ""
 #| "One or more running instances of xscreensaver or xlockmore have been "
@@ -448,13 +451,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr "Dienste bei Paket-Upgrades ohne Rückfrage neu starten?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -475,7 +478,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for PAM library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -483,7 +486,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Running services and programs that are using NSS need to be restarted, "
@@ -507,7 +510,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for PAM upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -515,7 +518,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the PAM library upgrade:"
@@ -526,7 +529,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -536,13 +539,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "Display-Manager müssen manuell neu gestartet werden"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 #, fuzzy
 #| msgid ""
 #| "The wdm and xdm display managers require a restart for the new version of "
@@ -632,3 +635,11 @@
 "zu, die Einträge automatisch zu entfernen. Kontrollieren Sie unbedingt die "
 "Änderungen in der Datei /etc/nsswitch.conf, wenn Sie zustimmen, die Einträge "
 "jetzt zu löschen."
+
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Wenn die Zertifikat-Überprüfung eingeschaltet ist, muss mindestens eine "
+#~ "der Optionen »tls_cacertdir« oder »tls_cacertfile« in die Datei /etc/"
+#~ "nslcd.conf eingetragen werden."

Modified: debian/nss-pam-ldapd/trunk/debian/po/es.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/es.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/es.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -32,7 +32,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.8.4\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2011-08-15 12:59+0100\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -539,26 +539,29 @@
 "          se proporciona se ignorará.\n"
 " * exigir: se pedirá, necesitará y comprobará un certificado."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Si la comprobación del certificado está activa, se debe utilizar al menos "
-"una de las opciones «tls_cacertdir» o «tls_cacertfile» en el archivo «/etc/"
-"nslcd.conf»."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr "Se deben reiniciar xscreensaver y xlockmore antes de actualizar"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 #, fuzzy
 #| msgid ""
 #| "One or more running instances of xscreensaver or xlockmore have been "
@@ -584,7 +587,7 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr ""
 "¿Quiere que los servicios se actualicen durante una actualización de paquete "
@@ -592,7 +595,7 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -613,7 +616,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for PAM library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -621,7 +624,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Running services and programs that are using NSS need to be restarted, "
@@ -645,7 +648,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for PAM upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -653,7 +656,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the PAM library upgrade:"
@@ -664,7 +667,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -673,13 +676,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "Debe reiniciar manualmente los gestores de pantalla"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 #, fuzzy
 #| msgid ""
 #| "The wdm and xdm display managers require a restart for the new version of "
@@ -775,6 +778,14 @@
 "las entradas automáticamente ahora. Asegúrese de que revisa los cambios en "
 "el archivo «/etc/nsswitch.conf» si escoge borrar las entradas ahora."
 
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Si la comprobación del certificado está activa, se debe utilizar al menos "
+#~ "una de las opciones «tls_cacertdir» o «tls_cacertfile» en el archivo «/"
+#~ "etc/nslcd.conf»."
+
 #~ msgid "Enable shadow lookups through NSS?"
 #~ msgstr "¿Desea activar las búsquedas de «shadow» por NSS?"
 

Modified: debian/nss-pam-ldapd/trunk/debian/po/fi.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/fi.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/fi.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: nss-ldapd\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2009-06-23 21:44+0300\n"
 "Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -378,25 +378,29 @@
 "               ei saada, tästä ei välitetä\n"
 " * vaadi:      Varmenne vaaditaan ja tarkastetaan."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Jos tarkastus on käytössä, tulisi ainakin toinen asetuksista tls_cacertdir "
-"ja tls_cacertfile laittaa tiedostoon /etc/nslcd.conf."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr "xscreensaver ja xlockmore täytyy käynnistää uudelleen ennen päivitystä"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid ""
 "One or more running instances of xscreensaver or xlockmore have been "
 "detected on this system. Because of incompatible library changes, the "
@@ -408,13 +412,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -427,7 +431,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for PAM library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -435,7 +439,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Running services and programs that are using NSS need to be restarted, "
@@ -459,7 +463,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for PAM upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -467,7 +471,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the PAM library upgrade:"
@@ -478,7 +482,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -487,13 +491,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "Näytönhallintaohjelma tulee käynnistää uudelleen käsin"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 #, fuzzy
 #| msgid ""
 #| "The kdm, wdm, and xdm display managers require a restart for the new "
@@ -588,6 +592,13 @@
 "jos poistat tietueet nyt."
 
 #~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Jos tarkastus on käytössä, tulisi ainakin toinen asetuksista "
+#~ "tls_cacertdir ja tls_cacertfile laittaa tiedostoon /etc/nslcd.conf."
+
+#~ msgid ""
 #~ "If the LDAP database requires a login for normal lookups, enter the name "
 #~ "of the account that will be used here. Leave it empty otherwise."
 #~ msgstr ""

Modified: debian/nss-pam-ldapd/trunk/debian/po/fr.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/fr.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/fr.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.9.1-2\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2014-06-10 07:19+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -401,26 +401,29 @@
 " - Essayer   : certificat demandé et contrôlé, mais facultatif ;\n"
 " - Demander  : certificat obligatoire et contrôlé."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Si le contrôle du certificat est activé, il est indispensable d'utiliser au "
-"moins l'une des options « tls_cacertdir » ou « tls_cacertfile » dans le "
-"fichier /etc/nslcd.conf."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr "Redémarrage nécessaire de xscreensaver et xlockmore avant mise à jour"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid ""
 "One or more running instances of xscreensaver or xlockmore have been "
 "detected on this system. Because of incompatible library changes, the "
@@ -438,13 +441,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr "Redémarrer les services automatiquement lors des mises à jour ?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -464,13 +467,13 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 msgid "Services to restart for nslcd upgrade:"
 msgstr "Services à redémarrer lors de la mise à niveau de nslcd :"
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 msgid ""
 "Running services and programs that are using nslcd need to be restarted, "
 "otherwise they might not be able to do lookup or authentication any more "
@@ -486,20 +489,20 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid "Failure restarting some services for nslcd upgrade"
 msgstr ""
 "Erreur du redémarrage de certains services pour la mise à niveau de nslcd"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid "The following services could not be restarted:"
 msgstr "Les services suivants n'ont pas pu être redémarrés :"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -509,13 +512,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "Pas de redémarrage automatique du gestionnaire graphique de sessions"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid ""
 "The wdm and xdm display managers require a restart for the new version of "
 "nslcd, but there are X login sessions active on your system that would be "
@@ -602,6 +605,14 @@
 "changements effectués automatiquement dans /etc/nsswitch.conf si vous "
 "choisissez de supprimer les entrées maintenant."
 
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Si le contrôle du certificat est activé, il est indispensable d'utiliser "
+#~ "au moins l'une des options « tls_cacertdir » ou « tls_cacertfile » dans "
+#~ "le fichier /etc/nslcd.conf."
+
 #~ msgid "Enable shadow lookups through NSS?"
 #~ msgstr "Faut-il activer les recherches de mots de passe cachés avec NSS ?"
 

Modified: debian/nss-pam-ldapd/trunk/debian/po/gl.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/gl.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/gl.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.6\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2009-07-18 10:02+0200\n"
 "Last-Translator: Marce Villarino <mvillarino@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -388,25 +388,29 @@
 "   ningún ignorarase,\n"
 " * demandar:pedirase, requirirase e comprobarase un certificado."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Se desactiva a comprobación do certificado, debe ter no ficheiro /etc/nslcd."
-"conf polo menos unha das opcións tls_cacertdir ou tlscacertfile."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr "xscreensaver e xlockmore deben ser reiniciados antes de actualizar"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 #, fuzzy
 #| msgid ""
 #| "One or more running instances of xscreensaver or xlockmore have been "
@@ -431,13 +435,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -450,7 +454,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for PAM library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -458,7 +462,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Running services and programs that are using NSS need to be restarted, "
@@ -481,7 +485,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for PAM upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -489,7 +493,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the PAM library upgrade:"
@@ -500,7 +504,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -510,13 +514,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "Débese reiniciar manualmente o xestor de pantallas"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 #, fuzzy
 #| msgid ""
 #| "The wdm and xdm display managers require a restart for the new version of "
@@ -612,6 +616,13 @@
 "nsswitch.conf se escolle agora eliminar as entradas."
 
 #~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Se desactiva a comprobación do certificado, debe ter no ficheiro /etc/"
+#~ "nslcd.conf polo menos unha das opcións tls_cacertdir ou tlscacertfile."
+
+#~ msgid ""
 #~ "If the LDAP database requires a login for normal lookups, enter the name "
 #~ "of the account that will be used here. Leave it empty otherwise."
 #~ msgstr ""

Modified: debian/nss-pam-ldapd/trunk/debian/po/it.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/it.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/it.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.8.13-2\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2013-06-24 17:49+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -391,25 +391,29 @@
 "             di un certificato viene ignorata;\n"
 " * richiedi: un certificato viene richiesto in modo vincolante e controllato."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Se è abilitata la verifica dei certificati, almeno una delle opzioni "
-"tls_cacertdir o tls_cacertfile deve trovarsi in «/etc/nslcd.conf»."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr "Riavvio di xscreensaver e xlockmore prima dell'aggiornamento"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 #, fuzzy
 #| msgid ""
 #| "One or more running instances of xscreensaver or xlockmore have been "
@@ -435,13 +439,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -454,7 +458,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for PAM library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -462,7 +466,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Running services and programs that are using NSS need to be restarted, "
@@ -486,7 +490,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for PAM upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -494,7 +498,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the PAM library upgrade:"
@@ -505,7 +509,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -513,13 +517,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "Il display manager deve essere riavviato manualmente"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 #, fuzzy
 #| msgid ""
 #| "The wdm and xdm display managers require a restart for the new version of "
@@ -611,6 +615,13 @@
 "rimuovere le voci automaticamente adesso. Controllare le modifiche a «/etc/"
 "nsswitch.conf» se si sceglie la rimozione automatica."
 
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Se è abilitata la verifica dei certificati, almeno una delle opzioni "
+#~ "tls_cacertdir o tls_cacertfile deve trovarsi in «/etc/nslcd.conf»."
+
 #~ msgid "Enable shadow lookups through NSS?"
 #~ msgstr "Abilitare le ricerche «shadow» tramite NSS?"
 

Modified: debian/nss-pam-ldapd/trunk/debian/po/ja.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/ja.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/ja.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.8.13-2\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2013-06-10 23:29+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -375,26 +375,30 @@
 "         証明書が提供されなかった場合は単に無視される\n"
 " * 要求: 証明書は要求され、必須であり、チェックされる。"
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"証明書のチェックが有効の場合、tls_cacertdir、tls_cacertfile オプションのうち"
-"の少なくとも 1 つは /etc/nslcd.conf に掲載されている必要があります。"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr ""
 "xscreensaver と xlockmore はアップグレードする前に再起動する必要があります。"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 #, fuzzy
 #| msgid ""
 #| "One or more running instances of xscreensaver or xlockmore have been "
@@ -419,14 +423,14 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr ""
 "パッケージのアップグレード中、質問することなくサービスを再起動しますか?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -446,7 +450,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for PAM library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -454,7 +458,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Running services and programs that are using NSS need to be restarted, "
@@ -477,7 +481,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for PAM upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -485,7 +489,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the PAM library upgrade:"
@@ -494,7 +498,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -504,13 +508,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "ディスプレイマネージャは手動で再起動されなければなりません"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 #, fuzzy
 #| msgid ""
 #| "The wdm and xdm display managers require a restart for the new version of "
@@ -598,3 +602,10 @@
 "/etc/nsswitch.conf を手動で編集するか、エントリを自動で今削除することを選べま"
 "す。エントリを今削除することを選ぶ場合、/etc/nsswitch.conf の変更内容を確認し"
 "てください。"
+
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "証明書のチェックが有効の場合、tls_cacertdir、tls_cacertfile オプションのう"
+#~ "ちの少なくとも 1 つは /etc/nslcd.conf に掲載されている必要があります。"

Modified: debian/nss-pam-ldapd/trunk/debian/po/nb.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/nb.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/nb.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.8.4\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2012-01-01 15:17+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -438,25 +438,29 @@
 "           det blir ignorert dersom det ikke blir oppgitt et sertifikat.\n"
 "* krev:  det blir bedt om et sertifikat som blir krevet og kontrollert."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Hvis sertifikatkontroll er slått på, så må minst ett av valgene tls."
-"cacertdir eller tls.cscertfile være lagt inn i /etc/nslcd.conf."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr "xscreensaver og xlockmore må restartes før oppgradering"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 #, fuzzy
 #| msgid ""
 #| "One or more running instances of xscreensaver or xlockmore have been "
@@ -482,13 +486,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr "Skal tjenester restartes uten spørsmål under pakkeoppgraderinger?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -508,7 +512,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for GNU libc library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -516,7 +520,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Running services and programs that are using NSS need to be restarted, "
@@ -539,7 +543,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for GNU libc upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -547,7 +551,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the GNU libc library "
@@ -559,7 +563,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -567,13 +571,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid ""
 "The wdm and xdm display managers require a restart for the new version of "
 "nslcd, but there are X login sessions active on your system that would be "
@@ -657,6 +661,13 @@
 "automatisk nå. Pass på at du kontrollerer endringene i /etc/nsswitch,conf "
 "hvis du velger å fjerne innslagene nå."
 
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Hvis sertifikatkontroll er slått på, så må minst ett av valgene tls."
+#~ "cacertdir eller tls.cscertfile være lagt inn i /etc/nslcd.conf."
+
 #~ msgid "Enable shadow lookups through NSS?"
 #~ msgstr "Skal skyggeoppslag gjennom NSS være slått på?"
 

Modified: debian/nss-pam-ldapd/trunk/debian/po/nl.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/nl.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/nl.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.8.13-2\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2013-10-18 15:00+0200\n"
 "Last-Translator: Arthur de Jong <arthur@arthurdejong.org>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -389,26 +389,29 @@
 " * eis: een certificaat wordt gevraagd, gecontroleerd en is\n"
 "        verplicht."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Als certificaat-controle is ingeschakeld moet minstens één van de "
-"tls_cacertdir of tls_cacertfile opties geconfigureerd worden in /etc/nslcd."
-"conf."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr "xscreensaver en xlockmore moeten voor het opwaarderen worden herstart"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid ""
 "One or more running instances of xscreensaver or xlockmore have been "
 "detected on this system. Because of incompatible library changes, the "
@@ -426,13 +429,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr "Diensten zonder vragen herstarten bij het opwaarderen van pakketten?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -453,13 +456,13 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 msgid "Services to restart for nslcd upgrade:"
 msgstr "Bij de opwaardering van nslcd te herstarten diensten:"
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 msgid ""
 "Running services and programs that are using nslcd need to be restarted, "
 "otherwise they might not be able to do lookup or authentication any more "
@@ -476,19 +479,19 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid "Failure restarting some services for nslcd upgrade"
 msgstr "Herstarten van sommige diensten bij de nslcd-opwaardering is mislukt"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid "The following services could not be restarted:"
 msgstr "De volgende diensten konden niet herstart worden:"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -498,13 +501,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "De beeldschermbeheerder dient handmatig herstart te worden"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid ""
 "The wdm and xdm display managers require a restart for the new version of "
 "nslcd, but there are X login sessions active on your system that would be "
@@ -587,3 +590,11 @@
 "U kunt /etc/nsswitch.conf met de hand bijwerken kunt de items nu automatisch "
 "laten verwijderen. Controleer de inhoud van /etc/nsswitch.conf als u ervoor "
 "kiest om ze nu te verwijderen."
+
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Als certificaat-controle is ingeschakeld moet minstens één van de "
+#~ "tls_cacertdir of tls_cacertfile opties geconfigureerd worden in /etc/"
+#~ "nslcd.conf."

Modified: debian/nss-pam-ldapd/trunk/debian/po/pl.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/pl.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/pl.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.8.13-2\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2013-06-23 23:03+0200\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -389,25 +389,29 @@
 "            zostanie on dostarczony zostanie to zignorowane;\n"
 " * wymagaj: certyfikat będzie żądany, wymagany i sprawdzany."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Jeśli włączone jest sprawdzanie certyfikatu to w pliku /etc/nslcd.conf "
-"należy umieścić co najmniej jedną z opcji tls_cacertdir lub tls_cacertfile."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr "xscreensaver i xlockmore muszą zostać zrestartowane przed aktualizacją"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 #, fuzzy
 #| msgid ""
 #| "One or more running instances of xscreensaver or xlockmore have been "
@@ -432,13 +436,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr "Zrestartować usługi podczas aktualizacji pakietu bez pytania?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -458,7 +462,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for PAM library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -467,7 +471,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Running services and programs that are using NSS need to be restarted, "
@@ -491,7 +495,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for PAM upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -499,7 +503,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the PAM library upgrade:"
@@ -509,7 +513,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -519,13 +523,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "Menedżer logowania musi być zrestartowany ręcznie"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 #, fuzzy
 #| msgid ""
 #| "The wdm and xdm display managers require a restart for the new version of "
@@ -615,3 +619,11 @@
 "Można dokonać ręcznej edycji pliku /etc/nsswitch.conf lub wybrać teraz "
 "automatyczne usunięcie odpowiednich wpisów. W tym drugim przypadku proszę "
 "pamiętać o przejrzeniu plik /etc/nsswitch.conf po zakończeniu konfiguracji."
+
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Jeśli włączone jest sprawdzanie certyfikatu to w pliku /etc/nslcd.conf "
+#~ "należy umieścić co najmniej jedną z opcji tls_cacertdir lub "
+#~ "tls_cacertfile."

Modified: debian/nss-pam-ldapd/trunk/debian/po/pt.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/pt.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/pt.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.9.4-1\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2014-06-09 20:28+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -392,25 +392,29 @@
 "              se nenhum certificado for disponibilizado;\n"
 " * obrigar: será obrigatória a requisição e verificação de um certificado."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Se a verificação de certificados for activada, pelo menos uma das opções "
-"tls_cacertdir ou tls_cacertfile tem que ser colocada em /etc/nslcd.conf."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr "xscreensaver e xlockmore têm de ser reiniciados antes da actualização"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid ""
 "One or more running instances of xscreensaver or xlockmore have been "
 "detected on this system. Because of incompatible library changes, the "
@@ -428,13 +432,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr "Reiniciar serviços sem perguntar durante a actualização do pacote?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -454,13 +458,13 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 msgid "Services to restart for nslcd upgrade:"
 msgstr "Serviços a reiniciar para a actualização do nslcd:"
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 msgid ""
 "Running services and programs that are using nslcd need to be restarted, "
 "otherwise they might not be able to do lookup or authentication any more "
@@ -477,19 +481,19 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid "Failure restarting some services for nslcd upgrade"
 msgstr "Falha ao reiniciar alguns serviços para a actualização do nslcd"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid "The following services could not be restarted:"
 msgstr "Os seguintes serviços não puderam ser reiniciados:"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -498,13 +502,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "O gestor de sessão gráfica deverá ser reiniciado manualmente"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid ""
 "The wdm and xdm display managers require a restart for the new version of "
 "nslcd, but there are X login sessions active on your system that would be "
@@ -589,6 +593,13 @@
 "entradas automaticamente agora. Certifique-se que revê as alterações em /etc/"
 "nsswitch.conf se escolher remover as entradas agora."
 
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Se a verificação de certificados for activada, pelo menos uma das opções "
+#~ "tls_cacertdir ou tls_cacertfile tem que ser colocada em /etc/nslcd.conf."
+
 #~ msgid "Enable shadow lookups through NSS?"
 #~ msgstr "Activar as buscas shadow através de NSS?"
 

Modified: debian/nss-pam-ldapd/trunk/debian/po/pt_BR.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/pt_BR.po       Fri Jun 20 20:50:26 
2014        (r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/pt_BR.po       Fri Jun 20 22:41:20 
2014        (r2095)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.8.4\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2011-08-14 15:53-0300\n"
 "Last-Translator: Denis Doria <denisdoria@gmail.com>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -436,25 +436,29 @@
 "        certificado é provido o mesmo é ignorado;\n"
 " * demand: um certificado será requisitado, requerido, e validado."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Se a verificação do certificado está ativa, pelo menos uma das opções "
-"tls_cacertdir ou tls_cacertfile deve ser inclusa no /etc/nslcd.conf."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr "O xscreensaver e xlockmore precisam ser reiniciados antes de atualizar"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 #, fuzzy
 #| msgid ""
 #| "One or more running instances of xscreensaver or xlockmore have been "
@@ -480,13 +484,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -499,7 +503,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for PAM library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -507,7 +511,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Running services and programs that are using NSS need to be restarted, "
@@ -530,7 +534,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for PAM upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -538,7 +542,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the PAM library upgrade:"
@@ -549,7 +553,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -559,13 +563,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "Gerenciadores de display devem ser reiniciados manualmente"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 #, fuzzy
 #| msgid ""
 #| "The wdm and xdm display managers require a restart for the new version of "
@@ -661,6 +665,13 @@
 "entradas automaticamente agora. Tenha certeza de rever as mudanças no /etc/"
 "nsswitch.conf se escolher remover as entradas agora."
 
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Se a verificação do certificado está ativa, pelo menos uma das opções "
+#~ "tls_cacertdir ou tls_cacertfile deve ser inclusa no /etc/nslcd.conf."
+
 #~ msgid "Enable shadow lookups through NSS?"
 #~ msgstr "Ativar pesquisas obscuras através do NSS?"
 

Modified: debian/nss-pam-ldapd/trunk/debian/po/ru.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/ru.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/ru.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.8.13-2\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2013-06-10 20:52+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -392,25 +392,29 @@
 "                нет, то продолжать работу;\n"
 " * обязательна: обязательно запросить и проверить сертификат."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Если разрешена проверка сертификата, то в файле /etc/nslcd.conf должен быть "
-"параметр tls_cacertdir или tls_cacertfile."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr "Перед обновлением требуется перезапустить xscreensaver и xlockmore"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 #, fuzzy
 #| msgid ""
 #| "One or more running instances of xscreensaver or xlockmore have been "
@@ -436,13 +440,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr "Перезапускать службы при обновлении пакета не задавая вопрос?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -461,7 +465,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for PAM library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -469,7 +473,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Running services and programs that are using NSS need to be restarted, "
@@ -493,7 +497,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for PAM upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -501,7 +505,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the PAM library upgrade:"
@@ -511,7 +515,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -521,13 +525,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "Программу входа в систему нужно перезапустить вручную"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 #, fuzzy
 #| msgid ""
 #| "The wdm and xdm display managers require a restart for the new version of "
@@ -617,6 +621,13 @@
 "автоматическое удаление записей прямо сейчас. После этого проверьте "
 "изменённый /etc/nsswitch.conf."
 
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Если разрешена проверка сертификата, то в файле /etc/nslcd.conf должен "
+#~ "быть параметр tls_cacertdir или tls_cacertfile."
+
 #~ msgid "Enable shadow lookups through NSS?"
 #~ msgstr "Включить поиск в теневых паролях через NSS?"
 

Modified: debian/nss-pam-ldapd/trunk/debian/po/sk.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/sk.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/sk.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.8.13-2\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2013-06-10 19:12+0200\n"
 "Last-Translator: Slavko <linux@slavino.sk>\n"
 "Language-Team: slovenčina <debian-l10n-slovak@lists.debian.org>\n"
@@ -398,25 +398,29 @@
 "            certifikát poskytnutý, je ignorovaný;\n"
 " * žiadať:  certifikát bude vyžiadaný, vyžadovaný a skontrolovaný."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Ak je zapnutá kontrola certifikátu, musí byť v súbore /etc/nslcd.conf "
-"vložená aspoň jedna z volieb tls_cacertdir alebo tls_cacertfile."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr "xscreensaver a xlockmore je nutné pred aktualizáciou reštartovať"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 #, fuzzy
 #| msgid ""
 #| "One or more running instances of xscreensaver or xlockmore have been "
@@ -442,13 +446,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr "Reštartovať služby počas aktualizácie balíka bez pýtania sa?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -469,7 +473,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for PAM library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -477,7 +481,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Running services and programs that are using NSS need to be restarted, "
@@ -500,7 +504,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for PAM upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -508,7 +512,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the PAM library upgrade:"
@@ -518,7 +522,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -528,13 +532,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "Správcu obrazovky je potrebné reštartovať ručne"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 #, fuzzy
 #| msgid ""
 #| "The wdm and xdm display managers require a restart for the new version of "
@@ -625,6 +629,13 @@
 "položiek automaticky teraz. Ak si vyberiete odstránenie položiek teraz, "
 "nezabudnite si skontrolovať zmeny v /etc/nsswitch.conf."
 
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Ak je zapnutá kontrola certifikátu, musí byť v súbore /etc/nslcd.conf "
+#~ "vložená aspoň jedna z volieb tls_cacertdir alebo tls_cacertfile."
+
 #~ msgid "Enable shadow lookups through NSS?"
 #~ msgstr "Zapnúť tieňové vyhľadávanie cez NSS?"
 

Modified: debian/nss-pam-ldapd/trunk/debian/po/sv.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/sv.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/sv.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.8.13-2\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2013-07-01 17:12+0100\n"
 "Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -387,26 +387,30 @@
 "           inget certifikat tillhandahålls kommer detta ignoreras;\n"
 " * kräv: ett certifikat kommer efterfrågas, måste finnas och kontrolleras."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Om certifikatkontroll är aktiverad måste åtminstone ett avtls_cacertdir- och "
-"tls_cacertfile-direktiven läggas i /etc/nslcd.conf."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr ""
 "xscreensaver och xlockmore måste startas om innan uppgraderingen påbörjas"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 #, fuzzy
 #| msgid ""
 #| "One or more running instances of xscreensaver or xlockmore have been "
@@ -432,13 +436,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr "Ska tjänster startas om vid paketuppgraderinger utan att först fråga?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -457,7 +461,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for PAM library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -465,7 +469,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Running services and programs that are using NSS need to be restarted, "
@@ -488,7 +492,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for PAM upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -496,7 +500,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the PAM library upgrade:"
@@ -507,7 +511,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -517,13 +521,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "Skärmhanterare måste startas om manuellt"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 #, fuzzy
 #| msgid ""
 #| "The wdm and xdm display managers require a restart for the new version of "
@@ -613,6 +617,13 @@
 "automatiskt nu. Se över ändringarna i /etc/nsswitch.conf om du väljer att ta "
 "bort posterna nu."
 
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Om certifikatkontroll är aktiverad måste åtminstone ett avtls_cacertdir- "
+#~ "och tls_cacertfile-direktiven läggas i /etc/nslcd.conf."
+
 #~ msgid "Enable shadow lookups through NSS?"
 #~ msgstr "Aktivera shadow-uppslag genom NSS?"
 

Modified: debian/nss-pam-ldapd/trunk/debian/po/templates.pot
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/templates.pot  Fri Jun 20 20:50:26 
2014        (r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/templates.pot  Fri Jun 20 22:41:20 
2014        (r2095)
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: nss-pam-ldapd 0.9.1-2\n"
+"Project-Id-Version: nss-pam-ldapd\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\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"
@@ -331,23 +331,29 @@
 " * demand: a certificate will be requested, required, and checked."
 msgstr ""
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid ""
 "One or more running instances of xscreensaver or xlockmore have been "
 "detected on this system. Because of incompatible library changes, the "
@@ -359,13 +365,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -378,13 +384,13 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 msgid "Services to restart for nslcd upgrade:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 msgid ""
 "Running services and programs that are using nslcd need to be restarted, "
 "otherwise they might not be able to do lookup or authentication any more "
@@ -395,19 +401,19 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid "Failure restarting some services for nslcd upgrade"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid "The following services could not be restarted:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -415,13 +421,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid ""
 "The wdm and xdm display managers require a restart for the new version of "
 "nslcd, but there are X login sessions active on your system that would be "

Modified: debian/nss-pam-ldapd/trunk/debian/po/tr.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/tr.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/tr.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.8.13-2\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2013-06-12 17:48+0200\n"
 "Last-Translator: Atila KOÇ <akoc@artielektronik.com.tr>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -388,27 +388,30 @@
 "         bir sertifika alınamazsa önemsenmeyecek;\n"
 " * talep et: bir sertifika istenecek, gerekli görülecek ve denetlenecek."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Eğer sertifika denetimi etkinleştirilirse, tls_cacertdir ya da "
-"tls_cacertfile seçeneklerinden en az birinin /etc/nslcd.conf dosyasına "
-"konulması gerekecektir."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr ""
 "Yükseltme işleminden önce xscreensaver ve xlockmore yeniden başlatılmalı"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 #, fuzzy
 #| msgid ""
 #| "One or more running instances of xscreensaver or xlockmore have been "
@@ -433,13 +436,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -452,7 +455,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for PAM library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -461,7 +464,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Most services that use PAM need to be restarted to use modules built for "
@@ -482,7 +485,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for PAM upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -490,7 +493,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the PAM library upgrade:"
@@ -500,7 +503,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -510,13 +513,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "Görüntü yöneticisinin elle yeniden başlatılması gerekli"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 #, fuzzy
 #| msgid ""
 #| "The kdm, wdm, and xdm display managers require a restart for the new "
@@ -608,3 +611,11 @@
 "kendiliğinden çıkarılmasını seçebilirsiniz. Girdilerin kendiliğinden "
 "çıkarılmasını seçerseniz, /etc/nsswitch.conf dosyasında yapılan "
 "değişiklikleri denetlediğinizden emin olunuz."
+
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Eğer sertifika denetimi etkinleştirilirse, tls_cacertdir ya da "
+#~ "tls_cacertfile seçeneklerinden en az birinin /etc/nslcd.conf dosyasına "
+#~ "konulması gerekecektir."

Modified: debian/nss-pam-ldapd/trunk/debian/po/vi.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/vi.po  Fri Jun 20 20:50:26 2014        
(r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/vi.po  Fri Jun 20 22:41:20 2014        
(r2095)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.7.9\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: 2010-09-29 22:21+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: \n"
@@ -377,27 +377,30 @@
 "\t\t\t\tnếu chứng nhận không được cung cấp\n"
 " • đòi hỏi\t\t\tmột chứng nhận được yêu cầu, đòi hỏi và kiểm tra."
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"Nếu tính năng kiểm tra được hiệu lực thì ít nhất một của hai tuỳ chọn « "
-"tls_cacertdir » và « tls_cacertfile » phải được để vào tập tin cấu hình « /"
-"etc/nslcd.conf »."
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr ""
 "Trước khi nâng cấp thì cần phải khởi chạy lại xscreensaver và xlockmore"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 #, fuzzy
 #| msgid ""
 #| "One or more running instances of xscreensaver or xlockmore have been "
@@ -423,13 +426,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -442,7 +445,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for PAM library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -450,7 +453,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Running services and programs that are using NSS need to be restarted, "
@@ -473,7 +476,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for PAM upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -481,7 +484,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the PAM library upgrade:"
@@ -491,7 +494,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -501,13 +504,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "Trình quản lý trình bày phải được khởi chạy bằng tay"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 #, fuzzy
 #| msgid ""
 #| "The kdm, wdm, and xdm display managers require a restart for the new "
@@ -602,6 +605,14 @@
 "động gỡ bỏ các mục nhập ngay bây giờ. Xem lại kỹ các thay đổi trong « /etc/"
 "nsswitch.conf » nếu bạn chọn gỡ bỏ các mục nhập ngay bây giờ."
 
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "Nếu tính năng kiểm tra được hiệu lực thì ít nhất một của hai tuỳ chọn « "
+#~ "tls_cacertdir » và « tls_cacertfile » phải được để vào tập tin cấu hình "
+#~ "« /etc/nslcd.conf »."
+
 #~ msgid "Enable shadow lookups through NSS?"
 #~ msgstr "Bật tra tìm bóng qua NSS ?"
 

Modified: debian/nss-pam-ldapd/trunk/debian/po/zh_CN.po
==============================================================================
--- debian/nss-pam-ldapd/trunk/debian/po/zh_CN.po       Fri Jun 20 20:50:26 
2014        (r2094)
+++ debian/nss-pam-ldapd/trunk/debian/po/zh_CN.po       Fri Jun 20 22:41:20 
2014        (r2095)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.8.4\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2013-10-18 14:41+0200\n"
+"POT-Creation-Date: 2014-06-08 11:45+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: zym <ming_zym@sina.com>\n"
 "Language-Team: \n"
@@ -411,24 +411,29 @@
 " * try: 会请求服务器证书,如服务器提供证书则验证,如无则忽略。\n"
 " * demand: 会请求服务器证书,必须有证书并验证证书。"
 
-#. Type: select
+#. Type: string
 #. Description
-#: ../nslcd.templates:13002
+#: ../nslcd.templates:14001
+msgid "Certificate authority certificate:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:14001
 msgid ""
-"If certificate checking is enabled, at least one of the tls_cacertdir or "
-"tls_cacertfile options must be put in /etc/nslcd.conf."
+"When certificate checking is enabled this file contains the X.509 "
+"certificate that is used to check the certificate provided by the server."
 msgstr ""
-"如果启用证书检查,/etc/nslcd.conf必须有tls_cacertdir或者tls_cacertfile选项。"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 msgid "xscreensaver and xlockmore must be restarted before upgrading"
 msgstr "在升级前必须重新启动 xscreensaver 和 xlockmore"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:14001
+#: ../nslcd.templates:15001
 #, fuzzy
 #| msgid ""
 #| "One or more running instances of xscreensaver or xlockmore have been "
@@ -451,13 +456,13 @@
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid "Restart services during package upgrades without asking?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:15001
+#: ../nslcd.templates:16001
 msgid ""
 "There are services installed on your system which need to be restarted when "
 "certain libraries, such as libpam, libc, and libssl, are upgraded. Since "
@@ -470,7 +475,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid "Services to restart for PAM library upgrade:"
 msgid "Services to restart for nslcd upgrade:"
@@ -478,7 +483,7 @@
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:16001
+#: ../nslcd.templates:17001
 #, fuzzy
 #| msgid ""
 #| "Running services and programs that are using NSS need to be restarted, "
@@ -499,7 +504,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid "Failure restarting some services for PAM upgrade"
 msgid "Failure restarting some services for nslcd upgrade"
@@ -507,7 +512,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The following services could not be restarted for the PAM library upgrade:"
@@ -516,7 +521,7 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:17001
+#: ../nslcd.templates:18001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
@@ -524,13 +529,13 @@
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 msgid "Display manager must be restarted manually"
 msgstr "必须手动重新启动显示管理器"
 
 #. Type: error
 #. Description
-#: ../nslcd.templates:18001
+#: ../nslcd.templates:19001
 #, fuzzy
 #| msgid ""
 #| "The kdm, wdm, and xdm display managers require a restart for the new "
@@ -618,6 +623,13 @@
 "您现在可以手工修改/etc/nsswitch.conf或者勾选来删除LDAP功能。如果您删除了条"
 "目,请确保检查/etc/nsswitch.conf文件。"
 
+#~ msgid ""
+#~ "If certificate checking is enabled, at least one of the tls_cacertdir or "
+#~ "tls_cacertfile options must be put in /etc/nslcd.conf."
+#~ msgstr ""
+#~ "如果启用证书检查,/etc/nslcd.conf必须有tls_cacertdir或者tls_cacertfile选"
+#~ "项。"
+
 #~ msgid "Enable shadow lookups through NSS?"
 #~ msgstr "启用通过NSS查询shadow信息?"
 
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/