From 086706a859a67930ac842e88cef54f9974bc98b0 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 24 Oct 2010 14:02:17 +0200
Subject: [PATCH] * similarize to what launchpad has * resolve some fuzzies by
 adding \n's

---
 citadel/po/citadel-setup/ar.po | 26 ++++-------
 citadel/po/citadel-setup/cs.po | 83 ++++++++++++----------------------
 citadel/po/citadel-setup/de.po | 59 +++++++++++-------------
 citadel/po/citadel-setup/es.po | 36 +++++++--------
 citadel/po/citadel-setup/fi.po | 41 +++++++----------
 citadel/po/citadel-setup/fr.po | 44 ++++++++----------
 citadel/po/citadel-setup/ja.po | 64 +++++++++++---------------
 citadel/po/citadel-setup/pt.po | 61 +++++++++++--------------
 citadel/po/citadel-setup/ru.po | 51 ++++++++++-----------
 citadel/po/citadel-setup/sv.po | 46 +++++++++----------
 citadel/po/citadel-setup/vi.po | 54 ++++++++++------------
 11 files changed, 238 insertions(+), 327 deletions(-)

diff --git a/citadel/po/citadel-setup/ar.po b/citadel/po/citadel-setup/ar.po
index fdc233c32..b304f0062 100644
--- a/citadel/po/citadel-setup/ar.po
+++ b/citadel/po/citadel-setup/ar.po
@@ -8,21 +8,19 @@ msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-09-28 00:22+0200\n"
-"PO-Revision-Date: 2010-09-09 06:22+0300\n"
+"PO-Revision-Date: 2010-10-22 14:27+0000\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"X-Launchpad-Export-Date: 2010-10-23 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"Language: ar\n"
 
 #: ../utils/setup.c:119
-#, fuzzy
 msgid "Citadel Home Directory"
-msgstr "Active Directory"
+msgstr ""
 
 #: ../utils/setup.c:122
 msgid ""
@@ -69,9 +67,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:149
-#, fuzzy
 msgid "Citadel User ID:"
-msgstr "Citadel/UX"
+msgstr ""
 
 #: ../utils/setup.c:151
 msgid ""
@@ -98,9 +95,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:168
-#, fuzzy
 msgid "Server port number:"
-msgstr "رقم منفذ LDAP:"
+msgstr ""
 
 #: ../utils/setup.c:170
 msgid ""
@@ -117,7 +113,6 @@ msgid "Authentication method to use:"
 msgstr "طريقة المصادقة المطلوب استخدامها:"
 
 #: ../utils/setup.c:179
-#, fuzzy
 msgid ""
 "Please choose the user authentication mode. By default Citadel will use its "
 "own internal user accounts database. If you choose Host, Citadel users will "
@@ -135,11 +130,6 @@ msgid ""
 "\n"
 "ANSWER \"0\" UNLESS YOU COMPLETELY UNDERSTAND THIS OPTION.\n"
 msgstr ""
-"رجاء اختر وضع مصادقة المستخدمين. سيستخدم Citadel قاعدة بياناته الداخلية بشكل "
-"افتراضي. إن اخترت استخدام مضيف، تكون حسابات مستخدمي Citadel على النظام "
-"المضيف، وتتم مصادقتهم عبر /etc/passwd أو مصدر PAM. خيار LDAP يستخدم خادم "
-"الدليل المتوافق مع RFC 2307، والخيار الأخير يستخدم خدمة ميكروسوفت Active "
-"Directory LDAP الغير قياسية."
 
 #: ../utils/setup.c:197
 msgid "LDAP host:"
@@ -232,7 +222,7 @@ msgid "Adding service entry..."
 msgstr ""
 
 #. Other errors might mean something really did go wrong.
-#.
+#. 
 #: ../utils/setup.c:463 ../utils/setup.c:510 ../utils/setup.c:518
 msgid "Cannot open"
 msgstr ""
diff --git a/citadel/po/citadel-setup/cs.po b/citadel/po/citadel-setup/cs.po
index 804436a0c..e530e3347 100644
--- a/citadel/po/citadel-setup/cs.po
+++ b/citadel/po/citadel-setup/cs.po
@@ -8,18 +8,19 @@ msgstr ""
 "Project-Id-Version: citadel\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-09-28 00:22+0200\n"
-"PO-Revision-Date: 2009-08-16 15:48+0200\n"
+"PO-Revision-Date: 2010-10-22 14:32+0000\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-23 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"Language: cs\n"
 
 #: ../utils/setup.c:119
-#, fuzzy
 msgid "Citadel Home Directory"
-msgstr "Active Directory"
+msgstr ""
 
 #: ../utils/setup.c:122
 msgid ""
@@ -66,9 +67,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:149
-#, fuzzy
 msgid "Citadel User ID:"
-msgstr "Citadel/UX"
+msgstr ""
 
 #: ../utils/setup.c:151
 msgid ""
@@ -114,7 +114,6 @@ msgid "Authentication method to use:"
 msgstr ""
 
 #: ../utils/setup.c:179
-#, fuzzy
 msgid ""
 "Please choose the user authentication mode. By default Citadel will use its "
 "own internal user accounts database. If you choose Host, Citadel users will "
@@ -132,50 +131,38 @@ msgid ""
 "\n"
 "ANSWER \"0\" UNLESS YOU COMPLETELY UNDERSTAND THIS OPTION.\n"
 msgstr ""
-"Zvolte si způsob autentizace uživatelů. Ve výchozím nastavení používá "
-"Citadel svou vlastní databázi uživatelských účtů. Zvolíte-li možnost "
-"hostitel, budou mít uživatelé Citadel účty na hostitelském systému a budou "
-"se ověřovat oproti /etc/passwd nebo PAM. Možnost LDAP použije adresářový "
-"server odpovídající RFC 2307. Poslední možnost použije nestandardní LDAP "
-"schéma MS Active Directory."
 
 #: ../utils/setup.c:197
 msgid "LDAP host:"
 msgstr "LDAP server:"
 
 #: ../utils/setup.c:199
-#, fuzzy
 msgid "Please enter the host name or IP address of your LDAP server.\n"
-msgstr "Zadejte jméno nebo IP adresu počítače, na kterém běží LDAP server."
+msgstr ""
 
 #: ../utils/setup.c:201
 msgid "LDAP port number:"
 msgstr "LDAP port:"
 
 #: ../utils/setup.c:203
-#, fuzzy
 msgid "Please enter the port number of the LDAP service (usually 389).\n"
-msgstr "Zadejte číslo portu, na kterém běží služba LDAP (obvykle 389)."
+msgstr ""
 
 #: ../utils/setup.c:205
 msgid "LDAP base DN:"
 msgstr "Základní LDAP DN:"
 
 #: ../utils/setup.c:207
-#, fuzzy
 msgid ""
 "Please enter the Base DN to search for authentication\n"
 "(for example: dc=example,dc=com)\n"
 msgstr ""
-"Zadejte základní DN (Distinguished Name), ve kterém se budou hledat "
-"autentizační údaje (například: dc=priklad,dc=cz)."
 
 #: ../utils/setup.c:210
 msgid "LDAP bind DN:"
 msgstr "DN účtu pro LDAP dotazy:"
 
 #: ../utils/setup.c:212
-#, fuzzy
 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 "
@@ -185,23 +172,17 @@ msgid ""
 "privileges.  If your LDAP server allows anonymous queries, you can\n"
 "leave this blank.\n"
 msgstr ""
-"Zadejte DN účtu, který se bude používat pro dotazy do LDAP serveru. Účet "
-"nevyžaduje žádná speciální oprávnění. Pokud LDAP server umožňuje anonymní "
-"dotazy, můžete ponechat prázdné."
 
 #: ../utils/setup.c:220
 msgid "LDAP bind password:"
 msgstr "Heslo účtu pro LDAP dotazy:"
 
 #: ../utils/setup.c:222
-#, fuzzy
 msgid ""
 "If you entered a Bind DN in the previous question, you must now enter\n"
 "the password associated with that account.  Otherwise, you can leave this\n"
 "blank.\n"
 msgstr ""
-"Pokud jste v předchozí otázce zadali DN účtu pro LDAP dotazy, musíte nyní "
-"zadat heslo tohoto účtu. V opačném případě můžete ponechat prázdné."
 
 #: ../utils/setup.c:299
 msgid "Yes/No"
@@ -232,7 +213,7 @@ msgid "Adding service entry..."
 msgstr ""
 
 #. Other errors might mean something really did go wrong.
-#.
+#. 
 #: ../utils/setup.c:463 ../utils/setup.c:510 ../utils/setup.c:518
 msgid "Cannot open"
 msgstr ""
@@ -355,9 +336,8 @@ msgstr ""
 
 #: ../utils/setup.c:1450 ../utils/setup.c:1457 ../utils/setup.c:1472
 #: ../utils/setup.c:1512
-#, fuzzy
 msgid "Citadel Setup"
-msgstr "Citadel/UX"
+msgstr ""
 
 #: ../utils/setup.c:1459
 msgid "The directory you specified does not exist"
@@ -370,9 +350,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:1485
-#, fuzzy
 msgid "Citadel setup program"
-msgstr "Active Directory"
+msgstr ""
 
 #: ../utils/setup.c:1513
 msgid "This Citadel installation is too old to be upgraded."
@@ -390,8 +369,8 @@ msgstr ""
 #~ "server naslouchat na všech adresách."
 
 #~ msgid ""
-#~ "This can usually be left to the default unless multiple instances of "
-#~ "Citadel are running on the same computer."
+#~ "This can usually be left to the default unless multiple instances of Citadel "
+#~ "are running on the same computer."
 #~ msgstr ""
 #~ "Pokud na tomto počítači nemáte více instancí Citadel, můžete nejspíš "
 #~ "ponechat výchozí hodnotu."
@@ -406,8 +385,8 @@ msgstr ""
 #~ msgstr "LDAP"
 
 #~ msgid ""
-#~ "Do not change this option unless you are sure it is required, since "
-#~ "changing back requires a full reinstall of Citadel."
+#~ "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 neměňte, "
 #~ "protože návrat zpět znamená kompletní reinstalaci Citadel."
@@ -435,33 +414,31 @@ msgstr ""
 
 #~ msgid ""
 #~ "Specify the way authentication is done, either host based or Citadel "
-#~ "internal. Host based accounting could be /etc/passwd or an LDAP "
-#~ "directory. WARNING: do not change this setting once your system is "
-#~ "installed. Answer \"no\" unless you completely understand this option."
+#~ "internal. Host based accounting could be /etc/passwd or an LDAP directory. "
+#~ "WARNING: do not change this setting once your system is installed. Answer "
+#~ "\"no\" unless you completely understand this option."
 #~ msgstr ""
 #~ "Zadejte způsob autentizace - buď založený na mechanismech hostitelského "
 #~ "počítače, nebo na interní správě přímo v Citadel. Ověřováním podle "
-#~ "hostitelského počítače se myslí /etc/passwd nebo LDAP adresář. VAROVÁNÍ: "
-#~ "po instalaci systému již toto nastavení neměňte. Pokud si nejste zcela "
-#~ "jisti, zda otázce rozumíte, odpovězte „ne“."
+#~ "hostitelského počítače se myslí /etc/passwd nebo LDAP adresář. VAROVÁNÍ: po "
+#~ "instalaci systému již toto nastavení neměňte. Pokud si nejste zcela jisti, "
+#~ "zda otázce rozumíte, odpovězte „ne“."
 
 #~ msgid ""
-#~ "Enter the name of the Citadel administrator (which is probably you). When "
-#~ "an account is created with this name, it will automatically be given "
+#~ "Enter the name of the Citadel administrator (which is probably you). When an "
+#~ "account is created with this name, it will automatically be given "
 #~ "administrator-level access."
 #~ msgstr ""
-#~ "Zadejte jméno správce Citadel (což budete pravděpodobně vy). Při "
-#~ "vytvoření účtu se zadaným jménem mu budou automaticky přidána správcovská "
-#~ "oprávnění."
+#~ "Zadejte jméno správce Citadel (což budete pravděpodobně vy). Při vytvoření "
+#~ "účtu se zadaným jménem mu budou automaticky přidána správcovská oprávnění."
 
 #~ msgid ""
 #~ "For post configuring your Citadel Server, use citadel-webcit with your "
-#~ "browser, log in as the user you specified as the Administrator, and "
-#~ "review the Points under the Administration menu. If you have further "
-#~ "questions review www.citadel.org, specialy the FAQ and Documentation "
-#~ "section."
+#~ "browser, log in as the user you specified as the Administrator, and review "
+#~ "the Points under the Administration menu. If you have further questions "
+#~ "review www.citadel.org, specialy the FAQ and Documentation section."
 #~ msgstr ""
 #~ "Pro poinstalační nastavení Citadel serveru si nainstalujte balík citadel-"
 #~ "webcit. Ve webovém prohlížeči se přihlaste pod uživatelem, kterého jste "
-#~ "zvolili za správce a projděte si menu Administration. Máte-li další "
-#~ "otázky, podívejte se na http://www.citadel.org do částí Dokumentace a FAQ."
+#~ "zvolili za správce a projděte si menu Administration. Máte-li další otázky, "
+#~ "podívejte se na http://www.citadel.org do částí Dokumentace a FAQ."
diff --git a/citadel/po/citadel-setup/de.po b/citadel/po/citadel-setup/de.po
index ed9ff455c..14cf5be1d 100644
--- a/citadel/po/citadel-setup/de.po
+++ b/citadel/po/citadel-setup/de.po
@@ -7,16 +7,17 @@ msgstr ""
 "Project-Id-Version: citadel 7.63-1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-09-28 00:22+0200\n"
-"PO-Revision-Date: 2009-09-08 19:40+0200\n"
+"PO-Revision-Date: 2010-10-22 14:33+0000\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: de <debian-l10n-german@lists.debian.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-23 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"Language: \n"
 
 #: ../utils/setup.c:119
-#, fuzzy
 msgid "Citadel Home Directory"
 msgstr "Citadel Basis Directory"
 
@@ -164,7 +165,6 @@ msgid "LDAP base DN:"
 msgstr "LDAP-base-DN:"
 
 #: ../utils/setup.c:207
-#, fuzzy
 msgid ""
 "Please enter the Base DN to search for authentication\n"
 "(for example: dc=example,dc=com)\n"
@@ -177,7 +177,6 @@ msgid "LDAP bind DN:"
 msgstr "LDAP-bind-DN:"
 
 #: ../utils/setup.c:212
-#, fuzzy
 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 "
@@ -197,7 +196,6 @@ msgid "LDAP bind password:"
 msgstr "LDAP-bind-Passwort:"
 
 #: ../utils/setup.c:222
-#, fuzzy
 msgid ""
 "If you entered a Bind DN in the previous question, you must now enter\n"
 "the password associated with that account.  Otherwise, you can leave this\n"
@@ -236,7 +234,7 @@ msgid "Adding service entry..."
 msgstr ""
 
 #. Other errors might mean something really did go wrong.
-#.
+#. 
 #: ../utils/setup.c:463 ../utils/setup.c:510 ../utils/setup.c:518
 msgid "Cannot open"
 msgstr ""
@@ -357,12 +355,10 @@ msgstr ""
 msgid "setup: cannot append"
 msgstr ""
 
-#
 #: ../utils/setup.c:1450 ../utils/setup.c:1457 ../utils/setup.c:1472
 #: ../utils/setup.c:1512
-#, fuzzy
 msgid "Citadel Setup"
-msgstr "Citadel Benutzer ID:"
+msgstr "Citadel Setup"
 
 #: ../utils/setup.c:1459
 msgid "The directory you specified does not exist"
@@ -375,9 +371,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:1485
-#, fuzzy
 msgid "Citadel setup program"
-msgstr "Citadel Basis Directory"
+msgstr "Citadel Setup Programm"
 
 #: ../utils/setup.c:1513
 msgid "This Citadel installation is too old to be upgraded."
@@ -391,13 +386,13 @@ msgstr ""
 #~ "Please specify the IP address which the server should be listening to. If "
 #~ "you specify 0.0.0.0, the server will listen on all addresses."
 #~ msgstr ""
