[Pkg-citadel-commit] r374 - in citadel/trunk/debian: . po

Wed Aug 12 11:48:12 UTC 2009

Author: meskes
Date: 2009-08-12 11:48:12 +0000 (Wed, 12 Aug 2009)
New Revision: 374

Modified:
   citadel/trunk/debian/citadel-server.config
   citadel/trunk/debian/po/ar.po
   citadel/trunk/debian/po/cs.po
   citadel/trunk/debian/po/de.po
   citadel/trunk/debian/po/fi.po
   citadel/trunk/debian/po/fr.po
   citadel/trunk/debian/po/pt.po
   citadel/trunk/debian/po/ru.po
   citadel/trunk/debian/po/sv.po
   citadel/trunk/debian/po/vi.po
Log:
Lost a line.


Modified: citadel/trunk/debian/citadel-server.config
===================================================================

--- citadel/trunk/debian/citadel-server.config	2009-08-12 11:30:13 UTC (rev 373)
+++ citadel/trunk/debian/citadel-server.config	2009-08-12 11:48:12 UTC (rev 374)
@@ -81,6 +81,7 @@
 				*)
 					STATE=5
 					;;
+			esac
 			;;
 		    3)
 			if [ "$LoginType" = "Host" ]; then

Modified: citadel/trunk/debian/po/ar.po
===================================================================
--- citadel/trunk/debian/po/ar.po	2009-08-12 11:30:13 UTC (rev 373)
+++ citadel/trunk/debian/po/ar.po	2009-08-12 11:48:12 UTC (rev 374)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: citadel at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 13:17+0100\n"
+"POT-Creation-Date: 2009-08-12 13:31+0200\n"
 "PO-Revision-Date: 2008-04-03 17:55+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat at yahoo.com>\n"
 "Language-Team: Arabic <support at arabeyes.org>\n"
@@ -48,33 +48,107 @@
 "are running on the same computer."
 msgstr ""
 
-#. Type: boolean
+#. Type: select
+#. Choices
+#: ../citadel-server.templates:2001
+msgid "Internal, Host, LDAP, Active Directory"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
 msgid "Enable external authentication mode?"
 msgstr "ØªØ±ÙŠØ¯ ØªÙ…ÙƒÙŠÙ† ÙˆØ¶Ø¹ Ø§Ù„Ù…ØµØ§Ø¯Ù‚Ø© Ø§Ù„Ø®Ø§Ø±Ø¬ÙŠØ©ØŸ"
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
 msgid ""
 "Please choose the user authentication mode. By default Citadel will use its "
-"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
-"(or LDAP)."
+"own internal user accounts database. If you choose Host, Citadel users will "
+"have accounts on the host system, authenticated via /etc/passwd or a PAM "
+"source. LDAP chooses an RFC 2307 compliant directory server, the last option "
+"chooses the nonstandard MS Active Directory LDAP scheme."
 msgstr ""
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
 msgid ""
-"Do not accept this option unless you are sure it is required, since changing "
+"Do not change this option unless you are sure it is required, since changing "
 "back requires a full reinstall of Citadel."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../citadel-server.templates:3001
+msgid "LDAP host"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:3001
+msgid "Please enter host name or IP address of your LDAP server."
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "LDAP port number"
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "Please enter the port number of your LDAP service (usually 389)."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid "LDAP base DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid ""
+"Please enter the Base DN to search for authentication (for example: "
+"dc=example,dc=com),"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid "LDAP bind DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid ""
+"Please enter the DN of an account to use for binding to the LDAP server for "
+"performing queries. The account does not require any other privileges. If "
+"your LDAP server allows anonymous queries, you can. leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid "LDAP bind password"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid ""
+"If you entered a Bind DN in the previous question, you must now enter the "
+"password associated with that account.  Otherwise, you can leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:8001
 #, fuzzy
 #| msgid "Citadel administrator:"
 msgid "Citadel administrator username:"
@@ -82,7 +156,7 @@
 
 #. Type: string
 #. Description
-#: ../citadel-server.templates:3001
+#: ../citadel-server.templates:8001
 msgid ""
 "Please enter the name of the Citadel user account that should be granted "
 "administrative privileges once created. If using internal authentication "
@@ -92,13 +166,13 @@
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid "Administrator password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the administrator user."

Modified: citadel/trunk/debian/po/cs.po
===================================================================
--- citadel/trunk/debian/po/cs.po	2009-08-12 11:30:13 UTC (rev 373)
+++ citadel/trunk/debian/po/cs.po	2009-08-12 11:48:12 UTC (rev 374)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: citadel\n"
 "Report-Msgid-Bugs-To: citadel at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 13:17+0100\n"
+"POT-Creation-Date: 2009-08-12 13:31+0200\n"
 "PO-Revision-Date: 2009-03-09 20:06+0100\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -41,31 +41,48 @@
 "Pokud na tomto poÄÃtaÄi nemÃ¡te vÃce instancÃ Citadel, mÅ¯Å¾ete nejspÃÅ¡ "
 "ponechat vÃ½chozÃ hodnotu."
 
