merge r951 from trunk

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@952 ef36b2f9-881f-0410-afb5-c4e39611909c

33 files changed, 2091 insertions, 398 deletions

diff --git a/AUTHORS b/AUTHORS
index 41d6b3c..f518874 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,7 +5,7 @@ code are:
 
 Luke Howard <lukeh@padl.com>
 West Consulting <info@west.nl>
-Arthur de Jong <arthur@ch.tudelft.nl>
+Arthur de Jong <arthur@arthurdejong.org>
 Howard Chu <hyc@symas.com>
 
 The following people (in no particular order) have also volunteered their
diff --git a/HACKING b/HACKING
index 52498c7..ca5abb0 100644
--- a/HACKING
+++ b/HACKING
@@ -24,7 +24,7 @@ are considered:
 * when including third-party code, retain copyright information (copyright
   holder and license) and ensure that the license is LGPL compatible
 
-Please contact Arthur de Jong <arthur@ch.tudelft.nl> if you want to
+Please contact Arthur de Jong <arthur@arthurdejong.org> if you want to
 contribute or use the Debian BTS if you're using the Debian package.
 
 
diff --git a/README b/README
index 44214b5..c1c2b29 100644
--- a/README
+++ b/README
@@ -8,7 +8,7 @@
    In 2006 Arthur de Jong of West Consuling forked the library to
    split it into a thin NSS part and a server part. Most of the code
    was rewritten.
-   http://ch.tudelft.nl/~arthur/nss-ldapd/
+   http://arthurdejong.org/nss-ldapd/
 
    Copyright (C) 1997-2006 Luke Howard
    Copyright (C) 2006, 2007 West Consulting
@@ -348,7 +348,7 @@ REPORTING BUGS
 ==============
 
 If you find any bugs or missing features please send email to
-  arthur@ch.tudelft.nl
+  arthur@arthurdejong.org
 If you are using the Debian package you are encouraged to use the BTS.
 Please include as much information as needed (platform, output of configure
 if compilation fails, output of the failure, etc). Patches are more than
diff --git a/configure.ac b/configure.ac
index 36e48b5..a3b820d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ version 2.1 of the License, or (at your option) any later version. See the
 configure.ac file for more details.])
 
 # initialize and set version and bugreport address
-AC_INIT([nss-ldapd],[0.6.10],[arthur@ch.tudelft.nl])
+AC_INIT([nss-ldapd],[0.6.10],[arthur@arthurdejong.org])
 RELEASE_MONTH="Jun 2009"
 AC_SUBST(RELEASE_MONTH)
 AC_CONFIG_SRCDIR([nslcd.h])
diff --git a/debian/control b/debian/control
index 60662f6..d13926c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,9 @@ Maintainer: Arthur de Jong <adejong@debian.org>
 Uploaders: Richard A Nelson (Rick) <cowboy@debian.org>
 Standards-Version: 3.8.1
 Build-Depends: debhelper (>= 7), libkrb5-dev, libldap2-dev, libsasl2-dev, po-debconf (>= 0.5.0), docbook2x, docbook-xml, libpam0g-dev
-Homepage: http://ch.tudelft.nl/~arthur/nss-ldapd
-Vcs-Svn: http://arthurenhella.demon.nl/svn/nss-ldapd/nss-ldapd/
-Vcs-Browser: http://arthurenhella.demon.nl/viewcvs/nss-ldapd/nss-ldapd/
+Homepage: http://arthurdejong.org/nss-ldapd/
+Vcs-Svn: http://arthurdejong.org/svn/nss-ldapd/nss-ldapd/
+Vcs-Browser: http://arthurdejong.org/viewvc/nss-ldapd/nss-ldapd/
 
 Package: nslcd
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index b430b2a..bca11b8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ of PADL Software Pty Ltd. http://www.padl.com/OSS/nss_ldap.html
 
 In 2006 Arthur de Jong of West Consuling forked the library to split it into a
 thin NSS part and a server part. Most of the code was rewritten.
-http://ch.tudelft.nl/~arthur/nss-ldapd/
+http://arthurdejong.org/nss-ldapd/
 
 Arthur de Jong is both the upstream and Debian package maintainer, so there
 are no differences between the Debian package and the upstream version.
diff --git a/debian/libnss-ldapd.config b/debian/libnss-ldapd.config
index 4fc68bb..03d5622 100644
--- a/debian/libnss-ldapd.config
+++ b/debian/libnss-ldapd.config
@@ -11,6 +11,13 @@ db_version 2.0
 # set title
 db_title "Configuring libnss-ldapd"
 
+#
+# This is the fist part of the script. In this part an attempt
+# is made to get or guess the current configuration. This information
+# is used later on to prompt the user and to provide a sensible
+# default.
+#
+
 # parse /etc/nsswitch.conf and see which services have ldap specified
 db_get libnss-ldapd/nsswitch
 if [ -z "$RET" ]
@@ -23,6 +30,12 @@ then
   db_set libnss-ldapd/nsswitch "$configured"
 fi
 
+#
+# This is the second part of the script. In this part the configurable
+# settings will be presented to the user for approval. The postinst
+# will finaly perform the actual modifications.
+#
+
 # ask for which nsswitch options to configure
 db_capb multiselect
 db_input high libnss-ldapd/nsswitch || true
diff --git a/debian/libnss-ldapd.templates b/debian/libnss-ldapd.templates
index 0fbef27..ea9852b 100644
--- a/debian/libnss-ldapd.templates
+++ b/debian/libnss-ldapd.templates
@@ -2,26 +2,26 @@ Template: libnss-ldapd/nsswitch
 Type: multiselect
 Choices: aliases, ethers, group, hosts, netgroup, networks, passwd, protocols, rpc, services, shadow
 _Description: Name services to configure:
- For this package to work, you need to modify your /etc/nsswitch.conf to
- use the ldap datasource.
+ For this package to work, you need to modify your /etc/nsswitch.conf to use
+ the ldap datasource.
  .
- You can select the services that should be enabled or disabled
- for LDAP lookups. The new LDAP lookups will be added as last option.
- Be sure to review these changes.
+ You can select the services that should have LDAP lookups enabled. The
+ new LDAP lookups will be added as the last datasource. Be sure to review
+ these changes.
 
 Template: libnss-ldapd/clean_nsswitch
 Type: boolean
 Default: false
 _Description: Remove LDAP from nsswitch.conf now?
- LDAP is still configured for name lookups for the following services:
+ The following services are still configured to use LDAP for lookups:
    ${services}
  but the libnss-ldapd package is about to be removed.
  .
- You are advised to remove the entries if you don't plan on using LDAP
- for name resolution any more.  Not removing ldap from nsswitch.conf should,
- for most services, not cause problems, but host name resolution could be
- affected in subtle ways.
+ You are advised to remove the entries if you don't plan on using LDAP for
+ name resolution any more. Not removing ldap from nsswitch.conf should, for
+ most services, not cause problems, but host name resolution could be affected
+ in subtle ways.
  .
- You can edit /etc/nsswitch.conf by hand or chose to remove the entries
- automatically now. Be sure to review the changes to /etc/nsswitch.conf if
- you chose to remove the entries now.
+ You can edit /etc/nsswitch.conf by hand or choose to remove the entries
+ automatically now. Be sure to review the changes to /etc/nsswitch.conf if you
+ choose to remove the entries now.
diff --git a/debian/nslcd.config b/debian/nslcd.config
index a1da587..577b7fb 100644
--- a/debian/nslcd.config
+++ b/debian/nslcd.config
@@ -10,7 +10,7 @@ db_version 2.0
 db_capb backup
 
 # set title
-db_title "Configuring libnss-ldapd"
+db_title "Configuring NSLCD"
 
 #
 # This is the fist part of the script. In this part an attempt
@@ -111,6 +111,27 @@ parsecfg()
     bindpw=`sed -n 's/^bindpw[[:space:]]*//ip' "$cfgfile" | tail -n 1`
     db_set libnss-ldapd/ldap-bindpw "$bindpw"
   fi
+  # check ssl option
+  db_get libnss-ldapd/ldap-starttls
+  if [ -z "$RET" ]
+  then
+    if grep -qi '^ssl[[:space:]]*start_*tls' "$cfgfile"
+    then
+      db_set libnss-ldapd/ldap-starttls "true"
+    elif grep -qi '^ssl[[:space:]]' "$cfgfile"
+    then
+      db_set libnss-ldapd/ldap-starttls "false"
+    fi
+  fi
+  # check reqcert option
+  db_get libnss-ldapd/ldap-reqcert
+  if [ -z "$RET" ]
+  then
+    reqcert=`sed -n 's/^tls_\(reqcert\|checkpeer\)[[:space:]]*\([^[:space:]]*\)[[:space:]]*$/\2/ip' "$cfgfile" | tail -n 1`
+    # normalise value
+    reqcert=`echo "$reqcert" | tr 'A-Z' 'a-z' | sed 's/^no$/never/;s/^yes$/demand/'`
+    [ -n "$reqcert" ] && db_set libnss-ldapd/ldap-reqcert "$reqcert"
+  fi
   # we're done
   return 0
 }
@@ -137,6 +158,8 @@ else
   [ -z "$RET" ] && db_set libnss-ldapd/ldap-uris "ldap://127.0.0.1/"
   db_get libnss-ldapd/ldap-base
   [ -z "$RET" ] && db_set libnss-ldapd/ldap-base "dc=example,dc=net/"
+  db_get libnss-ldapd/ldap-starttls
+  [ -z "$RET" ] && db_set libnss-ldapd/ldap-starttls "false"
 fi
 
 #
@@ -177,9 +200,41 @@ do
       db_set libnss-ldapd/ldap-bindpw ""
     fi
     # ask the question, go to the next question or back
-    state="done"
+    state="starttls"
     db_go || state="binddn"
     ;;
+  starttls)
+    # check if ldaps:// URL's are used
+    db_get libnss-ldapd/ldap-uris
+    uris="$RET"
+    if (echo "$uris" | grep -q 'ldaps://')
+    then
+      # ldaps: URI defined, don't ask about StartTLS
+      db_set libnss-ldapd/ldap-starttls "false"
+    else
+      # ask whether to use StartTLS
+      db_input medium libnss-ldapd/ldap-starttls || true
+    fi
+    # ask the question, go to the next question or back
+    state="reqcert"
+    db_go || state="bindpw"
+    ;;
+  reqcert)
+    # check if ldaps:// URL's are used
+    db_get libnss-ldapd/ldap-uris
+    uris="$RET"
+    # check if StartTLS is used
+    db_get libnss-ldapd/ldap-starttls
+    starttls="$RET"
+    if (echo "$uris" | grep -q 'ldaps://') || [ "$starttls" = "true" ]
+    then
+      # ask whether to do certificate validation
+      db_input high libnss-ldapd/ldap-reqcert || true
+    fi
+    # ask the question, go to the next question or back
+    state="done"
+    db_go || state="bindpw"
+    ;;
   esac
 done
 
diff --git a/debian/nslcd.postinst b/debian/nslcd.postinst
index a296420..75777dd 100644
--- a/debian/nslcd.postinst
+++ b/debian/nslcd.postinst
@@ -106,6 +106,10 @@ base dc=example,dc=net
 #binddn cn=annonymous,dc=example,dc=net
 #bindpw secret
 
+# SSL options
+#ssl off
+#tls_reqcert never
+
 # The search scope.
 #scope sub
 
@@ -184,6 +188,26 @@ then
   fi
   # remove password from database
   db_set libnss-ldapd/ldap-bindpw ""
+  # set ssl option
+  db_get libnss-ldapd/ldap-starttls
+  if [ "$RET" = "true" ]
+  then
+    cfg_set ssl "start_tls"
+  elif grep -qi '^ssl[[:space:]]*start_*tls' $CONFFILE
+  then
+    cfg_disable ssl
+  fi
+  # set tls_reqcert option
+  db_get libnss-ldapd/ldap-reqcert
+  if [ -n "$RET" ]
+  then
+    # rename any tls_checkpeer options
+    sed -i 's/^tls_checkpeer/tls_reqcert/i' "$CONFFILE"
+    # set tls_reqcert option
+    cfg_set tls_reqcert "$RET"
+    # clear debconf value so that this option is only set if the question is asked
+    db_set libnss-ldapd/ldap-reqcert ""
+  fi
   # we're done
   db_stop
   # fix permissions of configfile if upgrading from an old version
diff --git a/debian/nslcd.templates b/debian/nslcd.templates
index ab331ca..d861272 100644
--- a/debian/nslcd.templates
+++ b/debian/nslcd.templates
@@ -1,29 +1,28 @@
 Template: libnss-ldapd/ldap-uris
 Type: string