-#~ "Bitte geben Sie die IP-Adressen an, auf der der Server auf Anfragen "
-#~ "warten soll. Falls Sie 0.0.0.0 angeben, wird der Server auf allen "
-#~ "Adressen auf Anfragen warten."
+#~ "Bitte geben Sie die IP-Adressen an, auf der der Server auf Anfragen warten "
+#~ "soll. Falls Sie 0.0.0.0 angeben, wird der Server auf allen Adressen auf "
+#~ "Anfragen warten."
 
 #~ msgid ""
-#~ "This can usually be left to the default unless multiple instances of "
-#~ "Citadel are running on the same computer."
+#~ "This can usually be left to the default unless multiple instances of Citadel "
+#~ "are running on the same computer."
 #~ msgstr ""
 #~ "Normalerweise können Sie die Vorgabe beibehalten, falls Sie nicht mehrere "
 #~ "Instanzen von Citadel auf dem gleichen Computer betreiben."
@@ -436,8 +431,8 @@ msgstr ""
 #~ "Please enter the name of the Citadel user account that should be granted "
 #~ "administrative privileges once created."
 #~ msgstr ""
-#~ "Geben Sie den Namen des Citadel-Benutzerkontos ein, dem nach der "
-#~ "Erstellung administrative Privilegien gewährt werden sollen."
+#~ "Geben Sie den Namen des Citadel-Benutzerkontos ein, dem nach der Erstellung "
+#~ "administrative Privilegien gewährt werden sollen."
 
 #~ msgid ""
 #~ "Specify the way authentication is done, either host based or Citadel "
@@ -445,22 +440,20 @@ msgstr ""
 #~ "directory. WARNING: do not change this setting once your system is "
 #~ "installed. Answer \"no\" unless you completely understand this option."
 #~ msgstr ""
-#~ "Geben Sie an, wie die Authentifizierung läuft, entweder Rechner-basiert "
-#~ "oder Citadel-intern. Rechner-basierte Authentifizierung könnte /etc/"
-#~ "passwd oder ein LDAP-Verzeichnis sein. WARNUNG: Ändern Sie diese Option "
-#~ "nicht, nachdem Ihr System installiert ist. Antworten Sie »Nein« falls Sie "
-#~ "diese Option nicht komplett verstehen."
+#~ "Geben Sie an, wie die Authentifizierung läuft, entweder Rechner-basiert oder "
+#~ "Citadel-intern. Rechner-basierte Authentifizierung könnte /etc/passwd oder "
+#~ "ein LDAP-Verzeichnis sein. WARNUNG: Ändern Sie diese Option nicht, nachdem "
+#~ "Ihr System installiert ist. Antworten Sie »Nein« falls Sie diese Option "
+#~ "nicht komplett verstehen."
 
 #~ msgid ""
 #~ "For post configuring your Citadel Server, use citadel-webcit with your "
-#~ "browser, log in as the user you specified as the Administrator, and "
-#~ "review the Points under the Administration menu. If you have further "
-#~ "questions review www.citadel.org, especially the FAQ and Documentation "
-#~ "section."
+#~ "browser, log in as the user you specified as the Administrator, and review "
+#~ "the Points under the Administration menu. If you have further questions "
+#~ "review www.citadel.org, especially the FAQ and Documentation section."
 #~ msgstr ""
 #~ "Für die weitere Konfiguration Ihres Citadel-Servers verwenden Sie bitte "
-#~ "citadel-webcit in Ihrem Browser. Melden Sie sich dort als den Benutzer "
-#~ "an, den Sie eben als Administrator angegeben haben und schauen Sie dann "
-#~ "die Punkte im Administrations-Menü durch. Falls Sie weitere Fragen haben, "
-#~ "lesen Sie www.citadel.org, insbesondere die FAQ und den Dokumentations-"
-#~ "Abschnitt."
+#~ "citadel-webcit in Ihrem Browser. Melden Sie sich dort als den Benutzer an, "
+#~ "den Sie eben als Administrator angegeben haben und schauen Sie dann die "
+#~ "Punkte im Administrations-Menü durch. Falls Sie weitere Fragen haben, lesen "
+#~ "Sie www.citadel.org, insbesondere die FAQ und den Dokumentations-Abschnitt."
diff --git a/citadel/po/citadel-setup/es.po b/citadel/po/citadel-setup/es.po
index 4a4f11416..8bf48933a 100644
--- a/citadel/po/citadel-setup/es.po
+++ b/citadel/po/citadel-setup/es.po
@@ -30,18 +30,19 @@ msgstr ""
 "Project-Id-Version: citadel-7.66-1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-09-28 00:22+0200\n"
-"PO-Revision-Date: 2009-11-24 16:09+0100\n"
+"PO-Revision-Date: 2010-10-22 14:34+0000\n"
 "Last-Translator: Shuko <felix_os69@hotmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-23 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"Language: es\n"
 
 #: ../utils/setup.c:119
-#, fuzzy
 msgid "Citadel Home Directory"
-msgstr "Active Directory"
+msgstr ""
 
 #: ../utils/setup.c:122
 msgid ""
@@ -116,9 +117,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:168
-#, fuzzy
 msgid "Server port number:"
-msgstr "Número del puerto de LDAP:"
+msgstr ""
 
 #: ../utils/setup.c:170
 msgid ""
@@ -166,7 +166,6 @@ msgid "LDAP host:"
 msgstr "Equipo de LDAP:"
 
 #: ../utils/setup.c:199
-#, fuzzy
 msgid "Please enter the host name or IP address of your LDAP server.\n"
 msgstr ""
 "Por favor, introduzca el nombre del equipo o la dirección IP de su servidor "
@@ -177,18 +176,16 @@ msgid "LDAP port number:"
 msgstr "Número del puerto de LDAP:"
 
 #: ../utils/setup.c:203
-#, fuzzy
 msgid "Please enter the port number of the LDAP service (usually 389).\n"
 msgstr ""
 "Por favor, introduzca el número del puerto del servicio LDAP (generalmente "
-"389)."
+"389).\n"
 
 #: ../utils/setup.c:205
 msgid "LDAP base DN:"
 msgstr "DN base de LDAP:"
 
 #: ../utils/setup.c:207
-#, fuzzy
 msgid ""
 "Please enter the Base DN to search for authentication\n"
 "(for example: dc=example,dc=com)\n"
@@ -260,7 +257,7 @@ msgid "Adding service entry..."
 msgstr ""
 
 #. Other errors might mean something really did go wrong.
-#.
+#. 
 #: ../utils/setup.c:463 ../utils/setup.c:510 ../utils/setup.c:518
 msgid "Cannot open"
 msgstr ""
@@ -397,9 +394,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:1485
-#, fuzzy
 msgid "Citadel setup program"
-msgstr "Active Directory"
+msgstr ""
 
 #: ../utils/setup.c:1513
 msgid "This Citadel installation is too old to be upgraded."
@@ -418,8 +414,8 @@ msgstr ""
 #~ "direcciones."
 
 #~ msgid ""
-#~ "This can usually be left to the default unless multiple instances of "
-#~ "Citadel are running on the same computer."
+#~ "This can usually be left to the default unless multiple instances of Citadel "
+#~ "are running on the same computer."
 #~ msgstr ""
 #~ "Normalmente se puede dejar el valor predeterminado, a no ser que tenga "
 #~ "varias instancias de Citadel ejecutándose en el mismo equipo."
@@ -434,12 +430,12 @@ msgstr ""
 #~ msgstr "LDAP"
 
 #~ msgid ""
-#~ "Do not change this option unless you are sure it is required, since "
-#~ "changing back requires a full reinstall of Citadel."
+#~ "Do not change this option unless you are sure it is required, since changing "
+#~ "back requires a full reinstall of Citadel."
 #~ msgstr ""
-#~ "No cambie esta opción a no ser que esté seguro de que es necesario, ya "
-#~ "que si lo cambia se deberá reinstalar completamente Citadel para volver "
-#~ "al estado anterior."
+#~ "No cambie esta opción a no ser que esté seguro de que es necesario, ya que "
+#~ "si lo cambia se deberá reinstalar completamente Citadel para volver al "
+#~ "estado anterior."
 
 #~ msgid ""
 #~ "While not mandatory, it is highly recommended that you set a password for "
