r436 - in zope-common/trunk/debian: . po

Fabio Tranchitella kobold at alioth.debian.org
Thu Nov 2 15:46:52 CET 2006 

Author: kobold
Date: 2006-11-02 15:46:51 +0100 (Thu, 02 Nov 2006)
New Revision: 436

Modified:
   zope-common/trunk/debian/README.Debian
   zope-common/trunk/debian/changelog
   zope-common/trunk/debian/control
   zope-common/trunk/debian/po/cs.po
   zope-common/trunk/debian/po/da.po
   zope-common/trunk/debian/po/de.po
   zope-common/trunk/debian/po/fr.po
   zope-common/trunk/debian/po/it.po
   zope-common/trunk/debian/po/ja.po
   zope-common/trunk/debian/po/nl.po
   zope-common/trunk/debian/po/pt_BR.po
   zope-common/trunk/debian/po/sv.po
   zope-common/trunk/debian/po/templates.pot
   zope-common/trunk/debian/po/vi.po
   zope-common/trunk/debian/templates
Log:
Changes for the next upload.


Modified: zope-common/trunk/debian/README.Debian
===================================================================
--- zope-common/trunk/debian/README.Debian	2006-11-02 14:13:28 UTC (rev 435)
+++ zope-common/trunk/debian/README.Debian	2006-11-02 14:46:51 UTC (rev 436)
@@ -53,10 +53,10 @@
 your system, but not in an Zope instance, except the instance is
 configured to have all products installed by default.
 
-To add the MyProduct product to the Zope 2.10 instance `myinstance',
+To add the MyProduct product to the Zope 2.9 instance `myinstance',
 you have to run the following command:
 
-    # dzhandle -z 2.10 add-product myinstance MyProduct
+    # dzhandle -z 2.9 add-product myinstance MyProduct
 
 
 Handling of Zope Instances
@@ -64,10 +64,10 @@
 
 You (or a package) can create a zope instance using:
 
-  dzhandle -z 2.10 make-instance <instance> --addon-mode [all|manual]
+  dzhandle -z 2.9 make-instance <instance> --addon-mode [all|manual]
 
 The script uses the `mkzopeinstance.py' script to create the instance
-and creates a file /etc/zope2.10/<instance>/debian_policy, which has
+and creates a file /etc/zope2.9/<instance>/debian_policy, which has
 information about how the instance should be handled.
 
 Addon-Mode describes, if all addons should be installed in the Products
@@ -82,7 +82,7 @@
 
 - 'tree-linked' copies the directory tree of the addon and symlinks every
   file. Works better when you do have different zope versions requiring
-  different python versions (that's what the zope2.10-sandbox package uses).
+  different python versions (that's what the zope2.9-sandbox package uses).
 
 - 'copied' copies the product to the instance, but doesn't update the copy
   on package upgrades.

Modified: zope-common/trunk/debian/changelog
===================================================================
--- zope-common/trunk/debian/changelog	2006-11-02 14:13:28 UTC (rev 435)
+++ zope-common/trunk/debian/changelog	2006-11-02 14:46:51 UTC (rev 436)
@@ -1,3 +1,13 @@
+zope-common (0.5.26) unstable; urgency=low
+
+  * debian/README.Debian: updated to use zope2.9 instead of zope2.10
+    in the examples, because that's the version we'll ship in etch.
+  * debian/templates: fixed two typos. (Closes: #385882)
+  * debian/control: sb-release and po-debconf should be in Build-Depends.
+    (Closes: #392653)
+
+ -- Fabio Tranchitella <kobold at debian.org>  Thu,  2 Nov 2006 15:22:13 +0100
+
 zope-common (0.5.25) unstable; urgency=low
 
   * Add support for Zope 2.10 to dzhandle.

Modified: zope-common/trunk/debian/control
===================================================================
--- zope-common/trunk/debian/control	2006-11-02 14:13:28 UTC (rev 435)
+++ zope-common/trunk/debian/control	2006-11-02 14:46:51 UTC (rev 436)
@@ -2,9 +2,9 @@
 Section: web
 Priority: optional
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
-Uploaders: Fabio Tranchitella <kobold at debian.org>, Andrea Mennucci <mennucc1 at debian.org>, martin f. krafft <madduck at debian.org>, Matthias Klose  <doko at debian.org>, Jonas Meurer <mejo at debian.org>
-Build-Depends: debhelper (>= 5.0.0)
-Build-Depends-Indep: lsb-release, docbook-to-man
+Uploaders: Fabio Tranchitella <kobold at debian.org>, Andrea Mennucci <mennucc1 at debian.org>, martin f. krafft <madduck at debian.org>, Matthias Klose <doko at debian.org>, Jonas Meurer <mejo at debian.org>
+Build-Depends: debhelper (>= 5.0.0), po-debconf, lsb-release
+Build-Depends-Indep: docbook-to-man
 Standards-Version: 3.7.2
 
 Package: zope-common

Modified: zope-common/trunk/debian/po/cs.po
===================================================================
--- zope-common/trunk/debian/po/cs.po	2006-11-02 14:13:28 UTC (rev 435)
+++ zope-common/trunk/debian/po/cs.po	2006-11-02 14:46:51 UTC (rev 436)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: zope-common\n"
 "Report-Msgid-Bugs-To: pkg-zope-developers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-11-01 18:24+0100\n"
+"POT-Creation-Date: 2006-11-02 15:44+0100\n"
 "PO-Revision-Date: 2005-10-03 18:39+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -32,8 +32,8 @@
 #. Type: select
 #. Description
 #: ../templates:1002
-msgid "When will Zope instances be restarted?"
-msgstr "Kdy se mají instance Zope restartovat?"
+msgid "When to automatically restart Zope instances:"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -80,7 +80,8 @@
 #. Type: select
 #. Description
 #: ../templates:2002
-msgid "Found old/incomplete zope instance '${instance}'"
+#, fuzzy
+msgid "Found an old/incomplete zope instance '${instance}':"
 msgstr "Nalezena starší/nekompletní instance zope '${instance}'"
 
 #. Type: select
@@ -108,16 +109,18 @@
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
 msgid "Keep data for ${instance} on package purge?"
 msgstr "Ponechat data ${instance} při vyčištění balíku?"
 
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
 msgid ""
 "Purging the data files of a zope instance on package purge results in loss "
-"of all data of the zope instance. Keep the data files in /var/lib/zope"
-"${zver}/instance/${instance}  on package removal and purge?"
+"of all data of the zope instance. The data files for this instance are "
+"stored in /var/lib/zope${zver}/instance/${instance}."
 msgstr ""
 "Smazání datových souborů instance Zope při vyčištění balíku ze systému "
 "znamená, že ztratíte všechna data dané instance Zope. Ponechat při "
@@ -127,7 +130,8 @@
 #. Type: string
 #. Description
 #: ../templates:4001
-msgid "Enter admin user for zope instance '${instance}':"
+#, fuzzy
+msgid "Admin user for zope instance '${instance}':"
 msgstr "Zadejte administrátorské jméno pro Zope instanci '${instance}':"
 
 #. Type: string
@@ -172,7 +176,8 @@
 #. Type: password
 #. Description
 #: ../templates:5001
-msgid "Enter a password for the admin user:"
+#, fuzzy
+msgid "Password for the admin user:"
 msgstr "Zadejte heslo pro administrátora:"
 
 #. Type: password
@@ -190,8 +195,8 @@
 #. Type: password
 #. Description
 #: ../templates:6001
-msgid "Enter again the same password:"
-msgstr "Znovu zadejte stejné heslo:"
+msgid "Same password:"
+msgstr ""
 
 #. Type: password
 #. Description
@@ -202,7 +207,8 @@
 #. Type: string
 #. Description
 #: ../templates:7001
-msgid "Enter the HTTP port for this instance:"
+#, fuzzy
+msgid "HTTP port for this instance:"
 msgstr "Zadejte HTTP port této instance:"
 
 #. Type: string
@@ -240,7 +246,7 @@
 #. Type: note
 #. Description
 #: ../templates:8001
-msgid "Use these values to login into the Zope${zver} instance ${instance}:"
+msgid "Use these values to log in in to the Zope${zver} instance ${instance}:"
 msgstr ""
 "Pro přihlášení do instance ${instance} Zope${zver} použijte následující "
 "údaje:"
@@ -254,3 +260,9 @@
 msgstr ""
 " * Uživatel : ${user}\n"
 " * Heslo    : ${password}"
+
+#~ msgid "When will Zope instances be restarted?"
+#~ msgstr "Kdy se mají instance Zope restartovat?"
+
+#~ msgid "Enter again the same password:"
+#~ msgstr "Znovu zadejte stejné heslo:"

Modified: zope-common/trunk/debian/po/da.po
===================================================================
--- zope-common/trunk/debian/po/da.po	2006-11-02 14:13:28 UTC (rev 435)
+++ zope-common/trunk/debian/po/da.po	2006-11-02 14:46:51 UTC (rev 436)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: zope_2.6.4-1_templates\n"
 "Report-Msgid-Bugs-To: pkg-zope-developers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-11-01 18:24+0100\n"
+"POT-Creation-Date: 2006-11-02 15:44+0100\n"
 "PO-Revision-Date: 2006-05-11 16:29+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
 "Language-Team: Danish <dansk at klid.dk>\n"
@@ -25,8 +25,8 @@
 #. Type: select
 #. Description
 #: ../templates:1002
-msgid "When will Zope instances be restarted?"
-msgstr "Hvornår skal Zope-forekomster genstartes?"
+msgid "When to automatically restart Zope instances:"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -72,7 +72,8 @@
 #. Type: select
 #. Description
 #: ../templates:2002
-msgid "Found old/incomplete zope instance '${instance}'"
+#, fuzzy
+msgid "Found an old/incomplete zope instance '${instance}':"
 msgstr "Fandt gamle/ukomplette zope-forekomst '${instance}'"
 
 #. Type: select
@@ -100,16 +101,18 @@
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
 msgid "Keep data for ${instance} on package purge?"
 msgstr "Behold data for ${instance} når pakken udrenses?"
 
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
 msgid ""
 "Purging the data files of a zope instance on package purge results in loss "
-"of all data of the zope instance. Keep the data files in /var/lib/zope"
-"${zver}/instance/${instance}  on package removal and purge?"
+"of all data of the zope instance. The data files for this instance are "
+"stored in /var/lib/zope${zver}/instance/${instance}."
 msgstr ""
 "Hvis du fjerne en zope-forekomsts datafiler, når debianpakken udrenses, "
 "mister du alle forekomstens data. Skal datafilerne i /var/lib/zope${zver}/"
@@ -118,7 +121,8 @@
 #. Type: string
 #. Description
 #: ../templates:4001
-msgid "Enter admin user for zope instance '${instance}':"
+#, fuzzy
+msgid "Admin user for zope instance '${instance}':"
 msgstr "Angiv administartor-bruger for zope-forekomsten '${instance}':"
 
 #. Type: string
@@ -163,7 +167,8 @@
 #. Type: password
 #. Description
 #: ../templates:5001
-msgid "Enter a password for the admin user:"
+#, fuzzy
+msgid "Password for the admin user:"
 msgstr "Angiv administratorbrugerens adgangskode:"
 
 #. Type: password
@@ -181,8 +186,8 @@
 #. Type: password
 #. Description
 #: ../templates:6001
-msgid "Enter again the same password:"
-msgstr "Angiv samme adgangskode igen:"
+msgid "Same password:"
+msgstr ""
 
 #. Type: password
 #. Description
@@ -193,7 +198,8 @@
 #. Type: string
 #. Description
 #: ../templates:7001
-msgid "Enter the HTTP port for this instance:"
+#, fuzzy
+msgid "HTTP port for this instance:"
 msgstr "Angiv HTTP-port for denne instans:"
 
 #. Type: string
@@ -232,7 +238,7 @@
 #. Type: note
 #. Description
 #: ../templates:8001
-msgid "Use these values to login into the Zope${zver} instance ${instance}:"
+msgid "Use these values to log in in to the Zope${zver} instance ${instance}:"
 msgstr "Benyt disse værdier til at logge på Zope${zver}-instansen ${instance}:"
 
 #. Type: note
@@ -244,3 +250,9 @@
 msgstr ""
 " * Bruger      : ${user}\n"
 " * Adgangskode : ${password}"
+
+#~ msgid "When will Zope instances be restarted?"
+#~ msgstr "Hvornår skal Zope-forekomster genstartes?"
+
+#~ msgid "Enter again the same password:"
+#~ msgstr "Angiv samme adgangskode igen:"

Modified: zope-common/trunk/debian/po/de.po
===================================================================
--- zope-common/trunk/debian/po/de.po	2006-11-02 14:13:28 UTC (rev 435)
+++ zope-common/trunk/debian/po/de.po	2006-11-02 14:46:51 UTC (rev 436)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: zope-common_0.5.17_de\n"
 "Report-Msgid-Bugs-To: pkg-zope-developers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-11-01 18:24+0100\n"
+"POT-Creation-Date: 2006-11-02 15:44+0100\n"
 "PO-Revision-Date: 2006-01-06 21:27+0100\n"
 "Last-Translator: Erik Schanze <schanzi_ at gmx.de>\n"
 "Language-Team: German <de at li.org>\n"
@@ -35,8 +35,8 @@
 #. Type: select
 #. Description
 #: ../templates:1002
-msgid "When will Zope instances be restarted?"
-msgstr "Wann sollen Zope-Instanzen neu gestartet werden?"
+msgid "When to automatically restart Zope instances:"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -85,7 +85,8 @@
 #. Type: select
 #. Description
 #: ../templates:2002
-msgid "Found old/incomplete zope instance '${instance}'"
+#, fuzzy
+msgid "Found an old/incomplete zope instance '${instance}':"
 msgstr "Alte bzw. unvollständige Zope-Instanz '${instance}' gefunden"
 
 #. Type: select
@@ -114,6 +115,7 @@
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
 msgid "Keep data for ${instance} on package purge?"
 msgstr ""
 "Daten von ${instance} beim restlosen Löschen (purge) des Pakets behalten?"
@@ -121,10 +123,11 @@
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
 msgid ""
 "Purging the data files of a zope instance on package purge results in loss "
-"of all data of the zope instance. Keep the data files in /var/lib/zope"
-"${zver}/instance/${instance}  on package removal and purge?"
+"of all data of the zope instance. The data files for this instance are "
+"stored in /var/lib/zope${zver}/instance/${instance}."
 msgstr ""
 "Werden die Daten-Dateien einer Zope-Instanz beim restlosen Entfernen des "
 "Pakets gelöscht, bedeutet das den Verlust aller Daten dieser Zope-Instanz. "
@@ -135,7 +138,8 @@
 #. Type: string
 #. Description
 #: ../templates:4001
-msgid "Enter admin user for zope instance '${instance}':"
+#, fuzzy
+msgid "Admin user for zope instance '${instance}':"
 msgstr "Admin-Benutzer der Zope-Instanz '${instance}' eingeben:"
 
 #. Type: string
@@ -181,7 +185,8 @@
 #. Type: password
 #. Description
 #: ../templates:5001
-msgid "Enter a password for the admin user:"
+#, fuzzy
+msgid "Password for the admin user:"
 msgstr "Passwort für Admin-Benutzer eingeben:"
 
 #. Type: password
@@ -200,8 +205,8 @@
 #. Type: password
 #. Description
 #: ../templates:6001
-msgid "Enter again the same password:"
-msgstr "Das gleiche Passwort nocheinmal eingeben:"
+msgid "Same password:"
+msgstr ""
 
 #. Type: password
 #. Description
@@ -212,7 +217,8 @@
 #. Type: string
 #. Description
 #: ../templates:7001
-msgid "Enter the HTTP port for this instance:"
+#, fuzzy
+msgid "HTTP port for this instance:"
 msgstr "HTTP-Port dieser Instanz:"
 
 #. Type: string
@@ -251,7 +257,7 @@
 #. Type: note
 #. Description
 #: ../templates:8001
-msgid "Use these values to login into the Zope${zver} instance ${instance}:"
+msgid "Use these values to log in in to the Zope${zver} instance ${instance}:"
 msgstr ""
 "Benutzen Sie diese Angaben zum Anmelden an der Zope${zver}-Instanz "
 "${instance}:"
@@ -265,3 +271,9 @@
 msgstr ""
 " * Benutzername : ${user}\n"
 " * Passwort     : ${password}"
+
+#~ msgid "When will Zope instances be restarted?"
+#~ msgstr "Wann sollen Zope-Instanzen neu gestartet werden?"
+
+#~ msgid "Enter again the same password:"
+#~ msgstr "Das gleiche Passwort nocheinmal eingeben:"

Modified: zope-common/trunk/debian/po/fr.po
===================================================================
--- zope-common/trunk/debian/po/fr.po	2006-11-02 14:13:28 UTC (rev 435)
+++ zope-common/trunk/debian/po/fr.po	2006-11-02 14:46:51 UTC (rev 436)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: zope-0.5.10\n"
 "Report-Msgid-Bugs-To: pkg-zope-developers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-11-01 18:24+0100\n"
+"POT-Creation-Date: 2006-11-02 15:44+0100\n"
 "PO-Revision-Date: 2005-11-08 22:09+0100\n"
 "Last-Translator: Michel Grentzinger <mic.grentz at online.fr>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -32,8 +32,8 @@
 #. Type: select
 #. Description
 #: ../templates:1002
-msgid "When will Zope instances be restarted?"
-msgstr "Méthode de redémarrage des instances Zope :"
+msgid "When to automatically restart Zope instances:"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -82,7 +82,8 @@
 #. Type: select
 #. Description
 #: ../templates:2002
-msgid "Found old/incomplete zope instance '${instance}'"
+#, fuzzy
+msgid "Found an old/incomplete zope instance '${instance}':"
 msgstr "Instance Zope « ${instance} » ancienne ou incomplète"
 
 #. Type: select
@@ -111,6 +112,7 @@
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
 msgid "Keep data for ${instance} on package purge?"
 msgstr ""
 "Conserver les données de l'instance « ${instance} » lors de la purge du "
@@ -119,10 +121,11 @@
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
 msgid ""
 "Purging the data files of a zope instance on package purge results in loss "
-"of all data of the zope instance. Keep the data files in /var/lib/zope"
-"${zver}/instance/${instance}  on package removal and purge?"
+"of all data of the zope instance. The data files for this instance are "
+"stored in /var/lib/zope${zver}/instance/${instance}."
 msgstr ""
 "La suppression définitive des fichiers de données d'une instance Zope "
 "conduira à la perte de toutes les données de cette instance. Veuillez "
@@ -132,7 +135,8 @@
 #. Type: string
 #. Description
 #: ../templates:4001
-msgid "Enter admin user for zope instance '${instance}':"
+#, fuzzy
+msgid "Admin user for zope instance '${instance}':"
 msgstr "Administrateur de l'instance « ${instance} » :"
 
 #. Type: string
@@ -178,7 +182,8 @@
 #. Type: password
 #. Description
 #: ../templates:5001
-msgid "Enter a password for the admin user:"
+#, fuzzy
+msgid "Password for the admin user:"
 msgstr "Mot de passe de l'administrateur :"
 
 #. Type: password
@@ -196,8 +201,8 @@
 #. Type: password
 #. Description
 #: ../templates:6001
-msgid "Enter again the same password:"
-msgstr "Confirmation du mot de passe :"
+msgid "Same password:"
+msgstr ""
 
 #. Type: password
 #. Description
@@ -208,7 +213,8 @@
 #. Type: string
 #. Description
 #: ../templates:7001
-msgid "Enter the HTTP port for this instance:"
+#, fuzzy
+msgid "HTTP port for this instance:"
 msgstr "Port HTTP pour cette instance :"
 
 #. Type: string
@@ -246,7 +252,7 @@
 #. Type: note
 #. Description
 #: ../templates:8001
-msgid "Use these values to login into the Zope${zver} instance ${instance}:"
+msgid "Use these values to log in in to the Zope${zver} instance ${instance}:"
 msgstr ""
 "Utilisez ces valeurs pour vous connecter à l'instance « ${instance} » de Zope"
 "${zver} :"
@@ -260,3 +266,9 @@
 msgstr ""
 " - Utilisateur : ${user}\n"
 " - Mot de passe : ${password}"
+
+#~ msgid "When will Zope instances be restarted?"
+#~ msgstr "Méthode de redémarrage des instances Zope :"
+
+#~ msgid "Enter again the same password:"
+#~ msgstr "Confirmation du mot de passe :"

Modified: zope-common/trunk/debian/po/it.po
===================================================================
--- zope-common/trunk/debian/po/it.po	2006-11-02 14:13:28 UTC (rev 435)
+++ zope-common/trunk/debian/po/it.po	2006-11-02 14:46:51 UTC (rev 436)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: zope-common\n"
 "Report-Msgid-Bugs-To: pkg-zope-developers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-11-01 18:24+0100\n"
+"POT-Creation-Date: 2006-11-02 15:44+0100\n"
 "PO-Revision-Date: 2005-03-09 HO:MI+ZONE\n"
 "Last-Translator: Fabio Tranchitella <kobold at kobold.it>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -32,8 +32,8 @@
 #. Type: select
 #. Description
 #: ../templates:1002
-msgid "When will Zope instances be restarted?"
-msgstr "Quando verranno riavviate le istanze di Zope?"
+msgid "When to automatically restart Zope instances:"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -82,7 +82,8 @@
 #. Type: select
 #. Description
 #: ../templates:2002
-msgid "Found old/incomplete zope instance '${instance}'"
+#, fuzzy
+msgid "Found an old/incomplete zope instance '${instance}':"
 msgstr "Trovata una istanza zope '${instance}' vecchia o incompleta"
 
 #. Type: select
@@ -111,6 +112,7 @@
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
 msgid "Keep data for ${instance} on package purge?"
 msgstr ""
 "Mantenere i dati per l'istanza ${instance} dopo la rimozione del pacchetto?"
@@ -118,10 +120,11 @@
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
 msgid ""
 "Purging the data files of a zope instance on package purge results in loss "
-"of all data of the zope instance. Keep the data files in /var/lib/zope"
-"${zver}/instance/${instance}  on package removal and purge?"
+"of all data of the zope instance. The data files for this instance are "
+"stored in /var/lib/zope${zver}/instance/${instance}."
 msgstr ""
 "La rimozione dei file di dati di un'istanza zope durante la rimozione del "
 "pacchetto (purge) causerà la perdita di tutti i dati dell'istanza zope. "
@@ -131,7 +134,8 @@
 #. Type: string
 #. Description
 #: ../templates:4001
-msgid "Enter admin user for zope instance '${instance}':"
+#, fuzzy
+msgid "Admin user for zope instance '${instance}':"
 msgstr "Inserire il nome utente dell'amministratore "
 
 #. Type: string
@@ -177,7 +181,8 @@
 #. Type: password
 #. Description
 #: ../templates:5001
-msgid "Enter a password for the admin user:"
+#, fuzzy
+msgid "Password for the admin user:"
 msgstr "Inserire la password per l'utente amministratore"
 
 #. Type: password
@@ -195,8 +200,8 @@
 #. Type: password
 #. Description
 #: ../templates:6001
-msgid "Enter again the same password:"
-msgstr "Inserire di nuovo la stessa password:"
+msgid "Same password:"
+msgstr ""
 
 #. Type: password
 #. Description
@@ -207,7 +212,8 @@
 #. Type: string
 #. Description
 #: ../templates:7001
-msgid "Enter the HTTP port for this instance:"
+#, fuzzy
+msgid "HTTP port for this instance:"
 msgstr "Specificare la porta HTTP per questa istanza:"
 
 #. Type: string
@@ -245,7 +251,7 @@
 #. Type: note
 #. Description
 #: ../templates:8001
-msgid "Use these values to login into the Zope${zver} instance ${instance}:"
+msgid "Use these values to log in in to the Zope${zver} instance ${instance}:"
 msgstr ""
 "Utilizzare questi valori per accedere all'istanza Zope${zver} ${instance}:"
 
@@ -258,3 +264,9 @@
 msgstr ""
 " * Utente   : ${user}\n"
 " * Password : ${password}"
+
+#~ msgid "When will Zope instances be restarted?"
+#~ msgstr "Quando verranno riavviate le istanze di Zope?"
+
+#~ msgid "Enter again the same password:"
+#~ msgstr "Inserire di nuovo la stessa password:"

Modified: zope-common/trunk/debian/po/ja.po
===================================================================
--- zope-common/trunk/debian/po/ja.po	2006-11-02 14:13:28 UTC (rev 435)
+++ zope-common/trunk/debian/po/ja.po	2006-11-02 14:46:51 UTC (rev 436)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: zope-common VERSION\n"
 "Report-Msgid-Bugs-To: pkg-zope-developers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-11-01 18:24+0100\n"
+"POT-Creation-Date: 2006-11-02 15:44+0100\n"
 "PO-Revision-Date: 2005-06-06 13:08+0900\n"
 "Last-Translator: Hideki Yamane <henrich at samba.gr.jp>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -33,8 +33,8 @@
 #. Type: select
 #. Description
 #: ../templates:1002
-msgid "When will Zope instances be restarted?"
-msgstr "¤¤¤Ä Zope ¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤òºÆµ¯Æ°¤·¤Þ¤¹¤«?"
+msgid "When to automatically restart Zope instances:"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -79,7 +79,8 @@
 #. Type: select
 #. Description
 #: ../templates:2002
-msgid "Found old/incomplete zope instance '${instance}'"
+#, fuzzy
+msgid "Found an old/incomplete zope instance '${instance}':"
 msgstr ""
 "¸Å¤¤¡¦¤¢¤ë¤¤¤ÏÉÔ´°Á´¤Ê zope ¥¤¥ó¥¹¥¿¥ó¥¹ '${instance}' ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
@@ -108,6 +109,7 @@
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
 msgid "Keep data for ${instance} on package purge?"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤ò purge ¤¹¤ëºÝ¤Ë ${instance} ¤Î¥Ç¡¼¥¿¤âºï½ü¤·¤Þ¤¹¤«?"
 
@@ -117,8 +119,8 @@
 #, fuzzy
 msgid ""
 "Purging the data files of a zope instance on package purge results in loss "
-"of all data of the zope instance. Keep the data files in /var/lib/zope"
-"${zver}/instance/${instance}  on package removal and purge?"
+"of all data of the zope instance. The data files for this instance are "
+"stored in /var/lib/zope${zver}/instance/${instance}."
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸¤ò purge ¤¹¤ëºÝ¡¢zope ¥¤¥ó¥¹¥¿¥ó¥¹¤Î¥Ç¡¼¥¿¥Õ¥¡¥¤¥ë¤â purge ¤¹¤ë¤È"
 "zope ¥¤¥ó¥¹¥¿¥ó¥¹¤ÎÁ´¤Æ¤Î¥Ç¡¼¥¿¤ò¼º¤¤¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸¤Îºï½ü¤È purge ¤ÎºÝ¤Ë¡¢"
@@ -127,7 +129,8 @@
 #. Type: string
 #. Description
 #: ../templates:4001
-msgid "Enter admin user for zope instance '${instance}':"
+#, fuzzy
+msgid "Admin user for zope instance '${instance}':"
 msgstr "zope ¥¤¥ó¥¹¥¿¥ó¥¹ '${instance}' ¤Î´ÉÍý¼Ô¥æ¡¼¥¶¤òÆþÎϤ·¤Æ²¼¤µ¤¤:"
 
 #. Type: string
@@ -172,7 +175,8 @@
 #. Type: password
 #. Description
 #: ../templates:5001
-msgid "Enter a password for the admin user:"
+#, fuzzy
+msgid "Password for the admin user:"
 msgstr "´ÉÍý¼Ô¥æ¡¼¥¶¤Î¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:"
 
 #. Type: password
@@ -190,8 +194,8 @@
 #. Type: password
 #. Description
 #: ../templates:6001
-msgid "Enter again the same password:"
-msgstr "Ʊ¤¸¥Ñ¥¹¥ï¡¼¥É¤ò¤â¤¦°ìÅÙÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:"
+msgid "Same password:"
+msgstr ""
 
 #. Type: password
 #. Description
@@ -202,7 +206,7 @@
 #. Type: string
 #. Description
 #: ../templates:7001
-msgid "Enter the HTTP port for this instance:"
+msgid "HTTP port for this instance:"
 msgstr ""
 
 #. Type: string
@@ -236,7 +240,7 @@
 #. Type: note
 #. Description
 #: ../templates:8001
-msgid "Use these values to login into the Zope${zver} instance ${instance}:"
+msgid "Use these values to log in in to the Zope${zver} instance ${instance}:"
 msgstr ""
 
 #. Type: note
@@ -246,3 +250,9 @@
 " * User     : ${user}\n"
 " * Password : ${password}"
 msgstr ""
+
+#~ msgid "When will Zope instances be restarted?"
+#~ msgstr "¤¤¤Ä Zope ¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤òºÆµ¯Æ°¤·¤Þ¤¹¤«?"
+
+#~ msgid "Enter again the same password:"
+#~ msgstr "Ʊ¤¸¥Ñ¥¹¥ï¡¼¥É¤ò¤â¤¦°ìÅÙÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:"

Modified: zope-common/trunk/debian/po/nl.po
===================================================================
--- zope-common/trunk/debian/po/nl.po	2006-11-02 14:13:28 UTC (rev 435)
+++ zope-common/trunk/debian/po/nl.po	2006-11-02 14:46:51 UTC (rev 436)
@@ -18,7 +18,7 @@
 msgstr ""
 "Project-Id-Version: zope-common_0.5.24_nl\n"
 "Report-Msgid-Bugs-To: pkg-zope-developers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-11-01 18:24+0100\n"
+"POT-Creation-Date: 2006-11-02 15:44+0100\n"
 "PO-Revision-Date: 2006-09-23 17:28+0200\n"
 "Last-Translator: Kurt De Bree <kdebree at telenet.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -36,8 +36,8 @@
 #. Type: select
 #. Description
 #: ../templates:1002
-msgid "When will Zope instances be restarted?"
-msgstr "Wanneer worden Zope-diensten herstart?"
+msgid "When to automatically restart Zope instances:"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -85,7 +85,8 @@
 #. Type: select
 #. Description
 #: ../templates:2002
-msgid "Found old/incomplete zope instance '${instance}'"
+#, fuzzy
+msgid "Found an old/incomplete zope instance '${instance}':"
 msgstr "Verouderde/onvolledige zope-dienst '${instance}' gevonden"
 
 #. Type: select
@@ -114,16 +115,18 @@
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
 msgid "Keep data for ${instance} on package purge?"
 msgstr "Data voor ${instance} behouden bij wissen van het pakket?"
 
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
 msgid ""
 "Purging the data files of a zope instance on package purge results in loss "
-"of all data of the zope instance. Keep the data files in /var/lib/zope"
-"${zver}/instance/${instance}  on package removal and purge?"
+"of all data of the zope instance. The data files for this instance are "
+"stored in /var/lib/zope${zver}/instance/${instance}."
 msgstr ""
 "Wissen (purge) van de databestanden van een zope-dienst tijdens het wissen "
 "van het pakket resulteert in het verlies van alle data van de zope-dienst. "
@@ -133,7 +136,8 @@
 #. Type: string
 #. Description
 #: ../templates:4001
-msgid "Enter admin user for zope instance '${instance}':"
+#, fuzzy
+msgid "Admin user for zope instance '${instance}':"
 msgstr "Geef de admin-gebruiker voor de zope-dienst '${instance}' in:"
 
 #. Type: string
@@ -179,7 +183,8 @@
 #. Type: password
 #. Description
 #: ../templates:5001
-msgid "Enter a password for the admin user:"
+#, fuzzy
+msgid "Password for the admin user:"
 msgstr "Geef het wachtwoord voor de admin-gebruiker:"
 
 #. Type: password
@@ -197,8 +202,8 @@
 #. Type: password
 #. Description
 #: ../templates:6001
-msgid "Enter again the same password:"
-msgstr "Geef nogmaals hetzelfde wachtwoord in:"
+msgid "Same password:"
+msgstr ""
 
 #. Type: password
 #. Description
@@ -209,7 +214,8 @@
 #. Type: string
 #. Description
 #: ../templates:7001
-msgid "Enter the HTTP port for this instance:"
+#, fuzzy
+msgid "HTTP port for this instance:"
 msgstr "Geef de HTTP-poort in voor deze dienst:"
 
 #. Type: string
@@ -248,7 +254,7 @@
 #. Type: note
 #. Description
 #: ../templates:8001
-msgid "Use these values to login into the Zope${zver} instance ${instance}:"
+msgid "Use these values to log in in to the Zope${zver} instance ${instance}:"
 msgstr ""
 "Gebruik deze waarden om toegang te krijgen tot de Zope${zver}-dienst "
 "${instance}:"
@@ -262,3 +268,9 @@
 msgstr ""
 " * Gebruiker: ${user}\n"
 " * Wachtwoord: ${password}"
+
+#~ msgid "When will Zope instances be restarted?"
+#~ msgstr "Wanneer worden Zope-diensten herstart?"
+
+#~ msgid "Enter again the same password:"
+#~ msgstr "Geef nogmaals hetzelfde wachtwoord in:"

Modified: zope-common/trunk/debian/po/pt_BR.po
===================================================================
--- zope-common/trunk/debian/po/pt_BR.po	2006-11-02 14:13:28 UTC (rev 435)
+++ zope-common/trunk/debian/po/pt_BR.po	2006-11-02 14:46:51 UTC (rev 436)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: zope\n"
 "Report-Msgid-Bugs-To: pkg-zope-developers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-11-01 18:24+0100\n"
+"POT-Creation-Date: 2006-11-02 15:44+0100\n"
 "PO-Revision-Date: 2005-03-30 12:14-0300\n"
 "Last-Translator: Tiago Bortoletto Vaz <tiago at debian-ba.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -32,8 +32,8 @@
 #. Type: select
 #. Description
 #: ../templates:1002
-msgid "When will Zope instances be restarted?"
-msgstr "Quando as instâncias do Zope serão reiniciadas?"
+msgid "When to automatically restart Zope instances:"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -81,7 +81,8 @@
 #. Type: select
 #. Description
 #: ../templates:2002
-msgid "Found old/incomplete zope instance '${instance}'"
+#, fuzzy
+msgid "Found an old/incomplete zope instance '${instance}':"
 msgstr "Encontrada instância antiga/incompleta '${instance}'"
 
 #. Type: select
@@ -110,6 +111,7 @@
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
 msgid "Keep data for ${instance} on package purge?"
 msgstr ""
 "Remover os dados de ${instance} na remoção do pacote com opção 'purge'?"
@@ -120,8 +122,8 @@
 #, fuzzy
 msgid ""
 "Purging the data files of a zope instance on package purge results in loss "
-"of all data of the zope instance. Keep the data files in /var/lib/zope"
-"${zver}/instance/${instance}  on package removal and purge?"
+"of all data of the zope instance. The data files for this instance are "
+"stored in /var/lib/zope${zver}/instance/${instance}."
 msgstr ""
 "Ao remover arquivos de dados de uma instância na remoção de um pacote com a "
 "opção 'purge' todos os dados desta instância serão perdidos. Deixar os "
@@ -131,7 +133,8 @@
 #. Type: string
 #. Description
 #: ../templates:4001
-msgid "Enter admin user for zope instance '${instance}':"
+#, fuzzy
+msgid "Admin user for zope instance '${instance}':"
 msgstr "Entre com o usuário de administração para a instância '${instance}':"
 
 #. Type: string
@@ -177,7 +180,8 @@
 #. Type: password
 #. Description
 #: ../templates:5001
-msgid "Enter a password for the admin user:"
+#, fuzzy
+msgid "Password for the admin user:"
 msgstr "Entre com uma senha para o administrador:"
 
 #. Type: password
@@ -195,8 +199,8 @@
 #. Type: password
 #. Description
 #: ../templates:6001
-msgid "Enter again the same password:"
-msgstr "Repita a senha:"
+msgid "Same password:"
+msgstr ""
 
 #. Type: password
 #. Description
@@ -208,7 +212,7 @@
 #. Type: string
 #. Description
 #: ../templates:7001
-msgid "Enter the HTTP port for this instance:"
+msgid "HTTP port for this instance:"
 msgstr ""
 
 #. Type: string
@@ -242,7 +246,7 @@
 #. Type: note
 #. Description
 #: ../templates:8001
-msgid "Use these values to login into the Zope${zver} instance ${instance}:"
+msgid "Use these values to log in in to the Zope${zver} instance ${instance}:"
 msgstr ""
 
 #. Type: note
@@ -252,3 +256,9 @@
 " * User     : ${user}\n"
 " * Password : ${password}"
 msgstr ""
+
+#~ msgid "When will Zope instances be restarted?"
+#~ msgstr "Quando as instâncias do Zope serão reiniciadas?"
+
+#~ msgid "Enter again the same password:"
+#~ msgstr "Repita a senha:"

Modified: zope-common/trunk/debian/po/sv.po
===================================================================
--- zope-common/trunk/debian/po/sv.po	2006-11-02 14:13:28 UTC (rev 435)
+++ zope-common/trunk/debian/po/sv.po	2006-11-02 14:46:51 UTC (rev 436)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: zope-common 0.5.11\n"
 "Report-Msgid-Bugs-To: pkg-zope-developers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-11-01 18:24+0100\n"
+"POT-Creation-Date: 2006-11-02 15:44+0100\n"
 "PO-Revision-Date: 2005-10-21 13:03+0200\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <sv at li.org>\n"
@@ -31,8 +31,8 @@
 #. Type: select
 #. Description
 #: ../templates:1002
-msgid "When will Zope instances be restarted?"
-msgstr "När vill du starta om Zope's instanser?"
+msgid "When to automatically restart Zope instances:"
+msgstr ""
 
 #. Type: select
 #. Description
@@ -80,7 +80,8 @@
 #. Type: select
 #. Description
 #: ../templates:2002
-msgid "Found old/incomplete zope instance '${instance}'"
+#, fuzzy
+msgid "Found an old/incomplete zope instance '${instance}':"
 msgstr "Hittade gammal (ofärdig Zope-instans '${instance}'"
 
 #. Type: select
@@ -108,16 +109,18 @@
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
 msgid "Keep data for ${instance} on package purge?"
 msgstr "Spara data för ${instance} vid avinstallation av paketet?"
 
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
 msgid ""
 "Purging the data files of a zope instance on package purge results in loss "
-"of all data of the zope instance. Keep the data files in /var/lib/zope"
-"${zver}/instance/${instance}  on package removal and purge?"
+"of all data of the zope instance. The data files for this instance are "
+"stored in /var/lib/zope${zver}/instance/${instance}."
 msgstr ""
 "Utrensning av datafiler i en zope-instans vid avinstallation resulterar i "
 "att all data i instansen går förlorad. Behålla datafilerna i /var/lib/zope"
@@ -126,7 +129,8 @@
 #. Type: string
 #. Description
 #: ../templates:4001
-msgid "Enter admin user for zope instance '${instance}':"
+#, fuzzy
+msgid "Admin user for zope instance '${instance}':"
 msgstr "Ange en administratörsanvändare för Zope-instansen 'default':"
 
 #. Type: string
@@ -171,7 +175,8 @@
 #. Type: password
 #. Description
 #: ../templates:5001
-msgid "Enter a password for the admin user:"
+#, fuzzy
+msgid "Password for the admin user:"
 msgstr "Ange ett lösenord för administrationsanvändaren:"
 
 #. Type: password
@@ -189,8 +194,8 @@
 #. Type: password
 #. Description
 #: ../templates:6001
-msgid "Enter again the same password:"
-msgstr "Ange samma lösenord igen:"
+msgid "Same password:"
+msgstr ""
 
 #. Type: password
 #. Description
@@ -201,7 +206,8 @@
 #. Type: string
 #. Description
 #: ../templates:7001
-msgid "Enter the HTTP port for this instance:"
+#, fuzzy
+msgid "HTTP port for this instance:"
 msgstr "Ange HTTP-porten för denna instans:"
 
 #. Type: string
@@ -240,7 +246,7 @@
 #. Type: note
 #. Description
 #: ../templates:8001
-msgid "Use these values to login into the Zope${zver} instance ${instance}:"
+msgid "Use these values to log in in to the Zope${zver} instance ${instance}:"
 msgstr ""
 "Använd dessa värden för att logga in i Zope${zver} instansen ${instance}:"
 
@@ -253,3 +259,9 @@
 msgstr ""
 " * Användare : ${user}\n"
 " * Lösenord   : ${password}"
+
+#~ msgid "When will Zope instances be restarted?"
+#~ msgstr "När vill du starta om Zope's instanser?"
+
+#~ msgid "Enter again the same password:"
+#~ msgstr "Ange samma lösenord igen:"

Modified: zope-common/trunk/debian/po/templates.pot
===================================================================
--- zope-common/trunk/debian/po/templates.pot	2006-11-02 14:13:28 UTC (rev 435)
+++ zope-common/trunk/debian/po/templates.pot	2006-11-02 14:46:51 UTC (rev 436)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pkg-zope-developers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-11-01 18:24+0100\n"
+"POT-Creation-Date: 2006-11-02 15:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -25,7 +25,7 @@
 #. Type: select
 #. Description
 #: ../templates:1002
-msgid "When will Zope instances be restarted?"
+msgid "When to automatically restart Zope instances:"
 msgstr ""
 
 #. Type: select
@@ -61,7 +61,7 @@
 #. Type: select
 #. Description
 #: ../templates:2002
-msgid "Found old/incomplete zope instance '${instance}'"
+msgid "Found an old/incomplete zope instance '${instance}':"
 msgstr ""
 
 #. Type: select
@@ -89,14 +89,14 @@
 #: ../templates:3001
 msgid ""
 "Purging the data files of a zope instance on package purge results in loss "
-"of all data of the zope instance. Keep the data files in /var/lib/zope"
-"${zver}/instance/${instance}  on package removal and purge?"
+"of all data of the zope instance. The data files for this instance are "
+"stored in /var/lib/zope${zver}/instance/${instance}."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../templates:4001
-msgid "Enter admin user for zope instance '${instance}':"
+msgid "Admin user for zope instance '${instance}':"
 msgstr ""
 
 #. Type: string
@@ -134,7 +134,7 @@
 #. Type: password
 #. Description
 #: ../templates:5001
-msgid "Enter a password for the admin user:"
+msgid "Password for the admin user:"
 msgstr ""
 
 #. Type: password
@@ -149,7 +149,7 @@
 #. Type: password
 #. Description
 #: ../templates:6001
-msgid "Enter again the same password:"
+msgid "Same password:"
 msgstr ""
 
 #. Type: password
@@ -161,7 +161,7 @@
 #. Type: string
 #. Description
 #: ../templates:7001
-msgid "Enter the HTTP port for this instance:"
+msgid "HTTP port for this instance:"
 msgstr ""
 
 #. Type: string
@@ -195,7 +195,7 @@
 #. Type: note
 #. Description
 #: ../templates:8001
-msgid "Use these values to login into the Zope${zver} instance ${instance}:"
+msgid "Use these values to log in in to the Zope${zver} instance ${instance}:"
 msgstr ""
 
 #. Type: note

Modified: zope-common/trunk/debian/po/vi.po
===================================================================
--- zope-common/trunk/debian/po/vi.po	2006-11-02 14:13:28 UTC (rev 435)
+++ zope-common/trunk/debian/po/vi.po	2006-11-02 14:46:51 UTC (rev 436)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: zope 2.6.4-3\n"
 "Report-Msgid-Bugs-To: pkg-zope-developers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-11-01 18:24+0100\n"
+"POT-Creation-Date: 2006-11-02 15:44+0100\n"
 "PO-Revision-Date: 2005-08-21 22:21+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
@@ -25,13 +25,12 @@
 #. Type: select
 #. Description
 #: ../templates:1002
-msgid "When will Zope instances be restarted?"
+msgid "When to automatically restart Zope instances:"
 msgstr ""
 
 #. Type: select
 #. Description
 #: ../templates:1002
-#, fuzzy
 msgid ""
 "Zope has an extensible, modular structure that allows you to easily add "
 "extra components (products) or features. Each product or feature can usually "
@@ -71,8 +70,9 @@
 #. Type: select
 #. Description
 #: ../templates:2002
-msgid "Found old/incomplete zope instance '${instance}'"
-msgstr ""
+#, fuzzy
+msgid "Found an old/incomplete zope instance '${instance}':"
+msgstr "Hãy nhập người dùng quản lý cho thể hiện Zope « default »:"
 
 #. Type: select
 #. Description
@@ -99,21 +99,20 @@
 #: ../templates:3001
 msgid ""
 "Purging the data files of a zope instance on package purge results in loss "
-"of all data of the zope instance. Keep the data files in /var/lib/zope"
-"${zver}/instance/${instance}  on package removal and purge?"
+"of all data of the zope instance. The data files for this instance are "
+"stored in /var/lib/zope${zver}/instance/${instance}."
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../templates:4001
 #, fuzzy
-msgid "Enter admin user for zope instance '${instance}':"
+msgid "Admin user for zope instance '${instance}':"
 msgstr "Hãy nhập người dùng quản lý cho thể hiện Zope « default »:"
 
 #. Type: string
 #. Description
 #: ../templates:4001
-#, fuzzy
 msgid ""
 "Please enter an admin user for the zope instance '${instance}'. A valid user "
 "name starts with a letter, followed by letters and digits."
@@ -149,7 +148,8 @@
 #. Type: password
 #. Description
 #: ../templates:5001
-msgid "Enter a password for the admin user:"
+#, fuzzy
+msgid "Password for the admin user:"
 msgstr "Hãy nhập mật khẩu cho người dùng quản lý:"
 
 #. Type: password
@@ -167,8 +167,8 @@
 #. Type: password
 #. Description
 #: ../templates:6001
-msgid "Enter again the same password:"
-msgstr "Hãy gõ lại mật khẩu."
+msgid "Same password:"
+msgstr ""
 
 #. Type: password
 #. Description
@@ -180,13 +180,12 @@
 #. Description
 #: ../templates:7001
 #, fuzzy
-msgid "Enter the HTTP port for this instance:"
+msgid "HTTP port for this instance:"
 msgstr "Hãy nhập mật khẩu cho người dùng quản lý:"
 
 #. Type: string
 #. Description
 #: ../templates:7001
-#, fuzzy
 msgid "Please enter the HTTP port for the instance ${instance}."
 msgstr "Hãy gõ lại mật khẩu cho người dùng quản lý."
 
@@ -215,7 +214,7 @@
 #. Type: note
 #. Description
 #: ../templates:8001
-msgid "Use these values to login into the Zope${zver} instance ${instance}:"
+msgid "Use these values to log in in to the Zope${zver} instance ${instance}:"
 msgstr ""
 
 #. Type: note
@@ -226,6 +225,9 @@
 " * Password : ${password}"
 msgstr ""
 
+#~ msgid "Enter again the same password:"
+#~ msgstr "Hãy gõ lại mật khẩu."
+
 #~ msgid "When do you like to restart Zope?"
 #~ msgstr "Khi nào bạn có thích khởi chạy lại trình Zope?"
 

Modified: zope-common/trunk/debian/templates
===================================================================
--- zope-common/trunk/debian/templates	2006-11-02 14:13:28 UTC (rev 435)
+++ zope-common/trunk/debian/templates	2006-11-02 14:46:51 UTC (rev 436)
@@ -2,7 +2,7 @@
 Type: select
 _Choices: configuring, end, manually
 Default: end
-_Description: When will Zope instances be restarted?
+_Description: When to automatically restart Zope instances:
  Zope has an extensible, modular structure that allows you to easily
  add extra components (products) or features. Each product or feature
  can usually be found in packages whose name starts with a 'zope-'
@@ -22,7 +22,7 @@
 Type: select
 _Choices: abort, remove and continue
 Default: abort
-_Description: Found old/incomplete zope instance '${instance}'
+_Description: Found an old/incomplete zope instance '${instance}':
  Found an old/incomplete ${instance} instance in
  /var/lib/zope${zver}/instance/${instance}. No data file Data.fs was found
  for the instance, meaning that the installation was not completed
@@ -38,14 +38,14 @@
 Default: true
 _Description: Keep data for ${instance} on package purge?
  Purging the data files of a zope instance on package purge
- results in loss of all data of the zope instance. Keep
- the data files in /var/lib/zope${zver}/instance/${instance} 
- on package removal and purge?
+ results in loss of all data of the zope instance. The data
+ files for this instance are stored in
+ /var/lib/zope${zver}/instance/${instance}.
 
 Template: zope-common/admin-user
 Type: string
 Default: admin
-_Description: Enter admin user for zope instance '${instance}':
+_Description: Admin user for zope instance '${instance}':
  Please enter an admin user for the zope instance '${instance}'.
  A valid user name starts with a letter, followed by letters and digits.
  .
@@ -58,7 +58,7 @@
 
 Template: zope-common/admin-password
 Type: password
-_Description: Enter a password for the admin user:
+_Description: Password for the admin user:
  Please enter a password for the admin user. The password must not be empty.
  The password is deleted from the configuration database, once the
  instance is sucessfully created and cannot be recoverd.
@@ -71,7 +71,7 @@
 
 Template: zope-common/admin-password-confirmation
 Type: password
-_Description: Enter again the same password:
+_Description: Same password:
  Please enter again the password for the admin user.
  .
  NOTE: Once the instance has been created, the parameter entered
@@ -82,7 +82,7 @@
 
 Template: zope-common/instance-http-port
 Type: string
-_Description: Enter the HTTP port for this instance:
+_Description: HTTP port for this instance:
  Please enter the HTTP port for the instance ${instance}.
  .
  Other services (e.g. FTP, WebDAV, debug) will be disabled by default.
@@ -94,7 +94,7 @@
  You haven't provided a user and a password for your instance, so these 
  values have been automatically generated.
  .
- Use these values to login into the Zope${zver} instance ${instance}:
+ Use these values to log in in to the Zope${zver} instance ${instance}:
  .
   * User     : ${user}
   * Password : ${password}

More information about the pkg-zope-commits mailing list