-_Description: LDAP server Uniform Resource Identifier:
- Please enter the URI of the LDAP server used. This is a string in the form
- ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The
- port number is optional.
+_Description: LDAP server URI:
+ Please enter the Uniform Resource Identifier of the LDAP server. The format
+ is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or
+ 'ldapi://' can be used. The port number is optional.
  .
- When using the ldap or ldaps schemes it is usually a good idea to use an IP
- address; this reduces the risk of failure when name services are unavailable.
+ When using an ldap or ldaps scheme it is recommended to use an IP address to
+ avoid failures when domain name services are unavailable.
  .
  Multiple URIs can be be specified by separating them with spaces.
 
 Template: libnss-ldapd/ldap-base
 Type: string
 _Description: LDAP server search base:
- Please enter the distinguished name of the LDAP search base.  Many sites
- use the components of their domain names for this purpose.  For example,
- the domain "example.net" would use "dc=example,dc=net" as the
- distinguished name of the search base.
+ Please enter the distinguished name of the LDAP search base. Many sites use
+ the components of their domain names for this purpose. For example, the
+ domain "example.net" would use "dc=example,dc=net" as the distinguished name
+ of the search base.
 
 Template: libnss-ldapd/ldap-binddn
 Type: string
 _Description: LDAP database user:
- If the LDAP database requires a login for normal lookups, enter
- the name of the account that will be used here. Leave empty
- otherwise.
+ 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.
  .
  This value should be specified as a DN (distinguished name).
 
@@ -31,3 +30,25 @@ Template: libnss-ldapd/ldap-bindpw
 Type: password
 _Description: LDAP user password:
  Enter the password that will be used to log in to the LDAP database.
+
+Template: libnss-ldapd/ldap-starttls
+Type: boolean
+_Description: Use StartTLS?
+ Please choose whether the connection to the LDAP server should use
+ StartTLS to encrypt the connection.
+
+Template: libnss-ldapd/ldap-reqcert
+Type: select
+__Choices: never, allow, try, demand
+_Description: Check server's SSL certificate:
+ When an encrypted connection is used, a server certificate can be requested
+ and checked. Please choose whether lookups should be configured to require
+ a certificate, and whether certificates should be checked for validity:
+  * never: no certificate will be requested or checked;
+  * allow: a certificate will be requested, but it is not
+           required or checked;
+  * 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/nss-ldapd.conf.
diff --git a/debian/po/ca.po b/debian/po/ca.po
index eca2775..340708c 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap 211-4\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-08 00:30+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2004-11-02 20:49+0100\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -18,16 +18,17 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
-msgid "LDAP server Uniform Resource Identifier:"
-msgstr ""
+#, fuzzy
+msgid "LDAP server URI:"
+msgstr "adreça de l'ordinador del servidor d'LDAP"
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
 msgstr ""
 
 #. Type: string
@@ -38,8 +39,8 @@ msgstr ""
 #| "Note: It is usually a good idea to use an IP address; this reduces risks "
 #| "of failure in the event name service is unavailable."
 msgid ""
-"When using the ldap or ldaps schemes it is usually a good idea to use an IP "
-"address; this reduces the risk of failure when name services are unavailable."
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
 msgstr ""
 "Nota: normalment és una bona idea utilitzar una adreça d'IP; redueix el risc "
 "de produir-se errors si el serveis de noms dels esdeveniments no està "
@@ -62,8 +63,8 @@ msgstr "adreça de l'ordinador del servidor d'LDAP"
 #. Description
 #: ../nslcd.templates:2001
 msgid ""
-"Please enter the distinguished name of the LDAP search base.  Many sites use "
-"the components of their domain names for this purpose.  For example, the "
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
 msgstr ""
@@ -84,7 +85,7 @@ msgstr "usuari de la base de dades sense privilegis"
 #: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave empty otherwise."
+"the account that will be used here. Leave it empty otherwise."
 msgstr ""
 
 #. Type: string
@@ -107,6 +108,67 @@ msgstr ""
 "Introduïu la contrasenya que s'utilitzarà per a l'accés autenticat a la base "
 "de dades de l'LDAP."
 
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "Check server's SSL certificate:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
@@ -125,9 +187,9 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:1001
 msgid ""
-"You can select the services that should be enabled or disabled for LDAP "
-"lookups. The new LDAP lookups will be added as last option. Be sure to "
-"review these changes."
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
 msgstr ""
 
 #. Type: boolean
@@ -140,7 +202,7 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"LDAP is still configured for name lookups for the following services:\n"
+"The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
 "but the libnss-ldapd package is about to be removed."
 msgstr ""
@@ -150,7 +212,7 @@ msgstr ""
 #: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
-"name resolution any more.  Not removing ldap from nsswitch.conf should, for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
 "most services, not cause problems, but host name resolution could be "
 "affected in subtle ways."
 msgstr ""
@@ -159,9 +221,9 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"You can edit /etc/nsswitch.conf by hand or chose to remove the entries "
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
-"you chose to remove the entries now."
+"you choose to remove the entries now."
 msgstr ""
 
 #, fuzzy
@@ -178,7 +240,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Please enter which version of the LDAP protocol is to use.  It is usually "
+#~ "Please enter which version of the LDAP protocol is to use. It is usually "
 #~ "a good idea to set this to highest available version number."
 #~ msgstr ""
 #~ "Introduïu la versió del protocol d'LDAP que utilitza el ldapns. "
@@ -188,7 +250,7 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "For this package to work, you need to modify your /etc/nsswitch.conf to "
-#~ "use the ldap datasource.  There is an example file at /usr/share/doc/"
+#~ "use the ldap datasource. There is an example file at /usr/share/doc/"
 #~ "libnss-ldap/examples/nsswitch.ldap which can be used as an example for "
 #~ "your nsswitch setup."
 #~ msgstr ""
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 052ddbd..dcbc2dd 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-08 00:30+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2005-07-10 16:33+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -26,16 +26,17 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
-msgid "LDAP server Uniform Resource Identifier:"
-msgstr ""
+#, fuzzy
+msgid "LDAP server URI:"
+msgstr "Adresa počítače s LDAP serverem"
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
 msgstr ""
 
 #. Type: string
@@ -46,8 +47,8 @@ msgstr ""
 #| "Note: It is usually a good idea to use an IP address; this reduces risks "
 #| "of failure in the event name service is unavailable."
 msgid ""
-"When using the ldap or ldaps schemes it is usually a good idea to use an IP "
-"address; this reduces the risk of failure when name services are unavailable."
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
 msgstr ""
 "Poznámka: vždy je lepší použít IP adresu, protože se tím snižuje riziko "
 "chyby v případě, že je služba překladu jmen nedostupná."
@@ -69,8 +70,8 @@ msgstr "Adresa počítače s LDAP serverem"
 #. Description
 #: ../nslcd.templates:2001
 msgid ""
-"Please enter the distinguished name of the LDAP search base.  Many sites use "
-"the components of their domain names for this purpose.  For example, the "
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
 msgstr ""
@@ -91,7 +92,7 @@ msgstr "Neprivilegovaný databázový uživatel"
 #: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave empty otherwise."
+"the account that will be used here. Leave it empty otherwise."
 msgstr ""
 
 #. Type: string
@@ -112,6 +113,67 @@ msgstr ""
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "Zadejte heslo, které se použije pro přístup k LDAP databázi."
 
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "Check server's SSL certificate:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
@@ -130,9 +192,9 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:1001
 msgid ""
-"You can select the services that should be enabled or disabled for LDAP "
-"lookups. The new LDAP lookups will be added as last option. Be sure to "
-"review these changes."
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
 msgstr ""
 
 #. Type: boolean
@@ -145,7 +207,7 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"LDAP is still configured for name lookups for the following services:\n"
+"The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
 "but the libnss-ldapd package is about to be removed."
 msgstr ""
@@ -155,7 +217,7 @@ msgstr ""
 #: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
-"name resolution any more.  Not removing ldap from nsswitch.conf should, for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
 "most services, not cause problems, but host name resolution could be "
 "affected in subtle ways."
 msgstr ""
@@ -164,9 +226,9 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"You can edit /etc/nsswitch.conf by hand or chose to remove the entries "
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
-"you chose to remove the entries now."
+"you choose to remove the entries now."
 msgstr ""
 
 #, fuzzy
@@ -181,7 +243,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Please enter which version of the LDAP protocol is to use.  It is usually "
+#~ "Please enter which version of the LDAP protocol is to use. It is usually "
 #~ "a good idea to set this to highest available version number."
 #~ msgstr ""
 #~ "Zadejte verzi LDAP protokolu, kterou má ldapns používat. Obvykle se "
@@ -190,7 +252,7 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "For this package to work, you need to modify your /etc/nsswitch.conf to "
-#~ "use the ldap datasource.  There is an example file at /usr/share/doc/"
+#~ "use the ldap datasource. There is an example file at /usr/share/doc/"
 #~ "libnss-ldap/examples/nsswitch.ldap which can be used as an example for "
 #~ "your nsswitch setup."
 #~ msgstr ""
diff --git a/debian/po/da.po b/debian/po/da.po
index 06322e0..1c872a6 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.6\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-08 00:30+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-04-21 23:51+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -19,17 +19,23 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
-msgid "LDAP server Uniform Resource Identifier:"
-msgstr ""
-"LDAP-server ensartet ressourceidentifikator (Uniform Resource Identifier):"
+#, fuzzy
+#| msgid "LDAP server search base:"
+msgid "LDAP server URI:"
+msgstr "LDAP-server søgebase:"
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "Please enter the URI of the LDAP server used. This is a string in the "
+#| "form ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be "
+#| "used. The port number is optional."
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
 msgstr ""
 "Angiv URIen for den anvendte LDAP-server. Dette er en streng af typen ldap://"
 "<værtsnavn eller IP>:<port>/ . ldaps:// eller ldapi:// kan også bruges. "
@@ -38,9 +44,14 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "When using the ldap or ldaps schemes it is usually a good idea to use an "
+#| "IP address; this reduces the risk of failure when name services are "
+#| "unavailable."
 msgid ""
-"When using the ldap or ldaps schemes it is usually a good idea to use an IP "
-"address; this reduces the risk of failure when name services are unavailable."
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
 msgstr ""
 "Når ldap- eller ldaps-formerne bruges er det typisk en god idé at bruge en "
 "IP-adresse; dette reducerer risikoen for fejl når navneservice ikke er "
@@ -62,8 +73,8 @@ msgstr "LDAP-server søgebase:"
 #. Description
 #: ../nslcd.templates:2001
 msgid ""
-"Please enter the distinguished name of the LDAP search base.  Many sites use "
-"the components of their domain names for this purpose.  For example, the "
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
 msgstr ""
@@ -80,9 +91,13 @@ msgstr "LDAP databasebruger:"
 #. Type: string
 #. Description
 #: ../nslcd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "If the LDAP database requires a login for normal lookups, enter the name "
+#| "of the account that will be used here. Leave empty otherwise."
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave empty otherwise."
+"the account that will be used here. Leave it empty otherwise."
 msgstr ""
 "Hvis LDAP-databasen kræver et brugernavn til almindelige opslag, så angiv "
 "her navnet på kontoen som vil blive brugt. Ellers lad det stå tomt."
@@ -106,6 +121,67 @@ msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Angiv adgangskoden som vil blive brugt til at logge på til LDAP-databasen."
 
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "Check server's SSL certificate:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
@@ -125,10 +201,15 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "You can select the services that should be enabled or disabled for LDAP "
+#| "lookups. The new LDAP lookups will be added as last option. Be sure to "
+#| "review these changes."
 msgid ""
-"You can select the services that should be enabled or disabled for LDAP "
-"lookups. The new LDAP lookups will be added as last option. Be sure to "
-"review these changes."
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
 msgstr ""
 "Du kan vælge de services som skal aktiveres eller slås fra for LDAP-opslag. "
 "De nye LDAP-opslag vil blive tilføjet som sidste mulighed. Sørg for at "
@@ -143,8 +224,13 @@ msgstr "Fjern LDAP fra nsswitch.conf nu?"
 #. Type: boolean
 #. Description
 #: ../libnss-ldapd.templates:2001
+#, fuzzy
+#| msgid ""
+#| "LDAP is still configured for name lookups for the following services:\n"
+#| "  ${services}\n"
+#| "but the libnss-ldapd package is about to be removed."
 msgid ""
-"LDAP is still configured for name lookups for the following services:\n"
+"The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
 "but the libnss-ldapd package is about to be removed."
 msgstr ""
@@ -157,7 +243,7 @@ msgstr ""
 #: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
-"name resolution any more.  Not removing ldap from nsswitch.conf should, for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
 "most services, not cause problems, but host name resolution could be "
 "affected in subtle ways."
 msgstr ""
@@ -170,10 +256,14 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"You can edit /etc/nsswitch.conf by hand or chose to remove the entries "
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
-"you chose to remove the entries now."
+"you choose to remove the entries now."
 msgstr ""
 "Du kan redigere /etc/nsswitch.conf i hånden eller vælge at fjerne indlæg "
 "automatisk nu. Sørg for at gennemse ændringer til /etc/nsswitch.conf hvis du "
 "vælger at fjerne indlæggene nu."
+
+#~ msgid "LDAP server Uniform Resource Identifier:"
+#~ msgstr ""
+#~ "LDAP-server ensartet ressourceidentifikator (Uniform Resource Identifier):"
diff --git a/debian/po/de.po b/debian/po/de.po
index 76b91a5..83604fa 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.5\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-08 00:30+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2008-01-27 21:02+0100\n"
 "Last-Translator: Erik Schanze <eriks@debian.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -19,19 +19,28 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
+#  Template: shared/ldapns/ldap-server
+#  ddtp-prioritize: 56
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
-msgid "LDAP server Uniform Resource Identifier:"
-msgstr "URI (Uniform Resource Identifier) des LDAP-Servers:"
+#, fuzzy
+#| msgid "LDAP server search base:"
+msgid "LDAP server URI:"
+msgstr "Suchbasis des LDAP-Servers:"
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "Please enter the URI of the LDAP server used. This is a string in the "
+#| "form ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be "
+#| "used. The port number is optional."
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
 msgstr ""
 "Bitte geben Sie den URI des benutzten LDAP-Servers ein. Das ist eine "
 "Zeichenkette der Form »ldap://<Rechnername oder IP-Adresse>:<Port>/«. "
@@ -42,9 +51,14 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "When using the ldap or ldaps schemes it is usually a good idea to use an "
+#| "IP address; this reduces the risk of failure when name services are "
+#| "unavailable."
 msgid ""
-"When using the ldap or ldaps schemes it is usually a good idea to use an IP "
-"address; this reduces the risk of failure when name services are unavailable."
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
 msgstr ""
 "Wenn Sie »ldap« oder »ldaps« verwenden, sollten Sie eine IP-Adresse eingeben; "
 "das verringert das Ausfallrisiko, falls die Namensauflösung einmal nicht "
@@ -69,8 +83,8 @@ msgstr "Suchbasis des LDAP-Servers:"
 #. Description
 #: ../nslcd.templates:2001
 msgid ""
-"Please enter the distinguished name of the LDAP search base.  Many sites use "
-"the components of their domain names for this purpose.  For example, the "
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
 msgstr ""
@@ -90,9 +104,13 @@ msgstr "LDAP-Datenbank-Benutzer:"
 #. Type: string
 #. Description
 #: ../nslcd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "If the LDAP database requires a login for normal lookups, enter the name "
+#| "of the account that will be used here. Leave empty otherwise."
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave empty otherwise."
+"the account that will be used here. Leave it empty otherwise."
 msgstr ""
 "Wenn die LDAP-Datenbank für normale Anfragen eine Authentifizierung "
 "verlangt, geben Sie hier den Benutzernamen ein, der dafür verwendet werden "
@@ -117,6 +135,67 @@ msgstr "Passwort des LDAP-Benutzers:"
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "Geben Sie das Passwort für die Anmeldung an der LDAP-Datenbank ein."
 
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "Check server's SSL certificate:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
@@ -136,10 +215,15 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "You can select the services that should be enabled or disabled for LDAP "
+#| "lookups. The new LDAP lookups will be added as last option. Be sure to "
+#| "review these changes."
 msgid ""
-"You can select the services that should be enabled or disabled for LDAP "
-"lookups. The new LDAP lookups will be added as last option. Be sure to "
-"review these changes."
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
 msgstr ""
 "Sie können die Dienste auswählen, für die LDAP-Anfragen (nicht) zugelassen "
 "werden. Die neuen LDAP-Anfragen werden als letzte Möglichkeit angefügt. "
@@ -155,7 +239,7 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"LDAP is still configured for name lookups for the following services:\n"
+"The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
 "but the libnss-ldapd package is about to be removed."
 msgstr ""
@@ -165,7 +249,7 @@ msgstr ""
 #: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
-"name resolution any more.  Not removing ldap from nsswitch.conf should, for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
 "most services, not cause problems, but host name resolution could be "
 "affected in subtle ways."
 msgstr ""
@@ -174,11 +258,14 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"You can edit /etc/nsswitch.conf by hand or chose to remove the entries "
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
-"you chose to remove the entries now."
+"you choose to remove the entries now."
 msgstr ""
 
+#~ msgid "LDAP server Uniform Resource Identifier:"
+#~ msgstr "URI (Uniform Resource Identifier) des LDAP-Servers:"
+
 #~ msgid "LDAP account for root:"
 #~ msgstr "LDAP-Zugangname für root:"
 
diff --git a/debian/po/es.po b/debian/po/es.po
index 67a9717..7f15c6f 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -33,7 +33,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.6.8\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-08 00:30+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-04-27 08:31+0100\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -44,16 +44,23 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
-msgid "LDAP server Uniform Resource Identifier:"
-msgstr "Identificador de Recurso Uniforme (URI) del servidor LDAP:"
+#, fuzzy
+#| msgid "LDAP server search base:"
+msgid "LDAP server URI:"
+msgstr "Base de búsqueda en el servidor LDAP:"
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "Please enter the URI of the LDAP server used. This is a string in the "
+#| "form ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be "
+#| "used. The port number is optional."
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
 msgstr ""
 "Introduzca el URI del servidor LDAP. Este es una cadena con la forma «ldap://"
 "<nombre de máquina o IP>:<puerto>/». También se puede utilizar «ldaps://» o "
@@ -63,9 +70,14 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "When using the ldap or ldaps schemes it is usually a good idea to use an "
+#| "IP address; this reduces the risk of failure when name services are "
+#| "unavailable."
 msgid ""
-"When using the ldap or ldaps schemes it is usually a good idea to use an IP "
-"address; this reduces the risk of failure when name services are unavailable."
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
 msgstr ""
 "Cuando utilice los esquemas ldap o ldaps es siempre una buena idea "
 "especificar una dirección IP, ya que reduce el riesgo de fallos en caso de "
@@ -88,8 +100,8 @@ msgstr "Base de búsqueda en el servidor LDAP:"
 #. Description
 #: ../nslcd.templates:2001
 msgid ""
-"Please enter the distinguished name of the LDAP search base.  Many sites use "
-"the components of their domain names for this purpose.  For example, the "
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
 msgstr ""
@@ -107,9 +119,13 @@ msgstr "Usuario de la base de datos LDAP:"
 #. Type: string
 #. Description
 #: ../nslcd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "If the LDAP database requires a login for normal lookups, enter the name "
+#| "of the account that will be used here. Leave empty otherwise."
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave empty otherwise."
+"the account that will be used here. Leave it empty otherwise."
 msgstr ""
 "Introduzca el nombre de la cuenta que utilizará si la base de datos LDAP "
 "requiere un usuario para búsquedas. En caso contrario déjelo en blanco."
@@ -134,6 +150,67 @@ msgstr ""
 "Introduzca la contraseña que se utilizará para acceder a la base de datos "
 "LDAP."
 
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "Check server's SSL certificate:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
@@ -153,10 +230,15 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "You can select the services that should be enabled or disabled for LDAP "
+#| "lookups. The new LDAP lookups will be added as last option. Be sure to "
+#| "review these changes."
 msgid ""
-"You can select the services that should be enabled or disabled for LDAP "
-"lookups. The new LDAP lookups will be added as last option. Be sure to "
-"review these changes."
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
 msgstr ""
 "Puede elegir los servicios que se deben habilitar o deshabilitar para las "
 "búsquedas de LDAP. Las nuevas búsquedas LDAP se añadirán como última opción. "
@@ -171,8 +253,13 @@ msgstr "¿Desea borrar LDAP del archivo «nsswitch.conf» ahora?"
 #. Type: boolean
 #. Description
 #: ../libnss-ldapd.templates:2001
+#, fuzzy
+#| msgid ""
+#| "LDAP is still configured for name lookups for the following services:\n"
+#| "  ${services}\n"
+#| "but the libnss-ldapd package is about to be removed."
 msgid ""
-"LDAP is still configured for name lookups for the following services:\n"
+"The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
 "but the libnss-ldapd package is about to be removed."
 msgstr ""
@@ -186,7 +273,7 @@ msgstr ""
 #: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
-"name resolution any more.  Not removing ldap from nsswitch.conf should, for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
 "most services, not cause problems, but host name resolution could be "
 "affected in subtle ways."
 msgstr ""
@@ -199,14 +286,17 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"You can edit /etc/nsswitch.conf by hand or chose to remove the entries "
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
-"you chose to remove the entries now."
+"you choose to remove the entries now."
 msgstr ""
 "Puede editar manualmente el archivo «/etc/nsswitch.conf» o escoger borrar 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 "LDAP server Uniform Resource Identifier:"
+#~ msgstr "Identificador de Recurso Uniforme (URI) del servidor LDAP:"
+
 #~ msgid "LDAP account for root:"
 #~ msgstr "Cuenta de superusuario LDAP:"
 
@@ -306,7 +396,7 @@ msgstr ""
 #
 #, fuzzy
 #~ msgid ""
-#~ "Please enter which version of the LDAP protocol is to use.  It is usually "
+#~ "Please enter which version of the LDAP protocol is to use. It is usually "
 #~ "a good idea to set this to highest available version number."
 #~ msgstr ""
 #~ "Por favor introduzca la versión del protocolo LDAP que usará ldapns. "
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 742fdcc..718dd71 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -1,17 +1,17 @@
 # Copyright (C) 2009
 # This file is distributed under the same license as the nss-ldapd package.
 #
-# Esko Araj?rvi <edu@iki.fi>, 2009.
+# Esko Arajärvi <edu@iki.fi>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-08 00:30+0200\n"
-"PO-Revision-Date: 2009-05-23 21:15+0300\n"
-"Last-Translator: Esko Araj?rvi <edu@iki.fi>\n"
+"POT-Creation-Date: 2009-06-26 17:06+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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -19,37 +19,37 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
-msgid "LDAP server Uniform Resource Identifier:"
-msgstr "LDAP-palvelimen URI (Uniform Resource Identifier):"
+msgid "LDAP server URI:"
+msgstr "LDAP-palvelimen URI:"
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
 msgstr ""
-"Anna k?ytetyn LDAP-palvelimen URI. T?m? merkkijono on muotoa: ?ldap://"
-"<verkkonimi tai IP>:<portti>/?. ldaps:// tai ldapi:// ovat my?s k?ytett?"
-"viss?. Porttinumero ei ole pakollinen."
+"Anna käytettävän LDAP-palvelimen URI (Uniform Resource Identifier). "
+"Merkkijonon muoto on ”ldap://<verkkonimi tai IP-osoite>:<portti>/”. Myös "
+"skeemoja ”ldaps://” ja ”ldapi://” voidaan käyttää. Porttinumero ei ole "
+"pakollinen."
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
 msgid ""
-"When using the ldap or ldaps schemes it is usually a good idea to use an IP "
-"address; this reduces the risk of failure when name services are unavailable."
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
 msgstr ""
-"K?ytett?ess? ldap- ja ldaps-skeemoja on yleens? suositeltavaa k?ytt?? IP-"
-"osoitetta. T?m? v?hent?? ongelmien riski?, kun nimipalvelimia ei ole k?ytett?"
-"viss?."
+"Käytettäessä ldap- ja ldaps-skeemoja on suositeltavaa käyttää IP-osoitetta, "
+"koska tällöin nimipalvelun toimimattomuus ei aiheuta toimintahäiriötä."
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
 msgid "Multiple URIs can be be specified by separating them with spaces."
-msgstr "Voit sy?tt?? useamman URIn erottamalla ne v?lily?nneill?."
+msgstr "Voit syöttää useamman URIn erottamalla ne välilyönneillä."
 
 #. Type: string
 #. Description
@@ -61,37 +61,37 @@ msgstr "LDAP-palvelimen hakukanta:"
 #. Description
 #: ../nslcd.templates:2001
 msgid ""
-"Please enter the distinguished name of the LDAP search base.  Many sites use "
-"the components of their domain names for this purpose.  For example, the "
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
 msgstr ""
-"Anna LDAP-hakukannan erittelev? nimi (Distinguished Name, DN). Useilla "
-"sivustoilla k?ytet??n verkkonimen osia t?h?n tarkoitukseen. Esimerkiksi "
-"verkkotunnus ?esimerkki.fi? k?ytt?isi nime? ?dc=esimerkki,dc=fi? hakukannan "
-"erittelev?n? nimen?."
+"Anna LDAP-hakukannan erittelevä nimi (Distinguished Name, DN). Useilla "
+"sivustoilla käytetään verkkonimen osia tähän tarkoitukseen. Esimerkiksi "
+"verkkotunnus ”esimerkki.fi” käyttäisi nimeä ”dc=esimerkki,dc=fi” hakukannan "
+"erittelevänä nimenä."
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:3001
 msgid "LDAP database user:"
-msgstr "LDAP-tietokannan k?ytt?j?tunnus:"
+msgstr "LDAP-tietokannan käyttäjätunnus:"
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave empty otherwise."
+"the account that will be used here. Leave it empty otherwise."
 msgstr ""
-"Jos LDAP-tietokannan t?ytyy kirjautua tehd?kseen normaaleja hakuja, anna k?"
-"ytett?v?n tunnuksen nimi t?ss?. J?t? muuten kentt? tyhj?ksi."
+"Jos LDAP-tietokannan täytyy kirjautua tehdäkseen normaaleja hakuja, anna "
+"käytettävän tunnuksen nimi tässä. Jätä muuten kenttä tyhjäksi."
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:3001
 msgid "This value should be specified as a DN (distinguished name)."
-msgstr "T?m? arvo tulisi antaa erittelev?n? nimen?."
+msgstr "Tämä arvo tulisi antaa erittelevänä nimenä."
 
 #. Type: password
 #. Description
@@ -103,7 +103,80 @@ msgstr "LDAP-tunnuksen salasana:"
 #. Description
 #: ../nslcd.templates:4001
 msgid "Enter the password that will be used to log in to the LDAP database."
-msgstr "Anna salasana, jota k?ytet??n kirjauduttaessa LDAP-tietokantaan."
+msgstr "Anna salasana, jota käytetään kirjauduttaessa LDAP-tietokantaan."
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr "Käytetäänkö StartTLS:ää?"
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr ""
+"Valitse tulisiko LDAP-palvelimelle otettava yhteys salata käyttäen StartTLS:"
+"ää."
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr "ei koskaan"
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr "salli"
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr "yritä"
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr "vaadi"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "Check server's SSL certificate:"
+msgstr "Palvelimen SSL-varmenteen tarkistus:"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+"Käytettäessä salattua yhteyttä, palvelimelta voidaan pyytää varmenne "
+"tarkastettavaksi. Valitse tulisiko hakujen pyytää varmennetta ja tulisiko "
+"varmenteiden oikeellisuus tarkastaa:\n"
+" * ei koskaan: Varmennetta ei pyydetä tai tarkasteta\n"
+" * salli:      Varmenne pyydetään, mutta sitä ei vaadita tai tarkasteta\n"
+" * yritä:      Varmenne pyydetään ja tarkastetaan, mutta jos sitä\n"
+"               ei saada, tästä ei välitetä\n"
+" * vaadi:      Varmenne vaaditaan ja tarkastetaan.\n"
+"Jos tarkastus on käytössä, tulisi ainakin toinen asetuksista tls_cacertdir "
+"ja tls_cacertfile laittaa tiedostoon /etc/nss-ldapd.conf."
 
 #. Type: multiselect
 #. Description
@@ -118,20 +191,19 @@ msgid ""
 "For this package to work, you need to modify your /etc/nsswitch.conf to use "
 "the ldap datasource."
 msgstr ""
-"Jotta t?m? paketti toimisi, t?ytyy tiedosto /etc/nsswitch.conf muokata k?ytt?"
-"m??n ldap-tietol?hdett?."
+"Jotta tämä paketti toimisi, täytyy tiedosto /etc/nsswitch.conf muokata "
+"käyttämään ldap-tietolähdettä."
 
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
 msgid ""
-"You can select the services that should be enabled or disabled for LDAP "
-"lookups. The new LDAP lookups will be added as last option. Be sure to "
-"review these changes."
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
 msgstr ""
-"Voit valita palvelut, jotka tulisi ottaa k?ytt??n tai poistaa k?yt?st? k?"
-"ytett?ess? LDAP-hakuja. Uudet LDAP-haut lis?t??n viimeiseksi vaihtoehdoksi. "
-"Muista tarkastaa n?m? muutokset."
+"Voit valita palvelut, jotka tarvitsevat LDAP-hakuja. Uudet LDAP-haut "
+"lisätään viimeiseksi tietolähteeksi. Muista tarkastaa nämä muutokset."
 
 #. Type: boolean
 #. Description
@@ -143,11 +215,11 @@ msgstr "Poistetaan LDAP tiedostosta nsswitch.conf nyt?"
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"LDAP is still configured for name lookups for the following services:\n"
+"The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
 "but the libnss-ldapd package is about to be removed."
 msgstr ""
-"LDAP on viel? asetettu tekem??n nimihakuja seuraaville palveluille:\n"
+"Seuraavat palvelut käyttävät edelleen LDAP:ia hauissaan:\n"
 "  ${services}\n"
 "Pakettia libnss-ldapd ollaan kuitenkin poistamassa."
 
@@ -156,12 +228,12 @@ msgstr ""
 #: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
-"name resolution any more.  Not removing ldap from nsswitch.conf should, for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
 "most services, not cause problems, but host name resolution could be "
 "affected in subtle ways."
 msgstr ""
-"On suositeltavaa poistaa tietueet, jos LDAP:ia ei aiota en?? k?ytt?? nimien "
-"selvitt?miseen. Jos ldap j?tet??n tiedostoon nsswitch.conf, sen ei pit?isi "
+"On suositeltavaa poistaa tietueet, jos LDAP:ia ei aiota enää käyttää nimien "
+"selvittämiseen. Jos ldap jätetään tiedostoon nsswitch.conf, sen ei pitäisi "
 "useimpien palveluiden kohdalla aiheuttaa ongelmia, mutta konenimien selvitys "
 "saattaa muuttua joillain tavoilla."
 
@@ -169,10 +241,10 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"You can edit /etc/nsswitch.conf by hand or chose to remove the entries "
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
-"you chose to remove the entries now."
+"you choose to remove the entries now."
 msgstr ""
-"Voit muokata tiedostoa /etc/nsswitch.conf k?sin tai poistaa tietueet nyt "
+"Voit muokata tiedostoa /etc/nsswitch.conf käsin tai poistaa tietueet nyt "
 "automaattisesti. Muista tarkastaa tiedoston /etc/nsswitch.conf muutokset, "
 "jos poistat tietueet nyt."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 9603b21..4143c26 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.3\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-08 00:30+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-04-23 01:38+0100\n"
 "Last-Translator: Guillaume Delacour <gui@iroqwa.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -22,16 +22,23 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
-msgid "LDAP server Uniform Resource Identifier:"
-msgstr "Adresse du serveur LDAP :"
+#, fuzzy
+#| msgid "LDAP server search base:"
+msgid "LDAP server URI:"
+msgstr "Base de recherche du serveur LDAP :"
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "Please enter the URI of the LDAP server used. This is a string in the "
+#| "form ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be "
+#| "used. The port number is optional."
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
 msgstr ""
 "Veuillez indiquer l'adresse du serveur LDAP à utiliser. Il s'agit d'une "
 "chaîne de la forme « ldap://<nom de machine ou IP>:<port>/ ». Des adresses "
@@ -41,9 +48,14 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "When using the ldap or ldaps schemes it is usually a good idea to use an "
+#| "IP address; this reduces the risk of failure when name services are "
+#| "unavailable."
 msgid ""
-"When using the ldap or ldaps schemes it is usually a good idea to use an IP "
-"address; this reduces the risk of failure when name services are unavailable."
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
 msgstr ""
 "Lorsque le protocole utilisé est « ldap » ou « ldaps », il est recommandé "
 "d'utiliser une adresse IP plutôt qu'un nom d'hôte ; les risques d'échec sont "
@@ -66,8 +78,8 @@ msgstr "Base de recherche du serveur LDAP :"
 #. Description
 #: ../nslcd.templates:2001
 msgid ""
-"Please enter the distinguished name of the LDAP search base.  Many sites use "
-"the components of their domain names for this purpose.  For example, the "
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
 msgstr ""
@@ -85,9 +97,13 @@ msgstr "Utilisateur de la base LDAP :"
 #. Type: string
 #. Description
 #: ../nslcd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "If the LDAP database requires a login for normal lookups, enter the name "
+#| "of the account that will be used here. Leave empty otherwise."
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave empty otherwise."
+"the account that will be used here. Leave it empty otherwise."
 msgstr ""
 "Si le serveur LDAP nécessite un identifiant pour les recherches ordinaires, "
 "veuillez indiquer le compte qui doit être utilisé. N'indiquez rien dans le "
@@ -113,6 +129,67 @@ msgstr ""
 "Veuillez indiquer le mot de passe à utiliser pour s'identifier sur la base "
 "LDAP."
 
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "Check server's SSL certificate:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
@@ -132,10 +209,15 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "You can select the services that should be enabled or disabled for LDAP "
+#| "lookups. The new LDAP lookups will be added as last option. Be sure to "
+#| "review these changes."
 msgid ""
-"You can select the services that should be enabled or disabled for LDAP "
-"lookups. The new LDAP lookups will be added as last option. Be sure to "
-"review these changes."
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
 msgstr ""
 "Vous pouvez aussi choisir les services qui doivent être activés ou "
 "désactivés pour les requêtes LDAP. Les nouvelles requêtes LDAP seront "
@@ -151,8 +233,13 @@ msgstr "Faut-il supprimer LDAP de nsswitch.conf maintenant ?"
 #. Type: boolean
 #. Description
 #: ../libnss-ldapd.templates:2001
+#, fuzzy
+#| msgid ""
+#| "LDAP is still configured for name lookups for the following services:\n"
+#| "  ${services}\n"
+#| "but the libnss-ldapd package is about to be removed."
 msgid ""
-"LDAP is still configured for name lookups for the following services:\n"
+"The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
 "but the libnss-ldapd package is about to be removed."
 msgstr ""
@@ -166,7 +253,7 @@ msgstr ""
 #: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
-"name resolution any more.  Not removing ldap from nsswitch.conf should, for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
 "most services, not cause problems, but host name resolution could be "
 "affected in subtle ways."
 msgstr ""
@@ -179,15 +266,18 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"You can edit /etc/nsswitch.conf by hand or chose to remove the entries "
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
-"you chose to remove the entries now."
+"you choose to remove the entries now."
 msgstr ""
 "Vous pouvez modifier /etc/nsswitch.conf vous-même ou choisir de supprimer "
 "les entrées automatiquement maintenant. Il est important de vérifier les "
 "changements effectués automatiquement dans /etc/nsswitch.conf si vous "
 "choisissez de supprimer les entrées maintenant."
 
+#~ msgid "LDAP server Uniform Resource Identifier:"
+#~ msgstr "Adresse du serveur LDAP :"
+
 #~ msgid "LDAP account for root:"
 #~ msgstr "Identifiant LDAP du superutilisateur :"
 
@@ -229,7 +319,7 @@ msgstr ""
 #~ msgstr "Version du protocole LDAP :"
 
 #~ msgid ""
-#~ "Please enter which version of the LDAP protocol is to use.  It is usually "
+#~ "Please enter which version of the LDAP protocol is to use. It is usually "
 #~ "a good idea to set this to highest available version number."
 #~ msgstr ""
 #~ "Veuillez indiquer la version du protocole LDAP à utiliser. Il est "
@@ -237,7 +327,7 @@ msgstr ""
 
 #~ msgid ""
 #~ "For this package to work, you need to modify your /etc/nsswitch.conf to "
-#~ "use the ldap datasource.  There is an example file at /usr/share/doc/"
+#~ "use the ldap datasource. There is an example file at /usr/share/doc/"
 #~ "libnss-ldap/examples/nsswitch.ldap which can be used as an example for "
 #~ "your nsswitch setup."
 #~ msgstr ""
diff --git a/debian/po/gl.po b/debian/po/gl.po
index da1982a..6ba138d 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.6\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-08 00:30+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-05-06 22:55+0200\n"
 "Last-Translator: marce villarino <mvillarino@users.sourceforge.net>\n"
 "Language-Team: Galician <proxecto@trasno.ent>\n"
@@ -19,16 +19,23 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
-msgid "LDAP server Uniform Resource Identifier:"
-msgstr "URI do servidor LDAP:"
+#, fuzzy
+#| msgid "LDAP server search base:"
+msgid "LDAP server URI:"
+msgstr "Base da procura de servidor LDAP:"
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "Please enter the URI of the LDAP server used. This is a string in the "
+#| "form ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be "
+#| "used. The port number is optional."
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
 msgstr ""
 "Indique o URI do servidor LDAP. Isto é unha cadea coa forma ldap://<máquina "
 "ou IP>:<porto>/. Tamén pode empregar ldaps:// ou ldapi://. O número de porto "
@@ -37,9 +44,14 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "When using the ldap or ldaps schemes it is usually a good idea to use an "
+#| "IP address; this reduces the risk of failure when name services are "
+#| "unavailable."
 msgid ""
-"When using the ldap or ldaps schemes it is usually a good idea to use an IP "
-"address; this reduces the risk of failure when name services are unavailable."
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
 msgstr ""
 "Cando se empregan os esquemas ldap ou ldaps xeralmente é boa idea empregar "
 "un enderezo IP, xa que se reduce o risco de fallo se non hai servizos de "
@@ -61,8 +73,8 @@ msgstr "Base da procura de servidor LDAP:"
 #. Description
 #: ../nslcd.templates:2001
 msgid ""
-"Please enter the distinguished name of the LDAP search base.  Many sites use "
-"the components of their domain names for this purpose.  For example, the "
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
 msgstr ""
@@ -80,9 +92,13 @@ msgstr "Usuario da base de datos LDAP:"
 #. Type: string
 #. Description
 #: ../nslcd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "If the LDAP database requires a login for normal lookups, enter the name "
+#| "of the account that will be used here. Leave empty otherwise."
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave empty otherwise."
+"the account that will be used here. Leave it empty otherwise."
 msgstr ""
 "Se a base de datos do LDAP require de identificación para procuras normais, "
 "indique aquí o nome da conta que se empregará. Caso contrario déixeo en "
@@ -108,6 +124,67 @@ msgstr ""
 "Indique o contrasinal que se ha empregar para acceder á base de datos do "
 "LDAP."
 
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "Check server's SSL certificate:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
@@ -127,10 +204,15 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "You can select the services that should be enabled or disabled for LDAP "
+#| "lookups. The new LDAP lookups will be added as last option. Be sure to "
+#| "review these changes."
 msgid ""
-"You can select the services that should be enabled or disabled for LDAP "
-"lookups. The new LDAP lookups will be added as last option. Be sure to "
-"review these changes."
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
 msgstr ""
 "Pode escoller or servizos que se deben activar ou desactivar nas procuras "
 "LDAP. As novas procuras LDAP engadiranse como última opción. Revise estas "
@@ -145,8 +227,13 @@ msgstr "Desexa eliminar LDAP de nsswitch.conf?"
 #. Type: boolean
 #. Description
 #: ../libnss-ldapd.templates:2001
+#, fuzzy
+#| msgid ""
+#| "LDAP is still configured for name lookups for the following services:\n"
+#| "  ${services}\n"
+#| "but the libnss-ldapd package is about to be removed."
 msgid ""
-"LDAP is still configured for name lookups for the following services:\n"
+"The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
 "but the libnss-ldapd package is about to be removed."
 msgstr ""
@@ -160,7 +247,7 @@ msgstr ""
 #: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
-"name resolution any more.  Not removing ldap from nsswitch.conf should, for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
 "most services, not cause problems, but host name resolution could be "
 "affected in subtle ways."
 msgstr ""
@@ -173,10 +260,13 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"You can edit /etc/nsswitch.conf by hand or chose to remove the entries "
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
-"you chose to remove the entries now."
+"you choose to remove the entries now."
 msgstr ""
 "Pode editar manualmente /etc/nsswitch.conf ou escoller agora eliminar "
 "automaticamente as entradas. Asegúrese de revisar as modificacións a /etc/"
 "nsswitch.conf se escolle agora eliminar as entradas."
+
+#~ msgid "LDAP server Uniform Resource Identifier:"
+#~ msgstr "URI do servidor LDAP:"
diff --git a/debian/po/it.po b/debian/po/it.po
index d6f2253..076cb14 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.6.8\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-08 00:30+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-04-22 07:36+0200\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -19,16 +19,23 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
-msgid "LDAP server Uniform Resource Identifier:"
-msgstr "Uniform Resource Identifier (URI) del server LDAP:"
+#, fuzzy
+#| msgid "LDAP server search base:"
+msgid "LDAP server URI:"
+msgstr "Base di ricerca del server LDAP:"
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "Please enter the URI of the LDAP server used. This is a string in the "
+#| "form ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be "
+#| "used. The port number is optional."
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
 msgstr ""
 "Inserire l'URI del server LDAP utilizzato. Si tratta di una stringa del tipo "
 "«ldap://<nomehost o IP>:<porta>»; è anche possibile usare «ldaps://» oppure "
@@ -37,9 +44,14 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "When using the ldap or ldaps schemes it is usually a good idea to use an "
+#| "IP address; this reduces the risk of failure when name services are "
+#| "unavailable."
 msgid ""
-"When using the ldap or ldaps schemes it is usually a good idea to use an IP "
-"address; this reduces the risk of failure when name services are unavailable."
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
 msgstr ""
 "Quando si usa lo schema ldap o ldaps è una buona idea usare un indirizzo IP, "
 "al fine di ridurre i rischi di errore quando i servizi dei nomi non sono "
@@ -61,8 +73,8 @@ msgstr "Base di ricerca del server LDAP:"
 #. Description
 #: ../nslcd.templates:2001
 msgid ""
-"Please enter the distinguished name of the LDAP search base.  Many sites use "
-"the components of their domain names for this purpose.  For example, the "
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
 msgstr ""
@@ -80,9 +92,13 @@ msgstr "Utente del database LDAP:"
 #. Type: string
 #. Description
 #: ../nslcd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "If the LDAP database requires a login for normal lookups, enter the name "
+#| "of the account that will be used here. Leave empty otherwise."
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave empty otherwise."
+"the account that will be used here. Leave it empty otherwise."
 msgstr ""
 "Se il database LDAP richiede l'accesso per le normali ricerche, inserire il "
 "nome dell'account che verrà utilizzato per l'accesso. In caso contrario, "
@@ -108,6 +124,67 @@ msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Inserire la password che verrà utilizzata per accedere al database LDAP."
 
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "Check server's SSL certificate:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
@@ -127,10 +204,15 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "You can select the services that should be enabled or disabled for LDAP "
+#| "lookups. The new LDAP lookups will be added as last option. Be sure to "
+#| "review these changes."
 msgid ""
-"You can select the services that should be enabled or disabled for LDAP "
-"lookups. The new LDAP lookups will be added as last option. Be sure to "
-"review these changes."
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
 msgstr ""
 "È possibile selezionare i servizi che dovrebbero essere abilitati o "
 "disabilitati per le ricerche LDAP. Le nuove ricerche LDAP verranno aggiunte "
@@ -145,8 +227,13 @@ msgstr "Rimuovere LDAP da nsswitch.con ora?"
 #. Type: boolean
 #. Description
 #: ../libnss-ldapd.templates:2001
+#, fuzzy
+#| msgid ""
+#| "LDAP is still configured for name lookups for the following services:\n"
+#| "  ${services}\n"
+#| "but the libnss-ldapd package is about to be removed."
 msgid ""
-"LDAP is still configured for name lookups for the following services:\n"
+"The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
 "but the libnss-ldapd package is about to be removed."
 msgstr ""
@@ -159,7 +246,7 @@ msgstr ""
 #: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
-"name resolution any more.  Not removing ldap from nsswitch.conf should, for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
 "most services, not cause problems, but host name resolution could be "
 "affected in subtle ways."
 msgstr ""
@@ -172,10 +259,13 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"You can edit /etc/nsswitch.conf by hand or chose to remove the entries "
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
-"you chose to remove the entries now."
+"you choose to remove the entries now."
 msgstr ""
 "È possibile modificare manualmente «/etc/nsswitch.conf» o scegliere di "
 "rimuovere le voci automaticamente adesso. Ci si accerti di controllare le "
 "modifiche a «/etc/nsswitch.conf» se si sceglie la rimozione automatica."
+
+#~ msgid "LDAP server Uniform Resource Identifier:"
+#~ msgstr "Uniform Resource Identifier (URI) del server LDAP:"
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 388462b..7f4f6da 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.6.8\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-08 00:30+0200\n"
-"PO-Revision-Date: 2009-04-22 08:53+0900\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
+"PO-Revision-Date: 2009-06-24 08:18+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,30 +26,30 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
-msgid "LDAP server Uniform Resource Identifier:"
-msgstr "LDAP サーバの Uniform Resource Identifier:"
+msgid "LDAP server URI:"
+msgstr "LDAP サーバの URI:"
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
 msgstr ""
-"利用するLDAP サーバの URI を入力してください。これは ldap://<ホスト名または "
-"IP>:<ポート>/ 形式の文字列です。ldaps:// または ldapi:// も利用できます。ポー"
-"ト番号は省略できます。"
+"LDAP サーバの Uniform Resource Identifier を入力してください。形式は 'ldap://"
+"<ホスト名または IP>:<ポート>/' です。このほかに 'ldaps://' または 'ldapi://' "
+"も利用できます。ポート番号は省略できます。"
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
 msgid ""
-"When using the ldap or ldaps schemes it is usually a good idea to use an IP "
-"address; this reduces the risk of failure when name services are unavailable."
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
 msgstr ""
-"ldap または ldaps スキーマを使うとき、IP アドレスを使うのは、通常、良い考えで"
-"す。これはネームサービスが利用できないときの障害の危険を減らします。"
+"ldap または ldaps スキーマを使う際には、ネームサービスが利用できないときの障"
+"害回避のために IP アドレスを使うことを推奨します。"
 
 #. Type: string
 #. Description
@@ -67,8 +67,8 @@ msgstr "LDAP サーバの検索ベース:"
 #. Description
 #: ../nslcd.templates:2001
 msgid ""
-"Please enter the distinguished name of the LDAP search base.  Many sites use "
-"the components of their domain names for this purpose.  For example, the "
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
 msgstr ""
@@ -87,7 +87,7 @@ msgstr "LDAP データベースユーザ:"
 #: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave empty otherwise."
+"the account that will be used here. Leave it empty otherwise."
 msgstr ""
 "通常のルックアップに LDAP データベースがログインを必要とするのであれば、利用"
 "するアカウント名をここに入力してください。そうでなければ空のままにします。"
@@ -110,6 +110,80 @@ msgstr "LDAP ユーザパスワード:"
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "LDAP データベースにログインするのに使うパスワードを入力してください。"
 
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr "StartTLS を利用しますか?"
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr ""
+"接続の暗号化のために LDAP サーバに StartTLS を使って接続するかどうかを選んで"
+"ください。"
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr "使わない"
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr "許可"
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr "試行"
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr "要求"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "Check server's SSL certificate:"
+msgstr "サーバの SSL 証明書のチェック:"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+"暗号化接続を利用する場合、サーバ証明書を要求して確認できます。ルックアップで"
+"証明書を必須とするよう設定するかどうか、および証明書の妥当性を確認するかどう"
+"かを選んでください。\n"
+" * 使わない: 証明書は要求もチェックもされない\n"
+" * 許可: 証明書を要求するが、必須ではなくチェックも\n"
+"         されない\n"
+" * 試行: 証明書は要求およびチェックされるが、\n"
+"         証明書が提供されなかった場合は単に無視される\n"
+" * 要求: 証明書は要求され、必須であり、チェックされる。\n"
+"証明書のチェックが有効の場合、tls_cacertdir、tls_cacertfile オプションのうち"
+"の少なくとも 1 つは /etc/nss-ldap.conf に掲載されている必要があります。"
+
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
@@ -130,13 +204,13 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:1001
 msgid ""
-"You can select the services that should be enabled or disabled for LDAP "
-"lookups. The new LDAP lookups will be added as last option. Be sure to "
-"review these changes."
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
 msgstr ""
-"LDAP ルックアップを有効または無効にしたいサービスを選択できます。新しい LDAP "
-"ルックアップは最後の選択肢として追加されます。これらの変更を見て確認してくだ"
-"さい。"
+"LDAP ルックアップを有効にしたいサービスを選択できます。新しい LDAP ルックアッ"
+"プは最後のデータソースとして追加されます。これらの変更を見て確認してくださ"
+"い。"
 
 #. Type: boolean
 #. Description
@@ -148,11 +222,11 @@ msgstr "nsswitch.conf から LDAP を今削除しますか?"
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"LDAP is still configured for name lookups for the following services:\n"
+"The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
 "but the libnss-ldapd package is about to be removed."
 msgstr ""
-"LDAP は以下のサービスの名前検索のためにまだ設定されています:\n"
+"以下のサービスはまだルックアップに LDAP を使うよう設定されています:\n"
 "  ${services}\n"
 "しかし、libnss-ldapd パッケージは削除されようとしています。"
 
@@ -161,7 +235,7 @@ msgstr ""
 #: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
-"name resolution any more.  Not removing ldap from nsswitch.conf should, for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
 "most services, not cause problems, but host name resolution could be "
 "affected in subtle ways."
 msgstr ""
@@ -173,9 +247,9 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"You can edit /etc/nsswitch.conf by hand or chose to remove the entries "
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
-"you chose to remove the entries now."
+"you choose to remove the entries now."
 msgstr ""
 "/etc/nsswitch.conf を手動で編集するか、エントリを自動で今削除することを選べま"
 "す。エントリを今削除することを選ぶ場合、/etc/nsswitch.conf の変更内容を確認し"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 09bd735..e428d10 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.3\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-08 00:30+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2008-02-26 17:12+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -27,16 +27,23 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
-msgid "LDAP server Uniform Resource Identifier:"
-msgstr "URI (Uniform Resource Identifier) van de LDAP-server:"
+#, fuzzy
+#| msgid "LDAP server search base:"
+msgid "LDAP server URI:"
+msgstr "LDAP-server zoekbasis:"
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "Please enter the URI of the LDAP server used. This is a string in the "
+#| "form ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be "
+#| "used. The port number is optional."
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
 msgstr ""
 "Wat is de URI van de gebruikte LDAP-server? Dit is een string met de vorm "
 "ldap://<computernaam of IP>:<poortnummer>/ . ldaps:// of ldapi:// kan ook "
@@ -45,9 +52,14 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "When using the ldap or ldaps schemes it is usually a good idea to use an "
+#| "IP address; this reduces the risk of failure when name services are "
+#| "unavailable."
 msgid ""
-"When using the ldap or ldaps schemes it is usually a good idea to use an IP "
-"address; this reduces the risk of failure when name services are unavailable."
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
 msgstr ""
 "Bij gebruik van  'ldap'- of 'ldaps'-schema's is het gewoonlijk een goed idee "
 "om een IP-adres te gebruiken aangezien dit de kans op mislukkingen "
@@ -69,8 +81,8 @@ msgstr "LDAP-server zoekbasis:"
 #. Description
 #: ../nslcd.templates:2001
 msgid ""
-"Please enter the distinguished name of the LDAP search base.  Many sites use "
-"the components of their domain names for this purpose.  For example, the "
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
 msgstr ""
@@ -88,9 +100,13 @@ msgstr "LDAP-databasegebruiker:"
 #. Type: string
 #. Description
 #: ../nslcd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "If the LDAP database requires a login for normal lookups, enter the name "
+#| "of the account that will be used here. Leave empty otherwise."
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave empty otherwise."
+"the account that will be used here. Leave it empty otherwise."
 msgstr ""
 "Als de LDAP-database aanmelden vereist voor normale zoekacties dient u hier "
 "de naam van de te gebruiken account op te geven. As aanmelden niet nodig "
@@ -116,6 +132,67 @@ msgstr ""
 "Voer het wachtwoord in dat gebruikt zal worden om op de LDAP-database aan te "
 "melden."
 
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "Check server's SSL certificate:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
@@ -135,10 +212,15 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "You can select the services that should be enabled or disabled for LDAP "
+#| "lookups. The new LDAP lookups will be added as last option. Be sure to "
+#| "review these changes."
 msgid ""
-"You can select the services that should be enabled or disabled for LDAP "
-"lookups. The new LDAP lookups will be added as last option. Be sure to "
-"review these changes."
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
 msgstr ""
 "Hier kunt u de diensten selecteren die voor LDAP-zoekacties geactiveerd en "
 "gedeactiveerd dienen te worden. De nieuwe LDAP-zoekacties worden toegevoegd "
@@ -154,7 +236,7 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"LDAP is still configured for name lookups for the following services:\n"
+"The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
 "but the libnss-ldapd package is about to be removed."
 msgstr ""
@@ -164,7 +246,7 @@ msgstr ""
 #: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
-"name resolution any more.  Not removing ldap from nsswitch.conf should, for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
 "most services, not cause problems, but host name resolution could be "
 "affected in subtle ways."
 msgstr ""
@@ -173,11 +255,14 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"You can edit /etc/nsswitch.conf by hand or chose to remove the entries "
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
-"you chose to remove the entries now."
+"you choose to remove the entries now."
 msgstr ""
 
+#~ msgid "LDAP server Uniform Resource Identifier:"
+#~ msgstr "URI (Uniform Resource Identifier) van de LDAP-server:"
+
 #~ msgid "LDAP account for root:"
 #~ msgstr "LDAP-account voor root:"
 
diff --git a/debian/po/pt.po b/debian/po/pt.po
index e7b9e12..5788624 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.6.8\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-08 00:30+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-04-24 00:05+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -20,16 +20,23 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
-msgid "LDAP server Uniform Resource Identifier:"
-msgstr "Uniform Resource Identifier (URI) do servidor LDAP:"
+#, fuzzy
+#| msgid "LDAP server search base:"
+msgid "LDAP server URI:"
+msgstr "Base de busca do servidor LDAP:"
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "Please enter the URI of the LDAP server used. This is a string in the "
+#| "form ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be "
+#| "used. The port number is optional."
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
 msgstr ""
 "Por favor insira o URI do servidor LDAP a usar. Esta é uma sequência no "
 "formato ldap://<nome da máquina ou IP>:<porto>/. ldaps:// ou ldapi:// podem "
@@ -38,9 +45,14 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "When using the ldap or ldaps schemes it is usually a good idea to use an "
+#| "IP address; this reduces the risk of failure when name services are "
+#| "unavailable."
 msgid ""
-"When using the ldap or ldaps schemes it is usually a good idea to use an IP "
-"address; this reduces the risk of failure when name services are unavailable."
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
 msgstr ""
 "Geralmente é boa ideia usar um endereço IP quando se usam esquemas ldap ou "
 "ldaps; isto reduz riscos de falhas quando o serviço de nomes não está "
@@ -62,8 +74,8 @@ msgstr "Base de busca do servidor LDAP:"
 #. Description
 #: ../nslcd.templates:2001
 msgid ""
-"Please enter the distinguished name of the LDAP search base.  Many sites use "
-"the components of their domain names for this purpose.  For example, the "
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
 msgstr ""
@@ -81,9 +93,13 @@ msgstr "Utilizador da base de dados LDAP:"
 #. Type: string
 #. Description
 #: ../nslcd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "If the LDAP database requires a login for normal lookups, enter the name "
+#| "of the account that will be used here. Leave empty otherwise."
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave empty otherwise."
+"the account that will be used here. Leave it empty otherwise."
 msgstr ""
 "Se a base de dados LDAP requerer autenticação para buscas normais, indique "
 "aqui o nome da conta que vai ser usada. Em caso contrário, deixe o campo "
@@ -109,6 +125,67 @@ msgstr ""
 "Indique a palavra-passe que vai ser usada para autenticação na base de dados "
 "LDAP."
 
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "Check server's SSL certificate:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
@@ -128,10 +205,15 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "You can select the services that should be enabled or disabled for LDAP "
+#| "lookups. The new LDAP lookups will be added as last option. Be sure to "
+#| "review these changes."
 msgid ""
-"You can select the services that should be enabled or disabled for LDAP "
-"lookups. The new LDAP lookups will be added as last option. Be sure to "
-"review these changes."
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
 msgstr ""
 "Você pode seleccionar os serviços que deverão estar activos ou inactivos "
 "para buscas LDAP. Novas buscas LDAP serão adicionadas como últimas opções."
@@ -146,8 +228,13 @@ msgstr "Remover agora o LDAP do nsswitch.conf?"
 #. Type: boolean
 #. Description
 #: ../libnss-ldapd.templates:2001
+#, fuzzy
+#| msgid ""
+#| "LDAP is still configured for name lookups for the following services:\n"
+#| "  ${services}\n"
+#| "but the libnss-ldapd package is about to be removed."
 msgid ""
-"LDAP is still configured for name lookups for the following services:\n"
+"The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
 "but the libnss-ldapd package is about to be removed."
 msgstr ""
@@ -161,7 +248,7 @@ msgstr ""
 #: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
-"name resolution any more.  Not removing ldap from nsswitch.conf should, for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
 "most services, not cause problems, but host name resolution could be "
 "affected in subtle ways."
 msgstr ""
@@ -174,10 +261,13 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"You can edit /etc/nsswitch.conf by hand or chose to remove the entries "
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
-"you chose to remove the entries now."
+"you choose to remove the entries now."
 msgstr ""
 "Você pode editar manualmente o /etc/nsswitch.conf ou escolher remover as "
 "entradas automaticamente agora. Certifique-se que revê as alterações em /etc/"
 "nsswitch.conf se escolher remover as entradas agora."
+
+#~ msgid "LDAP server Uniform Resource Identifier:"
+#~ msgstr "Uniform Resource Identifier (URI) do servidor LDAP:"
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 86af515..272e2e7 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap_203-1\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-08 00:30+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2003-03-08 11:39+0300\n"
 "Last-Translator: Andr� Lu�s Lopes <andrelop@ig.com.br>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -26,16 +26,17 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
-msgid "LDAP server Uniform Resource Identifier:"
-msgstr ""
+#, fuzzy
+msgid "LDAP server URI:"
+msgstr "Endere�o da m�quina servidora LDAP."
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
 msgstr ""
 
 #. Type: string
@@ -46,8 +47,8 @@ msgstr ""
 #| "Note: It is usually a good idea to use an IP address; this reduces risks "
 #| "of failure in the event name service is unavailable."
 msgid ""
-"When using the ldap or ldaps schemes it is usually a good idea to use an IP "
-"address; this reduces the risk of failure when name services are unavailable."
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
 msgstr ""
 "Nota: � normalmente uma boa id�ia usar um endere�o IP; isto reduz riscos de "
 "falhas no caso do servidor de nomes n�o estar dispon�vel."
@@ -69,8 +70,8 @@ msgstr "Endere�o da m�quina servidora LDAP."
 #. Description
 #: ../nslcd.templates:2001
 msgid ""
-"Please enter the distinguished name of the LDAP search base.  Many sites use "
-"the components of their domain names for this purpose.  For example, the "
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
 msgstr ""
@@ -91,7 +92,7 @@ msgstr "Usu�rio n�o previlegiado da base de dados."
 #: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave empty otherwise."
+"the account that will be used here. Leave it empty otherwise."
 msgstr ""
 
 #. Type: string
@@ -113,6 +114,67 @@ msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Informe a senha que ser� usada para a autentica��o na base de dados LDAP."
 
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "Check server's SSL certificate:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
@@ -131,9 +193,9 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:1001
 msgid ""
-"You can select the services that should be enabled or disabled for LDAP "
-"lookups. The new LDAP lookups will be added as last option. Be sure to "
-"review these changes."
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
 msgstr ""
 
 #. Type: boolean
@@ -146,7 +208,7 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"LDAP is still configured for name lookups for the following services:\n"
+"The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
 "but the libnss-ldapd package is about to be removed."
 msgstr ""
@@ -156,7 +218,7 @@ msgstr ""
 #: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
-"name resolution any more.  Not removing ldap from nsswitch.conf should, for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
 "most services, not cause problems, but host name resolution could be "
 "affected in subtle ways."
 msgstr ""
@@ -165,9 +227,9 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"You can edit /etc/nsswitch.conf by hand or chose to remove the entries "
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
-"you chose to remove the entries now."
+"you choose to remove the entries now."
 msgstr ""
 
 #, fuzzy
@@ -183,7 +245,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Please enter which version of the LDAP protocol is to use.  It is usually "
+#~ "Please enter which version of the LDAP protocol is to use. It is usually "
 #~ "a good idea to set this to highest available version number."
 #~ msgstr ""
 #~ "Por favor informe qual vers�o do protocolo LDAP ldapns deve ser usada. "
@@ -193,7 +255,7 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "For this package to work, you need to modify your /etc/nsswitch.conf to "
-#~ "use the ldap datasource.  There is an example file at /usr/share/doc/"
+#~ "use the ldap datasource. There is an example file at /usr/share/doc/"
 #~ "libnss-ldap/examples/nsswitch.ldap which can be used as an example for "
 #~ "your nsswitch setup."
 #~ msgstr ""
diff --git a/debian/po/ru.po b/debian/po/ru.po
index def74a8..c02daac 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.6.8\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-08 00:30+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-04-22 21:14+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -26,16 +26,23 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
-msgid "LDAP server Uniform Resource Identifier:"
-msgstr "Единообразный идентификатор ресурса сервера LDAP:"
+#, fuzzy
+#| msgid "LDAP server search base:"
+msgid "LDAP server URI:"
+msgstr "База поиска сервера LDAP:"
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "Please enter the URI of the LDAP server used. This is a string in the "
+#| "form ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be "
+#| "used. The port number is optional."
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
 msgstr ""
 "Укажите URI используемого сервера LDAP. Это должна быть строка в виде ldap://"
 "<имя_хоста или IP>:<порт>/ . Можно использовать ldaps:// или ldapi:// . "
@@ -44,9 +51,14 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "When using the ldap or ldaps schemes it is usually a good idea to use an "
+#| "IP address; this reduces the risk of failure when name services are "
+#| "unavailable."
 msgid ""
-"When using the ldap or ldaps schemes it is usually a good idea to use an IP "
-"address; this reduces the risk of failure when name services are unavailable."
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
 msgstr ""
 "При использовании схем ldap или ldaps, обычно, лучше указывать IP-адрес; это "
 "снижает риск появления проблем в случае отказа службы имён."
@@ -68,8 +80,8 @@ msgstr "База поиска сервера LDAP:"
 #. Description
 #: ../nslcd.templates:2001
 msgid ""
-"Please enter the distinguished name of the LDAP search base.  Many sites use "
-"the components of their domain names for this purpose.  For example, the "
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
 msgstr ""
@@ -87,9 +99,13 @@ msgstr "Пользователь базы данных LDAP:"
 #. Type: string
 #. Description
 #: ../nslcd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "If the LDAP database requires a login for normal lookups, enter the name "
+#| "of the account that will be used here. Leave empty otherwise."
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave empty otherwise."
+"the account that will be used here. Leave it empty otherwise."
 msgstr ""
 "Если для обычного поиска по базе данных LDAP требуется регистрация, то "
 "введите здесь имя этой учётной записи. Иначе оставьте поле пустым."
@@ -113,6 +129,67 @@ msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Введите пароль, который будет использован для подключения к базе данных LDAP."
 
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "Check server's SSL certificate:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
@@ -132,10 +209,15 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "You can select the services that should be enabled or disabled for LDAP "
+#| "lookups. The new LDAP lookups will be added as last option. Be sure to "
+#| "review these changes."
 msgid ""
-"You can select the services that should be enabled or disabled for LDAP "
-"lookups. The new LDAP lookups will be added as last option. Be sure to "
-"review these changes."
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
 msgstr ""
 "Вы можете выбрать службы, для которых нужно включить или выключить поиск в "
 "LDAP. Поиск по LDAP будет добавлен в конец списка опрашиваемых служб. Позже "
@@ -150,8 +232,13 @@ msgstr "Удалить LDAP из nsswitch.conf прямо сейчас?"
 #. Type: boolean
 #. Description
 #: ../libnss-ldapd.templates:2001
+#, fuzzy
+#| msgid ""
+#| "LDAP is still configured for name lookups for the following services:\n"
+#| "  ${services}\n"
+#| "but the libnss-ldapd package is about to be removed."
 msgid ""
-"LDAP is still configured for name lookups for the following services:\n"
+"The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
 "but the libnss-ldapd package is about to be removed."
 msgstr ""
@@ -164,7 +251,7 @@ msgstr ""
 #: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
-"name resolution any more.  Not removing ldap from nsswitch.conf should, for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
 "most services, not cause problems, but host name resolution could be "
 "affected in subtle ways."
 msgstr ""
@@ -177,10 +264,13 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"You can edit /etc/nsswitch.conf by hand or chose to remove the entries "
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
-"you chose to remove the entries now."
+"you choose to remove the entries now."
 msgstr ""
 "Вы можете отредактировать файл /etc/nsswitch.conf вручную или выбрать "
 "автоматическое удаление записей прямо сейчас. После этого проверьте "
 "изменённый /etc/nsswitch.conf."
+
+#~ msgid "LDAP server Uniform Resource Identifier:"
+#~ msgstr "Единообразный идентификатор ресурса сервера LDAP:"
diff --git a/debian/po/sv.po b/debian/po/sv.po
index a2360b9..721ab33 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nss-ldapd_sv\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-08 00:30+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2009-05-03 12:55+0200\n"
 "Last-Translator: Martin �gren <martin.agren@gmail.com>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -32,16 +32,23 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
-msgid "LDAP server Uniform Resource Identifier:"
-msgstr "Generell resursidentifierare, URI, f�r LDAP-servern:"
+#, fuzzy
+#| msgid "LDAP server search base:"
+msgid "LDAP server URI:"
+msgstr "S�kbas f�r LDAP-server:"
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "Please enter the URI of the LDAP server used. This is a string in the "
+#| "form ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be "
+#| "used. The port number is optional."
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
 msgstr ""
 "Ange URI:n till den LDAP-server som anv�nds. Detta �r en str�ng p� formen "
 "ldap://<v�rdnamn eller IP>:<port>/ . ldaps:// eller ldapi:// kan ocks� "
@@ -50,9 +57,14 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "When using the ldap or ldaps schemes it is usually a good idea to use an "
+#| "IP address; this reduces the risk of failure when name services are "
+#| "unavailable."
 msgid ""
-"When using the ldap or ldaps schemes it is usually a good idea to use an IP "
-"address; this reduces the risk of failure when name services are unavailable."
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
 msgstr ""
 "N�r ldap och ldaps anv�nds �r det vanligtvis en bra id� att anv�nda en IP-"
 "adress; detta reducerar risken f�r fel om namntj�nsten �r otillg�nglig."
@@ -73,8 +85,8 @@ msgstr "S�kbas f�r LDAP-server:"
 #. Description
 #: ../nslcd.templates:2001
 msgid ""
-"Please enter the distinguished name of the LDAP search base.  Many sites use "
-"the components of their domain names for this purpose.  For example, the "
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
 msgstr ""
@@ -91,9 +103,13 @@ msgstr "LDAP-databasanv�ndare:"
 #. Type: string
 #. Description
 #: ../nslcd.templates:3001
+#, fuzzy
+#| msgid ""
+#| "If the LDAP database requires a login for normal lookups, enter the name "
+#| "of the account that will be used here. Leave empty otherwise."
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave empty otherwise."
+"the account that will be used here. Leave it empty otherwise."
 msgstr ""
 "Om LDAP-databasen kr�ver inloggning f�r vanliga uppslag, ange namnet p� det "
 "konto som ska anv�ndas. L�mna annars tomt."
@@ -116,6 +132,67 @@ msgstr "LDAP-anv�ndarl�senord:"
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "Ange l�senordet som ska anv�ndas f�r att logga in p� LDAP-databasen."
 
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "Check server's SSL certificate:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
@@ -135,10 +212,15 @@ msgstr ""
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
+#, fuzzy
+#| msgid ""
+#| "You can select the services that should be enabled or disabled for LDAP "
+#| "lookups. The new LDAP lookups will be added as last option. Be sure to "
+#| "review these changes."
 msgid ""
-"You can select the services that should be enabled or disabled for LDAP "
-"lookups. The new LDAP lookups will be added as last option. Be sure to "
-"review these changes."
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
 msgstr ""
 "Du kan v�lja de tj�nster som ska vara aktiverade eller avaktiverade vid LDAP-"
 "uppslag. De nya LDAP-uppslagen kommer att l�ggas till som ett sista val. Se "
@@ -153,8 +235,13 @@ msgstr "Ta bort LDAP fr�n nsswitch.conf nu?"
 #. Type: boolean
 #. Description
 #: ../libnss-ldapd.templates:2001
+#, fuzzy
+#| msgid ""
+#| "LDAP is still configured for name lookups for the following services:\n"
+#| "  ${services}\n"
+#| "but the libnss-ldapd package is about to be removed."
 msgid ""
-"LDAP is still configured for name lookups for the following services:\n"
+"The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
 "but the libnss-ldapd package is about to be removed."
 msgstr ""
@@ -167,7 +254,7 @@ msgstr ""
 #: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
-"name resolution any more.  Not removing ldap from nsswitch.conf should, for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
 "most services, not cause problems, but host name resolution could be "
 "affected in subtle ways."
 msgstr ""
@@ -179,10 +266,13 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"You can edit /etc/nsswitch.conf by hand or chose to remove the entries "
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
-"you chose to remove the entries now."
+"you choose to remove the entries now."
 msgstr ""
 "Du kan �ndra /etc/nsswitch.conf f�r hand eller v�lja att ta bort posterna "
 "automatiskt nu. Se �ver �ndringarna i /etc/nsswitch.conf om du v�ljer att ta "
 "bort posterna nu."
+
+#~ msgid "LDAP server Uniform Resource Identifier:"
+#~ msgstr "Generell resursidentifierare, URI, f�r LDAP-servern:"
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 25615b8..3577136 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: nss-ldapd 0.6\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-08 00:30+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+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"
@@ -19,24 +19,24 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
-msgid "LDAP server Uniform Resource Identifier:"
+msgid "LDAP server URI:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
 msgid ""
-"When using the ldap or ldaps schemes it is usually a good idea to use an IP "
-"address; this reduces the risk of failure when name services are unavailable."
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
 msgstr ""
 
 #. Type: string
@@ -55,8 +55,8 @@ msgstr ""
 #. Description
 #: ../nslcd.templates:2001
 msgid ""
-"Please enter the distinguished name of the LDAP search base.  Many sites use "
-"the components of their domain names for this purpose.  For example, the "
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
 msgstr ""
@@ -72,7 +72,7 @@ msgstr ""
 #: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave empty otherwise."
+"the account that will be used here. Leave it empty otherwise."
 msgstr ""
 
 #. Type: string
@@ -93,6 +93,67 @@ msgstr ""
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "Check server's SSL certificate:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
@@ -111,9 +172,9 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:1001
 msgid ""
-"You can select the services that should be enabled or disabled for LDAP "
-"lookups. The new LDAP lookups will be added as last option. Be sure to "
-"review these changes."
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
 msgstr ""
 
 #. Type: boolean
@@ -126,7 +187,7 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"LDAP is still configured for name lookups for the following services:\n"
+"The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
 "but the libnss-ldapd package is about to be removed."
 msgstr ""
@@ -136,7 +197,7 @@ msgstr ""
 #: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
-"name resolution any more.  Not removing ldap from nsswitch.conf should, for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
 "most services, not cause problems, but host name resolution could be "
 "affected in subtle ways."
 msgstr ""
@@ -145,7 +206,7 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"You can edit /etc/nsswitch.conf by hand or chose to remove the entries "
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
-"you chose to remove the entries now."
+"you choose to remove the entries now."
 msgstr ""
diff --git a/debian/po/vi.po b/debian/po/vi.po
index dbda075..a186193 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libnss-ldap 238-1\n"
 "Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2009-05-08 00:30+0200\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
 "PO-Revision-Date: 2005-06-08 15:25+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -18,16 +18,17 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
-msgid "LDAP server Uniform Resource Identifier:"
-msgstr ""
+#, fuzzy
+msgid "LDAP server URI:"
+msgstr "Địa chỉ máy phục vụ LDAP"
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:1001
 msgid ""
-"Please enter the URI of the LDAP server used. This is a string in the form "
-"ldap://<hostname or IP>:<port>/ . ldaps:// or ldapi:// can also be used. The "
-"port number is optional."
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
 msgstr ""
 
 #. Type: string
@@ -38,8 +39,8 @@ msgstr ""
 #| "Note: It is usually a good idea to use an IP address; this reduces risks "
 #| "of failure in the event name service is unavailable."
 msgid ""
-"When using the ldap or ldaps schemes it is usually a good idea to use an IP "
-"address; this reduces the risk of failure when name services are unavailable."
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
 msgstr ""
 "Ghi chú: thường là ý kiến tốt để sử dụng một địa chỉ dạng IP vì sẽ gặp ít "
 "lỗi hơn nếu dịch vụ tên miền không sẵn sàng."
@@ -61,8 +62,8 @@ msgstr "Địa chỉ máy phục vụ LDAP"
 #. Description
 #: ../nslcd.templates:2001
 msgid ""
-"Please enter the distinguished name of the LDAP search base.  Many sites use "
-"the components of their domain names for this purpose.  For example, the "
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
 "domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
 "name of the search base."
 msgstr ""
@@ -82,7 +83,7 @@ msgstr "người dùng cơ sở dữ liệu không có quyền truy cập đặc
 #: ../nslcd.templates:3001
 msgid ""
 "If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave empty otherwise."
+"the account that will be used here. Leave it empty otherwise."
 msgstr ""
 
 #. Type: string
@@ -103,6 +104,67 @@ msgstr ""
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "Hãy nhập mật khẩu sẽ được dùng để đăng nhập vào cơ sở dữ liệu LDAP."
 
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "Check server's SSL certificate:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../libnss-ldapd.templates:1001
@@ -121,9 +183,9 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:1001
 msgid ""
-"You can select the services that should be enabled or disabled for LDAP "
-"lookups. The new LDAP lookups will be added as last option. Be sure to "
-"review these changes."
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
 msgstr ""
 
 #. Type: boolean
@@ -136,7 +198,7 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"LDAP is still configured for name lookups for the following services:\n"
+"The following services are still configured to use LDAP for lookups:\n"
 "  ${services}\n"
 "but the libnss-ldapd package is about to be removed."
 msgstr ""
@@ -146,7 +208,7 @@ msgstr ""
 #: ../libnss-ldapd.templates:2001
 msgid ""
 "You are advised to remove the entries if you don't plan on using LDAP for "
-"name resolution any more.  Not removing ldap from nsswitch.conf should, for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
 "most services, not cause problems, but host name resolution could be "
 "affected in subtle ways."
 msgstr ""
@@ -155,9 +217,9 @@ msgstr ""
 #. Description
 #: ../libnss-ldapd.templates:2001
 msgid ""
-"You can edit /etc/nsswitch.conf by hand or chose to remove the entries "
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 "automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
-"you chose to remove the entries now."
+"you choose to remove the entries now."
 msgstr ""
 
 #, fuzzy
@@ -172,7 +234,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "Please enter which version of the LDAP protocol is to use.  It is usually "
+#~ "Please enter which version of the LDAP protocol is to use. It is usually "
 #~ "a good idea to set this to highest available version number."
 #~ msgstr ""
 #~ "Hãy nhập phiên bản giao thức LDAP nào mà ldapns nên dùng. Thường là ý "
@@ -181,7 +243,7 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "For this package to work, you need to modify your /etc/nsswitch.conf to "
-#~ "use the ldap datasource.  There is an example file at /usr/share/doc/"
+#~ "use the ldap datasource. There is an example file at /usr/share/doc/"
 #~ "libnss-ldap/examples/nsswitch.ldap which can be used as an example for "
 #~ "your nsswitch setup."
 #~ msgstr ""
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
new file mode 100644
index 0000000..0d23096
--- /dev/null
+++ b/debian/po/zh_CN.po
@@ -0,0 +1,232 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: nss-ldapd@packages.debian.org\n"
+"POT-Creation-Date: 2009-06-26 17:06+0200\n"
+"PO-Revision-Date: \n"
+"Last-Translator: zym <zym@3721.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-Country: CHINA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:1001
+msgid "LDAP server URI:"
+msgstr "LDAP 服务器URI地址："
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:1001
+msgid ""
+"Please enter the Uniform Resource Identifier of the LDAP server. The format "
+"is 'ldap://<hostname_or_IP_address>:<port>/'. Alternatively, 'ldaps://' or "
+"'ldapi://' can be used. The port number is optional."
+msgstr ""
+"请输入LDAP服务器的统一资源标识符（URI），格式为 'ldap://<服务器名或IP地址>:<"
+"端口>/ '，也可以用'ldaps://'或'ldapi://'，端口号可选。"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:1001
+msgid ""
+"When using an ldap or ldaps scheme it is recommended to use an IP address to "
+"avoid failures when domain name services are unavailable."
+msgstr "使用ldap或ldaps模式时，推荐使用IP地址以防止域名无法解析造成失效。"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:1001
+msgid "Multiple URIs can be be specified by separating them with spaces."
+msgstr "可以加入多个URI地址，用空格分开。"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:2001
+msgid "LDAP server search base:"
+msgstr "LDAP服务器搜索起点："
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:2001
+msgid ""
+"Please enter the distinguished name of the LDAP search base. Many sites use "
+"the components of their domain names for this purpose. For example, the "
+"domain \"example.net\" would use \"dc=example,dc=net\" as the distinguished "
+"name of the search base."
+msgstr ""
+"请输入LDAP搜索起点DN。多数网站使用域名作，如域名\"example.net\"会使用"
+"\"dc=example,dc=net\"作为搜索的起点DN。"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:3001
+msgid "LDAP database user:"
+msgstr "LDAP数据库用户名："
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:3001
+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 "如LDAP数据库在查询时需要登录，请输入登录帐号，否则请空着。"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:3001
+msgid "This value should be specified as a DN (distinguished name)."
+msgstr "这个值应该设置为一个DN (distinguished name)。"
+
+#. Type: password
+#. Description
+#: ../nslcd.templates:4001
+msgid "LDAP user password:"
+msgstr "LDAP用户密码："
+
+#. Type: password
+#. Description
+#: ../nslcd.templates:4001
+msgid "Enter the password that will be used to log in to the LDAP database."
+msgstr "输入登录LDAP数据库的的密码："
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid "Use StartTLS?"
+msgstr "使用 StartTLS?"
+
+#. Type: boolean
+#. Description
+#: ../nslcd.templates:5001
+msgid ""
+"Please choose whether the connection to the LDAP server should use StartTLS "
+"to encrypt the connection."
+msgstr "请选择是否使用StartTLS来加密到LDAP服务器的连接。"
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "never"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "allow"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "try"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:6001
+msgid "demand"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+#, fuzzy
+#| msgid "Check server SSL certificate?"
+msgid "Check server's SSL certificate:"
+msgstr "需要检查服务器的SSL证书吗？"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid ""
+"When an encrypted connection is used, a server certificate can be requested "
+"and checked. Please choose whether lookups should be configured to require a "
+"certificate, and whether certificates should be checked for validity:\n"
+" * never: no certificate will be requested or checked;\n"
+" * allow: a certificate will be requested, but it is not\n"
+"          required or checked;\n"
+" * try: a certificate will be requested and checked, but if no\n"
+"        certificate is provided it is ignored;\n"
+" * demand: a certificate will be requested, required, and checked.\n"
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nss-ldapd.conf."
+msgstr ""
+"使用加密连接的时候，可以要求检查服务器端的证书。请选择设置是否需要服务器证"
+"书，是否需要验证证书的有效性:\n"
+"* never:不检查证书\n"
+"* allow: 会请求服务器证书，但是不检查证书是否存在和有效。* try: 会请求服务器"
+"证书，如服务器提供证书则验证，如无则忽略。 * demand:会请求服务器证书，必须有"
+"证书并验证证书。\n"
+"如果启用证书检查，/etc/nss-ldapd.conf必须有tls_cacertdir或者tls_cacertfile选"
+"项。"
+
+#. Type: multiselect
+#. Description
+#: ../libnss-ldapd.templates:1001
+msgid "Name services to configure:"
+msgstr "配置名称服务："
+
+#. Type: multiselect
+#. Description
+#: ../libnss-ldapd.templates:1001
+msgid ""
+"For this package to work, you need to modify your /etc/nsswitch.conf to use "
+"the ldap datasource."
+msgstr "启用需要修改 /etc/nsswitch.conf 来使用ldap数据源。"
+
+#. Type: multiselect
+#. Description
+#: ../libnss-ldapd.templates:1001
+msgid ""
+"You can select the services that should have LDAP lookups enabled. The new "
+"LDAP lookups will be added as the last datasource. Be sure to review these "
+"changes."
+msgstr ""
+"请选择您需要启用或者停用LDAP名称服务。新的LDAP源将会追加在其他源后面。请务必"
+"检查验证。"
+
+#. Type: boolean
+#. Description
+#: ../libnss-ldapd.templates:2001
+msgid "Remove LDAP from nsswitch.conf now?"
+msgstr "从nsswitch.conf中停用LDAP模式？"
+
+#. Type: boolean
+#. Description
+#: ../libnss-ldapd.templates:2001
+msgid ""
+"The following services are still configured to use LDAP for lookups:\n"
+"  ${services}\n"
+"but the libnss-ldapd package is about to be removed."
+msgstr ""
+"下列服务仍然设置为使用LDAP模式：\n"
+"  ${services}\n"
+"但libnss-ldapd会被删除。"
+
+#. Type: boolean
+#. Description
+#: ../libnss-ldapd.templates:2001
+msgid ""
+"You are advised to remove the entries if you don't plan on using LDAP for "
+"name resolution any more. Not removing ldap from nsswitch.conf should, for "
+"most services, not cause problems, but host name resolution could be "
+"affected in subtle ways."
+msgstr ""
+"如您不想再使用LDAP进行名称解析，推荐您删除LDAP相关条目。如不从nsswitch.conf删"
+"除ldap多数服务不会有问题，但是会对名称解析产生一些细微的影响。"
+
+#. Type: boolean
+#. Description
+#: ../libnss-ldapd.templates:2001
+msgid ""
+"You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
+"automatically now. Be sure to review the changes to /etc/nsswitch.conf if "
+"you choose to remove the entries now."
+msgstr ""
+"您现在可以手工修改/etc/nsswitch.conf或者勾选来删除LDAP功能。如果您删除了条"
+"目，请确保检查/etc/nsswitch.conf文件。"
diff --git a/man/nslcd.8.xml b/man/nslcd.8.xml
index f3076d8..0129be8 100644
--- a/man/nslcd.8.xml
+++ b/man/nslcd.8.xml
@@ -128,7 +128,7 @@
 
  <refsect1 id="author">
   <title>Author</title>
-  <para>This manual was written by Arthur de Jong &lt;arthur@ch.tudelft.nl&gt;.</para>
+  <para>This manual was written by Arthur de Jong &lt;arthur@arthurdejong.org&gt;.</para>
  </refsect1>
 
 </refentry>
diff --git a/man/nss-ldapd.conf.5.xml b/man/nss-ldapd.conf.5.xml
index 6c1360c..e3f505b 100644
--- a/man/nss-ldapd.conf.5.xml
+++ b/man/nss-ldapd.conf.5.xml
@@ -710,7 +710,7 @@
 
  <refsect1 id="author">
   <title>Author</title>
-  <para>This manual was written by Arthur de Jong &lt;arthur@ch.tudelft.nl&gt;
+  <para>This manual was written by Arthur de Jong &lt;arthur@arthurdejong.org&gt;
         and is based on the
         <citerefentry><refentrytitle>nss_ldap</refentrytitle><manvolnum>5</manvolnum></citerefentry>
         manual developed by PADL Software Pty Ltd.</para>
diff --git a/nslcd/cfg.c b/nslcd/cfg.c
index d7fde81..9051e68 100644
--- a/nslcd/cfg.c
+++ b/nslcd/cfg.c
@@ -849,7 +849,8 @@ static void cfg_read(const char *filename,struct ldap_config *cfg)
     {
       check_argumentcount(filename,lnr,keyword,
           (get_token(&line,token,sizeof(token))!=NULL));
-      if (strcasecmp(token,"start_tls")==0)
+      if ( (strcasecmp(token,"start_tls")==0) ||
+           (strcasecmp(token,"starttls")==0) )
         cfg->ldc_ssl_on=SSL_START_TLS;
       else if (parse_boolean(filename,lnr,token))
         cfg->ldc_ssl_on=SSL_LDAPS;
diff --git a/nslcd/nslcd.c b/nslcd/nslcd.c
index 8c64c9c..d95c09f 100644
--- a/nslcd/nslcd.c
+++ b/nslcd/nslcd.c
@@ -474,7 +474,7 @@ static void create_pidfile(const char *filename)
   {
     if ((fp=fopen(filename,"w"))==NULL)
     {
-      log_log(LOG_ERR,"cannot open pid file (%s): %s",filename,strerror(errno));
+      log_log(LOG_ERR,"cannot create pid file (%s): %s",filename,strerror(errno));
       exit(EXIT_FAILURE);
     }
     if (fprintf(fp,"%d\n",(int)getpid())<=0)