merge in debian package update

18 files changed, 593 insertions, 486 deletions

diff --git a/debian/changelog b/debian/changelog
index 5015777..9887de5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,54 @@ zephyr (3.0~a1) unstable; urgency=low
   * Kerberos 5 client support; new upstream?
   * GNU config automated update: config.sub     (20070118 to 20080116),
     config.guess     (20070306 to 20080123)
+  * Acknowledge NMUs
+  * Build-depend on x11proto-core-dev.  Closess: #515456
+  * Japanese debconf translation, thanks to Hideki Yamane.  Closes: #510734
 
  -- Karl Ramm <kcr@1ts.org>  Sun, 21 Dec 2008 02:07:58 -0500
 
+zephyr (2.1.20070719.SNAPSHOT-2) unstable; urgency=low
+
+  * Z_SendLocation could be fooled by the USER_LOGIN message (which has
+    the same UID as the SERVACK we're really waiting for) arriving first.
+    Wait for the SERVACK explicitly, so the USER_LOGIN gets left on the
+    queue even if it arrives early. (thanks, Mark!)
+  * Acknowledge NMUs
+  * Build-depend on x11proto-core-dev.  Closess: #515456
+  * Japanese debconf translation, thanks to Hideki Yamane.  Closes: #510734
+
+ -- Karl Ramm <kcr@debian.org>  Sun, 01 Mar 2009 02:52:20 -0500
+
+zephyr (2.1.20070719.SNAPSHOT-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix pending l10n issues. Debconf translations:
+    - Swedish. Closes: #491531
+  * Brazilian Portuguese. Closes: #501262
+
+ -- Christian Perrier <bubulle@debian.org>  Mon, 06 Oct 2008 07:16:54 +0200
+
+zephyr (2.1.20070719.SNAPSHOT-1.1) unstable; urgency=low
+
+  * Non-maintainer upload to fix pending l10n issues
+  * Debconf templates and debian/control reviewed by the debian-l10n-
+    english team as part of the Smith review project. Closes: #453291
+  * [Debconf translation updates]
+    - Galician. Closes: #454511, #447936
+    - Finnish. Closes: #454608
+    - Czech. Closes: #455240
+    - Spanish. Closes: #455576
+    - Italian. Closes: #456225
+    - Basque. Closes: #456823
+    - German. Closes: #456981
+    - Dutch. Closes: #457034, #447724
+    - Russian. Closes: #457087, #451807
+    - Portuguese. Closes: #457111
+    - Vietnamese. Closes: #457301
+    - French. Closes: #457560, #435494, #435495
+
+ -- Christian Perrier <bubulle@debian.org>  Wed, 20 Feb 2008 20:11:27 +0100
+
 zephyr (2.1.20070719.SNAPSHOT-1) unstable; urgency=low
 
   * new upstream, Closes: #433603
diff --git a/debian/control b/debian/control
index ae6e4bc..df33b41 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Karl Ramm <kcr@debian.org>
 Uploaders: Karl Ramm <kcr@debian.org>, Sam Hartman <hartmans@debian.org>
-Build-Depends: debhelper (>= 4), libares-dev, libkrb5-dev (>= 1.2.2-4), comerr-dev, ss-dev, libreadline5-dev, libx11-dev, libxt-dev, x-dev, libxaw7-dev | libxaw8-dev, libxmu-dev, libncurses5-dev, bison, libhesiod-dev, libssl-dev
+Build-Depends: debhelper (>= 4), libares-dev, libkrb5-dev (>= 1.2.2-4), comerr-dev, ss-dev, libreadline5-dev, libx11-dev, libxt-dev, x-dev  | x11proto-core-dev, libxaw7-dev | libxaw8-dev, libxmu-dev, libncurses5-dev, bison, libhesiod-dev
 Standards-Version: 3.7.2.2
 
 Package: libzephyr4
@@ -11,11 +11,13 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libzephyr4-krb, libzephyr4-krb5, libzephyr4-krb45
-Description: The original "Instant Message" system libraries without Kerberos
- This is the Project Athena Zephyr notification system 2000/04/21 snapshot.
- Zephyr allows users to send messages to other users or to groups of
- users.  Users can view incoming Zephyr messages as windowgrams
- (transient X windows) or as text on a terminal.
+Description: Project Athena's notification service - non-Kerberos libraries
+ Zephyr is derived from the original Project Athena 'Instant Message' system
+ and allows users to send messages to other users or to groups of users.
+ Users can view incoming Zephyr messages as windowgrams (transient X
+ windows) or as text on a terminal.
+ .
+ This package provides the libraries without Kerberos support.
 
 Package: libzephyr4-krb
 Section: libs
@@ -24,13 +26,13 @@ Depends: ${shlibs:Depends}, krb4-config
 Conflicts: libzephyr4, libzephyr4-krb5, libzephyr4-krb45
 Replaces: libzephyr4, libzephyr4-krb5, libzephyr4-krb45
 Provides: libzephyr4
-Description: The original "Instant Message" system libraries with Kerberos 
- This version of the library uses Kerberos for message authentication.
+Description: Project Athena's notification service - libraries with Kerberos
+ Zephyr is derived from the original Project Athena 'Instant Message' system
+ and allows users to send messages to other users or to groups of users.
+ Users can view incoming Zephyr messages as windowgrams (transient X
+ windows) or as text on a terminal.
  .
- This is the Project Athena Zephyr notification system 2000/04/21 snapshot.
- Zephyr allows users to send messages to other users or to groups of
- users.  Users can view incoming Zephyr messages as windowgrams
- (transient X windows) or as text on a terminal.
+ This package provides libraries that use Kerberos.
 
 Package: libzephyr4-krb5
 Section: libs
@@ -67,31 +69,29 @@ Section: net
 Replaces: zephyr-client
 Architecture: any
 Depends: ${shlibs:Depends}, debianutils (>= 1.6), debconf | debconf-2.0
-Description: The original "Instant Message" system client
- This package only contains the clients; you'll need a server to talk to.
+Description: Project Athena's notification service - client programs
+ Zephyr is derived from the original Project Athena 'Instant Message' system
+ and allows users to send messages to other users or to groups of users.
+ Users can view incoming Zephyr messages as windowgrams (transient X
+ windows) or as text on a terminal.
  .
- This is the Project Athena Zephyr notification system 2000/04/21 snapshot.
- Zephyr allows users to send messages to other users or to groups of
- users.  Users can view incoming Zephyr messages as windowgrams
- (transient X windows) or as text on a terminal.
+ This package provides client programs for the messaging service.
 
 Package: zephyr-server
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, debconf | debconf-2.0
 Conflicts: zephyr-server-krb, zephyr-server-krb5, zephyr-server-krb45
-Description: The original "Instant Message" system-server without Kerberos
- You probably only need one server for a group of clients.
- This can be a memory-intensive server, especially for very large sites.
- .
- The server maintains a location and subscription database for all the
- receiving clients. All zephyrgrams are sent to the server to be routed
- to the intended recipient.
- .
- This is the Project Athena Zephyr notification system 2000/04/21 snapshot.
- Zephyr allows users to send messages to other users or to groups of
- users.  Users can view incoming Zephyr messages as windowgrams
- (transient X windows) or as text on a terminal.
+Description: Project Athena's notification service - non-Kerberos server
+ Zephyr is derived from the original Project Athena 'Instant Message' system
+ and allows users to send messages to other users or to groups of users.
+ Users can view incoming Zephyr messages as windowgrams (transient X
+ windows) or as text on a terminal.
+ .
+ This package provides the server for the messaging service, which
+ maintains a location and subscription database for all the receiving
+ clients. All zephyrgrams are sent to the server to be routed to the
+ intended recipient. Only one server is required for a group of clients.
 
 Package: zephyr-server-krb
 Section: net
@@ -100,20 +100,21 @@ Depends: ${shlibs:Depends}, debconf | debconf-2.0, libzephyr4-krb
 Conflicts: zephyr-server, zephyr-server-krb5, zephyr-server-krb45
 Replaces: zephyr-server, zephyr-server-krb5, zephyr-server-krb45
 Provides: zephyr-server
-Description: The original "Instant Message" system-server with Kerberos
- You probably only need one server for a group of clients.
- This can be a memory-intensive server, especially for very large sites.
+Description: Project Athena's notification service - server with Kerberos
+ Zephyr is derived from the original Project Athena 'Instant Message' system
+ and allows users to send messages to other users or to groups of users.
+ Users can view incoming Zephyr messages as windowgrams (transient X
+ windows) or as text on a terminal.
+ .
+ This package provides the server for the messaging service. Only one
+ server is needed for a group of client. The program consumes much memory,
+ especially for very large sites.
  .
  The server maintains a location and subscription database for all the
  receiving clients. All zephyrgrams are sent to the server to be routed
  to the intended recipient.
  .
- This version of the server uses Kerberos for message authentication.
- .
- This is the Project Athena Zephyr notification system 2000/04/21 snapshot.
- Zephyr allows users to send messages to other users or to groups of
- users.  Users can view incoming Zephyr messages as windowgrams
- (transient X windows) or as text on a terminal.
+ This version of the server uses Kerberos.
 
 Package: zephyr-server-krb5
 Section: net
@@ -163,12 +164,11 @@ Package: libzephyr-dev
 Section: libdevel
 Architecture: any
 Depends: libzephyr4 (= ${binary:Version}) | libzephyr4-krb (= ${binary:Version}), libc6-dev
-Description: The original "Instant Message" system development libraries
- This package is needed to compile certain other zephyr clients. There are
- various other clients available, including a totally gratuitous Motif client,
- a Tcl client, several Emacs clients, and a number of X clients.
- .
- This is the Project Athena Zephyr notification system 2000/04/21 snapshot.
- Zephyr allows users to send messages to other users or to groups of
- users.  Users can view incoming Zephyr messages as windowgrams
- (transient X windows) or as text on a terminal.
+Description: Project Athena's notification service - development files
+ Zephyr is derived from the original Project Athena 'Instant Message' system
+ and allows users to send messages to other users or to groups of users.
+ Users can view incoming Zephyr messages as windowgrams (transient X
+ windows) or as text on a terminal.
+ .
+ This package provides development libraries and files, which are
+ needed to compile alternative Zephyr clients.
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 3764deb..56ad2b1 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -14,42 +14,47 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zephyr\n"
-"Report-Msgid-Bugs-To: kcr@debian.org\n"
-"POT-Creation-Date: 2007-07-19 04:11-0400\n"
-"PO-Revision-Date: 2005-03-16 20:16+0100\n"
+"Report-Msgid-Bugs-To: Source: zephyr@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-05 09:47+0530\n"
+"PO-Revision-Date: 2007-12-08 17:00+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
-"Language-Team: Czech <debian-l10n-czech@debian.org>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid "Zephyr servers:"
-msgstr ""
+msgstr "Zephyr servery:"
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001
-#, fuzzy
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(note that this can be a subset of what you're telling the servers) If you "
-"are using hesiod to advertise your zephyr servers, leave this blank."
+"Please specify the full names of the Zephyr servers, as a space-separated "
+"list."
 msgstr ""
-"Zadejte mezerami odd�len� cel� jm�na va�ich zephyr server� (m��e to b�t i "
-"podmno�ina toho, co sd�lujete server�m)."
+"Zadejte prosím plná jména Zephyr serverů; jednotlivá jména oddělte mezerami."
 
 #. Type: string
 #. Description
-#: ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(Note that this can be a superset of that you're telling the clients.)"
+"The list configured on clients can be a subset of the list configured on "
+"servers."
+msgstr ""
+"Seznam definovaný na klientech může být podmnožinou seznamu definovaného na "
+"serverech."
+
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001
+msgid "This can be left empty if Hesiod is used to advertise Zephyr servers."
 msgstr ""
-"Zadejte mezerami odd�len� cel� jm�na va�ich zephyr server� (m��e to b�t i "
-"nadmno�ina toho, co sd�lujete klient�m)."
+"Pokud pro oznamování Zephyr serverů používáte Hesiod, můžete ponechat "
+"prázdné."
 
 #~ msgid ""
 #~ "We want to try and capture user changes when they edit a config file "
@@ -59,15 +64,15 @@ msgstr ""
 #~ "value is written out in postinst. If this is false we skip reading config "
 #~ "files until postinst runs."
 #~ msgstr ""
-#~ "Sna��me se rozpoznat a zachytit u�ivatelovy ru�n� zm�ny v konfigura�n�m "
-#~ "souboru, co� se d�je v konfigura�n�m skriptu. Ov�em v p��pad� "
-#~ "p�edkonfigurace je konfigura�n� skript spu�t�n dvakr�t p�ed spu�t�n�m "
-#~ "poinstala�n�ho skriptu a tud�� m��eme p�e��st chybnou hodnotu p�ed t�m, "
-#~ "ne� je upraven� hodnota zaps�na v poinstala�n�m kroku. Pokud je to "
-#~ "chybn�, p�esko��me �ten� kofigura�n�ch soubor� a� do poinstala�n� f�ze."
+#~ "Snažíme se rozpoznat a zachytit uživatelovy ruční změny v konfiguračním "
+#~ "souboru, což se děje v konfiguračním skriptu. Ovšem v případě "
+#~ "předkonfigurace je konfigurační skript spuštěn dvakrát před spuštěním "
+#~ "poinstalačního skriptu a tudíž můžeme přečíst chybnou hodnotu před tím, "
+#~ "než je upravená hodnota zapsána v poinstalačním kroku. Pokud je to "
+#~ "chybně, přeskočíme čtení kofiguračních souborů až do poinstalační fáze."
 
 #~ msgid "You have no zephyr servers specified for the client"
-#~ msgstr "Pro klienta jste nezadali ��dn� zephyr servery"
+#~ msgstr "Pro klienta jste nezadali žádné zephyr servery"
 
 #~ msgid ""
 #~ "The zephyr-clients package for whatever reason does not have any zephyr "
@@ -75,12 +80,12 @@ msgstr ""
 #~ "add the names of your zephyr servers, separated by spaces to the zhm_args "
 #~ "variable."
 #~ msgstr ""
-#~ "Bal��ek zephyr-clients nem� z n�jak�ho d�vodu nakonfigurov�n ��dn� zephyr "
-#~ "server. Upravte pros�m soubor /etc/default/zephyr-clients a p�idejte do "
-#~ "n�j do prom�nn� zhm_args mezerami odd�len� jm�na zephyr server�."
+#~ "Balíček zephyr-clients nemá z nějakého důvodu nakonfigurován žádný zephyr "
+#~ "server. Upravte prosím soubor /etc/default/zephyr-clients a přidejte do "
+#~ "něj do proměnné zhm_args mezerami oddělená jména zephyr serverů."
 
 #~ msgid "What are your zephyr servers?"
-#~ msgstr "Jak� jsou va�e zephyr servery?"
+#~ msgstr "Jaké jsou vaše zephyr servery?"
 
 #~ msgid "You should never see this"
-#~ msgstr "Toto jste nikdy nem�li vid�t"
+#~ msgstr "Toto jste nikdy neměli vidět"
diff --git a/debian/po/de.po b/debian/po/de.po
index 602207e..27a0f97 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -1,23 +1,16 @@
+# Translation of proftpd-dfsg debconf templates to German
+# Copyright (C) Tobias Toedter <t.toedter@gmx.net>, 2005, 2006.
+# Copyright (C) Helge Kreutzmann <debian@helgefjell.de>, 2007.
+# This file is distributed under the same license as the proftpd-dfsg package.
 #
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-#    Developers do not need to manually edit POT or PO files.
-#
-# Tobias Toedter <t.toedter@gmx.net>, 2005, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: zephyr\n"
-"Report-Msgid-Bugs-To: kcr@debian.org\n"
-"POT-Creation-Date: 2007-07-19 04:11-0400\n"
-"PO-Revision-Date: 2006-11-02 21:36+0100\n"
-"Last-Translator: Tobias Toedter <t.toedter@gmx.net>\n"
-"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"Project-Id-Version: zephyr 2.1.20070719.SNAPSHOT-3\n"
+"Report-Msgid-Bugs-To: Source: zephyr@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-05 09:47+0530\n"
+"PO-Revision-Date: 2007-12-18 21:27+0100\n"
+"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
+"Language-Team: de <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,33 +19,55 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid "Zephyr servers:"
 msgstr "Zephyr-Server:"
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001
-#, fuzzy
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(note that this can be a subset of what you're telling the servers) If you "
-"are using hesiod to advertise your zephyr servers, leave this blank."
+"Please specify the full names of the Zephyr servers, as a space-separated "
+"list."
 msgstr ""
-"Bitte geben Sie die vollständigen Namen Ihrer zephyr-Server durch "
-"Leerzeichen getrennt ein. (Beachten Sie, dass dies eine Untermenge von dem "
-"sein kann, was Sie den Servern angeben.)"
+"Bitte geben Sie eine durch Leerzeichen getrennte Liste der Namen der Zephyr-"
+"Server an."
 
 #. Type: string
 #. Description
-#: ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(Note that this can be a superset of that you're telling the clients.)"
+"The list configured on clients can be a subset of the list configured on "
+"servers."
+msgstr ""
+"Die Listen auf den konfigurierten Clients können eine Untermenge der Listen "
+"auf den konfigurierten Servern sein."
+
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001
+msgid "This can be left empty if Hesiod is used to advertise Zephyr servers."
 msgstr ""
-"Bitte geben Sie die vollständigen Namen Ihrer zephyr-Server durch "
-"Leerzeichen getrennt ein. (Beachten Sie, dass dies eine Obermenge von dem "
-"sein kann, was Sie den Clients angeben.)"
+"Diese Liste kann leer bleiben, falls Hesiod zum Bekanntgeben von Zephyr-"
+"Servern verwendet wird."
+
+#~ msgid ""
+#~ "Please type the full names of your zephyr servers, separated by spaces. "
+#~ "(note that this can be a subset of what you're telling the servers) If "
+#~ "you are using hesiod to advertise your zephyr servers, leave this blank."
+#~ msgstr ""
+#~ "Bitte geben Sie die vollständigen Namen Ihrer Zephyr-Server durch "
+#~ "Leerzeichen getrennt ein. (Beachten Sie, dass dies eine Untermenge von "
+#~ "dem sein kann, was Sie den Servern angeben.) Falls Sie Hesiod zum "
+#~ "Bekanntgeben Ihrer Server verwenden, lassen Sie dies leer."
+
+#~ msgid ""
+#~ "Please type the full names of your zephyr servers, separated by spaces. "
+#~ "(Note that this can be a superset of that you're telling the clients.)"
+#~ msgstr ""
+#~ "Bitte geben Sie die vollständigen Namen Ihrer zephyr-Server durch "
+#~ "Leerzeichen getrennt ein. (Beachten Sie, dass dies eine Obermenge von dem "
+#~ "sein kann, was Sie den Clients angeben.)"
 
 #~ msgid "for internal use"
 #~ msgstr "Für interne Verwendung"
@@ -68,10 +83,10 @@ msgstr ""
 #~ "Es wird versucht, manuelle Änderungen des Benutzers an den "
 #~ "Konfigurationsdateien zu erkennen. Aus diesem Grund werden die Dateien "
 #~ "mit Hilfe des Konfigurationsskripts angesehen. Allerdings wird dieses "
-#~ "Konfigurationsskript im Falle von »preconfigure« zweimal ausgeführt, "
-#~ "bevor »postinst« an der Reihe ist. Daher kann es sein, dass ein falscher "
-#~ "Wert eingelesen wird, bevor der korrekte Wert während »postinst« "
-#~ "geschrieben wird. Falls dies nicht richtig ist, wird das Einlesen von "
+#~ "Konfigurationsskript im Falle von »preconfigure« zweimal ausgeführt, bevor "
+#~ "»postinst« an der Reihe ist. Daher kann es sein, dass ein falscher Wert "
+#~ "eingelesen wird, bevor der korrekte Wert während »postinst« geschrieben "
+#~ "wird. Falls dies nicht richtig ist, wird das Einlesen von "
 #~ "Konfigurationsdateien übersprungen, bis »postinst« ausgeführt wird."
 
 #~ msgid "You have no zephyr servers specified for the client"
diff --git a/debian/po/es.po b/debian/po/es.po
index e72e58e..2a22e1e 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -20,10 +20,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: zephyr 2.1.20010518.SNAPSHOT-17\n"
-"Report-Msgid-Bugs-To: kcr@debian.org\n"
-"POT-Creation-Date: 2007-07-19 04:11-0400\n"
-"PO-Revision-Date: 2007-04-25 01:00+0200\n"
+"Project-Id-Version: zephyr 2.1.20070719.SNAPSHOT-4\n"
+"Report-Msgid-Bugs-To: Source: zephyr@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-05 09:47+0530\n"
+"PO-Revision-Date: 2007-12-05 15:50+0100\n"
 "Last-Translator: Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>\n"
 "Language-Team: Debian L10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -32,65 +32,34 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid "Zephyr servers:"
-msgstr "Servidores zephyr:"
+msgstr "Servidores Zephyr:"
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001
-#, fuzzy
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(note that this can be a subset of what you're telling the servers) If you "
-"are using hesiod to advertise your zephyr servers, leave this blank."
+"Please specify the full names of the Zephyr servers, as a space-separated "
+"list."
 msgstr ""
-"Por favor, introduzca el nombre completo de sus servidores zephyr separados "
-"por espacios (tenga en cuenta que puede tratarse de un subconjunto de lo que "
-"usted considera como los servidores)."
+"Por favor, introduzca el nombre completo de los servidores Zephyr como una "
+"lista separada por espacios."
 
 #. Type: string
 #. Description
-#: ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(Note that this can be a superset of that you're telling the clients.)"
+"The list configured on clients can be a subset of the list configured on "
+"servers."
 msgstr ""
-"Por favor, introduzca los nombres completos de los servidores zephyr "
-"separados por espacios (tenga en cuenta que se puede tratar de un conjunto "
-"más amplio de lo que usted considera como los clientes)."
+"La lista configurada en los clientes puede ser un subconjunto de la lista "
+"configurada en los servidores."
 
-#~ msgid "for internal use"
-#~ msgstr "para uso interno"
-
-#~ msgid ""
-#~ "We want to try and capture user changes when they edit a config file "
-#~ "manually.  To do this we look at the file in the config script. However, "
-#~ "in the case of preconfigure, the config script is run twice before the "
-#~ "postinst is run.  Thus we may read the wrong value before the edited "
-#~ "value is written out in postinst. If this is false we skip reading config "
-#~ "files until postinst runs."
-#~ msgstr ""
-#~ "Para averiguar qué cambios ha realizado el usuario manualmente en el "
-#~ "fichero de configuración, es preciso mirar en el fichero que hay en el "
-#~ "script de configuración. Sin embargo, si se trata de preconfigurar el "
-#~ "paquete, dicho script se ejecuta dos veces antes de que lo haga el "
-#~ "posterior a la instalación. De ese modo, es posible obtener un valor "
-#~ "equivocado antes de que se guarde después de la instalación el valor "
-#~ "editado. Si no es éste el caso, nos saltamos la lectura de los ficheros "
-#~ "de configuración hasta que se ejecute el script posterior a la "
-#~ "instalación."
-
-#~ msgid "You have no zephyr servers specified for the client"
-#~ msgstr "No ha especificado servidores zephyr para el cliente"
-
-#~ msgid ""
-#~ "The zephyr-clients package for whatever reason does not have any zephyr "
-#~ "servers configured.  Please edit the file /etc/default/zephyr-clients and "
-#~ "add the names of your zephyr servers, separated by spaces to the zhm_args "
-#~ "variable."
-#~ msgstr ""
-#~ "Por algún motivo el paquete zephyr-clients no tiene configurado ningún "
-#~ "servidor zephyr. Por favor, edite el fichero /etc/default/zephyr-clients "
-#~ "y añada los nombres de los servidores zephyr separados por espacios en la "
-#~ "variable zhm_args."
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001
+msgid "This can be left empty if Hesiod is used to advertise Zephyr servers."
+msgstr ""
+"Puede dejarlo en blanco si se utiliza Hesiod para anunciar los servidores "
+"Zephyr."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 92847d7..e54aa6d 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: zephyr_2.1.20010518.SNAPSHOT-17\n"
-"Report-Msgid-Bugs-To: kcr@debian.org\n"
-"POT-Creation-Date: 2007-07-19 04:11-0400\n"
-"PO-Revision-Date: 2006-10-22 10:46+0200\n"
+"Project-Id-Version: zephyr_2.1.20070913.SNAPSHOT-3\n"
+"Report-Msgid-Bugs-To: Source: zephyr@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-05 09:47+0530\n"
+"PO-Revision-Date: 2007-12-23 15:01+0100\n"
 "Last-Translator: Michel Grentzinger <mic.grentz@online.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,71 +24,33 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid "Zephyr servers:"
 msgstr "Serveurs Zephyr�:"
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001
-#, fuzzy
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(note that this can be a subset of what you're telling the servers) If you "
-"are using hesiod to advertise your zephyr servers, leave this blank."
+"Please specify the full names of the Zephyr servers, as a space-separated "
+"list."
 msgstr ""
-"Veuillez indiquer les noms complets de vos serveurs Zephyr, s�par�s par des "
-"espaces (veuillez noter que cette liste peut �tre un sous-ensemble de ce que "
-"vous indiquez aux serveurs)."
+"Veuillez indiquer le nom complet des serveurs Zephyr, s�par�s par un espace."
 
 #. Type: string
 #. Description
-#: ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(Note that this can be a superset of that you're telling the clients.)"
+"The list configured on clients can be a subset of the list configured on "
+"servers."
 msgstr ""
-"Veuillez indiquer les noms complets de vos serveurs Zephyr, s�par�s par des "
-"espaces (veuillez noter que cela peut �tre un sur-ensemble de ce que vous "
-"indiquez aux clients)."
+"La liste configur�e sur les clients peut �tre un sous-ensemble de la liste "
+"configur�e sur les serveurs."
 
-#~ msgid "for internal use"
-#~ msgstr "Usage interne"
-
-#~ msgid ""
-#~ "We want to try and capture user changes when they edit a config file "
-#~ "manually.  To do this we look at the file in the config script. However, "
-#~ "in the case of preconfigure, the config script is run twice before the "
-#~ "postinst is run.  Thus we may read the wrong value before the edited "
-#~ "value is written out in postinst. If this is false we skip reading config "
-#~ "files until postinst runs."
-#~ msgstr ""
-#~ "Nous souhaitons essayer de collecter les modifications faites par des "
-#~ "utilisateurs lorsqu'ils changent eux-m�mes un fichier de configuration. "
-#~ "Pour cela, nous regardons le fichier dans le script de configuration. "
-#~ "Cependant lors de la pr�configuration, le script est lanc� deux fois "
-#~ "avant que le script ��postinst�� ne soit lanc�. Ainsi, nous pouvons lire "
-#~ "la mauvaise valeur avant que la valeur modifi�e ne soit �crite dans le "
-#~ "script ��postinst��. Si cela est faux, nous passerons � travers la "
-#~ "lecture des fichiers de configuration jusqu'� ce que ��postinst�� soit "
-#~ "lanc�."
-
-#~ msgid "You have no zephyr servers specified for the client"
-#~ msgstr "Aucun serveur Zephyr indiqu� pour le client"
-
-#~ msgid ""
-#~ "The zephyr-clients package for whatever reason does not have any zephyr "
-#~ "servers configured.  Please edit the file /etc/default/zephyr-clients and "
-#~ "add the names of your zephyr servers, separated by spaces to the zhm_args "
-#~ "variable."
-#~ msgstr ""
-#~ "Pour une raison quelconque, le paquet zephyr-clients ne contient pas de "
-#~ "serveur Zephyr configur�. Veuillez modifier le fichier /etc/default/"
-#~ "zephyr-clients et ajouter les noms de vos serveurs Zephyr, s�par�s par "
-#~ "des espaces, dans la variable zhm_args."
-
-#~ msgid "What are your zephyr servers?"
-#~ msgstr "Serveurs Zephyr�:"
-
-#~ msgid "You should never see this"
-#~ msgstr "Vous ne devriez jamais voir cela"
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001
+msgid "This can be left empty if Hesiod is used to advertise Zephyr servers."
+msgstr ""
+"Ce champ peut �tre laiss� vide si Hesiod est employ� pour annoncer les "
+"serveurs Zephyr."
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 6cb85ae..92d393f 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zephyr\n"
-"Report-Msgid-Bugs-To: kcr@debian.org\n"
-"POT-Creation-Date: 2007-07-19 04:11-0400\n"
-"PO-Revision-Date: 2007-02-28 10:30+0100\n"
+"Report-Msgid-Bugs-To: Source: zephyr@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-05 09:47+0530\n"
+"PO-Revision-Date: 2007-12-05 20:45+0000\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
 "MIME-Version: 1.0\n"
@@ -16,33 +16,55 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid "Zephyr servers:"
 msgstr "Servidores zephyr:"
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001
-#, fuzzy
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(note that this can be a subset of what you're telling the servers) If you "
-"are using hesiod to advertise your zephyr servers, leave this blank."
+"Please specify the full names of the Zephyr servers, as a space-separated "
+"list."
 msgstr ""
-"Escriba os nomes completos dos seus servidores zephyr, separados por "
-"espazos. (Teña en conta que isto pode ser un subconxunto do que lles conta "
-"aos servidores)"
+"Indique os nomes completos dos servidores Zephyr, nunha lista de nomes "
+"separados por comas."
 
 #. Type: string
 #. Description
-#: ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(Note that this can be a superset of that you're telling the clients.)"
+"The list configured on clients can be a subset of the list configured on "
+"servers."
+msgstr ""
+"A lista configurada nos clientes pode ser un subconxunto da lista "
+"configurada nos servidores."
+
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001
+msgid "This can be left empty if Hesiod is used to advertise Zephyr servers."
 msgstr ""
-"Escriba os nomes completos dos seus servidores zephyr, separados por "
-"espazos. (Teña en conta que pode ser un superconxunto do que lles di aos "
-"clientes)."
+"Pódese deixar baleiro se se emprega Hesiod para anunciar os servidores "
+"Zephyr."
+
+#, fuzzy
+#~ msgid ""
+#~ "Please type the full names of your zephyr servers, separated by spaces. "
+#~ "(note that this can be a subset of what you're telling the servers) If "
+#~ "you are using hesiod to advertise your zephyr servers, leave this blank."
+#~ msgstr ""
+#~ "Escriba os nomes completos dos seus servidores zephyr, separados por "
+#~ "espazos. (Teña en conta que isto pode ser un subconxunto do que lles "
+#~ "conta aos servidores)"
+
+#~ msgid ""
+#~ "Please type the full names of your zephyr servers, separated by spaces. "
+#~ "(Note that this can be a superset of that you're telling the clients.)"
+#~ msgstr ""
+#~ "Escriba os nomes completos dos seus servidores zephyr, separados por "
+#~ "espazos. (Teña en conta que pode ser un superconxunto do que lles di aos "
+#~ "clientes)."
 
 #~ msgid "for internal use"
 #~ msgstr "para uso interno"
diff --git a/debian/po/ja.po b/debian/po/ja.po
new file mode 100644
index 0000000..3ddbf45
--- /dev/null
+++ b/debian/po/ja.po
@@ -0,0 +1,45 @@
+# Copyright (C) 2008 Karl Ramm <kcr@debian.org>
+# This file is distributed under the same license as the zephyr package.
+# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: zephyr 2.1.20070719.SNAPSHOT-1.2\n"
+"Report-Msgid-Bugs-To: Source: zephyr@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-05 09:47+0530\n"
+"PO-Revision-Date: 2008-12-28 22:26+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
+msgid "Zephyr servers:"
+msgstr "Zephyr サーバ:"
+
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
+msgid ""
+"Please specify the full names of the Zephyr servers, as a space-separated "
+"list."
+msgstr ""
+"Zephyr サーバの名前を全て、スペースで区切ったリストで指定してください。"
+
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
+msgid ""
+"The list configured on clients can be a subset of the list configured on "
+"servers."
+msgstr ""
+"クライアント上で設定されたリストは、サーバ上で設定されたリストのサブセットになります。"
+
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001
+msgid "This can be left empty if Hesiod is used to advertise Zephyr servers."
+msgstr "Hesiod を Zephyr サーバの広報に利用している場合は、ここは空のままで構いません。"
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 0832d6d..cadb04c 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -14,45 +14,68 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: zephyr\n"
-"Report-Msgid-Bugs-To: kcr@debian.org\n"
-"POT-Creation-Date: 2007-07-19 04:11-0400\n"
-"PO-Revision-Date: 2007-02-28 21:28+0100\n"
+"Report-Msgid-Bugs-To: Source: zephyr@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-05 09:47+0530\n"
+"PO-Revision-Date: 2007-12-09 14:00+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Dutch\n"
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid "Zephyr servers:"
 msgstr "Zephyr-servers:"
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001
-#, fuzzy
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(note that this can be a subset of what you're telling the servers) If you "
-"are using hesiod to advertise your zephyr servers, leave this blank."
+"Please specify the full names of the Zephyr servers, as a space-separated "
+"list."
 msgstr ""
-"Gelieve de volledige naam van uw zephyr-servers op te geven gescheiden door "
-"spaties (merk op dat dit een subset kan zijn van wat u aan de servers "
-"vertelt)."
+"Gelieve hier een (met spaties gescheiden) lijst van de de volledige namen "
+"van de Zephyr-servers op te geven."
 
 #. Type: string
 #. Description
-#: ../zephyr-server.templates:1001
-#, fuzzy
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(Note that this can be a superset of that you're telling the clients.)"
+"The list configured on clients can be a subset of the list configured on "
+"servers."
 msgstr ""
-"Gelieve de volledige namen van uw zephyr-servers op te geven, gescheiden "
-"door spaties (merk op dat dit een superset kan zijn van wat u de clients "
-"verteld)."
+"De op de clients ingestelde lijst mag een subset zijn van de op de servers "
+"ingestelde lijst."
+
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001
+msgid "This can be left empty if Hesiod is used to advertise Zephyr servers."
+msgstr ""
+"Als u Hesiod gebruikt om Zephyr-servers te adverteren kunt u dit veld "
+"leeglaten."
+
+#, fuzzy
+#~ msgid ""
+#~ "Please type the full names of your zephyr servers, separated by spaces. "
+#~ "(note that this can be a subset of what you're telling the servers) If "
+#~ "you are using hesiod to advertise your zephyr servers, leave this blank."
+#~ msgstr ""
+#~ "Gelieve de volledige naam van uw zephyr-servers op te geven gescheiden "
+#~ "door spaties (merk op dat dit een subset kan zijn van wat u aan de "
+#~ "servers vertelt)."
+
+#, fuzzy
+#~ msgid ""
+#~ "Please type the full names of your zephyr servers, separated by spaces. "
+#~ "(Note that this can be a superset of that you're telling the clients.)"
+#~ msgstr ""
+#~ "Gelieve de volledige namen van uw zephyr-servers op te geven, gescheiden "
+#~ "door spaties (merk op dat dit een superset kan zijn van wat u de clients "
+#~ "verteld)."
 
 #~ msgid "for internal use"
 #~ msgstr "voor intern gebruik"
diff --git a/debian/po/pt.po b/debian/po/pt.po
index b8f9a30..70aba7e 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -1,22 +1,12 @@
-#
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
+# Portuguese translation for zephyr's debconf messages
+# Ricardo Silva <ardoric@gmail.com>, 2007
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: zephyr 2.1.20010518.SNAPSHOT-17.1\n"
-"Report-Msgid-Bugs-To: kcr@debian.org\n"
-"POT-Creation-Date: 2007-07-19 04:11-0400\n"
-"PO-Revision-Date: 2007-03-12 21:15+0000\n"
+"Project-Id-Version: zephyr 2.1.20070719.SNAPSHOT-3\n"
+"Report-Msgid-Bugs-To: Source: zephyr@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-05 09:47+0530\n"
+"PO-Revision-Date: 2007-12-19 22:05+0000\n"
 "Last-Translator: Ricardo Silva <ardoric@gmail.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,33 +15,54 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid "Zephyr servers:"
 msgstr "Servidores Zephyr:"
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001
-#, fuzzy
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(note that this can be a subset of what you're telling the servers) If you "
-"are using hesiod to advertise your zephyr servers, leave this blank."
+"Please specify the full names of the Zephyr servers, as a space-separated "
+"list."
 msgstr ""
-"Por favor escreva os nomes completos dos seus servidores zephyr, separados "
-"por espaços. (note que esta lista pode ser um subconjunto do que diz aos "
-"servidores)"
+"Por favor especifique o nome completo dos servidores Zephyr, numa lista "
+"separada por espaços."
 
 #. Type: string
 #. Description
-#: ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(Note that this can be a superset of that you're telling the clients.)"
+"The list configured on clients can be a subset of the list configured on "
+"servers."
+msgstr ""
+"A lista configurada nos clientes pode ser um sub-conjunto da lista "
+"configurada nos servidores."
+
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001
+msgid "This can be left empty if Hesiod is used to advertise Zephyr servers."
 msgstr ""
-"Por favor escreva os nomes completos dos seus servidores zephyr, separados "
-"por espaços. (Note que esta lista pode ser um super-conjunto do que diz aos "
-"clientes.)"
+"Esta opção pode ser deixada vazia se o Hesiod for utilizado para anunciar os "
+"servidores Zephyr."
+
+#~ msgid ""
+#~ "Please type the full names of your zephyr servers, separated by spaces. "
+#~ "(note that this can be a subset of what you're telling the servers) If "
+#~ "you are using hesiod to advertise your zephyr servers, leave this blank."
+#~ msgstr ""
+#~ "Por favor escreva os nomes completos dos seus servidores zephyr, "
+#~ "separados por espaços. (note que esta lista pode ser um subconjunto do "
+#~ "que diz aos servidores)"
+
+#~ msgid ""
+#~ "Please type the full names of your zephyr servers, separated by spaces. "
+#~ "(Note that this can be a superset of that you're telling the clients.)"
+#~ msgstr ""
+#~ "Por favor escreva os nomes completos dos seus servidores zephyr, "
+#~ "separados por espaços. (Note que esta lista pode ser um super-conjunto "
+#~ "do que diz aos clientes.)"
 
 #~ msgid "for internal use"
 #~ msgstr "para uso interno"
@@ -64,16 +75,16 @@ msgstr ""
 #~ "value is written out in postinst. If this is false we skip reading config "
 #~ "files until postinst runs."
 #~ msgstr ""
-#~ "Tentamos determinar que alterações os utilizadores fazem quando editam um "
-#~ "ficheiro de configuração manualmente. Para tal analisamos o ficheiro no "
-#~ "script de configuração. No entanto quando há pré-configuração, o script "
-#~ "de configuração é corrido duas vezes antes do pós-instalação. Assim "
-#~ "podemos ler os valores errados antes que o valor editado seja escrito no "
-#~ "pós-instalação. Se esta opção for falsa não analisamos os ficheiros de "
-#~ "configuração até que o pós-instalação corra."
+#~ "Tentamos determinar que alterações os utilizadores fazem quando editam "
+#~ "um ficheiro de configuração manualmente. Para tal analisamos o ficheiro "
+#~ "no script de configuração. No entanto quando há pré-configuração, o "
+#~ "script de configuração é corrido duas vezes antes do pós-instalaçÃ"
+#~ "£o. Assim podemos ler os valores errados antes que o valor editado seja "
+#~ "escrito no pós-instalação. Se esta opção for falsa não analisamos "
+#~ "os ficheiros de configuração até que o pós-instalação corra."
 
 #~ msgid "You have no zephyr servers specified for the client"
-#~ msgstr "Não tem nenhum servidor zephyr especificado para o cliente"
+#~ msgstr "Não tem nenhum servidor zephyr especificado para o cliente"
 
 #~ msgid ""
 #~ "The zephyr-clients package for whatever reason does not have any zephyr "
@@ -81,7 +92,7 @@ msgstr ""
 #~ "add the names of your zephyr servers, separated by spaces to the zhm_args "
 #~ "variable."
 #~ msgstr ""
-#~ "O pacote zephyr-clients por alguma razão não tem nenhum servidor zephyr "
+#~ "O pacote zephyr-clients por alguma razão não tem nenhum servidor zephyr "
 #~ "configurado. Por favor edite o ficheiro /etc/default/zephyr-clients e "
-#~ "adicione os nomes dos seus servidores zephyr, separados por espaços à "
-#~ "variável zhm_args."
+#~ "adicione os nomes dos seus servidores zephyr, separados por espaços à "
+#~ "variável zhm_args."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 12ad702..915ba1d 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -7,19 +7,18 @@
 # /usr/share/doc/po-debconf/README-trans
 # or http://www.debian.org/intl/l10n/po-debconf/README-trans
 # Developers do not need to manually edit POT or PO files.
-# 
+#
 # 	
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: zephyr 2.1\n"
-"Report-Msgid-Bugs-To: kcr@debian.org\n"
-"POT-Creation-Date: 2007-07-19 04:11-0400\n"
-"PO-Revision-Date: 2005-03-21 23:30-0300\n"
-"Last-Translator: Felipe Augusto van de Wiel (faw) <felipe@cathedrallabs."
+"Report-Msgid-Bugs-To: Source: zephyr@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-05 09:47+0530\n"
+"PO-Revision-Date: 2008-10-06 02:33-0300\n"
+"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
 "org>\n"
-"Language-Team: Portuguese/Brazil <debian-l10n-portuguese@listas.cipsga.org."
-"br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,33 +26,54 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid "Zephyr servers:"
-msgstr ""
+msgstr "Servidores Zephyr:"
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001
-#, fuzzy
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(note that this can be a subset of what you're telling the servers) If you "
-"are using hesiod to advertise your zephyr servers, leave this blank."
+"Please specify the full names of the Zephyr servers, as a space-separated "
+"list."
 msgstr ""
-"Por favor digite o nome completo dos seus servidores zephyr, separado por "
-"espaços. (note que isso pode ser um subconjunto daquilo que você está "
-"dizendo aos servidores)"
+"Por favor, especifique os nomes completos dos servidores Zephyr, use uma "
+"lista separada por espaços."
 
 #. Type: string
 #. Description
-#: ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(Note that this can be a superset of that you're telling the clients.)"
+"The list configured on clients can be a subset of the list configured on "
+"servers."
+msgstr ""
+"A lista configurada nos clientes pode ser um subconjunto da lista "
+"configurada nos servidores."
+
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001
+msgid "This can be left empty if Hesiod is used to advertise Zephyr servers."
 msgstr ""
-"Por favor digite os nomes completos de seus servidores zephyr, separado por "
-"espaços. (Note que isso pode ser um subconjunto daquilo que você está "
-"dizendo aos clientes.)"
+"É possível deixar este campo vazio se o Hesiod for usado para anunciar os "
+"servidores Zephyr."
+
+#~ msgid ""
+#~ "Please type the full names of your zephyr servers, separated by spaces. "
+#~ "(note that this can be a subset of what you're telling the servers) If "
+#~ "you are using hesiod to advertise your zephyr servers, leave this blank."
+#~ msgstr ""
+#~ "Por favor digite o nome completo dos seus servidores zephyr, separado por "
+#~ "espaços. (note que isso pode ser um subconjunto daquilo que você está "
+#~ "dizendo aos servidores)"
+
+#~ msgid ""
+#~ "Please type the full names of your zephyr servers, separated by spaces. "
+#~ "(Note that this can be a superset of that you're telling the clients.)"
+#~ msgstr ""
+#~ "Por favor digite os nomes completos de seus servidores zephyr, separado "
+#~ "por espaços. (Note que isso pode ser um subconjunto daquilo que você está "
+#~ "dizendo aos clientes.)"
 
 #~ msgid ""
 #~ "We want to try and capture user changes when they edit a config file "
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 87b7a1e..03a1bf7 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -1,4 +1,4 @@
-# translation of zephyr_2.1.20010518.SNAPSHOT-17_ru.po to Russian
+# translation of ru.po to Russian
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -12,14 +12,14 @@
 #
 #    Developers do not need to manually edit POT or PO files.
 #
-# Unknown, 2003,
-# Yuri Kozlov <kozlov.y@gmail.com>, 2006.
+# Unknown, 2003,.
+# Yuri Kozlov <kozlov.y@gmail.com>, 2006, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.20010518.SNAPSHOT-17\n"
-"Report-Msgid-Bugs-To: kcr@debian.org\n"
-"POT-Creation-Date: 2007-07-19 04:11-0400\n"
-"PO-Revision-Date: 2006-12-24 18:45+0300\n"
+"Project-Id-Version: 2.1.20070719.SNAPSHOT-3\n"
+"Report-Msgid-Bugs-To: Source: zephyr@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-05 09:47+0530\n"
+"PO-Revision-Date: 2007-12-19 20:35+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -31,61 +31,31 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid "Zephyr servers:"
 msgstr "Серверы Zephyr:"
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001
-#, fuzzy
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(note that this can be a subset of what you're telling the servers) If you "
-"are using hesiod to advertise your zephyr servers, leave this blank."
-msgstr ""
-"Введите полные имена ваших серверов zephyr, разделяя их пробелами. (заметим, "
-"что это может быть подмножеством того, что вы указываете серверам.)"
+"Please specify the full names of the Zephyr servers, as a space-separated "
+"list."
+msgstr "Введите список полных имён серверов Zephyr через пробел."
 
 #. Type: string
 #. Description
-#: ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(Note that this can be a superset of that you're telling the clients.)"
+"The list configured on clients can be a subset of the list configured on "
+"servers."
 msgstr ""
-"Введите полные имена ваших серверов zephyr, разделяя их пробелами. (заметим, "
-"что это может быть надмножеством того, что вы указываете клиентам.)"
-
-#~ msgid "for internal use"
-#~ msgstr "для внутреннего использования"
-
-#~ msgid ""
-#~ "We want to try and capture user changes when they edit a config file "
-#~ "manually.  To do this we look at the file in the config script. However, "
-#~ "in the case of preconfigure, the config script is run twice before the "
-#~ "postinst is run.  Thus we may read the wrong value before the edited "
-#~ "value is written out in postinst. If this is false we skip reading config "
-#~ "files until postinst runs."
-#~ msgstr ""
-#~ "Мы хотим попробовать захватить пользовательские изменения, когда "
-#~ "пользователи редактируют файл настроек вручную. Чтобы это сделать, мы "
-#~ "смотрим в файл сценария config. Однако в случае preconfigure, сценарий "
-#~ "config запускается дважды до запуска postinst. Потому мы можем прочитать "
-#~ "неверное значение до того, как отредактированное значение будет записано "
-#~ "из postinst. Если это не удалось, то мы пропускаем чтение файлов "
-#~ "настроек, пока не будет запущен postinst."
-
-#~ msgid "You have no zephyr servers specified for the client"
-#~ msgstr "Вы не указали сервера zephyr для клиента"
+"На клиентах можно указывать подмножество списка, настроенного на серверах."
 
-#~ msgid ""
-#~ "The zephyr-clients package for whatever reason does not have any zephyr "
-#~ "servers configured.  Please edit the file /etc/default/zephyr-clients and "
-#~ "add the names of your zephyr servers, separated by spaces to the zhm_args "
-#~ "variable."
-#~ msgstr ""
-#~ "Пакет zephyr-clients по какой-то причине не настроен ни на один из "
-#~ "серверов zephyr. Пожалуйста, отредактируйте файл /etc/default/zephyr-"
-#~ "clients и добавьте имена ваших серверов zephyr, разделяя их пробелами, в "
-#~ "переменную zhm_args."
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001
+msgid "This can be left empty if Hesiod is used to advertise Zephyr servers."
+msgstr ""
+"Можно ничего не вводить, если для объявления серверов Zephyr используется "
+"Hesiod."
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 07d1ff0..4631f5c 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -1,3 +1,4 @@
+# translation of zephyr_2.1.20070719.SNAPSHOT-1.1_sv.po to Swedish
 # Translators, if you are not familiar with the PO format, gettext
 # documentation is worth reading, especially sections dedicated to
 # this format, e.g. by running:
@@ -7,82 +8,50 @@
 # /usr/share/doc/po-debconf/README-trans
 # or http://www.debian.org/intl/l10n/po-debconf/README-trans
 # Developers do not need to manually edit POT or PO files.
-# , fuzzy
-#
 #
+# Martin �gren <martin.agren@gmail.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: zephyr 2.1.20010518.SNAPSHOT-13\n"
-"Report-Msgid-Bugs-To: kcr@debian.org\n"
-"POT-Creation-Date: 2007-07-19 04:11-0400\n"
-"PO-Revision-Date: 2005-12-17 23:27+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Project-Id-Version: zephyr_2.1.20070719.SNAPSHOT-1.1_sv\n"
+"Report-Msgid-Bugs-To: Source: zephyr@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-05 09:47+0530\n"
+"PO-Revision-Date: 2008-07-20 10:41+0200\n"
+"Last-Translator: Martin �gren <martin.agren@gmail.com>\n"
+"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid "Zephyr servers:"
-msgstr ""
+msgstr "Zephyr-servrar:"
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001
-#, fuzzy
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(note that this can be a subset of what you're telling the servers) If you "
-"are using hesiod to advertise your zephyr servers, leave this blank."
-msgstr ""
-"V�nligen ange hela namnen f�r dina zephyr-servrar, separerade med "
-"mellanslag. (notera att detta kan vara ett subset av vad du ber�ttar f�r "
-"servrarna)"
+"Please specify the full names of the Zephyr servers, as a space-separated "
+"list."
+msgstr "Ange hela namnen p� Zephyr-servrarna som en blankstegsseparerad lista."
 
 #. Type: string
 #. Description
-#: ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(Note that this can be a superset of that you're telling the clients.)"
+"The list configured on clients can be a subset of the list configured on "
+"servers."
 msgstr ""
-"V�nligen ange hela namnen f�r dina zephyr-servrar, separerade med mellanslag "
-"(Notera att detta kan vara ett superset av vad du ber�ttar f�r klienterna.)"
-
-#~ msgid ""
-#~ "We want to try and capture user changes when they edit a config file "
-#~ "manually.  To do this we look at the file in the config script. However, "
-#~ "in the case of preconfigure, the config script is run twice before the "
-#~ "postinst is run.  Thus we may read the wrong value before the edited "
-#~ "value is written out in postinst. If this is false we skip reading config "
-#~ "files until postinst runs."
-#~ msgstr ""
-#~ "Vi vill f�rs�ka att f�nga in anv�ndar�ndringar n�r de redigerar en "
-#~ "konfigurationsfil manuellt. F�r att g�ra dett ser vi p� filen i "
-#~ "konfigurationsskriptet. Hur som helst, i fallet med f�rkonfigurationer "
-#~ "k�rs konfigurationsskriptet dubbelt f�re postinst k�rs. D�rf�r kan vi "
-#~ "l�sa av fel v�rde f�re det redigerade v�rdet har skrivits ut i postinst. "
-#~ "Om detta �r falskt hoppar vi �ver l�sning av konfigurationsfiler tills "
-#~ "postinst k�rs."
-
-#~ msgid "You have no zephyr servers specified for the client"
-#~ msgstr "Du har inga zephyr-servrar angivna f�r klienten"
+"Den lista som konfigureras p� klienter kan vara en delm�ngd av listan som "
+"konfigureras p� servrar."
 
-#~ msgid ""
-#~ "The zephyr-clients package for whatever reason does not have any zephyr "
-#~ "servers configured.  Please edit the file /etc/default/zephyr-clients and "
-#~ "add the names of your zephyr servers, separated by spaces to the zhm_args "
-#~ "variable."
-#~ msgstr ""
-#~ "Paketet zephyr-clients har av n�gon anledning inte n�gra zephyr-servrar "
-#~ "konfigurerade. V�nligen redigera filen /etc/default/zephyr-clients och "
-#~ "l�gg till namnen f�r din zephyr-servrar i variabeln zhm_args, separera "
-#~ "med mellanslag."
-
-#~ msgid "What are your zephyr servers?"
-#~ msgstr "Vilka �r dina zephyr-servrar?"
-
-#~ msgid "You should never see this"
-#~ msgstr "Du b�r aldrig se detta"
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001
+msgid "This can be left empty if Hesiod is used to advertise Zephyr servers."
+msgstr ""
+"Detta f�lt kan l�mnas tomt om Hesiod anv�nds f�r att tillk�nnage Zephyr-"
+"servrar."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 4a081ae..90619b2 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: kcr@debian.org\n"
-"POT-Creation-Date: 2007-07-19 04:11-0400\n"
+"Report-Msgid-Bugs-To: Source: zephyr@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-05 09:47+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,23 +18,28 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid "Zephyr servers:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(note that this can be a subset of what you're telling the servers) If you "
-"are using hesiod to advertise your zephyr servers, leave this blank."
+"Please specify the full names of the Zephyr servers, as a space-separated "
+"list."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(Note that this can be a superset of that you're telling the clients.)"
+"The list configured on clients can be a subset of the list configured on "
+"servers."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001
+msgid "This can be left empty if Hesiod is used to advertise Zephyr servers."
 msgstr ""
diff --git a/debian/po/vi.po b/debian/po/vi.po
index b8462c0..15d45ba 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,50 +1,72 @@
 # Vietnamese translation for Zephyr.
-# Copyright © 2005 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2005.
+# Copyright © 2007 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: zephyr 2.1.20010518.SNAPSHOT-13\n"
-"Report-Msgid-Bugs-To: kcr@debian.org\n"
-"POT-Creation-Date: 2007-07-19 04:11-0400\n"
-"PO-Revision-Date: 2005-08-21 21:51+0930\n"
+"Project-Id-Version: zephyr 2.1.20070719.SNAPSHOT-3\n"
+"Report-Msgid-Bugs-To: Source: zephyr@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-05 09:47+0530\n"
+"PO-Revision-Date: 2007-12-21 22:24+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\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.2.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.7b1\n"
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid "Zephyr servers:"
-msgstr ""
+msgstr "Máy phục vụ Zephyr:"
 
 #. Type: string
 #. Description
-#: ../zephyr-clients.templates:1001
-#, fuzzy
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(note that this can be a subset of what you're telling the servers) If you "
-"are using hesiod to advertise your zephyr servers, leave this blank."
+"Please specify the full names of the Zephyr servers, as a space-separated "
+"list."
 msgstr ""
-"Hãy gõ tên đầy đủ của các trình phục vụ zephyr của bạn, định giới bằng dấu "
-"cách (ghi chú: đây có thể là nhóm con của điều mà bạn đang báo những trình "
-"phục vụ)."
+"Hãy ghi rõ tên đầy đủ của mỗi máy phục vụ Zephyr, làm danh sách định giới "
+"bằng dấu cách."
 
 #. Type: string
 #. Description
-#: ../zephyr-server.templates:1001
+#: ../zephyr-clients.templates:2001 ../zephyr-server.templates:2001
 msgid ""
-"Please type the full names of your zephyr servers, separated by spaces. "
-"(Note that this can be a superset of that you're telling the clients.)"
+"The list configured on clients can be a subset of the list configured on "
+"servers."
+msgstr ""
+"Danh sách được cấu hình trên máy khách có thể là tập hợp con của danh sách "
+"được cấu hình trên máy phục vụ."
+
+#. Type: string
+#. Description
+#: ../zephyr-clients.templates:2001
+msgid "This can be left empty if Hesiod is used to advertise Zephyr servers."
 msgstr ""
-"Hãy gõ tên đầy đủ của các trình phục vụ zephyr của bạn, định giới bằng dấu "
-"cách (ghi chú: điều này có thể là siêu nhóm của điều mà bạn đang báo những "
-"trình khách)."
+"Trường này có thể bỏ rỗng nếu Hesiod được dùng để quảng cáo máy phục vụ "
+"Zephyr."
+
+#~ msgid ""
+#~ "Please type the full names of your zephyr servers, separated by spaces. "
+#~ "(note that this can be a subset of what you're telling the servers) If "
+#~ "you are using hesiod to advertise your zephyr servers, leave this blank."
+#~ msgstr ""
+#~ "Hãy gõ tên đầy đủ của các máy phục vụ Zephyr của bạn, định giới bằng dấu "
+#~ "cách (ghi chú: đây có thể là tập hợp con của điều mà bạn báo cho máy phục "
+#~ "vụ). Dùng Hesiod để quảng cáo các máy phục vụ Zephyr thì bỏ rỗng trường "
+#~ "này."
+
+#~ msgid ""
+#~ "Please type the full names of your zephyr servers, separated by spaces. "
+#~ "(Note that this can be a superset of that you're telling the clients.)"
+#~ msgstr ""
+#~ "Hãy gõ tên đầy đủ của các trình phục vụ zephyr của bạn, định giới bằng "
+#~ "dấu cách (ghi chú: điều này có thể là siêu nhóm của điều mà bạn đang báo "
+#~ "những trình khách)."
 
 #~ msgid ""
 #~ "We want to try and capture user changes when they edit a config file "
diff --git a/debian/rules b/debian/rules
index aac989e..d834423 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ configure-stamp:
 	-mkdir krb4
 	cd krb4 && CFLAGS="-g -O" ../configure --with-krb4=/usr $(CONFIGURE_ROOT)
 	-mkdir no-krb
-	cd no-krb && CFLAGS="" ../configure $(CONFIGURE_ROOT)
+	cd no-krb && CFLAGS="-g -O" ../configure $(CONFIGURE_ROOT)
 	touch configure-stamp
 
 build: configure-stamp build-stamp
diff --git a/debian/zephyr-clients.templates b/debian/zephyr-clients.templates
index 9b85e80..2d0d025 100644
--- a/debian/zephyr-clients.templates
+++ b/debian/zephyr-clients.templates
@@ -1,10 +1,22 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english@lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
 Template: zephyr-clients/servers
 Type: string
 _Description: Zephyr servers:
- Please type the full names of your zephyr servers, separated by spaces.
- (note that this can be a subset of what you're telling the servers)
- If you are using hesiod to advertise your zephyr servers, leave this
- blank.
+ Please specify the full names of the Zephyr servers, as a
+ space-separated list.
+ .
+ The list configured on clients can be a subset of the list configured
+ on servers.
+ .
+ This can be left empty if Hesiod is used to advertise Zephyr servers.
 
 Template: zephyr-clients/read_conf
 Type: boolean
diff --git a/debian/zephyr-server.templates b/debian/zephyr-server.templates
index 5616327..11c9b86 100644
--- a/debian/zephyr-server.templates
+++ b/debian/zephyr-server.templates
@@ -1,8 +1,20 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english@lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
 Template: zephyr-server/servers
 Type: string
 _Description: Zephyr servers:
- Please type the full names of your zephyr servers, separated by spaces.
- (Note that this can be a superset of that you're telling the clients.)
+ Please specify the full names of the Zephyr servers, as a
+ space-separated list.
+ .
+ The list configured on clients can be a subset of the list configured
+ on servers.
 
 Template: zephyr-server/read_conf
 Type: boolean