lists.arthurdejong.org
RSS feed

nss-pam-ldapd commit: r1494 - nss-pam-ldapd/debian/po

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

nss-pam-ldapd commit: r1494 - nss-pam-ldapd/debian/po



Author: arthur
Date: Tue Aug  9 11:09:03 2011
New Revision: 1494
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1494

Log:
run debconf-updatepo to update .pot and .po files

Modified:
   nss-pam-ldapd/debian/po/ca.po
   nss-pam-ldapd/debian/po/cs.po
   nss-pam-ldapd/debian/po/da.po
   nss-pam-ldapd/debian/po/de.po
   nss-pam-ldapd/debian/po/es.po
   nss-pam-ldapd/debian/po/fi.po
   nss-pam-ldapd/debian/po/fr.po
   nss-pam-ldapd/debian/po/gl.po
   nss-pam-ldapd/debian/po/it.po
   nss-pam-ldapd/debian/po/ja.po
   nss-pam-ldapd/debian/po/nb.po
   nss-pam-ldapd/debian/po/nl.po
   nss-pam-ldapd/debian/po/pt.po
   nss-pam-ldapd/debian/po/pt_BR.po
   nss-pam-ldapd/debian/po/ru.po
   nss-pam-ldapd/debian/po/sv.po
   nss-pam-ldapd/debian/po/templates.pot
   nss-pam-ldapd/debian/po/vi.po
   nss-pam-ldapd/debian/po/zh_CN.po

Modified: nss-pam-ldapd/debian/po/ca.po
==============================================================================
--- nss-pam-ldapd/debian/po/ca.po       Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/ca.po       Tue Aug  9 11:09:03 2011        (r1494)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.7.9\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+0200\n"
 "PO-Revision-Date: 2010-08-24 09:14+0100\n"
 "Last-Translator: Agustí Grau <fletxa@gmail.com>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -29,8 +29,8 @@
 #: ../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."
+"is \"ldap://<hostname_or_IP_address>:<port>/\". Alternatively, \"ldaps://\" "
+"or \"ldapi://\" can be used. The port number is optional."
 msgstr ""
 "Introduiu la URI del servidor LDAP. El format és 'ldap://"
 "<nom_servidor_o_adreça_IP>:<port>/'. També es pot utilitzar 'ldaps://' or "
@@ -101,13 +101,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -145,67 +149,29 @@
 "de dades de l'LDAP."
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
 msgstr ""
+"Introduïu la contrasenya que s'utilitzarà per a l'accés autenticat a la base "
+"de dades de l'LDAP."
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -234,16 +200,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -270,13 +235,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
@@ -285,7 +250,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr ""
 "Introduïu la contrasenya que s'utilitzarà per a l'accés autenticat a la base "
@@ -297,8 +262,8 @@
 #, fuzzy
 #| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr ""
 "Aquest valor hauria de ésser especificat com a DN (distinguished name)."
 
@@ -312,7 +277,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -380,26 +345,38 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+"Quan s'utilitza una connexió xifrada, es demana el certificat del servidor i "
+"es comprova. Seleccioneu si les consultes han de ésser configurades per a "
+"requerir un certificat i quins certificates tenen que ésser comprovats per "
+"validar-los:"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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/nslcd.conf."
+" * demand: a certificate will be requested, required, and checked."
 msgstr ""
-"Quan s'utilitza una connexió xifrada, es demana el certificat del servidor i "
-"es comprova. Seleccioneu si les consultes han de ésser configurades per a "
-"requerir un certificat i quins certificates tenen que ésser comprovats per "
-"validar-los:\n"
 " * mai: cap certificat serà demanat o comprovat;\n"
 " * permetre: es demana el certificat, però no és\n"
 "          requerit o comprovat;\n"
 " * intent: el certificat serà demanat i comprovat, pero si no\n"
 "          es proporciona serà ignorat;\n"
-" * demanda: el certiicat serà demanat, requerit i comprovat.\n"
+" * demanda: el certiicat serà demanat, requerit i comprovat."
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nslcd.conf."
+msgstr ""
 "Si la comprovació de certificats està habilitada, s'haura d'habilitar en el "
 "fitxer /etc/nslcd.conf com a mínim una opció de tls_cacertdir o "
 "tls_cacertfile."

Modified: nss-pam-ldapd/debian/po/cs.po
==============================================================================
--- nss-pam-ldapd/debian/po/cs.po       Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/cs.po       Tue Aug  9 11:09:03 2011        (r1494)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.7.9\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+0200\n"
 "PO-Revision-Date: 2010-08-18 22:38+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -24,8 +24,8 @@
 #: ../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."
+"is \"ldap://<hostname_or_IP_address>:<port>/\". Alternatively, \"ldaps://\" "
+"or \"ldapi://\" can be used. The port number is optional."
 msgstr ""
 "Zadejte URI (Uniform Resource Identifier) LDAP serveru ve formátu „ldap://"
 "<jmeno_nebo_IP_adresa_serveru>:<port>/“. Možné jsou i varianty „ldaps://“ a "
@@ -96,13 +96,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -136,67 +140,27 @@
 msgstr "Zadejte heslo, které se použije pro přístup k LDAP databázi."
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
-msgstr ""
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
+msgstr "Zadejte heslo, které se použije pro přístup k LDAP databázi."
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -223,16 +187,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -257,13 +220,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
@@ -272,7 +235,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr "Zadejte heslo, které se použije pro přístup k LDAP databázi."
 
@@ -282,8 +245,8 @@
 #, fuzzy
 #| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr "Tato hodnota by měla být zadána jako rozlišitelné jméno (DN)."
 
 #. Type: string
@@ -296,7 +259,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -364,25 +327,37 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+"Při použití šifrovaného spojení, může být vyžádán a zkontrolován certifikát "
+"serveru. Vyberte si, zda mají dotazy certifikát vyžadovat a zda se má "
+"kontrolovat jeho platnost:"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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/nslcd.conf."
+" * demand: a certificate will be requested, required, and checked."
 msgstr ""
-"Při použití šifrovaného spojení, může být vyžádán a zkontrolován certifikát "
-"serveru. Vyberte si, zda mají dotazy certifikát vyžadovat a zda se má "
-"kontrolovat jeho platnost:\n"
 " * nikdy: certifikát nebude nikdy vyžadován ani kontrolován;\n"
 " * povoleno: certifikát bude vyžádán, ale není povinný a nebude\n"
 "             kontrolován;\n"
 " * pokusit se: certifikát bude vyžádán a zkontrolován, ale pokud\n"
 "               nebude certifikát obdržen, bude to ignorováno;\n"
-" * vyžadováno: certifikát je povinný a bude zkontrolován.\n"
+" * vyžadováno: certifikát je povinný a bude zkontrolován."
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nslcd.conf."
+msgstr ""
 "Je-li zapnuta kontrola certifikátů, musí být v /etc/nslcd.conf povolena "
 "minimálně jedna z voleb tls_cacertdir a tls_cacertfile."
 

Modified: nss-pam-ldapd/debian/po/da.po
==============================================================================
--- nss-pam-ldapd/debian/po/da.po       Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/da.po       Tue Aug  9 11:09:03 2011        (r1494)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.7.9\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+0200\n"
 "PO-Revision-Date: 2010-08-24 23:51+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -32,8 +32,8 @@
 #: ../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."
+"is \"ldap://<hostname_or_IP_address>:<port>/\". Alternatively, \"ldaps://\" "
+"or \"ldapi://\" can be used. The port number is optional."
 msgstr ""
 "Angiv URI'en (Uniform Resource Identifier) for den anvendte LDAP-server. "
 "Formatet er 'ldap://<værtsnavn_eller_IP-adresse>:<port>/'. Alternativt "
@@ -102,13 +102,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -141,67 +145,28 @@
 "Angiv adgangskoden som vil blive brugt til at logge på til LDAP-databasen."
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
 msgstr ""
+"Angiv adgangskoden som vil blive brugt til at logge på til LDAP-databasen."
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -229,16 +194,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -262,13 +226,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
@@ -277,7 +241,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr ""
 "Angiv adgangskoden som vil blive brugt til at logge på til LDAP-databasen."
@@ -288,8 +252,8 @@
 #, fuzzy
 #| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr "Denne værdi bør angives som et DN (særligt navn - distinguished name)."
 
 #. Type: string
@@ -302,7 +266,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -370,27 +334,39 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+"Når en krypteret forbindelse bruges, kan der blive spurgt efter et "
+"servercertifikat, som tjekkes. Vælg venligst hvorvidt opslag skal "
+"konfigureres til at kræve et certifikat, og hvorvidt certifikater skal "
+"validitetstjekkes:"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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/nslcd.conf."
+" * demand: a certificate will be requested, required, and checked."
 msgstr ""
-"Når en krypteret forbindelse bruges, kan der blive spurgt efter et "
-"servercertifikat, som tjekkes. Vælg venligst hvorvidt opslag skal "
-"konfigureres til at kræve et certifikat, og hvorvidt certifikater skal "
-"validitetstjekkes:\n"
 " * aldrig: Der vil ikke blive spurgt efter eller tjekket for certifikater;\n"
 " * tillad: Der vil blive spurgt efter et certifikat, men det er ikke krævet\n"
 "           og tjekkes ikke;\n"
 " * forsøg: Der vil blive spurgt efter et certifikat, som tjekkes, men hvis\n"
 "           intet certifikat tilbydes ignoreres det;\n"
 " * kræv: Der vil blive spurgt efter et certifikat, det er krævet og det\n"
-"         tjekkes.\n"
+"         tjekkes."
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nslcd.conf."
+msgstr ""
 "Hvis certifikattjek er aktiveret skal mindst en af tilvalgene tls_cacertdir "
 "eller tls_cacertfile være placeret i /etc/nslcd.conf."
 

Modified: nss-pam-ldapd/debian/po/de.po
==============================================================================
--- nss-pam-ldapd/debian/po/de.po       Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/de.po       Tue Aug  9 11:09:03 2011        (r1494)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.7.9\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+0200\n"
 "PO-Revision-Date: 2010-08-25 23:28+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -33,8 +33,8 @@
 #: ../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."
+"is \"ldap://<hostname_or_IP_address>:<port>/\". Alternatively, \"ldaps://\" "
+"or \"ldapi://\" can be used. The port number is optional."
 msgstr ""
 "Bitte geben Sie den Uniform Resource Identifier des benutzten LDAP-Servers "
 "ein. Das Format ist »ldap://<Rechnername oder IP-Adresse>:<Port>/«. "
@@ -109,13 +109,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #  Template: libnss-ldap/binddn
@@ -150,67 +154,28 @@
 msgstr "Geben Sie das Passwort für die Anmeldung an der LDAP-Datenbank ein."
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
+#
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
-msgstr ""
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
+msgstr "Geben Sie das Passwort für die Anmeldung an der LDAP-Datenbank ein."
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -238,16 +203,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -271,13 +235,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #
@@ -287,7 +251,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr "Geben Sie das Passwort für die Anmeldung an der LDAP-Datenbank ein."
 
@@ -297,8 +261,8 @@
 #, fuzzy
 #| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr "Dieser Wert sollte ein DN (distinguished name) sein."
 
 #. Type: string
@@ -311,7 +275,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -379,26 +343,38 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+"Wenn eine verschlüsselte Verbindung benutzt wird, kann ein Server-Zertifikat "
+"erforderlich sein und überprüft werden. Bitte wählen Sie, ob Zertifikate "
+"angefordert und deren Gültigkeit geprüft werden soll:"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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/nslcd.conf."
+" * demand: a certificate will be requested, required, and checked."
 msgstr ""
-"Wenn eine verschlüsselte Verbindung benutzt wird, kann ein Server-Zertifikat "
-"erforderlich sein und überprüft werden. Bitte wählen Sie, ob Zertifikate "
-"angefordert und deren Gültigkeit geprüft werden soll:\n"
 " * nie:       es wird kein Zertifikat angefordert oder überprüft;\n"
 " * erlauben:  ein Zertifikat wird angefordert, aber es ist nicht\n"
 "              erforderlich und wird nicht überprüft;\n"
 " * versuchen: ein Zertifikat wird angefordert und überprüft,\n"
 "              aber es wird ignoriert, wenn keins angeboten wird\n"
 " * anfordern: ein Zertifikat wird angefordert, ist erforderlich\n"
-"              und wird überprüft\n"
+"              und wird überprüft"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nslcd.conf."
+msgstr ""
 "Wenn die Zertifikat-Überprüfung eingeschaltet ist, muss mindestens eine der "
 "Optionen »tls_cacertdir« oder »tls_cacertfile« in die Datei /etc/nslcd.conf "
 "eingetragen werden."

Modified: nss-pam-ldapd/debian/po/es.po
==============================================================================
--- nss-pam-ldapd/debian/po/es.po       Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/es.po       Tue Aug  9 11:09:03 2011        (r1494)
@@ -32,7 +32,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.7.9\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+0200\n"
 "PO-Revision-Date: 2010-08-28 19:42+0100\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -52,8 +52,8 @@
 #: ../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."
+"is \"ldap://<hostname_or_IP_address>:<port>/\". Alternatively, \"ldaps://\" "
+"or \"ldapi://\" can be used. The port number is optional."
 msgstr ""
 "Introduzca el URI («Uniform Resource Identifier») del servidor LDAP. Éste "
 "debe tener el formato «ldap://<máquina-o-dirección-ip>:<puerto>/», también "
@@ -193,13 +193,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -237,67 +241,29 @@
 "LDAP."
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
 msgstr ""
+"Introduzca la contraseña que se utilizará para acceder a la base de datos "
+"LDAP."
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -326,16 +292,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -360,13 +325,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
@@ -375,7 +340,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr ""
 "Introduzca la contraseña que se utilizará para acceder a la base de datos "
@@ -387,8 +352,8 @@
 #, fuzzy
 #| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr "Debe introducir el valor en forma de DN (nombre distintivo)."
 
 #. Type: string
@@ -401,7 +366,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -469,26 +434,38 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+"Cuando se utiliza una conexión cifrada, se podrá pedir y comprobar un "
+"certificado del servidor. Escoja si las búsquedas se deberían configurar "
+"para necesitar un certificado, y si se debería comprobar la validez de los "
+"certificados."
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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/nslcd.conf."
+" * demand: a certificate will be requested, required, and checked."
 msgstr ""
-"Cuando se utiliza una conexión cifrada, se podrá pedir y comprobar un "
-"certificado del servidor. Escoja si las búsquedas se deberían configurar "
-"para necesitar un certificado, y si se debería comprobar la validez de los "
-"certificados.\n"
 " * nunca: no se pedirá ni comprobará ningún certificado.\n"
 " * permitir: se pedirá un certificado, pero no se\n"
 "          necesitará o se comprobará.\n"
 " * intentar: se pedirá y comprobará un certificado, pero si no\n"
 "          se proporciona se ignorará.\n"
-" * exigir: se pedirá, necesitará y comprobará un certificado.\n"
+" * exigir: se pedirá, necesitará y comprobará un certificado."
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nslcd.conf."
+msgstr ""
 "Si la comprobación del certificado está activa, se debe utilizar al menos "
 "una de las opciones «tls_cacertdir» o «tls_cacertfile» en el archivo «/etc/"
 "nslcd.conf»."

Modified: nss-pam-ldapd/debian/po/fi.po
==============================================================================
--- nss-pam-ldapd/debian/po/fi.po       Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/fi.po       Tue Aug  9 11:09:03 2011        (r1494)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: nss-ldapd\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+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"
@@ -31,8 +31,8 @@
 #: ../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."
+"is \"ldap://<hostname_or_IP_address>:<port>/\". Alternatively, \"ldaps://\" "
+"or \"ldapi://\" can be used. The port number is optional."
 msgstr ""
 "Anna käytettävän LDAP-palvelimen URI (Uniform Resource Identifier). "
 "Merkkijonon muoto on ”ldap://<verkkonimi tai IP-osoite>:<portti>/”. Myös "
@@ -103,13 +103,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -141,67 +145,27 @@
 msgstr "Anna salasana, jota käytetään kirjauduttaessa LDAP-tietokantaan."
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
-msgstr ""
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
+msgstr "Anna salasana, jota käytetään kirjauduttaessa LDAP-tietokantaan."
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -228,16 +192,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -260,13 +223,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
@@ -275,7 +238,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr "Anna salasana, jota käytetään kirjauduttaessa LDAP-tietokantaan."
 
@@ -285,8 +248,8 @@
 #, fuzzy
 #| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr "Tämä arvo tulisi antaa erittelevänä nimenä."
 
 #. Type: string
@@ -299,7 +262,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -367,24 +330,36 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+"Käytettäessä salattua yhteyttä, palvelimelta voidaan pyytää varmenne "
+"tarkastettavaksi. Valitse tulisiko hakujen pyytää varmennetta ja tulisiko "
+"varmenteiden oikeellisuus tarkastaa:"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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/nslcd.conf."
+" * demand: a certificate will be requested, required, and checked."
 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"
+" * vaadi:      Varmenne vaaditaan ja tarkastetaan."
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nslcd.conf."
+msgstr ""
 "Jos tarkastus on käytössä, tulisi ainakin toinen asetuksista tls_cacertdir "
 "ja tls_cacertfile laittaa tiedostoon /etc/nslcd.conf."
 

Modified: nss-pam-ldapd/debian/po/fr.po
==============================================================================
--- nss-pam-ldapd/debian/po/fr.po       Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/fr.po       Tue Aug  9 11:09:03 2011        (r1494)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.7.9\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+0200\n"
 "PO-Revision-Date: 2010-08-17 22:05-0400\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -34,8 +34,8 @@
 #: ../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."
+"is \"ldap://<hostname_or_IP_address>:<port>/\". Alternatively, \"ldaps://\" "
+"or \"ldapi://\" can be used. The port number is optional."
 msgstr ""
 "Veuillez indiquer l'URI (« Uniform Resource Identifier ») du serveur LDAP à "
 "utiliser. Il s'agit d'une adresse de la forme « ldap://<nom de machine ou "
@@ -110,13 +110,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -154,67 +158,29 @@
 "LDAP."
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
 msgstr ""
+"Veuillez indiquer le mot de passe à utiliser pour s'identifier sur la base "
+"LDAP."
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -243,16 +209,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -277,13 +242,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
@@ -292,7 +257,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr ""
 "Veuillez indiquer le mot de passe à utiliser pour s'identifier sur la base "
@@ -304,8 +269,8 @@
 #, fuzzy
 #| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr "Cette valeur doit être un nom distinctif (« DN »)."
 
 #. Type: string
@@ -318,7 +283,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -386,23 +351,35 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+"En cas de connexion chiffrée, le certificat du serveur peut être demandé et "
+"contrôlé. Veuillez choisir la façon de réaliser ce contrôle :"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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/nslcd.conf."
+" * demand: a certificate will be requested, required, and checked."
 msgstr ""
-"En cas de connexion chiffrée, le certificat du serveur peut être demandé et "
-"contrôlé. Veuillez choisir la façon de réaliser ce contrôle :\n"
 " - Jamais    : certificat non demandé ni contrôlé ;\n"
 " - Autoriser : certificat demandé mais facultatif et non\n"
 "               contrôlé ;\n"
 " - Essayer   : certificat demandé et contrôlé, mais facultatif ;\n"
-" - Demander  : certificat obligatoire et contrôlé.\n"
+" - Demander  : certificat obligatoire et contrôlé."
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nslcd.conf."
+msgstr ""
 "Si le contrôle du certificat est activé, il est indispensable d'utiliser au "
 "moins l'une des options « tls_cacertdir » ou « tls_cacertfile » dans le "
 "fichier /etc/nslcd.conf."

Modified: nss-pam-ldapd/debian/po/gl.po
==============================================================================
--- nss-pam-ldapd/debian/po/gl.po       Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/gl.po       Tue Aug  9 11:09:03 2011        (r1494)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.6\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+0200\n"
 "PO-Revision-Date: 2009-07-18 10:02+0200\n"
 "Last-Translator: Marce Villarino <mvillarino@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -32,8 +32,8 @@
 #: ../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."
+"is \"ldap://<hostname_or_IP_address>:<port>/\". Alternatively, \"ldaps://\" "
+"or \"ldapi://\" can be used. The port number is optional."
 msgstr ""
 "Introduza o URI do servidor LDAP. O formato é «ldap://<nome_ou_IP>:"
 "<porto>/». Tamén se poden empregar «ldaps://» ou «ldapi://» . O número do "
@@ -103,13 +103,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -143,67 +147,29 @@
 "LDAP."
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
 msgstr ""
+"Indique o contrasinal que se ha empregar para acceder á base de datos do "
+"LDAP."
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -232,16 +198,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -266,13 +231,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
@@ -281,7 +246,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr ""
 "Indique o contrasinal que se ha empregar para acceder á base de datos do "
@@ -293,8 +258,8 @@
 #, fuzzy
 #| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr "Este valor debe especificarse como un DN (nome distintivo)."
 
 #. Type: string
@@ -307,7 +272,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -375,24 +340,36 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+"Cando se emprega unha conexión cifrada pode pedirse e comprobarse un "
+"certificado do servidor. Escolla se as procuras deben estar configuradas "
+"para requirir un certificado e se debe comprobarse a validez destes:"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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/nslcd.conf."
+" * demand: a certificate will be requested, required, and checked."
 msgstr ""
-"Cando se emprega unha conexión cifrada pode pedirse e comprobarse un "
-"certificado do servidor. Escolla se as procuras deben estar configuradas "
-"para requirir un certificado e se debe comprobarse a validez destes:\n"
 " * nunca: non se pedirá nin se comprobará ningún certificado,\n"
 " * permitir: pedirase un certificado, pero non é requirido nin comprobado,\n"
 " * tentar: pedirase e comprobarase un certificado, pero de non fornecerse\n"
 "   ningún ignorarase,\n"
-" * demandar:pedirase, requirirase e comprobarase un certificado.\n"
+" * demandar:pedirase, requirirase e comprobarase un certificado."
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nslcd.conf."
+msgstr ""
 "Se desactiva a comprobación do certificado, debe ter no ficheiro /etc/nslcd."
 "conf polo menos unha das opcións tls_cacertdir ou tlscacertfile."
 

Modified: nss-pam-ldapd/debian/po/it.po
==============================================================================
--- nss-pam-ldapd/debian/po/it.po       Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/it.po       Tue Aug  9 11:09:03 2011        (r1494)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.7.9\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+0200\n"
 "PO-Revision-Date: 2010-08-19 14:20+0200\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -29,8 +29,8 @@
 #: ../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."
+"is \"ldap://<hostname_or_IP_address>:<port>/\". Alternatively, \"ldaps://\" "
+"or \"ldapi://\" can be used. The port number is optional."
 msgstr ""
 "Inserire l'Uniform Resource Identifier (URI) del server LDAP. Il formato è "
 "«ldap://<nomehost o indirizzo IP>:<porta>»; è anche possibile usare "
@@ -101,13 +101,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -141,67 +145,28 @@
 "Inserire la password che verrà utilizzata per accedere al database LDAP."
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
 msgstr ""
+"Inserire la password che verrà utilizzata per accedere al database LDAP."
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -229,16 +194,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -262,13 +226,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
@@ -277,7 +241,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr ""
 "Inserire la password che verrà utilizzata per accedere al database LDAP."
@@ -288,8 +252,8 @@
 #, fuzzy
 #| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr ""
 "Questo valore dovrebbe essere specificato come DN (distinguished name)."
 
@@ -303,7 +267,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -371,26 +335,38 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+"Quando viene utilizzata una connessione cifrata è possibile chiedere e "
+"controllare un certificato del server. Scegliere se le ricerche devono "
+"essere configurate per richiedere un certificato e se la validità dei "
+"certificati deve essere controllata:"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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/nslcd.conf."
+" * demand: a certificate will be requested, required, and checked."
 msgstr ""
-"Quando viene utilizzata una connessione cifrata è possibile chiedere e "
-"controllare un certificato del server. Scegliere se le ricerche devono "
-"essere configurate per richiedere un certificato e se la validità dei "
-"certificati deve essere controllata:\n"
 " * mai:      non verrà richiesto né controllato alcun certificato;\n"
 " * consenti: un certificato viene richiesto, ma non in modo vincolante,\n"
 "             né viene controllato;\n"
 " * prova:    un certificato verrà richiesto e controllato, ma la mancata\n"
 "             fornitura di un certificato viene ignorata;\n"
-" * richiedi: viene chiesto in modo vincolante e controllato.\n"
+" * richiedi: viene chiesto in modo vincolante e controllato."
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nslcd.conf."
+msgstr ""
 "Se è abilitata la richiesta di certificati, almeno una delle opzioni "
 "tls_cacertdir o tls_cacertfile devono trovarsi in «/etc/nslcd.conf»."
 

Modified: nss-pam-ldapd/debian/po/ja.po
==============================================================================
--- nss-pam-ldapd/debian/po/ja.po       Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/ja.po       Tue Aug  9 11:09:03 2011        (r1494)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.6.9\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+0200\n"
 "PO-Revision-Date: 2010-08-20 20:49+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -24,8 +24,8 @@
 #: ../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."
+"is \"ldap://<hostname_or_IP_address>:<port>/\". Alternatively, \"ldaps://\" "
+"or \"ldapi://\" can be used. The port number is optional."
 msgstr ""
 "LDAP サーバの Uniform Resource Identifier を入力してください。形式は 'ldap://"
 "<ホスト名または IP>:<ポート>/' です。このほかに 'ldaps://' または 'ldapi://' "
@@ -94,13 +94,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -132,67 +136,27 @@
 msgstr "LDAP データベースにログインするのに使うパスワードを入力してください。"
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
-msgstr ""
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
+msgstr "LDAP データベースにログインするのに使うパスワードを入力してください。"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -219,16 +183,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -251,13 +214,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
@@ -266,7 +229,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr "LDAP データベースにログインするのに使うパスワードを入力してください。"
 
@@ -276,8 +239,8 @@
 #, fuzzy
 #| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr "この値は DN (識別名) として指定すべきです。"
 
 #. Type: string
@@ -290,7 +253,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -358,25 +321,37 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+"暗号化接続を利用する場合、サーバ証明書を要求して確認できます。ルックアップで"
+"証明書を必須とするよう設定するかどうか、および証明書の妥当性を確認するかどう"
+"かを選んでください。"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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/nslcd.conf."
+" * demand: a certificate will be requested, required, and checked."
 msgstr ""
-"暗号化接続を利用する場合、サーバ証明書を要求して確認できます。ルックアップで"
-"証明書を必須とするよう設定するかどうか、および証明書の妥当性を確認するかどう"
-"かを選んでください。\n"
 " * 使わない: 証明書は要求もチェックもされない\n"
 " * 許可: 証明書を要求するが、必須ではなくチェックも\n"
 "         されない\n"
 " * 試行: 証明書は要求およびチェックされるが、\n"
 "         証明書が提供されなかった場合は単に無視される\n"
-" * 要求: 証明書は要求され、必須であり、チェックされる。\n"
+" * 要求: 証明書は要求され、必須であり、チェックされる。"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nslcd.conf."
+msgstr ""
 "証明書のチェックが有効の場合、tls_cacertdir、tls_cacertfile オプションのうち"
 "の少なくとも 1 つは /etc/nslcd.conf に掲載されている必要があります。"
 

Modified: nss-pam-ldapd/debian/po/nb.po
==============================================================================
--- nss-pam-ldapd/debian/po/nb.po       Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/nb.po       Tue Aug  9 11:09:03 2011        (r1494)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.6.9\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+0200\n"
 "PO-Revision-Date: 2010-08-18 20:24+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -31,8 +31,8 @@
 #: ../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."
+"is \"ldap://<hostname_or_IP_address>:<port>/\". Alternatively, \"ldaps://\" "
+"or \"ldapi://\" can be used. The port number is optional."
 msgstr ""
 "Skriv inn Uniform Resource Identifier for LDAP-tjeneren, Formatet er «ldap://"
 "<vertsnavn_eller_IP-adresse>:<port>/». «ldaps://» eller «ldapi://» kan også "
@@ -101,13 +101,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -139,67 +143,27 @@
 msgstr "Oppgi passordet som vil bli brukt til å logge inn i LDAP-databasen."
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
-msgstr ""
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
+msgstr "Oppgi passordet som vil bli brukt til å logge inn i LDAP-databasen."
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -226,16 +190,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -258,13 +221,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
@@ -273,7 +236,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr "Oppgi passordet som vil bli brukt til å logge inn i LDAP-databasen."
 
@@ -283,8 +246,8 @@
 #, fuzzy
 #| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr "Verdien må oppgis som et DN - entydig navn."
 
 #. Type: string
@@ -297,7 +260,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -365,25 +328,37 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+"Når det brukes en kryptert forbindelse kan det utbes og kontrolleres et "
+"tjenersertifikat. Velg om oppslag skal settes opp til å kreve et sertifikat, "
+"og om gyldigheten av sertifikatet skal kontrolleres:"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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/nslcd.conf."
+" * demand: a certificate will be requested, required, and checked."
 msgstr ""
-"Når det brukes en kryptert forbindelse kan det utbes og kontrolleres et "
-"tjenersertifikat. Velg om oppslag skal settes opp til å kreve et sertifikat, "
-"og om gyldigheten av sertifikatet skal kontrolleres:\n"
 "* aldri: det blir ikke bedt om sertifikater og ikke kontrollert;\n"
 "* tillat: det blir bedt om et sertifikat, men det er ikke påkrevet\n"
 "           eller kontrollert.\n"
 "* forsøk: det blir bedt om et sertifikat som blir kontrollert, men\n"
 "           det blir ignorert dersom det ikke blir oppgitt et sertifikat.\n"
-"* krev:  det blir bedt om et sertifikat som blir krevet og kontrollert.\n"
+"* krev:  det blir bedt om et sertifikat som blir krevet og kontrollert."
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nslcd.conf."
+msgstr ""
 "Hvis sertifikatkontroll er slått på, så må minst ett av valgene tls."
 "cacertdir eller tls.cscertfile være lagt inn i /etc/nslcd.conf."
 

Modified: nss-pam-ldapd/debian/po/nl.po
==============================================================================
--- nss-pam-ldapd/debian/po/nl.po       Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/nl.po       Tue Aug  9 11:09:03 2011        (r1494)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: nss-ldapd 0.3\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+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"
@@ -25,8 +25,8 @@
 #: ../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."
+"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? Het formaat is 'ldap://"
 "<computernaam of IP>:<poortnummer>/'. Ook kan 'ldaps://' of 'ldapi://' "
@@ -97,13 +97,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -141,67 +145,29 @@
 "melden."
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
 msgstr ""
+"Voer het wachtwoord in dat gebruikt zal worden om op de LDAP-database aan te "
+"melden."
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -230,16 +196,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -264,13 +229,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
@@ -279,7 +244,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr ""
 "Voer het wachtwoord in dat gebruikt zal worden om op de LDAP-database aan te "
@@ -291,8 +256,8 @@
 #, fuzzy
 #| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr "Deze waarde dient opgegeven te worden als een DN (distinguished name)."
 
 #. Type: string
@@ -305,7 +270,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -371,13 +336,25 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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"
+" * demand: a certificate will be requested, required, and checked."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 "If certificate checking is enabled, at least one of the tls_cacertdir or "
 "tls_cacertfile options must be put in /etc/nslcd.conf."
 msgstr ""

Modified: nss-pam-ldapd/debian/po/pt.po
==============================================================================
--- nss-pam-ldapd/debian/po/pt.po       Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/pt.po       Tue Aug  9 11:09:03 2011        (r1494)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.7.9\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+0200\n"
 "PO-Revision-Date: 2010-08-17 22:34+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -31,8 +31,8 @@
 #: ../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."
+"is \"ldap://<hostname_or_IP_address>:<port>/\". Alternatively, \"ldaps://\" "
+"or \"ldapi://\" can be used. The port number is optional."
 msgstr ""
 "Por favor insira o Uniform Resource Identifier do servidor LDAP. O formato é "
 "'ldap://<nome_da_máquina_ou_endereço_IP>:<porto>/'. Alternativamente, pode "
@@ -102,13 +102,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -142,67 +146,29 @@
 "LDAP."
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
 msgstr ""
+"Indique a palavra-passe que vai ser usada para autenticação na base de dados "
+"LDAP."
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -231,16 +197,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -265,13 +230,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
@@ -280,7 +245,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr ""
 "Indique a palavra-passe que vai ser usada para autenticação na base de dados "
@@ -292,8 +257,8 @@
 #, fuzzy
 #| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr "Este valor deve ser especificado como um nome distinto (DN)."
 
 #. Type: string
@@ -306,7 +271,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -374,26 +339,38 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+"Quando é usada uma ligação encriptada, pode ser requisitado e verificado um "
+"certificado do servidor. Por favor escolha se as buscas devem ser "
+"configuradas para requisitar um certificado, e se a validade dos "
+"certificados deve ser verificada :"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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/nslcd.conf."
+" * demand: a certificate will be requested, required, and checked."
 msgstr ""
-"Quando é usada uma ligação encriptada, pode ser requisitado e verificado um "
-"certificado do servidor. Por favor escolha se as buscas devem ser "
-"configuradas para requisitar um certificado, e se a validade dos "
-"certificados deve ser verificada :\n"
 " * nunca: nenhum certificado será requisitado ou verificado;\n"
 " * permitir: será requisitado um certificado, mas não será obrigatório\n"
 "              nem verificado;\n"
 " * tentar: um certificado será requisitado e verificado, mas é ignorado\n"
 "              se nenhum certificado for disponibilizado;\n"
-" * obrigar: será obrigatória a requisição e verificação de um certificado.\n"
+" * obrigar: será obrigatória a requisição e verificação de um certificado."
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nslcd.conf."
+msgstr ""
 "Se a verificação de certificados for activada, pelo menos uma das opções "
 "tls_cacertdir ou tls_cacertfile tem que ser colocada em /etc/nslcd.conf."
 

Modified: nss-pam-ldapd/debian/po/pt_BR.po
==============================================================================
--- nss-pam-ldapd/debian/po/pt_BR.po    Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/pt_BR.po    Tue Aug  9 11:09:03 2011        (r1494)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: libnss-ldap_203-1\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+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"
@@ -25,8 +25,8 @@
 #: ../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."
+"is \"ldap://<hostname_or_IP_address>:<port>/\". Alternatively, \"ldaps://\" "
+"or \"ldapi://\" can be used. The port number is optional."
 msgstr ""
 
 #. Type: string
@@ -99,13 +99,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -143,67 +147,28 @@
 "Informe a senha que ser� usada para a autentica��o na base de dados LDAP."
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
 msgstr ""
+"Informe a senha que ser� usada para a autentica��o na base de dados LDAP."
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -231,16 +196,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -267,13 +231,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
@@ -282,7 +246,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr ""
 "Informe a senha que ser� usada para a autentica��o na base de dados LDAP."
@@ -290,10 +254,16 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
+#, fuzzy
+#| msgid ""
+#| "Enter the name of the account that will be used to log in to the LDAP "
+#| "database."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr ""
+"Informe o nome da conta que ser� usada para se autenticar na base de dados "
+"LDAP."
 
 #. Type: string
 #. Description
@@ -305,7 +275,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -371,13 +341,25 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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"
+" * demand: a certificate will be requested, required, and checked."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 "If certificate checking is enabled, at least one of the tls_cacertdir or "
 "tls_cacertfile options must be put in /etc/nslcd.conf."
 msgstr ""

Modified: nss-pam-ldapd/debian/po/ru.po
==============================================================================
--- nss-pam-ldapd/debian/po/ru.po       Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/ru.po       Tue Aug  9 11:09:03 2011        (r1494)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.7.9\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+0200\n"
 "PO-Revision-Date: 2010-08-18 20:51+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -32,8 +32,8 @@
 #: ../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."
+"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://\" или "
@@ -104,13 +104,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -143,67 +147,28 @@
 "Введите пароль, который будет использован для подключения к базе данных LDAP."
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
 msgstr ""
+"Введите пароль, который будет использован для подключения к базе данных LDAP."
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -231,16 +196,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -264,13 +228,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
@@ -279,7 +243,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr ""
 "Введите пароль, который будет использован для подключения к базе данных LDAP."
@@ -290,8 +254,8 @@
 #, fuzzy
 #| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr "Значение должно быть указано в форме DN (уникального имени)."
 
 #. Type: string
@@ -304,7 +268,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -372,24 +336,36 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+"При использовании шифрованного соединения, можно запросить и проверить "
+"сертификат сервера. Выберите нужно ли запрашивать и проверять сертификат:"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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/nslcd.conf."
+" * demand: a certificate will be requested, required, and checked."
 msgstr ""
-"При использовании шифрованного соединения, можно запросить и проверить "
-"сертификат сервера. Выберите нужно ли запрашивать и проверять сертификат:\n"
 " * никогда:     не запрашивать и не проверять сертификат;\n"
 " * запросить:   запросить сертификат, но его наличие и проверка\n"
 "                не обязательны;\n"
 " * попытаться:  запросить и проверить сертификат, но если его\n"
 "                нет, то продолжать работу;\n"
-" * обязательна: обязательно запросить и проверить сертификат.\n"
+" * обязательна: обязательно запросить и проверить сертификат."
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nslcd.conf."
+msgstr ""
 "Если разрешена проверка сертификата, то в файле /etc/nslcd.conf должен быть "
 "параметр tls_cacertdir или tls_cacertfile."
 

Modified: nss-pam-ldapd/debian/po/sv.po
==============================================================================
--- nss-pam-ldapd/debian/po/sv.po       Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/sv.po       Tue Aug  9 11:09:03 2011        (r1494)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.7.9\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+0200\n"
 "PO-Revision-Date: 2010-08-28 12:21+0200\n"
 "Last-Translator: Martin �gren <martin.agren@gmail.com>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -31,8 +31,8 @@
 #: ../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."
+"is \"ldap://<hostname_or_IP_address>:<port>/\". Alternatively, \"ldaps://\" "
+"or \"ldapi://\" can be used. The port number is optional."
 msgstr ""
 "Ange URI:n (eng. \"Uniform Resource Identifier\") till LDAP-servern. "
 "Formatet �r 'ldap://<v�rdnamn_eller_IP>:<port>/'. Alternativt kan 'ldaps://' "
@@ -101,13 +101,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -139,67 +143,27 @@
 msgstr "Ange l�senordet som ska anv�ndas f�r att logga in p� LDAP-databasen."
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
-msgstr ""
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
+msgstr "Ange l�senordet som ska anv�ndas f�r att logga in p� LDAP-databasen."
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -226,16 +190,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -258,13 +221,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
@@ -273,7 +236,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr "Ange l�senordet som ska anv�ndas f�r att logga in p� LDAP-databasen."
 
@@ -283,8 +246,8 @@
 #, fuzzy
 #| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr "Detta v�rde ska anges som ett DN (eng. \"distinguished name\")."
 
 #. Type: string
@@ -297,7 +260,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -365,25 +328,37 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+"N�r en krypterad uppkoppling anv�nds, kan ett servercertifikat efterfr�gas "
+"och kontrolleras. V�lj huruvida uppslag ska konfigureras f�r att kr�va ett "
+"certifikat och huruvida certifikatens giltighet ska kontrolleras:"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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/nslcd.conf."
+" * demand: a certificate will be requested, required, and checked."
 msgstr ""
-"N�r en krypterad uppkoppling anv�nds, kan ett servercertifikat efterfr�gas "
-"och kontrolleras. V�lj huruvida uppslag ska konfigureras f�r att kr�va ett "
-"certifikat och huruvida certifikatens giltighet ska kontrolleras:\n"
 " * aldrig: inget certifikat kommer efterfr�gas eller kontrolleras;\n"
 " * till�t: ett certifikat kommer efterfr�gas, men det kr�vs inget\n"
 "           och det kontrolleras inte;\n"
 " * f�rs�k: ett certifikat kommer efterfr�gas och kontrolleras, men om\n"
 "           inget certifikat tillhandah�lls kommer detta ignoreras;\n"
-" * kr�v: ett certifikat kommer efterfr�gas och kontrolleras.\n"
+" * kr�v: ett certifikat kommer efterfr�gas och kontrolleras."
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nslcd.conf."
+msgstr ""
 "Om certifikatkontroll �r aktiverad m�ste �tminstone ett avtls_cacertdir- och "
 "tls_cacertfile-direktiven l�ggas i /etc/nslcd.conf."
 

Modified: nss-pam-ldapd/debian/po/templates.pot
==============================================================================
--- nss-pam-ldapd/debian/po/templates.pot       Tue Aug  9 11:02:41 2011        
(r1493)
+++ nss-pam-ldapd/debian/po/templates.pot       Tue Aug  9 11:09:03 2011        
(r1494)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+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"
@@ -28,8 +28,8 @@
 #: ../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."
+"is \"ldap://<hostname_or_IP_address>:<port>/\". Alternatively, \"ldaps://\" "
+"or \"ldapi://\" can be used. The port number is optional."
 msgstr ""
 
 #. Type: string
@@ -90,13 +90,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -126,67 +130,25 @@
 msgstr ""
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
+#: ../nslcd.templates:6001
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -211,16 +173,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -241,20 +202,20 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr ""
 
@@ -262,8 +223,8 @@
 #. Description
 #: ../nslcd.templates:9001
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr ""
 
 #. Type: string
@@ -276,7 +237,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -342,13 +303,25 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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"
+" * demand: a certificate will be requested, required, and checked."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 "If certificate checking is enabled, at least one of the tls_cacertdir or "
 "tls_cacertfile options must be put in /etc/nslcd.conf."
 msgstr ""

Modified: nss-pam-ldapd/debian/po/vi.po
==============================================================================
--- nss-pam-ldapd/debian/po/vi.po       Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/vi.po       Tue Aug  9 11:09:03 2011        (r1494)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.7.9\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+0200\n"
 "PO-Revision-Date: 2010-09-29 22:21+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -30,8 +30,8 @@
 #: ../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."
+"is \"ldap://<hostname_or_IP_address>:<port>/\". Alternatively, \"ldaps://\" "
+"or \"ldapi://\" can be used. The port number is optional."
 msgstr ""
 "Hãy gõ địa chỉ URI (nhận diện tài nguyên thống nhất) của máy phục vụ LDAP. "
 "Định dạng nên là « ldap://tên_máy_hay_địa_chỉ_IP:cổng/ ». Cũng có thể sử "
@@ -101,13 +101,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -139,67 +143,27 @@
 msgstr "Hãy gõ mật khẩu sẽ được dùng để đăng nhập vào cơ sở dữ liệu LDAP."
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
-msgstr ""
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
+msgstr "Hãy gõ mật khẩu sẽ được dùng để đăng nhập vào cơ sở dữ liệu LDAP."
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -226,16 +190,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -258,13 +221,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
@@ -273,7 +236,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr "Hãy gõ mật khẩu sẽ được dùng để đăng nhập vào cơ sở dữ liệu LDAP."
 
@@ -283,8 +246,8 @@
 #, fuzzy
 #| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr "Giá trị này nên được ghi rõ dưới dạng một DN (tên phân biệt)."
 
 #. Type: string
@@ -297,7 +260,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -365,26 +328,37 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+"Khi sử dụng một kết nối đã mật mã, cũng có thể yêu cầu và kiểm tra một chứng "
+"nhận máy phục vụ. Hãy chọn nếu chức năng tra cứu nên được cấu hình để yêu "
+"cầu một chứng nhận, và nếu chứng nhận nên được kiểm tra là hợp lệ hay không."
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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/nslcd.conf."
+" * demand: a certificate will be requested, required, and checked."
 msgstr ""
-"Khi sử dụng một kết nối đã mật mã, cũng có thể yêu cầu và kiểm tra một chứng "
-"nhận máy phục vụ. Hãy chọn nếu chức năng tra cứu nên được cấu hình để yêu "
-"cầu một chứng nhận, và nếu chứng nhận nên được kiểm tra là hợp lệ hay "
-"không.\n"
 " • không bao giờ\tkhông có chứng nhận nào được yêu cầu hoặc kiểm tra\n"
 " • cho phép\t\tmột chứng nhận sẽ được yêu cầu, còn nó không phải\n"
 "\t\t\t\tđược đòi hỏi hoặc kiểm tra\n"
 " • thử\t\t\tmột chứng nhận được yêu cầu và kiểm tra, nhưng mà lờ đi\n"
 "\t\t\t\tnếu chứng nhận không được cung cấp\n"
-" • đòi hỏi\t\t\tmột chứng nhận được yêu cầu, đòi hỏi và kiểm tra.\n"
+" • đòi hỏi\t\t\tmột chứng nhận được yêu cầu, đòi hỏi và kiểm tra."
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
+"If certificate checking is enabled, at least one of the tls_cacertdir or "
+"tls_cacertfile options must be put in /etc/nslcd.conf."
+msgstr ""
 "Nếu tính năng kiểm tra được hiệu lực thì ít nhất một của hai tuỳ chọn « "
 "tls_cacertdir » và « tls_cacertfile » phải được để vào tập tin cấu hình « /"
 "etc/nslcd.conf »."

Modified: nss-pam-ldapd/debian/po/zh_CN.po
==============================================================================
--- nss-pam-ldapd/debian/po/zh_CN.po    Tue Aug  9 11:02:41 2011        (r1493)
+++ nss-pam-ldapd/debian/po/zh_CN.po    Tue Aug  9 11:09:03 2011        (r1494)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: nss-pam-ldapd 0.7.9\n"
 "Report-Msgid-Bugs-To: nss-pam-ldapd@packages.debian.org\n"
-"POT-Creation-Date: 2010-12-30 17:25+0100\n"
+"POT-Creation-Date: 2011-08-09 11:04+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: zym <ming_zym@sina.com>\n"
 "Language-Team: \n"
@@ -27,8 +27,8 @@
 #: ../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."
+"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://',端口号可选。"
@@ -93,13 +93,17 @@
 #. Description
 #: ../nslcd.templates:3002
 msgid ""
-"If your LDAP database requires authentication you can choose which mechanism "
-"should be used. Please choose the mechanism by which authentication should "
-"be done:\n"
+"Please choose what type of authentication the LDAP database should require "
+"(if any):"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid ""
 " * none: no authentication;\n"
-" * simple: simple clear text binddn/password;\n"
-" * SASL: one of the Simple Authentication and Security Layer\n"
-"         mechanisms."
+" * simple: simple bind DN and password authentication;\n"
+" * SASL: any Simple Authentication and Security Layer mechanism."
 msgstr ""
 
 #. Type: string
@@ -131,67 +135,27 @@
 msgstr "输入登录LDAP数据库的的密码:"
 
 #. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "auto"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "LOGIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "PLAIN"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "NTLM"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "CRAM-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "DIGEST-MD5"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../nslcd.templates:6001
-msgid "GSSAPI"
-msgstr ""
-
-#. Type: select
-#. Choices
+#. Description
 #: ../nslcd.templates:6001
-msgid "OTP"
+msgid "SASL mechanism to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
-msgid "SASL mechanism to use:"
-msgstr ""
+#: ../nslcd.templates:6001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Choose the SASL mechanism that will be used to authenticate to the LDAP "
+"database:"
+msgstr "输入登录LDAP数据库的的密码:"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:6001
 msgid ""
-"Choose the SASL mechanism that will be used to authenticate to the LDAP "
-"database:\n"
-" * auto: autonegociation;\n"
-" * LOGIN: deprecated in flavor of PLAIN;\n"
+" * auto: auto-negotiation;\n"
+" * LOGIN: deprecated in favor of PLAIN;\n"
 " * PLAIN: simple cleartext password mechanism;\n"
 " * NTLM: NT LAN Manager authentication mechanism;\n"
 " * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
@@ -218,16 +182,15 @@
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid ""
-"If empty, the GSSAPI mechanism will use information from the Kerberos "
-"credential cache. Others mechanisms may need @<REALM> suffixing sasl_authcid "
-"and sasl_authzid."
+msgid "The realm is appended to authentication and authorization identities."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:7001
-msgid "The realm is appended to authentication and authorisation identities."
+msgid ""
+"For GSSAPI this can be left blank to use information from the Kerberos "
+"credential cache."
 msgstr ""
 
 #. Type: string
@@ -250,13 +213,13 @@
 #. Description
 #: ../nslcd.templates:8001
 msgid ""
-"This is the login used in LOGIN, PLAIN, CRAM-MD5 and DIGEST-MD5 mechanisms."
+"This is the login used in LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../nslcd.templates:9001
-msgid "SASL proxy authorisation identity:"
+msgid "SASL proxy authorization identity:"
 msgstr ""
 
 #. Type: string
@@ -265,7 +228,7 @@
 #, fuzzy
 #| msgid "Enter the password that will be used to log in to the LDAP database."
 msgid ""
-"Enter the proxy authorisation identity that will be used to authenticate to "
+"Enter the proxy authorization identity that will be used to authenticate to "
 "the LDAP database."
 msgstr "输入登录LDAP数据库的的密码:"
 
@@ -275,8 +238,8 @@
 #, fuzzy
 #| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"This is the object in the name of witch the LDAP request are done. This "
-"value should be specified as a DN (distinguished name)."
+"This is the object in the name of which the LDAP request is done. This value "
+"should be specified as a DN (distinguished name)."
 msgstr "这个值应该设置为一个DN (distinguished name)。"
 
 #. Type: string
@@ -289,7 +252,7 @@
 #. Description
 #: ../nslcd.templates:10001
 msgid ""
-"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"Enter the Cyrus SASL security properties. Allowed values are described in "
 "the ldap.conf(5) manual page in the SASL OPTIONS section."
 msgstr ""
 
@@ -355,22 +318,34 @@
 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"
+"certificate, and whether certificates should be checked for validity:"
+msgstr ""
+"使用加密连接的时候,可以要求检查服务器端的证书。请选择设置是否需要服务器证"
+"书,是否需要验证证书的有效性:"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 " * 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"
+" * demand: a certificate will be requested, required, and checked."
+msgstr ""
+" * never: 不检查证书\n"
+" * allow: 会请求服务器证书,但是不检查证书是否存在和有效。\n"
+" * try: 会请求服务器证书,如服务器提供证书则验证,如无则忽略。\n"
+" * demand: 会请求服务器证书,必须有证书并验证证书。"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:13002
+msgid ""
 "If certificate checking is enabled, at least one of the tls_cacertdir or "
 "tls_cacertfile options must be put in /etc/nslcd.conf."
 msgstr ""
-"使用加密连接的时候,可以要求检查服务器端的证书。请选择设置是否需要服务器证"
-"书,是否需要验证证书的有效性:\n"
-"* never:不检查证书\n"
-"* allow: 会请求服务器证书,但是不检查证书是否存在和有效。* try: 会请求服务器"
-"证书,如服务器提供证书则验证,如无则忽略。 * demand:会请求服务器证书,必须有"
-"证书并验证证书。\n"
 "如果启用证书检查,/etc/nslcd.conf必须有tls_cacertdir或者tls_cacertfile选项。"
 
 #. Type: multiselect
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits