lists.arthurdejong.org
RSS feed

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

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

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



Author: arthur
Date: Thu Dec 30 17:26:56 2010
New Revision: 1356
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1356

Log:
run debconf-updatepo (new and updated templates)

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       Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/ca.po       Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -72,53 +72,271 @@
 "«exemple.net» utilitzaria el nom distingit de la base de la cerca "
 "«dc=exemple,dc=net»."
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
-msgid "LDAP database user:"
-msgstr "usuari de la base de dades de l'LDAP:"
+msgid "none"
+msgstr ""
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+#, fuzzy
+msgid "LDAP authentication to use:"
+msgstr "Versió de l'LDAP a utilitzar"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
+"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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
 msgstr ""
-"Si la base de dades LDAP requereix una autenticació per a realitzar cerques, "
-"entreu el nom del compte que serà utilitzat. Deixeu-lo en blanc en qualsevol "
-"altre cas."
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
+#: ../nslcd.templates:4001
+msgid "LDAP database user:"
+msgstr "usuari de la base de dades de l'LDAP:"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Enter the name of the account that will be used to log in to the LDAP "
+#| "database."
+msgid ""
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. This value should be specified as a DN (distinguished name)."
 msgstr ""
-"Aquest valor hauria de ésser especificat com a DN (distinguished name)."
+"Introduïu el nom del compte que s'utilitzarà per entrar a la base de dades "
+"de l'LDAP."
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr "Contrasenya de l'usuari de l'LDAP:"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in 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
+#. 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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm 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: 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid ""
+#| "Enter the name of the account that will be used to log in to the LDAP "
+#| "database."
+msgid ""
+"Enter the SASL authentication identity that will be used to authenticate to "
+"the LDAP database."
+msgstr ""
+"Introduïu el nom del compte que s'utilitzarà per entrar a la base de dades "
+"de l'LDAP."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"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: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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)."
+msgstr ""
+"Aquest valor hauria de ésser especificat com a DN (distinguished name)."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr "Utilitzar StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -128,37 +346,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr "Mai"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr "Permet"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr "Prova"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr "Demanda"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr "Comprovar certificat SSL del servidor:"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -293,6 +511,14 @@
 "posteriorment) o si hauria de deixar per a ser editada manualment per "
 "l'administrador."
 
+#~ msgid ""
+#~ "If the LDAP database requires a login for normal lookups, enter the name "
+#~ "of the account that will be used here. Leave it empty otherwise."
+#~ msgstr ""
+#~ "Si la base de dades LDAP requereix una autenticació per a realitzar "
+#~ "cerques, entreu el nom del compte que serà utilitzat. Deixeu-lo en blanc "
+#~ "en qualsevol altre cas."
+
 #, fuzzy
 #~ msgid ""
 #~ "Enter the password that will be used to log in to the LDAP database when "
@@ -302,10 +528,6 @@
 #~ "base de dades de l'LDAP."
 
 #, fuzzy
-#~ msgid "LDAP version to use:"
-#~ msgstr "Versió de l'LDAP a utilitzar"
-
-#, fuzzy
 #~ msgid ""
 #~ "Please enter which version of the LDAP protocol is to use. It is usually "
 #~ "a good idea to set this to highest available version number."
@@ -404,13 +626,6 @@
 #~ msgstr "Totes les noves instal·lacions ho tindran de forma predeterminada."
 
 #~ msgid ""
-#~ "Enter the name of the account that will be used to log in to the LDAP "
-#~ "database."
-#~ msgstr ""
-#~ "Introduïu el nom del compte que s'utilitzarà per entrar a la base de "
-#~ "dades de l'LDAP."
-
-#~ msgid ""
 #~ "Also, before removing this package, it is wise to remove the ldap entries "
 #~ "from nsswitch.conf to keep basic services functioning."
 #~ msgstr ""

Modified: nss-pam-ldapd/debian/po/cs.po
==============================================================================
--- nss-pam-ldapd/debian/po/cs.po       Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/cs.po       Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -66,49 +66,261 @@
 "tento účel využívá části svých doménových jmen. Například doména „priklad."
 "cz“ by jako rozlišitelné jméno svého stromu použila „dc=priklad,dc=cz“."
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
-msgid "LDAP database user:"
-msgstr "LDAP uživatel:"
+msgid "none"
+msgstr ""
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+#, fuzzy
+#| msgid "LDAP version to use:"
+msgid "LDAP authentication to use:"
+msgstr "Verze LDAPu, která se má použít:"
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
+"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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
 msgstr ""
-"Pokud LDAP databáze vyžaduje pro běžné vyhledávání přihlášení, zadejte jméno "
-"účtu, který se má použít. V opačném případě ponechte prázdné."
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
-msgid "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)."
+#: ../nslcd.templates:4001
+msgid "LDAP database user:"
+msgstr "LDAP uživatel:"
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../nslcd.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Enter the name of the account that will be used to log in to the LDAP "
+#| "database."
+msgid ""
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. This value should be specified as a DN (distinguished name)."
+msgstr "Zadejte jméno účtu, který se použije pro přístup k LDAP databázi."
+
+#. Type: password
+#. Description
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr "Heslo LDAP uživatele:"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "Zadejte heslo, které se použije pro přístup k LDAP databázi."
 
+#. Type: 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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm 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: 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid ""
+#| "Enter the name of the account that will be used to log in to the LDAP "
+#| "database."
+msgid ""
+"Enter the SASL authentication identity that will be used to authenticate to "
+"the LDAP database."
+msgstr "Zadejte jméno účtu, který se použije pro přístup k LDAP databázi."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"the LDAP database."
+msgstr "Zadejte heslo, které se použije pro přístup k LDAP databázi."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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)."
+msgstr "Tato hodnota by měla být zadána jako rozlišitelné jméno (DN)."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr "Používat StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -118,37 +330,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr "nikdy"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr "povoleno"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr "pokusit se"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr "vyžadováno"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr "Kontrolovat SSL certifikát serveru:"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -279,6 +491,13 @@
 "automaticky (což byste měli následně zkontrolovat), nebo zda ho tam přidá "
 "správce systému ručně."
 
+#~ msgid ""
+#~ "If the LDAP database requires a login for normal lookups, enter the name "
+#~ "of the account that will be used here. Leave it empty otherwise."
+#~ msgstr ""
+#~ "Pokud LDAP databáze vyžaduje pro běžné vyhledávání přihlášení, zadejte "
+#~ "jméno účtu, který se má použít. V opačném případě ponechte prázdné."
+
 #, fuzzy
 #~| msgid ""
 #~| "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
@@ -303,9 +522,6 @@
 #~ "Zadejte heslo, které se použije pro přístup k LDAP databázi v případech, ."
 #~ "kdy rootovský proces něco vyhledává."
 
-#~ msgid "LDAP version to use:"
-#~ msgstr "Verze LDAPu, která se má použít:"
-
 #~ msgid ""
 #~ "Please enter which version of the LDAP protocol is to use. It is usually "
 #~ "a good idea to set this to highest available version number."
@@ -398,11 +614,6 @@
 #~ msgstr "Toto je výchozí nastavení pro všechny nové instalace."
 
 #~ msgid ""