diff --git a/citadel/po/citadel-setup/fi.po b/citadel/po/citadel-setup/fi.po
index 39c765be4..7a1b106ab 100644
--- a/citadel/po/citadel-setup/fi.po
+++ b/citadel/po/citadel-setup/fi.po
@@ -4,21 +4,20 @@ msgstr ""
 "Project-Id-Version: citadel\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-09-28 00:22+0200\n"
-"PO-Revision-Date: 2009-08-22 21:43+0300\n"
+"PO-Revision-Date: 2010-10-22 14:35+0000\n"
 "Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-23 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: FINLAND\n"
-"X-Generator: Lokalize 0.3\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: fi\n"
 
 #: ../utils/setup.c:119
-#, fuzzy
 msgid "Citadel Home Directory"
-msgstr "Active Directory"
+msgstr ""
 
 #: ../utils/setup.c:122
 msgid ""
@@ -93,9 +92,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:168
-#, fuzzy
 msgid "Server port number:"
-msgstr "LDAP-portin numero:"
+msgstr ""
 
 #: ../utils/setup.c:170
 msgid ""
@@ -142,31 +140,28 @@ msgid "LDAP host:"
 msgstr "LDAP-kone:"
 
 #: ../utils/setup.c:199
-#, fuzzy
 msgid "Please enter the host name or IP address of your LDAP server.\n"
-msgstr "Anna LDAP-palvelimen verkkonimi tai IP-osoite."
+msgstr "Anna LDAP-palvelimen verkkonimi tai IP-osoite.\n"
 
 #: ../utils/setup.c:201
 msgid "LDAP port number:"
 msgstr "LDAP-portin numero:"
 
 #: ../utils/setup.c:203
-#, fuzzy
 msgid "Please enter the port number of the LDAP service (usually 389).\n"
-msgstr "Anna LDAP-palvelun porttinumero (yleensä 389)."
+msgstr "Anna LDAP-palvelun porttinumero (yleensä 389).\n"
 
 #: ../utils/setup.c:205
 msgid "LDAP base DN:"
 msgstr "LDAPin kanta-DN (erittelevä nimi):"
 
 #: ../utils/setup.c:207
-#, fuzzy
 msgid ""
 "Please enter the Base DN to search for authentication\n"
 "(for example: dc=example,dc=com)\n"
 msgstr ""
 "Anna erittelevä nimi, josta kirjautumistietoja etsitään (esimerkiksi: "
-"dc=example,dc=com)."
+"dc=example,dc=com).\n"
 
 #: ../utils/setup.c:210
 msgid "LDAP bind DN:"
@@ -193,7 +188,6 @@ msgid "LDAP bind password:"
 msgstr "LDAP-yhteyden salasana:"
 
 #: ../utils/setup.c:222
-#, fuzzy
 msgid ""
 "If you entered a Bind DN in the previous question, you must now enter\n"
 "the password associated with that account.  Otherwise, you can leave this\n"
@@ -231,7 +225,7 @@ msgid "Adding service entry..."
 msgstr ""
 
 #. Other errors might mean something really did go wrong.
-#.
+#. 
 #: ../utils/setup.c:463 ../utils/setup.c:510 ../utils/setup.c:518
 msgid "Cannot open"
 msgstr ""
@@ -368,9 +362,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:1485
-#, fuzzy
 msgid "Citadel setup program"
-msgstr "Active Directory"
+msgstr ""
 
 #: ../utils/setup.c:1513
 msgid "This Citadel installation is too old to be upgraded."
@@ -388,11 +381,11 @@ msgstr ""
 #~ "kuuntelee kaikkia osoitteita."
 
 #~ msgid ""
-#~ "This can usually be left to the default unless multiple instances of "
-#~ "Citadel are running on the same computer."
+#~ "This can usually be left to the default unless multiple instances of Citadel "
+#~ "are running on the same computer."
 #~ msgstr ""
-#~ "Oletusarvoa voidaan yleensä käyttää, ellei samalla koneella ajeta "
-#~ "useampia Citadel-instansseja."
+#~ "Oletusarvoa voidaan yleensä käyttää, ellei samalla koneella ajeta useampia "
+#~ "Citadel-instansseja."
 
 #~ msgid "Internal"
 #~ msgstr "Sisäinen"
@@ -404,8 +397,8 @@ msgstr ""
 #~ msgstr "LDAP"
 
 #~ msgid ""
-#~ "Do not change this option unless you are sure it is required, since "
-#~ "changing back requires a full reinstall of Citadel."
+#~ "Do not change this option unless you are sure it is required, since changing "
+#~ "back requires a full reinstall of Citadel."
 #~ msgstr ""
 #~ "Älä vaihda tätä valintaa, ellet ole varma, että se on tarpeen, koska "
 #~ "takaisin vaihtaminen vaatii, että Citadel asennetaan täysin uudelleen."
diff --git a/citadel/po/citadel-setup/fr.po b/citadel/po/citadel-setup/fr.po
index 2f1dc985b..a6162044b 100644
--- a/citadel/po/citadel-setup/fr.po
+++ b/citadel/po/citadel-setup/fr.po
@@ -10,20 +10,19 @@ msgstr ""
 "Project-Id-Version: fr-new\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-09-28 00:22+0200\n"
-"PO-Revision-Date: 2009-08-13 06:42+0200\n"
+"PO-Revision-Date: 2010-10-22 14:37+0000\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.3\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Launchpad-Export-Date: 2010-10-23 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"Language: fr\n"
 
 #: ../utils/setup.c:119
-#, fuzzy
 msgid "Citadel Home Directory"
-msgstr "Active Directory"
+msgstr ""
 
 #: ../utils/setup.c:122
 msgid ""
@@ -98,9 +97,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:168
-#, fuzzy
 msgid "Server port number:"
-msgstr "Port du serveur LDAP :"
+msgstr ""
 
 #: ../utils/setup.c:170
 msgid ""
@@ -147,33 +145,30 @@ msgid "LDAP host:"
 msgstr "Serveur LDAP :"
 
 #: ../utils/setup.c:199
-#, fuzzy
 msgid "Please enter the host name or IP address of your LDAP server.\n"
-msgstr "Veuillez indiquer le nom d'hôte ou l'adresse IP du serveur LDAP."
+msgstr "Veuillez indiquer le nom d'hôte ou l'adresse IP du serveur LDAP.\n"
 
 #: ../utils/setup.c:201
 msgid "LDAP port number:"
 msgstr "Port du serveur LDAP :"
 
 #: ../utils/setup.c:203
-#, fuzzy
 msgid "Please enter the port number of the LDAP service (usually 389).\n"
 msgstr ""
 "Veuillez indiquer le numéro du port d'écoute pour le serveur LDAP (en "
-"général 389)."
+"général 389)\n."
 
 #: ../utils/setup.c:205
 msgid "LDAP base DN:"
 msgstr "DN de base du serveur LDAP :"
 
 #: ../utils/setup.c:207
-#, fuzzy
 msgid ""
 "Please enter the Base DN to search for authentication\n"
 "(for example: dc=example,dc=com)\n"
 msgstr ""
 "Veuillez indiquer la base de recherche pour l'authentification LDAP "
-"(p. ex. dc=example,dc=com)."
+"(p. ex. dc=example,dc=com).\n"
 
 #: ../utils/setup.c:210
 msgid "LDAP bind DN:"
@@ -238,7 +233,7 @@ msgid "Adding service entry..."
 msgstr ""
 
 #. Other errors might mean something really did go wrong.
-#.
+#. 
 #: ../utils/setup.c:463 ../utils/setup.c:510 ../utils/setup.c:518
 msgid "Cannot open"
 msgstr ""
@@ -375,9 +370,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:1485
-#, fuzzy
 msgid "Citadel setup program"
-msgstr "Active Directory"
+msgstr ""
 
 #: ../utils/setup.c:1513
 msgid "This Citadel installation is too old to be upgraded."
@@ -391,15 +385,15 @@ msgstr ""
 #~ "Please specify the IP address which the server should be listening to. If "
 #~ "you specify 0.0.0.0, the server will listen on all addresses."
 #~ msgstr ""
-#~ "Veuillez indiquer l'adresse IP sur laquelle le serveur sera actif. Si "
-#~ "vous indiquez 0.0.0.0, Citadel sera à l'écoute de toutes les adresses."
+#~ "Veuillez indiquer l'adresse IP sur laquelle le serveur sera actif. Si vous "
+#~ "indiquez 0.0.0.0, Citadel sera à l'écoute de toutes les adresses."
 
 #~ msgid ""
-#~ "This can usually be left to the default unless multiple instances of "
-#~ "Citadel are running on the same computer."
+#~ "This can usually be left to the default unless multiple instances of Citadel "
+#~ "are running on the same computer."
 #~ msgstr ""
-#~ "Vous pouvez normalement sauter cette étape à moins que plusieurs "
-#~ "instances de Citadel ne tournent sur le même ordinateur."
+#~ "Vous pouvez normalement sauter cette étape à moins que plusieurs instances "
+#~ "de Citadel ne tournent sur le même ordinateur."
 
 #~ msgid "Internal"
 #~ msgstr "Interne"
@@ -411,8 +405,8 @@ msgstr ""
 #~ msgstr "LDAP"
 
 #~ msgid ""
-#~ "Do not change this option unless you are sure it is required, since "
-#~ "changing back requires a full reinstall of Citadel."
+#~ "Do not change this option unless you are sure it is required, since changing "
+#~ "back requires a full reinstall of Citadel."
 #~ msgstr ""
 #~ "Ne modifiez cette option que si elle est indispensable car il n'est pas "
 #~ "possible de la changer sans entièrement réinstaller Citadel."
diff --git a/citadel/po/citadel-setup/ja.po b/citadel/po/citadel-setup/ja.po
index 15306d133..9ff3b887a 100644
--- a/citadel/po/citadel-setup/ja.po
+++ b/citadel/po/citadel-setup/ja.po
@@ -1,24 +1,25 @@
-# Copyright (C) 2009 Debian Citadel Team <pkg-citadel-devel@lists.alioth.debian.org>
-# This file is distributed under the same license as citadel package.
-# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2009.
-# 
+# Copyright (C) 2009 Debian Citadel Team <pkg-citadel-devel@lists.alioth.debian.org>
+# This file is distributed under the same license as citadel package.
+# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: citadel 7.66-1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-09-28 00:22+0200\n"
-"PO-Revision-Date: 2009-11-19 14:32+0900\n"
+"PO-Revision-Date: 2010-10-22 14:41+0000\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-23 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"Language: ja\n"
 
 #: ../utils/setup.c:119
-#, fuzzy
 msgid "Citadel Home Directory"
-msgstr "Active Directory"
+msgstr ""
 
 #: ../utils/setup.c:122
 msgid ""
@@ -48,10 +49,9 @@ msgid ""
 "this user account will be created if it does not exist. For external "
 "authentication this user account has to exist."
 msgstr ""
-"作成後に管理者特権を与える Citadel のユーザアカウント名を入力してください。内"
-"部アカウントでの認証を使う場合、このユーザアカウントが存在しないのであれば作"
-"成されます。外部認証の場合は、このユーザアカウントが存在している必要がありま"
-"す。"
+"作成後に管理者特権を与える Citadel "
+"のユーザアカウント名を入力してください。内部アカウントでの認証を使う場合、このユーザアカウントが存在しないのであれば作成されます。外部認証の場合は、このユ"
+"ーザアカウントが存在している必要があります。"
 
 #: ../utils/setup.c:143
 msgid "Administrator password:"
@@ -93,9 +93,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:168
-#, fuzzy
 msgid "Server port number:"
-msgstr "LDAP のポート番号:"
+msgstr ""
 
 #: ../utils/setup.c:170
 msgid ""
@@ -141,30 +140,27 @@ msgid "LDAP host:"
 msgstr "LDAP ホスト:"
 
 #: ../utils/setup.c:199
-#, fuzzy
 msgid "Please enter the host name or IP address of your LDAP server.\n"
-msgstr "LDAP サーバのホスト名、あるいは IP アドレスを入力してください。"
+msgstr "LDAP サーバのホスト名、あるいは IP アドレスを入力してください。\n"
 
 #: ../utils/setup.c:201
 msgid "LDAP port number:"
 msgstr "LDAP のポート番号:"
 
 #: ../utils/setup.c:203
-#, fuzzy
 msgid "Please enter the port number of the LDAP service (usually 389).\n"
-msgstr "LDAP サービスのポート番号を入力してください (通常は 389 です)。"
+msgstr "LDAP サービスのポート番号を入力してください (通常は 389 です)。\n"
 
 #: ../utils/setup.c:205
 msgid "LDAP base DN:"
 msgstr "LDAP ベース DN:"
 
 #: ../utils/setup.c:207
-#, fuzzy
 msgid ""
 "Please enter the Base DN to search for authentication\n"
 "(for example: dc=example,dc=com)\n"
 msgstr ""
-"認証の際、検索に使うベース DN を入力してください (例:dc=example,dc=com)。"
+"認証の際、検索に使うベース DN を入力してください\n (例:dc=example,dc=com)。\n"
 
 #: ../utils/setup.c:210
 msgid "LDAP bind DN:"
@@ -228,7 +224,7 @@ msgid "Adding service entry..."
 msgstr ""
 
 #. Other errors might mean something really did go wrong.
-#.
+#. 
 #: ../utils/setup.c:463 ../utils/setup.c:510 ../utils/setup.c:518
 msgid "Cannot open"
 msgstr ""
@@ -365,9 +361,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:1485
-#, fuzzy
 msgid "Citadel setup program"
-msgstr "Active Directory"
+msgstr ""
 
 #: ../utils/setup.c:1513
 msgid "This Citadel installation is too old to be upgraded."
@@ -380,16 +375,12 @@ msgstr ""
 #~ msgid ""
 #~ "Please specify the IP address which the server should be listening to. If "
 #~ "you specify 0.0.0.0, the server will listen on all addresses."
-#~ msgstr ""
-#~ "サーバが待ち受けをする IP アドレスを指定してください。0.0.0.0 を指定した場"
-#~ "合、サーバはすべてのアドレスで待ち受けます。"
+#~ msgstr "サーバが待ち受けをする IP アドレスを指定してください。0.0.0.0 を指定した場合、サーバはすべてのアドレスで待ち受けます。"
 
 #~ msgid ""
-#~ "This can usually be left to the default unless multiple instances of "
-#~ "Citadel are running on the same computer."
-#~ msgstr ""
-#~ "同じコンピュータ上で複数の Citadel インスタンスが動作していなければ、これ"
-#~ "は通常デフォルトのままで構いません。"
+#~ "This can usually be left to the default unless multiple instances of Citadel "
+#~ "are running on the same computer."
+#~ msgstr "同じコンピュータ上で複数の Citadel インスタンスが動作していなければ、これは通常デフォルトのままで構いません。"
 
 #~ msgid "Internal"
 #~ msgstr "内部アカウント"
@@ -401,18 +392,15 @@ msgstr ""
 #~ msgstr "LDAP"
 
 #~ msgid ""
-#~ "Do not change this option unless you are sure it is required, since "
-#~ "changing back requires a full reinstall of Citadel."
+#~ "Do not change this option unless you are sure it is required, since changing "
+#~ "back requires a full reinstall of Citadel."
 #~ msgstr ""
-#~ "何が必要か分かっていない場合は、このオプションを変更しないでください。変更"
-#~ "を元に戻すには Citadel をゼロから再インストールすることが必要です。"
+#~ "何が必要か分かっていない場合は、このオプションを変更しないでください。変更を元に戻すには Citadel をゼロから再インストールすることが必要です。"
 
 #~ msgid ""
 #~ "While not mandatory, it is highly recommended that you set a password for "
 #~ "the administrator user."
-#~ msgstr ""
-#~ "必須ではないものの、管理者ユーザにパスワードを設定することを強くお勧めしま"
-#~ "す。"
+#~ msgstr "必須ではないものの、管理者ユーザにパスワードを設定することを強くお勧めします。"
 
 #~ msgid "Internal, Host, LDAP, Active Directory"
 #~ msgstr "内部アカウント, ホスト上, LDAP, Active Directory"
diff --git a/citadel/po/citadel-setup/pt.po b/citadel/po/citadel-setup/pt.po
index 848b1376b..2776c8004 100644
--- a/citadel/po/citadel-setup/pt.po
+++ b/citadel/po/citadel-setup/pt.po
@@ -8,18 +8,19 @@ msgstr ""
 "Project-Id-Version: citadel-7.72-1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-09-28 00:22+0200\n"
-"PO-Revision-Date: 2010-03-07 00:30+0100\n"
+"PO-Revision-Date: 2010-10-22 14:42+0000\n"
 "Last-Translator: Pedro Ribeiro <p.m42.ribeiro@gmail.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
-"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-23 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"Language: pt\n"
 
 #: ../utils/setup.c:119
-#, fuzzy
 msgid "Citadel Home Directory"
-msgstr "Active Directory"
+msgstr ""
 
 #: ../utils/setup.c:122
 msgid ""
@@ -66,9 +67,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:149
-#, fuzzy
 msgid "Citadel User ID:"
-msgstr "Citadel/UX"
+msgstr ""
 
 #: ../utils/setup.c:151
 msgid ""
@@ -95,7 +95,6 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:168
-#, fuzzy
 msgid "Server port number:"
 msgstr "Número de porto LDAP:"
 
@@ -144,31 +143,28 @@ msgid "LDAP host:"
 msgstr "Servidor LDAP:"
 
 #: ../utils/setup.c:199
-#, fuzzy
 msgid "Please enter the host name or IP address of your LDAP server.\n"
-msgstr "Indique por favor o nome ou endereço IP do servidor LDAP."
+msgstr "Indique por favor o nome ou endereço IP do servidor LDAP.\n"
 
 #: ../utils/setup.c:201
 msgid "LDAP port number:"
 msgstr "Número de porto LDAP:"
 
 #: ../utils/setup.c:203
-#, fuzzy
 msgid "Please enter the port number of the LDAP service (usually 389).\n"
-msgstr "Indique por favor o número de porto do serviço LDAP (normalmente 389)."
+msgstr "Indique por favor o número de porto do serviço LDAP (normalmente 389).\n"
 
 #: ../utils/setup.c:205
 msgid "LDAP base DN:"
 msgstr "DN de base LDAP:"
 
 #: ../utils/setup.c:207
-#, fuzzy
 msgid ""
 "Please enter the Base DN to search for authentication\n"
 "(for example: dc=example,dc=com)\n"
 msgstr ""
-"Indique por favor o DN de Base para procurar por autenticação (por exemplo: "
-"dc=exemplo,dc=com)."
+"Indique por favor o DN de Base para procurar por autenticação \n(por exemplo: "
+"dc=exemplo,dc=com).\n"
 
 #: ../utils/setup.c:210
 msgid "LDAP bind DN:"
@@ -200,9 +196,9 @@ msgid ""
 "the password associated with that account.  Otherwise, you can leave this\n"
 "blank.\n"
 msgstr ""
-"Se indicou um DN de ligação na questão anterior, deve indicar agora a "
-"palavra-passe associada com essa conta. Caso contrário, pode deixar esta "
-"opção em branco."
+"Se indicou um DN de ligação na questão anterior, deve indicar agora a \n"
+"palavra-passe associada com essa conta. Caso contrário, pode deixar esta \n"
+"opção em branco.\n"
 
 #: ../utils/setup.c:299
 msgid "Yes/No"
@@ -233,7 +229,7 @@ msgid "Adding service entry..."
 msgstr ""
 
 #. Other errors might mean something really did go wrong.
-#.
+#. 
 #: ../utils/setup.c:463 ../utils/setup.c:510 ../utils/setup.c:518
 msgid "Cannot open"
 msgstr ""
@@ -356,9 +352,8 @@ msgstr ""
 
 #: ../utils/setup.c:1450 ../utils/setup.c:1457 ../utils/setup.c:1472
 #: ../utils/setup.c:1512
-#, fuzzy
 msgid "Citadel Setup"
-msgstr "Citadel/UX"
+msgstr ""
 
 #: ../utils/setup.c:1459
 msgid "The directory you specified does not exist"
@@ -371,9 +366,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:1485
-#, fuzzy
 msgid "Citadel setup program"
-msgstr "Active Directory"
+msgstr ""
 
 #: ../utils/setup.c:1513
 msgid "This Citadel installation is too old to be upgraded."
@@ -387,12 +381,12 @@ msgstr ""
 #~ "Please specify the IP address which the server should be listening to. If "
 #~ "you specify 0.0.0.0, the server will listen on all addresses."
 #~ msgstr ""
-#~ "Por favor, indique o endereço IP no qual o servidor irá estar à escuta. "
-#~ "Se indicar 0.0.0.0 o servidor irá escutar em todos os endereços."
+#~ "Por favor, indique o endereço IP no qual o servidor irá estar à escuta. Se "
+#~ "indicar 0.0.0.0 o servidor irá escutar em todos os endereços."
 
 #~ msgid ""
-#~ "This can usually be left to the default unless multiple instances of "
-#~ "Citadel are running on the same computer."
+#~ "This can usually be left to the default unless multiple instances of Citadel "
+#~ "are running on the same computer."
 #~ msgstr ""
 #~ "Pode normalmente deixar o valor pré-definido a não ser que execute várias "
 #~ "instâncias do Citadel no mesmo computador."
@@ -407,8 +401,8 @@ msgstr ""
 #~ msgstr "LDAP"
 
 #~ msgid ""
-#~ "Do not change this option unless you are sure it is required, since "
-#~ "changing back requires a full reinstall of Citadel."
+#~ "Do not change this option unless you are sure it is required, since changing "
+#~ "back requires a full reinstall of Citadel."
 #~ msgstr ""
 #~ "Não altere esta opção a não ser que esteja seguro da sua necessidade, uma "
 #~ "vez que mudá-la posteriormente necessita de uma reinstalação do Citadel."
@@ -417,8 +411,8 @@ msgstr ""
 #~ "While not mandatory, it is highly recommended that you set a password for "
 #~ "the administrator user."
 #~ msgstr ""
-#~ "Embora não sendo obrigatória, é altamente recomendado que defina uma "
-#~ "palavra-passe para o administrador."
+#~ "Embora não sendo obrigatória, é altamente recomendado que defina uma palavra-"
+#~ "passe para o administrador."
 
 #~ msgid "Internal, Host, LDAP, Active Directory"
 #~ msgstr "Interna, Host, LDAP, Active Directory"
@@ -448,10 +442,9 @@ msgstr ""
 
 #~ msgid ""
 #~ "For post configuring your Citadel Server, use citadel-webcit with your "
-#~ "browser, log in as the user you specified as the Administrator, and "
-#~ "review the Points under the Administration menu. If you have further "
-#~ "questions review www.citadel.org, especially the FAQ and Documentation "
-#~ "section."
+#~ "browser, log in as the user you specified as the Administrator, and review "
+#~ "the Points under the Administration menu. If you have further questions "
+#~ "review www.citadel.org, especially the FAQ and Documentation section."
 #~ msgstr ""
 #~ "Para configuração posterior do seu servidor Citadel, use o citadel-webcit "
 #~ "com o seu browser, entre com o nome de utilazdor designado como "
diff --git a/citadel/po/citadel-setup/ru.po b/citadel/po/citadel-setup/ru.po
index 9c305d5c7..6f6766602 100644
--- a/citadel/po/citadel-setup/ru.po
+++ b/citadel/po/citadel-setup/ru.po
@@ -10,21 +10,21 @@ msgstr ""
 "Project-Id-Version: citadel 7.63-1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-09-28 00:22+0200\n"
-"PO-Revision-Date: 2009-09-10 20:26+0400\n"
+"PO-Revision-Date: 2010-10-22 14:42+0000\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+X-Launchpad-Export-Date: 2010-10-23 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"Language: ru\n"
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../utils/setup.c:119
-#, fuzzy
 msgid "Citadel Home Directory"
-msgstr "Active Directory"
+msgstr ""
 
 #: ../utils/setup.c:122
 msgid ""
@@ -99,9 +99,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:168
-#, fuzzy
 msgid "Server port number:"
-msgstr "Номер порта LDAP:"
+msgstr ""
 
 #: ../utils/setup.c:170
 msgid ""
@@ -150,31 +149,29 @@ msgid "LDAP host:"
 msgstr "Сервер LDAP:"
 
 #: ../utils/setup.c:199
-#, fuzzy
 msgid "Please enter the host name or IP address of your LDAP server.\n"
-msgstr "Введите имя или IP-адрес сервера LDAP."
+msgstr "Введите имя или IP-адрес сервера LDAP.\n"
 
 #: ../utils/setup.c:201
 msgid "LDAP port number:"
 msgstr "Номер порта LDAP:"
 
 #: ../utils/setup.c:203
-#, fuzzy
 msgid "Please enter the port number of the LDAP service (usually 389).\n"
-msgstr "Введите номер порта службы LDAP (обычно 389)."
+msgstr "Введите номер порта службы LDAP (обычно 389).\n"
 
 #: ../utils/setup.c:205
 msgid "LDAP base DN:"
 msgstr "Базовое DN LDAP:"
 
 #: ../utils/setup.c:207
-#, fuzzy
+
 msgid ""
 "Please enter the Base DN to search for authentication\n"
 "(for example: dc=example,dc=com)\n"
 msgstr ""
-"Введите базовое DN для поиска, используемое при аутентификации (например: "
-"dc=example,dc=com)."
+"Введите базовое DN для поиска, используемое при аутентификации \n(например: "
+"dc=example,dc=com).\n"
 
 #: ../utils/setup.c:210
 msgid "LDAP bind DN:"
@@ -201,14 +198,13 @@ msgid "LDAP bind password:"
 msgstr "Пароль для подключения к LDAP:"
 
 #: ../utils/setup.c:222
-#, fuzzy
 msgid ""
 "If you entered a Bind DN in the previous question, you must now enter\n"
 "the password associated with that account.  Otherwise, you can leave this\n"
 "blank.\n"
 msgstr ""
-"Если вы ввели DN учётной записи в предыдущем вопросе, то теперь вам нужно "
-"указать пароль для этой учётной записи. Иначе можете оставить поле пустым."
+"Если вы ввели DN учётной записи в предыдущем вопросе, то теперь вам нужно\n"
+"указать пароль для этой учётной записи. Иначе можете оставить поле пустым.\n"
 
 #: ../utils/setup.c:299
 msgid "Yes/No"
@@ -239,7 +235,7 @@ msgid "Adding service entry..."
 msgstr ""
 
 #. Other errors might mean something really did go wrong.
-#.
+#. 
 #: ../utils/setup.c:463 ../utils/setup.c:510 ../utils/setup.c:518
 msgid "Cannot open"
 msgstr ""
@@ -376,9 +372,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:1485
-#, fuzzy
 msgid "Citadel setup program"
-msgstr "Active Directory"
+msgstr ""
 
 #: ../utils/setup.c:1513
 msgid "This Citadel installation is too old to be upgraded."
@@ -393,15 +388,15 @@ msgstr ""
 #~ "you specify 0.0.0.0, the server will listen on all addresses."
 #~ msgstr ""
 #~ "Введите IP-адрес, который будет использовать сервер для ожидания "
-#~ "подключений. Если указать 0.0.0.0, то Citadel будет ожидать подключения "
-#~ "на адресах всех интерфейсов."
+#~ "подключений. Если указать 0.0.0.0, то Citadel будет ожидать подключения на "
+#~ "адресах всех интерфейсов."
 
 #~ msgid ""
-#~ "This can usually be left to the default unless multiple instances of "
-#~ "Citadel are running on the same computer."
+#~ "This can usually be left to the default unless multiple instances of Citadel "
+#~ "are running on the same computer."
 #~ msgstr ""
-#~ "Если вы не запускаете несколько экземпляров Citadel на одном компьютере, "
-#~ "то можно оставить значение по умолчанию."
+#~ "Если вы не запускаете несколько экземпляров Citadel на одном компьютере, то "
+#~ "можно оставить значение по умолчанию."
 
 #~ msgid "Internal"
 #~ msgstr "Внутренняя"
@@ -413,8 +408,8 @@ msgstr ""
 #~ msgstr "LDAP"
 
 #~ msgid ""
-#~ "Do not change this option unless you are sure it is required, since "
-#~ "changing back requires a full reinstall of Citadel."
+#~ "Do not change this option unless you are sure it is required, since changing "
+#~ "back requires a full reinstall of Citadel."
 #~ msgstr ""
 #~ "Не выбирайте других пунктов кроме первого, если не уверены, что это "
 #~ "действительно нужно, так как для изменения потребуется полностью "
diff --git a/citadel/po/citadel-setup/sv.po b/citadel/po/citadel-setup/sv.po
index 7fc491217..fe10ae8ea 100644
--- a/citadel/po/citadel-setup/sv.po
+++ b/citadel/po/citadel-setup/sv.po
@@ -8,21 +8,23 @@ msgstr ""
 "Project-Id-Version: citadel\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-09-28 00:22+0200\n"
-"PO-Revision-Date: 2009-10-22 01:30+0100\n"
+"PO-Revision-Date: 2010-10-22 14:43+0000\n"
 "Last-Translator: Martin Bagge <brother@bsnet.se>\n"
 "Language-Team: swedish <debian-l10n-swedish@lists.debian.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "X-Poedit-Language: Swedish\n"
+"X-Launchpad-Export-Date: 2010-10-23 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: Sweden\n"
+"Language: sv\n"
+"X-Poedit-Language: Swedish\n"
 
 #: ../utils/setup.c:119
-#, fuzzy
 msgid "Citadel Home Directory"
-msgstr "Active Directory"
+msgstr ""
 
 #: ../utils/setup.c:122
 msgid ""
@@ -97,9 +99,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:168
-#, fuzzy
 msgid "Server port number:"
-msgstr "Portnummer för LDAP:"
+msgstr ""
 
 #: ../utils/setup.c:170
 msgid ""
@@ -146,31 +147,28 @@ msgid "LDAP host:"
 msgstr "LDAP-värd:"
 
 #: ../utils/setup.c:199
-#, fuzzy
 msgid "Please enter the host name or IP address of your LDAP server.\n"
-msgstr "Ange värdnamnet eller IP-adressen för din LDAP-server."
+msgstr "Ange värdnamnet eller IP-adressen för din LDAP-server.\n"
 
 #: ../utils/setup.c:201
 msgid "LDAP port number:"
 msgstr "Portnummer för LDAP:"
 
 #: ../utils/setup.c:203
-#, fuzzy
 msgid "Please enter the port number of the LDAP service (usually 389).\n"
-msgstr "Ange portnummer för din LDAP-server (vanligen 389)."
+msgstr "Ange portnummer för din LDAP-server (vanligen 389).\n"
 
 #: ../utils/setup.c:205
 msgid "LDAP base DN:"
 msgstr "Bas-DN för LDAP:"
 
 #: ../utils/setup.c:207
-#, fuzzy
 msgid ""
 "Please enter the Base DN to search for authentication\n"
 "(for example: dc=example,dc=com)\n"
 msgstr ""
 "Ange det Bas-DN som ska användas vid sökning för identifiering av användare "
-"(ex. dc=example,dc=com)."
+"\n(ex. dc=example,dc=com).\n"
 
 #: ../utils/setup.c:210
 msgid "LDAP bind DN:"
@@ -235,7 +233,7 @@ msgid "Adding service entry..."
 msgstr ""
 
 #. Other errors might mean something really did go wrong.
-#.
+#. 
 #: ../utils/setup.c:463 ../utils/setup.c:510 ../utils/setup.c:518
 msgid "Cannot open"
 msgstr ""
@@ -372,9 +370,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:1485
-#, fuzzy
 msgid "Citadel setup program"
-msgstr "Active Directory"
+msgstr ""
 
 #: ../utils/setup.c:1513
 msgid "This Citadel installation is too old to be upgraded."
@@ -392,11 +389,11 @@ msgstr ""
 #~ "servern att lyssna på alla adresser."
 
 #~ msgid ""
-#~ "This can usually be left to the default unless multiple instances of "
-#~ "Citadel are running on the same computer."
+#~ "This can usually be left to the default unless multiple instances of Citadel "
+#~ "are running on the same computer."
 #~ msgstr ""
-#~ "Standardvalet fungerar utmärkt för alla som endast kör en instans av "
-#~ "Citadel på samma dator."
+#~ "Standardvalet fungerar utmärkt för alla som endast kör en instans av Citadel "
+#~ "på samma dator."
 
 #~ msgid "Internal"
 #~ msgstr "Internt"
@@ -408,11 +405,11 @@ msgstr ""
 #~ msgstr "LDAP"
 
 #~ msgid ""
-#~ "Do not change this option unless you are sure it is required, since "
-#~ "changing back requires a full reinstall of Citadel."
+#~ "Do not change this option unless you are sure it is required, since changing "
+#~ "back requires a full reinstall of Citadel."
 #~ msgstr ""
-#~ "Ändra inte denna inställning om du inte är helt säker på att det behövs. "
-#~ "För att återställa måste hela Citadel installeras om."
+#~ "Ändra inte denna inställning om du inte är helt säker på att det behövs. För "
+#~ "att återställa måste hela Citadel installeras om."
 
 #~ msgid ""
 #~ "While not mandatory, it is highly recommended that you set a password for "
@@ -431,5 +428,4 @@ msgstr ""
 #~ "Please enter the name of the Citadel user account that should be granted "
 #~ "administrative privileges once created."
 #~ msgstr ""
-#~ "Ange namnet på det Citadel-konto som ska agera adminstratör när det "
-#~ "skapats."
+#~ "Ange namnet på det Citadel-konto som ska agera adminstratör när det skapats."
diff --git a/citadel/po/citadel-setup/vi.po b/citadel/po/citadel-setup/vi.po
index 88cfdecd7..e15465789 100644
--- a/citadel/po/citadel-setup/vi.po
+++ b/citadel/po/citadel-setup/vi.po
@@ -7,20 +7,21 @@ msgstr ""
 "Project-Id-Version: citadel 7.61-1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-09-28 00:22+0200\n"
-"PO-Revision-Date: 2009-09-23 18:07+0930\n"
+"PO-Revision-Date: 2010-10-22 14:44+0000\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
+"X-Launchpad-Export-Date: 2010-10-23 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"Language: vi\n"
 
 #: ../utils/setup.c:119
-#, fuzzy
 msgid "Citadel Home Directory"
-msgstr "Thư mục Hoạt động"
+msgstr ""
 
 #: ../utils/setup.c:122
 msgid ""
@@ -94,9 +95,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:168
-#, fuzzy
 msgid "Server port number:"
-msgstr "Số thứ tự cổng LDAP:"
+msgstr ""
 
 #: ../utils/setup.c:170
 msgid ""
@@ -144,18 +144,16 @@ msgid "LDAP host:"
 msgstr "Máy chủ LDAP:"
 
 #: ../utils/setup.c:199
-#, fuzzy
 msgid "Please enter the host name or IP address of your LDAP server.\n"
-msgstr "Hãy gõ tên máy hay địa chỉ IP của máy phục vụ LDAP nên dùng."
+msgstr "Hãy gõ tên máy hay địa chỉ IP của máy phục vụ LDAP nên dùng.\n"
 
 #: ../utils/setup.c:201
 msgid "LDAP port number:"
 msgstr "Số thứ tự cổng LDAP:"
 
 #: ../utils/setup.c:203
-#, fuzzy
 msgid "Please enter the port number of the LDAP service (usually 389).\n"
-msgstr "Hãy gõ số thứ tự cổng của dịch vụ LDAP (thường là 389)."
+msgstr "Hãy gõ số thứ tự cổng của dịch vụ LDAP (thường là 389).\n"
 
 #: ../utils/setup.c:205
 msgid "LDAP base DN:"
@@ -167,8 +165,8 @@ msgid ""
 "Please enter the Base DN to search for authentication\n"
 "(for example: dc=example,dc=com)\n"
 msgstr ""
-"Hãy gõ tên phân biệt (DN) cơ bản để tìm kiếm thông tin xác thực (v.d. « "
-"dc=tên_miền,dc=com »)."
+"Hãy gõ tên phân biệt (DN) cơ bản để tìm kiếm thông tin xác thực \n(v.d. « "
+"dc=tên_miền,dc=com »).\n"
 
 #: ../utils/setup.c:210
 msgid "LDAP bind DN:"
@@ -195,15 +193,14 @@ msgid "LDAP bind password:"
 msgstr "Mật khẩu tổ hợp LDAP:"
 
 #: ../utils/setup.c:222
-#, fuzzy
 msgid ""
 "If you entered a Bind DN in the previous question, you must now enter\n"
 "the password associated with that account.  Otherwise, you can leave this\n"
 "blank.\n"
 msgstr ""
-"Nếu bạn đã nhập một tên phân biệt (DN) kiểu đóng kết khi đáp ứng câu hỏi "
-"đằng trước, ở đây cũng cần gõ mật khẩu tương ứng với tài khoản đó. Không thì "
-"bỏ trống trường này."
+"Nếu bạn đã nhập một tên phân biệt (DN) kiểu đóng kết khi đáp ứng câu hỏi \n"
+"đằng trước, ở đây cũng cần gõ mật khẩu tương ứng với tài khoản đó. Không thì\n"
+"bỏ trống trường này.\n"
 
 #: ../utils/setup.c:299
 msgid "Yes/No"
@@ -234,7 +231,7 @@ msgid "Adding service entry..."
 msgstr ""
 
 #. Other errors might mean something really did go wrong.
-#.
+#. 
 #: ../utils/setup.c:463 ../utils/setup.c:510 ../utils/setup.c:518
 msgid "Cannot open"
 msgstr ""
@@ -371,9 +368,8 @@ msgid ""
 msgstr ""
 
 #: ../utils/setup.c:1485
-#, fuzzy
 msgid "Citadel setup program"
-msgstr "Thư mục Hoạt động"
+msgstr ""
 
 #: ../utils/setup.c:1513
 msgid "This Citadel installation is too old to be upgraded."
@@ -387,15 +383,15 @@ msgstr ""
 #~ "Please specify the IP address which the server should be listening to. If "
 #~ "you specify 0.0.0.0, the server will listen on all addresses."
 #~ msgstr ""
-#~ "Hãy chỉ định địa chỉ IP trên đó trình phục vụ nên lắng nghe. Đặt địa chỉ "
-#~ "« 0.0.0.0 » thì trình phục vụ lắng nghe trên mọi địa chỉ."
+#~ "Hãy chỉ định địa chỉ IP trên đó trình phục vụ nên lắng nghe. Đặt địa chỉ « "
+#~ "0.0.0.0 » thì trình phục vụ lắng nghe trên mọi địa chỉ."
 
 #~ msgid ""
-#~ "This can usually be left to the default unless multiple instances of "
-#~ "Citadel are running on the same computer."
+#~ "This can usually be left to the default unless multiple instances of Citadel "
+#~ "are running on the same computer."
 #~ msgstr ""
-#~ "Giá trị mặc định thường vẫn thích hợp nếu chỉ có một tiến trình Citadel "
-#~ "đang chạy trên máy này."
+#~ "Giá trị mặc định thường vẫn thích hợp nếu chỉ có một tiến trình Citadel đang "
+#~ "chạy trên máy này."
 
 #~ msgid "Internal"
 #~ msgstr "Nội bộ"
@@ -407,11 +403,11 @@ msgstr ""
 #~ msgstr "LDAP"
 
 #~ msgid ""
-#~ "Do not change this option unless you are sure it is required, since "
-#~ "changing back requires a full reinstall of Citadel."
+#~ "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 tuỳ chọn "
-#~ "này cần thiết cài đặt lại Citadel một cách hoàn toàn."
+#~ "Chưa chắc thì không nên bật tuỳ chọn này, vì việc hoàn nguyên tuỳ chọn này "
+#~ "cần thiết cài đặt lại Citadel một cách hoàn toàn."
 
 #~ msgid ""
 #~ "While not mandatory, it is highly recommended that you set a password for "
-- 
2.30.2