-#. Type: boolean
+#. Type: select
+#. Choices
+#: ../citadel-server.templates:2001
+msgid "Internal, Host, LDAP, Active Directory"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
 msgid "Enable external authentication mode?"
 msgstr "Povolit externÃ autentizaci?"
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
+#, fuzzy
+#| msgid ""
+#| "Please choose the user authentication mode. By default Citadel will use "
+#| "its own internal user accounts database. If you accept this option, "
+#| "Citadel users will have accounts on the host system, authenticated via /"
+#| "etc/passwd (or LDAP)."
 msgid ""
 "Please choose the user authentication mode. By default Citadel will use its "
-"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
-"(or LDAP)."
+"own internal user accounts database. If you choose Host, Citadel users will "
+"have accounts on the host system, authenticated via /etc/passwd or a PAM "
+"source. LDAP chooses an RFC 2307 compliant directory server, the last option "
+"chooses the nonstandard MS Active Directory LDAP scheme."
 msgstr ""
 "Zvolte si zpÅ¯sob autentizace uÅ¾ivatelÅ¯. Ve vÃ½chozÃm nastavenÃ pouÅ¾ÃvÃ¡ "
 "Citadel svou vlastnÃ databÃ¡zi uÅ¾ivatelskÃ½ch ÃºÄtÅ¯. PovolÃte-li tuto moÅ¾nost, "
 "budou mÃt uÅ¾ivatelÃ© Citadel ÃºÄty na hostitelskÃ©m systÃ©mu a budou se ovÄ›Å™ovat "
 "oproti /etc/passwd (nebo LDAPu)."
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
+#, fuzzy
+#| msgid ""
+#| "Do not accept this option unless you are sure it is required, since "
+#| "changing back requires a full reinstall of Citadel."
 msgid ""
-"Do not accept this option unless you are sure it is required, since changing "
+"Do not change this option unless you are sure it is required, since changing "
 "back requires a full reinstall of Citadel."
 msgstr ""
 "Pokud si nejste jisti, Å¾e tuto moÅ¾nost opravdu chcete, radÄ›ji ji "
@@ -74,12 +91,79 @@
 #. Type: string
 #. Description
 #: ../citadel-server.templates:3001
+msgid "LDAP host"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:3001
+msgid "Please enter host name or IP address of your LDAP server."
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "LDAP port number"
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "Please enter the port number of your LDAP service (usually 389)."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid "LDAP base DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid ""
+"Please enter the Base DN to search for authentication (for example: "
+"dc=example,dc=com),"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid "LDAP bind DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid ""
+"Please enter the DN of an account to use for binding to the LDAP server for "
+"performing queries. The account does not require any other privileges. If "
+"your LDAP server allows anonymous queries, you can. leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid "LDAP bind password"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid ""
+"If you entered a Bind DN in the previous question, you must now enter the "
+"password associated with that account.  Otherwise, you can leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:8001
 msgid "Citadel administrator username:"
 msgstr "UÅ¾ivatelskÃ© jmÃ©no sprÃ¡vce Citadel:"
 
 #. Type: string
 #. Description
-#: ../citadel-server.templates:3001
+#: ../citadel-server.templates:8001
 msgid ""
 "Please enter the name of the Citadel user account that should be granted "
 "administrative privileges once created. If using internal authentication "
@@ -93,13 +177,13 @@
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid "Administrator password:"
 msgstr "SprÃ¡vcovskÃ© heslo:"
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the administrator user."

Modified: citadel/trunk/debian/po/de.po
===================================================================
--- citadel/trunk/debian/po/de.po	2009-08-12 11:30:13 UTC (rev 373)
+++ citadel/trunk/debian/po/de.po	2009-08-12 11:48:12 UTC (rev 374)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: citadel 7.42-1\n"
 "Report-Msgid-Bugs-To: citadel at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 13:17+0100\n"
+"POT-Creation-Date: 2009-08-12 13:31+0200\n"
 "PO-Revision-Date: 2009-03-07 14:20+0100\n"
 "Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german at lists.debian.org>\n"
@@ -41,31 +41,48 @@
 "Normalerweise können Sie die Vorgabe beibehalten, falls Sie nicht mehrere "
 "Instanzen von Citadel auf dem gleichen Computer betreiben."
 
-#. Type: boolean
+#. Type: select
+#. Choices
+#: ../citadel-server.templates:2001
+msgid "Internal, Host, LDAP, Active Directory"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
 msgid "Enable external authentication mode?"
 msgstr "Externen Authentifizierungsmodus aktivieren?"
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
+#, fuzzy
+#| msgid ""
+#| "Please choose the user authentication mode. By default Citadel will use "
+#| "its own internal user accounts database. If you accept this option, "
+#| "Citadel users will have accounts on the host system, authenticated via /"
+#| "etc/passwd (or LDAP)."
 msgid ""
 "Please choose the user authentication mode. By default Citadel will use its "
-"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
-"(or LDAP)."
+"own internal user accounts database. If you choose Host, Citadel users will "
+"have accounts on the host system, authenticated via /etc/passwd or a PAM "
+"source. LDAP chooses an RFC 2307 compliant directory server, the last option "
+"chooses the nonstandard MS Active Directory LDAP scheme."
 msgstr ""
 "Bitte wählen Sie die Authentifizierungsmethode für Benutzer. Standardmäßig "
 "wird Citadel seine interne Benutzerkontendatenbank verwenden. Falls Sie "
 "dieser Option zustimmen, werden die Benutzer von Citadel Konten auf dem "
 "Gastsystem haben und via /etc/passwd (oder LDAP) authentifiziert werden."
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
+#, fuzzy
+#| msgid ""
+#| "Do not accept this option unless you are sure it is required, since "
+#| "changing back requires a full reinstall of Citadel."
 msgid ""
-"Do not accept this option unless you are sure it is required, since changing "
+"Do not change this option unless you are sure it is required, since changing "
 "back requires a full reinstall of Citadel."
 msgstr ""
 "Stimmen Sie dieser Option nur zu, wenn Sie sich sicher sind, dass Sie sie "
@@ -75,12 +92,79 @@
 #. Type: string
 #. Description
 #: ../citadel-server.templates:3001
+msgid "LDAP host"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:3001
+msgid "Please enter host name or IP address of your LDAP server."
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "LDAP port number"
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "Please enter the port number of your LDAP service (usually 389)."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid "LDAP base DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid ""
+"Please enter the Base DN to search for authentication (for example: "
+"dc=example,dc=com),"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid "LDAP bind DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid ""
+"Please enter the DN of an account to use for binding to the LDAP server for "
+"performing queries. The account does not require any other privileges. If "
+"your LDAP server allows anonymous queries, you can. leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid "LDAP bind password"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid ""
+"If you entered a Bind DN in the previous question, you must now enter the "
+"password associated with that account.  Otherwise, you can leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:8001
 msgid "Citadel administrator username:"
 msgstr "Benutzername des Citadel-Administrators:"
 
 #. Type: string
 #. Description
-#: ../citadel-server.templates:3001
+#: ../citadel-server.templates:8001
 msgid ""
 "Please enter the name of the Citadel user account that should be granted "
 "administrative privileges once created. If using internal authentication "
@@ -95,13 +179,13 @@
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid "Administrator password:"
 msgstr "Administrator-Passwort:"
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the administrator user."

Modified: citadel/trunk/debian/po/fi.po
===================================================================
--- citadel/trunk/debian/po/fi.po	2009-08-12 11:30:13 UTC (rev 373)
+++ citadel/trunk/debian/po/fi.po	2009-08-12 11:48:12 UTC (rev 374)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: citadel\n"
 "Report-Msgid-Bugs-To: citadel at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 13:17+0100\n"
+"POT-Creation-Date: 2009-08-12 13:31+0200\n"
 "PO-Revision-Date: 2009-03-07 20:20+0200\n"
 "Last-Translator: Esko ArajÃ¤rvi <edu at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -37,31 +37,48 @@
 "Oletusarvoa voidaan yleensÃ¤ kÃ¤yttÃ¤Ã¤, ellei samalla koneella ajeta useampia "
 "Citadel-instansseja."
 
-#. Type: boolean
+#. Type: select
+#. Choices
+#: ../citadel-server.templates:2001
+msgid "Internal, Host, LDAP, Active Directory"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
 msgid "Enable external authentication mode?"
 msgstr "Otetaanko ulkoinen tunnistautumistapa kÃ¤yttÃ¶Ã¶n?"
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
+#, fuzzy
+#| msgid ""
+#| "Please choose the user authentication mode. By default Citadel will use "
+#| "its own internal user accounts database. If you accept this option, "
+#| "Citadel users will have accounts on the host system, authenticated via /"
+#| "etc/passwd (or LDAP)."
 msgid ""
 "Please choose the user authentication mode. By default Citadel will use its "
-"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
-"(or LDAP)."
+"own internal user accounts database. If you choose Host, Citadel users will "
+"have accounts on the host system, authenticated via /etc/passwd or a PAM "
+"source. LDAP chooses an RFC 2307 compliant directory server, the last option "
+"chooses the nonstandard MS Active Directory LDAP scheme."
 msgstr ""
 "Valitse kÃ¤yttÃ¤jien tunnistautumistapa. Oletuksena Citadel kÃ¤yttÃ¤Ã¤ omaa "
 "sisÃ¤istÃ¤ kÃ¤yttÃ¤jÃ¤tunnustietokantaa. Jos valitset tÃ¤mÃ¤n vaihtoehdon, Citadel-"
 "kÃ¤yttÃ¤jille tehdÃ¤Ã¤n tunnukset isÃ¤ntÃ¤koneelle ja tunnistautuminen tapahtuu "
 "tiedoston /etc/passwd (tai LDAP:n) avulla."
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
+#, fuzzy
+#| msgid ""
+#| "Do not accept this option unless you are sure it is required, since "
+#| "changing back requires a full reinstall of Citadel."
 msgid ""
-"Do not accept this option unless you are sure it is required, since changing "
+"Do not change this option unless you are sure it is required, since changing "
 "back requires a full reinstall of Citadel."
 msgstr ""
 "Ã„lÃ¤ valitse tÃ¤tÃ¤ vaihtoehtoa, ellet ole varma, ettÃ¤ sitÃ¤ tarvitaan, koska "
@@ -70,12 +87,79 @@
 #. Type: string
 #. Description
 #: ../citadel-server.templates:3001
+msgid "LDAP host"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:3001
+msgid "Please enter host name or IP address of your LDAP server."
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "LDAP port number"
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "Please enter the port number of your LDAP service (usually 389)."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid "LDAP base DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid ""
+"Please enter the Base DN to search for authentication (for example: "
+"dc=example,dc=com),"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid "LDAP bind DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid ""
+"Please enter the DN of an account to use for binding to the LDAP server for "
+"performing queries. The account does not require any other privileges. If "
+"your LDAP server allows anonymous queries, you can. leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid "LDAP bind password"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid ""
+"If you entered a Bind DN in the previous question, you must now enter the "
+"password associated with that account.  Otherwise, you can leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:8001
 msgid "Citadel administrator username:"
 msgstr "Citadel-yllÃ¤pitÃ¤jÃ¤n kÃ¤yttÃ¤jÃ¤tunnus:"
 
 #. Type: string
 #. Description
-#: ../citadel-server.templates:3001
+#: ../citadel-server.templates:8001
 msgid ""
 "Please enter the name of the Citadel user account that should be granted "
 "administrative privileges once created. If using internal authentication "
@@ -89,13 +173,13 @@
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid "Administrator password:"
 msgstr "YllÃ¤pitÃ¤jÃ¤n salasana:"
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the administrator user."

Modified: citadel/trunk/debian/po/fr.po
===================================================================
--- citadel/trunk/debian/po/fr.po	2009-08-12 11:30:13 UTC (rev 373)
+++ citadel/trunk/debian/po/fr.po	2009-08-12 11:48:12 UTC (rev 374)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: fr-new\n"
 "Report-Msgid-Bugs-To: citadel at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 13:17+0100\n"
+"POT-Creation-Date: 2009-08-12 13:31+0200\n"
 "PO-Revision-Date: 2009-03-02 18:41+0100\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -44,31 +44,48 @@
 "Vous pouvez normalement sauter cette Ã©tape Ã  moins que plusieurs instances "
 "de Citadel ne tournent sur le mÃªme ordinateur."
 
-#. Type: boolean
+#. Type: select
+#. Choices
+#: ../citadel-server.templates:2001
+msgid "Internal, Host, LDAP, Active Directory"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
 msgid "Enable external authentication mode?"
 msgstr "Faut-il activer le mode d'authentificationÂ ?"
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
+#, fuzzy
+#| msgid ""
+#| "Please choose the user authentication mode. By default Citadel will use "
+#| "its own internal user accounts database. If you accept this option, "
+#| "Citadel users will have accounts on the host system, authenticated via /"
+#| "etc/passwd (or LDAP)."
 msgid ""
 "Please choose the user authentication mode. By default Citadel will use its "
-"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
-"(or LDAP)."
+"own internal user accounts database. If you choose Host, Citadel users will "
+"have accounts on the host system, authenticated via /etc/passwd or a PAM "
+"source. LDAP chooses an RFC 2307 compliant directory server, the last option "
+"chooses the nonstandard MS Active Directory LDAP scheme."
 msgstr ""
 "Veuillez choisir le mode d'authentification des utilisateurs. Par dÃ©faut, "
 "Citadel utilise son systÃ¨me interne de comptes. Si vous choisissez cette "
 "option, les comptes du systÃ¨me hÃ´te seront utilisÃ©s, avec authentification "
 "par /etc/passwd (ou LDAP)."
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
+#, fuzzy
+#| msgid ""
+#| "Do not accept this option unless you are sure it is required, since "
+#| "changing back requires a full reinstall of Citadel."
 msgid ""
-"Do not accept this option unless you are sure it is required, since changing "
+"Do not change this option unless you are sure it is required, since changing "
 "back requires a full reinstall of Citadel."
 msgstr ""
 "Ne choisissez cette option que si elle est indispensable car il n'est pas "
@@ -77,12 +94,79 @@
 #. Type: string
 #. Description
 #: ../citadel-server.templates:3001
+msgid "LDAP host"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:3001
+msgid "Please enter host name or IP address of your LDAP server."
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "LDAP port number"
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "Please enter the port number of your LDAP service (usually 389)."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid "LDAP base DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid ""
+"Please enter the Base DN to search for authentication (for example: "
+"dc=example,dc=com),"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid "LDAP bind DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid ""
+"Please enter the DN of an account to use for binding to the LDAP server for "
+"performing queries. The account does not require any other privileges. If "
+"your LDAP server allows anonymous queries, you can. leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid "LDAP bind password"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid ""
+"If you entered a Bind DN in the previous question, you must now enter the "
+"password associated with that account.  Otherwise, you can leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:8001
 msgid "Citadel administrator username:"
 msgstr "Identifiant de l'administrateur de CitadelÂ :"
 
 #. Type: string
 #. Description
-#: ../citadel-server.templates:3001
+#: ../citadel-server.templates:8001
 msgid ""
 "Please enter the name of the Citadel user account that should be granted "
 "administrative privileges once created. If using internal authentication "
@@ -96,13 +180,13 @@
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid "Administrator password:"
 msgstr "Mot de passe de l'administrateurÂ :"
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the administrator user."

Modified: citadel/trunk/debian/po/pt.po
===================================================================
--- citadel/trunk/debian/po/pt.po	2009-08-12 11:30:13 UTC (rev 373)
+++ citadel/trunk/debian/po/pt.po	2009-08-12 11:48:12 UTC (rev 374)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: citadel-7.42-1\n"
 "Report-Msgid-Bugs-To: citadel at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 13:17+0100\n"
+"POT-Creation-Date: 2009-08-12 13:31+0200\n"
 "PO-Revision-Date: 2009-03-03 21:57+0000\n"
 "Last-Translator: Pedro Ribeiro <p.m42.ribeiro at gmail.com>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -41,31 +41,48 @@
 "Pode normalmente deixar o valor prÃ©-definido a nÃ£o ser que execute vÃ¡rias "
 "instÃ¢ncias do Citadel no mesmo computador."
 
-#. Type: boolean
+#. Type: select
+#. Choices
+#: ../citadel-server.templates:2001
+msgid "Internal, Host, LDAP, Active Directory"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
 msgid "Enable external authentication mode?"
 msgstr "Habilitar modo de autenticaÃ§Ã£o externa?"
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
+#, fuzzy
+#| msgid ""
+#| "Please choose the user authentication mode. By default Citadel will use "
+#| "its own internal user accounts database. If you accept this option, "
+#| "Citadel users will have accounts on the host system, authenticated via /"
+#| "etc/passwd (or LDAP)."
 msgid ""
 "Please choose the user authentication mode. By default Citadel will use its "
-"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
-"(or LDAP)."
+"own internal user accounts database. If you choose Host, Citadel users will "
+"have accounts on the host system, authenticated via /etc/passwd or a PAM "
+"source. LDAP chooses an RFC 2307 compliant directory server, the last option "
+"chooses the nonstandard MS Active Directory LDAP scheme."
 msgstr ""
 "Por favor, escolha o mÃ©todo de autenticaÃ§Ã£o de utilizadores. Por omissÃ£o o "
 "Citadel irÃ¡ usar a base de dados interna de contas de utilizador. Se aceitar "
 "esta opÃ§Ã£o, os utilzadores do Citadel irÃ£o ter contas no sistema, com "
 "autenticaÃ§Ã£o via /etc/passwd (ou LDAP)."
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
+#, fuzzy
+#| msgid ""
+#| "Do not accept this option unless you are sure it is required, since "
+#| "changing back requires a full reinstall of Citadel."
 msgid ""
-"Do not accept this option unless you are sure it is required, since changing "
+"Do not change this option unless you are sure it is required, since changing "
 "back requires a full reinstall of Citadel."
 msgstr ""
 "NÃ£o aceite esta opÃ§Ã£o a nÃ£o ser que esteja seguro da sua necessidade, uma "
@@ -74,12 +91,79 @@
 #. Type: string
 #. Description
 #: ../citadel-server.templates:3001
+msgid "LDAP host"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:3001
+msgid "Please enter host name or IP address of your LDAP server."
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "LDAP port number"
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "Please enter the port number of your LDAP service (usually 389)."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid "LDAP base DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid ""
+"Please enter the Base DN to search for authentication (for example: "
+"dc=example,dc=com),"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid "LDAP bind DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid ""
+"Please enter the DN of an account to use for binding to the LDAP server for "
+"performing queries. The account does not require any other privileges. If "
+"your LDAP server allows anonymous queries, you can. leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid "LDAP bind password"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid ""
+"If you entered a Bind DN in the previous question, you must now enter the "
+"password associated with that account.  Otherwise, you can leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:8001
 msgid "Citadel administrator username:"
 msgstr "Nome de utilizador do administrador Citadel:"
 
 #. Type: string
 #. Description
-#: ../citadel-server.templates:3001
+#: ../citadel-server.templates:8001
 msgid ""
 "Please enter the name of the Citadel user account that should be granted "
 "administrative privileges once created. If using internal authentication "
@@ -93,13 +177,13 @@
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid "Administrator password:"
 msgstr "Palavra-passe de administrador:"
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the administrator user."

Modified: citadel/trunk/debian/po/ru.po
===================================================================
--- citadel/trunk/debian/po/ru.po	2009-08-12 11:30:13 UTC (rev 373)
+++ citadel/trunk/debian/po/ru.po	2009-08-12 11:48:12 UTC (rev 374)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: citadel 7.50-2\n"
 "Report-Msgid-Bugs-To: citadel at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 13:17+0100\n"
+"POT-Creation-Date: 2009-08-12 13:31+0200\n"
 "PO-Revision-Date: 2009-05-17 17:22+0400\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -47,20 +47,33 @@
 "ÐžÐ±Ñ‹Ñ‡Ð½Ð¾, Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ, ÐµÑÐ»Ð¸ Ð²Ñ‹ Ð½Ðµ Ð·Ð°Ð¿ÑƒÑÐºÐ°ÐµÑ‚Ðµ "
 "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ ÑÐºÐ·ÐµÐ¼Ð¿Ð»ÑÑ€Ð¾Ð² Citadel Ð½Ð° Ð¾Ð´Ð½Ð¾Ð¼ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ðµ."
 
-#. Type: boolean
+#. Type: select
+#. Choices
+#: ../citadel-server.templates:2001
+msgid "Internal, Host, LDAP, Active Directory"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
 msgid "Enable external authentication mode?"
 msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ñ€ÐµÐ¶Ð¸Ð¼ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸?"
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
+#, fuzzy
+#| msgid ""
+#| "Please choose the user authentication mode. By default Citadel will use "
+#| "its own internal user accounts database. If you accept this option, "
+#| "Citadel users will have accounts on the host system, authenticated via /"
+#| "etc/passwd (or LDAP)."
 msgid ""
 "Please choose the user authentication mode. By default Citadel will use its "
-"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
-"(or LDAP)."
+"own internal user accounts database. If you choose Host, Citadel users will "
+"have accounts on the host system, authenticated via /etc/passwd or a PAM "
+"source. LDAP chooses an RFC 2307 compliant directory server, the last option "
+"chooses the nonstandard MS Active Directory LDAP scheme."
 msgstr ""
 "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ€ÐµÐ¶Ð¸Ð¼ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ¾Ð¹ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸. ÐŸÐ¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Citadel "
 "Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ ÑÐ²Ð¾ÑŽ ÑÐ¾Ð±ÑÑ‚Ð²ÐµÐ½Ð½ÑƒÑŽ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÑŽÑŽ Ð±Ð°Ð·Ñƒ Ð´Ð°Ð½Ð½Ñ‹Ñ… ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ñ… Ð·Ð°Ð¿Ð¸ÑÐµÐ¹. Ð•ÑÐ»Ð¸ Ð²Ñ‹ "
@@ -68,11 +81,15 @@
 "ÑÑ‡Ð¸Ñ‚Ð°Ñ‚ÑŒÑÑ ÑƒÑ‡Ñ‘Ñ‚Ð½Ñ‹Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¼Ð°ÑˆÐ¸Ð½Ñ‹, Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð¾Ð½ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½, Ð° Ð´Ð»Ñ "
 "Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸ Ð±ÑƒÐ´ÐµÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑÑ Ñ„Ð°Ð¹Ð» /etc/passwd (Ð¸Ð»Ð¸ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ LDAP)."
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
+#, fuzzy
+#| msgid ""
+#| "Do not accept this option unless you are sure it is required, since "
+#| "changing back requires a full reinstall of Citadel."
 msgid ""
-"Do not accept this option unless you are sure it is required, since changing "
+"Do not change this option unless you are sure it is required, since changing "
 "back requires a full reinstall of Citadel."
 msgstr ""
 "ÐÐµ Ð¾Ñ‚Ð²ÐµÑ‡Ð°Ð¹Ñ‚Ðµ ÑƒÑ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾, ÐµÑÐ»Ð¸ Ð½Ðµ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹, Ñ‡Ñ‚Ð¾ ÑÑ‚Ð¾ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ð½ÑƒÐ¶Ð½Ð¾, "
@@ -81,12 +98,79 @@
 #. Type: string
 #. Description
 #: ../citadel-server.templates:3001
+msgid "LDAP host"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:3001
+msgid "Please enter host name or IP address of your LDAP server."
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "LDAP port number"
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "Please enter the port number of your LDAP service (usually 389)."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid "LDAP base DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid ""
+"Please enter the Base DN to search for authentication (for example: "
+"dc=example,dc=com),"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid "LDAP bind DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid ""
+"Please enter the DN of an account to use for binding to the LDAP server for "
+"performing queries. The account does not require any other privileges. If "
+"your LDAP server allows anonymous queries, you can. leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid "LDAP bind password"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid ""
+"If you entered a Bind DN in the previous question, you must now enter the "
+"password associated with that account.  Otherwise, you can leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:8001
 msgid "Citadel administrator username:"
 msgstr "Ð˜Ð¼Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð° Citadel:"
 
 #. Type: string
 #. Description
-#: ../citadel-server.templates:3001
+#: ../citadel-server.templates:8001
 msgid ""
 "Please enter the name of the Citadel user account that should be granted "
 "administrative privileges once created. If using internal authentication "
@@ -100,13 +184,13 @@
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid "Administrator password:"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ðº ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°:"
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the administrator user."

Modified: citadel/trunk/debian/po/sv.po
===================================================================
--- citadel/trunk/debian/po/sv.po	2009-08-12 11:30:13 UTC (rev 373)
+++ citadel/trunk/debian/po/sv.po	2009-08-12 11:48:12 UTC (rev 374)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: citadel\n"
 "Report-Msgid-Bugs-To: citadel at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 13:17+0100\n"
+"POT-Creation-Date: 2009-08-12 13:31+0200\n"
 "PO-Revision-Date: 2009-03-05 13:44+0100\n"
 "Last-Translator: Martin Bagge <brother at bsnet.se>\n"
 "Language-Team: swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -43,31 +43,48 @@
 "Standardvalet fungerar utmÃ¤rkt fÃ¶r alla som endast kÃ¶r en instans av Citadel "
 "pÃ¥ samma dator."
 
-#. Type: boolean
+#. Type: select
+#. Choices
+#: ../citadel-server.templates:2001
+msgid "Internal, Host, LDAP, Active Directory"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
 msgid "Enable external authentication mode?"
 msgstr "Aktivera det externa identifieringslÃ¤get?"
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
+#, fuzzy
+#| msgid ""
+#| "Please choose the user authentication mode. By default Citadel will use "
+#| "its own internal user accounts database. If you accept this option, "
+#| "Citadel users will have accounts on the host system, authenticated via /"
+#| "etc/passwd (or LDAP)."
 msgid ""
 "Please choose the user authentication mode. By default Citadel will use its "
-"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
-"(or LDAP)."
+"own internal user accounts database. If you choose Host, Citadel users will "
+"have accounts on the host system, authenticated via /etc/passwd or a PAM "
+"source. LDAP chooses an RFC 2307 compliant directory server, the last option "
+"chooses the nonstandard MS Active Directory LDAP scheme."
 msgstr ""
 "Ange vilket identifieringslÃ¤ge som ska anvÃ¤ndas. Standardvalet Ã¤r att "
 "Citadel anvÃ¤nder sin interna kontodatabase. Genom att vÃ¤lja detta alternativ "
 "kommer CitadelanvÃ¤ndarna ha konton pÃ¥ vÃ¤rdsystemet och identifieras via /etc/"
 "passwd (eller LDAP)."
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
+#, fuzzy
+#| msgid ""
+#| "Do not accept this option unless you are sure it is required, since "
+#| "changing back requires a full reinstall of Citadel."
 msgid ""
-"Do not accept this option unless you are sure it is required, since changing "
+"Do not change this option unless you are sure it is required, since changing "
 "back requires a full reinstall of Citadel."
 msgstr ""
 "VÃ¤lj inte detta alternativ om du inte Ã¤r helt sÃ¤ker pÃ¥ att det Ã¤r vad du "
@@ -76,12 +93,79 @@
 #. Type: string
 #. Description
 #: ../citadel-server.templates:3001
+msgid "LDAP host"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:3001
+msgid "Please enter host name or IP address of your LDAP server."
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "LDAP port number"
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "Please enter the port number of your LDAP service (usually 389)."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid "LDAP base DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid ""
+"Please enter the Base DN to search for authentication (for example: "
+"dc=example,dc=com),"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid "LDAP bind DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid ""
+"Please enter the DN of an account to use for binding to the LDAP server for "
+"performing queries. The account does not require any other privileges. If "
+"your LDAP server allows anonymous queries, you can. leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid "LDAP bind password"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid ""
+"If you entered a Bind DN in the previous question, you must now enter the "
+"password associated with that account.  Otherwise, you can leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:8001
 msgid "Citadel administrator username:"
 msgstr "AnvÃ¤ndarnamn fÃ¶r Citadel-administratÃ¶ren:"
 
 #. Type: string
 #. Description
-#: ../citadel-server.templates:3001
+#: ../citadel-server.templates:8001
 msgid ""
 "Please enter the name of the Citadel user account that should be granted "
 "administrative privileges once created. If using internal authentication "
@@ -95,13 +179,13 @@
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid "Administrator password:"
 msgstr "AdministratÃ¶rens lÃ¶senord:"
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the administrator user."

Modified: citadel/trunk/debian/po/vi.po
===================================================================
--- citadel/trunk/debian/po/vi.po	2009-08-12 11:30:13 UTC (rev 373)
+++ citadel/trunk/debian/po/vi.po	2009-08-12 11:48:12 UTC (rev 374)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: citadel 7.42-1\n"
 "Report-Msgid-Bugs-To: citadel at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 13:17+0100\n"
+"POT-Creation-Date: 2009-08-12 13:31+0200\n"
 "PO-Revision-Date: 2009-03-05 17:50+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -42,31 +42,48 @@
 "GiÃ¡ trá»‹ máº·c Ä‘á»‹nh thÆ°á»ng lÃ  thÃch há»£p náº¿u chá»‰ cÃ³ má»™t tiáº¿n trÃ¬nh Citadel Ä‘ang "
 "cháº¡y trÃªn mÃ¡y nÃ y."
 
-#. Type: boolean
+#. Type: select
+#. Choices
+#: ../citadel-server.templates:2001
+msgid "Internal, Host, LDAP, Active Directory"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
 msgid "Enable external authentication mode?"
 msgstr "Báºt cháº¿ Ä‘á»™ xÃ¡c thá»±c bÃªn ngoÃ i khÃ´ng?"
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
+#, fuzzy
+#| msgid ""
+#| "Please choose the user authentication mode. By default Citadel will use "
+#| "its own internal user accounts database. If you accept this option, "
+#| "Citadel users will have accounts on the host system, authenticated via /"
+#| "etc/passwd (or LDAP)."
 msgid ""
 "Please choose the user authentication mode. By default Citadel will use its "
-"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
-"(or LDAP)."
+"own internal user accounts database. If you choose Host, Citadel users will "
+"have accounts on the host system, authenticated via /etc/passwd or a PAM "
+"source. LDAP chooses an RFC 2307 compliant directory server, the last option "
+"chooses the nonstandard MS Active Directory LDAP scheme."
 msgstr ""
 "HÃ£y chá»n cháº¿ Ä‘á»™ xÃ¡c thá»±c ngÆ°á»i dÃ¹ng. Máº·c Ä‘á»‹nh lÃ  Citadel dÃ¹ng cÆ¡ sá»Ÿ dá»¯ liá»‡u "
 "tÃ i khoáº£n ngÆ°á»i dÃ¹ng ná»™i bá»™ cá»§a chÃnh nÃ³. Báºt tÃ¹y chá»n nÃ y thÃ¬ má»—i ngÆ°á»i "
 "dÃ¹ng Citadel sáº½ cÃ³ má»™t tÃ i khoáº£n trÃªn há»‡ thá»‘ng há»— trá»£, xÃ¡c thá»±c thÃ´ng qua Â« /"
 "etc/passwd Â» (hay LDAP)."
 
-#. Type: boolean
+#. Type: select
 #. Description
-#: ../citadel-server.templates:2001
+#: ../citadel-server.templates:2002
+#, fuzzy
+#| msgid ""
+#| "Do not accept this option unless you are sure it is required, since "
+#| "changing back requires a full reinstall of Citadel."
 msgid ""
-"Do not accept this option unless you are sure it is required, since changing "
+"Do not change this option unless you are sure it is required, since changing "
 "back requires a full reinstall of Citadel."
 msgstr ""
 "ChÆ°a cháº¯c thÃ¬ khÃ´ng nÃªn báºt tuá»³ chá»n nÃ y, vÃ¬ viá»‡c hoÃ n nguyÃªn cáº§n thiáº¿t cÃ i "
@@ -75,12 +92,79 @@
 #. Type: string
 #. Description
 #: ../citadel-server.templates:3001
+msgid "LDAP host"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:3001
+msgid "Please enter host name or IP address of your LDAP server."
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "LDAP port number"
+msgstr ""
+
+#. Type: integer
+#. Description
+#: ../citadel-server.templates:4001
+msgid "Please enter the port number of your LDAP service (usually 389)."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid "LDAP base DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:5001
+msgid ""
+"Please enter the Base DN to search for authentication (for example: "
+"dc=example,dc=com),"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid "LDAP bind DN"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:6001
+msgid ""
+"Please enter the DN of an account to use for binding to the LDAP server for "
+"performing queries. The account does not require any other privileges. If "
+"your LDAP server allows anonymous queries, you can. leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid "LDAP bind password"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:7001
+msgid ""
+"If you entered a Bind DN in the previous question, you must now enter the "
+"password associated with that account.  Otherwise, you can leave this blank."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../citadel-server.templates:8001
 msgid "Citadel administrator username:"
 msgstr "TÃªn ngÆ°á»i dÃ¹ng quáº£n trá»‹ Citadel:"
 
 #. Type: string
 #. Description
-#: ../citadel-server.templates:3001
+#: ../citadel-server.templates:8001
 msgid ""
 "Please enter the name of the Citadel user account that should be granted "
 "administrative privileges once created. If using internal authentication "
@@ -93,13 +177,13 @@
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid "Administrator password:"
 msgstr "Máºt kháº©u quáº£n trá»‹:"
 
 #. Type: password
 #. Description
-#: ../citadel-server.templates:4001
+#: ../citadel-server.templates:9001
 msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the administrator user."