-#~ "Enter the name of the account that will be used to log in to the LDAP "
-#~ "database."
-#~ msgstr "Zadejte jméno účtu, který se použije pro přístup k LDAP databázi."
-
-#~ msgid ""
 #~ "Also, before removing this package, it is wise to remove the ldap entries "
 #~ "from nsswitch.conf to keep basic services functioning."
 #~ msgstr ""

Modified: nss-pam-ldapd/debian/po/da.po
==============================================================================
--- nss-pam-ldapd/debian/po/da.po       Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/da.po       Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -74,50 +74,259 @@
 "fra deres domænenavne til dette formål. Eksempelvis ville domænet »eksempel."
 "dk« bruge »dc=eksempel,dc=dk« som det særlige navn på søgebasen."
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
-msgid "LDAP database user:"
-msgstr "LDAP-databasebruger:"
+msgid "none"
+msgstr ""
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid "LDAP authentication to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
+"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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
 msgstr ""
-"Hvis LDAP-databasen kræver et brugernavn til almindelige opslag, så angiv "
-"her navnet på kontoen, som vil blive brugt. Ellers lad det stå tomt."
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
+#: ../nslcd.templates:4001
+msgid "LDAP database user:"
+msgstr "LDAP-databasebruger:"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:4001
+#, fuzzy
+#| msgid "This value should be specified as a DN (distinguished name)."
+msgid ""
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. 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: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr "Adgangskode for LDAP-bruger:"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Angiv adgangskoden som vil blive brugt til at logge på til LDAP-databasen."
 
+#. Type: 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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm 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: 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL authentication 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."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"the LDAP database."
+msgstr ""
+"Angiv adgangskoden som vil blive brugt til at logge på til LDAP-databasen."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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)."
+msgstr "Denne værdi bør angives som et DN (særligt navn - distinguished name)."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr "Brug StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -127,37 +336,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr "aldrig"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr "tillad"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr "forsøg"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr "kræv"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr "Tjek servers SSL-certifikat:"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -289,3 +498,10 @@
 "Vælg venligst hvorvidt /etc/nsswitch.conf automatisk skal have tilføjet det "
 "krævede punkt (i dette tilfælde skal det fjernes efterfølgende) eller "
 "hvorvidt, det skal efterlades til en administrator for manuel redigering."
+
+#~ msgid ""
+#~ "If the LDAP database requires a login for normal lookups, enter the name "
+#~ "of the account that will be used here. Leave it empty otherwise."
+#~ msgstr ""
+#~ "Hvis LDAP-databasen kræver et brugernavn til almindelige opslag, så angiv "
+#~ "her navnet på kontoen, som vil blive brugt. Ellers lad det stå tomt."

Modified: nss-pam-ldapd/debian/po/de.po
==============================================================================
--- nss-pam-ldapd/debian/po/de.po       Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/de.po       Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -81,53 +81,261 @@
 "würde bei der Domäne »example.net« der DN »dc=example,dc=net« als Suchbasis "
 "verwendet werden."
 
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "none"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid "LDAP authentication to use:"
+msgstr ""
+
+#. Type: select
+#. 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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
+msgstr ""
+
 #  Template: libnss-ldap/binddn
 #  ddtp-prioritize: 56
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
+#: ../nslcd.templates:4001
 msgid "LDAP database user:"
 msgstr "LDAP-Datenbank-Benutzer:"
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
+#: ../nslcd.templates:4001
+#, fuzzy
+#| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
-msgstr ""
-"Wenn die LDAP-Datenbank für normale Anfragen eine Authentifizierung "
-"verlangt, geben Sie hier den Benutzernamen ein, der dafür verwendet werden "
-"soll. Andernfalls lassen Sie das Feld leer."
-
-#. Type: string
-#. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. This value should be specified as a DN (distinguished name)."
 msgstr "Dieser Wert sollte ein DN (distinguished name) sein."
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr "Passwort des LDAP-Benutzers:"
 
 #
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "Geben Sie das Passwort für die Anmeldung an der LDAP-Datenbank ein."
 
+#. Type: 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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm 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: 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL authentication 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."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"the LDAP database."
+msgstr "Geben Sie das Passwort für die Anmeldung an der LDAP-Datenbank ein."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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)."
+msgstr "Dieser Wert sollte ein DN (distinguished name) sein."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr "StartTLS benutzen?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -137,37 +345,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr "nie"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr "erlauben"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr "versuchen"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr "anfordern"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr "Das SSL-Zertifikat des Servers überprüfen:"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -301,3 +509,11 @@
 "hinzugefügt werden soll (in diesem Fall sollte dies anschließend nochmals "
 "überprüft werden) oder ob das manuelle Bearbeiten dem Administrator "
 "überlassen werden soll."
+
+#~ msgid ""
+#~ "If the LDAP database requires a login for normal lookups, enter the name "
+#~ "of the account that will be used here. Leave it empty otherwise."
+#~ msgstr ""
+#~ "Wenn die LDAP-Datenbank für normale Anfragen eine Authentifizierung "
+#~ "verlangt, geben Sie hier den Benutzernamen ein, der dafür verwendet "
+#~ "werden soll. Andernfalls lassen Sie das Feld leer."

Modified: nss-pam-ldapd/debian/po/es.po
==============================================================================
--- nss-pam-ldapd/debian/po/es.po       Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/es.po       Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -98,52 +98,334 @@
 "propósito. Por ejemplo, el dominio «ejemplo.net» utilizaría «dc=ejemplo,"
 "dc=net» como nombre distintivo de la base de búsquedas."
 
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "none"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#  Template: libnss-ldap/dblogin
+#  ddtp-prioritize: 56
+#
+# msgid ""
+# "database requires login"
+# msgstr ""
+#
+# msgid ""
+# "Does the LDAP database require login?"
+# msgstr ""
+#
+# msgid ""
+# "Answer this question affirmatively only if you can't retreive entries from "
+# "the database without logging in."
+# msgstr ""
+#
+# msgid ""
+# "Note: Under a normal setup, this is not needed."
+# msgstr ""
+#  Template: libnss-ldap/override
+#  ddtp-prioritize: 56
+#
+# msgid ""
+# "enable automatic configuration updates by debconf"
+# msgstr ""
+#
+# msgid ""
+# "Should debconf automatically update libnss-ldap's configuration file?"
+# msgstr ""
+#
+# msgid ""
+# "libnss-ldap has been moved to use debconf for its configuration."
+# msgstr ""
+#
+# msgid ""
+# "The file will be prepended with \"###DEBCONF###\"; you can disable the "
+# "debconf updates by removing that line."
+# msgstr ""
+#
+# msgid ""
+# "All new installations will have this by default."
+# msgstr ""
+#  Template: libnss-ldap/binddn
+#  ddtp-prioritize: 56
+#
+# msgid ""
+# "unprivileged database user"
+# msgstr ""
+#
+# msgid ""
+# "Enter the name of the account that will be used to log in to the LDAP "
+# "database."
+# msgstr ""
+#  Template: libnss-ldap/bindpw
+#  ddtp-prioritize: 56
+#
+# msgid ""
+# "password for database login account"
+# msgstr ""
+#
+# msgid ""
+# "Enter the password that will be used to log in to the LDAP database."
+# msgstr ""
+#  Template: shared/ldapns/ldap_version
+#  ddtp-prioritize: 56
+#
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+#, fuzzy
+msgid "LDAP authentication to use:"
+msgstr "Versión de LDAP a utilizar"
+
+#. Type: select
+#. 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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
+msgstr ""
+
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
+#: ../nslcd.templates:4001
 msgid "LDAP database user:"
 msgstr "Usuario de la base de datos LDAP:"
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
+#: ../nslcd.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Enter the password that will be used to log in to the LDAP database when "
+#| "the root process does lookups."
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. This value should be specified as a DN (distinguished name)."
 msgstr ""
-"Introduzca el nombre de la cuenta que utilizará, si la base de datos LDAP "
-"requiere una identificación para las búsquedas normales. En caso contrario, "
-"déjelo en blanco."
-
-#. Type: string
-#. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
-msgstr "Debe introducir el valor en forma de DN (nombre distintivo)."
+"Introduzca la contraseña que se utilizará para acceder a la base de datos "
+"LDAP cuando un proceso de superusuario realice búsquedas."
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr "Contraseña del usuario LDAP:"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Introduzca la contraseña que se utilizará para acceder a la base de datos "
 "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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm 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: 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL authentication 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 "
+"LDAP."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"the LDAP database."
+msgstr ""
+"Introduzca la contraseña que se utilizará para acceder a la base de datos "
+"LDAP."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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)."
+msgstr "Debe introducir el valor en forma de DN (nombre distintivo)."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr "¿Desea utilizar StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -153,37 +435,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr "nunca"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr "permitir"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr "intentar"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr "exigir"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr "Comprobar el certificado SSL del servidor:"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -317,6 +599,14 @@
 "automáticamente (en el caso de que se deba revisar después) o si se debería "
 "dejar al administrador editarla manualmente."
 
+#~ msgid ""
+#~ "If the LDAP database requires a login for normal lookups, enter the name "
+#~ "of the account that will be used here. Leave it empty otherwise."
+#~ msgstr ""
+#~ "Introduzca el nombre de la cuenta que utilizará, si la base de datos LDAP "
+#~ "requiere una identificación para las búsquedas normales. En caso "
+#~ "contrario, déjelo en blanco."
+
 #~| msgid ""
 #~| "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
 #~| "automatically now. Be sure to review the changes to /etc/nsswitch.conf "
@@ -352,83 +642,6 @@
 #~ msgid "LDAP root account password:"
 #~ msgstr "Contraseña de la cuenta de superusuario LDAP:"
 
-#~ msgid ""
-#~ "Enter the password that will be used to log in to the LDAP database when "
-#~ "the root process does lookups."
-#~ msgstr ""
-#~ "Introduzca la contraseña que se utilizará para acceder a la base de datos "
-#~ "LDAP cuando un proceso de superusuario realice búsquedas."
-
-#  Template: libnss-ldap/dblogin
-#  ddtp-prioritize: 56
-#
-# msgid ""
-# "database requires login"
-# msgstr ""
-#
-# msgid ""
-# "Does the LDAP database require login?"
-# msgstr ""
-#
-# msgid ""
-# "Answer this question affirmatively only if you can't retreive entries from "
-# "the database without logging in."
-# msgstr ""
-#
-# msgid ""
-# "Note: Under a normal setup, this is not needed."
-# msgstr ""
-#  Template: libnss-ldap/override
-#  ddtp-prioritize: 56
-#
-# msgid ""
-# "enable automatic configuration updates by debconf"
-# msgstr ""
-#
-# msgid ""
-# "Should debconf automatically update libnss-ldap's configuration file?"
-# msgstr ""
-#
-# msgid ""
-# "libnss-ldap has been moved to use debconf for its configuration."
-# msgstr ""
-#
-# msgid ""
-# "The file will be prepended with \"###DEBCONF###\"; you can disable the "
-# "debconf updates by removing that line."
-# msgstr ""
-#
-# msgid ""
-# "All new installations will have this by default."
-# msgstr ""
-#  Template: libnss-ldap/binddn
-#  ddtp-prioritize: 56
-#
-# msgid ""
-# "unprivileged database user"
-# msgstr ""
-#
-# msgid ""
-# "Enter the name of the account that will be used to log in to the LDAP "
-# "database."
-# msgstr ""
-#  Template: libnss-ldap/bindpw
-#  ddtp-prioritize: 56
-#
-# msgid ""
-# "password for database login account"
-# msgstr ""
-#
-# msgid ""
-# "Enter the password that will be used to log in to the LDAP database."
-# msgstr ""
-#  Template: shared/ldapns/ldap_version
-#  ddtp-prioritize: 56
-#
-#, fuzzy
-#~ msgid "LDAP version to use:"
-#~ msgstr "Versión de LDAP a utilizar"
-
 #
 #, fuzzy
 #~ msgid ""

Modified: nss-pam-ldapd/debian/po/fi.po
==============================================================================
--- nss-pam-ldapd/debian/po/fi.po       Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/fi.po       Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -75,49 +75,255 @@
 "verkkotunnus ”esimerkki.fi” käyttäisi nimeä ”dc=esimerkki,dc=fi” hakukannan "
 "erittelevänä nimenä."
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
-msgid "LDAP database user:"
-msgstr "LDAP-tietokannan käyttäjätunnus:"
+msgid "none"
+msgstr ""
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid "LDAP authentication to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
+"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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
 msgstr ""
-"Jos LDAP-tietokannan täytyy kirjautua tehdäkseen normaaleja hakuja, anna "
-"käytettävän tunnuksen nimi tässä. Jätä muuten kenttä tyhjäksi."
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
+#: ../nslcd.templates:4001
+msgid "LDAP database user:"
+msgstr "LDAP-tietokannan käyttäjätunnus:"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:4001
+#, fuzzy
+#| msgid "This value should be specified as a DN (distinguished name)."
+msgid ""
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. This value should be specified as a DN (distinguished name)."
 msgstr "Tämä arvo tulisi antaa erittelevänä nimenä."
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr "LDAP-tunnuksen salasana:"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "Anna salasana, jota käytetään kirjauduttaessa LDAP-tietokantaan."
 
+#. 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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm that will be used to authenticate to the LDAP database."
+msgstr "Anna salasana, jota käytetään kirjauduttaessa LDAP-tietokantaan."
+
+#. 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL authentication identity that will be used to authenticate to "
+"the LDAP database."
+msgstr "Anna salasana, jota käytetään kirjauduttaessa LDAP-tietokantaan."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"the LDAP database."
+msgstr "Anna salasana, jota käytetään kirjauduttaessa LDAP-tietokantaan."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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)."
+msgstr "Tämä arvo tulisi antaa erittelevänä nimenä."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr "Käytetäänkö StartTLS:ää?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -127,37 +333,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr "ei koskaan"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr "salli"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr "yritä"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr "vaadi"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr "Palvelimen SSL-varmenteen tarkistus:"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -278,6 +484,13 @@
 "whether it should be left for an administrator to edit manually."
 msgstr ""
 
+#~ msgid ""
+#~ "If the LDAP database requires a login for normal lookups, enter the name "
+#~ "of the account that will be used here. Leave it empty otherwise."
+#~ msgstr ""
+#~ "Jos LDAP-tietokannan täytyy kirjautua tehdäkseen normaaleja hakuja, anna "
+#~ "käytettävän tunnuksen nimi tässä. Jätä muuten kenttä tyhjäksi."
+
 #, fuzzy
 #~| msgid ""
 #~| "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "

Modified: nss-pam-ldapd/debian/po/fr.po
==============================================================================
--- nss-pam-ldapd/debian/po/fr.po       Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/fr.po       Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -80,52 +80,269 @@
 "domaine à cette fin. Par exemple, le domaine « example.net » utiliserait "
 "« dc=example,dc=net »."
 
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "none"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+#, fuzzy
+#| msgid "LDAP version to use:"
+msgid "LDAP authentication to use:"
+msgstr "Version du protocole LDAP :"
+
+#. Type: select
+#. 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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
+msgstr ""
+
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
+#: ../nslcd.templates:4001
 msgid "LDAP database user:"
 msgstr "Utilisateur de la base LDAP :"
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
+#: ../nslcd.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Enter the password that will be used to log in to the LDAP database when "
+#| "the root process does lookups."
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. This value should be specified as a DN (distinguished name)."
 msgstr ""
-"Si le serveur LDAP nécessite un identifiant pour les recherches ordinaires, "
-"veuillez indiquer le compte qui doit être utilisé. N'indiquez rien dans le "
-"cas contraire."
-
-#. Type: string
-#. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
-msgstr "Cette valeur doit être un nom distinctif (« DN »)."
+"Veuillez indiquer le mot de passe à utiliser pour s'identifier sur la base "
+"LDAP en tant que superutilisateur."
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr "Mot de passe de l'utilisateur LDAP :"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Veuillez indiquer le mot de passe à utiliser pour s'identifier sur la base "
 "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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm 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: 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL authentication 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 "
+"LDAP."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"the LDAP database."
+msgstr ""
+"Veuillez indiquer le mot de passe à utiliser pour s'identifier sur la base "
+"LDAP."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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)."
+msgstr "Cette valeur doit être un nom distinctif (« DN »)."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr "Faut-il utiliser StartTLS ?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -135,37 +352,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr "Jamais"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr "Autoriser"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr "Essayer"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr "Demander"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr "Contrôle du certificat SSL du serveur :"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -298,6 +515,14 @@
 "ajoutée automatiquement (ce qui peut nécessiter de la vérifier ensuite). "
 "Dans le cas contraire, un administrateur devra l'ajouter plus tard."
 
+#~ msgid ""
+#~ "If the LDAP database requires a login for normal lookups, enter the name "
+#~ "of the account that will be used here. Leave it empty otherwise."
+#~ msgstr ""
+#~ "Si le serveur LDAP nécessite un identifiant pour les recherches "
+#~ "ordinaires, veuillez indiquer le compte qui doit être utilisé. N'indiquez "
+#~ "rien dans le cas contraire."
+
 #, fuzzy
 #~| msgid ""
 #~| "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "
@@ -339,13 +564,6 @@
 #~ msgstr "Mot de passe du superutilisateur LDAP :"
 
 #~ msgid ""
-#~ "Enter the password that will be used to log in to the LDAP database when "
-#~ "the root process does lookups."
-#~ msgstr ""
-#~ "Veuillez indiquer le mot de passe à utiliser pour s'identifier sur la "
-#~ "base LDAP en tant que superutilisateur."
-
-#~ msgid ""
 #~ "When using the ldapi scheme, %2f should be used to escape slashes (e.g. "
 #~ "ldapi://%2fvar%2frun%2fldapi_sock/)"
 #~ msgstr ""
@@ -353,9 +571,6 @@
 #~ "remplacer les barres obliques (« slashes »), par exemple : « ldapi://"
 #~ "%2fvar%2frun%2fldapi_sock/ »."
 
-#~ msgid "LDAP version to use:"
-#~ msgstr "Version du protocole LDAP :"
-
 #~ msgid ""
 #~ "Please enter which version of the LDAP protocol is to use. It is usually "
 #~ "a good idea to set this to highest available version number."

Modified: nss-pam-ldapd/debian/po/gl.po
==============================================================================
--- nss-pam-ldapd/debian/po/gl.po       Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/gl.po       Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -75,52 +75,263 @@
 "dominio «exemplo.net» debería empregar «dc=exemplo,dc=net» como nome "
 "distintivo da base de procura."
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
-msgid "LDAP database user:"
-msgstr "Usuario da base de datos LDAP:"
+msgid "none"
+msgstr ""
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid "LDAP authentication to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
+"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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
 msgstr ""
-"Se a base de datos do LDAP require de identificación para procuras normais, "
-"indique aquí o nome da conta que se empregará. Caso contrario déixeo en "
-"branco."
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
+#: ../nslcd.templates:4001
+msgid "LDAP database user:"
+msgstr "Usuario da base de datos LDAP:"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:4001
+#, fuzzy
+#| msgid "This value should be specified as a DN (distinguished name)."
+msgid ""
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. This value should be specified as a DN (distinguished name)."
 msgstr "Este valor debe especificarse como un DN (nome distintivo)."
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr "Contrasinal do usuario de LDAP:"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Indique o contrasinal que se ha empregar para acceder á base de datos do "
 "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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm 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: 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL authentication 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 "
+"LDAP."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"the LDAP database."
+msgstr ""
+"Indique o contrasinal que se ha empregar para acceder á base de datos do "
+"LDAP."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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)."
+msgstr "Este valor debe especificarse como un DN (nome distintivo)."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr "Debe empregarse StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -130,37 +341,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr "nunca"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr "permitir"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr "tentar"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr "demandar"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr "Comprobación do certificado SSL do servidor:"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -283,6 +494,14 @@
 "whether it should be left for an administrator to edit manually."
 msgstr ""
 
+#~ msgid ""
+#~ "If the LDAP database requires a login for normal lookups, enter the name "
+#~ "of the account that will be used here. Leave it empty otherwise."
+#~ msgstr ""
+#~ "Se a base de datos do LDAP require de identificación para procuras "
+#~ "normais, indique aquí o nome da conta que se empregará. Caso contrario "
+#~ "déixeo en branco."
+
 #, fuzzy
 #~| msgid ""
 #~| "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "

Modified: nss-pam-ldapd/debian/po/it.po
==============================================================================
--- nss-pam-ldapd/debian/po/it.po       Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/it.po       Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -73,52 +73,261 @@
 "dominio «esempio.net» userebbe «dc=esempio,dc=net» come DN della base di "
 "ricerca."
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
-msgid "LDAP database user:"
-msgstr "Utente del database LDAP:"
+msgid "none"
+msgstr ""
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid "LDAP authentication to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
+"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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
 msgstr ""
-"Se il database LDAP richiede l'accesso per le normali ricerche, inserire il "
-"nome dell'account che verrà utilizzato per l'accesso. In caso contrario, "
-"lasciare vuoto."
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
+#: ../nslcd.templates:4001
+msgid "LDAP database user:"
+msgstr "Utente del database LDAP:"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:4001
+#, fuzzy
+#| msgid "This value should be specified as a DN (distinguished name)."
+msgid ""
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. This value should be specified as a DN (distinguished name)."
 msgstr ""
 "Questo valore dovrebbe essere specificato come DN (distinguished name)."
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr "Password dell'utente LDAP:"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Inserire la password che verrà utilizzata per accedere al database LDAP."
 
+#. Type: 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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm that will be used to authenticate to the LDAP database."
+msgstr ""
+"Inserire la password che verrà utilizzata per accedere al database LDAP."
+
+#. 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL authentication identity that will be used to authenticate to "
+"the LDAP database."
+msgstr ""
+"Inserire la password che verrà utilizzata per accedere al database LDAP."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"the LDAP database."
+msgstr ""
+"Inserire la password che verrà utilizzata per accedere al database LDAP."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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)."
+msgstr ""
+"Questo valore dovrebbe essere specificato come DN (distinguished name)."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr "Utilizzare StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -128,37 +337,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr "mai"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr "consenti"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr "prova"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr "richiedi"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr "Controllare il certificato del server SSL?"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -290,6 +499,14 @@
 "nsswitch.conf» o se si preferisce l'immissione manuale da parte di un "
 "amministratore."
 
+#~ msgid ""
+#~ "If the LDAP database requires a login for normal lookups, enter the name "
+#~ "of the account that will be used here. Leave it empty otherwise."
+#~ msgstr ""
+#~ "Se il database LDAP richiede l'accesso per le normali ricerche, inserire "
+#~ "il nome dell'account che verrà utilizzato per l'accesso. In caso "
+#~ "contrario, lasciare vuoto."
+
 #, fuzzy
 #~| msgid ""
 #~| "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "

Modified: nss-pam-ldapd/debian/po/ja.po
==============================================================================
--- nss-pam-ldapd/debian/po/ja.po       Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/ja.po       Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -66,49 +66,255 @@
 "素をこの目的に使っています。たとえば、ドメイン \"example.net\" では検索ベース"
 "の識別名として \"dc=example,dc=net\" を使っているでしょう。"
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
-msgid "LDAP database user:"
-msgstr "LDAP データベースユーザ:"
+msgid "none"
+msgstr ""
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid "LDAP authentication to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
+"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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
 msgstr ""
-"通常のルックアップに LDAP データベースがログインを必要とするのであれば、利用"
-"するアカウント名をここに入力してください。そうでなければ空のままにします。"
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
+#: ../nslcd.templates:4001
+msgid "LDAP database user:"
+msgstr "LDAP データベースユーザ:"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:4001
+#, fuzzy
+#| msgid "This value should be specified as a DN (distinguished name)."
+msgid ""
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. This value should be specified as a DN (distinguished name)."
 msgstr "この値は DN (識別名) として指定すべきです。"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr "LDAP ユーザパスワード:"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm that will be used to authenticate to the LDAP database."
+msgstr "LDAP データベースにログインするのに使うパスワードを入力してください。"
+
+#. 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL authentication identity that will be used to authenticate to "
+"the LDAP database."
+msgstr "LDAP データベースにログインするのに使うパスワードを入力してください。"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"the LDAP database."
+msgstr "LDAP データベースにログインするのに使うパスワードを入力してください。"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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)."
+msgstr "この値は DN (識別名) として指定すべきです。"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr "StartTLS を利用しますか?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -118,37 +324,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr "使わない"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr "許可"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr "試行"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr "要求"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr "サーバの SSL 証明書のチェック:"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -275,3 +481,11 @@
 msgstr ""
 "/etc/nsswitch.conf に自動で必須エントリを追加するか (この場合、後で再確認して"
 "ください)、管理者が手動で変更するためにそのままにしておくかを選んでください。"
+
+#~ msgid ""
+#~ "If the LDAP database requires a login for normal lookups, enter the name "
+#~ "of the account that will be used here. Leave it empty otherwise."
+#~ msgstr ""
+#~ "通常のルックアップに LDAP データベースがログインを必要とするのであれば、利"
+#~ "用するアカウント名をここに入力してください。そうでなければ空のままにしま"
+#~ "す。"

Modified: nss-pam-ldapd/debian/po/nb.po
==============================================================================
--- nss-pam-ldapd/debian/po/nb.po       Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/nb.po       Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -73,49 +73,255 @@
 "komponentene i domenenavnet til dette, For eksempel, domenet «example.net» "
 "ville bruke «dc=example,dc=net» som entydig navn på søkebasen."
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
-msgid "LDAP database user:"
-msgstr "LDAP databasebruker:"
+msgid "none"
+msgstr ""
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid "LDAP authentication to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
+"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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
 msgstr ""
-"Hvis LDAP-databasen trenger et login-navn for normale oppslag, så skriv inn "
-"her navnet på kontoen som vil bli brukt. La det stå tomt ellers."
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
+#: ../nslcd.templates:4001
+msgid "LDAP database user:"
+msgstr "LDAP databasebruker:"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:4001
+#, fuzzy
+#| msgid "This value should be specified as a DN (distinguished name)."
+msgid ""
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. This value should be specified as a DN (distinguished name)."
 msgstr "Verdien må oppgis som et DN - entydig navn."
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr "LDAP bruker-passord:"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm that will be used to authenticate to the LDAP database."
+msgstr "Oppgi passordet som vil bli brukt til å logge inn i LDAP-databasen."
+
+#. 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL authentication identity that will be used to authenticate to "
+"the LDAP database."
+msgstr "Oppgi passordet som vil bli brukt til å logge inn i LDAP-databasen."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"the LDAP database."
+msgstr "Oppgi passordet som vil bli brukt til å logge inn i LDAP-databasen."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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)."
+msgstr "Verdien må oppgis som et DN - entydig navn."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr "Bruke StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -125,37 +331,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr "aldri"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr "tillat"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr "forsøk"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr "krev"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr "Kontroller tjenerens SSL-sertifikat:"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -284,3 +490,10 @@
 "Velg om /etc/nsswitch.conf skal få det nødvendige innslaget lagt til "
 "automatisk (i så fall bør det kontrolleres etterpå), eller om det skal "
 "legges til manuelt siden av en administrator."
+
+#~ msgid ""
+#~ "If the LDAP database requires a login for normal lookups, enter the name "
+#~ "of the account that will be used here. Leave it empty otherwise."
+#~ msgstr ""
+#~ "Hvis LDAP-databasen trenger et login-navn for normale oppslag, så skriv "
+#~ "inn her navnet på kontoen som vil bli brukt. La det stå tomt ellers."

Modified: nss-pam-ldapd/debian/po/nl.po
==============================================================================
--- nss-pam-ldapd/debian/po/nl.po       Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/nl.po       Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -28,9 +28,9 @@
 "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://' gebruikt worden. Het poortnummer is optioneel."
+"Wat is de URI van de gebruikte LDAP-server? Het formaat is 'ldap://"
+"<computernaam of IP>:<poortnummer>/'. Ook kan 'ldaps://' of 'ldapi://' "
+"gebruikt worden. Het poortnummer is optioneel."
 
 #. Type: string
 #. Description
@@ -39,9 +39,9 @@
 "When using an ldap or ldaps scheme it is recommended to use an IP address to "
 "avoid failures when domain name services are unavailable."
 msgstr ""
-"Bij gebruik van  'ldap'- of 'ldaps'-schema's is het aanbevolen "
-"om een IP-adres te gebruiken om problemen te voorkomen "
-"wanneer naamdiensten onbeschikbaar zijn."
+"Bij gebruik van  'ldap'- of 'ldaps'-schema's is het aanbevolen om een IP-"
+"adres te gebruiken om problemen te voorkomen wanneer naamdiensten "
+"onbeschikbaar zijn."
 
 #. Type: string
 #. Description
@@ -69,52 +69,267 @@
 "domeinnaam \"example.net\" zou gebruik maken van \"dc=example,dc=net\" als "
 "de onderscheiden naam van de zoekbasis."
 
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "none"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid "LDAP authentication to use:"
+msgstr ""
+
+#. Type: select
+#. 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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
+msgstr ""
+
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
+#: ../nslcd.templates:4001
 msgid "LDAP database user:"
 msgstr "LDAP-databasegebruiker:"
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
+#: ../nslcd.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Enter the password that will be used to log in to the LDAP database when "
+#| "the root process does lookups."
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. This value should be specified as a DN (distinguished name)."
 msgstr ""
-"Als de LDAP-database aanmelden vereist voor normale zoekacties dient u hier "
-"de naam van de te gebruiken account op te geven. As aanmelden niet nodig "
-"kunt u dit leeg laten."
-
-#. Type: string
-#. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
-msgstr "Deze waarde dient opgegeven te worden als een DN (distinguished name)."
+"Wat is het wachtwoord dat gebruikt zal worden om op de LDAP-database aan te "
+"melden wanneer het root-proces zoekacties doet?"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr "Wachtwoord van de LDAP-gebruiker:"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Voer het wachtwoord in dat gebruikt zal worden om op de LDAP-database aan te "
 "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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm 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: 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL authentication 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 "
+"melden."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"the LDAP database."
+msgstr ""
+"Voer het wachtwoord in dat gebruikt zal worden om op de LDAP-database aan te "
+"melden."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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)."
+msgstr "Deze waarde dient opgegeven te worden als een DN (distinguished name)."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -122,37 +337,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -192,8 +407,8 @@
 "changes."
 msgstr ""
 "Hier kunt u de diensten selecteren die voor LDAP-zoekacties geactiveerd "
-"dienen te worden. De nieuwe LDAP-zoekacties worden toegevoegd "
-"als de laatste gegevensbron. Gelieve deze aanpassingen te controleren."
+"dienen te worden. De nieuwe LDAP-zoekacties worden toegevoegd als de laatste "
+"gegevensbron. Gelieve deze aanpassingen te controleren."
 
 #. Type: boolean
 #. Description
@@ -254,6 +469,14 @@
 "whether it should be left for an administrator to edit manually."
 msgstr ""
 
+#~ msgid ""
+#~ "If the LDAP database requires a login for normal lookups, enter the name "
+#~ "of the account that will be used here. Leave it empty otherwise."
+#~ msgstr ""
+#~ "Als de LDAP-database aanmelden vereist voor normale zoekacties dient u "
+#~ "hier de naam van de te gebruiken account op te geven. As aanmelden niet "
+#~ "nodig kunt u dit leeg laten."
+
 #~ msgid "LDAP server Uniform Resource Identifier:"
 #~ msgstr "URI (Uniform Resource Identifier) van de LDAP-server:"
 
@@ -274,10 +497,3 @@
 
 #~ msgid "LDAP root account password:"
 #~ msgstr "Wachtwoord van de LDAP-account voor root:"
-
-#~ msgid ""
-#~ "Enter the password that will be used to log in to the LDAP database when "
-#~ "the root process does lookups."
-#~ msgstr ""
-#~ "Wat is het wachtwoord dat gebruikt zal worden om op de LDAP-database aan "
-#~ "te melden wanneer het root-proces zoekacties doet?"

Modified: nss-pam-ldapd/debian/po/pt.po
==============================================================================
--- nss-pam-ldapd/debian/po/pt.po       Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/pt.po       Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -74,52 +74,263 @@
 "domínio \"exemplo.net\" deverá usar \"dc=exemplo,dc=net\" como nome distinto "
 "da base de busca."
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
-msgid "LDAP database user:"
-msgstr "Utilizador da base de dados LDAP:"
+msgid "none"
+msgstr ""
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid "LDAP authentication to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
+"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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
 msgstr ""
-"Se a base de dados LDAP requerer autenticação para buscas normais, indique "
-"aqui o nome da conta que vai ser usada. Em caso contrário, deixe o campo "
-"vazio."
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
+#: ../nslcd.templates:4001
+msgid "LDAP database user:"
+msgstr "Utilizador da base de dados LDAP:"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:4001
+#, fuzzy
+#| msgid "This value should be specified as a DN (distinguished name)."
+msgid ""
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. This value should be specified as a DN (distinguished name)."
 msgstr "Este valor deve ser especificado como um nome distinto (DN)."
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr "Palavra-passe de utilizador LDAP:"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Indique a palavra-passe que vai ser usada para 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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm 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: 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL authentication 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 "
+"LDAP."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"the LDAP database."
+msgstr ""
+"Indique a palavra-passe que vai ser usada para autenticação na base de dados "
+"LDAP."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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)."
+msgstr "Este valor deve ser especificado como um nome distinto (DN)."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr "Utilizar StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -129,37 +340,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr "nunca"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr "permitir"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr "tentar"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr "obrigar"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr "Verificar o certificado SSL do servidor:"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -293,6 +504,14 @@
 "posteriormente) ou se deverá ser deixado para um administrador editar "
 "manualmente."
 
+#~ msgid ""
+#~ "If the LDAP database requires a login for normal lookups, enter the name "
+#~ "of the account that will be used here. Leave it empty otherwise."
+#~ msgstr ""
+#~ "Se a base de dados LDAP requerer autenticação para buscas normais, "
+#~ "indique aqui o nome da conta que vai ser usada. Em caso contrário, deixe "
+#~ "o campo vazio."
+
 #, fuzzy
 #~| msgid ""
 #~| "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "

Modified: nss-pam-ldapd/debian/po/pt_BR.po
==============================================================================
--- nss-pam-ldapd/debian/po/pt_BR.po    Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/pt_BR.po    Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -70,49 +70,266 @@
 "dom�nio \"example.net\" usaria \"dc=example,dc=net\" como o nome distinto da "
 "base de procura."
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "none"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
 #, fuzzy
-msgid "LDAP database user:"
-msgstr "Usu�rio n�o previlegiado da base de dados."
+msgid "LDAP authentication to use:"
+msgstr "Vers�o do protocolo LDAP a ser utilizada."
 
-#. Type: string
+#. Type: select
 #. Description
-#: ../nslcd.templates:3001
+#: ../nslcd.templates:3002
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
+"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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
+#: ../nslcd.templates:4001
+#, fuzzy
+msgid "LDAP database user:"
+msgstr "Usu�rio n�o previlegiado da base de dados."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Enter the name of the account that will be used to log in to the LDAP "
+#| "database."
+msgid ""
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. 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: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr ""
 "Informe a senha que ser� usada para a autentica��o na base de dados LDAP."
 
+#. Type: 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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm 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: 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid ""
+#| "Enter the name of the account that will be used to log in to the LDAP "
+#| "database."
+msgid ""
+"Enter the SASL authentication identity that will be used to authenticate to "
+"the LDAP database."
+msgstr ""
+"Informe o nome da conta que ser� usada para se autenticar na base de dados "
+"LDAP."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"the LDAP database."
+msgstr ""
+"Informe a senha que ser� usada para a autentica��o na base de dados LDAP."
+
+#. Type: string
+#. 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)."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -120,37 +337,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -255,10 +472,6 @@
 #~ "Informe a senha que ser� usada para a autentica��o na base de dados LDAP."
 
 #, fuzzy
-#~ msgid "LDAP version to use:"
-#~ msgstr "Vers�o do protocolo LDAP a ser utilizada."
-
-#, fuzzy
 #~ msgid ""
 #~ "Please enter which version of the LDAP protocol is to use. It is usually "
 #~ "a good idea to set this to highest available version number."
@@ -356,13 +569,6 @@
 #~ msgstr "Todas as novas instala��es ter�o isso por padr�o."
 
 #~ msgid ""
-#~ "Enter the name of the account that will be used to log in to the LDAP "
-#~ "database."
-#~ msgstr ""
-#~ "Informe o nome da conta que ser� usada para se autenticar na base de "
-#~ "dados LDAP."
-
-#~ msgid ""
 #~ "Also, before removing this package, it is wise to remove the ldap entries "
 #~ "from nsswitch.conf to keep basic services functioning."
 #~ msgstr ""

Modified: nss-pam-ldapd/debian/po/ru.po
==============================================================================
--- nss-pam-ldapd/debian/po/ru.po       Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/ru.po       Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -76,50 +76,259 @@
 "качестве уникального имени базы поиска использовалось бы \"dc=example,dc=net"
 "\"."
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
-msgid "LDAP database user:"
-msgstr "Пользователь базы данных LDAP:"
+msgid "none"
+msgstr ""
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid "LDAP authentication to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
+"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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
 msgstr ""
-"Если для обычного поиска по базе данных LDAP требуется регистрация, то "
-"введите здесь имя этой учётной записи. Иначе оставьте поле пустым."
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
+#: ../nslcd.templates:4001
+msgid "LDAP database user:"
+msgstr "Пользователь базы данных LDAP:"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:4001
+#, fuzzy
+#| msgid "This value should be specified as a DN (distinguished name)."
+msgid ""
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. This value should be specified as a DN (distinguished name)."
 msgstr "Значение должно быть указано в форме DN (уникального имени)."
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr "Пароль пользователя LDAP:"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm that will be used to authenticate to the LDAP database."
+msgstr ""
+"Введите пароль, который будет использован для подключения к базе данных LDAP."
+
+#. 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL authentication identity that will be used to authenticate to "
+"the LDAP database."
+msgstr ""
+"Введите пароль, который будет использован для подключения к базе данных LDAP."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"the LDAP database."
+msgstr ""
+"Введите пароль, который будет использован для подключения к базе данных LDAP."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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)."
+msgstr "Значение должно быть указано в форме DN (уникального имени)."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr "Использовать StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -129,37 +338,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr "никогда"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr "запросить"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr "попытаться"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr "обязательна"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr "Проверка SSL-сертификат сервера:"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -288,6 +497,13 @@
 "автоматически (по окончании проверьте изменения), или предоставить "
 "возможность администратору сделать это вручную."
 
+#~ msgid ""
+#~ "If the LDAP database requires a login for normal lookups, enter the name "
+#~ "of the account that will be used here. Leave it empty otherwise."
+#~ msgstr ""
+#~ "Если для обычного поиска по базе данных LDAP требуется регистрация, то "
+#~ "введите здесь имя этой учётной записи. Иначе оставьте поле пустым."
+
 #, fuzzy
 #~| msgid ""
 #~| "You can edit /etc/nsswitch.conf by hand or choose to remove the entries "

Modified: nss-pam-ldapd/debian/po/sv.po
==============================================================================
--- nss-pam-ldapd/debian/po/sv.po       Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/sv.po       Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -73,49 +73,255 @@
 "deras dom�nnamn f�r denna funktion. Till exempel att dom�nen \"example.net\" "
 "skulle anv�nda \"dc=example,dc=net\" som sitt DN-namn f�r s�kbasen."
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
-msgid "LDAP database user:"
-msgstr "LDAP-databasanv�ndare:"
+msgid "none"
+msgstr ""
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid "LDAP authentication to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
+"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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
 msgstr ""
-"Om LDAP-databasen kr�ver inloggning f�r vanliga uppslag, ange namnet p� det "
-"konto som ska anv�ndas h�r. L�mna annars tomt."
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
+#: ../nslcd.templates:4001
+msgid "LDAP database user:"
+msgstr "LDAP-databasanv�ndare:"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:4001
+#, fuzzy
+#| msgid "This value should be specified as a DN (distinguished name)."
+msgid ""
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. This value should be specified as a DN (distinguished name)."
 msgstr "Detta v�rde ska anges som ett DN (eng. \"distinguished name\")."
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr "LDAP-anv�ndarl�senord:"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 msgstr "Ange l�senordet som ska anv�ndas f�r att logga in p� LDAP-databasen."
 
+#. Type: 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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm 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: 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL authentication 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."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"the LDAP database."
+msgstr "Ange l�senordet som ska anv�ndas f�r att logga in p� LDAP-databasen."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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)."
+msgstr "Detta v�rde ska anges som ett DN (eng. \"distinguished name\")."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr "Anv�nda StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -125,37 +331,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr "aldrig"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr "till�t"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr "f�rs�k"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr "kr�v"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr "Kontrollera serverns SSL-certifikat:"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -284,3 +490,10 @@
 "V�lj huruvida den n�dv�ndiga posten ska l�ggas till i /etc/nsswitch.conf "
 "automatiskt (det b�r i s� fall kontrolleras i efterhand) eller om det ska "
 "l�mnas �t en administrat�r att redigera filen manuellt."
+
+#~ msgid ""
+#~ "If the LDAP database requires a login for normal lookups, enter the name "
+#~ "of the account that will be used here. Leave it empty otherwise."
+#~ msgstr ""
+#~ "Om LDAP-databasen kr�ver inloggning f�r vanliga uppslag, ange namnet p� "
+#~ "det konto som ska anv�ndas h�r. L�mna annars tomt."

Modified: nss-pam-ldapd/debian/po/templates.pot
==============================================================================
--- nss-pam-ldapd/debian/po/templates.pot       Thu Dec 30 17:25:17 2010        
(r1355)
+++ nss-pam-ldapd/debian/po/templates.pot       Thu Dec 30 17:26:56 2010        
(r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -62,47 +62,245 @@
 "name of the search base."
 msgstr ""
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
-msgid "LDAP database user:"
+msgid "none"
 msgstr ""
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid "LDAP authentication to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
+"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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
+#: ../nslcd.templates:4001
+msgid "LDAP database user:"
 msgstr ""
 
-#. Type: password
+#. Type: string
 #. Description
 #: ../nslcd.templates:4001
+msgid ""
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. This value should be specified as a DN (distinguished name)."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid ""
+"Enter the SASL realm that will be used to authenticate to the LDAP database."
+msgstr ""
+
+#. 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"Enter the SASL authentication identity that will be used to authenticate to "
+"the LDAP database."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+msgid ""
+"Enter the proxy authorisation identity that will be used to authenticate to "
+"the LDAP database."
+msgstr ""
+
+#. Type: string
+#. 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)."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -110,37 +308,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "

Modified: nss-pam-ldapd/debian/po/vi.po
==============================================================================
--- nss-pam-ldapd/debian/po/vi.po       Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/vi.po       Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\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"
@@ -73,49 +73,255 @@
 "phần tên miền cho mục đích này, v.d. miền « ví_dụ.net » sẽ sử dụng « "
 "dc=ví_dụ,dc=net » làm tên phân biệt của cơ bản tìm kiếm."
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
-msgid "LDAP database user:"
-msgstr "Người dùng cơ sở dữ liệu LDAP:"
+msgid "none"
+msgstr ""
 
-#. Type: string
-#. Description
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
 #: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid "LDAP authentication to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
+"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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
 msgstr ""
-"Nếu cơ sở dữ liệu LDAP yêu cầu đăng nhập để tra cứu một cách tiêu chuẩn, hãy "
-"gõ vào đây tên của tài khoản sẽ dùng. Không thì bỏ trống trường này."
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
+#: ../nslcd.templates:4001
+msgid "LDAP database user:"
+msgstr "Người dùng cơ sở dữ liệu LDAP:"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:4001
+#, fuzzy
+#| msgid "This value should be specified as a DN (distinguished name)."
+msgid ""
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. 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: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr "Mật khẩu người dùng LDAP:"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in 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
+#. 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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm 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: 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL authentication 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."
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"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: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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)."
+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
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr "Dùng StartTLS ?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -125,37 +331,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr "không bao giờ"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr "cho phép"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr "thử"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr "đòi hỏi"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr "Kiểm tra chứng nhận SSL của máy phục vụ :"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -284,6 +490,13 @@
 "added automatically (in which case it should be reviewed afterwards) or "
 "whether it should be left for an administrator to edit manually."
 msgstr ""
-"Hãy chọn nếu « /etc/nsswitch.conf » nên có mục nhập yêu cầu được tự động thêm 
"
-"(trong trường hợp đó nó nên được xem lại về sau), hoặc nếu nên để lại để "
-"quản trị xem lại."
+"Hãy chọn nếu « /etc/nsswitch.conf » nên có mục nhập yêu cầu được tự động "
+"thêm (trong trường hợp đó nó nên được xem lại về sau), hoặc nếu nên để lại "
+"để quản trị xem lại."
+
+#~ msgid ""
+#~ "If the LDAP database requires a login for normal lookups, enter the name "
+#~ "of the account that will be used here. Leave it empty otherwise."
+#~ msgstr ""
+#~ "Nếu cơ sở dữ liệu LDAP yêu cầu đăng nhập để tra cứu một cách tiêu chuẩn, "
+#~ "hãy gõ vào đây tên của tài khoản sẽ dùng. Không thì bỏ trống trường này."

Modified: nss-pam-ldapd/debian/po/zh_CN.po
==============================================================================
--- nss-pam-ldapd/debian/po/zh_CN.po    Thu Dec 30 17:25:17 2010        (r1355)
+++ nss-pam-ldapd/debian/po/zh_CN.po    Thu Dec 30 17:26:56 2010        (r1356)
@@ -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-08-28 13:39+0200\n"
+"POT-Creation-Date: 2010-12-30 17:25+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: zym <ming_zym@sina.com>\n"
 "Language-Team: \n"
@@ -65,47 +65,255 @@
 "请输入LDAP搜索起点DN。多数网站使用域名作,如域名\"example.net\"会使用"
 "\"dc=example,dc=net\"作为搜索的起点DN。"
 
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "none"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "simple"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../nslcd.templates:3001
+msgid "SASL"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:3002
+msgid "LDAP authentication to use:"
+msgstr ""
+
+#. Type: select
+#. 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"
+" * none: no authentication;\n"
+" * simple: simple clear text binddn/password;\n"
+" * SASL: one of the Simple Authentication and Security Layer\n"
+"         mechanisms."
+msgstr ""
+
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
+#: ../nslcd.templates:4001
 msgid "LDAP database user:"
 msgstr "LDAP数据库用户名:"
 
 #. Type: string
 #. Description
-#: ../nslcd.templates:3001
+#: ../nslcd.templates:4001
+#, fuzzy
+#| msgid "This value should be specified as a DN (distinguished name)."
 msgid ""
-"If the LDAP database requires a login for normal lookups, enter the name of "
-"the account that will be used here. Leave it empty otherwise."
-msgstr "如LDAP数据库在查询时需要登录,请输入登录帐号,否则请空着。"
-
-#. Type: string
-#. Description
-#: ../nslcd.templates:3001
-msgid "This value should be specified as a DN (distinguished name)."
+"Enter the name of the account that will be used to log in to the LDAP "
+"database. This value should be specified as a DN (distinguished name)."
 msgstr "这个值应该设置为一个DN (distinguished name)。"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "LDAP user password:"
 msgstr "LDAP用户密码:"
 
 #. Type: password
 #. Description
-#: ../nslcd.templates:4001
+#: ../nslcd.templates:5001
 msgid "Enter the password that will be used to log in to the LDAP database."
 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
+#: ../nslcd.templates:6001
+msgid "OTP"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+msgid "SASL mechanism to use:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../nslcd.templates:6002
+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"
+" * PLAIN: simple cleartext password mechanism;\n"
+" * NTLM: NT LAN Manager authentication mechanism;\n"
+" * CRAM-MD5: challenge-response scheme based on HMAC-MD5;\n"
+" * DIGEST-MD5: HTTP Digest compatible challenge-response scheme;\n"
+" * GSSAPI: used for Kerberos;\n"
+" * OTP: a One Time Password mechanism."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "SASL realm:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL realm that will be used to authenticate to the LDAP database."
+msgstr "输入登录LDAP数据库的的密码:"
+
+#. 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."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:7001
+msgid "The realm is appended to authentication and authorisation identities."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid "SASL authentication identity:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+#, fuzzy
+#| msgid "Enter the password that will be used to log in to the LDAP database."
+msgid ""
+"Enter the SASL authentication identity that will be used to authenticate to "
+"the LDAP database."
+msgstr "输入登录LDAP数据库的的密码:"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:8001
+msgid ""
+"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:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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 "
+"the LDAP database."
+msgstr "输入登录LDAP数据库的的密码:"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:9001
+#, 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)."
+msgstr "这个值应该设置为一个DN (distinguished name)。"
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid "Cyrus SASL security properties:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:10001
+msgid ""
+"Enter the Cyrus  SASL  security properties. Allowed values are described in "
+"the ldap.conf(5) manual page in the SASL OPTIONS section."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Kerberos credential cache file path:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../nslcd.templates:11001
+msgid "Enter the GSSAPI/Kerberos credential cache file name that will be used."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid "Use StartTLS?"
 msgstr "使用 StartTLS?"
 
 #. Type: boolean
 #. Description
-#: ../nslcd.templates:5001
+#: ../nslcd.templates:12001
 msgid ""
 "Please choose whether the connection to the LDAP server should use StartTLS "
 "to encrypt the connection."
@@ -113,37 +321,37 @@
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "never"
 msgstr "从不"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "allow"
 msgstr "允许"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "try"
 msgstr "尝试"
 
 #. Type: select
 #. Choices
-#: ../nslcd.templates:6001
+#: ../nslcd.templates:13001
 msgid "demand"
 msgstr "必须"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 msgid "Check server's SSL certificate:"
 msgstr "检查服务器端的SSL证书:"
 
 #. Type: select
 #. Description
-#: ../nslcd.templates:6002
+#: ../nslcd.templates:13002
 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 "
@@ -260,3 +468,8 @@
 msgstr ""
 "请选择/etc/nsswitch.conf是自动添加必需的条目(后续应当进行审核)还是留给管理"
 "员手工修改。"
+
+#~ msgid ""
+#~ "If the LDAP database requires a login for normal lookups, enter the name "
+#~ "of the account that will be used here. Leave it empty otherwise."
+#~ msgstr "如LDAP数据库在查询时需要登录,请输入登录帐号,否则请空着。"
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits